diff --git a/SCsub b/SCsub
index 4e61af6..e1a637a 100644
--- a/SCsub
+++ b/SCsub
@@ -25,55 +25,55 @@ sources = [
 
     "register_types.cpp",
 
-    "library/terrain_library.cpp",
-    "library/terrain_library_simple.cpp",
-    "library/terrain_material_cache.cpp",
+    "library/terrain_2d_library.cpp",
+    "library/terrain_2d_library_simple.cpp",
+    "library/terrain_2d_material_cache.cpp",
     
-    "nodes/terrain_light_node.cpp",
+    "nodes/terrain_2d_light_node.cpp",
 
-    "library/terrain_surface.cpp",
-    "library/terrain_surface_simple.cpp",
+    "library/terrain_2d_surface.cpp",
+    "library/terrain_2d_surface_simple.cpp",
 
-    "data/terrain_light.cpp",
+    "data/terrain_2d_light.cpp",
 
-    "meshers/terrain_mesher.cpp",
+    "meshers/terrain_2d_mesher.cpp",
 
-    "meshers/blocky/terrain_mesher_blocky.cpp",
-    "meshers/default/terrain_mesher_default.cpp",
+    "meshers/blocky/terrain_2d_mesher_blocky.cpp",
+    "meshers/default/terrain_2d_mesher_default.cpp",
 
-    "world/terrain_world.cpp",
-    "world/terrain_chunk.cpp",
-    "world/terrain_structure.cpp",
-    "world/block_terrain_structure.cpp",
-    "world/terrain_environment_data.cpp",
+    "world/terrain_2d_world.cpp",
+    "world/terrain_2d_chunk.cpp",
+    "world/terrain_2d_structure.cpp",
+    "world/block_terrain_2d_structure.cpp",
+    "world/terrain_2d_environment_data.cpp",
 
-    "world/blocky/terrain_chunk_blocky.cpp",
-    "world/blocky/terrain_world_blocky.cpp",
+    "world/blocky/terrain_2d_chunk_blocky.cpp",
+    "world/blocky/terrain_2d_world_blocky.cpp",
 
-    "world/default/terrain_world_default.cpp",
-    "world/default/terrain_chunk_default.cpp",
+    "world/default/terrain_2d_world_default.cpp",
+    "world/default/terrain_2d_chunk_default.cpp",
 
-    "level_generator/terrain_level_generator.cpp",
-    "level_generator/terrain_level_generator_flat.cpp",
+    "level_generator/terrain_2d_level_generator.cpp",
+    "level_generator/terrain_2d_level_generator_flat.cpp",
 
-    "areas/terrain_world_area.cpp",
+    "areas/terrain_2d_world_area.cpp",
 
-    "world/terrain_world_editor.cpp",
+    "world/terrain_2d_world_editor.cpp",
     
     "thirdparty/lz4/lz4.c",
 
-    "world/jobs/terrain_job.cpp",
-    "world/jobs/terrain_terrain_job.cpp",
-    "world/jobs/terrain_mesher_job_step.cpp",
-    "world/jobs/terrain_light_job.cpp",
-    "world/jobs/terrain_prop_job.cpp",
+    "world/jobs/terrain_2d_job.cpp",
+    "world/jobs/terrain_2d_terrain_job.cpp",
+    "world/jobs/terrain_2d_mesher_job_step.cpp",
+    "world/jobs/terrain_2d_light_job.cpp",
+    "world/jobs/terrain_2d_prop_job.cpp",
 ]
 
 if has_texture_packer:
-    sources.append("library/terrain_library_merger.cpp")
-    sources.append("library/terrain_library_merger_pcm.cpp")
-    sources.append("library/terrain_surface_merger.cpp")
-    sources.append("library/terrain_material_cache_pcm.cpp")
+    sources.append("library/terrain_2d_library_merger.cpp")
+    sources.append("library/terrain_2d_library_merger_pcm.cpp")
+    sources.append("library/terrain_2d_surface_merger.cpp")
+    sources.append("library/terrain_2d_material_cache_pcm.cpp")
 
 if ARGUMENTS.get('custom_modules_shared', 'no') == 'yes':
     # Shared lib compilation
