diff --git a/src/main/java/inf112/fiasko/roborally/game_wrapper/BoardActiveScreen.java b/src/main/java/inf112/fiasko/roborally/game_wrapper/screens/BoardActiveScreen.java
similarity index 97%
rename from src/main/java/inf112/fiasko/roborally/game_wrapper/BoardActiveScreen.java
rename to src/main/java/inf112/fiasko/roborally/game_wrapper/screens/BoardActiveScreen.java
index f421529..1eaa871 100644
--- a/src/main/java/inf112/fiasko/roborally/game_wrapper/BoardActiveScreen.java
+++ b/src/main/java/inf112/fiasko/roborally/game_wrapper/screens/BoardActiveScreen.java
@@ -1,9 +1,8 @@
-package inf112.fiasko.roborally.game_wrapper;
+package inf112.fiasko.roborally.game_wrapper.screens;
 
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.Input;
 import com.badlogic.gdx.InputProcessor;
-import com.badlogic.gdx.Screen;
 import com.badlogic.gdx.graphics.GL20;
 import com.badlogic.gdx.graphics.OrthographicCamera;
 import com.badlogic.gdx.graphics.g2d.SpriteBatch;
@@ -13,9 +12,9 @@ import com.badlogic.gdx.math.Vector3;
 import com.badlogic.gdx.utils.Disposable;
 import com.badlogic.gdx.utils.viewport.ExtendViewport;
 import com.badlogic.gdx.utils.viewport.Viewport;
+import inf112.fiasko.roborally.game_wrapper.RoboRallyWrapper;
 import inf112.fiasko.roborally.objects.IDrawableGame;
 import inf112.fiasko.roborally.objects.IDrawableObject;
-import inf112.fiasko.roborally.objects.RoboRallyGame;
 import inf112.fiasko.roborally.utility.IOUtil;
 import inf112.fiasko.roborally.utility.TextureConverterUtil;
 
@@ -38,7 +37,7 @@ public class BoardActiveScreen extends AbstractScreen implements InputProcessor
     private final int viewPortHeight = 12 * tileDimensions;
     private final Viewport viewport;
 
