diff --git a/config/routes.php b/config/routes.php
index d399b9c..8026f7b 100644
--- a/config/routes.php
+++ b/config/routes.php
@@ -1,2 +1,4 @@
 <?php
-$router->get('/', '/', [new HomeController(), 'home']);
\ No newline at end of file
+use src\Controller\HomeController;
+
+$router->get('/', [new HomeController(), 'index']);
\ No newline at end of file
diff --git a/public/index.php b/public/index.php
index f08ff53..6d72079 100644
--- a/public/index.php
+++ b/public/index.php
@@ -1,6 +1,8 @@
 <?php
 require_once __DIR__ . '/../src/Autoloader.php';
 
+use src\Router;
+
 $autoloader = new Autoloader();
 $autoloader->addNamespace('src', __DIR__ . '/../src');
 $autoloader->register();
diff --git a/src/Controller/BaseController.php b/src/Controller/BaseController.php
index 391fd8e..167323a 100644
--- a/src/Controller/BaseController.php
+++ b/src/Controller/BaseController.php
@@ -1,11 +1,13 @@
 <?php
+namespace src\Controller;
+
 abstract class BaseController
 {
-        protected function render(string $view, array $data = []): void
+    protected function render(string $view, array $data = []): void
     {
         extract($data);
 
-        $viewPath = __DIR__ . '/../../views/' . $view . '.php';
+        $viewPath = __DIR__ . '/../../templates/' . $view . '.php';
 
         if (!file_exists($viewPath)) {
             http_response_code(500);
diff --git a/src/Controller/HomeController.php b/src/Controller/HomeController.php
index 9d1d0c2..8814fed 100644
--- a/src/Controller/HomeController.php
+++ b/src/Controller/HomeController.php
@@ -1,4 +1,6 @@
 <?php
+namespace src\Controller;
+
 class HomeController extends BaseController
 {
     public function index(): void
diff --git a/src/Router.php b/src/Router.php
index b626868..afffe67 100644
--- a/src/Router.php
+++ b/src/Router.php
@@ -1,11 +1,11 @@
 <?php
-namespace src
+namespace src;
 
-public class Router
+class Router
 {
     private array $routes = [];
 
-    public function get(string $path, cllable $handler): void
+    public function get(string $path, callable $handler): void
     {
         $this->routes['GET'][$path] = $handler;
     }
@@ -17,7 +17,8 @@ public class Router
 
     public function dispatch(string $method, string $uri): void
     {
-        $handler = $this->routes[$method][$uri] ?? null;
+        $path = parse_url($uri, PHP_URL_PATH) ?? '/';
+        $handler = $this->routes[$method][$path] ?? null;
 
         if ($handler === null) {
             http_response_code(404);