49 files changed, 3 insertions, 3 deletions

diff --git a/build.zig b/build.zig
index a9b05c5..5b86ce5 100644
--- a/build.zig
+++ b/build.zig
@@ -20,7 +20,7 @@ pub fn build(b: *std.build.Builder) !void {
     const scan_protocols = ScanProtocolsStep.create(b);
 
     {
-        const river = b.addExecutable("river", "src/river.zig");
+        const river = b.addExecutable("river", "river/main.zig");
         river.setTarget(target);
         river.setBuildMode(mode);
         river.addBuildOption(bool, "xwayland", xwayland);
@@ -38,7 +38,7 @@ pub fn build(b: *std.build.Builder) !void {
     }
 
     {
-        const riverctl = b.addExecutable("riverctl", "src/riverctl.zig");
+        const riverctl = b.addExecutable("riverctl", "riverctl/main.zig");
         riverctl.setTarget(target);
         riverctl.setBuildMode(mode);
 
@@ -52,7 +52,7 @@ pub fn build(b: *std.build.Builder) !void {
     }
 
     {
-        const river_test = b.addTest("src/test_main.zig");
+        const river_test = b.addTest("river/test_main.zig");
         river_test.setTarget(target);
         river_test.setBuildMode(mode);
         river_test.addBuildOption(bool, "xwayland", xwayland);
diff --git a/src/Box.zig b/river/Box.zig
index 0ba3e63..0ba3e63 100644
--- a/src/Box.zig
+++ b/river/Box.zig
diff --git a/src/Config.zig b/river/Config.zig
index 20b7504..20b7504 100644
--- a/src/Config.zig
+++ b/river/Config.zig
diff --git a/src/Control.zig b/river/Control.zig
index e9ae576..e9ae576 100644
--- a/src/Control.zig
+++ b/river/Control.zig
diff --git a/src/Cursor.zig b/river/Cursor.zig
index 9eede57..9eede57 100644
--- a/src/Cursor.zig
+++ b/river/Cursor.zig
diff --git a/src/Decoration.zig b/river/Decoration.zig
index 91c5bed..91c5bed 100644
--- a/src/Decoration.zig
+++ b/river/Decoration.zig
diff --git a/src/DecorationManager.zig b/river/DecorationManager.zig
index 5a9abb4..5a9abb4 100644
--- a/src/DecorationManager.zig
+++ b/river/DecorationManager.zig
diff --git a/src/InputManager.zig b/river/InputManager.zig
index 3a95346..3a95346 100644
--- a/src/InputManager.zig
+++ b/river/InputManager.zig
diff --git a/src/Keyboard.zig b/river/Keyboard.zig
index cbfd6cd..cbfd6cd 100644
--- a/src/Keyboard.zig
+++ b/river/Keyboard.zig
diff --git a/src/LayerSurface.zig b/river/LayerSurface.zig
index 088dd97..088dd97 100644
--- a/src/LayerSurface.zig
+++ b/river/LayerSurface.zig
diff --git a/src/Mapping.zig b/river/Mapping.zig
index 61df624..61df624 100644
--- a/src/Mapping.zig
+++ b/river/Mapping.zig
diff --git a/src/Output.zig b/river/Output.zig
index a32c000..a32c000 100644
--- a/src/Output.zig
+++ b/river/Output.zig
diff --git a/src/Root.zig b/river/Root.zig
index f87d7ae..f87d7ae 100644
--- a/src/Root.zig
+++ b/river/Root.zig
diff --git a/src/Seat.zig b/river/Seat.zig
index 82979fc..82979fc 100644
--- a/src/Seat.zig
+++ b/river/Seat.zig
diff --git a/src/Server.zig b/river/Server.zig
index e46a619..e46a619 100644
--- a/src/Server.zig
+++ b/river/Server.zig
diff --git a/src/View.zig b/river/View.zig
index 8ab32cc..8ab32cc 100644
--- a/src/View.zig
+++ b/river/View.zig
diff --git a/src/VoidView.zig b/river/VoidView.zig
index 72c57a7..72c57a7 100644
--- a/src/VoidView.zig
+++ b/river/VoidView.zig
diff --git a/src/XdgPopup.zig b/river/XdgPopup.zig
index b4ee56c..b4ee56c 100644
--- a/src/XdgPopup.zig
+++ b/river/XdgPopup.zig
diff --git a/src/XdgToplevel.zig b/river/XdgToplevel.zig
index b3806db..b3806db 100644
--- a/src/XdgToplevel.zig
+++ b/river/XdgToplevel.zig
diff --git a/src/XwaylandUnmanaged.zig b/river/XwaylandUnmanaged.zig
index fe33e73..fe33e73 100644
--- a/src/XwaylandUnmanaged.zig
+++ b/river/XwaylandUnmanaged.zig
diff --git a/src/XwaylandView.zig b/river/XwaylandView.zig
index dbd35e4..dbd35e4 100644
--- a/src/XwaylandView.zig
+++ b/river/XwaylandView.zig
diff --git a/src/c.zig b/river/c.zig
index df4bcee..df4bcee 100644
--- a/src/c.zig
+++ b/river/c.zig
diff --git a/src/command.zig b/river/command.zig
index c1db559..c1db559 100644
--- a/src/command.zig
+++ b/river/command.zig
diff --git a/src/command/close.zig b/river/command/close.zig
index 04b2dcd..04b2dcd 100644
--- a/src/command/close.zig
+++ b/river/command/close.zig
diff --git a/src/command/declare_mode.zig b/river/command/declare_mode.zig
index 943ede8..943ede8 100644
--- a/src/command/declare_mode.zig
+++ b/river/command/declare_mode.zig
diff --git a/src/command/enter_mode.zig b/river/command/enter_mode.zig
index 8c7e3e4..8c7e3e4 100644
--- a/src/command/enter_mode.zig
+++ b/river/command/enter_mode.zig
diff --git a/src/command/exit.zig b/river/command/exit.zig
index a21e4f3..a21e4f3 100644
--- a/src/command/exit.zig
+++ b/river/command/exit.zig
diff --git a/src/command/focus.zig b/river/command/focus.zig
index 0e2c9e0..0e2c9e0 100644
--- a/src/command/focus.zig
+++ b/river/command/focus.zig
diff --git a/src/command/focus_all_tags.zig b/river/command/focus_all_tags.zig
index 28e001d..28e001d 100644
--- a/src/command/focus_all_tags.zig
+++ b/river/command/focus_all_tags.zig
diff --git a/src/command/focus_output.zig b/river/command/focus_output.zig
index b11664f..b11664f 100644
--- a/src/command/focus_output.zig
+++ b/river/command/focus_output.zig
diff --git a/src/command/focus_tag.zig b/river/command/focus_tag.zig
index 8f69e6e..8f69e6e 100644
--- a/src/command/focus_tag.zig
+++ b/river/command/focus_tag.zig
diff --git a/src/command/layout.zig b/river/command/layout.zig
index 4a21050..4a21050 100644
--- a/src/command/layout.zig
+++ b/river/command/layout.zig
diff --git a/src/command/map.zig b/river/command/map.zig
index 90c0b33..90c0b33 100644
--- a/src/command/map.zig
+++ b/river/command/map.zig
diff --git a/src/command/mod_master_count.zig b/river/command/mod_master_count.zig
index 38a379e..38a379e 100644
--- a/src/command/mod_master_count.zig
+++ b/river/command/mod_master_count.zig
diff --git a/src/command/mod_master_factor.zig b/river/command/mod_master_factor.zig
index ec8065a..ec8065a 100644
--- a/src/command/mod_master_factor.zig
+++ b/river/command/mod_master_factor.zig
diff --git a/src/command/send_to_output.zig b/river/command/send_to_output.zig
index de92f6f..de92f6f 100644
--- a/src/command/send_to_output.zig
+++ b/river/command/send_to_output.zig
diff --git a/src/command/spawn.zig b/river/command/spawn.zig
index 880483a..880483a 100644
--- a/src/command/spawn.zig
+++ b/river/command/spawn.zig
diff --git a/src/command/tag_view.zig b/river/command/tag_view.zig
index 735481d..735481d 100644
--- a/src/command/tag_view.zig
+++ b/river/command/tag_view.zig
diff --git a/src/command/tag_view_all_tags.zig b/river/command/tag_view_all_tags.zig
index 2d187f3..2d187f3 100644
--- a/src/command/tag_view_all_tags.zig
+++ b/river/command/tag_view_all_tags.zig
diff --git a/src/command/toggle_float.zig b/river/command/toggle_float.zig
index 25655e8..25655e8 100644
--- a/src/command/toggle_float.zig
+++ b/river/command/toggle_float.zig
diff --git a/src/command/toggle_tag_focus.zig b/river/command/toggle_tag_focus.zig
index 09761c7..09761c7 100644
--- a/src/command/toggle_tag_focus.zig
+++ b/river/command/toggle_tag_focus.zig
diff --git a/src/command/toggle_view_tag.zig b/river/command/toggle_view_tag.zig
index 469a750..469a750 100644
--- a/src/command/toggle_view_tag.zig
+++ b/river/command/toggle_view_tag.zig
diff --git a/src/command/zoom.zig b/river/command/zoom.zig
index 59156ab..59156ab 100644
--- a/src/command/zoom.zig
+++ b/river/command/zoom.zig
diff --git a/src/log.zig b/river/log.zig
index 30d2564..30d2564 100644
--- a/src/log.zig
+++ b/river/log.zig
diff --git a/src/river.zig b/river/main.zig
index a5f5334..a5f5334 100644
--- a/src/river.zig
+++ b/river/main.zig
diff --git a/src/render.zig b/river/render.zig
index a7055ef..a7055ef 100644
--- a/src/render.zig
+++ b/river/render.zig
diff --git a/src/test_main.zig b/river/test_main.zig
index 2ed8247..2ed8247 100644
--- a/src/test_main.zig
+++ b/river/test_main.zig
diff --git a/src/view_stack.zig b/river/view_stack.zig
index 0543d03..0543d03 100644
--- a/src/view_stack.zig
+++ b/river/view_stack.zig
diff --git a/src/riverctl.zig b/riverctl/main.zig
index 287c1aa..287c1aa 100644
--- a/src/riverctl.zig
+++ b/riverctl/main.zig