diff --git a/unit_tests/algorithms/douglas_peucker.cpp b/unit_tests/engine/douglas_peucker.cpp
similarity index 100%
rename from unit_tests/algorithms/douglas_peucker.cpp
rename to unit_tests/engine/douglas_peucker.cpp
diff --git a/unit_tests/algorithms/geometry_string.cpp b/unit_tests/engine/geometry_string.cpp
similarity index 100%
rename from unit_tests/algorithms/geometry_string.cpp
rename to unit_tests/engine/geometry_string.cpp
diff --git a/unit_tests/algorithm_tests.cpp b/unit_tests/engine_tests.cpp
similarity index 97%
rename from unit_tests/algorithm_tests.cpp
rename to unit_tests/engine_tests.cpp
index 0a9f3fdff..1a2f88ed0 100644
--- a/unit_tests/algorithm_tests.cpp
+++ b/unit_tests/engine_tests.cpp
@@ -25,7 +25,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#define BOOST_TEST_MODULE algorithm tests
+#define BOOST_TEST_MODULE engine tests
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/unit_tests/data_structures/compressed_edge_container.cpp b/unit_tests/extractor/compressed_edge_container.cpp
similarity index 100%
rename from unit_tests/data_structures/compressed_edge_container.cpp
rename to unit_tests/extractor/compressed_edge_container.cpp
diff --git a/unit_tests/algorithms/graph_compressor.cpp b/unit_tests/extractor/graph_compressor.cpp
similarity index 100%
rename from unit_tests/algorithms/graph_compressor.cpp
rename to unit_tests/extractor/graph_compressor.cpp
diff --git a/unit_tests/data_structures/raster_source.cpp b/unit_tests/extractor/raster_source.cpp
similarity index 100%
rename from unit_tests/data_structures/raster_source.cpp
rename to unit_tests/extractor/raster_source.cpp
diff --git a/unit_tests/datastructure_tests.cpp b/unit_tests/extractor_tests.cpp
similarity index 96%
rename from unit_tests/datastructure_tests.cpp
rename to unit_tests/extractor_tests.cpp
index 850d61910..25bc11dff 100644
--- a/unit_tests/datastructure_tests.cpp
+++ b/unit_tests/extractor_tests.cpp
@@ -25,7 +25,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#define BOOST_TEST_MODULE datastructure tests
+#define BOOST_TEST_MODULE extractor tests
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/unit_tests/data_structures/binary_heap.cpp b/unit_tests/util/binary_heap.cpp
similarity index 100%
rename from unit_tests/data_structures/binary_heap.cpp
rename to unit_tests/util/binary_heap.cpp
diff --git a/unit_tests/data_structures/coordinate.cpp b/unit_tests/util/coordinate.cpp
similarity index 100%
rename from unit_tests/data_structures/coordinate.cpp
rename to unit_tests/util/coordinate.cpp
diff --git a/unit_tests/algorithms/duration_parsing.cpp b/unit_tests/util/duration_parsing.cpp
similarity index 100%
rename from unit_tests/algorithms/duration_parsing.cpp
rename to unit_tests/util/duration_parsing.cpp
diff --git a/unit_tests/data_structures/dynamic_graph.cpp b/unit_tests/util/dynamic_graph.cpp
similarity index 100%
rename from unit_tests/data_structures/dynamic_graph.cpp
rename to unit_tests/util/dynamic_graph.cpp
diff --git a/unit_tests/data_structures/range_table.cpp b/unit_tests/util/range_table.cpp
similarity index 100%
rename from unit_tests/data_structures/range_table.cpp
rename to unit_tests/util/range_table.cpp
diff --git a/unit_tests/data_structures/static_graph.cpp b/unit_tests/util/static_graph.cpp
similarity index 100%
rename from unit_tests/data_structures/static_graph.cpp
rename to unit_tests/util/static_graph.cpp
diff --git a/unit_tests/data_structures/static_rtree.cpp b/unit_tests/util/static_rtree.cpp
similarity index 100%
rename from unit_tests/data_structures/static_rtree.cpp
rename to unit_tests/util/static_rtree.cpp
diff --git a/unit_tests/algorithms/string_util.cpp b/unit_tests/util/string_util.cpp
similarity index 100%
rename from unit_tests/algorithms/string_util.cpp
rename to unit_tests/util/string_util.cpp