diff --git a/asset-packer/includes.c b/asset-packer/includes.c
deleted file mode 100644
index 3e95db3..0000000
--- a/asset-packer/includes.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "../external/xxhash/xxhash.h"
diff --git a/dub.json b/dub.json
index 21b9d4d..69bf847 100644
--- a/dub.json
+++ b/dub.json
@@ -7,11 +7,10 @@
 			"targetType": "executable",
 			"targetName": "Gears",
 			"targetPath": "build",
-			"platforms": ["linux", "windows"],
 			"sourceFiles-linux": ["build/libvma.a", "build/libxxhash.a"],
 			"sourceFiles-windows": [],
-			"importPaths": ["src"],
-			"sourcePaths": ["src"],
+			"importPaths": ["src/gears", "src/shared"],
+			"sourcePaths": ["src/gears", "src/shared"],
 			"libs-linux": ["xcb", "X11", "X11-xcb", "vulkan", "stdc++"],
 			"libs-windows": [],
 			"preGenerateCommands-linux": ["./build-vma.sh"],
@@ -22,10 +21,9 @@
 			"targetType": "executable",
 			"targetPath": "build",
 			"targetName": "Packer",
-			"platforms": ["linux", "windows"],
-			"importPaths": ["src", "asset-packer"],
-			"sourceFiles-linux": ["src/util.d", "build/libxxhash.a"],
-			"sourcePaths": ["asset-packer"],
+			"importPaths": ["src/packer", "src/shared"],
+			"sourcePaths": ["src/packer", "src/shared"],
+			"sourceFiles-linux": ["build/libxxhash.a"],
 		}
 	]
 }
diff --git a/src/includes.c b/src/gears/includes.c
similarity index 82%
rename from src/includes.c
rename to src/gears/includes.c
index 11a40e1..d4455c5 100644
--- a/src/includes.c
+++ b/src/gears/includes.c
@@ -20,6 +20,6 @@
 #define VMA_DYNAMIC_VULKAN_FUNCTIONS 1
 #define VMA_VULKAN_VERSION 1003000
 
-#include "../external/vma/vk_mem_alloc.h"
+#include "../../external/vma/vk_mem_alloc.h"
 
-#include "../external/xxhash/xxhash.h"
+#include "../../external/xxhash/xxhash.h"
diff --git a/src/main.d b/src/gears/main.d
similarity index 100%
rename from src/main.d
rename to src/gears/main.d
diff --git a/src/platform.d b/src/gears/platform.d
similarity index 100%
rename from src/platform.d
rename to src/gears/platform.d
diff --git a/src/renderer.d b/src/gears/renderer.d
similarity index 100%
rename from src/renderer.d
rename to src/gears/renderer.d
diff --git a/src/tests.d b/src/gears/tests.d
similarity index 100%
rename from src/tests.d
rename to src/gears/tests.d
diff --git a/src/vulkan.d b/src/gears/vulkan.d
similarity index 100%
rename from src/vulkan.d
rename to src/gears/vulkan.d
diff --git a/src/vulkan_funcs.d b/src/gears/vulkan_funcs.d
similarity index 100%
rename from src/vulkan_funcs.d
rename to src/gears/vulkan_funcs.d
diff --git a/src/vulkan_logging.d b/src/gears/vulkan_logging.d
similarity index 100%
rename from src/vulkan_logging.d
rename to src/gears/vulkan_logging.d
diff --git a/src/main.o b/src/main.o
deleted file mode 100644
index 887e9df..0000000
Binary files a/src/main.o and /dev/null differ
diff --git a/src/packer/includes.c b/src/packer/includes.c
new file mode 100644
index 0000000..2c68f7f
--- /dev/null
+++ b/src/packer/includes.c
@@ -0,0 +1 @@
+#include "../../external/xxhash/xxhash.h"
diff --git a/asset-packer/main.d b/src/packer/main.d
similarity index 100%
rename from asset-packer/main.d
rename to src/packer/main.d
diff --git a/src/aliases.d b/src/shared/aliases.d
similarity index 100%
rename from src/aliases.d
rename to src/shared/aliases.d
diff --git a/src/alloc.d b/src/shared/alloc.d
similarity index 100%
rename from src/alloc.d
rename to src/shared/alloc.d
diff --git a/src/assets.d b/src/shared/assets.d
similarity index 100%
rename from src/assets.d
rename to src/shared/assets.d
diff --git a/src/math.d b/src/shared/math.d
similarity index 100%
rename from src/math.d
rename to src/shared/math.d
diff --git a/src/util.d b/src/shared/util.d
similarity index 100%
rename from src/util.d
rename to src/shared/util.d