diff --git a/espeak-data/voices/asia/vi b/espeak-data/voices/aav/vi
similarity index 100%
rename from espeak-data/voices/asia/vi
rename to espeak-data/voices/aav/vi
diff --git a/espeak-data/voices/asia/vi-VN-x-central b/espeak-data/voices/aav/vi-VN-x-central
similarity index 100%
rename from espeak-data/voices/asia/vi-VN-x-central
rename to espeak-data/voices/aav/vi-VN-x-central
diff --git a/espeak-data/voices/asia/vi-VN-x-south b/espeak-data/voices/aav/vi-VN-x-south
similarity index 100%
rename from espeak-data/voices/asia/vi-VN-x-south
rename to espeak-data/voices/aav/vi-VN-x-south
diff --git a/espeak-data/voices/other/eo b/espeak-data/voices/art/eo
similarity index 100%
rename from espeak-data/voices/other/eo
rename to espeak-data/voices/art/eo
diff --git a/espeak-data/voices/other/ia b/espeak-data/voices/art/ia
similarity index 100%
rename from espeak-data/voices/other/ia
rename to espeak-data/voices/art/ia
diff --git a/espeak-data/voices/other/jbo b/espeak-data/voices/art/jbo
similarity index 100%
rename from espeak-data/voices/other/jbo
rename to espeak-data/voices/art/jbo
diff --git a/espeak-data/voices/other/lfn b/espeak-data/voices/art/lfn
similarity index 100%
rename from espeak-data/voices/other/lfn
rename to espeak-data/voices/art/lfn
diff --git a/espeak-data/voices/asia/hy b/espeak-data/voices/axm/hy
similarity index 100%
rename from espeak-data/voices/asia/hy
rename to espeak-data/voices/axm/hy
diff --git a/espeak-data/voices/asia/hy-arevmda b/espeak-data/voices/axm/hy-arevmda
similarity index 100%
rename from espeak-data/voices/asia/hy-arevmda
rename to espeak-data/voices/axm/hy-arevmda
diff --git a/espeak-data/voices/test/nci b/espeak-data/voices/azc/nci
similarity index 100%
rename from espeak-data/voices/test/nci
rename to espeak-data/voices/azc/nci
diff --git a/espeak-data/voices/other/sw b/espeak-data/voices/bnt/sw
similarity index 100%
rename from espeak-data/voices/other/sw
rename to espeak-data/voices/bnt/sw
diff --git a/espeak-data/voices/asia/ka b/espeak-data/voices/ccs/ka
similarity index 100%
rename from espeak-data/voices/asia/ka
rename to espeak-data/voices/ccs/ka
diff --git a/espeak-data/voices/europe/cy b/espeak-data/voices/cel/cy
similarity index 100%
rename from espeak-data/voices/europe/cy
rename to espeak-data/voices/cel/cy
diff --git a/espeak-data/voices/europe/ga b/espeak-data/voices/cel/ga
similarity index 100%
rename from espeak-data/voices/europe/ga
rename to espeak-data/voices/cel/ga
diff --git a/espeak-data/voices/test/gd b/espeak-data/voices/cel/gd
similarity index 100%
rename from espeak-data/voices/test/gd
rename to espeak-data/voices/cel/gd
diff --git a/espeak-data/voices/test/om b/espeak-data/voices/cus/om
similarity index 100%
rename from espeak-data/voices/test/om
rename to espeak-data/voices/cus/om
diff --git a/espeak-data/voices/asia/kn b/espeak-data/voices/dra/kn
similarity index 100%
rename from espeak-data/voices/asia/kn
rename to espeak-data/voices/dra/kn
diff --git a/espeak-data/voices/asia/ml b/espeak-data/voices/dra/ml
similarity index 100%
rename from espeak-data/voices/asia/ml
rename to espeak-data/voices/dra/ml
diff --git a/espeak-data/voices/asia/ta b/espeak-data/voices/dra/ta
similarity index 100%
rename from espeak-data/voices/asia/ta
rename to espeak-data/voices/dra/ta
diff --git a/espeak-data/voices/asia/te b/espeak-data/voices/dra/te
similarity index 100%
rename from espeak-data/voices/asia/te
rename to espeak-data/voices/dra/te
diff --git a/espeak-data/voices/test/kl b/espeak-data/voices/esx/kl
similarity index 100%
rename from espeak-data/voices/test/kl
rename to espeak-data/voices/esx/kl
diff --git a/espeak-data/voices/europe/da b/espeak-data/voices/gmq/da
similarity index 100%
rename from espeak-data/voices/europe/da
rename to espeak-data/voices/gmq/da
diff --git a/espeak-data/voices/europe/is b/espeak-data/voices/gmq/is
similarity index 100%
rename from espeak-data/voices/europe/is
rename to espeak-data/voices/gmq/is
diff --git a/espeak-data/voices/europe/no b/espeak-data/voices/gmq/no
similarity index 100%
rename from espeak-data/voices/europe/no
rename to espeak-data/voices/gmq/no
diff --git a/espeak-data/voices/europe/sv b/espeak-data/voices/gmq/sv
similarity index 100%
rename from espeak-data/voices/europe/sv
rename to espeak-data/voices/gmq/sv
diff --git a/espeak-data/voices/other/af b/espeak-data/voices/gmw/af
similarity index 100%
rename from espeak-data/voices/other/af
rename to espeak-data/voices/gmw/af
diff --git a/espeak-data/voices/de b/espeak-data/voices/gmw/de
similarity index 100%
rename from espeak-data/voices/de
rename to espeak-data/voices/gmw/de
diff --git a/espeak-data/voices/en b/espeak-data/voices/gmw/en
similarity index 100%
rename from espeak-data/voices/en
rename to espeak-data/voices/gmw/en
diff --git a/espeak-data/voices/other/en-029 b/espeak-data/voices/gmw/en-029
similarity index 100%
rename from espeak-data/voices/other/en-029
rename to espeak-data/voices/gmw/en-029
diff --git a/espeak-data/voices/other/en-GB-scotland b/espeak-data/voices/gmw/en-GB-scotland
similarity index 100%
rename from espeak-data/voices/other/en-GB-scotland
rename to espeak-data/voices/gmw/en-GB-scotland
diff --git a/espeak-data/voices/other/en-GB-x-gbclan b/espeak-data/voices/gmw/en-GB-x-gbclan
similarity index 100%
rename from espeak-data/voices/other/en-GB-x-gbclan
rename to espeak-data/voices/gmw/en-GB-x-gbclan
diff --git a/espeak-data/voices/other/en-GB-x-gbcwmd b/espeak-data/voices/gmw/en-GB-x-gbcwmd
similarity index 100%
rename from espeak-data/voices/other/en-GB-x-gbcwmd
rename to espeak-data/voices/gmw/en-GB-x-gbcwmd
diff --git a/espeak-data/voices/other/en-GB-x-rp b/espeak-data/voices/gmw/en-GB-x-rp
similarity index 100%
rename from espeak-data/voices/other/en-GB-x-rp
rename to espeak-data/voices/gmw/en-GB-x-rp
diff --git a/espeak-data/voices/en-us b/espeak-data/voices/gmw/en-US
similarity index 100%
rename from espeak-data/voices/en-us
rename to espeak-data/voices/gmw/en-US
diff --git a/espeak-data/voices/europe/nl b/espeak-data/voices/gmw/nl
similarity index 100%
rename from espeak-data/voices/europe/nl
rename to espeak-data/voices/gmw/nl
diff --git a/espeak-data/voices/europe/el b/espeak-data/voices/grk/el
similarity index 100%
rename from espeak-data/voices/europe/el
rename to espeak-data/voices/grk/el
diff --git a/espeak-data/voices/other/grc b/espeak-data/voices/grk/grc
similarity index 100%
rename from espeak-data/voices/other/grc
rename to espeak-data/voices/grk/grc
diff --git a/espeak-data/voices/test/as b/espeak-data/voices/inc/as
similarity index 100%
rename from espeak-data/voices/test/as
rename to espeak-data/voices/inc/as
diff --git a/espeak-data/voices/asia/bn b/espeak-data/voices/inc/bn
similarity index 100%
rename from espeak-data/voices/asia/bn
rename to espeak-data/voices/inc/bn
diff --git a/espeak-data/voices/asia/gu b/espeak-data/voices/inc/gu
similarity index 100%
rename from espeak-data/voices/asia/gu
rename to espeak-data/voices/inc/gu
diff --git a/espeak-data/voices/asia/hi b/espeak-data/voices/inc/hi
similarity index 100%
rename from espeak-data/voices/asia/hi
rename to espeak-data/voices/inc/hi
diff --git a/espeak-data/voices/test/mr b/espeak-data/voices/inc/mr
similarity index 100%
rename from espeak-data/voices/test/mr
rename to espeak-data/voices/inc/mr
diff --git a/espeak-data/voices/asia/ne b/espeak-data/voices/inc/ne
similarity index 100%
rename from espeak-data/voices/asia/ne
rename to espeak-data/voices/inc/ne
diff --git a/espeak-data/voices/test/or b/espeak-data/voices/inc/or
similarity index 100%
rename from espeak-data/voices/test/or
rename to espeak-data/voices/inc/or
diff --git a/espeak-data/voices/asia/pa b/espeak-data/voices/inc/pa
similarity index 100%
rename from espeak-data/voices/asia/pa
rename to espeak-data/voices/inc/pa
diff --git a/espeak-data/voices/test/si b/espeak-data/voices/inc/si
similarity index 100%
rename from espeak-data/voices/test/si
rename to espeak-data/voices/inc/si
diff --git a/espeak-data/voices/test/ur b/espeak-data/voices/inc/ur
similarity index 100%
rename from espeak-data/voices/test/ur
rename to espeak-data/voices/inc/ur
diff --git a/espeak-data/voices/europe/sq b/espeak-data/voices/ine/sq
similarity index 100%
rename from espeak-data/voices/europe/sq
rename to espeak-data/voices/ine/sq
diff --git a/espeak-data/voices/asia/fa b/espeak-data/voices/ira/fa
similarity index 100%
rename from espeak-data/voices/asia/fa
rename to espeak-data/voices/ira/fa
diff --git a/espeak-data/voices/asia/fa-Latn b/espeak-data/voices/ira/fa-Latn
similarity index 100%
rename from espeak-data/voices/asia/fa-Latn
rename to espeak-data/voices/ira/fa-Latn
diff --git a/espeak-data/voices/asia/fa-en-us b/espeak-data/voices/ira/fa-en-us
similarity index 100%
rename from espeak-data/voices/asia/fa-en-us
rename to espeak-data/voices/ira/fa-en-us
diff --git a/espeak-data/voices/asia/ku b/espeak-data/voices/ira/ku
similarity index 100%
rename from espeak-data/voices/asia/ku
rename to espeak-data/voices/ira/ku
diff --git a/espeak-data/voices/other/la b/espeak-data/voices/itc/la
similarity index 100%
rename from espeak-data/voices/other/la
rename to espeak-data/voices/itc/la
diff --git a/espeak-data/voices/asia/ko b/espeak-data/voices/ko
similarity index 100%
rename from espeak-data/voices/asia/ko
rename to espeak-data/voices/ko
diff --git a/espeak-data/voices/asia/id b/espeak-data/voices/poz/id
similarity index 100%
rename from espeak-data/voices/asia/id
rename to espeak-data/voices/poz/id
diff --git a/espeak-data/voices/asia/ms b/espeak-data/voices/poz/ms
similarity index 100%
rename from espeak-data/voices/asia/ms
rename to espeak-data/voices/poz/ms
diff --git a/espeak-data/voices/europe/an b/espeak-data/voices/roa/an
similarity index 100%
rename from espeak-data/voices/europe/an
rename to espeak-data/voices/roa/an
diff --git a/espeak-data/voices/europe/ca b/espeak-data/voices/roa/ca
similarity index 100%
rename from espeak-data/voices/europe/ca
rename to espeak-data/voices/roa/ca
diff --git a/espeak-data/voices/europe/es b/espeak-data/voices/roa/es
similarity index 100%
rename from espeak-data/voices/europe/es
rename to espeak-data/voices/roa/es
diff --git a/espeak-data/voices/es-419 b/espeak-data/voices/roa/es-419
similarity index 100%
rename from espeak-data/voices/es-419
rename to espeak-data/voices/roa/es-419
diff --git a/espeak-data/voices/fr b/espeak-data/voices/roa/fr
similarity index 100%
rename from espeak-data/voices/fr
rename to espeak-data/voices/roa/fr
diff --git a/espeak-data/voices/europe/fr-be b/espeak-data/voices/roa/fr-BE
similarity index 100%
rename from espeak-data/voices/europe/fr-be
rename to espeak-data/voices/roa/fr-BE
diff --git a/espeak-data/voices/europe/it b/espeak-data/voices/roa/it
similarity index 100%
rename from espeak-data/voices/europe/it
rename to espeak-data/voices/roa/it
diff --git a/espeak-data/voices/test/pap b/espeak-data/voices/roa/pap
similarity index 100%
rename from espeak-data/voices/test/pap
rename to espeak-data/voices/roa/pap
diff --git a/espeak-data/voices/pt b/espeak-data/voices/roa/pt-BR
similarity index 100%
rename from espeak-data/voices/pt
rename to espeak-data/voices/roa/pt-BR
diff --git a/espeak-data/voices/europe/pt-pt b/espeak-data/voices/roa/pt-PT
similarity index 100%
rename from espeak-data/voices/europe/pt-pt
rename to espeak-data/voices/roa/pt-PT
diff --git a/espeak-data/voices/europe/ro b/espeak-data/voices/roa/ro
similarity index 100%
rename from espeak-data/voices/europe/ro
rename to espeak-data/voices/roa/ro
diff --git a/espeak-data/voices/test/am b/espeak-data/voices/sem/am
similarity index 100%
rename from espeak-data/voices/test/am
rename to espeak-data/voices/sem/am
diff --git a/espeak-data/voices/asia/zh b/espeak-data/voices/sit/cmn
similarity index 100%
rename from espeak-data/voices/asia/zh
rename to espeak-data/voices/sit/cmn
diff --git a/espeak-data/voices/my b/espeak-data/voices/sit/my
similarity index 100%
rename from espeak-data/voices/my
rename to espeak-data/voices/sit/my
diff --git a/espeak-data/voices/asia/zh-yue b/espeak-data/voices/sit/yue
similarity index 100%
rename from espeak-data/voices/asia/zh-yue
rename to espeak-data/voices/sit/yue
diff --git a/espeak-data/voices/test/ko b/espeak-data/voices/test/ko
deleted file mode 100644
index d9330a8f..00000000
--- a/espeak-data/voices/test/ko
+++ /dev/null
@@ -1,6 +0,0 @@
-name korean-test
-language ko
-gender male
-pitch 80 118
-intonation 2
-
diff --git a/espeak-data/voices/test/az b/espeak-data/voices/trk/az
similarity index 100%
rename from espeak-data/voices/test/az
rename to espeak-data/voices/trk/az
diff --git a/espeak-data/voices/asia/tr b/espeak-data/voices/trk/tr
similarity index 100%
rename from espeak-data/voices/asia/tr
rename to espeak-data/voices/trk/tr
diff --git a/espeak-data/voices/europe/et b/espeak-data/voices/urj/et
similarity index 100%
rename from espeak-data/voices/europe/et
rename to espeak-data/voices/urj/et
diff --git a/espeak-data/voices/europe/fi b/espeak-data/voices/urj/fi
similarity index 100%
rename from espeak-data/voices/europe/fi
rename to espeak-data/voices/urj/fi
diff --git a/espeak-data/voices/europe/hu b/espeak-data/voices/urj/hu
similarity index 100%
rename from espeak-data/voices/europe/hu
rename to espeak-data/voices/urj/hu
diff --git a/espeak-data/voices/europe/eu b/espeak-data/voices/xaq/eu
similarity index 100%
rename from espeak-data/voices/europe/eu
rename to espeak-data/voices/xaq/eu
diff --git a/espeak-data/voices/europe/lt b/espeak-data/voices/xaq/lt
similarity index 100%
rename from espeak-data/voices/europe/lt
rename to espeak-data/voices/xaq/lt
diff --git a/espeak-data/voices/europe/lv b/espeak-data/voices/xaq/lv
similarity index 100%
rename from espeak-data/voices/europe/lv
rename to espeak-data/voices/xaq/lv
diff --git a/espeak-data/voices/europe/bg b/espeak-data/voices/zls/bg
similarity index 100%
rename from espeak-data/voices/europe/bg
rename to espeak-data/voices/zls/bg
diff --git a/espeak-data/voices/europe/bs b/espeak-data/voices/zls/bs
similarity index 100%
rename from espeak-data/voices/europe/bs
rename to espeak-data/voices/zls/bs
diff --git a/espeak-data/voices/europe/cs b/espeak-data/voices/zls/cs
similarity index 100%
rename from espeak-data/voices/europe/cs
rename to espeak-data/voices/zls/cs
diff --git a/espeak-data/voices/europe/hr b/espeak-data/voices/zls/hr
similarity index 100%
rename from espeak-data/voices/europe/hr
rename to espeak-data/voices/zls/hr
diff --git a/espeak-data/voices/europe/mk b/espeak-data/voices/zls/mk
similarity index 100%
rename from espeak-data/voices/europe/mk
rename to espeak-data/voices/zls/mk
diff --git a/espeak-data/voices/europe/pl b/espeak-data/voices/zls/pl
similarity index 100%
rename from espeak-data/voices/europe/pl
rename to espeak-data/voices/zls/pl
diff --git a/espeak-data/voices/europe/ru b/espeak-data/voices/zls/ru
similarity index 100%
rename from espeak-data/voices/europe/ru
rename to espeak-data/voices/zls/ru
diff --git a/espeak-data/voices/europe/sk b/espeak-data/voices/zls/sk
similarity index 100%
rename from espeak-data/voices/europe/sk
rename to espeak-data/voices/zls/sk
diff --git a/espeak-data/voices/test/sl b/espeak-data/voices/zls/sl
similarity index 100%
rename from espeak-data/voices/test/sl
rename to espeak-data/voices/zls/sl
diff --git a/espeak-data/voices/europe/sr b/espeak-data/voices/zls/sr
similarity index 100%
rename from espeak-data/voices/europe/sr
rename to espeak-data/voices/zls/sr