diff --git a/src/terminal.zig b/src/terminal.zig
index c1061f9..5814ae0 100644
--- a/src/terminal.zig
+++ b/src/terminal.zig
@@ -1,20 +1,11 @@
 const std = @import("std");
-pub const Key = @import("terminal/key.zig");
+pub const Key = @import("terminal/Key.zig");
+pub const Size = @import("terminal/Size.zig");
+pub const Position = @import("terminal/Position.zig");
 pub const code_point = @import("code_point");
 
 const log = std.log.scoped(.terminal);
 
-pub const Size = struct {
-    anchor: Position = .{ .col = 1, .row = 1 }, // top left corner by default
-    cols: u16,
-    rows: u16,
-};
-
-pub const Position = struct {
-    col: u16,
-    row: u16,
-};
-
 // Ref: https://vt100.net/docs/vt510-rm/DECRPM.html
 pub const ReportMode = enum {
     not_recognized,
diff --git a/src/terminal/key.zig b/src/terminal/Key.zig
similarity index 100%
rename from src/terminal/key.zig
rename to src/terminal/Key.zig
diff --git a/src/terminal/Position.zig b/src/terminal/Position.zig
new file mode 100644
index 0000000..4a0f7b0
--- /dev/null
+++ b/src/terminal/Position.zig
@@ -0,0 +1,2 @@
+col: u16,
+row: u16,
diff --git a/src/terminal/Size.zig b/src/terminal/Size.zig
new file mode 100644
index 0000000..c492048
--- /dev/null
+++ b/src/terminal/Size.zig
@@ -0,0 +1,5 @@
+const Position = @import("Position.zig");
+
+anchor: Position = .{ .col = 1, .row = 1 }, // top left corner by default
+cols: u16,
+rows: u16,