diff --git a/src/tim/CMakeLists.txt b/src/tim/CMakeLists.txt
index 3dcfda7..6208d9c 100644
--- a/src/tim/CMakeLists.txt
+++ b/src/tim/CMakeLists.txt
@@ -12,11 +12,6 @@ list(APPEND SRC
     ${VX_SRC}
     ${OPS_SRC}
     )
-list(REMOVE_ITEM SRC ./vx/context_test.cc)
-list(REMOVE_ITEM SRC ./vx/graph_test.cc)
-list(REMOVE_ITEM SRC ./vx/ops/reorg_test.cc)
-list(REMOVE_ITEM SRC ./vx/ops/simple_operations_test.cc)
-list(REMOVE_ITEM SRC ./vx/ops/relational_operations_test.cc)
 
 include_directories(${PROJECT_SOURCE_DIR}/include)
 include_directories(${PROJECT_SOURCE_DIR}/include/tim/vx)
diff --git a/src/tim/vx/context_test.cc b/src/tim/vx/ut/context_test.cc
similarity index 100%
rename from src/tim/vx/context_test.cc
rename to src/tim/vx/ut/context_test.cc
diff --git a/src/tim/vx/graph_test.cc b/src/tim/vx/ut/graph_test.cc
similarity index 100%
rename from src/tim/vx/graph_test.cc
rename to src/tim/vx/ut/graph_test.cc
diff --git a/src/tim/vx/ops/relational_operations_test.cc b/src/tim/vx/ut/relational_operations_test.cc
similarity index 100%
rename from src/tim/vx/ops/relational_operations_test.cc
rename to src/tim/vx/ut/relational_operations_test.cc
diff --git a/src/tim/vx/ops/reorg_test.cc b/src/tim/vx/ut/reorg_test.cc
similarity index 100%
rename from src/tim/vx/ops/reorg_test.cc
rename to src/tim/vx/ut/reorg_test.cc
diff --git a/src/tim/vx/ops/simple_operations_test.cc b/src/tim/vx/ut/simple_operations_test.cc
similarity index 100%
rename from src/tim/vx/ops/simple_operations_test.cc
rename to src/tim/vx/ut/simple_operations_test.cc