diff --git a/tests/autoload.php b/tests/autoload.php
deleted file mode 100644
index bd2266b..0000000
--- a/tests/autoload.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-    $BuildDirectory = __DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'build';
-    $AutoloadPath = $BuildDirectory . DIRECTORY_SEPARATOR . 'src' . DIRECTORY_SEPARATOR . 'autoload.php';
-
-    if(!file_exists($BuildDirectory) || !is_dir($BuildDirectory))
-        throw new RuntimeException('Build directory does not exist, to run tests you must build the project.');
-
-    if(!file($AutoloadPath) || !is_file($AutoloadPath))
-        throw new RuntimeException('Autoload file does not exist in \'' . $BuildDirectory .'\', to run tests you must build the project.');
-
-    require($AutoloadPath);
\ No newline at end of file
diff --git a/tests/old_tests/autoload.php b/tests/old_tests/autoload.php
new file mode 100644
index 0000000..6c515ef
--- /dev/null
+++ b/tests/old_tests/autoload.php
@@ -0,0 +1,32 @@
+<?php
+/*
+ * Copyright (c) Nosial 2022-2023, all rights reserved.
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
+ *  associated documentation files (the "Software"), to deal in the Software without restriction, including without
+ *  limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ *  Software, and to permit persons to whom the Software is furnished to do so, subject to the following
+ *  conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in all copies or substantial portions
+ *  of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+ *  INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+ *  PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ *  OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ *  DEALINGS IN THE SOFTWARE.
+ *
+ */
+
+$BuildDirectory = __DIR__ . DIRECTORY_SEPARATOR . 'ncc' . DIRECTORY_SEPARATOR . 'build';
+    $AutoloadPath = $BuildDirectory . DIRECTORY_SEPARATOR . 'src' . DIRECTORY_SEPARATOR . 'autoload.php';
+
+    if(!file_exists($BuildDirectory) || !is_dir($BuildDirectory))
+        throw new RuntimeExcepion('Build directory does not exist, to run tests you must build the project.');
+
+    if(!file($AutoloadPath) || !is_file($AutoloadPath))
+        throw new RuntimeException('Autoload file does not exist in \'' . $BuildDirectory .'\', to run tests you must build the project.');
+
+    require($AutoloadPath);
\ No newline at end of file
diff --git a/tests/composer/parse_json.php b/tests/old_tests/composer/parse_json.php
similarity index 100%
rename from tests/composer/parse_json.php
rename to tests/old_tests/composer/parse_json.php
diff --git a/tests/example_project/scripts/unit.php b/tests/old_tests/example_project/scripts/unit.php
similarity index 100%
rename from tests/example_project/scripts/unit.php
rename to tests/old_tests/example_project/scripts/unit.php
diff --git a/tests/package_lock/load_package_lock.php b/tests/old_tests/package_lock/load_package_lock.php
similarity index 100%
rename from tests/package_lock/load_package_lock.php
rename to tests/old_tests/package_lock/load_package_lock.php
diff --git a/tests/project_configuration/load_configuration.php b/tests/old_tests/project_configuration/load_configuration.php
similarity index 100%
rename from tests/project_configuration/load_configuration.php
rename to tests/old_tests/project_configuration/load_configuration.php
diff --git a/tests/third_party/php-encryption/create_random_key.php b/tests/old_tests/third_party/php-encryption/create_random_key.php
similarity index 100%
rename from tests/third_party/php-encryption/create_random_key.php
rename to tests/old_tests/third_party/php-encryption/create_random_key.php
diff --git a/tests/third_party/php-encryption/encryption_decryption.php b/tests/old_tests/third_party/php-encryption/encryption_decryption.php
similarity index 100%
rename from tests/third_party/php-encryption/encryption_decryption.php
rename to tests/old_tests/third_party/php-encryption/encryption_decryption.php
diff --git a/tests/third_party/theseer/directory_scanner.php b/tests/old_tests/third_party/theseer/directory_scanner.php
similarity index 87%
rename from tests/third_party/theseer/directory_scanner.php
rename to tests/old_tests/third_party/theseer/directory_scanner.php
index ff28e24..b13bb74 100644
--- a/tests/third_party/theseer/directory_scanner.php
+++ b/tests/old_tests/third_party/theseer/directory_scanner.php
@@ -3,7 +3,7 @@
     require(__DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'autoload.php');
 
     $Scanner = new \ncc\ThirdParty\theseer\DirectoryScanner\DirectoryScanner();
-    $Basedir = realpath(__DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..');
+    $Basedir = realpath(__DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'third_party');
 
     /** @var SplFileInfo $item */
     foreach($Scanner($Basedir . DIRECTORY_SEPARATOR . 'src', true) as $item)
diff --git a/tests/utils/pathfinder.php b/tests/old_tests/utils/pathfinder.php
similarity index 100%
rename from tests/utils/pathfinder.php
rename to tests/old_tests/utils/pathfinder.php
diff --git a/tests/utils/runtime_extensions.php b/tests/old_tests/utils/runtime_extensions.php
similarity index 100%
rename from tests/utils/runtime_extensions.php
rename to tests/old_tests/utils/runtime_extensions.php
diff --git a/tests/utils/scope_resolver.php b/tests/old_tests/utils/scope_resolver.php
similarity index 100%
rename from tests/utils/scope_resolver.php
rename to tests/old_tests/utils/scope_resolver.php