diff --git a/UD_any/tokenizer/tokenizer.cla b/UD_any/tokenizer/tokenizer.cla
index 4e6ce0fe9a93a2bb1176ede9cc28122533783990..cdd5a2ef8235dc0fd7e6043a4adda666f1273713 100644
--- a/UD_any/tokenizer/tokenizer.cla
+++ b/UD_any/tokenizer/tokenizer.cla
@@ -1,7 +1,7 @@
 Name : Tokenizer
 Type : Prediction
 Oracle : tokenizer
-Feature Model : tokenizer.fm
+Feature Model : data/feature_models/tokenizer.fm
 Action Set : data/tokenizer.as
 Topology : (500,RELU,0.3)
 Dynamic : no
diff --git a/UD_any/tokenizer/tokenizer.fm b/UD_any/tokenizer/tokenizer.fm
deleted file mode 100644
index 6ca04d6b132aa8204c283feb084c88ad1969e609..0000000000000000000000000000000000000000
--- a/UD_any/tokenizer/tokenizer.fm
+++ /dev/null
@@ -1,30 +0,0 @@
-# Features classiques
-# FORM
-b.0#FORM.fasttext
-b.-1#FORM.fasttext
-b.-2#FORM.fasttext
-# UPPERCASE
-b.0#FORM.U
-# UPPERCASE
-b.0#FORM.LEN
-# SUFFIXES
-b.0#FORM.PART.-4.-4
-b.0#FORM.PART.-3.-3
-b.0#FORM.PART.-2.-2
-b.0#FORM.PART.-1.-1
-b.0#FORM.PART.0.0
-b.0#FORM.PART.1.1
-b.0#FORM.PART.2.2
-b.0#FORM.PART.3.3
-# RAW INPUT
-raw.-5
-raw.-4
-raw.-3
-raw.-2
-raw.-1
-raw.0
-raw.2
-raw.3
-raw.4
-raw.5
-raw.6
diff --git a/UD_any/tokeparser/lemmatizer_case.cla b/UD_any/tokeparser/lemmatizer_case.cla
index 84a2b28578fec3ed06819881b6d6b2fd34639928..0994d40c10be7705854b52504754c3d6bf9a1a3b 100644
--- a/UD_any/tokeparser/lemmatizer_case.cla
+++ b/UD_any/tokeparser/lemmatizer_case.cla
@@ -1,7 +1,7 @@
 Name : Lemmatizer_Case
 Type : Prediction
 Oracle : lemma_case
-Feature Model : lemmatizer_case.fm
+Feature Model : data/feature_models/lemmatizer_rules.fm
 Action Set : data/lemmatizer_case.as
 Topology : (100,RELU,0.1)
 Dynamic : yes
diff --git a/UD_any/tokeparser/lemmatizer_case.fm b/UD_any/tokeparser/lemmatizer_case.fm
deleted file mode 100644
index 3712709614d7e967f252633965e943485589a566..0000000000000000000000000000000000000000
--- a/UD_any/tokeparser/lemmatizer_case.fm
+++ /dev/null
@@ -1,13 +0,0 @@
-# Features classiques
-b.0#POS
-b.0#MORPHO
-b.0#FORM
-# Suffixes 
-b.0#FORM.PART.-4.-4
-b.0#FORM.PART.-3.-3
-b.0#FORM.PART.-2.-2
-b.0#FORM.PART.-1.-1
-b.0#FORM.PART.0.0
-b.0#FORM.PART.1.1
-b.0#FORM.PART.2.2
-b.0#FORM.PART.3.3
diff --git a/UD_any/tokeparser/lemmatizer_rules.cla b/UD_any/tokeparser/lemmatizer_rules.cla
index df6917cfab9ccfbc514d3d07748bc2dfcbb8dc67..9b59b622f3120d5a6df4bb24a15d1a2d371129ba 100644
--- a/UD_any/tokeparser/lemmatizer_rules.cla
+++ b/UD_any/tokeparser/lemmatizer_rules.cla
@@ -1,7 +1,7 @@
 Name : Lemmatizer_Rules
 Type : Prediction
 Oracle : lemma_rules
-Feature Model : lemmatizer_rules.fm
+Feature Model : data/feature_models/lemmatizer_rules.fm
 Action Set : data/lemmatizer_rules.as
 Topology : (500,RELU,0.3)
 Dynamic : yes
