diff --git a/src/boundaries.rs b/src/client/boundaries.rs
similarity index 100%
rename from src/boundaries.rs
rename to src/client/boundaries.rs
diff --git a/src/layout.rs b/src/client/layout.rs
similarity index 100%
rename from src/layout.rs
rename to src/client/layout.rs
diff --git a/src/client/mod.rs b/src/client/mod.rs
new file mode 100644
index 00000000..619ba375
--- /dev/null
+++ b/src/client/mod.rs
@@ -0,0 +1,9 @@
+pub mod boundaries;
+pub mod layout;
+pub mod tab;
+pub mod panes;
+
+
+pub fn start_client() {
+
+}
\ No newline at end of file
diff --git a/src/panes/grid.rs b/src/client/panes/grid.rs
similarity index 100%
rename from src/panes/grid.rs
rename to src/client/panes/grid.rs
diff --git a/src/panes/mod.rs b/src/client/panes/mod.rs
similarity index 100%
rename from src/panes/mod.rs
rename to src/client/panes/mod.rs
diff --git a/src/panes/plugin_pane.rs b/src/client/panes/plugin_pane.rs
similarity index 100%
rename from src/panes/plugin_pane.rs
rename to src/client/panes/plugin_pane.rs
diff --git a/src/panes/terminal_character.rs b/src/client/panes/terminal_character.rs
similarity index 100%
rename from src/panes/terminal_character.rs
rename to src/client/panes/terminal_character.rs
diff --git a/src/panes/terminal_pane.rs b/src/client/panes/terminal_pane.rs
similarity index 100%
rename from src/panes/terminal_pane.rs
rename to src/client/panes/terminal_pane.rs
diff --git a/src/tab.rs b/src/client/tab.rs
similarity index 100%
rename from src/tab.rs
rename to src/client/tab.rs
diff --git a/src/command_is_executing.rs b/src/common/command_is_executing.rs
similarity index 100%
rename from src/command_is_executing.rs
rename to src/common/command_is_executing.rs
diff --git a/src/errors.rs b/src/common/errors.rs
similarity index 100%
rename from src/errors.rs
rename to src/common/errors.rs
diff --git a/src/input.rs b/src/common/input.rs
similarity index 100%
rename from src/input.rs
rename to src/common/input.rs
diff --git a/src/ipc.rs b/src/common/ipc.rs
similarity index 100%
rename from src/ipc.rs
rename to src/common/ipc.rs
diff --git a/src/common/mod.rs b/src/common/mod.rs
new file mode 100644
index 00000000..7daeb94f
--- /dev/null
+++ b/src/common/mod.rs
@@ -0,0 +1,8 @@
+pub mod input;
+pub mod os_input_output;
+pub mod pty_bus;
+pub mod screen;
+pub mod ipc;
+pub mod wasm_vm;
+pub mod command_is_executing;
+pub mod errors;
\ No newline at end of file
diff --git a/src/os_input_output.rs b/src/common/os_input_output.rs
similarity index 100%
rename from src/os_input_output.rs
rename to src/common/os_input_output.rs
diff --git a/src/pty_bus.rs b/src/common/pty_bus.rs
similarity index 100%
rename from src/pty_bus.rs
rename to src/common/pty_bus.rs
diff --git a/src/screen.rs b/src/common/screen.rs
similarity index 100%
rename from src/screen.rs
rename to src/common/screen.rs
diff --git a/src/wasm_vm.rs b/src/common/wasm_vm.rs
similarity index 100%
rename from src/wasm_vm.rs
rename to src/common/wasm_vm.rs
diff --git a/src/main.rs b/src/main.rs
index 3757dfc4..338da041 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,21 +1,15 @@
 #[cfg(test)]
 mod tests;
 
-mod boundaries;
 mod cli;
-mod command_is_executing;
-mod errors;
-mod input;
-mod ipc;
-mod layout;
-mod os_input_output;
-mod panes;
-mod pty_bus;
-mod screen;
-mod tab;
 mod utils;
+mod common;
+// TODO mod server;
+mod client;
+
+use common::{input, pty_bus, os_input_output, screen, ipc, wasm_vm, command_is_executing, errors};
+use client::{tab, layout, boundaries, panes};
 
-mod wasm_vm;
 
 use std::io::Write;
 use std::os::unix::net::UnixStream;
diff --git a/src/server/mod.rs b/src/server/mod.rs
new file mode 100644
index 00000000..626b4e6b
--- /dev/null
+++ b/src/server/mod.rs
@@ -0,0 +1,5 @@
+use super::super::common::{screen};
+
+pub fn start_server() {
+  // TODO
+}
\ No newline at end of file