diff --git a/src/main/java/se/urmo/game/entities/collectibles/Fruit.java b/src/main/java/se/urmo/game/entities/collectibles/Fruit.java
index bbbbdf4..48cfbc8 100644
--- a/src/main/java/se/urmo/game/entities/collectibles/Fruit.java
+++ b/src/main/java/se/urmo/game/entities/collectibles/Fruit.java
@@ -4,7 +4,7 @@ import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import se.urmo.game.entities.pacman.PacMan;
 import se.urmo.game.map.GameMap;
-import se.urmo.game.state.FruitType;
+import se.urmo.game.util.FruitType;
 
 import java.awt.Graphics;
 import java.awt.Point;
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 ea41c0d..8e64253 100644
--- a/src/main/java/se/urmo/game/entities/ghost/Ghost.java
+++ b/src/main/java/se/urmo/game/entities/ghost/Ghost.java
@@ -10,9 +10,9 @@ import se.urmo.game.entities.pacman.PacMan;
 import se.urmo.game.graphics.SpriteLocation;
 import se.urmo.game.graphics.SpriteSheetManager;
 import se.urmo.game.main.Game;
+import se.urmo.game.main.GhostManager;
+import se.urmo.game.main.LevelManager;
 import se.urmo.game.map.GameMap;
-import se.urmo.game.state.GhostManager;
-import se.urmo.game.state.LevelManager;
 import se.urmo.game.util.Direction;
 import se.urmo.game.util.MyPoint;
 
diff --git a/src/main/java/se/urmo/game/entities/pacman/PacMan.java b/src/main/java/se/urmo/game/entities/pacman/PacMan.java
index 6b30e86..2c1e3ca 100644
--- a/src/main/java/se/urmo/game/entities/pacman/PacMan.java
+++ b/src/main/java/se/urmo/game/entities/pacman/PacMan.java
@@ -7,8 +7,8 @@ import se.urmo.game.collision.CollisionChecker;
 import se.urmo.game.entities.BaseAnimated;
 import se.urmo.game.graphics.SpriteLocation;
 import se.urmo.game.graphics.SpriteSheetManager;
+import se.urmo.game.main.LevelManager;
 import se.urmo.game.map.GameMap;
-import se.urmo.game.state.LevelManager;
 import se.urmo.game.util.Direction;
 import se.urmo.game.util.LoadSave;
 import se.urmo.game.util.MyPoint;
diff --git a/src/main/java/se/urmo/game/input/KeyHandler.java b/src/main/java/se/urmo/game/input/KeyHandler.java
index 3e7c4b8..98ebc7e 100644
--- a/src/main/java/se/urmo/game/input/KeyHandler.java
+++ b/src/main/java/se/urmo/game/input/KeyHandler.java
@@ -1,6 +1,6 @@
 package se.urmo.game.input;
 
-import se.urmo.game.state.GameStateManager;
+import se.urmo.game.main.GameStateManager;
 
 import java.awt.event.KeyEvent;
 import java.awt.event.KeyListener;
diff --git a/src/main/java/se/urmo/game/state/AnimationManager.java b/src/main/java/se/urmo/game/main/AnimationManager.java
similarity index 94%
rename from src/main/java/se/urmo/game/state/AnimationManager.java
rename to src/main/java/se/urmo/game/main/AnimationManager.java
index 0e4b744..f65b3d1 100644
--- a/src/main/java/se/urmo/game/state/AnimationManager.java
+++ b/src/main/java/se/urmo/game/main/AnimationManager.java
@@ -1,4 +1,4 @@
-package se.urmo.game.state;
+package se.urmo.game.main;
 
 import se.urmo.game.entities.Animated;
 
diff --git a/src/main/java/se/urmo/game/state/FruitManager.java b/src/main/java/se/urmo/game/main/FruitManager.java
similarity index 92%
rename from src/main/java/se/urmo/game/state/FruitManager.java
rename to src/main/java/se/urmo/game/main/FruitManager.java
index e376ccb..6dd86b5 100644
--- a/src/main/java/se/urmo/game/state/FruitManager.java
+++ b/src/main/java/se/urmo/game/main/FruitManager.java
@@ -1,8 +1,10 @@
-package se.urmo.game.state;
+package se.urmo.game.main;
 
 import lombok.extern.slf4j.Slf4j;
 import se.urmo.game.entities.collectibles.Fruit;
 import se.urmo.game.entities.pacman.PacMan;
