feat: more refactoring (broken)

fix: cleanup dependencies
refactor: into rust workspaces
2026-01-30 19:15:17 +01:00 · 2025-09-16 15:09:43 +10:00 · 2025-09-14 09:27:49 +10:00 · 2025-09-14 09:19:03 +10:00
199 changed files with 3895 additions and 30801 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -29,6 +29,4 @@ src-tauri/flamegraph.svg
 src-tauri/perf*

 /*.AppImage
-/squashfs-root
-
-/target/
+/squashfs-root
--- a/README.md
+++ b/README.md
@@ -1,21 +1,29 @@
-# Drop Desktop Client
+# Drop App

-The Drop Desktop Client is the companion app for [Drop](https://github.com/Drop-OSS/drop). It is the official & intended way to download and play games on your Drop server.
+Drop app is the companion app for [Drop](https://github.com/Drop-OSS/drop). It uses a Tauri base with Nuxt 3 + TailwindCSS on top of it, so we can re-use components from the web UI.

-## Internals
+## Running
+Before setting up the drop app, be sure that you have a server set up. 
+The instructions for this can be found on the [Drop Docs](https://docs.droposs.org/docs/guides/quickstart)

-It uses a Tauri base with Nuxt 3 + TailwindCSS on top of it, so we can re-use components from the web UI.
+## Current features
+Currently supported are the following features:
+- Signin (with custom server)
+- Database registering & recovery
+- Dynamic library fetching from server
+- Installing & uninstalling games
+- Download progress monitoring
+- Launching / playing games

 ## Development
-Before setting up a development environemnt, be sure that you have a server set up. The instructions for this can be found on the [Drop Docs](https://docs.droposs.org/docs/guides/quickstart).

-Then, install dependencies with `yarn`. This'll install the custom builder's dependencies. Then, check everything works properly with `yarn tauri build`. 
+Install dependencies with `yarn`

-Run the app in development with `yarn tauri dev`. NVIDIA users on Linux, use shell script `./nvidia-prop-dev.sh`
+Run the app in development with `yarn tauri dev`. NVIDIA users on Linux, use shell script `./nvidia-prop-dev.sh`

 To manually specify the logging level, add the environment variable `RUST_LOG=[debug, info, warn, error]` to `yarn tauri dev`:

 e.g. `RUST_LOG=debug yarn tauri dev`

 ## Contributing
-Check out the contributing guide on our Developer Docs: [Drop Developer Docs - Contributing](https://developer.droposs.org/contributing).
+Check the original [Drop repo](https://github.com/Drop-OSS/drop/blob/main/CONTRIBUTING.md) for contributing guidelines. 
--- a/main/app.vue
+++ b/main/app.vue
@@ -1,5 +1,5 @@
 <template>
-  <NuxtLoadingIndicator color="#2563eb" />
+    <NuxtLoadingIndicator color="#2563eb" />
  <NuxtLayout class="select-none w-screen h-screen">
    <NuxtPage />
    <ModalStack />
@@ -7,7 +7,14 @@
 </template>

 <script setup lang="ts">
+import "~/composables/downloads.js";
+
 import { invoke } from "@tauri-apps/api/core";
+import { useAppState } from "./composables/app-state.js";
+import {
+  initialNavigation,
+  setupHooks,
+} from "./composables/state-navigation.js";

 const router = useRouter();

--- a/shared/components/GameStatusButton.vue
+++ b/shared/components/GameStatusButton.vue
--- a/main/components/Header.vue
+++ b/main/components/Header.vue
@@ -2,7 +2,9 @@
  <div class="h-16 bg-zinc-950 flex flex-row justify-between">
    <div class="flex flex-row grow items-center pl-5 pr-2 py-3">
      <div class="inline-flex items-center gap-x-10">
-        <Wordmark class="h-8 mb-0.5" />
+        <NuxtLink to="/store">
+          <Wordmark class="h-8 mb-0.5" />
+        </NuxtLink>
        <nav class="inline-flex items-center mt-0.5">
          <ol class="inline-flex items-center gap-x-6">
            <NuxtLink
@@ -40,7 +42,7 @@
        </ol>
      </div>
    </div>
-    <WindowControl />
+    <WindowControl  />
  </div>
 </template>

--- a/main/components/HeaderUserWidget.vue
+++ b/main/components/HeaderUserWidget.vue
@@ -76,6 +76,7 @@ import { Menu, MenuButton, MenuItem, MenuItems } from "@headlessui/vue";
 import { ChevronDownIcon } from "@heroicons/vue/16/solid";
 import type { NavigationItem } from "../types";
 import HeaderWidget from "./HeaderWidget.vue";
+import { useAppState } from "~/composables/app-state";
 import { invoke } from "@tauri-apps/api/core";

 const open = ref(false);
--- a/main/components/LibrarySearch.vue
+++ b/main/components/LibrarySearch.vue
@@ -73,7 +73,7 @@
                  alt=""
                />
              </div>
-              <div class="flex flex-col gap-x-2">
+              <div class="inline-flex items-center gap-x-2">
                <p
                  class="text-sm whitespace-nowrap font-display font-semibold"
                >
--- a/shared/components/Logo.vue
+++ b/shared/components/Logo.vue
--- a/main/components/PageWidget.vue
+++ b/main/components/PageWidget.vue
@@ -0,0 +1,7 @@
+<template>
+  <NuxtLink
+    class="inline-flex items-center gap-x-2 px-1 py-0.5 rounded bg-blue-900 text-zinc-100 hover:bg-blue-800"
+  >
+    <slot />
+  </NuxtLink>
+</template>
--- a/shared/components/Wordmark.vue
+++ b/shared/components/Wordmark.vue
--- a/shared/composables/app-state.ts
+++ b/shared/composables/app-state.ts
--- a/shared/composables/current-page-engine.ts
+++ b/shared/composables/current-page-engine.ts
--- a/shared/composables/downloads.ts
+++ b/shared/composables/downloads.ts
--- a/shared/composables/game.ts
+++ b/shared/composables/game.ts
--- a/shared/composables/generateGameMeta.ts
+++ b/shared/composables/generateGameMeta.ts
--- a/shared/composables/state-navigation.ts
+++ b/shared/composables/state-navigation.ts
--- a/shared/composables/use-object.ts
+++ b/shared/composables/use-object.ts
@@ -1,5 +1,5 @@
 import { convertFileSrc } from "@tauri-apps/api/core";

-export const useObject = (id: string) => {
+export const useObject = async (id: string) => {
  return convertFileSrc(id, "object");
 };
--- a/main/nuxt.config.ts
+++ b/main/nuxt.config.ts
@@ -9,17 +9,13 @@ export default defineNuxtConfig({
    },
  },

+  css: ["~/assets/main.scss"],
+
  ssr: false,

-  extends: ["../shared", "../libs/drop-base"],
+  extends: [["../libs/drop-base"]],

  app: {
    baseURL: "/main",
-  },
-
-  devtools: {
-    enabled: false,
-  },
-
-  
+  }
 });
--- a/shared/plugins/global-error-handler.ts
+++ b/shared/plugins/global-error-handler.ts
--- a/shared/plugins/vuedraggable.ts
+++ b/shared/plugins/vuedraggable.ts
--- a/shared/public/fonts/helvetica/Helvetica-Bold.woff
+++ b/shared/public/fonts/helvetica/Helvetica-Bold.woff
--- a/shared/public/fonts/helvetica/Helvetica-BoldOblique.woff
+++ b/shared/public/fonts/helvetica/Helvetica-BoldOblique.woff
--- a/shared/public/fonts/helvetica/Helvetica-Oblique.woff
+++ b/shared/public/fonts/helvetica/Helvetica-Oblique.woff
--- a/shared/public/fonts/helvetica/Helvetica.woff
+++ b/shared/public/fonts/helvetica/Helvetica.woff
--- a/shared/public/fonts/helvetica/helvetica-compressed-5871d14b6903a.woff
+++ b/shared/public/fonts/helvetica/helvetica-compressed-5871d14b6903a.woff
--- a/shared/public/fonts/helvetica/helvetica-light-587ebe5a59211.woff
+++ b/shared/public/fonts/helvetica/helvetica-light-587ebe5a59211.woff
--- a/shared/public/fonts/helvetica/helvetica-light-587ebe5a59211.woff2
+++ b/shared/public/fonts/helvetica/helvetica-light-587ebe5a59211.woff2
--- a/shared/public/fonts/helvetica/helvetica-rounded-bold-5871d05ead8de.woff
+++ b/shared/public/fonts/helvetica/helvetica-rounded-bold-5871d05ead8de.woff
--- a/shared/public/fonts/inter/InterVariable-Italic.ttf
+++ b/shared/public/fonts/inter/InterVariable-Italic.ttf
--- a/shared/public/fonts/inter/InterVariable.ttf
+++ b/shared/public/fonts/inter/InterVariable.ttf
--- a/shared/public/fonts/motiva/MotivaSansBlack.woff.ttf
+++ b/shared/public/fonts/motiva/MotivaSansBlack.woff.ttf
--- a/shared/public/fonts/motiva/MotivaSansBold.woff.ttf
+++ b/shared/public/fonts/motiva/MotivaSansBold.woff.ttf
--- a/shared/public/fonts/motiva/MotivaSansExtraBold.ttf
+++ b/shared/public/fonts/motiva/MotivaSansExtraBold.ttf
--- a/shared/public/fonts/motiva/MotivaSansLight.woff.ttf
+++ b/shared/public/fonts/motiva/MotivaSansLight.woff.ttf
--- a/shared/public/fonts/motiva/MotivaSansMedium.woff.ttf
+++ b/shared/public/fonts/motiva/MotivaSansMedium.woff.ttf
--- a/shared/public/fonts/motiva/MotivaSansRegular.woff.ttf
+++ b/shared/public/fonts/motiva/MotivaSansRegular.woff.ttf
--- a/shared/public/fonts/motiva/MotivaSansThin.ttf
+++ b/shared/public/fonts/motiva/MotivaSansThin.ttf
--- a/main/tailwind.config.js
+++ b/main/tailwind.config.js
@@ -7,7 +7,6 @@ export default {
    "./plugins/**/*.{js,ts}",
    "./app.vue",
    "./error.vue",
