From f13d777b7f7aec9731bd4212f5e1393dac83bb41 Mon Sep 17 00:00:00 2001
From: Dave Gaeddert <dave.gaeddert@gmail.com>
Date: Fri, 21 Jun 2024 16:43:49 -0500
Subject: [PATCH] Move admin etc into staff directory

---
 bolt-cache/bolt/cache/admin.py                |   4 +-
 bolt-flags/bolt/flags/admin.py                |   6 +--
 bolt-oauth/bolt/oauth/admin.py                |   6 +--
 bolt-oauth/tests/urls.py                      |   2 +-
 bolt-pages/README.md                          |   3 ++
 bolt-pages/bolt/pages/README.md               |   1 +
 bolt-staff/README.md                          |  47 +-----------------
 bolt-staff/bolt/admin/templates/.DS_Store     | Bin 6148 -> 0 bytes
 bolt-staff/bolt/staff/README.md               |   1 +
 bolt-staff/bolt/{admin => staff}/__init__.py  |   0
 bolt-staff/bolt/{ => staff}/admin/README.md   |   8 +--
 .../migrations => staff/admin}/__init__.py    |   0
 .../{ => staff}/admin/assets/admin/admin.css  |   0
 .../{ => staff}/admin/assets/admin/admin.js   |   0
 .../{ => staff}/admin/assets/admin/chart.js   |   0
 .../assets/admin/jquery-3.6.1.slim.min.js     |   0
 .../{ => staff}/admin/assets/admin/list.js    |   0
 .../bolt/{ => staff}/admin/cards/__init__.py  |   0
 .../bolt/{ => staff}/admin/cards/base.py      |   2 +-
 .../bolt/{ => staff}/admin/cards/charts.py    |   0
 .../bolt/{ => staff}/admin/cards/tables.py    |   0
 bolt-staff/bolt/{ => staff}/admin/config.py   |   2 +-
 bolt-staff/bolt/{ => staff}/admin/dates.py    |   0
 bolt-staff/bolt/{ => staff}/admin/jinja.py    |   0
 .../admin/migrations/0001_initial.py          |   0
 .../migrations/0002_alter_dashboard_cards.py  |   0
 .../admin/migrations/0003_delete_dashboard.py |   0
 .../admin/migrations/__init__.py}             |   0
 .../admin/templates/admin/base.html           |   0
 .../admin/templates/admin/cards/base.html     |   0
 .../admin/templates/admin/cards/card.html     |   0
 .../admin/templates/admin/cards/chart.html    |   0
 .../admin/templates/admin/cards/table.html    |   0
 .../admin/templates/admin/detail.html         |   0
 .../admin/templates/admin/form.html           |   0
 .../admin/templates/admin/index.html          |   0
 .../admin/templates/admin/list.html           |   0
 .../admin/templates/admin/page.html           |   0
 .../admin/templates/admin/search.html         |   0
 .../admin/templates/admin/values/UUID.html    |   0
 .../admin/templates/admin/values/bool.html    |   0
 .../templates/admin/values/datetime.html      |   0
 .../admin/templates/admin/values/default.html |   0
 .../templates/admin/values/get_display.html   |   0
 .../templates/elements/admin/Checkbox.html    |   0
 .../elements/admin/CheckboxField.html         |   0
 .../templates/elements/admin/FieldErrors.html |   0
 .../admin/templates/elements/admin/Input.html |   0
 .../templates/elements/admin/InputField.html  |   0
 .../admin/templates/elements/admin/Label.html |   0
 .../templates/elements/admin/Select.html      |   0
 .../templates/elements/admin/SelectField.html |   0
 .../templates/elements/admin/Submit.html      |   0
 bolt-staff/bolt/{ => staff}/admin/urls.py     |   0
 .../bolt/{ => staff}/admin/views/__init__.py  |   0
 .../bolt/{ => staff}/admin/views/base.py      |   2 +-
 .../bolt/{ => staff}/admin/views/default.py   |   0
 .../bolt/{ => staff}/admin/views/models.py    |   0
 .../bolt/{ => staff}/admin/views/registry.py  |   4 +-
 .../bolt/{ => staff}/impersonate/README.md    |   6 +--
 .../bolt/{ => staff}/impersonate/__init__.py  |   0
 .../{ => staff}/impersonate/middleware.py     |   0
 bolt-staff/bolt/staff/impersonate/models.py   |   0
 .../{ => staff}/impersonate/permissions.py    |   0
 .../bolt/{ => staff}/impersonate/settings.py  |   0
 .../bolt/{ => staff}/impersonate/urls.py      |   0
 .../bolt/{ => staff}/impersonate/views.py     |   0
 .../bolt/{ => staff}/querystats/README.md     |   0
 .../bolt/{ => staff}/querystats/__init__.py   |   0
 .../bolt/{ => staff}/querystats/core.py       |   0
 .../bolt/{ => staff}/querystats/middleware.py |   0
 .../templates/querystats/querystats.html      |   0
 .../templates/querystats/toolbar.html         |   0
 .../bolt/{ => staff}/querystats/urls.py       |   0
 .../bolt/{ => staff}/querystats/views.py      |   0
 bolt-staff/bolt/{ => staff}/toolbar/README.md |   0
 .../bolt/{ => staff}/toolbar/__init__.py      |   0
 .../toolbar/assets/toolbar/toolbar.js         |   0
 bolt-staff/bolt/{ => staff}/toolbar/core.py   |   0
 .../bolt/staff/toolbar/default_settings.py    |   1 +
 bolt-staff/bolt/{ => staff}/toolbar/jinja.py  |   0
 .../toolbar/templates/toolbar/links.html      |   0
 .../toolbar/templates/toolbar/toolbar.html    |   0
 bolt-staff/bolt/toolbar/default_settings.py   |   1 -
 bolt-staff/tests_impersonate/settings.py      |   4 +-
 bolt-worker/bolt/worker/admin.py              |  12 ++---
 bolt/bolt/packages/config.py                  |   6 +--
 bolt/bolt/packages/registry.py                |   2 +-
 scripts/compile-readmes                       |  12 ++---
 89 files changed, 45 insertions(+), 87 deletions(-)
 create mode 100644 bolt-pages/README.md
 create mode 100644 bolt-pages/bolt/pages/README.md
 delete mode 100644 bolt-staff/bolt/admin/templates/.DS_Store
 create mode 100644 bolt-staff/bolt/staff/README.md
 rename bolt-staff/bolt/{admin => staff}/__init__.py (100%)
 rename bolt-staff/bolt/{ => staff}/admin/README.md (96%)
 rename bolt-staff/bolt/{admin/migrations => staff/admin}/__init__.py (100%)
 rename bolt-staff/bolt/{ => staff}/admin/assets/admin/admin.css (100%)
 rename bolt-staff/bolt/{ => staff}/admin/assets/admin/admin.js (100%)
 rename bolt-staff/bolt/{ => staff}/admin/assets/admin/chart.js (100%)
 rename bolt-staff/bolt/{ => staff}/admin/assets/admin/jquery-3.6.1.slim.min.js (100%)
 rename bolt-staff/bolt/{ => staff}/admin/assets/admin/list.js (100%)
 rename bolt-staff/bolt/{ => staff}/admin/cards/__init__.py (100%)
 rename bolt-staff/bolt/{ => staff}/admin/cards/base.py (97%)
 rename bolt-staff/bolt/{ => staff}/admin/cards/charts.py (100%)
 rename bolt-staff/bolt/{ => staff}/admin/cards/tables.py (100%)
 rename bolt-staff/bolt/{ => staff}/admin/config.py (95%)
 rename bolt-staff/bolt/{ => staff}/admin/dates.py (100%)
 rename bolt-staff/bolt/{ => staff}/admin/jinja.py (100%)
 rename bolt-staff/bolt/{ => staff}/admin/migrations/0001_initial.py (100%)
 rename bolt-staff/bolt/{ => staff}/admin/migrations/0002_alter_dashboard_cards.py (100%)
 rename bolt-staff/bolt/{ => staff}/admin/migrations/0003_delete_dashboard.py (100%)
 rename bolt-staff/bolt/{impersonate/models.py => staff/admin/migrations/__init__.py} (100%)
 rename bolt-staff/bolt/{ => staff}/admin/templates/admin/base.html (100%)
 rename bolt-staff/bolt/{ => staff}/admin/templates/admin/cards/base.html (100%)
 rename bolt-staff/bolt/{ => staff}/admin/templates/admin/cards/card.html (100%)
 rename bolt-staff/bolt/{ => staff}/admin/templates/admin/cards/chart.html (100%)
 rename bolt-staff/bolt/{ => staff}/admin/templates/admin/cards/table.html (100%)
 rename bolt-staff/bolt/{ => staff}/admin/templates/admin/detail.html (100%)
 rename bolt-staff/bolt/{ => staff}/admin/templates/admin/form.html (100%)
 rename bolt-staff/bolt/{ => staff}/admin/templates/admin/index.html (100%)
 rename bolt-staff/bolt/{ => staff}/admin/templates/admin/list.html (100%)
 rename bolt-staff/bolt/{ => staff}/admin/templates/admin/page.html (100%)
 rename bolt-staff/bolt/{ => staff}/admin/templates/admin/search.html (100%)
 rename bolt-staff/bolt/{ => staff}/admin/templates/admin/values/UUID.html (100%)
 rename bolt-staff/bolt/{ => staff}/admin/templates/admin/values/bool.html (100%)
 rename bolt-staff/bolt/{ => staff}/admin/templates/admin/values/datetime.html (100%)
 rename bolt-staff/bolt/{ => staff}/admin/templates/admin/values/default.html (100%)
 rename bolt-staff/bolt/{ => staff}/admin/templates/admin/values/get_display.html (100%)
 rename bolt-staff/bolt/{ => staff}/admin/templates/elements/admin/Checkbox.html (100%)
 rename bolt-staff/bolt/{ => staff}/admin/templates/elements/admin/CheckboxField.html (100%)
 rename bolt-staff/bolt/{ => staff}/admin/templates/elements/admin/FieldErrors.html (100%)
 rename bolt-staff/bolt/{ => staff}/admin/templates/elements/admin/Input.html (100%)
 rename bolt-staff/bolt/{ => staff}/admin/templates/elements/admin/InputField.html (100%)
 rename bolt-staff/bolt/{ => staff}/admin/templates/elements/admin/Label.html (100%)
 rename bolt-staff/bolt/{ => staff}/admin/templates/elements/admin/Select.html (100%)
 rename bolt-staff/bolt/{ => staff}/admin/templates/elements/admin/SelectField.html (100%)
 rename bolt-staff/bolt/{ => staff}/admin/templates/elements/admin/Submit.html (100%)
 rename bolt-staff/bolt/{ => staff}/admin/urls.py (100%)
 rename bolt-staff/bolt/{ => staff}/admin/views/__init__.py (100%)
 rename bolt-staff/bolt/{ => staff}/admin/views/base.py (99%)
 rename bolt-staff/bolt/{ => staff}/admin/views/default.py (100%)
 rename bolt-staff/bolt/{ => staff}/admin/views/models.py (100%)
 rename bolt-staff/bolt/{ => staff}/admin/views/registry.py (96%)
 rename bolt-staff/bolt/{ => staff}/impersonate/README.md (85%)
 rename bolt-staff/bolt/{ => staff}/impersonate/__init__.py (100%)
 rename bolt-staff/bolt/{ => staff}/impersonate/middleware.py (100%)
 create mode 100644 bolt-staff/bolt/staff/impersonate/models.py
 rename bolt-staff/bolt/{ => staff}/impersonate/permissions.py (100%)
 rename bolt-staff/bolt/{ => staff}/impersonate/settings.py (100%)
 rename bolt-staff/bolt/{ => staff}/impersonate/urls.py (100%)
 rename bolt-staff/bolt/{ => staff}/impersonate/views.py (100%)
 rename bolt-staff/bolt/{ => staff}/querystats/README.md (100%)
 rename bolt-staff/bolt/{ => staff}/querystats/__init__.py (100%)
 rename bolt-staff/bolt/{ => staff}/querystats/core.py (100%)
 rename bolt-staff/bolt/{ => staff}/querystats/middleware.py (100%)
 rename bolt-staff/bolt/{ => staff}/querystats/templates/querystats/querystats.html (100%)
 rename bolt-staff/bolt/{ => staff}/querystats/templates/querystats/toolbar.html (100%)
 rename bolt-staff/bolt/{ => staff}/querystats/urls.py (100%)
 rename bolt-staff/bolt/{ => staff}/querystats/views.py (100%)
 rename bolt-staff/bolt/{ => staff}/toolbar/README.md (100%)
 rename bolt-staff/bolt/{ => staff}/toolbar/__init__.py (100%)
 rename bolt-staff/bolt/{ => staff}/toolbar/assets/toolbar/toolbar.js (100%)
 rename bolt-staff/bolt/{ => staff}/toolbar/core.py (100%)
 create mode 100644 bolt-staff/bolt/staff/toolbar/default_settings.py
 rename bolt-staff/bolt/{ => staff}/toolbar/jinja.py (100%)
 rename bolt-staff/bolt/{ => staff}/toolbar/templates/toolbar/links.html (100%)
 rename bolt-staff/bolt/{ => staff}/toolbar/templates/toolbar/toolbar.html (100%)
 delete mode 100644 bolt-staff/bolt/toolbar/default_settings.py

