diff --git a/__tests__/no-mock-data.test.ts b/__tests__/no-mock-data.test.ts
index 25ef3a3..5b0ad23 100644
--- a/__tests__/no-mock-data.test.ts
+++ b/__tests__/no-mock-data.test.ts
@@ -18,8 +18,8 @@ describe('No Mock Data Tests', () => {
 
   it('should use API service in all components', () => {
     const pagePath = join(process.cwd(), 'app', 'page.tsx');
-    const adminPath = join(process.cwd(), 'app', 'upadaj', 'dashboard', 'page.tsx');
-    
+    const adminPath = join(process.cwd(), 'app', 'dashboard', 'page.tsx');
+
     const pageContent = readFileSync(pagePath, 'utf-8');
     const adminContent = readFileSync(adminPath, 'utf-8');
     
diff --git a/__tests__/ui-features.test.ts b/__tests__/ui-features.test.ts
index 2f7773c..b1c5da5 100644
--- a/__tests__/ui-features.test.ts
+++ b/__tests__/ui-features.test.ts
@@ -3,7 +3,7 @@ import { join } from 'path';
 
 describe('UI Features Tests', () => {
   it('should have color hex input in admin form', () => {
-    const adminDashboardPath = join(process.cwd(), 'app', 'upadaj', 'dashboard', 'page.tsx');
+    const adminDashboardPath = join(process.cwd(), 'app', 'dashboard', 'page.tsx');
     const adminContent = readFileSync(adminDashboardPath, 'utf-8');
     
     // Check for color input
@@ -22,7 +22,7 @@ describe('UI Features Tests', () => {
   });
 
   it('should have number inputs for quantity fields', () => {
-    const adminDashboardPath = join(process.cwd(), 'app', 'upadaj', 'dashboard', 'page.tsx');
+    const adminDashboardPath = join(process.cwd(), 'app', 'dashboard', 'page.tsx');
     const adminContent = readFileSync(adminDashboardPath, 'utf-8');
     
     // Check for number inputs for quantities
@@ -34,7 +34,7 @@ describe('UI Features Tests', () => {
   });
 
   it('should have number input for quantity', () => {
-    const adminDashboardPath = join(process.cwd(), 'app', 'upadaj', 'dashboard', 'page.tsx');
+    const adminDashboardPath = join(process.cwd(), 'app', 'dashboard', 'page.tsx');
     const adminContent = readFileSync(adminDashboardPath, 'utf-8');
     
     // Check for number input
@@ -44,7 +44,7 @@ describe('UI Features Tests', () => {
   });
 
   it('should have predefined material options', () => {
-    const adminDashboardPath = join(process.cwd(), 'app', 'upadaj', 'dashboard', 'page.tsx');
+    const adminDashboardPath = join(process.cwd(), 'app', 'dashboard', 'page.tsx');
     const adminContent = readFileSync(adminDashboardPath, 'utf-8');
     
     // Check for material select dropdown
@@ -54,8 +54,8 @@ describe('UI Features Tests', () => {
   });
 
   it('should have admin header with navigation', () => {
-    const adminDashboardPath = join(process.cwd(), 'app', 'upadaj', 'dashboard', 'page.tsx');
-    
+    const adminDashboardPath = join(process.cwd(), 'app', 'dashboard', 'page.tsx');
+
     const dashboardContent = readFileSync(adminDashboardPath, 'utf-8');
     
     // Check for admin header
diff --git a/app/upadaj/dashboard/page.tsx b/app/dashboard/page.tsx
similarity index 100%
rename from app/upadaj/dashboard/page.tsx
rename to app/dashboard/page.tsx
diff --git a/app/upadaj/colors/page.tsx b/app/upadaj/colors/page.tsx
index 6c5918e..bce9847 100644
--- a/app/upadaj/colors/page.tsx
+++ b/app/upadaj/colors/page.tsx
@@ -194,7 +194,7 @@ export default function ColorsManagement() {
             <h2 className="text-xl font-bold text-gray-900 dark:text-white mb-6">Admin Panel</h2>
             <nav className="space-y-2">
               <a
-                href="/upadaj/dashboard"
+                href="/dashboard"
                 className="block px-4 py-2 text-gray-700 dark:text-gray-300 hover:bg-gray-100 dark:hover:bg-gray-700 rounded"
               >
                 Filamenti
diff --git a/app/upadaj/page.tsx b/app/upadaj/page.tsx
index 33a72eb..610601a 100644
--- a/app/upadaj/page.tsx
+++ b/app/upadaj/page.tsx
@@ -33,7 +33,7 @@ export default function AdminLogin() {
       trackEvent('Admin', 'Login', 'Success');
 
       // Redirect to admin dashboard using window.location for static export
-      window.location.href = '/upadaj/dashboard';
+      window.location.href = '/dashboard';
     } catch (err: any) {
       setError('Neispravno korisničko ime ili lozinka');
       console.error('Login error:', err);
diff --git a/app/upadaj/requests/page.tsx b/app/upadaj/requests/page.tsx
index 39530d7..d4152a3 100644
--- a/app/upadaj/requests/page.tsx
+++ b/app/upadaj/requests/page.tsx
@@ -125,7 +125,7 @@ export default function ColorRequestsAdmin() {
           <h1 className="text-3xl font-bold text-gray-800 dark:text-gray-100">Zahtevi za Boje</h1>
           <div className="space-x-4">
             <Link
-              href="/upadaj/dashboard"
+              href="/dashboard"
               className="px-4 py-2 bg-gray-600 text-white rounded hover:bg-gray-700"
             >
               Inventar