diff --git a/src/AX25Defines.h b/src/AX25/AX25Defines.h
similarity index 100%
rename from src/AX25Defines.h
rename to src/AX25/AX25Defines.h
diff --git a/src/AX25Demodulator.cpp b/src/AX25/AX25Demodulator.cpp
similarity index 100%
rename from src/AX25Demodulator.cpp
rename to src/AX25/AX25Demodulator.cpp
diff --git a/src/AX25Demodulator.h b/src/AX25/AX25Demodulator.h
similarity index 100%
rename from src/AX25Demodulator.h
rename to src/AX25/AX25Demodulator.h
diff --git a/src/AX25Frame.cpp b/src/AX25/AX25Frame.cpp
similarity index 100%
rename from src/AX25Frame.cpp
rename to src/AX25/AX25Frame.cpp
diff --git a/src/AX25Frame.h b/src/AX25/AX25Frame.h
similarity index 100%
rename from src/AX25Frame.h
rename to src/AX25/AX25Frame.h
diff --git a/src/AX25RX.cpp b/src/AX25/AX25RX.cpp
similarity index 100%
rename from src/AX25RX.cpp
rename to src/AX25/AX25RX.cpp
diff --git a/src/AX25RX.h b/src/AX25/AX25RX.h
similarity index 100%
rename from src/AX25RX.h
rename to src/AX25/AX25RX.h
diff --git a/src/AX25TX.cpp b/src/AX25/AX25TX.cpp
similarity index 100%
rename from src/AX25TX.cpp
rename to src/AX25/AX25TX.cpp
diff --git a/src/AX25TX.h b/src/AX25/AX25TX.h
similarity index 100%
rename from src/AX25TX.h
rename to src/AX25/AX25TX.h
diff --git a/src/AX25Twist.cpp b/src/AX25/AX25Twist.cpp
similarity index 100%
rename from src/AX25Twist.cpp
rename to src/AX25/AX25Twist.cpp
diff --git a/src/AX25Twist.h b/src/AX25/AX25Twist.h
similarity index 100%
rename from src/AX25Twist.h
rename to src/AX25/AX25Twist.h
diff --git a/src/CalDMR.cpp b/src/DMR/CalDMR.cpp
similarity index 100%
rename from src/CalDMR.cpp
rename to src/DMR/CalDMR.cpp
diff --git a/src/CalDMR.h b/src/DMR/CalDMR.h
similarity index 100%
rename from src/CalDMR.h
rename to src/DMR/CalDMR.h
diff --git a/src/DMRDMORX.cpp b/src/DMR/DMRDMORX.cpp
similarity index 100%
rename from src/DMRDMORX.cpp
rename to src/DMR/DMRDMORX.cpp
diff --git a/src/DMRDMORX.h b/src/DMR/DMRDMORX.h
similarity index 100%
rename from src/DMRDMORX.h
rename to src/DMR/DMRDMORX.h
diff --git a/src/DMRDMOTX.cpp b/src/DMR/DMRDMOTX.cpp
similarity index 100%
rename from src/DMRDMOTX.cpp
rename to src/DMR/DMRDMOTX.cpp
diff --git a/src/DMRDMOTX.h b/src/DMR/DMRDMOTX.h
similarity index 100%
rename from src/DMRDMOTX.h
rename to src/DMR/DMRDMOTX.h
diff --git a/src/DMRDefines.h b/src/DMR/DMRDefines.h
similarity index 100%
rename from src/DMRDefines.h
rename to src/DMR/DMRDefines.h
diff --git a/src/DMRIdleRX.cpp b/src/DMR/DMRIdleRX.cpp
similarity index 100%
rename from src/DMRIdleRX.cpp
rename to src/DMR/DMRIdleRX.cpp
diff --git a/src/DMRIdleRX.h b/src/DMR/DMRIdleRX.h
similarity index 100%
rename from src/DMRIdleRX.h
rename to src/DMR/DMRIdleRX.h
diff --git a/src/DMRRX.cpp b/src/DMR/DMRRX.cpp
similarity index 100%
rename from src/DMRRX.cpp
rename to src/DMR/DMRRX.cpp
diff --git a/src/DMRRX.h b/src/DMR/DMRRX.h
similarity index 100%
rename from src/DMRRX.h
rename to src/DMR/DMRRX.h
diff --git a/src/DMRSlotRX.cpp b/src/DMR/DMRSlotRX.cpp
similarity index 100%
rename from src/DMRSlotRX.cpp
rename to src/DMR/DMRSlotRX.cpp
diff --git a/src/DMRSlotRX.h b/src/DMR/DMRSlotRX.h
similarity index 100%
rename from src/DMRSlotRX.h
rename to src/DMR/DMRSlotRX.h
diff --git a/src/DMRSlotType.cpp b/src/DMR/DMRSlotType.cpp
similarity index 100%
rename from src/DMRSlotType.cpp
rename to src/DMR/DMRSlotType.cpp
diff --git a/src/DMRSlotType.h b/src/DMR/DMRSlotType.h
similarity index 100%
rename from src/DMRSlotType.h
rename to src/DMR/DMRSlotType.h
diff --git a/src/DMRTX.cpp b/src/DMR/DMRTX.cpp
similarity index 100%
rename from src/DMRTX.cpp
rename to src/DMR/DMRTX.cpp
diff --git a/src/DMRTX.h b/src/DMR/DMRTX.h
similarity index 100%
rename from src/DMRTX.h
rename to src/DMR/DMRTX.h
diff --git a/src/CalDStarRX.cpp b/src/DStar/CalDStarRX.cpp
similarity index 100%
rename from src/CalDStarRX.cpp
rename to src/DStar/CalDStarRX.cpp
diff --git a/src/CalDStarRX.h b/src/DStar/CalDStarRX.h
similarity index 100%
rename from src/CalDStarRX.h
rename to src/DStar/CalDStarRX.h
diff --git a/src/CalDStarTX.cpp b/src/DStar/CalDStarTX.cpp
similarity index 100%
rename from src/CalDStarTX.cpp
rename to src/DStar/CalDStarTX.cpp
diff --git a/src/CalDStarTX.h b/src/DStar/CalDStarTX.h
similarity index 100%
rename from src/CalDStarTX.h
rename to src/DStar/CalDStarTX.h
diff --git a/src/DStarDefines.h b/src/DStar/DStarDefines.h
similarity index 100%
rename from src/DStarDefines.h
rename to src/DStar/DStarDefines.h
diff --git a/src/DStarRX.cpp b/src/DStar/DStarRX.cpp
similarity index 100%
rename from src/DStarRX.cpp
rename to src/DStar/DStarRX.cpp
diff --git a/src/DStarRX.h b/src/DStar/DStarRX.h
similarity index 100%
rename from src/DStarRX.h
rename to src/DStar/DStarRX.h
diff --git a/src/DStarTX.cpp b/src/DStar/DStarTX.cpp
similarity index 100%
rename from src/DStarTX.cpp
rename to src/DStar/DStarTX.cpp
diff --git a/src/DStarTX.h b/src/DStar/DStarTX.h
similarity index 100%
rename from src/DStarTX.h
rename to src/DStar/DStarTX.h
diff --git a/src/CalFM.cpp b/src/FM/CalFM.cpp
similarity index 100%
rename from src/CalFM.cpp
rename to src/FM/CalFM.cpp
diff --git a/src/CalFM.h b/src/FM/CalFM.h
similarity index 100%
rename from src/CalFM.h
rename to src/FM/CalFM.h
diff --git a/src/FM.cpp b/src/FM/FM.cpp
similarity index 100%
rename from src/FM.cpp
rename to src/FM/FM.cpp
diff --git a/src/FM.h b/src/FM/FM.h
similarity index 100%
rename from src/FM.h
rename to src/FM/FM.h
diff --git a/src/FMBlanking.cpp b/src/FM/FMBlanking.cpp
similarity index 100%
rename from src/FMBlanking.cpp
rename to src/FM/FMBlanking.cpp
diff --git a/src/FMBlanking.h b/src/FM/FMBlanking.h
similarity index 100%
rename from src/FMBlanking.h
rename to src/FM/FMBlanking.h
diff --git a/src/FMCTCSSRX.cpp b/src/FM/FMCTCSSRX.cpp
similarity index 100%
rename from src/FMCTCSSRX.cpp
rename to src/FM/FMCTCSSRX.cpp
diff --git a/src/FMCTCSSRX.h b/src/FM/FMCTCSSRX.h
similarity index 100%
rename from src/FMCTCSSRX.h
rename to src/FM/FMCTCSSRX.h
diff --git a/src/FMCTCSSTX.cpp b/src/FM/FMCTCSSTX.cpp
similarity index 100%
rename from src/FMCTCSSTX.cpp
rename to src/FM/FMCTCSSTX.cpp
diff --git a/src/FMCTCSSTX.h b/src/FM/FMCTCSSTX.h
similarity index 100%
rename from src/FMCTCSSTX.h
rename to src/FM/FMCTCSSTX.h
diff --git a/src/FMDirectForm1.h b/src/FM/FMDirectForm1.h
similarity index 100%
rename from src/FMDirectForm1.h
rename to src/FM/FMDirectForm1.h
diff --git a/src/FMDownSampler.cpp b/src/FM/FMDownSampler.cpp
similarity index 100%
rename from src/FMDownSampler.cpp
rename to src/FM/FMDownSampler.cpp
diff --git a/src/FMDownSampler.h b/src/FM/FMDownSampler.h
similarity index 100%
rename from src/FMDownSampler.h
rename to src/FM/FMDownSampler.h
diff --git a/src/FMKeyer.cpp b/src/FM/FMKeyer.cpp
similarity index 100%
rename from src/FMKeyer.cpp
rename to src/FM/FMKeyer.cpp
diff --git a/src/FMKeyer.h b/src/FM/FMKeyer.h
similarity index 100%
rename from src/FMKeyer.h
rename to src/FM/FMKeyer.h
diff --git a/src/FMNoiseSquelch.cpp b/src/FM/FMNoiseSquelch.cpp
similarity index 100%
rename from src/FMNoiseSquelch.cpp
rename to src/FM/FMNoiseSquelch.cpp
diff --git a/src/FMNoiseSquelch.h b/src/FM/FMNoiseSquelch.h
similarity index 100%
rename from src/FMNoiseSquelch.h
rename to src/FM/FMNoiseSquelch.h
diff --git a/src/FMSamplePairPack.h b/src/FM/FMSamplePairPack.h
similarity index 100%
rename from src/FMSamplePairPack.h
rename to src/FM/FMSamplePairPack.h
diff --git a/src/FMTimeout.cpp b/src/FM/FMTimeout.cpp
similarity index 100%
rename from src/FMTimeout.cpp
rename to src/FM/FMTimeout.cpp
diff --git a/src/FMTimeout.h b/src/FM/FMTimeout.h
similarity index 100%
rename from src/FMTimeout.h
rename to src/FM/FMTimeout.h
diff --git a/src/FMTimer.cpp b/src/FM/FMTimer.cpp
similarity index 100%
rename from src/FMTimer.cpp
rename to src/FM/FMTimer.cpp
diff --git a/src/FMTimer.h b/src/FM/FMTimer.h
similarity index 100%
rename from src/FMTimer.h
rename to src/FM/FMTimer.h
diff --git a/src/FMUpSampler.cpp b/src/FM/FMUpSampler.cpp
similarity index 100%
rename from src/FMUpSampler.cpp
rename to src/FM/FMUpSampler.cpp
diff --git a/src/FMUpSampler.h b/src/FM/FMUpSampler.h
similarity index 100%
rename from src/FMUpSampler.h
rename to src/FM/FMUpSampler.h
diff --git a/src/Globals.h b/src/Globals.h
index f1c2ca2..371b01e 100644
--- a/src/Globals.h
+++ b/src/Globals.h
@@ -58,37 +58,38 @@ enum MMDVM_STATE {
 };
 
 #include "SerialPort.h"
