diff --git a/src/components/TabSelector.svelte b/src/components/TabSelector.svelte
index 76ac0da..87fb99a 100644
--- a/src/components/TabSelector.svelte
+++ b/src/components/TabSelector.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import type { TabHandler } from "../shark/TabHandler";
+  import type { TabHandler } from "../shark/handlers/TabHandler";
 
   export let tabs: typeof TabHandler.AllTabs;
   export let selectedTab: typeof TabHandler.currentTab;
diff --git a/src/shark/SharkGame.ts b/src/shark/SharkGame.ts
index ce51bf3..b0e6662 100644
--- a/src/shark/SharkGame.ts
+++ b/src/shark/SharkGame.ts
@@ -1,9 +1,9 @@
 import { Resources } from "./data/Resources";
-import { MessageHandler } from "./MessageHandler";
-import { SaveHandler } from "./SaveHandler";
+import { MessageHandler } from "./handlers/MessageHandler";
+import { SaveHandler } from "./handlers/SaveHandler";
 import { Settings } from "./Settings";
 import { StaticClass } from "./StaticClass";
-import { TabHandler } from "./TabHandler";
+import { TabHandler } from "./handlers/TabHandler";
 
 import { HomeActions } from "./data/HomeActions";
 
diff --git a/src/shark/MessageHandler.ts b/src/shark/handlers/MessageHandler.ts
similarity index 82%
rename from src/shark/MessageHandler.ts
rename to src/shark/handlers/MessageHandler.ts
index f9ff039..7c46f55 100644
--- a/src/shark/MessageHandler.ts
+++ b/src/shark/handlers/MessageHandler.ts
@@ -1,8 +1,8 @@
 import { writable } from "svelte/store";
 
-import { Message, MessageType } from "./Message";
-import { Settings } from "./Settings";
-import { StaticClass } from "./StaticClass";
+import { Message, MessageType } from "../Message";
+import { Settings } from "../Settings";
+import { StaticClass } from "../StaticClass";
 
 export class MessageHandler extends StaticClass {
   static messages = writable<Message[]>([]);
diff --git a/src/shark/SaveHandler.ts b/src/shark/handlers/SaveHandler.ts
similarity index 95%
rename from src/shark/SaveHandler.ts
rename to src/shark/handlers/SaveHandler.ts
index 78267f1..8eeb015 100644
--- a/src/shark/SaveHandler.ts
+++ b/src/shark/handlers/SaveHandler.ts
@@ -1,9 +1,9 @@
-import type { Message, MessageType } from "./Message";
-import type { SharkGame } from "./SharkGame";
-import { StaticClass } from "./StaticClass";
+import type { Message, MessageType } from "../Message";
+import type { SharkGame } from "../SharkGame";
+import { StaticClass } from "../StaticClass";
 import type { TabHandler } from "./TabHandler";
-import { LZString } from "./LZString";
-import { Settings } from "./Settings";
+import { LZString } from "../LZString";
+import { Settings } from "../Settings";
 
 const __EMPTY_OBJECT = {};
 type Version0Save = typeof __EMPTY_OBJECT;
diff --git a/src/shark/TabHandler.ts b/src/shark/handlers/TabHandler.ts
similarity index 59%
rename from src/shark/TabHandler.ts
rename to src/shark/handlers/TabHandler.ts
index 7e7268e..4be3b2e 100644
--- a/src/shark/TabHandler.ts
+++ b/src/shark/handlers/TabHandler.ts
@@ -1,6 +1,6 @@
-import Home from "../components/Tabs/Home.svelte";
-import Lab from "../components/Tabs/Lab.svelte";
-import { StaticClass } from "./StaticClass";
+import { StaticClass } from "../StaticClass";
+import Home from "../../components/Tabs/Home.svelte";
+import Lab from "../../components/Tabs/Lab.svelte";
 
 export class TabHandler extends StaticClass {
   static readonly AllTabs = {