diff --git a/src/main/java/inf112/fiasko/roborally/Main.java b/src/main/java/inf112/fiasko/roborally/Main.java
index 834a012..c8ab047 100644
--- a/src/main/java/inf112/fiasko/roborally/Main.java
+++ b/src/main/java/inf112/fiasko/roborally/Main.java
@@ -2,6 +2,7 @@ package inf112.fiasko.roborally;
 
 import com.badlogic.gdx.backends.lwjgl.LwjglApplication;
 import com.badlogic.gdx.backends.lwjgl.LwjglApplicationConfiguration;
+import inf112.fiasko.roborally.game_wrapper.RoboRallyLauncher;
 
 
 public class Main {
@@ -12,6 +13,6 @@ public class Main {
         cfg.height = 900;
         cfg.samples = 3;
 
-        new LwjglApplication(new GameLauncher(), cfg);
+        new LwjglApplication(new RoboRallyLauncher(), cfg);
     }
 }
\ No newline at end of file
diff --git a/src/main/java/inf112/fiasko/roborally/game/IDrawableGame.java b/src/main/java/inf112/fiasko/roborally/objects/IDrawableGame.java
similarity index 86%
rename from src/main/java/inf112/fiasko/roborally/game/IDrawableGame.java
rename to src/main/java/inf112/fiasko/roborally/objects/IDrawableGame.java
index ac25ae3..847f158 100644
--- a/src/main/java/inf112/fiasko/roborally/game/IDrawableGame.java
+++ b/src/main/java/inf112/fiasko/roborally/objects/IDrawableGame.java
@@ -1,8 +1,4 @@
-package inf112.fiasko.roborally.game;
-
-import inf112.fiasko.roborally.objects.Robot;
-import inf112.fiasko.roborally.objects.Tile;
-import inf112.fiasko.roborally.objects.Wall;
+package inf112.fiasko.roborally.objects;
 
 import java.util.List;
 
diff --git a/src/main/java/inf112/fiasko/roborally/game/Game.java b/src/main/java/inf112/fiasko/roborally/objects/RoboRallyGame.java
similarity index 93%
rename from src/main/java/inf112/fiasko/roborally/game/Game.java
rename to src/main/java/inf112/fiasko/roborally/objects/RoboRallyGame.java
index ff813fb..f5dc4c2 100644
--- a/src/main/java/inf112/fiasko/roborally/game/Game.java
+++ b/src/main/java/inf112/fiasko/roborally/objects/RoboRallyGame.java
@@ -1,11 +1,7 @@
-package inf112.fiasko.roborally.game;
+package inf112.fiasko.roborally.objects;
 
 import inf112.fiasko.roborally.element_properties.Position;
 import inf112.fiasko.roborally.element_properties.RobotID;
-import inf112.fiasko.roborally.objects.Board;
-import inf112.fiasko.roborally.objects.Robot;
-import inf112.fiasko.roborally.objects.Tile;
-import inf112.fiasko.roborally.objects.Wall;
 import inf112.fiasko.roborally.utility.BoardLoaderUtil;
 
 import java.io.IOException;
@@ -16,10 +12,10 @@ import java.util.concurrent.TimeUnit;
 /**
  * This class represent a game which is drawable using libgdx
  */
-public class Game implements IDrawableGame {
+public class RoboRallyGame implements IDrawableGame {
     private Board gameBoard;
 
-    public Game(boolean debug) {
+    public RoboRallyGame(boolean debug) {
         if (debug) {
             initializeDebugMode();
         } else {
@@ -27,7 +23,7 @@ public class Game implements IDrawableGame {
         }
     }
 
-    public Game() {
+    public RoboRallyGame() {
         initializeGame();
     }
 
diff --git a/src/main/java/inf112/fiasko/roborally/utility/IOUtil.java b/src/main/java/inf112/fiasko/roborally/utility/IOUtil.java
index 92fb30c..f200c7a 100644
--- a/src/main/java/inf112/fiasko/roborally/utility/IOUtil.java
+++ b/src/main/java/inf112/fiasko/roborally/utility/IOUtil.java
@@ -3,7 +3,7 @@ package inf112.fiasko.roborally.utility;
 import com.badlogic.gdx.graphics.g2d.TextureRegion;
 import inf112.fiasko.roborally.element_properties.Direction;
 import inf112.fiasko.roborally.element_properties.Position;
-import inf112.fiasko.roborally.game.IDrawableGame;
+import inf112.fiasko.roborally.objects.IDrawableGame;
 import inf112.fiasko.roborally.objects.DrawableObject;
 import inf112.fiasko.roborally.objects.IDrawableObject;
 import inf112.fiasko.roborally.objects.Robot;
diff --git a/src/test/java/inf112/fiasko/roborally/game/GameTest.java b/src/test/java/inf112/fiasko/roborally/game_wrapper/RoboRallyGameTest.java
similarity index 72%
rename from src/test/java/inf112/fiasko/roborally/game/GameTest.java
rename to src/test/java/inf112/fiasko/roborally/game_wrapper/RoboRallyGameTest.java
index 6d6621a..aee853b 100644
--- a/src/test/java/inf112/fiasko/roborally/game/GameTest.java
+++ b/src/test/java/inf112/fiasko/roborally/game_wrapper/RoboRallyGameTest.java
@@ -1,15 +1,18 @@
-package inf112.fiasko.roborally.game;
+package inf112.fiasko.roborally.game_wrapper;
 
 import static org.junit.Assert.assertTrue;
+
+import inf112.fiasko.roborally.objects.IDrawableGame;
+import inf112.fiasko.roborally.objects.RoboRallyGame;
 import org.junit.Before;
 import org.junit.Test;
 
-public class GameTest {
+public class RoboRallyGameTest {
     private IDrawableGame game;
 
     @Before
     public void setUp() {
-        game = new Game();
+        game = new RoboRallyGame();
     }
 
     @Test