diff --git a/.github/workflows/engines-cross-ci.yml b/.github/workflows/engines-cross-ci.yml
index 1500d130bb5..b31f72f383d 100644
--- a/.github/workflows/engines-cross-ci.yml
+++ b/.github/workflows/engines-cross-ci.yml
@@ -1,5 +1,5 @@
-# Cross-platform lanes for the engines (parakeet-cpp/, tts-cpp/ — engines/*
-# after the repo reorg QIP; update the path filters + SRC map when it lands).
+# Cross-platform lanes for the engines (engines/parakeet/, engines/tts/ —
+# moved from parakeet-cpp/, tts-cpp/ by the repo reorg QIP, PR 1).
 #
 # Complements parakeet-ci.yml / tts-ci.yml (linux+mac build+test):
 #   - windows: full build + non-GPU ctest (MSVC, static ggml)
@@ -14,13 +14,13 @@ on:
   push:
     branches: [master]
     paths:
-      - 'parakeet-cpp/**'
-      - 'tts-cpp/**'
+      - 'engines/parakeet/**'
+      - 'engines/tts/**'
       - '.github/workflows/engines-cross-ci.yml'
   pull_request:
     paths:
-      - 'parakeet-cpp/**'
-      - 'tts-cpp/**'
+      - 'engines/parakeet/**'
+      - 'engines/tts/**'
       - '.github/workflows/engines-cross-ci.yml'
   workflow_dispatch:
 
@@ -43,10 +43,10 @@ jobs:
         engine: [parakeet, tts]
         include:
           - engine: parakeet
-            src: parakeet-cpp
+            src: engines/parakeet
             cmake_flags: -DPARAKEET_USE_SYSTEM_GGML=ON -DPARAKEET_BUILD_TESTS=ON -DPARAKEET_BUILD_EXAMPLES=OFF
           - engine: tts
-            src: tts-cpp
+            src: engines/tts
             cmake_flags: -DTTS_CPP_BUILD_TESTS=ON
     runs-on: windows-2022
     timeout-minutes: 90
@@ -65,7 +65,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: ggml-install
-          key: ggml-install-windows-2022-msvc-static-${{ steps.ggml.outputs.sha }}
+          key: ggml-install-portable-windows-2022-msvc-static-${{ steps.ggml.outputs.sha }}
 
       # Static ggml on Windows sidesteps DLL discovery for the test exes.
       - name: Build ggml (MSVC, static, CPU-only)
@@ -79,6 +79,7 @@ jobs:
           git -C ggml-src checkout -q FETCH_HEAD
           cmake -S ggml-src -B ggml-src/build -A x64 \
             -DBUILD_SHARED_LIBS=OFF \
+            -DGGML_NATIVE=OFF \
             -DGGML_BUILD_TESTS=OFF \
             -DGGML_BUILD_EXAMPLES=OFF \
             -DCMAKE_INSTALL_PREFIX="$PWD/ggml-install"
@@ -104,10 +105,10 @@ jobs:
         engine: [parakeet, tts]
         include:
           - engine: parakeet
-            src: parakeet-cpp
+            src: engines/parakeet
             cmake_flags: -DPARAKEET_USE_SYSTEM_GGML=ON -DPARAKEET_BUILD_TESTS=OFF -DPARAKEET_BUILD_EXAMPLES=OFF
           - engine: tts
-            src: tts-cpp
+            src: engines/tts
             cmake_flags: -DTTS_CPP_BUILD_TESTS=OFF
     runs-on: ubuntu-24.04
     timeout-minutes: 60
@@ -168,10 +169,10 @@ jobs:
         engine: [parakeet, tts]
         include:
           - engine: parakeet
-            src: parakeet-cpp
+            src: engines/parakeet
             cmake_flags: -DPARAKEET_USE_SYSTEM_GGML=ON -DPARAKEET_BUILD_TESTS=OFF -DPARAKEET_BUILD_EXAMPLES=OFF
           - engine: tts
-            src: tts-cpp
+            src: engines/tts
             cmake_flags: -DTTS_CPP_BUILD_TESTS=OFF
     runs-on: macos-14
     timeout-minutes: 60
diff --git a/.github/workflows/parakeet-ci.yml b/.github/workflows/parakeet-ci.yml
index 02ce8ee9d49..ba0ff40680e 100644
--- a/.github/workflows/parakeet-ci.yml
+++ b/.github/workflows/parakeet-ci.yml
@@ -1,5 +1,5 @@
-# CI for the parakeet engine (parakeet-cpp/ — engines/parakeet/ after the
-# repo reorg QIP lands; update the path filters below when it does).
+# CI for the parakeet engine (engines/parakeet/ — moved from parakeet-cpp/
+# by the repo reorg QIP, PR 1).
 #
 # Scope (QIP "PR 0" lane): build the engine + every test harness against
 # system ggml (qvac-ext-ggml @ speech, the same fork the ggml-speech vcpkg
@@ -14,11 +14,11 @@ on:
   push:
     branches: [master]
     paths:
-      - 'parakeet-cpp/**'
+      - 'engines/parakeet/**'
       - '.github/workflows/parakeet-ci.yml'
   pull_request:
     paths:
-      - 'parakeet-cpp/**'
+      - 'engines/parakeet/**'
       - '.github/workflows/parakeet-ci.yml'
   workflow_dispatch:
     inputs:
@@ -36,7 +36,7 @@ concurrency:
 
 env:
   GGML_REPO: https://github.com/tetherto/qvac-ext-ggml.git
-  GGML_BRANCH: speech # keep in sync with parakeet-cpp/scripts/setup-ggml.sh
+  GGML_BRANCH: speech # keep in sync with engines/parakeet/scripts/setup-ggml.sh
 
 jobs:
   build-test:
@@ -63,7 +63,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: ggml-install
-          key: ggml-install-${{ matrix.os }}-${{ steps.ggml.outputs.sha }}
+          key: ggml-install-portable-${{ matrix.os }}-${{ steps.ggml.outputs.sha }}
 
       - name: Cache ccache
         uses: actions/cache@v4
@@ -88,6 +88,7 @@ jobs:
           cmake -S ggml-src -B ggml-src/build \
             -DCMAKE_BUILD_TYPE=Release \
             -DBUILD_SHARED_LIBS=ON \
+            -DGGML_NATIVE=OFF \
             -DGGML_METAL=OFF \
             -DGGML_BUILD_TESTS=OFF \
             -DGGML_BUILD_EXAMPLES=OFF \
@@ -97,7 +98,7 @@ jobs:
 
       - name: Configure
         run: |
-          cmake -S parakeet-cpp -B build \
+          cmake -S engines/parakeet -B build \
             -DCMAKE_BUILD_TYPE=Release \
             -DPARAKEET_USE_SYSTEM_GGML=ON \
             -DPARAKEET_BUILD_TESTS=ON \
@@ -139,7 +140,7 @@ jobs:
             -DGGML_VULKAN=ON \
             -DCMAKE_INSTALL_PREFIX="$PWD/ggml-install"
           cmake --build ggml-src/build -j && cmake --install ggml-src/build
-          cmake -S parakeet-cpp -B build -DCMAKE_BUILD_TYPE=Release \
+          cmake -S engines/parakeet -B build -DCMAKE_BUILD_TYPE=Release \
             -DPARAKEET_USE_SYSTEM_GGML=ON -DPARAKEET_BUILD_TESTS=ON \
             -DCMAKE_PREFIX_PATH="$PWD/ggml-install"
           cmake --build build -j
diff --git a/.github/workflows/tts-ci.yml b/.github/workflows/tts-ci.yml
index 00234903010..5d59a1f65c3 100644
--- a/.github/workflows/tts-ci.yml
+++ b/.github/workflows/tts-ci.yml
@@ -1,5 +1,5 @@
-# CI for the TTS engines (tts-cpp/ — engines/tts/ after the repo reorg QIP
-# lands; update the path filters below when it does).
+# CI for the TTS engines (engines/tts/ — moved from tts-cpp/ by the repo
+# reorg QIP, PR 1).
 #
 # Scope (QIP "PR 0" lane): build chatterbox + supertonic + lavasr and every
 # test harness against system ggml (qvac-ext-ggml @ speech — mandatory here:
@@ -13,11 +13,11 @@ on:
   push:
     branches: [master]
     paths:
-      - 'tts-cpp/**'
+      - 'engines/tts/**'
       - '.github/workflows/tts-ci.yml'
   pull_request:
     paths:
-      - 'tts-cpp/**'
+      - 'engines/tts/**'
       - '.github/workflows/tts-ci.yml'
   workflow_dispatch:
     inputs:
@@ -62,7 +62,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: ggml-install
-          key: ggml-install-${{ matrix.os }}-${{ steps.ggml.outputs.sha }}
+          key: ggml-install-portable-${{ matrix.os }}-${{ steps.ggml.outputs.sha }}
 
       - name: Cache ccache
         uses: actions/cache@v4
@@ -89,6 +89,7 @@ jobs:
           cmake -S ggml-src -B ggml-src/build \
             -DCMAKE_BUILD_TYPE=Release \
             -DBUILD_SHARED_LIBS=ON \
+            -DGGML_NATIVE=OFF \
             -DGGML_METAL=OFF \
             -DGGML_BUILD_TESTS=OFF \
             -DGGML_BUILD_EXAMPLES=OFF \
@@ -98,7 +99,7 @@ jobs:
 
       - name: Configure
         run: |
-          cmake -S tts-cpp -B build \
+          cmake -S engines/tts -B build \
             -DCMAKE_BUILD_TYPE=Release \
             -DTTS_CPP_BUILD_TESTS=ON \
             -DCMAKE_PREFIX_PATH="$PWD/ggml-install"
@@ -139,7 +140,7 @@ jobs:
             -DGGML_VULKAN=ON \
             -DCMAKE_INSTALL_PREFIX="$PWD/ggml-install"
           cmake --build ggml-src/build -j && cmake --install ggml-src/build
-          cmake -S tts-cpp -B build -DCMAKE_BUILD_TYPE=Release \
+          cmake -S engines/tts -B build -DCMAKE_BUILD_TYPE=Release \
             -DTTS_CPP_BUILD_TESTS=ON \
             -DCMAKE_PREFIX_PATH="$PWD/ggml-install"
           cmake --build build -j