diff --git a/bolt-cache/bolt/cache/admin.py b/bolt-cache/bolt/cache/admin.py
index 514b7d7be6..18e4f7f675 100644
--- a/bolt-cache/bolt/cache/admin.py
+++ b/bolt-cache/bolt/cache/admin.py
@@ -1,10 +1,10 @@
-from bolt.admin.views import (
+from bolt.cache.models import CachedItem
+from bolt.staff.admin.views import (
     AdminModelDetailView,
     AdminModelListView,
     AdminModelViewset,
     register_viewset,
 )
-from bolt.cache.models import CachedItem
 
 
 @register_viewset
diff --git a/bolt-flags/bolt/flags/admin.py b/bolt-flags/bolt/flags/admin.py
index 66f834b379..18e9746551 100644
--- a/bolt-flags/bolt/flags/admin.py
+++ b/bolt-flags/bolt/flags/admin.py
@@ -1,14 +1,14 @@
 from functools import cached_property
 
-from bolt.admin.cards import Card
-from bolt.admin.views import (
+from bolt.db.forms import ModelForm
+from bolt.staff.admin.cards import Card
+from bolt.staff.admin.views import (
     AdminModelDetailView,
     AdminModelListView,
     AdminModelUpdateView,
     AdminModelViewset,
     register_viewset,
 )
-from bolt.db.forms import ModelForm
 
 from .models import Flag, FlagResult
 
diff --git a/bolt-oauth/bolt/oauth/admin.py b/bolt-oauth/bolt/oauth/admin.py
index 58b538e2fc..742a834546 100644
--- a/bolt-oauth/bolt/oauth/admin.py
+++ b/bolt-oauth/bolt/oauth/admin.py
@@ -1,11 +1,11 @@
-from bolt.admin.cards import ChartCard
-from bolt.admin.views import (
+from bolt.db.models import Count
+from bolt.staff.admin.cards import ChartCard
+from bolt.staff.admin.views import (
     AdminModelDetailView,
     AdminModelListView,
     AdminModelViewset,
     register_viewset,
 )
-from bolt.db.models import Count
 
 from .models import OAuthConnection
 
diff --git a/bolt-oauth/tests/urls.py b/bolt-oauth/tests/urls.py
index 22317fb048..065497f721 100644
--- a/bolt-oauth/tests/urls.py
+++ b/bolt-oauth/tests/urls.py
@@ -1,6 +1,6 @@
-from bolt import admin
 from bolt.auth.views import AuthViewMixin, LogoutView
 from bolt.oauth.providers import get_provider_keys
+from bolt.staff import admin
 from bolt.urls import include, path
 from bolt.views import TemplateView
 
diff --git a/bolt-pages/README.md b/bolt-pages/README.md
new file mode 100644
index 0000000000..1b8b47bae9
--- /dev/null
+++ b/bolt-pages/README.md
@@ -0,0 +1,3 @@
+<!-- This file is compiled from bolt-pages/bolt/pages/README.md. Do not edit this file directly. -->
+
+# Pages
diff --git a/bolt-pages/bolt/pages/README.md b/bolt-pages/bolt/pages/README.md
new file mode 100644
index 0000000000..28064c05f3
--- /dev/null
+++ b/bolt-pages/bolt/pages/README.md
@@ -0,0 +1 @@
+# Pages
diff --git a/bolt-staff/README.md b/bolt-staff/README.md
index 54bb364087..a33a057655 100644
--- a/bolt-staff/README.md
+++ b/bolt-staff/README.md
@@ -1,46 +1,3 @@
-<!-- This file is compiled from bolt-staff/bolt/impersonate/README.md. Do not edit this file directly. -->
+<!-- This file is compiled from bolt-staff/bolt/staff/README.md. Do not edit this file directly. -->
 
-# bolt-impersonate
-
-See what your users see.
-
-A key feature for providing customer support is to be able to view the site through their account.
-With `impersonate` installed, you can impersonate a user by finding them in the Django admin and clicking the "Impersonate" button.
-
-![](/docs/img/impersonate-admin.png)
-
-Then with the [staff toolbar](/docs/bolt-toolbar/) enabled, you'll get a notice of the impersonation and a button to exit:
-
-![](/docs/img/impersonate-bar.png)
-
-## Installation
-
-To impersonate users, you need the app, middleware, and URLs:
-
-```python
-# settings.py
-INSTALLED_PACKAGES = INSTALLED_PACKAGES + [
-  "bolt.impersonate",
-]
-
-MIDDLEWARE = MIDDLEWARE + [
-  "bolt.impersonate.ImpersonateMiddleware",
-]
-```
-
-```python
-# urls.py
-urlpatterns = [
-    # ...
-    path("impersonate/", include("bolt.impersonate.urls")),
-]
-```
-
-## Settings
-
-By default, all staff users can impersonate other users.
-
-```python
-# settings.py
-IMPERSONATE_ALLOWED = lambda user: user.is_staff
-```
+# Staff
diff --git a/bolt-staff/bolt/admin/templates/.DS_Store b/bolt-staff/bolt/admin/templates/.DS_Store
deleted file mode 100644
index dbd07c1a1c1d289c1b490405a326e8a55ae29325..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHKJ8r^25S>XVP-t9I?iIMf%5qNN3m_#C4KXMr)UI+aj>emhq98+&f+l(+&Ai>&
zd29I<9*>A<`}MjKX+&fWH<WJ+Q?qmPi9KXSfpFZhlR@6#pK_Q~Ur!kKNnXHwm;G=4
zvHuvhyI~V|Unet51*iZOpaN8Y3jA3C>%Fk~B9M^^Pys6Nqkw%M3f!<Jj)DH^K=2U&
zI78YEYo8^6#S*}pI0hmE)1U%_sySk4(2*}$R};s;po`}4q4{LZ2}S+sxW9P0Xbohf
z0#x8qfydZ3*8iX3H|GCK5_eR93j8Ytbk_A<i&x6tI(a$kwFSP0Tg?e>hP6`=yd49*
i9b;qdc<Dt^S8R>*nm7hJ9eJk%`7>a;(5S$@6*vQa;1$mR

diff --git a/bolt-staff/bolt/staff/README.md b/bolt-staff/bolt/staff/README.md
new file mode 100644
index 0000000000..5ad78c9291
--- /dev/null
+++ b/bolt-staff/bolt/staff/README.md
@@ -0,0 +1 @@
+# Staff
diff --git a/bolt-staff/bolt/admin/__init__.py b/bolt-staff/bolt/staff/__init__.py
similarity index 100%
rename from bolt-staff/bolt/admin/__init__.py
rename to bolt-staff/bolt/staff/__init__.py
diff --git a/bolt-staff/bolt/admin/README.md b/bolt-staff/bolt/staff/admin/README.md
similarity index 96%
rename from bolt-staff/bolt/admin/README.md
rename to bolt-staff/bolt/staff/admin/README.md
index 6b5c896bd7..28a2668287 100644
--- a/bolt-staff/bolt/admin/README.md
+++ b/bolt-staff/bolt/staff/admin/README.md
@@ -14,7 +14,7 @@ in addition to models.
 
 ## Installation
 
-- install bolt.staff and bolt.htmx, add bolt.admin and bolt.htmx to installed packages
+- install bolt.staff and bolt.htmx, add bolt.staff.admin and bolt.htmx to installed packages
 - add url
 
 ## Models in the admin
@@ -238,11 +238,11 @@ To impersonate users, you need the app, middleware, and URLs:
 ```python
 # settings.py
 INSTALLED_PACKAGES = INSTALLED_PACKAGES + [
-  "bolt.impersonate",
+  "bolt.staff.impersonate",
 ]
 
 MIDDLEWARE = MIDDLEWARE + [
-  "bolt.impersonate.ImpersonateMiddleware",
+  "bolt.staff.impersonate.ImpersonateMiddleware",
 ]
 ```
 
@@ -250,7 +250,7 @@ MIDDLEWARE = MIDDLEWARE + [
 # urls.py
 urlpatterns = [
     # ...
-    path("impersonate/", include("bolt.impersonate.urls")),
+    path("impersonate/", include("bolt.staff.impersonate.urls")),
 ]
 ```
 
diff --git a/bolt-staff/bolt/admin/migrations/__init__.py b/bolt-staff/bolt/staff/admin/__init__.py
similarity index 100%
rename from bolt-staff/bolt/admin/migrations/__init__.py
rename to bolt-staff/bolt/staff/admin/__init__.py
diff --git a/bolt-staff/bolt/admin/assets/admin/admin.css b/bolt-staff/bolt/staff/admin/assets/admin/admin.css
similarity index 100%
rename from bolt-staff/bolt/admin/assets/admin/admin.css
rename to bolt-staff/bolt/staff/admin/assets/admin/admin.css
diff --git a/bolt-staff/bolt/admin/assets/admin/admin.js b/bolt-staff/bolt/staff/admin/assets/admin/admin.js
similarity index 100%
rename from bolt-staff/bolt/admin/assets/admin/admin.js
rename to bolt-staff/bolt/staff/admin/assets/admin/admin.js
diff --git a/bolt-staff/bolt/admin/assets/admin/chart.js b/bolt-staff/bolt/staff/admin/assets/admin/chart.js
similarity index 100%
rename from bolt-staff/bolt/admin/assets/admin/chart.js
rename to bolt-staff/bolt/staff/admin/assets/admin/chart.js
diff --git a/bolt-staff/bolt/admin/assets/admin/jquery-3.6.1.slim.min.js b/bolt-staff/bolt/staff/admin/assets/admin/jquery-3.6.1.slim.min.js
similarity index 100%
rename from bolt-staff/bolt/admin/assets/admin/jquery-3.6.1.slim.min.js
rename to bolt-staff/bolt/staff/admin/assets/admin/jquery-3.6.1.slim.min.js
diff --git a/bolt-staff/bolt/admin/assets/admin/list.js b/bolt-staff/bolt/staff/admin/assets/admin/list.js
similarity index 100%
rename from bolt-staff/bolt/admin/assets/admin/list.js
rename to bolt-staff/bolt/staff/admin/assets/admin/list.js
diff --git a/bolt-staff/bolt/admin/cards/__init__.py b/bolt-staff/bolt/staff/admin/cards/__init__.py
similarity index 100%
rename from bolt-staff/bolt/admin/cards/__init__.py
rename to bolt-staff/bolt/staff/admin/cards/__init__.py
diff --git a/bolt-staff/bolt/admin/cards/base.py b/bolt-staff/bolt/staff/admin/cards/base.py
similarity index 97%
rename from bolt-staff/bolt/admin/cards/base.py
rename to bolt-staff/bolt/staff/admin/cards/base.py
index e2b5333c8f..e1789c017c 100644
--- a/bolt-staff/bolt/admin/cards/base.py
+++ b/bolt-staff/bolt/staff/admin/cards/base.py
@@ -1,7 +1,7 @@
 from enum import Enum
 
-from bolt.admin.dates import DatetimeRange, DatetimeRangeAliases
 from bolt.http import HttpRequest
+from bolt.staff.admin.dates import DatetimeRange, DatetimeRangeAliases
 from bolt.templates import Template
 from bolt.utils.text import slugify
 from bolt.views import View
diff --git a/bolt-staff/bolt/admin/cards/charts.py b/bolt-staff/bolt/staff/admin/cards/charts.py
similarity index 100%
rename from bolt-staff/bolt/admin/cards/charts.py
rename to bolt-staff/bolt/staff/admin/cards/charts.py
diff --git a/bolt-staff/bolt/admin/cards/tables.py b/bolt-staff/bolt/staff/admin/cards/tables.py
similarity index 100%
rename from bolt-staff/bolt/admin/cards/tables.py
rename to bolt-staff/bolt/staff/admin/cards/tables.py
diff --git a/bolt-staff/bolt/admin/config.py b/bolt-staff/bolt/staff/admin/config.py
similarity index 95%
rename from bolt-staff/bolt/admin/config.py
rename to bolt-staff/bolt/staff/admin/config.py
index b837c425ff..ee27f16b30 100644
--- a/bolt-staff/bolt/admin/config.py
+++ b/bolt-staff/bolt/staff/admin/config.py
@@ -6,7 +6,7 @@
 
 
 class BoltAdminConfig(PackageConfig):
-    name = "bolt.admin"
+    name = "bolt.staff.admin"
     label = "boltadmin"
 
     def ready(self):
diff --git a/bolt-staff/bolt/admin/dates.py b/bolt-staff/bolt/staff/admin/dates.py
similarity index 100%
rename from bolt-staff/bolt/admin/dates.py
rename to bolt-staff/bolt/staff/admin/dates.py
diff --git a/bolt-staff/bolt/admin/jinja.py b/bolt-staff/bolt/staff/admin/jinja.py
similarity index 100%
rename from bolt-staff/bolt/admin/jinja.py
rename to bolt-staff/bolt/staff/admin/jinja.py
diff --git a/bolt-staff/bolt/admin/migrations/0001_initial.py b/bolt-staff/bolt/staff/admin/migrations/0001_initial.py
similarity index 100%
rename from bolt-staff/bolt/admin/migrations/0001_initial.py
rename to bolt-staff/bolt/staff/admin/migrations/0001_initial.py
diff --git a/bolt-staff/bolt/admin/migrations/0002_alter_dashboard_cards.py b/bolt-staff/bolt/staff/admin/migrations/0002_alter_dashboard_cards.py
similarity index 100%
rename from bolt-staff/bolt/admin/migrations/0002_alter_dashboard_cards.py
rename to bolt-staff/bolt/staff/admin/migrations/0002_alter_dashboard_cards.py
diff --git a/bolt-staff/bolt/admin/migrations/0003_delete_dashboard.py b/bolt-staff/bolt/staff/admin/migrations/0003_delete_dashboard.py
similarity index 100%
rename from bolt-staff/bolt/admin/migrations/0003_delete_dashboard.py
rename to bolt-staff/bolt/staff/admin/migrations/0003_delete_dashboard.py
diff --git a/bolt-staff/bolt/impersonate/models.py b/bolt-staff/bolt/staff/admin/migrations/__init__.py
similarity index 100%
rename from bolt-staff/bolt/impersonate/models.py
rename to bolt-staff/bolt/staff/admin/migrations/__init__.py
diff --git a/bolt-staff/bolt/admin/templates/admin/base.html b/bolt-staff/bolt/staff/admin/templates/admin/base.html
similarity index 100%
rename from bolt-staff/bolt/admin/templates/admin/base.html
rename to bolt-staff/bolt/staff/admin/templates/admin/base.html
diff --git a/bolt-staff/bolt/admin/templates/admin/cards/base.html b/bolt-staff/bolt/staff/admin/templates/admin/cards/base.html
similarity index 100%
rename from bolt-staff/bolt/admin/templates/admin/cards/base.html
rename to bolt-staff/bolt/staff/admin/templates/admin/cards/base.html
diff --git a/bolt-staff/bolt/admin/templates/admin/cards/card.html b/bolt-staff/bolt/staff/admin/templates/admin/cards/card.html
similarity index 100%
rename from bolt-staff/bolt/admin/templates/admin/cards/card.html
rename to bolt-staff/bolt/staff/admin/templates/admin/cards/card.html
diff --git a/bolt-staff/bolt/admin/templates/admin/cards/chart.html b/bolt-staff/bolt/staff/admin/templates/admin/cards/chart.html
similarity index 100%
rename from bolt-staff/bolt/admin/templates/admin/cards/chart.html
rename to bolt-staff/bolt/staff/admin/templates/admin/cards/chart.html
diff --git a/bolt-staff/bolt/admin/templates/admin/cards/table.html b/bolt-staff/bolt/staff/admin/templates/admin/cards/table.html
similarity index 100%
rename from bolt-staff/bolt/admin/templates/admin/cards/table.html
rename to bolt-staff/bolt/staff/admin/templates/admin/cards/table.html
diff --git a/bolt-staff/bolt/admin/templates/admin/detail.html b/bolt-staff/bolt/staff/admin/templates/admin/detail.html
similarity index 100%
rename from bolt-staff/bolt/admin/templates/admin/detail.html
rename to bolt-staff/bolt/staff/admin/templates/admin/detail.html
diff --git a/bolt-staff/bolt/admin/templates/admin/form.html b/bolt-staff/bolt/staff/admin/templates/admin/form.html
similarity index 100%
rename from bolt-staff/bolt/admin/templates/admin/form.html
rename to bolt-staff/bolt/staff/admin/templates/admin/form.html
diff --git a/bolt-staff/bolt/admin/templates/admin/index.html b/bolt-staff/bolt/staff/admin/templates/admin/index.html
similarity index 100%
rename from bolt-staff/bolt/admin/templates/admin/index.html
rename to bolt-staff/bolt/staff/admin/templates/admin/index.html
diff --git a/bolt-staff/bolt/admin/templates/admin/list.html b/bolt-staff/bolt/staff/admin/templates/admin/list.html
similarity index 100%
rename from bolt-staff/bolt/admin/templates/admin/list.html
rename to bolt-staff/bolt/staff/admin/templates/admin/list.html
diff --git a/bolt-staff/bolt/admin/templates/admin/page.html b/bolt-staff/bolt/staff/admin/templates/admin/page.html
similarity index 100%
rename from bolt-staff/bolt/admin/templates/admin/page.html
rename to bolt-staff/bolt/staff/admin/templates/admin/page.html
diff --git a/bolt-staff/bolt/admin/templates/admin/search.html b/bolt-staff/bolt/staff/admin/templates/admin/search.html
similarity index 100%
rename from bolt-staff/bolt/admin/templates/admin/search.html
rename to bolt-staff/bolt/staff/admin/templates/admin/search.html
diff --git a/bolt-staff/bolt/admin/templates/admin/values/UUID.html b/bolt-staff/bolt/staff/admin/templates/admin/values/UUID.html
similarity index 100%
rename from bolt-staff/bolt/admin/templates/admin/values/UUID.html
rename to bolt-staff/bolt/staff/admin/templates/admin/values/UUID.html
diff --git a/bolt-staff/bolt/admin/templates/admin/values/bool.html b/bolt-staff/bolt/staff/admin/templates/admin/values/bool.html
similarity index 100%
rename from bolt-staff/bolt/admin/templates/admin/values/bool.html
rename to bolt-staff/bolt/staff/admin/templates/admin/values/bool.html
diff --git a/bolt-staff/bolt/admin/templates/admin/values/datetime.html b/bolt-staff/bolt/staff/admin/templates/admin/values/datetime.html
similarity index 100%
rename from bolt-staff/bolt/admin/templates/admin/values/datetime.html
rename to bolt-staff/bolt/staff/admin/templates/admin/values/datetime.html
diff --git a/bolt-staff/bolt/admin/templates/admin/values/default.html b/bolt-staff/bolt/staff/admin/templates/admin/values/default.html
similarity index 100%
rename from bolt-staff/bolt/admin/templates/admin/values/default.html
rename to bolt-staff/bolt/staff/admin/templates/admin/values/default.html
diff --git a/bolt-staff/bolt/admin/templates/admin/values/get_display.html b/bolt-staff/bolt/staff/admin/templates/admin/values/get_display.html
similarity index 100%
rename from bolt-staff/bolt/admin/templates/admin/values/get_display.html
rename to bolt-staff/bolt/staff/admin/templates/admin/values/get_display.html
diff --git a/bolt-staff/bolt/admin/templates/elements/admin/Checkbox.html b/bolt-staff/bolt/staff/admin/templates/elements/admin/Checkbox.html
similarity index 100%
rename from bolt-staff/bolt/admin/templates/elements/admin/Checkbox.html
rename to bolt-staff/bolt/staff/admin/templates/elements/admin/Checkbox.html
diff --git a/bolt-staff/bolt/admin/templates/elements/admin/CheckboxField.html b/bolt-staff/bolt/staff/admin/templates/elements/admin/CheckboxField.html
similarity index 100%
rename from bolt-staff/bolt/admin/templates/elements/admin/CheckboxField.html
rename to bolt-staff/bolt/staff/admin/templates/elements/admin/CheckboxField.html
diff --git a/bolt-staff/bolt/admin/templates/elements/admin/FieldErrors.html b/bolt-staff/bolt/staff/admin/templates/elements/admin/FieldErrors.html
similarity index 100%
rename from bolt-staff/bolt/admin/templates/elements/admin/FieldErrors.html
rename to bolt-staff/bolt/staff/admin/templates/elements/admin/FieldErrors.html
diff --git a/bolt-staff/bolt/admin/templates/elements/admin/Input.html b/bolt-staff/bolt/staff/admin/templates/elements/admin/Input.html
similarity index 100%
rename from bolt-staff/bolt/admin/templates/elements/admin/Input.html
rename to bolt-staff/bolt/staff/admin/templates/elements/admin/Input.html
diff --git a/bolt-staff/bolt/admin/templates/elements/admin/InputField.html b/bolt-staff/bolt/staff/admin/templates/elements/admin/InputField.html
similarity index 100%
rename from bolt-staff/bolt/admin/templates/elements/admin/InputField.html
rename to bolt-staff/bolt/staff/admin/templates/elements/admin/InputField.html
diff --git a/bolt-staff/bolt/admin/templates/elements/admin/Label.html b/bolt-staff/bolt/staff/admin/templates/elements/admin/Label.html
similarity index 100%
rename from bolt-staff/bolt/admin/templates/elements/admin/Label.html
rename to bolt-staff/bolt/staff/admin/templates/elements/admin/Label.html
diff --git a/bolt-staff/bolt/admin/templates/elements/admin/Select.html b/bolt-staff/bolt/staff/admin/templates/elements/admin/Select.html
similarity index 100%
rename from bolt-staff/bolt/admin/templates/elements/admin/Select.html
rename to bolt-staff/bolt/staff/admin/templates/elements/admin/Select.html
diff --git a/bolt-staff/bolt/admin/templates/elements/admin/SelectField.html b/bolt-staff/bolt/staff/admin/templates/elements/admin/SelectField.html
similarity index 100%
rename from bolt-staff/bolt/admin/templates/elements/admin/SelectField.html
rename to bolt-staff/bolt/staff/admin/templates/elements/admin/SelectField.html
diff --git a/bolt-staff/bolt/admin/templates/elements/admin/Submit.html b/bolt-staff/bolt/staff/admin/templates/elements/admin/Submit.html
similarity index 100%
rename from bolt-staff/bolt/admin/templates/elements/admin/Submit.html
rename to bolt-staff/bolt/staff/admin/templates/elements/admin/Submit.html
diff --git a/bolt-staff/bolt/admin/urls.py b/bolt-staff/bolt/staff/admin/urls.py
similarity index 100%
rename from bolt-staff/bolt/admin/urls.py
rename to bolt-staff/bolt/staff/admin/urls.py
diff --git a/bolt-staff/bolt/admin/views/__init__.py b/bolt-staff/bolt/staff/admin/views/__init__.py
similarity index 100%
rename from bolt-staff/bolt/admin/views/__init__.py
rename to bolt-staff/bolt/staff/admin/views/__init__.py
diff --git a/bolt-staff/bolt/admin/views/base.py b/bolt-staff/bolt/staff/admin/views/base.py
similarity index 99%
rename from bolt-staff/bolt/admin/views/base.py
rename to bolt-staff/bolt/staff/admin/views/base.py
index 8bb4d44a1e..4ed53a5d6f 100644
--- a/bolt-staff/bolt/admin/views/base.py
+++ b/bolt-staff/bolt/staff/admin/views/base.py
@@ -1,11 +1,11 @@
 from typing import TYPE_CHECKING
 
-from bolt.admin.dates import DatetimeRange, DatetimeRangeAliases
 from bolt.auth.views import AuthViewMixin
 from bolt.db import models
 from bolt.htmx.views import HTMXViewMixin
 from bolt.http import Response, ResponseRedirect
 from bolt.paginator import Paginator
+from bolt.staff.admin.dates import DatetimeRange, DatetimeRangeAliases
 from bolt.urls import reverse
 from bolt.utils import timezone
 from bolt.utils.text import slugify
diff --git a/bolt-staff/bolt/admin/views/default.py b/bolt-staff/bolt/staff/admin/views/default.py
similarity index 100%
rename from bolt-staff/bolt/admin/views/default.py
rename to bolt-staff/bolt/staff/admin/views/default.py
diff --git a/bolt-staff/bolt/admin/views/models.py b/bolt-staff/bolt/staff/admin/views/models.py
similarity index 100%
rename from bolt-staff/bolt/admin/views/models.py
rename to bolt-staff/bolt/staff/admin/views/models.py
diff --git a/bolt-staff/bolt/admin/views/registry.py b/bolt-staff/bolt/staff/admin/views/registry.py
similarity index 96%
rename from bolt-staff/bolt/admin/views/registry.py
rename to bolt-staff/bolt/staff/admin/views/registry.py
index 3992b66d60..76a923372a 100644
--- a/bolt-staff/bolt/admin/views/registry.py
+++ b/bolt-staff/bolt/staff/admin/views/registry.py
@@ -106,8 +106,8 @@ def get_searchable_views(self):
         return views
 
     def get_model_detail_url(self, instance):
-        from bolt.admin.views.base import URL_NAMESPACE
-        from bolt.admin.views.models import AdminModelDetailView
+        from bolt.staff.admin.views.base import URL_NAMESPACE
+        from bolt.staff.admin.views.models import AdminModelDetailView
 
         if not instance.pk:
             # Has to actually be in the db
diff --git a/bolt-staff/bolt/impersonate/README.md b/bolt-staff/bolt/staff/impersonate/README.md
similarity index 85%
rename from bolt-staff/bolt/impersonate/README.md
rename to bolt-staff/bolt/staff/impersonate/README.md
index b1d6266a29..06864c75c1 100644
--- a/bolt-staff/bolt/impersonate/README.md
+++ b/bolt-staff/bolt/staff/impersonate/README.md
@@ -18,11 +18,11 @@ To impersonate users, you need the app, middleware, and URLs:
 ```python
 # settings.py
 INSTALLED_PACKAGES = INSTALLED_PACKAGES + [
-  "bolt.impersonate",
+  "bolt.staff.impersonate",
 ]
 
 MIDDLEWARE = MIDDLEWARE + [
-  "bolt.impersonate.ImpersonateMiddleware",
+  "bolt.staff.impersonate.ImpersonateMiddleware",
 ]
 ```
 
@@ -30,7 +30,7 @@ MIDDLEWARE = MIDDLEWARE + [
 # urls.py
 urlpatterns = [
     # ...
-    path("impersonate/", include("bolt.impersonate.urls")),
+    path("impersonate/", include("bolt.staff.impersonate.urls")),
 ]
 ```
 
diff --git a/bolt-staff/bolt/impersonate/__init__.py b/bolt-staff/bolt/staff/impersonate/__init__.py
similarity index 100%
rename from bolt-staff/bolt/impersonate/__init__.py
rename to bolt-staff/bolt/staff/impersonate/__init__.py
diff --git a/bolt-staff/bolt/impersonate/middleware.py b/bolt-staff/bolt/staff/impersonate/middleware.py
similarity index 100%
rename from bolt-staff/bolt/impersonate/middleware.py
rename to bolt-staff/bolt/staff/impersonate/middleware.py
diff --git a/bolt-staff/bolt/staff/impersonate/models.py b/bolt-staff/bolt/staff/impersonate/models.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/bolt-staff/bolt/impersonate/permissions.py b/bolt-staff/bolt/staff/impersonate/permissions.py
similarity index 100%
rename from bolt-staff/bolt/impersonate/permissions.py
rename to bolt-staff/bolt/staff/impersonate/permissions.py
diff --git a/bolt-staff/bolt/impersonate/settings.py b/bolt-staff/bolt/staff/impersonate/settings.py
similarity index 100%
rename from bolt-staff/bolt/impersonate/settings.py
rename to bolt-staff/bolt/staff/impersonate/settings.py
diff --git a/bolt-staff/bolt/impersonate/urls.py b/bolt-staff/bolt/staff/impersonate/urls.py
similarity index 100%
rename from bolt-staff/bolt/impersonate/urls.py
rename to bolt-staff/bolt/staff/impersonate/urls.py
diff --git a/bolt-staff/bolt/impersonate/views.py b/bolt-staff/bolt/staff/impersonate/views.py
similarity index 100%
rename from bolt-staff/bolt/impersonate/views.py
rename to bolt-staff/bolt/staff/impersonate/views.py
diff --git a/bolt-staff/bolt/querystats/README.md b/bolt-staff/bolt/staff/querystats/README.md
similarity index 100%
rename from bolt-staff/bolt/querystats/README.md
rename to bolt-staff/bolt/staff/querystats/README.md
diff --git a/bolt-staff/bolt/querystats/__init__.py b/bolt-staff/bolt/staff/querystats/__init__.py
similarity index 100%
rename from bolt-staff/bolt/querystats/__init__.py
rename to bolt-staff/bolt/staff/querystats/__init__.py
diff --git a/bolt-staff/bolt/querystats/core.py b/bolt-staff/bolt/staff/querystats/core.py
similarity index 100%
rename from bolt-staff/bolt/querystats/core.py
rename to bolt-staff/bolt/staff/querystats/core.py
diff --git a/bolt-staff/bolt/querystats/middleware.py b/bolt-staff/bolt/staff/querystats/middleware.py
similarity index 100%
rename from bolt-staff/bolt/querystats/middleware.py
rename to bolt-staff/bolt/staff/querystats/middleware.py
diff --git a/bolt-staff/bolt/querystats/templates/querystats/querystats.html b/bolt-staff/bolt/staff/querystats/templates/querystats/querystats.html
similarity index 100%
rename from bolt-staff/bolt/querystats/templates/querystats/querystats.html
rename to bolt-staff/bolt/staff/querystats/templates/querystats/querystats.html
diff --git a/bolt-staff/bolt/querystats/templates/querystats/toolbar.html b/bolt-staff/bolt/staff/querystats/templates/querystats/toolbar.html
similarity index 100%
rename from bolt-staff/bolt/querystats/templates/querystats/toolbar.html
rename to bolt-staff/bolt/staff/querystats/templates/querystats/toolbar.html
diff --git a/bolt-staff/bolt/querystats/urls.py b/bolt-staff/bolt/staff/querystats/urls.py
similarity index 100%
rename from bolt-staff/bolt/querystats/urls.py
rename to bolt-staff/bolt/staff/querystats/urls.py
diff --git a/bolt-staff/bolt/querystats/views.py b/bolt-staff/bolt/staff/querystats/views.py
similarity index 100%
rename from bolt-staff/bolt/querystats/views.py
rename to bolt-staff/bolt/staff/querystats/views.py
diff --git a/bolt-staff/bolt/toolbar/README.md b/bolt-staff/bolt/staff/toolbar/README.md
similarity index 100%
rename from bolt-staff/bolt/toolbar/README.md
rename to bolt-staff/bolt/staff/toolbar/README.md
diff --git a/bolt-staff/bolt/toolbar/__init__.py b/bolt-staff/bolt/staff/toolbar/__init__.py
similarity index 100%
rename from bolt-staff/bolt/toolbar/__init__.py
rename to bolt-staff/bolt/staff/toolbar/__init__.py
diff --git a/bolt-staff/bolt/toolbar/assets/toolbar/toolbar.js b/bolt-staff/bolt/staff/toolbar/assets/toolbar/toolbar.js
similarity index 100%
rename from bolt-staff/bolt/toolbar/assets/toolbar/toolbar.js
rename to bolt-staff/bolt/staff/toolbar/assets/toolbar/toolbar.js
diff --git a/bolt-staff/bolt/toolbar/core.py b/bolt-staff/bolt/staff/toolbar/core.py
similarity index 100%
rename from bolt-staff/bolt/toolbar/core.py
rename to bolt-staff/bolt/staff/toolbar/core.py
diff --git a/bolt-staff/bolt/staff/toolbar/default_settings.py b/bolt-staff/bolt/staff/toolbar/default_settings.py
new file mode 100644
index 0000000000..63fdd2a05d
--- /dev/null
+++ b/bolt-staff/bolt/staff/toolbar/default_settings.py
@@ -0,0 +1 @@
+TOOLBAR_CLASS = "bolt.staff.toolbar.Toolbar"
diff --git a/bolt-staff/bolt/toolbar/jinja.py b/bolt-staff/bolt/staff/toolbar/jinja.py
similarity index 100%
rename from bolt-staff/bolt/toolbar/jinja.py
rename to bolt-staff/bolt/staff/toolbar/jinja.py
diff --git a/bolt-staff/bolt/toolbar/templates/toolbar/links.html b/bolt-staff/bolt/staff/toolbar/templates/toolbar/links.html
similarity index 100%
rename from bolt-staff/bolt/toolbar/templates/toolbar/links.html
rename to bolt-staff/bolt/staff/toolbar/templates/toolbar/links.html
diff --git a/bolt-staff/bolt/toolbar/templates/toolbar/toolbar.html b/bolt-staff/bolt/staff/toolbar/templates/toolbar/toolbar.html
similarity index 100%
rename from bolt-staff/bolt/toolbar/templates/toolbar/toolbar.html
rename to bolt-staff/bolt/staff/toolbar/templates/toolbar/toolbar.html
diff --git a/bolt-staff/bolt/toolbar/default_settings.py b/bolt-staff/bolt/toolbar/default_settings.py
deleted file mode 100644
index 86060d6d19..0000000000
--- a/bolt-staff/bolt/toolbar/default_settings.py
+++ /dev/null
@@ -1 +0,0 @@
-TOOLBAR_CLASS = "bolt.toolbar.Toolbar"
diff --git a/bolt-staff/tests_impersonate/settings.py b/bolt-staff/tests_impersonate/settings.py
index 37f7bed5dc..c525c5c25c 100644
--- a/bolt-staff/tests_impersonate/settings.py
+++ b/bolt-staff/tests_impersonate/settings.py
@@ -9,7 +9,7 @@
 INSTALLED_PACKAGES = [
     "bolt.auth",
     "bolt.sessions",
-    "bolt.impersonate",
+    "bolt.staff.impersonate",
 ]
 
 MIDDLEWARE = [
@@ -19,7 +19,7 @@
     "bolt.csrf.middleware.CsrfViewMiddleware",
     "bolt.auth.middleware.AuthenticationMiddleware",
     "bolt.middleware.clickjacking.XFrameOptionsMiddleware",
-    "bolt.impersonate.middleware.ImpersonateMiddleware",
+    "bolt.staff.impersonate.middleware.ImpersonateMiddleware",
 ]
 
 DATABASES = {
diff --git a/bolt-worker/bolt/worker/admin.py b/bolt-worker/bolt/worker/admin.py
index fce9976bc5..48a9b02e5e 100644
--- a/bolt-worker/bolt/worker/admin.py
+++ b/bolt-worker/bolt/worker/admin.py
@@ -1,16 +1,16 @@
 from datetime import timedelta
 
-from bolt.admin.cards import Card
-from bolt.admin.dates import DatetimeRangeAliases
-from bolt.admin.views import (
+from bolt.db import models
+from bolt.http import ResponseRedirect
+from bolt.runtime import settings
+from bolt.staff.admin.cards import Card
+from bolt.staff.admin.dates import DatetimeRangeAliases
+from bolt.staff.admin.views import (
     AdminModelDetailView,
     AdminModelListView,
     AdminModelViewset,
     register_viewset,
 )
-from bolt.db import models
-from bolt.http import ResponseRedirect
-from bolt.runtime import settings
 
 from .models import Job, JobRequest, JobResult
 
diff --git a/bolt/bolt/packages/config.py b/bolt/bolt/packages/config.py
index a0f90d7325..a095392e53 100644
--- a/bolt/bolt/packages/config.py
+++ b/bolt/bolt/packages/config.py
@@ -15,10 +15,10 @@ class PackageConfig:
     migrations_module = "migrations"
 
     def __init__(self, package_name, package_module):
-        # Full Python path to the application e.g. 'bolt.admin.admin'.
+        # Full Python path to the application e.g. 'bolt.staff.admin.admin'.
         self.name = package_name
 
-        # Root module for the application e.g. <module 'bolt.admin.admin'
+        # Root module for the application e.g. <module 'bolt.staff.admin.admin'
         # from 'admin/__init__.py'>.
         self.module = package_module
 
@@ -43,7 +43,7 @@ def __init__(self, package_name, package_module):
         if not hasattr(self, "path"):
             self.path = self._path_from_module(package_module)
 
-        # Module containing models e.g. <module 'bolt.admin.models'
+        # Module containing models e.g. <module 'bolt.staff.admin.models'
         # from 'admin/models.py'>. Set by import_models().
         # None if the application doesn't have a models module.
         self.models_module = None
diff --git a/bolt/bolt/packages/registry.py b/bolt/bolt/packages/registry.py
index 6efd77dd4e..79ba19a06f 100644
--- a/bolt/bolt/packages/registry.py
+++ b/bolt/bolt/packages/registry.py
@@ -243,7 +243,7 @@ def is_installed(self, package_name):
         """
         Check whether an application with this name exists in the registry.
 
-        package_name is the full name of the app e.g. 'bolt.admin'.
+        package_name is the full name of the app e.g. 'bolt.staff.admin'.
         """
         self.check_packages_ready()
         return any(ac.name == package_name for ac in self.package_configs.values())
diff --git a/scripts/compile-readmes b/scripts/compile-readmes
index db142cc03c..2c6158e361 100755
--- a/scripts/compile-readmes
+++ b/scripts/compile-readmes
@@ -25,12 +25,8 @@ compile_readme "bolt/README.md" "bolt/bolt/README.md"
 
 # Now do the same for every bolt-* package and the README.md found at bolt-<pkg>/bolt/*/README.md
 for package_dir in bolt-*; do
-    # if [ -d "$package_dir/bolt" ]; then
-    # Find the README.md in $package_dir/bolt/*/README.md
-    find "$package_dir/bolt" -name "README.md" | while read -r code_readme; do
-        package_readme="$package_dir/README.md"
-        compile_readme "$package_readme" "$code_readme"
-    done
-    # compile_readme "$package_dir/README.md" "$package_dir/bolt/README.md"
-    # fi
+    package_name=$(echo "$package_dir" | sed -e "s/^bolt-//")
+    package_readme="$package_dir/README.md"
+    code_readme="$package_dir/bolt/$package_name/README.md"
+    compile_readme "$package_readme" "$code_readme"
 done