26 files changed, 30 insertions, 30 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b968102..f1e13c2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,8 +38,8 @@ pkg_check_modules(LIBDRM libdrm REQUIRED)
 enable_testing()
 
 add_subdirectory(libkms++)
-add_subdirectory(libkmstest)
-add_subdirectory(tests)
+add_subdirectory(libkms++util)
+add_subdirectory(utils)
 
 if(LIBKMS_ENABLE_KMSCUBE)
 	add_subdirectory(kmscube)
diff --git a/kmscube/CMakeLists.txt b/kmscube/CMakeLists.txt
index 15b4dbf..b6bac29 100644
--- a/kmscube/CMakeLists.txt
+++ b/kmscube/CMakeLists.txt
@@ -32,7 +32,7 @@ link_directories(
 add_executable (kmscube cube.cpp cube.h cube-egl.cpp cube-egl.h cube-gles2.cpp cube-gles2.h
     cube-null.cpp cube-gbm.cpp cube-x11.cpp cube-wl.cpp
     esTransform.c esTransform.h)
-target_link_libraries(kmscube kms++ kmstest
+target_link_libraries(kmscube kms++ kms++util
     ${LIBDRM_LIBRARIES}
     ${GLESv2_LIBRARIES}
     ${EGL_LIBRARIES}
diff --git a/libkms++util/CMakeLists.txt b/libkms++util/CMakeLists.txt
new file mode 100644
index 0000000..d08ec84
--- /dev/null
+++ b/libkms++util/CMakeLists.txt
@@ -0,0 +1,5 @@
+file(GLOB SRCS "*.cpp" "*.h")
+add_library(kms++util ${SRCS})
+
+target_link_libraries(kms++util kms++)
+target_include_directories(kms++util PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/libkmstest/color.cpp b/libkms++util/color.cpp
index 490ff64..490ff64 100644
--- a/libkmstest/color.cpp
+++ b/libkms++util/color.cpp
diff --git a/libkmstest/color.h b/libkms++util/color.h
index ef85a67..ef85a67 100644
--- a/libkmstest/color.h
+++ b/libkms++util/color.h
diff --git a/libkmstest/colorbar.cpp b/libkms++util/colorbar.cpp
index 9fbec28..9fbec28 100644
--- a/libkmstest/colorbar.cpp
+++ b/libkms++util/colorbar.cpp
diff --git a/libkmstest/cpuframebuffer.cpp b/libkms++util/cpuframebuffer.cpp
index 1f14ddc..1f14ddc 100644
--- a/libkmstest/cpuframebuffer.cpp
+++ b/libkms++util/cpuframebuffer.cpp
diff --git a/libkmstest/cpuframebuffer.h b/libkms++util/cpuframebuffer.h
index d2073bc..d2073bc 100644
--- a/libkmstest/cpuframebuffer.h
+++ b/libkms++util/cpuframebuffer.h
diff --git a/libkmstest/extcpuframebuffer.cpp b/libkms++util/extcpuframebuffer.cpp
index 145168f..145168f 100644
--- a/libkmstest/extcpuframebuffer.cpp
+++ b/libkms++util/extcpuframebuffer.cpp
diff --git a/libkmstest/extcpuframebuffer.h b/libkms++util/extcpuframebuffer.h
index 172841f..172841f 100644
--- a/libkmstest/extcpuframebuffer.h
+++ b/libkms++util/extcpuframebuffer.h
diff --git a/libkmstest/kmstest.h b/libkms++util/kmstest.h
index aed40fe..aed40fe 100644
--- a/libkmstest/kmstest.h
+++ b/libkms++util/kmstest.h
diff --git a/libkmstest/opts.cpp b/libkms++util/opts.cpp
index 4ea31f8..4ea31f8 100644
--- a/libkmstest/opts.cpp
+++ b/libkms++util/opts.cpp
diff --git a/libkmstest/opts.h b/libkms++util/opts.h
index 1b0fd22..1b0fd22 100644
--- a/libkmstest/opts.h
+++ b/libkms++util/opts.h
diff --git a/libkmstest/test.h b/libkms++util/test.h
index 3631f2c..3631f2c 100644
--- a/libkmstest/test.h
+++ b/libkms++util/test.h
diff --git a/libkmstest/testpat.cpp b/libkms++util/testpat.cpp
index 68f4385..68f4385 100644
--- a/libkmstest/testpat.cpp
+++ b/libkms++util/testpat.cpp
diff --git a/libkmstest/CMakeLists.txt b/libkmstest/CMakeLists.txt
deleted file mode 100644
index e7980ee..0000000
--- a/libkmstest/CMakeLists.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-file(GLOB SRCS "*.cpp" "*.h")
-add_library(kmstest ${SRCS})
-
-target_link_libraries(kmstest kms++)
-target_include_directories(kmstest PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/py/CMakeLists.txt b/py/CMakeLists.txt
index f48ec2c..562a3cf 100644
--- a/py/CMakeLists.txt
+++ b/py/CMakeLists.txt
@@ -10,8 +10,8 @@ endif()
 
 include_directories(${PROJECT_SOURCE_DIR}/ext/pybind11/include)
 
-add_library(pykms SHARED pykms.cpp pykmsbase.cpp pykmstest.cpp)
-target_link_libraries(pykms kms++ kmstest ${LIBDRM_LIBRARIES})
+add_library(pykms SHARED pykms.cpp pykmsbase.cpp pykmsutil.cpp)
+target_link_libraries(pykms kms++ kms++util ${LIBDRM_LIBRARIES})
 
 # Don't add a 'lib' prefix to the shared library
 set_target_properties(pykms PROPERTIES PREFIX "")
diff --git a/py/pykmstest.cpp b/py/pykmsutil.cpp
index 407330d..407330d 100644
--- a/py/pykmstest.cpp
+++ b/py/pykmsutil.cpp
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
deleted file mode 100644
index bb335d3..0000000
--- a/tests/CMakeLists.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-include_directories(${LIBDRM_INCLUDE_DIRS})
-link_directories(${LIBDRM_LIBRARY_DIRS})
-
-add_executable (db db.cpp)
-target_link_libraries(db kms++ kmstest ${LIBDRM_LIBRARIES})
-
-add_executable (testpat testpat.cpp)
-target_link_libraries(testpat kms++ kmstest ${LIBDRM_LIBRARIES})
-
-add_executable (kmsview kmsview.cpp)
-target_link_libraries(kmsview kms++ kmstest ${LIBDRM_LIBRARIES})
-
-add_executable (kmsprint kmsprint.cpp)
-target_link_libraries(kmsprint kms++ kmstest ${LIBDRM_LIBRARIES})
-
-add_executable (fbtestpat fbtestpat.cpp)
-target_link_libraries(fbtestpat kmstest)
-
-add_executable (kmscapture kmscapture.cpp)
-target_link_libraries(kmscapture kms++ kmstest ${LIBDRM_LIBRARIES})
diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt
new file mode 100644
index 0000000..3a7115e
--- /dev/null
+++ b/utils/CMakeLists.txt
@@ -0,0 +1,20 @@
+include_directories(${LIBDRM_INCLUDE_DIRS})
+link_directories(${LIBDRM_LIBRARY_DIRS})
+
+add_executable (db db.cpp)
+target_link_libraries(db kms++ kms++util ${LIBDRM_LIBRARIES})
+
+add_executable (testpat testpat.cpp)
+target_link_libraries(testpat kms++ kms++util ${LIBDRM_LIBRARIES})
+
+add_executable (kmsview kmsview.cpp)
+target_link_libraries(kmsview kms++ kms++util ${LIBDRM_LIBRARIES})
+
+add_executable (kmsprint kmsprint.cpp)
+target_link_libraries(kmsprint kms++ kms++util ${LIBDRM_LIBRARIES})
+
+add_executable (fbtestpat fbtestpat.cpp)
+target_link_libraries(fbtestpat kms++util)
+
+add_executable (kmscapture kmscapture.cpp)
+target_link_libraries(kmscapture kms++ kms++util ${LIBDRM_LIBRARIES})
diff --git a/tests/db.cpp b/utils/db.cpp
index 3e8420b..3e8420b 100644
--- a/tests/db.cpp
+++ b/utils/db.cpp
diff --git a/tests/fbtestpat.cpp b/utils/fbtestpat.cpp
index d82f3e4..d82f3e4 100644
--- a/tests/fbtestpat.cpp
+++ b/utils/fbtestpat.cpp
diff --git a/tests/kmscapture.cpp b/utils/kmscapture.cpp
index ee700b7..ee700b7 100644
--- a/tests/kmscapture.cpp
+++ b/utils/kmscapture.cpp
diff --git a/tests/kmsprint.cpp b/utils/kmsprint.cpp
index 7b9de8c..7b9de8c 100644
--- a/tests/kmsprint.cpp
+++ b/utils/kmsprint.cpp
diff --git a/tests/kmsview.cpp b/utils/kmsview.cpp
index aae7e80..aae7e80 100644
--- a/tests/kmsview.cpp
+++ b/utils/kmsview.cpp
diff --git a/tests/testpat.cpp b/utils/testpat.cpp
index ede176c..ede176c 100644
--- a/tests/testpat.cpp
+++ b/utils/testpat.cpp