diff --git a/src/App.zig b/src/App.zig
index cc8277c52..271ba2043 100644
--- a/src/App.zig
+++ b/src/App.zig
@@ -13,7 +13,7 @@ const Surface = @import("Surface.zig");
 const tracy = @import("tracy");
 const input = @import("input.zig");
 const Config = @import("config.zig").Config;
-const BlockingQueue = @import("./blocking_queue.zig").BlockingQueue;
+const BlockingQueue = @import("datastruct/main.zig").BlockingQueue;
 const renderer = @import("renderer.zig");
 const font = @import("font/main.zig");
 const internal_os = @import("os/main.zig");
diff --git a/src/blocking_queue.zig b/src/datastruct/blocking_queue.zig
similarity index 100%
rename from src/blocking_queue.zig
rename to src/datastruct/blocking_queue.zig
diff --git a/src/cache_table.zig b/src/datastruct/cache_table.zig
similarity index 99%
rename from src/cache_table.zig
rename to src/datastruct/cache_table.zig
index 7a1a10b2b..40d36cc24 100644
--- a/src/cache_table.zig
+++ b/src/datastruct/cache_table.zig
@@ -1,4 +1,4 @@
-const fastmem = @import("./fastmem.zig");
+const fastmem = @import("../fastmem.zig");
 
 const std = @import("std");
 const assert = std.debug.assert;
diff --git a/src/circ_buf.zig b/src/datastruct/circ_buf.zig
similarity index 99%
rename from src/circ_buf.zig
rename to src/datastruct/circ_buf.zig
index 4157fd0a4..ccee41801 100644
--- a/src/circ_buf.zig
+++ b/src/datastruct/circ_buf.zig
@@ -1,7 +1,7 @@
 const std = @import("std");
 const assert = std.debug.assert;
 const Allocator = std.mem.Allocator;
