3 files changed, 14 insertions, 14 deletions
diff --git a/host/lib/CMakeLists.txt b/host/lib/CMakeLists.txt
index b205bad5b..a5345cae4 100644
--- a/host/lib/CMakeLists.txt
+++ b/host/lib/CMakeLists.txt
@@ -22,8 +22,6 @@ SET(libuhd_sources
     device.cpp
     gain_handler.cpp
     load_modules.cpp
-    simple_device.cpp
-    tune_helper.cpp
     types.cpp
     wax.cpp
     transport/if_addrs.cpp
@@ -32,7 +30,9 @@ SET(libuhd_sources
     usrp/dboard/db_basic_and_lf.cpp
     usrp/dboard_base.cpp
     usrp/dboard_interface.cpp
+    usrp/simple_usrp.cpp
     usrp/dboard_manager.cpp
+    usrp/tune_helper.cpp
     usrp/usrp2/dboard_impl.cpp
     usrp/usrp2/dboard_interface.cpp
     usrp/usrp2/dsp_impl.cpp
diff --git a/host/lib/simple_device.cpp b/host/lib/usrp/simple_usrp.cpp
index 801516353..4bd47dc3f 100644
--- a/host/lib/simple_device.cpp
+++ b/host/lib/usrp/simple_usrp.cpp
@@ -15,8 +15,8 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-#include <uhd/simple_device.hpp>
-#include <uhd/utils/tune_helper.hpp>
+#include <uhd/usrp/simple_usrp.hpp>
+#include <uhd/usrp/tune_helper.hpp>
 #include <uhd/utils/assert.hpp>
 #include <uhd/usrp/subdev_props.hpp>
 #include <uhd/usrp/mboard_props.hpp>
@@ -43,9 +43,9 @@ static std::vector<double> get_xx_rates(wax::obj decerps, wax::obj rate){
 /***********************************************************************
  * Simple Device Implementation
  **********************************************************************/
-class simple_device_impl : public simple_device{
+class simple_usrp_impl : public simple_usrp{
 public:
-    simple_device_impl(const device_addr_t &addr){
+    simple_usrp_impl(const device_addr_t &addr){
         _dev = device::make(addr);
         _mboard = (*_dev)[DEVICE_PROP_MBOARD];
         _rx_ddc = _mboard[named_prop_t(MBOARD_PROP_RX_DSP, "ddc0")];
@@ -62,7 +62,7 @@ public:
         _tx_subdev = tx_dboard[named_prop_t(DBOARD_PROP_SUBDEV, tx_subdev_in_use)];
     }
 
-    ~simple_device_impl(void){
+    ~simple_usrp_impl(void){
         /* NOP */
     }
 
@@ -202,6 +202,6 @@ private:
 /***********************************************************************
  * The Make Function
  **********************************************************************/
-simple_device::sptr simple_device::make(const std::string &args){
-    return sptr(new simple_device_impl(device_addr_t::from_args_str(args)));
+simple_usrp::sptr simple_usrp::make(const std::string &args){
+    return sptr(new simple_usrp_impl(device_addr_t::from_args_str(args)));
 }
diff --git a/host/lib/tune_helper.cpp b/host/lib/usrp/tune_helper.cpp
index 381685578..79a6aff7b 100644
--- a/host/lib/tune_helper.cpp
+++ b/host/lib/usrp/tune_helper.cpp
@@ -15,7 +15,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-#include <uhd/utils/tune_helper.hpp>
+#include <uhd/usrp/tune_helper.hpp>
 #include <uhd/utils/algorithm.hpp>
 #include <uhd/usrp/subdev_props.hpp>
 #include <cmath>
@@ -82,7 +82,7 @@ static tune_result_t tune_xx_subdev_and_dxc(
 /***********************************************************************
  * RX Tune
  **********************************************************************/
-tune_result_t uhd::tune_rx_subdev_and_ddc(
+tune_result_t uhd::usrp::tune_rx_subdev_and_ddc(
     wax::obj subdev, wax::obj ddc,
     double target_freq, double lo_offset
 ){
@@ -90,7 +90,7 @@ tune_result_t uhd::tune_rx_subdev_and_ddc(
     return tune_xx_subdev_and_dxc(is_tx, subdev, ddc, target_freq, lo_offset);
 }
 
-tune_result_t uhd::tune_rx_subdev_and_ddc(
+tune_result_t uhd::usrp::tune_rx_subdev_and_ddc(
     wax::obj subdev, wax::obj ddc,
     double target_freq
 ){
@@ -105,7 +105,7 @@ tune_result_t uhd::tune_rx_subdev_and_ddc(
 /***********************************************************************
  * TX Tune
  **********************************************************************/
-tune_result_t uhd::tune_tx_subdev_and_duc(
+tune_result_t uhd::usrp::tune_tx_subdev_and_duc(
     wax::obj subdev, wax::obj duc,
     double target_freq, double lo_offset
 ){
@@ -113,7 +113,7 @@ tune_result_t uhd::tune_tx_subdev_and_duc(
     return tune_xx_subdev_and_dxc(is_tx, subdev, duc, target_freq, lo_offset);
 }
 
-tune_result_t uhd::tune_tx_subdev_and_duc(
+tune_result_t uhd::usrp::tune_tx_subdev_and_duc(
     wax::obj subdev, wax::obj duc,
     double target_freq
 ){