-    "../shared/components/**/*.vue"
  ],
  theme: {
    extend: {
--- a/package.json
+++ b/package.json
@@ -14,8 +14,7 @@
    "@tauri-apps/plugin-os": "^2.3.0",
    "@tauri-apps/plugin-shell": "^2.3.0",
    "pino": "^9.7.0",
-    "pino-pretty": "^13.1.1",
-    "tauri": "^0.15.0"
+    "pino-pretty": "^13.1.1"
  },
  "devDependencies": {
    "@tauri-apps/cli": "^2.7.1"
--- a/shared/app.vue
+++ b/shared/app.vue
@@ -1,50 +0,0 @@
-<template>
-  <NuxtLoadingIndicator color="#2563eb" />
-  <NuxtLayout class="select-none w-screen h-screen">
-    <NuxtPage />
-    <ModalStack />
-  </NuxtLayout>
-</template>
-
-<script setup lang="ts">
-import "~/composables/downloads.js";
-
-import { invoke } from "@tauri-apps/api/core";
-import { useAppState } from "./composables/app-state.js";
-import {
-  initialNavigation,
-  setupHooks,
-} from "./composables/state-navigation.js";
-
-const router = useRouter();
-
-const state = useAppState();
-
-async function fetchState() {
-  try {
-    state.value = JSON.parse(await invoke("fetch_state"));
-    if (!state.value)
-      throw createError({
-        statusCode: 500,
-        statusMessage: `App state is: ${state.value}`,
-        fatal: true,
-      });
-  } catch (e) {
-    console.error("failed to parse state", e);
-    throw e;
-  }
-}
-await fetchState();
-
-// This is inefficient but apparently we do it lol
-router.beforeEach(async () => {
-  await fetchState();
-});
-
-setupHooks();
-initialNavigation(state);
-
-useHead({
-  title: "Drop",
-});
-</script>
--- a/shared/assets/main.scss
+++ b/shared/assets/main.scss
@@ -1,84 +0,0 @@
-@tailwind base;
-@tailwind components;
-@tailwind utilities;
-
-html,
-body {
-  -ms-overflow-style: none; /* IE and Edge /
-scrollbar-width: none; / Firefox */
-}
-
-/* Hide scrollbar for Chrome, Safari and Opera */
-html::-webkit-scrollbar {
-  display: none;
-}
-
-$motiva: (
-  ("MotivaSansThin.ttf", "ttf", 100, normal),
-  ("MotivaSansLight.woff.ttf", "woff", 300, normal),
-  ("MotivaSansRegular.woff.ttf", "woff", 400, normal),
-  ("MotivaSansMedium.woff.ttf", "woff", 500, normal),
-  ("MotivaSansBold.woff.ttf", "woff", 600, normal),
-  ("MotivaSansExtraBold.ttf", "woff", 700, normal),
-  ("MotivaSansBlack.woff.ttf", "woff", 900, normal)
-);
-
-$helvetica: (
-  ("Helvetica.woff", "woff", 400, normal),
-  ("Helvetica-Oblique.woff", "woff", 400, italic),
-  ("Helvetica-Bold.woff", "woff", 600, normal),
-  ("Helvetica-BoldOblique.woff", "woff", 600, italic),
-  ("helvetica-light-587ebe5a59211.woff2", "woff2", 300, normal)
-);
-
-@each $file, $format, $weight, $style in $motiva {
-  @font-face {
-    font-family: "Motiva Sans";
-    src: url("/fonts/motiva/#{$file}") format($format);
-    font-weight: $weight;
-    font-style: $style;
-  }
-}
-
-@each $file, $format, $weight, $style in $helvetica {
-  @font-face {
-    font-family: "Helvetica";
-    src: url("/fonts/helvetica/#{$file}") format($format);
-    font-weight: $weight;
-    font-style: $style;
-  }
-}
-
-@font-face {
-  font-family: "Inter";
-  src: url("/fonts/inter/InterVariable.ttf");
-  font-style: normal;
-}
-
-@font-face {
-  font-family: "Inter";
-  src: url("/fonts/inter/InterVariable-Italic.ttf");
-  font-style: italic;
-}
-
-/* ===== Scrollbar CSS ===== */
-/* Firefox */
-* {
-  scrollbar-width: 4px;
-  scrollbar-color: #52525b #00000000;
-}
-
-/* Chrome, Edge, and Safari */
-*::-webkit-scrollbar {
-  width: 4px;
-}
-
-*::-webkit-scrollbar-track {
-  background: transparent;
-}
-
-*::-webkit-scrollbar-thumb {
-  background-color: #52525b;
-  border-radius: 10px;
-  border: 3px solid #52525b;
-}
--- a/shared/error.vue
+++ b/shared/error.vue
@@ -1,91 +0,0 @@
-<template>
-  <NuxtLayout name="default">
-    <div
-      class="grid min-h-full grid-cols-1 grid-rows-[1fr,auto,1fr] lg:grid-cols-[max(50%,36rem),1fr]"
-    >
-      <header
-        class="mx-auto w-full max-w-7xl px-6 pt-6 sm:pt-10 lg:col-span-2 lg:col-start-1 lg:row-start-1 lg:px-8"
-      >
-        <Logo class="h-10 w-auto sm:h-12" />
-        
-      </header>
-      <main
-        class="mx-auto w-full max-w-7xl px-6 py-24 sm:py-32 lg:col-span-2 lg:col-start-1 lg:row-start-2 lg:px-8"
-      >
-        <div class="max-w-lg">
-          <p class="text-base font-semibold leading-8 text-blue-600">
-            {{ error?.statusCode }}
-          </p>
-          <h1
-            class="mt-4 text-3xl font-bold font-display tracking-tight text-zinc-100 sm:text-5xl"
-          >
-            Oh no!
-          </h1>
-          <p
-            v-if="message"
-            class="mt-3 font-bold text-base leading-7 text-red-500"
-          >
-            {{ message }}
-          </p>
-          <p class="mt-6 text-base leading-7 text-zinc-400">
-            An error occurred while responding to your request. If you believe
-            this to be a bug, please report it. Try signing in and see if it
-            resolves the issue.
-          </p>
-          <div class="mt-10">
-            <!-- full app reload to fix errors -->
-            <a
-              href="/store"
-              class="text-sm font-semibold leading-7 text-blue-600"
-              ><span aria-hidden="true">&larr;</span> Back to store</a
-            >
-          </div>
-        </div>
-      </main>
-      <footer class="self-end lg:col-span-2 lg:col-start-1 lg:row-start-3">
-        <div class="border-t border-zinc-700 bg-zinc-900 py-10">
-          <nav
-            class="mx-auto flex w-full max-w-7xl items-center gap-x-4 px-6 text-sm leading-7 text-zinc-400 lg:px-8"
-          >
-            <NuxtLink href="/docs">Documentation</NuxtLink>
-            <svg
-              viewBox="0 0 2 2"
-              aria-hidden="true"
-              class="h-0.5 w-0.5 fill-zinc-600"
-            >
-              <circle cx="1" cy="1" r="1" />
-            </svg>
-            <a href="https://discord.gg/NHx46XKJWA" target="_blank"
-              >Support Discord</a
-            >
-          </nav>
-        </div>
-      </footer>
-      <div
-        class="hidden lg:relative lg:col-start-2 lg:row-start-1 lg:row-end-4 lg:block"
-      >
-        <img
-          src="@/assets/wallpaper.jpg"
-          alt=""
-          class="absolute inset-0 h-full w-full object-cover"
-        />
-      </div>
-    </div>
-  </NuxtLayout>
-</template>
-
-<script setup lang="ts">
-import type { NuxtError } from "#app";
-
-const props = defineProps({
-  error: Object as () => NuxtError,
-});
-
-const statusCode = props.error?.statusCode;
-const message =
-  props.error?.statusMessage ||
-  props.error?.message ||
-  "An unknown error occurred.";
-
-console.error(props.error);
-</script>
--- a/shared/nuxt.config.ts
+++ b/shared/nuxt.config.ts
@@ -1,25 +0,0 @@
-// https://nuxt.com/docs/api/configuration/nuxt-config
-export default defineNuxtConfig({
-  compatibilityDate: "2024-04-03",
-
-  postcss: {
-    plugins: {
-      tailwindcss: {},
-      autoprefixer: {},
-    },
-  },
-
-  css: ["~/assets/main.scss"],
-
-  ssr: false,
-
-  extends: [["../libs/drop-base"]],
-
-  app: {
-    baseURL: "/main",
-  },
-
-  devtools: {
-    enabled: false,
-  },
-});
--- a/shared/package.json
+++ b/shared/package.json
@@ -1,37 +0,0 @@
-{
-  "name": "view",
-  "private": true,
-  "version": "0.3.3",
-  "type": "module",
-  "scripts": {
-    "build": "nuxt generate",
-    "dev": "nuxt dev",
-    "postinstall": "nuxt prepare",
-    "tauri": "tauri"
-  },
-  "dependencies": {
-    "@headlessui/vue": "^1.7.23",
-    "@heroicons/vue": "^2.1.5",
-    "@nuxtjs/tailwindcss": "^6.12.2",
-    "@tauri-apps/api": "^2.7.0",
-    "koa": "^2.16.1",
-    "markdown-it": "^14.1.0",
-    "micromark": "^4.0.1",
-    "nuxt": "^3.16.0",
-    "scss": "^0.2.4",
-    "vue-router": "latest",
-    "vuedraggable": "^4.1.0"
-  },
-  "devDependencies": {
-    "@tailwindcss/forms": "^0.5.9",
-    "@tailwindcss/typography": "^0.5.15",
-    "@types/markdown-it": "^14.1.2",
-    "autoprefixer": "^10.4.20",
-    "postcss": "^8.4.47",
-    "sass-embedded": "^1.79.4",
-    "tailwindcss": "^3.4.13",
-    "typescript": "^5.8.3",
-    "vue-tsc": "^2.2.10"
-  },
-  "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
-}
--- a/shared/tailwind.config.js
+++ b/shared/tailwind.config.js
@@ -1,20 +0,0 @@
-/** @type {import('tailwindcss').Config} */
-export default {
-  content: [
-    "./components/**/*.{js,vue,ts}",
-    "./layouts/**/*.vue",
-    "./pages/**/*.vue",
-    "./plugins/**/*.{js,ts}",
-    "./app.vue",
-    "./error.vue",
-  ],
-  theme: {
-    extend: {
-      fontFamily: {
-        sans: ["Inter"],
-        display: ["Motiva Sans"],
-      },
-    },
-  },
-  plugins: [require("@tailwindcss/forms"), require('@tailwindcss/typography')],
-};
--- a/shared/tsconfig.json
+++ b/shared/tsconfig.json
@@ -1,5 +0,0 @@
-{
-  // https://nuxt.com/docs/guide/concepts/typescript
-  "extends": "./.nuxt/tsconfig.json",
-  "exclude": ["src-tauri/**/*"]
-}
--- a/shared/types.ts
+++ b/shared/types.ts
@@ -1,96 +0,0 @@
-import type { Component } from "vue";
-
-export type NavigationItem = {
-  prefix: string;
-  route: string;
-  label: string;
-};
-
-export type QuickActionNav = {
-  icon: Component;
-  notifications?: number;
-  action: () => Promise<void>;
-};
-
-export type User = {
-  id: string;
-  username: string;
-  admin: boolean;
-  displayName: string;
-  profilePictureObjectId: string;
-};
-
-export type AppState = {
-  status: AppStatus;
-  user?: User;
-};
-
-export type Game = {
-  id: string;
-  mName: string;
-  mShortDescription: string;
-  mDescription: string;
-  mIconObjectId: string;
-  mBannerObjectId: string;
-  mCoverObjectId: string;
-  mImageLibraryObjectIds: string[];
-  mImageCarouselObjectIds: string[];
-};
-
-export type Collection = {
-  id: string;
-  name: string;
-  isDefault: boolean;
-  entries: Array<{ gameId: string; game: Game }>;
-};
-
-export type GameVersion = {
-  launchCommandTemplate: string;
-};
-
-export enum AppStatus {
-  NotConfigured = "NotConfigured",
-  Offline = "Offline",
-  SignedOut = "SignedOut",
-  SignedIn = "SignedIn",
-  SignedInNeedsReauth = "SignedInNeedsReauth",
-  ServerUnavailable = "ServerUnavailable",
-}
-
-export enum GameStatusEnum {
-  Remote = "Remote",
-  Queued = "Queued",
-  Downloading = "Downloading",
-  Validating = "Validating",
-  Installed = "Installed",
-  Updating = "Updating",
-  Uninstalling = "Uninstalling",
-  SetupRequired = "SetupRequired",
-  Running = "Running",
-  PartiallyInstalled = "PartiallyInstalled",
-}
-
-export type GameStatus = {
-  type: GameStatusEnum;
-  version_name?: string;
-  install_dir?: string;
-};
-
-export enum DownloadableType {
-  Game = "Game",
-  Tool = "Tool",
-  DLC = "DLC",
-  Mod = "Mod",
-}
-
-export type DownloadableMetadata = {
-  id: string;
-  version: string;
-  downloadType: DownloadableType;
-};
-
-export type Settings = {
-  autostart: boolean;
-  maxDownloadThreads: number;
-  forceOffline: boolean;
-};
--- a/shared/yarn.lock
+++ b/shared/yarn.lock
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -1,154 +1,101 @@
 [package]
 name = "drop-app"
 version = "0.3.3"
-description = "The client application for the open-source, self-hosted game distribution platform Drop"
-authors = ["Drop OSS"]
+# authors = ["Drop OSS"]
 edition = "2024"
+description = "The client application for the open-source, self-hosted game distribution platform Drop"
+
+[workspace]
+resolver = "3"
+members = ["drop-consts",
+  "drop-database",
+  "drop-downloads",
+  "drop-errors", "drop-library",
+  "drop-native-library",
+  "drop-process",
+  "drop-remote",
+]

 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

-[target."cfg(any(target_os = \"macos\", windows, target_os = \"linux\"))".dependencies]
-tauri-plugin-single-instance = { version = "2.0.0", features = ["deep-link"] }
-
 [lib]
+crate-type = ["cdylib", "rlib", "staticlib"]
 # The `_lib` suffix may seem redundant but it is necessary
 # to make the lib name unique and wouldn't conflict with the bin name.
 # This seems to be only an issue on Windows, see https://github.com/rust-lang/cargo/issues/8519
 name = "drop_app_lib"
-crate-type = ["staticlib", "cdylib", "rlib"]
-rustflags = ["-C", "target-feature=+aes,+sse2"]
-
-
-[build-dependencies]
-tauri-build = { version = "2.0.0", features = [] }
+# rustflags = ["-C", "target-feature=+aes,+sse2"]

 [dependencies]
-tauri-plugin-shell = "2.2.1"
-serde_json = "1"
-rayon = "1.10.0"
-webbrowser = "1.0.2"
-url = "2.5.2"
-tauri-plugin-deep-link = "2"
-log = "0.4.22"
-hex = "0.4.3"
-tauri-plugin-dialog = "2"
-http = "1.1.0"
-urlencoding = "2.1.3"
-md5 = "0.7.0"
-chrono = "0.4.38"
-tauri-plugin-os = "2"
 boxcar = "0.2.7"
-umu-wrapper-lib = "0.1.0"
-tauri-plugin-autostart = "2.0.0"
-shared_child = "1.0.1"
-serde_with = "3.12.0"
-slice-deque = "0.3.0"
-throttle_my_fn = "0.2.6"
-parking_lot = "0.12.3"
-atomic-instant-full = "0.1.0"
-cacache = "13.1.0"
-http-serde = "2.1.1"
-reqwest-middleware = "0.4.0"
-reqwest-middleware-cache = "0.1.1"
-deranged = "=0.4.0"
-droplet-rs = "0.7.3"
-gethostname = "1.0.1"
-zstd = "0.13.3"
-tar = "0.4.44"
-rand = "0.9.1"
-regex = "1.11.1"
-tempfile = "3.19.1"
-schemars = "0.8.22"
-sha1 = "0.10.6"
 dirs = "6.0.0"
-whoami = "1.6.0"
-filetime = "0.2.25"
-walkdir = "2.5.0"
-known-folders = "1.2.0"
-native_model = { version = "0.6.4", features = ["rmp_serde_1_3"], git = "https://github.com/Drop-OSS/native_model.git"}
-tauri-plugin-opener = "2.4.0"
-bitcode = "0.6.6"
-reqwest-websocket = "0.5.0"
+drop-database = { path = "./drop-database" }
+drop-downloads = { path = "./drop-downloads" }
+drop-errors = { path = "./drop-errors" }
+drop-native-library = { path = "./drop-native-library" }
+drop-process = { path = "./drop-process" }
+drop-remote = { path = "./drop-remote" }
 futures-lite = "2.6.0"
-page_size = "0.6.0"
-sysinfo = "0.36.1"
-humansize = "2.1.3"
-tokio-util = { version = "0.7.16", features = ["io"] }
-futures-core = "0.3.31"
-bytes = "1.10.1"
-# tailscale = { path = "./tailscale" }
-
-
-# Workspaces
-client = { version = "0.1.0", path = "./client" }
-database = { path = "./database" }
-process = { path = "./process" }
-remote = { version = "0.1.0", path = "./remote" }
-utils = { path = "./utils" }
-games = { version = "0.1.0", path = "./games" }
-download_manager = { version = "0.1.0", path = "./download_manager" }
-
-[dependencies.dynfmt]
-version = "0.1.5"
-features = ["curly"]
-
-[dependencies.tauri]
-version = "2.7.0"
-features = ["protocol-asset", "tray-icon"]
-
-[dependencies.tokio]
-version = "1.40.0"
-features = ["rt", "tokio-macros", "signal"]
+hex = "0.4.3"
+http = "1.1.0"
+known-folders = "1.2.0"
+log = "0.4.22"
+md5 = "0.7.0"
+rayon = "1.10.0"
+regex = "1.11.1"
+reqwest-websocket = "0.5.0"
+serde_json = "1"
+tar = "0.4.44"
+tauri = { version = "2.7.0", features = ["protocol-asset", "tray-icon"] }
+tauri-plugin-autostart = "2.0.0"
+tauri-plugin-deep-link = "2"
+tauri-plugin-dialog = "2"
+tauri-plugin-opener = "2.4.0"
+tauri-plugin-os = "2"
+tauri-plugin-shell = "2.2.1"
+tempfile = "3.19.1"
+url = "2.5.2"
+webbrowser = "1.0.2"
+whoami = "1.6.0"
+zstd = "0.13.3"

 [dependencies.log4rs]
 version = "1.3.0"
 features = ["console_appender", "file_appender"]

-[dependencies.rustix]
-version = "0.38.37"
-features = ["fs"]
-
-[dependencies.uuid]
-version = "1.10.0"
-features = ["v4", "fast-rng", "macro-diagnostics"]
-
-[dependencies.rustbreak]
-version = "2"
-features = ["other_errors"] # You can also use "yaml_enc" or "bin_enc"
-
 [dependencies.reqwest]
 version = "0.12.22"
 default-features = false
 features = [
-    "json",
-    "http2",
-    "blocking",
-    "rustls-tls",
-    "native-tls-alpn",
-    "rustls-tls-native-roots",
-    "stream",
+  "blocking",
+  "http2",
+  "json",
+  "native-tls-alpn",
+  "rustls-tls",
+  "rustls-tls-native-roots",
+  "stream",
 ]

+[dependencies.rustix]
+version = "0.38.37"
+features = ["fs"]
+
 [dependencies.serde]
 version = "1"
 features = ["derive", "rc"]

+[dependencies.uuid]
+version = "1.10.0"
+features = ["fast-rng", "macro-diagnostics", "v4"]
+
+[build-dependencies]
+tauri-build = { version = "2.0.0", features = [] }
+
+[target."cfg(any(target_os = \"macos\", windows, target_os = \"linux\"))".dependencies]
+tauri-plugin-single-instance = { version = "2.0.0", features = ["deep-link"] }
+
 [profile.release]
 lto = true
+panic = "abort"
 codegen-units = 1
-panic = 'abort'

-
-[workspace]
-members = [
-    "client",
-    "database",
-    "process",
-    "remote",
-    "utils",
-    "cloud_saves",
-    "download_manager",
-    "games",
-]
-
-resolver = "3"
--- a/src-tauri/client/Cargo.lock
+++ b/src-tauri/client/Cargo.lock
--- a/src-tauri/client/Cargo.toml
+++ b/src-tauri/client/Cargo.toml
@@ -1,12 +0,0 @@
-[package]
-name = "client"
-version = "0.1.0"
-edition = "2024"
-
-[dependencies]
-bitcode = "0.6.7"
-database = { version = "0.1.0", path = "../database" }
-log = "0.4.28"
-serde = { version = "1.0.228", features = ["derive"] }
-tauri = "2.8.5"
-tauri-plugin-autostart = "2.5.0"
--- a/src-tauri/client/src/app_state.rs
+++ b/src-tauri/client/src/app_state.rs
--- a/src-tauri/client/src/app_status.rs
+++ b/src-tauri/client/src/app_status.rs
@@ -1,12 +0,0 @@
-use serde::Serialize;
-
-#[derive(Clone, Copy, Serialize, Eq, PartialEq)]
-pub enum AppStatus {
-    NotConfigured,
-    Offline,
-    ServerError,
-    SignedOut,
-    SignedIn,
-    SignedInNeedsReauth,
-    ServerUnavailable,
-}
--- a/src-tauri/client/src/autostart.rs
+++ b/src-tauri/client/src/autostart.rs
@@ -1,26 +0,0 @@
-use database::borrow_db_checked;
-use log::debug;
-use tauri::AppHandle;
-use tauri_plugin_autostart::ManagerExt;
-
-// New function to sync state on startup
-pub fn sync_autostart_on_startup(app: &AppHandle) -> Result<(), String> {
-    let db_handle = borrow_db_checked();
-    let should_be_enabled = db_handle.settings.autostart;
-    drop(db_handle);
-
-    let manager = app.autolaunch();
-    let current_state = manager.is_enabled().map_err(|e| e.to_string())?;
-
-    if current_state != should_be_enabled {
-        if should_be_enabled {
-            manager.enable().map_err(|e| e.to_string())?;
-            debug!("synced autostart: enabled");
-        } else {
-            manager.disable().map_err(|e| e.to_string())?;
-            debug!("synced autostart: disabled");
-        }
-    }
-
-    Ok(())
-}
--- a/src-tauri/client/src/compat.rs
+++ b/src-tauri/client/src/compat.rs
@@ -1,52 +0,0 @@
-use std::{
-    ffi::OsStr,
-    path::PathBuf,
-    process::{Command, Stdio},
-    sync::LazyLock,
-};
-
-use log::info;
-
-pub static COMPAT_INFO: LazyLock<Option<CompatInfo>> = LazyLock::new(create_new_compat_info);
-
-pub static UMU_LAUNCHER_EXECUTABLE: LazyLock<Option<PathBuf>> = LazyLock::new(|| {
-    let x = get_umu_executable();
-    info!("{:?}", &x);
-    x
-});
-
-#[derive(Clone)]
-pub struct CompatInfo {
-    pub umu_installed: bool,
-}
-
-fn create_new_compat_info() -> Option<CompatInfo> {
-    #[cfg(target_os = "windows")]
-    return None;
-
-    let has_umu_installed = UMU_LAUNCHER_EXECUTABLE.is_some();
-    Some(CompatInfo {
-        umu_installed: has_umu_installed,
-    })
-}
-
-const UMU_BASE_LAUNCHER_EXECUTABLE: &str = "umu-run";
-const UMU_INSTALL_DIRS: [&str; 4] = ["/app/share", "/use/local/share", "/usr/share", "/opt"];
-
-fn get_umu_executable() -> Option<PathBuf> {
-    if check_executable_exists(UMU_BASE_LAUNCHER_EXECUTABLE) {
-        return Some(PathBuf::from(UMU_BASE_LAUNCHER_EXECUTABLE));
-    }
-
-    for dir in UMU_INSTALL_DIRS {
-        let p = PathBuf::from(dir).join(UMU_BASE_LAUNCHER_EXECUTABLE);
-        if check_executable_exists(&p) {
-            return Some(p);
-        }
-    }
-    None
-}
-fn check_executable_exists<P: AsRef<OsStr>>(exec: P) -> bool {
-    let has_umu_installed = Command::new(exec).stdout(Stdio::null()).output();
-    has_umu_installed.is_ok()
-}
--- a/src-tauri/client/src/lib.rs
+++ b/src-tauri/client/src/lib.rs
@@ -1,4 +0,0 @@
-pub mod app_status;
-pub mod autostart;
-pub mod compat;
-pub mod user;
--- a/src-tauri/client/src/user.rs
+++ b/src-tauri/client/src/user.rs
@@ -1,12 +0,0 @@
-use bitcode::{Decode, Encode};
-use serde::{Deserialize, Serialize};
-
-#[derive(Clone, Serialize, Deserialize, Encode, Decode)]
-#[serde(rename_all = "camelCase")]
-pub struct User {
-    id: String,
-    username: String,
-    admin: bool,
-    display_name: String,
-    profile_picture_object_id: String,
-}
--- a/src-tauri/cloud_saves/Cargo.toml
+++ b/src-tauri/cloud_saves/Cargo.toml
@@ -1,19 +0,0 @@
-[package]
-name = "cloud_saves"
-version = "0.1.0"
-edition = "2024"
-
-[dependencies]
-database = { version = "0.1.0", path = "../database" }
-dirs = "6.0.0"
-log = "0.4.28"
-regex = "1.11.3"
-rustix = "1.1.2"
-serde = "1.0.228"
-serde_json = "1.0.145"
-serde_with = "3.15.0"
-tar = "0.4.44"
-tempfile = "3.23.0"
-uuid = "1.18.1"
-whoami = "1.6.1"
-zstd = "0.13.3"
--- a/src-tauri/cloud_saves/src/backup_manager.rs
+++ b/src-tauri/cloud_saves/src/backup_manager.rs
@@ -1,234 +0,0 @@
-use std::{collections::HashMap, path::PathBuf, str::FromStr};
-
-#[cfg(target_os = "linux")]
-use database::platform::Platform;
-use database::{GameVersion, db::DATA_ROOT_DIR};
-use log::warn;
-
-use crate::error::BackupError;
-
-use super::path::CommonPath;
-
-pub struct BackupManager<'a> {
-    pub current_platform: Platform,
-    pub sources: HashMap<(Platform, Platform), &'a (dyn BackupHandler + Sync + Send)>,
-}
-
-impl Default for BackupManager<'_> {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl BackupManager<'_> {
-    pub fn new() -> Self {
-        BackupManager {
-            #[cfg(target_os = "windows")]
-            current_platform: Platform::Windows,
-
-            #[cfg(target_os = "macos")]
-            current_platform: Platform::MacOs,
-
-            #[cfg(target_os = "linux")]
-            current_platform: Platform::Linux,
-
-            sources: HashMap::from([
-                // Current platform to target platform
-                (
-                    (Platform::Windows, Platform::Windows),
-                    &WindowsBackupManager {} as &(dyn BackupHandler + Sync + Send),
-                ),
-                (
-                    (Platform::Linux, Platform::Linux),
-                    &LinuxBackupManager {} as &(dyn BackupHandler + Sync + Send),
-                ),
-                (
-                    (Platform::MacOs, Platform::MacOs),
-                    &MacBackupManager {} as &(dyn BackupHandler + Sync + Send),
-                ),
-            ]),
-        }
-    }
-}
-
-pub trait BackupHandler: Send + Sync {
-    fn root_translate(&self, _path: &PathBuf, _game: &GameVersion) -> Result<PathBuf, BackupError> {
-        Ok(DATA_ROOT_DIR.join("games"))
-    }
-    fn game_translate(&self, _path: &PathBuf, game: &GameVersion) -> Result<PathBuf, BackupError> {
-        Ok(PathBuf::from_str(&game.game_id).unwrap())
-    }
-    fn base_translate(&self, path: &PathBuf, game: &GameVersion) -> Result<PathBuf, BackupError> {
-        Ok(self
-            .root_translate(path, game)?
-            .join(self.game_translate(path, game)?))
-    }
-    fn home_translate(&self, _path: &PathBuf, _game: &GameVersion) -> Result<PathBuf, BackupError> {
-        let c = CommonPath::Home.get().ok_or(BackupError::NotFound);
-        println!("{:?}", c);
-        c
-    }
-    fn store_user_id_translate(
-        &self,
-        _path: &PathBuf,
-        game: &GameVersion,
-    ) -> Result<PathBuf, BackupError> {
-        PathBuf::from_str(&game.game_id).map_err(|_| BackupError::ParseError)
-    }
-    fn os_user_name_translate(
-        &self,
-        _path: &PathBuf,
-        _game: &GameVersion,
-    ) -> Result<PathBuf, BackupError> {
-        Ok(PathBuf::from_str(&whoami::username()).unwrap())
-    }
-    fn win_app_data_translate(
-        &self,
-        _path: &PathBuf,
-        _game: &GameVersion,
-    ) -> Result<PathBuf, BackupError> {
-        warn!("Unexpected Windows Reference in Backup <winAppData>");
-        Err(BackupError::InvalidSystem)
-    }
-    fn win_local_app_data_translate(
-        &self,
-        _path: &PathBuf,
-        _game: &GameVersion,
-    ) -> Result<PathBuf, BackupError> {
-        warn!("Unexpected Windows Reference in Backup <winLocalAppData>");
-        Err(BackupError::InvalidSystem)
-    }
-    fn win_local_app_data_low_translate(
-        &self,
-        _path: &PathBuf,
-        _game: &GameVersion,
-    ) -> Result<PathBuf, BackupError> {
-        warn!("Unexpected Windows Reference in Backup <winLocalAppDataLow>");
-        Err(BackupError::InvalidSystem)
-    }
-    fn win_documents_translate(
-        &self,
-        _path: &PathBuf,
-        _game: &GameVersion,
-    ) -> Result<PathBuf, BackupError> {
-        warn!("Unexpected Windows Reference in Backup <winDocuments>");
-        Err(BackupError::InvalidSystem)
-    }
-    fn win_public_translate(
-        &self,
-        _path: &PathBuf,
-        _game: &GameVersion,
-    ) -> Result<PathBuf, BackupError> {
-        warn!("Unexpected Windows Reference in Backup <winPublic>");
-        Err(BackupError::InvalidSystem)
-    }
-    fn win_program_data_translate(
-        &self,
-        _path: &PathBuf,
-        _game: &GameVersion,
-    ) -> Result<PathBuf, BackupError> {
-        warn!("Unexpected Windows Reference in Backup <winProgramData>");
-        Err(BackupError::InvalidSystem)
-    }
-    fn win_dir_translate(
-        &self,
-        _path: &PathBuf,
-        _game: &GameVersion,
-    ) -> Result<PathBuf, BackupError> {
-        warn!("Unexpected Windows Reference in Backup <winDir>");
-        Err(BackupError::InvalidSystem)
-    }
-    fn xdg_data_translate(
-        &self,
-        _path: &PathBuf,
-        _game: &GameVersion,
-    ) -> Result<PathBuf, BackupError> {
-        warn!("Unexpected XDG Reference in Backup <xdgData>");
-        Err(BackupError::InvalidSystem)
-    }
-    fn xdg_config_translate(
-        &self,
-        _path: &PathBuf,
-        _game: &GameVersion,
-    ) -> Result<PathBuf, BackupError> {
-        warn!("Unexpected XDG Reference in Backup <xdgConfig>");
-        Err(BackupError::InvalidSystem)
-    }
-    fn skip_translate(&self, _path: &PathBuf, _game: &GameVersion) -> Result<PathBuf, BackupError> {
-        Ok(PathBuf::new())
-    }
-}
-
-pub struct LinuxBackupManager {}
-impl BackupHandler for LinuxBackupManager {
-    fn xdg_config_translate(
-        &self,
-        _path: &PathBuf,
-        _game: &GameVersion,
-    ) -> Result<PathBuf, BackupError> {
-        CommonPath::Data.get().ok_or(BackupError::NotFound)
-    }
-    fn xdg_data_translate(
-        &self,
-        _path: &PathBuf,
-        _game: &GameVersion,
-    ) -> Result<PathBuf, BackupError> {
-        CommonPath::Config.get().ok_or(BackupError::NotFound)
-    }
-}
-pub struct WindowsBackupManager {}
-impl BackupHandler for WindowsBackupManager {
-    fn win_app_data_translate(
-        &self,
-        _path: &PathBuf,
-        _game: &GameVersion,
-    ) -> Result<PathBuf, BackupError> {
-        CommonPath::Config.get().ok_or(BackupError::NotFound)
-    }
-    fn win_local_app_data_translate(
-        &self,
-        _path: &PathBuf,
-        _game: &GameVersion,
-    ) -> Result<PathBuf, BackupError> {
-        CommonPath::DataLocal.get().ok_or(BackupError::NotFound)
-    }
-    fn win_local_app_data_low_translate(
-        &self,
-        _path: &PathBuf,
-        _game: &GameVersion,
-    ) -> Result<PathBuf, BackupError> {
-        CommonPath::DataLocalLow
-            .get()
-            .ok_or(BackupError::NotFound)
-    }
-    fn win_dir_translate(
-        &self,
-        _path: &PathBuf,
-        _game: &GameVersion,
-    ) -> Result<PathBuf, BackupError> {
-        Ok(PathBuf::from_str("C:/Windows").unwrap())
-    }
-    fn win_documents_translate(
-        &self,
-        _path: &PathBuf,
-        _game: &GameVersion,
-    ) -> Result<PathBuf, BackupError> {
-        CommonPath::Document.get().ok_or(BackupError::NotFound)
-    }
-    fn win_program_data_translate(
-        &self,
-        _path: &PathBuf,
-        _game: &GameVersion,
-    ) -> Result<PathBuf, BackupError> {
-        Ok(PathBuf::from_str("C:/ProgramData").unwrap())
-    }
-    fn win_public_translate(
-        &self,
-        _path: &PathBuf,
-        _game: &GameVersion,
-    ) -> Result<PathBuf, BackupError> {
-        CommonPath::Public.get().ok_or(BackupError::NotFound)
-    }
-}
-pub struct MacBackupManager {}
-impl BackupHandler for MacBackupManager {}
--- a/src-tauri/cloud_saves/src/error.rs
+++ b/src-tauri/cloud_saves/src/error.rs
@@ -1,27 +0,0 @@
-use std::fmt::Display;
-
-use serde_with::SerializeDisplay;
-
-#[derive(Debug, SerializeDisplay, Clone, Copy)]
-
-pub enum BackupError {
-    InvalidSystem,
-
-    NotFound,
-
-    ParseError,
-}
-
-impl Display for BackupError {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        let s = match self {
-            BackupError::InvalidSystem => "Attempted to generate path for invalid system",
-
-            BackupError::NotFound => "Could not generate or find path",
-
-            BackupError::ParseError => "Failed to parse path",
-        };
-
-        write!(f, "{}", s)
-    }
-}
--- a/src-tauri/cloud_saves/src/lib.rs
+++ b/src-tauri/cloud_saves/src/lib.rs
@@ -1,8 +0,0 @@
-pub mod backup_manager;
-pub mod conditions;
-pub mod error;
-pub mod metadata;
-pub mod normalise;
-pub mod path;
-pub mod placeholder;
-pub mod resolver;
--- a/src-tauri/database/Cargo.toml
+++ b/src-tauri/database/Cargo.toml
@@ -1,15 +0,0 @@
-[package]
-name = "database"
-version = "0.1.0"
-edition = "2024"
-
-[dependencies]
-chrono = "0.4.42"
-dirs = "6.0.0"
-log = "0.4.28"
-native_model = { version = "0.6.4", features = ["rmp_serde_1_3"], git = "https://github.com/Drop-OSS/native_model.git"}
-rustbreak = "2.0.0"
-serde = "1.0.228"
-serde_with = "3.15.0"
-url = "2.5.7"
-whoami = "1.6.1"
--- a/src-tauri/database/src/db.rs
+++ b/src-tauri/database/src/db.rs
@@ -1,45 +0,0 @@
-use std::{
-    path::PathBuf,
-    sync::{Arc, LazyLock},
-};
-
-use rustbreak::{DeSerError, DeSerializer};
-use serde::{Serialize, de::DeserializeOwned};
-
-use crate::interface::{DatabaseImpls, DatabaseInterface};
-
-pub static DB: LazyLock<DatabaseInterface> = LazyLock::new(DatabaseInterface::set_up_database);
-
-#[cfg(not(debug_assertions))]
-static DATA_ROOT_PREFIX: &str = "drop";
-#[cfg(debug_assertions)]
-static DATA_ROOT_PREFIX: &str = "drop-debug";
-
-pub static DATA_ROOT_DIR: LazyLock<Arc<PathBuf>> = LazyLock::new(|| {
-    Arc::new(
-        dirs::data_dir()
-            .expect("Failed to get data dir")
-            .join(DATA_ROOT_PREFIX),
-    )
-});
-
-// Custom JSON serializer to support everything we need
-#[derive(Debug, Default, Clone)]
-pub struct DropDatabaseSerializer;
-
-impl<T: native_model::Model + Serialize + DeserializeOwned> DeSerializer<T>
-    for DropDatabaseSerializer
-{
-    fn serialize(&self, val: &T) -> rustbreak::error::DeSerResult<Vec<u8>> {
-        native_model::encode(val).map_err(|e| DeSerError::Internal(e.to_string()))
-    }
-
-    fn deserialize<R: std::io::Read>(&self, mut s: R) -> rustbreak::error::DeSerResult<T> {
-        let mut buf = Vec::new();
-        s.read_to_end(&mut buf)
-            .map_err(|e| rustbreak::error::DeSerError::Other(e.into()))?;
-        let (val, _version) =
-            native_model::decode(buf).map_err(|e| DeSerError::Internal(e.to_string()))?;
-        Ok(val)
-    }
-}
--- a/src-tauri/database/src/interface.rs
+++ b/src-tauri/database/src/interface.rs
@@ -1,188 +0,0 @@
-use std::{
-    fs::{self, create_dir_all},
-    mem::ManuallyDrop,
-    ops::{Deref, DerefMut},
-    path::PathBuf,
-    sync::{RwLockReadGuard, RwLockWriteGuard},
-};
-
-use chrono::Utc;
-use log::{debug, error, info, warn};
-use rustbreak::{PathDatabase, RustbreakError};
-use url::Url;
-
-use crate::{
-    db::{DATA_ROOT_DIR, DB, DropDatabaseSerializer},
-    models::data::Database,
-};
-
-pub type DatabaseInterface =
-    rustbreak::Database<Database, rustbreak::backend::PathBackend, DropDatabaseSerializer>;
-
-pub trait DatabaseImpls {
-    fn set_up_database() -> DatabaseInterface;
-    fn database_is_set_up(&self) -> bool;
-    fn fetch_base_url(&self) -> Url;
-}
-impl DatabaseImpls for DatabaseInterface {
-    fn set_up_database() -> DatabaseInterface {
-        let db_path = DATA_ROOT_DIR.join("drop.db");
-        let games_base_dir = DATA_ROOT_DIR.join("games");
-        let logs_root_dir = DATA_ROOT_DIR.join("logs");
-        let cache_dir = DATA_ROOT_DIR.join("cache");
-        let pfx_dir = DATA_ROOT_DIR.join("pfx");
-
-        debug!("creating data directory at {DATA_ROOT_DIR:?}");
-        create_dir_all(DATA_ROOT_DIR.as_path()).unwrap_or_else(|e| {
-            panic!(
-                "Failed to create directory {} with error {}",
-                DATA_ROOT_DIR.display(),
-                e
-            )
-        });
-        create_dir_all(&games_base_dir).unwrap_or_else(|e| {
-            panic!(
-                "Failed to create directory {} with error {}",
-                games_base_dir.display(),
-                e
-            )
-        });
-        create_dir_all(&logs_root_dir).unwrap_or_else(|e| {
-            panic!(
-                "Failed to create directory {} with error {}",
-                logs_root_dir.display(),
-                e
-            )
-        });
-        create_dir_all(&cache_dir).unwrap_or_else(|e| {
-            panic!(
-                "Failed to create directory {} with error {}",
-                cache_dir.display(),
-                e
-            )
-        });
-        create_dir_all(&pfx_dir).unwrap_or_else(|e| {
-            panic!(
-                "Failed to create directory {} with error {}",
-                pfx_dir.display(),
-                e
-            )
-        });
-
-        let exists = fs::exists(db_path.clone()).unwrap_or_else(|e| {
-            panic!(
-                "Failed to find if {} exists with error {}",
-                db_path.display(),
-                e
-            )
-        });
-
-        if exists {
-            match PathDatabase::load_from_path(db_path.clone()) {
-                Ok(db) => db,
-                Err(e) => handle_invalid_database(e, db_path, games_base_dir, cache_dir),
-            }
-        } else {
-            let default = Database::new(games_base_dir, None, cache_dir);
-            debug!("Creating database at path {}", db_path.display());
-            PathDatabase::create_at_path(db_path, default).expect("Database could not be created")
-        }
-    }
-
-    fn database_is_set_up(&self) -> bool {
-        !borrow_db_checked().base_url.is_empty()
-    }
-
-    fn fetch_base_url(&self) -> Url {
-        let handle = borrow_db_checked();
-        Url::parse(&handle.base_url)
-            .unwrap_or_else(|_| panic!("Failed to parse base url {}", handle.base_url))
-    }
-}
-
-// TODO: Make the error relelvant rather than just assume that it's a Deserialize error
-fn handle_invalid_database(
-    _e: RustbreakError,
-    db_path: PathBuf,
-    games_base_dir: PathBuf,
-    cache_dir: PathBuf,
-) -> rustbreak::Database<Database, rustbreak::backend::PathBackend, DropDatabaseSerializer> {
-    warn!("{_e}");
-    let new_path = {
-        let time = Utc::now().timestamp();
-        let mut base = db_path.clone();
-        base.set_file_name(format!("drop.db.backup-{time}"));
-        base
-    };
-    info!("old database stored at: {}", new_path.to_string_lossy());
-    fs::rename(&db_path, &new_path).unwrap_or_else(|e| {
-        panic!(
-            "Could not rename database {} to {} with error {}",
-            db_path.display(),
-            new_path.display(),
-            e
-        )
-    });
-
-    let db = Database::new(games_base_dir, Some(new_path), cache_dir);
-
-    PathDatabase::create_at_path(db_path, db).expect("Database could not be created")
-}
-
-// To automatically save the database upon drop
-pub struct DBRead<'a>(RwLockReadGuard<'a, Database>);
-pub struct DBWrite<'a>(ManuallyDrop<RwLockWriteGuard<'a, Database>>);
-impl<'a> Deref for DBWrite<'a> {
-    type Target = Database;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-impl<'a> DerefMut for DBWrite<'a> {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.0
-    }
-}
-impl<'a> Deref for DBRead<'a> {
-    type Target = Database;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-impl Drop for DBWrite<'_> {
-    fn drop(&mut self) {
-        unsafe {
-            ManuallyDrop::drop(&mut self.0);
-        }
-
-        match DB.save() {
-            Ok(()) => {}
-            Err(e) => {
-                error!("database failed to save with error {e}");
-                panic!("database failed to save with error {e}")
-            }
-        }
-    }
-}
-
-pub fn borrow_db_checked<'a>() -> DBRead<'a> {
-    match DB.borrow_data() {
-        Ok(data) => DBRead(data),
-        Err(e) => {
-            error!("database borrow failed with error {e}");
-            panic!("database borrow failed with error {e}");
-        }
-    }
-}
-
-pub fn borrow_db_mut_checked<'a>() -> DBWrite<'a> {
-    match DB.borrow_data_mut() {
-        Ok(data) => DBWrite(ManuallyDrop::new(data)),
-        Err(e) => {
-            error!("database borrow mut failed with error {e}");
-            panic!("database borrow mut failed with error {e}");
-        }
-    }
-}
--- a/src-tauri/database/src/lib.rs
+++ b/src-tauri/database/src/lib.rs
@@ -1,14 +0,0 @@
-#![feature(nonpoison_rwlock)]
-
-pub mod db;
-pub mod debug;
-pub mod interface;
-pub mod models;
-pub mod platform;
-
-pub use db::DB;
-pub use interface::{borrow_db_checked, borrow_db_mut_checked};
-pub use models::data::{
-    ApplicationTransientStatus, Database, DatabaseApplications, DatabaseAuth, DownloadType,
-    DownloadableMetadata, GameDownloadStatus, GameVersion, Settings,
-};
--- a/src-tauri/download_manager/Cargo.toml
+++ b/src-tauri/download_manager/Cargo.toml
@@ -1,17 +0,0 @@
-[package]
-name = "download_manager"
-version = "0.1.0"
-edition = "2024"
-
-[dependencies]
-atomic-instant-full = "0.1.0"
-database = { version = "0.1.0", path = "../database" }
-humansize = "2.1.3"
-log = "0.4.28"
-parking_lot = "0.12.5"
-remote = { version = "0.1.0", path = "../remote" }
-serde = "1.0.228"
-serde_with = "3.15.0"
-tauri = "2.8.5"
-throttle_my_fn = "0.2.6"
-utils = { version = "0.1.0", path = "../utils" }
--- a/src-tauri/download_manager/src/error.rs
+++ b/src-tauri/download_manager/src/error.rs
@@ -1,80 +0,0 @@
-use humansize::{BINARY, format_size};
-use std::{
-    fmt::{Display, Formatter},
-    io,
-    sync::{Arc, mpsc::SendError},
-};
-
-use remote::error::RemoteAccessError;
-use serde_with::SerializeDisplay;
-
-#[derive(SerializeDisplay)]
-pub enum DownloadManagerError<T> {
-    IOError(io::Error),
-    SignalError(SendError<T>),
-}
-impl<T> Display for DownloadManagerError<T> {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            DownloadManagerError::IOError(error) => write!(f, "{error}"),
-            DownloadManagerError::SignalError(send_error) => write!(f, "{send_error}"),
-        }
-    }
-}
-impl<T> From<SendError<T>> for DownloadManagerError<T> {
-    fn from(value: SendError<T>) -> Self {
-        DownloadManagerError::SignalError(value)
-    }
-}
-impl<T> From<io::Error> for DownloadManagerError<T> {
-    fn from(value: io::Error) -> Self {
-        DownloadManagerError::IOError(value)
-    }
-}
-
-// TODO: Rename / separate from downloads
-#[derive(Debug, SerializeDisplay)]
-pub enum ApplicationDownloadError {
-    NotInitialized,
-    Communication(RemoteAccessError),
-    DiskFull(u64, u64),
-    #[allow(dead_code)]
-    Checksum,
-    Lock,
-    IoError(Arc<io::Error>),
-    DownloadError(RemoteAccessError),
-}
-
-impl Display for ApplicationDownloadError {
-    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        match self {
-            ApplicationDownloadError::NotInitialized => {
-                write!(f, "Download not initalized, did something go wrong?")
-            }
-            ApplicationDownloadError::DiskFull(required, available) => write!(
-                f,
-                "Game requires {}, {} remaining left on disk.",
-                format_size(*required, BINARY),
-                format_size(*available, BINARY),
-            ),
-            ApplicationDownloadError::Communication(error) => write!(f, "{error}"),
-            ApplicationDownloadError::Lock => write!(
-                f,
-                "failed to acquire lock. Something has gone very wrong internally. Please restart the application"
-            ),
-            ApplicationDownloadError::Checksum => {
-                write!(f, "checksum failed to validate for download")
-            }
-            ApplicationDownloadError::IoError(error) => write!(f, "io error: {error}"),
-            ApplicationDownloadError::DownloadError(error) => {
-                write!(f, "Download failed with error {error:?}")
-            }
-        }
-    }
-}
-
-impl From<io::Error> for ApplicationDownloadError {
-    fn from(value: io::Error) -> Self {
-        ApplicationDownloadError::IoError(Arc::new(value))
-    }
-}
--- a/src-tauri/download_manager/src/lib.rs
+++ b/src-tauri/download_manager/src/lib.rs
@@ -1,44 +0,0 @@
-#![feature(duration_millis_float)]
-#![feature(nonpoison_mutex)]
-#![feature(sync_nonpoison)]
-
-use std::{ops::Deref, sync::OnceLock};
-
-use tauri::AppHandle;
-
-use crate::{
-    download_manager_builder::DownloadManagerBuilder, download_manager_frontend::DownloadManager,
-};
-
-pub mod download_manager_builder;
-pub mod download_manager_frontend;
-pub mod downloadable;
-pub mod error;
-pub mod frontend_updates;
-pub mod util;
-
-pub static DOWNLOAD_MANAGER: DownloadManagerWrapper = DownloadManagerWrapper::new();
-
-pub struct DownloadManagerWrapper(OnceLock<DownloadManager>);
-impl DownloadManagerWrapper {
-    const fn new() -> Self {
-        DownloadManagerWrapper(OnceLock::new())
-    }
-    pub fn init(app_handle: AppHandle) {
-        DOWNLOAD_MANAGER
-            .0
-            .set(DownloadManagerBuilder::build(app_handle))
-            .expect("Failed to initialise download manager");
-    }
-}
-
-impl Deref for DownloadManagerWrapper {
-    type Target = DownloadManager;
-
-    fn deref(&self) -> &Self::Target {
-        match self.0.get() {
-            Some(download_manager) => download_manager,
-            None => unreachable!("Download manager should always be initialised"),
-        }
-    }
-}
--- a/src-tauri/drop-consts/Cargo.toml
+++ b/src-tauri/drop-consts/Cargo.toml
@@ -1,8 +1,7 @@
 [package]
