diff --git a/.vscode/launch.json b/.vscode/launch.json
index ee045047..16bfe4bd 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -22,7 +22,7 @@
             "name": "clice_test",
             "program": "${workspaceFolder}/build/bin/clice_test",
             "args": [
-                "--test-dir=/home/ykiko/C++/clice2/tests/Source",
+                "--test-dir=/home/ykiko/C++/clice2/tests",
                 "--gtest_filter=clice.PCM"
             ],
             "cwd": "${workspaceFolder}"
@@ -33,7 +33,7 @@
             "name": "TemplateResolver",
             "program": "${workspaceFolder}/build/bin/clice_test",
             "args": [
-                "--test-dir=/home/ykiko/C++/clice2/tests/Source",
+                "--test-dir=/home/ykiko/C++/clice2/tests",
                 "--gtest_filter=clice.TemplateResolver"
             ],
             "cwd": "${workspaceFolder}"
@@ -44,7 +44,7 @@
             "name": "Index",
             "program": "${workspaceFolder}/build/bin/clice_test",
             "args": [
-                "--test-dir=/home/ykiko/C++/clice2/tests/Source",
+                "--test-dir=/home/ykiko/C++/clice2/tests",
                 "--gtest_filter=clice.Index"
             ],
             "cwd": "${workspaceFolder}"
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0c10933f..99acc29f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -89,6 +89,6 @@ if(CLICE_ENABLE_TEST)
         "${CMAKE_SOURCE_DIR}/src/Feature/*.cpp" 
         "${CMAKE_SOURCE_DIR}/src/Support/*.cpp"
     )
-    file(GLOB TEST_SRC_FILES "${CMAKE_SOURCE_DIR}/tests/*/*.cpp")
-    target_sources(clice_test PRIVATE ${AST_SRC_FILES} ${TEST_SRC_FILES} ${CMAKE_SOURCE_DIR}/tests/main.cpp)
+    file(GLOB TEST_SRC_FILES "${CMAKE_SOURCE_DIR}/unittests/*/*.cpp")
+    target_sources(clice_test PRIVATE ${AST_SRC_FILES} ${TEST_SRC_FILES} ${CMAKE_SOURCE_DIR}/unittests/main.cpp)
 endif()
