diff --git a/tests-unit/server_test/routes_test/internal_routes_test.py b/tests-unit/server/routes/internal_routes_test.py
similarity index 100%
rename from tests-unit/server_test/routes_test/internal_routes_test.py
rename to tests-unit/server/routes/internal_routes_test.py
diff --git a/tests-unit/server_test/services_test/file_service_test.py b/tests-unit/server/services/file_service_test.py
similarity index 96%
rename from tests-unit/server_test/services_test/file_service_test.py
rename to tests-unit/server/services/file_service_test.py
index 134c668ddfa..5650452a32f 100644
--- a/tests-unit/server_test/services_test/file_service_test.py
+++ b/tests-unit/server/services/file_service_test.py
@@ -29,6 +29,7 @@ def test_list_files_valid_directory(file_service, mock_file_system_ops):
     mock_file_system_ops.walk_directory.assert_called_once_with("/path/to/models")
 
 def test_list_files_invalid_directory(file_service):
+    # Does not support walking directories outside of the allowed directories
     with pytest.raises(ValueError, match="Invalid directory key"):
         file_service.list_files("invalid_key")
 
diff --git a/tests-unit/server_test/utils_test/file_operations_test.py b/tests-unit/server/utils/file_operations_test.py
similarity index 100%
rename from tests-unit/server_test/utils_test/file_operations_test.py
rename to tests-unit/server/utils/file_operations_test.py