diff --git a/device-oriole.mk b/device-oriole.mk
index ab1a6ad..0445f01 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -70,22 +70,22 @@
 
 # Voice packs for Text-To-Speech
 PRODUCT_COPY_FILES += \
-	device/google/gs101/tts/ja-jp/ja-jp-x-htm-r22.zvoice:product/tts/google/ja-jp/ja-jp-x-htm-r22.zvoice\
-	device/google/gs101/tts/ja-jp/ja-jp-x-jaa-r22.zvoice:product/tts/google/ja-jp/ja-jp-x-jaa-r22.zvoice\
-	device/google/gs101/tts/ja-jp/ja-jp-x-jab-r22.zvoice:product/tts/google/ja-jp/ja-jp-x-jab-r22.zvoice\
-	device/google/gs101/tts/ja-jp/ja-jp-x-jac-r22.zvoice:product/tts/google/ja-jp/ja-jp-x-jac-r22.zvoice\
-	device/google/gs101/tts/ja-jp/ja-jp-x-jad-r22.zvoice:product/tts/google/ja-jp/ja-jp-x-jad-r22.zvoice\
-	device/google/gs101/tts/ja-jp/ja-jp-x-mfk-r22.zvoice:product/tts/google/ja-jp/ja-jp-x-mfk-r22.zvoice\
-	device/google/gs101/tts/fr-fr/fr-fr-x-multi-r23.zvoice:product/tts/google/fr-fr/fr-fr-x-multi-r23.zvoice\
-	device/google/gs101/tts/de-de/de-de-x-multi-r23.zvoice:product/tts/google/de-de/de-de-x-multi-r23.zvoice\
-	device/google/gs101/tts/it-it/it-it-x-amb-r21.zvoice:product/tts/google/it-it/it-it-x-amb-r21.zvoice\
-	device/google/gs101/tts/it-it/it-it-x-ita-r21.zvoice:product/tts/google/it-it/it-it-x-ita-r21.zvoice\
-	device/google/gs101/tts/it-it/it-it-x-itb-r21.zvoice:product/tts/google/it-it/it-it-x-itb-r21.zvoice\
-	device/google/gs101/tts/it-it/it-it-x-itc-r21.zvoice:product/tts/google/it-it/it-it-x-itc-r21.zvoice\
-	device/google/gs101/tts/it-it/it-it-x-itd-r21.zvoice:product/tts/google/it-it/it-it-x-itd-r21.zvoice\
-	device/google/gs101/tts/it-it/it-it-x-kda-r21.zvoice:product/tts/google/it-it/it-it-x-kda-r21.zvoice\
-	device/google/gs101/tts/es-es/es-es-x-ana-r22.zvoice:product/tts/google/es-es/es-es-x-ana-r22.zvoice\
-	device/google/gs101/tts/es-es/es-es-x-multi-r22.zvoice:product/tts/google/es-es/es-es-x-multi-r22.zvoice
+	device/google/raviole/tts/ja-jp/ja-jp-x-htm-r22.zvoice:product/tts/google/ja-jp/ja-jp-x-htm-r22.zvoice\
+	device/google/raviole/tts/ja-jp/ja-jp-x-jaa-r22.zvoice:product/tts/google/ja-jp/ja-jp-x-jaa-r22.zvoice\
+	device/google/raviole/tts/ja-jp/ja-jp-x-jab-r22.zvoice:product/tts/google/ja-jp/ja-jp-x-jab-r22.zvoice\
+	device/google/raviole/tts/ja-jp/ja-jp-x-jac-r22.zvoice:product/tts/google/ja-jp/ja-jp-x-jac-r22.zvoice\
+	device/google/raviole/tts/ja-jp/ja-jp-x-jad-r22.zvoice:product/tts/google/ja-jp/ja-jp-x-jad-r22.zvoice\
+	device/google/raviole/tts/ja-jp/ja-jp-x-mfk-r22.zvoice:product/tts/google/ja-jp/ja-jp-x-mfk-r22.zvoice\
+	device/google/raviole/tts/fr-fr/fr-fr-x-multi-r23.zvoice:product/tts/google/fr-fr/fr-fr-x-multi-r23.zvoice\
+	device/google/raviole/tts/de-de/de-de-x-multi-r23.zvoice:product/tts/google/de-de/de-de-x-multi-r23.zvoice\
+	device/google/raviole/tts/it-it/it-it-x-amb-r21.zvoice:product/tts/google/it-it/it-it-x-amb-r21.zvoice\
+	device/google/raviole/tts/it-it/it-it-x-ita-r21.zvoice:product/tts/google/it-it/it-it-x-ita-r21.zvoice\
+	device/google/raviole/tts/it-it/it-it-x-itb-r21.zvoice:product/tts/google/it-it/it-it-x-itb-r21.zvoice\
+	device/google/raviole/tts/it-it/it-it-x-itc-r21.zvoice:product/tts/google/it-it/it-it-x-itc-r21.zvoice\
+	device/google/raviole/tts/it-it/it-it-x-itd-r21.zvoice:product/tts/google/it-it/it-it-x-itd-r21.zvoice\
+	device/google/raviole/tts/it-it/it-it-x-kda-r21.zvoice:product/tts/google/it-it/it-it-x-kda-r21.zvoice\
+	device/google/raviole/tts/es-es/es-es-x-ana-r22.zvoice:product/tts/google/es-es/es-es-x-ana-r22.zvoice\
+	device/google/raviole/tts/es-es/es-es-x-multi-r22.zvoice:product/tts/google/es-es/es-es-x-multi-r22.zvoice
 
 # Keyboard bottom padding in dp for portrait mode
 PRODUCT_PRODUCT_PROPERTIES += ro.com.google.ime.kb_pad_port_b=10
