diff --git a/biblio-tools/v1/crossref/expand.ini b/biblio-tools/v1/crossref/expand.ini
new file mode 100644
index 0000000..b6d1d2d
--- /dev/null
+++ b/biblio-tools/v1/crossref/expand.ini
@@ -0,0 +1,45 @@
+# Necessary plugins
+[use]
+plugin = basics
+plugin = analytics
+plugin = storage
+
+# Flow configuration
+[JSONParse]
+separator = *
+
+[bufferize]
+
+[combine]
+path = env('path', 'value')
+primer = get('bufferID')
+prepend = buffers
+append = transit
+persistent = true
+
+[combine/exchange]
+value = get('value')
+
+[combine/group]
+size = 100
+
+[combine/replace]
+path = rows
+value = fix(self.length)
+path = filter
+value = self().map(x => 'doi:'.concat(x)).join(',')
+
+# see https://github.com/CrossRef/rest-api-doc#api-overview
+[combine/URLStream]
+url  = https://api.crossref.org/works
+path = .items.*
+timeout = 30000
+
+[combine/replace]
+path = id
+value = get('DOI')
+path = value
+value = self()
+
+[dump]
+indent = env('indent', false)
diff --git a/biblio-tools/v1/unpaywall/README.md b/biblio-tools/v1/unpaywall/README.md
new file mode 100644
index 0000000..04c2ef4
--- /dev/null
+++ b/biblio-tools/v1/unpaywall/README.md
@@ -0,0 +1,54 @@
+# Web service d'extraction de terms "clés" - Teeft - pour des textes en Français
+
+Exemple d'utilisation :
+
+```bash
+ 
+cat <<EOF |jq .|curl -N --proxy "" -X POST --data-binary @- "http://localhost:31976/is_oa/expand?indent=true"
+[
+     { "value": "10.1016/j.fuel.2018.07.071"},
+     { "value": "10.1007/s10980-018-0699-8"},
+     { "value": "10.1159/000490004"},
+     { "value": "10.5004/dwt.2018.22303"},
+     { "value": "10.1039/c8ta04267e"},
+     { "value": "10.1186/s40517-018-0104-5"},
+     { "value": "10.1021/acs.cgd.8b00170"},
+     { "value": "10.3390/ma11081335"},
+     { "value": "10.1002/pssa.201700946"},
+     { "value": "10.1214/17-AOS1640"},
+     { "value": "10.1038/s41598-018-31574-4"},
+     { "value": "10.1093/treephys/tpy054"},
+     { "value": "10.1126/sciadv.aat2355"},
+     { "value": "10.5541/ijot.286022"},
+     { "value": "10.1098/rsos.180510"},
+     { "value": "10.1007/s11356-017-9377-7"},
+     { "value": "10.1111/nph.15376"},
+     { "value": "10.5194/nhess-18-2221-2018"},
+     { "value": "10.1177/0959683618771496"},
+     { "value": "10.21577/0100-4042.20170242"},
+     { "value": "10.1080/09593330.2017.1354075"},
+     { "value": "10.1371/journal.pone.0200901"},
+     { "value": "10.1242/jeb.182170"},
+     { "value": "10.3232/SJSS.2018.V8.N2.02"},
+     { "value": "10.1299/jfst.2018jfst0002"},
+     { "value": "10.1061/(ASCE)WR.1943-5452.0000974"},
+     { "value": "10.1166/mat.2018.1547"},
+     { "value": "10.21163/GT_2018.131.02"},
+     { "value": "10.1002/kin.21181"},
+     { "value": "10.3917/jie.pr1.0033"},
+     { "value": "10.1021/acs.macromol.8b00378"},
+     { "value": "10.1063/1.5039202"},
+     { "value": "10.1049/iet-gtd.2017.1197"},
+     { "value": "10.2478/bgeo-2018-0002"},
+     { "value": "10.1016/j.simpat.2018.05.005"},
+     { "value": "10.1021/acsami.8b04753"},
+     { "value": "10.1111/cea.13139"},
+     { "value": "10.1049/iet-rpg.2017.0342"},
+     { "value": "10.1130/G40005.1"},
+     { "value": "10.1007/s11356-017-9123-1"}
+]
+EOF
+```
+
+
+
diff --git a/biblio-tools/v1/unpaywall/examples.http b/biblio-tools/v1/unpaywall/examples.http
new file mode 100644
index 0000000..386d994
--- /dev/null
+++ b/biblio-tools/v1/unpaywall/examples.http
@@ -0,0 +1,13 @@
+# These examples can be used directly in VSCode, using REST Client extension (humao.rest-client)
+
+POST https://bibliographic-enrichment.services.inist.fr/v1/unpaywall/is_oa?indent=true HTTP/1.1
+Content-Type: application/json
+
+[
+  { "value": "10.1016/j.fuel.2018.07.071" },
+  { "value": "10.1007/s10980-018-0699-8" },
+  { "value": "10.1159/000490004" },
+  { "value": "10.1016/j.memsci.2018.08.024"
+]
+
+###
diff --git a/biblio-tools/v1/unpaywall/is_oa.ini b/biblio-tools/v1/unpaywall/is_oa.ini
new file mode 100644
index 0000000..2bf4385
--- /dev/null
+++ b/biblio-tools/v1/unpaywall/is_oa.ini
@@ -0,0 +1,76 @@
+# Necessary plugins
+[use]
+plugin = basics
+plugin = analytics
+plugin = storage
+
+# Flow configuration
+[JSONParse]
+separator = *
+
+[env]
+path = size
+value = 10
+
+path = indent
+value = true
+
+
+# Pour traiter par lot on groupe puis on utilise spawn qui crée un buffer par lot
+[group]
+size = env('size')
+
+[spawn]
+[spawn/ungroup]
+[spawn/bufferize]
+
+# On réalise un mapping dynamique sur le champ value (et on sauvegarde les correspondances trouvées)
+[spawn/combine]
+path = value
+default = n/a
+primer = get('bufferID')
+prepend = buffers
+append = transit
+persistent = true
+
+[spawn/combine/group]
+size = env('size')
+
+[spawn/combine/replace]
+path = dois
+value = self().map('value').map(x => JSON.stringify(x)).join(',')
+
+# On crée un objet contenant tous les valeurs nécessaire pour créer une requete
+[spawn/combine/replace]
+path = query
+value = fix('{getDataUPW(dois:[', self.dois, ']){doi, is_oa}}').join('')
+
+[spawn/combine/URLStream]
+url = https://unpaywall.inist.fr/graphql
+path = data.getDataUPW.*
+timeout = 5000
+noerror = true
+
+# On supprime les réponses qui n'ont pas abouties (
+[spawn/combine/drop]
+path = is_oa
+
+# On créé l'object attendu par combine { id, value } pour faire le mapping
+[spawn/combine/replace]
+path = id
+value = get('doi')
+
+path = value
+value = get('is_oa', 'n/a')
+
+# On nettoie l'objet en supprimant les champs temporaires
+[spawn/exchange]
+value = self().omit('bufferID')
+
+# On simplifie la structure
+[assign]
+path = value
+value = get('value.value', self.value)
+
+[dump]
+indent = env('indent')
diff --git a/bibliographic-enrichment/v1/crossref/expand.ini b/bibliographic-enrichment/v1/crossref/expand.ini
deleted file mode 100644
index b6d1d2d..0000000
--- a/bibliographic-enrichment/v1/crossref/expand.ini
+++ /dev/null
@@ -1,45 +0,0 @@
-# Necessary plugins
-[use]
-plugin = basics
-plugin = analytics
-plugin = storage
-
-# Flow configuration
-[JSONParse]
-separator = *
-
-[bufferize]
-
-[combine]
-path = env('path', 'value')
-primer = get('bufferID')
-prepend = buffers
-append = transit
-persistent = true
-
-[combine/exchange]
-value = get('value')
-
-[combine/group]
-size = 100
-
-[combine/replace]
-path = rows
-value = fix(self.length)
-path = filter
-value = self().map(x => 'doi:'.concat(x)).join(',')
-
-# see https://github.com/CrossRef/rest-api-doc#api-overview
-[combine/URLStream]
-url  = https://api.crossref.org/works
-path = .items.*
-timeout = 30000
-
-[combine/replace]
-path = id
-value = get('DOI')
-path = value
-value = self()
-
-[dump]
-indent = env('indent', false)
diff --git a/bibliographic-enrichment/v1/unpaywall/README.md b/bibliographic-enrichment/v1/unpaywall/README.md
deleted file mode 100644
index 04c2ef4..0000000
--- a/bibliographic-enrichment/v1/unpaywall/README.md
+++ /dev/null
@@ -1,54 +0,0 @@
-# Web service d'extraction de terms "clés" - Teeft - pour des textes en Français
-
-Exemple d'utilisation :
-
-```bash
- 
-cat <<EOF |jq .|curl -N --proxy "" -X POST --data-binary @- "http://localhost:31976/is_oa/expand?indent=true"
-[
-     { "value": "10.1016/j.fuel.2018.07.071"},
-     { "value": "10.1007/s10980-018-0699-8"},
-     { "value": "10.1159/000490004"},
-     { "value": "10.5004/dwt.2018.22303"},
-     { "value": "10.1039/c8ta04267e"},
-     { "value": "10.1186/s40517-018-0104-5"},
-     { "value": "10.1021/acs.cgd.8b00170"},
-     { "value": "10.3390/ma11081335"},
-     { "value": "10.1002/pssa.201700946"},
-     { "value": "10.1214/17-AOS1640"},
-     { "value": "10.1038/s41598-018-31574-4"},
-     { "value": "10.1093/treephys/tpy054"},
-     { "value": "10.1126/sciadv.aat2355"},
-     { "value": "10.5541/ijot.286022"},
-     { "value": "10.1098/rsos.180510"},
-     { "value": "10.1007/s11356-017-9377-7"},
-     { "value": "10.1111/nph.15376"},
-     { "value": "10.5194/nhess-18-2221-2018"},
-     { "value": "10.1177/0959683618771496"},
-     { "value": "10.21577/0100-4042.20170242"},
-     { "value": "10.1080/09593330.2017.1354075"},
-     { "value": "10.1371/journal.pone.0200901"},
-     { "value": "10.1242/jeb.182170"},
-     { "value": "10.3232/SJSS.2018.V8.N2.02"},
-     { "value": "10.1299/jfst.2018jfst0002"},
-     { "value": "10.1061/(ASCE)WR.1943-5452.0000974"},
-     { "value": "10.1166/mat.2018.1547"},
-     { "value": "10.21163/GT_2018.131.02"},
-     { "value": "10.1002/kin.21181"},
-     { "value": "10.3917/jie.pr1.0033"},
-     { "value": "10.1021/acs.macromol.8b00378"},
-     { "value": "10.1063/1.5039202"},
-     { "value": "10.1049/iet-gtd.2017.1197"},
-     { "value": "10.2478/bgeo-2018-0002"},
-     { "value": "10.1016/j.simpat.2018.05.005"},
-     { "value": "10.1021/acsami.8b04753"},
-     { "value": "10.1111/cea.13139"},
-     { "value": "10.1049/iet-rpg.2017.0342"},
-     { "value": "10.1130/G40005.1"},
-     { "value": "10.1007/s11356-017-9123-1"}
-]
-EOF
-```
-
-
-
diff --git a/bibliographic-enrichment/v1/unpaywall/examples.http b/bibliographic-enrichment/v1/unpaywall/examples.http
deleted file mode 100644
index 386d994..0000000
--- a/bibliographic-enrichment/v1/unpaywall/examples.http
+++ /dev/null
@@ -1,13 +0,0 @@
-# These examples can be used directly in VSCode, using REST Client extension (humao.rest-client)
-
-POST https://bibliographic-enrichment.services.inist.fr/v1/unpaywall/is_oa?indent=true HTTP/1.1
-Content-Type: application/json
-
-[
-  { "value": "10.1016/j.fuel.2018.07.071" },
-  { "value": "10.1007/s10980-018-0699-8" },
-  { "value": "10.1159/000490004" },
-  { "value": "10.1016/j.memsci.2018.08.024"
-]
-
-###
diff --git a/bibliographic-enrichment/v1/unpaywall/is_oa.ini b/bibliographic-enrichment/v1/unpaywall/is_oa.ini
deleted file mode 100644
index 2bf4385..0000000
--- a/bibliographic-enrichment/v1/unpaywall/is_oa.ini
+++ /dev/null
@@ -1,76 +0,0 @@
-# Necessary plugins
-[use]
-plugin = basics
-plugin = analytics
-plugin = storage
-
-# Flow configuration
-[JSONParse]
-separator = *
-
-[env]
-path = size
-value = 10
-
-path = indent
-value = true
-
-
-# Pour traiter par lot on groupe puis on utilise spawn qui crée un buffer par lot
-[group]
-size = env('size')
-
-[spawn]
-[spawn/ungroup]
-[spawn/bufferize]
-
-# On réalise un mapping dynamique sur le champ value (et on sauvegarde les correspondances trouvées)
-[spawn/combine]
-path = value
-default = n/a
-primer = get('bufferID')
-prepend = buffers
-append = transit
-persistent = true
-
-[spawn/combine/group]
-size = env('size')
-
-[spawn/combine/replace]
-path = dois
-value = self().map('value').map(x => JSON.stringify(x)).join(',')
-
-# On crée un objet contenant tous les valeurs nécessaire pour créer une requete
-[spawn/combine/replace]
-path = query
-value = fix('{getDataUPW(dois:[', self.dois, ']){doi, is_oa}}').join('')
-
-[spawn/combine/URLStream]
-url = https://unpaywall.inist.fr/graphql
-path = data.getDataUPW.*
-timeout = 5000
-noerror = true
-
-# On supprime les réponses qui n'ont pas abouties (
-[spawn/combine/drop]
-path = is_oa
-
-# On créé l'object attendu par combine { id, value } pour faire le mapping
-[spawn/combine/replace]
-path = id
-value = get('doi')
-
-path = value
-value = get('is_oa', 'n/a')
-
-# On nettoie l'objet en supprimant les champs temporaires
-[spawn/exchange]
-value = self().omit('bufferID')
-
-# On simplifie la structure
-[assign]
-path = value
-value = get('value.value', self.value)
-
-[dump]
-indent = env('indent')