diff --git a/secert-hitler/src/controller/mod.rs b/secert-hitler/src/controller/mod.rs
index 26b99ce..955c71b 100644
--- a/secert-hitler/src/controller/mod.rs
+++ b/secert-hitler/src/controller/mod.rs
@@ -1,2 +1 @@
 mod gamemaster;
-mod state;
diff --git a/secert-hitler/src/model/mod.rs b/secert-hitler/src/model/mod.rs
index e69de29..ceecf47 100644
--- a/secert-hitler/src/model/mod.rs
+++ b/secert-hitler/src/model/mod.rs
@@ -0,0 +1 @@
+mod state;
diff --git a/secert-hitler/src/controller/state/event.rs b/secert-hitler/src/model/state/event.rs
similarity index 100%
rename from secert-hitler/src/controller/state/event.rs
rename to secert-hitler/src/model/state/event.rs
diff --git a/secert-hitler/src/controller/state/mockroom.rs b/secert-hitler/src/model/state/mockroom.rs
similarity index 100%
rename from secert-hitler/src/controller/state/mockroom.rs
rename to secert-hitler/src/model/state/mockroom.rs
diff --git a/secert-hitler/src/controller/state/mockrooms.rs b/secert-hitler/src/model/state/mockrooms.rs
similarity index 100%
rename from secert-hitler/src/controller/state/mockrooms.rs
rename to secert-hitler/src/model/state/mockrooms.rs
diff --git a/secert-hitler/src/controller/state/mod.rs b/secert-hitler/src/model/state/mod.rs
similarity index 100%
rename from secert-hitler/src/controller/state/mod.rs
rename to secert-hitler/src/model/state/mod.rs
diff --git a/secert-hitler/src/controller/state/room.rs b/secert-hitler/src/model/state/room.rs
similarity index 100%
rename from secert-hitler/src/controller/state/room.rs
rename to secert-hitler/src/model/state/room.rs
diff --git a/secert-hitler/src/controller/state/rooms.rs b/secert-hitler/src/model/state/rooms.rs
similarity index 100%
rename from secert-hitler/src/controller/state/rooms.rs
rename to secert-hitler/src/model/state/rooms.rs