diff --git a/parakeet-cpp/.gitignore b/engines/parakeet/.gitignore
similarity index 100%
rename from parakeet-cpp/.gitignore
rename to engines/parakeet/.gitignore
diff --git a/parakeet-cpp/CMakeLists.txt b/engines/parakeet/CMakeLists.txt
similarity index 100%
rename from parakeet-cpp/CMakeLists.txt
rename to engines/parakeet/CMakeLists.txt
diff --git a/parakeet-cpp/LICENSE b/engines/parakeet/LICENSE
similarity index 100%
rename from parakeet-cpp/LICENSE
rename to engines/parakeet/LICENSE
diff --git a/parakeet-cpp/NOTICE b/engines/parakeet/NOTICE
similarity index 100%
rename from parakeet-cpp/NOTICE
rename to engines/parakeet/NOTICE
diff --git a/parakeet-cpp/PROGRESS.md b/engines/parakeet/PROGRESS.md
similarity index 100%
rename from parakeet-cpp/PROGRESS.md
rename to engines/parakeet/PROGRESS.md
diff --git a/parakeet-cpp/README.md b/engines/parakeet/README.md
similarity index 100%
rename from parakeet-cpp/README.md
rename to engines/parakeet/README.md
diff --git a/parakeet-cpp/cmake/parakeet-cppConfig.cmake.in b/engines/parakeet/cmake/parakeet-cppConfig.cmake.in
similarity index 100%
rename from parakeet-cpp/cmake/parakeet-cppConfig.cmake.in
rename to engines/parakeet/cmake/parakeet-cppConfig.cmake.in
diff --git a/parakeet-cpp/examples/live-mic-attributed.cpp b/engines/parakeet/examples/live-mic-attributed.cpp
similarity index 100%
rename from parakeet-cpp/examples/live-mic-attributed.cpp
rename to engines/parakeet/examples/live-mic-attributed.cpp
diff --git a/parakeet-cpp/examples/live-mic.cpp b/engines/parakeet/examples/live-mic.cpp
similarity index 100%
rename from parakeet-cpp/examples/live-mic.cpp
rename to engines/parakeet/examples/live-mic.cpp
diff --git a/parakeet-cpp/examples/miniaudio.h b/engines/parakeet/examples/miniaudio.h
similarity index 100%
rename from parakeet-cpp/examples/miniaudio.h
rename to engines/parakeet/examples/miniaudio.h
diff --git a/parakeet-cpp/examples/miniaudio_impl.cpp b/engines/parakeet/examples/miniaudio_impl.cpp
similarity index 100%
rename from parakeet-cpp/examples/miniaudio_impl.cpp
rename to engines/parakeet/examples/miniaudio_impl.cpp
diff --git a/parakeet-cpp/include/parakeet/attributed.h b/engines/parakeet/include/parakeet/attributed.h
similarity index 100%
rename from parakeet-cpp/include/parakeet/attributed.h
rename to engines/parakeet/include/parakeet/attributed.h
diff --git a/parakeet-cpp/include/parakeet/cli.h b/engines/parakeet/include/parakeet/cli.h
similarity index 100%
rename from parakeet-cpp/include/parakeet/cli.h
rename to engines/parakeet/include/parakeet/cli.h
diff --git a/parakeet-cpp/include/parakeet/diarization.h b/engines/parakeet/include/parakeet/diarization.h
similarity index 100%
rename from parakeet-cpp/include/parakeet/diarization.h
rename to engines/parakeet/include/parakeet/diarization.h
diff --git a/parakeet-cpp/include/parakeet/engine.h b/engines/parakeet/include/parakeet/engine.h
similarity index 100%
rename from parakeet-cpp/include/parakeet/engine.h
rename to engines/parakeet/include/parakeet/engine.h
diff --git a/parakeet-cpp/include/parakeet/export.h b/engines/parakeet/include/parakeet/export.h
similarity index 100%
rename from parakeet-cpp/include/parakeet/export.h
rename to engines/parakeet/include/parakeet/export.h
diff --git a/parakeet-cpp/include/parakeet/log.h b/engines/parakeet/include/parakeet/log.h
similarity index 100%
rename from parakeet-cpp/include/parakeet/log.h
rename to engines/parakeet/include/parakeet/log.h
diff --git a/parakeet-cpp/include/parakeet/parakeet.h b/engines/parakeet/include/parakeet/parakeet.h
similarity index 100%
rename from parakeet-cpp/include/parakeet/parakeet.h
rename to engines/parakeet/include/parakeet/parakeet.h
diff --git a/parakeet-cpp/include/parakeet/streaming.h b/engines/parakeet/include/parakeet/streaming.h
similarity index 100%
rename from parakeet-cpp/include/parakeet/streaming.h
rename to engines/parakeet/include/parakeet/streaming.h
diff --git a/parakeet-cpp/scripts/convert-nemo-to-gguf.py b/engines/parakeet/scripts/convert-nemo-to-gguf.py
similarity index 100%
rename from parakeet-cpp/scripts/convert-nemo-to-gguf.py
rename to engines/parakeet/scripts/convert-nemo-to-gguf.py
diff --git a/parakeet-cpp/scripts/download-all-models.sh b/engines/parakeet/scripts/download-all-models.sh
similarity index 100%
rename from parakeet-cpp/scripts/download-all-models.sh
rename to engines/parakeet/scripts/download-all-models.sh
diff --git a/parakeet-cpp/scripts/dump-ctc-reference.py b/engines/parakeet/scripts/dump-ctc-reference.py
similarity index 100%
rename from parakeet-cpp/scripts/dump-ctc-reference.py
rename to engines/parakeet/scripts/dump-ctc-reference.py
diff --git a/parakeet-cpp/scripts/dump-eou-reference.py b/engines/parakeet/scripts/dump-eou-reference.py
similarity index 100%
rename from parakeet-cpp/scripts/dump-eou-reference.py
rename to engines/parakeet/scripts/dump-eou-reference.py
diff --git a/parakeet-cpp/scripts/dump-sortformer-reference.py b/engines/parakeet/scripts/dump-sortformer-reference.py
similarity index 100%
rename from parakeet-cpp/scripts/dump-sortformer-reference.py
rename to engines/parakeet/scripts/dump-sortformer-reference.py
diff --git a/parakeet-cpp/scripts/dump-tdt-reference.py b/engines/parakeet/scripts/dump-tdt-reference.py
similarity index 100%
rename from parakeet-cpp/scripts/dump-tdt-reference.py
rename to engines/parakeet/scripts/dump-tdt-reference.py
diff --git a/parakeet-cpp/scripts/ref-encoder-from-gguf.py b/engines/parakeet/scripts/ref-encoder-from-gguf.py
similarity index 100%
rename from parakeet-cpp/scripts/ref-encoder-from-gguf.py
rename to engines/parakeet/scripts/ref-encoder-from-gguf.py
diff --git a/parakeet-cpp/scripts/setup-ggml.sh b/engines/parakeet/scripts/setup-ggml.sh
similarity index 100%
rename from parakeet-cpp/scripts/setup-ggml.sh
rename to engines/parakeet/scripts/setup-ggml.sh
diff --git a/parakeet-cpp/scripts/streaming-reference.py b/engines/parakeet/scripts/streaming-reference.py
similarity index 100%
rename from parakeet-cpp/scripts/streaming-reference.py
rename to engines/parakeet/scripts/streaming-reference.py
diff --git a/parakeet-cpp/scripts/verify-gguf-roundtrip.py b/engines/parakeet/scripts/verify-gguf-roundtrip.py
similarity index 100%
rename from parakeet-cpp/scripts/verify-gguf-roundtrip.py
rename to engines/parakeet/scripts/verify-gguf-roundtrip.py
diff --git a/parakeet-cpp/src/backend_util.h b/engines/parakeet/src/backend_util.h
similarity index 100%
rename from parakeet-cpp/src/backend_util.h
rename to engines/parakeet/src/backend_util.h
diff --git a/parakeet-cpp/src/cli_main.cpp b/engines/parakeet/src/cli_main.cpp
similarity index 100%
rename from parakeet-cpp/src/cli_main.cpp
rename to engines/parakeet/src/cli_main.cpp
diff --git a/parakeet-cpp/src/dr_wav.h b/engines/parakeet/src/dr_wav.h
similarity index 100%
rename from parakeet-cpp/src/dr_wav.h
rename to engines/parakeet/src/dr_wav.h
diff --git a/parakeet-cpp/src/energy_vad.cpp b/engines/parakeet/src/energy_vad.cpp
similarity index 100%
rename from parakeet-cpp/src/energy_vad.cpp
rename to engines/parakeet/src/energy_vad.cpp
diff --git a/parakeet-cpp/src/energy_vad.h b/engines/parakeet/src/energy_vad.h
similarity index 100%
rename from parakeet-cpp/src/energy_vad.h
rename to engines/parakeet/src/energy_vad.h
diff --git a/parakeet-cpp/src/main.cpp b/engines/parakeet/src/main.cpp
similarity index 100%
rename from parakeet-cpp/src/main.cpp
rename to engines/parakeet/src/main.cpp
diff --git a/parakeet-cpp/src/mel_preprocess.cpp b/engines/parakeet/src/mel_preprocess.cpp
similarity index 100%
rename from parakeet-cpp/src/mel_preprocess.cpp
rename to engines/parakeet/src/mel_preprocess.cpp
diff --git a/parakeet-cpp/src/mel_preprocess.h b/engines/parakeet/src/mel_preprocess.h
similarity index 100%
rename from parakeet-cpp/src/mel_preprocess.h
rename to engines/parakeet/src/mel_preprocess.h
diff --git a/parakeet-cpp/src/parakeet_ctc.cpp b/engines/parakeet/src/parakeet_ctc.cpp
similarity index 100%
rename from parakeet-cpp/src/parakeet_ctc.cpp
rename to engines/parakeet/src/parakeet_ctc.cpp
diff --git a/parakeet-cpp/src/parakeet_ctc.h b/engines/parakeet/src/parakeet_ctc.h
similarity index 100%
rename from parakeet-cpp/src/parakeet_ctc.h
rename to engines/parakeet/src/parakeet_ctc.h
diff --git a/parakeet-cpp/src/parakeet_engine.cpp b/engines/parakeet/src/parakeet_engine.cpp
similarity index 100%
rename from parakeet-cpp/src/parakeet_engine.cpp
rename to engines/parakeet/src/parakeet_engine.cpp
diff --git a/parakeet-cpp/src/parakeet_eou.cpp b/engines/parakeet/src/parakeet_eou.cpp
similarity index 100%
rename from parakeet-cpp/src/parakeet_eou.cpp
rename to engines/parakeet/src/parakeet_eou.cpp
diff --git a/parakeet-cpp/src/parakeet_eou.h b/engines/parakeet/src/parakeet_eou.h
similarity index 100%
rename from parakeet-cpp/src/parakeet_eou.h
rename to engines/parakeet/src/parakeet_eou.h
diff --git a/parakeet-cpp/src/parakeet_log.cpp b/engines/parakeet/src/parakeet_log.cpp
similarity index 100%
rename from parakeet-cpp/src/parakeet_log.cpp
rename to engines/parakeet/src/parakeet_log.cpp
diff --git a/parakeet-cpp/src/parakeet_log.h b/engines/parakeet/src/parakeet_log.h
similarity index 100%
rename from parakeet-cpp/src/parakeet_log.h
rename to engines/parakeet/src/parakeet_log.h
diff --git a/parakeet-cpp/src/parakeet_sortformer.cpp b/engines/parakeet/src/parakeet_sortformer.cpp
similarity index 100%
rename from parakeet-cpp/src/parakeet_sortformer.cpp
rename to engines/parakeet/src/parakeet_sortformer.cpp
diff --git a/parakeet-cpp/src/parakeet_sortformer.h b/engines/parakeet/src/parakeet_sortformer.h
similarity index 100%
rename from parakeet-cpp/src/parakeet_sortformer.h
rename to engines/parakeet/src/parakeet_sortformer.h
diff --git a/parakeet-cpp/src/parakeet_tdt.cpp b/engines/parakeet/src/parakeet_tdt.cpp
similarity index 100%
rename from parakeet-cpp/src/parakeet_tdt.cpp
rename to engines/parakeet/src/parakeet_tdt.cpp
diff --git a/parakeet-cpp/src/parakeet_tdt.h b/engines/parakeet/src/parakeet_tdt.h
similarity index 100%
rename from parakeet-cpp/src/parakeet_tdt.h
rename to engines/parakeet/src/parakeet_tdt.h
diff --git a/parakeet-cpp/src/sentencepiece_bpe.cpp b/engines/parakeet/src/sentencepiece_bpe.cpp
similarity index 100%
rename from parakeet-cpp/src/sentencepiece_bpe.cpp
rename to engines/parakeet/src/sentencepiece_bpe.cpp
diff --git a/parakeet-cpp/src/sentencepiece_bpe.h b/engines/parakeet/src/sentencepiece_bpe.h
similarity index 100%
rename from parakeet-cpp/src/sentencepiece_bpe.h
rename to engines/parakeet/src/sentencepiece_bpe.h
diff --git a/parakeet-cpp/test/samples/abcba.rttm b/engines/parakeet/test/samples/abcba.rttm
similarity index 100%
rename from parakeet-cpp/test/samples/abcba.rttm
rename to engines/parakeet/test/samples/abcba.rttm
diff --git a/parakeet-cpp/test/samples/abcba.wav b/engines/parakeet/test/samples/abcba.wav
similarity index 100%
rename from parakeet-cpp/test/samples/abcba.wav
rename to engines/parakeet/test/samples/abcba.wav
diff --git a/parakeet-cpp/test/samples/abcdba.rttm b/engines/parakeet/test/samples/abcdba.rttm
similarity index 100%
rename from parakeet-cpp/test/samples/abcdba.rttm
rename to engines/parakeet/test/samples/abcdba.rttm
diff --git a/parakeet-cpp/test/samples/abcdba.wav b/engines/parakeet/test/samples/abcdba.wav
similarity index 100%
rename from parakeet-cpp/test/samples/abcdba.wav
rename to engines/parakeet/test/samples/abcdba.wav
diff --git a/parakeet-cpp/test/samples/diarization-sample-16k.wav b/engines/parakeet/test/samples/diarization-sample-16k.wav
similarity index 100%
rename from parakeet-cpp/test/samples/diarization-sample-16k.wav
rename to engines/parakeet/test/samples/diarization-sample-16k.wav
diff --git a/parakeet-cpp/test/samples/fr-multipiece-16k.wav b/engines/parakeet/test/samples/fr-multipiece-16k.wav
similarity index 100%
rename from parakeet-cpp/test/samples/fr-multipiece-16k.wav
rename to engines/parakeet/test/samples/fr-multipiece-16k.wav
diff --git a/parakeet-cpp/test/samples/jfk.wav b/engines/parakeet/test/samples/jfk.wav
similarity index 100%
rename from parakeet-cpp/test/samples/jfk.wav
rename to engines/parakeet/test/samples/jfk.wav
diff --git a/parakeet-cpp/test/samples/sample-16k.wav b/engines/parakeet/test/samples/sample-16k.wav
similarity index 100%
rename from parakeet-cpp/test/samples/sample-16k.wav
rename to engines/parakeet/test/samples/sample-16k.wav
diff --git a/parakeet-cpp/test/test_ctc.cpp b/engines/parakeet/test/test_ctc.cpp
similarity index 100%
rename from parakeet-cpp/test/test_ctc.cpp
rename to engines/parakeet/test/test_ctc.cpp
diff --git a/parakeet-cpp/test/test_decoder_determinism.cpp b/engines/parakeet/test/test_decoder_determinism.cpp
similarity index 100%
rename from parakeet-cpp/test/test_decoder_determinism.cpp
rename to engines/parakeet/test/test_decoder_determinism.cpp
diff --git a/parakeet-cpp/test/test_encoder.cpp b/engines/parakeet/test/test_encoder.cpp
similarity index 100%
rename from parakeet-cpp/test/test_encoder.cpp
rename to engines/parakeet/test/test_encoder.cpp
diff --git a/parakeet-cpp/test/test_encoder_capture_parity.cpp b/engines/parakeet/test/test_encoder_capture_parity.cpp
similarity index 100%
rename from parakeet-cpp/test/test_encoder_capture_parity.cpp
rename to engines/parakeet/test/test_encoder_capture_parity.cpp
diff --git a/parakeet-cpp/test/test_eou_decoder_parity.cpp b/engines/parakeet/test/test_eou_decoder_parity.cpp
similarity index 100%
rename from parakeet-cpp/test/test_eou_decoder_parity.cpp
rename to engines/parakeet/test/test_eou_decoder_parity.cpp
diff --git a/parakeet-cpp/test/test_eou_streaming.cpp b/engines/parakeet/test/test_eou_streaming.cpp
similarity index 100%
rename from parakeet-cpp/test/test_eou_streaming.cpp
rename to engines/parakeet/test/test_eou_streaming.cpp
diff --git a/parakeet-cpp/test/test_mel.cpp b/engines/parakeet/test/test_mel.cpp
similarity index 100%
rename from parakeet-cpp/test/test_mel.cpp
rename to engines/parakeet/test/test_mel.cpp
diff --git a/parakeet-cpp/test/test_mel_fft_parity.cpp b/engines/parakeet/test/test_mel_fft_parity.cpp
similarity index 100%
rename from parakeet-cpp/test/test_mel_fft_parity.cpp
rename to engines/parakeet/test/test_mel_fft_parity.cpp
diff --git a/parakeet-cpp/test/test_perf_regression.cpp b/engines/parakeet/test/test_perf_regression.cpp
similarity index 100%
rename from parakeet-cpp/test/test_perf_regression.cpp
rename to engines/parakeet/test/test_perf_regression.cpp
diff --git a/parakeet-cpp/test/test_sched_diarize_lifecycle.cpp b/engines/parakeet/test/test_sched_diarize_lifecycle.cpp
similarity index 100%
rename from parakeet-cpp/test/test_sched_diarize_lifecycle.cpp
rename to engines/parakeet/test/test_sched_diarize_lifecycle.cpp
diff --git a/parakeet-cpp/test/test_sched_encoder_determinism.cpp b/engines/parakeet/test/test_sched_encoder_determinism.cpp
similarity index 100%
rename from parakeet-cpp/test/test_sched_encoder_determinism.cpp
rename to engines/parakeet/test/test_sched_encoder_determinism.cpp
diff --git a/parakeet-cpp/test/test_sortformer_aosc_speakers.cpp b/engines/parakeet/test/test_sortformer_aosc_speakers.cpp
similarity index 100%
rename from parakeet-cpp/test/test_sortformer_aosc_speakers.cpp
rename to engines/parakeet/test/test_sortformer_aosc_speakers.cpp
diff --git a/parakeet-cpp/test/test_sortformer_parity.cpp b/engines/parakeet/test/test_sortformer_parity.cpp
similarity index 100%
rename from parakeet-cpp/test/test_sortformer_parity.cpp
rename to engines/parakeet/test/test_sortformer_parity.cpp
diff --git a/parakeet-cpp/test/test_sortformer_streaming.cpp b/engines/parakeet/test/test_sortformer_streaming.cpp
similarity index 100%
rename from parakeet-cpp/test/test_sortformer_streaming.cpp
rename to engines/parakeet/test/test_sortformer_streaming.cpp
diff --git a/parakeet-cpp/test/test_streaming.cpp b/engines/parakeet/test/test_streaming.cpp
similarity index 100%
rename from parakeet-cpp/test/test_streaming.cpp
rename to engines/parakeet/test/test_streaming.cpp
diff --git a/parakeet-cpp/test/test_tdt_decoder_parity.cpp b/engines/parakeet/test/test_tdt_decoder_parity.cpp
similarity index 100%
rename from parakeet-cpp/test/test_tdt_decoder_parity.cpp
rename to engines/parakeet/test/test_tdt_decoder_parity.cpp
diff --git a/parakeet-cpp/test/test_tdt_encoder_parity.cpp b/engines/parakeet/test/test_tdt_encoder_parity.cpp
similarity index 100%
rename from parakeet-cpp/test/test_tdt_encoder_parity.cpp
rename to engines/parakeet/test/test_tdt_encoder_parity.cpp
diff --git a/parakeet-cpp/test/test_utils.h b/engines/parakeet/test/test_utils.h
similarity index 100%
rename from parakeet-cpp/test/test_utils.h
rename to engines/parakeet/test/test_utils.h
diff --git a/parakeet-cpp/test/test_vk_vs_cpu.cpp b/engines/parakeet/test/test_vk_vs_cpu.cpp
similarity index 100%
rename from parakeet-cpp/test/test_vk_vs_cpu.cpp
rename to engines/parakeet/test/test_vk_vs_cpu.cpp
diff --git a/tts-cpp/.gitignore b/engines/tts/.gitignore
similarity index 100%
rename from tts-cpp/.gitignore
rename to engines/tts/.gitignore
diff --git a/tts-cpp/CMakeLists.txt b/engines/tts/CMakeLists.txt
similarity index 100%
rename from tts-cpp/CMakeLists.txt
rename to engines/tts/CMakeLists.txt
diff --git a/tts-cpp/LICENSE b/engines/tts/LICENSE
similarity index 100%
rename from tts-cpp/LICENSE
rename to engines/tts/LICENSE
diff --git a/tts-cpp/MEMORY.md b/engines/tts/MEMORY.md
similarity index 100%
rename from tts-cpp/MEMORY.md
rename to engines/tts/MEMORY.md
diff --git a/tts-cpp/NOTICE b/engines/tts/NOTICE
similarity index 100%
rename from tts-cpp/NOTICE
rename to engines/tts/NOTICE
diff --git a/tts-cpp/PROGRESS.md b/engines/tts/PROGRESS.md
similarity index 100%
rename from tts-cpp/PROGRESS.md
rename to engines/tts/PROGRESS.md
diff --git a/tts-cpp/PROGRESS_SUPERTONIC.md b/engines/tts/PROGRESS_SUPERTONIC.md
similarity index 100%
rename from tts-cpp/PROGRESS_SUPERTONIC.md
rename to engines/tts/PROGRESS_SUPERTONIC.md
diff --git a/tts-cpp/README.md b/engines/tts/README.md
similarity index 100%
rename from tts-cpp/README.md
rename to engines/tts/README.md
diff --git a/tts-cpp/cmake/tts-cppConfig.cmake.in b/engines/tts/cmake/tts-cppConfig.cmake.in
similarity index 100%
rename from tts-cpp/cmake/tts-cppConfig.cmake.in
rename to engines/tts/cmake/tts-cppConfig.cmake.in
diff --git a/tts-cpp/docs/voiceclone-backward-campplus.md b/engines/tts/docs/voiceclone-backward-campplus.md
similarity index 100%
rename from tts-cpp/docs/voiceclone-backward-campplus.md
rename to engines/tts/docs/voiceclone-backward-campplus.md
diff --git a/tts-cpp/docs/voiceclone-backward-gap-matrix.md b/engines/tts/docs/voiceclone-backward-gap-matrix.md
similarity index 100%
rename from tts-cpp/docs/voiceclone-backward-gap-matrix.md
rename to engines/tts/docs/voiceclone-backward-gap-matrix.md
diff --git a/tts-cpp/include/tts-cpp/backend.h b/engines/tts/include/tts-cpp/backend.h
similarity index 100%
rename from tts-cpp/include/tts-cpp/backend.h
rename to engines/tts/include/tts-cpp/backend.h
diff --git a/tts-cpp/include/tts-cpp/chatterbox/engine.h b/engines/tts/include/tts-cpp/chatterbox/engine.h
similarity index 100%
rename from tts-cpp/include/tts-cpp/chatterbox/engine.h
rename to engines/tts/include/tts-cpp/chatterbox/engine.h
diff --git a/tts-cpp/include/tts-cpp/chatterbox/s3gen_pipeline.h b/engines/tts/include/tts-cpp/chatterbox/s3gen_pipeline.h
similarity index 100%
rename from tts-cpp/include/tts-cpp/chatterbox/s3gen_pipeline.h
rename to engines/tts/include/tts-cpp/chatterbox/s3gen_pipeline.h
diff --git a/tts-cpp/include/tts-cpp/export.h b/engines/tts/include/tts-cpp/export.h
similarity index 100%
rename from tts-cpp/include/tts-cpp/export.h
rename to engines/tts/include/tts-cpp/export.h
diff --git a/tts-cpp/include/tts-cpp/lavasr/denoiser.h b/engines/tts/include/tts-cpp/lavasr/denoiser.h
similarity index 100%
rename from tts-cpp/include/tts-cpp/lavasr/denoiser.h
rename to engines/tts/include/tts-cpp/lavasr/denoiser.h
diff --git a/tts-cpp/include/tts-cpp/lavasr/enhancer.h b/engines/tts/include/tts-cpp/lavasr/enhancer.h
similarity index 100%
rename from tts-cpp/include/tts-cpp/lavasr/enhancer.h
rename to engines/tts/include/tts-cpp/lavasr/enhancer.h
diff --git a/tts-cpp/include/tts-cpp/log.h b/engines/tts/include/tts-cpp/log.h
similarity index 100%
rename from tts-cpp/include/tts-cpp/log.h
rename to engines/tts/include/tts-cpp/log.h
diff --git a/tts-cpp/include/tts-cpp/parler/description.h b/engines/tts/include/tts-cpp/parler/description.h
similarity index 100%
rename from tts-cpp/include/tts-cpp/parler/description.h
rename to engines/tts/include/tts-cpp/parler/description.h
diff --git a/tts-cpp/include/tts-cpp/parler/engine.h b/engines/tts/include/tts-cpp/parler/engine.h
similarity index 100%
rename from tts-cpp/include/tts-cpp/parler/engine.h
rename to engines/tts/include/tts-cpp/parler/engine.h
diff --git a/tts-cpp/include/tts-cpp/supertonic/engine.h b/engines/tts/include/tts-cpp/supertonic/engine.h
similarity index 100%
rename from tts-cpp/include/tts-cpp/supertonic/engine.h
rename to engines/tts/include/tts-cpp/supertonic/engine.h
diff --git a/tts-cpp/include/tts-cpp/tts-cpp.h b/engines/tts/include/tts-cpp/tts-cpp.h
similarity index 100%
rename from tts-cpp/include/tts-cpp/tts-cpp.h
rename to engines/tts/include/tts-cpp/tts-cpp.h
diff --git a/tts-cpp/scripts/bench-m4-validation.sh b/engines/tts/scripts/bench-m4-validation.sh
similarity index 100%
rename from tts-cpp/scripts/bench-m4-validation.sh
rename to engines/tts/scripts/bench-m4-validation.sh
diff --git a/tts-cpp/scripts/bench-supertonic-onnx.py b/engines/tts/scripts/bench-supertonic-onnx.py
similarity index 100%
rename from tts-cpp/scripts/bench-supertonic-onnx.py
rename to engines/tts/scripts/bench-supertonic-onnx.py
diff --git a/tts-cpp/scripts/build_cangjie_tsv.py b/engines/tts/scripts/build_cangjie_tsv.py
similarity index 100%
rename from tts-cpp/scripts/build_cangjie_tsv.py
rename to engines/tts/scripts/build_cangjie_tsv.py
diff --git a/tts-cpp/scripts/build_mecab_dict.py b/engines/tts/scripts/build_mecab_dict.py
similarity index 100%
rename from tts-cpp/scripts/build_mecab_dict.py
rename to engines/tts/scripts/build_mecab_dict.py
diff --git a/tts-cpp/scripts/compare-tokenizer.py b/engines/tts/scripts/compare-tokenizer.py
similarity index 100%
rename from tts-cpp/scripts/compare-tokenizer.py
rename to engines/tts/scripts/compare-tokenizer.py
diff --git a/tts-cpp/scripts/convert-lavasr-denoiser-to-gguf.py b/engines/tts/scripts/convert-lavasr-denoiser-to-gguf.py
similarity index 100%
rename from tts-cpp/scripts/convert-lavasr-denoiser-to-gguf.py
rename to engines/tts/scripts/convert-lavasr-denoiser-to-gguf.py
diff --git a/tts-cpp/scripts/convert-lavasr-enhancer-to-gguf.py b/engines/tts/scripts/convert-lavasr-enhancer-to-gguf.py
similarity index 100%
rename from tts-cpp/scripts/convert-lavasr-enhancer-to-gguf.py
rename to engines/tts/scripts/convert-lavasr-enhancer-to-gguf.py
diff --git a/tts-cpp/scripts/convert-s3gen-to-gguf.py b/engines/tts/scripts/convert-s3gen-to-gguf.py
similarity index 100%
rename from tts-cpp/scripts/convert-s3gen-to-gguf.py
rename to engines/tts/scripts/convert-s3gen-to-gguf.py
diff --git a/tts-cpp/scripts/convert-supertonic2-to-gguf.py b/engines/tts/scripts/convert-supertonic2-to-gguf.py
similarity index 100%
rename from tts-cpp/scripts/convert-supertonic2-to-gguf.py
rename to engines/tts/scripts/convert-supertonic2-to-gguf.py
diff --git a/tts-cpp/scripts/convert-t3-mtl-to-gguf.py b/engines/tts/scripts/convert-t3-mtl-to-gguf.py
similarity index 100%
rename from tts-cpp/scripts/convert-t3-mtl-to-gguf.py
rename to engines/tts/scripts/convert-t3-mtl-to-gguf.py
diff --git a/tts-cpp/scripts/convert-t3-turbo-to-gguf.py b/engines/tts/scripts/convert-t3-turbo-to-gguf.py
similarity index 100%
rename from tts-cpp/scripts/convert-t3-turbo-to-gguf.py
rename to engines/tts/scripts/convert-t3-turbo-to-gguf.py
diff --git a/tts-cpp/scripts/dump-campplus-reference.py b/engines/tts/scripts/dump-campplus-reference.py
similarity index 100%
rename from tts-cpp/scripts/dump-campplus-reference.py
rename to engines/tts/scripts/dump-campplus-reference.py
diff --git a/tts-cpp/scripts/dump-lavasr-denoiser-fixtures.py b/engines/tts/scripts/dump-lavasr-denoiser-fixtures.py
similarity index 100%
rename from tts-cpp/scripts/dump-lavasr-denoiser-fixtures.py
rename to engines/tts/scripts/dump-lavasr-denoiser-fixtures.py
diff --git a/tts-cpp/scripts/dump-lavasr-denoiser-pipeline-fixtures.py b/engines/tts/scripts/dump-lavasr-denoiser-pipeline-fixtures.py
similarity index 100%
rename from tts-cpp/scripts/dump-lavasr-denoiser-pipeline-fixtures.py
rename to engines/tts/scripts/dump-lavasr-denoiser-pipeline-fixtures.py
diff --git a/tts-cpp/scripts/dump-lavasr-enhancer-fixtures.py b/engines/tts/scripts/dump-lavasr-enhancer-fixtures.py
similarity index 100%
rename from tts-cpp/scripts/dump-lavasr-enhancer-fixtures.py
rename to engines/tts/scripts/dump-lavasr-enhancer-fixtures.py
diff --git a/tts-cpp/scripts/dump-s3gen-reference.py b/engines/tts/scripts/dump-s3gen-reference.py
similarity index 100%
rename from tts-cpp/scripts/dump-s3gen-reference.py
rename to engines/tts/scripts/dump-s3gen-reference.py
diff --git a/tts-cpp/scripts/dump-s3tokenizer-reference.py b/engines/tts/scripts/dump-s3tokenizer-reference.py
similarity index 100%
rename from tts-cpp/scripts/dump-s3tokenizer-reference.py
rename to engines/tts/scripts/dump-s3tokenizer-reference.py
diff --git a/tts-cpp/scripts/dump-streaming-reference.py b/engines/tts/scripts/dump-streaming-reference.py
similarity index 100%
rename from tts-cpp/scripts/dump-streaming-reference.py
rename to engines/tts/scripts/dump-streaming-reference.py
diff --git a/tts-cpp/scripts/dump-supertonic-reference.py b/engines/tts/scripts/dump-supertonic-reference.py
similarity index 100%
rename from tts-cpp/scripts/dump-supertonic-reference.py
rename to engines/tts/scripts/dump-supertonic-reference.py
diff --git a/tts-cpp/scripts/dump-t3-mtl-reference.py b/engines/tts/scripts/dump-t3-mtl-reference.py
similarity index 100%
rename from tts-cpp/scripts/dump-t3-mtl-reference.py
rename to engines/tts/scripts/dump-t3-mtl-reference.py
diff --git a/tts-cpp/scripts/dump-voiceclone-fixtures.py b/engines/tts/scripts/dump-voiceclone-fixtures.py
similarity index 100%
rename from tts-cpp/scripts/dump-voiceclone-fixtures.py
rename to engines/tts/scripts/dump-voiceclone-fixtures.py
diff --git a/tts-cpp/scripts/extract-voice.py b/engines/tts/scripts/extract-voice.py
similarity index 100%
rename from tts-cpp/scripts/extract-voice.py
rename to engines/tts/scripts/extract-voice.py
diff --git a/tts-cpp/scripts/gen-nfkd-table.py b/engines/tts/scripts/gen-nfkd-table.py
similarity index 100%
rename from tts-cpp/scripts/gen-nfkd-table.py
rename to engines/tts/scripts/gen-nfkd-table.py
diff --git a/tts-cpp/scripts/parler/compute-imatrix.py b/engines/tts/scripts/parler/compute-imatrix.py
similarity index 100%
rename from tts-cpp/scripts/parler/compute-imatrix.py
rename to engines/tts/scripts/parler/compute-imatrix.py
diff --git a/tts-cpp/scripts/parler/convert-to-gguf.py b/engines/tts/scripts/parler/convert-to-gguf.py
similarity index 100%
rename from tts-cpp/scripts/parler/convert-to-gguf.py
rename to engines/tts/scripts/parler/convert-to-gguf.py
diff --git a/tts-cpp/scripts/parler/dump-reference.py b/engines/tts/scripts/parler/dump-reference.py
similarity index 100%
rename from tts-cpp/scripts/parler/dump-reference.py
rename to engines/tts/scripts/parler/dump-reference.py
diff --git a/tts-cpp/scripts/parler/indic-cases.json b/engines/tts/scripts/parler/indic-cases.json
similarity index 100%
rename from tts-cpp/scripts/parler/indic-cases.json
rename to engines/tts/scripts/parler/indic-cases.json
diff --git a/tts-cpp/scripts/parler/quant-grid.py b/engines/tts/scripts/parler/quant-grid.py
similarity index 100%
rename from tts-cpp/scripts/parler/quant-grid.py
rename to engines/tts/scripts/parler/quant-grid.py
diff --git a/tts-cpp/scripts/reference-t3-turbo.py b/engines/tts/scripts/reference-t3-turbo.py
similarity index 100%
rename from tts-cpp/scripts/reference-t3-turbo.py
rename to engines/tts/scripts/reference-t3-turbo.py
diff --git a/tts-cpp/scripts/requantize-gguf.py b/engines/tts/scripts/requantize-gguf.py
similarity index 100%
rename from tts-cpp/scripts/requantize-gguf.py
rename to engines/tts/scripts/requantize-gguf.py
diff --git a/tts-cpp/scripts/setup-ggml.sh b/engines/tts/scripts/setup-ggml.sh
similarity index 100%
rename from tts-cpp/scripts/setup-ggml.sh
rename to engines/tts/scripts/setup-ggml.sh
diff --git a/tts-cpp/scripts/setup-supertonic2.sh b/engines/tts/scripts/setup-supertonic2.sh
similarity index 100%
rename from tts-cpp/scripts/setup-supertonic2.sh
rename to engines/tts/scripts/setup-supertonic2.sh
diff --git a/tts-cpp/scripts/synthesize.sh b/engines/tts/scripts/synthesize.sh
similarity index 100%
rename from tts-cpp/scripts/synthesize.sh
rename to engines/tts/scripts/synthesize.sh
diff --git a/tts-cpp/scripts/validate-precision-parity.sh b/engines/tts/scripts/validate-precision-parity.sh
similarity index 100%
rename from tts-cpp/scripts/validate-precision-parity.sh
rename to engines/tts/scripts/validate-precision-parity.sh
diff --git a/tts-cpp/src/backend_selection.cpp b/engines/tts/src/backend_selection.cpp
similarity index 100%
rename from tts-cpp/src/backend_selection.cpp
rename to engines/tts/src/backend_selection.cpp
diff --git a/tts-cpp/src/backend_selection.h b/engines/tts/src/backend_selection.h
similarity index 100%
rename from tts-cpp/src/backend_selection.h
rename to engines/tts/src/backend_selection.h
diff --git a/tts-cpp/src/backend_util.h b/engines/tts/src/backend_util.h
similarity index 100%
rename from tts-cpp/src/backend_util.h
rename to engines/tts/src/backend_util.h
diff --git a/tts-cpp/src/campplus.cpp b/engines/tts/src/campplus.cpp
similarity index 100%
rename from tts-cpp/src/campplus.cpp
rename to engines/tts/src/campplus.cpp
diff --git a/tts-cpp/src/campplus.h b/engines/tts/src/campplus.h
similarity index 100%
rename from tts-cpp/src/campplus.h
rename to engines/tts/src/campplus.h
diff --git a/tts-cpp/src/campplus_backward.cpp b/engines/tts/src/campplus_backward.cpp
similarity index 100%
rename from tts-cpp/src/campplus_backward.cpp
rename to engines/tts/src/campplus_backward.cpp
diff --git a/tts-cpp/src/campplus_backward.h b/engines/tts/src/campplus_backward.h
similarity index 100%
rename from tts-cpp/src/campplus_backward.h
rename to engines/tts/src/campplus_backward.h
diff --git a/tts-cpp/src/campplus_forward.inc b/engines/tts/src/campplus_forward.inc
similarity index 100%
rename from tts-cpp/src/campplus_forward.inc
rename to engines/tts/src/campplus_forward.inc
diff --git a/tts-cpp/src/chatterbox_cli.cpp b/engines/tts/src/chatterbox_cli.cpp
similarity index 100%
rename from tts-cpp/src/chatterbox_cli.cpp
rename to engines/tts/src/chatterbox_cli.cpp
diff --git a/tts-cpp/src/chatterbox_engine.cpp b/engines/tts/src/chatterbox_engine.cpp
similarity index 100%
rename from tts-cpp/src/chatterbox_engine.cpp
rename to engines/tts/src/chatterbox_engine.cpp
diff --git a/tts-cpp/src/chatterbox_t3_internal.h b/engines/tts/src/chatterbox_t3_internal.h
similarity index 100%
rename from tts-cpp/src/chatterbox_t3_internal.h
rename to engines/tts/src/chatterbox_t3_internal.h
diff --git a/tts-cpp/src/chatterbox_tts.cpp b/engines/tts/src/chatterbox_tts.cpp
similarity index 100%
rename from tts-cpp/src/chatterbox_tts.cpp
rename to engines/tts/src/chatterbox_tts.cpp
diff --git a/tts-cpp/src/chatterbox_tts_test_hooks.h b/engines/tts/src/chatterbox_tts_test_hooks.h
similarity index 100%
rename from tts-cpp/src/chatterbox_tts_test_hooks.h
rename to engines/tts/src/chatterbox_tts_test_hooks.h
diff --git a/tts-cpp/src/cli_main.cpp b/engines/tts/src/cli_main.cpp
similarity index 100%
rename from tts-cpp/src/cli_main.cpp
rename to engines/tts/src/cli_main.cpp
diff --git a/tts-cpp/src/dr_wav.h b/engines/tts/src/dr_wav.h
similarity index 100%
rename from tts-cpp/src/dr_wav.h
rename to engines/tts/src/dr_wav.h
diff --git a/tts-cpp/src/gguf_stream.h b/engines/tts/src/gguf_stream.h
similarity index 100%
rename from tts-cpp/src/gguf_stream.h
rename to engines/tts/src/gguf_stream.h
diff --git a/tts-cpp/src/gpt2_bpe.cpp b/engines/tts/src/gpt2_bpe.cpp
similarity index 100%
rename from tts-cpp/src/gpt2_bpe.cpp
rename to engines/tts/src/gpt2_bpe.cpp
diff --git a/tts-cpp/src/gpt2_bpe.h b/engines/tts/src/gpt2_bpe.h
similarity index 100%
rename from tts-cpp/src/gpt2_bpe.h
rename to engines/tts/src/gpt2_bpe.h
diff --git a/tts-cpp/src/json.hpp b/engines/tts/src/json.hpp
similarity index 100%
rename from tts-cpp/src/json.hpp
rename to engines/tts/src/json.hpp
diff --git a/tts-cpp/src/lavasr/denoiser.cpp b/engines/tts/src/lavasr/denoiser.cpp
similarity index 100%
rename from tts-cpp/src/lavasr/denoiser.cpp
rename to engines/tts/src/lavasr/denoiser.cpp
diff --git a/tts-cpp/src/lavasr/denoiser.h b/engines/tts/src/lavasr/denoiser.h
similarity index 100%
rename from tts-cpp/src/lavasr/denoiser.h
rename to engines/tts/src/lavasr/denoiser.h
diff --git a/tts-cpp/src/lavasr/denoiser_api.cpp b/engines/tts/src/lavasr/denoiser_api.cpp
similarity index 100%
rename from tts-cpp/src/lavasr/denoiser_api.cpp
rename to engines/tts/src/lavasr/denoiser_api.cpp
diff --git a/tts-cpp/src/lavasr/denoiser_core.cpp b/engines/tts/src/lavasr/denoiser_core.cpp
similarity index 100%
rename from tts-cpp/src/lavasr/denoiser_core.cpp
rename to engines/tts/src/lavasr/denoiser_core.cpp
diff --git a/tts-cpp/src/lavasr/denoiser_core.h b/engines/tts/src/lavasr/denoiser_core.h
similarity index 100%
rename from tts-cpp/src/lavasr/denoiser_core.h
rename to engines/tts/src/lavasr/denoiser_core.h
diff --git a/tts-cpp/src/lavasr/denoiser_ggml.cpp b/engines/tts/src/lavasr/denoiser_ggml.cpp
similarity index 100%
rename from tts-cpp/src/lavasr/denoiser_ggml.cpp
rename to engines/tts/src/lavasr/denoiser_ggml.cpp
diff --git a/tts-cpp/src/lavasr/denoiser_ggml.h b/engines/tts/src/lavasr/denoiser_ggml.h
similarity index 100%
rename from tts-cpp/src/lavasr/denoiser_ggml.h
rename to engines/tts/src/lavasr/denoiser_ggml.h
diff --git a/tts-cpp/src/lavasr/denoiser_gguf.cpp b/engines/tts/src/lavasr/denoiser_gguf.cpp
similarity index 100%
rename from tts-cpp/src/lavasr/denoiser_gguf.cpp
rename to engines/tts/src/lavasr/denoiser_gguf.cpp
diff --git a/tts-cpp/src/lavasr/denoiser_gguf.h b/engines/tts/src/lavasr/denoiser_gguf.h
similarity index 100%
rename from tts-cpp/src/lavasr/denoiser_gguf.h
rename to engines/tts/src/lavasr/denoiser_gguf.h
diff --git a/tts-cpp/src/lavasr/dsp/dsp_constants.h b/engines/tts/src/lavasr/dsp/dsp_constants.h
similarity index 100%
rename from tts-cpp/src/lavasr/dsp/dsp_constants.h
rename to engines/tts/src/lavasr/dsp/dsp_constants.h
diff --git a/tts-cpp/src/lavasr/dsp/fastlr_merge.cpp b/engines/tts/src/lavasr/dsp/fastlr_merge.cpp
similarity index 100%
rename from tts-cpp/src/lavasr/dsp/fastlr_merge.cpp
rename to engines/tts/src/lavasr/dsp/fastlr_merge.cpp
diff --git a/tts-cpp/src/lavasr/dsp/fastlr_merge.h b/engines/tts/src/lavasr/dsp/fastlr_merge.h
similarity index 100%
rename from tts-cpp/src/lavasr/dsp/fastlr_merge.h
rename to engines/tts/src/lavasr/dsp/fastlr_merge.h
diff --git a/tts-cpp/src/lavasr/dsp/mel_filterbank.cpp b/engines/tts/src/lavasr/dsp/mel_filterbank.cpp
similarity index 100%
rename from tts-cpp/src/lavasr/dsp/mel_filterbank.cpp
rename to engines/tts/src/lavasr/dsp/mel_filterbank.cpp
diff --git a/tts-cpp/src/lavasr/dsp/mel_filterbank.h b/engines/tts/src/lavasr/dsp/mel_filterbank.h
similarity index 100%
rename from tts-cpp/src/lavasr/dsp/mel_filterbank.h
rename to engines/tts/src/lavasr/dsp/mel_filterbank.h
diff --git a/tts-cpp/src/lavasr/dsp/overlap_add.cpp b/engines/tts/src/lavasr/dsp/overlap_add.cpp
similarity index 100%
rename from tts-cpp/src/lavasr/dsp/overlap_add.cpp
rename to engines/tts/src/lavasr/dsp/overlap_add.cpp
diff --git a/tts-cpp/src/lavasr/dsp/overlap_add.h b/engines/tts/src/lavasr/dsp/overlap_add.h
similarity index 100%
rename from tts-cpp/src/lavasr/dsp/overlap_add.h
rename to engines/tts/src/lavasr/dsp/overlap_add.h
diff --git a/tts-cpp/src/lavasr/dsp/resampler.cpp b/engines/tts/src/lavasr/dsp/resampler.cpp
similarity index 100%
rename from tts-cpp/src/lavasr/dsp/resampler.cpp
rename to engines/tts/src/lavasr/dsp/resampler.cpp
diff --git a/tts-cpp/src/lavasr/dsp/resampler.h b/engines/tts/src/lavasr/dsp/resampler.h
similarity index 100%
rename from tts-cpp/src/lavasr/dsp/resampler.h
rename to engines/tts/src/lavasr/dsp/resampler.h
diff --git a/tts-cpp/src/lavasr/dsp/stft_processor.cpp b/engines/tts/src/lavasr/dsp/stft_processor.cpp
similarity index 100%
rename from tts-cpp/src/lavasr/dsp/stft_processor.cpp
rename to engines/tts/src/lavasr/dsp/stft_processor.cpp
diff --git a/tts-cpp/src/lavasr/dsp/stft_processor.h b/engines/tts/src/lavasr/dsp/stft_processor.h
similarity index 100%
rename from tts-cpp/src/lavasr/dsp/stft_processor.h
rename to engines/tts/src/lavasr/dsp/stft_processor.h
diff --git a/tts-cpp/src/lavasr/enhancer.cpp b/engines/tts/src/lavasr/enhancer.cpp
similarity index 100%
rename from tts-cpp/src/lavasr/enhancer.cpp
rename to engines/tts/src/lavasr/enhancer.cpp
diff --git a/tts-cpp/src/lavasr/enhancer.h b/engines/tts/src/lavasr/enhancer.h
similarity index 100%
rename from tts-cpp/src/lavasr/enhancer.h
rename to engines/tts/src/lavasr/enhancer.h
diff --git a/tts-cpp/src/lavasr/enhancer_api.cpp b/engines/tts/src/lavasr/enhancer_api.cpp
similarity index 100%
rename from tts-cpp/src/lavasr/enhancer_api.cpp
rename to engines/tts/src/lavasr/enhancer_api.cpp
diff --git a/tts-cpp/src/lavasr/enhancer_core.cpp b/engines/tts/src/lavasr/enhancer_core.cpp
similarity index 100%
rename from tts-cpp/src/lavasr/enhancer_core.cpp
rename to engines/tts/src/lavasr/enhancer_core.cpp
diff --git a/tts-cpp/src/lavasr/enhancer_core.h b/engines/tts/src/lavasr/enhancer_core.h
similarity index 100%
rename from tts-cpp/src/lavasr/enhancer_core.h
rename to engines/tts/src/lavasr/enhancer_core.h
diff --git a/tts-cpp/src/lavasr/enhancer_ggml.cpp b/engines/tts/src/lavasr/enhancer_ggml.cpp
similarity index 100%
rename from tts-cpp/src/lavasr/enhancer_ggml.cpp
rename to engines/tts/src/lavasr/enhancer_ggml.cpp
diff --git a/tts-cpp/src/lavasr/enhancer_ggml.h b/engines/tts/src/lavasr/enhancer_ggml.h
similarity index 100%
rename from tts-cpp/src/lavasr/enhancer_ggml.h
rename to engines/tts/src/lavasr/enhancer_ggml.h
diff --git a/tts-cpp/src/lavasr/enhancer_gguf.cpp b/engines/tts/src/lavasr/enhancer_gguf.cpp
similarity index 100%
rename from tts-cpp/src/lavasr/enhancer_gguf.cpp
rename to engines/tts/src/lavasr/enhancer_gguf.cpp
diff --git a/tts-cpp/src/lavasr/enhancer_gguf.h b/engines/tts/src/lavasr/enhancer_gguf.h
similarity index 100%
rename from tts-cpp/src/lavasr/enhancer_gguf.h
rename to engines/tts/src/lavasr/enhancer_gguf.h
diff --git a/tts-cpp/src/lavasr/lavasr_bench.cpp b/engines/tts/src/lavasr/lavasr_bench.cpp
similarity index 100%
rename from tts-cpp/src/lavasr/lavasr_bench.cpp
rename to engines/tts/src/lavasr/lavasr_bench.cpp
diff --git a/tts-cpp/src/log.cpp b/engines/tts/src/log.cpp
similarity index 100%
rename from tts-cpp/src/log.cpp
rename to engines/tts/src/log.cpp
diff --git a/tts-cpp/src/main.cpp b/engines/tts/src/main.cpp
similarity index 100%
rename from tts-cpp/src/main.cpp
rename to engines/tts/src/main.cpp
diff --git a/tts-cpp/src/mel2wav.cpp b/engines/tts/src/mel2wav.cpp
similarity index 100%
rename from tts-cpp/src/mel2wav.cpp
rename to engines/tts/src/mel2wav.cpp
diff --git a/tts-cpp/src/mel_extract_stft.cpp b/engines/tts/src/mel_extract_stft.cpp
similarity index 100%
rename from tts-cpp/src/mel_extract_stft.cpp
rename to engines/tts/src/mel_extract_stft.cpp
diff --git a/tts-cpp/src/mtl_tokenizer.cpp b/engines/tts/src/mtl_tokenizer.cpp
similarity index 100%
rename from tts-cpp/src/mtl_tokenizer.cpp
rename to engines/tts/src/mtl_tokenizer.cpp
diff --git a/tts-cpp/src/mtl_tokenizer.h b/engines/tts/src/mtl_tokenizer.h
similarity index 100%
rename from tts-cpp/src/mtl_tokenizer.h
rename to engines/tts/src/mtl_tokenizer.h
diff --git a/tts-cpp/src/mtl_unicode_tables.inc b/engines/tts/src/mtl_unicode_tables.inc
similarity index 100%
rename from tts-cpp/src/mtl_unicode_tables.inc
rename to engines/tts/src/mtl_unicode_tables.inc
diff --git a/tts-cpp/src/npy.h b/engines/tts/src/npy.h
similarity index 100%
rename from tts-cpp/src/npy.h
rename to engines/tts/src/npy.h
diff --git a/tts-cpp/src/parler/bpe_tokenizer.cpp b/engines/tts/src/parler/bpe_tokenizer.cpp
similarity index 100%
rename from tts-cpp/src/parler/bpe_tokenizer.cpp
rename to engines/tts/src/parler/bpe_tokenizer.cpp
diff --git a/tts-cpp/src/parler/bpe_tokenizer.h b/engines/tts/src/parler/bpe_tokenizer.h
similarity index 100%
rename from tts-cpp/src/parler/bpe_tokenizer.h
rename to engines/tts/src/parler/bpe_tokenizer.h
diff --git a/tts-cpp/src/parler/cli.cpp b/engines/tts/src/parler/cli.cpp
similarity index 100%
rename from tts-cpp/src/parler/cli.cpp
rename to engines/tts/src/parler/cli.cpp
diff --git a/tts-cpp/src/parler/dac.cpp b/engines/tts/src/parler/dac.cpp
similarity index 100%
rename from tts-cpp/src/parler/dac.cpp
rename to engines/tts/src/parler/dac.cpp
diff --git a/tts-cpp/src/parler/decoder.cpp b/engines/tts/src/parler/decoder.cpp
similarity index 100%
rename from tts-cpp/src/parler/decoder.cpp
rename to engines/tts/src/parler/decoder.cpp
diff --git a/tts-cpp/src/parler/delay.cpp b/engines/tts/src/parler/delay.cpp
similarity index 100%
rename from tts-cpp/src/parler/delay.cpp
rename to engines/tts/src/parler/delay.cpp
diff --git a/tts-cpp/src/parler/delay.h b/engines/tts/src/parler/delay.h
similarity index 100%
rename from tts-cpp/src/parler/delay.h
rename to engines/tts/src/parler/delay.h
diff --git a/tts-cpp/src/parler/description.cpp b/engines/tts/src/parler/description.cpp
similarity index 100%
rename from tts-cpp/src/parler/description.cpp
rename to engines/tts/src/parler/description.cpp
diff --git a/tts-cpp/src/parler/engine.cpp b/engines/tts/src/parler/engine.cpp
similarity index 100%
rename from tts-cpp/src/parler/engine.cpp
rename to engines/tts/src/parler/engine.cpp
diff --git a/tts-cpp/src/parler/gguf.cpp b/engines/tts/src/parler/gguf.cpp
similarity index 100%
rename from tts-cpp/src/parler/gguf.cpp
rename to engines/tts/src/parler/gguf.cpp
diff --git a/tts-cpp/src/parler/internal.h b/engines/tts/src/parler/internal.h
similarity index 100%
rename from tts-cpp/src/parler/internal.h
rename to engines/tts/src/parler/internal.h
diff --git a/tts-cpp/src/parler/sampler.cpp b/engines/tts/src/parler/sampler.cpp
similarity index 100%
rename from tts-cpp/src/parler/sampler.cpp
rename to engines/tts/src/parler/sampler.cpp
diff --git a/tts-cpp/src/parler/sampler.h b/engines/tts/src/parler/sampler.h
similarity index 100%
rename from tts-cpp/src/parler/sampler.h
rename to engines/tts/src/parler/sampler.h
diff --git a/tts-cpp/src/parler/t5.cpp b/engines/tts/src/parler/t5.cpp
similarity index 100%
rename from tts-cpp/src/parler/t5.cpp
rename to engines/tts/src/parler/t5.cpp
diff --git a/tts-cpp/src/parler/text_norm.cpp b/engines/tts/src/parler/text_norm.cpp
similarity index 100%
rename from tts-cpp/src/parler/text_norm.cpp
rename to engines/tts/src/parler/text_norm.cpp
diff --git a/tts-cpp/src/parler/text_norm.h b/engines/tts/src/parler/text_norm.h
similarity index 100%
rename from tts-cpp/src/parler/text_norm.h
rename to engines/tts/src/parler/text_norm.h
diff --git a/tts-cpp/src/parler/tokenizer.cpp b/engines/tts/src/parler/tokenizer.cpp
similarity index 100%
rename from tts-cpp/src/parler/tokenizer.cpp
rename to engines/tts/src/parler/tokenizer.cpp
diff --git a/tts-cpp/src/parler/tokenizer.h b/engines/tts/src/parler/tokenizer.h
similarity index 100%
rename from tts-cpp/src/parler/tokenizer.h
rename to engines/tts/src/parler/tokenizer.h
diff --git a/tts-cpp/src/s3tokenizer.cpp b/engines/tts/src/s3tokenizer.cpp
similarity index 100%
rename from tts-cpp/src/s3tokenizer.cpp
rename to engines/tts/src/s3tokenizer.cpp
diff --git a/tts-cpp/src/s3tokenizer.h b/engines/tts/src/s3tokenizer.h
similarity index 100%
rename from tts-cpp/src/s3tokenizer.h
rename to engines/tts/src/s3tokenizer.h
diff --git a/tts-cpp/src/sched_dispatch.cpp b/engines/tts/src/sched_dispatch.cpp
similarity index 100%
rename from tts-cpp/src/sched_dispatch.cpp
rename to engines/tts/src/sched_dispatch.cpp
diff --git a/tts-cpp/src/sched_dispatch.h b/engines/tts/src/sched_dispatch.h
similarity index 100%
rename from tts-cpp/src/sched_dispatch.h
rename to engines/tts/src/sched_dispatch.h
diff --git a/tts-cpp/src/supertonic_bench.cpp b/engines/tts/src/supertonic_bench.cpp
similarity index 100%
rename from tts-cpp/src/supertonic_bench.cpp
rename to engines/tts/src/supertonic_bench.cpp
diff --git a/tts-cpp/src/supertonic_chunker.cpp b/engines/tts/src/supertonic_chunker.cpp
similarity index 100%
rename from tts-cpp/src/supertonic_chunker.cpp
rename to engines/tts/src/supertonic_chunker.cpp
diff --git a/tts-cpp/src/supertonic_chunker.h b/engines/tts/src/supertonic_chunker.h
similarity index 100%
rename from tts-cpp/src/supertonic_chunker.h
rename to engines/tts/src/supertonic_chunker.h
diff --git a/tts-cpp/src/supertonic_cli.cpp b/engines/tts/src/supertonic_cli.cpp
similarity index 100%
rename from tts-cpp/src/supertonic_cli.cpp
rename to engines/tts/src/supertonic_cli.cpp
diff --git a/tts-cpp/src/supertonic_duration.cpp b/engines/tts/src/supertonic_duration.cpp
similarity index 100%
rename from tts-cpp/src/supertonic_duration.cpp
rename to engines/tts/src/supertonic_duration.cpp
diff --git a/tts-cpp/src/supertonic_engine.cpp b/engines/tts/src/supertonic_engine.cpp
similarity index 100%
rename from tts-cpp/src/supertonic_engine.cpp
rename to engines/tts/src/supertonic_engine.cpp
diff --git a/tts-cpp/src/supertonic_gguf.cpp b/engines/tts/src/supertonic_gguf.cpp
similarity index 100%
rename from tts-cpp/src/supertonic_gguf.cpp
rename to engines/tts/src/supertonic_gguf.cpp
diff --git a/tts-cpp/src/supertonic_internal.h b/engines/tts/src/supertonic_internal.h
similarity index 100%
rename from tts-cpp/src/supertonic_internal.h
rename to engines/tts/src/supertonic_internal.h
diff --git a/tts-cpp/src/supertonic_preprocess.cpp b/engines/tts/src/supertonic_preprocess.cpp
similarity index 100%
rename from tts-cpp/src/supertonic_preprocess.cpp
rename to engines/tts/src/supertonic_preprocess.cpp
diff --git a/tts-cpp/src/supertonic_text_encoder.cpp b/engines/tts/src/supertonic_text_encoder.cpp
similarity index 100%
rename from tts-cpp/src/supertonic_text_encoder.cpp
rename to engines/tts/src/supertonic_text_encoder.cpp
diff --git a/tts-cpp/src/supertonic_text_encoder_backward.cpp b/engines/tts/src/supertonic_text_encoder_backward.cpp
similarity index 100%
rename from tts-cpp/src/supertonic_text_encoder_backward.cpp
rename to engines/tts/src/supertonic_text_encoder_backward.cpp
diff --git a/tts-cpp/src/supertonic_text_encoder_backward.h b/engines/tts/src/supertonic_text_encoder_backward.h
similarity index 100%
rename from tts-cpp/src/supertonic_text_encoder_backward.h
rename to engines/tts/src/supertonic_text_encoder_backward.h
diff --git a/tts-cpp/src/supertonic_vector_estimator.cpp b/engines/tts/src/supertonic_vector_estimator.cpp
similarity index 100%
rename from tts-cpp/src/supertonic_vector_estimator.cpp
rename to engines/tts/src/supertonic_vector_estimator.cpp
diff --git a/tts-cpp/src/supertonic_vector_estimator_backward.cpp b/engines/tts/src/supertonic_vector_estimator_backward.cpp
similarity index 100%
rename from tts-cpp/src/supertonic_vector_estimator_backward.cpp
rename to engines/tts/src/supertonic_vector_estimator_backward.cpp
diff --git a/tts-cpp/src/supertonic_vector_estimator_backward.h b/engines/tts/src/supertonic_vector_estimator_backward.h
similarity index 100%
rename from tts-cpp/src/supertonic_vector_estimator_backward.h
rename to engines/tts/src/supertonic_vector_estimator_backward.h
diff --git a/tts-cpp/src/supertonic_vocoder.cpp b/engines/tts/src/supertonic_vocoder.cpp
similarity index 100%
rename from tts-cpp/src/supertonic_vocoder.cpp
rename to engines/tts/src/supertonic_vocoder.cpp
diff --git a/tts-cpp/src/supertonic_voice_json.cpp b/engines/tts/src/supertonic_voice_json.cpp
similarity index 100%
rename from tts-cpp/src/supertonic_voice_json.cpp
rename to engines/tts/src/supertonic_voice_json.cpp
diff --git a/tts-cpp/src/supertonic_voice_json.h b/engines/tts/src/supertonic_voice_json.h
similarity index 100%
rename from tts-cpp/src/supertonic_voice_json.h
rename to engines/tts/src/supertonic_voice_json.h
diff --git a/tts-cpp/src/t3_alignment_analyzer.cpp b/engines/tts/src/t3_alignment_analyzer.cpp
similarity index 100%
rename from tts-cpp/src/t3_alignment_analyzer.cpp
rename to engines/tts/src/t3_alignment_analyzer.cpp
diff --git a/tts-cpp/src/t3_alignment_analyzer.h b/engines/tts/src/t3_alignment_analyzer.h
similarity index 100%
rename from tts-cpp/src/t3_alignment_analyzer.h
rename to engines/tts/src/t3_alignment_analyzer.h
diff --git a/tts-cpp/src/t3_mtl.cpp b/engines/tts/src/t3_mtl.cpp
similarity index 100%
rename from tts-cpp/src/t3_mtl.cpp
rename to engines/tts/src/t3_mtl.cpp
diff --git a/tts-cpp/src/t3_mtl.h b/engines/tts/src/t3_mtl.h
similarity index 100%
rename from tts-cpp/src/t3_mtl.h
rename to engines/tts/src/t3_mtl.h
diff --git a/tts-cpp/src/t3_stop_controller.cpp b/engines/tts/src/t3_stop_controller.cpp
similarity index 100%
rename from tts-cpp/src/t3_stop_controller.cpp
rename to engines/tts/src/t3_stop_controller.cpp
diff --git a/tts-cpp/src/t3_stop_controller.h b/engines/tts/src/t3_stop_controller.h
similarity index 100%
rename from tts-cpp/src/t3_stop_controller.h
rename to engines/tts/src/t3_stop_controller.h
diff --git a/tts-cpp/src/text_preprocess.cpp b/engines/tts/src/text_preprocess.cpp
similarity index 100%
rename from tts-cpp/src/text_preprocess.cpp
rename to engines/tts/src/text_preprocess.cpp
diff --git a/tts-cpp/src/text_preprocess.h b/engines/tts/src/text_preprocess.h
similarity index 100%
rename from tts-cpp/src/text_preprocess.h
rename to engines/tts/src/text_preprocess.h
diff --git a/tts-cpp/src/voice_encoder.cpp b/engines/tts/src/voice_encoder.cpp
similarity index 100%
rename from tts-cpp/src/voice_encoder.cpp
rename to engines/tts/src/voice_encoder.cpp
diff --git a/tts-cpp/src/voice_encoder.h b/engines/tts/src/voice_encoder.h
similarity index 100%
rename from tts-cpp/src/voice_encoder.h
rename to engines/tts/src/voice_encoder.h
diff --git a/tts-cpp/src/voice_features.cpp b/engines/tts/src/voice_features.cpp
similarity index 100%
rename from tts-cpp/src/voice_features.cpp
rename to engines/tts/src/voice_features.cpp
diff --git a/tts-cpp/src/voice_features.h b/engines/tts/src/voice_features.h
similarity index 100%
rename from tts-cpp/src/voice_features.h
rename to engines/tts/src/voice_features.h
diff --git a/tts-cpp/src/voiceclone_gradcheck.cpp b/engines/tts/src/voiceclone_gradcheck.cpp
similarity index 100%
rename from tts-cpp/src/voiceclone_gradcheck.cpp
rename to engines/tts/src/voiceclone_gradcheck.cpp
diff --git a/tts-cpp/src/voiceclone_gradcheck.h b/engines/tts/src/voiceclone_gradcheck.h
similarity index 100%
rename from tts-cpp/src/voiceclone_gradcheck.h
rename to engines/tts/src/voiceclone_gradcheck.h
diff --git a/tts-cpp/src/voiceclone_metrics.cpp b/engines/tts/src/voiceclone_metrics.cpp
similarity index 100%
rename from tts-cpp/src/voiceclone_metrics.cpp
rename to engines/tts/src/voiceclone_metrics.cpp
diff --git a/tts-cpp/src/voiceclone_metrics.h b/engines/tts/src/voiceclone_metrics.h
similarity index 100%
rename from tts-cpp/src/voiceclone_metrics.h
rename to engines/tts/src/voiceclone_metrics.h
diff --git a/tts-cpp/test/fixtures/voiceclone/v1/README.md b/engines/tts/test/fixtures/voiceclone/v1/README.md
similarity index 100%
rename from tts-cpp/test/fixtures/voiceclone/v1/README.md
rename to engines/tts/test/fixtures/voiceclone/v1/README.md
diff --git a/tts-cpp/test/fixtures/voiceclone/v1/embed_a.npy b/engines/tts/test/fixtures/voiceclone/v1/embed_a.npy
similarity index 100%
rename from tts-cpp/test/fixtures/voiceclone/v1/embed_a.npy
rename to engines/tts/test/fixtures/voiceclone/v1/embed_a.npy
diff --git a/tts-cpp/test/fixtures/voiceclone/v1/embed_b.npy b/engines/tts/test/fixtures/voiceclone/v1/embed_b.npy
similarity index 100%
rename from tts-cpp/test/fixtures/voiceclone/v1/embed_b.npy
rename to engines/tts/test/fixtures/voiceclone/v1/embed_b.npy
diff --git a/tts-cpp/test/fixtures/voiceclone/v1/expected_cosine.npy b/engines/tts/test/fixtures/voiceclone/v1/expected_cosine.npy
similarity index 100%
rename from tts-cpp/test/fixtures/voiceclone/v1/expected_cosine.npy
rename to engines/tts/test/fixtures/voiceclone/v1/expected_cosine.npy
diff --git a/tts-cpp/test/fixtures/voiceclone/v1/expected_style_loss.npy b/engines/tts/test/fixtures/voiceclone/v1/expected_style_loss.npy
similarity index 100%
rename from tts-cpp/test/fixtures/voiceclone/v1/expected_style_loss.npy
rename to engines/tts/test/fixtures/voiceclone/v1/expected_style_loss.npy
diff --git a/tts-cpp/test/fixtures/voiceclone/v1/expected_wer.npy b/engines/tts/test/fixtures/voiceclone/v1/expected_wer.npy
similarity index 100%
rename from tts-cpp/test/fixtures/voiceclone/v1/expected_wer.npy
rename to engines/tts/test/fixtures/voiceclone/v1/expected_wer.npy
diff --git a/tts-cpp/test/fixtures/voiceclone/v1/hidden_ref.npy b/engines/tts/test/fixtures/voiceclone/v1/hidden_ref.npy
similarity index 100%
rename from tts-cpp/test/fixtures/voiceclone/v1/hidden_ref.npy
rename to engines/tts/test/fixtures/voiceclone/v1/hidden_ref.npy
diff --git a/tts-cpp/test/fixtures/voiceclone/v1/hidden_target.npy b/engines/tts/test/fixtures/voiceclone/v1/hidden_target.npy
similarity index 100%
rename from tts-cpp/test/fixtures/voiceclone/v1/hidden_target.npy
rename to engines/tts/test/fixtures/voiceclone/v1/hidden_target.npy
diff --git a/tts-cpp/test/fixtures/voiceclone/v1/wer_hyp.txt b/engines/tts/test/fixtures/voiceclone/v1/wer_hyp.txt
similarity index 100%
rename from tts-cpp/test/fixtures/voiceclone/v1/wer_hyp.txt
rename to engines/tts/test/fixtures/voiceclone/v1/wer_hyp.txt
diff --git a/tts-cpp/test/fixtures/voiceclone/v1/wer_ref.txt b/engines/tts/test/fixtures/voiceclone/v1/wer_ref.txt
similarity index 100%
rename from tts-cpp/test/fixtures/voiceclone/v1/wer_ref.txt
rename to engines/tts/test/fixtures/voiceclone/v1/wer_ref.txt
diff --git a/tts-cpp/test/parler/test_bpe_tokenizer.cpp b/engines/tts/test/parler/test_bpe_tokenizer.cpp
similarity index 100%
rename from tts-cpp/test/parler/test_bpe_tokenizer.cpp
rename to engines/tts/test/parler/test_bpe_tokenizer.cpp
diff --git a/tts-cpp/test/parler/test_dac.cpp b/engines/tts/test/parler/test_dac.cpp
similarity index 100%
rename from tts-cpp/test/parler/test_dac.cpp
rename to engines/tts/test/parler/test_dac.cpp
diff --git a/tts-cpp/test/parler/test_decoder.cpp b/engines/tts/test/parler/test_decoder.cpp
similarity index 100%
rename from tts-cpp/test/parler/test_decoder.cpp
rename to engines/tts/test/parler/test_decoder.cpp
diff --git a/tts-cpp/test/parler/test_delay.cpp b/engines/tts/test/parler/test_delay.cpp
similarity index 100%
rename from tts-cpp/test/parler/test_delay.cpp
rename to engines/tts/test/parler/test_delay.cpp
diff --git a/tts-cpp/test/parler/test_description.cpp b/engines/tts/test/parler/test_description.cpp
similarity index 100%
rename from tts-cpp/test/parler/test_description.cpp
rename to engines/tts/test/parler/test_description.cpp
diff --git a/tts-cpp/test/parler/test_e2e.cpp b/engines/tts/test/parler/test_e2e.cpp
similarity index 100%
rename from tts-cpp/test/parler/test_e2e.cpp
rename to engines/tts/test/parler/test_e2e.cpp
diff --git a/tts-cpp/test/parler/test_engine.cpp b/engines/tts/test/parler/test_engine.cpp
similarity index 100%
rename from tts-cpp/test/parler/test_engine.cpp
rename to engines/tts/test/parler/test_engine.cpp
diff --git a/tts-cpp/test/parler/test_sched_equivalence.cpp b/engines/tts/test/parler/test_sched_equivalence.cpp
similarity index 98%
rename from tts-cpp/test/parler/test_sched_equivalence.cpp
rename to engines/tts/test/parler/test_sched_equivalence.cpp
index 8ca4511c609..58111ea5a88 100644
--- a/tts-cpp/test/parler/test_sched_equivalence.cpp
+++ b/engines/tts/test/parler/test_sched_equivalence.cpp
@@ -2,6 +2,7 @@
 // same greedy input as A (direct), B (TTS_CPP_FORCE_SCHED=1) and A' (direct
 // again); all three PCM buffers must be bit-identical.
 
