diff --git a/sdcard/numbers/0.wav b/sdcard/NUMBERS/GB/0.wav
similarity index 100%
rename from sdcard/numbers/0.wav
rename to sdcard/NUMBERS/GB/0.wav
diff --git a/sdcard/numbers/1.wav b/sdcard/NUMBERS/GB/1.wav
similarity index 100%
rename from sdcard/numbers/1.wav
rename to sdcard/NUMBERS/GB/1.wav
diff --git a/sdcard/numbers/2.wav b/sdcard/NUMBERS/GB/2.wav
similarity index 100%
rename from sdcard/numbers/2.wav
rename to sdcard/NUMBERS/GB/2.wav
diff --git a/sdcard/numbers/3.wav b/sdcard/NUMBERS/GB/3.wav
similarity index 91%
rename from sdcard/numbers/3.wav
rename to sdcard/NUMBERS/GB/3.wav
index 765fea878..33fd83db2 100644
Binary files a/sdcard/numbers/3.wav and b/sdcard/NUMBERS/GB/3.wav differ
diff --git a/sdcard/numbers/4.wav b/sdcard/NUMBERS/GB/4.wav
similarity index 100%
rename from sdcard/numbers/4.wav
rename to sdcard/NUMBERS/GB/4.wav
diff --git a/sdcard/numbers/5.wav b/sdcard/NUMBERS/GB/5.wav
similarity index 100%
rename from sdcard/numbers/5.wav
rename to sdcard/NUMBERS/GB/5.wav
diff --git a/sdcard/numbers/6.wav b/sdcard/NUMBERS/GB/6.wav
similarity index 100%
rename from sdcard/numbers/6.wav
rename to sdcard/NUMBERS/GB/6.wav
diff --git a/sdcard/numbers/7.wav b/sdcard/NUMBERS/GB/7.wav
similarity index 100%
rename from sdcard/numbers/7.wav
rename to sdcard/NUMBERS/GB/7.wav
diff --git a/sdcard/numbers/8.wav b/sdcard/NUMBERS/GB/8.wav
similarity index 100%
rename from sdcard/numbers/8.wav
rename to sdcard/NUMBERS/GB/8.wav
diff --git a/sdcard/numbers/9.wav b/sdcard/NUMBERS/GB/9.wav
similarity index 100%
rename from sdcard/numbers/9.wav
rename to sdcard/NUMBERS/GB/9.wav
diff --git a/sdcard/numbers/announce.wav b/sdcard/NUMBERS/GB/announce.wav
similarity index 100%
rename from sdcard/numbers/announce.wav
rename to sdcard/NUMBERS/GB/announce.wav
diff --git a/sdcard/NUMBERS/UA/0.wav b/sdcard/NUMBERS/UA/0.wav
new file mode 100644
index 000000000..583fb58ca
Binary files /dev/null and b/sdcard/NUMBERS/UA/0.wav differ
diff --git a/sdcard/NUMBERS/UA/1.wav b/sdcard/NUMBERS/UA/1.wav
new file mode 100644
index 000000000..0c7194d5a
Binary files /dev/null and b/sdcard/NUMBERS/UA/1.wav differ
diff --git a/sdcard/NUMBERS/UA/2.wav b/sdcard/NUMBERS/UA/2.wav
new file mode 100644
index 000000000..c0ed2e210
Binary files /dev/null and b/sdcard/NUMBERS/UA/2.wav differ
diff --git a/sdcard/NUMBERS/UA/3.wav b/sdcard/NUMBERS/UA/3.wav
new file mode 100644
index 000000000..34b5011ca
Binary files /dev/null and b/sdcard/NUMBERS/UA/3.wav differ
diff --git a/sdcard/NUMBERS/UA/4.wav b/sdcard/NUMBERS/UA/4.wav
new file mode 100644
index 000000000..a46ea6ac1
Binary files /dev/null and b/sdcard/NUMBERS/UA/4.wav differ
diff --git a/sdcard/NUMBERS/UA/5.wav b/sdcard/NUMBERS/UA/5.wav
new file mode 100644
index 000000000..92c889a11
Binary files /dev/null and b/sdcard/NUMBERS/UA/5.wav differ
diff --git a/sdcard/NUMBERS/UA/6.wav b/sdcard/NUMBERS/UA/6.wav
new file mode 100644
index 000000000..0fc0d6716
Binary files /dev/null and b/sdcard/NUMBERS/UA/6.wav differ
diff --git a/sdcard/NUMBERS/UA/7.wav b/sdcard/NUMBERS/UA/7.wav
new file mode 100644
index 000000000..bc0f28ce3
Binary files /dev/null and b/sdcard/NUMBERS/UA/7.wav differ
diff --git a/sdcard/NUMBERS/UA/8.wav b/sdcard/NUMBERS/UA/8.wav
new file mode 100644
index 000000000..baf277fc7
Binary files /dev/null and b/sdcard/NUMBERS/UA/8.wav differ
diff --git a/sdcard/NUMBERS/UA/9.wav b/sdcard/NUMBERS/UA/9.wav
new file mode 100644
index 000000000..0628f94bc
Binary files /dev/null and b/sdcard/NUMBERS/UA/9.wav differ
diff --git a/sdcard/NUMBERS/UA2/0.wav b/sdcard/NUMBERS/UA2/0.wav
new file mode 100644
index 000000000..90725f142
Binary files /dev/null and b/sdcard/NUMBERS/UA2/0.wav differ
diff --git a/sdcard/NUMBERS/UA2/1.wav b/sdcard/NUMBERS/UA2/1.wav
new file mode 100644
index 000000000..69f913340
Binary files /dev/null and b/sdcard/NUMBERS/UA2/1.wav differ
diff --git a/sdcard/NUMBERS/UA2/2.wav b/sdcard/NUMBERS/UA2/2.wav
new file mode 100644
index 000000000..42b153af8
Binary files /dev/null and b/sdcard/NUMBERS/UA2/2.wav differ
diff --git a/sdcard/NUMBERS/UA2/3.wav b/sdcard/NUMBERS/UA2/3.wav
new file mode 100644
index 000000000..8044ea4ed
Binary files /dev/null and b/sdcard/NUMBERS/UA2/3.wav differ
diff --git a/sdcard/NUMBERS/UA2/4.wav b/sdcard/NUMBERS/UA2/4.wav
new file mode 100644
index 000000000..e0e815130
Binary files /dev/null and b/sdcard/NUMBERS/UA2/4.wav differ
diff --git a/sdcard/NUMBERS/UA2/5.wav b/sdcard/NUMBERS/UA2/5.wav
new file mode 100644
index 000000000..06eaec49d
Binary files /dev/null and b/sdcard/NUMBERS/UA2/5.wav differ
diff --git a/sdcard/NUMBERS/UA2/6.wav b/sdcard/NUMBERS/UA2/6.wav
new file mode 100644
index 000000000..5b5e9f1fa
Binary files /dev/null and b/sdcard/NUMBERS/UA2/6.wav differ
diff --git a/sdcard/NUMBERS/UA2/7.wav b/sdcard/NUMBERS/UA2/7.wav
new file mode 100644
index 000000000..40262eb17
Binary files /dev/null and b/sdcard/NUMBERS/UA2/7.wav differ
diff --git a/sdcard/NUMBERS/UA2/8.wav b/sdcard/NUMBERS/UA2/8.wav
new file mode 100644
index 000000000..f27f5c6c8
Binary files /dev/null and b/sdcard/NUMBERS/UA2/8.wav differ
diff --git a/sdcard/NUMBERS/UA2/9.wav b/sdcard/NUMBERS/UA2/9.wav
new file mode 100644
index 000000000..8d0487528
Binary files /dev/null and b/sdcard/NUMBERS/UA2/9.wav differ
diff --git a/sdcard/xylos/a.wav b/sdcard/xylos/a.wav
deleted file mode 100644
index a335344d0..000000000
Binary files a/sdcard/xylos/a.wav and /dev/null differ
diff --git a/sdcard/xylos/address.wav b/sdcard/xylos/address.wav
deleted file mode 100644
index d6ed09383..000000000
Binary files a/sdcard/xylos/address.wav and /dev/null differ
diff --git a/sdcard/xylos/b.wav b/sdcard/xylos/b.wav
deleted file mode 100644
index 2da7f6428..000000000
Binary files a/sdcard/xylos/b.wav and /dev/null differ
diff --git a/sdcard/xylos/c.wav b/sdcard/xylos/c.wav
deleted file mode 100644
index 041cda0cc..000000000
Binary files a/sdcard/xylos/c.wav and /dev/null differ
diff --git a/sdcard/xylos/city.wav b/sdcard/xylos/city.wav
deleted file mode 100644
index efe4eadd9..000000000
Binary files a/sdcard/xylos/city.wav and /dev/null differ
diff --git a/sdcard/xylos/d.wav b/sdcard/xylos/d.wav
deleted file mode 100644
index 9b94654ef..000000000
Binary files a/sdcard/xylos/d.wav and /dev/null differ
diff --git a/sdcard/xylos/e.wav b/sdcard/xylos/e.wav
deleted file mode 100644
index d57658024..000000000
Binary files a/sdcard/xylos/e.wav and /dev/null differ
diff --git a/sdcard/xylos/eight.wav b/sdcard/xylos/eight.wav
deleted file mode 100644
index f11fa2f8f..000000000
Binary files a/sdcard/xylos/eight.wav and /dev/null differ
diff --git a/sdcard/xylos/f.wav b/sdcard/xylos/f.wav
deleted file mode 100644
index c437691bd..000000000
Binary files a/sdcard/xylos/f.wav and /dev/null differ
diff --git a/sdcard/xylos/family.wav b/sdcard/xylos/family.wav
deleted file mode 100644
index bf4b11e0c..000000000
Binary files a/sdcard/xylos/family.wav and /dev/null differ
diff --git a/sdcard/xylos/five.wav b/sdcard/xylos/five.wav
deleted file mode 100644
index 739d4aad6..000000000
Binary files a/sdcard/xylos/five.wav and /dev/null differ
diff --git a/sdcard/xylos/four.wav b/sdcard/xylos/four.wav
deleted file mode 100644
index af58fa233..000000000
Binary files a/sdcard/xylos/four.wav and /dev/null differ
diff --git a/sdcard/xylos/header.wav b/sdcard/xylos/header.wav
deleted file mode 100644
index 4e0cd38ff..000000000
Binary files a/sdcard/xylos/header.wav and /dev/null differ
diff --git a/sdcard/xylos/ignore.wav b/sdcard/xylos/ignore.wav
deleted file mode 100644
index 6ba78657f..000000000
Binary files a/sdcard/xylos/ignore.wav and /dev/null differ
diff --git a/sdcard/xylos/nine.wav b/sdcard/xylos/nine.wav
deleted file mode 100644
index c742b430d..000000000
Binary files a/sdcard/xylos/nine.wav and /dev/null differ
diff --git a/sdcard/xylos/off.wav b/sdcard/xylos/off.wav
deleted file mode 100644
index 65af80bbe..000000000
Binary files a/sdcard/xylos/off.wav and /dev/null differ
diff --git a/sdcard/xylos/on.wav b/sdcard/xylos/on.wav
deleted file mode 100644
index 2135bf316..000000000
Binary files a/sdcard/xylos/on.wav and /dev/null differ
diff --git a/sdcard/xylos/one.wav b/sdcard/xylos/one.wav
deleted file mode 100644
index d11750075..000000000
Binary files a/sdcard/xylos/one.wav and /dev/null differ
diff --git a/sdcard/xylos/relays.wav b/sdcard/xylos/relays.wav
deleted file mode 100644
index 38127d3bf..000000000
Binary files a/sdcard/xylos/relays.wav and /dev/null differ
diff --git a/sdcard/xylos/seven.wav b/sdcard/xylos/seven.wav
deleted file mode 100644
index 3300898d1..000000000
Binary files a/sdcard/xylos/seven.wav and /dev/null differ
diff --git a/sdcard/xylos/six.wav b/sdcard/xylos/six.wav
deleted file mode 100644
index b0421c031..000000000
Binary files a/sdcard/xylos/six.wav and /dev/null differ
diff --git a/sdcard/xylos/subfamily.wav b/sdcard/xylos/subfamily.wav
deleted file mode 100644
index 53c7e0f2a..000000000
Binary files a/sdcard/xylos/subfamily.wav and /dev/null differ
diff --git a/sdcard/xylos/three.wav b/sdcard/xylos/three.wav
deleted file mode 100644
index 5630043b8..000000000
Binary files a/sdcard/xylos/three.wav and /dev/null differ
diff --git a/sdcard/xylos/trailer.wav b/sdcard/xylos/trailer.wav
deleted file mode 100644
index 83b15ab17..000000000
Binary files a/sdcard/xylos/trailer.wav and /dev/null differ
diff --git a/sdcard/xylos/two.wav b/sdcard/xylos/two.wav
deleted file mode 100644
index 2c5eac9b7..000000000
Binary files a/sdcard/xylos/two.wav and /dev/null differ
diff --git a/sdcard/xylos/zero.wav b/sdcard/xylos/zero.wav
deleted file mode 100644
index de71ea157..000000000
Binary files a/sdcard/xylos/zero.wav and /dev/null differ