diff --git a/cbv/shortcut_urls.py b/cbv/shortcut_urls.py
index e3e4f9ac..16a24999 100644
--- a/cbv/shortcut_urls.py
+++ b/cbv/shortcut_urls.py
@@ -1,11 +1,11 @@
-from django.urls import re_path
+from django.urls import path
 
 from cbv import views
 
 
 urlpatterns = [
-    re_path(
-        r"(?P<klass>[a-zA-Z_-]+)/$",
+    path(
+        "<str:klass>/",
         views.LatestKlassDetailView.as_view(),
         name="klass-detail-shortcut",
     ),
diff --git a/cbv/urls.py b/cbv/urls.py
index 60bb2c5e..0b4aeedd 100644
--- a/cbv/urls.py
+++ b/cbv/urls.py
@@ -12,7 +12,7 @@
 django/1.41a/core/DjangoRuntimeWarning
 """
 
-from django.urls import include, path, reverse_lazy
+from django.urls import path, reverse_lazy
 from django.views.generic import RedirectView
 
 from cbv import views
@@ -22,75 +22,40 @@
     path("", RedirectView.as_view(url=reverse_lazy("home"))),
     path(
         "<slug:package>/",
-        include(
-            [
-                path(
-                    "",
-                    views.RedirectToLatestVersionView.as_view(),
-                    {"url_name": "version-detail"},
-                ),
-                path(
-                    "latest/",
-                    include(
-                        [
-                            path(
-                                "",
-                                views.RedirectToLatestVersionView.as_view(),
-                                {"url_name": "version-detail"},
-                                name="latest-version-detail",
-                            ),
-                            path(
-                                "<str:module>/",
-                                include(
-                                    [
-                                        path(
-                                            "",
-                                            views.RedirectToLatestVersionView.as_view(),
-                                            {"url_name": "module-detail"},
-                                            name="latest-module-detail",
-                                        ),
-                                        path(
-                                            "<str:klass>/",
-                                            views.RedirectToLatestVersionView.as_view(),
-                                            {"url_name": "klass-detail"},
-                                            name="latest-klass-detail",
-                                        ),
-                                    ]
-                                ),
-                            ),
-                        ]
-                    ),
-                ),
-                path(
-                    "<str:version>/",
-                    include(
-                        [
-                            path(
-                                "",
-                                views.VersionDetailView.as_view(),
-                                name="version-detail",
-                            ),
-                            path(
-                                "<str:module>/",
-                                include(
-                                    [
-                                        path(
-                                            "",
-                                            views.ModuleDetailView.as_view(),
-                                            name="module-detail",
-                                        ),
-                                        path(
-                                            "<str:klass>/",
-                                            views.KlassDetailView.as_view(),
-                                            name="klass-detail",
-                                        ),
-                                    ]
-                                ),
-                            ),
-                        ]
-                    ),
-                ),
-            ]
-        ),
+        views.RedirectToLatestVersionView.as_view(),
+        {"url_name": "version-detail"},
+    ),
+    path(
+        "<slug:package>/latest/",
+        views.RedirectToLatestVersionView.as_view(),
+        {"url_name": "version-detail"},
+        name="latest-version-detail",
+    ),
+    path(
+        "<slug:package>/<str:version>/",
+        views.VersionDetailView.as_view(),
+        name="version-detail",
+    ),
+    path(
+        "<slug:package>/latest/<str:module>/",
+        views.RedirectToLatestVersionView.as_view(),
+        {"url_name": "module-detail"},
+        name="latest-module-detail",
+    ),
+    path(
+        "<slug:package>/<str:version>/<str:module>/",
+        views.ModuleDetailView.as_view(),
+        name="module-detail",
+    ),
+    path(
+        "<slug:package>/latest/<str:module>/<str:klass>/",
+        views.RedirectToLatestVersionView.as_view(),
+        {"url_name": "klass-detail"},
+        name="latest-klass-detail",
+    ),
+    path(
+        "<slug:package>/<str:version>/<str:module>/<str:klass>/",
+        views.KlassDetailView.as_view(),
+        name="klass-detail",
     ),
 ]
diff --git a/inspector/urls.py b/inspector/urls.py
index fb2f3cb5..d23145e4 100644
--- a/inspector/urls.py
+++ b/inspector/urls.py
@@ -1,6 +1,6 @@
 from django.conf import settings
 from django.conf.urls.static import static
-from django.urls import include, path, re_path
+from django.urls import include, path
 from django.views.generic import TemplateView
 
 from cbv.views import HomeView, Sitemap
@@ -9,7 +9,7 @@
 urlpatterns = [
     path("", HomeView.as_view(), name="home"),
     path("projects/", include("cbv.urls")),
-    re_path(r"^sitemap\.xml$", Sitemap.as_view(), name="sitemap"),
+    path("sitemap.xml", Sitemap.as_view(), name="sitemap"),
     path("", include("cbv.shortcut_urls"), {"package": "Django"}),
 ] + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)