diff --git a/areas/terrain_world_area.cpp b/areas/terrain_2d_world_area.cpp
similarity index 98%
rename from areas/terrain_world_area.cpp
rename to areas/terrain_2d_world_area.cpp
index 5e5a421..194e814 100644
--- a/areas/terrain_world_area.cpp
+++ b/areas/terrain_2d_world_area.cpp
@@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#include "terrain_world_area.h"
+#include "terrain_2d_world_area.h"
 
 AABB TerrainWorldArea::get_aabb() const {
 	return _aabb;
diff --git a/areas/terrain_world_area.h b/areas/terrain_2d_world_area.h
similarity index 100%
rename from areas/terrain_world_area.h
rename to areas/terrain_2d_world_area.h
diff --git a/data/terrain_light.cpp b/data/terrain_2d_light.cpp
similarity index 98%
rename from data/terrain_light.cpp
rename to data/terrain_2d_light.cpp
index 598eff6..a251506 100644
--- a/data/terrain_light.cpp
+++ b/data/terrain_2d_light.cpp
@@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#include "terrain_light.h"
+#include "terrain_2d_light.h"
 
 _FORCE_INLINE_ int TerrainLight::get_world_position_x() const {
 	return _world_position_x;
diff --git a/data/terrain_light.h b/data/terrain_2d_light.h
similarity index 100%
rename from data/terrain_light.h
rename to data/terrain_2d_light.h
diff --git a/level_generator/terrain_level_generator.cpp b/level_generator/terrain_2d_level_generator.cpp
similarity index 95%
rename from level_generator/terrain_level_generator.cpp
rename to level_generator/terrain_2d_level_generator.cpp
index b789fb6..4ffe15c 100644
--- a/level_generator/terrain_level_generator.cpp
+++ b/level_generator/terrain_2d_level_generator.cpp
@@ -20,9 +20,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#include "terrain_level_generator.h"
+#include "terrain_2d_level_generator.h"
 
-#include "../world/terrain_chunk.h"
+#include "../world/terrain_2d_chunk.h"
 
 void TerrainLevelGenerator::generate_chunk(Ref<TerrainChunk> chunk) {
 	if (has_method("_generate_chunk")) {
diff --git a/level_generator/terrain_level_generator.h b/level_generator/terrain_2d_level_generator.h
similarity index 100%
rename from level_generator/terrain_level_generator.h
rename to level_generator/terrain_2d_level_generator.h
diff --git a/level_generator/terrain_level_generator_flat.cpp b/level_generator/terrain_2d_level_generator_flat.cpp
similarity index 96%
rename from level_generator/terrain_level_generator_flat.cpp
rename to level_generator/terrain_2d_level_generator_flat.cpp
index 5aa359e..6a69eaa 100644
--- a/level_generator/terrain_level_generator_flat.cpp
+++ b/level_generator/terrain_2d_level_generator_flat.cpp
@@ -20,9 +20,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#include "terrain_level_generator_flat.h"
+#include "terrain_2d_level_generator_flat.h"
 
-#include "../world/terrain_chunk.h"
+#include "../world/terrain_2d_chunk.h"
 
 int TerrainLevelGeneratorFlat::get_floor_position() const {
 	return _floor_position;
diff --git a/level_generator/terrain_level_generator_flat.h b/level_generator/terrain_2d_level_generator_flat.h
similarity index 97%
rename from level_generator/terrain_level_generator_flat.h
rename to level_generator/terrain_2d_level_generator_flat.h
index 48f5a24..d2820fc 100644
--- a/level_generator/terrain_level_generator_flat.h
+++ b/level_generator/terrain_2d_level_generator_flat.h
@@ -23,7 +23,7 @@ SOFTWARE.
 #ifndef TERRAIN_LEVEL_GENERATOR_FLAT_H
 #define TERRAIN_LEVEL_GENERATOR_FLAT_H
 
-#include "terrain_level_generator.h"
+#include "terrain_2d_level_generator.h"
 
 class TerrainChunk;
 
diff --git a/library/terrain_library.cpp b/library/terrain_2d_library.cpp
similarity index 99%
rename from library/terrain_library.cpp
rename to library/terrain_2d_library.cpp
index 0bef9f2..fdfdbfc 100644
--- a/library/terrain_library.cpp
+++ b/library/terrain_2d_library.cpp
@@ -20,11 +20,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#include "terrain_library.h"
+#include "terrain_2d_library.h"
 
-#include "../world/terrain_chunk.h"
+#include "../world/terrain_2d_chunk.h"
 
-#include "terrain_material_cache.h"
+#include "terrain_2d_material_cache.h"
 
 #ifdef PROPS_PRESENT
 #include "../../props/props/prop_data.h"
diff --git a/library/terrain_library.h b/library/terrain_2d_library.h
similarity index 99%
rename from library/terrain_library.h
rename to library/terrain_2d_library.h
index 89f14b1..3a9e029 100644
--- a/library/terrain_library.h
+++ b/library/terrain_2d_library.h
@@ -53,8 +53,8 @@ SOFTWARE.
 #include "core/math/rect2.h"
 #include "scene/resources/material.h"
 
-#include "../data/terrain_light.h"
-#include "terrain_surface.h"
+#include "../data/terrain_2d_light.h"
+#include "terrain_2d_surface.h"
 
 #include "../defines.h"
 
diff --git a/library/terrain_library_merger.cpp b/library/terrain_2d_library_merger.cpp
similarity index 99%
rename from library/terrain_library_merger.cpp
rename to library/terrain_2d_library_merger.cpp
index 9062959..72acb92 100644
--- a/library/terrain_library_merger.cpp
+++ b/library/terrain_2d_library_merger.cpp
@@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#include "terrain_library_merger.h"
+#include "terrain_2d_library_merger.h"
 
 #include "scene/resources/packed_scene.h"
 #include "scene/resources/texture.h"
diff --git a/library/terrain_library_merger.h b/library/terrain_2d_library_merger.h
similarity index 96%
rename from library/terrain_library_merger.h
rename to library/terrain_2d_library_merger.h
index 66437fa..414f00b 100644
--- a/library/terrain_library_merger.h
+++ b/library/terrain_2d_library_merger.h
@@ -33,12 +33,12 @@ SOFTWARE.
 #include "core/map.h"
 #endif
 
-#include "terrain_library.h"
+#include "terrain_2d_library.h"
 
 #include "scene/resources/material.h"
 
-#include "../data/terrain_light.h"
-#include "terrain_surface_merger.h"
+#include "../data/terrain_2d_light.h"
+#include "terrain_2d_surface_merger.h"
 
 class TerrainSurfaceSimple;
 class TerrainMesher;
diff --git a/library/terrain_library_merger_pcm.cpp b/library/terrain_2d_library_merger_pcm.cpp
similarity index 99%
rename from library/terrain_library_merger_pcm.cpp
rename to library/terrain_2d_library_merger_pcm.cpp
index 628168e..c9f7529 100644
--- a/library/terrain_library_merger_pcm.cpp
+++ b/library/terrain_2d_library_merger_pcm.cpp
@@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#include "terrain_library_merger_pcm.h"
+#include "terrain_2d_library_merger_pcm.h"
 
 #include "../../texture_packer/texture_packer.h"
 #include "scene/resources/packed_scene.h"
@@ -37,10 +37,10 @@ SOFTWARE.
 #endif
 
 #include "../defines.h"
-#include "../world/default/terrain_chunk_default.h"
+#include "../world/default/terrain_2d_chunk_default.h"
 #include "core/hashfuncs.h"
 #include "core/message_queue.h"
-#include "terrain_material_cache_pcm.h"
+#include "terrain_2d_material_cache_pcm.h"
 
 bool TerrainLibraryMergerPCM::_supports_caching() {
 	return true;
diff --git a/library/terrain_library_merger_pcm.h b/library/terrain_2d_library_merger_pcm.h
similarity index 97%
rename from library/terrain_library_merger_pcm.h
rename to library/terrain_2d_library_merger_pcm.h
index 8a68ee8..cef19d2 100644
--- a/library/terrain_library_merger_pcm.h
+++ b/library/terrain_2d_library_merger_pcm.h
@@ -33,12 +33,12 @@ SOFTWARE.
 #include "core/map.h"
 #endif
 
-#include "terrain_library.h"
+#include "terrain_2d_library.h"
 
 #include "scene/resources/material.h"
 
-#include "../data/terrain_light.h"
-#include "terrain_surface_merger.h"
+#include "../data/terrain_2d_light.h"
+#include "terrain_2d_surface_merger.h"
 
 #include "core/os/mutex.h"
 
diff --git a/library/terrain_library_simple.cpp b/library/terrain_2d_library_simple.cpp
similarity index 99%
rename from library/terrain_library_simple.cpp
rename to library/terrain_2d_library_simple.cpp
index 80fd227..783aa83 100644
--- a/library/terrain_library_simple.cpp
+++ b/library/terrain_2d_library_simple.cpp
@@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#include "terrain_library_simple.h"
+#include "terrain_2d_library_simple.h"
 
 #include "../defines.h"
 
diff --git a/library/terrain_library_simple.h b/library/terrain_2d_library_simple.h
similarity index 95%
rename from library/terrain_library_simple.h
rename to library/terrain_2d_library_simple.h
index 3992ab9..7959e92 100644
--- a/library/terrain_library_simple.h
+++ b/library/terrain_2d_library_simple.h
@@ -31,12 +31,12 @@ SOFTWARE.
 #include "core/resource.h"
 #endif
 
-#include "terrain_library.h"
+#include "terrain_2d_library.h"
 
 #include "scene/resources/material.h"
 
-#include "../data/terrain_light.h"
-#include "terrain_surface_simple.h"
+#include "../data/terrain_2d_light.h"
+#include "terrain_2d_surface_simple.h"
 
 class TerrainSurfaceSimple;
 class TerrainMesher;
diff --git a/library/terrain_material_cache.cpp b/library/terrain_2d_material_cache.cpp
similarity index 99%
rename from library/terrain_material_cache.cpp
rename to library/terrain_2d_material_cache.cpp
index eeb5763..06c6c9e 100644
--- a/library/terrain_material_cache.cpp
+++ b/library/terrain_2d_material_cache.cpp
@@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#include "terrain_material_cache.h"
+#include "terrain_2d_material_cache.h"
 
 #include "../defines.h"
 
diff --git a/library/terrain_material_cache.h b/library/terrain_2d_material_cache.h
similarity index 99%
rename from library/terrain_material_cache.h
rename to library/terrain_2d_material_cache.h
index a2367fe..f0f7e80 100644
--- a/library/terrain_material_cache.h
+++ b/library/terrain_2d_material_cache.h
@@ -38,7 +38,7 @@ SOFTWARE.
 #include "core/math/rect2.h"
 #include "scene/resources/material.h"
 
-#include "terrain_library.h"
+#include "terrain_2d_library.h"
 
 #include "../defines.h"
 
diff --git a/library/terrain_material_cache_pcm.cpp b/library/terrain_2d_material_cache_pcm.cpp
similarity index 98%
rename from library/terrain_material_cache_pcm.cpp
rename to library/terrain_2d_material_cache_pcm.cpp
index 320f578..e4f03b1 100644
--- a/library/terrain_material_cache_pcm.cpp
+++ b/library/terrain_2d_material_cache_pcm.cpp
@@ -20,12 +20,12 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#include "terrain_material_cache_pcm.h"
+#include "terrain_2d_material_cache_pcm.h"
 
 #include "../../texture_packer/texture_packer.h"
 #include "scene/resources/texture.h"
-#include "terrain_surface.h"
-#include "terrain_surface_merger.h"
+#include "terrain_2d_surface.h"
+#include "terrain_2d_surface_merger.h"
 
 int TerrainMaterialCachePCM::get_texture_flags() const {
 	return _packer->get_texture_flags();
diff --git a/library/terrain_material_cache_pcm.h b/library/terrain_2d_material_cache_pcm.h
similarity index 98%
rename from library/terrain_material_cache_pcm.h
rename to library/terrain_2d_material_cache_pcm.h
index 1644af0..aa27eea 100644
--- a/library/terrain_material_cache_pcm.h
+++ b/library/terrain_2d_material_cache_pcm.h
@@ -23,7 +23,7 @@ SOFTWARE.
 #ifndef TERRAIN_MATERIAL_CACHE_PCM_H
 #define TERRAIN_MATERIAL_CACHE_PCM_H
 
-#include "terrain_material_cache.h"
+#include "terrain_2d_material_cache.h"
 
 #include "core/version.h"
 
diff --git a/library/terrain_surface.cpp b/library/terrain_2d_surface.cpp
similarity index 99%
rename from library/terrain_surface.cpp
rename to library/terrain_2d_surface.cpp
index 401f54a..9ec4ae5 100644
--- a/library/terrain_surface.cpp
+++ b/library/terrain_2d_surface.cpp
@@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#include "terrain_surface.h"
+#include "terrain_2d_surface.h"
 
 int TerrainSurface::get_id() const {
 	return _id;
diff --git a/library/terrain_surface.h b/library/terrain_2d_surface.h
similarity index 98%
rename from library/terrain_surface.h
rename to library/terrain_2d_surface.h
index 8420450..cf08a69 100644
--- a/library/terrain_surface.h
+++ b/library/terrain_2d_surface.h
@@ -39,7 +39,7 @@ SOFTWARE.
 #include "core/math/rect2.h"
 #include "scene/resources/material.h"
 
-#include "terrain_library.h"
+#include "terrain_2d_library.h"
 
 class TerrainLibrary;
 
diff --git a/library/terrain_surface_merger.cpp b/library/terrain_2d_surface_merger.cpp
similarity index 97%
rename from library/terrain_surface_merger.cpp
rename to library/terrain_2d_surface_merger.cpp
index c56fc5f..0e3b2ab 100644
--- a/library/terrain_surface_merger.cpp
+++ b/library/terrain_2d_surface_merger.cpp
@@ -20,9 +20,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#include "terrain_surface_merger.h"
+#include "terrain_2d_surface_merger.h"
 
-#include "terrain_library_merger.h"
+#include "terrain_2d_library_merger.h"
 
 #include "../defines.h"
 
diff --git a/library/terrain_surface_merger.h b/library/terrain_2d_surface_merger.h
similarity index 98%
rename from library/terrain_surface_merger.h
rename to library/terrain_2d_surface_merger.h
index 011c189..2648847 100644
--- a/library/terrain_surface_merger.h
+++ b/library/terrain_2d_surface_merger.h
@@ -23,7 +23,7 @@ SOFTWARE.
 #ifndef TERRAIN_SURFACE_MERGER_H
 #define TERRAIN_SURFACE_MERGER_H
 
-#include "terrain_surface.h"
+#include "terrain_2d_surface.h"
 
 #include "scene/resources/texture.h"
 
diff --git a/library/terrain_surface_simple.cpp b/library/terrain_2d_surface_simple.cpp
similarity index 97%
rename from library/terrain_surface_simple.cpp
rename to library/terrain_2d_surface_simple.cpp
index 56d342f..bb28b63 100644
--- a/library/terrain_surface_simple.cpp
+++ b/library/terrain_2d_surface_simple.cpp
@@ -20,9 +20,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#include "terrain_surface_simple.h"
+#include "terrain_2d_surface_simple.h"
 
-#include "terrain_library_simple.h"
+#include "terrain_2d_library_simple.h"
 
 int TerrainSurfaceSimple::get_atlas_x(const TerrainSurfaceSides side) const {
 	int indx = (side * 2);
diff --git a/library/terrain_surface_simple.h b/library/terrain_2d_surface_simple.h
similarity index 98%
rename from library/terrain_surface_simple.h
rename to library/terrain_2d_surface_simple.h
index 37742d4..c405c13 100644
--- a/library/terrain_surface_simple.h
+++ b/library/terrain_2d_surface_simple.h
@@ -23,7 +23,7 @@ SOFTWARE.
 #ifndef TERRAIN_SURFACE_SIMPLE_H
 #define TERRAIN_SURFACE_SIMPLE_H
 
-#include "terrain_surface.h"
+#include "terrain_2d_surface.h"
 
 class TerrainSurfaceSimple : public TerrainSurface {
 	GDCLASS(TerrainSurfaceSimple, TerrainSurface)
diff --git a/meshers/blocky/terrain_mesher_blocky.cpp b/meshers/blocky/terrain_2d_mesher_blocky.cpp
similarity index 99%
rename from meshers/blocky/terrain_mesher_blocky.cpp
rename to meshers/blocky/terrain_2d_mesher_blocky.cpp
index 6e6caa7..ea2a266 100644
--- a/meshers/blocky/terrain_mesher_blocky.cpp
+++ b/meshers/blocky/terrain_2d_mesher_blocky.cpp
@@ -20,11 +20,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#include "terrain_mesher_blocky.h"
+#include "terrain_2d_mesher_blocky.h"
 
 #include "core/math/math_funcs.h"
 
-#include "../../library/terrain_material_cache.h"
+#include "../../library/terrain_2d_material_cache.h"
 
 bool TerrainMesherBlocky::get_always_add_colors() const {
 	return _always_add_colors;
diff --git a/meshers/blocky/terrain_mesher_blocky.h b/meshers/blocky/terrain_2d_mesher_blocky.h
similarity index 95%
rename from meshers/blocky/terrain_mesher_blocky.h
rename to meshers/blocky/terrain_2d_mesher_blocky.h
index 6b57abd..c746d09 100644
--- a/meshers/blocky/terrain_mesher_blocky.h
+++ b/meshers/blocky/terrain_2d_mesher_blocky.h
@@ -34,8 +34,8 @@ SOFTWARE.
 #include "core/math/vector2.h"
 #include "core/math/vector3.h"
 
-#include "../default/terrain_mesher_default.h"
-#include "../../world/default/terrain_chunk_default.h"
+#include "../default/terrain_2d_mesher_default.h"
+#include "../../world/default/terrain_2d_chunk_default.h"
 
 class TerrainMesherBlocky : public TerrainMesherDefault {
 	GDCLASS(TerrainMesherBlocky, TerrainMesherDefault);
diff --git a/meshers/default/terrain_mesher_default.cpp b/meshers/default/terrain_2d_mesher_default.cpp
similarity index 98%
rename from meshers/default/terrain_mesher_default.cpp
rename to meshers/default/terrain_2d_mesher_default.cpp
index 3b4265a..63d3759 100644
--- a/meshers/default/terrain_mesher_default.cpp
+++ b/meshers/default/terrain_2d_mesher_default.cpp
@@ -20,9 +20,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#include "terrain_mesher_default.h"
+#include "terrain_2d_mesher_default.h"
 
-#include "../../world/default/terrain_chunk_default.h"
+#include "../../world/default/terrain_2d_chunk_default.h"
 
 #include "../../defines.h"
 
diff --git a/meshers/default/terrain_mesher_default.h b/meshers/default/terrain_2d_mesher_default.h
similarity index 98%
rename from meshers/default/terrain_mesher_default.h
rename to meshers/default/terrain_2d_mesher_default.h
index 731d305..2df1269 100644
--- a/meshers/default/terrain_mesher_default.h
+++ b/meshers/default/terrain_2d_mesher_default.h
@@ -34,7 +34,7 @@ SOFTWARE.
 #include "core/math/vector2.h"
 #include "core/math/vector3.h"
 
-#include "../terrain_mesher.h"
+#include "../terrain_2d_mesher.h"
 
 class TerrainMesherDefault : public TerrainMesher {
 	GDCLASS(TerrainMesherDefault, TerrainMesher);
diff --git a/meshers/terrain_mesher.cpp b/meshers/terrain_2d_mesher.cpp
similarity index 99%
rename from meshers/terrain_mesher.cpp
rename to meshers/terrain_2d_mesher.cpp
index b755dbe..974004b 100644
--- a/meshers/terrain_mesher.cpp
+++ b/meshers/terrain_2d_mesher.cpp
@@ -20,14 +20,14 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#include "terrain_mesher.h"
+#include "terrain_2d_mesher.h"
 
 #include "../defines.h"
 
 #include mesh_instance_h
 
-#include "../world/default/terrain_chunk_default.h"
-#include "../world/terrain_chunk.h"
+#include "../world/default/terrain_2d_chunk_default.h"
+#include "../world/terrain_2d_chunk.h"
 
 bool TerrainMesher::Vertex::operator==(const Vertex &p_vertex) const {
 	if (vertex != p_vertex.vertex)
diff --git a/meshers/terrain_mesher.h b/meshers/terrain_2d_mesher.h
similarity index 99%
rename from meshers/terrain_mesher.h
rename to meshers/terrain_2d_mesher.h
index 56453bc..ce01a8f 100644
--- a/meshers/terrain_mesher.h
+++ b/meshers/terrain_2d_mesher.h
@@ -56,7 +56,7 @@ include_pool_vector
 #include "../../mesh_data_resource/mesh_data_resource.h"
 #endif
 
-#include "../library/terrain_library.h"
+#include "../library/terrain_2d_library.h"
 
 		class TerrainLibrary;
 class TerrainChunk;
diff --git a/nodes/terrain_light_node.cpp b/nodes/terrain_2d_light_node.cpp
similarity index 78%
rename from nodes/terrain_light_node.cpp
rename to nodes/terrain_2d_light_node.cpp
index bfb539c..fb7a6af 100644
--- a/nodes/terrain_light_node.cpp
+++ b/nodes/terrain_2d_light_node.cpp
@@ -1,4 +1,4 @@
-#include "terrain_light_node.h"
+#include "terrain_2d_light_node.h"
 
 TerrainLightNode::TerrainLightNode() {
 }
diff --git a/nodes/terrain_light_node.h b/nodes/terrain_2d_light_node.h
similarity index 100%
rename from nodes/terrain_light_node.h
rename to nodes/terrain_2d_light_node.h
diff --git a/register_types.cpp b/register_types.cpp
index d9ce5a8..f3000cf 100644
--- a/register_types.cpp
+++ b/register_types.cpp
@@ -22,51 +22,51 @@ SOFTWARE.
 
 #include "register_types.h"
 
-#include "library/terrain_surface.h"
-#include "library/terrain_surface_simple.h"
+#include "library/terrain_2d_surface.h"
+#include "library/terrain_2d_surface_simple.h"
 
-#include "library/terrain_material_cache.h"
-#include "library/terrain_library.h"
-#include "library/terrain_library_simple.h"
+#include "library/terrain_2d_material_cache.h"
+#include "library/terrain_2d_library.h"
+#include "library/terrain_2d_library_simple.h"
 
 #ifdef TEXTURE_PACKER_PRESENT
-#include "library/terrain_surface_merger.h"
-#include "library/terrain_library_merger.h"
-#include "library/terrain_library_merger_pcm.h"
-#include "library/terrain_material_cache_pcm.h"
+#include "library/terrain_2d_surface_merger.h"
+#include "library/terrain_2d_library_merger.h"
+#include "library/terrain_2d_library_merger_pcm.h"
+#include "library/terrain_2d_material_cache_pcm.h"
 #endif
 
-#include "data/terrain_light.h"
-#include "meshers/terrain_mesher.h"
+#include "data/terrain_2d_light.h"
+#include "meshers/terrain_2d_mesher.h"
 
-#include "world/block_terrain_structure.h"
-#include "world/terrain_chunk.h"
-#include "world/terrain_environment_data.h"
-#include "world/terrain_structure.h"
-#include "world/terrain_world.h"
+#include "world/block_terrain_2d_structure.h"
+#include "world/terrain_2d_chunk.h"
+#include "world/terrain_2d_environment_data.h"
+#include "world/terrain_2d_structure.h"
+#include "world/terrain_2d_world.h"
 
-#include "world/default/terrain_chunk_default.h"
-#include "world/default/terrain_world_default.h"
+#include "world/default/terrain_2d_chunk_default.h"
+#include "world/default/terrain_2d_world_default.h"
 
-#include "level_generator/terrain_level_generator.h"
-#include "level_generator/terrain_level_generator_flat.h"
+#include "level_generator/terrain_2d_level_generator.h"
+#include "level_generator/terrain_2d_level_generator_flat.h"
 
-#include "areas/terrain_world_area.h"
+#include "areas/terrain_2d_world_area.h"
 
-#include "world/terrain_world_editor.h"
+#include "world/terrain_2d_world_editor.h"
 
-#include "meshers/blocky/terrain_mesher_blocky.h"
+#include "meshers/blocky/terrain_2d_mesher_blocky.h"
 
-#include "world/blocky/terrain_chunk_blocky.h"
-#include "world/blocky/terrain_world_blocky.h"
+#include "world/blocky/terrain_2d_chunk_blocky.h"
+#include "world/blocky/terrain_2d_world_blocky.h"
 
-#include "nodes/terrain_light_node.h"
+#include "nodes/terrain_2d_light_node.h"
 
-#include "world/jobs/terrain_job.h"
-#include "world/jobs/terrain_light_job.h"
-#include "world/jobs/terrain_mesher_job_step.h"
-#include "world/jobs/terrain_prop_job.h"
-#include "world/jobs/terrain_terrain_job.h"
+#include "world/jobs/terrain_2d_job.h"
+#include "world/jobs/terrain_2d_light_job.h"
+#include "world/jobs/terrain_2d_mesher_job_step.h"
+#include "world/jobs/terrain_2d_prop_job.h"
+#include "world/jobs/terrain_2d_terrain_job.h"
 
 void register_terraman_2d_types() {
 	ClassDB::register_class<TerrainMesher>();
diff --git a/world/block_terrain_structure.cpp b/world/block_terrain_2d_structure.cpp
similarity index 98%
rename from world/block_terrain_structure.cpp
rename to world/block_terrain_2d_structure.cpp
index 1503569..cd8e04c 100644
--- a/world/block_terrain_structure.cpp
+++ b/world/block_terrain_2d_structure.cpp
@@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#include "block_terrain_structure.h"
+#include "block_terrain_2d_structure.h"
 
 int BlockTerrainStructure::get_channel_type() const {
 	return _channel_type;
diff --git a/world/block_terrain_structure.h b/world/block_terrain_2d_structure.h
similarity index 97%
rename from world/block_terrain_structure.h
rename to world/block_terrain_2d_structure.h
index 5572bf6..fc2571e 100644
--- a/world/block_terrain_structure.h
+++ b/world/block_terrain_2d_structure.h
@@ -31,14 +31,14 @@ SOFTWARE.
 #include "core/vector.h"
 #endif
 
-#include "terrain_structure.h"
+#include "terrain_2d_structure.h"
 
 #include "../defines.h"
 
 #include pool_vector_h
 include_pool_vector
 
-#include "terrain_chunk.h"
+#include "terrain_2d_chunk.h"
 		;
 
 class BlockTerrainStructure : public TerrainStructure {
diff --git a/world/blocky/terrain_chunk_blocky.cpp b/world/blocky/terrain_2d_chunk_blocky.cpp
similarity index 98%
rename from world/blocky/terrain_chunk_blocky.cpp
rename to world/blocky/terrain_2d_chunk_blocky.cpp
index 2a8b65e..6d3da94 100644
--- a/world/blocky/terrain_chunk_blocky.cpp
+++ b/world/blocky/terrain_2d_chunk_blocky.cpp
@@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#include "terrain_chunk_blocky.h"
+#include "terrain_2d_chunk_blocky.h"
 
 #include "../../defines.h"
 
diff --git a/world/blocky/terrain_chunk_blocky.h b/world/blocky/terrain_2d_chunk_blocky.h
similarity index 96%
rename from world/blocky/terrain_chunk_blocky.h
rename to world/blocky/terrain_2d_chunk_blocky.h
index dd54c64..7e8e3f3 100644
--- a/world/blocky/terrain_chunk_blocky.h
+++ b/world/blocky/terrain_2d_chunk_blocky.h
@@ -23,7 +23,7 @@ SOFTWARE.
 #ifndef TERRAIN_CHUNK_BLOCKY_H
 #define TERRAIN_CHUNK_BLOCKY_H
 
-#include "../default/terrain_chunk_default.h"
+#include "../default/terrain_2d_chunk_default.h"
 
 class TerrainChunkBlocky : public TerrainChunkDefault {
 	GDCLASS(TerrainChunkBlocky, TerrainChunkDefault);
diff --git a/world/blocky/terrain_world_blocky.cpp b/world/blocky/terrain_2d_world_blocky.cpp
similarity index 92%
rename from world/blocky/terrain_world_blocky.cpp
rename to world/blocky/terrain_2d_world_blocky.cpp
index 3839d4a..c5ae23a 100644
--- a/world/blocky/terrain_world_blocky.cpp
+++ b/world/blocky/terrain_2d_world_blocky.cpp
@@ -20,14 +20,14 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#include "terrain_world_blocky.h"
+#include "terrain_2d_world_blocky.h"
 
-#include "terrain_chunk_blocky.h"
+#include "terrain_2d_chunk_blocky.h"
 
-#include "../../meshers/blocky/terrain_mesher_blocky.h"
-#include "../jobs/terrain_light_job.h"
-#include "../jobs/terrain_prop_job.h"
-#include "../jobs/terrain_terrain_job.h"
+#include "../../meshers/blocky/terrain_2d_mesher_blocky.h"
+#include "../jobs/terrain_2d_light_job.h"
+#include "../jobs/terrain_2d_prop_job.h"
+#include "../jobs/terrain_2d_terrain_job.h"
 
 Ref<TerrainChunk> TerrainWorldBlocky::_create_chunk(int x, int z, Ref<TerrainChunk> chunk) {
 	if (!chunk.is_valid()) {
diff --git a/world/blocky/terrain_world_blocky.h b/world/blocky/terrain_2d_world_blocky.h
similarity index 96%
rename from world/blocky/terrain_world_blocky.h
rename to world/blocky/terrain_2d_world_blocky.h
index c74983a..0fa5394 100644
--- a/world/blocky/terrain_world_blocky.h
+++ b/world/blocky/terrain_2d_world_blocky.h
@@ -23,7 +23,7 @@ SOFTWARE.
 #ifndef TERRAIN_WORLD_BLOCKY_H
 #define TERRAIN_WORLD_BLOCKY_H
 
-#include "../default/terrain_world_default.h"
+#include "../default/terrain_2d_world_default.h"
 
 class TerrainWorldBlocky : public TerrainWorldDefault {
 	GDCLASS(TerrainWorldBlocky, TerrainWorldDefault);
diff --git a/world/default/terrain_chunk_default.cpp b/world/default/terrain_2d_chunk_default.cpp
similarity index 98%
rename from world/default/terrain_chunk_default.cpp
rename to world/default/terrain_2d_chunk_default.cpp
index ae65542..5850757 100644
--- a/world/default/terrain_chunk_default.cpp
+++ b/world/default/terrain_2d_chunk_default.cpp
@@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#include "terrain_chunk_default.h"
+#include "terrain_2d_chunk_default.h"
 
 #include "../../defines.h"
 
@@ -28,16 +28,16 @@ SOFTWARE.
 #include physics_server_h
 
 #include "../../../opensimplex/open_simplex_noise.h"
-#include "../../meshers/default/terrain_mesher_default.h"
-#include "../terrain_world.h"
+#include "../../meshers/default/terrain_2d_mesher_default.h"
+#include "../terrain_2d_world.h"
 
-#include "../jobs/terrain_job.h"
+#include "../jobs/terrain_2d_job.h"
 
-#include "terrain_world_default.h"
+#include "terrain_2d_world_default.h"
 
-#include "../jobs/terrain_light_job.h"
-#include "../jobs/terrain_prop_job.h"
-#include "../jobs/terrain_terrain_job.h"
+#include "../jobs/terrain_2d_light_job.h"
+#include "../jobs/terrain_2d_prop_job.h"
+#include "../jobs/terrain_2d_terrain_job.h"
 
 const String TerrainChunkDefault::BINDING_STRING_BUILD_FLAGS = "Use Isolevel,Use Lighting,Use AO,Use RAO,Generate AO,Generate RAO,Bake Lights,Create Collider,Create Lods";
 
diff --git a/world/default/terrain_chunk_default.h b/world/default/terrain_2d_chunk_default.h
similarity index 96%
rename from world/default/terrain_chunk_default.h
rename to world/default/terrain_2d_chunk_default.h
index d94cecd..3d94675 100644
--- a/world/default/terrain_chunk_default.h
+++ b/world/default/terrain_2d_chunk_default.h
@@ -36,7 +36,7 @@ SOFTWARE.
 #endif
 
 
-#include "../terrain_chunk.h"
+#include "../terrain_2d_chunk.h"
 
 #include "../../defines.h"
 
@@ -45,11 +45,11 @@ SOFTWARE.
 #include "core/os/thread_safe.h"
 
 #include "scene/resources/packed_scene.h"
-#include "../terrain_world.h"
-#include "../../data/terrain_light.h"
-#include "../../meshers/terrain_mesher.h"
-#include "../../library/terrain_surface.h"
-#include "../../library/terrain_library.h"
+#include "../terrain_2d_world.h"
+#include "../../data/terrain_2d_light.h"
+#include "../../meshers/terrain_2d_mesher.h"
+#include "../../library/terrain_2d_surface.h"
+#include "../../library/terrain_2d_library.h"
 
 class TerrainWorld;
 class TerrainJob;
diff --git a/world/default/terrain_world_default.cpp b/world/default/terrain_2d_world_default.cpp
similarity index 97%
rename from world/default/terrain_world_default.cpp
rename to world/default/terrain_2d_world_default.cpp
index 30189ce..a1bc838 100644
--- a/world/default/terrain_world_default.cpp
+++ b/world/default/terrain_2d_world_default.cpp
@@ -20,16 +20,16 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#include "terrain_world_default.h"
+#include "terrain_2d_world_default.h"
 
-#include "terrain_chunk_default.h"
+#include "terrain_2d_chunk_default.h"
 
 #include "../../defines.h"
 
-#include "../../meshers/default/terrain_mesher_default.h"
-#include "../jobs/terrain_light_job.h"
-#include "../jobs/terrain_prop_job.h"
-#include "../jobs/terrain_terrain_job.h"
+#include "../../meshers/default/terrain_2d_mesher_default.h"
+#include "../jobs/terrain_2d_light_job.h"
+#include "../jobs/terrain_2d_prop_job.h"
+#include "../jobs/terrain_2d_terrain_job.h"
 
 _FORCE_INLINE_ int TerrainWorldDefault::get_build_flags() const {
 	return _build_flags;
diff --git a/world/default/terrain_world_default.h b/world/default/terrain_2d_world_default.h
similarity index 98%
rename from world/default/terrain_world_default.h
rename to world/default/terrain_2d_world_default.h
index 2e830b9..bef769b 100644
--- a/world/default/terrain_world_default.h
+++ b/world/default/terrain_2d_world_default.h
@@ -23,7 +23,7 @@ SOFTWARE.
 #ifndef TERRAIN_WORLD_DEFAULT_H
 #define TERRAIN_WORLD_DEFAULT_H
 
-#include "../terrain_world.h"
+#include "../terrain_2d_world.h"
 
 class TerrainWorldDefault : public TerrainWorld {
 	GDCLASS(TerrainWorldDefault, TerrainWorld);
diff --git a/world/jobs/terrain_job.cpp b/world/jobs/terrain_2d_job.cpp
similarity index 99%
rename from world/jobs/terrain_job.cpp
rename to world/jobs/terrain_2d_job.cpp
index b40d912..647322b 100644
--- a/world/jobs/terrain_job.cpp
+++ b/world/jobs/terrain_2d_job.cpp
@@ -20,9 +20,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#include "terrain_job.h"
+#include "terrain_2d_job.h"
 
-#include "../default/terrain_chunk_default.h"
+#include "../default/terrain_2d_chunk_default.h"
 
 #include "../../../opensimplex/open_simplex_noise.h"
 
diff --git a/world/jobs/terrain_job.h b/world/jobs/terrain_2d_job.h
similarity index 100%
rename from world/jobs/terrain_job.h
rename to world/jobs/terrain_2d_job.h
diff --git a/world/jobs/terrain_light_job.cpp b/world/jobs/terrain_2d_light_job.cpp
similarity index 91%
rename from world/jobs/terrain_light_job.cpp
rename to world/jobs/terrain_2d_light_job.cpp
index 8f4468d..3191042 100644
--- a/world/jobs/terrain_light_job.cpp
+++ b/world/jobs/terrain_2d_light_job.cpp
@@ -20,15 +20,15 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#include "terrain_light_job.h"
+#include "terrain_2d_light_job.h"
 
 #include "../../defines.h"
 
-#include "../../library/terrain_surface.h"
-#include "../../library/terrain_library.h"
+#include "../../library/terrain_2d_surface.h"
+#include "../../library/terrain_2d_library.h"
 
-#include "../../meshers/terrain_mesher.h"
-#include "../default/terrain_chunk_default.h"
+#include "../../meshers/terrain_2d_mesher.h"
+#include "../default/terrain_2d_chunk_default.h"
 
 void TerrainLightJob::phase_light() {
 	Ref<TerrainChunkDefault> chunk = _chunk;
diff --git a/world/jobs/terrain_light_job.h b/world/jobs/terrain_2d_light_job.h
similarity index 98%
rename from world/jobs/terrain_light_job.h
rename to world/jobs/terrain_2d_light_job.h
index 9877672..1583231 100644
--- a/world/jobs/terrain_light_job.h
+++ b/world/jobs/terrain_2d_light_job.h
@@ -23,7 +23,7 @@ SOFTWARE.
 #ifndef TERRAIN_LIGHT_JOB_H
 #define TERRAIN_LIGHT_JOB_H
 
-#include "terrain_job.h"
+#include "terrain_2d_job.h"
 
 class TerrainMesher;
 
diff --git a/world/jobs/terrain_mesher_job_step.cpp b/world/jobs/terrain_2d_mesher_job_step.cpp
similarity index 99%
rename from world/jobs/terrain_mesher_job_step.cpp
rename to world/jobs/terrain_2d_mesher_job_step.cpp
index aeb43de..1e9a324 100644
--- a/world/jobs/terrain_mesher_job_step.cpp
+++ b/world/jobs/terrain_2d_mesher_job_step.cpp
@@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#include "terrain_mesher_job_step.h"
+#include "terrain_2d_mesher_job_step.h"
 
 const String TerrainMesherJobStep::BINDING_STRING_TERRAIN_TERRAIN_JOB_STEP_TYPE = "Normal,Normal LOD,Drop UV2,Merge Verts,Bake Texture,Simplify Mesh";
 
diff --git a/world/jobs/terrain_mesher_job_step.h b/world/jobs/terrain_2d_mesher_job_step.h
similarity index 100%
rename from world/jobs/terrain_mesher_job_step.h
rename to world/jobs/terrain_2d_mesher_job_step.h
diff --git a/world/jobs/terrain_prop_job.cpp b/world/jobs/terrain_2d_prop_job.cpp
similarity index 97%
rename from world/jobs/terrain_prop_job.cpp
rename to world/jobs/terrain_2d_prop_job.cpp
index 19a8bd8..fcaa334 100644
--- a/world/jobs/terrain_prop_job.cpp
+++ b/world/jobs/terrain_2d_prop_job.cpp
@@ -20,23 +20,23 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#include "terrain_prop_job.h"
+#include "terrain_2d_prop_job.h"
 
 #include "../../defines.h"
 
-#include "../../library/terrain_material_cache.h"
-#include "../../library/terrain_surface.h"
-#include "../../library/terrain_library.h"
+#include "../../library/terrain_2d_material_cache.h"
+#include "../../library/terrain_2d_surface.h"
+#include "../../library/terrain_2d_library.h"
 
-#include "../../meshers/default/terrain_mesher_default.h"
-#include "../../meshers/terrain_mesher.h"
-#include "../default/terrain_chunk_default.h"
+#include "../../meshers/default/terrain_2d_mesher_default.h"
+#include "../../meshers/terrain_2d_mesher.h"
+#include "../default/terrain_2d_chunk_default.h"
 
 #ifdef MESH_DATA_RESOURCE_PRESENT
 #include "../../../mesh_data_resource/mesh_data_resource.h"
 #endif
 
-#include "../../world/default/terrain_world_default.h"
+#include "../../world/default/terrain_2d_world_default.h"
 
 #ifdef MESH_UTILS_PRESENT
 #include "../../../mesh_utils/fast_quadratic_mesh_simplifier.h"
diff --git a/world/jobs/terrain_prop_job.h b/world/jobs/terrain_2d_prop_job.h
similarity index 97%
rename from world/jobs/terrain_prop_job.h
rename to world/jobs/terrain_2d_prop_job.h
index 602129b..d80b1c4 100644
--- a/world/jobs/terrain_prop_job.h
+++ b/world/jobs/terrain_2d_prop_job.h
@@ -23,9 +23,9 @@ SOFTWARE.
 #ifndef TERRAIN_PROP_JOB_H
 #define TERRAIN_PROP_JOB_H
 
-#include "terrain_job.h"
+#include "terrain_2d_job.h"
 
-#include "terrain_mesher_job_step.h"
+#include "terrain_2d_mesher_job_step.h"
 
 class TerrainMesher;
 
diff --git a/world/jobs/terrain_terrain_job.cpp b/world/jobs/terrain_2d_terrain_job.cpp
similarity index 98%
rename from world/jobs/terrain_terrain_job.cpp
rename to world/jobs/terrain_2d_terrain_job.cpp
index f13efbb..28dc166 100644
--- a/world/jobs/terrain_terrain_job.cpp
+++ b/world/jobs/terrain_2d_terrain_job.cpp
@@ -20,16 +20,16 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#include "terrain_terrain_job.h"
+#include "terrain_2d_terrain_job.h"
 
-#include "../../library/terrain_material_cache.h"
-#include "../../library/terrain_surface.h"
-#include "../../library/terrain_library.h"
+#include "../../library/terrain_2d_material_cache.h"
+#include "../../library/terrain_2d_surface.h"
+#include "../../library/terrain_2d_library.h"
 
-#include "../../meshers/default/terrain_mesher_default.h"
-#include "../../meshers/terrain_mesher.h"
+#include "../../meshers/default/terrain_2d_mesher_default.h"
+#include "../../meshers/terrain_2d_mesher.h"
 
-#include "../default/terrain_chunk_default.h"
+#include "../default/terrain_2d_chunk_default.h"
 
 #ifdef MESH_UTILS_PRESENT
 #include "../../../mesh_utils/fast_quadratic_mesh_simplifier.h"
diff --git a/world/jobs/terrain_terrain_job.h b/world/jobs/terrain_2d_terrain_job.h
similarity index 97%
rename from world/jobs/terrain_terrain_job.h
rename to world/jobs/terrain_2d_terrain_job.h
index 3bfcf5f..0fa17f6 100644
--- a/world/jobs/terrain_terrain_job.h
+++ b/world/jobs/terrain_2d_terrain_job.h
@@ -23,9 +23,9 @@ SOFTWARE.
 #ifndef TERRAIN_TERRAIN_JOB_H
 #define TERRAIN_TERRAIN_JOB_H
 
-#include "terrain_job.h"
+#include "terrain_2d_job.h"
 
-#include "terrain_mesher_job_step.h"
+#include "terrain_2d_mesher_job_step.h"
 
 #include "../../defines.h"
 
diff --git a/world/terrain_chunk.cpp b/world/terrain_2d_chunk.cpp
similarity index 99%
rename from world/terrain_chunk.cpp
rename to world/terrain_2d_chunk.cpp
index 81d27c8..ca61efc 100644
--- a/world/terrain_chunk.cpp
+++ b/world/terrain_2d_chunk.cpp
@@ -20,17 +20,17 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#include "terrain_chunk.h"
+#include "terrain_2d_chunk.h"
 
-#include "terrain_world.h"
+#include "terrain_2d_world.h"
 
 #include "../thirdparty/lz4/lz4.h"
 
 #include "../defines.h"
 
 #include "core/message_queue.h"
-#include "jobs/terrain_job.h"
-#include "terrain_structure.h"
+#include "jobs/terrain_2d_job.h"
+#include "terrain_2d_structure.h"
 
 #if THREAD_POOL_PRESENT
 #include "../../thread_pool/thread_pool.h"
diff --git a/world/terrain_chunk.h b/world/terrain_2d_chunk.h
similarity index 98%
rename from world/terrain_chunk.h
rename to world/terrain_2d_chunk.h
index 8306563..51d15d2 100644
--- a/world/terrain_chunk.h
+++ b/world/terrain_2d_chunk.h
@@ -48,11 +48,11 @@ include_pool_vector
 
 #include "scene/resources/packed_scene.h"
 
-#include "terrain_world.h"
+#include "terrain_2d_world.h"
 
-#include "../data/terrain_light.h"
+#include "../data/terrain_2d_light.h"
 
-#include "../meshers/terrain_mesher.h"
+#include "../meshers/terrain_2d_mesher.h"
 
 #if PROPS_PRESENT
 #include "../../props/props/prop_data.h"
@@ -64,8 +64,8 @@ include_pool_vector
 #define Texture Texture2D
 #endif
 
-#include "../library/terrain_surface.h"
-#include "../library/terrain_library.h"
+#include "../library/terrain_2d_surface.h"
+#include "../library/terrain_2d_library.h"
 		; //hackfix for a clang format issue
 
 class TerrainJob;
diff --git a/world/terrain_environment_data.cpp b/world/terrain_2d_environment_data.cpp
similarity index 99%
rename from world/terrain_environment_data.cpp
rename to world/terrain_2d_environment_data.cpp
index 4c19ad1..78537e0 100644
--- a/world/terrain_environment_data.cpp
+++ b/world/terrain_2d_environment_data.cpp
@@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#include "terrain_environment_data.h"
+#include "terrain_2d_environment_data.h"
 
 Ref<Environment> TerrainEnvironmentData::get_environment() {
 	return _environment;
diff --git a/world/terrain_environment_data.h b/world/terrain_2d_environment_data.h
similarity index 100%
rename from world/terrain_environment_data.h
rename to world/terrain_2d_environment_data.h
diff --git a/world/terrain_structure.cpp b/world/terrain_2d_structure.cpp
similarity index 99%
rename from world/terrain_structure.cpp
rename to world/terrain_2d_structure.cpp
index 5b18730..0308f54 100644
--- a/world/terrain_structure.cpp
+++ b/world/terrain_2d_structure.cpp
@@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#include "terrain_structure.h"
+#include "terrain_2d_structure.h"
 
 bool TerrainStructure::get_use_aabb() const {
 	return _use_aabb;
diff --git a/world/terrain_structure.h b/world/terrain_2d_structure.h
similarity index 98%
rename from world/terrain_structure.h
rename to world/terrain_2d_structure.h
index 34dddf3..cc0a0a5 100644
--- a/world/terrain_structure.h
+++ b/world/terrain_2d_structure.h
@@ -38,7 +38,7 @@ SOFTWARE.
 #include pool_vector_h
 include_pool_vector
 #include "core/math/aabb.h"
-#include "terrain_chunk.h"
+#include "terrain_2d_chunk.h"
 
 		class TerrainStructure : public Resource {
 	GDCLASS(TerrainStructure, Resource);
diff --git a/world/terrain_world.cpp b/world/terrain_2d_world.cpp
similarity index 99%
rename from world/terrain_world.cpp
rename to world/terrain_2d_world.cpp
index fc06c4c..fc7da56 100644
--- a/world/terrain_world.cpp
+++ b/world/terrain_2d_world.cpp
@@ -20,13 +20,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#include "terrain_world.h"
+#include "terrain_2d_world.h"
 
 #include "core/version.h"
 
 #include "core/message_queue.h"
-#include "terrain_chunk.h"
-#include "terrain_structure.h"
+#include "terrain_2d_chunk.h"
+#include "terrain_2d_structure.h"
 
 #include "../defines.h"
 
diff --git a/world/terrain_world.h b/world/terrain_2d_world.h
similarity index 98%
rename from world/terrain_world.h
rename to world/terrain_2d_world.h
index 34e443e..0ce5ca0 100644
--- a/world/terrain_world.h
+++ b/world/terrain_2d_world.h
@@ -37,9 +37,9 @@ SOFTWARE.
 
 #include navigation_h
 
-#include "../areas/terrain_world_area.h"
-#include "../level_generator/terrain_level_generator.h"
-#include "../library/terrain_library.h"
+#include "../areas/terrain_2d_world_area.h"
+#include "../level_generator/terrain_2d_level_generator.h"
+#include "../library/terrain_2d_library.h"
 
 #include "core/os/os.h"
 
diff --git a/world/terrain_world_editor.cpp b/world/terrain_2d_world_editor.cpp
similarity index 98%
rename from world/terrain_world_editor.cpp
rename to world/terrain_2d_world_editor.cpp
index 92cc67e..03b8239 100644
--- a/world/terrain_world_editor.cpp
+++ b/world/terrain_2d_world_editor.cpp
@@ -20,21 +20,21 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#include "terrain_world_editor.h"
+#include "terrain_2d_world_editor.h"
 
 #include "core/version.h"
 
 #include "editor/editor_scale.h"
 #include "editor/editor_settings.h"
 
-#include "terrain_world.h"
+#include "terrain_2d_world.h"
 
 #include "core/os/keyboard.h"
 
-#include "terrain_chunk.h"
+#include "terrain_2d_chunk.h"
 
-#include "../library/terrain_surface.h"
-#include "../library/terrain_library.h"
+#include "../library/terrain_2d_surface.h"
+#include "../library/terrain_2d_library.h"
 
 #include "../defines.h"
 
diff --git a/world/terrain_world_editor.h b/world/terrain_2d_world_editor.h
similarity index 100%
rename from world/terrain_world_editor.h
rename to world/terrain_2d_world_editor.h