-name = "utils"
+name = "drop-consts"
 version = "0.1.0"
 edition = "2024"

 [dependencies]
-log = "0.4.28"
-webbrowser = "1.0.5"
+dirs = "6.0.0"
--- a/src-tauri/drop-consts/src/lib.rs
+++ b/src-tauri/drop-consts/src/lib.rs
@@ -0,0 +1,15 @@
+use std::{
+    path::PathBuf,
+    sync::{Arc, LazyLock},
+};
+
+#[cfg(not(debug_assertions))]
+static DATA_ROOT_PREFIX: &'static str = "drop";
+#[cfg(debug_assertions)]
+static DATA_ROOT_PREFIX: &str = "drop-debug";
+
+pub static DATA_ROOT_DIR: LazyLock<&'static PathBuf> =
+    LazyLock::new(|| Box::leak(Box::new(dirs::data_dir().unwrap().join(DATA_ROOT_PREFIX))));
+
+pub static CACHE_DIR: LazyLock<&'static PathBuf> =
+    LazyLock::new(|| Box::leak(Box::new(DATA_ROOT_DIR.join("cache"))));
--- a/src-tauri/drop-database/Cargo.toml
+++ b/src-tauri/drop-database/Cargo.toml
@@ -0,0 +1,21 @@
+[package]
+name = "drop-database"
+version = "0.1.0"
+edition = "2024"
+
+[dependencies]
+bitcode = "0.6.7"
+chrono = "0.4.42"
+drop-consts = { path = "../drop-consts" }
+drop-library = { path = "../drop-library" }
+drop-native-library = { path = "../drop-native-library" }
+log = "0.4.28"
+native_model = { git = "https://github.com/Drop-OSS/native_model.git", version = "0.6.4", features = [
+  "rmp_serde_1_3",
+] }
+rustbreak = "2.0.0"
+serde = { version = "1.0.219", features = ["derive"] }
+serde_with = "3.14.0"
+url = "2.5.7"
+whoami = "1.6.1"
+
--- a/src-tauri/drop-database/src/db.rs
+++ b/src-tauri/drop-database/src/db.rs
@@ -0,0 +1,140 @@
+use std::{
+    fs::{self, create_dir_all},
+    mem::ManuallyDrop,
+    ops::{Deref, DerefMut},
+    path::PathBuf,
+    sync::{Arc, LazyLock, RwLockReadGuard, RwLockWriteGuard},
+};
+
+use chrono::Utc;
+use drop_consts::DATA_ROOT_DIR;
+use log::{debug, error, info, warn};
+use rustbreak::{DeSerError, DeSerializer, PathDatabase, RustbreakError};
+use serde::{Serialize, de::DeserializeOwned};
+
+use crate::DB;
+
+use super::models::data::Database;
+
+// Custom JSON serializer to support everything we need
+#[derive(Debug, Default, Clone)]
+pub struct DropDatabaseSerializer;
+
+impl<T: native_model::Model + Serialize + DeserializeOwned> DeSerializer<T>
+    for DropDatabaseSerializer
+{
+    fn serialize(&self, val: &T) -> rustbreak::error::DeSerResult<Vec<u8>> {
+        native_model::encode(val).map_err(|e| DeSerError::Internal(e.to_string()))
+    }
+
+    fn deserialize<R: std::io::Read>(&self, mut s: R) -> rustbreak::error::DeSerResult<T> {
+        let mut buf = Vec::new();
+        s.read_to_end(&mut buf)
+            .map_err(|e| rustbreak::error::DeSerError::Internal(e.to_string()))?;
+        let (val, _version) =
+            native_model::decode(buf).map_err(|e| DeSerError::Internal(e.to_string()))?;
+        Ok(val)
+    }
+}
+
+pub type DatabaseInterface =
+    rustbreak::Database<Database, rustbreak::backend::PathBackend, DropDatabaseSerializer>;
+
+pub trait DatabaseImpls {
+    fn set_up_database() -> DatabaseInterface;
+}
+impl DatabaseImpls for DatabaseInterface {
+    fn set_up_database() -> DatabaseInterface {
+        let db_path = DATA_ROOT_DIR.join("drop.db");
+        let games_base_dir = DATA_ROOT_DIR.join("games");
+        let logs_root_dir = DATA_ROOT_DIR.join("logs");
+        let cache_dir = DATA_ROOT_DIR.join("cache");
+        let pfx_dir = DATA_ROOT_DIR.join("pfx");
+
+        debug!("creating data directory at {DATA_ROOT_DIR:?}");
+        create_dir_all(DATA_ROOT_DIR.as_path()).unwrap();
+        create_dir_all(&games_base_dir).unwrap();
+        create_dir_all(&logs_root_dir).unwrap();
+        create_dir_all(&cache_dir).unwrap();
+        create_dir_all(&pfx_dir).unwrap();
+
+        let exists = fs::exists(db_path.clone()).unwrap();
+
+        if exists {
+            match PathDatabase::load_from_path(db_path.clone()) {
+                Ok(db) => db,
+                Err(e) => handle_invalid_database(e, db_path, games_base_dir, cache_dir),
+            }
+        } else {
+            let default = Database::new(games_base_dir, None);
+            debug!(
+                "Creating database at path {}",
+                db_path.as_os_str().to_str().unwrap()
+            );
+            PathDatabase::create_at_path(db_path, default).expect("Database could not be created")
+        }
+    }
+}
+
+// TODO: Make the error relelvant rather than just assume that it's a Deserialize error
+fn handle_invalid_database(
+    _e: RustbreakError,
+    db_path: PathBuf,
+    games_base_dir: PathBuf,
+    cache_dir: PathBuf,
+) -> rustbreak::Database<Database, rustbreak::backend::PathBackend, DropDatabaseSerializer> {
+    warn!("{_e}");
+    let new_path = {
+        let time = Utc::now().timestamp();
+        let mut base = db_path.clone();
+        base.set_file_name(format!("drop.db.backup-{time}"));
+        base
+    };
+    info!("old database stored at: {}", new_path.to_string_lossy());
+    fs::rename(&db_path, &new_path).unwrap();
+
+    let db = Database::new(
+        games_base_dir.into_os_string().into_string().unwrap(),
+        Some(new_path),
+    );
+
+    PathDatabase::create_at_path(db_path, db).expect("Database could not be created")
+}
+
+// To automatically save the database upon drop
+pub struct DBRead<'a>(pub(crate) RwLockReadGuard<'a, Database>);
+pub struct DBWrite<'a>(pub(crate) ManuallyDrop<RwLockWriteGuard<'a, Database>>);
+impl<'a> Deref for DBWrite<'a> {
+    type Target = Database;
+
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}
+impl<'a> DerefMut for DBWrite<'a> {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        &mut self.0
+    }
+}
+impl<'a> Deref for DBRead<'a> {
+    type Target = Database;
+
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}
+impl Drop for DBWrite<'_> {
+    fn drop(&mut self) {
+        unsafe {
+            ManuallyDrop::drop(&mut self.0);
+        }
+
+        match DB.save() {
+            Ok(()) => {}
+            Err(e) => {
+                error!("database failed to save with error {e}");
+                panic!("database failed to save with error {e}")
+            }
+        }
+    }
+}
--- a/src-tauri/drop-database/src/debug.rs
+++ b/src-tauri/drop-database/src/debug.rs
--- a/src-tauri/games/src/downloads/drop_data.rs
+++ b/src-tauri/games/src/downloads/drop_data.rs
@@ -1,19 +1,15 @@
 use std::{
-    collections::HashMap,
-    fs::File,
-    io::{self, Read, Write},
-    path::{Path, PathBuf},
+    collections::HashMap, fs::File, io::{self, Read, Write}, path::{Path, PathBuf}
 };

 use log::error;
 use native_model::{Decode, Encode};