-const fastmem = @import("fastmem.zig");
+const fastmem = @import("../fastmem.zig");
 
 /// Returns a circular buffer containing type T.
 pub fn CircBuf(comptime T: type, comptime default: T) type {
diff --git a/src/lru.zig b/src/datastruct/lru.zig
similarity index 100%
rename from src/lru.zig
rename to src/datastruct/lru.zig
diff --git a/src/datastruct/main.zig b/src/datastruct/main.zig
new file mode 100644
index 000000000..70a7ce97f
--- /dev/null
+++ b/src/datastruct/main.zig
@@ -0,0 +1,17 @@
+//! The datastruct package contains data structures or anything closely
+//! related to data structures.
+
+const blocking_queue = @import("blocking_queue.zig");
+const cache_table = @import("cache_table.zig");
+const circ_buf = @import("circ_buf.zig");
+const segmented_pool = @import("segmented_pool.zig");
+
+pub const lru = @import("lru.zig");
+pub const BlockingQueue = blocking_queue.BlockingQueue;
+pub const CacheTable = cache_table.CacheTable;
+pub const CircBuf = circ_buf.CircBuf;
+pub const SegmentedPool = segmented_pool.SegmentedPool;
+
+test {
+    @import("std").testing.refAllDecls(@This());
+}
diff --git a/src/segmented_pool.zig b/src/datastruct/segmented_pool.zig
similarity index 100%
rename from src/segmented_pool.zig
rename to src/datastruct/segmented_pool.zig
diff --git a/src/font/shaper/Cache.zig b/src/font/shaper/Cache.zig
index 2a1424118..672845bfd 100644
--- a/src/font/shaper/Cache.zig
+++ b/src/font/shaper/Cache.zig
@@ -14,7 +14,7 @@ const std = @import("std");
 const assert = std.debug.assert;
 const Allocator = std.mem.Allocator;
 const font = @import("../main.zig");
-const CacheTable = @import("../../cache_table.zig").CacheTable;
+const CacheTable = @import("../../datastruct/main.zig").CacheTable;
 
 const log = std.log.scoped(.font_shaper_cache);
 
diff --git a/src/inspector/key.zig b/src/inspector/key.zig
index 9e1d6eacb..e28bd5d4a 100644
--- a/src/inspector/key.zig
+++ b/src/inspector/key.zig
@@ -1,7 +1,7 @@
 const std = @import("std");
 const Allocator = std.mem.Allocator;
 const input = @import("../input.zig");
-const CircBuf = @import("../circ_buf.zig").CircBuf;
+const CircBuf = @import("../datastruct/main.zig").CircBuf;
 const cimgui = @import("cimgui");
 
 /// Circular buffer of key events.
diff --git a/src/inspector/termio.zig b/src/inspector/termio.zig
index bae07bcfe..78b35e19b 100644
--- a/src/inspector/termio.zig
+++ b/src/inspector/termio.zig
@@ -2,7 +2,7 @@ const std = @import("std");
 const Allocator = std.mem.Allocator;
 const cimgui = @import("cimgui");
 const terminal = @import("../terminal/main.zig");
-const CircBuf = @import("../circ_buf.zig").CircBuf;
+const CircBuf = @import("../datastruct/main.zig").CircBuf;
 const Surface = @import("../Surface.zig");
 
 /// The stream handler for our inspector.
diff --git a/src/main_ghostty.zig b/src/main_ghostty.zig
index a435d8772..071d4d530 100644
--- a/src/main_ghostty.zig
+++ b/src/main_ghostty.zig
@@ -168,7 +168,6 @@ pub const std_options: std.Options = .{
 };
 
 test {
-    _ = @import("circ_buf.zig");
     _ = @import("pty.zig");
     _ = @import("Command.zig");
     _ = @import("font/main.zig");
@@ -180,17 +179,11 @@ test {
     _ = @import("surface_mouse.zig");
 
     // Libraries
-    _ = @import("segmented_pool.zig");
     _ = @import("crash/main.zig");
+    _ = @import("datastruct/main.zig");
     _ = @import("inspector/main.zig");
     _ = @import("terminal/main.zig");
     _ = @import("terminfo/main.zig");
     _ = @import("simd/main.zig");
     _ = @import("unicode/main.zig");
-
-    // TODO
-    _ = @import("blocking_queue.zig");
-    _ = @import("cache_table.zig");
-    _ = @import("config.zig");
-    _ = @import("lru.zig");
 }
diff --git a/src/os/cf_release_thread.zig b/src/os/cf_release_thread.zig
index 32069163b..5001441e0 100644
--- a/src/os/cf_release_thread.zig
+++ b/src/os/cf_release_thread.zig
@@ -9,7 +9,7 @@ const builtin = @import("builtin");
 const xev = @import("xev");
 const macos = @import("macos");
 
-const BlockingQueue = @import("../blocking_queue.zig").BlockingQueue;
+const BlockingQueue = @import("../datastruct/main.zig").BlockingQueue;
 
 const Allocator = std.mem.Allocator;
 const log = std.log.scoped(.cf_release_thread);
diff --git a/src/renderer/Thread.zig b/src/renderer/Thread.zig
index 35679e994..94a1280d9 100644
--- a/src/renderer/Thread.zig
+++ b/src/renderer/Thread.zig
@@ -9,7 +9,7 @@ const crash = @import("../crash/main.zig");
 const renderer = @import("../renderer.zig");
 const apprt = @import("../apprt.zig");
 const configpkg = @import("../config.zig");
-const BlockingQueue = @import("../blocking_queue.zig").BlockingQueue;
+const BlockingQueue = @import("../datastruct/main.zig").BlockingQueue;
 const App = @import("../App.zig");
 
 const Allocator = std.mem.Allocator;
diff --git a/src/termio/Exec.zig b/src/termio/Exec.zig
index 5018ced33..3bf288cb7 100644
--- a/src/termio/Exec.zig
+++ b/src/termio/Exec.zig
@@ -20,7 +20,7 @@ const shell_integration = @import("shell_integration.zig");
 const terminal = @import("../terminal/main.zig");
 const termio = @import("../termio.zig");
 const Command = @import("../Command.zig");
-const SegmentedPool = @import("../segmented_pool.zig").SegmentedPool;
+const SegmentedPool = @import("../datastruct/main.zig").SegmentedPool;
 const ptypkg = @import("../pty.zig");
 const Pty = ptypkg.Pty;
 const EnvMap = std.process.EnvMap;
diff --git a/src/termio/Termio.zig b/src/termio/Termio.zig
index f28eb118e..f2cdfc770 100644
--- a/src/termio/Termio.zig
+++ b/src/termio/Termio.zig
@@ -15,7 +15,6 @@ const posix = std.posix;
 const termio = @import("../termio.zig");
 const Command = @import("../Command.zig");
 const Pty = @import("../pty.zig").Pty;
-const SegmentedPool = @import("../segmented_pool.zig").SegmentedPool;
 const StreamHandler = @import("stream_handler.zig").StreamHandler;
 const terminal = @import("../terminal/main.zig");
 const terminfo = @import("../terminfo/main.zig");
diff --git a/src/termio/Thread.zig b/src/termio/Thread.zig
index 0f9cd782e..3d316e399 100644
--- a/src/termio/Thread.zig
+++ b/src/termio/Thread.zig
@@ -17,7 +17,7 @@ const builtin = @import("builtin");
 const xev = @import("xev");
 const crash = @import("../crash/main.zig");
 const termio = @import("../termio.zig");
-const BlockingQueue = @import("../blocking_queue.zig").BlockingQueue;
+const BlockingQueue = @import("../datastruct/main.zig").BlockingQueue;
 
 const Allocator = std.mem.Allocator;
 const log = std.log.scoped(.io_thread);
diff --git a/src/termio/backend.zig b/src/termio/backend.zig
index 0080e7628..68b283a00 100644
--- a/src/termio/backend.zig
+++ b/src/termio/backend.zig
@@ -12,7 +12,6 @@ const shell_integration = @import("shell_integration.zig");
 const terminal = @import("../terminal/main.zig");
 const termio = @import("../termio.zig");
 const Command = @import("../Command.zig");
-const SegmentedPool = @import("../segmented_pool.zig").SegmentedPool;
 const Pty = @import("../pty.zig").Pty;
 
 // The preallocation size for the write request pool. This should be big
diff --git a/src/termio/mailbox.zig b/src/termio/mailbox.zig
index 85471009d..cac453a1c 100644
--- a/src/termio/mailbox.zig
+++ b/src/termio/mailbox.zig
@@ -5,7 +5,7 @@ const Allocator = std.mem.Allocator;
 const xev = @import("xev");
 const renderer = @import("../renderer.zig");
 const termio = @import("../termio.zig");
-const BlockingQueue = @import("../blocking_queue.zig").BlockingQueue;
+const BlockingQueue = @import("../datastruct/main.zig").BlockingQueue;
 
 const log = std.log.scoped(.io_writer);