diff --git a/spec/expansion_spec.cr b/spec/expansion_spec.cr
index e323584..81c82ff 100644
--- a/spec/expansion_spec.cr
+++ b/spec/expansion_spec.cr
@@ -1,6 +1,6 @@
 require "./spec_helper"
-require "./../src/map"
-require "./../src/queue"
+require "./../src/game/map"
+require "./../src/game/queue"
 
 describe Point do
   p1 = Point.new(0, 0)
diff --git a/spec/queue_spec.cr b/spec/queue_spec.cr
index cae01c6..55519cc 100644
--- a/spec/queue_spec.cr
+++ b/spec/queue_spec.cr
@@ -1,6 +1,6 @@
 require "./spec_helper"
-require "./../src/queue"
-require "./../src/command"
+require "./../src/game/queue"
+require "./../src/game/command"
 
 macro define_dummy_classes(count)
   {% for i in (1...count) %}
diff --git a/spec/world_spec.cr b/spec/world_spec.cr
index b3253dc..8dc7c77 100644
--- a/spec/world_spec.cr
+++ b/spec/world_spec.cr
@@ -1,5 +1,5 @@
 require "./spec_helper"
-require "../src/world"
+require "../src/game/world"
 
 describe "World" do
   it "should build crystal harvester" do
diff --git a/src/expansion.cr b/src/expansion.cr
index 183866b..e9001cd 100644
--- a/src/expansion.cr
+++ b/src/expansion.cr
@@ -1,9 +1,8 @@
-require "colorize"
-require "./command"
-require "./map"
-require "./queue"
-require "./resources"
-require "./world"
+require "./game/command"
+require "./game/map"
+require "./game/queue"
+require "./game/resources"
+require "./game/world"
 
 UserWorld = World.new
 
diff --git a/src/command.cr b/src/game/command.cr
similarity index 100%
rename from src/command.cr
rename to src/game/command.cr
diff --git a/src/exception.cr b/src/game/exception.cr
similarity index 100%
rename from src/exception.cr
rename to src/game/exception.cr
diff --git a/src/map.cr b/src/game/map.cr
similarity index 100%
rename from src/map.cr
rename to src/game/map.cr
diff --git a/src/queue.cr b/src/game/queue.cr
similarity index 100%
rename from src/queue.cr
rename to src/game/queue.cr
diff --git a/src/resources.cr b/src/game/resources.cr
similarity index 100%
rename from src/resources.cr
rename to src/game/resources.cr
diff --git a/src/tile.cr b/src/game/tile.cr
similarity index 100%
rename from src/tile.cr
rename to src/game/tile.cr
diff --git a/src/world.cr b/src/game/world.cr
similarity index 100%
rename from src/world.cr
rename to src/game/world.cr