+#include "../test_env_portable.h"
 #include "tts-cpp/parler/engine.h"
 
 #include <cstdio>
diff --git a/tts-cpp/test/parler/test_t5.cpp b/engines/tts/test/parler/test_t5.cpp
similarity index 100%
rename from tts-cpp/test/parler/test_t5.cpp
rename to engines/tts/test/parler/test_t5.cpp
diff --git a/tts-cpp/test/parler/test_text_norm.cpp b/engines/tts/test/parler/test_text_norm.cpp
similarity index 100%
rename from tts-cpp/test/parler/test_text_norm.cpp
rename to engines/tts/test/parler/test_text_norm.cpp
diff --git a/tts-cpp/test/parler/test_tokenizer.cpp b/engines/tts/test/parler/test_tokenizer.cpp
similarity index 100%
rename from tts-cpp/test/parler/test_tokenizer.cpp
rename to engines/tts/test/parler/test_tokenizer.cpp
diff --git a/tts-cpp/test/test_campplus.cpp b/engines/tts/test/test_campplus.cpp
similarity index 100%
rename from tts-cpp/test/test_campplus.cpp
rename to engines/tts/test/test_campplus.cpp
diff --git a/tts-cpp/test/test_campplus_backward.cpp b/engines/tts/test/test_campplus_backward.cpp
similarity index 100%
rename from tts-cpp/test/test_campplus_backward.cpp
rename to engines/tts/test/test_campplus_backward.cpp
diff --git a/tts-cpp/test/test_campplus_backward_parity.cpp b/engines/tts/test/test_campplus_backward_parity.cpp
similarity index 100%
rename from tts-cpp/test/test_campplus_backward_parity.cpp
rename to engines/tts/test/test_campplus_backward_parity.cpp
diff --git a/tts-cpp/test/test_chatterbox_engine_stream.cpp b/engines/tts/test/test_chatterbox_engine_stream.cpp
similarity index 100%
rename from tts-cpp/test/test_chatterbox_engine_stream.cpp
rename to engines/tts/test/test_chatterbox_engine_stream.cpp
diff --git a/tts-cpp/test/test_cpu_caches.cpp b/engines/tts/test/test_cpu_caches.cpp
similarity index 100%
rename from tts-cpp/test/test_cpu_caches.cpp
rename to engines/tts/test/test_cpu_caches.cpp
diff --git a/tts-cpp/test/test_env_portable.h b/engines/tts/test/test_env_portable.h
similarity index 100%
rename from tts-cpp/test/test_env_portable.h
rename to engines/tts/test/test_env_portable.h
diff --git a/tts-cpp/test/test_eos_roundtrip.cpp b/engines/tts/test/test_eos_roundtrip.cpp
similarity index 100%
rename from tts-cpp/test/test_eos_roundtrip.cpp
rename to engines/tts/test/test_eos_roundtrip.cpp
diff --git a/tts-cpp/test/test_fbank.cpp b/engines/tts/test/test_fbank.cpp
similarity index 100%
rename from tts-cpp/test/test_fbank.cpp
rename to engines/tts/test/test_fbank.cpp
diff --git a/tts-cpp/test/test_gguf_stream.cpp b/engines/tts/test/test_gguf_stream.cpp
similarity index 100%
rename from tts-cpp/test/test_gguf_stream.cpp
rename to engines/tts/test/test_gguf_stream.cpp
diff --git a/tts-cpp/test/test_kv_cache_type.cpp b/engines/tts/test/test_kv_cache_type.cpp
similarity index 100%
rename from tts-cpp/test/test_kv_cache_type.cpp
rename to engines/tts/test/test_kv_cache_type.cpp
diff --git a/tts-cpp/test/test_lavasr_denoiser_ggml.cpp b/engines/tts/test/test_lavasr_denoiser_ggml.cpp
similarity index 100%
rename from tts-cpp/test/test_lavasr_denoiser_ggml.cpp
rename to engines/tts/test/test_lavasr_denoiser_ggml.cpp
diff --git a/tts-cpp/test/test_lavasr_denoiser_gguf.cpp b/engines/tts/test/test_lavasr_denoiser_gguf.cpp
similarity index 100%
rename from tts-cpp/test/test_lavasr_denoiser_gguf.cpp
rename to engines/tts/test/test_lavasr_denoiser_gguf.cpp
diff --git a/tts-cpp/test/test_lavasr_dsp.cpp b/engines/tts/test/test_lavasr_dsp.cpp
similarity index 100%
rename from tts-cpp/test/test_lavasr_dsp.cpp
rename to engines/tts/test/test_lavasr_dsp.cpp
diff --git a/tts-cpp/test/test_lavasr_enhancer_core.cpp b/engines/tts/test/test_lavasr_enhancer_core.cpp
similarity index 100%
rename from tts-cpp/test/test_lavasr_enhancer_core.cpp
rename to engines/tts/test/test_lavasr_enhancer_core.cpp
diff --git a/tts-cpp/test/test_lavasr_enhancer_ggml.cpp b/engines/tts/test/test_lavasr_enhancer_ggml.cpp
similarity index 100%
rename from tts-cpp/test/test_lavasr_enhancer_ggml.cpp
rename to engines/tts/test/test_lavasr_enhancer_ggml.cpp
diff --git a/tts-cpp/test/test_lavasr_enhancer_gguf.cpp b/engines/tts/test/test_lavasr_enhancer_gguf.cpp
similarity index 100%
rename from tts-cpp/test/test_lavasr_enhancer_gguf.cpp
rename to engines/tts/test/test_lavasr_enhancer_gguf.cpp
diff --git a/tts-cpp/test/test_metal_ops.cpp b/engines/tts/test/test_metal_ops.cpp
similarity index 100%
rename from tts-cpp/test/test_metal_ops.cpp
rename to engines/tts/test/test_metal_ops.cpp
diff --git a/tts-cpp/test/test_mtl_sampler.cpp b/engines/tts/test/test_mtl_sampler.cpp
similarity index 100%
rename from tts-cpp/test/test_mtl_sampler.cpp
rename to engines/tts/test/test_mtl_sampler.cpp
diff --git a/tts-cpp/test/test_mtl_tokenizer.cpp b/engines/tts/test/test_mtl_tokenizer.cpp
similarity index 100%
rename from tts-cpp/test/test_mtl_tokenizer.cpp
rename to engines/tts/test/test_mtl_tokenizer.cpp
diff --git a/tts-cpp/test/test_multilingual_asr.cpp b/engines/tts/test/test_multilingual_asr.cpp
similarity index 100%
rename from tts-cpp/test/test_multilingual_asr.cpp
rename to engines/tts/test/test_multilingual_asr.cpp
diff --git a/tts-cpp/test/test_multilingual_synth.cpp b/engines/tts/test/test_multilingual_synth.cpp
similarity index 100%
rename from tts-cpp/test/test_multilingual_synth.cpp
rename to engines/tts/test/test_multilingual_synth.cpp
diff --git a/tts-cpp/test/test_output_sample_rate.cpp b/engines/tts/test/test_output_sample_rate.cpp
similarity index 100%
rename from tts-cpp/test/test_output_sample_rate.cpp
rename to engines/tts/test/test_output_sample_rate.cpp
diff --git a/tts-cpp/test/test_output_sample_rate_supertonic.cpp b/engines/tts/test/test_output_sample_rate_supertonic.cpp
similarity index 100%
rename from tts-cpp/test/test_output_sample_rate_supertonic.cpp
rename to engines/tts/test/test_output_sample_rate_supertonic.cpp
diff --git a/tts-cpp/test/test_resample.cpp b/engines/tts/test/test_resample.cpp
similarity index 100%
rename from tts-cpp/test/test_resample.cpp
rename to engines/tts/test/test_resample.cpp
diff --git a/tts-cpp/test/test_s3gen.cpp b/engines/tts/test/test_s3gen.cpp
similarity index 100%
rename from tts-cpp/test/test_s3gen.cpp
rename to engines/tts/test/test_s3gen.cpp
diff --git a/tts-cpp/test/test_s3gen_cfg_rate.cpp b/engines/tts/test/test_s3gen_cfg_rate.cpp
similarity index 100%
rename from tts-cpp/test/test_s3gen_cfg_rate.cpp
rename to engines/tts/test/test_s3gen_cfg_rate.cpp
diff --git a/tts-cpp/test/test_s3gen_sched_equivalence.cpp b/engines/tts/test/test_s3gen_sched_equivalence.cpp
similarity index 100%
rename from tts-cpp/test/test_s3gen_sched_equivalence.cpp
rename to engines/tts/test/test_s3gen_sched_equivalence.cpp
diff --git a/tts-cpp/test/test_s3tokenizer.cpp b/engines/tts/test/test_s3tokenizer.cpp
similarity index 100%
rename from tts-cpp/test/test_s3tokenizer.cpp
rename to engines/tts/test/test_s3tokenizer.cpp
diff --git a/tts-cpp/test/test_streaming.cpp b/engines/tts/test/test_streaming.cpp
similarity index 100%
rename from tts-cpp/test/test_streaming.cpp
rename to engines/tts/test/test_streaming.cpp
diff --git a/tts-cpp/test/test_streaming_loudness.cpp b/engines/tts/test/test_streaming_loudness.cpp
similarity index 100%
rename from tts-cpp/test/test_streaming_loudness.cpp
rename to engines/tts/test/test_streaming_loudness.cpp
diff --git a/tts-cpp/test/test_supertonic_audit3_caches.cpp b/engines/tts/test/test_supertonic_audit3_caches.cpp
similarity index 100%
rename from tts-cpp/test/test_supertonic_audit3_caches.cpp
rename to engines/tts/test/test_supertonic_audit3_caches.cpp
diff --git a/tts-cpp/test/test_supertonic_backend_dispatch.cpp b/engines/tts/test/test_supertonic_backend_dispatch.cpp
similarity index 100%
rename from tts-cpp/test/test_supertonic_backend_dispatch.cpp
rename to engines/tts/test/test_supertonic_backend_dispatch.cpp
diff --git a/tts-cpp/test/test_supertonic_capability_cache.cpp b/engines/tts/test/test_supertonic_capability_cache.cpp
similarity index 100%
rename from tts-cpp/test/test_supertonic_capability_cache.cpp
rename to engines/tts/test/test_supertonic_capability_cache.cpp
diff --git a/tts-cpp/test/test_supertonic_convnext_block_fused.cpp b/engines/tts/test/test_supertonic_convnext_block_fused.cpp
similarity index 100%
rename from tts-cpp/test/test_supertonic_convnext_block_fused.cpp
rename to engines/tts/test/test_supertonic_convnext_block_fused.cpp
diff --git a/tts-cpp/test/test_supertonic_duration.cpp b/engines/tts/test/test_supertonic_duration.cpp
similarity index 100%
rename from tts-cpp/test/test_supertonic_duration.cpp
rename to engines/tts/test/test_supertonic_duration.cpp
diff --git a/tts-cpp/test/test_supertonic_duration_trace.cpp b/engines/tts/test/test_supertonic_duration_trace.cpp
similarity index 100%
rename from tts-cpp/test/test_supertonic_duration_trace.cpp
rename to engines/tts/test/test_supertonic_duration_trace.cpp
diff --git a/tts-cpp/test/test_supertonic_engine_cycle.cpp b/engines/tts/test/test_supertonic_engine_cycle.cpp
similarity index 100%
rename from tts-cpp/test/test_supertonic_engine_cycle.cpp
rename to engines/tts/test/test_supertonic_engine_cycle.cpp
diff --git a/tts-cpp/test/test_supertonic_external_voice.cpp b/engines/tts/test/test_supertonic_external_voice.cpp
similarity index 100%
rename from tts-cpp/test/test_supertonic_external_voice.cpp
rename to engines/tts/test/test_supertonic_external_voice.cpp
diff --git a/tts-cpp/test/test_supertonic_f16_attn_parity.cpp b/engines/tts/test/test_supertonic_f16_attn_parity.cpp
similarity index 100%
rename from tts-cpp/test/test_supertonic_f16_attn_parity.cpp
rename to engines/tts/test/test_supertonic_f16_attn_parity.cpp
diff --git a/tts-cpp/test/test_supertonic_f16_deny_list_api.cpp b/engines/tts/test/test_supertonic_f16_deny_list_api.cpp
similarity index 100%
rename from tts-cpp/test/test_supertonic_f16_deny_list_api.cpp
rename to engines/tts/test/test_supertonic_f16_deny_list_api.cpp
diff --git a/tts-cpp/test/test_supertonic_f16_weights.cpp b/engines/tts/test/test_supertonic_f16_weights.cpp
similarity index 100%
rename from tts-cpp/test/test_supertonic_f16_weights.cpp
rename to engines/tts/test/test_supertonic_f16_weights.cpp
diff --git a/tts-cpp/test/test_supertonic_graph_rewrites.cpp b/engines/tts/test/test_supertonic_graph_rewrites.cpp
similarity index 100%
rename from tts-cpp/test/test_supertonic_graph_rewrites.cpp
rename to engines/tts/test/test_supertonic_graph_rewrites.cpp
diff --git a/tts-cpp/test/test_supertonic_graph_to_graph_blit.cpp b/engines/tts/test/test_supertonic_graph_to_graph_blit.cpp
similarity index 100%
rename from tts-cpp/test/test_supertonic_graph_to_graph_blit.cpp
rename to engines/tts/test/test_supertonic_graph_to_graph_blit.cpp
diff --git a/tts-cpp/test/test_supertonic_in_graph_transpose.cpp b/engines/tts/test/test_supertonic_in_graph_transpose.cpp
similarity index 100%
rename from tts-cpp/test/test_supertonic_in_graph_transpose.cpp
rename to engines/tts/test/test_supertonic_in_graph_transpose.cpp
diff --git a/tts-cpp/test/test_supertonic_input_scratchpad.cpp b/engines/tts/test/test_supertonic_input_scratchpad.cpp
similarity index 100%
rename from tts-cpp/test/test_supertonic_input_scratchpad.cpp
rename to engines/tts/test/test_supertonic_input_scratchpad.cpp
diff --git a/tts-cpp/test/test_supertonic_kv_attn_type.cpp b/engines/tts/test/test_supertonic_kv_attn_type.cpp
similarity index 100%
rename from tts-cpp/test/test_supertonic_kv_attn_type.cpp
rename to engines/tts/test/test_supertonic_kv_attn_type.cpp
diff --git a/tts-cpp/test/test_supertonic_kv_attn_type_api.cpp b/engines/tts/test/test_supertonic_kv_attn_type_api.cpp
similarity index 100%
rename from tts-cpp/test/test_supertonic_kv_attn_type_api.cpp
rename to engines/tts/test/test_supertonic_kv_attn_type_api.cpp
diff --git a/tts-cpp/test/test_supertonic_languages.cpp b/engines/tts/test/test_supertonic_languages.cpp
similarity index 100%
rename from tts-cpp/test/test_supertonic_languages.cpp
rename to engines/tts/test/test_supertonic_languages.cpp
diff --git a/tts-cpp/test/test_supertonic_load_caches.cpp b/engines/tts/test/test_supertonic_load_caches.cpp
similarity index 100%
rename from tts-cpp/test/test_supertonic_load_caches.cpp
rename to engines/tts/test/test_supertonic_load_caches.cpp
diff --git a/tts-cpp/test/test_supertonic_pinned_host_buffer.cpp b/engines/tts/test/test_supertonic_pinned_host_buffer.cpp
similarity index 100%
rename from tts-cpp/test/test_supertonic_pinned_host_buffer.cpp
rename to engines/tts/test/test_supertonic_pinned_host_buffer.cpp
diff --git a/tts-cpp/test/test_supertonic_pipeline.cpp b/engines/tts/test/test_supertonic_pipeline.cpp
similarity index 100%
rename from tts-cpp/test/test_supertonic_pipeline.cpp
rename to engines/tts/test/test_supertonic_pipeline.cpp
diff --git a/tts-cpp/test/test_supertonic_portable_ops.cpp b/engines/tts/test/test_supertonic_portable_ops.cpp
similarity index 100%
rename from tts-cpp/test/test_supertonic_portable_ops.cpp
rename to engines/tts/test/test_supertonic_portable_ops.cpp
diff --git a/tts-cpp/test/test_supertonic_preprocess.cpp b/engines/tts/test/test_supertonic_preprocess.cpp
similarity index 100%
rename from tts-cpp/test/test_supertonic_preprocess.cpp
rename to engines/tts/test/test_supertonic_preprocess.cpp
diff --git a/tts-cpp/test/test_supertonic_profile_csv.cpp b/engines/tts/test/test_supertonic_profile_csv.cpp
similarity index 100%
rename from tts-cpp/test/test_supertonic_profile_csv.cpp
rename to engines/tts/test/test_supertonic_profile_csv.cpp
diff --git a/tts-cpp/test/test_supertonic_rope_in_graph.cpp b/engines/tts/test/test_supertonic_rope_in_graph.cpp
similarity index 100%
rename from tts-cpp/test/test_supertonic_rope_in_graph.cpp
rename to engines/tts/test/test_supertonic_rope_in_graph.cpp
diff --git a/tts-cpp/test/test_supertonic_rope_packed_qk.cpp b/engines/tts/test/test_supertonic_rope_packed_qk.cpp
similarity index 100%
rename from tts-cpp/test/test_supertonic_rope_packed_qk.cpp
rename to engines/tts/test/test_supertonic_rope_packed_qk.cpp
diff --git a/tts-cpp/test/test_supertonic_sched_equivalence.cpp b/engines/tts/test/test_supertonic_sched_equivalence.cpp
similarity index 100%
rename from tts-cpp/test/test_supertonic_sched_equivalence.cpp
rename to engines/tts/test/test_supertonic_sched_equivalence.cpp
diff --git a/tts-cpp/test/test_supertonic_text_encoder.cpp b/engines/tts/test/test_supertonic_text_encoder.cpp
similarity index 100%
rename from tts-cpp/test/test_supertonic_text_encoder.cpp
rename to engines/tts/test/test_supertonic_text_encoder.cpp
diff --git a/tts-cpp/test/test_supertonic_text_encoder_backward.cpp b/engines/tts/test/test_supertonic_text_encoder_backward.cpp
similarity index 100%
rename from tts-cpp/test/test_supertonic_text_encoder_backward.cpp
rename to engines/tts/test/test_supertonic_text_encoder_backward.cpp
diff --git a/tts-cpp/test/test_supertonic_text_encoder_caches.cpp b/engines/tts/test/test_supertonic_text_encoder_caches.cpp
similarity index 100%
rename from tts-cpp/test/test_supertonic_text_encoder_caches.cpp
rename to engines/tts/test/test_supertonic_text_encoder_caches.cpp
diff --git a/tts-cpp/test/test_supertonic_text_encoder_gpu_bridge.cpp b/engines/tts/test/test_supertonic_text_encoder_gpu_bridge.cpp
similarity index 100%
rename from tts-cpp/test/test_supertonic_text_encoder_gpu_bridge.cpp
rename to engines/tts/test/test_supertonic_text_encoder_gpu_bridge.cpp
diff --git a/tts-cpp/test/test_supertonic_text_encoder_trace.cpp b/engines/tts/test/test_supertonic_text_encoder_trace.cpp
similarity index 100%
rename from tts-cpp/test/test_supertonic_text_encoder_trace.cpp
rename to engines/tts/test/test_supertonic_text_encoder_trace.cpp
diff --git a/tts-cpp/test/test_supertonic_upload_skip_tracker.cpp b/engines/tts/test/test_supertonic_upload_skip_tracker.cpp
similarity index 100%
rename from tts-cpp/test/test_supertonic_upload_skip_tracker.cpp
rename to engines/tts/test/test_supertonic_upload_skip_tracker.cpp
diff --git a/tts-cpp/test/test_supertonic_vector.cpp b/engines/tts/test/test_supertonic_vector.cpp
similarity index 100%
rename from tts-cpp/test/test_supertonic_vector.cpp
rename to engines/tts/test/test_supertonic_vector.cpp
diff --git a/tts-cpp/test/test_supertonic_vector_estimator_backward.cpp b/engines/tts/test/test_supertonic_vector_estimator_backward.cpp
similarity index 100%
rename from tts-cpp/test/test_supertonic_vector_estimator_backward.cpp
rename to engines/tts/test/test_supertonic_vector_estimator_backward.cpp
diff --git a/tts-cpp/test/test_supertonic_vector_trace.cpp b/engines/tts/test/test_supertonic_vector_trace.cpp
similarity index 100%
rename from tts-cpp/test/test_supertonic_vector_trace.cpp
rename to engines/tts/test/test_supertonic_vector_trace.cpp
diff --git a/tts-cpp/test/test_supertonic_vocoder.cpp b/engines/tts/test/test_supertonic_vocoder.cpp
similarity index 100%
rename from tts-cpp/test/test_supertonic_vocoder.cpp
rename to engines/tts/test/test_supertonic_vocoder.cpp
diff --git a/tts-cpp/test/test_supertonic_vocoder_pointwise.cpp b/engines/tts/test/test_supertonic_vocoder_pointwise.cpp
similarity index 100%
rename from tts-cpp/test/test_supertonic_vocoder_pointwise.cpp
rename to engines/tts/test/test_supertonic_vocoder_pointwise.cpp
diff --git a/tts-cpp/test/test_supertonic_vocoder_trace.cpp b/engines/tts/test/test_supertonic_vocoder_trace.cpp
similarity index 100%
rename from tts-cpp/test/test_supertonic_vocoder_trace.cpp
rename to engines/tts/test/test_supertonic_vocoder_trace.cpp
diff --git a/tts-cpp/test/test_supertonic_voice_host_cache.cpp b/engines/tts/test/test_supertonic_voice_host_cache.cpp
similarity index 100%
rename from tts-cpp/test/test_supertonic_voice_host_cache.cpp
rename to engines/tts/test/test_supertonic_voice_host_cache.cpp
diff --git a/tts-cpp/test/test_supertonic_vulkan_device_select.cpp b/engines/tts/test/test_supertonic_vulkan_device_select.cpp
similarity index 100%
rename from tts-cpp/test/test_supertonic_vulkan_device_select.cpp
rename to engines/tts/test/test_supertonic_vulkan_device_select.cpp
diff --git a/tts-cpp/test/test_supertonic_vulkan_dispatch.cpp b/engines/tts/test/test_supertonic_vulkan_dispatch.cpp
similarity index 100%
rename from tts-cpp/test/test_supertonic_vulkan_dispatch.cpp
rename to engines/tts/test/test_supertonic_vulkan_dispatch.cpp
diff --git a/tts-cpp/test/test_supertonic_vulkan_env_overrides.cpp b/engines/tts/test/test_supertonic_vulkan_env_overrides.cpp
similarity index 100%
rename from tts-cpp/test/test_supertonic_vulkan_env_overrides.cpp
rename to engines/tts/test/test_supertonic_vulkan_env_overrides.cpp
diff --git a/tts-cpp/test/test_supertonic_warm_up_api.cpp b/engines/tts/test/test_supertonic_warm_up_api.cpp
similarity index 100%
rename from tts-cpp/test/test_supertonic_warm_up_api.cpp
rename to engines/tts/test/test_supertonic_warm_up_api.cpp
diff --git a/tts-cpp/test/test_t3_alignment_analyzer.cpp b/engines/tts/test/test_t3_alignment_analyzer.cpp
similarity index 100%
rename from tts-cpp/test/test_t3_alignment_analyzer.cpp
rename to engines/tts/test/test_t3_alignment_analyzer.cpp
diff --git a/tts-cpp/test/test_t3_caches.cpp b/engines/tts/test/test_t3_caches.cpp
similarity index 100%
rename from tts-cpp/test/test_t3_caches.cpp
rename to engines/tts/test/test_t3_caches.cpp
diff --git a/tts-cpp/test/test_t3_mtl.cpp b/engines/tts/test/test_t3_mtl.cpp
similarity index 100%
rename from tts-cpp/test/test_t3_mtl.cpp
rename to engines/tts/test/test_t3_mtl.cpp
diff --git a/tts-cpp/test/test_t3_mtl_stages.cpp b/engines/tts/test/test_t3_mtl_stages.cpp
similarity index 100%
rename from tts-cpp/test/test_t3_mtl_stages.cpp
rename to engines/tts/test/test_t3_mtl_stages.cpp
diff --git a/tts-cpp/test/test_t3_sched_dispatch.cpp b/engines/tts/test/test_t3_sched_dispatch.cpp
similarity index 100%
rename from tts-cpp/test/test_t3_sched_dispatch.cpp
rename to engines/tts/test/test_t3_sched_dispatch.cpp
diff --git a/tts-cpp/test/test_t3_sched_equivalence.cpp b/engines/tts/test/test_t3_sched_equivalence.cpp
similarity index 100%
rename from tts-cpp/test/test_t3_sched_equivalence.cpp
rename to engines/tts/test/test_t3_sched_equivalence.cpp
diff --git a/tts-cpp/test/test_t3_sched_migration.cpp b/engines/tts/test/test_t3_sched_migration.cpp
similarity index 100%
rename from tts-cpp/test/test_t3_sched_migration.cpp
rename to engines/tts/test/test_t3_sched_migration.cpp
diff --git a/tts-cpp/test/test_t3_stop_controller.cpp b/engines/tts/test/test_t3_stop_controller.cpp
similarity index 100%
rename from tts-cpp/test/test_t3_stop_controller.cpp
rename to engines/tts/test/test_t3_stop_controller.cpp
diff --git a/tts-cpp/test/test_text_split.cpp b/engines/tts/test/test_text_split.cpp
similarity index 100%
rename from tts-cpp/test/test_text_split.cpp
rename to engines/tts/test/test_text_split.cpp
diff --git a/tts-cpp/test/test_voice_embedding.cpp b/engines/tts/test/test_voice_embedding.cpp
similarity index 100%
rename from tts-cpp/test/test_voice_embedding.cpp
rename to engines/tts/test/test_voice_embedding.cpp
diff --git a/tts-cpp/test/test_voice_encoder.cpp b/engines/tts/test/test_voice_encoder.cpp
similarity index 100%
rename from tts-cpp/test/test_voice_encoder.cpp
rename to engines/tts/test/test_voice_encoder.cpp
diff --git a/tts-cpp/test/test_voice_features.cpp b/engines/tts/test/test_voice_features.cpp
similarity index 100%
rename from tts-cpp/test/test_voice_features.cpp
rename to engines/tts/test/test_voice_features.cpp
diff --git a/tts-cpp/test/test_voiceclone_gradcheck.cpp b/engines/tts/test/test_voiceclone_gradcheck.cpp
similarity index 100%
rename from tts-cpp/test/test_voiceclone_gradcheck.cpp
rename to engines/tts/test/test_voiceclone_gradcheck.cpp
diff --git a/tts-cpp/test/test_voiceclone_metrics.cpp b/engines/tts/test/test_voiceclone_metrics.cpp
similarity index 100%
rename from tts-cpp/test/test_voiceclone_metrics.cpp
rename to engines/tts/test/test_voiceclone_metrics.cpp