diff --git a/UD_any/tokeparser/lemmatizer_rules.fm b/UD_any/tokeparser/lemmatizer_rules.fm
deleted file mode 100644
index 8a54c13dbccb8b8566934093d76bac011374421a..0000000000000000000000000000000000000000
--- a/UD_any/tokeparser/lemmatizer_rules.fm
+++ /dev/null
@@ -1,16 +0,0 @@
-# Features classiques
-b.0#POS
-b.0#MORPHO
-b.0#FORM
-b.-1#POS
-b.-1#MORPHO
-b.-1#FORM
-# Suffixes 
-b.0#FORM.PART.-4.-4
-b.0#FORM.PART.-3.-3
-b.0#FORM.PART.-2.-2
-b.0#FORM.PART.-1.-1
-b.0#FORM.PART.0.0
-b.0#FORM.PART.1.1
-b.0#FORM.PART.2.2
-b.0#FORM.PART.3.3
diff --git a/UD_any/tokeparser/morpho.cla b/UD_any/tokeparser/morpho.cla
index 83e9e8178d7339a82eb9f3f8f6ef40e3094cff6e..024d1e99d8541dff950adbccbcd8ae50362e6dd9 100644
--- a/UD_any/tokeparser/morpho.cla
+++ b/UD_any/tokeparser/morpho.cla
@@ -1,7 +1,7 @@
 Name : Morpho
 Type : Prediction
 Oracle : morpho
-Feature Model : morpho.fm
+Feature Model : data/feature_models/morpho_nofuture.fm
 Action Set : data/morpho_parts.as
 Topology : (500,RELU,0.3)
 Dynamic : yes
diff --git a/UD_any/tokeparser/morpho.fm b/UD_any/tokeparser/morpho.fm
deleted file mode 100644
index 396abfe5ec4b7edee5726f79ebb5ac92f413d2cc..0000000000000000000000000000000000000000
--- a/UD_any/tokeparser/morpho.fm
+++ /dev/null
@@ -1,39 +0,0 @@
-# Features classiques
-# FORM
-b.0#FORM.fasttext
-b.1#FORM.fasttext
-b.2#FORM.fasttext
-b.-1#FORM.fasttext
-b.-2#FORM.fasttext
-# POS
-b.0#POS
-b.-1#POS
-b.-2#POS
-b.-3#POS
-# MORPHO
-b.0#MORPHO
-b.-1#MORPHO
-b.-2#MORPHO
-# UPPERCASE
-b.0#FORM.U
-b.1#FORM.U
-# LENGTH
-b.0#FORM.LEN
-# SUFFIXES
-b.0#FORM.PART.-4.-4
-b.0#FORM.PART.-3.-3
-b.0#FORM.PART.-2.-2
-b.0#FORM.PART.-1.-1
-b.0#FORM.PART.0.0
-b.0#FORM.PART.1.1
-b.0#FORM.PART.2.2
-b.0#FORM.PART.3.3
-# ERROR CORRECTION
-#b.1#POS
-#b.1#MORPHO
-#b.2#POS
-#b.2#MORPHO
-#b.3#POS
-#b.3#MORPHO
-#b.4#POS
-#b.4#MORPHO
diff --git a/UD_any/tokeparser/parser.cla b/UD_any/tokeparser/parser.cla
index b3b31dd3d0dfe0cefa1964d7cf4486af997d6817..77714bee6a35fd391bea92997f34e1f63536a530 100644
--- a/UD_any/tokeparser/parser.cla
+++ b/UD_any/tokeparser/parser.cla
@@ -1,7 +1,7 @@
 Name : Parser
 Type : Prediction
 Oracle : parser
-Feature Model : parser.fm
+Feature Model : data/feature_models/parser_nofuture.fm
 Action Set : data/parser.as
 Topology : (500,RELU,0.3)
 Dynamic : yes
