diff --git a/src/main/java/inf112/fiasko/roborally/objects/Grid.java b/src/main/java/inf112/fiasko/roborally/objects/Grid.java
index ed2b71a..38a5982 100644
--- a/src/main/java/inf112/fiasko/roborally/objects/Grid.java
+++ b/src/main/java/inf112/fiasko/roborally/objects/Grid.java
@@ -9,9 +9,9 @@ import java.util.List;
  */
 public class Grid<K> implements IGrid<K> {
 
-    private int height;
-    private int width;
-    private List<ArrayList<K>> grid = new ArrayList<>();
+    private final int height;
+    private final int width;
+    private final List<ArrayList<K>> grid = new ArrayList<>();
 
     /**
      * Initializes an empty grid
diff --git a/src/main/java/inf112/fiasko/roborally/TextureConverterUtil.java b/src/main/java/inf112/fiasko/roborally/utility/TextureConverterUtil.java
similarity index 99%
rename from src/main/java/inf112/fiasko/roborally/TextureConverterUtil.java
rename to src/main/java/inf112/fiasko/roborally/utility/TextureConverterUtil.java
index 2f0dc31..798acdb 100644
--- a/src/main/java/inf112/fiasko/roborally/TextureConverterUtil.java
+++ b/src/main/java/inf112/fiasko/roborally/utility/TextureConverterUtil.java
@@ -1,4 +1,4 @@
-package inf112.fiasko.roborally;
+package inf112.fiasko.roborally.utility;
 
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.graphics.Texture;
diff --git a/src/test/java/inf112/fiasko/roborally/objects/DrawableObjectTest.java b/src/test/java/inf112/fiasko/roborally/objects/DrawableObjectTest.java
index bc106af..ff6a3fb 100644
--- a/src/test/java/inf112/fiasko/roborally/objects/DrawableObjectTest.java
+++ b/src/test/java/inf112/fiasko/roborally/objects/DrawableObjectTest.java
@@ -1,6 +1,5 @@
 package inf112.fiasko.roborally.objects;
 
-import inf112.fiasko.roborally.objects.DrawableObject;
 import inf112.fiasko.roborally.element_properties.GameTexture;
 import org.junit.Before;
 import org.junit.Test;