diff --git a/CMakeLists.txt b/CMakeLists.txt
index bce456b0..a237b7e2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -59,113 +59,113 @@ add_subdirectory("core")
 
 # Source modules
 if (OPT_BUILD_AIRSPY_SOURCE)
-add_subdirectory("airspy_source")
+add_subdirectory("source_modules/airspy_source")
 endif (OPT_BUILD_AIRSPY_SOURCE)
 
 if (OPT_BUILD_AIRSPYHF_SOURCE)
-add_subdirectory("airspyhf_source")
+add_subdirectory("source_modules/airspyhf_source")
 endif (OPT_BUILD_AIRSPYHF_SOURCE)
 
 if (OPT_BUILD_BLADERF_SOURCE)
-add_subdirectory("bladerf_source")
+add_subdirectory("source_modules/bladerf_source")
 endif (OPT_BUILD_BLADERF_SOURCE)
 
 if (OPT_BUILD_FILE_SOURCE)
-add_subdirectory("file_source")
+add_subdirectory("source_modules/file_source")
 endif (OPT_BUILD_FILE_SOURCE)
 
 if (OPT_BUILD_HACKRF_SOURCE)
-add_subdirectory("hackrf_source")
+add_subdirectory("source_modules/hackrf_source")
 endif (OPT_BUILD_HACKRF_SOURCE)
 
 if (OPT_BUILD_LIMESDR_SOURCE)
-add_subdirectory("limesdr_source")
+add_subdirectory("source_modules/limesdr_source")
 endif (OPT_BUILD_LIMESDR_SOURCE)
 
 if (OPT_BUILD_SDDC_SOURCE)
-add_subdirectory("sddc_source")
+add_subdirectory("source_modules/sddc_source")
 endif (OPT_BUILD_SDDC_SOURCE)
 
 if (OPT_BUILD_RTL_SDR_SOURCE)
-add_subdirectory("rtl_sdr_source")
+add_subdirectory("source_modules/rtl_sdr_source")
 endif (OPT_BUILD_RTL_SDR_SOURCE)
 
 if (OPT_BUILD_RTL_TCP_SOURCE)
-add_subdirectory("rtl_tcp_source")
+add_subdirectory("source_modules/rtl_tcp_source")
 endif (OPT_BUILD_RTL_TCP_SOURCE)
 
 if (OPT_BUILD_SDRPLAY_SOURCE)
-add_subdirectory("sdrplay_source")
+add_subdirectory("source_modules/sdrplay_source")
 endif (OPT_BUILD_SDRPLAY_SOURCE)
 
 if (OPT_BUILD_SOAPY_SOURCE)
-add_subdirectory("soapy_source")
+add_subdirectory("source_modules/soapy_source")
 endif (OPT_BUILD_SOAPY_SOURCE)
 
 if (OPT_BUILD_SPYSERVER_SOURCE)
-add_subdirectory("spyserver_source")
+add_subdirectory("source_modules/spyserver_source")
 endif (OPT_BUILD_SPYSERVER_SOURCE)
 
 if (OPT_BUILD_PLUTOSDR_SOURCE)
-add_subdirectory("plutosdr_source")
+add_subdirectory("source_modules/plutosdr_source")
 endif (OPT_BUILD_PLUTOSDR_SOURCE)
 
 
 # Sink modules
 if (OPT_BUILD_AUDIO_SINK)
-add_subdirectory("audio_sink")
+add_subdirectory("sink_modules/audio_sink")
 endif (OPT_BUILD_AUDIO_SINK)
 
 if (OPT_BUILD_PORTAUDIO_SINK)
-add_subdirectory("portaudio_sink")
+add_subdirectory("sink_modules/portaudio_sink")
 endif (OPT_BUILD_PORTAUDIO_SINK)
 
 if (OPT_BUILD_NETWORK_SINK)
-add_subdirectory("network_sink")
+add_subdirectory("sink_modules/network_sink")
 endif (OPT_BUILD_NETWORK_SINK)
 
 if (OPT_BUILD_NEW_PORTAUDIO_SINK)
-add_subdirectory("new_portaudio_sink")
+add_subdirectory("sink_modules/new_portaudio_sink")
 endif (OPT_BUILD_NEW_PORTAUDIO_SINK)
 
 
 # Decoders
 if (OPT_BUILD_FALCON9_DECODER)
-add_subdirectory("falcon9_decoder")
+add_subdirectory("decoder_modules/falcon9_decoder")
 endif (OPT_BUILD_FALCON9_DECODER)
 
 if (OPT_BUILD_M17_DECODER)
-add_subdirectory("m17_decoder")
+add_subdirectory("decoder_modules/m17_decoder")
 endif (OPT_BUILD_M17_DECODER)
 
 if (OPT_BUILD_METEOR_DEMODULATOR)
-add_subdirectory("meteor_demodulator")
+add_subdirectory("decoder_modules/meteor_demodulator")
 endif (OPT_BUILD_METEOR_DEMODULATOR)
 
 if (OPT_BUILD_RADIO)
-add_subdirectory("radio")
+add_subdirectory("decoder_modules/radio")
 endif (OPT_BUILD_RADIO)
 
 if (OPT_BUILD_WEATHER_SAT_DECODER)
-add_subdirectory("weather_sat_decoder")
+add_subdirectory("decoder_modules/weather_sat_decoder")
 endif (OPT_BUILD_WEATHER_SAT_DECODER)
 
 
 # Misc
 if (OPT_BUILD_DISCORD_PRESENCE)
-add_subdirectory("discord_integration")
+add_subdirectory("misc_modules/discord_integration")
 endif (OPT_BUILD_DISCORD_PRESENCE)
 
 if (OPT_BUILD_FREQUENCY_MANAGER)
-add_subdirectory("frequency_manager")
+add_subdirectory("misc_modules/frequency_manager")
 endif (OPT_BUILD_FREQUENCY_MANAGER)
 
 if (OPT_BUILD_RECORDER)
-add_subdirectory("recorder")
+add_subdirectory("misc_modules/recorder")
 endif (OPT_BUILD_RECORDER)
 
 if (OPT_BUILD_RIGCTL_SERVER)
-add_subdirectory("rigctl_server")
+add_subdirectory("misc_modules/rigctl_server")
 endif (OPT_BUILD_RIGCTL_SERVER)
 
 
