diff --git a/apps/api/urls.py b/apps/api/urls.py
index bbce426..e9a0818 100644
--- a/apps/api/urls.py
+++ b/apps/api/urls.py
@@ -24,39 +24,43 @@ urlpatterns = [
     path("api-auth/", include("rest_framework.urls", namespace="rest_framework")),
     path("api-token-auth/", obtain_auth_token),
 
+    # region Servers
     path("servers/", include([
         path("", Server_ListView.as_view()),
-        path("<int:pk>/", include([
-            path("", Server_DetailView.as_view()),
-
-            path("filters/", include([
-                path("", ContentFilter_ListView.as_view()),
-                path("<int:pk>/", ContentFilter_DetailView.as_view())
-            ])),
-
-            path("message-styles/", include([
-                path("", MessageStyle_ListView.as_view()),
-                path("<int:pk>/", MessageStyle_DetailView.as_view())
-            ])),
-
-            path("subscriptions/", include([
-                path("", Subscription_ListView.as_view()),
-                path("<int:pk>/", include([
-                    path("", Subscription_DetailView.as_view()),
-                    path("content/", include([
-                        path("", Content_ListView.as_view()),
-                        path("<int:pk>/", Content_DetailView.as_view())
-                    ]))
-                ]))
-            ]))
-        ]))
+        path("<int:pk>/", Server_DetailView.as_view())
     ])),
 
+    # region Filters
+    path("filters/", include([
+        path("", ContentFilter_ListView.as_view()),
+        path("<int:pk>/", ContentFilter_DetailView.as_view())
+    ])),
+
+    # region Message Mutators
     path("message-mutators/", include([
         path("", MessageMutator_ListView.as_view()),
         path("<int:pk>/", MessageMutator_DetailView.as_view())
     ])),
 
+    # region Message Styles
+    path("message-styles/", include([
+        path("", MessageStyle_ListView.as_view()),
+        path("<int:pk>/", MessageStyle_DetailView.as_view())
+    ])),
+
+    # region Subscriptions
+    path("subscriptions/", include([
+        path("", Subscription_ListView.as_view()),
+        path("<int:pk>/", Subscription_DetailView.as_view())
+    ])),
+
+    # region Content
+    path("content/", include([
+        path("", Content_ListView.as_view()),
+        path("<int:pk>/", Content_DetailView.as_view())
+    ])),
+
+    # region Unique Rules
     path("unique-content-rules/", include([
         path("", UniqueContentRule_ListView.as_view()),
         path("<int:pk>/", UniqueContentRule_DetailView.as_view())