diff --git a/samples/tutorials/CMakeLists.txt b/samples/tutorials/CMakeLists.txt
index 506a94b..dc94d6e 100644
--- a/samples/tutorials/CMakeLists.txt
+++ b/samples/tutorials/CMakeLists.txt
@@ -98,13 +98,13 @@ make_executable2(get_disparity SRCS data/get_disparity.cc WITH_OPENCV)
 make_executable2(get_depth SRCS data/get_depth.cc WITH_OPENCV)
 if(PCL_FOUND)
   make_executable2(get_points
-    SRCS data/get_points.cc data/pc_viewer.cc
+    SRCS data/get_points.cc util/pc_viewer.cc
     WITH_OPENCV WITH_PCL
   )
 endif()
-make_executable2(get_imu SRCS data/get_imu.cc data/cv_painter.cc WITH_OPENCV)
+make_executable2(get_imu SRCS data/get_imu.cc util/cv_painter.cc WITH_OPENCV)
 make_executable2(get_from_callbacks
-  SRCS data/get_from_callbacks.cc data/cv_painter.cc
+  SRCS data/get_from_callbacks.cc util/cv_painter.cc
   WITH_OPENCV
 )
 make_executable2(get_with_plugin SRCS data/get_with_plugin.cc WITH_OPENCV)
diff --git a/samples/tutorials/data/get_from_callbacks.cc b/samples/tutorials/data/get_from_callbacks.cc
index 2842182..f73b358 100644
--- a/samples/tutorials/data/get_from_callbacks.cc
+++ b/samples/tutorials/data/get_from_callbacks.cc
@@ -22,7 +22,7 @@
 
 #include "mynteye/api.h"
 
-#include "data/cv_painter.h"
+#include "util/cv_painter.h"
 
 MYNTEYE_USE_NAMESPACE
 
diff --git a/samples/tutorials/data/get_imu.cc b/samples/tutorials/data/get_imu.cc
index 8e86eae..b52cb5f 100644
--- a/samples/tutorials/data/get_imu.cc
+++ b/samples/tutorials/data/get_imu.cc
@@ -17,7 +17,7 @@
 
 #include "mynteye/api.h"
 
-#include "data/cv_painter.h"
+#include "util/cv_painter.h"
 
 MYNTEYE_USE_NAMESPACE
 
diff --git a/samples/tutorials/data/get_points.cc b/samples/tutorials/data/get_points.cc
index 7649d7f..246c10b 100644
--- a/samples/tutorials/data/get_points.cc
+++ b/samples/tutorials/data/get_points.cc
@@ -17,7 +17,7 @@
 
 #include "mynteye/api.h"
 
-#include "data/pc_viewer.h"
+#include "util/pc_viewer.h"
 
 MYNTEYE_USE_NAMESPACE
 
diff --git a/samples/tutorials/data/cv_painter.cc b/samples/tutorials/util/cv_painter.cc
similarity index 99%
rename from samples/tutorials/data/cv_painter.cc
rename to samples/tutorials/util/cv_painter.cc
index 55e5d99..1700b72 100644
--- a/samples/tutorials/data/cv_painter.cc
+++ b/samples/tutorials/util/cv_painter.cc
@@ -11,7 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#include "data/cv_painter.h"
+#include "util/cv_painter.h"
 
 #include <glog/logging.h>
 
diff --git a/samples/tutorials/data/cv_painter.h b/samples/tutorials/util/cv_painter.h
similarity index 100%
rename from samples/tutorials/data/cv_painter.h
rename to samples/tutorials/util/cv_painter.h
diff --git a/samples/tutorials/data/pc_viewer.cc b/samples/tutorials/util/pc_viewer.cc
similarity index 99%
rename from samples/tutorials/data/pc_viewer.cc
rename to samples/tutorials/util/pc_viewer.cc
index 39bb9b2..9226a28 100644
--- a/samples/tutorials/data/pc_viewer.cc
+++ b/samples/tutorials/util/pc_viewer.cc
@@ -11,7 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#include "data/pc_viewer.h"
+#include "util/pc_viewer.h"
 
 #include <glog/logging.h>
 
diff --git a/samples/tutorials/data/pc_viewer.h b/samples/tutorials/util/pc_viewer.h
similarity index 100%
rename from samples/tutorials/data/pc_viewer.h
rename to samples/tutorials/util/pc_viewer.h