diff --git a/dlib-test-library b/dlib-test-library
deleted file mode 100755
index 0dc0697..0000000
Binary files a/dlib-test-library and /dev/null differ
diff --git a/dub.json b/dub.json
index 8af49e4..91ecaf0 100644
--- a/dub.json
+++ b/dub.json
@@ -1,39 +1,50 @@
 {
 	"name": "dlib",
 	"description": "General purpose library",
-	"targetType": "sourceLibrary",
-	"sourcePaths": ["dlib"],
-	"importPaths": ["dlib"],
-	"sourceFiles-linux": ["build/libstb.a"],
-	"sourceFiles-windows": [],
-	"libs-linux": [
-		"X11", 
-		"Xfixes", 
-		"SDL3"
-	],
-	"dflags-webassembly": [
-		"-mtriple=wasm32-unknown-unknown-wasm", 
-		"-betterC", 
-		"-vgc", 
-		"-fvisibility=hidden", 
-		"-i=.", 
-		"-i=core", 
-		"-i=std", 
-		"--real-precision=double", 
-		"--Xcc=-DBUILD_WASM", 
-		"-gcc=clang"
-	],
-	"libs-windows": [],
-	"preGenerateCommands-linux": ["./build.sh"],
+	"targetType": "none",
 	"subPackages": [
 		{
-			"name": "dlib-vulkan",
+			"name": "core",
+			"targetType": "sourceLibrary",
+			"sourcePaths": ["dlib"],
+			"importPaths": ["dlib"],
+			"sourceFiles-linux": ["build/libstb.a"],
+			"sourceFiles-windows": [],
+			"libs-linux": [
+				"X11", 
+				"Xfixes", 
+				"SDL3"
+			],
+			"dflags-webassembly": [
+				"-mtriple=wasm32-unknown-unknown-wasm", 
+				"-betterC", 
+				"-vgc", 
+				"-fvisibility=hidden", 
+				"-i=.", 
+				"-i=core", 
+				"-i=std", 
+				"--real-precision=double", 
+				"--Xcc=-DBUILD_WASM", 
+				"-gcc=clang"
+			],
+			"libs-windows": [],
+			"preGenerateCommands-linux": ["./build.sh"],
+			"buildTypes": {
+				"unittest": {
+					"buildOptions": ["unittests", "debugMode", "debugInfo"],
+					"versions": ["DLIB_TEST", "VULKAN_RENDERER_TEST"]
+				}
+			}
+		},
+		{
+			"name": "vulkan",
 			"description": "Vulkan library for rendering and compute",
 			"targetType": "sourceLibrary",
 			"sourcePaths": ["vulkan"],
 			"importPaths": ["vulkan"],
 			"sourceFiles-linux": ["build/libvma.a"],
 			"sourceFiles-windows": [],
+			"stringImportPaths": ["build"],
 			"dflags-ldc": ["--Xcc=-DBUILD_VULKAN"],
 			"dflags-dmd": ["-Xcc=-DBUILD_VULKAN"],
 			"libs-linux": [
@@ -43,6 +54,9 @@
 			"libs-windows": [],
 			"versions": ["BUILD_VULKAN"],
 			"debugVersions": ["VULKAN_DEBUG"],
+			"dependencies": {
+				"dlib:core": "*"
+			},
 			"buildTypes": {
 				"unittest": {
 					"buildOptions": ["unittests", "debugMode", "debugInfo"],
@@ -51,28 +65,44 @@
 			}
 		},
 		{
-			"name": "dlib-assets",
+			"name": "assets",
 			"description": "Asset loading utilities",
 			"targetType": "sourceLibrary",
+			"importPaths": ["dlib"],
+			"dependencies": {
+				"dlib:core": "*"
+			},
 			"sourceFiles-linux": ["build/libcgltf.a"],
 			"sourceFiles-windows": [],
 			"versions": ["BUILD_ASSETS"]
 		},
 		{
-			"name": "dlib-opengl",
+			"name": "opengl",
 			"description": "OpenGL bindings/set up utilities",
 			"targetType": "sourceLibrary",
 			"sourcePaths": ["opengl"],
 			"importPaths": ["opengl"],
 			"libs-linux": ["GL"],
 			"libs-windows": [],
-			"versions": ["BUILD_GL"]
+			"dflags-ldc": ["--Xcc=-DBUILD_GL"],
+			"dflags-dmd": ["-Xcc=-DBUILD_GL"],
+			"versions": ["BUILD_GL"],
+			"dependencies": {
+				"dlib:core": "*"
+			}
+		},
+		{
+			"name": "test",
+			"description": "Include all packages for a test",
+			"targetType": "library",
+			"sourceFiles": ["dlib/package.d"],
+			"importPaths": ["dlib"],
+			"dependencies": {
+				"dlib:vulkan": "*",
+				"dlib:assets": "*",
+				"dlib:opengl": "*",
+				"dlib:core": "*"
+			}
 		}
 	],
-	"buildTypes": {
-		"unittest": {
-			"buildOptions": ["unittests", "debugMode", "debugInfo"],
-			"versions": ["DLIB_TEST", "VULKAN_RENDERER_TEST"]
-		}
-	}
 }