-use utils::lock;

 pub type DropData = v1::DropData;

 pub static DROP_DATA_PATH: &str = ".dropdata";

-pub mod v1 {
+mod v1 {
    use std::{collections::HashMap, path::PathBuf, sync::Mutex};

    use native_model::native_model;
@@ -53,12 +49,7 @@ impl DropData {
        let mut s = Vec::new();
        file.read_to_end(&mut s)?;

-        native_model::rmp_serde_1_3::RmpSerde::decode(s).map_err(|e| {
-            io::Error::new(
-                io::ErrorKind::InvalidData,
-                format!("Failed to decode drop data: {e}"),
-            )
-        })
+        Ok(native_model::rmp_serde_1_3::RmpSerde::decode(s).unwrap())
    }
    pub fn write(&self) {
        let manifest_raw = match native_model::rmp_serde_1_3::RmpSerde::encode(&self) {
@@ -80,15 +71,12 @@ impl DropData {
        }
    }
    pub fn set_contexts(&self, completed_contexts: &[(String, bool)]) {
-        *lock!(self.contexts) = completed_contexts
-            .iter()
-            .map(|s| (s.0.clone(), s.1))
-            .collect();
+        *self.contexts.lock().unwrap() = completed_contexts.iter().map(|s| (s.0.clone(), s.1)).collect();
    }
    pub fn set_context(&self, context: String, state: bool) {
-        lock!(self.contexts).entry(context).insert_entry(state);
+        self.contexts.lock().unwrap().entry(context).insert_entry(state);
    }
    pub fn get_contexts(&self) -> HashMap<String, bool> {
-        lock!(self.contexts).clone()
+        self.contexts.lock().unwrap().clone()
    }
 }
--- a/src-tauri/drop-database/src/lib.rs
+++ b/src-tauri/drop-database/src/lib.rs
@@ -0,0 +1,34 @@
+use std::{mem::ManuallyDrop, sync::LazyLock};
+
+use log::error;
+
+use crate::db::{DBRead, DBWrite, DatabaseImpls, DatabaseInterface};
+
+pub mod db;
+pub mod debug;
+pub mod models;
+pub mod process;
+pub mod runtime_models;
+pub mod drop_data;
+
+pub static DB: LazyLock<DatabaseInterface> = LazyLock::new(DatabaseInterface::set_up_database);
+
+pub fn borrow_db_checked<'a>() -> DBRead<'a> {
+    match DB.borrow_data() {
+        Ok(data) => DBRead(data),
+        Err(e) => {
+            error!("database borrow failed with error {e}");
+            panic!("database borrow failed with error {e}");
+        }
+    }
+}
+
+pub fn borrow_db_mut_checked<'a>() -> DBWrite<'a> {
+    match DB.borrow_data_mut() {
+        Ok(data) => DBWrite(ManuallyDrop::new(data)),
+        Err(e) => {
+            error!("database borrow mut failed with error {e}");
+            panic!("database borrow mut failed with error {e}");
+        }
+    }
+}
--- a/src-tauri/drop-database/src/models.rs
+++ b/src-tauri/drop-database/src/models.rs
@@ -8,7 +8,7 @@ pub mod data {
    // Declare it using the actual version that it is from, i.e. v1::Settings rather than just Settings from here

    pub type GameVersion = v1::GameVersion;
-    pub type Database = v3::Database;
+    pub type Database = v4::Database;
    pub type Settings = v1::Settings;
    pub type DatabaseAuth = v1::DatabaseAuth;

@@ -19,7 +19,7 @@ pub mod data {
     */
    pub type DownloadableMetadata = v1::DownloadableMetadata;
    pub type DownloadType = v1::DownloadType;
-    pub type DatabaseApplications = v2::DatabaseApplications;
+    pub type DatabaseApplications = v4::DatabaseApplications;
    // pub type DatabaseCompatInfo = v2::DatabaseCompatInfo;

    use std::collections::HashMap;
@@ -40,7 +40,7 @@ pub mod data {
        use serde_with::serde_as;
        use std::{collections::HashMap, path::PathBuf};

-        use crate::platform::Platform;
+        use crate::process::Platform;

        use super::{Deserialize, Serialize, native_model};

@@ -48,7 +48,7 @@ pub mod data {
            "{}".to_owned()
        }

-        #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq)]
+        #[derive(Serialize, Deserialize, Clone, Debug)]
        #[serde(rename_all = "camelCase")]
        #[native_model(id = 2, version = 1, with = native_model::rmp_serde_1_3::RmpSerde)]
        pub struct GameVersion {
@@ -191,6 +191,8 @@ pub mod data {

        use serde_with::serde_as;

+        use crate::runtime_models::Game;
+
        use super::{Deserialize, Serialize, native_model, v1};

        #[native_model(id = 1, version = 2, with = native_model::rmp_serde_1_3::RmpSerde, from = v1::Database)]
@@ -273,9 +275,7 @@ pub mod data {
        #[native_model(id = 3, version = 2, with = native_model::rmp_serde_1_3::RmpSerde, from=v1::DatabaseApplications)]
        pub struct DatabaseApplications {
            pub install_dirs: Vec<PathBuf>,
-            // Guaranteed to exist if the game also exists in the app state map
            pub game_statuses: HashMap<String, GameDownloadStatus>,
-
            pub game_versions: HashMap<String, HashMap<String, v1::GameVersion>>,
            pub installed_game_version: HashMap<String, v1::DownloadableMetadata>,

@@ -332,41 +332,72 @@ pub mod data {
        }
    }

+    mod v4 {
+        use std::{collections::HashMap, path::PathBuf};
+        use drop_library::libraries::LibraryProviderIdentifier;
+        use drop_native_library::impls::DropNativeLibraryProvider;
+        use serde_with::serde_as;
+        use crate::models::data::v3;
+        use super::{Deserialize, Serialize, native_model, v1, v2};
+
+        #[derive(Serialize, Deserialize, Clone)]
+        pub enum Library {
+            NativeLibrary(DropNativeLibraryProvider),
+        }
+
+        #[serde_as]
+        #[derive(Serialize, Deserialize, Default, Clone)]
+        #[serde(rename_all = "camelCase")]
+        #[native_model(id = 3, version = 4, with = native_model::rmp_serde_1_3::RmpSerde, from=v2::DatabaseApplications)]
+        pub struct DatabaseApplications {
+            pub install_dirs: Vec<PathBuf>,
+            pub libraries: HashMap<LibraryProviderIdentifier, Library>,
+
+            #[serde(skip)]
+            pub transient_statuses:
+                HashMap<v1::DownloadableMetadata, v1::ApplicationTransientStatus>,
+        }
+
+        impl From<v2::DatabaseApplications> for DatabaseApplications {
+            fn from(value: v2::DatabaseApplications) -> Self {
+                todo!()
+            }
+        }
+
+        #[native_model(id = 1, version = 4, with = native_model::rmp_serde_1_3::RmpSerde, from = v3::Database)]
+        #[derive(Serialize, Deserialize, Default, Clone)]
+        pub struct Database {
+            #[serde(default)]
+            pub settings: v1::Settings,
+            pub drop_applications: DatabaseApplications,
+            #[serde(skip)]
+            pub prev_database: Option<PathBuf>,
+        }
+
+        impl From<v3::Database> for Database {
+            fn from(value: v3::Database) -> Self {
+                Database {
+                    settings: value.settings,
+                    drop_applications: value.applications.into(),
+                    prev_database: value.prev_database,
+                }
+            }
+        }
+    }
+
    impl Database {
        pub fn new<T: Into<PathBuf>>(
            games_base_dir: T,
            prev_database: Option<PathBuf>,
-            cache_dir: PathBuf,
        ) -> Self {
            Self {
-                applications: DatabaseApplications {
+                drop_applications: DatabaseApplications {
                    install_dirs: vec![games_base_dir.into()],
-                    game_statuses: HashMap::new(),
-                    game_versions: HashMap::new(),
-                    installed_game_version: HashMap::new(),
+                    libraries: HashMap::new(),
                    transient_statuses: HashMap::new(),
                },
                prev_database,
-                base_url: String::new(),
-                auth: None,
                settings: Settings::default(),
-                cache_dir,
-                compat_info: None,
-            }
-        }
-    }
-    impl DatabaseAuth {
-        pub fn new(
-            private: String,
-            cert: String,
-            client_id: String,
-            web_token: Option<String>,
-        ) -> Self {
-            Self {
-                private,
-                cert,
-                client_id,
-                web_token,
            }
        }
    }
--- a/src-tauri/drop-database/src/process.rs
+++ b/src-tauri/drop-database/src/process.rs
@@ -40,7 +40,7 @@ impl From<whoami::Platform> for Platform {
            whoami::Platform::Windows => Platform::Windows,
            whoami::Platform::Linux => Platform::Linux,
            whoami::Platform::MacOS => Platform::MacOs,
-            platform => unimplemented!("Playform {} is not supported", platform),
+            _ => unimplemented!(),
        }
    }
 }
--- a/src-tauri/drop-database/src/runtime_models.rs
+++ b/src-tauri/drop-database/src/runtime_models.rs
@@ -0,0 +1,28 @@
+use bitcode::{Decode, Encode};
+use serde::{Deserialize, Serialize};
+
+#[derive(Serialize, Deserialize, Clone, Debug, Default, Encode, Decode)]
+#[serde(rename_all = "camelCase")]
+pub struct Game {
+    pub id: String,
+    m_name: String,
+    m_short_description: String,
+    m_description: String,
+    // mDevelopers
+    // mPublishers
+    m_icon_object_id: String,
+    m_banner_object_id: String,
+    m_cover_object_id: String,
+    m_image_library_object_ids: Vec<String>,
+    m_image_carousel_object_ids: Vec<String>,
+}
+
+#[derive(Clone, Serialize, Deserialize, Encode, Decode)]
+#[serde(rename_all = "camelCase")]
+pub struct User {
+    id: String,
+    username: String,
+    admin: bool,
+    display_name: String,
+    profile_picture_object_id: String,
+}
--- a/src-tauri/drop-downloads/Cargo.toml
+++ b/src-tauri/drop-downloads/Cargo.toml
@@ -0,0 +1,16 @@
+[package]
+name = "drop-downloads"
+version = "0.1.0"
+edition = "2024"
+
+[dependencies]
+atomic-instant-full = "0.1.0"
+drop-database = { path = "../drop-database" }
+drop-errors = { path = "../drop-errors" }
+# can't depend, cycle
+# drop-native-library = { path = "../drop-native-library" }
+log = "0.4.22"
+parking_lot = "0.12.4"
+serde = "1.0.219"
+tauri = { version = "2.7.0" }
+throttle_my_fn = "0.2.6"
--- a/src-tauri/download_manager/src/download_manager_builder.rs
+++ b/src-tauri/download_manager/src/download_manager_builder.rs
@@ -7,15 +7,13 @@ use std::{
    thread::{JoinHandle, spawn},
 };

-use database::DownloadableMetadata;
+use drop_database::models::data::DownloadableMetadata;
+use drop_errors::application_download_error::ApplicationDownloadError;
 use log::{debug, error, info, warn};
-use tauri::AppHandle;
-use utils::{app_emit, lock, send};
+use tauri::{AppHandle, Emitter};

 use crate::{
-    download_manager_frontend::DownloadStatus,
-    error::ApplicationDownloadError,
-    frontend_updates::{QueueUpdateEvent, QueueUpdateEventQueueData, StatsUpdateEvent},
+    download_manager_frontend::DownloadStatus, events::{QueueUpdateEvent, QueueUpdateEventQueueData, StatsUpdateEvent}
 };

 use super::{
@@ -31,43 +29,6 @@ use super::{
 pub type DownloadAgent = Arc<Box<dyn Downloadable + Send + Sync>>;
 pub type CurrentProgressObject = Arc<Mutex<Option<Arc<ProgressObject>>>>;

-/*
-
-Welcome to the download manager, the most overengineered, glorious piece of bullshit.
-
-The download manager takes a queue of ids and their associated
-DownloadAgents, and then, one-by-one, executes them. It provides an interface
-to interact with the currently downloading agent, and manage the queue.
-
-When the DownloadManager is initialised, it is designed to provide a reference
-which can be used to provide some instructions (the DownloadManagerInterface),
-but other than that, it runs without any sort of interruptions.
-
-It does this by opening up two data structures. Primarily is the command_receiver,
-and mpsc (multi-channel-single-producer) which allows commands to be sent from
-the Interface, and queued up for the Manager to process.
-
-These have been mapped in the DownloadManagerSignal docs.
-
-The other way to interact with the DownloadManager is via the donwload_queue,
-which is just a collection of ids which may be rearranged to suit
-whichever download queue order is required.
-
-+----------------------------------------------------------------------------+
-| DO NOT ATTEMPT TO ADD OR REMOVE FROM THE QUEUE WITHOUT USING SIGNALS!!     |
-| THIS WILL CAUSE A DESYNC BETWEEN THE DOWNLOAD AGENT REGISTRY AND THE QUEUE |
-| WHICH HAS NOT BEEN ACCOUNTED FOR                                           |
-+----------------------------------------------------------------------------+
-
-This download queue does not actually own any of the DownloadAgents. It is
-simply an id-based reference system. The actual Agents are stored in the
-download_agent_registry HashMap, as ordering is no issue here. This is why
-appending or removing from the download_queue must be done via signals.
-
-Behold, my madness - quexeky
-
-*/
-
 pub struct DownloadManagerBuilder {
    download_agent_registry: HashMap<DownloadableMetadata, DownloadAgent>,
    download_queue: Queue,
@@ -106,7 +67,7 @@ impl DownloadManagerBuilder {
    }

    fn set_status(&self, status: DownloadManagerStatus) {
-        *lock!(self.status) = status;
+        *self.status.lock().unwrap() = status;
    }

    fn remove_and_cleanup_front_download(&mut self, meta: &DownloadableMetadata) -> DownloadAgent {
@@ -120,9 +81,9 @@ impl DownloadManagerBuilder {
    // Make sure the download thread is terminated
    fn cleanup_current_download(&mut self) {
        self.active_control_flag = None;
-        *lock!(self.progress) = None;
+        *self.progress.lock().unwrap() = None;

-        let mut download_thread_lock = lock!(self.current_download_thread);
+        let mut download_thread_lock = self.current_download_thread.lock().unwrap();

        if let Some(unfinished_thread) = download_thread_lock.take()
            && !unfinished_thread.is_finished()
@@ -138,7 +99,7 @@ impl DownloadManagerBuilder {
            current_flag.set(DownloadThreadControlFlag::Stop);
        }

-        let mut download_thread_lock = lock!(self.current_download_thread);
+        let mut download_thread_lock = self.current_download_thread.lock().unwrap();
        if let Some(current_download_thread) = download_thread_lock.take() {
            return current_download_thread.join().is_ok();
        };
@@ -200,7 +161,9 @@ impl DownloadManagerBuilder {
        self.download_queue.append(meta.clone());
        self.download_agent_registry.insert(meta, download_agent);

-        send!(self.sender, DownloadManagerSignal::UpdateUIQueue);
+        self.sender
+            .send(DownloadManagerSignal::UpdateUIQueue)
+            .unwrap();
    }

    fn manage_go_signal(&mut self) {
@@ -246,7 +209,7 @@ impl DownloadManagerBuilder {

        let sender = self.sender.clone();

-        let mut download_thread_lock = lock!(self.current_download_thread);
+        let mut download_thread_lock = self.current_download_thread.lock().unwrap();
        let app_handle = self.app_handle.clone();

        *download_thread_lock = Some(spawn(move || {
@@ -257,7 +220,7 @@ impl DownloadManagerBuilder {
                    Err(e) => {
                        error!("download {:?} has error {}", download_agent.metadata(), &e);
                        download_agent.on_error(&app_handle, &e);
-                        send!(sender, DownloadManagerSignal::Error(e));
+                        sender.send(DownloadManagerSignal::Error(e)).unwrap();
                        return;
                    }
                };
@@ -281,7 +244,7 @@ impl DownloadManagerBuilder {
                            &e
                        );
                        download_agent.on_error(&app_handle, &e);
-                        send!(sender, DownloadManagerSignal::Error(e));
+                        sender.send(DownloadManagerSignal::Error(e)).unwrap();
                        return;
                    }
                };
@@ -292,11 +255,10 @@ impl DownloadManagerBuilder {

                if validate_result {
                    download_agent.on_complete(&app_handle);
-                    send!(
-                        sender,
-                        DownloadManagerSignal::Completed(download_agent.metadata())
-                    );
-                    send!(sender, DownloadManagerSignal::UpdateUIQueue);
+                    sender
+                        .send(DownloadManagerSignal::Completed(download_agent.metadata()))
+                        .unwrap();
+                    sender.send(DownloadManagerSignal::UpdateUIQueue).unwrap();
                    return;
                }
            }
@@ -323,7 +285,7 @@ impl DownloadManagerBuilder {
        }

        self.push_ui_queue_update();
-        send!(self.sender, DownloadManagerSignal::Go);
+        self.sender.send(DownloadManagerSignal::Go).unwrap();
    }
    fn manage_error_signal(&mut self, error: ApplicationDownloadError) {
        debug!("got signal Error");
@@ -361,7 +323,7 @@ impl DownloadManagerBuilder {
            let index = self.download_queue.get_by_meta(meta);
            if let Some(index) = index {
                download_agent.on_cancelled(&self.app_handle);
-                let _ = self.download_queue.edit().remove(index);
+                let _ = self.download_queue.edit().remove(index).unwrap();
                let removed = self.download_agent_registry.remove(meta);
                debug!(
                    "removed {:?} from queue {:?}",
@@ -376,7 +338,7 @@ impl DownloadManagerBuilder {
    fn push_ui_stats_update(&self, kbs: usize, time: usize) {
        let event_data = StatsUpdateEvent { speed: kbs, time };

-        app_emit!(&self.app_handle, "update_stats", event_data);
+        self.app_handle.emit("update_stats", event_data).unwrap();
    }
    fn push_ui_queue_update(&self) {
        let queue = &self.download_queue.read();
@@ -395,6 +357,6 @@ impl DownloadManagerBuilder {
            .collect();

        let event_data = QueueUpdateEvent { queue: queue_objs };
-        app_emit!(&self.app_handle, "update_queue", event_data);
+        self.app_handle.emit("update_queue", event_data).unwrap();
    }
 }
--- a/src-tauri/download_manager/src/download_manager_frontend.rs
+++ b/src-tauri/download_manager/src/download_manager_frontend.rs
@@ -3,18 +3,16 @@ use std::{
    collections::VecDeque,
    fmt::Debug,
    sync::{
-        Mutex, MutexGuard,
        mpsc::{SendError, Sender},
+        Mutex, MutexGuard,
    },
    thread::JoinHandle,
 };

-use database::DownloadableMetadata;
+use drop_database::models::data::DownloadableMetadata;
+use drop_errors::application_download_error::ApplicationDownloadError;
 use log::{debug, info};
 use serde::Serialize;
-use utils::{lock, send};
-
-use crate::error::ApplicationDownloadError;

 use super::{
    download_manager_builder::{CurrentProgressObject, DownloadAgent},
@@ -79,7 +77,6 @@ pub enum DownloadStatus {
 /// The actual download queue may be accessed through the .`edit()` function,
 /// which provides raw access to the underlying queue.
 /// THIS EDITING IS BLOCKING!!!
-#[derive(Debug)]
 pub struct DownloadManager {
    terminator: Mutex<Option<JoinHandle<Result<(), ()>>>>,
    download_queue: Queue,
@@ -119,21 +116,22 @@ impl DownloadManager {
        self.download_queue.read()
    }
    pub fn get_current_download_progress(&self) -> Option<f64> {
-        let progress_object = (*lock!(self.progress)).clone()?;
+        let progress_object = (*self.progress.lock().unwrap()).clone()?;
        Some(progress_object.get_progress())
    }
    pub fn rearrange_string(&self, meta: &DownloadableMetadata, new_index: usize) {
        let mut queue = self.edit();
-        let current_index =
-            get_index_from_id(&mut queue, meta).expect("Failed to get meta index from id");
-        let to_move = queue
-            .remove(current_index)
-            .expect("Failed to remove meta at index from queue");
+        let current_index = get_index_from_id(&mut queue, meta).unwrap();
+        let to_move = queue.remove(current_index).unwrap();
        queue.insert(new_index, to_move);
-        send!(self.command_sender, DownloadManagerSignal::UpdateUIQueue);
+        self.command_sender
+            .send(DownloadManagerSignal::UpdateUIQueue)
+            .unwrap();
    }
    pub fn cancel(&self, meta: DownloadableMetadata) {
-        send!(self.command_sender, DownloadManagerSignal::Cancel(meta));
+        self.command_sender
+            .send(DownloadManagerSignal::Cancel(meta))
+            .unwrap();
    }
    pub fn rearrange(&self, current_index: usize, new_index: usize) {
        if current_index == new_index {
@@ -142,31 +140,39 @@ impl DownloadManager {

        let needs_pause = current_index == 0 || new_index == 0;
        if needs_pause {
-            send!(self.command_sender, DownloadManagerSignal::Stop);
+            self.command_sender
+                .send(DownloadManagerSignal::Stop)
+                .unwrap();
        }

        debug!("moving download at index {current_index} to index {new_index}");

        let mut queue = self.edit();
-        let to_move = queue.remove(current_index).expect("Failed to get");
+        let to_move = queue.remove(current_index).unwrap();
        queue.insert(new_index, to_move);
        drop(queue);

        if needs_pause {
-            send!(self.command_sender, DownloadManagerSignal::Go);
+            self.command_sender.send(DownloadManagerSignal::Go).unwrap();
        }
-        send!(self.command_sender, DownloadManagerSignal::UpdateUIQueue);
-        send!(self.command_sender, DownloadManagerSignal::Go);
+        self.command_sender
+            .send(DownloadManagerSignal::UpdateUIQueue)
+            .unwrap();
+        self.command_sender.send(DownloadManagerSignal::Go).unwrap();
    }
    pub fn pause_downloads(&self) {
-        send!(self.command_sender, DownloadManagerSignal::Stop);
+        self.command_sender
+            .send(DownloadManagerSignal::Stop)
+            .unwrap();
    }
    pub fn resume_downloads(&self) {
-        send!(self.command_sender, DownloadManagerSignal::Go);
+        self.command_sender.send(DownloadManagerSignal::Go).unwrap();
    }
    pub fn ensure_terminated(&self) -> Result<Result<(), ()>, Box<dyn Any + Send>> {
-        send!(self.command_sender, DownloadManagerSignal::Finish);
-        let terminator = lock!(self.terminator).take();
+        self.command_sender
+            .send(DownloadManagerSignal::Finish)
+            .unwrap();
+        let terminator = self.terminator.lock().unwrap().take();
        terminator.unwrap().join()
    }
    pub fn get_sender(&self) -> Sender<DownloadManagerSignal> {
--- a/src-tauri/download_manager/src/downloadable.rs
+++ b/src-tauri/download_manager/src/downloadable.rs
@@ -1,10 +1,9 @@
 use std::sync::Arc;

-use database::DownloadableMetadata;
+use drop_database::models::data::DownloadableMetadata;
+use drop_errors::application_download_error::ApplicationDownloadError;
 use tauri::AppHandle;

-use crate::error::ApplicationDownloadError;
-
 use super::{
    download_manager_frontend::DownloadStatus,
    util::{download_thread_control_flag::DownloadThreadControl, progress_object::ProgressObject},
--- a/src-tauri/download_manager/src/frontend_updates.rs
+++ b/src-tauri/download_manager/src/frontend_updates.rs
@@ -1,4 +1,4 @@
-use database::DownloadableMetadata;
+use drop_database::models::data::DownloadableMetadata;
 use serde::Serialize;

 use crate::download_manager_frontend::DownloadStatus;
--- a/src-tauri/drop-downloads/src/lib.rs
+++ b/src-tauri/drop-downloads/src/lib.rs
@@ -0,0 +1,7 @@
+#![feature(duration_millis_float)]
+
+pub mod download_manager_builder;
+pub mod download_manager_frontend;
+pub mod downloadable;
+pub mod events;
+pub mod util;
--- a/src-tauri/download_manager/src/util/download_thread_control_flag.rs
+++ b/src-tauri/download_manager/src/util/download_thread_control_flag.rs
@@ -1,6 +1,6 @@
 use std::sync::{
-    Arc,
    atomic::{AtomicBool, Ordering},
+    Arc,
 };

 #[derive(PartialEq, Eq, PartialOrd, Ord)]
@@ -22,11 +22,7 @@ impl From<DownloadThreadControlFlag> for bool {
 /// false => Stop
 impl From<bool> for DownloadThreadControlFlag {
    fn from(value: bool) -> Self {
-        if value {
-            DownloadThreadControlFlag::Go
-        } else {
-            DownloadThreadControlFlag::Stop
-        }
+        if value { DownloadThreadControlFlag::Go } else { DownloadThreadControlFlag::Stop }
    }
 }

--- a/src-tauri/download_manager/src/util/mod.rs
+++ b/src-tauri/download_manager/src/util/mod.rs
--- a/src-tauri/download_manager/src/util/progress_object.rs
+++ b/src-tauri/download_manager/src/util/progress_object.rs
@@ -9,13 +9,12 @@ use std::{

 use atomic_instant_full::AtomicInstant;
 use throttle_my_fn::throttle;
-use utils::{lock, send};

 use crate::download_manager_frontend::DownloadManagerSignal;

 use super::rolling_progress_updates::RollingProgressWindow;

-#[derive(Clone, Debug)]
+#[derive(Clone)]
 pub struct ProgressObject {
    max: Arc<Mutex<usize>>,
    progress_instances: Arc<Mutex<Vec<Arc<AtomicUsize>>>>,
@@ -75,10 +74,12 @@ impl ProgressObject {
    }

    pub fn set_time_now(&self) {
-        *lock!(self.start) = Instant::now();
+        *self.start.lock().unwrap() = Instant::now();
    }
    pub fn sum(&self) -> usize {
-        lock!(self.progress_instances)
+        self.progress_instances
+            .lock()
+            .unwrap()
            .iter()
            .map(|instance| instance.load(Ordering::Acquire))
            .sum()
@@ -87,25 +88,27 @@ impl ProgressObject {
        self.set_time_now();
        self.bytes_last_update.store(0, Ordering::Release);
        self.rolling.reset();
-        lock!(self.progress_instances)
+        self.progress_instances
+            .lock()
+            .unwrap()
            .iter()
            .for_each(|x| x.store(0, Ordering::SeqCst));
    }
    pub fn get_max(&self) -> usize {
-        *lock!(self.max)
+        *self.max.lock().unwrap()
    }
    pub fn set_max(&self, new_max: usize) {
-        *lock!(self.max) = new_max;
+        *self.max.lock().unwrap() = new_max;
    }
    pub fn set_size(&self, length: usize) {
-        *lock!(self.progress_instances) =
+        *self.progress_instances.lock().unwrap() =
            (0..length).map(|_| Arc::new(AtomicUsize::new(0))).collect();
    }
    pub fn get_progress(&self) -> f64 {
        self.sum() as f64 / self.get_max() as f64
    }
    pub fn get(&self, index: usize) -> Arc<AtomicUsize> {
-        lock!(self.progress_instances)[index].clone()
+        self.progress_instances.lock().unwrap()[index].clone()
    }
    fn update_window(&self, kilobytes_per_second: usize) {
        self.rolling.update(kilobytes_per_second);
@@ -117,9 +120,7 @@ pub fn calculate_update(progress: &ProgressObject) {
    let last_update_time = progress
        .last_update_time
        .swap(Instant::now(), Ordering::SeqCst);
-    let time_since_last_update = Instant::now()
-        .duration_since(last_update_time)
-        .as_millis_f64();
+    let time_since_last_update = Instant::now().duration_since(last_update_time).as_millis_f64();

    let current_bytes_downloaded = progress.sum();
    let max = progress.get_max();
@@ -127,8 +128,7 @@ pub fn calculate_update(progress: &ProgressObject) {
        .bytes_last_update
        .swap(current_bytes_downloaded, Ordering::Acquire);

-    let bytes_since_last_update =
-        current_bytes_downloaded.saturating_sub(bytes_at_last_update) as f64;
+    let bytes_since_last_update = current_bytes_downloaded.saturating_sub(bytes_at_last_update) as f64;

    let kilobytes_per_second = bytes_since_last_update / time_since_last_update;

@@ -148,12 +148,18 @@ pub fn push_update(progress: &ProgressObject, bytes_remaining: usize) {
 }

 fn update_ui(progress_object: &ProgressObject, kilobytes_per_second: usize, time_remaining: usize) {
-    send!(
-        progress_object.sender,
-        DownloadManagerSignal::UpdateUIStats(kilobytes_per_second, time_remaining)
-    );
+    progress_object
+        .sender
+        .send(DownloadManagerSignal::UpdateUIStats(
+            kilobytes_per_second,
+            time_remaining,
+        ))
+        .unwrap();
 }

 fn update_queue(progress: &ProgressObject) {
-    send!(progress.sender, DownloadManagerSignal::UpdateUIQueue)
+    progress
+        .sender
+        .send(DownloadManagerSignal::UpdateUIQueue)
+        .unwrap();
 }
--- a/src-tauri/download_manager/src/util/queue.rs
+++ b/src-tauri/download_manager/src/util/queue.rs
@@ -3,10 +3,9 @@ use std::{
    sync::{Arc, Mutex, MutexGuard},
 };

-use database::DownloadableMetadata;
-use utils::lock;
+use drop_database::models::data::DownloadableMetadata;

-#[derive(Clone, Debug)]
+#[derive(Clone)]
 pub struct Queue {
    inner: Arc<Mutex<VecDeque<DownloadableMetadata>>>,
 }
@@ -25,10 +24,10 @@ impl Queue {
        }
    }
    pub fn read(&self) -> VecDeque<DownloadableMetadata> {
-        lock!(self.inner).clone()
+        self.inner.lock().unwrap().clone()
    }
    pub fn edit(&self) -> MutexGuard<'_, VecDeque<DownloadableMetadata>> {
-        lock!(self.inner)
+        self.inner.lock().unwrap()
    }
    pub fn pop_front(&self) -> Option<DownloadableMetadata> {
        self.edit().pop_front()
--- a/src-tauri/download_manager/src/util/rolling_progress_updates.rs
+++ b/src-tauri/download_manager/src/util/rolling_progress_updates.rs
@@ -3,17 +3,11 @@ use std::sync::{
    atomic::{AtomicUsize, Ordering},
 };

-#[derive(Clone, Debug)]
+#[derive(Clone)]
 pub struct RollingProgressWindow<const S: usize> {
    window: Arc<[AtomicUsize; S]>,
    current: Arc<AtomicUsize>,
 }
-impl<const S: usize> Default for RollingProgressWindow<S> {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
 impl<const S: usize> RollingProgressWindow<S> {
    pub fn new() -> Self {
        Self {
@@ -37,7 +31,7 @@ impl<const S: usize> RollingProgressWindow<S> {
            .collect::<Vec<usize>>();
        let amount = valid.len();
        let sum = valid.into_iter().sum::<usize>();
-
+        
        sum / amount
    }
    pub fn reset(&self) {
--- a/src-tauri/drop-errors/Cargo.toml
+++ b/src-tauri/drop-errors/Cargo.toml
@@ -0,0 +1,14 @@
+[package]
+name = "drop-errors"
+version = "0.1.0"
+edition = "2024"
+
+[dependencies]
+http = "1.3.1"
+humansize = "2.1.3"
+reqwest = "0.12.23"
+reqwest-websocket = "0.5.1"
+serde = { version = "1.0.219", features = ["derive"] }
+serde_with = "3.14.0"
+tauri-plugin-opener = "2.5.0"
+url = "2.5.7"
--- a/src-tauri/drop-errors/src/application_download_error.rs
+++ b/src-tauri/drop-errors/src/application_download_error.rs
@@ -0,0 +1,49 @@
+use std::{
+    fmt::{Display, Formatter},
+    io, sync::Arc,
+};
+
+use serde_with::SerializeDisplay;
+use humansize::{format_size, BINARY};
+
+use super::remote_access_error::RemoteAccessError;
+
+// TODO: Rename / separate from downloads
+#[derive(Debug, SerializeDisplay)]
+pub enum ApplicationDownloadError {
+    NotInitialized,
+    Communication(RemoteAccessError),
+    DiskFull(u64, u64),
+    #[allow(dead_code)]
+    Checksum,
+    Lock,
+    IoError(Arc<io::Error>),
+    DownloadError,
+}
+
+impl Display for ApplicationDownloadError {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        match self {
+            ApplicationDownloadError::NotInitialized => write!(f, "Download not initalized, did something go wrong?"),
+            ApplicationDownloadError::DiskFull(required, available) => write!(
+                f,
+                "Game requires {}, {} remaining left on disk.",
+                format_size(*required, BINARY),
+                format_size(*available, BINARY),
+            ),
+            ApplicationDownloadError::Communication(error) => write!(f, "{error}"),
+            ApplicationDownloadError::Lock => write!(
+                f,
+                "failed to acquire lock. Something has gone very wrong internally. Please restart the application"
+            ),
+            ApplicationDownloadError::Checksum => {
+                write!(f, "checksum failed to validate for download")
+            }
+            ApplicationDownloadError::IoError(error) => write!(f, "io error: {error}"),
+            ApplicationDownloadError::DownloadError => write!(
+                f,
+                "Download failed. See Download Manager status for specific error"
+            ),
+        }
+    }
+}
--- a/src-tauri/drop-errors/src/download_manager_error.rs
+++ b/src-tauri/drop-errors/src/download_manager_error.rs
@@ -0,0 +1,27 @@
+use std::{fmt::Display, io, sync::mpsc::SendError};
+
+use serde_with::SerializeDisplay;
+
+#[derive(SerializeDisplay)]
+pub enum DownloadManagerError<T> {
+    IOError(io::Error),
+    SignalError(SendError<T>),
+}
+impl<T> Display for DownloadManagerError<T> {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            DownloadManagerError::IOError(error) => write!(f, "{error}"),
+            DownloadManagerError::SignalError(send_error) => write!(f, "{send_error}"),
+        }
+    }
+}
+impl<T> From<SendError<T>> for DownloadManagerError<T> {
+    fn from(value: SendError<T>) -> Self {
+        DownloadManagerError::SignalError(value)
+    }
+}
+impl<T> From<io::Error> for DownloadManagerError<T> {
+    fn from(value: io::Error) -> Self {
+        DownloadManagerError::IOError(value)
+    }
+}
--- a/src-tauri/drop-errors/src/drop_server_error.rs
+++ b/src-tauri/drop-errors/src/drop_server_error.rs
@@ -0,0 +1,10 @@
+use serde::Deserialize;
+
+#[derive(Deserialize, Debug, Clone)]
+#[serde(rename_all = "camelCase")]
+pub struct ServerError {
+    pub status_code: usize,
+    pub status_message: String,
+    // pub message: String,
+    // pub url: String,
+}
--- a/src-tauri/drop-errors/src/lib.rs
+++ b/src-tauri/drop-errors/src/lib.rs
@@ -0,0 +1,6 @@
+pub mod application_download_error;
+pub mod download_manager_error;
+pub mod drop_server_error;
+pub mod library_error;
+pub mod process_error;
+pub mod remote_access_error;
--- a/src-tauri/drop-errors/src/library_error.rs
+++ b/src-tauri/drop-errors/src/library_error.rs
@@ -0,0 +1,18 @@
+use std::fmt::Display;
+
+use serde_with::SerializeDisplay;
+
+#[derive(SerializeDisplay)]
+pub enum LibraryError {
+    MetaNotFound(String),
+}
+impl Display for LibraryError {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            LibraryError::MetaNotFound(id) => write!(
+                f,
+                "Could not locate any installed version of game ID {id} in the database"
+            ),
+        }
+    }
+}
--- a/src-tauri/drop-errors/src/process_error.rs
+++ b/src-tauri/drop-errors/src/process_error.rs
@@ -11,9 +11,7 @@ pub enum ProcessError {
    IOError(Error),
    FormatError(String), // String errors supremacy
    InvalidPlatform,
-    OpenerError(tauri_plugin_opener::Error),
-    InvalidArguments(String),
-    FailedLaunch(String),
+    OpenerError(tauri_plugin_opener::Error)
 }

 impl Display for ProcessError {
@@ -25,15 +23,9 @@ impl Display for ProcessError {
            ProcessError::InvalidVersion => "Invalid game version",
            ProcessError::IOError(error) => &error.to_string(),
            ProcessError::InvalidPlatform => "This game cannot be played on the current platform",
-            ProcessError::FormatError(error) => &format!("Could not format template: {error:?}"),
-            ProcessError::OpenerError(error) => &format!("Could not open directory: {error:?}"),
-            ProcessError::InvalidArguments(arguments) => {
-                &format!("Invalid arguments in command {arguments}")
-            }
-            ProcessError::FailedLaunch(game_id) => {
-                &format!("Drop detected that the game {game_id} may have failed to launch properly")
-            }
-        };
+            ProcessError::FormatError(e) => &format!("Failed to format template: {e}"),
+            ProcessError::OpenerError(error) => &format!("Failed to open directory: {error}"),
+                    };
        write!(f, "{s}")
    }
 }
--- a/src-tauri/drop-errors/src/remote_access_error.rs
+++ b/src-tauri/drop-errors/src/remote_access_error.rs
@@ -4,20 +4,11 @@ use std::{
    sync::Arc,
 };

-use http::{HeaderName, StatusCode, header::ToStrError};
+use http::StatusCode;
 use serde_with::SerializeDisplay;
 use url::ParseError;

-use serde::Deserialize;
-
-#[derive(Deserialize, Debug, Clone)]
-#[serde(rename_all = "camelCase")]
-pub struct DropServerError {
-    pub status_code: usize,
-    pub status_message: String,
-    // pub message: String,
-    // pub url: String,
-}
+use super::drop_server_error::ServerError;

 #[derive(Debug, SerializeDisplay)]
 pub enum RemoteAccessError {
@@ -27,7 +18,7 @@ pub enum RemoteAccessError {
    InvalidEndpoint,
    HandshakeFailed(String),
    GameNotFound(String),
-    InvalidResponse(DropServerError),
+    InvalidResponse(ServerError),
    UnparseableResponse(String),
    ManifestDownloadFailed(StatusCode, String),
    OutOfSync,
@@ -53,7 +44,8 @@ impl Display for RemoteAccessError {
                    error
                        .source()
                        .map(std::string::ToString::to_string)
-                        .unwrap_or("Unknown error".to_string())
+                        .or_else(|| Some("Unknown error".to_string()))
+                        .unwrap()
                )
            }
            RemoteAccessError::FetchErrorWS(error) => write!(
@@ -62,8 +54,9 @@ impl Display for RemoteAccessError {
                error,
                error
                    .source()
-                    .map(std::string::ToString::to_string)
-                    .unwrap_or("Unknown error".to_string())
+                    .map(|e| e.to_string())
+                    .or_else(|| Some("Unknown error".to_string()))
+                    .unwrap()
            ),
            RemoteAccessError::ParsingError(parse_error) => {
                write!(f, "{parse_error}")
@@ -113,31 +106,3 @@ impl From<ParseError> for RemoteAccessError {
    }
 }
 impl std::error::Error for RemoteAccessError {}
-
-#[derive(Debug, SerializeDisplay)]
-pub enum CacheError {
-    HeaderNotFound(HeaderName),
-    ParseError(ToStrError),
-    Remote(RemoteAccessError),
-    ConstructionError(http::Error),
-}
-
-impl Display for CacheError {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        let s = match self {
-            CacheError::HeaderNotFound(header_name) => {
-                format!("Could not find header {header_name} in cache")
-            }
-            CacheError::ParseError(to_str_error) => {
-                format!("Could not parse cache with error {to_str_error}")
-            }
-            CacheError::Remote(remote_access_error) => {
-                format!("Cache got remote access error: {remote_access_error}")
-            }
-            CacheError::ConstructionError(error) => {
-                format!("Could not construct cache body with error {error}")
-            }
-        };
-        write!(f, "{s}")
-    }
-}
--- a/src-tauri/drop-library/Cargo.toml
+++ b/src-tauri/drop-library/Cargo.toml
@@ -0,0 +1,11 @@
+[package]
+name = "drop-library"
+version = "0.1.0"
+edition = "2024"
+
+[dependencies]
+drop-errors = { path = "../drop-errors" }
+http = "*"
+reqwest = { version = "*", default-features = false }
+serde = { version = "*", default-features = false, features = ["derive"] }
+tauri = "*"
--- a/src-tauri/drop-library/src/errors.rs
+++ b/src-tauri/drop-library/src/errors.rs
@@ -0,0 +1,11 @@
+pub enum DropLibraryError {
+    NetworkError(reqwest::Error),
+    ServerError(drop_errors::drop_server_error::ServerError),
+    Unconfigured,
+}
+
+impl From<reqwest::Error> for DropLibraryError {
+    fn from(value: reqwest::Error) -> Self {
+        DropLibraryError::NetworkError(value)
+    }
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
DecDuck	43b56462d6	feat: more refactoring (broken)	2025-09-16 15:09:43 +10:00
DecDuck	ab219670dc	fix: cleanup dependencies	2025-09-14 09:27:49 +10:00
DecDuck	c1beef380e	refactor: into rust workspaces	2025-09-14 09:19:03 +10:00