diff --git a/UD_any/tokeparser/parser.fm b/UD_any/tokeparser/parser.fm
deleted file mode 100644
index d29a6a85e05571f1edf7b25303d9841be5489d32..0000000000000000000000000000000000000000
--- a/UD_any/tokeparser/parser.fm
+++ /dev/null
@@ -1,122 +0,0 @@
-# Features classiques
-# FORM
-s.0#LEMMA.fasttext
-s.1#LEMMA.fasttext
-s.2#LEMMA.fasttext
-s.0.ldep#LEMMA.fasttext
-s.1.ldep#LEMMA.fasttext
-s.0.rdep#LEMMA.fasttext
-s.1.rdep#LEMMA.fasttext
-s.0.ldep.ldep#LEMMA.fasttext
-s.1.ldep.ldep#LEMMA.fasttext
-s.0.rdep.rdep#LEMMA.fasttext
-s.1.rdep.rdep#LEMMA.fasttext
-s.0.l2dep#LEMMA.fasttext
-s.1.l2dep#LEMMA.fasttext
-s.0.r2dep#LEMMA.fasttext
-s.1.r2dep#LEMMA.fasttext
-b.0#LEMMA.fasttext
-b.-1#LEMMA.fasttext
-b.-2#LEMMA.fasttext
-b.0.ldep#LEMMA.fasttext
-b.1#FORM.fasttext
-b.2#FORM.fasttext
-# POS
-s.0#POS
-s.1#POS
-s.2#POS
-s.0.ldep#POS
-s.1.ldep#POS
-s.0.rdep#POS
-s.1.rdep#POS
-s.0.ldep.ldep#POS
-s.1.ldep.ldep#POS
-s.0.rdep.rdep#POS
-s.1.rdep.rdep#POS
-s.0.l2dep#POS
-s.1.l2dep#POS
-s.0.r2dep#POS
-s.1.r2dep#POS
-b.0#POS
-b.-1#POS
-b.-2#POS
-b.0.ldep#POS
-b.-1.gov#POS
-s.0.gov#POS
-s.1.gov#POS
-# MORPHO
-s.0#MORPHO
-s.1#MORPHO
-s.2#MORPHO
-s.0.ldep#MORPHO
-s.1.ldep#MORPHO
-s.0.rdep#MORPHO
-s.1.rdep#MORPHO
-s.0.ldep.ldep#MORPHO
-s.1.ldep.ldep#MORPHO
-s.0.rdep.rdep#MORPHO
-s.1.rdep.rdep#MORPHO
-s.0.l2dep#MORPHO
-s.1.l2dep#MORPHO
-s.0.r2dep#MORPHO
-s.1.r2dep#MORPHO
-b.0#MORPHO
-b.-1#MORPHO
-b.-2#MORPHO
-b.0.ldep#MORPHO
-s.1.gov#MORPHO
-b.-1.gov#MORPHO
-s.0.gov#MORPHO
-# LABELS
-s.0.ldep#LABEL
-s.1.ldep#LABEL
-s.0.rdep#LABEL
-s.1.rdep#LABEL
-s.0.ldep.ldep#LABEL
-s.1.ldep.ldep#LABEL
-s.0.rdep.rdep#LABEL
-s.1.rdep.rdep#LABEL
-s.0.l2dep#LABEL
-s.1.l2dep#LABEL
-s.0.r2dep#LABEL
-s.1.r2dep#LABEL
-b.0.ldep#LABEL
-b.-2#LABEL
-b.-1#LABEL
-b.0#LABEL
-s.0#LABEL
-s.1#LABEL
-# DISTANCE
-s.0#DIST.s.1
-b.0#DIST.s.0
-# VALENCY
-s.0#nbr
-s.1#nbr
-s.0#nbl
-s.1#nbl
-# UPPERCASE
-b.0#FORM.U
-b.1#FORM.U
-# EOS
-b.-1#EOS
-# HISTORY
-tc.0
-tc.1
-tc.2
-tc.3
-tc.4
-# ERROR CORRECTION
-#b.1.ldep#LEMMA.fasttext
-#b.1.ldep#POS
-#b.1.ldep#MORPHO
-#b.1.ldep#LABEL
-#b.1#LABEL
-#b.1.gov#POS
-#b.1.gov#MORPHO
-#b.2.ldep#LEMMA.fasttext
-#b.2.ldep#POS
-#b.2.ldep#MORPHO
-#b.2.ldep#LABEL
-#b.2#LABEL
-#b.2.gov#POS
-#b.2.gov#MORPHO
diff --git a/UD_any/tokeparser/parser_gold.cla b/UD_any/tokeparser/parser_gold.cla
deleted file mode 100644
index af36775f7ace7268bc19391d9de0e59c0d1d3570..0000000000000000000000000000000000000000
--- a/UD_any/tokeparser/parser_gold.cla
+++ /dev/null
@@ -1,4 +0,0 @@
-Name : Parser_Gold
-Type : Information
-Oracle : parser_gold
-Oracle Filename : parser.as
diff --git a/UD_any/tokeparser/tagger.cla b/UD_any/tokeparser/tagger.cla
index 58c70381efeaa368293d568fc767a34b57ab08e7..c98cb92ba6c11bf9f893f23e4522b2682bfde843 100644
--- a/UD_any/tokeparser/tagger.cla
+++ b/UD_any/tokeparser/tagger.cla
@@ -1,7 +1,7 @@
 Name : Tagger
 Type : Prediction
 Oracle : tagger