@@ -196,7 +196,7 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
     add_custom_target(do_always ALL cp \"$<TARGET_FILE_DIR:sdrpp_core>/libsdrpp_core.dylib\" \"$<TARGET_FILE_DIR:sdrpp>\")
 endif ()
 
-# cmake .. "-DCMAKE_TOOLCHAIN_FILE=C:/Users/Alex/vcpkg/scripts/buildsystems/vcpkg.cmake" -DOPT_BUILD_BLADERF_SOURCE=ON -DOPT_BUILD_LIMESDR_SOURCE=ON -DOPT_BUILD_SDRPLAY_SOURCE=ON -DOPT_BUILD_M17_DECODER=ON
+# cmake .. "-DCMAKE_TOOLCHAIN_FILE=C:/dev/vcpkg/scripts/buildsystems/vcpkg.cmake" -DOPT_BUILD_BLADERF_SOURCE=ON -DOPT_BUILD_LIMESDR_SOURCE=ON -DOPT_BUILD_SDRPLAY_SOURCE=ON -DOPT_BUILD_M17_DECODER=ON
 
 # Install directives
 install(TARGETS sdrpp DESTINATION bin)
diff --git a/falcon9_decoder/CMakeLists.txt b/decoder_modules/falcon9_decoder/CMakeLists.txt
similarity index 100%
rename from falcon9_decoder/CMakeLists.txt
rename to decoder_modules/falcon9_decoder/CMakeLists.txt
diff --git a/falcon9_decoder/src/falcon_fec.h b/decoder_modules/falcon9_decoder/src/falcon_fec.h
similarity index 100%
rename from falcon9_decoder/src/falcon_fec.h
rename to decoder_modules/falcon9_decoder/src/falcon_fec.h
diff --git a/falcon9_decoder/src/falcon_packet.h b/decoder_modules/falcon9_decoder/src/falcon_packet.h
similarity index 100%
rename from falcon9_decoder/src/falcon_packet.h
rename to decoder_modules/falcon9_decoder/src/falcon_packet.h
diff --git a/falcon9_decoder/src/libcorrect/convolutional/CMakeLists.txt b/decoder_modules/falcon9_decoder/src/libcorrect/convolutional/CMakeLists.txt
similarity index 100%
rename from falcon9_decoder/src/libcorrect/convolutional/CMakeLists.txt
rename to decoder_modules/falcon9_decoder/src/libcorrect/convolutional/CMakeLists.txt
diff --git a/falcon9_decoder/src/libcorrect/convolutional/bit.c b/decoder_modules/falcon9_decoder/src/libcorrect/convolutional/bit.c
similarity index 100%
rename from falcon9_decoder/src/libcorrect/convolutional/bit.c
rename to decoder_modules/falcon9_decoder/src/libcorrect/convolutional/bit.c
diff --git a/falcon9_decoder/src/libcorrect/convolutional/convolutional.c b/decoder_modules/falcon9_decoder/src/libcorrect/convolutional/convolutional.c
similarity index 100%
rename from falcon9_decoder/src/libcorrect/convolutional/convolutional.c
rename to decoder_modules/falcon9_decoder/src/libcorrect/convolutional/convolutional.c
diff --git a/falcon9_decoder/src/libcorrect/convolutional/decode.c b/decoder_modules/falcon9_decoder/src/libcorrect/convolutional/decode.c
similarity index 100%
rename from falcon9_decoder/src/libcorrect/convolutional/decode.c
rename to decoder_modules/falcon9_decoder/src/libcorrect/convolutional/decode.c
diff --git a/falcon9_decoder/src/libcorrect/convolutional/encode.c b/decoder_modules/falcon9_decoder/src/libcorrect/convolutional/encode.c
similarity index 100%
rename from falcon9_decoder/src/libcorrect/convolutional/encode.c
rename to decoder_modules/falcon9_decoder/src/libcorrect/convolutional/encode.c
diff --git a/falcon9_decoder/src/libcorrect/convolutional/error_buffer.c b/decoder_modules/falcon9_decoder/src/libcorrect/convolutional/error_buffer.c
similarity index 100%
rename from falcon9_decoder/src/libcorrect/convolutional/error_buffer.c
rename to decoder_modules/falcon9_decoder/src/libcorrect/convolutional/error_buffer.c
diff --git a/falcon9_decoder/src/libcorrect/convolutional/history_buffer.c b/decoder_modules/falcon9_decoder/src/libcorrect/convolutional/history_buffer.c
similarity index 100%
rename from falcon9_decoder/src/libcorrect/convolutional/history_buffer.c
rename to decoder_modules/falcon9_decoder/src/libcorrect/convolutional/history_buffer.c
diff --git a/falcon9_decoder/src/libcorrect/convolutional/lookup.c b/decoder_modules/falcon9_decoder/src/libcorrect/convolutional/lookup.c
similarity index 100%
rename from falcon9_decoder/src/libcorrect/convolutional/lookup.c
rename to decoder_modules/falcon9_decoder/src/libcorrect/convolutional/lookup.c
diff --git a/falcon9_decoder/src/libcorrect/convolutional/metric.c b/decoder_modules/falcon9_decoder/src/libcorrect/convolutional/metric.c
similarity index 100%
rename from falcon9_decoder/src/libcorrect/convolutional/metric.c
rename to decoder_modules/falcon9_decoder/src/libcorrect/convolutional/metric.c
diff --git a/falcon9_decoder/src/libcorrect/convolutional/sse/CMakeLists.txt b/decoder_modules/falcon9_decoder/src/libcorrect/convolutional/sse/CMakeLists.txt
similarity index 100%
rename from falcon9_decoder/src/libcorrect/convolutional/sse/CMakeLists.txt
rename to decoder_modules/falcon9_decoder/src/libcorrect/convolutional/sse/CMakeLists.txt
diff --git a/falcon9_decoder/src/libcorrect/convolutional/sse/convolutional.c b/decoder_modules/falcon9_decoder/src/libcorrect/convolutional/sse/convolutional.c
similarity index 100%
rename from falcon9_decoder/src/libcorrect/convolutional/sse/convolutional.c
rename to decoder_modules/falcon9_decoder/src/libcorrect/convolutional/sse/convolutional.c
diff --git a/falcon9_decoder/src/libcorrect/convolutional/sse/decode.c b/decoder_modules/falcon9_decoder/src/libcorrect/convolutional/sse/decode.c
similarity index 100%
rename from falcon9_decoder/src/libcorrect/convolutional/sse/decode.c
rename to decoder_modules/falcon9_decoder/src/libcorrect/convolutional/sse/decode.c
diff --git a/falcon9_decoder/src/libcorrect/convolutional/sse/encode.c b/decoder_modules/falcon9_decoder/src/libcorrect/convolutional/sse/encode.c
similarity index 100%
rename from falcon9_decoder/src/libcorrect/convolutional/sse/encode.c
rename to decoder_modules/falcon9_decoder/src/libcorrect/convolutional/sse/encode.c
diff --git a/falcon9_decoder/src/libcorrect/convolutional/sse/lookup.c b/decoder_modules/falcon9_decoder/src/libcorrect/convolutional/sse/lookup.c
similarity index 100%
rename from falcon9_decoder/src/libcorrect/convolutional/sse/lookup.c
rename to decoder_modules/falcon9_decoder/src/libcorrect/convolutional/sse/lookup.c
diff --git a/falcon9_decoder/src/libcorrect/correct-sse.h b/decoder_modules/falcon9_decoder/src/libcorrect/correct-sse.h
similarity index 100%
rename from falcon9_decoder/src/libcorrect/correct-sse.h
rename to decoder_modules/falcon9_decoder/src/libcorrect/correct-sse.h
diff --git a/falcon9_decoder/src/libcorrect/correct.h b/decoder_modules/falcon9_decoder/src/libcorrect/correct.h
similarity index 100%
rename from falcon9_decoder/src/libcorrect/correct.h
rename to decoder_modules/falcon9_decoder/src/libcorrect/correct.h
diff --git a/falcon9_decoder/src/libcorrect/correct/convolutional.h b/decoder_modules/falcon9_decoder/src/libcorrect/correct/convolutional.h
similarity index 100%
rename from falcon9_decoder/src/libcorrect/correct/convolutional.h
rename to decoder_modules/falcon9_decoder/src/libcorrect/correct/convolutional.h
diff --git a/falcon9_decoder/src/libcorrect/correct/convolutional/bit.h b/decoder_modules/falcon9_decoder/src/libcorrect/correct/convolutional/bit.h
similarity index 100%
rename from falcon9_decoder/src/libcorrect/correct/convolutional/bit.h
rename to decoder_modules/falcon9_decoder/src/libcorrect/correct/convolutional/bit.h
diff --git a/falcon9_decoder/src/libcorrect/correct/convolutional/convolutional.h b/decoder_modules/falcon9_decoder/src/libcorrect/correct/convolutional/convolutional.h
similarity index 100%
rename from falcon9_decoder/src/libcorrect/correct/convolutional/convolutional.h
rename to decoder_modules/falcon9_decoder/src/libcorrect/correct/convolutional/convolutional.h
diff --git a/falcon9_decoder/src/libcorrect/correct/convolutional/error_buffer.h b/decoder_modules/falcon9_decoder/src/libcorrect/correct/convolutional/error_buffer.h
similarity index 100%
rename from falcon9_decoder/src/libcorrect/correct/convolutional/error_buffer.h
rename to decoder_modules/falcon9_decoder/src/libcorrect/correct/convolutional/error_buffer.h
diff --git a/falcon9_decoder/src/libcorrect/correct/convolutional/history_buffer.h b/decoder_modules/falcon9_decoder/src/libcorrect/correct/convolutional/history_buffer.h
similarity index 100%
rename from falcon9_decoder/src/libcorrect/correct/convolutional/history_buffer.h
rename to decoder_modules/falcon9_decoder/src/libcorrect/correct/convolutional/history_buffer.h
diff --git a/falcon9_decoder/src/libcorrect/correct/convolutional/lookup.h b/decoder_modules/falcon9_decoder/src/libcorrect/correct/convolutional/lookup.h
similarity index 100%
rename from falcon9_decoder/src/libcorrect/correct/convolutional/lookup.h
rename to decoder_modules/falcon9_decoder/src/libcorrect/correct/convolutional/lookup.h
diff --git a/falcon9_decoder/src/libcorrect/correct/convolutional/metric.h b/decoder_modules/falcon9_decoder/src/libcorrect/correct/convolutional/metric.h
similarity index 100%
rename from falcon9_decoder/src/libcorrect/correct/convolutional/metric.h
rename to decoder_modules/falcon9_decoder/src/libcorrect/correct/convolutional/metric.h
diff --git a/falcon9_decoder/src/libcorrect/correct/convolutional/sse/convolutional.h b/decoder_modules/falcon9_decoder/src/libcorrect/correct/convolutional/sse/convolutional.h
similarity index 100%
rename from falcon9_decoder/src/libcorrect/correct/convolutional/sse/convolutional.h
rename to decoder_modules/falcon9_decoder/src/libcorrect/correct/convolutional/sse/convolutional.h
diff --git a/falcon9_decoder/src/libcorrect/correct/convolutional/sse/lookup.h b/decoder_modules/falcon9_decoder/src/libcorrect/correct/convolutional/sse/lookup.h
similarity index 100%
rename from falcon9_decoder/src/libcorrect/correct/convolutional/sse/lookup.h
rename to decoder_modules/falcon9_decoder/src/libcorrect/correct/convolutional/sse/lookup.h
diff --git a/falcon9_decoder/src/libcorrect/correct/portable.h b/decoder_modules/falcon9_decoder/src/libcorrect/correct/portable.h
similarity index 100%
rename from falcon9_decoder/src/libcorrect/correct/portable.h
rename to decoder_modules/falcon9_decoder/src/libcorrect/correct/portable.h
diff --git a/falcon9_decoder/src/libcorrect/correct/reed-solomon.h b/decoder_modules/falcon9_decoder/src/libcorrect/correct/reed-solomon.h
similarity index 100%
rename from falcon9_decoder/src/libcorrect/correct/reed-solomon.h
rename to decoder_modules/falcon9_decoder/src/libcorrect/correct/reed-solomon.h
diff --git a/falcon9_decoder/src/libcorrect/correct/reed-solomon/decode.h b/decoder_modules/falcon9_decoder/src/libcorrect/correct/reed-solomon/decode.h
similarity index 100%
rename from falcon9_decoder/src/libcorrect/correct/reed-solomon/decode.h
rename to decoder_modules/falcon9_decoder/src/libcorrect/correct/reed-solomon/decode.h
diff --git a/falcon9_decoder/src/libcorrect/correct/reed-solomon/encode.h b/decoder_modules/falcon9_decoder/src/libcorrect/correct/reed-solomon/encode.h
similarity index 100%
rename from falcon9_decoder/src/libcorrect/correct/reed-solomon/encode.h
rename to decoder_modules/falcon9_decoder/src/libcorrect/correct/reed-solomon/encode.h
diff --git a/falcon9_decoder/src/libcorrect/correct/reed-solomon/field.h b/decoder_modules/falcon9_decoder/src/libcorrect/correct/reed-solomon/field.h
similarity index 100%
rename from falcon9_decoder/src/libcorrect/correct/reed-solomon/field.h
rename to decoder_modules/falcon9_decoder/src/libcorrect/correct/reed-solomon/field.h
diff --git a/falcon9_decoder/src/libcorrect/correct/reed-solomon/polynomial.h b/decoder_modules/falcon9_decoder/src/libcorrect/correct/reed-solomon/polynomial.h
similarity index 100%
rename from falcon9_decoder/src/libcorrect/correct/reed-solomon/polynomial.h
rename to decoder_modules/falcon9_decoder/src/libcorrect/correct/reed-solomon/polynomial.h
diff --git a/falcon9_decoder/src/libcorrect/correct/reed-solomon/reed-solomon.h b/decoder_modules/falcon9_decoder/src/libcorrect/correct/reed-solomon/reed-solomon.h
similarity index 100%
rename from falcon9_decoder/src/libcorrect/correct/reed-solomon/reed-solomon.h
rename to decoder_modules/falcon9_decoder/src/libcorrect/correct/reed-solomon/reed-solomon.h
diff --git a/falcon9_decoder/src/libcorrect/correct/util/error-sim-fec.h b/decoder_modules/falcon9_decoder/src/libcorrect/correct/util/error-sim-fec.h
similarity index 100%
rename from falcon9_decoder/src/libcorrect/correct/util/error-sim-fec.h
rename to decoder_modules/falcon9_decoder/src/libcorrect/correct/util/error-sim-fec.h
diff --git a/falcon9_decoder/src/libcorrect/correct/util/error-sim-shim.h b/decoder_modules/falcon9_decoder/src/libcorrect/correct/util/error-sim-shim.h
similarity index 100%
rename from falcon9_decoder/src/libcorrect/correct/util/error-sim-shim.h
rename to decoder_modules/falcon9_decoder/src/libcorrect/correct/util/error-sim-shim.h
diff --git a/falcon9_decoder/src/libcorrect/correct/util/error-sim-sse.h b/decoder_modules/falcon9_decoder/src/libcorrect/correct/util/error-sim-sse.h
similarity index 100%
rename from falcon9_decoder/src/libcorrect/correct/util/error-sim-sse.h
rename to decoder_modules/falcon9_decoder/src/libcorrect/correct/util/error-sim-sse.h
diff --git a/falcon9_decoder/src/libcorrect/correct/util/error-sim.h b/decoder_modules/falcon9_decoder/src/libcorrect/correct/util/error-sim.h
similarity index 100%
rename from falcon9_decoder/src/libcorrect/correct/util/error-sim.h
rename to decoder_modules/falcon9_decoder/src/libcorrect/correct/util/error-sim.h
diff --git a/falcon9_decoder/src/libcorrect/fec_shim.c b/decoder_modules/falcon9_decoder/src/libcorrect/fec_shim.c
similarity index 100%
rename from falcon9_decoder/src/libcorrect/fec_shim.c
rename to decoder_modules/falcon9_decoder/src/libcorrect/fec_shim.c
diff --git a/falcon9_decoder/src/libcorrect/fec_shim.h b/decoder_modules/falcon9_decoder/src/libcorrect/fec_shim.h
similarity index 100%
rename from falcon9_decoder/src/libcorrect/fec_shim.h
rename to decoder_modules/falcon9_decoder/src/libcorrect/fec_shim.h
diff --git a/falcon9_decoder/src/libcorrect/reed-solomon/CMakeLists.txt b/decoder_modules/falcon9_decoder/src/libcorrect/reed-solomon/CMakeLists.txt
similarity index 100%
rename from falcon9_decoder/src/libcorrect/reed-solomon/CMakeLists.txt
rename to decoder_modules/falcon9_decoder/src/libcorrect/reed-solomon/CMakeLists.txt
diff --git a/falcon9_decoder/src/libcorrect/reed-solomon/decode.c b/decoder_modules/falcon9_decoder/src/libcorrect/reed-solomon/decode.c
similarity index 100%
rename from falcon9_decoder/src/libcorrect/reed-solomon/decode.c
rename to decoder_modules/falcon9_decoder/src/libcorrect/reed-solomon/decode.c
diff --git a/falcon9_decoder/src/libcorrect/reed-solomon/encode.c b/decoder_modules/falcon9_decoder/src/libcorrect/reed-solomon/encode.c
similarity index 100%
rename from falcon9_decoder/src/libcorrect/reed-solomon/encode.c
rename to decoder_modules/falcon9_decoder/src/libcorrect/reed-solomon/encode.c
diff --git a/falcon9_decoder/src/libcorrect/reed-solomon/polynomial.c b/decoder_modules/falcon9_decoder/src/libcorrect/reed-solomon/polynomial.c
similarity index 100%
rename from falcon9_decoder/src/libcorrect/reed-solomon/polynomial.c
rename to decoder_modules/falcon9_decoder/src/libcorrect/reed-solomon/polynomial.c
diff --git a/falcon9_decoder/src/libcorrect/reed-solomon/reed-solomon.c b/decoder_modules/falcon9_decoder/src/libcorrect/reed-solomon/reed-solomon.c
similarity index 100%
rename from falcon9_decoder/src/libcorrect/reed-solomon/reed-solomon.c
rename to decoder_modules/falcon9_decoder/src/libcorrect/reed-solomon/reed-solomon.c
diff --git a/falcon9_decoder/src/main.cpp b/decoder_modules/falcon9_decoder/src/main.cpp
similarity index 100%
rename from falcon9_decoder/src/main.cpp
rename to decoder_modules/falcon9_decoder/src/main.cpp
diff --git a/m17_decoder/CMakeLists.txt b/decoder_modules/m17_decoder/CMakeLists.txt
similarity index 100%
rename from m17_decoder/CMakeLists.txt
rename to decoder_modules/m17_decoder/CMakeLists.txt
diff --git a/m17_decoder/src/base40.cpp b/decoder_modules/m17_decoder/src/base40.cpp
similarity index 100%
rename from m17_decoder/src/base40.cpp
rename to decoder_modules/m17_decoder/src/base40.cpp
diff --git a/m17_decoder/src/base40.h b/decoder_modules/m17_decoder/src/base40.h
similarity index 100%
rename from m17_decoder/src/base40.h
rename to decoder_modules/m17_decoder/src/base40.h
diff --git a/m17_decoder/src/crc16.h b/decoder_modules/m17_decoder/src/crc16.h
similarity index 100%
rename from m17_decoder/src/crc16.h
rename to decoder_modules/m17_decoder/src/crc16.h
diff --git a/m17_decoder/src/golay24.h b/decoder_modules/m17_decoder/src/golay24.h
similarity index 100%
rename from m17_decoder/src/golay24.h
rename to decoder_modules/m17_decoder/src/golay24.h
diff --git a/m17_decoder/src/lsf_decode.cpp b/decoder_modules/m17_decoder/src/lsf_decode.cpp
similarity index 100%
rename from m17_decoder/src/lsf_decode.cpp
rename to decoder_modules/m17_decoder/src/lsf_decode.cpp
diff --git a/m17_decoder/src/lsf_decode.h b/decoder_modules/m17_decoder/src/lsf_decode.h
similarity index 100%
rename from m17_decoder/src/lsf_decode.h
rename to decoder_modules/m17_decoder/src/lsf_decode.h
diff --git a/m17_decoder/src/m17dsp.h b/decoder_modules/m17_decoder/src/m17dsp.h
similarity index 100%
rename from m17_decoder/src/m17dsp.h
rename to decoder_modules/m17_decoder/src/m17dsp.h
diff --git a/m17_decoder/src/main.cpp b/decoder_modules/m17_decoder/src/main.cpp
similarity index 100%
rename from m17_decoder/src/main.cpp
rename to decoder_modules/m17_decoder/src/main.cpp
diff --git a/meteor_demodulator/CMakeLists.txt b/decoder_modules/meteor_demodulator/CMakeLists.txt
similarity index 100%
rename from meteor_demodulator/CMakeLists.txt
rename to decoder_modules/meteor_demodulator/CMakeLists.txt
diff --git a/meteor_demodulator/src/main.cpp b/decoder_modules/meteor_demodulator/src/main.cpp
similarity index 100%
rename from meteor_demodulator/src/main.cpp
rename to decoder_modules/meteor_demodulator/src/main.cpp
diff --git a/meteor_demodulator/src/meteor_demodulator_interface.h b/decoder_modules/meteor_demodulator/src/meteor_demodulator_interface.h
similarity index 100%
rename from meteor_demodulator/src/meteor_demodulator_interface.h
rename to decoder_modules/meteor_demodulator/src/meteor_demodulator_interface.h
diff --git a/radio/CMakeLists.txt b/decoder_modules/radio/CMakeLists.txt
similarity index 100%
rename from radio/CMakeLists.txt
rename to decoder_modules/radio/CMakeLists.txt
diff --git a/radio/src/am_demod.h b/decoder_modules/radio/src/am_demod.h
similarity index 100%
rename from radio/src/am_demod.h
rename to decoder_modules/radio/src/am_demod.h
diff --git a/radio/src/cw_demod.h b/decoder_modules/radio/src/cw_demod.h
similarity index 100%
rename from radio/src/cw_demod.h
rename to decoder_modules/radio/src/cw_demod.h
diff --git a/radio/src/dsb_demod.h b/decoder_modules/radio/src/dsb_demod.h
similarity index 100%
rename from radio/src/dsb_demod.h
rename to decoder_modules/radio/src/dsb_demod.h
diff --git a/radio/src/fm_demod.h b/decoder_modules/radio/src/fm_demod.h
similarity index 100%
rename from radio/src/fm_demod.h
rename to decoder_modules/radio/src/fm_demod.h
diff --git a/radio/src/lsb_demod.h b/decoder_modules/radio/src/lsb_demod.h
similarity index 100%
rename from radio/src/lsb_demod.h
rename to decoder_modules/radio/src/lsb_demod.h
diff --git a/radio/src/main.cpp b/decoder_modules/radio/src/main.cpp
similarity index 100%
rename from radio/src/main.cpp
rename to decoder_modules/radio/src/main.cpp
diff --git a/radio/src/radio_demod.h b/decoder_modules/radio/src/radio_demod.h
similarity index 100%
rename from radio/src/radio_demod.h
rename to decoder_modules/radio/src/radio_demod.h
diff --git a/radio/src/radio_interface.h b/decoder_modules/radio/src/radio_interface.h
similarity index 100%
rename from radio/src/radio_interface.h
rename to decoder_modules/radio/src/radio_interface.h
diff --git a/radio/src/raw_demod.h b/decoder_modules/radio/src/raw_demod.h
similarity index 100%
rename from radio/src/raw_demod.h
rename to decoder_modules/radio/src/raw_demod.h
diff --git a/radio/src/usb_demod.h b/decoder_modules/radio/src/usb_demod.h
similarity index 100%
rename from radio/src/usb_demod.h
rename to decoder_modules/radio/src/usb_demod.h
diff --git a/radio/src/wfm_demod.h b/decoder_modules/radio/src/wfm_demod.h
similarity index 100%
rename from radio/src/wfm_demod.h
rename to decoder_modules/radio/src/wfm_demod.h
diff --git a/weather_sat_decoder/CMakeLists.txt b/decoder_modules/weather_sat_decoder/CMakeLists.txt
similarity index 100%
rename from weather_sat_decoder/CMakeLists.txt
rename to decoder_modules/weather_sat_decoder/CMakeLists.txt
diff --git a/weather_sat_decoder/src/main.cpp b/decoder_modules/weather_sat_decoder/src/main.cpp
similarity index 100%
rename from weather_sat_decoder/src/main.cpp
rename to decoder_modules/weather_sat_decoder/src/main.cpp
diff --git a/weather_sat_decoder/src/noaa_hrpt_decoder.h b/decoder_modules/weather_sat_decoder/src/noaa_hrpt_decoder.h
similarity index 100%
rename from weather_sat_decoder/src/noaa_hrpt_decoder.h
rename to decoder_modules/weather_sat_decoder/src/noaa_hrpt_decoder.h
diff --git a/weather_sat_decoder/src/sat_decoder.h b/decoder_modules/weather_sat_decoder/src/sat_decoder.h
similarity index 100%
rename from weather_sat_decoder/src/sat_decoder.h
rename to decoder_modules/weather_sat_decoder/src/sat_decoder.h
diff --git a/make_windows_package.ps1 b/make_windows_package.ps1
index 00707b70..0a3355fb 100644
--- a/make_windows_package.ps1
+++ b/make_windows_package.ps1
@@ -11,59 +11,59 @@ cp $build_dir/Release/* sdrpp_windows_x64/
 cp 'C:/Program Files/PothosSDR/bin/volk.dll' sdrpp_windows_x64/
 
 # Copy source modules
-cp $build_dir/airspy_source/Release/airspy_source.dll sdrpp_windows_x64/modules/
+cp $build_dir/source_modules/airspy_source/Release/airspy_source.dll sdrpp_windows_x64/modules/
 cp 'C:/Program Files/PothosSDR/bin/airspy.dll' sdrpp_windows_x64/
 
-cp $build_dir/airspyhf_source/Release/airspyhf_source.dll sdrpp_windows_x64/modules/
+cp $build_dir/source_modules/airspyhf_source/Release/airspyhf_source.dll sdrpp_windows_x64/modules/
 cp 'C:/Program Files/PothosSDR/bin/airspyhf.dll' sdrpp_windows_x64/
 
-cp $build_dir/bladerf_source/Release/bladerf_source.dll sdrpp_windows_x64/modules/
+cp $build_dir/source_modules/bladerf_source/Release/bladerf_source.dll sdrpp_windows_x64/modules/
 cp 'C:/Program Files/PothosSDR/bin/bladeRF.dll' sdrpp_windows_x64/
 
-cp $build_dir/file_source/Release/file_source.dll sdrpp_windows_x64/modules/
+cp $build_dir/source_modules/file_source/Release/file_source.dll sdrpp_windows_x64/modules/
 
-cp $build_dir/hackrf_source/Release/hackrf_source.dll sdrpp_windows_x64/modules/
+cp $build_dir/source_modules/hackrf_source/Release/hackrf_source.dll sdrpp_windows_x64/modules/
 cp 'C:/Program Files/PothosSDR/bin/hackrf.dll' sdrpp_windows_x64/
 
-cp $build_dir/rtl_sdr_source/Release/rtl_sdr_source.dll sdrpp_windows_x64/modules/
+cp $build_dir/source_modules/rtl_sdr_source/Release/rtl_sdr_source.dll sdrpp_windows_x64/modules/
 cp 'C:/Program Files/PothosSDR/bin/rtlsdr.dll' sdrpp_windows_x64/
 
-cp $build_dir/limesdr_source/Release/limesdr_source.dll sdrpp_windows_x64/modules/
+cp $build_dir/source_modules/limesdr_source/Release/limesdr_source.dll sdrpp_windows_x64/modules/
 cp 'C:/Program Files/PothosSDR/bin/LimeSuite.dll' sdrpp_windows_x64/
 
-cp $build_dir/rtl_tcp_source/Release/rtl_tcp_source.dll sdrpp_windows_x64/modules/
+cp $build_dir/source_modules/rtl_tcp_source/Release/rtl_tcp_source.dll sdrpp_windows_x64/modules/
 
-cp $build_dir/sdrplay_source/Release/sdrplay_source.dll sdrpp_windows_x64/modules/ -ErrorAction SilentlyContinue
+cp $build_dir/source_modules/sdrplay_source/Release/sdrplay_source.dll sdrpp_windows_x64/modules/ -ErrorAction SilentlyContinue
 cp 'C:/Program Files/SDRplay/API/x64/sdrplay_api.dll' sdrpp_windows_x64/ -ErrorAction SilentlyContinue
 
-cp $build_dir/soapy_source/Release/soapy_source.dll sdrpp_windows_x64/modules/
+cp $build_dir/source_modules/soapy_source/Release/soapy_source.dll sdrpp_windows_x64/modules/
 
-cp $build_dir/plutosdr_source/Release/plutosdr_source.dll sdrpp_windows_x64/modules/
+cp $build_dir/source_modules/plutosdr_source/Release/plutosdr_source.dll sdrpp_windows_x64/modules/
 cp 'C:/Program Files/PothosSDR/bin/libiio.dll' sdrpp_windows_x64/
 cp 'C:/Program Files/PothosSDR/bin/libad9361.dll' sdrpp_windows_x64/
 
-cp $build_dir/spyserver_source/Release/spyserver_source.dll sdrpp_windows_x64/modules/
+cp $build_dir/source_modules/spyserver_source/Release/spyserver_source.dll sdrpp_windows_x64/modules/
 
 
 # Copy sink modules
-cp $build_dir/audio_sink/Release/audio_sink.dll sdrpp_windows_x64/modules/
+cp $build_dir/sink_modules/audio_sink/Release/audio_sink.dll sdrpp_windows_x64/modules/
 cp "C:/Program Files (x86)/RtAudio/bin/rtaudio.dll" sdrpp_windows_x64/
-cp $build_dir/network_sink/Release/network_sink.dll sdrpp_windows_x64/modules/
+cp $build_dir/sink_modules/network_sink/Release/network_sink.dll sdrpp_windows_x64/modules/
 
 
 # Copy decoder modules
-cp $build_dir/m17_decoder/Release/m17_decoder.dll sdrpp_windows_x64/modules/
+cp $build_dir/decoder_modules/m17_decoder/Release/m17_decoder.dll sdrpp_windows_x64/modules/
 cp "C:/Program Files/codec2/lib/libcodec2.dll" sdrpp_windows_x64/
 
-cp $build_dir/meteor_demodulator/Release/meteor_demodulator.dll sdrpp_windows_x64/modules/
-cp $build_dir/radio/Release/radio.dll sdrpp_windows_x64/modules/
+cp $build_dir/decoder_modules/meteor_demodulator/Release/meteor_demodulator.dll sdrpp_windows_x64/modules/
+cp $build_dir/decoder_modules/radio/Release/radio.dll sdrpp_windows_x64/modules/
 
 
 # Copy misc modules
-cp $build_dir/discord_integration/Release/discord_integration.dll sdrpp_windows_x64/modules/
-cp $build_dir/frequency_manager/Release/frequency_manager.dll sdrpp_windows_x64/modules/
-cp $build_dir/recorder/Release/recorder.dll sdrpp_windows_x64/modules/
-cp $build_dir/rigctl_server/Release/rigctl_server.dll sdrpp_windows_x64/modules/
+cp $build_dir/misc_modules/discord_integration/Release/discord_integration.dll sdrpp_windows_x64/modules/
+cp $build_dir/misc_modules/frequency_manager/Release/frequency_manager.dll sdrpp_windows_x64/modules/
+cp $build_dir/misc_modules/recorder/Release/recorder.dll sdrpp_windows_x64/modules/
+cp $build_dir/misc_modules/rigctl_server/Release/rigctl_server.dll sdrpp_windows_x64/modules/
 
 
 # Copy supporting libs
diff --git a/demo_module/CMakeLists.txt b/misc_modules/demo_module/CMakeLists.txt
similarity index 100%
rename from demo_module/CMakeLists.txt
rename to misc_modules/demo_module/CMakeLists.txt
diff --git a/demo_module/src/main.cpp b/misc_modules/demo_module/src/main.cpp
similarity index 100%
rename from demo_module/src/main.cpp
rename to misc_modules/demo_module/src/main.cpp
diff --git a/discord_integration/CMakeLists.txt b/misc_modules/discord_integration/CMakeLists.txt
similarity index 88%
rename from discord_integration/CMakeLists.txt
rename to misc_modules/discord_integration/CMakeLists.txt
index 50defffe..c3571e20 100644
--- a/discord_integration/CMakeLists.txt
+++ b/misc_modules/discord_integration/CMakeLists.txt
@@ -12,7 +12,7 @@ endif ()
 add_subdirectory("discord-rpc")
 
 file(GLOB SRC "src/*.cpp")
-include_directories("src/" "discord-rpc/include" "../radio/src/")
+include_directories("src/" "discord-rpc/include" "../../decoder_modules/radio/src/")
 
 add_library(discord_integration SHARED ${SRC})
 target_link_libraries(discord_integration PUBLIC sdrpp_core discord-rpc)
diff --git a/discord_integration/discord-rpc/CMakeLists.txt b/misc_modules/discord_integration/discord-rpc/CMakeLists.txt
similarity index 100%
rename from discord_integration/discord-rpc/CMakeLists.txt
rename to misc_modules/discord_integration/discord-rpc/CMakeLists.txt
diff --git a/discord_integration/discord-rpc/LICENSE b/misc_modules/discord_integration/discord-rpc/LICENSE
similarity index 100%
rename from discord_integration/discord-rpc/LICENSE
rename to misc_modules/discord_integration/discord-rpc/LICENSE
diff --git a/discord_integration/discord-rpc/include/discord_register.h b/misc_modules/discord_integration/discord-rpc/include/discord_register.h
similarity index 100%
rename from discord_integration/discord-rpc/include/discord_register.h
rename to misc_modules/discord_integration/discord-rpc/include/discord_register.h
diff --git a/discord_integration/discord-rpc/include/discord_rpc.h b/misc_modules/discord_integration/discord-rpc/include/discord_rpc.h
similarity index 100%
rename from discord_integration/discord-rpc/include/discord_rpc.h
rename to misc_modules/discord_integration/discord-rpc/include/discord_rpc.h
diff --git a/discord_integration/discord-rpc/include/rapidjson/allocators.h b/misc_modules/discord_integration/discord-rpc/include/rapidjson/allocators.h
similarity index 100%
rename from discord_integration/discord-rpc/include/rapidjson/allocators.h
rename to misc_modules/discord_integration/discord-rpc/include/rapidjson/allocators.h
diff --git a/discord_integration/discord-rpc/include/rapidjson/cursorstreamwrapper.h b/misc_modules/discord_integration/discord-rpc/include/rapidjson/cursorstreamwrapper.h
similarity index 100%
rename from discord_integration/discord-rpc/include/rapidjson/cursorstreamwrapper.h
rename to misc_modules/discord_integration/discord-rpc/include/rapidjson/cursorstreamwrapper.h
diff --git a/discord_integration/discord-rpc/include/rapidjson/document.h b/misc_modules/discord_integration/discord-rpc/include/rapidjson/document.h
similarity index 100%
rename from discord_integration/discord-rpc/include/rapidjson/document.h
rename to misc_modules/discord_integration/discord-rpc/include/rapidjson/document.h
diff --git a/discord_integration/discord-rpc/include/rapidjson/encodedstream.h b/misc_modules/discord_integration/discord-rpc/include/rapidjson/encodedstream.h
similarity index 100%
rename from discord_integration/discord-rpc/include/rapidjson/encodedstream.h
rename to misc_modules/discord_integration/discord-rpc/include/rapidjson/encodedstream.h
diff --git a/discord_integration/discord-rpc/include/rapidjson/encodings.h b/misc_modules/discord_integration/discord-rpc/include/rapidjson/encodings.h
similarity index 100%
rename from discord_integration/discord-rpc/include/rapidjson/encodings.h
rename to misc_modules/discord_integration/discord-rpc/include/rapidjson/encodings.h
diff --git a/discord_integration/discord-rpc/include/rapidjson/error/en.h b/misc_modules/discord_integration/discord-rpc/include/rapidjson/error/en.h
similarity index 100%
rename from discord_integration/discord-rpc/include/rapidjson/error/en.h
rename to misc_modules/discord_integration/discord-rpc/include/rapidjson/error/en.h
diff --git a/discord_integration/discord-rpc/include/rapidjson/error/error.h b/misc_modules/discord_integration/discord-rpc/include/rapidjson/error/error.h
similarity index 100%
rename from discord_integration/discord-rpc/include/rapidjson/error/error.h
rename to misc_modules/discord_integration/discord-rpc/include/rapidjson/error/error.h
diff --git a/discord_integration/discord-rpc/include/rapidjson/filereadstream.h b/misc_modules/discord_integration/discord-rpc/include/rapidjson/filereadstream.h
similarity index 100%
rename from discord_integration/discord-rpc/include/rapidjson/filereadstream.h
rename to misc_modules/discord_integration/discord-rpc/include/rapidjson/filereadstream.h
diff --git a/discord_integration/discord-rpc/include/rapidjson/filewritestream.h b/misc_modules/discord_integration/discord-rpc/include/rapidjson/filewritestream.h
similarity index 100%
rename from discord_integration/discord-rpc/include/rapidjson/filewritestream.h
rename to misc_modules/discord_integration/discord-rpc/include/rapidjson/filewritestream.h
diff --git a/discord_integration/discord-rpc/include/rapidjson/fwd.h b/misc_modules/discord_integration/discord-rpc/include/rapidjson/fwd.h
similarity index 100%
rename from discord_integration/discord-rpc/include/rapidjson/fwd.h
rename to misc_modules/discord_integration/discord-rpc/include/rapidjson/fwd.h
diff --git a/discord_integration/discord-rpc/include/rapidjson/internal/biginteger.h b/misc_modules/discord_integration/discord-rpc/include/rapidjson/internal/biginteger.h
similarity index 100%
rename from discord_integration/discord-rpc/include/rapidjson/internal/biginteger.h
rename to misc_modules/discord_integration/discord-rpc/include/rapidjson/internal/biginteger.h
diff --git a/discord_integration/discord-rpc/include/rapidjson/internal/clzll.h b/misc_modules/discord_integration/discord-rpc/include/rapidjson/internal/clzll.h
similarity index 100%
rename from discord_integration/discord-rpc/include/rapidjson/internal/clzll.h
rename to misc_modules/discord_integration/discord-rpc/include/rapidjson/internal/clzll.h
diff --git a/discord_integration/discord-rpc/include/rapidjson/internal/diyfp.h b/misc_modules/discord_integration/discord-rpc/include/rapidjson/internal/diyfp.h
similarity index 100%
rename from discord_integration/discord-rpc/include/rapidjson/internal/diyfp.h
rename to misc_modules/discord_integration/discord-rpc/include/rapidjson/internal/diyfp.h
diff --git a/discord_integration/discord-rpc/include/rapidjson/internal/dtoa.h b/misc_modules/discord_integration/discord-rpc/include/rapidjson/internal/dtoa.h
similarity index 100%
rename from discord_integration/discord-rpc/include/rapidjson/internal/dtoa.h
rename to misc_modules/discord_integration/discord-rpc/include/rapidjson/internal/dtoa.h
diff --git a/discord_integration/discord-rpc/include/rapidjson/internal/ieee754.h b/misc_modules/discord_integration/discord-rpc/include/rapidjson/internal/ieee754.h
similarity index 100%
rename from discord_integration/discord-rpc/include/rapidjson/internal/ieee754.h
rename to misc_modules/discord_integration/discord-rpc/include/rapidjson/internal/ieee754.h
diff --git a/discord_integration/discord-rpc/include/rapidjson/internal/itoa.h b/misc_modules/discord_integration/discord-rpc/include/rapidjson/internal/itoa.h
similarity index 100%
rename from discord_integration/discord-rpc/include/rapidjson/internal/itoa.h
rename to misc_modules/discord_integration/discord-rpc/include/rapidjson/internal/itoa.h
diff --git a/discord_integration/discord-rpc/include/rapidjson/internal/meta.h b/misc_modules/discord_integration/discord-rpc/include/rapidjson/internal/meta.h
similarity index 100%
rename from discord_integration/discord-rpc/include/rapidjson/internal/meta.h
rename to misc_modules/discord_integration/discord-rpc/include/rapidjson/internal/meta.h
diff --git a/discord_integration/discord-rpc/include/rapidjson/internal/pow10.h b/misc_modules/discord_integration/discord-rpc/include/rapidjson/internal/pow10.h
similarity index 100%
rename from discord_integration/discord-rpc/include/rapidjson/internal/pow10.h
rename to misc_modules/discord_integration/discord-rpc/include/rapidjson/internal/pow10.h
diff --git a/discord_integration/discord-rpc/include/rapidjson/internal/regex.h b/misc_modules/discord_integration/discord-rpc/include/rapidjson/internal/regex.h
similarity index 100%
rename from discord_integration/discord-rpc/include/rapidjson/internal/regex.h
rename to misc_modules/discord_integration/discord-rpc/include/rapidjson/internal/regex.h
diff --git a/discord_integration/discord-rpc/include/rapidjson/internal/stack.h b/misc_modules/discord_integration/discord-rpc/include/rapidjson/internal/stack.h
similarity index 100%
rename from discord_integration/discord-rpc/include/rapidjson/internal/stack.h
rename to misc_modules/discord_integration/discord-rpc/include/rapidjson/internal/stack.h
diff --git a/discord_integration/discord-rpc/include/rapidjson/internal/strfunc.h b/misc_modules/discord_integration/discord-rpc/include/rapidjson/internal/strfunc.h
similarity index 100%
rename from discord_integration/discord-rpc/include/rapidjson/internal/strfunc.h
rename to misc_modules/discord_integration/discord-rpc/include/rapidjson/internal/strfunc.h
diff --git a/discord_integration/discord-rpc/include/rapidjson/internal/strtod.h b/misc_modules/discord_integration/discord-rpc/include/rapidjson/internal/strtod.h
similarity index 100%
rename from discord_integration/discord-rpc/include/rapidjson/internal/strtod.h
rename to misc_modules/discord_integration/discord-rpc/include/rapidjson/internal/strtod.h
diff --git a/discord_integration/discord-rpc/include/rapidjson/internal/swap.h b/misc_modules/discord_integration/discord-rpc/include/rapidjson/internal/swap.h
similarity index 100%
rename from discord_integration/discord-rpc/include/rapidjson/internal/swap.h
rename to misc_modules/discord_integration/discord-rpc/include/rapidjson/internal/swap.h
diff --git a/discord_integration/discord-rpc/include/rapidjson/istreamwrapper.h b/misc_modules/discord_integration/discord-rpc/include/rapidjson/istreamwrapper.h
similarity index 100%
rename from discord_integration/discord-rpc/include/rapidjson/istreamwrapper.h
rename to misc_modules/discord_integration/discord-rpc/include/rapidjson/istreamwrapper.h
diff --git a/discord_integration/discord-rpc/include/rapidjson/memorybuffer.h b/misc_modules/discord_integration/discord-rpc/include/rapidjson/memorybuffer.h
similarity index 100%
rename from discord_integration/discord-rpc/include/rapidjson/memorybuffer.h
rename to misc_modules/discord_integration/discord-rpc/include/rapidjson/memorybuffer.h
diff --git a/discord_integration/discord-rpc/include/rapidjson/memorystream.h b/misc_modules/discord_integration/discord-rpc/include/rapidjson/memorystream.h
similarity index 100%
rename from discord_integration/discord-rpc/include/rapidjson/memorystream.h
rename to misc_modules/discord_integration/discord-rpc/include/rapidjson/memorystream.h
diff --git a/discord_integration/discord-rpc/include/rapidjson/msinttypes/inttypes.h b/misc_modules/discord_integration/discord-rpc/include/rapidjson/msinttypes/inttypes.h
similarity index 100%
rename from discord_integration/discord-rpc/include/rapidjson/msinttypes/inttypes.h
rename to misc_modules/discord_integration/discord-rpc/include/rapidjson/msinttypes/inttypes.h
diff --git a/discord_integration/discord-rpc/include/rapidjson/msinttypes/stdint.h b/misc_modules/discord_integration/discord-rpc/include/rapidjson/msinttypes/stdint.h
similarity index 100%
rename from discord_integration/discord-rpc/include/rapidjson/msinttypes/stdint.h
rename to misc_modules/discord_integration/discord-rpc/include/rapidjson/msinttypes/stdint.h
diff --git a/discord_integration/discord-rpc/include/rapidjson/ostreamwrapper.h b/misc_modules/discord_integration/discord-rpc/include/rapidjson/ostreamwrapper.h
similarity index 100%
rename from discord_integration/discord-rpc/include/rapidjson/ostreamwrapper.h
rename to misc_modules/discord_integration/discord-rpc/include/rapidjson/ostreamwrapper.h
diff --git a/discord_integration/discord-rpc/include/rapidjson/pointer.h b/misc_modules/discord_integration/discord-rpc/include/rapidjson/pointer.h
similarity index 100%
rename from discord_integration/discord-rpc/include/rapidjson/pointer.h
rename to misc_modules/discord_integration/discord-rpc/include/rapidjson/pointer.h
diff --git a/discord_integration/discord-rpc/include/rapidjson/prettywriter.h b/misc_modules/discord_integration/discord-rpc/include/rapidjson/prettywriter.h
similarity index 100%
rename from discord_integration/discord-rpc/include/rapidjson/prettywriter.h
rename to misc_modules/discord_integration/discord-rpc/include/rapidjson/prettywriter.h
diff --git a/discord_integration/discord-rpc/include/rapidjson/rapidjson.h b/misc_modules/discord_integration/discord-rpc/include/rapidjson/rapidjson.h
similarity index 100%
rename from discord_integration/discord-rpc/include/rapidjson/rapidjson.h
rename to misc_modules/discord_integration/discord-rpc/include/rapidjson/rapidjson.h
diff --git a/discord_integration/discord-rpc/include/rapidjson/reader.h b/misc_modules/discord_integration/discord-rpc/include/rapidjson/reader.h
similarity index 100%
rename from discord_integration/discord-rpc/include/rapidjson/reader.h
rename to misc_modules/discord_integration/discord-rpc/include/rapidjson/reader.h
diff --git a/discord_integration/discord-rpc/include/rapidjson/schema.h b/misc_modules/discord_integration/discord-rpc/include/rapidjson/schema.h
similarity index 100%
rename from discord_integration/discord-rpc/include/rapidjson/schema.h
rename to misc_modules/discord_integration/discord-rpc/include/rapidjson/schema.h
diff --git a/discord_integration/discord-rpc/include/rapidjson/stream.h b/misc_modules/discord_integration/discord-rpc/include/rapidjson/stream.h
similarity index 100%
rename from discord_integration/discord-rpc/include/rapidjson/stream.h
rename to misc_modules/discord_integration/discord-rpc/include/rapidjson/stream.h
diff --git a/discord_integration/discord-rpc/include/rapidjson/stringbuffer.h b/misc_modules/discord_integration/discord-rpc/include/rapidjson/stringbuffer.h
similarity index 100%
rename from discord_integration/discord-rpc/include/rapidjson/stringbuffer.h
rename to misc_modules/discord_integration/discord-rpc/include/rapidjson/stringbuffer.h
diff --git a/discord_integration/discord-rpc/include/rapidjson/writer.h b/misc_modules/discord_integration/discord-rpc/include/rapidjson/writer.h
similarity index 100%
rename from discord_integration/discord-rpc/include/rapidjson/writer.h
rename to misc_modules/discord_integration/discord-rpc/include/rapidjson/writer.h
diff --git a/discord_integration/discord-rpc/src/CMakeLists.txt b/misc_modules/discord_integration/discord-rpc/src/CMakeLists.txt
similarity index 100%
rename from discord_integration/discord-rpc/src/CMakeLists.txt
rename to misc_modules/discord_integration/discord-rpc/src/CMakeLists.txt
diff --git a/discord_integration/discord-rpc/src/backoff.h b/misc_modules/discord_integration/discord-rpc/src/backoff.h
similarity index 100%
rename from discord_integration/discord-rpc/src/backoff.h
rename to misc_modules/discord_integration/discord-rpc/src/backoff.h
diff --git a/discord_integration/discord-rpc/src/connection.h b/misc_modules/discord_integration/discord-rpc/src/connection.h
similarity index 100%
rename from discord_integration/discord-rpc/src/connection.h
rename to misc_modules/discord_integration/discord-rpc/src/connection.h
diff --git a/discord_integration/discord-rpc/src/connection_unix.cpp b/misc_modules/discord_integration/discord-rpc/src/connection_unix.cpp
similarity index 100%
rename from discord_integration/discord-rpc/src/connection_unix.cpp
rename to misc_modules/discord_integration/discord-rpc/src/connection_unix.cpp
diff --git a/discord_integration/discord-rpc/src/connection_win.cpp b/misc_modules/discord_integration/discord-rpc/src/connection_win.cpp
similarity index 100%
rename from discord_integration/discord-rpc/src/connection_win.cpp
rename to misc_modules/discord_integration/discord-rpc/src/connection_win.cpp
diff --git a/discord_integration/discord-rpc/src/discord_register_linux.cpp b/misc_modules/discord_integration/discord-rpc/src/discord_register_linux.cpp
similarity index 100%
rename from discord_integration/discord-rpc/src/discord_register_linux.cpp
rename to misc_modules/discord_integration/discord-rpc/src/discord_register_linux.cpp
diff --git a/discord_integration/discord-rpc/src/discord_register_osx.m b/misc_modules/discord_integration/discord-rpc/src/discord_register_osx.m
similarity index 100%
rename from discord_integration/discord-rpc/src/discord_register_osx.m
rename to misc_modules/discord_integration/discord-rpc/src/discord_register_osx.m
diff --git a/discord_integration/discord-rpc/src/discord_register_win.cpp b/misc_modules/discord_integration/discord-rpc/src/discord_register_win.cpp
similarity index 100%
rename from discord_integration/discord-rpc/src/discord_register_win.cpp
rename to misc_modules/discord_integration/discord-rpc/src/discord_register_win.cpp
diff --git a/discord_integration/discord-rpc/src/discord_rpc.cpp b/misc_modules/discord_integration/discord-rpc/src/discord_rpc.cpp
similarity index 100%
rename from discord_integration/discord-rpc/src/discord_rpc.cpp
rename to misc_modules/discord_integration/discord-rpc/src/discord_rpc.cpp
diff --git a/discord_integration/discord-rpc/src/dllmain.cpp b/misc_modules/discord_integration/discord-rpc/src/dllmain.cpp
similarity index 100%
rename from discord_integration/discord-rpc/src/dllmain.cpp
rename to misc_modules/discord_integration/discord-rpc/src/dllmain.cpp
diff --git a/discord_integration/discord-rpc/src/msg_queue.h b/misc_modules/discord_integration/discord-rpc/src/msg_queue.h
similarity index 100%
rename from discord_integration/discord-rpc/src/msg_queue.h
rename to misc_modules/discord_integration/discord-rpc/src/msg_queue.h
diff --git a/discord_integration/discord-rpc/src/rpc_connection.cpp b/misc_modules/discord_integration/discord-rpc/src/rpc_connection.cpp
similarity index 100%
rename from discord_integration/discord-rpc/src/rpc_connection.cpp
rename to misc_modules/discord_integration/discord-rpc/src/rpc_connection.cpp
diff --git a/discord_integration/discord-rpc/src/rpc_connection.h b/misc_modules/discord_integration/discord-rpc/src/rpc_connection.h
similarity index 100%
rename from discord_integration/discord-rpc/src/rpc_connection.h
rename to misc_modules/discord_integration/discord-rpc/src/rpc_connection.h
diff --git a/discord_integration/discord-rpc/src/serialization.cpp b/misc_modules/discord_integration/discord-rpc/src/serialization.cpp
similarity index 100%
rename from discord_integration/discord-rpc/src/serialization.cpp
rename to misc_modules/discord_integration/discord-rpc/src/serialization.cpp
diff --git a/discord_integration/discord-rpc/src/serialization.h b/misc_modules/discord_integration/discord-rpc/src/serialization.h
similarity index 100%
rename from discord_integration/discord-rpc/src/serialization.h
rename to misc_modules/discord_integration/discord-rpc/src/serialization.h
diff --git a/discord_integration/src/main.cpp b/misc_modules/discord_integration/src/main.cpp
similarity index 100%
rename from discord_integration/src/main.cpp
rename to misc_modules/discord_integration/src/main.cpp
diff --git a/frequency_manager/CMakeLists.txt b/misc_modules/frequency_manager/CMakeLists.txt
similarity index 90%
rename from frequency_manager/CMakeLists.txt
rename to misc_modules/frequency_manager/CMakeLists.txt
index 83304f5b..d1b7eda0 100644
--- a/frequency_manager/CMakeLists.txt
+++ b/misc_modules/frequency_manager/CMakeLists.txt
@@ -9,7 +9,7 @@ else ()
     add_compile_options(-O3 -std=c++17)
 endif ()
 
-include_directories("src/" "../radio/src")
+include_directories("src/" "../../decoder_modules/radio/src")
 
 file(GLOB SRC "src/*.cpp")
 
diff --git a/frequency_manager/src/main.cpp b/misc_modules/frequency_manager/src/main.cpp
similarity index 100%
rename from frequency_manager/src/main.cpp
rename to misc_modules/frequency_manager/src/main.cpp
diff --git a/recorder/CMakeLists.txt b/misc_modules/recorder/CMakeLists.txt
similarity index 100%
rename from recorder/CMakeLists.txt
rename to misc_modules/recorder/CMakeLists.txt
diff --git a/recorder/src/main.cpp b/misc_modules/recorder/src/main.cpp
similarity index 100%
rename from recorder/src/main.cpp
rename to misc_modules/recorder/src/main.cpp
diff --git a/recorder/src/recorder_interface.h b/misc_modules/recorder/src/recorder_interface.h
similarity index 100%
rename from recorder/src/recorder_interface.h
rename to misc_modules/recorder/src/recorder_interface.h
diff --git a/recorder/src/wav.h b/misc_modules/recorder/src/wav.h
similarity index 100%
rename from recorder/src/wav.h
rename to misc_modules/recorder/src/wav.h
diff --git a/rigctl_server/CMakeLists.txt b/misc_modules/rigctl_server/CMakeLists.txt
similarity index 84%
rename from rigctl_server/CMakeLists.txt
rename to misc_modules/rigctl_server/CMakeLists.txt
index 75609b9e..d8f78f1f 100644
--- a/rigctl_server/CMakeLists.txt
+++ b/misc_modules/rigctl_server/CMakeLists.txt
@@ -13,8 +13,8 @@ file(GLOB SRC "src/*.cpp")
 
 include_directories("src/")
 include_directories("../recorder/src")
-include_directories("../meteor_demodulator/src")
-include_directories("../radio/src")
+include_directories("../../decoder_modules/meteor_demodulator/src")
+include_directories("../../decoder_modules/radio/src")
 
 add_library(rigctl_server SHARED ${SRC})
 target_link_libraries(rigctl_server PRIVATE sdrpp_core)
diff --git a/rigctl_server/src/main.cpp b/misc_modules/rigctl_server/src/main.cpp
similarity index 100%
rename from rigctl_server/src/main.cpp
rename to misc_modules/rigctl_server/src/main.cpp
diff --git a/scanner/CMakeLists.txt b/misc_modules/scanner/CMakeLists.txt
similarity index 100%
rename from scanner/CMakeLists.txt
rename to misc_modules/scanner/CMakeLists.txt
diff --git a/scanner/src/main.cpp b/misc_modules/scanner/src/main.cpp
similarity index 100%
rename from scanner/src/main.cpp
rename to misc_modules/scanner/src/main.cpp
diff --git a/audio_sink/CMakeLists.txt b/sink_modules/audio_sink/CMakeLists.txt
similarity index 100%
rename from audio_sink/CMakeLists.txt
rename to sink_modules/audio_sink/CMakeLists.txt
diff --git a/audio_sink/src/main.cpp b/sink_modules/audio_sink/src/main.cpp
similarity index 100%
rename from audio_sink/src/main.cpp
rename to sink_modules/audio_sink/src/main.cpp
diff --git a/network_sink/CMakeLists.txt b/sink_modules/network_sink/CMakeLists.txt
similarity index 100%
rename from network_sink/CMakeLists.txt
rename to sink_modules/network_sink/CMakeLists.txt
diff --git a/network_sink/src/main.cpp b/sink_modules/network_sink/src/main.cpp
similarity index 100%
rename from network_sink/src/main.cpp
rename to sink_modules/network_sink/src/main.cpp
diff --git a/new_portaudio_sink/CMakeLists.txt b/sink_modules/new_portaudio_sink/CMakeLists.txt
similarity index 100%
rename from new_portaudio_sink/CMakeLists.txt
rename to sink_modules/new_portaudio_sink/CMakeLists.txt
diff --git a/new_portaudio_sink/src/main.cpp b/sink_modules/new_portaudio_sink/src/main.cpp
similarity index 100%
rename from new_portaudio_sink/src/main.cpp
rename to sink_modules/new_portaudio_sink/src/main.cpp
diff --git a/portaudio_sink/CMakeLists.txt b/sink_modules/portaudio_sink/CMakeLists.txt
similarity index 100%
rename from portaudio_sink/CMakeLists.txt
rename to sink_modules/portaudio_sink/CMakeLists.txt
diff --git a/portaudio_sink/src/main.cpp b/sink_modules/portaudio_sink/src/main.cpp
similarity index 100%
rename from portaudio_sink/src/main.cpp
rename to sink_modules/portaudio_sink/src/main.cpp
diff --git a/airspy_source/CMakeLists.txt b/source_modules/airspy_source/CMakeLists.txt
similarity index 100%
rename from airspy_source/CMakeLists.txt
rename to source_modules/airspy_source/CMakeLists.txt
diff --git a/airspy_source/src/main.cpp b/source_modules/airspy_source/src/main.cpp
similarity index 100%
rename from airspy_source/src/main.cpp
rename to source_modules/airspy_source/src/main.cpp
diff --git a/airspyhf_source/CMakeLists.txt b/source_modules/airspyhf_source/CMakeLists.txt
similarity index 100%
rename from airspyhf_source/CMakeLists.txt
rename to source_modules/airspyhf_source/CMakeLists.txt
diff --git a/airspyhf_source/src/main.cpp b/source_modules/airspyhf_source/src/main.cpp
similarity index 100%
rename from airspyhf_source/src/main.cpp
rename to source_modules/airspyhf_source/src/main.cpp
diff --git a/bladerf_source/CMakeLists.txt b/source_modules/bladerf_source/CMakeLists.txt
similarity index 100%
rename from bladerf_source/CMakeLists.txt
rename to source_modules/bladerf_source/CMakeLists.txt
diff --git a/bladerf_source/src/main.cpp b/source_modules/bladerf_source/src/main.cpp
similarity index 100%
rename from bladerf_source/src/main.cpp
rename to source_modules/bladerf_source/src/main.cpp
diff --git a/file_source/CMakeLists.txt b/source_modules/file_source/CMakeLists.txt
similarity index 100%
rename from file_source/CMakeLists.txt
rename to source_modules/file_source/CMakeLists.txt
diff --git a/file_source/src/main.cpp b/source_modules/file_source/src/main.cpp
similarity index 100%
rename from file_source/src/main.cpp
rename to source_modules/file_source/src/main.cpp
diff --git a/file_source/src/wavreader.h b/source_modules/file_source/src/wavreader.h
similarity index 100%
rename from file_source/src/wavreader.h
rename to source_modules/file_source/src/wavreader.h
diff --git a/hackrf_source/CMakeLists.txt b/source_modules/hackrf_source/CMakeLists.txt
similarity index 100%
rename from hackrf_source/CMakeLists.txt
rename to source_modules/hackrf_source/CMakeLists.txt
diff --git a/hackrf_source/src/main.cpp b/source_modules/hackrf_source/src/main.cpp
similarity index 100%
rename from hackrf_source/src/main.cpp
rename to source_modules/hackrf_source/src/main.cpp
diff --git a/limesdr_source/CMakeLists.txt b/source_modules/limesdr_source/CMakeLists.txt
similarity index 100%
rename from limesdr_source/CMakeLists.txt
rename to source_modules/limesdr_source/CMakeLists.txt
diff --git a/limesdr_source/src/main.cpp b/source_modules/limesdr_source/src/main.cpp
similarity index 100%
rename from limesdr_source/src/main.cpp
rename to source_modules/limesdr_source/src/main.cpp
diff --git a/plutosdr_source/CMakeLists.txt b/source_modules/plutosdr_source/CMakeLists.txt
similarity index 100%
rename from plutosdr_source/CMakeLists.txt
rename to source_modules/plutosdr_source/CMakeLists.txt
diff --git a/plutosdr_source/src/main.cpp b/source_modules/plutosdr_source/src/main.cpp
similarity index 100%
rename from plutosdr_source/src/main.cpp
rename to source_modules/plutosdr_source/src/main.cpp
diff --git a/rtl_sdr_source/CMakeLists.txt b/source_modules/rtl_sdr_source/CMakeLists.txt
similarity index 100%
rename from rtl_sdr_source/CMakeLists.txt
rename to source_modules/rtl_sdr_source/CMakeLists.txt
diff --git a/rtl_sdr_source/src/main.cpp b/source_modules/rtl_sdr_source/src/main.cpp
similarity index 100%
rename from rtl_sdr_source/src/main.cpp
rename to source_modules/rtl_sdr_source/src/main.cpp
diff --git a/rtl_tcp_source/CMakeLists.txt b/source_modules/rtl_tcp_source/CMakeLists.txt
similarity index 100%
rename from rtl_tcp_source/CMakeLists.txt
rename to source_modules/rtl_tcp_source/CMakeLists.txt
diff --git a/rtl_tcp_source/src/main.cpp b/source_modules/rtl_tcp_source/src/main.cpp
similarity index 100%
rename from rtl_tcp_source/src/main.cpp
rename to source_modules/rtl_tcp_source/src/main.cpp
diff --git a/rtl_tcp_source/src/rtltcp_client.h b/source_modules/rtl_tcp_source/src/rtltcp_client.h
similarity index 100%
rename from rtl_tcp_source/src/rtltcp_client.h
rename to source_modules/rtl_tcp_source/src/rtltcp_client.h
diff --git a/sddc_source/CMakeLists.txt b/source_modules/sddc_source/CMakeLists.txt
similarity index 100%
rename from sddc_source/CMakeLists.txt
rename to source_modules/sddc_source/CMakeLists.txt
diff --git a/sddc_source/res/firmwares/SDDC_FX3.img b/source_modules/sddc_source/res/firmwares/SDDC_FX3.img
similarity index 100%
rename from sddc_source/res/firmwares/SDDC_FX3.img
rename to source_modules/sddc_source/res/firmwares/SDDC_FX3.img
diff --git a/sddc_source/src/libsddc/CMakeLists.txt b/source_modules/sddc_source/src/libsddc/CMakeLists.txt
similarity index 100%
rename from sddc_source/src/libsddc/CMakeLists.txt
rename to source_modules/sddc_source/src/libsddc/CMakeLists.txt
diff --git a/sddc_source/src/libsddc/Core/CMakeLists.txt b/source_modules/sddc_source/src/libsddc/Core/CMakeLists.txt
similarity index 100%
rename from sddc_source/src/libsddc/Core/CMakeLists.txt
rename to source_modules/sddc_source/src/libsddc/Core/CMakeLists.txt
diff --git a/sddc_source/src/libsddc/Core/FX3Class.h b/source_modules/sddc_source/src/libsddc/Core/FX3Class.h
similarity index 100%
rename from sddc_source/src/libsddc/Core/FX3Class.h
rename to source_modules/sddc_source/src/libsddc/Core/FX3Class.h
diff --git a/sddc_source/src/libsddc/Core/PScope_uti.cpp b/source_modules/sddc_source/src/libsddc/Core/PScope_uti.cpp
similarity index 100%
rename from sddc_source/src/libsddc/Core/PScope_uti.cpp
rename to source_modules/sddc_source/src/libsddc/Core/PScope_uti.cpp
diff --git a/sddc_source/src/libsddc/Core/PScope_uti.h b/source_modules/sddc_source/src/libsddc/Core/PScope_uti.h
similarity index 100%
rename from sddc_source/src/libsddc/Core/PScope_uti.h
rename to source_modules/sddc_source/src/libsddc/Core/PScope_uti.h
diff --git a/sddc_source/src/libsddc/Core/RadioHandler.cpp b/source_modules/sddc_source/src/libsddc/Core/RadioHandler.cpp
similarity index 100%
rename from sddc_source/src/libsddc/Core/RadioHandler.cpp
rename to source_modules/sddc_source/src/libsddc/Core/RadioHandler.cpp
diff --git a/sddc_source/src/libsddc/Core/RadioHandler.h b/source_modules/sddc_source/src/libsddc/Core/RadioHandler.h
similarity index 100%
rename from sddc_source/src/libsddc/Core/RadioHandler.h
rename to source_modules/sddc_source/src/libsddc/Core/RadioHandler.h
diff --git a/sddc_source/src/libsddc/Core/arch/linux/FX3handler.cpp b/source_modules/sddc_source/src/libsddc/Core/arch/linux/FX3handler.cpp
similarity index 100%
rename from sddc_source/src/libsddc/Core/arch/linux/FX3handler.cpp
rename to source_modules/sddc_source/src/libsddc/Core/arch/linux/FX3handler.cpp
diff --git a/sddc_source/src/libsddc/Core/arch/linux/FX3handler.h b/source_modules/sddc_source/src/libsddc/Core/arch/linux/FX3handler.h
similarity index 100%
rename from sddc_source/src/libsddc/Core/arch/linux/FX3handler.h
rename to source_modules/sddc_source/src/libsddc/Core/arch/linux/FX3handler.h
diff --git a/sddc_source/src/libsddc/Core/arch/linux/ezusb.c b/source_modules/sddc_source/src/libsddc/Core/arch/linux/ezusb.c
similarity index 100%
rename from sddc_source/src/libsddc/Core/arch/linux/ezusb.c
rename to source_modules/sddc_source/src/libsddc/Core/arch/linux/ezusb.c
diff --git a/sddc_source/src/libsddc/Core/arch/linux/ezusb.h b/source_modules/sddc_source/src/libsddc/Core/arch/linux/ezusb.h
similarity index 100%
rename from sddc_source/src/libsddc/Core/arch/linux/ezusb.h
rename to source_modules/sddc_source/src/libsddc/Core/arch/linux/ezusb.h
diff --git a/sddc_source/src/libsddc/Core/arch/linux/logging.c b/source_modules/sddc_source/src/libsddc/Core/arch/linux/logging.c
similarity index 100%
rename from sddc_source/src/libsddc/Core/arch/linux/logging.c
rename to source_modules/sddc_source/src/libsddc/Core/arch/linux/logging.c
diff --git a/sddc_source/src/libsddc/Core/arch/linux/logging.h b/source_modules/sddc_source/src/libsddc/Core/arch/linux/logging.h
similarity index 100%
rename from sddc_source/src/libsddc/Core/arch/linux/logging.h
rename to source_modules/sddc_source/src/libsddc/Core/arch/linux/logging.h
diff --git a/sddc_source/src/libsddc/Core/arch/linux/streaming.c b/source_modules/sddc_source/src/libsddc/Core/arch/linux/streaming.c
similarity index 100%
rename from sddc_source/src/libsddc/Core/arch/linux/streaming.c
rename to source_modules/sddc_source/src/libsddc/Core/arch/linux/streaming.c
diff --git a/sddc_source/src/libsddc/Core/arch/linux/streaming.h b/source_modules/sddc_source/src/libsddc/Core/arch/linux/streaming.h
similarity index 100%
rename from sddc_source/src/libsddc/Core/arch/linux/streaming.h
rename to source_modules/sddc_source/src/libsddc/Core/arch/linux/streaming.h
diff --git a/sddc_source/src/libsddc/Core/arch/linux/usb_device.c b/source_modules/sddc_source/src/libsddc/Core/arch/linux/usb_device.c
similarity index 100%
rename from sddc_source/src/libsddc/Core/arch/linux/usb_device.c
rename to source_modules/sddc_source/src/libsddc/Core/arch/linux/usb_device.c
diff --git a/sddc_source/src/libsddc/Core/arch/linux/usb_device.h b/source_modules/sddc_source/src/libsddc/Core/arch/linux/usb_device.h
similarity index 100%
rename from sddc_source/src/libsddc/Core/arch/linux/usb_device.h
rename to source_modules/sddc_source/src/libsddc/Core/arch/linux/usb_device.h
diff --git a/sddc_source/src/libsddc/Core/arch/linux/usb_device_internals.h b/source_modules/sddc_source/src/libsddc/Core/arch/linux/usb_device_internals.h
similarity index 100%
rename from sddc_source/src/libsddc/Core/arch/linux/usb_device_internals.h
rename to source_modules/sddc_source/src/libsddc/Core/arch/linux/usb_device_internals.h
diff --git a/sddc_source/src/libsddc/Core/arch/win32/CyAPI/CyAPI.cpp b/source_modules/sddc_source/src/libsddc/Core/arch/win32/CyAPI/CyAPI.cpp
similarity index 100%
rename from sddc_source/src/libsddc/Core/arch/win32/CyAPI/CyAPI.cpp
rename to source_modules/sddc_source/src/libsddc/Core/arch/win32/CyAPI/CyAPI.cpp
diff --git a/sddc_source/src/libsddc/Core/arch/win32/CyAPI/CyAPI.h b/source_modules/sddc_source/src/libsddc/Core/arch/win32/CyAPI/CyAPI.h
similarity index 100%
rename from sddc_source/src/libsddc/Core/arch/win32/CyAPI/CyAPI.h
rename to source_modules/sddc_source/src/libsddc/Core/arch/win32/CyAPI/CyAPI.h
diff --git a/sddc_source/src/libsddc/Core/arch/win32/CyAPI/CyUSB30_def.h b/source_modules/sddc_source/src/libsddc/Core/arch/win32/CyAPI/CyUSB30_def.h
similarity index 100%
rename from sddc_source/src/libsddc/Core/arch/win32/CyAPI/CyUSB30_def.h
rename to source_modules/sddc_source/src/libsddc/Core/arch/win32/CyAPI/CyUSB30_def.h
diff --git a/sddc_source/src/libsddc/Core/arch/win32/CyAPI/UsbdStatus.h b/source_modules/sddc_source/src/libsddc/Core/arch/win32/CyAPI/UsbdStatus.h
similarity index 100%
rename from sddc_source/src/libsddc/Core/arch/win32/CyAPI/UsbdStatus.h
rename to source_modules/sddc_source/src/libsddc/Core/arch/win32/CyAPI/UsbdStatus.h
diff --git a/sddc_source/src/libsddc/Core/arch/win32/CyAPI/VersionNo.h b/source_modules/sddc_source/src/libsddc/Core/arch/win32/CyAPI/VersionNo.h
similarity index 100%
rename from sddc_source/src/libsddc/Core/arch/win32/CyAPI/VersionNo.h
rename to source_modules/sddc_source/src/libsddc/Core/arch/win32/CyAPI/VersionNo.h
diff --git a/sddc_source/src/libsddc/Core/arch/win32/CyAPI/cyioctl.h b/source_modules/sddc_source/src/libsddc/Core/arch/win32/CyAPI/cyioctl.h
similarity index 100%
rename from sddc_source/src/libsddc/Core/arch/win32/CyAPI/cyioctl.h
rename to source_modules/sddc_source/src/libsddc/Core/arch/win32/CyAPI/cyioctl.h
diff --git a/sddc_source/src/libsddc/Core/arch/win32/CyAPI/devioctl.h b/source_modules/sddc_source/src/libsddc/Core/arch/win32/CyAPI/devioctl.h
similarity index 100%
rename from sddc_source/src/libsddc/Core/arch/win32/CyAPI/devioctl.h
rename to source_modules/sddc_source/src/libsddc/Core/arch/win32/CyAPI/devioctl.h
diff --git a/sddc_source/src/libsddc/Core/arch/win32/CyAPI/usb100.h b/source_modules/sddc_source/src/libsddc/Core/arch/win32/CyAPI/usb100.h
similarity index 100%
rename from sddc_source/src/libsddc/Core/arch/win32/CyAPI/usb100.h
rename to source_modules/sddc_source/src/libsddc/Core/arch/win32/CyAPI/usb100.h
diff --git a/sddc_source/src/libsddc/Core/arch/win32/CyAPI/usb200.h b/source_modules/sddc_source/src/libsddc/Core/arch/win32/CyAPI/usb200.h
similarity index 100%
rename from sddc_source/src/libsddc/Core/arch/win32/CyAPI/usb200.h
rename to source_modules/sddc_source/src/libsddc/Core/arch/win32/CyAPI/usb200.h
diff --git a/sddc_source/src/libsddc/Core/arch/win32/FX3handler.cpp b/source_modules/sddc_source/src/libsddc/Core/arch/win32/FX3handler.cpp
similarity index 100%
rename from sddc_source/src/libsddc/Core/arch/win32/FX3handler.cpp
rename to source_modules/sddc_source/src/libsddc/Core/arch/win32/FX3handler.cpp
diff --git a/sddc_source/src/libsddc/Core/arch/win32/FX3handler.h b/source_modules/sddc_source/src/libsddc/Core/arch/win32/FX3handler.h
similarity index 100%
rename from sddc_source/src/libsddc/Core/arch/win32/FX3handler.h
rename to source_modules/sddc_source/src/libsddc/Core/arch/win32/FX3handler.h
diff --git a/sddc_source/src/libsddc/Core/dsp/ringbuffer.h b/source_modules/sddc_source/src/libsddc/Core/dsp/ringbuffer.h
similarity index 100%
rename from sddc_source/src/libsddc/Core/dsp/ringbuffer.h
rename to source_modules/sddc_source/src/libsddc/Core/dsp/ringbuffer.h
diff --git a/sddc_source/src/libsddc/Core/fft_mt_r2iq.cpp b/source_modules/sddc_source/src/libsddc/Core/fft_mt_r2iq.cpp
similarity index 100%
rename from sddc_source/src/libsddc/Core/fft_mt_r2iq.cpp
rename to source_modules/sddc_source/src/libsddc/Core/fft_mt_r2iq.cpp
diff --git a/sddc_source/src/libsddc/Core/fft_mt_r2iq.h b/source_modules/sddc_source/src/libsddc/Core/fft_mt_r2iq.h
similarity index 100%
rename from sddc_source/src/libsddc/Core/fft_mt_r2iq.h
rename to source_modules/sddc_source/src/libsddc/Core/fft_mt_r2iq.h
diff --git a/sddc_source/src/libsddc/Core/fft_mt_r2iq_avx.cpp b/source_modules/sddc_source/src/libsddc/Core/fft_mt_r2iq_avx.cpp
similarity index 100%
rename from sddc_source/src/libsddc/Core/fft_mt_r2iq_avx.cpp
rename to source_modules/sddc_source/src/libsddc/Core/fft_mt_r2iq_avx.cpp
diff --git a/sddc_source/src/libsddc/Core/fft_mt_r2iq_avx2.cpp b/source_modules/sddc_source/src/libsddc/Core/fft_mt_r2iq_avx2.cpp
similarity index 100%
rename from sddc_source/src/libsddc/Core/fft_mt_r2iq_avx2.cpp
rename to source_modules/sddc_source/src/libsddc/Core/fft_mt_r2iq_avx2.cpp
diff --git a/sddc_source/src/libsddc/Core/fft_mt_r2iq_avx512.cpp b/source_modules/sddc_source/src/libsddc/Core/fft_mt_r2iq_avx512.cpp
similarity index 100%
rename from sddc_source/src/libsddc/Core/fft_mt_r2iq_avx512.cpp
rename to source_modules/sddc_source/src/libsddc/Core/fft_mt_r2iq_avx512.cpp
diff --git a/sddc_source/src/libsddc/Core/fft_mt_r2iq_def.cpp b/source_modules/sddc_source/src/libsddc/Core/fft_mt_r2iq_def.cpp
similarity index 100%
rename from sddc_source/src/libsddc/Core/fft_mt_r2iq_def.cpp
rename to source_modules/sddc_source/src/libsddc/Core/fft_mt_r2iq_def.cpp
diff --git a/sddc_source/src/libsddc/Core/fft_mt_r2iq_impl.hpp b/source_modules/sddc_source/src/libsddc/Core/fft_mt_r2iq_impl.hpp
similarity index 100%
rename from sddc_source/src/libsddc/Core/fft_mt_r2iq_impl.hpp
rename to source_modules/sddc_source/src/libsddc/Core/fft_mt_r2iq_impl.hpp
diff --git a/sddc_source/src/libsddc/Core/fir.cpp b/source_modules/sddc_source/src/libsddc/Core/fir.cpp
similarity index 100%
rename from sddc_source/src/libsddc/Core/fir.cpp
rename to source_modules/sddc_source/src/libsddc/Core/fir.cpp
diff --git a/sddc_source/src/libsddc/Core/fir.h b/source_modules/sddc_source/src/libsddc/Core/fir.h
similarity index 100%
rename from sddc_source/src/libsddc/Core/fir.h
rename to source_modules/sddc_source/src/libsddc/Core/fir.h
diff --git a/sddc_source/src/libsddc/Core/license.txt b/source_modules/sddc_source/src/libsddc/Core/license.txt
similarity index 100%
rename from sddc_source/src/libsddc/Core/license.txt
rename to source_modules/sddc_source/src/libsddc/Core/license.txt
diff --git a/sddc_source/src/libsddc/Core/pffft/LICENSE.txt b/source_modules/sddc_source/src/libsddc/Core/pffft/LICENSE.txt
similarity index 100%
rename from sddc_source/src/libsddc/Core/pffft/LICENSE.txt
rename to source_modules/sddc_source/src/libsddc/Core/pffft/LICENSE.txt
diff --git a/sddc_source/src/libsddc/Core/pffft/bench_mixers.c b/source_modules/sddc_source/src/libsddc/Core/pffft/bench_mixers.c
similarity index 100%
rename from sddc_source/src/libsddc/Core/pffft/bench_mixers.c
rename to source_modules/sddc_source/src/libsddc/Core/pffft/bench_mixers.c
diff --git a/sddc_source/src/libsddc/Core/pffft/fmv.h b/source_modules/sddc_source/src/libsddc/Core/pffft/fmv.h
similarity index 100%
rename from sddc_source/src/libsddc/Core/pffft/fmv.h
rename to source_modules/sddc_source/src/libsddc/Core/pffft/fmv.h
diff --git a/sddc_source/src/libsddc/Core/pffft/pf_mixer.cpp b/source_modules/sddc_source/src/libsddc/Core/pffft/pf_mixer.cpp
similarity index 100%
rename from sddc_source/src/libsddc/Core/pffft/pf_mixer.cpp
rename to source_modules/sddc_source/src/libsddc/Core/pffft/pf_mixer.cpp
diff --git a/sddc_source/src/libsddc/Core/pffft/pf_mixer.h b/source_modules/sddc_source/src/libsddc/Core/pffft/pf_mixer.h
similarity index 100%
rename from sddc_source/src/libsddc/Core/pffft/pf_mixer.h
rename to source_modules/sddc_source/src/libsddc/Core/pffft/pf_mixer.h
diff --git a/sddc_source/src/libsddc/Core/r2iq.h b/source_modules/sddc_source/src/libsddc/Core/r2iq.h
similarity index 100%
rename from sddc_source/src/libsddc/Core/r2iq.h
rename to source_modules/sddc_source/src/libsddc/Core/r2iq.h
diff --git a/sddc_source/src/libsddc/Core/radio/BBRF103Radio.cpp b/source_modules/sddc_source/src/libsddc/Core/radio/BBRF103Radio.cpp
similarity index 100%
rename from sddc_source/src/libsddc/Core/radio/BBRF103Radio.cpp
rename to source_modules/sddc_source/src/libsddc/Core/radio/BBRF103Radio.cpp
diff --git a/sddc_source/src/libsddc/Core/radio/HF103Radio.cpp b/source_modules/sddc_source/src/libsddc/Core/radio/HF103Radio.cpp
similarity index 100%
rename from sddc_source/src/libsddc/Core/radio/HF103Radio.cpp
rename to source_modules/sddc_source/src/libsddc/Core/radio/HF103Radio.cpp
diff --git a/sddc_source/src/libsddc/Core/radio/RX888R2Radio.cpp b/source_modules/sddc_source/src/libsddc/Core/radio/RX888R2Radio.cpp
similarity index 100%
rename from sddc_source/src/libsddc/Core/radio/RX888R2Radio.cpp
rename to source_modules/sddc_source/src/libsddc/Core/radio/RX888R2Radio.cpp
diff --git a/sddc_source/src/libsddc/Core/radio/RX888R3Radio.cpp b/source_modules/sddc_source/src/libsddc/Core/radio/RX888R3Radio.cpp
similarity index 100%
rename from sddc_source/src/libsddc/Core/radio/RX888R3Radio.cpp
rename to source_modules/sddc_source/src/libsddc/Core/radio/RX888R3Radio.cpp
diff --git a/sddc_source/src/libsddc/Core/radio/RX888Radio.cpp b/source_modules/sddc_source/src/libsddc/Core/radio/RX888Radio.cpp
similarity index 100%
rename from sddc_source/src/libsddc/Core/radio/RX888Radio.cpp
rename to source_modules/sddc_source/src/libsddc/Core/radio/RX888Radio.cpp
diff --git a/sddc_source/src/libsddc/Core/radio/RX999Radio.cpp b/source_modules/sddc_source/src/libsddc/Core/radio/RX999Radio.cpp
similarity index 100%
rename from sddc_source/src/libsddc/Core/radio/RX999Radio.cpp
rename to source_modules/sddc_source/src/libsddc/Core/radio/RX999Radio.cpp
diff --git a/sddc_source/src/libsddc/Core/radio/RXLucy.cpp b/source_modules/sddc_source/src/libsddc/Core/radio/RXLucy.cpp
similarity index 100%
rename from sddc_source/src/libsddc/Core/radio/RXLucy.cpp
rename to source_modules/sddc_source/src/libsddc/Core/radio/RXLucy.cpp
diff --git a/sddc_source/src/libsddc/Core/radio/RadioHardware.cpp b/source_modules/sddc_source/src/libsddc/Core/radio/RadioHardware.cpp
similarity index 100%
rename from sddc_source/src/libsddc/Core/radio/RadioHardware.cpp
rename to source_modules/sddc_source/src/libsddc/Core/radio/RadioHardware.cpp
diff --git a/sddc_source/src/libsddc/Core/sddc_config.cpp b/source_modules/sddc_source/src/libsddc/Core/sddc_config.cpp
similarity index 100%
rename from sddc_source/src/libsddc/Core/sddc_config.cpp
rename to source_modules/sddc_source/src/libsddc/Core/sddc_config.cpp
diff --git a/sddc_source/src/libsddc/Core/sddc_config.h b/source_modules/sddc_source/src/libsddc/Core/sddc_config.h
similarity index 100%
rename from sddc_source/src/libsddc/Core/sddc_config.h
rename to source_modules/sddc_source/src/libsddc/Core/sddc_config.h
diff --git a/sddc_source/src/libsddc/HWSDRtable.h b/source_modules/sddc_source/src/libsddc/HWSDRtable.h
similarity index 100%
rename from sddc_source/src/libsddc/HWSDRtable.h
rename to source_modules/sddc_source/src/libsddc/HWSDRtable.h
diff --git a/sddc_source/src/libsddc/Interface.h b/source_modules/sddc_source/src/libsddc/Interface.h
similarity index 100%
rename from sddc_source/src/libsddc/Interface.h
rename to source_modules/sddc_source/src/libsddc/Interface.h
diff --git a/sddc_source/src/libsddc/LICENSE.txt b/source_modules/sddc_source/src/libsddc/LICENSE.txt
similarity index 100%
rename from sddc_source/src/libsddc/LICENSE.txt
rename to source_modules/sddc_source/src/libsddc/LICENSE.txt
diff --git a/sddc_source/src/libsddc/libsddc/CMakeLists.txt b/source_modules/sddc_source/src/libsddc/libsddc/CMakeLists.txt
similarity index 100%
rename from sddc_source/src/libsddc/libsddc/CMakeLists.txt
rename to source_modules/sddc_source/src/libsddc/libsddc/CMakeLists.txt
diff --git a/sddc_source/src/libsddc/libsddc/libsddc.cpp b/source_modules/sddc_source/src/libsddc/libsddc/libsddc.cpp
similarity index 100%
rename from sddc_source/src/libsddc/libsddc/libsddc.cpp
rename to source_modules/sddc_source/src/libsddc/libsddc/libsddc.cpp
diff --git a/sddc_source/src/libsddc/libsddc/libsddc.h b/source_modules/sddc_source/src/libsddc/libsddc/libsddc.h
similarity index 100%
rename from sddc_source/src/libsddc/libsddc/libsddc.h
rename to source_modules/sddc_source/src/libsddc/libsddc/libsddc.h
diff --git a/sddc_source/src/libsddc/libsddc/wavehdr.h b/source_modules/sddc_source/src/libsddc/libsddc/wavehdr.h
similarity index 100%
rename from sddc_source/src/libsddc/libsddc/wavehdr.h
rename to source_modules/sddc_source/src/libsddc/libsddc/wavehdr.h
diff --git a/sddc_source/src/libsddc/libsddc/wavewrite.c b/source_modules/sddc_source/src/libsddc/libsddc/wavewrite.c
similarity index 100%
rename from sddc_source/src/libsddc/libsddc/wavewrite.c
rename to source_modules/sddc_source/src/libsddc/libsddc/wavewrite.c
diff --git a/sddc_source/src/libsddc/libsddc/wavewrite.h b/source_modules/sddc_source/src/libsddc/libsddc/wavewrite.h
similarity index 100%
rename from sddc_source/src/libsddc/libsddc/wavewrite.h
rename to source_modules/sddc_source/src/libsddc/libsddc/wavewrite.h
diff --git a/sddc_source/src/main.cpp b/source_modules/sddc_source/src/main.cpp
similarity index 100%
rename from sddc_source/src/main.cpp
rename to source_modules/sddc_source/src/main.cpp
diff --git a/sdrplay_source/CMakeLists.txt b/source_modules/sdrplay_source/CMakeLists.txt
similarity index 100%
rename from sdrplay_source/CMakeLists.txt
rename to source_modules/sdrplay_source/CMakeLists.txt
diff --git a/sdrplay_source/src/main.cpp b/source_modules/sdrplay_source/src/main.cpp
similarity index 100%
rename from sdrplay_source/src/main.cpp
rename to source_modules/sdrplay_source/src/main.cpp
diff --git a/soapy_source/CMakeLists.txt b/source_modules/soapy_source/CMakeLists.txt
similarity index 100%
rename from soapy_source/CMakeLists.txt
rename to source_modules/soapy_source/CMakeLists.txt
diff --git a/soapy_source/src/main.cpp b/source_modules/soapy_source/src/main.cpp
similarity index 100%
rename from soapy_source/src/main.cpp
rename to source_modules/soapy_source/src/main.cpp
diff --git a/spyserver_source/CMakeLists.txt b/source_modules/spyserver_source/CMakeLists.txt
similarity index 100%
rename from spyserver_source/CMakeLists.txt
rename to source_modules/spyserver_source/CMakeLists.txt
diff --git a/spyserver_source/src/main.cpp b/source_modules/spyserver_source/src/main.cpp
similarity index 100%
rename from spyserver_source/src/main.cpp
rename to source_modules/spyserver_source/src/main.cpp
diff --git a/spyserver_source/src/spyserver_client.cpp b/source_modules/spyserver_source/src/spyserver_client.cpp
similarity index 100%
rename from spyserver_source/src/spyserver_client.cpp
rename to source_modules/spyserver_source/src/spyserver_client.cpp
diff --git a/spyserver_source/src/spyserver_client.h b/source_modules/spyserver_source/src/spyserver_client.h
similarity index 100%
rename from spyserver_source/src/spyserver_client.h
rename to source_modules/spyserver_source/src/spyserver_client.h
diff --git a/spyserver_source/src/spyserver_protocol.h b/source_modules/spyserver_source/src/spyserver_protocol.h
similarity index 100%
rename from spyserver_source/src/spyserver_protocol.h
rename to source_modules/spyserver_source/src/spyserver_protocol.h