diff --git a/tests/Source/ASTVisitor/test.cpp b/tests/ASTVisitor/test.cpp
similarity index 100%
rename from tests/Source/ASTVisitor/test.cpp
rename to tests/ASTVisitor/test.cpp
diff --git a/tests/Source/CodeCompletion/test.cpp b/tests/CodeCompletion/test.cpp
similarity index 100%
rename from tests/Source/CodeCompletion/test.cpp
rename to tests/CodeCompletion/test.cpp
diff --git a/tests/Source/CodeCompletion/test1.h b/tests/CodeCompletion/test1.h
similarity index 100%
rename from tests/Source/CodeCompletion/test1.h
rename to tests/CodeCompletion/test1.h
diff --git a/tests/Source/CodeCompletion/test2.h b/tests/CodeCompletion/test2.h
similarity index 100%
rename from tests/Source/CodeCompletion/test2.h
rename to tests/CodeCompletion/test2.h
diff --git a/tests/Source/Diagnostic/test.cpp b/tests/Diagnostic/test.cpp
similarity index 100%
rename from tests/Source/Diagnostic/test.cpp
rename to tests/Diagnostic/test.cpp
diff --git a/tests/Source/Diagnostic/test.h b/tests/Diagnostic/test.h
similarity index 100%
rename from tests/Source/Diagnostic/test.h
rename to tests/Diagnostic/test.h
diff --git a/tests/Source/Index/ClassTemplate.cpp b/tests/Index/ClassTemplate.cpp
similarity index 100%
rename from tests/Source/Index/ClassTemplate.cpp
rename to tests/Index/ClassTemplate.cpp
diff --git a/tests/Source/Index/SugarType.cpp b/tests/Index/SugarType.cpp
similarity index 100%
rename from tests/Source/Index/SugarType.cpp
rename to tests/Index/SugarType.cpp
diff --git a/tests/Source/ModuleScanner/A.cppm b/tests/ModuleScanner/A.cppm
similarity index 100%
rename from tests/Source/ModuleScanner/A.cppm
rename to tests/ModuleScanner/A.cppm
diff --git a/tests/Source/ModuleScanner/B.cppm b/tests/ModuleScanner/B.cppm
similarity index 100%
rename from tests/Source/ModuleScanner/B.cppm
rename to tests/ModuleScanner/B.cppm
diff --git a/tests/Source/ModuleScanner/C.cppm b/tests/ModuleScanner/C.cppm
similarity index 100%
rename from tests/Source/ModuleScanner/C.cppm
rename to tests/ModuleScanner/C.cppm
diff --git a/tests/Source/ModuleScanner/D.cppm b/tests/ModuleScanner/D.cppm
similarity index 100%
rename from tests/Source/ModuleScanner/D.cppm
rename to tests/ModuleScanner/D.cppm
diff --git a/tests/Source/SelectionTree/test.cpp b/tests/SelectionTree/test.cpp
similarity index 100%
rename from tests/Source/SelectionTree/test.cpp
rename to tests/SelectionTree/test.cpp
diff --git a/tests/Source/TemplateResolver/alias-argument.cpp b/tests/TemplateResolver/alias-argument.cpp
similarity index 100%
rename from tests/Source/TemplateResolver/alias-argument.cpp
rename to tests/TemplateResolver/alias-argument.cpp
diff --git a/tests/Source/TemplateResolver/alias-dependent.cpp b/tests/TemplateResolver/alias-dependent.cpp
similarity index 100%
rename from tests/Source/TemplateResolver/alias-dependent.cpp
rename to tests/TemplateResolver/alias-dependent.cpp
diff --git a/tests/Source/TemplateResolver/alias-template.cpp b/tests/TemplateResolver/alias-template.cpp
similarity index 100%
rename from tests/Source/TemplateResolver/alias-template.cpp
rename to tests/TemplateResolver/alias-template.cpp
diff --git a/tests/Source/TemplateResolver/base-dependent.cpp b/tests/TemplateResolver/base-dependent.cpp
similarity index 100%
rename from tests/Source/TemplateResolver/base-dependent.cpp
rename to tests/TemplateResolver/base-dependent.cpp
diff --git a/tests/Source/TemplateResolver/multi-level.cpp b/tests/TemplateResolver/multi-level.cpp
similarity index 100%
rename from tests/Source/TemplateResolver/multi-level.cpp
rename to tests/TemplateResolver/multi-level.cpp
diff --git a/tests/Source/TemplateResolver/multi-nested.cpp b/tests/TemplateResolver/multi-nested.cpp
similarity index 100%
rename from tests/Source/TemplateResolver/multi-nested.cpp
rename to tests/TemplateResolver/multi-nested.cpp
diff --git a/tests/Source/TemplateResolver/nested-template.cpp b/tests/TemplateResolver/nested-template.cpp
similarity index 100%
rename from tests/Source/TemplateResolver/nested-template.cpp
rename to tests/TemplateResolver/nested-template.cpp
diff --git a/tests/Source/TemplateResolver/partial-dependent.cpp b/tests/TemplateResolver/partial-dependent.cpp
similarity index 100%
rename from tests/Source/TemplateResolver/partial-dependent.cpp
rename to tests/TemplateResolver/partial-dependent.cpp
diff --git a/tests/Source/TemplateResolver/single-level.cpp b/tests/TemplateResolver/single-level.cpp
similarity index 100%
rename from tests/Source/TemplateResolver/single-level.cpp
rename to tests/TemplateResolver/single-level.cpp
diff --git a/tests/Source/TemplateResolver/vector.cpp b/tests/TemplateResolver/vector.cpp
similarity index 100%
rename from tests/Source/TemplateResolver/vector.cpp
rename to tests/TemplateResolver/vector.cpp
diff --git a/tests/AST/ASTVisitor.cpp b/unittests/AST/ASTVisitor.cpp
similarity index 100%
rename from tests/AST/ASTVisitor.cpp
rename to unittests/AST/ASTVisitor.cpp
diff --git a/tests/AST/Compiler.cpp b/unittests/AST/Compiler.cpp
similarity index 100%
rename from tests/AST/Compiler.cpp
rename to unittests/AST/Compiler.cpp
diff --git a/tests/AST/Diagnostic.cpp b/unittests/AST/Diagnostic.cpp
similarity index 100%
rename from tests/AST/Diagnostic.cpp
rename to unittests/AST/Diagnostic.cpp
diff --git a/tests/AST/Resolver.cpp b/unittests/AST/Resolver.cpp
similarity index 100%
rename from tests/AST/Resolver.cpp
rename to unittests/AST/Resolver.cpp
diff --git a/tests/AST/Selection.cpp b/unittests/AST/Selection.cpp
similarity index 100%
rename from tests/AST/Selection.cpp
rename to unittests/AST/Selection.cpp
diff --git a/tests/Feature/CodeCompletion.cpp b/unittests/Feature/CodeCompletion.cpp
similarity index 100%
rename from tests/Feature/CodeCompletion.cpp
rename to unittests/Feature/CodeCompletion.cpp
diff --git a/tests/Feature/SemanticTokens.cpp b/unittests/Feature/SemanticTokens.cpp
similarity index 100%
rename from tests/Feature/SemanticTokens.cpp
rename to unittests/Feature/SemanticTokens.cpp
diff --git a/tests/Index/Index.cpp b/unittests/Index/Index.cpp
similarity index 100%
rename from tests/Index/Index.cpp
rename to unittests/Index/Index.cpp
diff --git a/tests/Index/Pack.cpp b/unittests/Index/Pack.cpp
similarity index 100%
rename from tests/Index/Pack.cpp
rename to unittests/Index/Pack.cpp
diff --git a/tests/Support/JSON.cpp b/unittests/Support/JSON.cpp
similarity index 100%
rename from tests/Support/JSON.cpp
rename to unittests/Support/JSON.cpp
diff --git a/tests/Support/TokenBuffer.cpp b/unittests/Support/TokenBuffer.cpp
similarity index 100%
rename from tests/Support/TokenBuffer.cpp
rename to unittests/Support/TokenBuffer.cpp
diff --git a/tests/Support/URI.cpp b/unittests/Support/URI.cpp
similarity index 100%
rename from tests/Support/URI.cpp
rename to unittests/Support/URI.cpp
diff --git a/tests/Test.h b/unittests/Test.h
similarity index 100%
rename from tests/Test.h
rename to unittests/Test.h
diff --git a/tests/main.cpp b/unittests/main.cpp
similarity index 100%
rename from tests/main.cpp
rename to unittests/main.cpp