-Feature Model : tagger.fm
+Feature Model : data/feature_models/tagger_nofuture.fm
 Action Set : data/tagger.as
 Topology : (500,RELU,0.3)
 Dynamic : yes
diff --git a/UD_any/tokeparser/tagger.fm b/UD_any/tokeparser/tagger.fm
deleted file mode 100644
index fc3a6ea3a18ca44214dd24bdc342272463eea33d..0000000000000000000000000000000000000000
--- a/UD_any/tokeparser/tagger.fm
+++ /dev/null
@@ -1,30 +0,0 @@
-# Features classiques
-# FORM
-b.0#FORM.fasttext
-b.1#FORM.fasttext
-b.2#FORM.fasttext
-b.-1#FORM.fasttext
-b.-2#FORM.fasttext
-# POS
-b.-1#POS
-b.-2#POS
-b.-3#POS
-# UPPERCASE
-b.0#FORM.U
-b.1#FORM.U
-# UPPERCASE
-b.0#FORM.LEN
-# SUFFIXES
-b.0#FORM.PART.-4.-4
-b.0#FORM.PART.-3.-3
-b.0#FORM.PART.-2.-2
-b.0#FORM.PART.-1.-1
-b.0#FORM.PART.0.0
-b.0#FORM.PART.1.1
-b.0#FORM.PART.2.2
-b.0#FORM.PART.3.3
-# ERROR CORRECTION
-#b.1#POS
-#b.2#POS
-#b.3#POS
-#b.4#POS
diff --git a/UD_any/tokeparser/tokenizer.cla b/UD_any/tokeparser/tokenizer.cla
index 4e6ce0fe9a93a2bb1176ede9cc28122533783990..cdd5a2ef8235dc0fd7e6043a4adda666f1273713 100644
--- a/UD_any/tokeparser/tokenizer.cla
+++ b/UD_any/tokeparser/tokenizer.cla
@@ -1,7 +1,7 @@
 Name : Tokenizer
 Type : Prediction
 Oracle : tokenizer
-Feature Model : tokenizer.fm
+Feature Model : data/feature_models/tokenizer.fm
 Action Set : data/tokenizer.as
 Topology : (500,RELU,0.3)
 Dynamic : no
diff --git a/UD_any/tokeparser/tokenizer.fm b/UD_any/tokeparser/tokenizer.fm
deleted file mode 100644
index 6ca04d6b132aa8204c283feb084c88ad1969e609..0000000000000000000000000000000000000000
--- a/UD_any/tokeparser/tokenizer.fm
+++ /dev/null
@@ -1,30 +0,0 @@
-# Features classiques
-# FORM
-b.0#FORM.fasttext
-b.-1#FORM.fasttext
-b.-2#FORM.fasttext
-# UPPERCASE
-b.0#FORM.U
-# UPPERCASE
-b.0#FORM.LEN
-# SUFFIXES
-b.0#FORM.PART.-4.-4
-b.0#FORM.PART.-3.-3
-b.0#FORM.PART.-2.-2
-b.0#FORM.PART.-1.-1
-b.0#FORM.PART.0.0
-b.0#FORM.PART.1.1
-b.0#FORM.PART.2.2
-b.0#FORM.PART.3.3
-# RAW INPUT
-raw.-5
-raw.-4
-raw.-3
-raw.-2
-raw.-1
-raw.0
-raw.2
-raw.3
-raw.4
-raw.5
-raw.6