diff --git a/secert-hitler/src/controller/gamemaster/mod.rs b/secert-hitler/src/controller/gamemaster/mod.rs
new file mode 100644
index 0000000..955c71b
--- /dev/null
+++ b/secert-hitler/src/controller/gamemaster/mod.rs
@@ -0,0 +1 @@
+mod gamemaster;
diff --git a/secert-hitler/src/controller/mod.rs b/secert-hitler/src/controller/mod.rs
index e69de29..26b99ce 100644
--- a/secert-hitler/src/controller/mod.rs
+++ b/secert-hitler/src/controller/mod.rs
@@ -0,0 +1,2 @@
+mod gamemaster;
+mod state;
diff --git a/secert-hitler/src/controller/state/mod.rs b/secert-hitler/src/controller/state/mod.rs
new file mode 100644
index 0000000..0ba16bf
--- /dev/null
+++ b/secert-hitler/src/controller/state/mod.rs
@@ -0,0 +1,5 @@
+mod event;
+mod room;
+mod rooms;
+mod mockroom;
+mod mockrooms;
diff --git a/secert-hitler/src/main.rs b/secert-hitler/src/main.rs
index 5f819e9..e7ce932 100644
--- a/secert-hitler/src/main.rs
+++ b/secert-hitler/src/main.rs
@@ -1,10 +1,7 @@
 mod config;
-#[path = "./controller/gamemaster/gamemaster.rs"] mod gamemaster;
-#[path = "./controller/state/event.rs"] mod event;
-#[path = "./controller/state/room.rs"] mod room;
-#[path = "./controller/state/rooms.rs"] mod rooms;
-#[path = "./controller/state/mockroom.rs"] mod mockroom;
-#[path = "./controller/state/mockrooms.rs"] mod mockrooms;
+mod controller;
+mod model;
+mod view;
 
 fn main() {
     println!("{}", config::PORT);