diff --git a/src/main/java/ca/blarg/gdx/tilemap3d/prefabs/json/JsonTilePrefab.java b/src/main/java/ca/blarg/gdx/tilemap3d/json/prefabs/JsonTilePrefab.java
similarity index 71%
rename from src/main/java/ca/blarg/gdx/tilemap3d/prefabs/json/JsonTilePrefab.java
rename to src/main/java/ca/blarg/gdx/tilemap3d/json/prefabs/JsonTilePrefab.java
index 816f39c..4c4bf72 100644
--- a/src/main/java/ca/blarg/gdx/tilemap3d/prefabs/json/JsonTilePrefab.java
+++ b/src/main/java/ca/blarg/gdx/tilemap3d/json/prefabs/JsonTilePrefab.java
@@ -1,4 +1,4 @@
-package ca.blarg.gdx.tilemap3d.prefabs.json;
+package ca.blarg.gdx.tilemap3d.json.prefabs;
 
 public class JsonTilePrefab {
 	public int width;
diff --git a/src/main/java/ca/blarg/gdx/tilemap3d/prefabs/json/TilePrefabJsonLoader.java b/src/main/java/ca/blarg/gdx/tilemap3d/json/prefabs/TilePrefabJsonLoader.java
similarity index 91%
rename from src/main/java/ca/blarg/gdx/tilemap3d/prefabs/json/TilePrefabJsonLoader.java
rename to src/main/java/ca/blarg/gdx/tilemap3d/json/prefabs/TilePrefabJsonLoader.java
index d6caccd..955112a 100644
--- a/src/main/java/ca/blarg/gdx/tilemap3d/prefabs/json/TilePrefabJsonLoader.java
+++ b/src/main/java/ca/blarg/gdx/tilemap3d/json/prefabs/TilePrefabJsonLoader.java
@@ -1,12 +1,13 @@
-package ca.blarg.gdx.tilemap3d.prefabs.json;
+package ca.blarg.gdx.tilemap3d.json.prefabs;
 
+import ca.blarg.gdx.tilemap3d.json.prefabs.JsonTilePrefab;
 import ca.blarg.gdx.tilemap3d.prefabs.TilePrefab;
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.files.FileHandle;
 import com.badlogic.gdx.utils.Base64Coder;
 import com.badlogic.gdx.utils.Json;
 import ca.blarg.gdx.Strings;
-import ca.blarg.gdx.tilemap3d.json.TileDataSerializer;
+import ca.blarg.gdx.tilemap3d.json.tilemap.TileDataSerializer;
 
 import java.nio.ByteBuffer;
 
diff --git a/src/main/java/ca/blarg/gdx/tilemap3d/json/JsonTileMap.java b/src/main/java/ca/blarg/gdx/tilemap3d/json/tilemap/JsonTileMap.java
similarity index 87%
rename from src/main/java/ca/blarg/gdx/tilemap3d/json/JsonTileMap.java
rename to src/main/java/ca/blarg/gdx/tilemap3d/json/tilemap/JsonTileMap.java
index 96af35d..6145564 100644
--- a/src/main/java/ca/blarg/gdx/tilemap3d/json/JsonTileMap.java
+++ b/src/main/java/ca/blarg/gdx/tilemap3d/json/tilemap/JsonTileMap.java
@@ -1,4 +1,4 @@
-package ca.blarg.gdx.tilemap3d.json;
+package ca.blarg.gdx.tilemap3d.json.tilemap;
 
 import java.util.ArrayList;
 
diff --git a/src/main/java/ca/blarg/gdx/tilemap3d/json/TileDataSerializer.java b/src/main/java/ca/blarg/gdx/tilemap3d/json/tilemap/TileDataSerializer.java
similarity index 97%
rename from src/main/java/ca/blarg/gdx/tilemap3d/json/TileDataSerializer.java
rename to src/main/java/ca/blarg/gdx/tilemap3d/json/tilemap/TileDataSerializer.java
index e128009..020c058 100644
--- a/src/main/java/ca/blarg/gdx/tilemap3d/json/TileDataSerializer.java
+++ b/src/main/java/ca/blarg/gdx/tilemap3d/json/tilemap/TileDataSerializer.java
@@ -1,4 +1,4 @@
-package ca.blarg.gdx.tilemap3d.json;
+package ca.blarg.gdx.tilemap3d.json.tilemap;
 
 import ca.blarg.gdx.tilemap3d.Tile;
 import ca.blarg.gdx.tilemap3d.TileRawDataContainer;
diff --git a/src/main/java/ca/blarg/gdx/tilemap3d/json/TileMapJsonLoader.java b/src/main/java/ca/blarg/gdx/tilemap3d/json/tilemap/TileMapJsonLoader.java
similarity index 95%
rename from src/main/java/ca/blarg/gdx/tilemap3d/json/TileMapJsonLoader.java
rename to src/main/java/ca/blarg/gdx/tilemap3d/json/tilemap/TileMapJsonLoader.java
index 1970f40..ec23623 100644
--- a/src/main/java/ca/blarg/gdx/tilemap3d/json/TileMapJsonLoader.java
+++ b/src/main/java/ca/blarg/gdx/tilemap3d/json/tilemap/TileMapJsonLoader.java
@@ -1,9 +1,11 @@
-package ca.blarg.gdx.tilemap3d.json;
+package ca.blarg.gdx.tilemap3d.json.tilemap;
 
 import ca.blarg.gdx.Strings;
 import ca.blarg.gdx.tilemap3d.ChunkVertexGenerator;
 import ca.blarg.gdx.tilemap3d.TileChunk;
 import ca.blarg.gdx.tilemap3d.TileMap;
+import ca.blarg.gdx.tilemap3d.json.tilemap.JsonTileMap;
+import ca.blarg.gdx.tilemap3d.json.tilemap.TileDataSerializer;
 import ca.blarg.gdx.tilemap3d.lighting.TileMapLighter;
 import ca.blarg.gdx.tilemap3d.tilemesh.TileMeshCollection;
 import com.badlogic.gdx.Gdx;
diff --git a/src/main/java/ca/blarg/gdx/tilemap3d/tilemesh/json/JsonCubeTextures.java b/src/main/java/ca/blarg/gdx/tilemap3d/json/tilemesh/JsonCubeTextures.java
similarity index 76%
rename from src/main/java/ca/blarg/gdx/tilemap3d/tilemesh/json/JsonCubeTextures.java
rename to src/main/java/ca/blarg/gdx/tilemap3d/json/tilemesh/JsonCubeTextures.java
index 7b1ee0c..bb06abe 100644
--- a/src/main/java/ca/blarg/gdx/tilemap3d/tilemesh/json/JsonCubeTextures.java
+++ b/src/main/java/ca/blarg/gdx/tilemap3d/json/tilemesh/JsonCubeTextures.java
@@ -1,4 +1,4 @@
-package ca.blarg.gdx.tilemap3d.tilemesh.json;
+package ca.blarg.gdx.tilemap3d.json.tilemesh;
 
 public class JsonCubeTextures {
 	public int top;
diff --git a/src/main/java/ca/blarg/gdx/tilemap3d/tilemesh/json/JsonMaterialMapping.java b/src/main/java/ca/blarg/gdx/tilemap3d/json/tilemesh/JsonMaterialMapping.java
similarity index 77%
rename from src/main/java/ca/blarg/gdx/tilemap3d/tilemesh/json/JsonMaterialMapping.java
rename to src/main/java/ca/blarg/gdx/tilemap3d/json/tilemesh/JsonMaterialMapping.java
index bc1fbe4..f9228e2 100644
--- a/src/main/java/ca/blarg/gdx/tilemap3d/tilemesh/json/JsonMaterialMapping.java
+++ b/src/main/java/ca/blarg/gdx/tilemap3d/json/tilemesh/JsonMaterialMapping.java
@@ -1,4 +1,4 @@
-package ca.blarg.gdx.tilemap3d.tilemesh.json;
+package ca.blarg.gdx.tilemap3d.json.tilemesh;
 
 public class JsonMaterialMapping {
 	public String name;
diff --git a/src/main/java/ca/blarg/gdx/tilemap3d/tilemesh/json/JsonTileDefinition.java b/src/main/java/ca/blarg/gdx/tilemap3d/json/tilemesh/JsonTileDefinition.java
similarity index 93%
rename from src/main/java/ca/blarg/gdx/tilemap3d/tilemesh/json/JsonTileDefinition.java
rename to src/main/java/ca/blarg/gdx/tilemap3d/json/tilemesh/JsonTileDefinition.java
index 3f4b305..be71d36 100644
--- a/src/main/java/ca/blarg/gdx/tilemap3d/tilemesh/json/JsonTileDefinition.java
+++ b/src/main/java/ca/blarg/gdx/tilemap3d/json/tilemesh/JsonTileDefinition.java
@@ -1,4 +1,4 @@
-package ca.blarg.gdx.tilemap3d.tilemesh.json;
+package ca.blarg.gdx.tilemap3d.json.tilemesh;
 
 import com.badlogic.gdx.graphics.Color;
 import com.badlogic.gdx.math.Vector3;
diff --git a/src/main/java/ca/blarg/gdx/tilemap3d/tilemesh/json/JsonTileMeshCollection.java b/src/main/java/ca/blarg/gdx/tilemap3d/json/tilemesh/JsonTileMeshCollection.java
similarity index 80%
rename from src/main/java/ca/blarg/gdx/tilemap3d/tilemesh/json/JsonTileMeshCollection.java
rename to src/main/java/ca/blarg/gdx/tilemap3d/json/tilemesh/JsonTileMeshCollection.java
index af08fff..9636cda 100644
--- a/src/main/java/ca/blarg/gdx/tilemap3d/tilemesh/json/JsonTileMeshCollection.java
+++ b/src/main/java/ca/blarg/gdx/tilemap3d/json/tilemesh/JsonTileMeshCollection.java
@@ -1,4 +1,4 @@
-package ca.blarg.gdx.tilemap3d.tilemesh.json;
+package ca.blarg.gdx.tilemap3d.json.tilemesh;
 
 import java.util.ArrayList;
 
diff --git a/src/main/java/ca/blarg/gdx/tilemap3d/tilemesh/json/JsonTileSubModels.java b/src/main/java/ca/blarg/gdx/tilemap3d/json/tilemesh/JsonTileSubModels.java
similarity index 82%
rename from src/main/java/ca/blarg/gdx/tilemap3d/tilemesh/json/JsonTileSubModels.java
rename to src/main/java/ca/blarg/gdx/tilemap3d/json/tilemesh/JsonTileSubModels.java
index 03c561f..b124230 100644
--- a/src/main/java/ca/blarg/gdx/tilemap3d/tilemesh/json/JsonTileSubModels.java
+++ b/src/main/java/ca/blarg/gdx/tilemap3d/json/tilemesh/JsonTileSubModels.java
@@ -1,4 +1,4 @@
-package ca.blarg.gdx.tilemap3d.tilemesh.json;
+package ca.blarg.gdx.tilemap3d.json.tilemesh;
 
 import com.badlogic.gdx.graphics.Color;
 import com.badlogic.gdx.math.Vector3;
diff --git a/src/main/java/ca/blarg/gdx/tilemap3d/tilemesh/json/TileMeshCollectionJsonLoader.java b/src/main/java/ca/blarg/gdx/tilemap3d/json/tilemesh/TileMeshCollectionJsonLoader.java
similarity index 99%
rename from src/main/java/ca/blarg/gdx/tilemap3d/tilemesh/json/TileMeshCollectionJsonLoader.java
rename to src/main/java/ca/blarg/gdx/tilemap3d/json/tilemesh/TileMeshCollectionJsonLoader.java
index ac5c4dc..3d702e5 100644
--- a/src/main/java/ca/blarg/gdx/tilemap3d/tilemesh/json/TileMeshCollectionJsonLoader.java
+++ b/src/main/java/ca/blarg/gdx/tilemap3d/json/tilemesh/TileMeshCollectionJsonLoader.java
@@ -1,4 +1,4 @@
-package ca.blarg.gdx.tilemap3d.tilemesh.json;
+package ca.blarg.gdx.tilemap3d.json.tilemesh;
 
 import ca.blarg.gdx.Bitfield;
 import ca.blarg.gdx.graphics.atlas.TextureAtlas;