6 files changed, 15 insertions, 7 deletions
diff --git a/apps/sample-convert.cpp b/apps/sample-convert.cpp
index 6ce83e8..0c3aa9a 100644
--- a/apps/sample-convert.cpp
+++ b/apps/sample-convert.cpp
@@ -1,4 +1,5 @@
-#include "trygvis/SensorSample.h"
+#include "trygvis/sensor.h"
+#include "trygvis/sensor/io.h"
 #include "json.hpp"
 #include "apps.h"
 #include <fstream>
@@ -10,6 +11,7 @@ namespace apps {
 using namespace std;
 using namespace trygvis::apps;
 using namespace trygvis::sensor;
+using namespace trygvis::sensor::io;
 using boost::tokenizer;
 namespace po = boost::program_options;
 
@@ -66,7 +68,7 @@ public:
         }
 
         std::vector<sample_output_stream_option *> options;
-        trygvis::sensor::timestamp_field tf(timestamp_field);
+        trygvis::sensor::io::timestamp_field tf(timestamp_field);
 
         if (!timestamp_field.empty()) {
             options.push_back(&tf);
diff --git a/apps/sample-select.cpp b/apps/sample-select.cpp
index fc50f41..d1e6d0e 100644
--- a/apps/sample-select.cpp
+++ b/apps/sample-select.cpp
@@ -1,4 +1,4 @@
-#include "trygvis/SensorSample.h"
+#include "trygvis/sensor.h"
 #include "apps.h"
 #include <boost/tokenizer.hpp>
 
diff --git a/apps/sample-timestamp.cpp b/apps/sample-timestamp.cpp
index c95f7a3..2fde1b6 100644
--- a/apps/sample-timestamp.cpp
+++ b/apps/sample-timestamp.cpp
@@ -1,4 +1,5 @@
-#include "trygvis/SensorSample.h"
+#include "trygvis/sensor.h"
+#include "trygvis/sensor/io.h"
 #include "apps.h"
 #include <fstream>
 #include <sys/stat.h>
@@ -9,6 +10,7 @@ namespace apps {
 using namespace std;
 using namespace trygvis::apps;
 using namespace trygvis::sensor;
+using namespace trygvis::sensor::io;
 namespace po = boost::program_options;
 
 enum class time_resolution {
diff --git a/apps/sm-get-value.cpp b/apps/sm-get-value.cpp
index 25f1c3e..115c6ae 100644
--- a/apps/sm-get-value.cpp
+++ b/apps/sm-get-value.cpp
@@ -5,7 +5,7 @@
 #include <thread>
 #include "ble/Bluetooth.h"
 #include "SoilMoisture.h"
-#include "trygvis/SensorSample.h"
+#include "trygvis/sensor.h"
 #include "json.hpp"
 #include "apps.h"
 
diff --git a/apps/sm-serial-read-all.cpp b/apps/sm-serial-read-all.cpp
index eb1f112..0c5e54a 100644
--- a/apps/sm-serial-read-all.cpp
+++ b/apps/sm-serial-read-all.cpp
@@ -1,4 +1,5 @@
-#include "trygvis/SensorSample.h"
+#include "trygvis/sensor.h"
+#include "trygvis/sensor/io.h"
 #include "json.hpp"
 #include "apps.h"
 #include <thread>
@@ -12,6 +13,7 @@ using namespace std;
 using namespace std::chrono;
 using namespace trygvis::apps;
 using namespace trygvis::sensor;
+using namespace trygvis::sensor::io;
 namespace po = boost::program_options;
 using json = nlohmann::json;
 
diff --git a/apps/sm-serial-read.cpp b/apps/sm-serial-read.cpp
index 68cdea7..8a6fd36 100644
--- a/apps/sm-serial-read.cpp
+++ b/apps/sm-serial-read.cpp
@@ -1,4 +1,5 @@
-#include "trygvis/SensorSample.h"
+#include "trygvis/sensor.h"
+#include "trygvis/sensor/io.h"
 #include "json.hpp"
 #include "apps.h"
 #include <chrono>
@@ -13,6 +14,7 @@ using namespace std;
 using namespace std::chrono;
 using namespace trygvis::apps;
 using namespace trygvis::sensor;
+using namespace trygvis::sensor::io;
 namespace po = boost::program_options;
 using json = nlohmann::json;