diff --git a/app.py b/app.py
index 753b9e7..bd0730f 100755
--- a/app.py
+++ b/app.py
@@ -15,15 +15,16 @@ import socket
 from urllib.parse import urlparse
 
 # Import route routers (to be created)
-from routes.search import router as search_router
-from routes.credentials import router as credentials_router
-from routes.album import router as album_router
-from routes.track import router as track_router
-from routes.playlist import router as playlist_router
-from routes.prgs import router as prgs_router
-from routes.config import router as config_router
-from routes.artist import router as artist_router
-from routes.history import router as history_router
+from routes.auth.credentials import router as credentials_router
+from routes.content.artist import router as artist_router
+from routes.content.album import router as album_router
+from routes.content.track import router as track_router
+from routes.content.playlist import router as playlist_router
+from routes.core.search import router as search_router
+from routes.core.history import router as history_router
+from routes.system.progress import router as prgs_router
+from routes.system.config import router as config_router
+
 
 # Import Celery configuration and manager
 from routes.utils.celery_manager import celery_manager
diff --git a/routes/auth/__init__.py b/routes/auth/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/routes/credentials.py b/routes/auth/credentials.py
similarity index 100%
rename from routes/credentials.py
rename to routes/auth/credentials.py
diff --git a/routes/content/__init__.py b/routes/content/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/routes/album.py b/routes/content/album.py
similarity index 100%
rename from routes/album.py
rename to routes/content/album.py
diff --git a/routes/artist.py b/routes/content/artist.py
similarity index 100%
rename from routes/artist.py
rename to routes/content/artist.py
diff --git a/routes/playlist.py b/routes/content/playlist.py
similarity index 100%
rename from routes/playlist.py
rename to routes/content/playlist.py
diff --git a/routes/track.py b/routes/content/track.py
similarity index 100%
rename from routes/track.py
rename to routes/content/track.py
diff --git a/routes/core/__init__.py b/routes/core/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/routes/history.py b/routes/core/history.py
similarity index 100%
rename from routes/history.py
rename to routes/core/history.py
diff --git a/routes/search.py b/routes/core/search.py
similarity index 100%
rename from routes/search.py
rename to routes/core/search.py
diff --git a/routes/system/__init__.py b/routes/system/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/routes/config.py b/routes/system/config.py
similarity index 100%
rename from routes/config.py
rename to routes/system/config.py
diff --git a/routes/prgs.py b/routes/system/progress.py
similarity index 100%
rename from routes/prgs.py
rename to routes/system/progress.py