diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index 7a1fcbf..28473bc 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -137,3 +137,18 @@ features = ["derive", "rc"]
 lto = true
 codegen-units = 1
 panic = 'abort'
+
+[workspace]
+members = [
+    "client",
+    "database",
+    "src-tauri",
+    "process",
+    "remote",
+    "utils",
+    "cloud_saves",
+    "download_manager",
+    "games",
+]
+
+resolver = "3"
\ No newline at end of file
diff --git a/client/Cargo.lock b/src-tauri/client/Cargo.lock
similarity index 100%
rename from client/Cargo.lock
rename to src-tauri/client/Cargo.lock
diff --git a/client/Cargo.toml b/src-tauri/client/Cargo.toml
similarity index 100%
rename from client/Cargo.toml
rename to src-tauri/client/Cargo.toml
diff --git a/client/src/app_state.rs b/src-tauri/client/src/app_state.rs
similarity index 100%
rename from client/src/app_state.rs
rename to src-tauri/client/src/app_state.rs
diff --git a/client/src/app_status.rs b/src-tauri/client/src/app_status.rs
similarity index 100%
rename from client/src/app_status.rs
rename to src-tauri/client/src/app_status.rs
diff --git a/client/src/autostart.rs b/src-tauri/client/src/autostart.rs
similarity index 100%
rename from client/src/autostart.rs
rename to src-tauri/client/src/autostart.rs
diff --git a/client/src/compat.rs b/src-tauri/client/src/compat.rs
similarity index 100%
rename from client/src/compat.rs
rename to src-tauri/client/src/compat.rs
diff --git a/client/src/lib.rs b/src-tauri/client/src/lib.rs
similarity index 100%
rename from client/src/lib.rs
rename to src-tauri/client/src/lib.rs
diff --git a/client/src/user.rs b/src-tauri/client/src/user.rs
similarity index 100%
rename from client/src/user.rs
rename to src-tauri/client/src/user.rs
diff --git a/cloud_saves/Cargo.toml b/src-tauri/cloud_saves/Cargo.toml
similarity index 100%
rename from cloud_saves/Cargo.toml
rename to src-tauri/cloud_saves/Cargo.toml
diff --git a/cloud_saves/src/backup_manager.rs b/src-tauri/cloud_saves/src/backup_manager.rs
similarity index 100%
rename from cloud_saves/src/backup_manager.rs
rename to src-tauri/cloud_saves/src/backup_manager.rs
diff --git a/cloud_saves/src/conditions.rs b/src-tauri/cloud_saves/src/conditions.rs
similarity index 100%
rename from cloud_saves/src/conditions.rs
rename to src-tauri/cloud_saves/src/conditions.rs
diff --git a/cloud_saves/src/error.rs b/src-tauri/cloud_saves/src/error.rs
similarity index 100%
rename from cloud_saves/src/error.rs
rename to src-tauri/cloud_saves/src/error.rs
diff --git a/cloud_saves/src/lib.rs b/src-tauri/cloud_saves/src/lib.rs
similarity index 100%
rename from cloud_saves/src/lib.rs
rename to src-tauri/cloud_saves/src/lib.rs
diff --git a/cloud_saves/src/metadata.rs b/src-tauri/cloud_saves/src/metadata.rs
similarity index 100%
rename from cloud_saves/src/metadata.rs
rename to src-tauri/cloud_saves/src/metadata.rs
diff --git a/cloud_saves/src/mod.rs b/src-tauri/cloud_saves/src/mod.rs
similarity index 100%
rename from cloud_saves/src/mod.rs
rename to src-tauri/cloud_saves/src/mod.rs
diff --git a/cloud_saves/src/normalise.rs b/src-tauri/cloud_saves/src/normalise.rs
similarity index 100%
rename from cloud_saves/src/normalise.rs
rename to src-tauri/cloud_saves/src/normalise.rs
diff --git a/cloud_saves/src/path.rs b/src-tauri/cloud_saves/src/path.rs
similarity index 100%
rename from cloud_saves/src/path.rs
rename to src-tauri/cloud_saves/src/path.rs
diff --git a/cloud_saves/src/placeholder.rs b/src-tauri/cloud_saves/src/placeholder.rs
similarity index 100%
rename from cloud_saves/src/placeholder.rs
rename to src-tauri/cloud_saves/src/placeholder.rs
diff --git a/cloud_saves/src/resolver.rs b/src-tauri/cloud_saves/src/resolver.rs
similarity index 100%
rename from cloud_saves/src/resolver.rs
rename to src-tauri/cloud_saves/src/resolver.rs
diff --git a/cloud_saves/src/strict_path.rs b/src-tauri/cloud_saves/src/strict_path.rs
similarity index 100%
rename from cloud_saves/src/strict_path.rs
rename to src-tauri/cloud_saves/src/strict_path.rs
diff --git a/database/Cargo.toml b/src-tauri/database/Cargo.toml
similarity index 100%
rename from database/Cargo.toml
rename to src-tauri/database/Cargo.toml
diff --git a/database/src/db.rs b/src-tauri/database/src/db.rs
similarity index 100%
rename from database/src/db.rs
rename to src-tauri/database/src/db.rs
diff --git a/database/src/debug.rs b/src-tauri/database/src/debug.rs
similarity index 100%
rename from database/src/debug.rs
rename to src-tauri/database/src/debug.rs
diff --git a/database/src/interface.rs b/src-tauri/database/src/interface.rs
similarity index 100%
rename from database/src/interface.rs
rename to src-tauri/database/src/interface.rs
diff --git a/database/src/lib.rs b/src-tauri/database/src/lib.rs
similarity index 100%
rename from database/src/lib.rs
rename to src-tauri/database/src/lib.rs
diff --git a/database/src/models.rs b/src-tauri/database/src/models.rs
similarity index 100%
rename from database/src/models.rs
rename to src-tauri/database/src/models.rs
diff --git a/database/src/platform.rs b/src-tauri/database/src/platform.rs
similarity index 100%
rename from database/src/platform.rs
rename to src-tauri/database/src/platform.rs
diff --git a/download_manager/Cargo.toml b/src-tauri/download_manager/Cargo.toml
similarity index 100%
rename from download_manager/Cargo.toml
rename to src-tauri/download_manager/Cargo.toml
diff --git a/download_manager/src/download_manager_builder.rs b/src-tauri/download_manager/src/download_manager_builder.rs
similarity index 100%
rename from download_manager/src/download_manager_builder.rs
rename to src-tauri/download_manager/src/download_manager_builder.rs
diff --git a/download_manager/src/download_manager_frontend.rs b/src-tauri/download_manager/src/download_manager_frontend.rs
similarity index 100%
rename from download_manager/src/download_manager_frontend.rs
rename to src-tauri/download_manager/src/download_manager_frontend.rs
diff --git a/download_manager/src/downloadable.rs b/src-tauri/download_manager/src/downloadable.rs
similarity index 100%
rename from download_manager/src/downloadable.rs
rename to src-tauri/download_manager/src/downloadable.rs
diff --git a/download_manager/src/error.rs b/src-tauri/download_manager/src/error.rs
similarity index 100%
rename from download_manager/src/error.rs
rename to src-tauri/download_manager/src/error.rs
diff --git a/download_manager/src/frontend_updates.rs b/src-tauri/download_manager/src/frontend_updates.rs
similarity index 100%
rename from download_manager/src/frontend_updates.rs
rename to src-tauri/download_manager/src/frontend_updates.rs
diff --git a/download_manager/src/lib.rs b/src-tauri/download_manager/src/lib.rs
similarity index 100%
rename from download_manager/src/lib.rs
rename to src-tauri/download_manager/src/lib.rs
diff --git a/download_manager/src/util/download_thread_control_flag.rs b/src-tauri/download_manager/src/util/download_thread_control_flag.rs
similarity index 100%
rename from download_manager/src/util/download_thread_control_flag.rs
rename to src-tauri/download_manager/src/util/download_thread_control_flag.rs
diff --git a/download_manager/src/util/mod.rs b/src-tauri/download_manager/src/util/mod.rs
similarity index 100%
rename from download_manager/src/util/mod.rs
rename to src-tauri/download_manager/src/util/mod.rs
diff --git a/download_manager/src/util/progress_object.rs b/src-tauri/download_manager/src/util/progress_object.rs
similarity index 100%
rename from download_manager/src/util/progress_object.rs
rename to src-tauri/download_manager/src/util/progress_object.rs
diff --git a/download_manager/src/util/queue.rs b/src-tauri/download_manager/src/util/queue.rs
similarity index 100%
rename from download_manager/src/util/queue.rs
rename to src-tauri/download_manager/src/util/queue.rs
diff --git a/download_manager/src/util/rolling_progress_updates.rs b/src-tauri/download_manager/src/util/rolling_progress_updates.rs
similarity index 100%
rename from download_manager/src/util/rolling_progress_updates.rs
rename to src-tauri/download_manager/src/util/rolling_progress_updates.rs
diff --git a/games/Cargo.toml b/src-tauri/games/Cargo.toml
similarity index 100%
rename from games/Cargo.toml
rename to src-tauri/games/Cargo.toml
diff --git a/games/src/collections/collection.rs b/src-tauri/games/src/collections/collection.rs
similarity index 100%
rename from games/src/collections/collection.rs
rename to src-tauri/games/src/collections/collection.rs
diff --git a/games/src/collections/mod.rs b/src-tauri/games/src/collections/mod.rs
similarity index 100%
rename from games/src/collections/mod.rs
rename to src-tauri/games/src/collections/mod.rs
diff --git a/games/src/downloads/download_agent.rs b/src-tauri/games/src/downloads/download_agent.rs
similarity index 100%
rename from games/src/downloads/download_agent.rs
rename to src-tauri/games/src/downloads/download_agent.rs
diff --git a/games/src/downloads/download_logic.rs b/src-tauri/games/src/downloads/download_logic.rs
similarity index 100%
rename from games/src/downloads/download_logic.rs
rename to src-tauri/games/src/downloads/download_logic.rs
diff --git a/games/src/downloads/drop_data.rs b/src-tauri/games/src/downloads/drop_data.rs
similarity index 100%
rename from games/src/downloads/drop_data.rs
rename to src-tauri/games/src/downloads/drop_data.rs
diff --git a/games/src/downloads/error.rs b/src-tauri/games/src/downloads/error.rs
similarity index 100%
rename from games/src/downloads/error.rs
rename to src-tauri/games/src/downloads/error.rs
diff --git a/games/src/downloads/manifest.rs b/src-tauri/games/src/downloads/manifest.rs
similarity index 100%
rename from games/src/downloads/manifest.rs
rename to src-tauri/games/src/downloads/manifest.rs
diff --git a/games/src/downloads/mod.rs b/src-tauri/games/src/downloads/mod.rs
similarity index 100%
rename from games/src/downloads/mod.rs
rename to src-tauri/games/src/downloads/mod.rs
diff --git a/games/src/downloads/utils.rs b/src-tauri/games/src/downloads/utils.rs
similarity index 100%
rename from games/src/downloads/utils.rs
rename to src-tauri/games/src/downloads/utils.rs
diff --git a/games/src/downloads/validate.rs b/src-tauri/games/src/downloads/validate.rs
similarity index 100%
rename from games/src/downloads/validate.rs
rename to src-tauri/games/src/downloads/validate.rs
diff --git a/games/src/lib.rs b/src-tauri/games/src/lib.rs
similarity index 100%
rename from games/src/lib.rs
rename to src-tauri/games/src/lib.rs
diff --git a/games/src/library.rs b/src-tauri/games/src/library.rs
similarity index 100%
rename from games/src/library.rs
rename to src-tauri/games/src/library.rs
diff --git a/games/src/scan.rs b/src-tauri/games/src/scan.rs
similarity index 100%
rename from games/src/scan.rs
rename to src-tauri/games/src/scan.rs
diff --git a/games/src/state.rs b/src-tauri/games/src/state.rs
similarity index 100%
rename from games/src/state.rs
rename to src-tauri/games/src/state.rs
diff --git a/process/Cargo.toml b/src-tauri/process/Cargo.toml
similarity index 100%
rename from process/Cargo.toml
rename to src-tauri/process/Cargo.toml
diff --git a/process/src/error.rs b/src-tauri/process/src/error.rs
similarity index 100%
rename from process/src/error.rs
rename to src-tauri/process/src/error.rs
diff --git a/process/src/format.rs b/src-tauri/process/src/format.rs
similarity index 100%
rename from process/src/format.rs
rename to src-tauri/process/src/format.rs
diff --git a/process/src/lib.rs b/src-tauri/process/src/lib.rs
similarity index 100%
rename from process/src/lib.rs
rename to src-tauri/process/src/lib.rs
diff --git a/process/src/process_handlers.rs b/src-tauri/process/src/process_handlers.rs
similarity index 100%
rename from process/src/process_handlers.rs
rename to src-tauri/process/src/process_handlers.rs
diff --git a/process/src/process_manager.rs b/src-tauri/process/src/process_manager.rs
similarity index 100%
rename from process/src/process_manager.rs
rename to src-tauri/process/src/process_manager.rs
diff --git a/remote/Cargo.toml b/src-tauri/remote/Cargo.toml
similarity index 100%
rename from remote/Cargo.toml
rename to src-tauri/remote/Cargo.toml
diff --git a/remote/src/auth.rs b/src-tauri/remote/src/auth.rs
similarity index 100%
rename from remote/src/auth.rs
rename to src-tauri/remote/src/auth.rs
diff --git a/remote/src/cache.rs b/src-tauri/remote/src/cache.rs
similarity index 100%
rename from remote/src/cache.rs
rename to src-tauri/remote/src/cache.rs
diff --git a/remote/src/error.rs b/src-tauri/remote/src/error.rs
similarity index 100%
rename from remote/src/error.rs
rename to src-tauri/remote/src/error.rs
diff --git a/remote/src/fetch_object.rs b/src-tauri/remote/src/fetch_object.rs
similarity index 100%
rename from remote/src/fetch_object.rs
rename to src-tauri/remote/src/fetch_object.rs
diff --git a/remote/src/lib.rs b/src-tauri/remote/src/lib.rs
similarity index 100%
rename from remote/src/lib.rs
rename to src-tauri/remote/src/lib.rs
diff --git a/remote/src/requests.rs b/src-tauri/remote/src/requests.rs
similarity index 100%
rename from remote/src/requests.rs
rename to src-tauri/remote/src/requests.rs
diff --git a/remote/src/server_proto.rs b/src-tauri/remote/src/server_proto.rs
similarity index 100%
rename from remote/src/server_proto.rs
rename to src-tauri/remote/src/server_proto.rs
diff --git a/remote/src/utils.rs b/src-tauri/remote/src/utils.rs
similarity index 100%
rename from remote/src/utils.rs
rename to src-tauri/remote/src/utils.rs
diff --git a/utils/Cargo.toml b/src-tauri/utils/Cargo.toml
similarity index 100%
rename from utils/Cargo.toml
rename to src-tauri/utils/Cargo.toml
diff --git a/utils/src/app_emit.rs b/src-tauri/utils/src/app_emit.rs
similarity index 100%
rename from utils/src/app_emit.rs
rename to src-tauri/utils/src/app_emit.rs
diff --git a/utils/src/download_manager_send.rs b/src-tauri/utils/src/download_manager_send.rs
similarity index 100%
rename from utils/src/download_manager_send.rs
rename to src-tauri/utils/src/download_manager_send.rs
diff --git a/utils/src/lib.rs b/src-tauri/utils/src/lib.rs
similarity index 100%
rename from utils/src/lib.rs
rename to src-tauri/utils/src/lib.rs
diff --git a/utils/src/lock.rs b/src-tauri/utils/src/lock.rs
similarity index 100%
rename from utils/src/lock.rs
rename to src-tauri/utils/src/lock.rs
diff --git a/utils/src/webbrowser_open.rs b/src-tauri/utils/src/webbrowser_open.rs
similarity index 100%
rename from utils/src/webbrowser_open.rs
rename to src-tauri/utils/src/webbrowser_open.rs