diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index d9b4d0e..11c9475 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -63,11 +63,8 @@ jobs:
 
          - name: Push changes to main
            run: |
-              git fetch origin main dev
-              git checkout main
-              git config pull.rebase false
-              git pull origin main
-              git merge origin/dev --allow-unrelated-histories --no-ff
-              git push origin main
+              git checkout -b main
+              git reset --hard dev
+              git push -u -f origin main
            env:
               GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/Router/MapRoute.php b/Router/MapRoute.php
index 3ac6a2b..83e420f 100644
--- a/Router/MapRoute.php
+++ b/Router/MapRoute.php
@@ -2,8 +2,8 @@
 
 namespace PhpSlides\Router;
 
-use PhpSlides\Src\Controller\Controller;
-use PhpSlides\Src\Foundation\Application;
+use PhpSlides\Core\Controller\Controller;
+use PhpSlides\Core\Foundation\Application;
 use PhpSlides\Router\Interface\MapInterface;
 
 /**
@@ -18,8 +18,8 @@
  */
 class MapRoute extends Controller implements MapInterface
 {
-	use \PhpSlides\Src\Utils\Validate;
-	use \PhpSlides\Src\Utils\Routes\StrictTypes;
+	use \PhpSlides\Core\Utils\Validate;
+	use \PhpSlides\Core\Utils\Routes\StrictTypes;
 
 	/**
 	 * @var string|array $route The route(s) to be mapped.
diff --git a/Router/Route.php b/Router/Route.php
index f6805c0..a75cd7c 100644
--- a/Router/Route.php
+++ b/Router/Route.php
@@ -17,8 +17,8 @@
 
 use Closure;
 use PhpSlides\Exception;
-use PhpSlides\Src\Traits\FileHandler;
-use PhpSlides\Src\Controller\Controller;
+use PhpSlides\Core\Traits\FileHandler;
+use PhpSlides\Core\Controller\Controller;
 use PhpSlides\Router\Interface\RouteInterface;
 
 /**
diff --git a/Router/view.php b/Router/view.php
index 0be1e52..ba30334 100644
--- a/Router/view.php
+++ b/Router/view.php
@@ -3,7 +3,7 @@
 namespace PhpSlides\Router;
 
 use component;
-use PhpSlides\Src\Foundation\Application;
+use PhpSlides\Core\Foundation\Application;
 
 /**
  * --------------------------------------------------------------
diff --git a/composer.json b/composer.json
index f83ee4a..b2b8d1d 100644
--- a/composer.json
+++ b/composer.json
@@ -32,7 +32,7 @@
 	"autoload": {
 		"psr-4": {
 			"PhpSlides\\": "src/Exception/",
-			"PhpSlides\\Src\\": "src/",
+			"PhpSlides\\Core\\": "src/",
 			"PhpSlides\\Router\\": "Router/"
 		},
 		"files": ["src/Bootstrap/App.php"]
diff --git a/src/Bootstrap/App.php b/src/Bootstrap/App.php
index d43ba7c..341170c 100644
--- a/src/Bootstrap/App.php
+++ b/src/Bootstrap/App.php
@@ -3,4 +3,4 @@
 /**
  * Start the PhpSlides Application
  */
-(new \PhpSlides\Src\Foundation\Application())->create();
+(new \PhpSlides\Core\Foundation\Application())->create();
diff --git a/src/Cache/Cache.php b/src/Cache/Cache.php
index 959b6a9..7bd188c 100644
--- a/src/Cache/Cache.php
+++ b/src/Cache/Cache.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace PhpSlides\Src\Cache;
+namespace PhpSlides\Core\Cache;
 
-use PhpSlides\Src\Foundation\Application;
+use PhpSlides\Core\Foundation\Application;
 
 /**
  * Class Cache
diff --git a/src/Cli/Configure.php b/src/Cli/Configure.php
index e05090e..d09ca2c 100644
--- a/src/Cli/Configure.php
+++ b/src/Cli/Configure.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-namespace PhpSlides\Src\Cli;
+namespace PhpSlides\Core\Cli;
 
 trait Configure
 {
diff --git a/src/Config/config.php b/src/Config/config.php
index 6c95219..bec5cbd 100644
--- a/src/Config/config.php
+++ b/src/Config/config.php
@@ -1,5 +1,5 @@
 <?php
 
-use PhpSlides\Src\Loader\FileLoader;
+use PhpSlides\Core\Loader\FileLoader;
 
 (new FileLoader())->load(__DIR__ . '/cors.php');
diff --git a/src/Config/cors.php b/src/Config/cors.php
index 5961680..fbf9382 100644
--- a/src/Config/cors.php
+++ b/src/Config/cors.php
@@ -1,8 +1,8 @@
 <?php
 
-use PhpSlides\Src\Logger\Logger;
-use PhpSlides\Src\Loader\FileLoader;
-use PhpSlides\Src\Foundation\Application;
+use PhpSlides\Core\Logger\Logger;
+use PhpSlides\Core\Loader\FileLoader;
+use PhpSlides\Core\Foundation\Application;
 
 $cors =
 	(new FileLoader())
diff --git a/src/Config/env.config.php b/src/Config/env.config.php
index 529b126..f9ba434 100644
--- a/src/Config/env.config.php
+++ b/src/Config/env.config.php
@@ -1,7 +1,7 @@
 <?php
 
 use Dotenv\Dotenv;
-use PhpSlides\Src\Foundation\Application;
+use PhpSlides\Core\Foundation\Application;
 
 $basePath = Application::$basePath === '' ? 'app/../' : Application::$basePath;
 
diff --git a/src/Config/guards.php b/src/Config/guards.php
index 08fa606..21e73c5 100644
--- a/src/Config/guards.php
+++ b/src/Config/guards.php
@@ -1,7 +1,7 @@
 <?php
 
-use PhpSlides\Src\Loader\FileLoader;
-use PhpSlides\Src\Foundation\Application;
+use PhpSlides\Core\Loader\FileLoader;
+use PhpSlides\Core\Foundation\Application;
 
 return (new FileLoader())
 	->safeLoad(Application::$configsDir . 'guards.php')
diff --git a/src/Config/jwt.config.php b/src/Config/jwt.config.php
index 99619d1..a736504 100644
--- a/src/Config/jwt.config.php
+++ b/src/Config/jwt.config.php
@@ -1,8 +1,8 @@
 <?php
 
 use PhpSlides\Exception;
-use PhpSlides\Src\Loader\FileLoader;
-use PhpSlides\Src\Foundation\Application;
+use PhpSlides\Core\Loader\FileLoader;
+use PhpSlides\Core\Foundation\Application;
 
 return (new FileLoader())
 	->safeLoad(Application::$configsDir . 'jwt.php')
diff --git a/src/Controller/ClassController.php b/src/Controller/ClassController.php
index 6a1570c..ddc961c 100644
--- a/src/Controller/ClassController.php
+++ b/src/Controller/ClassController.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace PhpSlides\Src\Controller;
+namespace PhpSlides\Core\Controller;
 
 use PhpSlides\Exception;
 
diff --git a/src/Controller/Controller.php b/src/Controller/Controller.php
index f1d78b3..81eb77a 100644
--- a/src/Controller/Controller.php
+++ b/src/Controller/Controller.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-namespace PhpSlides\Src\Controller;
+namespace PhpSlides\Core\Controller;
 
 abstract class Controller extends RouteController
 {
diff --git a/src/Controller/RouteController.php b/src/Controller/RouteController.php
index 966baf6..4ae913f 100644
--- a/src/Controller/RouteController.php
+++ b/src/Controller/RouteController.php
@@ -2,13 +2,13 @@
 
 declare(strict_types=1);
 
-namespace PhpSlides\Src\Controller;
+namespace PhpSlides\Core\Controller;
 
 use PhpSlides\Exception;
-use PhpSlides\Src\Http\Request;
-use PhpSlides\Src\Logger\Logger;
-use PhpSlides\Src\Loader\ViewLoader;
-use PhpSlides\Src\Foundation\Application;
+use PhpSlides\Core\Http\Request;
+use PhpSlides\Core\Logger\Logger;
+use PhpSlides\Core\Loader\ViewLoader;
+use PhpSlides\Core\Foundation\Application;
 
 class RouteController
 {
diff --git a/src/Database/Connection.php b/src/Database/Connection.php
index 2383204..9c7ebbd 100644
--- a/src/Database/Connection.php
+++ b/src/Database/Connection.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace PhpSlides\Src\Database;
+namespace PhpSlides\Core\Database;
 
 use DB;
 
diff --git a/src/Database/Database.php b/src/Database/Database.php
index a9202d9..f751fa5 100644
--- a/src/Database/Database.php
+++ b/src/Database/Database.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace PhpSlides\Src\Database;
+namespace PhpSlides\Core\Database;
 
 use MeekroORM;
-use PhpSlides\Src\Parser\ORMParser;
+use PhpSlides\Core\Parser\ORMParser;
 
 /**
  * Abstract class for managing database operations with MeekroORM.
diff --git a/src/Exception/Exception.php b/src/Exception/Exception.php
index 10a37ef..002a14d 100644
--- a/src/Exception/Exception.php
+++ b/src/Exception/Exception.php
@@ -2,7 +2,7 @@
 
 namespace PhpSlides;
 
-use PhpSlides\Src\Loader\FileLoader;
+use PhpSlides\Core\Loader\FileLoader;
 use Exception as DefaultException;
 use PhpSlides\Interface\SlidesException;
 
diff --git a/src/Exception/template/index.php b/src/Exception/template/index.php
index a4801db..18f487c 100644
--- a/src/Exception/template/index.php
+++ b/src/Exception/template/index.php
@@ -189,9 +189,9 @@ function highlightSpecificLines(block, linesToHighlight) {
      : 'http://';
 
    $addr =
-    \PhpSlides\Src\Foundation\Application::$REMOTE_ADDR .
+    \PhpSlides\Core\Foundation\Application::$REMOTE_ADDR .
     "/hot-reload-a$sid/worker";
-   $phpslides_version = \PhpSlides\Src\Foundation\Application::PHPSLIDES_VERSION;
+   $phpslides_version = \PhpSlides\Core\Foundation\Application::PHPSLIDES_VERSION;
 
    if (getenv('HOT_RELOAD') == 'true'): ?>
    <script>
diff --git a/src/Forgery/Database.php b/src/Forgery/Database.php
index c0ecbda..ca5105f 100644
--- a/src/Forgery/Database.php
+++ b/src/Forgery/Database.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace PhpSlides\Src\Forgery;
+namespace PhpSlides\Core\Forgery;
 
 use DB;
-use PhpSlides\Src\Logger\DBLogger;
-use PhpSlides\Src\Database\Connection;
-use PhpSlides\Src\Database\Database as DB_ORM;
+use PhpSlides\Core\Logger\DBLogger;
+use PhpSlides\Core\Database\Connection;
+use PhpSlides\Core\Database\Database as DB_ORM;
 
 /**
  * Abstract class for managing database operations.
diff --git a/src/Forgery/Forge.php b/src/Forgery/Forge.php
index 4fef47b..49eb7bc 100644
--- a/src/Forgery/Forge.php
+++ b/src/Forgery/Forge.php
@@ -1,10 +1,10 @@
 <?php declare(strict_types=1);
 
-namespace PhpSlides\Src\Forgery;
+namespace PhpSlides\Core\Forgery;
 
 use DB;
-use PhpSlides\Src\Parser\SqlParser;
-use PhpSlides\Src\Foundation\Application;
+use PhpSlides\Core\Parser\SqlParser;
+use PhpSlides\Core\Foundation\Application;
 
 class Forge extends Database
 {
diff --git a/src/Formatter/Includes.php b/src/Formatter/Includes.php
deleted file mode 100644
index e69de29..0000000
diff --git a/src/Formatter/SqlFormat.php b/src/Formatter/SqlFormat.php
index bc7660f..421cbeb 100644
--- a/src/Formatter/SqlFormat.php
+++ b/src/Formatter/SqlFormat.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace PhpSlides\Src\Formatter;
+namespace PhpSlides\Core\Formatter;
 
 /**
  * Abstract class for formatting SQL column definitions.
diff --git a/src/Formatter/ViewFormatter.php b/src/Formatter/ViewFormatter.php
index df85f33..cc12105 100644
--- a/src/Formatter/ViewFormatter.php
+++ b/src/Formatter/ViewFormatter.php
@@ -1,13 +1,13 @@
 <?php declare(strict_types=1);
 
-namespace PhpSlides\Src\Formatter;
+namespace PhpSlides\Core\Formatter;
 
-use PhpSlides\Src\Formatter\Views\FormatPslTags;
-use PhpSlides\Src\Formatter\Views\FormatIncludes;
-use PhpSlides\Src\Formatter\Views\FormatHotReload;
-use PhpSlides\Src\Formatter\Views\HandleProperties;
-use PhpSlides\Src\Formatter\Views\FormatImportQuotes;
-use PhpSlides\Src\Formatter\Views\FormatBracketInterpolation;
+use PhpSlides\Core\Formatter\Views\FormatPslTags;
+use PhpSlides\Core\Formatter\Views\FormatIncludes;
+use PhpSlides\Core\Formatter\Views\FormatHotReload;
+use PhpSlides\Core\Formatter\Views\HandleProperties;
+use PhpSlides\Core\Formatter\Views\FormatImportQuotes;
+use PhpSlides\Core\Formatter\Views\FormatBracketInterpolation;
 
 /**
  * Handles the formatting of view files for PhpSlides.
@@ -16,7 +16,7 @@
  * It applies multiple transformations such as handling includes, hot reloads, import quotes,
  * bracket interpolation, PSL tags, and properties for dynamic rendering.
  *
- * @package PhpSlides\Src\Formatter
+ * @package PhpSlides\Core\Formatter
  * @author Dave Conco <info@dconco.dev>
  * @copyright 2024 Dave Conco
  */
diff --git a/src/Formatter/Views/FormatBracketInterpolation.php b/src/Formatter/Views/FormatBracketInterpolation.php
index cd9aab0..f4a116e 100644
--- a/src/Formatter/Views/FormatBracketInterpolation.php
+++ b/src/Formatter/Views/FormatBracketInterpolation.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace PhpSlides\Src\Formatter\Views;
+namespace PhpSlides\Core\Formatter\Views;
 
 /**
  * Trait for handling bracket interpolation in view contents.
diff --git a/src/Formatter/Views/FormatHotReload.php b/src/Formatter/Views/FormatHotReload.php
index 0f6ead6..6b347a5 100644
--- a/src/Formatter/Views/FormatHotReload.php
+++ b/src/Formatter/Views/FormatHotReload.php
@@ -1,8 +1,8 @@
 <?php declare(strict_types=1);
 
-namespace PhpSlides\Src\Formatter\Views;
+namespace PhpSlides\Core\Formatter\Views;
 
-use PhpSlides\Src\Foundation\Application;
+use PhpSlides\Core\Foundation\Application;
 
 /**
  * Trait to add Hot Reload functionality in PhpSlides view files.
diff --git a/src/Formatter/Views/FormatImportQuotes.php b/src/Formatter/Views/FormatImportQuotes.php
index 410c589..8533da2 100644
--- a/src/Formatter/Views/FormatImportQuotes.php
+++ b/src/Formatter/Views/FormatImportQuotes.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace PhpSlides\Src\Formatter\Views;
+namespace PhpSlides\Core\Formatter\Views;
 
 /**
  * Trait to format import quotes in PhpSlides view files.
diff --git a/src/Formatter/Views/FormatIncludes.php b/src/Formatter/Views/FormatIncludes.php
index 1faf944..7424928 100644
--- a/src/Formatter/Views/FormatIncludes.php
+++ b/src/Formatter/Views/FormatIncludes.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace PhpSlides\Src\Formatter\Views;
+namespace PhpSlides\Core\Formatter\Views;
 
 /**
  * Trait to format includes elements in PhpSlides view files.
diff --git a/src/Formatter/Views/FormatPslTags.php b/src/Formatter/Views/FormatPslTags.php
index 3807ae0..37ccaf9 100644
--- a/src/Formatter/Views/FormatPslTags.php
+++ b/src/Formatter/Views/FormatPslTags.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace PhpSlides\Src\Formatter\Views;
+namespace PhpSlides\Core\Formatter\Views;
 
 /**
  * Trait to replace PhpSlides default tags in view files.
@@ -17,7 +17,7 @@ trait FormatPslTags
 	 * This constructor is a placeholder for any necessary initialization for
 	 * the class using this trait. It currently does not perform any operations.
 	 */
-	public function __construct ()
+	public function __construct()
 	{
 		// code...
 	}
@@ -30,24 +30,23 @@ public function __construct ()
 	 * PHP tags to remove unnecessary semicolons and ensures the code is correctly
 	 * formatted for execution.
 	 */
-	protected function psl_tags ()
+	protected function psl_tags()
 	{
 		// Regular expression to match any PHP opening and closing tags
 		$formattedContents = preg_replace_callback(
-		 '/<' . '\?' . '\s+([\s\S]*?)\s*\?' . '>/s',
-		 function ($matches)
-		 {
-			 // Trim the content inside the PHP tags, removing trailing semicolons
- 			$val = trim($matches[1]);
-			 $val = str_ends_with(')', $val) ? $val . ';' : $val;
+			'/<' . '\?' . '\s+([\s\S]*?)\s*\?' . '>/s',
+			function ($matches) {
+				// Trim the content inside the PHP tags, removing trailing semicolons
+				$val = trim($matches[1]);
+				$val = str_ends_with(')', $val) ? $val . ';' : $val;
 
-			 // Reformat the PHP content and return it
- 			return '<' . '?php ' . $val . ' ?' . '>';
-		 },
-		 $this->contents,
+				// Reformat the PHP content and return it
+				return '<' . '?php ' . $val . ' ?' . '>';
+			},
+			$this->contents,
 		);
 
 		// Update the contents with the formatted PHP code blocks
 		$this->contents = $formattedContents;
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Formatter/Views/HandleProperties.php b/src/Formatter/Views/HandleProperties.php
index 6e27ed7..64eb08c 100644
--- a/src/Formatter/Views/HandleProperties.php
+++ b/src/Formatter/Views/HandleProperties.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace PhpSlides\Src\Formatter\Views;
+namespace PhpSlides\Core\Formatter\Views;
 
 /**
  * Trait to handle properties for view files.
@@ -17,7 +17,7 @@ trait HandleProperties
 	 * This constructor is a placeholder for any necessary initialization for
 	 * the class using this trait. It currently does not perform any operations.
 	 */
-	public function __construct ()
+	public function __construct()
 	{
 		// code...
 	}
@@ -36,38 +36,30 @@ public function __construct ()
 	 * `\PhpSlides\Props` class. The final result is a code snippet that injects
 	 * the properties into the view file for later use.
 	 */
-	protected function properties (mixed ...$props)
+	protected function properties(mixed ...$props)
 	{
-		if (empty($props))
-		{
+		if (empty($props)) {
 			return;
 		}
 
 		// Initialize the PHP code snippet for assigning properties
-		$code = '<' . '?php $s = new \PhpSlides\Src\Props(); ';
+		$code = '<' . '?php $s = new \PhpSlides\Core\Props(); ';
 
 		// Loop through each provided property
-		foreach ($props as $key => $value)
-		{
-			if (is_int($key))
-			{
+		foreach ($props as $key => $value) {
+			if (is_int($key)) {
 				// If key is an integer, prefix it with an underscore
 				$key = "_$key";
 			}
 
 			// Handle different types of values (int, bool, array, string)
-			if (is_int($value) || is_bool($value))
-			{
+			if (is_int($value) || is_bool($value)) {
 				$code .= '$s->' . "$key = $value; ";
-			}
-			elseif (is_array($value))
-			{
+			} elseif (is_array($value)) {
 				// Serialize array values
 				$s = serialize($value);
 				$code .= '$s->' . "$key = unserialize('$s'); ";
-			}
-			else
-			{
+			} else {
 				$code .= '$s->' . "$key = '$value'; ";
 			}
 		}
@@ -78,4 +70,4 @@ protected function properties (mixed ...$props)
 		// Prepend the generated code to the contents
 		$this->contents = $code . $this->contents;
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Foundation/Application.php b/src/Foundation/Application.php
index 6c89d18..64ad9ed 100644
--- a/src/Foundation/Application.php
+++ b/src/Foundation/Application.php
@@ -1,21 +1,21 @@
 <?php declare(strict_types=1);
 
-namespace PhpSlides\Src\Foundation;
+namespace PhpSlides\Core\Foundation;
 
 use DB;
 use Closure;
 use PhpSlides\Router\Route;
-use PhpSlides\Src\Http\Request;
-use PhpSlides\Src\Forgery\Forge;
-use PhpSlides\Src\Logger\Logger;
-use PhpSlides\Src\Logger\DBLogger;
-use PhpSlides\Src\Loader\HotReload;
-use PhpSlides\Src\Database\Database;
-use PhpSlides\Src\Loader\Autoloader;
-use PhpSlides\Src\Loader\FileLoader;
-use PhpSlides\Src\Database\Connection;
-use PhpSlides\Src\Controller\Controller;
-use PhpSlides\Src\Interface\ApplicationInterface;
+use PhpSlides\Core\Http\Request;
+use PhpSlides\Core\Forgery\Forge;
+use PhpSlides\Core\Logger\Logger;
+use PhpSlides\Core\Logger\DBLogger;
+use PhpSlides\Core\Loader\HotReload;
+use PhpSlides\Core\Database\Database;
+use PhpSlides\Core\Loader\Autoloader;
+use PhpSlides\Core\Loader\FileLoader;
+use PhpSlides\Core\Database\Connection;
+use PhpSlides\Core\Controller\Controller;
+use PhpSlides\Core\Interface\ApplicationInterface;
 
 /**
  * Class Application
@@ -29,7 +29,7 @@
  */
 class Application extends Controller implements ApplicationInterface
 {
-	use \PhpSlides\Src\Cli\Configure;
+	use \PhpSlides\Core\Cli\Configure;
 	use Configuration;
 	use Logger;
 	use DBLogger {
diff --git a/src/Foundation/Configuration.php b/src/Foundation/Configuration.php
index 13409c2..490f1de 100644
--- a/src/Foundation/Configuration.php
+++ b/src/Foundation/Configuration.php
@@ -1,13 +1,13 @@
 <?php declare(strict_types=1);
 
-namespace PhpSlides\Src\Foundation;
+namespace PhpSlides\Core\Foundation;
 
 use PhpSlides\Exception;
 use PhpSlides\Router\view;
 
 trait Configuration
 {
-	use \PhpSlides\Src\Traits\FileHandler;
+	use \PhpSlides\Core\Traits\FileHandler;
 
 	/**
 	 * The base path of the application.
diff --git a/src/Foundation/Render.php b/src/Foundation/Render.php
index 9f3c84d..46beb6e 100644
--- a/src/Foundation/Render.php
+++ b/src/Foundation/Render.php
@@ -1,10 +1,10 @@
 <?php declare(strict_types=1);
 
-namespace PhpSlides\Src\Foundation;
+namespace PhpSlides\Core\Foundation;
 
-use PhpSlides\Src\Controller\Controller;
-use PhpSlides\Src\Foundation\Application;
-use PhpSlides\Src\Traits\Resources\Resources;
+use PhpSlides\Core\Controller\Controller;
+use PhpSlides\Core\Foundation\Application;
+use PhpSlides\Core\Traits\Resources\Resources;
 
 /**
  * Handles the rendering of all registered routes.
diff --git a/src/Globals/Chunks/codeSnippets.php b/src/Globals/Chunks/codeSnippets.php
index 3efc3b7..1f64fe9 100644
--- a/src/Globals/Chunks/codeSnippets.php
+++ b/src/Globals/Chunks/codeSnippets.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 /**
  * Retrieves a snippet of code around a specific line number from a given file.
diff --git a/src/Globals/Chunks/trace.php b/src/Globals/Chunks/trace.php
index 81724d7..577b538 100644
--- a/src/Globals/Chunks/trace.php
+++ b/src/Globals/Chunks/trace.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 /**
  * @format
diff --git a/src/Globals/Functions.php b/src/Globals/Functions.php
index 801ef29..da54050 100644
--- a/src/Globals/Functions.php
+++ b/src/Globals/Functions.php
@@ -2,9 +2,9 @@
 
 use PhpSlides\Exception;
 use PhpSlides\Router\Route;
-use PhpSlides\Src\Loader\FileLoader;
-use PhpSlides\Src\Loader\ViewLoader;
-use PhpSlides\Src\Foundation\Application;
+use PhpSlides\Core\Loader\FileLoader;
+use PhpSlides\Core\Loader\ViewLoader;
+use PhpSlides\Core\Foundation\Application;
 
 /**
  * Sets an environment variable '__DIR__' with the base path of the application.
@@ -352,7 +352,7 @@ function Props(?string $name = null)
 		$name = "_$name";
 	}
 
-	return (new \PhpSlides\Src\Props())->$name;
+	return (new \PhpSlides\Core\Props())->$name;
 }
 
 function ExceptionHandler(Throwable $exception)
diff --git a/src/Http/Api.php b/src/Http/Api.php
index b566d3c..d8a66d1 100644
--- a/src/Http/Api.php
+++ b/src/Http/Api.php
@@ -1,10 +1,10 @@
 <?php declare(strict_types=1);
 
-namespace PhpSlides\Src\Http;
+namespace PhpSlides\Core\Http;
 
 use PhpSlides\Exception;
-use PhpSlides\Src\Controller\Controller;
-use PhpSlides\Src\Http\Interface\ApiInterface;
+use PhpSlides\Core\Controller\Controller;
+use PhpSlides\Core\Http\Interface\ApiInterface;
 
 /**
  * The Api class provides a fluent interface to define API routes,
diff --git a/src/Http/ApiController.php b/src/Http/ApiController.php
index 96beee9..8791114 100644
--- a/src/Http/ApiController.php
+++ b/src/Http/ApiController.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-namespace PhpSlides\Src\Http;
+namespace PhpSlides\Core\Http;
 
 /**
  * Interface ApiController
diff --git a/src/Http/Auth/AuthGuard.php b/src/Http/Auth/AuthGuard.php
index bf6aae7..34212ae 100644
--- a/src/Http/Auth/AuthGuard.php
+++ b/src/Http/Auth/AuthGuard.php
@@ -1,9 +1,9 @@
 <?php declare(strict_types=1);
 
-namespace PhpSlides\Src\Http\Auth;
+namespace PhpSlides\Core\Http\Auth;
 
-use PhpSlides\Src\Http\Request;
-use PhpSlides\Src\Http\Interface\AuthGuardInterface;
+use PhpSlides\Core\Http\Request;
+use PhpSlides\Core\Http\Interface\AuthGuardInterface;
 
 /**
  * The Base AuthGuard
diff --git a/src/Http/Auth/Authorization.php b/src/Http/Auth/Authorization.php
index 3c92460..efe5e5b 100644
--- a/src/Http/Auth/Authorization.php
+++ b/src/Http/Auth/Authorization.php
@@ -1,107 +1,111 @@
 <?php declare(strict_types=1);
 
-namespace PhpSlides\Src\Http\Auth;
+namespace PhpSlides\Core\Http\Auth;
 
 trait Authorization
 {
-    // Static variable to store the authorization header
-    private static ?string $authorizationHeader = null;
+	// Static variable to store the authorization header
+	private static ?string $authorizationHeader = null;
 
-    /**
-     * Retrieves the Authorization header from the request.
-     *
-     * This method fetches all headers from the request and stores the Authorization header
-     * in a static property for subsequent use in authentication methods.
-     *
-     * @return void
-     */
-    private static function getAuthorizationHeader (): void
-    {
-        $headers = getallheaders() ?? apache_request_headers();
-        self::$authorizationHeader = $headers['Authorization'] ?? $_SERVER['HTTP_AUTHORIZATION'] ?? null;
-    }
+	/**
+	 * Retrieves the Authorization header from the request.
+	 *
+	 * This method fetches all headers from the request and stores the Authorization header
+	 * in a static property for subsequent use in authentication methods.
+	 *
+	 * @return void
+	 */
+	private static function getAuthorizationHeader(): void
+	{
+		$headers = getallheaders() ?? apache_request_headers();
+		self::$authorizationHeader =
+			$headers['Authorization'] ?? ($_SERVER['HTTP_AUTHORIZATION'] ?? null);
+	}
 
-    /**
-     * Get Basic Authentication credentials from the Authorization header.
-     *
-     * This method checks the `Authorization` header for the Basic authentication scheme,
-     * decodes the Base64 credentials, and splits them into the username and password.
-     *
-     * The username and password are returned as an associative array, or null if the 
-     * authorization header is not found or does not contain Basic credentials.
-     *
-     * @return ?array Returns an associative array with 'username' and 'password' or null if not found.
-     */
-    protected static function BasicAuthCredentials (): ?array
-    {
-        self::getAuthorizationHeader();
+	/**
+	 * Get Basic Authentication credentials from the Authorization header.
+	 *
+	 * This method checks the `Authorization` header for the Basic authentication scheme,
+	 * decodes the Base64 credentials, and splits them into the username and password.
+	 *
+	 * The username and password are returned as an associative array, or null if the
+	 * authorization header is not found or does not contain Basic credentials.
+	 *
+	 * @return ?array Returns an associative array with 'username' and 'password' or null if not found.
+	 */
+	protected static function BasicAuthCredentials(): ?array
+	{
+		self::getAuthorizationHeader();
 
-        // Check if the Authorization header is set and starts with "Basic"
-        if (self::$authorizationHeader && strpos(self::$authorizationHeader, 'Basic ') === 0)
-        {
-            // Remove "Basic " from the header to extract base64 encoded credentials
-            $base64Credentials = substr(self::$authorizationHeader, 6);
+		// Check if the Authorization header is set and starts with "Basic"
+		if (
+			self::$authorizationHeader &&
+			strpos(self::$authorizationHeader, 'Basic ') === 0
+		) {
+			// Remove "Basic " from the header to extract base64 encoded credentials
+			$base64Credentials = substr(self::$authorizationHeader, 6);
 
-            // Decode the base64 credentials
-            $decodedCredentials = base64_decode($base64Credentials, true);
+			// Decode the base64 credentials
+			$decodedCredentials = base64_decode($base64Credentials, true);
 
-            // Check if decoding was successful
-            if ($decodedCredentials === false)
-            {
-                return null; // Return null if decoding fails
-            }
+			// Check if decoding was successful
+			if ($decodedCredentials === false) {
+				return null; // Return null if decoding fails
+			}
 
-            // Split the decoded string into username and password
-            [ $username, $password ] = explode(':', $decodedCredentials, 2);
+			// Split the decoded string into username and password
+			[$username, $password] = explode(':', $decodedCredentials, 2);
 
-            // Return the credentials as an associative array
-            return [
-                'username' => trim(htmlspecialchars($username)),
-                'password' => trim(htmlspecialchars($password)),
-            ];
-        }
+			// Return the credentials as an associative array
+			return [
+				'username' => trim(htmlspecialchars($username)),
+				'password' => trim(htmlspecialchars($password)),
+			];
+		}
 
-        // Return null if no valid Basic Auth credentials are found
-        return null;
-    }
+		// Return null if no valid Basic Auth credentials are found
+		return null;
+	}
 
-    /**
-     * Get Bearer Token from the Authorization header.
-     *
-     * This method checks the `Authorization` header for the Bearer authentication scheme
-     * and returns the token if found.
-     *
-     * @return ?string Returns the token as a string, or null if not found.
-     */
-    protected static function BearerToken (): ?string
-    {
-        self::getAuthorizationHeader();
+	/**
+	 * Get Bearer Token from the Authorization header.
+	 *
+	 * This method checks the `Authorization` header for the Bearer authentication scheme
+	 * and returns the token if found.
+	 *
+	 * @return ?string Returns the token as a string, or null if not found.
+	 */
+	protected static function BearerToken(): ?string
+	{
+		self::getAuthorizationHeader();
 
-        // Check if the Authorization header is set and starts with "Bearer"
-        if (self::$authorizationHeader && strpos(self::$authorizationHeader, 'Bearer ') === 0)
-        {
-            // Extract the token by removing "Bearer " from the header
-            return substr(self::$authorizationHeader, 7);
-        }
+		// Check if the Authorization header is set and starts with "Bearer"
+		if (
+			self::$authorizationHeader &&
+			strpos(self::$authorizationHeader, 'Bearer ') === 0
+		) {
+			// Extract the token by removing "Bearer " from the header
+			return substr(self::$authorizationHeader, 7);
+		}
 
-        // Return null if no Bearer token is found
-        return null;
-    }
+		// Return null if no Bearer token is found
+		return null;
+	}
 
-
-    /**
-     * Retrieves the value of the specified API key from the request headers.
-     *
-     * This method attempts to find the API key in the following order:
-     * 1. From the headers returned by `getallheaders()`.
-     * 2. From the headers returned by `apache_request_headers()`.
-     * 3. From the `$_SERVER` superglobal with the key prefixed by "HTTP_".
-     *
-     * @param string $key The name of the API key to retrieve.
-     * @return string|null The value of the API key if found, or null if not found.
-     */
-    protected static function RequestApiKey (string $key)
-    {
-        return getallheaders()[$key] ?? apache_request_headers()[$key] ?? $_SERVER["HTTP_$key"] ?? null;
-    }
-}
\ No newline at end of file
+	/**
+	 * Retrieves the value of the specified API key from the request headers.
+	 *
+	 * This method attempts to find the API key in the following order:
+	 * 1. From the headers returned by `getallheaders()`.
+	 * 2. From the headers returned by `apache_request_headers()`.
+	 * 3. From the `$_SERVER` superglobal with the key prefixed by "HTTP_".
+	 *
+	 * @param string $key The name of the API key to retrieve.
+	 * @return string|null The value of the API key if found, or null if not found.
+	 */
+	protected static function RequestApiKey(string $key)
+	{
+		return getallheaders()[$key] ??
+			(apache_request_headers()[$key] ?? ($_SERVER["HTTP_$key"] ?? null));
+	}
+}
diff --git a/src/Http/Interface/ApiInterface.php b/src/Http/Interface/ApiInterface.php
index b0b7d87..f1c52c3 100644
--- a/src/Http/Interface/ApiInterface.php
+++ b/src/Http/Interface/ApiInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace PhpSlides\Src\Http\Interface;
+namespace PhpSlides\Core\Http\Interface;
 
 interface ApiInterface
 {
diff --git a/src/Http/Interface/AuthGuardInterface.php b/src/Http/Interface/AuthGuardInterface.php
index 3ae761e..3372f31 100644
--- a/src/Http/Interface/AuthGuardInterface.php
+++ b/src/Http/Interface/AuthGuardInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace PhpSlides\Src\Http\Interface;
+namespace PhpSlides\Core\Http\Interface;
 
 interface AuthGuardInterface
 {
diff --git a/src/Http/Interface/RequestInterface.php b/src/Http/Interface/RequestInterface.php
index 2390f04..daa5cec 100644
--- a/src/Http/Interface/RequestInterface.php
+++ b/src/Http/Interface/RequestInterface.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-namespace PhpSlides\Src\Http\Interface;
+namespace PhpSlides\Core\Http\Interface;
 
 use stdClass;
 
diff --git a/src/Http/Request.php b/src/Http/Request.php
index 64ee97e..bc3064e 100644
--- a/src/Http/Request.php
+++ b/src/Http/Request.php
@@ -1,10 +1,10 @@
 <?php declare(strict_types=1);
 
-namespace PhpSlides\Src\Http;
+namespace PhpSlides\Core\Http;
 
 use stdClass;
-use PhpSlides\Src\Foundation\Application;
-use PhpSlides\Src\Http\Interface\RequestInterface;
+use PhpSlides\Core\Foundation\Application;
+use PhpSlides\Core\Http\Interface\RequestInterface;
 
 /**
  * Class Request
@@ -14,8 +14,8 @@
  */
 class Request extends Application implements RequestInterface
 {
-	use \PhpSlides\Src\Utils\Validate;
-	use \PhpSlides\Src\Http\Auth\Authorization;
+	use \PhpSlides\Core\Utils\Validate;
+	use \PhpSlides\Core\Http\Auth\Authorization;
 
 	/**
 	 * @var ?array The URL parameters.
diff --git a/src/Interface/ApplicationInterface.php b/src/Interface/ApplicationInterface.php
index 4277a61..12a1739 100644
--- a/src/Interface/ApplicationInterface.php
+++ b/src/Interface/ApplicationInterface.php
@@ -1,6 +1,6 @@
-<?php declare(strict_types=1);
+<?php
 
-namespace PhpSlides\Src\Interface;
+namespace PhpSlides\Core\Interface;
 
 interface ApplicationInterface
 {
diff --git a/src/Interface/JwtService.php b/src/Interface/JwtService.php
index 6671d4d..eace470 100644
--- a/src/Interface/JwtService.php
+++ b/src/Interface/JwtService.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-namespace PhpSlides\Src\Interface;
+namespace PhpSlides\Core\Interface;
 
 /**
  * Interface JwtService
diff --git a/src/Loader/Autoloader.php b/src/Loader/Autoloader.php
index 44af0bd..9d48b3f 100644
--- a/src/Loader/Autoloader.php
+++ b/src/Loader/Autoloader.php
@@ -1,8 +1,8 @@
-<?php
+<?php declare(strict_types=1);
 
-namespace PhpSlides\Src\Loader;
+namespace PhpSlides\Core\Loader;
 
-use PhpSlides\Src\Foundation\Application;
+use PhpSlides\Core\Foundation\Application;
 
 /**
  * The Autoloader class automatically loads ORM-related classes by scanning
diff --git a/src/Loader/FileLoader.php b/src/Loader/FileLoader.php
index ad8a21a..25de9a3 100644
--- a/src/Loader/FileLoader.php
+++ b/src/Loader/FileLoader.php
@@ -1,6 +1,6 @@
-<?php
+<?php declare(strict_types=1);
 
-namespace PhpSlides\Src\Loader;
+namespace PhpSlides\Core\Loader;
 
 use PhpSlides\Exception;
 
diff --git a/src/Loader/HotReload.php b/src/Loader/HotReload.php
index 6da0e23..62e5299 100644
--- a/src/Loader/HotReload.php
+++ b/src/Loader/HotReload.php
@@ -1,10 +1,10 @@
 <?php declare(strict_types=1);
 
-namespace PhpSlides\Src\Loader;
+namespace PhpSlides\Core\Loader;
 
 use RecursiveIteratorIterator;
 use RecursiveDirectoryIterator;
-use PhpSlides\Src\Foundation\Application;
+use PhpSlides\Core\Foundation\Application;
 
 /**
  * The HotReload class monitors specified directories for file changes,
diff --git a/src/Loader/ViewLoader.php b/src/Loader/ViewLoader.php
index 0539ba3..5644546 100644
--- a/src/Loader/ViewLoader.php
+++ b/src/Loader/ViewLoader.php
@@ -1,9 +1,9 @@
 <?php declare(strict_types=1);
 
-namespace PhpSlides\Src\Loader;
+namespace PhpSlides\Core\Loader;
 
 use PhpSlides\Exception;
-use PhpSlides\Src\Formatter\ViewFormatter;
+use PhpSlides\Core\Formatter\ViewFormatter;
 
 /**
  * The ViewLoader class dynamically loads and formats view files, applying
diff --git a/src/Logger/DBLogger.php b/src/Logger/DBLogger.php
index b685c48..3a28911 100644
--- a/src/Logger/DBLogger.php
+++ b/src/Logger/DBLogger.php
@@ -1,9 +1,9 @@
 <?php declare(strict_types=1);
 
-namespace PhpSlides\Src\Logger;
+namespace PhpSlides\Core\Logger;
 
 use DateTime;
-use PhpSlides\Src\Foundation\Application;
+use PhpSlides\Core\Foundation\Application;
 
 /**
  * DBLogger trait for logging database-related messages.
diff --git a/src/Logger/Logger.php b/src/Logger/Logger.php
index cd2d329..6715495 100644
--- a/src/Logger/Logger.php
+++ b/src/Logger/Logger.php
@@ -1,9 +1,9 @@
 <?php declare(strict_types=1);
 
-namespace PhpSlides\Src\Logger;
+namespace PhpSlides\Core\Logger;
 
 use DateTime;
-use PhpSlides\Src\Foundation\Application;
+use PhpSlides\Core\Foundation\Application;
 
 /**
  * Logger trait for logging HTTP request details.
diff --git a/src/Mailer/Mailer.php b/src/Mailer/Mailer.php
index 1d06304..6b63179 100644
--- a/src/Mailer/Mailer.php
+++ b/src/Mailer/Mailer.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace PhpSlides\Src\Mailer;
+namespace PhpSlides\Core\Mailer;
 
 use PHPMailer\PHPMailer\Exception;
 use PHPMailer\PHPMailer\PHPMailer;
diff --git a/src/Parser/ORMParser.php b/src/Parser/ORMParser.php
index b49c93f..f6a927e 100644
--- a/src/Parser/ORMParser.php
+++ b/src/Parser/ORMParser.php
@@ -1,9 +1,9 @@
-<?php
+<?php declare(strict_types=1);
 
-namespace PhpSlides\Src\Parser;
+namespace PhpSlides\Core\Parser;
 
 use DB;
-use PhpSlides\Src\Forgery\Forge;
+use PhpSlides\Core\Forgery\Forge;
 
 /**
  * ORMParser is responsible for parsing a given class name into database-specific
diff --git a/src/Parser/SqlParser.php b/src/Parser/SqlParser.php
index 83b72c7..cca653f 100644
--- a/src/Parser/SqlParser.php
+++ b/src/Parser/SqlParser.php
@@ -1,9 +1,9 @@
-<?php
+<?php declare(strict_types=1);
 
-namespace PhpSlides\Src\Parser;
+namespace PhpSlides\Core\Parser;
 
-use PhpSlides\Src\Logger\DBLogger;
-use PhpSlides\Src\Formatter\SqlFormat;
+use PhpSlides\Core\Logger\DBLogger;
+use PhpSlides\Core\Formatter\SqlFormat;
 
 /**
  * SqlParser is responsible for parsing SQL column definitions and constraints.
diff --git a/src/Props.php b/src/Props.php
index 098f938..ba20ab6 100644
--- a/src/Props.php
+++ b/src/Props.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-namespace PhpSlides\Src;
+namespace PhpSlides\Core;
 
 /**
  * Class Props
diff --git a/src/Traits/FileHandler.php b/src/Traits/FileHandler.php
index 61b9a06..20f829c 100644
--- a/src/Traits/FileHandler.php
+++ b/src/Traits/FileHandler.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace PhpSlides\Src\Traits;
+namespace PhpSlides\Core\Traits;
 
 use PhpSlides\Exception;
-use PhpSlides\Src\Logger\Logger;
+use PhpSlides\Core\Logger\Logger;
 
 trait FileHandler
 {
diff --git a/src/Traits/Resources/ApiResources.php b/src/Traits/Resources/ApiResources.php
index 703ba74..06315c6 100644
--- a/src/Traits/Resources/ApiResources.php
+++ b/src/Traits/Resources/ApiResources.php
@@ -1,11 +1,11 @@
 <?php declare(strict_types=1);
 
-namespace PhpSlides\Src\Traits\Resources;
+namespace PhpSlides\Core\Traits\Resources;
 
 use PhpSlides\Exception;
 use PhpSlides\Router\MapRoute;
-use PhpSlides\Src\Http\Request;
-use PhpSlides\Src\Loader\FileLoader;
+use PhpSlides\Core\Http\Request;
+use PhpSlides\Core\Loader\FileLoader;
 
 trait ApiResources
 {
diff --git a/src/Traits/Resources/Resources.php b/src/Traits/Resources/Resources.php
index 82dbdfe..2c1708c 100644
--- a/src/Traits/Resources/Resources.php
+++ b/src/Traits/Resources/Resources.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-namespace PhpSlides\Src\Traits\Resources;
+namespace PhpSlides\Core\Traits\Resources;
 
 /**
  * Resources Trait
diff --git a/src/Traits/Resources/RouteResources.php b/src/Traits/Resources/RouteResources.php
index 8bdd474..c6d81eb 100644
--- a/src/Traits/Resources/RouteResources.php
+++ b/src/Traits/Resources/RouteResources.php
@@ -1,14 +1,14 @@
 <?php declare(strict_types=1);
 
-namespace PhpSlides\Src\Traits\Resources;
+namespace PhpSlides\Core\Traits\Resources;
 
 use Closure;
-use PhpSlides\Src\view;
+use PhpSlides\Core\view;
 use PhpSlides\Exception;
 use PhpSlides\Router\MapRoute;
-use PhpSlides\Src\Http\Request;
-use PhpSlides\Src\Loader\FileLoader;
-use PhpSlides\Src\Foundation\Application;
+use PhpSlides\Core\Http\Request;
+use PhpSlides\Core\Loader\FileLoader;
+use PhpSlides\Core\Foundation\Application;
 
 trait RouteResources
 {
diff --git a/src/Utils/Routes/Exception/InvalidTypesException.php b/src/Utils/Routes/Exception/InvalidTypesException.php
index c624067..98079ab 100644
--- a/src/Utils/Routes/Exception/InvalidTypesException.php
+++ b/src/Utils/Routes/Exception/InvalidTypesException.php
@@ -1,9 +1,9 @@
 <?php declare(strict_types=1);
 
-namespace PhpSlides\Src\Utils\Routes\Exception;
+namespace PhpSlides\Core\Utils\Routes\Exception;
 
 use Closure;
-use PhpSlides\Src\Foundation\Application;
+use PhpSlides\Core\Foundation\Application;
 
 class InvalidTypesException extends \PhpSlides\Exception
 {
diff --git a/src/Utils/Routes/StrictTypes.php b/src/Utils/Routes/StrictTypes.php
index a6e9216..02756b2 100644
--- a/src/Utils/Routes/StrictTypes.php
+++ b/src/Utils/Routes/StrictTypes.php
@@ -1,15 +1,15 @@
 <?php declare(strict_types=1);
 
-namespace PhpSlides\Src\Utils\Routes;
+namespace PhpSlides\Core\Utils\Routes;
 
-use PhpSlides\Src\Utils\Routes\Exception\InvalidTypesException;
+use PhpSlides\Core\Utils\Routes\Exception\InvalidTypesException;
 
 /**
  * Trait StrictTypes
  *
  * This trait is used to enforce strict type checking in the parameter types
  *
- * @package PhpSlides\Src\Utils\Routes
+ * @package PhpSlides\Core\Utils\Routes
  */
 trait StrictTypes
 {
diff --git a/src/Utils/Validate.php b/src/Utils/Validate.php
index ed5e6f2..d81e9b4 100644
--- a/src/Utils/Validate.php
+++ b/src/Utils/Validate.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-namespace PhpSlides\Src\Utils;
+namespace PhpSlides\Core\Utils;
 
 trait Validate
 {
diff --git a/src/Web/JWT.php b/src/Web/JWT.php
index 5a64a5f..34046b3 100644
--- a/src/Web/JWT.php
+++ b/src/Web/JWT.php
@@ -1,11 +1,11 @@
 <?php declare(strict_types=1);
 
-namespace PhpSlides\Src\Web;
+namespace PhpSlides\Core\Web;
 
 use Firebase\JWT\Key;
 use Firebase\JWT\JWT as WebToken;
-use PhpSlides\Src\Loader\FileLoader;
-use PhpSlides\Src\Interface\JwtService;
+use PhpSlides\Core\Loader\FileLoader;
+use PhpSlides\Core\Interface\JwtService;
 
 /**
  * The JwtService class provides methods for encoding, decoding, and verifying JSON Web Tokens (JWT).
diff --git a/tests/manualTests/Http/RequestTest.php b/tests/manualTests/Http/RequestTest.php
index 6446f19..3733693 100644
--- a/tests/manualTests/Http/RequestTest.php
+++ b/tests/manualTests/Http/RequestTest.php
@@ -2,7 +2,7 @@
 
 include_once __DIR__ . '/../../autoload.php';
 
-use PhpSlides\Src\Http\Request as HttpRequest;
+use PhpSlides\Core\Http\Request as HttpRequest;
 
 class Request extends HttpRequest
 {
diff --git a/tests/manualTests/Router/RouteTest.php b/tests/manualTests/Router/RouteTest.php
index 2c97c45..b6e5d7b 100644
--- a/tests/manualTests/Router/RouteTest.php
+++ b/tests/manualTests/Router/RouteTest.php
@@ -1,8 +1,8 @@
 <?php
 
 use PhpSlides\Router\Route;
-use PhpSlides\Src\Http\Request;
-use PhpSlides\Src\Foundation\Render;
+use PhpSlides\Core\Http\Request;
+use PhpSlides\Core\Foundation\Render;
 
 include_once __DIR__ . '/../autoload.php';
 include_once __DIR__ . '/../../../src/Globals/Functions.php';
diff --git a/tests/manualTests/Web/JwtTest.php b/tests/manualTests/Web/JwtTest.php
index f570b87..3d46f40 100644
--- a/tests/manualTests/Web/JwtTest.php
+++ b/tests/manualTests/Web/JwtTest.php
@@ -1,6 +1,6 @@
 <?php
 
-use PhpSlides\Src\Web\JWT;
+use PhpSlides\Core\Web\JWT;
 
 include_once __DIR__ . '/../autoload.php';
 include_once __DIR__ . '/../../src/Globals/Functions.php';