diff --git a/docs/add_language.md b/docs/add_language.md
index 714fb8ce..02c47fbe 100644
--- a/docs/add_language.md
+++ b/docs/add_language.md
@@ -7,7 +7,7 @@
 - [Configuration Files](#configuration-files)
   - [Makefile.am file](#makefileam-file)
   - [Phonemes file](#phonemes-file)
-  - [Voice File](#voice-file)
+  - [Language File](#language-file)
   - [Phoneme Definition File](#phoneme-definition-file)
   - [Dictionary Files](#dictionary-files)
 - [Program Code](#program-code)
@@ -59,7 +59,7 @@ These language tags are used to specify the language, such as:
 
 ### Language Family
 
-The voices are grouped by the closest language family the language belongs.
+The languages are grouped by the closest language family the language belongs.
 These language families are defined in
 [ISO 639-5](https://en.wikipedia.org/wiki/ISO_639-5). See also Wikipedia's
 [List of language families] (https://en.wiktionary.org/wiki/Wiktionary:List_of_families)
@@ -104,7 +104,7 @@ To add new language, you have to create or edit following files:
 | dictsource/fr_list           |create  |
 | dictsource/fr_rules          |create  |
 | dictsource/fr_extra          |create (optional) |
-| espeak-ng-data/voices/roa/fr    |create  |
+| espeak-ng-data/lang/roa/fr   |create  |
 
 where:
 
@@ -150,12 +150,12 @@ to make it call your new, e.g. `ph_french` file:
 	include ph_french
 	...
 
-### Voice File
+### Language File
 
-E.g. `espeak-ng-data/voices/roa/fr` is the voice file for French.
+E.g. `espeak-ng-data/lang/roa/fr` is the language file for French.
 This gives the language name and may set some options.
 
-Each language needs a voice file in `espeak-ng-data/voices` grouped by the
+Each language needs a language file in `espeak-ng-data/lang` grouped by the
 [language family](#language-family). The filename of the default voice for a
 language should be the same as the language code (e.g. `fr` for French).
 
@@ -173,7 +173,7 @@ attributes in the voice file. For example you may want to start the
 implementation of a new language by using the phoneme table of an
 existing language.
 
-Details of the contents of voice files are given in [Voices](voices.md).
+Details of the contents of language files are given in [Voices](voices.md).
 
 ### Phoneme Definition File
 
@@ -276,7 +276,7 @@ The function `SetTranslator()` at the start of the source code file
 options. For a new language, you would add its language code and the
 required options in `SetTranslator()`. However, this may not be necessary
 during testing because most of the options can also be set in the voice
-file in espeak-ng-data/voices (see [Voice Files](voices.md)).
+file in espeak-ng-data/lang (see [Voices](voices.md)).
 
 ## Compiling Rules File for Debugging
 
@@ -339,7 +339,7 @@ and what needs to be improved.
 * Make new intonation "tunes" for statements or questions (see
   [Intonation](intonation.md)).
 
-For most of the eSpeak voices, I do not speak or understand the language, and I
+For most of the eSpeak languages, I do not speak or understand the language, and I
 do not know how it should sound. I can only make improvements as a result of
 feedback from speakers of that language. If you want to help to improve a
 language, listen carefully and try to identify individual errors, either in
diff --git a/docs/voices.md b/docs/voices.md
index 6626fd7c..662c7de7 100644
--- a/docs/voices.md
+++ b/docs/voices.md
@@ -1,4 +1,4 @@
-# Voice Files
+# Voice and Language Files
 
 - [Identification Attributes](#identification-attributes)
   - [name](#name)
diff --git a/espeak-ng-data/voices/aav/vi b/espeak-ng-data/lang/aav/vi
similarity index 100%
rename from espeak-ng-data/voices/aav/vi
rename to espeak-ng-data/lang/aav/vi
diff --git a/espeak-ng-data/voices/aav/vi-VN-x-central b/espeak-ng-data/lang/aav/vi-VN-x-central
similarity index 100%
rename from espeak-ng-data/voices/aav/vi-VN-x-central
rename to espeak-ng-data/lang/aav/vi-VN-x-central
diff --git a/espeak-ng-data/voices/aav/vi-VN-x-south b/espeak-ng-data/lang/aav/vi-VN-x-south
similarity index 100%
rename from espeak-ng-data/voices/aav/vi-VN-x-south
rename to espeak-ng-data/lang/aav/vi-VN-x-south
diff --git a/espeak-ng-data/voices/art/eo b/espeak-ng-data/lang/art/eo
similarity index 100%
rename from espeak-ng-data/voices/art/eo
rename to espeak-ng-data/lang/art/eo
diff --git a/espeak-ng-data/voices/art/ia b/espeak-ng-data/lang/art/ia
similarity index 100%
rename from espeak-ng-data/voices/art/ia
rename to espeak-ng-data/lang/art/ia
diff --git a/espeak-ng-data/voices/art/jbo b/espeak-ng-data/lang/art/jbo
similarity index 100%
rename from espeak-ng-data/voices/art/jbo
rename to espeak-ng-data/lang/art/jbo
diff --git a/espeak-ng-data/voices/art/lfn b/espeak-ng-data/lang/art/lfn
similarity index 100%
rename from espeak-ng-data/voices/art/lfn
rename to espeak-ng-data/lang/art/lfn
diff --git a/espeak-ng-data/voices/azc/nci b/espeak-ng-data/lang/azc/nci
similarity index 100%
rename from espeak-ng-data/voices/azc/nci
rename to espeak-ng-data/lang/azc/nci
diff --git a/espeak-ng-data/voices/bat/lt b/espeak-ng-data/lang/bat/lt
similarity index 100%
rename from espeak-ng-data/voices/bat/lt
rename to espeak-ng-data/lang/bat/lt
diff --git a/espeak-ng-data/voices/bat/lv b/espeak-ng-data/lang/bat/lv
similarity index 100%
rename from espeak-ng-data/voices/bat/lv
rename to espeak-ng-data/lang/bat/lv
diff --git a/espeak-ng-data/voices/bnt/sw b/espeak-ng-data/lang/bnt/sw
similarity index 100%
rename from espeak-ng-data/voices/bnt/sw
rename to espeak-ng-data/lang/bnt/sw
diff --git a/espeak-ng-data/voices/bnt/tn b/espeak-ng-data/lang/bnt/tn
similarity index 100%
rename from espeak-ng-data/voices/bnt/tn
rename to espeak-ng-data/lang/bnt/tn
diff --git a/espeak-ng-data/voices/ccs/ka b/espeak-ng-data/lang/ccs/ka
similarity index 100%
rename from espeak-ng-data/voices/ccs/ka
rename to espeak-ng-data/lang/ccs/ka
diff --git a/espeak-ng-data/voices/cel/cy b/espeak-ng-data/lang/cel/cy
similarity index 100%
rename from espeak-ng-data/voices/cel/cy
rename to espeak-ng-data/lang/cel/cy
diff --git a/espeak-ng-data/voices/cel/ga b/espeak-ng-data/lang/cel/ga
similarity index 100%
rename from espeak-ng-data/voices/cel/ga
rename to espeak-ng-data/lang/cel/ga
diff --git a/espeak-ng-data/voices/cel/gd b/espeak-ng-data/lang/cel/gd
similarity index 100%
rename from espeak-ng-data/voices/cel/gd
rename to espeak-ng-data/lang/cel/gd
diff --git a/espeak-ng-data/voices/cus/om b/espeak-ng-data/lang/cus/om
similarity index 100%
rename from espeak-ng-data/voices/cus/om
rename to espeak-ng-data/lang/cus/om
diff --git a/espeak-ng-data/voices/dra/kn b/espeak-ng-data/lang/dra/kn
similarity index 100%
rename from espeak-ng-data/voices/dra/kn
rename to espeak-ng-data/lang/dra/kn
diff --git a/espeak-ng-data/voices/dra/ml b/espeak-ng-data/lang/dra/ml
similarity index 100%
rename from espeak-ng-data/voices/dra/ml
rename to espeak-ng-data/lang/dra/ml
diff --git a/espeak-ng-data/voices/dra/ta b/espeak-ng-data/lang/dra/ta
similarity index 100%
rename from espeak-ng-data/voices/dra/ta
rename to espeak-ng-data/lang/dra/ta
diff --git a/espeak-ng-data/voices/dra/te b/espeak-ng-data/lang/dra/te
similarity index 100%
rename from espeak-ng-data/voices/dra/te
rename to espeak-ng-data/lang/dra/te
diff --git a/espeak-ng-data/voices/esx/kl b/espeak-ng-data/lang/esx/kl
similarity index 100%
rename from espeak-ng-data/voices/esx/kl
rename to espeak-ng-data/lang/esx/kl
diff --git a/espeak-ng-data/voices/eu b/espeak-ng-data/lang/eu
similarity index 100%
rename from espeak-ng-data/voices/eu
rename to espeak-ng-data/lang/eu
diff --git a/espeak-ng-data/voices/gmq/da b/espeak-ng-data/lang/gmq/da
similarity index 100%
rename from espeak-ng-data/voices/gmq/da
rename to espeak-ng-data/lang/gmq/da
diff --git a/espeak-ng-data/voices/gmq/is b/espeak-ng-data/lang/gmq/is
similarity index 100%
rename from espeak-ng-data/voices/gmq/is
rename to espeak-ng-data/lang/gmq/is
diff --git a/espeak-ng-data/voices/gmq/no b/espeak-ng-data/lang/gmq/no
similarity index 100%
rename from espeak-ng-data/voices/gmq/no
rename to espeak-ng-data/lang/gmq/no
diff --git a/espeak-ng-data/voices/gmq/sv b/espeak-ng-data/lang/gmq/sv
similarity index 100%
rename from espeak-ng-data/voices/gmq/sv
rename to espeak-ng-data/lang/gmq/sv
diff --git a/espeak-ng-data/voices/gmw/af b/espeak-ng-data/lang/gmw/af
similarity index 100%
rename from espeak-ng-data/voices/gmw/af
rename to espeak-ng-data/lang/gmw/af
diff --git a/espeak-ng-data/voices/gmw/de b/espeak-ng-data/lang/gmw/de
similarity index 100%
rename from espeak-ng-data/voices/gmw/de
rename to espeak-ng-data/lang/gmw/de
diff --git a/espeak-ng-data/voices/gmw/en b/espeak-ng-data/lang/gmw/en
similarity index 100%
rename from espeak-ng-data/voices/gmw/en
rename to espeak-ng-data/lang/gmw/en
diff --git a/espeak-ng-data/voices/gmw/en-029 b/espeak-ng-data/lang/gmw/en-029
similarity index 100%
rename from espeak-ng-data/voices/gmw/en-029
rename to espeak-ng-data/lang/gmw/en-029
diff --git a/espeak-ng-data/voices/gmw/en-GB-scotland b/espeak-ng-data/lang/gmw/en-GB-scotland
similarity index 100%
rename from espeak-ng-data/voices/gmw/en-GB-scotland
rename to espeak-ng-data/lang/gmw/en-GB-scotland
diff --git a/espeak-ng-data/voices/gmw/en-GB-x-gbclan b/espeak-ng-data/lang/gmw/en-GB-x-gbclan
similarity index 100%
rename from espeak-ng-data/voices/gmw/en-GB-x-gbclan
rename to espeak-ng-data/lang/gmw/en-GB-x-gbclan
diff --git a/espeak-ng-data/voices/gmw/en-GB-x-gbcwmd b/espeak-ng-data/lang/gmw/en-GB-x-gbcwmd
similarity index 100%
rename from espeak-ng-data/voices/gmw/en-GB-x-gbcwmd
rename to espeak-ng-data/lang/gmw/en-GB-x-gbcwmd
diff --git a/espeak-ng-data/voices/gmw/en-GB-x-rp b/espeak-ng-data/lang/gmw/en-GB-x-rp
similarity index 100%
rename from espeak-ng-data/voices/gmw/en-GB-x-rp
rename to espeak-ng-data/lang/gmw/en-GB-x-rp
diff --git a/espeak-ng-data/voices/gmw/en-US b/espeak-ng-data/lang/gmw/en-US
similarity index 100%
rename from espeak-ng-data/voices/gmw/en-US
rename to espeak-ng-data/lang/gmw/en-US
diff --git a/espeak-ng-data/voices/gmw/nl b/espeak-ng-data/lang/gmw/nl
similarity index 100%
rename from espeak-ng-data/voices/gmw/nl
rename to espeak-ng-data/lang/gmw/nl
diff --git a/espeak-ng-data/voices/grk/el b/espeak-ng-data/lang/grk/el
similarity index 100%
rename from espeak-ng-data/voices/grk/el
rename to espeak-ng-data/lang/grk/el
diff --git a/espeak-ng-data/voices/grk/grc b/espeak-ng-data/lang/grk/grc
similarity index 100%
rename from espeak-ng-data/voices/grk/grc
rename to espeak-ng-data/lang/grk/grc
diff --git a/espeak-ng-data/voices/inc/as b/espeak-ng-data/lang/inc/as
similarity index 100%
rename from espeak-ng-data/voices/inc/as
rename to espeak-ng-data/lang/inc/as
diff --git a/espeak-ng-data/voices/inc/bn b/espeak-ng-data/lang/inc/bn
similarity index 100%
rename from espeak-ng-data/voices/inc/bn
rename to espeak-ng-data/lang/inc/bn
diff --git a/espeak-ng-data/voices/inc/gu b/espeak-ng-data/lang/inc/gu
similarity index 100%
rename from espeak-ng-data/voices/inc/gu
rename to espeak-ng-data/lang/inc/gu
diff --git a/espeak-ng-data/voices/inc/hi b/espeak-ng-data/lang/inc/hi
similarity index 100%
rename from espeak-ng-data/voices/inc/hi
rename to espeak-ng-data/lang/inc/hi
diff --git a/espeak-ng-data/voices/inc/kok b/espeak-ng-data/lang/inc/kok
similarity index 100%
rename from espeak-ng-data/voices/inc/kok
rename to espeak-ng-data/lang/inc/kok
diff --git a/espeak-ng-data/voices/inc/mr b/espeak-ng-data/lang/inc/mr
similarity index 100%
rename from espeak-ng-data/voices/inc/mr
rename to espeak-ng-data/lang/inc/mr
diff --git a/espeak-ng-data/voices/inc/ne b/espeak-ng-data/lang/inc/ne
similarity index 100%
rename from espeak-ng-data/voices/inc/ne
rename to espeak-ng-data/lang/inc/ne
diff --git a/espeak-ng-data/voices/inc/or b/espeak-ng-data/lang/inc/or
similarity index 100%
rename from espeak-ng-data/voices/inc/or
rename to espeak-ng-data/lang/inc/or
diff --git a/espeak-ng-data/voices/inc/pa b/espeak-ng-data/lang/inc/pa
similarity index 100%
rename from espeak-ng-data/voices/inc/pa
rename to espeak-ng-data/lang/inc/pa
diff --git a/espeak-ng-data/voices/inc/sd b/espeak-ng-data/lang/inc/sd
similarity index 100%
rename from espeak-ng-data/voices/inc/sd
rename to espeak-ng-data/lang/inc/sd
diff --git a/espeak-ng-data/voices/inc/si b/espeak-ng-data/lang/inc/si
similarity index 100%
rename from espeak-ng-data/voices/inc/si
rename to espeak-ng-data/lang/inc/si
diff --git a/espeak-ng-data/voices/inc/ur b/espeak-ng-data/lang/inc/ur
similarity index 100%
rename from espeak-ng-data/voices/inc/ur
rename to espeak-ng-data/lang/inc/ur
diff --git a/espeak-ng-data/voices/ine/hy b/espeak-ng-data/lang/ine/hy
similarity index 100%
rename from espeak-ng-data/voices/ine/hy
rename to espeak-ng-data/lang/ine/hy
diff --git a/espeak-ng-data/voices/ine/hy-arevmda b/espeak-ng-data/lang/ine/hy-arevmda
similarity index 100%
rename from espeak-ng-data/voices/ine/hy-arevmda
rename to espeak-ng-data/lang/ine/hy-arevmda
diff --git a/espeak-ng-data/voices/ine/sq b/espeak-ng-data/lang/ine/sq
similarity index 100%
rename from espeak-ng-data/voices/ine/sq
rename to espeak-ng-data/lang/ine/sq
diff --git a/espeak-ng-data/voices/ira/fa b/espeak-ng-data/lang/ira/fa
similarity index 100%
rename from espeak-ng-data/voices/ira/fa
rename to espeak-ng-data/lang/ira/fa
diff --git a/espeak-ng-data/voices/ira/fa-Latn b/espeak-ng-data/lang/ira/fa-Latn
similarity index 100%
rename from espeak-ng-data/voices/ira/fa-Latn
rename to espeak-ng-data/lang/ira/fa-Latn
diff --git a/espeak-ng-data/voices/ira/fa-en-us b/espeak-ng-data/lang/ira/fa-en-us
similarity index 100%
rename from espeak-ng-data/voices/ira/fa-en-us
rename to espeak-ng-data/lang/ira/fa-en-us
diff --git a/espeak-ng-data/voices/ira/ku b/espeak-ng-data/lang/ira/ku
similarity index 100%
rename from espeak-ng-data/voices/ira/ku
rename to espeak-ng-data/lang/ira/ku
diff --git a/espeak-ng-data/voices/itc/la b/espeak-ng-data/lang/itc/la
similarity index 100%
rename from espeak-ng-data/voices/itc/la
rename to espeak-ng-data/lang/itc/la
diff --git a/espeak-ng-data/voices/jpx/jp b/espeak-ng-data/lang/jpx/jp
similarity index 100%
rename from espeak-ng-data/voices/jpx/jp
rename to espeak-ng-data/lang/jpx/jp
diff --git a/espeak-ng-data/voices/ko b/espeak-ng-data/lang/ko
similarity index 100%
rename from espeak-ng-data/voices/ko
rename to espeak-ng-data/lang/ko
diff --git a/espeak-ng-data/voices/poz/id b/espeak-ng-data/lang/poz/id
similarity index 100%
rename from espeak-ng-data/voices/poz/id
rename to espeak-ng-data/lang/poz/id
diff --git a/espeak-ng-data/voices/poz/ms b/espeak-ng-data/lang/poz/ms
similarity index 100%
rename from espeak-ng-data/voices/poz/ms
rename to espeak-ng-data/lang/poz/ms
diff --git a/espeak-ng-data/voices/roa/an b/espeak-ng-data/lang/roa/an
similarity index 100%
rename from espeak-ng-data/voices/roa/an
rename to espeak-ng-data/lang/roa/an
diff --git a/espeak-ng-data/voices/roa/ca b/espeak-ng-data/lang/roa/ca
similarity index 100%
rename from espeak-ng-data/voices/roa/ca
rename to espeak-ng-data/lang/roa/ca
diff --git a/espeak-ng-data/voices/roa/es b/espeak-ng-data/lang/roa/es
similarity index 100%
rename from espeak-ng-data/voices/roa/es
rename to espeak-ng-data/lang/roa/es
diff --git a/espeak-ng-data/voices/roa/es-419 b/espeak-ng-data/lang/roa/es-419
similarity index 100%
rename from espeak-ng-data/voices/roa/es-419
rename to espeak-ng-data/lang/roa/es-419
diff --git a/espeak-ng-data/voices/roa/fr b/espeak-ng-data/lang/roa/fr
similarity index 100%
rename from espeak-ng-data/voices/roa/fr
rename to espeak-ng-data/lang/roa/fr
diff --git a/espeak-ng-data/voices/roa/fr-BE b/espeak-ng-data/lang/roa/fr-BE
similarity index 100%
rename from espeak-ng-data/voices/roa/fr-BE
rename to espeak-ng-data/lang/roa/fr-BE
diff --git a/espeak-ng-data/voices/roa/it b/espeak-ng-data/lang/roa/it
similarity index 100%
rename from espeak-ng-data/voices/roa/it
rename to espeak-ng-data/lang/roa/it
diff --git a/espeak-ng-data/voices/roa/pap b/espeak-ng-data/lang/roa/pap
similarity index 100%
rename from espeak-ng-data/voices/roa/pap
rename to espeak-ng-data/lang/roa/pap
diff --git a/espeak-ng-data/voices/roa/pt-BR b/espeak-ng-data/lang/roa/pt-BR
similarity index 100%
rename from espeak-ng-data/voices/roa/pt-BR
rename to espeak-ng-data/lang/roa/pt-BR
diff --git a/espeak-ng-data/voices/roa/pt-PT b/espeak-ng-data/lang/roa/pt-PT
similarity index 100%
rename from espeak-ng-data/voices/roa/pt-PT
rename to espeak-ng-data/lang/roa/pt-PT
diff --git a/espeak-ng-data/voices/roa/ro b/espeak-ng-data/lang/roa/ro
similarity index 100%
rename from espeak-ng-data/voices/roa/ro
rename to espeak-ng-data/lang/roa/ro
diff --git a/espeak-ng-data/voices/sai/gn b/espeak-ng-data/lang/sai/gn
similarity index 100%
rename from espeak-ng-data/voices/sai/gn
rename to espeak-ng-data/lang/sai/gn
diff --git a/espeak-ng-data/voices/sem/am b/espeak-ng-data/lang/sem/am
similarity index 100%
rename from espeak-ng-data/voices/sem/am
rename to espeak-ng-data/lang/sem/am
diff --git a/espeak-ng-data/voices/sem/ar b/espeak-ng-data/lang/sem/ar
similarity index 100%
rename from espeak-ng-data/voices/sem/ar
rename to espeak-ng-data/lang/sem/ar
diff --git a/espeak-ng-data/voices/sem/mt b/espeak-ng-data/lang/sem/mt
similarity index 100%
rename from espeak-ng-data/voices/sem/mt
rename to espeak-ng-data/lang/sem/mt
diff --git a/espeak-ng-data/voices/sit/cmn b/espeak-ng-data/lang/sit/cmn
similarity index 100%
rename from espeak-ng-data/voices/sit/cmn
rename to espeak-ng-data/lang/sit/cmn
diff --git a/espeak-ng-data/voices/sit/mni b/espeak-ng-data/lang/sit/mni
similarity index 100%
rename from espeak-ng-data/voices/sit/mni
rename to espeak-ng-data/lang/sit/mni
diff --git a/espeak-ng-data/voices/sit/my b/espeak-ng-data/lang/sit/my
similarity index 100%
rename from espeak-ng-data/voices/sit/my
rename to espeak-ng-data/lang/sit/my
diff --git a/espeak-ng-data/voices/sit/yue b/espeak-ng-data/lang/sit/yue
similarity index 100%
rename from espeak-ng-data/voices/sit/yue
rename to espeak-ng-data/lang/sit/yue
diff --git a/espeak-ng-data/voices/trk/az b/espeak-ng-data/lang/trk/az
similarity index 100%
rename from espeak-ng-data/voices/trk/az
rename to espeak-ng-data/lang/trk/az
diff --git a/espeak-ng-data/voices/trk/ky b/espeak-ng-data/lang/trk/ky
similarity index 100%
rename from espeak-ng-data/voices/trk/ky
rename to espeak-ng-data/lang/trk/ky
diff --git a/espeak-ng-data/voices/trk/tr b/espeak-ng-data/lang/trk/tr
similarity index 100%
rename from espeak-ng-data/voices/trk/tr
rename to espeak-ng-data/lang/trk/tr
diff --git a/espeak-ng-data/voices/trk/tt b/espeak-ng-data/lang/trk/tt
similarity index 100%
rename from espeak-ng-data/voices/trk/tt
rename to espeak-ng-data/lang/trk/tt
diff --git a/espeak-ng-data/voices/und/und-fonipa b/espeak-ng-data/lang/und/und-fonipa
similarity index 100%
rename from espeak-ng-data/voices/und/und-fonipa
rename to espeak-ng-data/lang/und/und-fonipa
diff --git a/espeak-ng-data/voices/urj/et b/espeak-ng-data/lang/urj/et
similarity index 100%
rename from espeak-ng-data/voices/urj/et
rename to espeak-ng-data/lang/urj/et
diff --git a/espeak-ng-data/voices/urj/fi b/espeak-ng-data/lang/urj/fi
similarity index 100%
rename from espeak-ng-data/voices/urj/fi
rename to espeak-ng-data/lang/urj/fi
diff --git a/espeak-ng-data/voices/urj/hu b/espeak-ng-data/lang/urj/hu
similarity index 100%
rename from espeak-ng-data/voices/urj/hu
rename to espeak-ng-data/lang/urj/hu
diff --git a/espeak-ng-data/voices/zls/bg b/espeak-ng-data/lang/zls/bg
similarity index 100%
rename from espeak-ng-data/voices/zls/bg
rename to espeak-ng-data/lang/zls/bg
diff --git a/espeak-ng-data/voices/zls/bs b/espeak-ng-data/lang/zls/bs
similarity index 100%
rename from espeak-ng-data/voices/zls/bs
rename to espeak-ng-data/lang/zls/bs
diff --git a/espeak-ng-data/voices/zls/cs b/espeak-ng-data/lang/zls/cs
similarity index 100%
rename from espeak-ng-data/voices/zls/cs
rename to espeak-ng-data/lang/zls/cs
diff --git a/espeak-ng-data/voices/zls/hr b/espeak-ng-data/lang/zls/hr
similarity index 100%
rename from espeak-ng-data/voices/zls/hr
rename to espeak-ng-data/lang/zls/hr
diff --git a/espeak-ng-data/voices/zls/mk b/espeak-ng-data/lang/zls/mk
similarity index 100%
rename from espeak-ng-data/voices/zls/mk
rename to espeak-ng-data/lang/zls/mk
diff --git a/espeak-ng-data/voices/zls/pl b/espeak-ng-data/lang/zls/pl
similarity index 100%
rename from espeak-ng-data/voices/zls/pl
rename to espeak-ng-data/lang/zls/pl
diff --git a/espeak-ng-data/voices/zls/ru b/espeak-ng-data/lang/zls/ru
similarity index 100%
rename from espeak-ng-data/voices/zls/ru
rename to espeak-ng-data/lang/zls/ru
diff --git a/espeak-ng-data/voices/zls/sk b/espeak-ng-data/lang/zls/sk
similarity index 100%
rename from espeak-ng-data/voices/zls/sk
rename to espeak-ng-data/lang/zls/sk
diff --git a/espeak-ng-data/voices/zls/sl b/espeak-ng-data/lang/zls/sl
similarity index 100%
rename from espeak-ng-data/voices/zls/sl
rename to espeak-ng-data/lang/zls/sl
diff --git a/espeak-ng-data/voices/zls/sr b/espeak-ng-data/lang/zls/sr
similarity index 100%
rename from espeak-ng-data/voices/zls/sr
rename to espeak-ng-data/lang/zls/sr