diff --git a/affiliations-tools/examples.http b/affiliations-tools/examples.http
new file mode 100644
index 0000000..e9b0e66
--- /dev/null
+++ b/affiliations-tools/examples.http
@@ -0,0 +1,32 @@
+# Structurer une affiliation au format texte
+POST https://affiliation-tools.services.inist.fr/v1/expand?indent=true HTTP/1.1
+Content-Type: application/json
+
+[
+     { "value": "Baran, N (reprint author), Univ Zagreb, Dept Phys, Bijenieka Cesta 32, Zagreb 10000, Croatia."},
+     { "value": "Harikane, Y (reprint author), Univ Tokyo, Inst Cosm Ray Res, 5-1-5 Kashiwanoha, Kashiwa, Chiba 2778582, Japan.; Harikane, Y (reprint author), Univ Tokyo, Grad Sch Sci, Dept Phys, Bunkyo Ku, 7-3-1 Hongo, Tokyo 1130033, Japan."},
+     { "value": "Davidzon, I (reprint author), Aix Marseille Univ, LAM, CNRS, UMR 7326, F-13388 Marseille, France.; Davidzon, I (reprint author), INAF Osservatorio Astron Bologna, Via Ranzani 1, I-40127 Bologna, Italy."},
+     { "value": "Zolotukhin, I (reprint author), IRAP, CNRS, 9 Ave Colonel Roche,BP 44346, F-31028 Toulouse 4, France.; Zolotukhin, I (reprint author), Moscow MV Lomonosov State Univ, Sternberg Astron Inst, Univ Skij Pr 13, Moscow 119992, Russia."},
+     { "value": "Cooke, J (reprint author), Swinburne Univ Technol, Ctr Astrophys & Supercomp, Hawthorn, Vic 3122, Australia."},
+     { "value": "van Uitert, E (reprint author), Argelander Inst Astron, Hugel 71, D-53121 Bonn, Germany."},
+     { "value": "Harnois-Deraps, J (reprint author), Univ British Columbia, Dept Phys & Astron, Vancouver, BC V6T 1Z1, Canada."},
+	 { "value": "Ford, J (reprint author), Univ British Columbia, Dept Phys & Astron, 6224 Agr Rd, Vancouver, BC V6T 1Z1, Canada."},
+     { "value": "Laigle, C (reprint author), Univ Paris 06, Sorbonne Univ, 98b Bd Arago, F-75014 Paris, France.; Laigle, C (reprint author), CNRS, UMR 7095, IAP, 98b Bd Arago, F-75014 Paris, France."}
+]
+EOF
+###
+
+
+# Resolution Netscity
+POST https://affiliation-tools.services.inist.fr/v1/netscity/expand?indent=true HTTP/1.1
+Content-Type: application/json
+
+[
+	{ "value": "VANDOEUVRE" },
+	{ "value": "SACLAY"},
+	{ "value": "ORSAY"},
+	{ "value": "TOULOUSE"},
+	{ "value": "VILLEURBANNE"},
+	{ "value": "NANCY"}
+]
+###
diff --git a/affiliations-tools/v1/README.md b/affiliations-tools/v1/README.md
deleted file mode 100644
index ddaf4fa..0000000
--- a/affiliations-tools/v1/README.md
+++ /dev/null
@@ -1,25 +0,0 @@
-# Web service dédié aux affliation
-
-
-## Structurer une affliation texte
-Exemple d'utilisation :
-
-```bash
- 
-cat <<EOF |jq .|curl -N --proxy "" -X POST --data-binary @- "http://localhost:31976/expand?indent=true"
-[
-    { "value": "Baran, N (reprint author), Univ Zagreb, Dept Phys, Bijenieka Cesta 32, Zagreb 10000, Croatia."},
-     { "value": "Harikane, Y (reprint author), Univ Tokyo, Inst Cosm Ray Res, 5-1-5 Kashiwanoha, Kashiwa, Chiba 2778582, Japan.; Harikane, Y (reprint author), Univ Tokyo, Grad Sch Sci, Dept Phys, Bunkyo Ku, 7-3-1 Hongo, Tokyo 1130033, Japan."},
-     { "value": "Davidzon, I (reprint author), Aix Marseille Univ, LAM, CNRS, UMR 7326, F-13388 Marseille, France.; Davidzon, I (reprint author), INAF Osservatorio Astron Bologna, Via Ranzani 1, I-40127 Bologna, Italy."},
-     { "value": "Zolotukhin, I (reprint author), IRAP, CNRS, 9 Ave Colonel Roche,BP 44346, F-31028 Toulouse 4, France.; Zolotukhin, I (reprint author), Moscow MV Lomonosov State Univ, Sternberg Astron Inst, Univ Skij Pr 13, Moscow 119992, Russia."},
-     { "value": "Cooke, J (reprint author), Swinburne Univ Technol, Ctr Astrophys & Supercomp, Hawthorn, Vic 3122, Australia."},
-     { "value": "van Uitert, E (reprint author), Argelander Inst Astron, Hugel 71, D-53121 Bonn, Germany."},
-     { "value": "Harnois-Deraps, J (reprint author), Univ British Columbia, Dept Phys & Astron, Vancouver, BC V6T 1Z1, Canada."},
-	 { "value": "Ford, J (reprint author), Univ British Columbia, Dept Phys & Astron, 6224 Agr Rd, Vancouver, BC V6T 1Z1, Canada."},
-     { "value": "Laigle, C (reprint author), Univ Paris 06, Sorbonne Univ, 98b Bd Arago, F-75014 Paris, France.; Laigle, C (reprint author), CNRS, UMR 7095, IAP, 98b Bd Arago, F-75014 Paris, France."}
-]
-EOF
-```
-
-
-
diff --git a/affiliations-tools/v1/expand.ini b/affiliations-tools/v1/expand.ini
index c379221..b5f3619 100644
--- a/affiliations-tools/v1/expand.ini
+++ b/affiliations-tools/v1/expand.ini
@@ -28,8 +28,8 @@
 path = value
 cacheName = step1
 [expand/URLConnect]