-    BoardActiveScreen(final RoboRallyWrapper roboRallyWrapper) {
+    public BoardActiveScreen(final RoboRallyWrapper roboRallyWrapper) {
         this.roboRallyWrapper = roboRallyWrapper;
 
         camera = new OrthographicCamera();
diff --git a/src/main/java/inf112/fiasko/roborally/game_wrapper/CardChoiceScreen.java b/src/main/java/inf112/fiasko/roborally/game_wrapper/screens/CardChoiceScreen.java
similarity index 97%
rename from src/main/java/inf112/fiasko/roborally/game_wrapper/CardChoiceScreen.java
rename to src/main/java/inf112/fiasko/roborally/game_wrapper/screens/CardChoiceScreen.java
index 5522097..106fbfe 100644
--- a/src/main/java/inf112/fiasko/roborally/game_wrapper/CardChoiceScreen.java
+++ b/src/main/java/inf112/fiasko/roborally/game_wrapper/screens/CardChoiceScreen.java
@@ -1,4 +1,4 @@
-package inf112.fiasko.roborally.game_wrapper;
+package inf112.fiasko.roborally.game_wrapper.screens;
 
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.InputAdapter;
@@ -16,6 +16,8 @@ import com.badlogic.gdx.scenes.scene2d.Touchable;
 import com.badlogic.gdx.scenes.scene2d.ui.TextButton;
 import com.badlogic.gdx.utils.viewport.FitViewport;
 import com.badlogic.gdx.utils.viewport.Viewport;
+import inf112.fiasko.roborally.game_wrapper.RoboRallyWrapper;
+import inf112.fiasko.roborally.game_wrapper.SimpleButton;
 import inf112.fiasko.roborally.objects.IDeck;
 import inf112.fiasko.roborally.objects.ProgrammingCard;
 import inf112.fiasko.roborally.utility.DeckLoaderUtil;
@@ -240,9 +242,9 @@ public class CardChoiceScreen extends InputAdapter implements Screen {
  * A helper class for keeping track of card information and a rectangle
  */
 class CardRectangle {
-    protected final Rectangle rectangle;
-    protected boolean selected = false;
-    protected final ProgrammingCard card;
+    final Rectangle rectangle;
+    boolean selected = false;
+    final ProgrammingCard card;
 
     CardRectangle(Rectangle rectangle, ProgrammingCard card) {
         this.rectangle = rectangle;
diff --git a/src/main/java/inf112/fiasko/roborally/game_wrapper/PowerDownScreen.java b/src/main/java/inf112/fiasko/roborally/game_wrapper/screens/PowerDownScreen.java
similarity index 94%
rename from src/main/java/inf112/fiasko/roborally/game_wrapper/PowerDownScreen.java
rename to src/main/java/inf112/fiasko/roborally/game_wrapper/screens/PowerDownScreen.java
index 1a6d1b2..acff006 100644
--- a/src/main/java/inf112/fiasko/roborally/game_wrapper/PowerDownScreen.java
+++ b/src/main/java/inf112/fiasko/roborally/game_wrapper/screens/PowerDownScreen.java
@@ -1,4 +1,4 @@
-package inf112.fiasko.roborally.game_wrapper;
+package inf112.fiasko.roborally.game_wrapper.screens;
 
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.graphics.GL20;
@@ -9,6 +9,8 @@ import com.badlogic.gdx.scenes.scene2d.Stage;
 import com.badlogic.gdx.scenes.scene2d.ui.TextButton;
 import com.badlogic.gdx.utils.viewport.FitViewport;
 import com.badlogic.gdx.utils.viewport.Viewport;
+import inf112.fiasko.roborally.game_wrapper.RoboRallyWrapper;
+import inf112.fiasko.roborally.game_wrapper.SimpleButton;
 
 public class PowerDownScreen extends AbstractScreen {
     private final RoboRallyWrapper roboRallyWrapper;
diff --git a/src/main/java/inf112/fiasko/roborally/game_wrapper/StartMenuScreen.java b/src/main/java/inf112/fiasko/roborally/game_wrapper/screens/StartMenuScreen.java
similarity index 96%
rename from src/main/java/inf112/fiasko/roborally/game_wrapper/StartMenuScreen.java
rename to src/main/java/inf112/fiasko/roborally/game_wrapper/screens/StartMenuScreen.java
index abaec7d..1862adf 100644
--- a/src/main/java/inf112/fiasko/roborally/game_wrapper/StartMenuScreen.java
+++ b/src/main/java/inf112/fiasko/roborally/game_wrapper/screens/StartMenuScreen.java
@@ -1,7 +1,6 @@
-package inf112.fiasko.roborally.game_wrapper;
+package inf112.fiasko.roborally.game_wrapper.screens;
 
 import com.badlogic.gdx.Gdx;
-import com.badlogic.gdx.Input;
 import com.badlogic.gdx.graphics.GL20;
 import com.badlogic.gdx.graphics.OrthographicCamera;
 import com.badlogic.gdx.scenes.scene2d.InputEvent;
@@ -10,6 +9,8 @@ import com.badlogic.gdx.scenes.scene2d.Stage;
 import com.badlogic.gdx.scenes.scene2d.ui.TextButton;
 import com.badlogic.gdx.utils.viewport.FitViewport;
 import com.badlogic.gdx.utils.viewport.Viewport;
+import inf112.fiasko.roborally.game_wrapper.RoboRallyWrapper;
+import inf112.fiasko.roborally.game_wrapper.SimpleButton;
 import inf112.fiasko.roborally.networking.RoboRallyClient;
 import inf112.fiasko.roborally.networking.RoboRallyServer;
 
diff --git a/src/main/java/inf112/fiasko/roborally/game_wrapper/UsernameScreen.java b/src/main/java/inf112/fiasko/roborally/game_wrapper/screens/UsernameScreen.java
similarity index 96%
rename from src/main/java/inf112/fiasko/roborally/game_wrapper/UsernameScreen.java
rename to src/main/java/inf112/fiasko/roborally/game_wrapper/screens/UsernameScreen.java
index 8e7ddab..9263b5b 100644
--- a/src/main/java/inf112/fiasko/roborally/game_wrapper/UsernameScreen.java
+++ b/src/main/java/inf112/fiasko/roborally/game_wrapper/screens/UsernameScreen.java
@@ -1,10 +1,9 @@
-package inf112.fiasko.roborally.game_wrapper;
+package inf112.fiasko.roborally.game_wrapper.screens;
 
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.graphics.GL20;
 import com.badlogic.gdx.graphics.OrthographicCamera;
 import com.badlogic.gdx.scenes.scene2d.InputEvent;
-import com.badlogic.gdx.scenes.scene2d.InputListener;
 import com.badlogic.gdx.scenes.scene2d.Stage;
 import com.badlogic.gdx.scenes.scene2d.ui.Skin;
 import com.badlogic.gdx.scenes.scene2d.ui.TextButton;
@@ -12,6 +11,7 @@ import com.badlogic.gdx.scenes.scene2d.ui.TextField;
 import com.badlogic.gdx.scenes.scene2d.utils.ClickListener;
 import com.badlogic.gdx.utils.viewport.FitViewport;
 import com.badlogic.gdx.utils.viewport.Viewport;
+import inf112.fiasko.roborally.game_wrapper.RoboRallyWrapper;
 
 public class UsernameScreen extends AbstractScreen {
     private final RoboRallyWrapper roboRallyWrapper;