diff --git a/src/main/java/se/urmo/game/entities/ghost/Ghost.java b/src/main/java/se/urmo/game/entities/ghost/Ghost.java
index 3acce12..7303a88 100644
--- a/src/main/java/se/urmo/game/entities/ghost/Ghost.java
+++ b/src/main/java/se/urmo/game/entities/ghost/Ghost.java
@@ -5,6 +5,13 @@ import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 import se.urmo.game.collision.GhostCollisionChecker;
 import se.urmo.game.entities.BaseAnimated;
+import se.urmo.game.entities.ghost.mode.ChaseGhostMode;
+import se.urmo.game.entities.ghost.mode.EatenGhostMode;
+import se.urmo.game.entities.ghost.mode.FrightenedGhostMode;
+import se.urmo.game.entities.ghost.mode.FrozenGhostMode;
+import se.urmo.game.entities.ghost.mode.GhostMode;
+import se.urmo.game.entities.ghost.mode.GhostState;
+import se.urmo.game.entities.ghost.mode.ScatterGhostMode;
 import se.urmo.game.entities.ghost.strategy.GhostStrategy;
 import se.urmo.game.entities.pacman.PacMan;
 import se.urmo.game.graphics.SpriteLocation;
diff --git a/src/main/java/se/urmo/game/entities/ghost/AbstractGhostModeImpl.java b/src/main/java/se/urmo/game/entities/ghost/mode/AbstractGhostModeImpl.java
similarity index 98%
rename from src/main/java/se/urmo/game/entities/ghost/AbstractGhostModeImpl.java
rename to src/main/java/se/urmo/game/entities/ghost/mode/AbstractGhostModeImpl.java
index 7ccaeec..4635c5d 100644
--- a/src/main/java/se/urmo/game/entities/ghost/AbstractGhostModeImpl.java
+++ b/src/main/java/se/urmo/game/entities/ghost/mode/AbstractGhostModeImpl.java
@@ -1,6 +1,7 @@
-package se.urmo.game.entities.ghost;
+package se.urmo.game.entities.ghost.mode;
 
 import lombok.extern.slf4j.Slf4j;
+import se.urmo.game.entities.ghost.Ghost;
 import se.urmo.game.entities.ghost.strategy.GhostStrategy;
 import se.urmo.game.entities.pacman.PacMan;
 import se.urmo.game.graphics.SpriteLocation;
diff --git a/src/main/java/se/urmo/game/entities/ghost/ChaseGhostMode.java b/src/main/java/se/urmo/game/entities/ghost/mode/ChaseGhostMode.java
similarity index 90%
rename from src/main/java/se/urmo/game/entities/ghost/ChaseGhostMode.java
rename to src/main/java/se/urmo/game/entities/ghost/mode/ChaseGhostMode.java
index 2f74281..77b4a23 100644
--- a/src/main/java/se/urmo/game/entities/ghost/ChaseGhostMode.java
+++ b/src/main/java/se/urmo/game/entities/ghost/mode/ChaseGhostMode.java
@@ -1,6 +1,7 @@
-package se.urmo.game.entities.ghost;
+package se.urmo.game.entities.ghost.mode;
 
 import lombok.extern.slf4j.Slf4j;
+import se.urmo.game.entities.ghost.Ghost;
 import se.urmo.game.entities.ghost.strategy.GhostStrategy;
 import se.urmo.game.entities.pacman.PacMan;
 import se.urmo.game.map.GameMap;
diff --git a/src/main/java/se/urmo/game/entities/ghost/EatenGhostMode.java b/src/main/java/se/urmo/game/entities/ghost/mode/EatenGhostMode.java
similarity index 94%
rename from src/main/java/se/urmo/game/entities/ghost/EatenGhostMode.java
rename to src/main/java/se/urmo/game/entities/ghost/mode/EatenGhostMode.java
index 362e5f0..33a47a0 100644
--- a/src/main/java/se/urmo/game/entities/ghost/EatenGhostMode.java
+++ b/src/main/java/se/urmo/game/entities/ghost/mode/EatenGhostMode.java
@@ -1,6 +1,7 @@
-package se.urmo.game.entities.ghost;
+package se.urmo.game.entities.ghost.mode;
 
 import lombok.extern.slf4j.Slf4j;
+import se.urmo.game.entities.ghost.Ghost;
 import se.urmo.game.entities.ghost.strategy.EatenStrategy;
 import se.urmo.game.entities.pacman.PacMan;
 import se.urmo.game.graphics.SpriteLocation;
diff --git a/src/main/java/se/urmo/game/entities/ghost/FrightenedGhostMode.java b/src/main/java/se/urmo/game/entities/ghost/mode/FrightenedGhostMode.java
similarity index 96%
rename from src/main/java/se/urmo/game/entities/ghost/FrightenedGhostMode.java
rename to src/main/java/se/urmo/game/entities/ghost/mode/FrightenedGhostMode.java
index 1c9d5b1..e79989a 100644
--- a/src/main/java/se/urmo/game/entities/ghost/FrightenedGhostMode.java
+++ b/src/main/java/se/urmo/game/entities/ghost/mode/FrightenedGhostMode.java
@@ -1,6 +1,7 @@
-package se.urmo.game.entities.ghost;
+package se.urmo.game.entities.ghost.mode;
 
 import lombok.extern.slf4j.Slf4j;
+import se.urmo.game.entities.ghost.Ghost;
 import se.urmo.game.entities.ghost.strategy.FearStrategy;
 import se.urmo.game.entities.pacman.PacMan;
 import se.urmo.game.graphics.SpriteLocation;