+import se.urmo.game.state.PlayingState;
+import se.urmo.game.util.FruitType;
 
 import java.awt.Graphics;
 
diff --git a/src/main/java/se/urmo/game/main/Game.java b/src/main/java/se/urmo/game/main/Game.java
index 08002b8..3717e41 100644
--- a/src/main/java/se/urmo/game/main/Game.java
+++ b/src/main/java/se/urmo/game/main/Game.java
@@ -2,7 +2,6 @@ package se.urmo.game.main;
 
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
-import se.urmo.game.state.GameStateManager;
 
 import javax.swing.JFrame;
 
diff --git a/src/main/java/se/urmo/game/main/GamePanel.java b/src/main/java/se/urmo/game/main/GamePanel.java
index e79cf0a..017c748 100644
--- a/src/main/java/se/urmo/game/main/GamePanel.java
+++ b/src/main/java/se/urmo/game/main/GamePanel.java
@@ -1,10 +1,12 @@
 package se.urmo.game.main;
 
 import se.urmo.game.input.KeyHandler;
-import se.urmo.game.state.GameStateManager;
 
-import javax.swing.*;
-import java.awt.*;
+import javax.swing.JPanel;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
 
 public class GamePanel extends JPanel {
     public static final int ORIGINAL_TILE_SIZE = 8;
diff --git a/src/main/java/se/urmo/game/state/GameStateManager.java b/src/main/java/se/urmo/game/main/GameStateManager.java
similarity index 81%
rename from src/main/java/se/urmo/game/state/GameStateManager.java
rename to src/main/java/se/urmo/game/main/GameStateManager.java
index 4a2e95e..b5e1575 100644
--- a/src/main/java/se/urmo/game/state/GameStateManager.java
+++ b/src/main/java/se/urmo/game/main/GameStateManager.java
@@ -1,6 +1,10 @@
-package se.urmo.game.state;
+package se.urmo.game.main;
 
 import lombok.Getter;
+import se.urmo.game.state.GameOverState;
+import se.urmo.game.state.GameState;
+import se.urmo.game.state.PlayingState;
+import se.urmo.game.util.GameStateType;
 
 import java.awt.Graphics2D;
 import java.util.HashMap;
diff --git a/src/main/java/se/urmo/game/state/GhostManager.java b/src/main/java/se/urmo/game/main/GhostManager.java
similarity index 98%
rename from src/main/java/se/urmo/game/state/GhostManager.java
rename to src/main/java/se/urmo/game/main/GhostManager.java
index 2ed9131..098804c 100644
--- a/src/main/java/se/urmo/game/state/GhostManager.java
+++ b/src/main/java/se/urmo/game/main/GhostManager.java
@@ -1,20 +1,19 @@
-package se.urmo.game.state;
+package se.urmo.game.main;
 
 import lombok.Getter;
-import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 import se.urmo.game.collision.GhostCollisionChecker;
-import se.urmo.game.entities.ghost.strategy.BlinkyStrategy;
-import se.urmo.game.entities.ghost.strategy.ClydeStrategy;
 import se.urmo.game.entities.ghost.Ghost;
 import se.urmo.game.entities.ghost.GhostMode;
+import se.urmo.game.entities.ghost.strategy.BlinkyStrategy;
+import se.urmo.game.entities.ghost.strategy.ClydeStrategy;
 import se.urmo.game.entities.ghost.strategy.InkyStrategy;
-import se.urmo.game.entities.pacman.PacMan;
 import se.urmo.game.entities.ghost.strategy.PinkyStrategy;
 import se.urmo.game.entities.ghost.strategy.ScatterToBottomLeft;
 import se.urmo.game.entities.ghost.strategy.ScatterToBottomRight;
 import se.urmo.game.entities.ghost.strategy.ScatterToTopLeft;
 import se.urmo.game.entities.ghost.strategy.ScatterToTopRight;
+import se.urmo.game.entities.pacman.PacMan;
 import se.urmo.game.map.GameMap;
 
 import java.awt.Graphics2D;
diff --git a/src/main/java/se/urmo/game/state/HighScoreManager.java b/src/main/java/se/urmo/game/main/HighScoreManager.java
similarity index 97%
rename from src/main/java/se/urmo/game/state/HighScoreManager.java
rename to src/main/java/se/urmo/game/main/HighScoreManager.java
index d74ff84..2766cc1 100644
--- a/src/main/java/se/urmo/game/state/HighScoreManager.java
+++ b/src/main/java/se/urmo/game/main/HighScoreManager.java
@@ -1,4 +1,4 @@
-package se.urmo.game.state;
+package se.urmo.game.main;
 
 import java.nio.file.Files;
 import java.nio.file.Path;
diff --git a/src/main/java/se/urmo/game/state/LevelManager.java b/src/main/java/se/urmo/game/main/LevelManager.java
similarity index 97%
rename from src/main/java/se/urmo/game/state/LevelManager.java
rename to src/main/java/se/urmo/game/main/LevelManager.java
index c8cd902..d00dabd 100644
--- a/src/main/java/se/urmo/game/state/LevelManager.java
+++ b/src/main/java/se/urmo/game/main/LevelManager.java
@@ -1,6 +1,7 @@
-package se.urmo.game.state;
+package se.urmo.game.main;
 
 import lombok.Getter;
+import se.urmo.game.util.FruitType;
 
 public class LevelManager {
 
diff --git a/src/main/java/se/urmo/game/state/GameOverState.java b/src/main/java/se/urmo/game/state/GameOverState.java
index e854f2b..5b3ea94 100644
--- a/src/main/java/se/urmo/game/state/GameOverState.java
+++ b/src/main/java/se/urmo/game/state/GameOverState.java
@@ -1,7 +1,10 @@
 package se.urmo.game.state;
 
 import se.urmo.game.main.GamePanel;
+import se.urmo.game.main.GameStateManager;
+import se.urmo.game.main.HighScoreManager;
 import se.urmo.game.util.GameFonts;
+import se.urmo.game.util.GameStateType;
 
 import java.awt.Color;
 import java.awt.Graphics2D;
diff --git a/src/main/java/se/urmo/game/state/PlayingState.java b/src/main/java/se/urmo/game/state/PlayingState.java
index 180f279..6ea7981 100644
--- a/src/main/java/se/urmo/game/state/PlayingState.java
+++ b/src/main/java/se/urmo/game/state/PlayingState.java
@@ -7,11 +7,17 @@ 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.pacman.PacMan;
+import se.urmo.game.main.AnimationManager;
+import se.urmo.game.main.FruitManager;
+import se.urmo.game.main.GameStateManager;
+import se.urmo.game.main.GhostManager;
+import se.urmo.game.main.LevelManager;
 import se.urmo.game.map.GameMap;
 import se.urmo.game.map.MapTile;
 import se.urmo.game.map.TileType;
 import se.urmo.game.util.Direction;
 import se.urmo.game.util.GameFonts;
+import se.urmo.game.util.GameStateType;
 
 import java.awt.Color;
 import java.awt.Graphics2D;
diff --git a/src/main/java/se/urmo/game/state/FruitType.java b/src/main/java/se/urmo/game/util/FruitType.java
similarity index 96%
rename from src/main/java/se/urmo/game/state/FruitType.java
rename to src/main/java/se/urmo/game/util/FruitType.java
index 3efac3f..87eb1f5 100644
--- a/src/main/java/se/urmo/game/state/FruitType.java
+++ b/src/main/java/se/urmo/game/util/FruitType.java
@@ -1,4 +1,4 @@
-package se.urmo.game.state;
+package se.urmo.game.util;
 
 import lombok.Getter;
 import se.urmo.game.graphics.SpriteLocation;
diff --git a/src/main/java/se/urmo/game/state/GameStateType.java b/src/main/java/se/urmo/game/util/GameStateType.java
similarity index 66%
rename from src/main/java/se/urmo/game/state/GameStateType.java
rename to src/main/java/se/urmo/game/util/GameStateType.java
index 9277928..470e9c6 100644
--- a/src/main/java/se/urmo/game/state/GameStateType.java
+++ b/src/main/java/se/urmo/game/util/GameStateType.java
@@ -1,4 +1,4 @@
-package se.urmo.game.state;
+package se.urmo.game.util;
 
 public enum GameStateType {
     PLAYING, GAME_OVER,