diff --git a/Links.md b/Links.md
index 7491f10..ec631ae 100644
--- a/Links.md
+++ b/Links.md
@@ -2,28 +2,19 @@
* `cg3/`
* [functions.cg3](src-cg3-functions.cg3.html) ([src](https://github.com/giellalt/lang-inp/blob/main/src/cg3/functions.cg3))
* `fst/`
- * `affixes/`
- * [adjectives.lexc](src-fst-affixes-adjectives.lexc.html) ([src](https://github.com/giellalt/lang-inp/blob/main/src/fst/affixes/adjectives.lexc))
- * [nouns.lexc](src-fst-affixes-nouns.lexc.html) ([src](https://github.com/giellalt/lang-inp/blob/main/src/fst/affixes/nouns.lexc))
- * [propernouns.lexc](src-fst-affixes-propernouns.lexc.html) ([src](https://github.com/giellalt/lang-inp/blob/main/src/fst/affixes/propernouns.lexc))
- * [symbols.lexc](src-fst-affixes-symbols.lexc.html) ([src](https://github.com/giellalt/lang-inp/blob/main/src/fst/affixes/symbols.lexc))
- * [verbs.lexc](src-fst-affixes-verbs.lexc.html) ([src](https://github.com/giellalt/lang-inp/blob/main/src/fst/affixes/verbs.lexc))
- * [phonology.twolc](src-fst-phonology.twolc.html) ([src](https://github.com/giellalt/lang-inp/blob/main/src/fst/phonology.twolc))
- * [root.lexc](src-fst-root.lexc.html) ([src](https://github.com/giellalt/lang-inp/blob/main/src/fst/root.lexc))
- * `stems/`
- * [adjectives.lexc](src-fst-stems-adjectives.lexc.html) ([src](https://github.com/giellalt/lang-inp/blob/main/src/fst/stems/adjectives.lexc))
- * [nouns.lexc](src-fst-stems-nouns.lexc.html) ([src](https://github.com/giellalt/lang-inp/blob/main/src/fst/stems/nouns.lexc))
- * [numerals.lexc](src-fst-stems-numerals.lexc.html) ([src](https://github.com/giellalt/lang-inp/blob/main/src/fst/stems/numerals.lexc))
- * [prefixes.lexc](src-fst-stems-prefixes.lexc.html) ([src](https://github.com/giellalt/lang-inp/blob/main/src/fst/stems/prefixes.lexc))
- * [pronouns.lexc](src-fst-stems-pronouns.lexc.html) ([src](https://github.com/giellalt/lang-inp/blob/main/src/fst/stems/pronouns.lexc))
- * [verbs.lexc](src-fst-stems-verbs.lexc.html) ([src](https://github.com/giellalt/lang-inp/blob/main/src/fst/stems/verbs.lexc))
- * `phonetics/`
- * [txt2ipa.xfscript](src-phonetics-txt2ipa.xfscript.html) ([src](https://github.com/giellalt/lang-inp/blob/main/src/phonetics/txt2ipa.xfscript))
- * `transcriptions/`
- * [transcriptor-abbrevs2text.lexc](src-transcriptions-transcriptor-abbrevs2text.lexc.html) ([src](https://github.com/giellalt/lang-inp/blob/main/src/transcriptions/transcriptor-abbrevs2text.lexc))
- * [transcriptor-numbers-digit2text.lexc](src-transcriptions-transcriptor-numbers-digit2text.lexc.html) ([src](https://github.com/giellalt/lang-inp/blob/main/src/transcriptions/transcriptor-numbers-digit2text.lexc))
+ * `morphology/`
+ * `affixes/`
+ * [phonology.twolc](src-fst-morphology-phonology.twolc.html) ([src](https://github.com/giellalt/lang-inp/blob/main/src/fst/morphology/phonology.twolc))
+ * [root.lexc](src-fst-morphology-root.lexc.html) ([src](https://github.com/giellalt/lang-inp/blob/main/src/fst/morphology/root.lexc))
+ * `stems/`
+ * `phonetics/`
+ * [txt2ipa.xfscript](src-fst-phonetics-txt2ipa.xfscript.html) ([src](https://github.com/giellalt/lang-inp/blob/main/src/fst/phonetics/txt2ipa.xfscript))
+ * `transcriptions/`
+ * [transcriptor-abbrevs2text.lexc](src-fst-transcriptions-transcriptor-abbrevs2text.lexc.html) ([src](https://github.com/giellalt/lang-inp/blob/main/src/fst/transcriptions/transcriptor-abbrevs2text.lexc))
+ * [transcriptor-numbers-digit2text.lexc](src-fst-transcriptions-transcriptor-numbers-digit2text.lexc.html) ([src](https://github.com/giellalt/lang-inp/blob/main/src/fst/transcriptions/transcriptor-numbers-digit2text.lexc))
* `tools/`
* `tokenisers/`
* [tokeniser-disamb-gt-desc.pmscript](tools-tokenisers-tokeniser-disamb-gt-desc.pmscript.html) ([src](https://github.com/giellalt/lang-inp/blob/main/tools/tokenisers/tokeniser-disamb-gt-desc.pmscript))
+ * `/`
* [tokeniser-gramcheck-gt-desc.pmscript](tools-tokenisers-tokeniser-gramcheck-gt-desc.pmscript.html) ([src](https://github.com/giellalt/lang-inp/blob/main/tools/tokenisers/tokeniser-gramcheck-gt-desc.pmscript))
* [tokeniser-tts-cggt-desc.pmscript](tools-tokenisers-tokeniser-tts-cggt-desc.pmscript.html) ([src](https://github.com/giellalt/lang-inp/blob/main/tools/tokenisers/tokeniser-tts-cggt-desc.pmscript))
diff --git a/Makefile.in b/Makefile.in
index 3cabc4a..7f1cc1a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -936,7 +936,7 @@ regenerate-markdown: generate-markdown
# Generate endpoint json file for shield.io lemma count badge.
# Only to be stored in the gh-pages branch, ignored in main.
-$(srcdir)/lemmacount.json: $(top_srcdir)/src/fst/stems/*.lexc
+$(srcdir)/lemmacount.json: $(top_srcdir)/src/fst/morphology/stems/*.lexc
$(AM_V_GEN)$(GTCORE)/scripts/make-lemmacount.json.sh $(abs_top_srcdir) > $@
# Generate a maturity.json file as endpoint for the maturity badge.
diff --git a/index.md b/index.md
index 93f9725..36697fa 100644
--- a/index.md
+++ b/index.md
@@ -20,28 +20,19 @@ Below is an autogenerated list of documentation pages built from structured comm
* `cg3/`
* [functions.cg3](src-cg3-functions.cg3.html) ([src](https://github.com/giellalt/lang-inp/blob/main/src/cg3/functions.cg3))
* `fst/`
- * `affixes/`
- * [adjectives.lexc](src-fst-affixes-adjectives.lexc.html) ([src](https://github.com/giellalt/lang-inp/blob/main/src/fst/affixes/adjectives.lexc))
- * [nouns.lexc](src-fst-affixes-nouns.lexc.html) ([src](https://github.com/giellalt/lang-inp/blob/main/src/fst/affixes/nouns.lexc))
- * [propernouns.lexc](src-fst-affixes-propernouns.lexc.html) ([src](https://github.com/giellalt/lang-inp/blob/main/src/fst/affixes/propernouns.lexc))
- * [symbols.lexc](src-fst-affixes-symbols.lexc.html) ([src](https://github.com/giellalt/lang-inp/blob/main/src/fst/affixes/symbols.lexc))
- * [verbs.lexc](src-fst-affixes-verbs.lexc.html) ([src](https://github.com/giellalt/lang-inp/blob/main/src/fst/affixes/verbs.lexc))
- * [phonology.twolc](src-fst-phonology.twolc.html) ([src](https://github.com/giellalt/lang-inp/blob/main/src/fst/phonology.twolc))
- * [root.lexc](src-fst-root.lexc.html) ([src](https://github.com/giellalt/lang-inp/blob/main/src/fst/root.lexc))
- * `stems/`
- * [adjectives.lexc](src-fst-stems-adjectives.lexc.html) ([src](https://github.com/giellalt/lang-inp/blob/main/src/fst/stems/adjectives.lexc))
- * [nouns.lexc](src-fst-stems-nouns.lexc.html) ([src](https://github.com/giellalt/lang-inp/blob/main/src/fst/stems/nouns.lexc))
- * [numerals.lexc](src-fst-stems-numerals.lexc.html) ([src](https://github.com/giellalt/lang-inp/blob/main/src/fst/stems/numerals.lexc))
- * [prefixes.lexc](src-fst-stems-prefixes.lexc.html) ([src](https://github.com/giellalt/lang-inp/blob/main/src/fst/stems/prefixes.lexc))
- * [pronouns.lexc](src-fst-stems-pronouns.lexc.html) ([src](https://github.com/giellalt/lang-inp/blob/main/src/fst/stems/pronouns.lexc))
- * [verbs.lexc](src-fst-stems-verbs.lexc.html) ([src](https://github.com/giellalt/lang-inp/blob/main/src/fst/stems/verbs.lexc))
- * `phonetics/`
- * [txt2ipa.xfscript](src-phonetics-txt2ipa.xfscript.html) ([src](https://github.com/giellalt/lang-inp/blob/main/src/phonetics/txt2ipa.xfscript))
- * `transcriptions/`
- * [transcriptor-abbrevs2text.lexc](src-transcriptions-transcriptor-abbrevs2text.lexc.html) ([src](https://github.com/giellalt/lang-inp/blob/main/src/transcriptions/transcriptor-abbrevs2text.lexc))
- * [transcriptor-numbers-digit2text.lexc](src-transcriptions-transcriptor-numbers-digit2text.lexc.html) ([src](https://github.com/giellalt/lang-inp/blob/main/src/transcriptions/transcriptor-numbers-digit2text.lexc))
+ * `morphology/`
+ * `affixes/`
+ * [phonology.twolc](src-fst-morphology-phonology.twolc.html) ([src](https://github.com/giellalt/lang-inp/blob/main/src/fst/morphology/phonology.twolc))
+ * [root.lexc](src-fst-morphology-root.lexc.html) ([src](https://github.com/giellalt/lang-inp/blob/main/src/fst/morphology/root.lexc))
+ * `stems/`
+ * `phonetics/`
+ * [txt2ipa.xfscript](src-fst-phonetics-txt2ipa.xfscript.html) ([src](https://github.com/giellalt/lang-inp/blob/main/src/fst/phonetics/txt2ipa.xfscript))
+ * `transcriptions/`
+ * [transcriptor-abbrevs2text.lexc](src-fst-transcriptions-transcriptor-abbrevs2text.lexc.html) ([src](https://github.com/giellalt/lang-inp/blob/main/src/fst/transcriptions/transcriptor-abbrevs2text.lexc))
+ * [transcriptor-numbers-digit2text.lexc](src-fst-transcriptions-transcriptor-numbers-digit2text.lexc.html) ([src](https://github.com/giellalt/lang-inp/blob/main/src/fst/transcriptions/transcriptor-numbers-digit2text.lexc))
* `tools/`
* `tokenisers/`
* [tokeniser-disamb-gt-desc.pmscript](tools-tokenisers-tokeniser-disamb-gt-desc.pmscript.html) ([src](https://github.com/giellalt/lang-inp/blob/main/tools/tokenisers/tokeniser-disamb-gt-desc.pmscript))
+ * `/`
* [tokeniser-gramcheck-gt-desc.pmscript](tools-tokenisers-tokeniser-gramcheck-gt-desc.pmscript.html) ([src](https://github.com/giellalt/lang-inp/blob/main/tools/tokenisers/tokeniser-gramcheck-gt-desc.pmscript))
* [tokeniser-tts-cggt-desc.pmscript](tools-tokenisers-tokeniser-tts-cggt-desc.pmscript.html) ([src](https://github.com/giellalt/lang-inp/blob/main/tools/tokenisers/tokeniser-tts-cggt-desc.pmscript))
diff --git a/inp.md b/inp.md
index 0eecb86..d80d5e2 100644
--- a/inp.md
+++ b/inp.md
@@ -175,7 +175,7 @@ The Iñapari language adjectives compare.
* * *
-This (part of) documentation was generated from [src/fst/affixes/adjectives.lexc](https://github.com/giellalt/lang-inp/blob/main/src/fst/affixes/adjectives.lexc)
+This (part of) documentation was generated from [src/fst/morphology/affixes/adjectives.lexc](https://github.com/giellalt/lang-inp/blob/main/src/fst/morphology/affixes/adjectives.lexc)
---
@@ -184,7 +184,7 @@ The Iñapari language nouns inflect in cases.
* * *
-This (part of) documentation was generated from [src/fst/affixes/nouns.lexc](https://github.com/giellalt/lang-inp/blob/main/src/fst/affixes/nouns.lexc)
+This (part of) documentation was generated from [src/fst/morphology/affixes/nouns.lexc](https://github.com/giellalt/lang-inp/blob/main/src/fst/morphology/affixes/nouns.lexc)
---
@@ -194,7 +194,7 @@ nouns, but with a colon (':') as separator.
* * *
-This (part of) documentation was generated from [src/fst/affixes/propernouns.lexc](https://github.com/giellalt/lang-inp/blob/main/src/fst/affixes/propernouns.lexc)
+This (part of) documentation was generated from [src/fst/morphology/affixes/propernouns.lexc](https://github.com/giellalt/lang-inp/blob/main/src/fst/morphology/affixes/propernouns.lexc)
---
@@ -203,7 +203,7 @@ nouns, but with a colon (':') as separator.
* * *
-This (part of) documentation was generated from [src/fst/affixes/symbols.lexc](https://github.com/giellalt/lang-inp/blob/main/src/fst/affixes/symbols.lexc)
+This (part of) documentation was generated from [src/fst/morphology/affixes/symbols.lexc](https://github.com/giellalt/lang-inp/blob/main/src/fst/morphology/affixes/symbols.lexc)
---
@@ -212,7 +212,7 @@ The Iñapari language verbs inflect in persons.
* * *
-This (part of) documentation was generated from [src/fst/affixes/verbs.lexc](https://github.com/giellalt/lang-inp/blob/main/src/fst/affixes/verbs.lexc)
+This (part of) documentation was generated from [src/fst/morphology/affixes/verbs.lexc](https://github.com/giellalt/lang-inp/blob/main/src/fst/morphology/affixes/verbs.lexc)
---
@@ -233,7 +233,7 @@ The Iñapari morphophonological/twolc rules file !
* * *
-This (part of) documentation was generated from [src/fst/phonology.twolc](https://github.com/giellalt/lang-inp/blob/main/src/fst/phonology.twolc)
+This (part of) documentation was generated from [src/fst/morphology/phonology.twolc](https://github.com/giellalt/lang-inp/blob/main/src/fst/morphology/phonology.twolc)
---
@@ -314,7 +314,7 @@ word classes, or optionally from prefixes:
* * *
-This (part of) documentation was generated from [src/fst/root.lexc](https://github.com/giellalt/lang-inp/blob/main/src/fst/root.lexc)
+This (part of) documentation was generated from [src/fst/morphology/root.lexc](https://github.com/giellalt/lang-inp/blob/main/src/fst/morphology/root.lexc)
---
@@ -323,7 +323,7 @@ Adjectives in the Iñapari language describe things.
* * *
-This (part of) documentation was generated from [src/fst/stems/adjectives.lexc](https://github.com/giellalt/lang-inp/blob/main/src/fst/stems/adjectives.lexc)
+This (part of) documentation was generated from [src/fst/morphology/stems/adjectives.lexc](https://github.com/giellalt/lang-inp/blob/main/src/fst/morphology/stems/adjectives.lexc)
---
@@ -332,7 +332,7 @@ Nouns in the Iñapari language are things.
* * *
-This (part of) documentation was generated from [src/fst/stems/nouns.lexc](https://github.com/giellalt/lang-inp/blob/main/src/fst/stems/nouns.lexc)
+This (part of) documentation was generated from [src/fst/morphology/stems/nouns.lexc](https://github.com/giellalt/lang-inp/blob/main/src/fst/morphology/stems/nouns.lexc)
---
@@ -341,7 +341,7 @@ Numerals in the Iñapari language are numbers.
* * *
-This (part of) documentation was generated from [src/fst/stems/numerals.lexc](https://github.com/giellalt/lang-inp/blob/main/src/fst/stems/numerals.lexc)
+This (part of) documentation was generated from [src/fst/morphology/stems/numerals.lexc](https://github.com/giellalt/lang-inp/blob/main/src/fst/morphology/stems/numerals.lexc)
---
@@ -350,7 +350,7 @@ Prefixes in the Iñapari language are bound to beginning of other words.
* * *
-This (part of) documentation was generated from [src/fst/stems/prefixes.lexc](https://github.com/giellalt/lang-inp/blob/main/src/fst/stems/prefixes.lexc)
+This (part of) documentation was generated from [src/fst/morphology/stems/prefixes.lexc](https://github.com/giellalt/lang-inp/blob/main/src/fst/morphology/stems/prefixes.lexc)
---
@@ -359,7 +359,7 @@ Pronouns in the Iñapari language are references to things.
* * *
-This (part of) documentation was generated from [src/fst/stems/pronouns.lexc](https://github.com/giellalt/lang-inp/blob/main/src/fst/stems/pronouns.lexc)
+This (part of) documentation was generated from [src/fst/morphology/stems/pronouns.lexc](https://github.com/giellalt/lang-inp/blob/main/src/fst/morphology/stems/pronouns.lexc)
---
@@ -368,7 +368,7 @@ Verbs in the Iñapari language are actions.
* * *
-This (part of) documentation was generated from [src/fst/stems/verbs.lexc](https://github.com/giellalt/lang-inp/blob/main/src/fst/stems/verbs.lexc)
+This (part of) documentation was generated from [src/fst/morphology/stems/verbs.lexc](https://github.com/giellalt/lang-inp/blob/main/src/fst/morphology/stems/verbs.lexc)
---
@@ -535,7 +535,7 @@ retracted tongue root _q
* * *
-This (part of) documentation was generated from [src/phonetics/txt2ipa.xfscript](https://github.com/giellalt/lang-inp/blob/main/src/phonetics/txt2ipa.xfscript)
+This (part of) documentation was generated from [src/fst/phonetics/txt2ipa.xfscript](https://github.com/giellalt/lang-inp/blob/main/src/fst/phonetics/txt2ipa.xfscript)
---
@@ -555,7 +555,7 @@ For example:
* * *
-This (part of) documentation was generated from [src/transcriptions/transcriptor-abbrevs2text.lexc](https://github.com/giellalt/lang-inp/blob/main/src/transcriptions/transcriptor-abbrevs2text.lexc)
+This (part of) documentation was generated from [src/fst/transcriptions/transcriptor-abbrevs2text.lexc](https://github.com/giellalt/lang-inp/blob/main/src/fst/transcriptions/transcriptor-abbrevs2text.lexc)
---
@@ -569,7 +569,7 @@ For example:
* * *
-This (part of) documentation was generated from [src/transcriptions/transcriptor-numbers-digit2text.lexc](https://github.com/giellalt/lang-inp/blob/main/src/transcriptions/transcriptor-numbers-digit2text.lexc)
+This (part of) documentation was generated from [src/fst/transcriptions/transcriptor-numbers-digit2text.lexc](https://github.com/giellalt/lang-inp/blob/main/src/fst/transcriptions/transcriptor-numbers-digit2text.lexc)
---
diff --git a/lemmacount.json b/lemmacount.json
index 2e9538e..f6975c3 100644
--- a/lemmacount.json
+++ b/lemmacount.json
@@ -1 +1 @@
-{ "schemaVersion": 1, "label": "Lemmas", "message": "7", "color": "black" }
+{ "schemaVersion": 1, "label": "Lemmas", "message": "10", "color": "black" }
diff --git a/src-fst-affixes-symbols.lexc.md b/src-fst-affixes-symbols.lexc.md
deleted file mode 100644
index c4f1e05..0000000
--- a/src-fst-affixes-symbols.lexc.md
+++ /dev/null
@@ -1,9 +0,0 @@
-
-# Symbol affixes
-
-* * *
-
-This (part of) documentation was generated from [src/fst/affixes/symbols.lexc](https://github.com/giellalt/lang-inp/blob/main/src/fst/affixes/symbols.lexc)
-
----
-
diff --git a/src-fst-affixes-adjectives.lexc.md b/src-fst-morphology-affixes-adjectives.lexc.md
similarity index 51%
rename from src-fst-affixes-adjectives.lexc.md
rename to src-fst-morphology-affixes-adjectives.lexc.md
index 533e0f5..fd0430a 100644
--- a/src-fst-affixes-adjectives.lexc.md
+++ b/src-fst-morphology-affixes-adjectives.lexc.md
@@ -3,7 +3,7 @@ The Iñapari language adjectives compare.
* * *
-This (part of) documentation was generated from [src/fst/affixes/adjectives.lexc](https://github.com/giellalt/lang-inp/blob/main/src/fst/affixes/adjectives.lexc)
+This (part of) documentation was generated from [src/fst/morphology/affixes/adjectives.lexc](https://github.com/giellalt/lang-inp/blob/main/src/fst/morphology/affixes/adjectives.lexc)
---
diff --git a/src-fst-affixes-nouns.lexc.md b/src-fst-morphology-affixes-nouns.lexc.md
similarity index 52%
rename from src-fst-affixes-nouns.lexc.md
rename to src-fst-morphology-affixes-nouns.lexc.md
index 859fbae..e859456 100644
--- a/src-fst-affixes-nouns.lexc.md
+++ b/src-fst-morphology-affixes-nouns.lexc.md
@@ -3,7 +3,7 @@ The Iñapari language nouns inflect in cases.
* * *
-This (part of) documentation was generated from [src/fst/affixes/nouns.lexc](https://github.com/giellalt/lang-inp/blob/main/src/fst/affixes/nouns.lexc)
+This (part of) documentation was generated from [src/fst/morphology/affixes/nouns.lexc](https://github.com/giellalt/lang-inp/blob/main/src/fst/morphology/affixes/nouns.lexc)
---
diff --git a/src-fst-affixes-propernouns.lexc.md b/src-fst-morphology-affixes-propernouns.lexc.md
similarity index 61%
rename from src-fst-affixes-propernouns.lexc.md
rename to src-fst-morphology-affixes-propernouns.lexc.md
index d1888f5..a47c5aa 100644
--- a/src-fst-affixes-propernouns.lexc.md
+++ b/src-fst-morphology-affixes-propernouns.lexc.md
@@ -4,7 +4,7 @@ nouns, but with a colon (':') as separator.
* * *
-This (part of) documentation was generated from [src/fst/affixes/propernouns.lexc](https://github.com/giellalt/lang-inp/blob/main/src/fst/affixes/propernouns.lexc)
+This (part of) documentation was generated from [src/fst/morphology/affixes/propernouns.lexc](https://github.com/giellalt/lang-inp/blob/main/src/fst/morphology/affixes/propernouns.lexc)
---
diff --git a/src-fst-morphology-affixes-symbols.lexc.md b/src-fst-morphology-affixes-symbols.lexc.md
new file mode 100644
index 0000000..519e8d3
--- /dev/null
+++ b/src-fst-morphology-affixes-symbols.lexc.md
@@ -0,0 +1,9 @@
+
+# Symbol affixes
+
+* * *
+
+This (part of) documentation was generated from [src/fst/morphology/affixes/symbols.lexc](https://github.com/giellalt/lang-inp/blob/main/src/fst/morphology/affixes/symbols.lexc)
+
+---
+
diff --git a/src-fst-affixes-verbs.lexc.md b/src-fst-morphology-affixes-verbs.lexc.md
similarity index 53%
rename from src-fst-affixes-verbs.lexc.md
rename to src-fst-morphology-affixes-verbs.lexc.md
index 690ca56..75435a2 100644
--- a/src-fst-affixes-verbs.lexc.md
+++ b/src-fst-morphology-affixes-verbs.lexc.md
@@ -3,7 +3,7 @@ The Iñapari language verbs inflect in persons.
* * *
-This (part of) documentation was generated from [src/fst/affixes/verbs.lexc](https://github.com/giellalt/lang-inp/blob/main/src/fst/affixes/verbs.lexc)
+This (part of) documentation was generated from [src/fst/morphology/affixes/verbs.lexc](https://github.com/giellalt/lang-inp/blob/main/src/fst/morphology/affixes/verbs.lexc)
---
diff --git a/src-fst-phonology.twolc.md b/src-fst-morphology-phonology.twolc.md
similarity index 71%
rename from src-fst-phonology.twolc.md
rename to src-fst-morphology-phonology.twolc.md
index 47691a7..2bad96a 100644
--- a/src-fst-phonology.twolc.md
+++ b/src-fst-morphology-phonology.twolc.md
@@ -15,7 +15,7 @@ The Iñapari morphophonological/twolc rules file !
* * *
-This (part of) documentation was generated from [src/fst/phonology.twolc](https://github.com/giellalt/lang-inp/blob/main/src/fst/phonology.twolc)
+This (part of) documentation was generated from [src/fst/morphology/phonology.twolc](https://github.com/giellalt/lang-inp/blob/main/src/fst/morphology/phonology.twolc)
---
diff --git a/src-fst-root.lexc.md b/src-fst-morphology-root.lexc.md
similarity index 96%
rename from src-fst-root.lexc.md
rename to src-fst-morphology-root.lexc.md
index 4db730b..ab3a4a4 100644
--- a/src-fst-root.lexc.md
+++ b/src-fst-morphology-root.lexc.md
@@ -75,7 +75,7 @@ word classes, or optionally from prefixes:
* * *
-This (part of) documentation was generated from [src/fst/root.lexc](https://github.com/giellalt/lang-inp/blob/main/src/fst/root.lexc)
+This (part of) documentation was generated from [src/fst/morphology/root.lexc](https://github.com/giellalt/lang-inp/blob/main/src/fst/morphology/root.lexc)
---
diff --git a/src-fst-stems-adjectives.lexc.md b/src-fst-morphology-stems-adjectives.lexc.md
similarity index 52%
rename from src-fst-stems-adjectives.lexc.md
rename to src-fst-morphology-stems-adjectives.lexc.md
index f0db034..864e931 100644
--- a/src-fst-stems-adjectives.lexc.md
+++ b/src-fst-morphology-stems-adjectives.lexc.md
@@ -3,7 +3,7 @@ Adjectives in the Iñapari language describe things.
* * *
-This (part of) documentation was generated from [src/fst/stems/adjectives.lexc](https://github.com/giellalt/lang-inp/blob/main/src/fst/stems/adjectives.lexc)
+This (part of) documentation was generated from [src/fst/morphology/stems/adjectives.lexc](https://github.com/giellalt/lang-inp/blob/main/src/fst/morphology/stems/adjectives.lexc)
---
diff --git a/src-fst-stems-nouns.lexc.md b/src-fst-morphology-stems-nouns.lexc.md
similarity index 51%
rename from src-fst-stems-nouns.lexc.md
rename to src-fst-morphology-stems-nouns.lexc.md
index dba344f..4614969 100644
--- a/src-fst-stems-nouns.lexc.md
+++ b/src-fst-morphology-stems-nouns.lexc.md
@@ -3,7 +3,7 @@ Nouns in the Iñapari language are things.
* * *
-This (part of) documentation was generated from [src/fst/stems/nouns.lexc](https://github.com/giellalt/lang-inp/blob/main/src/fst/stems/nouns.lexc)
+This (part of) documentation was generated from [src/fst/morphology/stems/nouns.lexc](https://github.com/giellalt/lang-inp/blob/main/src/fst/morphology/stems/nouns.lexc)
---
diff --git a/src-fst-stems-numerals.lexc.md b/src-fst-morphology-stems-numerals.lexc.md
similarity index 51%
rename from src-fst-stems-numerals.lexc.md
rename to src-fst-morphology-stems-numerals.lexc.md
index 7c71f60..79bcbb0 100644
--- a/src-fst-stems-numerals.lexc.md
+++ b/src-fst-morphology-stems-numerals.lexc.md
@@ -3,7 +3,7 @@ Numerals in the Iñapari language are numbers.
* * *
-This (part of) documentation was generated from [src/fst/stems/numerals.lexc](https://github.com/giellalt/lang-inp/blob/main/src/fst/stems/numerals.lexc)
+This (part of) documentation was generated from [src/fst/morphology/stems/numerals.lexc](https://github.com/giellalt/lang-inp/blob/main/src/fst/morphology/stems/numerals.lexc)
---
diff --git a/src-fst-stems-prefixes.lexc.md b/src-fst-morphology-stems-prefixes.lexc.md
similarity index 55%
rename from src-fst-stems-prefixes.lexc.md
rename to src-fst-morphology-stems-prefixes.lexc.md
index ae8ee57..7e6ceab 100644
--- a/src-fst-stems-prefixes.lexc.md
+++ b/src-fst-morphology-stems-prefixes.lexc.md
@@ -3,7 +3,7 @@ Prefixes in the Iñapari language are bound to beginning of other words.
* * *
-This (part of) documentation was generated from [src/fst/stems/prefixes.lexc](https://github.com/giellalt/lang-inp/blob/main/src/fst/stems/prefixes.lexc)
+This (part of) documentation was generated from [src/fst/morphology/stems/prefixes.lexc](https://github.com/giellalt/lang-inp/blob/main/src/fst/morphology/stems/prefixes.lexc)
---
diff --git a/src-fst-stems-pronouns.lexc.md b/src-fst-morphology-stems-pronouns.lexc.md
similarity index 53%
rename from src-fst-stems-pronouns.lexc.md
rename to src-fst-morphology-stems-pronouns.lexc.md
index 3efc9d5..78445ca 100644
--- a/src-fst-stems-pronouns.lexc.md
+++ b/src-fst-morphology-stems-pronouns.lexc.md
@@ -3,7 +3,7 @@ Pronouns in the Iñapari language are references to things.
* * *
-This (part of) documentation was generated from [src/fst/stems/pronouns.lexc](https://github.com/giellalt/lang-inp/blob/main/src/fst/stems/pronouns.lexc)
+This (part of) documentation was generated from [src/fst/morphology/stems/pronouns.lexc](https://github.com/giellalt/lang-inp/blob/main/src/fst/morphology/stems/pronouns.lexc)
---
diff --git a/src-fst-stems-verbs.lexc.md b/src-fst-morphology-stems-verbs.lexc.md
similarity index 51%
rename from src-fst-stems-verbs.lexc.md
rename to src-fst-morphology-stems-verbs.lexc.md
index de4e0b6..bdb01a7 100644
--- a/src-fst-stems-verbs.lexc.md
+++ b/src-fst-morphology-stems-verbs.lexc.md
@@ -3,7 +3,7 @@ Verbs in the Iñapari language are actions.
* * *
-This (part of) documentation was generated from [src/fst/stems/verbs.lexc](https://github.com/giellalt/lang-inp/blob/main/src/fst/stems/verbs.lexc)
+This (part of) documentation was generated from [src/fst/morphology/stems/verbs.lexc](https://github.com/giellalt/lang-inp/blob/main/src/fst/morphology/stems/verbs.lexc)
---
diff --git a/src-phonetics-txt2ipa.xfscript.md b/src-fst-phonetics-txt2ipa.xfscript.md
similarity index 95%
rename from src-phonetics-txt2ipa.xfscript.md
rename to src-fst-phonetics-txt2ipa.xfscript.md
index 2d75d99..a7dddd9 100644
--- a/src-phonetics-txt2ipa.xfscript.md
+++ b/src-fst-phonetics-txt2ipa.xfscript.md
@@ -161,7 +161,7 @@ retracted tongue root _q
* * *
-This (part of) documentation was generated from [src/phonetics/txt2ipa.xfscript](https://github.com/giellalt/lang-inp/blob/main/src/phonetics/txt2ipa.xfscript)
+This (part of) documentation was generated from [src/fst/phonetics/txt2ipa.xfscript](https://github.com/giellalt/lang-inp/blob/main/src/fst/phonetics/txt2ipa.xfscript)
---
diff --git a/src-transcriptions-transcriptor-abbrevs2text.lexc.md b/src-fst-transcriptions-transcriptor-abbrevs2text.lexc.md
similarity index 53%
rename from src-transcriptions-transcriptor-abbrevs2text.lexc.md
rename to src-fst-transcriptions-transcriptor-abbrevs2text.lexc.md
index 49013af..a34b652 100644
--- a/src-transcriptions-transcriptor-abbrevs2text.lexc.md
+++ b/src-fst-transcriptions-transcriptor-abbrevs2text.lexc.md
@@ -14,7 +14,7 @@ For example:
* * *
-This (part of) documentation was generated from [src/transcriptions/transcriptor-abbrevs2text.lexc](https://github.com/giellalt/lang-inp/blob/main/src/transcriptions/transcriptor-abbrevs2text.lexc)
+This (part of) documentation was generated from [src/fst/transcriptions/transcriptor-abbrevs2text.lexc](https://github.com/giellalt/lang-inp/blob/main/src/fst/transcriptions/transcriptor-abbrevs2text.lexc)
---
diff --git a/src-fst-transcriptions-transcriptor-numbers-digit2text.lexc.md b/src-fst-transcriptions-transcriptor-numbers-digit2text.lexc.md
new file mode 100644
index 0000000..86d9337
--- /dev/null
+++ b/src-fst-transcriptions-transcriptor-numbers-digit2text.lexc.md
@@ -0,0 +1,14 @@
+
+
+% komma% :, Root ;
+% tjuohkkis% :%. Root ;
+% kolon% :%: Root ;
+% sárggis% :%- Root ;
+% násti% :%* Root ;
+
+* * *
+
+This (part of) documentation was generated from [src/fst/transcriptions/transcriptor-numbers-digit2text.lexc](https://github.com/giellalt/lang-inp/blob/main/src/fst/transcriptions/transcriptor-numbers-digit2text.lexc)
+
+---
+
diff --git a/src-transcriptions-transcriptor-numbers-digit2text.lexc.md b/src-transcriptions-transcriptor-numbers-digit2text.lexc.md
deleted file mode 100644
index 1bf280d..0000000
--- a/src-transcriptions-transcriptor-numbers-digit2text.lexc.md
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-% komma% :, Root ;
-% tjuohkkis% :%. Root ;
-% kolon% :%: Root ;
-% sárggis% :%- Root ;
-% násti% :%* Root ;
-
-* * *
-
-This (part of) documentation was generated from [src/transcriptions/transcriptor-numbers-digit2text.lexc](https://github.com/giellalt/lang-inp/blob/main/src/transcriptions/transcriptor-numbers-digit2text.lexc)
-
----
-