diff --git a/plugins/samplesource/soapysdrinput/CMakeLists.txt b/plugins/samplesource/soapysdrinput/CMakeLists.txt
index e63f1525b..b87a6567f 100644
--- a/plugins/samplesource/soapysdrinput/CMakeLists.txt
+++ b/plugins/samplesource/soapysdrinput/CMakeLists.txt
@@ -8,9 +8,6 @@ set(soapysdrinput_SOURCES
 	soapysdrinputplugin.cpp
 	soapysdrinputsettings.cpp
 	soapysdrinputthread.cpp
-	itemsettinggui.cpp
-	discreterangegui.cpp
-	intervalrangegui.cpp
 )
 
 set(soapysdrinput_HEADERS
@@ -19,15 +16,10 @@ set(soapysdrinput_HEADERS
 	soapysdrinputplugin.h
 	soapysdrinputsettings.h
 	soapysdrinputthread.h
-	itemsettinggui.h
-	discreterangegui.h
-	intervalrangegui.h
 )
 
 set(soapysdrinput_FORMS
 	soapysdrinputgui.ui
-	discreterangegui.ui
-	intervalrangegui.ui
 )
 
 if (BUILD_DEBIAN)
diff --git a/plugins/samplesource/soapysdrinput/soapysdrinputgui.cpp b/plugins/samplesource/soapysdrinput/soapysdrinputgui.cpp
index 9e7c2e0f7..1f2196dd6 100644
--- a/plugins/samplesource/soapysdrinput/soapysdrinputgui.cpp
+++ b/plugins/samplesource/soapysdrinput/soapysdrinputgui.cpp
@@ -22,10 +22,10 @@
 #include "device/deviceuiset.h"
 #include "util/simpleserializer.h"
 #include "gui/glspectrum.h"
+#include "soapygui/discreterangegui.h"
+#include "soapygui/intervalrangegui.h"
 
 #include "ui_soapysdrinputgui.h"
-#include "discreterangegui.h"
-#include "intervalrangegui.h"
 #include "soapysdrinputgui.h"
 
 SoapySDRInputGui::SoapySDRInputGui(DeviceUISet *deviceUISet, QWidget* parent) :
diff --git a/sdrgui/CMakeLists.txt b/sdrgui/CMakeLists.txt
index 95e655c92..1130a0a47 100644
--- a/sdrgui/CMakeLists.txt
+++ b/sdrgui/CMakeLists.txt
@@ -54,6 +54,10 @@ set(sdrgui_SOURCES
     
     device/deviceuiset.cpp
     
+    soapygui/discreterangegui.cpp
+    soapygui/intervalrangegui.cpp
+    soapygui/itemsettinggui.cpp
+    
     webapi/webapiadaptergui.cpp
 )
 
@@ -111,6 +115,10 @@ set(sdrgui_HEADERS
     
     device/deviceuiset.h
     
+    soapygui/discreterangegui.h
+    soapygui/intervalrangegui.h
+    soapygui/itemsettinggui.h
+    
     webapi/webapiadaptergui.h
 )
 
@@ -139,6 +147,8 @@ set(sdrgui_FORMS
     gui/myposdialog.ui
     gui/transverterdialog.ui
     gui/loggingdialog.ui
+    soapygui/discreterangegui.ui
+    soapygui/intervalrangegui.ui
 )
 
 set(sdrgui_RESOURCES
diff --git a/plugins/samplesource/soapysdrinput/discreterangegui.cpp b/sdrgui/soapygui/discreterangegui.cpp
similarity index 100%
rename from plugins/samplesource/soapysdrinput/discreterangegui.cpp
rename to sdrgui/soapygui/discreterangegui.cpp
diff --git a/plugins/samplesource/soapysdrinput/discreterangegui.h b/sdrgui/soapygui/discreterangegui.h
similarity index 100%
rename from plugins/samplesource/soapysdrinput/discreterangegui.h
rename to sdrgui/soapygui/discreterangegui.h
diff --git a/plugins/samplesource/soapysdrinput/discreterangegui.ui b/sdrgui/soapygui/discreterangegui.ui
similarity index 100%
rename from plugins/samplesource/soapysdrinput/discreterangegui.ui
rename to sdrgui/soapygui/discreterangegui.ui
diff --git a/plugins/samplesource/soapysdrinput/intervalrangegui.cpp b/sdrgui/soapygui/intervalrangegui.cpp
similarity index 100%
rename from plugins/samplesource/soapysdrinput/intervalrangegui.cpp
rename to sdrgui/soapygui/intervalrangegui.cpp
diff --git a/plugins/samplesource/soapysdrinput/intervalrangegui.h b/sdrgui/soapygui/intervalrangegui.h
similarity index 100%
rename from plugins/samplesource/soapysdrinput/intervalrangegui.h
rename to sdrgui/soapygui/intervalrangegui.h
diff --git a/plugins/samplesource/soapysdrinput/intervalrangegui.ui b/sdrgui/soapygui/intervalrangegui.ui
similarity index 100%
rename from plugins/samplesource/soapysdrinput/intervalrangegui.ui
rename to sdrgui/soapygui/intervalrangegui.ui
diff --git a/plugins/samplesource/soapysdrinput/itemsettinggui.cpp b/sdrgui/soapygui/itemsettinggui.cpp
similarity index 100%
rename from plugins/samplesource/soapysdrinput/itemsettinggui.cpp
rename to sdrgui/soapygui/itemsettinggui.cpp
diff --git a/plugins/samplesource/soapysdrinput/itemsettinggui.h b/sdrgui/soapygui/itemsettinggui.h
similarity index 100%
rename from plugins/samplesource/soapysdrinput/itemsettinggui.h
rename to sdrgui/soapygui/itemsettinggui.h