diff --git a/Mazebuilder/src/com/mazebuilder/gameplay/BitmaskWallContainer.java b/Mazebuilder/src/com/mazebuilder/gameplay/board/BitmaskWallContainer.java
similarity index 84%
rename from Mazebuilder/src/com/mazebuilder/gameplay/BitmaskWallContainer.java
rename to Mazebuilder/src/com/mazebuilder/gameplay/board/BitmaskWallContainer.java
index c1bd1df..e3ddd7d 100644
--- a/Mazebuilder/src/com/mazebuilder/gameplay/BitmaskWallContainer.java
+++ b/Mazebuilder/src/com/mazebuilder/gameplay/board/BitmaskWallContainer.java
@@ -1,4 +1,7 @@
-package com.mazebuilder.gameplay;
+package com.mazebuilder.gameplay.board;
+
+import com.mazebuilder.gameplay.Direction;
+import com.mazebuilder.gameplay.Location;
 
 public final class BitmaskWallContainer implements WallContainer {
     
diff --git a/Mazebuilder/src/com/mazebuilder/gameplay/Board.java b/Mazebuilder/src/com/mazebuilder/gameplay/board/Board.java
similarity index 86%
rename from Mazebuilder/src/com/mazebuilder/gameplay/Board.java
rename to Mazebuilder/src/com/mazebuilder/gameplay/board/Board.java
index 1daca76..b1f149e 100644
--- a/Mazebuilder/src/com/mazebuilder/gameplay/Board.java
+++ b/Mazebuilder/src/com/mazebuilder/gameplay/board/Board.java
@@ -1,5 +1,8 @@
-package com.mazebuilder.gameplay;
+package com.mazebuilder.gameplay.board;
 
+import com.mazebuilder.gameplay.Direction;
+import com.mazebuilder.gameplay.Location;
+import com.mazebuilder.gameplay.players.Player;
 import com.mazebuilder.renderer.Renderable;
 
 public interface Board extends Renderable {
diff --git a/Mazebuilder/src/com/mazebuilder/gameplay/DefaultBoard.java b/Mazebuilder/src/com/mazebuilder/gameplay/board/DefaultBoard.java
similarity index 93%
rename from Mazebuilder/src/com/mazebuilder/gameplay/DefaultBoard.java
rename to Mazebuilder/src/com/mazebuilder/gameplay/board/DefaultBoard.java
index 35acc61..e82ecc0 100644
--- a/Mazebuilder/src/com/mazebuilder/gameplay/DefaultBoard.java
+++ b/Mazebuilder/src/com/mazebuilder/gameplay/board/DefaultBoard.java
@@ -1,4 +1,4 @@
-package com.mazebuilder.gameplay;
+package com.mazebuilder.gameplay.board;
 
 import java.util.Map;
 
@@ -7,6 +7,10 @@
 import com.google.common.base.Preconditions;
 import com.google.common.base.Strings;
 import com.google.common.collect.Maps;
+import com.mazebuilder.gameplay.Direction;
+import com.mazebuilder.gameplay.Location;
+import com.mazebuilder.gameplay.SimpleLocation;
+import com.mazebuilder.gameplay.players.Player;
 import com.mazebuilder.renderer.BoardRenderer;
 
 public final class DefaultBoard implements Board {
diff --git a/Mazebuilder/src/com/mazebuilder/gameplay/WallContainer.java b/Mazebuilder/src/com/mazebuilder/gameplay/board/WallContainer.java
similarity index 65%
rename from Mazebuilder/src/com/mazebuilder/gameplay/WallContainer.java
rename to Mazebuilder/src/com/mazebuilder/gameplay/board/WallContainer.java
index 16e9669..5c8764f 100644
--- a/Mazebuilder/src/com/mazebuilder/gameplay/WallContainer.java
+++ b/Mazebuilder/src/com/mazebuilder/gameplay/board/WallContainer.java
@@ -1,4 +1,7 @@
-package com.mazebuilder.gameplay;
+package com.mazebuilder.gameplay.board;
+
+import com.mazebuilder.gameplay.Direction;
+import com.mazebuilder.gameplay.Location;
 
 public interface WallContainer {
     
diff --git a/Mazebuilder/src/com/mazebuilder/gameplay/ChaserPlayer.java b/Mazebuilder/src/com/mazebuilder/gameplay/players/ChaserPlayer.java
similarity index 92%
rename from Mazebuilder/src/com/mazebuilder/gameplay/ChaserPlayer.java
rename to Mazebuilder/src/com/mazebuilder/gameplay/players/ChaserPlayer.java
index d2c94f3..adff19a 100644
--- a/Mazebuilder/src/com/mazebuilder/gameplay/ChaserPlayer.java
+++ b/Mazebuilder/src/com/mazebuilder/gameplay/players/ChaserPlayer.java
@@ -1,4 +1,4 @@
-package com.mazebuilder.gameplay;
+package com.mazebuilder.gameplay.players;
 
 import java.util.Random;
 
@@ -7,6 +7,7 @@
 import com.google.common.collect.EnumMultiset;
 import com.google.common.collect.Multiset;
 import com.google.common.collect.Multisets;
+import com.mazebuilder.gameplay.Direction;
 import com.mazebuilder.renderer.PlayerRenderer;
 
 public final class ChaserPlayer implements Player {
diff --git a/Mazebuilder/src/com/mazebuilder/gameplay/Player.java b/Mazebuilder/src/com/mazebuilder/gameplay/players/Player.java
similarity index 87%
rename from Mazebuilder/src/com/mazebuilder/gameplay/Player.java
rename to Mazebuilder/src/com/mazebuilder/gameplay/players/Player.java
index 1800086..1b26604 100644
--- a/Mazebuilder/src/com/mazebuilder/gameplay/Player.java
+++ b/Mazebuilder/src/com/mazebuilder/gameplay/players/Player.java
@@ -1,6 +1,7 @@
-package com.mazebuilder.gameplay;
+package com.mazebuilder.gameplay.players;
 
 import com.google.common.collect.Multiset;
+import com.mazebuilder.gameplay.Direction;
 import com.mazebuilder.renderer.Renderable;
 
 public interface Player extends Renderable {
diff --git a/Mazebuilder/src/com/mazebuilder/gameplay/RunnerPlayer.java b/Mazebuilder/src/com/mazebuilder/gameplay/players/RunnerPlayer.java
similarity index 90%
rename from Mazebuilder/src/com/mazebuilder/gameplay/RunnerPlayer.java
rename to Mazebuilder/src/com/mazebuilder/gameplay/players/RunnerPlayer.java
index 74f0a7f..b6f3d70 100644
--- a/Mazebuilder/src/com/mazebuilder/gameplay/RunnerPlayer.java
+++ b/Mazebuilder/src/com/mazebuilder/gameplay/players/RunnerPlayer.java
@@ -1,9 +1,10 @@
-package com.mazebuilder.gameplay;
+package com.mazebuilder.gameplay.players;
 
 import org.newdawn.slick.Graphics;
 
 import com.google.common.collect.EnumMultiset;
 import com.google.common.collect.Multiset;
+import com.mazebuilder.gameplay.Direction;
 import com.mazebuilder.renderer.PlayerRenderer;
 
 public final class RunnerPlayer implements Player {
diff --git a/Mazebuilder/src/com/mazebuilder/renderer/BoardRenderer.java b/Mazebuilder/src/com/mazebuilder/renderer/BoardRenderer.java
index 8cc4f96..4abb65f 100644
--- a/Mazebuilder/src/com/mazebuilder/renderer/BoardRenderer.java
+++ b/Mazebuilder/src/com/mazebuilder/renderer/BoardRenderer.java
@@ -2,7 +2,7 @@
 
 import org.newdawn.slick.Graphics;
 
-import com.mazebuilder.gameplay.Player;
+import com.mazebuilder.gameplay.players.Player;
 
 public interface BoardRenderer {