diff --git a/core/src/netwerkprog/game/client/Map.java b/core/src/netwerkprog/game/client/map/Map.java
similarity index 97%
rename from core/src/netwerkprog/game/client/Map.java
rename to core/src/netwerkprog/game/client/map/Map.java
index d22de9e..1d3f953 100644
--- a/core/src/netwerkprog/game/client/Map.java
+++ b/core/src/netwerkprog/game/client/map/Map.java
@@ -1,4 +1,4 @@
-package netwerkprog.game.client;
+package netwerkprog.game.client.map;
 
 /**
  * Map class to hold a 2d array of tiles which will specify the map
diff --git a/core/src/netwerkprog/game/client/map/MapRenderer.java b/core/src/netwerkprog/game/client/map/MapRenderer.java
new file mode 100644
index 0000000..38667aa
--- /dev/null
+++ b/core/src/netwerkprog/game/client/map/MapRenderer.java
@@ -0,0 +1,42 @@
+package netwerkprog.game.client.map;
+
+import com.badlogic.gdx.graphics.g2d.Batch;
+import com.badlogic.gdx.graphics.g2d.SpriteBatch;
+import netwerkprog.game.util.Renderable;
+
+public class MapRenderer implements Renderable {
+    private int tileWidth;
+    private Map map;
+
+    public MapRenderer(Map map, int tileWidth) {
+        this.map = map;
+        this.tileWidth = tileWidth;
+    }
+
+    public int getTileWidth() {
+        return tileWidth;
+    }
+
+    public Map getMap() {
+        return map;
+    }
+
+    public void setTileWidth(int tileWidth) {
+        this.tileWidth = tileWidth;
+    }
+
+    public void setMap(Map map) {
+        this.map = map;
+    }
+
+    @Override
+    public void render() {
+        Batch batch = new SpriteBatch();
+
+    }
+
+    @Override
+    public void update(double deltaTime) {
+
+    }
+}
diff --git a/core/src/netwerkprog/game/util/Drawable.java b/core/src/netwerkprog/game/util/Renderable.java
similarity index 52%
rename from core/src/netwerkprog/game/util/Drawable.java
rename to core/src/netwerkprog/game/util/Renderable.java
index 529aae3..1730301 100644
--- a/core/src/netwerkprog/game/util/Drawable.java
+++ b/core/src/netwerkprog/game/util/Renderable.java
@@ -1,5 +1,5 @@
 package netwerkprog.game.util;
 
-public interface Drawable extends Updatable {
+public interface Renderable extends Updatable {
     void render();
 }
diff --git a/core/src/test/java/MapTest.java b/core/src/test/java/MapTest.java
index 722a14b..f91cc5e 100644
--- a/core/src/test/java/MapTest.java
+++ b/core/src/test/java/MapTest.java
@@ -1,4 +1,4 @@
-import netwerkprog.game.client.Map;
+import netwerkprog.game.client.map.Map;
 import org.junit.Assert;
 import org.junit.Test;