diff --git a/package.json b/package.json
index 32eafbb1..ffc2d145 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
   "type": "module",
   "scripts": {
     "setup-python": "install.bat",
-    "build-python": "pyinstaller -F src-python/test.py --distpath src-tauri/bin --clean -n test-x86_64-pc-windows-msvc",
+    "build-python": "pyinstaller -F src-python/webui_mainloop.py --add-data ./fonts;fonts/ --add-data ./batch;batch/ --add-data .venv/Lib/site-packages/zeroconf;zeroconf/ --add-data .venv/Lib/site-packages/openvr;openvr/ --distpath src-tauri/bin --exclude-module pandas --exclude-module matplotlib --exclude-module PyQt5 --clean -n test-x86_64-pc-windows-msvc",
     "dev": "vite",
     "build": "vite build",
     "preview": "vite preview",
diff --git a/config.py b/src-python/config.py
similarity index 100%
rename from config.py
rename to src-python/config.py
diff --git a/controller.py b/src-python/controller.py
similarity index 100%
rename from controller.py
rename to src-python/controller.py
diff --git a/main.py b/src-python/main.py
similarity index 100%
rename from main.py
rename to src-python/main.py
diff --git a/model.py b/src-python/model.py
similarity index 100%
rename from model.py
rename to src-python/model.py
diff --git a/models/osc/osc_tools.py b/src-python/models/osc/osc_tools.py
similarity index 100%
rename from models/osc/osc_tools.py
rename to src-python/models/osc/osc_tools.py
diff --git a/models/overlay/overlay.py b/src-python/models/overlay/overlay.py
similarity index 100%
rename from models/overlay/overlay.py
rename to src-python/models/overlay/overlay.py
diff --git a/models/overlay/overlay_image.py b/src-python/models/overlay/overlay_image.py
similarity index 100%
rename from models/overlay/overlay_image.py
rename to src-python/models/overlay/overlay_image.py
diff --git a/models/overlay/overlay_utils.py b/src-python/models/overlay/overlay_utils.py
similarity index 100%
rename from models/overlay/overlay_utils.py
rename to src-python/models/overlay/overlay_utils.py
diff --git a/models/transcription/transcription_languages.py b/src-python/models/transcription/transcription_languages.py
similarity index 100%
rename from models/transcription/transcription_languages.py
rename to src-python/models/transcription/transcription_languages.py
diff --git a/models/transcription/transcription_recorder.py b/src-python/models/transcription/transcription_recorder.py
similarity index 100%
rename from models/transcription/transcription_recorder.py
rename to src-python/models/transcription/transcription_recorder.py
diff --git a/models/transcription/transcription_transcriber.py b/src-python/models/transcription/transcription_transcriber.py
similarity index 100%
rename from models/transcription/transcription_transcriber.py
rename to src-python/models/transcription/transcription_transcriber.py
diff --git a/models/transcription/transcription_utils.py b/src-python/models/transcription/transcription_utils.py
similarity index 100%
rename from models/transcription/transcription_utils.py
rename to src-python/models/transcription/transcription_utils.py
diff --git a/models/transcription/transcription_whisper.py b/src-python/models/transcription/transcription_whisper.py
similarity index 100%
rename from models/transcription/transcription_whisper.py
rename to src-python/models/transcription/transcription_whisper.py
diff --git a/models/translation/translation_languages.py b/src-python/models/translation/translation_languages.py
similarity index 100%
rename from models/translation/translation_languages.py
rename to src-python/models/translation/translation_languages.py
diff --git a/models/translation/translation_translator.py b/src-python/models/translation/translation_translator.py
similarity index 100%
rename from models/translation/translation_translator.py
rename to src-python/models/translation/translation_translator.py
diff --git a/models/translation/translation_utils.py b/src-python/models/translation/translation_utils.py
similarity index 100%
rename from models/translation/translation_utils.py
rename to src-python/models/translation/translation_utils.py
diff --git a/models/xsoverlay/notification.py b/src-python/models/xsoverlay/notification.py
similarity index 100%
rename from models/xsoverlay/notification.py
rename to src-python/models/xsoverlay/notification.py
diff --git a/utils.py b/src-python/utils.py
similarity index 100%
rename from utils.py
rename to src-python/utils.py
diff --git a/webui_controller.py b/src-python/webui_controller.py
similarity index 100%
rename from webui_controller.py
rename to src-python/webui_controller.py
diff --git a/webui_mainloop.py b/src-python/webui_mainloop.py
similarity index 91%
rename from webui_mainloop.py
rename to src-python/webui_mainloop.py
index dbe825bf..315cee44 100644
--- a/webui_mainloop.py
+++ b/src-python/webui_mainloop.py
@@ -222,35 +222,53 @@ def main():
     received_data = json.loads(received_data)
 
     if received_data is True:
-        endpoint = received_data.get("endpoint", None)
-        data = received_data.get("data", None)
-
-        match endpoint.split("/")[1]:
-            case "config":
-                response_data, status = handleConfigRequest(endpoint, data)
-            case "controller":
-                response_data, status = handleControllerRequest(endpoint, data)
-            case _:
-                pass
-
-        response = {
-            "status": status,
-            "endpoint": endpoint,
-            "data": response_data,
+        response_data = {
+            "status": "ok",
+            "id": received_data["id"],
+            "data": received_data["data"],
         }
-
-        response = json.dumps(response)
+        response = json.dumps(response_data)
         time.sleep(2)
         print(response, flush=True)
 
+        # endpoint = received_data.get("endpoint", None)
+        # data = received_data.get("data", None)
+
+        # match endpoint.split("/")[1]:
+        #     case "config":
+        #         response_data, status = handleConfigRequest(endpoint, data)
+        #     case "controller":
+        #         response_data, status = handleControllerRequest(endpoint, data)
+        #     case _:
+        #         pass
+
+        # response = {
+        #     "status": status,
+        #     "endpoint": endpoint,
+        #     "data": response_data,
+        # }
+
+        # response = json.dumps(response)
+        # time.sleep(2)
+        # print(response, flush=True)
+
 if __name__ == "__main__":
-    endpoint = "/controller/list_mic_host"
-    data = None
-    response_data, status = handleControllerRequest(endpoint, data)
-    response = {
-        "status": status,
-        "endpoint": endpoint,
-        "data": response_data,
-    }
-    response = json.dumps(response)
-    print(response, flush=True)
\ No newline at end of file
+    # endpoint = "/controller/list_mic_host"
+    # data = None
+    # response_data, status = handleControllerRequest(endpoint, data)
+    # response = {
+    #     "status": status,
+    #     "endpoint": endpoint,
+    #     "data": response_data,
+    # }
+    # response = json.dumps(response)
+    # print(response, flush=True)
+
+    try:
+        print(json.dumps({"init_key_from_py": "Initialization from Python."}), flush=True)
+        while True:
+            main()
+    except Exception:
+        import traceback
+        with open('error.log', 'a') as f:
+            traceback.print_exc(file=f)
\ No newline at end of file