diff --git a/src/main/java/se/urmo/game/entities/ghost/FrozenGhostMode.java b/src/main/java/se/urmo/game/entities/ghost/mode/FrozenGhostMode.java
similarity index 86%
rename from src/main/java/se/urmo/game/entities/ghost/FrozenGhostMode.java
rename to src/main/java/se/urmo/game/entities/ghost/mode/FrozenGhostMode.java
index 8fe9a66..20cd3fc 100644
--- a/src/main/java/se/urmo/game/entities/ghost/FrozenGhostMode.java
+++ b/src/main/java/se/urmo/game/entities/ghost/mode/FrozenGhostMode.java
@@ -1,6 +1,7 @@
-package se.urmo.game.entities.ghost;
+package se.urmo.game.entities.ghost.mode;
 
 import lombok.extern.slf4j.Slf4j;
+import se.urmo.game.entities.ghost.Ghost;
 import se.urmo.game.entities.pacman.PacMan;
 import se.urmo.game.map.GameMap;
 
diff --git a/src/main/java/se/urmo/game/entities/ghost/GhostMode.java b/src/main/java/se/urmo/game/entities/ghost/mode/GhostMode.java
similarity index 67%
rename from src/main/java/se/urmo/game/entities/ghost/GhostMode.java
rename to src/main/java/se/urmo/game/entities/ghost/mode/GhostMode.java
index 8703f33..0e9892f 100644
--- a/src/main/java/se/urmo/game/entities/ghost/GhostMode.java
+++ b/src/main/java/se/urmo/game/entities/ghost/mode/GhostMode.java
@@ -1,4 +1,4 @@
-package se.urmo.game.entities.ghost;
+package se.urmo.game.entities.ghost.mode;
 
 public enum GhostMode {
     CHASE,
diff --git a/src/main/java/se/urmo/game/entities/ghost/GhostState.java b/src/main/java/se/urmo/game/entities/ghost/mode/GhostState.java
similarity index 82%
rename from src/main/java/se/urmo/game/entities/ghost/GhostState.java
rename to src/main/java/se/urmo/game/entities/ghost/mode/GhostState.java
index 762c723..13cd1b3 100644
--- a/src/main/java/se/urmo/game/entities/ghost/GhostState.java
+++ b/src/main/java/se/urmo/game/entities/ghost/mode/GhostState.java
@@ -1,5 +1,6 @@
-package se.urmo.game.entities.ghost;
+package se.urmo.game.entities.ghost.mode;
 
+import se.urmo.game.entities.ghost.Ghost;
 import se.urmo.game.entities.pacman.PacMan;
 import se.urmo.game.map.GameMap;
 import se.urmo.game.util.Direction;
diff --git a/src/main/java/se/urmo/game/entities/ghost/ScatterGhostMode.java b/src/main/java/se/urmo/game/entities/ghost/mode/ScatterGhostMode.java
similarity index 94%
rename from src/main/java/se/urmo/game/entities/ghost/ScatterGhostMode.java
rename to src/main/java/se/urmo/game/entities/ghost/mode/ScatterGhostMode.java
index b238e6d..394597a 100644
--- a/src/main/java/se/urmo/game/entities/ghost/ScatterGhostMode.java
+++ b/src/main/java/se/urmo/game/entities/ghost/mode/ScatterGhostMode.java
@@ -1,6 +1,7 @@
-package se.urmo.game.entities.ghost;
+package se.urmo.game.entities.ghost.mode;
 
 import lombok.extern.slf4j.Slf4j;
+import se.urmo.game.entities.ghost.Ghost;
 import se.urmo.game.entities.ghost.strategy.GhostStrategy;
 import se.urmo.game.entities.pacman.PacMan;
 import se.urmo.game.map.GameMap;
diff --git a/src/main/java/se/urmo/game/main/GhostManager.java b/src/main/java/se/urmo/game/main/GhostManager.java
index c9f9cc0..6356ebc 100644
--- a/src/main/java/se/urmo/game/main/GhostManager.java
+++ b/src/main/java/se/urmo/game/main/GhostManager.java
@@ -4,7 +4,7 @@ import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import se.urmo.game.collision.GhostCollisionChecker;
 import se.urmo.game.entities.ghost.Ghost;
-import se.urmo.game.entities.ghost.GhostMode;
+import se.urmo.game.entities.ghost.mode.GhostMode;
 import se.urmo.game.entities.ghost.strategy.BlinkyStrategy;
 import se.urmo.game.entities.ghost.strategy.ScatterToTopRight;
 import se.urmo.game.entities.pacman.PacMan;
diff --git a/src/main/java/se/urmo/game/state/PlayingState.java b/src/main/java/se/urmo/game/state/PlayingState.java
index b4c0a38..ee5a665 100644
--- a/src/main/java/se/urmo/game/state/PlayingState.java
+++ b/src/main/java/se/urmo/game/state/PlayingState.java
@@ -5,7 +5,7 @@ import lombok.extern.slf4j.Slf4j;
 import se.urmo.game.collision.CollisionChecker;
 import se.urmo.game.collision.GhostCollisionChecker;
 import se.urmo.game.entities.ghost.Ghost;
-import se.urmo.game.entities.ghost.GhostMode;
+import se.urmo.game.entities.ghost.mode.GhostMode;
 import se.urmo.game.entities.pacman.PacMan;
 import se.urmo.game.main.AnimationManager;
 import se.urmo.game.main.FruitManager;