diff --git a/build.zig b/build.zig
index 940639c..5b607b1 100644
--- a/build.zig
+++ b/build.zig
@@ -112,7 +112,7 @@ pub fn build(b: *std.Build) void {
     });
 
     const Buffer_mod = b.createModule(.{
-        .root_source_file = .{ .path = "src/Buffer.zig" },
+        .root_source_file = .{ .path = "src/buffer/Buffer.zig" },
         .imports = &.{
             .{ .name = "notcurses", .module = notcurses_mod },
             .{ .name = "cbor", .module = cbor_mod },
diff --git a/src/Buffer.zig b/src/buffer/Buffer.zig
similarity index 100%
rename from src/Buffer.zig
rename to src/buffer/Buffer.zig
diff --git a/src/Cursor.zig b/src/buffer/Cursor.zig
similarity index 100%
rename from src/Cursor.zig
rename to src/buffer/Cursor.zig
diff --git a/src/Selection.zig b/src/buffer/Selection.zig
similarity index 100%
rename from src/Selection.zig
rename to src/buffer/Selection.zig
diff --git a/src/View.zig b/src/buffer/View.zig
similarity index 100%
rename from src/View.zig
rename to src/buffer/View.zig
diff --git a/src/unicode.zig b/src/buffer/unicode.zig
similarity index 100%
rename from src/unicode.zig
rename to src/buffer/unicode.zig