-url = https://ws-libpostal.sandbox.istex.fr/parse/expand
-timeout = 5000
+url = https://affiliations-libpostal.services.inist.fr/v1/parse
+timeout = 10000
 
 # ---------  Enrichissement du resultat libpostal
 [expand]
@@ -60,16 +60,17 @@
 value = get('value.city').upperCase()
 
 # --------- Enrichissement du champ netscity contenant une ville
-[expand/combine]
-persistent = true
+[expand/expand]
 path = value.netscity
+size = 10
+cacheName = netscity
 
-[expand/combine/URLStream]
-url = https://ws-netscity.sandbox.istex.fr/combine
-timeout = env('timeout', 5000)
+[expand/expand/URLConnect]
+url = https://affiliations-tools.services.inist.fr/v1/netscity/expand
+timeout = 10000
 
 # --------- Selection des informations netscity à conserver
-[expand/combine/replace]
+[expand/expand/replace]
 path = id
 value = get('id')
 
@@ -90,15 +91,17 @@
 value = get('value.netscity.value')
 
 # --------- Enrichissement du champ country avec le vocabulaire 9SD de Loterre
-[expand/combine]
-persistent = true
+[expand/expand]
 path = value.country
-[expand/combine/URLConnect]
-url = https://ws-loterre.sandbox.istex.fr/9SD/combine
-timeout = env('timeout', 5000)
+size = 10
+cacheName = loterre
+
+[expand/expand/URLConnect]
+url = https://loterre-resolvers.services.inist.fr/v1/9SD/expand
+timeout = 10000
 
 # --------- Selection des informations loterre à conserver
-[expand/combine/replace]
+[expand/expand/replace]
 path = id
 value = get('id')
 
diff --git a/affiliations-tools/v1/netscity/expand.ini b/affiliations-tools/v1/netscity/expand.ini
index fec16d5..06b7a59 100644
--- a/affiliations-tools/v1/netscity/expand.ini
+++ b/affiliations-tools/v1/netscity/expand.ini
@@ -25,9 +25,9 @@
 
 [combine]
 path = env('path', 'value')
-primer = ./netscity.csv
+primer = ./v1/netscity/netscity.csv
 prepend = files
-file = ./netscity-enrichments.ini
+file = ./v1/netscity/netscity-enrichments.ini
 persistent = true
 
 [dump]
diff --git a/affiliations-tools/v1/netscity/netscity-enrichments.ini b/affiliations-tools/v1/netscity/netscity-enrichments.ini
index 826b78c..b405bb7 100644
--- a/affiliations-tools/v1/netscity/netscity-enrichments.ini
+++ b/affiliations-tools/v1/netscity/netscity-enrichments.ini
@@ -30,7 +30,7 @@
 primer = get('bufferID')
 prepend = buffers
 append = transit
-file = ./netscity-cities.ini
+file = ./v1/netscity/netscity-cities.ini
 persistent = true
 
 [assign]