diff --git a/src/ComptimeInterpreter.zig b/src/ComptimeInterpreter.zig
index bfb003a..794de32 100644
--- a/src/ComptimeInterpreter.zig
+++ b/src/ComptimeInterpreter.zig
@@ -12,7 +12,7 @@ const analysis = @import("analysis.zig");
 const offsets = @import("offsets.zig");
 const DocumentStore = @import("DocumentStore.zig");
 
-pub const InternPool = @import("InternPool.zig");
+pub const InternPool = @import("analyser/InternPool.zig");
 pub const Index = InternPool.Index;
 pub const Key = InternPool.Key;
 pub const ComptimeInterpreter = @This();
diff --git a/src/InternPool.zig b/src/analyser/InternPool.zig
similarity index 100%
rename from src/InternPool.zig
rename to src/analyser/InternPool.zig
diff --git a/src/analyser/analyser.zig b/src/analyser/analyser.zig
new file mode 100644
index 0000000..94af823
--- /dev/null
+++ b/src/analyser/analyser.zig
@@ -0,0 +1,8 @@
+pub const completions = @import("completions.zig");
+pub const InternPool = @import("InternPool.zig");
+pub const encoding = @import("encoding.zig");
+
+comptime {
+    const std = @import("std");
+    std.testing.refAllDecls(@This());
+}
diff --git a/src/analyser/completions.zig b/src/analyser/completions.zig
index 1f74896..276babc 100644
--- a/src/analyser/completions.zig
+++ b/src/analyser/completions.zig
@@ -1,5 +1,5 @@
 const std = @import("std");
-const InternPool = @import("../InternPool.zig");
+const InternPool = @import("InternPool.zig");
 const types = @import("../lsp.zig");
 
 const Ast = std.zig.Ast;
diff --git a/src/encoding.zig b/src/analyser/encoding.zig
similarity index 100%
rename from src/encoding.zig
rename to src/analyser/encoding.zig
diff --git a/src/zls.zig b/src/zls.zig
index f3a5e5c..4ecd8a9 100644
--- a/src/zls.zig
+++ b/src/zls.zig
@@ -12,7 +12,7 @@ pub const types = @import("lsp.zig");
 pub const URI = @import("uri.zig");
 pub const DocumentStore = @import("DocumentStore.zig");
 pub const ComptimeInterpreter = @import("ComptimeInterpreter.zig");
-pub const InternPool = @import("InternPool.zig");
+pub const analyser = @import("analyser/analyser.zig");
 
 comptime {
     const std = @import("std");
diff --git a/tests/language_features/comptime_interpreter.zig b/tests/language_features/comptime_interpreter.zig
index bc9cfba..920b909 100644
--- a/tests/language_features/comptime_interpreter.zig
+++ b/tests/language_features/comptime_interpreter.zig
@@ -5,7 +5,7 @@ const builtin = @import("builtin");
 const Ast = std.zig.Ast;
 
 const ComptimeInterpreter = zls.ComptimeInterpreter;
-const InternPool = zls.InternPool;
+const InternPool = zls.analyser.InternPool;
 const Index = InternPool.Index;
 const Key = InternPool.Key;
 const ast = zls.ast;