diff --git a/dev/server.php b/dev/server.php
new file mode 100644
index 0000000..c831cc3
--- /dev/null
+++ b/dev/server.php
@@ -0,0 +1,11 @@
+<?php declare(strict_types=1);
+
+$uri = parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH);
+
+$file = dirname(__DIR__) . '/public' . $uri;
+
+if (is_file($file)) {
+    return false;
+}
+
+require dirname(__DIR__) . '/index.php';
diff --git a/dev/server.sh b/dev/server.sh
index e478095..392bcf9 100755
--- a/dev/server.sh
+++ b/dev/server.sh
@@ -1,10 +1,8 @@
 #!/usr/bin/env bash
-set -euo pipefail
-
 HOST="${HOST:-127.0.0.1}"
 PORT="${PORT:-3333}"
 
 echo "Starting development server..."
 echo "URL: http://${HOST}:${PORT}"
 
-php -S "${HOST}:${PORT}" index.php
+php -S "${HOST}:${PORT}" -t public dev/server.php
diff --git a/index.php b/index.php
index dffaa05..9441963 100755
--- a/index.php
+++ b/index.php
@@ -1,10 +1,5 @@
 <?php declare(strict_types=1);
 
-// For server.sh and php -S localhost
-if (PHP_SAPI === 'cli-server' && is_file(__DIR__ . parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH))) {
-    return false;
-}
-
 define('ROOT', __DIR__);
 require ROOT . '/src/bootstrap.php';
 require ROOT . '/src/router.php';
diff --git a/src/views/partials/footer.php b/src/views/partials/footer.php
index a6ef893..d0480c1 100755
--- a/src/views/partials/footer.php
+++ b/src/views/partials/footer.php
@@ -1,3 +1,3 @@
-	<script src="/public/js/app.js"></script>
+	<script src="/js/app.js"></script>
 	</body>
 </html>
diff --git a/src/views/partials/head.php b/src/views/partials/head.php
index 62363c3..0784452 100755
--- a/src/views/partials/head.php
+++ b/src/views/partials/head.php
@@ -4,6 +4,6 @@
 		<meta charset="utf-8">
 		<meta name="viewport" content="width=device-width,initial-scale=1">
 		<title><?php echo escape_string($title ?? 'miniPHP') ?></title>
-		<link rel="stylesheet" href="/public/css/app.css">
+		<link rel="stylesheet" href="/css/app.css">
 	</head>
 	<body>
