diff --git a/Marlin/pins.h b/Marlin/src/pins/pins.h
similarity index 100%
rename from Marlin/pins.h
rename to Marlin/src/pins/pins.h
diff --git a/Marlin/pinsDebug.h b/Marlin/src/pins/pinsDebug.h
similarity index 100%
rename from Marlin/pinsDebug.h
rename to Marlin/src/pins/pinsDebug.h
diff --git a/Marlin/pinsDebug_list.h b/Marlin/src/pins/pinsDebug_list.h
similarity index 100%
rename from Marlin/pinsDebug_list.h
rename to Marlin/src/pins/pinsDebug_list.h
diff --git a/Marlin/pins_3DRAG.h b/Marlin/src/pins/pins_3DRAG.h
similarity index 100%
rename from Marlin/pins_3DRAG.h
rename to Marlin/src/pins/pins_3DRAG.h
diff --git a/Marlin/pins_5DPRINT.h b/Marlin/src/pins/pins_5DPRINT.h
similarity index 100%
rename from Marlin/pins_5DPRINT.h
rename to Marlin/src/pins/pins_5DPRINT.h
diff --git a/Marlin/pins_ALLIGATOR_R2.h b/Marlin/src/pins/pins_ALLIGATOR_R2.h
similarity index 100%
rename from Marlin/pins_ALLIGATOR_R2.h
rename to Marlin/src/pins/pins_ALLIGATOR_R2.h
diff --git a/Marlin/pins_ANET_10.h b/Marlin/src/pins/pins_ANET_10.h
similarity index 100%
rename from Marlin/pins_ANET_10.h
rename to Marlin/src/pins/pins_ANET_10.h
diff --git a/Marlin/pins_AZTEEG_X1.h b/Marlin/src/pins/pins_AZTEEG_X1.h
similarity index 100%
rename from Marlin/pins_AZTEEG_X1.h
rename to Marlin/src/pins/pins_AZTEEG_X1.h
diff --git a/Marlin/pins_AZTEEG_X3.h b/Marlin/src/pins/pins_AZTEEG_X3.h
similarity index 100%
rename from Marlin/pins_AZTEEG_X3.h
rename to Marlin/src/pins/pins_AZTEEG_X3.h
diff --git a/Marlin/pins_AZTEEG_X3_PRO.h b/Marlin/src/pins/pins_AZTEEG_X3_PRO.h
similarity index 100%
rename from Marlin/pins_AZTEEG_X3_PRO.h
rename to Marlin/src/pins/pins_AZTEEG_X3_PRO.h
diff --git a/Marlin/pins_BAM_DICE_DUE.h b/Marlin/src/pins/pins_BAM_DICE_DUE.h
similarity index 100%
rename from Marlin/pins_BAM_DICE_DUE.h
rename to Marlin/src/pins/pins_BAM_DICE_DUE.h
diff --git a/Marlin/pins_BQ_ZUM_MEGA_3D.h b/Marlin/src/pins/pins_BQ_ZUM_MEGA_3D.h
similarity index 100%
rename from Marlin/pins_BQ_ZUM_MEGA_3D.h
rename to Marlin/src/pins/pins_BQ_ZUM_MEGA_3D.h
diff --git a/Marlin/pins_BRAINWAVE.h b/Marlin/src/pins/pins_BRAINWAVE.h
similarity index 100%
rename from Marlin/pins_BRAINWAVE.h
rename to Marlin/src/pins/pins_BRAINWAVE.h
diff --git a/Marlin/pins_BRAINWAVE_PRO.h b/Marlin/src/pins/pins_BRAINWAVE_PRO.h
similarity index 100%
rename from Marlin/pins_BRAINWAVE_PRO.h
rename to Marlin/src/pins/pins_BRAINWAVE_PRO.h
diff --git a/Marlin/pins_CHEAPTRONIC.h b/Marlin/src/pins/pins_CHEAPTRONIC.h
similarity index 100%
rename from Marlin/pins_CHEAPTRONIC.h
rename to Marlin/src/pins/pins_CHEAPTRONIC.h
diff --git a/Marlin/pins_CHEAPTRONICv2.h b/Marlin/src/pins/pins_CHEAPTRONICv2.h
similarity index 100%
rename from Marlin/pins_CHEAPTRONICv2.h
rename to Marlin/src/pins/pins_CHEAPTRONICv2.h
diff --git a/Marlin/pins_CNCONTROLS_11.h b/Marlin/src/pins/pins_CNCONTROLS_11.h
similarity index 100%
rename from Marlin/pins_CNCONTROLS_11.h
rename to Marlin/src/pins/pins_CNCONTROLS_11.h
diff --git a/Marlin/pins_CNCONTROLS_12.h b/Marlin/src/pins/pins_CNCONTROLS_12.h
similarity index 100%
rename from Marlin/pins_CNCONTROLS_12.h
rename to Marlin/src/pins/pins_CNCONTROLS_12.h
diff --git a/Marlin/pins_DUE3DOM.h b/Marlin/src/pins/pins_DUE3DOM.h
similarity index 100%
rename from Marlin/pins_DUE3DOM.h
rename to Marlin/src/pins/pins_DUE3DOM.h
diff --git a/Marlin/pins_DUE3DOM_MINI.h b/Marlin/src/pins/pins_DUE3DOM_MINI.h
similarity index 100%
rename from Marlin/pins_DUE3DOM_MINI.h
rename to Marlin/src/pins/pins_DUE3DOM_MINI.h
diff --git a/Marlin/pins_ELEFU_3.h b/Marlin/src/pins/pins_ELEFU_3.h
similarity index 100%
rename from Marlin/pins_ELEFU_3.h
rename to Marlin/src/pins/pins_ELEFU_3.h
diff --git a/Marlin/pins_FELIX2.h b/Marlin/src/pins/pins_FELIX2.h
similarity index 100%
rename from Marlin/pins_FELIX2.h
rename to Marlin/src/pins/pins_FELIX2.h
diff --git a/Marlin/pins_GEN3_MONOLITHIC.h b/Marlin/src/pins/pins_GEN3_MONOLITHIC.h
similarity index 100%
rename from Marlin/pins_GEN3_MONOLITHIC.h
rename to Marlin/src/pins/pins_GEN3_MONOLITHIC.h
diff --git a/Marlin/pins_GEN3_PLUS.h b/Marlin/src/pins/pins_GEN3_PLUS.h
similarity index 100%
rename from Marlin/pins_GEN3_PLUS.h
rename to Marlin/src/pins/pins_GEN3_PLUS.h
diff --git a/Marlin/pins_GEN6.h b/Marlin/src/pins/pins_GEN6.h
similarity index 100%
rename from Marlin/pins_GEN6.h
rename to Marlin/src/pins/pins_GEN6.h
diff --git a/Marlin/pins_GEN6_DELUXE.h b/Marlin/src/pins/pins_GEN6_DELUXE.h
similarity index 100%
rename from Marlin/pins_GEN6_DELUXE.h
rename to Marlin/src/pins/pins_GEN6_DELUXE.h
diff --git a/Marlin/pins_GEN7_12.h b/Marlin/src/pins/pins_GEN7_12.h
similarity index 100%
rename from Marlin/pins_GEN7_12.h
rename to Marlin/src/pins/pins_GEN7_12.h
diff --git a/Marlin/pins_GEN7_13.h b/Marlin/src/pins/pins_GEN7_13.h
similarity index 100%
rename from Marlin/pins_GEN7_13.h
rename to Marlin/src/pins/pins_GEN7_13.h
diff --git a/Marlin/pins_GEN7_14.h b/Marlin/src/pins/pins_GEN7_14.h
similarity index 100%
rename from Marlin/pins_GEN7_14.h
rename to Marlin/src/pins/pins_GEN7_14.h
diff --git a/Marlin/pins_GEN7_CUSTOM.h b/Marlin/src/pins/pins_GEN7_CUSTOM.h
similarity index 100%
rename from Marlin/pins_GEN7_CUSTOM.h
rename to Marlin/src/pins/pins_GEN7_CUSTOM.h
diff --git a/Marlin/pins_GT2560_REV_A.h b/Marlin/src/pins/pins_GT2560_REV_A.h
similarity index 100%
rename from Marlin/pins_GT2560_REV_A.h
rename to Marlin/src/pins/pins_GT2560_REV_A.h
diff --git a/Marlin/pins_GT2560_REV_A_PLUS.h b/Marlin/src/pins/pins_GT2560_REV_A_PLUS.h
similarity index 100%
rename from Marlin/pins_GT2560_REV_A_PLUS.h
rename to Marlin/src/pins/pins_GT2560_REV_A_PLUS.h
diff --git a/Marlin/pins_K8200.h b/Marlin/src/pins/pins_K8200.h
similarity index 100%
rename from Marlin/pins_K8200.h
rename to Marlin/src/pins/pins_K8200.h
diff --git a/Marlin/pins_K8400.h b/Marlin/src/pins/pins_K8400.h
similarity index 100%
rename from Marlin/pins_K8400.h
rename to Marlin/src/pins/pins_K8400.h
diff --git a/Marlin/pins_LEAPFROG.h b/Marlin/src/pins/pins_LEAPFROG.h
similarity index 100%
rename from Marlin/pins_LEAPFROG.h
rename to Marlin/src/pins/pins_LEAPFROG.h
diff --git a/Marlin/pins_MEGACONTROLLER.h b/Marlin/src/pins/pins_MEGACONTROLLER.h
similarity index 100%
rename from Marlin/pins_MEGACONTROLLER.h
rename to Marlin/src/pins/pins_MEGACONTROLLER.h
diff --git a/Marlin/pins_MEGATRONICS.h b/Marlin/src/pins/pins_MEGATRONICS.h
similarity index 100%
rename from Marlin/pins_MEGATRONICS.h
rename to Marlin/src/pins/pins_MEGATRONICS.h
diff --git a/Marlin/pins_MEGATRONICS_2.h b/Marlin/src/pins/pins_MEGATRONICS_2.h
similarity index 100%
rename from Marlin/pins_MEGATRONICS_2.h
rename to Marlin/src/pins/pins_MEGATRONICS_2.h
diff --git a/Marlin/pins_MEGATRONICS_3.h b/Marlin/src/pins/pins_MEGATRONICS_3.h
similarity index 100%
rename from Marlin/pins_MEGATRONICS_3.h
rename to Marlin/src/pins/pins_MEGATRONICS_3.h
diff --git a/Marlin/pins_MELZI.h b/Marlin/src/pins/pins_MELZI.h
similarity index 100%
rename from Marlin/pins_MELZI.h
rename to Marlin/src/pins/pins_MELZI.h
diff --git a/Marlin/pins_MELZI_CREALITY.h b/Marlin/src/pins/pins_MELZI_CREALITY.h
similarity index 100%
rename from Marlin/pins_MELZI_CREALITY.h
rename to Marlin/src/pins/pins_MELZI_CREALITY.h
diff --git a/Marlin/pins_MELZI_MAKR3D.h b/Marlin/src/pins/pins_MELZI_MAKR3D.h
similarity index 100%
rename from Marlin/pins_MELZI_MAKR3D.h
rename to Marlin/src/pins/pins_MELZI_MAKR3D.h
diff --git a/Marlin/pins_MIGHTYBOARD_REVE.h b/Marlin/src/pins/pins_MIGHTYBOARD_REVE.h
similarity index 100%
rename from Marlin/pins_MIGHTYBOARD_REVE.h
rename to Marlin/src/pins/pins_MIGHTYBOARD_REVE.h
diff --git a/Marlin/pins_MINIRAMBO.h b/Marlin/src/pins/pins_MINIRAMBO.h
similarity index 100%
rename from Marlin/pins_MINIRAMBO.h
rename to Marlin/src/pins/pins_MINIRAMBO.h
diff --git a/Marlin/pins_MINITRONICS.h b/Marlin/src/pins/pins_MINITRONICS.h
similarity index 100%
rename from Marlin/pins_MINITRONICS.h
rename to Marlin/src/pins/pins_MINITRONICS.h
diff --git a/Marlin/pins_MKS_13.h b/Marlin/src/pins/pins_MKS_13.h
similarity index 100%
rename from Marlin/pins_MKS_13.h
rename to Marlin/src/pins/pins_MKS_13.h
diff --git a/Marlin/pins_MKS_BASE.h b/Marlin/src/pins/pins_MKS_BASE.h
similarity index 100%
rename from Marlin/pins_MKS_BASE.h
rename to Marlin/src/pins/pins_MKS_BASE.h
diff --git a/Marlin/pins_OMCA.h b/Marlin/src/pins/pins_OMCA.h
similarity index 100%
rename from Marlin/pins_OMCA.h
rename to Marlin/src/pins/pins_OMCA.h
diff --git a/Marlin/pins_OMCA_A.h b/Marlin/src/pins/pins_OMCA_A.h
similarity index 100%
rename from Marlin/pins_OMCA_A.h
rename to Marlin/src/pins/pins_OMCA_A.h
diff --git a/Marlin/pins_PRINTRBOARD.h b/Marlin/src/pins/pins_PRINTRBOARD.h
similarity index 100%
rename from Marlin/pins_PRINTRBOARD.h
rename to Marlin/src/pins/pins_PRINTRBOARD.h
diff --git a/Marlin/pins_PRINTRBOARD_REVF.h b/Marlin/src/pins/pins_PRINTRBOARD_REVF.h
similarity index 100%
rename from Marlin/pins_PRINTRBOARD_REVF.h
rename to Marlin/src/pins/pins_PRINTRBOARD_REVF.h
diff --git a/Marlin/pins_RADDS.h b/Marlin/src/pins/pins_RADDS.h
similarity index 100%
rename from Marlin/pins_RADDS.h
rename to Marlin/src/pins/pins_RADDS.h
diff --git a/Marlin/pins_RAMBO.h b/Marlin/src/pins/pins_RAMBO.h
similarity index 100%
rename from Marlin/pins_RAMBO.h
rename to Marlin/src/pins/pins_RAMBO.h
diff --git a/Marlin/pins_RAMPS.h b/Marlin/src/pins/pins_RAMPS.h
similarity index 100%
rename from Marlin/pins_RAMPS.h
rename to Marlin/src/pins/pins_RAMPS.h
diff --git a/Marlin/pins_RAMPS4DUE.h b/Marlin/src/pins/pins_RAMPS4DUE.h
similarity index 100%
rename from Marlin/pins_RAMPS4DUE.h
rename to Marlin/src/pins/pins_RAMPS4DUE.h
diff --git a/Marlin/pins_RAMPS_13.h b/Marlin/src/pins/pins_RAMPS_13.h
similarity index 100%
rename from Marlin/pins_RAMPS_13.h
rename to Marlin/src/pins/pins_RAMPS_13.h
diff --git a/Marlin/pins_RAMPS_DUO.h b/Marlin/src/pins/pins_RAMPS_DUO.h
similarity index 100%
rename from Marlin/pins_RAMPS_DUO.h
rename to Marlin/src/pins/pins_RAMPS_DUO.h
diff --git a/Marlin/pins_RAMPS_FD.h b/Marlin/src/pins/pins_RAMPS_FD.h
similarity index 100%
rename from Marlin/pins_RAMPS_FD.h
rename to Marlin/src/pins/pins_RAMPS_FD.h
diff --git a/Marlin/pins_RAMPS_FD_V2.h b/Marlin/src/pins/pins_RAMPS_FD_V2.h
similarity index 100%
rename from Marlin/pins_RAMPS_FD_V2.h
rename to Marlin/src/pins/pins_RAMPS_FD_V2.h
diff --git a/Marlin/pins_RAMPS_OLD.h b/Marlin/src/pins/pins_RAMPS_OLD.h
similarity index 100%
rename from Marlin/pins_RAMPS_OLD.h
rename to Marlin/src/pins/pins_RAMPS_OLD.h
diff --git a/Marlin/pins_RAMPS_RE_ARM.h b/Marlin/src/pins/pins_RAMPS_RE_ARM.h
similarity index 100%
rename from Marlin/pins_RAMPS_RE_ARM.h
rename to Marlin/src/pins/pins_RAMPS_RE_ARM.h
diff --git a/Marlin/pins_RAMPS_SMART.h b/Marlin/src/pins/pins_RAMPS_SMART.h
similarity index 100%
rename from Marlin/pins_RAMPS_SMART.h
rename to Marlin/src/pins/pins_RAMPS_SMART.h
diff --git a/Marlin/pins_RIGIDBOARD.h b/Marlin/src/pins/pins_RIGIDBOARD.h
similarity index 100%
rename from Marlin/pins_RIGIDBOARD.h
rename to Marlin/src/pins/pins_RIGIDBOARD.h
diff --git a/Marlin/pins_RIGIDBOARD_V2.h b/Marlin/src/pins/pins_RIGIDBOARD_V2.h
similarity index 100%
rename from Marlin/pins_RIGIDBOARD_V2.h
rename to Marlin/src/pins/pins_RIGIDBOARD_V2.h
diff --git a/Marlin/pins_RUMBA.h b/Marlin/src/pins/pins_RUMBA.h
similarity index 100%
rename from Marlin/pins_RUMBA.h
rename to Marlin/src/pins/pins_RUMBA.h
diff --git a/Marlin/pins_SAINSMART_2IN1.h b/Marlin/src/pins/pins_SAINSMART_2IN1.h
similarity index 100%
rename from Marlin/pins_SAINSMART_2IN1.h
rename to Marlin/src/pins/pins_SAINSMART_2IN1.h
diff --git a/Marlin/pins_SANGUINOLOLU_11.h b/Marlin/src/pins/pins_SANGUINOLOLU_11.h
similarity index 100%
rename from Marlin/pins_SANGUINOLOLU_11.h
rename to Marlin/src/pins/pins_SANGUINOLOLU_11.h
diff --git a/Marlin/pins_SANGUINOLOLU_12.h b/Marlin/src/pins/pins_SANGUINOLOLU_12.h
similarity index 100%
rename from Marlin/pins_SANGUINOLOLU_12.h
rename to Marlin/src/pins/pins_SANGUINOLOLU_12.h
diff --git a/Marlin/pins_SAV_MKI.h b/Marlin/src/pins/pins_SAV_MKI.h
similarity index 100%
rename from Marlin/pins_SAV_MKI.h
rename to Marlin/src/pins/pins_SAV_MKI.h
diff --git a/Marlin/pins_SCOOVO_X9H.h b/Marlin/src/pins/pins_SCOOVO_X9H.h
similarity index 100%
rename from Marlin/pins_SCOOVO_X9H.h
rename to Marlin/src/pins/pins_SCOOVO_X9H.h
diff --git a/Marlin/pins_SETHI.h b/Marlin/src/pins/pins_SETHI.h
similarity index 100%
rename from Marlin/pins_SETHI.h
rename to Marlin/src/pins/pins_SETHI.h
diff --git a/Marlin/pins_STB_11.h b/Marlin/src/pins/pins_STB_11.h
similarity index 100%
rename from Marlin/pins_STB_11.h
rename to Marlin/src/pins/pins_STB_11.h
diff --git a/Marlin/pins_TEENSY2.h b/Marlin/src/pins/pins_TEENSY2.h
similarity index 100%
rename from Marlin/pins_TEENSY2.h
rename to Marlin/src/pins/pins_TEENSY2.h
diff --git a/Marlin/pins_TEENSY35_36.h b/Marlin/src/pins/pins_TEENSY35_36.h
similarity index 100%
rename from Marlin/pins_TEENSY35_36.h
rename to Marlin/src/pins/pins_TEENSY35_36.h
diff --git a/Marlin/pins_TEENSYLU.h b/Marlin/src/pins/pins_TEENSYLU.h
similarity index 100%
rename from Marlin/pins_TEENSYLU.h
rename to Marlin/src/pins/pins_TEENSYLU.h
diff --git a/Marlin/pins_ULTIMAIN_2.h b/Marlin/src/pins/pins_ULTIMAIN_2.h
similarity index 100%
rename from Marlin/pins_ULTIMAIN_2.h
rename to Marlin/src/pins/pins_ULTIMAIN_2.h
diff --git a/Marlin/pins_ULTIMAKER.h b/Marlin/src/pins/pins_ULTIMAKER.h
similarity index 100%
rename from Marlin/pins_ULTIMAKER.h
rename to Marlin/src/pins/pins_ULTIMAKER.h
diff --git a/Marlin/pins_ULTIMAKER_OLD.h b/Marlin/src/pins/pins_ULTIMAKER_OLD.h
similarity index 100%
rename from Marlin/pins_ULTIMAKER_OLD.h
rename to Marlin/src/pins/pins_ULTIMAKER_OLD.h
diff --git a/Marlin/pins_ZRIB_V20.h b/Marlin/src/pins/pins_ZRIB_V20.h
similarity index 100%
rename from Marlin/pins_ZRIB_V20.h
rename to Marlin/src/pins/pins_ZRIB_V20.h