diff --git a/Marlin/configuration_store.cpp b/Marlin/src/module/configuration_store.cpp
similarity index 100%
rename from Marlin/configuration_store.cpp
rename to Marlin/src/module/configuration_store.cpp
diff --git a/Marlin/configuration_store.h b/Marlin/src/module/configuration_store.h
similarity index 100%
rename from Marlin/configuration_store.h
rename to Marlin/src/module/configuration_store.h
diff --git a/Marlin/endstops.cpp b/Marlin/src/module/endstops.cpp
similarity index 100%
rename from Marlin/endstops.cpp
rename to Marlin/src/module/endstops.cpp
diff --git a/Marlin/endstops.h b/Marlin/src/module/endstops.h
similarity index 100%
rename from Marlin/endstops.h
rename to Marlin/src/module/endstops.h
diff --git a/Marlin/planner.cpp b/Marlin/src/module/planner.cpp
similarity index 100%
rename from Marlin/planner.cpp
rename to Marlin/src/module/planner.cpp
diff --git a/Marlin/planner.h b/Marlin/src/module/planner.h
similarity index 100%
rename from Marlin/planner.h
rename to Marlin/src/module/planner.h
diff --git a/Marlin/planner_bezier.cpp b/Marlin/src/module/planner_bezier.cpp
similarity index 100%
rename from Marlin/planner_bezier.cpp
rename to Marlin/src/module/planner_bezier.cpp
diff --git a/Marlin/planner_bezier.h b/Marlin/src/module/planner_bezier.h
similarity index 100%
rename from Marlin/planner_bezier.h
rename to Marlin/src/module/planner_bezier.h
diff --git a/Marlin/printcounter.cpp b/Marlin/src/module/printcounter.cpp
similarity index 100%
rename from Marlin/printcounter.cpp
rename to Marlin/src/module/printcounter.cpp
diff --git a/Marlin/printcounter.h b/Marlin/src/module/printcounter.h
similarity index 100%
rename from Marlin/printcounter.h
rename to Marlin/src/module/printcounter.h
diff --git a/Marlin/speed_lookuptable.h b/Marlin/src/module/speed_lookuptable.h
similarity index 100%
rename from Marlin/speed_lookuptable.h
rename to Marlin/src/module/speed_lookuptable.h
diff --git a/Marlin/stepper.cpp b/Marlin/src/module/stepper.cpp
similarity index 100%
rename from Marlin/stepper.cpp
rename to Marlin/src/module/stepper.cpp
diff --git a/Marlin/stepper.h b/Marlin/src/module/stepper.h
similarity index 100%
rename from Marlin/stepper.h
rename to Marlin/src/module/stepper.h
diff --git a/Marlin/stepper_indirection.cpp b/Marlin/src/module/stepper_indirection.cpp
similarity index 100%
rename from Marlin/stepper_indirection.cpp
rename to Marlin/src/module/stepper_indirection.cpp
diff --git a/Marlin/stepper_indirection.h b/Marlin/src/module/stepper_indirection.h
similarity index 100%
rename from Marlin/stepper_indirection.h
rename to Marlin/src/module/stepper_indirection.h
diff --git a/Marlin/temperature.cpp b/Marlin/src/module/temperature.cpp
similarity index 100%
rename from Marlin/temperature.cpp
rename to Marlin/src/module/temperature.cpp
diff --git a/Marlin/temperature.h b/Marlin/src/module/temperature.h
similarity index 100%
rename from Marlin/temperature.h
rename to Marlin/src/module/temperature.h