diff --git a/Marlin/I2CPositionEncoder.cpp b/Marlin/src/feature/I2CPositionEncoder.cpp
similarity index 100%
rename from Marlin/I2CPositionEncoder.cpp
rename to Marlin/src/feature/I2CPositionEncoder.cpp
diff --git a/Marlin/I2CPositionEncoder.h b/Marlin/src/feature/I2CPositionEncoder.h
similarity index 100%
rename from Marlin/I2CPositionEncoder.h
rename to Marlin/src/feature/I2CPositionEncoder.h
diff --git a/Marlin/dac_dac084s085.cpp b/Marlin/src/feature/dac/dac_dac084s085.cpp
similarity index 100%
rename from Marlin/dac_dac084s085.cpp
rename to Marlin/src/feature/dac/dac_dac084s085.cpp
diff --git a/Marlin/dac_dac084s085.h b/Marlin/src/feature/dac/dac_dac084s085.h
similarity index 100%
rename from Marlin/dac_dac084s085.h
rename to Marlin/src/feature/dac/dac_dac084s085.h
diff --git a/Marlin/dac_mcp4728.cpp b/Marlin/src/feature/dac/dac_mcp4728.cpp
similarity index 100%
rename from Marlin/dac_mcp4728.cpp
rename to Marlin/src/feature/dac/dac_mcp4728.cpp
diff --git a/Marlin/dac_mcp4728.h b/Marlin/src/feature/dac/dac_mcp4728.h
similarity index 100%
rename from Marlin/dac_mcp4728.h
rename to Marlin/src/feature/dac/dac_mcp4728.h
diff --git a/Marlin/stepper_dac.cpp b/Marlin/src/feature/dac/stepper_dac.cpp
similarity index 100%
rename from Marlin/stepper_dac.cpp
rename to Marlin/src/feature/dac/stepper_dac.cpp
diff --git a/Marlin/stepper_dac.h b/Marlin/src/feature/dac/stepper_dac.h
similarity index 100%
rename from Marlin/stepper_dac.h
rename to Marlin/src/feature/dac/stepper_dac.h
diff --git a/Marlin/digipot_mcp4018.cpp b/Marlin/src/feature/digipot_mcp4018.cpp
similarity index 100%
rename from Marlin/digipot_mcp4018.cpp
rename to Marlin/src/feature/digipot_mcp4018.cpp
diff --git a/Marlin/digipot_mcp4451.cpp b/Marlin/src/feature/digipot_mcp4451.cpp
similarity index 100%
rename from Marlin/digipot_mcp4451.cpp
rename to Marlin/src/feature/digipot_mcp4451.cpp
diff --git a/Marlin/Max7219_Debug_LEDs.cpp b/Marlin/src/feature/leds/Max7219_Debug_LEDs.cpp
similarity index 100%
rename from Marlin/Max7219_Debug_LEDs.cpp
rename to Marlin/src/feature/leds/Max7219_Debug_LEDs.cpp
diff --git a/Marlin/Max7219_Debug_LEDs.h b/Marlin/src/feature/leds/Max7219_Debug_LEDs.h
similarity index 100%
rename from Marlin/Max7219_Debug_LEDs.h
rename to Marlin/src/feature/leds/Max7219_Debug_LEDs.h
diff --git a/Marlin/blinkm.cpp b/Marlin/src/feature/leds/blinkm.cpp
similarity index 100%
rename from Marlin/blinkm.cpp
rename to Marlin/src/feature/leds/blinkm.cpp
diff --git a/Marlin/blinkm.h b/Marlin/src/feature/leds/blinkm.h
similarity index 100%
rename from Marlin/blinkm.h
rename to Marlin/src/feature/leds/blinkm.h
diff --git a/Marlin/pca9632.cpp b/Marlin/src/feature/leds/pca9632.cpp
similarity index 100%
rename from Marlin/pca9632.cpp
rename to Marlin/src/feature/leds/pca9632.cpp
diff --git a/Marlin/pca9632.h b/Marlin/src/feature/leds/pca9632.h
similarity index 100%
rename from Marlin/pca9632.h
rename to Marlin/src/feature/leds/pca9632.h
diff --git a/Marlin/mesh_bed_leveling.cpp b/Marlin/src/feature/mbl/mesh_bed_leveling.cpp
similarity index 100%
rename from Marlin/mesh_bed_leveling.cpp
rename to Marlin/src/feature/mbl/mesh_bed_leveling.cpp
diff --git a/Marlin/mesh_bed_leveling.h b/Marlin/src/feature/mbl/mesh_bed_leveling.h
similarity index 100%
rename from Marlin/mesh_bed_leveling.h
rename to Marlin/src/feature/mbl/mesh_bed_leveling.h
diff --git a/Marlin/twibus.cpp b/Marlin/src/feature/twibus.cpp
similarity index 100%
rename from Marlin/twibus.cpp
rename to Marlin/src/feature/twibus.cpp
diff --git a/Marlin/twibus.h b/Marlin/src/feature/twibus.h
similarity index 100%
rename from Marlin/twibus.h
rename to Marlin/src/feature/twibus.h
diff --git a/Marlin/G26_Mesh_Validation_Tool.cpp b/Marlin/src/feature/ubl/G26_Mesh_Validation_Tool.cpp
similarity index 100%
rename from Marlin/G26_Mesh_Validation_Tool.cpp
rename to Marlin/src/feature/ubl/G26_Mesh_Validation_Tool.cpp
diff --git a/Marlin/ubl.cpp b/Marlin/src/feature/ubl/ubl.cpp
similarity index 100%
rename from Marlin/ubl.cpp
rename to Marlin/src/feature/ubl/ubl.cpp
diff --git a/Marlin/ubl.h b/Marlin/src/feature/ubl/ubl.h
similarity index 100%
rename from Marlin/ubl.h
rename to Marlin/src/feature/ubl/ubl.h
diff --git a/Marlin/ubl_G29.cpp b/Marlin/src/feature/ubl/ubl_G29.cpp
similarity index 100%
rename from Marlin/ubl_G29.cpp
rename to Marlin/src/feature/ubl/ubl_G29.cpp
diff --git a/Marlin/ubl_motion.cpp b/Marlin/src/feature/ubl/ubl_motion.cpp
similarity index 100%
rename from Marlin/ubl_motion.cpp
rename to Marlin/src/feature/ubl/ubl_motion.cpp