diff --git a/device-raven.mk b/device-raven.mk
index 488e695..8f2f382 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -74,22 +74,22 @@
 
 # Voice packs for Text-To-Speech
 PRODUCT_COPY_FILES += \
-	device/google/gs101/tts/ja-jp/ja-jp-x-htm-r22.zvoice:product/tts/google/ja-jp/ja-jp-x-htm-r22.zvoice\
-	device/google/gs101/tts/ja-jp/ja-jp-x-jaa-r22.zvoice:product/tts/google/ja-jp/ja-jp-x-jaa-r22.zvoice\
-	device/google/gs101/tts/ja-jp/ja-jp-x-jab-r22.zvoice:product/tts/google/ja-jp/ja-jp-x-jab-r22.zvoice\
-	device/google/gs101/tts/ja-jp/ja-jp-x-jac-r22.zvoice:product/tts/google/ja-jp/ja-jp-x-jac-r22.zvoice\
-	device/google/gs101/tts/ja-jp/ja-jp-x-jad-r22.zvoice:product/tts/google/ja-jp/ja-jp-x-jad-r22.zvoice\
-	device/google/gs101/tts/ja-jp/ja-jp-x-mfk-r22.zvoice:product/tts/google/ja-jp/ja-jp-x-mfk-r22.zvoice\
-	device/google/gs101/tts/fr-fr/fr-fr-x-multi-r23.zvoice:product/tts/google/fr-fr/fr-fr-x-multi-r23.zvoice\
-	device/google/gs101/tts/de-de/de-de-x-multi-r23.zvoice:product/tts/google/de-de/de-de-x-multi-r23.zvoice\
-	device/google/gs101/tts/it-it/it-it-x-amb-r21.zvoice:product/tts/google/it-it/it-it-x-amb-r21.zvoice\
-	device/google/gs101/tts/it-it/it-it-x-ita-r21.zvoice:product/tts/google/it-it/it-it-x-ita-r21.zvoice\
-	device/google/gs101/tts/it-it/it-it-x-itb-r21.zvoice:product/tts/google/it-it/it-it-x-itb-r21.zvoice\
-	device/google/gs101/tts/it-it/it-it-x-itc-r21.zvoice:product/tts/google/it-it/it-it-x-itc-r21.zvoice\
-	device/google/gs101/tts/it-it/it-it-x-itd-r21.zvoice:product/tts/google/it-it/it-it-x-itd-r21.zvoice\
-	device/google/gs101/tts/it-it/it-it-x-kda-r21.zvoice:product/tts/google/it-it/it-it-x-kda-r21.zvoice\
-	device/google/gs101/tts/es-es/es-es-x-ana-r22.zvoice:product/tts/google/es-es/es-es-x-ana-r22.zvoice\
-	device/google/gs101/tts/es-es/es-es-x-multi-r22.zvoice:product/tts/google/es-es/es-es-x-multi-r22.zvoice
+	device/google/raviole/tts/ja-jp/ja-jp-x-htm-r22.zvoice:product/tts/google/ja-jp/ja-jp-x-htm-r22.zvoice\
+	device/google/raviole/tts/ja-jp/ja-jp-x-jaa-r22.zvoice:product/tts/google/ja-jp/ja-jp-x-jaa-r22.zvoice\
+	device/google/raviole/tts/ja-jp/ja-jp-x-jab-r22.zvoice:product/tts/google/ja-jp/ja-jp-x-jab-r22.zvoice\
+	device/google/raviole/tts/ja-jp/ja-jp-x-jac-r22.zvoice:product/tts/google/ja-jp/ja-jp-x-jac-r22.zvoice\
+	device/google/raviole/tts/ja-jp/ja-jp-x-jad-r22.zvoice:product/tts/google/ja-jp/ja-jp-x-jad-r22.zvoice\
+	device/google/raviole/tts/ja-jp/ja-jp-x-mfk-r22.zvoice:product/tts/google/ja-jp/ja-jp-x-mfk-r22.zvoice\
+	device/google/raviole/tts/fr-fr/fr-fr-x-multi-r23.zvoice:product/tts/google/fr-fr/fr-fr-x-multi-r23.zvoice\
+	device/google/raviole/tts/de-de/de-de-x-multi-r23.zvoice:product/tts/google/de-de/de-de-x-multi-r23.zvoice\
+	device/google/raviole/tts/it-it/it-it-x-amb-r21.zvoice:product/tts/google/it-it/it-it-x-amb-r21.zvoice\
+	device/google/raviole/tts/it-it/it-it-x-ita-r21.zvoice:product/tts/google/it-it/it-it-x-ita-r21.zvoice\
+	device/google/raviole/tts/it-it/it-it-x-itb-r21.zvoice:product/tts/google/it-it/it-it-x-itb-r21.zvoice\
+	device/google/raviole/tts/it-it/it-it-x-itc-r21.zvoice:product/tts/google/it-it/it-it-x-itc-r21.zvoice\
+	device/google/raviole/tts/it-it/it-it-x-itd-r21.zvoice:product/tts/google/it-it/it-it-x-itd-r21.zvoice\
+	device/google/raviole/tts/it-it/it-it-x-kda-r21.zvoice:product/tts/google/it-it/it-it-x-kda-r21.zvoice\
+	device/google/raviole/tts/es-es/es-es-x-ana-r22.zvoice:product/tts/google/es-es/es-es-x-ana-r22.zvoice\
+	device/google/raviole/tts/es-es/es-es-x-multi-r22.zvoice:product/tts/google/es-es/es-es-x-multi-r22.zvoice
 
 # Display LBE
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.lbe.supported=1
diff --git a/tts/de-de/de-de-x-multi-r23.zvoice b/tts/de-de/de-de-x-multi-r23.zvoice
new file mode 100644
index 0000000..57dc1ec
--- /dev/null
+++ b/tts/de-de/de-de-x-multi-r23.zvoice
Binary files differ
diff --git a/tts/es-es/es-es-x-ana-r22.zvoice b/tts/es-es/es-es-x-ana-r22.zvoice
new file mode 100644
index 0000000..bcf4d30
--- /dev/null
+++ b/tts/es-es/es-es-x-ana-r22.zvoice
Binary files differ
diff --git a/tts/es-es/es-es-x-multi-r22.zvoice b/tts/es-es/es-es-x-multi-r22.zvoice
new file mode 100644
index 0000000..1ab7629
--- /dev/null
+++ b/tts/es-es/es-es-x-multi-r22.zvoice
Binary files differ
diff --git a/tts/fr-fr/fr-fr-x-multi-r23.zvoice b/tts/fr-fr/fr-fr-x-multi-r23.zvoice
new file mode 100644
index 0000000..ac179b5
--- /dev/null
+++ b/tts/fr-fr/fr-fr-x-multi-r23.zvoice
Binary files differ
diff --git a/tts/it-it/it-it-x-amb-r21.zvoice b/tts/it-it/it-it-x-amb-r21.zvoice
new file mode 100644
index 0000000..3b761b2
--- /dev/null
+++ b/tts/it-it/it-it-x-amb-r21.zvoice
Binary files differ
diff --git a/tts/it-it/it-it-x-ita-r21.zvoice b/tts/it-it/it-it-x-ita-r21.zvoice
new file mode 100644
index 0000000..780c938
--- /dev/null
+++ b/tts/it-it/it-it-x-ita-r21.zvoice
Binary files differ
diff --git a/tts/it-it/it-it-x-itb-r21.zvoice b/tts/it-it/it-it-x-itb-r21.zvoice
new file mode 100644
index 0000000..0e5b16b
--- /dev/null
+++ b/tts/it-it/it-it-x-itb-r21.zvoice
Binary files differ
diff --git a/tts/it-it/it-it-x-itc-r21.zvoice b/tts/it-it/it-it-x-itc-r21.zvoice
new file mode 100644
index 0000000..5f4cbcc
--- /dev/null
+++ b/tts/it-it/it-it-x-itc-r21.zvoice
Binary files differ
diff --git a/tts/it-it/it-it-x-itd-r21.zvoice b/tts/it-it/it-it-x-itd-r21.zvoice
new file mode 100644
index 0000000..c57cf3f
--- /dev/null
+++ b/tts/it-it/it-it-x-itd-r21.zvoice
Binary files differ
diff --git a/tts/it-it/it-it-x-kda-r21.zvoice b/tts/it-it/it-it-x-kda-r21.zvoice
new file mode 100644
index 0000000..6679970
--- /dev/null
+++ b/tts/it-it/it-it-x-kda-r21.zvoice
Binary files differ
diff --git a/tts/ja-jp/ja-jp-x-htm-r22.zvoice b/tts/ja-jp/ja-jp-x-htm-r22.zvoice
new file mode 100644
index 0000000..765ceab
--- /dev/null
+++ b/tts/ja-jp/ja-jp-x-htm-r22.zvoice
Binary files differ
diff --git a/tts/ja-jp/ja-jp-x-jaa-r22.zvoice b/tts/ja-jp/ja-jp-x-jaa-r22.zvoice
new file mode 100644
index 0000000..82b0e85
--- /dev/null
+++ b/tts/ja-jp/ja-jp-x-jaa-r22.zvoice
Binary files differ
diff --git a/tts/ja-jp/ja-jp-x-jab-r22.zvoice b/tts/ja-jp/ja-jp-x-jab-r22.zvoice
new file mode 100644
index 0000000..35f8e2e
--- /dev/null
+++ b/tts/ja-jp/ja-jp-x-jab-r22.zvoice
Binary files differ
diff --git a/tts/ja-jp/ja-jp-x-jac-r22.zvoice b/tts/ja-jp/ja-jp-x-jac-r22.zvoice
new file mode 100644
index 0000000..b10f725
--- /dev/null
+++ b/tts/ja-jp/ja-jp-x-jac-r22.zvoice
Binary files differ
diff --git a/tts/ja-jp/ja-jp-x-jad-r22.zvoice b/tts/ja-jp/ja-jp-x-jad-r22.zvoice
new file mode 100644
index 0000000..3cf1598
--- /dev/null
+++ b/tts/ja-jp/ja-jp-x-jad-r22.zvoice
Binary files differ
diff --git a/tts/ja-jp/ja-jp-x-mfk-r22.zvoice b/tts/ja-jp/ja-jp-x-mfk-r22.zvoice
new file mode 100644
index 0000000..3684110
--- /dev/null
+++ b/tts/ja-jp/ja-jp-x-mfk-r22.zvoice
Binary files differ