-#include "DMRIdleRX.h"
-#include "DMRDMORX.h"
-#include "DMRDMOTX.h"
-#include "DStarRX.h"
-#include "DStarTX.h"
-#include "DMRRX.h"
-#include "DMRTX.h"
-#include "YSFRX.h"
-#include "YSFTX.h"
-#include "P25RX.h"
-#include "P25TX.h"
-#include "M17RX.h"
-#include "M17TX.h"
-#include "NXDNRX.h"
-#include "NXDNTX.h"
-#include "POCSAGTX.h"
-#include "CalDStarRX.h"
-#include "CalDStarTX.h"
-#include "CalFM.h"
-#include "CalDMR.h"
-#include "CalP25.h"
-#include "CalNXDN.h"
-#include "CalPOCSAG.h"
+
+#include "POCSAG/CalPOCSAG.h"
+#include "DStar/CalDStarRX.h"
+#include "DStar/CalDStarTX.h"
+#include "POCSAG/POCSAGTX.h"
+#include "DStar/DStarRX.h"
+#include "DStar/DStarTX.h"
+#include "DMR/DMRIdleRX.h"
+#include "DMR/DMRDMORX.h"
+#include "DMR/DMRDMOTX.h"
+#include "NXDN/CalNXDN.h"
+#include "NXDN/NXDNRX.h"
+#include "NXDN/NXDNTX.h"
+#include "AX25/AX25RX.h"
+#include "AX25/AX25TX.h"
+#include "DMR/CalDMR.h"
+#include "P25/CalP25.h"
+#include "M17/CalM17.h"
+#include "DMR/DMRRX.h"
+#include "DMR/DMRTX.h"
+#include "YSF/YSFRX.h"
+#include "YSF/YSFTX.h"
+#include "P25/P25RX.h"
+#include "P25/P25TX.h"
+#include "M17/M17RX.h"
+#include "M17/M17TX.h"
+#include "FM/CalFM.h"
 #include "CalRSSI.h"
 #include "CWIdTX.h"
