5 files changed, 10 insertions, 5 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4efc76a90..0897a3275 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -37,7 +37,6 @@ target_sources(
 	ItemGrid.cpp
 	JsonUtils.cpp
 	LightingThread.cpp
-	LineBlockTracer.cpp
 	LinearInterpolation.cpp
 	LoggerListeners.cpp
 	Logger.cpp
@@ -72,7 +71,6 @@ target_sources(
 	BlockInServerPluginInterface.h
 	BlockInfo.h
 	BlockState.h
-	BlockTracer.h
 	BlockType.h
 	BrewingRecipes.h
 	BoundingBox.h
@@ -111,7 +109,6 @@ target_sources(
 	LazyArray.h
 	JsonUtils.h
 	LightingThread.h
-	LineBlockTracer.h
 	LinearInterpolation.h
 	LinearUpscale.h
 	Logger.h
@@ -153,8 +150,8 @@ target_sources(
 set(FOLDERS
 	Bindings BlockEntities Blocks Entities
 	Generating HTTP Items mbedTLS++ Mobs Noise
-	OSSupport Physics Protocol Registries Simulator
-	Simulator/IncrementalRedstoneSimulator UI WorldStorage
+	OSSupport Physics Physics/Tracers Protocol Registries
+	Simulator Simulator/IncrementalRedstoneSimulator UI WorldStorage
 )
 
 # Add all child source directories:
diff --git a/src/BlockTracer.h b/src/Physics/Tracers/BlockTracer.h
index 62ae1636e..62ae1636e 100644
--- a/src/BlockTracer.h
+++ b/src/Physics/Tracers/BlockTracer.h
diff --git a/src/Physics/Tracers/CMakeLists.txt b/src/Physics/Tracers/CMakeLists.txt
new file mode 100644
index 000000000..5263abbb2
--- /dev/null
+++ b/src/Physics/Tracers/CMakeLists.txt
@@ -0,0 +1,8 @@
+target_sources(
+	${CMAKE_PROJECT_NAME} PRIVATE
+
+	LineBlockTracer.cpp
+
+	BlockTracer.h
+	LineBlockTracer.h
+)
diff --git a/src/LineBlockTracer.cpp b/src/Physics/Tracers/LineBlockTracer.cpp
index 49eba9ac8..49eba9ac8 100644
--- a/src/LineBlockTracer.cpp
+++ b/src/Physics/Tracers/LineBlockTracer.cpp
diff --git a/src/LineBlockTracer.h b/src/Physics/Tracers/LineBlockTracer.h
index b1dacee20..b1dacee20 100644
--- a/src/LineBlockTracer.h
+++ b/src/Physics/Tracers/LineBlockTracer.h