diff --git a/src/BlockState.cpp b/src/Bindings/BlockState.cpp
similarity index 100%
rename from src/BlockState.cpp
rename to src/Bindings/BlockState.cpp
diff --git a/src/BlockState.h b/src/Bindings/BlockState.h
similarity index 100%
rename from src/BlockState.h
rename to src/Bindings/BlockState.h
diff --git a/src/BlockTypePalette.cpp b/src/Bindings/BlockTypePalette.cpp
similarity index 100%
rename from src/BlockTypePalette.cpp
rename to src/Bindings/BlockTypePalette.cpp
diff --git a/src/BlockTypePalette.h b/src/Bindings/BlockTypePalette.h
similarity index 100%
rename from src/BlockTypePalette.h
rename to src/Bindings/BlockTypePalette.h
diff --git a/src/BlockTypeRegistry.cpp b/src/Bindings/BlockTypeRegistry.cpp
similarity index 100%
rename from src/BlockTypeRegistry.cpp
rename to src/Bindings/BlockTypeRegistry.cpp
diff --git a/src/BlockTypeRegistry.h b/src/Bindings/BlockTypeRegistry.h
similarity index 100%
rename from src/BlockTypeRegistry.h
rename to src/Bindings/BlockTypeRegistry.h
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 69ea7dbd1..a3d34eb53 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -6,10 +6,7 @@ target_sources(
 	BiomeDef.cpp
 	BlockArea.cpp
 	BlockInfo.cpp
-	BlockState.cpp
 	BlockType.cpp
-	BlockTypePalette.cpp
-	BlockTypeRegistry.cpp
 	BrewingRecipes.cpp
 	Broadcaster.cpp
 	BoundingBox.cpp
@@ -53,7 +50,6 @@ target_sources(
 	MonsterConfig.cpp
 	NetherPortalScanner.cpp
 	OverridesSettingsRepository.cpp
-	PalettedBlockArea.cpp
 	ProbabDistrib.cpp
 	RankManager.cpp
 	RCONServer.cpp
@@ -76,11 +72,8 @@ target_sources(
 	BlockArea.h
 	BlockInServerPluginInterface.h
 	BlockInfo.h
-	BlockState.h
 	BlockTracer.h
 	BlockType.h
-	BlockTypePalette.h
-	BlockTypeRegistry.h
 	BrewingRecipes.h
 	BoundingBox.h
 	BuildInfo.h.cmake
@@ -135,7 +128,6 @@ target_sources(
 	NetherPortalScanner.h
 	OpaqueWorld.h
 	OverridesSettingsRepository.h
-	PalettedBlockArea.h
 	ProbabDistrib.h
 	RankManager.h
 	RCONServer.h
diff --git a/src/PalettedBlockArea.h b/src/PalettedBlockArea.h
index 3866d405b..5ded7bcb4 100644
--- a/src/PalettedBlockArea.h
+++ b/src/PalettedBlockArea.h
@@ -6,7 +6,7 @@
 
 #include <utility>
 
-#include "BlockTypePalette.h"
+#include "Bindings/BlockTypePalette.h"
 #include "Cuboid.h"
 
 
diff --git a/tests/BlockTypeRegistry/BlockStateTest.cpp b/tests/BlockTypeRegistry/BlockStateTest.cpp
index a9af34a9a..750e94d5f 100644
--- a/tests/BlockTypeRegistry/BlockStateTest.cpp
+++ b/tests/BlockTypeRegistry/BlockStateTest.cpp
@@ -1,5 +1,5 @@
 #include "Globals.h"
-#include "BlockState.h"
+#include "Bindings/BlockState.h"
 #include "../TestHelpers.h"
 
 
diff --git a/tests/BlockTypeRegistry/BlockTypePaletteTest.cpp b/tests/BlockTypeRegistry/BlockTypePaletteTest.cpp
index 1a2341bd9..23fe487c6 100644
--- a/tests/BlockTypeRegistry/BlockTypePaletteTest.cpp
+++ b/tests/BlockTypeRegistry/BlockTypePaletteTest.cpp
@@ -1,6 +1,6 @@
 #include "Globals.h"
 #include "../TestHelpers.h"
-#include "BlockTypePalette.h"
+#include "Bindings/BlockTypePalette.h"
 #include "Stopwatch.h"
 
 
diff --git a/tests/BlockTypeRegistry/BlockTypeRegistryTest.cpp b/tests/BlockTypeRegistry/BlockTypeRegistryTest.cpp
index 9e003cfcd..cac83c6a8 100644
--- a/tests/BlockTypeRegistry/BlockTypeRegistryTest.cpp
+++ b/tests/BlockTypeRegistry/BlockTypeRegistryTest.cpp
@@ -1,6 +1,6 @@
 
 #include "Globals.h"
-#include "BlockTypeRegistry.h"
+#include "Bindings/BlockTypeRegistry.h"
 #include "../TestHelpers.h"
 
 
diff --git a/tests/BlockTypeRegistry/CMakeLists.txt b/tests/BlockTypeRegistry/CMakeLists.txt
index b9036ffdf..e81d5ff38 100644
--- a/tests/BlockTypeRegistry/CMakeLists.txt
+++ b/tests/BlockTypeRegistry/CMakeLists.txt
@@ -7,7 +7,7 @@ include_directories(${PROJECT_SOURCE_DIR}/src/)
 add_executable(BlockStateTest
 	BlockStateTest.cpp
 	../TestHelpers.h
-	${PROJECT_SOURCE_DIR}/src/BlockState.cpp
+	${PROJECT_SOURCE_DIR}/src/Bindings/BlockState.cpp
 	${PROJECT_SOURCE_DIR}/src/StringUtils.cpp
 	${PROJECT_SOURCE_DIR}/src/OSSupport/CriticalSection.cpp
 )
@@ -16,8 +16,8 @@ target_link_libraries(BlockStateTest fmt::fmt)
 add_executable(BlockTypePaletteTest
 	BlockTypePaletteTest.cpp
 	../TestHelpers.h
-	${PROJECT_SOURCE_DIR}/src/BlockState.cpp
-	${PROJECT_SOURCE_DIR}/src/BlockTypePalette.cpp
+	${PROJECT_SOURCE_DIR}/src/Bindings/BlockState.cpp
+	${PROJECT_SOURCE_DIR}/src/Bindings/BlockTypePalette.cpp
 	${PROJECT_SOURCE_DIR}/src/JsonUtils.cpp
 	${PROJECT_SOURCE_DIR}/src/StringUtils.cpp
 	${PROJECT_SOURCE_DIR}/src/OSSupport/CriticalSection.cpp
@@ -29,7 +29,7 @@ target_link_libraries(BlockTypePaletteTest fmt::fmt jsoncpp_lib)
 add_executable(BlockTypeRegistryTest
 	BlockTypeRegistryTest.cpp
 	../TestHelpers.h
-	${PROJECT_SOURCE_DIR}/src/BlockTypeRegistry.cpp
+	${PROJECT_SOURCE_DIR}/src/Bindings/BlockTypeRegistry.cpp
 	${PROJECT_SOURCE_DIR}/src/StringUtils.cpp
 	${PROJECT_SOURCE_DIR}/src/OSSupport/CriticalSection.cpp
 )
@@ -39,9 +39,9 @@ target_link_libraries(BlockTypeRegistryTest fmt::fmt Threads::Threads)
 add_executable(PalettedBlockAreaTest
 	PalettedBlockAreaTest.cpp
 	../TestHelpers.h
-	${PROJECT_SOURCE_DIR}/src/BlockState.cpp
-	${PROJECT_SOURCE_DIR}/src/BlockTypeRegistry.cpp
-	${PROJECT_SOURCE_DIR}/src/BlockTypePalette.cpp
+	${PROJECT_SOURCE_DIR}/src/Bindings/BlockState.cpp
+	${PROJECT_SOURCE_DIR}/src/Bindings/BlockTypeRegistry.cpp
+	${PROJECT_SOURCE_DIR}/src/Bindings/BlockTypePalette.cpp
 	${PROJECT_SOURCE_DIR}/src/Cuboid.cpp
 	${PROJECT_SOURCE_DIR}/src/JsonUtils.cpp
 	${PROJECT_SOURCE_DIR}/src/PalettedBlockArea.cpp