diff --git a/plugins/samplesource/CMakeLists.txt b/plugins/samplesource/CMakeLists.txt
index 06f92d37f..e5318a504 100644
--- a/plugins/samplesource/CMakeLists.txt
+++ b/plugins/samplesource/CMakeLists.txt
@@ -29,7 +29,7 @@ endif(LIBUSB_FOUND AND LIBRTLSDR_FOUND)
 
 find_package(LibBLADERF)
 if(LIBUSB_FOUND AND LIBBLADERF_FOUND)
-    add_subdirectory(bladerf)
+    add_subdirectory(bladerfinput)
 endif(LIBUSB_FOUND AND LIBBLADERF_FOUND)
 
 find_package(LibAIRSPY)
@@ -68,7 +68,7 @@ if (BUILD_DEBIAN)
     add_subdirectory(airspy)
     add_subdirectory(hackrf)
     add_subdirectory(rtlsdr)
-    add_subdirectory(bladerf)
+    add_subdirectory(bladerfinput)
     add_subdirectory(sdrplay)
 endif (BUILD_DEBIAN)
 
diff --git a/plugins/samplesource/bladerf/CMakeLists.txt b/plugins/samplesource/bladerfinput/CMakeLists.txt
similarity index 76%
rename from plugins/samplesource/bladerf/CMakeLists.txt
rename to plugins/samplesource/bladerfinput/CMakeLists.txt
index 3b46dde2f..821777379 100644
--- a/plugins/samplesource/bladerf/CMakeLists.txt
+++ b/plugins/samplesource/bladerfinput/CMakeLists.txt
@@ -1,6 +1,6 @@
-project(bladerf)
+project(bladerfinput)
 
