diff --git a/tests/UnitFormatter.cpp b/tests/Base/UnitFormatter.cpp
similarity index 100%
rename from tests/UnitFormatter.cpp
rename to tests/Base/UnitFormatter.cpp
diff --git a/tests/Utils.cpp b/tests/Base/Utils.cpp
similarity index 100%
rename from tests/Utils.cpp
rename to tests/Base/Utils.cpp
diff --git a/tests/VersionTests.cpp b/tests/Base/Version.cpp
similarity index 100%
rename from tests/VersionTests.cpp
rename to tests/Base/Version.cpp
diff --git a/tests/Array.cpp b/tests/Data/Containers/Array.cpp
similarity index 100%
rename from tests/Array.cpp
rename to tests/Data/Containers/Array.cpp
diff --git a/tests/BinSearchArrayMapTest.cpp b/tests/Data/Containers/BinSearchArrayMap.cpp
similarity index 100%
rename from tests/BinSearchArrayMapTest.cpp
rename to tests/Data/Containers/BinSearchArrayMap.cpp
diff --git a/tests/StableVectorTest.cpp b/tests/Data/Containers/StableVector.cpp
similarity index 100%
rename from tests/StableVectorTest.cpp
rename to tests/Data/Containers/StableVector.cpp
diff --git a/tests/StringTest.cpp b/tests/Data/Containers/String.cpp
similarity index 100%
rename from tests/StringTest.cpp
rename to tests/Data/Containers/String.cpp
diff --git a/tests/MemFileTests.cpp b/tests/IO/MemMappedFile.cpp
similarity index 100%
rename from tests/MemFileTests.cpp
rename to tests/IO/MemMappedFile.cpp
diff --git a/tests/RGB565.cpp b/tests/Math/RGB565.cpp
similarity index 100%
rename from tests/RGB565.cpp
rename to tests/Math/RGB565.cpp
diff --git a/tests/RGBA5551.cpp b/tests/Math/RGBA5551.cpp
similarity index 100%
rename from tests/RGBA5551.cpp
rename to tests/Math/RGBA5551.cpp
diff --git a/tests/RayTests.cpp b/tests/Scene/Ray.cpp
similarity index 100%
rename from tests/RayTests.cpp
rename to tests/Scene/Ray.cpp