diff --git a/build.zig b/build.zig
index cb43169..0e40678 100644
--- a/build.zig
+++ b/build.zig
@@ -59,10 +59,10 @@ pub fn build(b: *zbs.Builder) void {
     }
 
     {
-        const turbonss_test = b.addTest("lib/test_all.zig");
-        addCmphDeps(turbonss_test, cmph);
+        const src_test = b.addTest("src/test_all.zig");
+        addCmphDeps(src_test, cmph);
         const test_step = b.step("test", "Run the tests");
-        test_step.dependOn(&turbonss_test.step);
+        test_step.dependOn(&src_test.step);
     }
 }
 
diff --git a/cli/unix2db/main.zig b/cli/unix2db/main.zig
deleted file mode 100644
index 13ab026..0000000
--- a/cli/unix2db/main.zig
+++ /dev/null
@@ -1,3 +0,0 @@
-const std = @import("std");
-
-pub fn main() !void {}
diff --git a/lib/Corpus.zig b/src/Corpus.zig
similarity index 100%
rename from lib/Corpus.zig
rename to src/Corpus.zig
diff --git a/lib/DB.zig b/src/DB.zig
similarity index 100%
rename from lib/DB.zig
rename to src/DB.zig
diff --git a/lib/File.zig b/src/File.zig
similarity index 100%
rename from lib/File.zig
rename to src/File.zig
diff --git a/lib/Group.zig b/src/Group.zig
similarity index 100%
rename from lib/Group.zig
rename to src/Group.zig
diff --git a/lib/PackedGroup.zig b/src/PackedGroup.zig
similarity index 100%
rename from lib/PackedGroup.zig
rename to src/PackedGroup.zig
diff --git a/lib/PackedUser.zig b/src/PackedUser.zig
similarity index 100%
rename from lib/PackedUser.zig
rename to src/PackedUser.zig
diff --git a/lib/User.zig b/src/User.zig
similarity index 100%
rename from lib/User.zig
rename to src/User.zig
diff --git a/lib/bdz.zig b/src/bdz.zig
similarity index 100%
rename from lib/bdz.zig
rename to src/bdz.zig
diff --git a/lib/cmph.zig b/src/cmph.zig
similarity index 100%
rename from lib/cmph.zig
rename to src/cmph.zig
diff --git a/lib/compress.zig b/src/compress.zig
similarity index 100%
rename from lib/compress.zig
rename to src/compress.zig
diff --git a/lib/flags.zig b/src/flags.zig
similarity index 100%
rename from lib/flags.zig
rename to src/flags.zig
diff --git a/lib/header.zig b/src/header.zig
similarity index 100%
rename from lib/header.zig
rename to src/header.zig
diff --git a/lib/libnss.zig b/src/libnss.zig
similarity index 100%
rename from lib/libnss.zig
rename to src/libnss.zig
diff --git a/lib/padding.zig b/src/padding.zig
similarity index 100%
rename from lib/padding.zig
rename to src/padding.zig
diff --git a/lib/shell.zig b/src/shell.zig
similarity index 100%
rename from lib/shell.zig
rename to src/shell.zig
diff --git a/lib/test_all.zig b/src/test_all.zig
similarity index 92%
rename from lib/test_all.zig
rename to src/test_all.zig
index b3ba8e0..35b3797 100644
--- a/lib/test_all.zig
+++ b/src/test_all.zig
@@ -13,4 +13,5 @@ test "turbonss test suite" {
     _ = @import("shell.zig");
     _ = @import("User.zig");
     _ = @import("validate.zig");
+    _ = @import("unix2db/main.zig");
 }
diff --git a/src/unix2db/main.zig b/src/unix2db/main.zig
new file mode 100644
index 0000000..c3b98a2
--- /dev/null
+++ b/src/unix2db/main.zig
@@ -0,0 +1,10 @@
+const std = @import("std");
+const flags = @import("../flags.zig");
+
+pub fn main() !void {}
+
+const testing = std.testing;
+
+test "stub" {
+    _ = flags;
+}
diff --git a/lib/validate.zig b/src/validate.zig
similarity index 100%
rename from lib/validate.zig
rename to src/validate.zig