diff --git a/sdrangel.windows.pro b/sdrangel.windows.pro
index 3bd72a45b..d75209cba 100644
--- a/sdrangel.windows.pro
+++ b/sdrangel.windows.pro
@@ -25,16 +25,16 @@ SUBDIRS += plugins/samplesource/rtlsdr
 SUBDIRS += plugins/samplesource/hackrf
 SUBDIRS += plugins/samplesource/airspy
 SUBDIRS += plugins/samplesource/bladerf
-SUBDIRS += plugins/channel/chanalyzer
-SUBDIRS += plugins/channel/demodam
-SUBDIRS += plugins/channel/demodbfm
-SUBDIRS += plugins/channel/demoddsd
-SUBDIRS += plugins/channel/demodlora
-SUBDIRS += plugins/channel/demodnfm
-SUBDIRS += plugins/channel/demodssb
-SUBDIRS += plugins/channel/demodwfm
-SUBDIRS += plugins/channel/tcpsrc
-SUBDIRS += plugins/channel/udpsrc
+SUBDIRS += plugins/channelrx/chanalyzer
+SUBDIRS += plugins/channelrx/demodam
+SUBDIRS += plugins/channelrx/demodbfm
+SUBDIRS += plugins/channelrx/demoddsd
+SUBDIRS += plugins/channelrx/demodlora
+SUBDIRS += plugins/channelrx/demodnfm
+SUBDIRS += plugins/channelrx/demodssb
+SUBDIRS += plugins/channelrx/demodwfm
+SUBDIRS += plugins/channelrx/tcpsrc
+SUBDIRS += plugins/channelrx/udpsrc
 
 # Main app must be last
 CONFIG += ordered
diff --git a/windows.install.bat b/windows.install.bat
index de33470e4..7e0970b21 100644
--- a/windows.install.bat
+++ b/windows.install.bat
@@ -14,16 +14,16 @@ copy %libusbdir%\dll\libusb-1.0.dll %2
 mkdir %2\plugins
 mkdir %2\plugins\channel
 mkdir %2\plugins\samplesource
-copy plugins\channel\chanalyzer\%1\chanalyzer.dll %2\plugins\channel
-copy plugins\channel\demodam\%1\demodam.dll %2\plugins\channel
-copy plugins\channel\demodbfm\%1\demodbfm.dll %2\plugins\channel
-copy plugins\channel\demoddsd\%1\demoddsd.dll %2\plugins\channel
-copy plugins\channel\demodlora\%1\demodlora.dll %2\plugins\channel
-copy plugins\channel\demodnfm\%1\demodnfm.dll %2\plugins\channel
-copy plugins\channel\demodssb\%1\demodssb.dll %2\plugins\channel
-copy plugins\channel\demodwfm\%1\demodwfm.dll %2\plugins\channel
-copy plugins\channel\tcpsrc\%1\tcpsrc.dll %2\plugins\channel
-copy plugins\channel\udpsrc\%1\udpsrc.dll %2\plugins\channel
+copy plugins\channelrx\chanalyzer\%1\chanalyzer.dll %2\plugins\channelrx
+copy plugins\channelrx\demodam\%1\demodam.dll %2\plugins\channelrx
+copy plugins\channelrx\demodbfm\%1\demodbfm.dll %2\plugins\channelrx
+copy plugins\channelrx\demoddsd\%1\demoddsd.dll %2\plugins\channelrx
+copy plugins\channelrx\demodlora\%1\demodlora.dll %2\plugins\channelrx
+copy plugins\channelrx\demodnfm\%1\demodnfm.dll %2\plugins\channelrx
+copy plugins\channelrx\demodssb\%1\demodssb.dll %2\plugins\channelrx
+copy plugins\channelrx\demodwfm\%1\demodwfm.dll %2\plugins\channelrx
+copy plugins\channelrx\tcpsrc\%1\tcpsrc.dll %2\plugins\channelrx
+copy plugins\channelrx\udpsrc\%1\udpsrc.dll %2\plugins\channelrx
 copy plugins\samplesource\filesource\%1\inputfilesource.dll %2\plugins\samplesource
 copy plugins\samplesource\rtlsdr\%1\inputrtlsdr.dll %2\plugins\samplesource
 copy plugins\samplesource\hackrf\%1\inputhackrf.dll %2\plugins\samplesource
diff --git a/windows64.install.bat b/windows64.install.bat
index d75eb7389..9d929f080 100644
--- a/windows64.install.bat
+++ b/windows64.install.bat
@@ -27,16 +27,16 @@ copy %libusbdir%\dll\libusb-1.0.dll %2
 mkdir %2\plugins
 mkdir %2\plugins\channel
 mkdir %2\plugins\samplesource
-copy plugins\channel\chanalyzer\%1\chanalyzer.dll %2\plugins\channel
-copy plugins\channel\demodam\%1\demodam.dll %2\plugins\channel
-copy plugins\channel\demodbfm\%1\demodbfm.dll %2\plugins\channel
-copy plugins\channel\demoddsd\%1\demoddsd.dll %2\plugins\channel
-copy plugins\channel\demodlora\%1\demodlora.dll %2\plugins\channel
-copy plugins\channel\demodnfm\%1\demodnfm.dll %2\plugins\channel
-copy plugins\channel\demodssb\%1\demodssb.dll %2\plugins\channel
-copy plugins\channel\demodwfm\%1\demodwfm.dll %2\plugins\channel
-copy plugins\channel\tcpsrc\%1\tcpsrc.dll %2\plugins\channel
-copy plugins\channel\udpsrc\%1\udpsrc.dll %2\plugins\channel
+copy plugins\channelrx\chanalyzer\%1\chanalyzer.dll %2\plugins\channelrx
+copy plugins\channelrx\demodam\%1\demodam.dll %2\plugins\channelrx
+copy plugins\channelrx\demodbfm\%1\demodbfm.dll %2\plugins\channelrx
+copy plugins\channelrx\demoddsd\%1\demoddsd.dll %2\plugins\channelrx
+copy plugins\channelrx\demodlora\%1\demodlora.dll %2\plugins\channelrx
+copy plugins\channelrx\demodnfm\%1\demodnfm.dll %2\plugins\channelrx
+copy plugins\channelrx\demodssb\%1\demodssb.dll %2\plugins\channelrxd
+copy plugins\channelrx\demodwfm\%1\demodwfm.dll %2\plugins\channelrx
+copy plugins\channelrx\tcpsrc\%1\tcpsrc.dll %2\plugins\channelrx
+copy plugins\channelrx\udpsrc\%1\udpsrc.dll %2\plugins\channelrx
 copy plugins\samplesource\filesource\%1\inputfilesource.dll %2\plugins\samplesource
 copy plugins\samplesource\sdrdaemon\%1\inputsdrdaemon.dll %2\plugins\samplesource
 copy plugins\samplesource\sdrdaemonfec\%1\inputsdrdaemonfec.dll %2\plugins\samplesource