-set(bladerf_SOURCES
+set(bladerfinput_SOURCES
 	bladerfinputgui.cpp
 	bladerfinput.cpp
 	bladerfinputplugin.cpp
@@ -8,7 +8,7 @@ set(bladerf_SOURCES
 	bladerfinputthread.cpp
 )
 
-set(bladerf_HEADERS
+set(bladerfinput_HEADERS
 	bladerfinputgui.h
 	bladerfinput.h
 	bladerfinputplugin.h
@@ -16,7 +16,7 @@ set(bladerf_HEADERS
 	bladerfinputthread.h
 )
 
-set(bladerf_FORMS
+set(bladerfinput_FORMS
 	bladerfinputgui.ui
 )
 
@@ -40,13 +40,13 @@ add_definitions(${QT_DEFINITIONS})
 add_definitions(-DQT_PLUGIN)
 add_definitions(-DQT_SHARED)
 
-#qt4_wrap_cpp(bladerf_HEADERS_MOC ${bladerf_HEADERS})
-qt5_wrap_ui(bladerf_FORMS_HEADERS ${bladerf_FORMS})
+#qt4_wrap_cpp(bladerfinput_HEADERS_MOC ${bladerfinput_HEADERS})
+qt5_wrap_ui(bladerfinput_FORMS_HEADERS ${bladerfinput_FORMS})
 
 add_library(inputbladerf SHARED
-	${bladerf_SOURCES}
-	${bladerf_HEADERS_MOC}
-	${bladerf_FORMS_HEADERS}
+	${bladerfinput_SOURCES}
+	${bladerfinput_HEADERS_MOC}
+	${bladerfinput_FORMS_HEADERS}
 )
 
 if (BUILD_DEBIAN)
diff --git a/plugins/samplesource/bladerf/bladerfinput.cpp b/plugins/samplesource/bladerfinput/bladerfinput.cpp
similarity index 98%
rename from plugins/samplesource/bladerf/bladerfinput.cpp
rename to plugins/samplesource/bladerfinput/bladerfinput.cpp
index cb5a5b728..0d2df929d 100644
--- a/plugins/samplesource/bladerf/bladerfinput.cpp
+++ b/plugins/samplesource/bladerfinput/bladerfinput.cpp
@@ -14,6 +14,8 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.          //
 ///////////////////////////////////////////////////////////////////////////////////
 
+#include "../bladerfinput/bladerfinput.h"
+
 #include <string.h>
 #include <errno.h>
 #include <QDebug>
@@ -21,12 +23,10 @@
 #include "util/simpleserializer.h"
 #include "dsp/dspcommands.h"
 #include "dsp/dspengine.h"
-#include "bladerfinput.h"
-
 #include <device/devicesourceapi.h>
 
-#include "bladerfinputgui.h"
-#include "bladerfinputthread.h"
+#include "../bladerfinput/bladerfinputgui.h"
+#include "../bladerfinput/bladerfinputthread.h"
 
 MESSAGE_CLASS_DEFINITION(BladerfInput::MsgConfigureBladerf, Message)
 MESSAGE_CLASS_DEFINITION(BladerfInput::MsgReportBladerf, Message)
diff --git a/plugins/samplesource/bladerf/bladerfinput.h b/plugins/samplesource/bladerfinput/bladerfinput.h
similarity index 98%
rename from plugins/samplesource/bladerf/bladerfinput.h
rename to plugins/samplesource/bladerfinput/bladerfinput.h
index a6d65a903..837a432bd 100644
--- a/plugins/samplesource/bladerf/bladerfinput.h
+++ b/plugins/samplesource/bladerfinput/bladerfinput.h
@@ -21,7 +21,8 @@
 
 #include <libbladeRF.h>
 #include <QString>
-#include "bladerfinputsettings.h"
+
+#include "../bladerfinput/bladerfinputsettings.h"
 
 class DeviceSourceAPI;
 class BladerfInputThread;
diff --git a/plugins/samplesource/bladerf/bladerf.pro b/plugins/samplesource/bladerfinput/bladerfinput.pro
similarity index 100%
rename from plugins/samplesource/bladerf/bladerf.pro
rename to plugins/samplesource/bladerfinput/bladerfinput.pro
diff --git a/plugins/samplesource/bladerf/bladerfinputgui.cpp b/plugins/samplesource/bladerfinput/bladerfinputgui.cpp
similarity index 99%
rename from plugins/samplesource/bladerf/bladerfinputgui.cpp
rename to plugins/samplesource/bladerfinput/bladerfinputgui.cpp
index 39a1b011c..4f3afe5ae 100644
--- a/plugins/samplesource/bladerf/bladerfinputgui.cpp
+++ b/plugins/samplesource/bladerfinput/bladerfinputgui.cpp
@@ -14,6 +14,8 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.          //
 ///////////////////////////////////////////////////////////////////////////////////
 
+#include "../bladerfinput/bladerfinputgui.h"
+
 #include <QDebug>
 #include <QMessageBox>
 
@@ -26,7 +28,6 @@
 #include "dsp/dspcommands.h"
 #include <device/devicesourceapi.h>
 #include <dsp/filerecord.h>
-#include "bladerfinputgui.h"
 
 BladerfInputGui::BladerfInputGui(DeviceSourceAPI *deviceAPI, QWidget* parent) :
 	QWidget(parent),
diff --git a/plugins/samplesource/bladerf/bladerfinputgui.h b/plugins/samplesource/bladerfinput/bladerfinputgui.h
similarity index 98%
rename from plugins/samplesource/bladerf/bladerfinputgui.h
rename to plugins/samplesource/bladerfinput/bladerfinputgui.h
index 271639a5e..6d3a14127 100644
--- a/plugins/samplesource/bladerf/bladerfinputgui.h
+++ b/plugins/samplesource/bladerfinput/bladerfinputgui.h
@@ -20,7 +20,7 @@
 #include <QTimer>
 #include "plugin/plugingui.h"
 
-#include "bladerfinput.h"
+#include "../bladerfinput/bladerfinput.h"
 
 class DeviceSourceAPI;
 class FileRecord;
diff --git a/plugins/samplesource/bladerf/bladerfinputgui.ui b/plugins/samplesource/bladerfinput/bladerfinputgui.ui
similarity index 100%
rename from plugins/samplesource/bladerf/bladerfinputgui.ui
rename to plugins/samplesource/bladerfinput/bladerfinputgui.ui
diff --git a/plugins/samplesource/bladerf/bladerfinputplugin.cpp b/plugins/samplesource/bladerfinput/bladerfinputplugin.cpp
similarity index 96%
rename from plugins/samplesource/bladerf/bladerfinputplugin.cpp
rename to plugins/samplesource/bladerfinput/bladerfinputplugin.cpp
index b8a84d281..b45b1aa5e 100644
--- a/plugins/samplesource/bladerf/bladerfinputplugin.cpp
+++ b/plugins/samplesource/bladerfinput/bladerfinputplugin.cpp
@@ -14,14 +14,16 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.          //
 ///////////////////////////////////////////////////////////////////////////////////
 
+#include "../bladerfinput/bladerfinputplugin.h"
+
 #include <QtPlugin>
 #include <QAction>
 #include <libbladeRF.h>
 #include "plugin/pluginapi.h"
 #include "util/simpleserializer.h"
 #include <device/devicesourceapi.h>
-#include "bladerfinputplugin.h"
-#include "bladerfinputgui.h"
+
+#include "../bladerfinput/bladerfinputgui.h"
 
 const PluginDescriptor BlderfInputPlugin::m_pluginDescriptor = {
 	QString("BladerRF Input"),
diff --git a/plugins/samplesource/bladerf/bladerfinputplugin.h b/plugins/samplesource/bladerfinput/bladerfinputplugin.h
similarity index 100%
rename from plugins/samplesource/bladerf/bladerfinputplugin.h
rename to plugins/samplesource/bladerfinput/bladerfinputplugin.h
diff --git a/plugins/samplesource/bladerf/bladerfinputsettings.cpp b/plugins/samplesource/bladerfinput/bladerfinputsettings.cpp
similarity index 99%
rename from plugins/samplesource/bladerf/bladerfinputsettings.cpp
rename to plugins/samplesource/bladerfinput/bladerfinputsettings.cpp
index 4f782b756..72e3a9374 100644
--- a/plugins/samplesource/bladerf/bladerfinputsettings.cpp
+++ b/plugins/samplesource/bladerfinput/bladerfinputsettings.cpp
@@ -14,10 +14,11 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.          //
 ///////////////////////////////////////////////////////////////////////////////////
 
+#include "bladerfinputsettings.h"
+
 #include <QtGlobal>
 #include "util/simpleserializer.h"
 
-#include "bladerfinputsettings.h"
 
 BladeRFInputSettings::BladeRFInputSettings()
 {
diff --git a/plugins/samplesource/bladerf/bladerfinputsettings.h b/plugins/samplesource/bladerfinput/bladerfinputsettings.h
similarity index 98%
rename from plugins/samplesource/bladerf/bladerfinputsettings.h
rename to plugins/samplesource/bladerfinput/bladerfinputsettings.h
index 9b9bdd17a..6d738de90 100644
--- a/plugins/samplesource/bladerf/bladerfinputsettings.h
+++ b/plugins/samplesource/bladerfinput/bladerfinputsettings.h
@@ -17,6 +17,7 @@
 #ifndef _BLADERF_BLADERFINPUTSETTINGS_H_
 #define _BLADERF_BLADERFINPUTSETTINGS_H_
 
+#include <QtGlobal>
 #include <libbladeRF.h>
 
 struct BladeRFInputSettings {
diff --git a/plugins/samplesource/bladerf/bladerfinputthread.cpp b/plugins/samplesource/bladerfinput/bladerfinputthread.cpp
similarity index 98%
rename from plugins/samplesource/bladerf/bladerfinputthread.cpp
rename to plugins/samplesource/bladerfinput/bladerfinputthread.cpp
index aaa8bd8e8..7805d91fa 100644
--- a/plugins/samplesource/bladerf/bladerfinputthread.cpp
+++ b/plugins/samplesource/bladerfinput/bladerfinputthread.cpp
@@ -14,10 +14,11 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.          //
 ///////////////////////////////////////////////////////////////////////////////////
 
+#include "../bladerfinput/bladerfinputthread.h"
+
 #include <stdio.h>
 #include <errno.h>
 #include "dsp/samplesinkfifo.h"
-#include "bladerfinputthread.h"
 
 
 
diff --git a/plugins/samplesource/bladerf/bladerfinputthread.h b/plugins/samplesource/bladerfinput/bladerfinputthread.h
similarity index 100%
rename from plugins/samplesource/bladerf/bladerfinputthread.h
rename to plugins/samplesource/bladerfinput/bladerfinputthread.h