-#include "AX25RX.h"
-#include "AX25TX.h"
-#include "CalM17.h"
+#include "FM/FM.h"
 #include "Debug.h"
 #include "IO.h"
-#include "FM.h"
 
 const uint8_t  MARK_SLOT1 = 0x08U;
 const uint8_t  MARK_SLOT2 = 0x04U;
diff --git a/src/CalM17.cpp b/src/M17/CalM17.cpp
similarity index 100%
rename from src/CalM17.cpp
rename to src/M17/CalM17.cpp
diff --git a/src/CalM17.h b/src/M17/CalM17.h
similarity index 100%
rename from src/CalM17.h
rename to src/M17/CalM17.h
diff --git a/src/M17Defines.h b/src/M17/M17Defines.h
similarity index 100%
rename from src/M17Defines.h
rename to src/M17/M17Defines.h
diff --git a/src/M17RX.cpp b/src/M17/M17RX.cpp
similarity index 100%
rename from src/M17RX.cpp
rename to src/M17/M17RX.cpp
diff --git a/src/M17RX.h b/src/M17/M17RX.h
similarity index 100%
rename from src/M17RX.h
rename to src/M17/M17RX.h
diff --git a/src/M17TX.cpp b/src/M17/M17TX.cpp
similarity index 100%
rename from src/M17TX.cpp
rename to src/M17/M17TX.cpp
diff --git a/src/M17TX.h b/src/M17/M17TX.h
similarity index 100%
rename from src/M17TX.h
rename to src/M17/M17TX.h
diff --git a/src/CalNXDN.cpp b/src/NXDN/CalNXDN.cpp
similarity index 100%
rename from src/CalNXDN.cpp
rename to src/NXDN/CalNXDN.cpp
diff --git a/src/CalNXDN.h b/src/NXDN/CalNXDN.h
similarity index 100%
rename from src/CalNXDN.h
rename to src/NXDN/CalNXDN.h
diff --git a/src/NXDNDefines.h b/src/NXDN/NXDNDefines.h
similarity index 100%
rename from src/NXDNDefines.h
rename to src/NXDN/NXDNDefines.h
diff --git a/src/NXDNRX.cpp b/src/NXDN/NXDNRX.cpp
similarity index 100%
rename from src/NXDNRX.cpp
rename to src/NXDN/NXDNRX.cpp
diff --git a/src/NXDNRX.h b/src/NXDN/NXDNRX.h
similarity index 100%
rename from src/NXDNRX.h
rename to src/NXDN/NXDNRX.h
diff --git a/src/NXDNTX.cpp b/src/NXDN/NXDNTX.cpp
similarity index 100%
rename from src/NXDNTX.cpp
rename to src/NXDN/NXDNTX.cpp
diff --git a/src/NXDNTX.h b/src/NXDN/NXDNTX.h
similarity index 100%
rename from src/NXDNTX.h
rename to src/NXDN/NXDNTX.h
diff --git a/src/CalP25.cpp b/src/P25/CalP25.cpp
similarity index 100%
rename from src/CalP25.cpp
rename to src/P25/CalP25.cpp
diff --git a/src/CalP25.h b/src/P25/CalP25.h
similarity index 100%
rename from src/CalP25.h
rename to src/P25/CalP25.h
diff --git a/src/P25Defines.h b/src/P25/P25Defines.h
similarity index 100%
rename from src/P25Defines.h
rename to src/P25/P25Defines.h
diff --git a/src/P25RX.cpp b/src/P25/P25RX.cpp
similarity index 100%
rename from src/P25RX.cpp
rename to src/P25/P25RX.cpp
diff --git a/src/P25RX.h b/src/P25/P25RX.h
similarity index 100%
rename from src/P25RX.h
rename to src/P25/P25RX.h
diff --git a/src/P25TX.cpp b/src/P25/P25TX.cpp
similarity index 100%
rename from src/P25TX.cpp
rename to src/P25/P25TX.cpp
diff --git a/src/P25TX.h b/src/P25/P25TX.h
similarity index 100%
rename from src/P25TX.h
rename to src/P25/P25TX.h
diff --git a/src/CalPOCSAG.cpp b/src/POCSAG/CalPOCSAG.cpp
similarity index 100%
rename from src/CalPOCSAG.cpp
rename to src/POCSAG/CalPOCSAG.cpp
diff --git a/src/CalPOCSAG.h b/src/POCSAG/CalPOCSAG.h
similarity index 100%
rename from src/CalPOCSAG.h
rename to src/POCSAG/CalPOCSAG.h
diff --git a/src/POCSAGTX.cpp b/src/POCSAG/POCSAGTX.cpp
similarity index 100%
rename from src/POCSAGTX.cpp
rename to src/POCSAG/POCSAGTX.cpp
diff --git a/src/POCSAGTX.h b/src/POCSAG/POCSAGTX.h
similarity index 100%
rename from src/POCSAGTX.h
rename to src/POCSAG/POCSAGTX.h
diff --git a/src/YSFDefines.h b/src/YSF/YSFDefines.h
similarity index 100%
rename from src/YSFDefines.h
rename to src/YSF/YSFDefines.h
diff --git a/src/YSFRX.cpp b/src/YSF/YSFRX.cpp
similarity index 100%
rename from src/YSFRX.cpp
rename to src/YSF/YSFRX.cpp
diff --git a/src/YSFRX.h b/src/YSF/YSFRX.h
similarity index 100%
rename from src/YSFRX.h
rename to src/YSF/YSFRX.h
diff --git a/src/YSFTX.cpp b/src/YSF/YSFTX.cpp
similarity index 100%
rename from src/YSFTX.cpp
rename to src/YSF/YSFTX.cpp
diff --git a/src/YSFTX.h b/src/YSF/YSFTX.h
similarity index 100%
rename from src/YSFTX.h
rename to src/YSF/YSFTX.h