diff --git a/.gut/delta.toml b/.gut/delta.toml
index b1082263..45c3140d 100644
--- a/.gut/delta.toml
+++ b/.gut/delta.toml
@@ -1,6 +1,6 @@
 template = "https://github.com/giellalt/template-lang-und"
-rev_id = 162
-template_sha = "72e0484a46ee787ac0c21dde10da1714de8e9a70"
+rev_id = 163
+template_sha = "20cdf7c398632f9e4bcf107488ca294f4cc34e1f"
 
 [replacements]
 __REPO__ = "lang-fao"
diff --git a/devtools/generate-adj-wordforms.sh b/devtools/generate-adj-wordforms.sh
index 6d71c64b..5c96ff7a 100755
--- a/devtools/generate-adj-wordforms.sh
+++ b/devtools/generate-adj-wordforms.sh
@@ -88,13 +88,13 @@ morf_codes="+A+Msc+Sg+Nom+Indef		   \
             +A+Superl+Neu+Pl+Nom+Def"
 
 # Lexicon source file for lexicons and lemmas:
-source_file=src/fst/stems/adjectives.lexc
+source_file=src/fst/morphology/stems/adjectives.lexc
 
 # Lexicons that should NOT be used to extract lemmas (egrep expression):
 exception_lexicons="(flagK)"
 
 # FST used for generation, MINUS suffix:
-generator_file=src/generator-gt-norm
+generator_file=src/fst/generator-gt-norm
 
 # How many lemmas maximally for each lexicon:
 lemmacount=2
diff --git a/devtools/generate-fem-wordforms.sh b/devtools/generate-fem-wordforms.sh
index 82a97640..c98529b9 100755
--- a/devtools/generate-fem-wordforms.sh
+++ b/devtools/generate-fem-wordforms.sh
@@ -35,13 +35,13 @@ morf_codes="+N+Fem+Sg+Nom+Indef \
             +N+Fem+Pl+Dat+Def"
 
 # Lexicon source file for lexicons and lemmas:
-source_file=src/fst/stems/nouns.lexc
+source_file=src/fst/morphology/stems/nouns.lexc
 
 # Lexicons that should NOT be used to extract lemmas (egrep expression):
 exception_lexicons="(h[_0-9/].*|k[_0-9].*|k1|k6)"
 
 # FST used for generation, MINUS suffix:
-generator_file=src/generator-gt-norm
+generator_file=src/fst/generator-gt-norm
 
 # How many lemmas maximally for each lexicon:
 lemmacount=2
diff --git a/devtools/generate-msc-wordforms.sh b/devtools/generate-msc-wordforms.sh
index ffd54508..04eebb43 100755
--- a/devtools/generate-msc-wordforms.sh
+++ b/devtools/generate-msc-wordforms.sh
@@ -35,13 +35,13 @@ morf_codes="+N+Msc+Sg+Nom+Indef \
             +N+Msc+Pl+Dat+Def"
 
 # Lexicon source file for lexicons and lemmas:
-source_file=src/fst/stems/nouns.lexc
+source_file=src/fst/morphology/stems/nouns.lexc
 
 # Lexicons that should NOT be used to extract lemmas (egrep expression):
 exception_lexicons="(h[_0-9]|kv[_0-9])"
 
 # FST used for generation, MINUS suffix:
-generator_file=src/generator-gt-norm
+generator_file=src/fst/generator-gt-norm
 
 # How many lemmas maximally for each lexicon:
 lemmacount=2
diff --git a/devtools/generate-neu-wordforms.sh b/devtools/generate-neu-wordforms.sh
index 4dd5cae0..0251be76 100755
--- a/devtools/generate-neu-wordforms.sh
+++ b/devtools/generate-neu-wordforms.sh
@@ -35,13 +35,13 @@ morf_codes="+N+Neu+Sg+Nom+Indef \
             +N+Neu+Pl+Dat+Def"
 
 # Lexicon source file for lexicons and lemmas:
-source_file=src/fst/stems/nouns.lexc
+source_file=src/fst/morphology/stems/nouns.lexc
 
 # Lexicons that should NOT be used to extract lemmas (egrep expression):
 exception_lexicons="(kv[_0-9]|kv[0-9[0-9]|k[_0-9])"
 
 # FST used for generation, MINUS suffix:
-generator_file=src/generator-gt-norm
+generator_file=src/fst/generator-gt-norm
 
 # How many lemmas maximally for each lexicon:
 lemmacount=2
diff --git a/devtools/generate-prop-wordforms.sh b/devtools/generate-prop-wordforms.sh
index de255ae7..2272a528 100755
--- a/devtools/generate-prop-wordforms.sh
+++ b/devtools/generate-prop-wordforms.sh
@@ -25,13 +25,13 @@ morf_codes="+N+Prop+Sg+Nom \
             +N+Prop+Sg+Dat"
 
 # Lexicon source file for lexicons and lemmas:
-source_file=src/fst/stems/propernouns.lexc
+source_file=src/fst/morphology/stems/propernouns.lexc
 
 # Lexicons that should NOT be used to extract lemmas (egrep expression):
 exception_lexicons="(flagK)"
 
 # FST used for generation, MINUS suffix:
-generator_file=src/generator-gt-norm
+generator_file=src/fst/generator-gt-norm
 
 # How many lemmas maximally for each lexicon:
 lemmacount=10
diff --git a/devtools/generate-verb-wordforms.sh b/devtools/generate-verb-wordforms.sh
index dd965304..74bc7c09 100755
--- a/devtools/generate-verb-wordforms.sh
+++ b/devtools/generate-verb-wordforms.sh
@@ -43,13 +43,13 @@ morf_codes="+V+Inf \
             +V+PrfPtc+Fem+Sg+Dat+Def"
 
 # Lexicon source file for lexicons and lemmas:
-source_file=src/fst/stems/verbs.lexc
+source_file=src/fst/morphology/stems/verbs.lexc
 
 # Lexicons that should NOT be used to extract lemmas (egrep expression):
 exception_lexicons="(flagK)"
 
 # FST used for generation, MINUS suffix:
-generator_file=src/generator-gt-norm
+generator_file=src/fst/generator-gt-norm
 
 # How many lemmas maximally for each lexicon:
 lemmacount=2