diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index aff913366..c15e7f7ee 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -1,4 +1,4 @@
 project(plugins)
 
-add_subdirectory(channel)
+add_subdirectory(channelrx)
 add_subdirectory(samplesource)
diff --git a/plugins/channel/CMakeLists.txt b/plugins/channelrx/CMakeLists.txt
similarity index 100%
rename from plugins/channel/CMakeLists.txt
rename to plugins/channelrx/CMakeLists.txt
diff --git a/plugins/channel/chanalyzer/CMakeLists.txt b/plugins/channelrx/chanalyzer/CMakeLists.txt
similarity index 92%
rename from plugins/channel/chanalyzer/CMakeLists.txt
rename to plugins/channelrx/chanalyzer/CMakeLists.txt
index 2eda838f4..8c137bdc1 100644
--- a/plugins/channel/chanalyzer/CMakeLists.txt
+++ b/plugins/channelrx/chanalyzer/CMakeLists.txt
@@ -42,4 +42,4 @@ target_link_libraries(chanalyzer
 
 qt5_use_modules(chanalyzer Core Widgets OpenGL Multimedia)
 
-install(TARGETS chanalyzer DESTINATION lib/plugins/channel)
+install(TARGETS chanalyzer DESTINATION lib/plugins/channelrx)
diff --git a/plugins/channel/chanalyzer/chanalyzer.cpp b/plugins/channelrx/chanalyzer/chanalyzer.cpp
similarity index 99%
rename from plugins/channel/chanalyzer/chanalyzer.cpp
rename to plugins/channelrx/chanalyzer/chanalyzer.cpp
index 904e5dc1f..396a4b72b 100644
--- a/plugins/channel/chanalyzer/chanalyzer.cpp
+++ b/plugins/channelrx/chanalyzer/chanalyzer.cpp
@@ -14,13 +14,14 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.          //
 ///////////////////////////////////////////////////////////////////////////////////
 
+#include "../../channelrx/chanalyzer/chanalyzer.h"
+
 #include <QTime>
 #include <QDebug>
 #include <stdio.h>
 #include "audio/audiooutput.h"
 #include "dsp/channelizer.h"
 
-#include "chanalyzer.h"
 
 MESSAGE_CLASS_DEFINITION(ChannelAnalyzer::MsgConfigureChannelAnalyzer, Message)
 
diff --git a/plugins/channel/chanalyzer/chanalyzer.h b/plugins/channelrx/chanalyzer/chanalyzer.h
similarity index 100%
rename from plugins/channel/chanalyzer/chanalyzer.h
rename to plugins/channelrx/chanalyzer/chanalyzer.h
diff --git a/plugins/channel/chanalyzer/chanalyzer.pro b/plugins/channelrx/chanalyzer/chanalyzer.pro
similarity index 100%
rename from plugins/channel/chanalyzer/chanalyzer.pro
rename to plugins/channelrx/chanalyzer/chanalyzer.pro
diff --git a/plugins/channel/chanalyzer/chanalyzergui.cpp b/plugins/channelrx/chanalyzer/chanalyzergui.cpp
similarity index 99%
rename from plugins/channel/chanalyzer/chanalyzergui.cpp
rename to plugins/channelrx/chanalyzer/chanalyzergui.cpp
index 0ab7ad095..29d05baff 100644
--- a/plugins/channel/chanalyzer/chanalyzergui.cpp
+++ b/plugins/channelrx/chanalyzer/chanalyzergui.cpp
@@ -14,6 +14,8 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.          //
 ///////////////////////////////////////////////////////////////////////////////////
 
+#include "../../channelrx/chanalyzer/chanalyzergui.h"
+
 #include <QDockWidget>
 #include <QMainWindow>
 #include "ui_chanalyzergui.h"
@@ -32,8 +34,7 @@
 #include "dsp/dspengine.h"
 #include "mainwindow.h"
 
-#include "chanalyzer.h"
-#include "chanalyzergui.h"
+#include "../../channelrx/chanalyzer/chanalyzer.h"
 
 const QString ChannelAnalyzerGUI::m_channelID = "org.f4exb.sdrangelove.channel.chanalyzer";
 
diff --git a/plugins/channel/chanalyzer/chanalyzergui.h b/plugins/channelrx/chanalyzer/chanalyzergui.h
similarity index 100%
rename from plugins/channel/chanalyzer/chanalyzergui.h
rename to plugins/channelrx/chanalyzer/chanalyzergui.h
diff --git a/plugins/channel/chanalyzer/chanalyzergui.ui b/plugins/channelrx/chanalyzer/chanalyzergui.ui
similarity index 100%
rename from plugins/channel/chanalyzer/chanalyzergui.ui
rename to plugins/channelrx/chanalyzer/chanalyzergui.ui
diff --git a/plugins/channel/chanalyzer/chanalyzerplugin.cpp b/plugins/channelrx/chanalyzer/chanalyzerplugin.cpp
similarity index 90%
rename from plugins/channel/chanalyzer/chanalyzerplugin.cpp
rename to plugins/channelrx/chanalyzer/chanalyzerplugin.cpp
index c3da23e27..0fd71da69 100644
--- a/plugins/channel/chanalyzer/chanalyzerplugin.cpp
+++ b/plugins/channelrx/chanalyzer/chanalyzerplugin.cpp
@@ -1,7 +1,9 @@
+#include "../../channelrx/chanalyzer/chanalyzerplugin.h"
+
 #include <QtPlugin>
 #include "plugin/pluginapi.h"
-#include "chanalyzergui.h"
-#include "chanalyzerplugin.h"
+
+#include "../../channelrx/chanalyzer/chanalyzergui.h"
 
 const PluginDescriptor ChannelAnalyzerPlugin::m_pluginDescriptor = {
 	QString("Channel Analyzer"),
diff --git a/plugins/channel/chanalyzer/chanalyzerplugin.h b/plugins/channelrx/chanalyzer/chanalyzerplugin.h
similarity index 100%
rename from plugins/channel/chanalyzer/chanalyzerplugin.h
rename to plugins/channelrx/chanalyzer/chanalyzerplugin.h
diff --git a/plugins/channel/demodam/CMakeLists.txt b/plugins/channelrx/demodam/CMakeLists.txt
similarity index 91%
rename from plugins/channel/demodam/CMakeLists.txt
rename to plugins/channelrx/demodam/CMakeLists.txt
index cb65025d9..6e349d1d1 100644
--- a/plugins/channel/demodam/CMakeLists.txt
+++ b/plugins/channelrx/demodam/CMakeLists.txt
@@ -42,4 +42,4 @@ target_link_libraries(demodam
 
 qt5_use_modules(demodam Core Widgets OpenGL Multimedia)
 
-install(TARGETS demodam DESTINATION lib/plugins/channel)
\ No newline at end of file
+install(TARGETS demodam DESTINATION lib/plugins/channelrx)
\ No newline at end of file
diff --git a/plugins/channel/demodam/amdemod.cpp b/plugins/channelrx/demodam/amdemod.cpp
similarity index 99%
rename from plugins/channel/demodam/amdemod.cpp
rename to plugins/channelrx/demodam/amdemod.cpp
index 669b13135..94a202d83 100644
--- a/plugins/channel/demodam/amdemod.cpp
+++ b/plugins/channelrx/demodam/amdemod.cpp
@@ -14,7 +14,7 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.          //
 ///////////////////////////////////////////////////////////////////////////////////
 
-#include "amdemod.h"
+#include "../../channelrx/demodam/amdemod.h"
 
 #include <QTime>
 #include <QDebug>
diff --git a/plugins/channel/demodam/amdemod.h b/plugins/channelrx/demodam/amdemod.h
similarity index 100%
rename from plugins/channel/demodam/amdemod.h
rename to plugins/channelrx/demodam/amdemod.h
diff --git a/plugins/channel/demodam/amdemodgui.cpp b/plugins/channelrx/demodam/amdemodgui.cpp
similarity index 98%
rename from plugins/channel/demodam/amdemodgui.cpp
rename to plugins/channelrx/demodam/amdemodgui.cpp
index d9828a677..3a730e940 100644
--- a/plugins/channel/demodam/amdemodgui.cpp
+++ b/plugins/channelrx/demodam/amdemodgui.cpp
@@ -1,4 +1,4 @@
-#include "amdemodgui.h"
+#include "../../channelrx/demodam/amdemodgui.h"
 
 #include <QDockWidget>
 #include <QMainWindow>
@@ -13,7 +13,7 @@
 #include "dsp/dspengine.h"
 #include "mainwindow.h"
 
-#include "amdemod.h"
+#include "../../channelrx/demodam/amdemod.h"
 
 const QString AMDemodGUI::m_channelID = "de.maintech.sdrangelove.channel.am";
 
diff --git a/plugins/channel/demodam/amdemodgui.h b/plugins/channelrx/demodam/amdemodgui.h
similarity index 100%
rename from plugins/channel/demodam/amdemodgui.h
rename to plugins/channelrx/demodam/amdemodgui.h
diff --git a/plugins/channel/demodam/amdemodgui.ui b/plugins/channelrx/demodam/amdemodgui.ui
similarity index 100%
rename from plugins/channel/demodam/amdemodgui.ui
rename to plugins/channelrx/demodam/amdemodgui.ui
diff --git a/plugins/channel/demodam/amplugin.cpp b/plugins/channelrx/demodam/amplugin.cpp
similarity index 91%
rename from plugins/channel/demodam/amplugin.cpp
rename to plugins/channelrx/demodam/amplugin.cpp
index 5fef98a7f..99df5cb52 100644
--- a/plugins/channel/demodam/amplugin.cpp
+++ b/plugins/channelrx/demodam/amplugin.cpp
@@ -1,9 +1,10 @@
-#include "amplugin.h"
+#include "../../channelrx/demodam/amplugin.h"
 
 #include <QtPlugin>
 #include <QAction>
 #include "plugin/pluginapi.h"
-#include "amdemodgui.h"
+
+#include "../../channelrx/demodam/amdemodgui.h"
 
 const PluginDescriptor AMPlugin::m_pluginDescriptor = {
 	QString("AM Demodulator"),
diff --git a/plugins/channel/demodam/amplugin.h b/plugins/channelrx/demodam/amplugin.h
similarity index 100%
rename from plugins/channel/demodam/amplugin.h
rename to plugins/channelrx/demodam/amplugin.h
diff --git a/plugins/channel/demodam/demodam.pro b/plugins/channelrx/demodam/demodam.pro
similarity index 100%
rename from plugins/channel/demodam/demodam.pro
rename to plugins/channelrx/demodam/demodam.pro
diff --git a/plugins/channel/demodbfm/CMakeLists.txt b/plugins/channelrx/demodbfm/CMakeLists.txt
similarity index 92%
rename from plugins/channel/demodbfm/CMakeLists.txt
rename to plugins/channelrx/demodbfm/CMakeLists.txt
index d509a8321..a9328ad6b 100644
--- a/plugins/channel/demodbfm/CMakeLists.txt
+++ b/plugins/channelrx/demodbfm/CMakeLists.txt
@@ -49,4 +49,4 @@ target_link_libraries(demodbfm
 
 qt5_use_modules(demodbfm Core Widgets OpenGL Multimedia)
 
-install(TARGETS demodbfm DESTINATION lib/plugins/channel)
+install(TARGETS demodbfm DESTINATION lib/plugins/channelrx)
diff --git a/plugins/channel/demodbfm/bfmdemod.cpp b/plugins/channelrx/demodbfm/bfmdemod.cpp
similarity index 99%
rename from plugins/channel/demodbfm/bfmdemod.cpp
rename to plugins/channelrx/demodbfm/bfmdemod.cpp
index da3c014fb..ece5602d0 100644
--- a/plugins/channel/demodbfm/bfmdemod.cpp
+++ b/plugins/channelrx/demodbfm/bfmdemod.cpp
@@ -15,6 +15,8 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.          //
 ///////////////////////////////////////////////////////////////////////////////////
 
+#include "../../channelrx/demodbfm/bfmdemod.h"
+
 #include <QTime>
 #include <QDebug>
 #include <stdio.h>
@@ -23,10 +25,10 @@
 #include "dsp/dspengine.h"
 #include "dsp/channelizer.h"
 #include "dsp/pidcontroller.h"
-#include "rdsparser.h"
-
 #include "bfmdemod.h"
 
+#include "../../channelrx/demodbfm/rdsparser.h"
+
 MESSAGE_CLASS_DEFINITION(BFMDemod::MsgConfigureBFMDemod, Message)
 
 const Real BFMDemod::default_deemphasis = 50.0; // 50 us
diff --git a/plugins/channel/demodbfm/bfmdemod.h b/plugins/channelrx/demodbfm/bfmdemod.h
similarity index 98%
rename from plugins/channel/demodbfm/bfmdemod.h
rename to plugins/channelrx/demodbfm/bfmdemod.h
index 4bf0ce326..eb6001e25 100644
--- a/plugins/channel/demodbfm/bfmdemod.h
+++ b/plugins/channelrx/demodbfm/bfmdemod.h
@@ -31,8 +31,9 @@
 #include "dsp/phasediscri.h"
 #include "audio/audiofifo.h"
 #include "util/message.h"
-#include "rdsdemod.h"
-#include "rdsdecoder.h"
+
+#include "../../channelrx/demodbfm/rdsdecoder.h"
+#include "../../channelrx/demodbfm/rdsdemod.h"
 
 class RDSParser;
 
diff --git a/plugins/channel/demodbfm/bfmdemodgui.cpp b/plugins/channelrx/demodbfm/bfmdemodgui.cpp
similarity index 99%
rename from plugins/channel/demodbfm/bfmdemodgui.cpp
rename to plugins/channelrx/demodbfm/bfmdemodgui.cpp
index f030834c9..e9db121fb 100644
--- a/plugins/channel/demodbfm/bfmdemodgui.cpp
+++ b/plugins/channelrx/demodbfm/bfmdemodgui.cpp
@@ -15,6 +15,8 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.          //
 ///////////////////////////////////////////////////////////////////////////////////
 
+#include "../../channelrx/demodbfm/bfmdemodgui.h"
+
 #include <QDockWidget>
 #include <QMainWindow>
 #include <QDebug>
@@ -35,10 +37,9 @@
 #include "gui/basicchannelsettingswidget.h"
 #include "mainwindow.h"
 
-#include "bfmdemodgui.h"
+#include "../../channelrx/demodbfm/bfmdemod.h"
+#include "../../channelrx/demodbfm/rdstmc.h"
 #include "ui_bfmdemodgui.h"
-#include "bfmdemod.h"
-#include "rdstmc.h"
 
 const QString BFMDemodGUI::m_channelID = "sdrangel.channel.bfm";
 
diff --git a/plugins/channel/demodbfm/bfmdemodgui.h b/plugins/channelrx/demodbfm/bfmdemodgui.h
similarity index 98%
rename from plugins/channel/demodbfm/bfmdemodgui.h
rename to plugins/channelrx/demodbfm/bfmdemodgui.h
index e2725934d..667beb065 100644
--- a/plugins/channel/demodbfm/bfmdemodgui.h
+++ b/plugins/channelrx/demodbfm/bfmdemodgui.h
@@ -22,7 +22,8 @@
 #include "plugin/plugingui.h"
 #include "dsp/channelmarker.h"
 #include "dsp/movingaverage.h"
-#include "rdsparser.h"
+
+#include "../../channelrx/demodbfm/rdsparser.h"
 
 class PluginAPI;
 class DeviceAPI;
diff --git a/plugins/channel/demodbfm/bfmdemodgui.ui b/plugins/channelrx/demodbfm/bfmdemodgui.ui
similarity index 100%
rename from plugins/channel/demodbfm/bfmdemodgui.ui
rename to plugins/channelrx/demodbfm/bfmdemodgui.ui
diff --git a/plugins/channel/demodbfm/bfmplugin.cpp b/plugins/channelrx/demodbfm/bfmplugin.cpp
similarity index 96%
rename from plugins/channel/demodbfm/bfmplugin.cpp
rename to plugins/channelrx/demodbfm/bfmplugin.cpp
index b34d40383..6edf37981 100644
--- a/plugins/channel/demodbfm/bfmplugin.cpp
+++ b/plugins/channelrx/demodbfm/bfmplugin.cpp
@@ -15,12 +15,12 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.          //
 ///////////////////////////////////////////////////////////////////////////////////
 
+#include "../../channelrx/demodbfm/bfmplugin.h"
+
 #include <QtPlugin>
 #include "plugin/pluginapi.h"
 
-#include "bfmplugin.h"
-
-#include "bfmdemodgui.h"
+#include "../../channelrx/demodbfm/bfmdemodgui.h"
 
 const PluginDescriptor BFMPlugin::m_pluginDescriptor = {
 	QString("Broadcast FM Demodulator"),
diff --git a/plugins/channel/demodbfm/bfmplugin.h b/plugins/channelrx/demodbfm/bfmplugin.h
similarity index 100%
rename from plugins/channel/demodbfm/bfmplugin.h
rename to plugins/channelrx/demodbfm/bfmplugin.h
diff --git a/plugins/channel/demodbfm/demodbfm.pro b/plugins/channelrx/demodbfm/demodbfm.pro
similarity index 100%
rename from plugins/channel/demodbfm/demodbfm.pro
rename to plugins/channelrx/demodbfm/demodbfm.pro
diff --git a/plugins/channel/demodbfm/rdsdecoder.cpp b/plugins/channelrx/demodbfm/rdsdecoder.cpp
similarity index 99%
rename from plugins/channel/demodbfm/rdsdecoder.cpp
rename to plugins/channelrx/demodbfm/rdsdecoder.cpp
index da7e8d15f..8e4827646 100644
--- a/plugins/channel/demodbfm/rdsdecoder.cpp
+++ b/plugins/channelrx/demodbfm/rdsdecoder.cpp
@@ -15,8 +15,9 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.          //
 ///////////////////////////////////////////////////////////////////////////////////
 
+#include "../../channelrx/demodbfm/rdsdecoder.h"
+
 #include <QDebug>
-#include "rdsdecoder.h"
 
 const unsigned int RDSDecoder::offset_pos[5] = {0,1,2,3,2};
 const unsigned int RDSDecoder::offset_word[5] = {252,408,360,436,848};
diff --git a/plugins/channel/demodbfm/rdsdecoder.h b/plugins/channelrx/demodbfm/rdsdecoder.h
similarity index 100%
rename from plugins/channel/demodbfm/rdsdecoder.h
rename to plugins/channelrx/demodbfm/rdsdecoder.h
diff --git a/plugins/channel/demodbfm/rdsdemod.cpp b/plugins/channelrx/demodbfm/rdsdemod.cpp
similarity index 99%
rename from plugins/channel/demodbfm/rdsdemod.cpp
rename to plugins/channelrx/demodbfm/rdsdemod.cpp
index f45d324d7..73155f569 100644
--- a/plugins/channel/demodbfm/rdsdemod.cpp
+++ b/plugins/channelrx/demodbfm/rdsdemod.cpp
@@ -15,12 +15,13 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.          //
 ///////////////////////////////////////////////////////////////////////////////////
 
+#include "../../channelrx/demodbfm/rdsdemod.h"
+
 #include <QDebug>
 #include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "rdsdemod.h"
 
 const Real RDSDemod::m_pllBeta = 50;
 const Real RDSDemod::m_fsc = 1187.5;
diff --git a/plugins/channel/demodbfm/rdsdemod.h b/plugins/channelrx/demodbfm/rdsdemod.h
similarity index 100%
rename from plugins/channel/demodbfm/rdsdemod.h
rename to plugins/channelrx/demodbfm/rdsdemod.h
diff --git a/plugins/channel/demodbfm/rdsparser.cpp b/plugins/channelrx/demodbfm/rdsparser.cpp
similarity index 99%
rename from plugins/channel/demodbfm/rdsparser.cpp
rename to plugins/channelrx/demodbfm/rdsparser.cpp
index 54c7705f6..0a0694dcf 100644
--- a/plugins/channel/demodbfm/rdsparser.cpp
+++ b/plugins/channelrx/demodbfm/rdsparser.cpp
@@ -15,6 +15,8 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.          //
 ///////////////////////////////////////////////////////////////////////////////////
 
+#include "../../channelrx/demodbfm/rdsparser.h"
+
 #include <QDebug>
 #include <string.h>
 #include <sstream>
@@ -22,8 +24,8 @@
 #include <cmath>
 #include <cstring>
 #include "boost/format.hpp"
-#include "rdsparser.h"
-#include "rdstmc.h"
+
+#include "../../channelrx/demodbfm/rdstmc.h"
 
 const unsigned int RDSParser::offset_pos[5] = {0,1,2,3,2};
 const unsigned int RDSParser::offset_word[5] = {252,408,360,436,848};
diff --git a/plugins/channel/demodbfm/rdsparser.h b/plugins/channelrx/demodbfm/rdsparser.h
similarity index 100%
rename from plugins/channel/demodbfm/rdsparser.h
rename to plugins/channelrx/demodbfm/rdsparser.h
diff --git a/plugins/channel/demodbfm/rdstmc.cpp b/plugins/channelrx/demodbfm/rdstmc.cpp
similarity index 99%
rename from plugins/channel/demodbfm/rdstmc.cpp
rename to plugins/channelrx/demodbfm/rdstmc.cpp
index 75508a5ca..583d16a3c 100644
--- a/plugins/channel/demodbfm/rdstmc.cpp
+++ b/plugins/channelrx/demodbfm/rdstmc.cpp
@@ -15,7 +15,7 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.          //
 ///////////////////////////////////////////////////////////////////////////////////
 
-#include "rdstmc.h"
+#include "../../channelrx/demodbfm/rdstmc.h"
 
 #define TMC_EVENTS 2047+1
 #define TMC_EVENT_LIST_LINES 2047+1
diff --git a/plugins/channel/demodbfm/rdstmc.h b/plugins/channelrx/demodbfm/rdstmc.h
similarity index 100%
rename from plugins/channel/demodbfm/rdstmc.h
rename to plugins/channelrx/demodbfm/rdstmc.h
diff --git a/plugins/channel/demoddsd/CMakeLists.txt b/plugins/channelrx/demoddsd/CMakeLists.txt
similarity index 92%
rename from plugins/channel/demoddsd/CMakeLists.txt
rename to plugins/channelrx/demoddsd/CMakeLists.txt
index aaaa4f573..6c03e4364 100644
--- a/plugins/channel/demoddsd/CMakeLists.txt
+++ b/plugins/channelrx/demoddsd/CMakeLists.txt
@@ -47,4 +47,4 @@ target_link_libraries(demoddsd
 
 qt5_use_modules(demoddsd Core Widgets OpenGL Multimedia)
 
-install(TARGETS demoddsd DESTINATION lib/plugins/channel)
\ No newline at end of file
+install(TARGETS demoddsd DESTINATION lib/plugins/channelrx)
\ No newline at end of file
diff --git a/plugins/channel/demoddsd/demoddsd.pro b/plugins/channelrx/demoddsd/demoddsd.pro
similarity index 100%
rename from plugins/channel/demoddsd/demoddsd.pro
rename to plugins/channelrx/demoddsd/demoddsd.pro
diff --git a/plugins/channel/demoddsd/dsddecoder.cpp b/plugins/channelrx/demoddsd/dsddecoder.cpp
similarity index 98%
rename from plugins/channel/demoddsd/dsddecoder.cpp
rename to plugins/channelrx/demoddsd/dsddecoder.cpp
index 917b3ea02..c8cb55afa 100644
--- a/plugins/channel/demoddsd/dsddecoder.cpp
+++ b/plugins/channelrx/demoddsd/dsddecoder.cpp
@@ -15,8 +15,9 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.          //
 ///////////////////////////////////////////////////////////////////////////////////
 
+#include "../../channelrx/demoddsd/dsddecoder.h"
+
 #include <QtGlobal>
-#include "dsddecoder.h"
 #include "audio/audiofifo.h"
 
 
diff --git a/plugins/channel/demoddsd/dsddecoder.h b/plugins/channelrx/demoddsd/dsddecoder.h
similarity index 96%
rename from plugins/channel/demoddsd/dsddecoder.h
rename to plugins/channelrx/demoddsd/dsddecoder.h
index 71d8e426e..7ab46ad17 100644
--- a/plugins/channel/demoddsd/dsddecoder.h
+++ b/plugins/channelrx/demoddsd/dsddecoder.h
@@ -15,8 +15,8 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.          //
 ///////////////////////////////////////////////////////////////////////////////////
 
-#ifndef PLUGINS_CHANNEL_DEMODDSD_DSDDECODER_H_
-#define PLUGINS_CHANNEL_DEMODDSD_DSDDECODER_H_
+#ifndef PLUGINS_CHANNELRX_DEMODDSD_DSDDECODER_H_
+#define PLUGINS_CHANNELRX_DEMODDSD_DSDDECODER_H_
 
 #include "dsd_decoder.h"
 
@@ -75,4 +75,4 @@ private:
     DSDcc::DSDDecoder m_decoder;
 };
 
-#endif /* PLUGINS_CHANNEL_DEMODDSD_DSDDECODER_H_ */
+#endif /* PLUGINS_CHANNELRX_DEMODDSD_DSDDECODER_H_ */
diff --git a/plugins/channel/demoddsd/dsddemod.cpp b/plugins/channelrx/demoddsd/dsddemod.cpp
similarity index 99%
rename from plugins/channel/demoddsd/dsddemod.cpp
rename to plugins/channelrx/demoddsd/dsddemod.cpp
index 14eddf7b5..61ace9642 100644
--- a/plugins/channel/demoddsd/dsddemod.cpp
+++ b/plugins/channelrx/demoddsd/dsddemod.cpp
@@ -15,16 +15,17 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.          //
 ///////////////////////////////////////////////////////////////////////////////////
 
+#include "../../channelrx/demoddsd/dsddemod.h"
+
 #include <QTime>
 #include <QDebug>
 #include <stdio.h>
 #include <complex.h>
-#include "dsddemod.h"
-#include "dsddemodgui.h"
 #include "audio/audiooutput.h"
 #include "dsp/channelizer.h"
 #include "dsp/pidcontroller.h"
 #include "dsp/dspengine.h"
+#include "../../channelrx/demoddsd/dsddemodgui.h"
 
 static const Real afSqTones[2] = {1200.0, 6400.0}; // {1200.0, 8000.0};
 
diff --git a/plugins/channel/demoddsd/dsddemod.h b/plugins/channelrx/demoddsd/dsddemod.h
similarity index 99%
rename from plugins/channel/demoddsd/dsddemod.h
rename to plugins/channelrx/demoddsd/dsddemod.h
index 474871bf2..080637364 100644
--- a/plugins/channel/demoddsd/dsddemod.h
+++ b/plugins/channelrx/demoddsd/dsddemod.h
@@ -31,7 +31,8 @@
 #include "dsp/afsquelch.h"
 #include "audio/audiofifo.h"
 #include "util/message.h"
-#include "dsddecoder.h"
+
+#include "../../channelrx/demoddsd/dsddecoder.h"
 
 class DSDDemodGUI;
 
diff --git a/plugins/channel/demoddsd/dsddemodgui.cpp b/plugins/channelrx/demoddsd/dsddemodgui.cpp
similarity index 99%
rename from plugins/channel/demoddsd/dsddemodgui.cpp
rename to plugins/channelrx/demoddsd/dsddemodgui.cpp
index 22f3c40ca..48cf13fe6 100644
--- a/plugins/channel/demoddsd/dsddemodgui.cpp
+++ b/plugins/channelrx/demoddsd/dsddemodgui.cpp
@@ -15,6 +15,8 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.          //
 ///////////////////////////////////////////////////////////////////////////////////
 
+#include "../../channelrx/demoddsd/dsddemodgui.h"
+
 #include <QDockWidget>
 #include <QMainWindow>
 #include <QDebug>
@@ -31,8 +33,7 @@
 #include "dsp/dspengine.h"
 #include "mainwindow.h"
 
-#include "dsddemod.h"
-#include "dsddemodgui.h"
+#include "../../channelrx/demoddsd/dsddemod.h"
 
 const QString DSDDemodGUI::m_channelID = "sdrangel.channel.dsddemod";
 
diff --git a/plugins/channel/demoddsd/dsddemodgui.h b/plugins/channelrx/demoddsd/dsddemodgui.h
similarity index 100%
rename from plugins/channel/demoddsd/dsddemodgui.h
rename to plugins/channelrx/demoddsd/dsddemodgui.h
diff --git a/plugins/channel/demoddsd/dsddemodgui.ui b/plugins/channelrx/demoddsd/dsddemodgui.ui
similarity index 100%
rename from plugins/channel/demoddsd/dsddemodgui.ui
rename to plugins/channelrx/demoddsd/dsddemodgui.ui
diff --git a/plugins/channel/demoddsd/dsddemodplugin.cpp b/plugins/channelrx/demoddsd/dsddemodplugin.cpp
similarity index 95%
rename from plugins/channel/demoddsd/dsddemodplugin.cpp
rename to plugins/channelrx/demoddsd/dsddemodplugin.cpp
index b6e7b0d3f..5a9ff41c8 100644
--- a/plugins/channel/demoddsd/dsddemodplugin.cpp
+++ b/plugins/channelrx/demoddsd/dsddemodplugin.cpp
@@ -15,11 +15,13 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.          //
 ///////////////////////////////////////////////////////////////////////////////////
 
+#include "../../channelrx/demoddsd/dsddemodplugin.h"
+
 #include <QtPlugin>
 #include "plugin/pluginapi.h"
 #include "device/deviceapi.h"
-#include "dsddemodplugin.h"
-#include "dsddemodgui.h"
+
+#include "../../channelrx/demoddsd/dsddemodgui.h"
 
 const PluginDescriptor DSDDemodPlugin::m_pluginDescriptor = {
 	QString("DSD Demodulator"),
diff --git a/plugins/channel/demoddsd/dsddemodplugin.h b/plugins/channelrx/demoddsd/dsddemodplugin.h
similarity index 100%
rename from plugins/channel/demoddsd/dsddemodplugin.h
rename to plugins/channelrx/demoddsd/dsddemodplugin.h
diff --git a/plugins/channel/demoddsd/readme.md b/plugins/channelrx/demoddsd/readme.md
similarity index 100%
rename from plugins/channel/demoddsd/readme.md
rename to plugins/channelrx/demoddsd/readme.md
diff --git a/plugins/channel/demodlora/CMakeLists.txt b/plugins/channelrx/demodlora/CMakeLists.txt
similarity index 91%
rename from plugins/channel/demodlora/CMakeLists.txt
rename to plugins/channelrx/demodlora/CMakeLists.txt
index c477b334e..14c0965fe 100644
--- a/plugins/channel/demodlora/CMakeLists.txt
+++ b/plugins/channelrx/demodlora/CMakeLists.txt
@@ -42,4 +42,4 @@ target_link_libraries(demodlora
 
 qt5_use_modules(demodlora Core Widgets OpenGL Multimedia)
 
-install(TARGETS demodlora DESTINATION lib/plugins/channel)
+install(TARGETS demodlora DESTINATION lib/plugins/channelrx)
diff --git a/plugins/channel/demodlora/demodlora.pro b/plugins/channelrx/demodlora/demodlora.pro
similarity index 100%
rename from plugins/channel/demodlora/demodlora.pro
rename to plugins/channelrx/demodlora/demodlora.pro
diff --git a/plugins/channel/demodlora/lorabits.h b/plugins/channelrx/demodlora/lorabits.h
similarity index 100%
rename from plugins/channel/demodlora/lorabits.h
rename to plugins/channelrx/demodlora/lorabits.h
diff --git a/plugins/channel/demodlora/lorademod.cpp b/plugins/channelrx/demodlora/lorademod.cpp
similarity index 98%
rename from plugins/channel/demodlora/lorademod.cpp
rename to plugins/channelrx/demodlora/lorademod.cpp
index f2d6a23a5..e75d877ba 100644
--- a/plugins/channel/demodlora/lorademod.cpp
+++ b/plugins/channelrx/demodlora/lorademod.cpp
@@ -16,13 +16,14 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.          //
 ///////////////////////////////////////////////////////////////////////////////////
 
+#include "../../channelrx/demodlora/lorademod.h"
+
 #include <QTime>
 #include <QDebug>
 #include <stdio.h>
-#include "lorademod.h"
 #include "dsp/channelizer.h"
 
-#include "lorabits.h"
+#include "../../channelrx/demodlora/lorabits.h"
 
 MESSAGE_CLASS_DEFINITION(LoRaDemod::MsgConfigureLoRaDemod, Message)
 
diff --git a/plugins/channel/demodlora/lorademod.h b/plugins/channelrx/demodlora/lorademod.h
similarity index 100%
rename from plugins/channel/demodlora/lorademod.h
rename to plugins/channelrx/demodlora/lorademod.h
diff --git a/plugins/channel/demodlora/lorademodgui.cpp b/plugins/channelrx/demodlora/lorademodgui.cpp
similarity index 97%
rename from plugins/channel/demodlora/lorademodgui.cpp
rename to plugins/channelrx/demodlora/lorademodgui.cpp
index b004ff3c1..56385fb4d 100644
--- a/plugins/channel/demodlora/lorademodgui.cpp
+++ b/plugins/channelrx/demodlora/lorademodgui.cpp
@@ -1,12 +1,12 @@
+#include "../../channelrx/demodlora/lorademodgui.h"
+#include "../../channelrx/demodlora/lorademodgui.h"
+
 #include <QDockWidget>
 #include <QMainWindow>
-#include "lorademodgui.h"
 #include "ui_lorademodgui.h"
-#include "lorademodgui.h"
 #include "ui_lorademodgui.h"
 #include "dsp/threadedsamplesink.h"
 #include "dsp/channelizer.h"
-#include "lorademod.h"
 #include "dsp/spectrumvis.h"
 #include "gui/glspectrum.h"
 #include "plugin/pluginapi.h"
@@ -14,6 +14,7 @@
 #include "util/simpleserializer.h"
 #include "gui/basicchannelsettingswidget.h"
 #include "dsp/dspengine.h"
+#include "../../channelrx/demodlora/lorademod.h"
 
 const QString LoRaDemodGUI::m_channelID = "de.maintech.sdrangelove.channel.lora";
 
diff --git a/plugins/channel/demodlora/lorademodgui.h b/plugins/channelrx/demodlora/lorademodgui.h
similarity index 100%
rename from plugins/channel/demodlora/lorademodgui.h
rename to plugins/channelrx/demodlora/lorademodgui.h
diff --git a/plugins/channel/demodlora/lorademodgui.ui b/plugins/channelrx/demodlora/lorademodgui.ui
similarity index 100%
rename from plugins/channel/demodlora/lorademodgui.ui
rename to plugins/channelrx/demodlora/lorademodgui.ui
diff --git a/plugins/channel/demodlora/loraplugin.cpp b/plugins/channelrx/demodlora/loraplugin.cpp
similarity index 90%
rename from plugins/channel/demodlora/loraplugin.cpp
rename to plugins/channelrx/demodlora/loraplugin.cpp
index 545f5b5d1..2dbf28a3d 100644
--- a/plugins/channel/demodlora/loraplugin.cpp
+++ b/plugins/channelrx/demodlora/loraplugin.cpp
@@ -1,7 +1,9 @@
+#include "../../channelrx/demodlora/loraplugin.h"
+
 #include <QtPlugin>
 #include "plugin/pluginapi.h"
-#include "loraplugin.h"
-#include "lorademodgui.h"
+
+#include "../../channelrx/demodlora/lorademodgui.h"
 
 const PluginDescriptor LoRaPlugin::m_pluginDescriptor = {
 	QString("LoRa Demodulator"),
diff --git a/plugins/channel/demodlora/loraplugin.h b/plugins/channelrx/demodlora/loraplugin.h
similarity index 100%
rename from plugins/channel/demodlora/loraplugin.h
rename to plugins/channelrx/demodlora/loraplugin.h
diff --git a/plugins/channel/demodnfm/CMakeLists.txt b/plugins/channelrx/demodnfm/CMakeLists.txt
similarity index 91%
rename from plugins/channel/demodnfm/CMakeLists.txt
rename to plugins/channelrx/demodnfm/CMakeLists.txt
index 17a38f21f..13041c1a0 100644
--- a/plugins/channel/demodnfm/CMakeLists.txt
+++ b/plugins/channelrx/demodnfm/CMakeLists.txt
@@ -42,4 +42,4 @@ target_link_libraries(demodnfm
 
 qt5_use_modules(demodnfm Core Widgets OpenGL Multimedia)
 
-install(TARGETS demodnfm DESTINATION lib/plugins/channel)
\ No newline at end of file
+install(TARGETS demodnfm DESTINATION lib/plugins/channelrx)
\ No newline at end of file
diff --git a/plugins/channel/demodnfm/demodnfm.pro b/plugins/channelrx/demodnfm/demodnfm.pro
similarity index 100%
rename from plugins/channel/demodnfm/demodnfm.pro
rename to plugins/channelrx/demodnfm/demodnfm.pro
diff --git a/plugins/channel/demodnfm/nfmdemod.cpp b/plugins/channelrx/demodnfm/nfmdemod.cpp
similarity index 99%
rename from plugins/channel/demodnfm/nfmdemod.cpp
rename to plugins/channelrx/demodnfm/nfmdemod.cpp
index a40b5a1a1..ae4fba48d 100644
--- a/plugins/channel/demodnfm/nfmdemod.cpp
+++ b/plugins/channelrx/demodnfm/nfmdemod.cpp
@@ -15,16 +15,17 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.          //
 ///////////////////////////////////////////////////////////////////////////////////
 
+#include "../../channelrx/demodnfm/nfmdemod.h"
+
 #include <QTime>
 #include <QDebug>
 #include <stdio.h>
 #include <complex.h>
-#include "nfmdemod.h"
-#include "nfmdemodgui.h"
 #include "audio/audiooutput.h"
 #include "dsp/channelizer.h"
 #include "dsp/pidcontroller.h"
 #include "dsp/dspengine.h"
+#include "../../channelrx/demodnfm/nfmdemodgui.h"
 
 static const Real afSqTones[2] = {1200.0, 6400.0}; // {1200.0, 8000.0};
 
diff --git a/plugins/channel/demodnfm/nfmdemod.h b/plugins/channelrx/demodnfm/nfmdemod.h
similarity index 100%
rename from plugins/channel/demodnfm/nfmdemod.h
rename to plugins/channelrx/demodnfm/nfmdemod.h
diff --git a/plugins/channel/demodnfm/nfmdemodgui.cpp b/plugins/channelrx/demodnfm/nfmdemodgui.cpp
similarity index 98%
rename from plugins/channel/demodnfm/nfmdemodgui.cpp
rename to plugins/channelrx/demodnfm/nfmdemodgui.cpp
index 74af895f1..08fcdbb87 100644
--- a/plugins/channel/demodnfm/nfmdemodgui.cpp
+++ b/plugins/channelrx/demodnfm/nfmdemodgui.cpp
@@ -1,11 +1,11 @@
+#include "../../channelrx/demodnfm/nfmdemodgui.h"
+
 #include <QDockWidget>
 #include <QMainWindow>
 #include <QDebug>
-#include "nfmdemodgui.h"
 #include "ui_nfmdemodgui.h"
 #include "dsp/threadedsamplesink.h"
 #include "dsp/channelizer.h"
-#include "nfmdemod.h"
 #include "dsp/nullsink.h"
 #include "plugin/pluginapi.h"
 #include "device/deviceapi.h"
@@ -14,6 +14,7 @@
 #include "gui/basicchannelsettingswidget.h"
 #include "dsp/dspengine.h"
 #include "mainwindow.h"
+#include "../../channelrx/demodnfm/nfmdemod.h"
 
 const QString NFMDemodGUI::m_channelID = "de.maintech.sdrangelove.channel.nfm";
 
diff --git a/plugins/channel/demodnfm/nfmdemodgui.h b/plugins/channelrx/demodnfm/nfmdemodgui.h
similarity index 100%
rename from plugins/channel/demodnfm/nfmdemodgui.h
rename to plugins/channelrx/demodnfm/nfmdemodgui.h
diff --git a/plugins/channel/demodnfm/nfmdemodgui.ui b/plugins/channelrx/demodnfm/nfmdemodgui.ui
similarity index 100%
rename from plugins/channel/demodnfm/nfmdemodgui.ui
rename to plugins/channelrx/demodnfm/nfmdemodgui.ui
diff --git a/plugins/channel/demodnfm/nfmplugin.cpp b/plugins/channelrx/demodnfm/nfmplugin.cpp
similarity index 90%
rename from plugins/channel/demodnfm/nfmplugin.cpp
rename to plugins/channelrx/demodnfm/nfmplugin.cpp
index 92d5e9951..e9ecb552d 100644
--- a/plugins/channel/demodnfm/nfmplugin.cpp
+++ b/plugins/channelrx/demodnfm/nfmplugin.cpp
@@ -1,7 +1,9 @@
+#include "../../channelrx/demodnfm/nfmplugin.h"
+
 #include <QtPlugin>
 #include "plugin/pluginapi.h"
-#include "nfmplugin.h"
-#include "nfmdemodgui.h"
+
+#include "../../channelrx/demodnfm/nfmdemodgui.h"
 
 const PluginDescriptor NFMPlugin::m_pluginDescriptor = {
 	QString("NFM Demodulator"),
diff --git a/plugins/channel/demodnfm/nfmplugin.h b/plugins/channelrx/demodnfm/nfmplugin.h
similarity index 100%
rename from plugins/channel/demodnfm/nfmplugin.h
rename to plugins/channelrx/demodnfm/nfmplugin.h
diff --git a/plugins/channel/demodnfm/readme.md b/plugins/channelrx/demodnfm/readme.md
similarity index 100%
rename from plugins/channel/demodnfm/readme.md
rename to plugins/channelrx/demodnfm/readme.md
diff --git a/plugins/channel/demodssb/CMakeLists.txt b/plugins/channelrx/demodssb/CMakeLists.txt
similarity index 91%
rename from plugins/channel/demodssb/CMakeLists.txt
rename to plugins/channelrx/demodssb/CMakeLists.txt
index 57edc8bbf..24f7e4a6b 100644
--- a/plugins/channel/demodssb/CMakeLists.txt
+++ b/plugins/channelrx/demodssb/CMakeLists.txt
@@ -42,4 +42,4 @@ target_link_libraries(demodssb
 
 qt5_use_modules(demodssb Core Widgets OpenGL Multimedia)
 
-install(TARGETS demodssb DESTINATION lib/plugins/channel)
+install(TARGETS demodssb DESTINATION lib/plugins/channelrx)
diff --git a/plugins/channel/demodssb/demodssb.pro b/plugins/channelrx/demodssb/demodssb.pro
similarity index 100%
rename from plugins/channel/demodssb/demodssb.pro
rename to plugins/channelrx/demodssb/demodssb.pro
diff --git a/plugins/channel/demodssb/ssbdemod.cpp b/plugins/channelrx/demodssb/ssbdemod.cpp
similarity index 99%
rename from plugins/channel/demodssb/ssbdemod.cpp
rename to plugins/channelrx/demodssb/ssbdemod.cpp
index 515009ead..c8418c34c 100644
--- a/plugins/channel/demodssb/ssbdemod.cpp
+++ b/plugins/channelrx/demodssb/ssbdemod.cpp
@@ -16,10 +16,11 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.          //
 ///////////////////////////////////////////////////////////////////////////////////
 
+#include "../../channelrx/demodssb/ssbdemod.h"
+
 #include <QTime>
 #include <QDebug>
 #include <stdio.h>
-#include "ssbdemod.h"
 #include "audio/audiooutput.h"
 #include "dsp/dspengine.h"
 #include "dsp/channelizer.h"
diff --git a/plugins/channel/demodssb/ssbdemod.h b/plugins/channelrx/demodssb/ssbdemod.h
similarity index 100%
rename from plugins/channel/demodssb/ssbdemod.h
rename to plugins/channelrx/demodssb/ssbdemod.h
diff --git a/plugins/channel/demodssb/ssbdemodgui.cpp b/plugins/channelrx/demodssb/ssbdemodgui.cpp
similarity index 98%
rename from plugins/channel/demodssb/ssbdemodgui.cpp
rename to plugins/channelrx/demodssb/ssbdemodgui.cpp
index fbbf19d73..48cc3d9c6 100644
--- a/plugins/channel/demodssb/ssbdemodgui.cpp
+++ b/plugins/channelrx/demodssb/ssbdemodgui.cpp
@@ -1,12 +1,12 @@
+#include "../../channelrx/demodssb/ssbdemodgui.h"
+#include "../../channelrx/demodssb/ssbdemodgui.h"
+
 #include <QDockWidget>
 #include <QMainWindow>
-#include "ssbdemodgui.h"
 #include "ui_ssbdemodgui.h"
-#include "ssbdemodgui.h"
 #include "ui_ssbdemodgui.h"
 #include "dsp/threadedsamplesink.h"
 #include "dsp/channelizer.h"
-#include "ssbdemod.h"
 #include "dsp/spectrumvis.h"
 #include "gui/glspectrum.h"
 #include "plugin/pluginapi.h"
@@ -16,6 +16,7 @@
 #include "gui/basicchannelsettingswidget.h"
 #include "dsp/dspengine.h"
 #include "mainwindow.h"
+#include "../../channelrx/demodssb/ssbdemod.h"
 
 const QString SSBDemodGUI::m_channelID = "de.maintech.sdrangelove.channel.ssb";
 
diff --git a/plugins/channel/demodssb/ssbdemodgui.h b/plugins/channelrx/demodssb/ssbdemodgui.h
similarity index 100%
rename from plugins/channel/demodssb/ssbdemodgui.h
rename to plugins/channelrx/demodssb/ssbdemodgui.h
diff --git a/plugins/channel/demodssb/ssbdemodgui.ui b/plugins/channelrx/demodssb/ssbdemodgui.ui
similarity index 100%
rename from plugins/channel/demodssb/ssbdemodgui.ui
rename to plugins/channelrx/demodssb/ssbdemodgui.ui
diff --git a/plugins/channel/demodssb/ssbplugin.cpp b/plugins/channelrx/demodssb/ssbplugin.cpp
similarity index 91%
rename from plugins/channel/demodssb/ssbplugin.cpp
rename to plugins/channelrx/demodssb/ssbplugin.cpp
index 4549835a9..11228ce20 100644
--- a/plugins/channel/demodssb/ssbplugin.cpp
+++ b/plugins/channelrx/demodssb/ssbplugin.cpp
@@ -1,8 +1,10 @@
+#include "../../channelrx/demodssb/ssbplugin.h"
+
 #include <QtPlugin>
 #include "plugin/pluginapi.h"
 #include "device/deviceapi.h"
-#include "ssbplugin.h"
-#include "ssbdemodgui.h"
+
+#include "../../channelrx/demodssb/ssbdemodgui.h"
 
 const PluginDescriptor SSBPlugin::m_pluginDescriptor = {
 	QString("SSB Demodulator"),
diff --git a/plugins/channel/demodssb/ssbplugin.h b/plugins/channelrx/demodssb/ssbplugin.h
similarity index 100%
rename from plugins/channel/demodssb/ssbplugin.h
rename to plugins/channelrx/demodssb/ssbplugin.h
diff --git a/plugins/channel/demodwfm/CMakeLists.txt b/plugins/channelrx/demodwfm/CMakeLists.txt
similarity index 91%
rename from plugins/channel/demodwfm/CMakeLists.txt
rename to plugins/channelrx/demodwfm/CMakeLists.txt
index 8362a8780..30ebebe8a 100644
--- a/plugins/channel/demodwfm/CMakeLists.txt
+++ b/plugins/channelrx/demodwfm/CMakeLists.txt
@@ -42,4 +42,4 @@ target_link_libraries(demodwfm
 
 qt5_use_modules(demodwfm Core Widgets OpenGL Multimedia)
 
-install(TARGETS demodwfm DESTINATION lib/plugins/channel)
\ No newline at end of file
+install(TARGETS demodwfm DESTINATION lib/plugins/channelrx)
\ No newline at end of file
diff --git a/plugins/channel/demodwfm/demodwfm.pro b/plugins/channelrx/demodwfm/demodwfm.pro
similarity index 100%
rename from plugins/channel/demodwfm/demodwfm.pro
rename to plugins/channelrx/demodwfm/demodwfm.pro
diff --git a/plugins/channel/demodwfm/wfmdemod.cpp b/plugins/channelrx/demodwfm/wfmdemod.cpp
similarity index 99%
rename from plugins/channel/demodwfm/wfmdemod.cpp
rename to plugins/channelrx/demodwfm/wfmdemod.cpp
index b46caf3b7..971fbc86d 100644
--- a/plugins/channel/demodwfm/wfmdemod.cpp
+++ b/plugins/channelrx/demodwfm/wfmdemod.cpp
@@ -15,6 +15,8 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.          //
 ///////////////////////////////////////////////////////////////////////////////////
 
+#include "../../channelrx/demodwfm/wfmdemod.h"
+
 #include <QTime>
 #include <QDebug>
 #include <stdio.h>
@@ -23,7 +25,6 @@
 #include "dsp/dspengine.h"
 #include "dsp/channelizer.h"
 #include "dsp/pidcontroller.h"
-#include "wfmdemod.h"
 
 MESSAGE_CLASS_DEFINITION(WFMDemod::MsgConfigureWFMDemod, Message)
 
diff --git a/plugins/channel/demodwfm/wfmdemod.h b/plugins/channelrx/demodwfm/wfmdemod.h
similarity index 100%
rename from plugins/channel/demodwfm/wfmdemod.h
rename to plugins/channelrx/demodwfm/wfmdemod.h
diff --git a/plugins/channel/demodwfm/wfmdemodgui.cpp b/plugins/channelrx/demodwfm/wfmdemodgui.cpp
similarity index 98%
rename from plugins/channel/demodwfm/wfmdemodgui.cpp
rename to plugins/channelrx/demodwfm/wfmdemodgui.cpp
index c4b0d3c01..bde8aea2a 100644
--- a/plugins/channel/demodwfm/wfmdemodgui.cpp
+++ b/plugins/channelrx/demodwfm/wfmdemodgui.cpp
@@ -1,3 +1,5 @@
+#include "../../channelrx/demodwfm/wfmdemodgui.h"
+
 #include <QDockWidget>
 #include <QMainWindow>
 #include <QDebug>
@@ -12,8 +14,7 @@
 #include "gui/basicchannelsettingswidget.h"
 #include "mainwindow.h"
 
-#include "wfmdemod.h"
-#include "wfmdemodgui.h"
+#include "../../channelrx/demodwfm/wfmdemod.h"
 
 const QString WFMDemodGUI::m_channelID = "de.maintech.sdrangelove.channel.wfm";
 
diff --git a/plugins/channel/demodwfm/wfmdemodgui.h b/plugins/channelrx/demodwfm/wfmdemodgui.h
similarity index 100%
rename from plugins/channel/demodwfm/wfmdemodgui.h
rename to plugins/channelrx/demodwfm/wfmdemodgui.h
diff --git a/plugins/channel/demodwfm/wfmdemodgui.ui b/plugins/channelrx/demodwfm/wfmdemodgui.ui
similarity index 100%
rename from plugins/channel/demodwfm/wfmdemodgui.ui
rename to plugins/channelrx/demodwfm/wfmdemodgui.ui
diff --git a/plugins/channel/demodwfm/wfmplugin.cpp b/plugins/channelrx/demodwfm/wfmplugin.cpp
similarity index 91%
rename from plugins/channel/demodwfm/wfmplugin.cpp
rename to plugins/channelrx/demodwfm/wfmplugin.cpp
index 33b007c5f..1d4913d67 100644
--- a/plugins/channel/demodwfm/wfmplugin.cpp
+++ b/plugins/channelrx/demodwfm/wfmplugin.cpp
@@ -1,8 +1,9 @@
+#include "../../channelrx/demodwfm/wfmplugin.h"
+
 #include <QtPlugin>
 #include "plugin/pluginapi.h"
 
-#include "wfmdemodgui.h"
-#include "wfmplugin.h"
+#include "../../channelrx/demodwfm/wfmdemodgui.h"
 
 const PluginDescriptor WFMPlugin::m_pluginDescriptor = {
 	QString("WFM Demodulator"),
diff --git a/plugins/channel/demodwfm/wfmplugin.h b/plugins/channelrx/demodwfm/wfmplugin.h
similarity index 100%
rename from plugins/channel/demodwfm/wfmplugin.h
rename to plugins/channelrx/demodwfm/wfmplugin.h
diff --git a/plugins/channel/tcpsrc/CMakeLists.txt b/plugins/channelrx/tcpsrc/CMakeLists.txt
similarity index 91%
rename from plugins/channel/tcpsrc/CMakeLists.txt
rename to plugins/channelrx/tcpsrc/CMakeLists.txt
index fb6bb8149..03c1b0c9a 100644
--- a/plugins/channel/tcpsrc/CMakeLists.txt
+++ b/plugins/channelrx/tcpsrc/CMakeLists.txt
@@ -42,4 +42,4 @@ target_link_libraries(demodtcpsrc
 
 qt5_use_modules(demodtcpsrc Core Widgets OpenGL Network)
 
-install(TARGETS demodtcpsrc DESTINATION lib/plugins/channel)
+install(TARGETS demodtcpsrc DESTINATION lib/plugins/channelrx)
diff --git a/plugins/channel/tcpsrc/tcpsrc.cpp b/plugins/channelrx/tcpsrc/tcpsrc.cpp
similarity index 99%
rename from plugins/channel/tcpsrc/tcpsrc.cpp
rename to plugins/channelrx/tcpsrc/tcpsrc.cpp
index 0833eaf3d..5e3c35bd1 100644
--- a/plugins/channel/tcpsrc/tcpsrc.cpp
+++ b/plugins/channelrx/tcpsrc/tcpsrc.cpp
@@ -14,12 +14,13 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.          //
 ///////////////////////////////////////////////////////////////////////////////////
 
+#include "../../channelrx/tcpsrc/tcpsrc.h"
+
 #include <QTcpServer>
 #include <QTcpSocket>
 #include <QThread>
-#include "tcpsrc.h"
-#include "tcpsrcgui.h"
 #include "dsp/channelizer.h"
+#include "../../channelrx/tcpsrc/tcpsrcgui.h"
 
 MESSAGE_CLASS_DEFINITION(TCPSrc::MsgTCPSrcConfigure, Message)
 MESSAGE_CLASS_DEFINITION(TCPSrc::MsgTCPSrcConnection, Message)
diff --git a/plugins/channel/tcpsrc/tcpsrc.h b/plugins/channelrx/tcpsrc/tcpsrc.h
similarity index 100%
rename from plugins/channel/tcpsrc/tcpsrc.h
rename to plugins/channelrx/tcpsrc/tcpsrc.h
diff --git a/plugins/channel/tcpsrc/tcpsrc.pro b/plugins/channelrx/tcpsrc/tcpsrc.pro
similarity index 100%
rename from plugins/channel/tcpsrc/tcpsrc.pro
rename to plugins/channelrx/tcpsrc/tcpsrc.pro
diff --git a/plugins/channel/tcpsrc/tcpsrcgui.cpp b/plugins/channelrx/tcpsrc/tcpsrcgui.cpp
similarity index 99%
rename from plugins/channel/tcpsrc/tcpsrcgui.cpp
rename to plugins/channelrx/tcpsrc/tcpsrcgui.cpp
index 5248e51d6..7d3ea70d4 100644
--- a/plugins/channel/tcpsrc/tcpsrcgui.cpp
+++ b/plugins/channelrx/tcpsrc/tcpsrcgui.cpp
@@ -1,7 +1,7 @@
-#include "tcpsrcgui.h"
+#include "../../channelrx/tcpsrc/tcpsrcgui.h"
+
 #include "plugin/pluginapi.h"
 #include "device/deviceapi.h"
-#include "tcpsrc.h"
 #include "dsp/threadedsamplesink.h"
 #include "dsp/channelizer.h"
 #include "dsp/spectrumvis.h"
@@ -11,6 +11,7 @@
 #include "gui/basicchannelsettingswidget.h"
 #include "ui_tcpsrcgui.h"
 #include "mainwindow.h"
+#include "../../channelrx/tcpsrc/tcpsrc.h"
 
 const QString TCPSrcGUI::m_channelID = "sdrangel.channel.tcpsrc";
 
diff --git a/plugins/channel/tcpsrc/tcpsrcgui.h b/plugins/channelrx/tcpsrc/tcpsrcgui.h
similarity index 98%
rename from plugins/channel/tcpsrc/tcpsrcgui.h
rename to plugins/channelrx/tcpsrc/tcpsrcgui.h
index 5319bb83b..d48219049 100644
--- a/plugins/channel/tcpsrc/tcpsrcgui.h
+++ b/plugins/channelrx/tcpsrc/tcpsrcgui.h
@@ -6,7 +6,8 @@
 #include "plugin/plugingui.h"
 #include "dsp/channelmarker.h"
 #include "dsp/movingaverage.h"
-#include "tcpsrc.h"
+
+#include "../../channelrx/tcpsrc/tcpsrc.h"
 
 class PluginAPI;
 class DeviceAPI;
diff --git a/plugins/channel/tcpsrc/tcpsrcgui.ui b/plugins/channelrx/tcpsrc/tcpsrcgui.ui
similarity index 100%
rename from plugins/channel/tcpsrc/tcpsrcgui.ui
rename to plugins/channelrx/tcpsrc/tcpsrcgui.ui
diff --git a/plugins/channel/tcpsrc/tcpsrcplugin.cpp b/plugins/channelrx/tcpsrc/tcpsrcplugin.cpp
similarity index 92%
rename from plugins/channel/tcpsrc/tcpsrcplugin.cpp
rename to plugins/channelrx/tcpsrc/tcpsrcplugin.cpp
index 3679e9304..f78bebb9a 100644
--- a/plugins/channel/tcpsrc/tcpsrcplugin.cpp
+++ b/plugins/channelrx/tcpsrc/tcpsrcplugin.cpp
@@ -1,7 +1,9 @@
+#include "../../channelrx/tcpsrc/tcpsrcplugin.h"
+
 #include <QtPlugin>
 #include "plugin/pluginapi.h"
-#include "tcpsrcplugin.h"
-#include "tcpsrcgui.h"
+
+#include "../../channelrx/tcpsrc/tcpsrcgui.h"
 
 const PluginDescriptor TCPSrcPlugin::m_pluginDescriptor = {
 	QString("TCP Channel Source"),
diff --git a/plugins/channel/tcpsrc/tcpsrcplugin.h b/plugins/channelrx/tcpsrc/tcpsrcplugin.h
similarity index 100%
rename from plugins/channel/tcpsrc/tcpsrcplugin.h
rename to plugins/channelrx/tcpsrc/tcpsrcplugin.h
diff --git a/plugins/channel/udpsrc/CMakeLists.txt b/plugins/channelrx/udpsrc/CMakeLists.txt
similarity index 91%
rename from plugins/channel/udpsrc/CMakeLists.txt
rename to plugins/channelrx/udpsrc/CMakeLists.txt
index 066bf685f..691cec519 100644
--- a/plugins/channel/udpsrc/CMakeLists.txt
+++ b/plugins/channelrx/udpsrc/CMakeLists.txt
@@ -41,4 +41,4 @@ target_link_libraries(demodudpsrc
 
 qt5_use_modules(demodudpsrc Core Widgets OpenGL Network Multimedia)
 
-install(TARGETS demodudpsrc DESTINATION lib/plugins/channel)
+install(TARGETS demodudpsrc DESTINATION lib/plugins/channelrx)
diff --git a/plugins/channel/udpsrc/readme.md b/plugins/channelrx/udpsrc/readme.md
similarity index 100%
rename from plugins/channel/udpsrc/readme.md
rename to plugins/channelrx/udpsrc/readme.md
diff --git a/plugins/channel/udpsrc/udpsrc.cpp b/plugins/channelrx/udpsrc/udpsrc.cpp
similarity index 99%
rename from plugins/channel/udpsrc/udpsrc.cpp
rename to plugins/channelrx/udpsrc/udpsrc.cpp
index 672b0842a..442f7d7c3 100644
--- a/plugins/channel/udpsrc/udpsrc.cpp
+++ b/plugins/channelrx/udpsrc/udpsrc.cpp
@@ -15,14 +15,15 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.          //
 ///////////////////////////////////////////////////////////////////////////////////
 
-#include "udpsrc.h"
+#include "../../channelrx/udpsrc/udpsrc.h"
 
 #include <QUdpSocket>
 #include <QThread>
 #include <QHostAddress>
 #include "dsp/channelizer.h"
 #include "dsp/dspengine.h"
-#include "udpsrcgui.h"
+
+#include "../../channelrx/udpsrc/udpsrcgui.h"
 
 MESSAGE_CLASS_DEFINITION(UDPSrc::MsgUDPSrcConfigure, Message)
 MESSAGE_CLASS_DEFINITION(UDPSrc::MsgUDPSrcConfigureImmediate, Message)
diff --git a/plugins/channel/udpsrc/udpsrc.h b/plugins/channelrx/udpsrc/udpsrc.h
similarity index 100%
rename from plugins/channel/udpsrc/udpsrc.h
rename to plugins/channelrx/udpsrc/udpsrc.h
diff --git a/plugins/channel/udpsrc/udpsrc.pro b/plugins/channelrx/udpsrc/udpsrc.pro
similarity index 100%
rename from plugins/channel/udpsrc/udpsrc.pro
rename to plugins/channelrx/udpsrc/udpsrc.pro
diff --git a/plugins/channel/udpsrc/udpsrcgui.cpp b/plugins/channelrx/udpsrc/udpsrcgui.cpp
similarity index 99%
rename from plugins/channel/udpsrc/udpsrcgui.cpp
rename to plugins/channelrx/udpsrc/udpsrcgui.cpp
index 28d457cb0..4f35f0745 100644
--- a/plugins/channel/udpsrc/udpsrcgui.cpp
+++ b/plugins/channelrx/udpsrc/udpsrcgui.cpp
@@ -15,7 +15,7 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.          //
 ///////////////////////////////////////////////////////////////////////////////////
 
-#include "udpsrcgui.h"
+#include "../../channelrx/udpsrc/udpsrcgui.h"
 
 #include "plugin/pluginapi.h"
 #include "device/deviceapi.h"
@@ -28,7 +28,8 @@
 #include "gui/basicchannelsettingswidget.h"
 #include "ui_udpsrcgui.h"
 #include "mainwindow.h"
-#include "udpsrc.h"
+
+#include "../../channelrx/udpsrc/udpsrc.h"
 
 const QString UDPSrcGUI::m_channelID = "sdrangel.channel.udpsrc";
 
diff --git a/plugins/channel/udpsrc/udpsrcgui.h b/plugins/channelrx/udpsrc/udpsrcgui.h
similarity index 98%
rename from plugins/channel/udpsrc/udpsrcgui.h
rename to plugins/channelrx/udpsrc/udpsrcgui.h
index 803ca59e2..44e97a6eb 100644
--- a/plugins/channel/udpsrc/udpsrcgui.h
+++ b/plugins/channelrx/udpsrc/udpsrcgui.h
@@ -24,7 +24,7 @@
 #include "dsp/channelmarker.h"
 #include "dsp/movingaverage.h"
 
-#include "udpsrc.h"
+#include "../../channelrx/udpsrc/udpsrc.h"
 
 class PluginAPI;
 class DeviceAPI;
diff --git a/plugins/channel/udpsrc/udpsrcgui.ui b/plugins/channelrx/udpsrc/udpsrcgui.ui
similarity index 100%
rename from plugins/channel/udpsrc/udpsrcgui.ui
rename to plugins/channelrx/udpsrc/udpsrcgui.ui
diff --git a/plugins/channel/udpsrc/udpsrcplugin.cpp b/plugins/channelrx/udpsrc/udpsrcplugin.cpp
similarity index 96%
rename from plugins/channel/udpsrc/udpsrcplugin.cpp
rename to plugins/channelrx/udpsrc/udpsrcplugin.cpp
index c3a96f9ed..f23f201bc 100644
--- a/plugins/channel/udpsrc/udpsrcplugin.cpp
+++ b/plugins/channelrx/udpsrc/udpsrcplugin.cpp
@@ -15,12 +15,12 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.          //
 ///////////////////////////////////////////////////////////////////////////////////
 
-#include "udpsrcplugin.h"
+#include "../../channelrx/udpsrc/udpsrcplugin.h"
 
 #include <QtPlugin>
 #include "plugin/pluginapi.h"
 
-#include "udpsrcgui.h"
+#include "../../channelrx/udpsrc/udpsrcgui.h"
 
 const PluginDescriptor UDPSrcPlugin::m_pluginDescriptor = {
 	QString("UDP Channel Source"),
diff --git a/plugins/channel/udpsrc/udpsrcplugin.h b/plugins/channelrx/udpsrc/udpsrcplugin.h
similarity index 100%
rename from plugins/channel/udpsrc/udpsrcplugin.h
rename to plugins/channelrx/udpsrc/udpsrcplugin.h