diff --git a/src/FOSSDB/urls.py b/src/FOSSDB/urls.py
index 7a48efe..ee1234e 100644
--- a/src/FOSSDB/urls.py
+++ b/src/FOSSDB/urls.py
@@ -19,10 +19,10 @@ from django.urls import include, path
 
 urlpatterns = [
     path("admin/", admin.site.urls),
-    path("", include("fossdb.urls")),
     path("", include("main.urls")),
-    path("", include("account.urls")),
     path("", include("django.contrib.auth.urls")),
+    path("settings/", include("account.urls")),
+    path("<str:owner>/<str:project_name>/", include("fossdb.urls")),
 ]
 if settings.DEBUG:
     from django.conf.urls.static import static
diff --git a/src/apps/account/urls.py b/src/apps/account/urls.py
index f055ba7..60cf0d1 100644
--- a/src/apps/account/urls.py
+++ b/src/apps/account/urls.py
@@ -3,7 +3,6 @@ from django.urls import path
 from . import views
 
 urlpatterns = [
-    path("signup/", views.signup_view, name="signup"),
-    path("login/", views.login_view, name="login"),
-    path("<str:username>/", views.ProfileProjectListView.as_view(), name="profile"),
+    path("profile/", views.ProfileUpdateView.as_view(), name="settings"),
+    path("security/", views.PasswordChangeView.as_view(), name="change_password"),
 ]
diff --git a/src/apps/fossdb/urls.py b/src/apps/fossdb/urls.py
index 1badc7c..2d266f6 100644
--- a/src/apps/fossdb/urls.py
+++ b/src/apps/fossdb/urls.py
@@ -3,10 +3,7 @@ from django.urls import path
 from . import views
 
 urlpatterns = [
-    path("search/", views.SearchResultsListView.as_view(), name="search"),
-    path("explore/", views.ProjectListView.as_view(), name="explore"),
-    path("contribute/", views.ProjectCreateView.as_view(), name="contribute"),
-    path("<str:owner>/<str:project_name>/", views.ProjectDetailView.as_view(), name="project-detail"),
-    path("<str:owner>/<str:project_name>/edit/", views.ProjectUpdateView.as_view(), name="project-update"),
-    path("<str:owner>/<str:project_name>/delete/", views.ProjectDeleteView.as_view(), name="project-delete"),
+    path("", views.ProjectDetailView.as_view(), name="project-detail"),
+    path("edit/", views.ProjectUpdateView.as_view(), name="project-update"),
+    path("delete/", views.ProjectDeleteView.as_view(), name="project-delete"),
 ]
diff --git a/src/apps/main/urls.py b/src/apps/main/urls.py
index 2b187ec..102d5f1 100644
--- a/src/apps/main/urls.py
+++ b/src/apps/main/urls.py
@@ -1,11 +1,20 @@
+from account.views import login_view, ProfileProjectListView, signup_view
 from django.urls import path
 
+from fossdb.views import ProjectCreateView, ProjectListView, SearchResultsListView
+
 from . import views
 
+
 urlpatterns = [
     path("", views.homepage, name="homepage"),
-    path("contribute/", views.contribute, name="contribute"),
-    path("news/", views.news, name="news"),
+    path("search/", SearchResultsListView.as_view(), name="search"),
+    path("explore/", ProjectListView.as_view(), name="explore"),
+    path("contribute/", ProjectCreateView.as_view(), name="contribute"),
     path("dashboard/", views.dashboard, name="dashboard"),
+    path("news/", views.news, name="news"),
     path("help/", views.help, name="help"),
+    path("signup/", signup_view, name="signup"),
+    path("login/", login_view, name="login"),
+    path("<str:username>/", ProfileProjectListView.as_view(), name="profile"),
 ]