diff --git a/app/Http/Controllers/Auth/ConfirmEmailController.php b/app/Access/Controllers/ConfirmEmailController.php
similarity index 93%
rename from app/Http/Controllers/Auth/ConfirmEmailController.php
rename to app/Access/Controllers/ConfirmEmailController.php
index fdde8e70c..94647e06e 100644
--- a/app/Http/Controllers/Auth/ConfirmEmailController.php
+++ b/app/Access/Controllers/ConfirmEmailController.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace BookStack\Http\Controllers\Auth;
+namespace BookStack\Access\Controllers;
 
-use BookStack\Auth\Access\EmailConfirmationService;
-use BookStack\Auth\Access\LoginService;
-use BookStack\Auth\UserRepo;
+use BookStack\Access\EmailConfirmationService;
+use BookStack\Access\LoginService;
 use BookStack\Exceptions\ConfirmationEmailException;
 use BookStack\Exceptions\UserTokenExpiredException;
 use BookStack\Exceptions\UserTokenNotFoundException;
-use BookStack\Http\Controllers\Controller;
+use BookStack\Http\Controller;
+use BookStack\Users\UserRepo;
 use Exception;
 use Illuminate\Http\Request;
 
diff --git a/app/Http/Controllers/Auth/ForgotPasswordController.php b/app/Access/Controllers/ForgotPasswordController.php
similarity index 94%
rename from app/Http/Controllers/Auth/ForgotPasswordController.php
rename to app/Access/Controllers/ForgotPasswordController.php
index 2bdc31df5..bc59e9d2f 100644
--- a/app/Http/Controllers/Auth/ForgotPasswordController.php
+++ b/app/Access/Controllers/ForgotPasswordController.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace BookStack\Http\Controllers\Auth;
+namespace BookStack\Access\Controllers;
 
-use BookStack\Actions\ActivityType;
-use BookStack\Http\Controllers\Controller;
+use BookStack\Activity\ActivityType;
+use BookStack\Http\Controller;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Password;
 
diff --git a/app/Http/Controllers/Auth/HandlesPartialLogins.php b/app/Access/Controllers/HandlesPartialLogins.php
similarity index 81%
rename from app/Http/Controllers/Auth/HandlesPartialLogins.php
rename to app/Access/Controllers/HandlesPartialLogins.php
index c7f362151..c5554e473 100644
--- a/app/Http/Controllers/Auth/HandlesPartialLogins.php
+++ b/app/Access/Controllers/HandlesPartialLogins.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace BookStack\Http\Controllers\Auth;
+namespace BookStack\Access\Controllers;
 
-use BookStack\Auth\Access\LoginService;
-use BookStack\Auth\User;
+use BookStack\Access\LoginService;
 use BookStack\Exceptions\NotFoundException;
+use BookStack\Users\Models\User;
 
 trait HandlesPartialLogins
 {
diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Access/Controllers/LoginController.php
similarity index 97%
rename from app/Http/Controllers/Auth/LoginController.php
rename to app/Access/Controllers/LoginController.php
index e16feb079..3b4f9b347 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Access/Controllers/LoginController.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace BookStack\Http\Controllers\Auth;
+namespace BookStack\Access\Controllers;
 
-use BookStack\Auth\Access\LoginService;
-use BookStack\Auth\Access\SocialAuthService;
+use BookStack\Access\LoginService;
+use BookStack\Access\SocialAuthService;
 use BookStack\Exceptions\LoginAttemptEmailNeededException;
 use BookStack\Exceptions\LoginAttemptException;
 use BookStack\Facades\Activity;
-use BookStack\Http\Controllers\Controller;
+use BookStack\Http\Controller;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
diff --git a/app/Http/Controllers/Auth/MfaBackupCodesController.php b/app/Access/Controllers/MfaBackupCodesController.php
similarity index 91%
rename from app/Http/Controllers/Auth/MfaBackupCodesController.php
rename to app/Access/Controllers/MfaBackupCodesController.php
index 4ceb394b0..5c334674e 100644
--- a/app/Http/Controllers/Auth/MfaBackupCodesController.php
+++ b/app/Access/Controllers/MfaBackupCodesController.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace BookStack\Http\Controllers\Auth;
+namespace BookStack\Access\Controllers;
 
-use BookStack\Actions\ActivityType;
-use BookStack\Auth\Access\LoginService;
-use BookStack\Auth\Access\Mfa\BackupCodeService;
-use BookStack\Auth\Access\Mfa\MfaSession;
-use BookStack\Auth\Access\Mfa\MfaValue;
+use BookStack\Access\LoginService;
+use BookStack\Access\Mfa\BackupCodeService;
+use BookStack\Access\Mfa\MfaSession;
+use BookStack\Access\Mfa\MfaValue;
+use BookStack\Activity\ActivityType;
 use BookStack\Exceptions\NotFoundException;
-use BookStack\Http\Controllers\Controller;
+use BookStack\Http\Controller;
 use Exception;
 use Illuminate\Http\Request;
 use Illuminate\Validation\ValidationException;
diff --git a/app/Http/Controllers/Auth/MfaController.php b/app/Access/Controllers/MfaController.php
similarity index 92%
rename from app/Http/Controllers/Auth/MfaController.php
rename to app/Access/Controllers/MfaController.php
index 6f6beb873..c9100ef91 100644
--- a/app/Http/Controllers/Auth/MfaController.php
+++ b/app/Access/Controllers/MfaController.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace BookStack\Http\Controllers\Auth;
+namespace BookStack\Access\Controllers;
 
-use BookStack\Actions\ActivityType;
-use BookStack\Auth\Access\Mfa\MfaValue;
-use BookStack\Http\Controllers\Controller;
+use BookStack\Access\Mfa\MfaValue;
+use BookStack\Activity\ActivityType;
+use BookStack\Http\Controller;
 use Illuminate\Http\Request;
 
 class MfaController extends Controller
diff --git a/app/Http/Controllers/Auth/MfaTotpController.php b/app/Access/Controllers/MfaTotpController.php
similarity index 89%
rename from app/Http/Controllers/Auth/MfaTotpController.php
rename to app/Access/Controllers/MfaTotpController.php
index a4cb63155..f60644b84 100644
--- a/app/Http/Controllers/Auth/MfaTotpController.php
+++ b/app/Access/Controllers/MfaTotpController.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace BookStack\Http\Controllers\Auth;
+namespace BookStack\Access\Controllers;
 
-use BookStack\Actions\ActivityType;
-use BookStack\Auth\Access\LoginService;
-use BookStack\Auth\Access\Mfa\MfaSession;
-use BookStack\Auth\Access\Mfa\MfaValue;
-use BookStack\Auth\Access\Mfa\TotpService;
-use BookStack\Auth\Access\Mfa\TotpValidationRule;
+use BookStack\Access\LoginService;
+use BookStack\Access\Mfa\MfaSession;
+use BookStack\Access\Mfa\MfaValue;
+use BookStack\Access\Mfa\TotpService;
+use BookStack\Access\Mfa\TotpValidationRule;
+use BookStack\Activity\ActivityType;
 use BookStack\Exceptions\NotFoundException;
-use BookStack\Http\Controllers\Controller;
+use BookStack\Http\Controller;
 use Illuminate\Http\Request;
 use Illuminate\Validation\ValidationException;
 
diff --git a/app/Http/Controllers/Auth/OidcController.php b/app/Access/Controllers/OidcController.php
similarity index 90%
rename from app/Http/Controllers/Auth/OidcController.php
rename to app/Access/Controllers/OidcController.php
index 78a47e488..e8c944934 100644
--- a/app/Http/Controllers/Auth/OidcController.php
+++ b/app/Access/Controllers/OidcController.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace BookStack\Http\Controllers\Auth;
+namespace BookStack\Access\Controllers;
 
-use BookStack\Auth\Access\Oidc\OidcException;
-use BookStack\Auth\Access\Oidc\OidcService;
-use BookStack\Http\Controllers\Controller;
+use BookStack\Access\Oidc\OidcException;
+use BookStack\Access\Oidc\OidcService;
+use BookStack\Http\Controller;
 use Illuminate\Http\Request;
 
 class OidcController extends Controller
diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Access/Controllers/RegisterController.php
similarity index 92%
rename from app/Http/Controllers/Auth/RegisterController.php
rename to app/Access/Controllers/RegisterController.php
index 262ca540e..3c653a073 100644
--- a/app/Http/Controllers/Auth/RegisterController.php
+++ b/app/Access/Controllers/RegisterController.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace BookStack\Http\Controllers\Auth;
+namespace BookStack\Access\Controllers;
 
-use BookStack\Auth\Access\LoginService;
-use BookStack\Auth\Access\RegistrationService;
-use BookStack\Auth\Access\SocialAuthService;
+use BookStack\Access\LoginService;
+use BookStack\Access\RegistrationService;
+use BookStack\Access\SocialAuthService;
 use BookStack\Exceptions\StoppedAuthenticationException;
 use BookStack\Exceptions\UserRegistrationException;
-use BookStack\Http\Controllers\Controller;
+use BookStack\Http\Controller;
 use Illuminate\Contracts\Validation\Validator as ValidatorContract;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Validator;
diff --git a/app/Http/Controllers/Auth/ResetPasswordController.php b/app/Access/Controllers/ResetPasswordController.php
similarity index 94%
rename from app/Http/Controllers/Auth/ResetPasswordController.php
rename to app/Access/Controllers/ResetPasswordController.php
index a9914928e..eae4e5e25 100644
--- a/app/Http/Controllers/Auth/ResetPasswordController.php
+++ b/app/Access/Controllers/ResetPasswordController.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace BookStack\Http\Controllers\Auth;
+namespace BookStack\Access\Controllers;
 
-use BookStack\Actions\ActivityType;
-use BookStack\Auth\Access\LoginService;
-use BookStack\Auth\User;
-use BookStack\Http\Controllers\Controller;
+use BookStack\Access\LoginService;
+use BookStack\Activity\ActivityType;
+use BookStack\Http\Controller;
+use BookStack\Users\Models\User;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Hash;
diff --git a/app/Http/Controllers/Auth/Saml2Controller.php b/app/Access/Controllers/Saml2Controller.php
similarity index 96%
rename from app/Http/Controllers/Auth/Saml2Controller.php
rename to app/Access/Controllers/Saml2Controller.php
index b3f8e7601..2f1698446 100644
--- a/app/Http/Controllers/Auth/Saml2Controller.php
+++ b/app/Access/Controllers/Saml2Controller.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace BookStack\Http\Controllers\Auth;
+namespace BookStack\Access\Controllers;
 
-use BookStack\Auth\Access\Saml2Service;
-use BookStack\Http\Controllers\Controller;
+use BookStack\Access\Saml2Service;
+use BookStack\Http\Controller;
 use Illuminate\Http\Request;
 use Illuminate\Support\Str;
 
diff --git a/app/Http/Controllers/Auth/SocialController.php b/app/Access/Controllers/SocialController.php
similarity index 95%
rename from app/Http/Controllers/Auth/SocialController.php
rename to app/Access/Controllers/SocialController.php
index 9ba4028ec..3df895dd8 100644
--- a/app/Http/Controllers/Auth/SocialController.php
+++ b/app/Access/Controllers/SocialController.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace BookStack\Http\Controllers\Auth;
+namespace BookStack\Access\Controllers;
 
-use BookStack\Auth\Access\LoginService;
-use BookStack\Auth\Access\RegistrationService;
-use BookStack\Auth\Access\SocialAuthService;
+use BookStack\Access\LoginService;
+use BookStack\Access\RegistrationService;
+use BookStack\Access\SocialAuthService;
 use BookStack\Exceptions\SocialDriverNotConfigured;
 use BookStack\Exceptions\SocialSignInAccountNotUsed;
 use BookStack\Exceptions\SocialSignInException;
 use BookStack\Exceptions\UserRegistrationException;
-use BookStack\Http\Controllers\Controller;
+use BookStack\Http\Controller;
 use Illuminate\Http\Request;
 use Illuminate\Support\Str;
 use Laravel\Socialite\Contracts\User as SocialUser;
diff --git a/app/Http/Controllers/Auth/ThrottlesLogins.php b/app/Access/Controllers/ThrottlesLogins.php
similarity index 98%
rename from app/Http/Controllers/Auth/ThrottlesLogins.php
rename to app/Access/Controllers/ThrottlesLogins.php
index 7578ba898..2a066dab5 100644
--- a/app/Http/Controllers/Auth/ThrottlesLogins.php
+++ b/app/Access/Controllers/ThrottlesLogins.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BookStack\Http\Controllers\Auth;
+namespace BookStack\Access\Controllers;
 
 use Illuminate\Cache\RateLimiter;
 use Illuminate\Http\Request;
diff --git a/app/Http/Controllers/Auth/UserInviteController.php b/app/Access/Controllers/UserInviteController.php
similarity index 94%
rename from app/Http/Controllers/Auth/UserInviteController.php
rename to app/Access/Controllers/UserInviteController.php
index 5b3bba6ff..9ee05b84f 100644
--- a/app/Http/Controllers/Auth/UserInviteController.php
+++ b/app/Access/Controllers/UserInviteController.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace BookStack\Http\Controllers\Auth;
+namespace BookStack\Access\Controllers;
 
-use BookStack\Auth\Access\UserInviteService;
-use BookStack\Auth\UserRepo;
+use BookStack\Access\UserInviteService;
 use BookStack\Exceptions\UserTokenExpiredException;
 use BookStack\Exceptions\UserTokenNotFoundException;
-use BookStack\Http\Controllers\Controller;
+use BookStack\Http\Controller;
+use BookStack\Users\UserRepo;
 use Exception;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
diff --git a/app/Auth/Access/EmailConfirmationService.php b/app/Access/EmailConfirmationService.php
similarity index 94%
rename from app/Auth/Access/EmailConfirmationService.php
rename to app/Access/EmailConfirmationService.php
index 1873cad08..79220f996 100644
--- a/app/Auth/Access/EmailConfirmationService.php
+++ b/app/Access/EmailConfirmationService.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace BookStack\Auth\Access;
+namespace BookStack\Access;
 
-use BookStack\Auth\User;
 use BookStack\Exceptions\ConfirmationEmailException;
 use BookStack\Notifications\ConfirmEmail;
+use BookStack\Users\Models\User;
 
 class EmailConfirmationService extends UserTokenService
 {
diff --git a/app/Auth/Access/ExternalBaseUserProvider.php b/app/Access/ExternalBaseUserProvider.php
similarity index 98%
rename from app/Auth/Access/ExternalBaseUserProvider.php
rename to app/Access/ExternalBaseUserProvider.php
index 122425c11..d3ece983f 100644
--- a/app/Auth/Access/ExternalBaseUserProvider.php
+++ b/app/Access/ExternalBaseUserProvider.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BookStack\Auth\Access;
+namespace BookStack\Access;
 
 use Illuminate\Contracts\Auth\Authenticatable;
 use Illuminate\Contracts\Auth\UserProvider;
diff --git a/app/Auth/Access/GroupSyncService.php b/app/Access/GroupSyncService.php
similarity index 96%
rename from app/Auth/Access/GroupSyncService.php
rename to app/Access/GroupSyncService.php
index 37d4e02d0..65e3e8fcd 100644
--- a/app/Auth/Access/GroupSyncService.php
+++ b/app/Access/GroupSyncService.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace BookStack\Auth\Access;
+namespace BookStack\Access;
 
-use BookStack\Auth\Role;
-use BookStack\Auth\User;
+use BookStack\Users\Models\Role;
+use BookStack\Users\Models\User;
 use Illuminate\Support\Collection;
 
 class GroupSyncService
diff --git a/app/Auth/Access/Guards/AsyncExternalBaseSessionGuard.php b/app/Access/Guards/AsyncExternalBaseSessionGuard.php
similarity index 95%
rename from app/Auth/Access/Guards/AsyncExternalBaseSessionGuard.php
rename to app/Access/Guards/AsyncExternalBaseSessionGuard.php
index 6677f5b10..ab982a6b0 100644
--- a/app/Auth/Access/Guards/AsyncExternalBaseSessionGuard.php
+++ b/app/Access/Guards/AsyncExternalBaseSessionGuard.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BookStack\Auth\Access\Guards;
+namespace BookStack\Access\Guards;
 
 /**
  * Saml2 Session Guard.
diff --git a/app/Auth/Access/Guards/ExternalBaseSessionGuard.php b/app/Access/Guards/ExternalBaseSessionGuard.php
similarity index 98%
rename from app/Auth/Access/Guards/ExternalBaseSessionGuard.php
rename to app/Access/Guards/ExternalBaseSessionGuard.php
index 99bfd2e79..2d15422a5 100644
--- a/app/Auth/Access/Guards/ExternalBaseSessionGuard.php
+++ b/app/Access/Guards/ExternalBaseSessionGuard.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace BookStack\Auth\Access\Guards;
+namespace BookStack\Access\Guards;
 
-use BookStack\Auth\Access\RegistrationService;
+use BookStack\Access\RegistrationService;
 use Illuminate\Auth\GuardHelpers;
 use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract;
 use Illuminate\Contracts\Auth\StatefulGuard;
diff --git a/app/Auth/Access/Guards/LdapSessionGuard.php b/app/Access/Guards/LdapSessionGuard.php
similarity index 96%
rename from app/Auth/Access/Guards/LdapSessionGuard.php
rename to app/Access/Guards/LdapSessionGuard.php
index e7ed22704..a417d3e61 100644
--- a/app/Auth/Access/Guards/LdapSessionGuard.php
+++ b/app/Access/Guards/LdapSessionGuard.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace BookStack\Auth\Access\Guards;
+namespace BookStack\Access\Guards;
 
-use BookStack\Auth\Access\LdapService;
-use BookStack\Auth\Access\RegistrationService;
-use BookStack\Auth\User;
+use BookStack\Access\LdapService;
+use BookStack\Access\RegistrationService;
 use BookStack\Exceptions\JsonDebugException;
 use BookStack\Exceptions\LdapException;
 use BookStack\Exceptions\LoginAttemptEmailNeededException;
 use BookStack\Exceptions\LoginAttemptException;
 use BookStack\Exceptions\UserRegistrationException;
+use BookStack\Users\Models\User;
 use Illuminate\Contracts\Auth\UserProvider;
 use Illuminate\Contracts\Session\Session;
 use Illuminate\Support\Str;
diff --git a/app/Auth/Access/Ldap.php b/app/Access/Ldap.php
similarity index 99%
rename from app/Auth/Access/Ldap.php
rename to app/Access/Ldap.php
index 4bf6db474..d245b3444 100644
--- a/app/Auth/Access/Ldap.php
+++ b/app/Access/Ldap.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BookStack\Auth\Access;
+namespace BookStack\Access;
 
 /**
  * Class Ldap
diff --git a/app/Auth/Access/LdapService.php b/app/Access/LdapService.php
similarity index 99%
rename from app/Auth/Access/LdapService.php
rename to app/Access/LdapService.php
index 359eeca2f..b127b931a 100644
--- a/app/Auth/Access/LdapService.php
+++ b/app/Access/LdapService.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace BookStack\Auth\Access;
+namespace BookStack\Access;
 
-use BookStack\Auth\User;
 use BookStack\Exceptions\JsonDebugException;
 use BookStack\Exceptions\LdapException;
 use BookStack\Uploads\UserAvatars;
+use BookStack\Users\Models\User;
 use ErrorException;
 use Illuminate\Support\Facades\Log;
 
diff --git a/app/Auth/Access/LoginService.php b/app/Access/LoginService.php
similarity index 97%
rename from app/Auth/Access/LoginService.php
rename to app/Access/LoginService.php
index c80943166..27480ba21 100644
--- a/app/Auth/Access/LoginService.php
+++ b/app/Access/LoginService.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace BookStack\Auth\Access;
+namespace BookStack\Access;
 
-use BookStack\Actions\ActivityType;
-use BookStack\Auth\Access\Mfa\MfaSession;
-use BookStack\Auth\User;
+use BookStack\Access\Mfa\MfaSession;
+use BookStack\Activity\ActivityType;
 use BookStack\Exceptions\LoginAttemptException;
 use BookStack\Exceptions\StoppedAuthenticationException;
 use BookStack\Facades\Activity;
 use BookStack\Facades\Theme;
 use BookStack\Theming\ThemeEvents;
+use BookStack\Users\Models\User;
 use Exception;
 
 class LoginService
diff --git a/app/Auth/Access/Mfa/BackupCodeService.php b/app/Access/Mfa/BackupCodeService.php
similarity index 97%
rename from app/Auth/Access/Mfa/BackupCodeService.php
rename to app/Access/Mfa/BackupCodeService.php
index d58d28ae1..7d68d4f92 100644
--- a/app/Auth/Access/Mfa/BackupCodeService.php
+++ b/app/Access/Mfa/BackupCodeService.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BookStack\Auth\Access\Mfa;
+namespace BookStack\Access\Mfa;
 
 use Illuminate\Support\Str;
 
diff --git a/app/Auth/Access/Mfa/MfaSession.php b/app/Access/Mfa/MfaSession.php
similarity index 95%
rename from app/Auth/Access/Mfa/MfaSession.php
rename to app/Access/Mfa/MfaSession.php
index 72163b58e..09b9e53b8 100644
--- a/app/Auth/Access/Mfa/MfaSession.php
+++ b/app/Access/Mfa/MfaSession.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace BookStack\Auth\Access\Mfa;
+namespace BookStack\Access\Mfa;
 
-use BookStack\Auth\User;
+use BookStack\Users\Models\User;
 
 class MfaSession
 {
diff --git a/app/Auth/Access/Mfa/MfaValue.php b/app/Access/Mfa/MfaValue.php
similarity index 96%
rename from app/Auth/Access/Mfa/MfaValue.php
rename to app/Access/Mfa/MfaValue.php
index 8f07c6657..64d20eb18 100644
--- a/app/Auth/Access/Mfa/MfaValue.php
+++ b/app/Access/Mfa/MfaValue.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace BookStack\Auth\Access\Mfa;
+namespace BookStack\Access\Mfa;
 
-use BookStack\Auth\User;
+use BookStack\Users\Models\User;
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Model;
 
diff --git a/app/Auth/Access/Mfa/TotpService.php b/app/Access/Mfa/TotpService.php
similarity index 96%
rename from app/Auth/Access/Mfa/TotpService.php
rename to app/Access/Mfa/TotpService.php
index e73c549fe..1d1af451a 100644
--- a/app/Auth/Access/Mfa/TotpService.php
+++ b/app/Access/Mfa/TotpService.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BookStack\Auth\Access\Mfa;
+namespace BookStack\Access\Mfa;
 
 use BaconQrCode\Renderer\Color\Rgb;
 use BaconQrCode\Renderer\Image\SvgImageBackEnd;
@@ -8,7 +8,7 @@ use BaconQrCode\Renderer\ImageRenderer;
 use BaconQrCode\Renderer\RendererStyle\Fill;
 use BaconQrCode\Renderer\RendererStyle\RendererStyle;
 use BaconQrCode\Writer;
-use BookStack\Auth\User;
+use BookStack\Users\Models\User;
 use PragmaRX\Google2FA\Google2FA;
 use PragmaRX\Google2FA\Support\Constants;
 
diff --git a/app/Auth/Access/Mfa/TotpValidationRule.php b/app/Access/Mfa/TotpValidationRule.php
similarity index 95%
rename from app/Auth/Access/Mfa/TotpValidationRule.php
rename to app/Access/Mfa/TotpValidationRule.php
index 22cb7da9b..c38bde90b 100644
--- a/app/Auth/Access/Mfa/TotpValidationRule.php
+++ b/app/Access/Mfa/TotpValidationRule.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BookStack\Auth\Access\Mfa;
+namespace BookStack\Access\Mfa;
 
 use Illuminate\Contracts\Validation\Rule;
 
diff --git a/app/Auth/Access/Oidc/OidcAccessToken.php b/app/Access/Oidc/OidcAccessToken.php
similarity index 97%
rename from app/Auth/Access/Oidc/OidcAccessToken.php
rename to app/Access/Oidc/OidcAccessToken.php
index 520966f6a..2ba56de6c 100644
--- a/app/Auth/Access/Oidc/OidcAccessToken.php
+++ b/app/Access/Oidc/OidcAccessToken.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BookStack\Auth\Access\Oidc;
+namespace BookStack\Access\Oidc;
 
 use InvalidArgumentException;
 use League\OAuth2\Client\Token\AccessToken;
diff --git a/app/Auth/Access/Oidc/OidcException.php b/app/Access/Oidc/OidcException.php
similarity index 63%
rename from app/Auth/Access/Oidc/OidcException.php
rename to app/Access/Oidc/OidcException.php
index e39f2c224..095d2f3ff 100644
--- a/app/Auth/Access/Oidc/OidcException.php
+++ b/app/Access/Oidc/OidcException.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BookStack\Auth\Access\Oidc;
+namespace BookStack\Access\Oidc;
 
 use Exception;
 
diff --git a/app/Auth/Access/Oidc/OidcIdToken.php b/app/Access/Oidc/OidcIdToken.php
similarity index 99%
rename from app/Auth/Access/Oidc/OidcIdToken.php
rename to app/Access/Oidc/OidcIdToken.php
index ca2c85d09..5a395022a 100644
--- a/app/Auth/Access/Oidc/OidcIdToken.php
+++ b/app/Access/Oidc/OidcIdToken.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BookStack\Auth\Access\Oidc;
+namespace BookStack\Access\Oidc;
 
 class OidcIdToken
 {
diff --git a/app/Auth/Access/Oidc/OidcInvalidKeyException.php b/app/Access/Oidc/OidcInvalidKeyException.php
similarity index 61%
rename from app/Auth/Access/Oidc/OidcInvalidKeyException.php
rename to app/Access/Oidc/OidcInvalidKeyException.php
index 1b3310e06..14c310133 100644
--- a/app/Auth/Access/Oidc/OidcInvalidKeyException.php
+++ b/app/Access/Oidc/OidcInvalidKeyException.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BookStack\Auth\Access\Oidc;
+namespace BookStack\Access\Oidc;
 
 class OidcInvalidKeyException extends \Exception
 {
diff --git a/app/Auth/Access/Oidc/OidcInvalidTokenException.php b/app/Access/Oidc/OidcInvalidTokenException.php
similarity index 67%
rename from app/Auth/Access/Oidc/OidcInvalidTokenException.php
rename to app/Access/Oidc/OidcInvalidTokenException.php
index 4f47eb08f..645f31d7f 100644
--- a/app/Auth/Access/Oidc/OidcInvalidTokenException.php
+++ b/app/Access/Oidc/OidcInvalidTokenException.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BookStack\Auth\Access\Oidc;
+namespace BookStack\Access\Oidc;
 
 use Exception;
 
diff --git a/app/Auth/Access/Oidc/OidcIssuerDiscoveryException.php b/app/Access/Oidc/OidcIssuerDiscoveryException.php
similarity index 68%
rename from app/Auth/Access/Oidc/OidcIssuerDiscoveryException.php
rename to app/Access/Oidc/OidcIssuerDiscoveryException.php
index 1ca1ed44a..1a453b49d 100644
--- a/app/Auth/Access/Oidc/OidcIssuerDiscoveryException.php
+++ b/app/Access/Oidc/OidcIssuerDiscoveryException.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BookStack\Auth\Access\Oidc;
+namespace BookStack\Access\Oidc;
 
 use Exception;
 
diff --git a/app/Auth/Access/Oidc/OidcJwtSigningKey.php b/app/Access/Oidc/OidcJwtSigningKey.php
similarity index 99%
rename from app/Auth/Access/Oidc/OidcJwtSigningKey.php
rename to app/Access/Oidc/OidcJwtSigningKey.php
index f003ec93c..3dab3e442 100644
--- a/app/Auth/Access/Oidc/OidcJwtSigningKey.php
+++ b/app/Access/Oidc/OidcJwtSigningKey.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BookStack\Auth\Access\Oidc;
+namespace BookStack\Access\Oidc;
 
 use phpseclib3\Crypt\Common\PublicKey;
 use phpseclib3\Crypt\PublicKeyLoader;
diff --git a/app/Auth/Access/Oidc/OidcOAuthProvider.php b/app/Access/Oidc/OidcOAuthProvider.php
similarity index 99%
rename from app/Auth/Access/Oidc/OidcOAuthProvider.php
rename to app/Access/Oidc/OidcOAuthProvider.php
index d577d8947..2ed8cd5c9 100644
--- a/app/Auth/Access/Oidc/OidcOAuthProvider.php
+++ b/app/Access/Oidc/OidcOAuthProvider.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BookStack\Auth\Access\Oidc;
+namespace BookStack\Access\Oidc;
 
 use League\OAuth2\Client\Grant\AbstractGrant;
 use League\OAuth2\Client\Provider\AbstractProvider;
diff --git a/app/Auth/Access/Oidc/OidcProviderSettings.php b/app/Access/Oidc/OidcProviderSettings.php
similarity index 99%
rename from app/Auth/Access/Oidc/OidcProviderSettings.php
rename to app/Access/Oidc/OidcProviderSettings.php
index 30ec8cac8..9c8b1b264 100644
--- a/app/Auth/Access/Oidc/OidcProviderSettings.php
+++ b/app/Access/Oidc/OidcProviderSettings.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BookStack\Auth\Access\Oidc;
+namespace BookStack\Access\Oidc;
 
 use GuzzleHttp\Psr7\Request;
 use Illuminate\Contracts\Cache\Repository;
diff --git a/app/Auth/Access/Oidc/OidcService.php b/app/Access/Oidc/OidcService.php
similarity index 97%
rename from app/Auth/Access/Oidc/OidcService.php
rename to app/Access/Oidc/OidcService.php
index 3da8b76eb..6d13fe8f1 100644
--- a/app/Auth/Access/Oidc/OidcService.php
+++ b/app/Access/Oidc/OidcService.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace BookStack\Auth\Access\Oidc;
+namespace BookStack\Access\Oidc;
 
-use BookStack\Auth\Access\GroupSyncService;
-use BookStack\Auth\Access\LoginService;
-use BookStack\Auth\Access\RegistrationService;
-use BookStack\Auth\User;
+use BookStack\Access\GroupSyncService;
+use BookStack\Access\LoginService;
+use BookStack\Access\RegistrationService;
 use BookStack\Exceptions\JsonDebugException;
 use BookStack\Exceptions\StoppedAuthenticationException;
 use BookStack\Exceptions\UserRegistrationException;
 use BookStack\Facades\Theme;
 use BookStack\Theming\ThemeEvents;
+use BookStack\Users\Models\User;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Cache;
 use League\OAuth2\Client\OptionProvider\HttpBasicAuthOptionProvider;
diff --git a/app/Auth/Access/RegistrationService.php b/app/Access/RegistrationService.php
similarity index 96%
rename from app/Auth/Access/RegistrationService.php
rename to app/Access/RegistrationService.php
index 6fcb404ee..1e40a9844 100644
--- a/app/Auth/Access/RegistrationService.php
+++ b/app/Access/RegistrationService.php
@@ -1,15 +1,14 @@
 <?php
 
-namespace BookStack\Auth\Access;
+namespace BookStack\Access;
 
-use BookStack\Actions\ActivityType;
-use BookStack\Auth\SocialAccount;
-use BookStack\Auth\User;
-use BookStack\Auth\UserRepo;
+use BookStack\Activity\ActivityType;
 use BookStack\Exceptions\UserRegistrationException;
 use BookStack\Facades\Activity;
 use BookStack\Facades\Theme;
 use BookStack\Theming\ThemeEvents;
+use BookStack\Users\Models\User;
+use BookStack\Users\UserRepo;
 use Exception;
 use Illuminate\Support\Str;
 
diff --git a/app/Auth/Access/Saml2Service.php b/app/Access/Saml2Service.php
similarity index 99%
rename from app/Auth/Access/Saml2Service.php
rename to app/Access/Saml2Service.php
index 24efd7f64..c033bd6a1 100644
--- a/app/Auth/Access/Saml2Service.php
+++ b/app/Access/Saml2Service.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace BookStack\Auth\Access;
+namespace BookStack\Access;
 
-use BookStack\Auth\User;
 use BookStack\Exceptions\JsonDebugException;
 use BookStack\Exceptions\SamlException;
 use BookStack\Exceptions\StoppedAuthenticationException;
 use BookStack\Exceptions\UserRegistrationException;
+use BookStack\Users\Models\User;
 use Exception;
 use OneLogin\Saml2\Auth;
 use OneLogin\Saml2\Constants;
diff --git a/app/Auth/SocialAccount.php b/app/Access/SocialAccount.php
similarity index 79%
rename from app/Auth/SocialAccount.php
rename to app/Access/SocialAccount.php
index 6cf0224a8..b76dbb9ec 100644
--- a/app/Auth/SocialAccount.php
+++ b/app/Access/SocialAccount.php
@@ -1,9 +1,10 @@
 <?php
 
-namespace BookStack\Auth;
+namespace BookStack\Access;
 
-use BookStack\Interfaces\Loggable;
-use BookStack\Model;
+use BookStack\Activity\Models\Loggable;
+use BookStack\App\Model;
+use BookStack\Users\Models\User;
 
 /**
  * Class SocialAccount.
diff --git a/app/Auth/Access/SocialAuthService.php b/app/Access/SocialAuthService.php
similarity index 99%
rename from app/Auth/Access/SocialAuthService.php
rename to app/Access/SocialAuthService.php
index 0df5ceb5e..24a04ef7e 100644
--- a/app/Auth/Access/SocialAuthService.php
+++ b/app/Access/SocialAuthService.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace BookStack\Auth\Access;
+namespace BookStack\Access;
 
-use BookStack\Auth\SocialAccount;
-use BookStack\Auth\User;
+use BookStack\Auth\Access\handler;
 use BookStack\Exceptions\SocialDriverNotConfigured;
 use BookStack\Exceptions\SocialSignInAccountNotUsed;
 use BookStack\Exceptions\UserRegistrationException;
+use BookStack\Users\Models\User;
 use Illuminate\Support\Facades\Event;
 use Illuminate\Support\Str;
 use Laravel\Socialite\Contracts\Factory as Socialite;
diff --git a/app/Auth/Access/UserInviteService.php b/app/Access/UserInviteService.php
similarity index 89%
rename from app/Auth/Access/UserInviteService.php
rename to app/Access/UserInviteService.php
index 191a03dd5..00e361e82 100644
--- a/app/Auth/Access/UserInviteService.php
+++ b/app/Access/UserInviteService.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace BookStack\Auth\Access;
+namespace BookStack\Access;
 
-use BookStack\Auth\User;
 use BookStack\Notifications\UserInvite;
+use BookStack\Users\Models\User;
 
 class UserInviteService extends UserTokenService
 {
diff --git a/app/Auth/Access/UserTokenService.php b/app/Access/UserTokenService.php
similarity index 97%
rename from app/Auth/Access/UserTokenService.php
rename to app/Access/UserTokenService.php
index 8dfe570f9..b4fd09c1b 100644
--- a/app/Auth/Access/UserTokenService.php
+++ b/app/Access/UserTokenService.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace BookStack\Auth\Access;
+namespace BookStack\Access;
 
-use BookStack\Auth\User;
 use BookStack\Exceptions\UserTokenExpiredException;
 use BookStack\Exceptions\UserTokenNotFoundException;
+use BookStack\Users\Models\User;
 use Carbon\Carbon;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Str;
diff --git a/app/Actions/ActivityQueries.php b/app/Activity/ActivityQueries.php
similarity index 95%
rename from app/Actions/ActivityQueries.php
rename to app/Activity/ActivityQueries.php
index 0e9cbdebb..c69cf7a36 100644
--- a/app/Actions/ActivityQueries.php
+++ b/app/Activity/ActivityQueries.php
@@ -1,13 +1,14 @@
 <?php
 
-namespace BookStack\Actions;
+namespace BookStack\Activity;
 
-use BookStack\Auth\Permissions\PermissionApplicator;
-use BookStack\Auth\User;
+use BookStack\Activity\Models\Activity;
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Models\Entity;
 use BookStack\Entities\Models\Page;
+use BookStack\Permissions\PermissionApplicator;
+use BookStack\Users\Models\User;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Relations\Relation;
 
diff --git a/app/Actions/ActivityType.php b/app/Activity/ActivityType.php
similarity index 98%
rename from app/Actions/ActivityType.php
rename to app/Activity/ActivityType.php
index 2a9615093..3018df1d3 100644
--- a/app/Actions/ActivityType.php
+++ b/app/Activity/ActivityType.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BookStack\Actions;
+namespace BookStack\Activity;
 
 class ActivityType
 {
diff --git a/app/Actions/CommentRepo.php b/app/Activity/CommentRepo.php
similarity index 97%
rename from app/Actions/CommentRepo.php
rename to app/Activity/CommentRepo.php
index 2f2dd658a..f16767fcf 100644
--- a/app/Actions/CommentRepo.php
+++ b/app/Activity/CommentRepo.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace BookStack\Actions;
+namespace BookStack\Activity;
 
+use BookStack\Activity\Models\Comment;
 use BookStack\Entities\Models\Entity;
 use BookStack\Facades\Activity as ActivityService;
 use League\CommonMark\CommonMarkConverter;
diff --git a/app/Http/Controllers/AuditLogController.php b/app/Activity/Controllers/AuditLogController.php
similarity index 93%
rename from app/Http/Controllers/AuditLogController.php
rename to app/Activity/Controllers/AuditLogController.php
index da8009d78..c3910a26b 100644
--- a/app/Http/Controllers/AuditLogController.php
+++ b/app/Activity/Controllers/AuditLogController.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace BookStack\Http\Controllers;
+namespace BookStack\Activity\Controllers;
 
-use BookStack\Actions\Activity;
-use BookStack\Actions\ActivityType;
+use BookStack\Activity\ActivityType;
+use BookStack\Activity\Models\Activity;
+use BookStack\Http\Controller;
 use BookStack\Util\SimpleListOptions;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\DB;
 
 class AuditLogController extends Controller
 {
diff --git a/app/Http/Controllers/CommentController.php b/app/Activity/Controllers/CommentController.php
similarity index 95%
rename from app/Http/Controllers/CommentController.php
rename to app/Activity/Controllers/CommentController.php
index 9804f6d39..b198d2d56 100644
--- a/app/Http/Controllers/CommentController.php
+++ b/app/Activity/Controllers/CommentController.php
@@ -1,9 +1,10 @@
 <?php
 
-namespace BookStack\Http\Controllers;
+namespace BookStack\Activity\Controllers;
 
-use BookStack\Actions\CommentRepo;
+use BookStack\Activity\CommentRepo;
 use BookStack\Entities\Models\Page;
+use BookStack\Http\Controller;
 use Illuminate\Http\Request;
 use Illuminate\Validation\ValidationException;
 
diff --git a/app/Http/Controllers/FavouriteController.php b/app/Activity/Controllers/FavouriteController.php
similarity index 95%
rename from app/Http/Controllers/FavouriteController.php
rename to app/Activity/Controllers/FavouriteController.php
index e46442a64..1b88ffd64 100644
--- a/app/Http/Controllers/FavouriteController.php
+++ b/app/Activity/Controllers/FavouriteController.php
@@ -1,11 +1,12 @@
 <?php
 
-namespace BookStack\Http\Controllers;
+namespace BookStack\Activity\Controllers;
 
+use BookStack\Activity\Models\Favouritable;
+use BookStack\App\Model;
 use BookStack\Entities\Models\Entity;
 use BookStack\Entities\Queries\TopFavourites;
-use BookStack\Interfaces\Favouritable;
-use BookStack\Model;
+use BookStack\Http\Controller;
 use Illuminate\Http\Request;
 
 class FavouriteController extends Controller
diff --git a/app/Http/Controllers/TagController.php b/app/Activity/Controllers/TagController.php
similarity index 94%
rename from app/Http/Controllers/TagController.php
rename to app/Activity/Controllers/TagController.php
index 00aaf2b78..0af8835ca 100644
--- a/app/Http/Controllers/TagController.php
+++ b/app/Activity/Controllers/TagController.php
@@ -1,8 +1,9 @@
 <?php
 
-namespace BookStack\Http\Controllers;
+namespace BookStack\Activity\Controllers;
 
-use BookStack\Actions\TagRepo;
+use BookStack\Activity\TagRepo;
+use BookStack\Http\Controller;
 use BookStack\Util\SimpleListOptions;
 use Illuminate\Http\Request;
 
diff --git a/app/Http/Controllers/WebhookController.php b/app/Activity/Controllers/WebhookController.php
similarity index 95%
rename from app/Http/Controllers/WebhookController.php
rename to app/Activity/Controllers/WebhookController.php
index c72dcc510..dcca1dc41 100644
--- a/app/Http/Controllers/WebhookController.php
+++ b/app/Activity/Controllers/WebhookController.php
@@ -1,10 +1,11 @@
 <?php
 
-namespace BookStack\Http\Controllers;
+namespace BookStack\Activity\Controllers;
 
-use BookStack\Actions\ActivityType;
-use BookStack\Actions\Queries\WebhooksAllPaginatedAndSorted;
-use BookStack\Actions\Webhook;
+use BookStack\Activity\ActivityType;
+use BookStack\Activity\Models\Webhook;
+use BookStack\Activity\Queries\WebhooksAllPaginatedAndSorted;
+use BookStack\Http\Controller;
 use BookStack\Util\SimpleListOptions;
 use Illuminate\Http\Request;
 
diff --git a/app/Actions/DispatchWebhookJob.php b/app/Activity/DispatchWebhookJob.php
similarity index 92%
rename from app/Actions/DispatchWebhookJob.php
rename to app/Activity/DispatchWebhookJob.php
index 2d805228c..5e6380f43 100644
--- a/app/Actions/DispatchWebhookJob.php
+++ b/app/Activity/DispatchWebhookJob.php
@@ -1,11 +1,13 @@
 <?php
 
-namespace BookStack\Actions;
+namespace BookStack\Activity;
 
-use BookStack\Auth\User;
+use BookStack\Activity\Models\Loggable;
+use BookStack\Activity\Models\Webhook;
+use BookStack\Activity\Tools\WebhookFormatter;
 use BookStack\Facades\Theme;
-use BookStack\Interfaces\Loggable;
 use BookStack\Theming\ThemeEvents;
+use BookStack\Users\Models\User;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
diff --git a/app/Actions/Activity.php b/app/Activity/Models/Activity.php
similarity index 92%
rename from app/Actions/Activity.php
rename to app/Activity/Models/Activity.php
index 0789fe123..1fa36e5be 100644
--- a/app/Actions/Activity.php
+++ b/app/Activity/Models/Activity.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace BookStack\Actions;
+namespace BookStack\Activity\Models;
 
-use BookStack\Auth\Permissions\JointPermission;
-use BookStack\Auth\User;
+use BookStack\App\Model;
 use BookStack\Entities\Models\Entity;
-use BookStack\Model;
+use BookStack\Permissions\Models\JointPermission;
+use BookStack\Users\Models\User;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
diff --git a/app/Actions/Comment.php b/app/Activity/Models/Comment.php
similarity index 91%
rename from app/Actions/Comment.php
rename to app/Activity/Models/Comment.php
index 885ba6ed1..e513bdf3d 100644
--- a/app/Actions/Comment.php
+++ b/app/Activity/Models/Comment.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace BookStack\Actions;
+namespace BookStack\Activity\Models;
 
-use BookStack\Model;
-use BookStack\Traits\HasCreatorAndUpdater;
+use BookStack\App\Model;
+use BookStack\Users\Models\HasCreatorAndUpdater;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 
diff --git a/app/Interfaces/Favouritable.php b/app/Activity/Models/Favouritable.php
similarity index 84%
rename from app/Interfaces/Favouritable.php
rename to app/Activity/Models/Favouritable.php
index 8a311d1f2..7a2b9247a 100644
--- a/app/Interfaces/Favouritable.php
+++ b/app/Activity/Models/Favouritable.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BookStack\Interfaces;
+namespace BookStack\Activity\Models;
 
 use Illuminate\Database\Eloquent\Relations\MorphMany;
 
diff --git a/app/Actions/Favourite.php b/app/Activity/Models/Favourite.php
similarity index 84%
rename from app/Actions/Favourite.php
rename to app/Activity/Models/Favourite.php
index c5d12a151..6f6079b07 100644
--- a/app/Actions/Favourite.php
+++ b/app/Activity/Models/Favourite.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace BookStack\Actions;
+namespace BookStack\Activity\Models;
 
-use BookStack\Auth\Permissions\JointPermission;
-use BookStack\Model;
+use BookStack\App\Model;
+use BookStack\Permissions\Models\JointPermission;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 
diff --git a/app/Interfaces/Loggable.php b/app/Activity/Models/Loggable.php
similarity index 79%
rename from app/Interfaces/Loggable.php
rename to app/Activity/Models/Loggable.php
index 923f64b00..f068b1f2c 100644
--- a/app/Interfaces/Loggable.php
+++ b/app/Activity/Models/Loggable.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BookStack\Interfaces;
+namespace BookStack\Activity\Models;
 
 interface Loggable
 {
diff --git a/app/Actions/Tag.php b/app/Activity/Models/Tag.php
similarity index 92%
rename from app/Actions/Tag.php
rename to app/Activity/Models/Tag.php
index e173faea0..0af0a65ac 100644
--- a/app/Actions/Tag.php
+++ b/app/Activity/Models/Tag.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace BookStack\Actions;
+namespace BookStack\Activity\Models;
 
-use BookStack\Auth\Permissions\JointPermission;
-use BookStack\Model;
+use BookStack\App\Model;
+use BookStack\Permissions\Models\JointPermission;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
diff --git a/app/Actions/View.php b/app/Activity/Models/View.php
similarity index 92%
rename from app/Actions/View.php
rename to app/Activity/Models/View.php
index 706467133..a6bc2139e 100644
--- a/app/Actions/View.php
+++ b/app/Activity/Models/View.php
@@ -1,10 +1,9 @@
 <?php
 
-namespace BookStack\Actions;
+namespace BookStack\Activity\Models;
 
-use BookStack\Auth\Permissions\JointPermission;
-use BookStack\Interfaces\Viewable;
-use BookStack\Model;
+use BookStack\App\Model;
+use BookStack\Permissions\Models\JointPermission;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 
diff --git a/app/Interfaces/Viewable.php b/app/Activity/Models/Viewable.php
similarity index 84%
rename from app/Interfaces/Viewable.php
rename to app/Activity/Models/Viewable.php
index d79ebed99..ccb6d5296 100644
--- a/app/Interfaces/Viewable.php
+++ b/app/Activity/Models/Viewable.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BookStack\Interfaces;
+namespace BookStack\Activity\Models;
 
 use Illuminate\Database\Eloquent\Relations\MorphMany;
 
diff --git a/app/Actions/Webhook.php b/app/Activity/Models/Webhook.php
similarity index 96%
rename from app/Actions/Webhook.php
rename to app/Activity/Models/Webhook.php
index 3ed5bb56f..2a80c71a7 100644
--- a/app/Actions/Webhook.php
+++ b/app/Activity/Models/Webhook.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace BookStack\Actions;
+namespace BookStack\Activity\Models;
 
-use BookStack\Interfaces\Loggable;
+use BookStack\Activity\ActivityType;
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
diff --git a/app/Actions/WebhookTrackedEvent.php b/app/Activity/Models/WebhookTrackedEvent.php
similarity index 88%
rename from app/Actions/WebhookTrackedEvent.php
rename to app/Activity/Models/WebhookTrackedEvent.php
index 28b3a366d..ac38849e9 100644
--- a/app/Actions/WebhookTrackedEvent.php
+++ b/app/Activity/Models/WebhookTrackedEvent.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BookStack\Actions;
+namespace BookStack\Activity\Models;
 
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
diff --git a/app/Actions/Queries/WebhooksAllPaginatedAndSorted.php b/app/Activity/Queries/WebhooksAllPaginatedAndSorted.php
similarity index 91%
rename from app/Actions/Queries/WebhooksAllPaginatedAndSorted.php
rename to app/Activity/Queries/WebhooksAllPaginatedAndSorted.php
index 4958b6070..0f23343a4 100644
--- a/app/Actions/Queries/WebhooksAllPaginatedAndSorted.php
+++ b/app/Activity/Queries/WebhooksAllPaginatedAndSorted.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace BookStack\Actions\Queries;
+namespace BookStack\Activity\Queries;
 
-use BookStack\Actions\Webhook;
+use BookStack\Activity\Models\Webhook;
 use BookStack\Util\SimpleListOptions;
 use Illuminate\Pagination\LengthAwarePaginator;
 
diff --git a/app/Actions/TagRepo.php b/app/Activity/TagRepo.php
similarity index 97%
rename from app/Actions/TagRepo.php
rename to app/Activity/TagRepo.php
index 13d1d957e..4f2dbed59 100644
--- a/app/Actions/TagRepo.php
+++ b/app/Activity/TagRepo.php
@@ -1,9 +1,10 @@
 <?php
 
-namespace BookStack\Actions;
+namespace BookStack\Activity;
 
-use BookStack\Auth\Permissions\PermissionApplicator;
+use BookStack\Activity\Models\Tag;
 use BookStack\Entities\Models\Entity;
+use BookStack\Permissions\PermissionApplicator;
 use BookStack\Util\SimpleListOptions;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Collection;
diff --git a/app/Actions/ActivityLogger.php b/app/Activity/Tools/ActivityLogger.php
similarity index 94%
rename from app/Actions/ActivityLogger.php
rename to app/Activity/Tools/ActivityLogger.php
index 6ece47fd5..105f9c408 100644
--- a/app/Actions/ActivityLogger.php
+++ b/app/Activity/Tools/ActivityLogger.php
@@ -1,10 +1,13 @@
 <?php
 
-namespace BookStack\Actions;
+namespace BookStack\Activity\Tools;
 
+use BookStack\Activity\DispatchWebhookJob;
+use BookStack\Activity\Models\Activity;
+use BookStack\Activity\Models\Loggable;
+use BookStack\Activity\Models\Webhook;
 use BookStack\Entities\Models\Entity;
 use BookStack\Facades\Theme;
-use BookStack\Interfaces\Loggable;
 use BookStack\Theming\ThemeEvents;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Facades\Log;
diff --git a/app/Actions/IpFormatter.php b/app/Activity/Tools/IpFormatter.php
similarity index 98%
rename from app/Actions/IpFormatter.php
rename to app/Activity/Tools/IpFormatter.php
index 21616ed29..13b56e994 100644
--- a/app/Actions/IpFormatter.php
+++ b/app/Activity/Tools/IpFormatter.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BookStack\Actions;
+namespace BookStack\Activity\Tools;
 
 class IpFormatter
 {
diff --git a/app/Actions/TagClassGenerator.php b/app/Activity/Tools/TagClassGenerator.php
similarity index 93%
rename from app/Actions/TagClassGenerator.php
rename to app/Activity/Tools/TagClassGenerator.php
index 7173b30a7..1a1bd16c8 100644
--- a/app/Actions/TagClassGenerator.php
+++ b/app/Activity/Tools/TagClassGenerator.php
@@ -1,6 +1,8 @@
 <?php
 
-namespace BookStack\Actions;
+namespace BookStack\Activity\Tools;
+
+use BookStack\Activity\Models\Tag;
 
 class TagClassGenerator
 {
diff --git a/app/Actions/WebhookFormatter.php b/app/Activity/Tools/WebhookFormatter.php
similarity index 94%
rename from app/Actions/WebhookFormatter.php
rename to app/Activity/Tools/WebhookFormatter.php
index bd0b6853a..423713978 100644
--- a/app/Actions/WebhookFormatter.php
+++ b/app/Activity/Tools/WebhookFormatter.php
@@ -1,12 +1,14 @@
 <?php
 
-namespace BookStack\Actions;
+namespace BookStack\Activity\Tools;
 
-use BookStack\Auth\User;
+use BookStack\Activity\ActivityType;
+use BookStack\Activity\Models\Loggable;
+use BookStack\Activity\Models\Webhook;
+use BookStack\App\Model;
 use BookStack\Entities\Models\Entity;
 use BookStack\Entities\Models\Page;
-use BookStack\Interfaces\Loggable;
-use BookStack\Model;
+use BookStack\Users\Models\User;
 use Illuminate\Support\Carbon;
 
 class WebhookFormatter
diff --git a/app/Http/Controllers/Api/ApiDocsController.php b/app/Api/ApiDocsController.php
similarity index 88%
rename from app/Http/Controllers/Api/ApiDocsController.php
rename to app/Api/ApiDocsController.php
index a1453e768..020c8902f 100644
--- a/app/Http/Controllers/Api/ApiDocsController.php
+++ b/app/Api/ApiDocsController.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace BookStack\Http\Controllers\Api;
+namespace BookStack\Api;
 
-use BookStack\Api\ApiDocsGenerator;
+use BookStack\Http\ApiController;
 
 class ApiDocsController extends ApiController
 {
diff --git a/app/Api/ApiDocsGenerator.php b/app/Api/ApiDocsGenerator.php
index 671923ab1..f13842328 100644
--- a/app/Api/ApiDocsGenerator.php
+++ b/app/Api/ApiDocsGenerator.php
@@ -2,7 +2,7 @@
 
 namespace BookStack\Api;
 
-use BookStack\Http\Controllers\Api\ApiController;
+use BookStack\Http\ApiController;
 use Exception;
 use Illuminate\Contracts\Container\BindingResolutionException;
 use Illuminate\Support\Collection;
diff --git a/app/Api/ApiToken.php b/app/Api/ApiToken.php
index 70b289ae1..b462eaae9 100644
--- a/app/Api/ApiToken.php
+++ b/app/Api/ApiToken.php
@@ -2,8 +2,8 @@
 
 namespace BookStack\Api;
 
-use BookStack\Auth\User;
-use BookStack\Interfaces\Loggable;
+use BookStack\Activity\Models\Loggable;
+use BookStack\Users\Models\User;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Support\Carbon;
diff --git a/app/Api/ApiTokenGuard.php b/app/Api/ApiTokenGuard.php
index 1bb672556..6302884a9 100644
--- a/app/Api/ApiTokenGuard.php
+++ b/app/Api/ApiTokenGuard.php
@@ -2,7 +2,7 @@
 
 namespace BookStack\Api;
 
-use BookStack\Auth\Access\LoginService;
+use BookStack\Access\LoginService;
 use BookStack\Exceptions\ApiAuthException;
 use Illuminate\Auth\GuardHelpers;
 use Illuminate\Contracts\Auth\Authenticatable;
diff --git a/app/Http/Controllers/UserApiTokenController.php b/app/Api/UserApiTokenController.php
similarity index 97%
rename from app/Http/Controllers/UserApiTokenController.php
rename to app/Api/UserApiTokenController.php
index b1a043cd3..d8fc1171c 100644
--- a/app/Http/Controllers/UserApiTokenController.php
+++ b/app/Api/UserApiTokenController.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace BookStack\Http\Controllers;
+namespace BookStack\Api;
 
-use BookStack\Actions\ActivityType;
-use BookStack\Api\ApiToken;
-use BookStack\Auth\User;
+use BookStack\Activity\ActivityType;
+use BookStack\Http\Controller;
+use BookStack\Users\Models\User;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Str;
diff --git a/app/Application.php b/app/App/Application.php
similarity index 95%
rename from app/Application.php
rename to app/App/Application.php
index d409d14bc..db60d5293 100644
--- a/app/Application.php
+++ b/app/App/Application.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BookStack;
+namespace BookStack\App;
 
 class Application extends \Illuminate\Foundation\Application
 {
diff --git a/app/Http/Controllers/HomeController.php b/app/App/HomeController.php
similarity index 98%
rename from app/Http/Controllers/HomeController.php
rename to app/App/HomeController.php
index a82710523..667af80d3 100644
--- a/app/Http/Controllers/HomeController.php
+++ b/app/App/HomeController.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace BookStack\Http\Controllers;
+namespace BookStack\App;
 
-use BookStack\Actions\ActivityQueries;
+use BookStack\Activity\ActivityQueries;
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Page;
 use BookStack\Entities\Queries\RecentlyViewed;
@@ -10,6 +10,7 @@ use BookStack\Entities\Queries\TopFavourites;
 use BookStack\Entities\Repos\BookRepo;
 use BookStack\Entities\Repos\BookshelfRepo;
 use BookStack\Entities\Tools\PageContent;
+use BookStack\Http\Controller;
 use BookStack\Uploads\FaviconHandler;
 use BookStack\Util\SimpleListOptions;
 use Illuminate\Http\Request;
diff --git a/app/Model.php b/app/App/Model.php
similarity index 94%
rename from app/Model.php
rename to app/App/Model.php
index 6fdc25097..8de5a2762 100644
--- a/app/Model.php
+++ b/app/App/Model.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BookStack;
+namespace BookStack\App;
 
 use Illuminate\Database\Eloquent\Model as EloquentModel;
 
diff --git a/app/Providers/AppServiceProvider.php b/app/App/Providers/AppServiceProvider.php
similarity index 94%
rename from app/Providers/AppServiceProvider.php
rename to app/App/Providers/AppServiceProvider.php
index 5d36d2c46..0c0895bf4 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/App/Providers/AppServiceProvider.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace BookStack\Providers;
+namespace BookStack\App\Providers;
 
-use BookStack\Actions\ActivityLogger;
-use BookStack\Auth\Access\SocialAuthService;
+use BookStack\Access\SocialAuthService;
+use BookStack\Activity\Tools\ActivityLogger;
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Bookshelf;
 use BookStack\Entities\Models\Chapter;
diff --git a/app/Providers/AuthServiceProvider.php b/app/App/Providers/AuthServiceProvider.php
similarity index 84%
rename from app/Providers/AuthServiceProvider.php
rename to app/App/Providers/AuthServiceProvider.php
index 5e16179ab..dc482ce33 100644
--- a/app/Providers/AuthServiceProvider.php
+++ b/app/App/Providers/AuthServiceProvider.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace BookStack\Providers;
+namespace BookStack\App\Providers;
 
+use BookStack\Access\ExternalBaseUserProvider;
+use BookStack\Access\Guards\AsyncExternalBaseSessionGuard;
+use BookStack\Access\Guards\LdapSessionGuard;
+use BookStack\Access\LdapService;
+use BookStack\Access\LoginService;
+use BookStack\Access\RegistrationService;
 use BookStack\Api\ApiTokenGuard;
-use BookStack\Auth\Access\ExternalBaseUserProvider;
-use BookStack\Auth\Access\Guards\AsyncExternalBaseSessionGuard;
-use BookStack\Auth\Access\Guards\LdapSessionGuard;
-use BookStack\Auth\Access\LdapService;
-use BookStack\Auth\Access\LoginService;
-use BookStack\Auth\Access\RegistrationService;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\ServiceProvider;
 use Illuminate\Validation\Rules\Password;
diff --git a/app/Providers/EventServiceProvider.php b/app/App/Providers/EventServiceProvider.php
similarity index 97%
rename from app/Providers/EventServiceProvider.php
rename to app/App/Providers/EventServiceProvider.php
index 97212e1ea..bf502d7da 100644
--- a/app/Providers/EventServiceProvider.php
+++ b/app/App/Providers/EventServiceProvider.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BookStack\Providers;
+namespace BookStack\App\Providers;
 
 use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
 use SocialiteProviders\Manager\SocialiteWasCalled;
diff --git a/app/Providers/RouteServiceProvider.php b/app/App/Providers/RouteServiceProvider.php
similarity index 98%
rename from app/Providers/RouteServiceProvider.php
rename to app/App/Providers/RouteServiceProvider.php
index 552a41322..913dfa435 100644
--- a/app/Providers/RouteServiceProvider.php
+++ b/app/App/Providers/RouteServiceProvider.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BookStack\Providers;
+namespace BookStack\App\Providers;
 
 use Illuminate\Cache\RateLimiting\Limit;
 use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
diff --git a/app/Providers/ThemeServiceProvider.php b/app/App/Providers/ThemeServiceProvider.php
similarity index 95%
rename from app/Providers/ThemeServiceProvider.php
rename to app/App/Providers/ThemeServiceProvider.php
index 50c4a5d19..4c657d912 100644
--- a/app/Providers/ThemeServiceProvider.php
+++ b/app/App/Providers/ThemeServiceProvider.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BookStack\Providers;
+namespace BookStack\App\Providers;
 
 use BookStack\Theming\ThemeEvents;
 use BookStack\Theming\ThemeService;
diff --git a/app/Providers/TranslationServiceProvider.php b/app/App/Providers/TranslationServiceProvider.php
similarity index 97%
rename from app/Providers/TranslationServiceProvider.php
rename to app/App/Providers/TranslationServiceProvider.php
index 6bf57e021..c1752f38e 100644
--- a/app/Providers/TranslationServiceProvider.php
+++ b/app/App/Providers/TranslationServiceProvider.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BookStack\Providers;
+namespace BookStack\App\Providers;
 
 use BookStack\Translation\FileLoader;
 use BookStack\Translation\MessageSelector;
diff --git a/app/Providers/ValidationRuleServiceProvider.php b/app/App/Providers/ValidationRuleServiceProvider.php
similarity index 96%
rename from app/Providers/ValidationRuleServiceProvider.php
rename to app/App/Providers/ValidationRuleServiceProvider.php
index b3c2a4aa7..1adc1ebd8 100644
--- a/app/Providers/ValidationRuleServiceProvider.php
+++ b/app/App/Providers/ValidationRuleServiceProvider.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BookStack\Providers;
+namespace BookStack\App\Providers;
 
 use BookStack\Uploads\ImageService;
 use Illuminate\Support\Facades\Validator;
diff --git a/app/Providers/ViewTweaksServiceProvider.php b/app/App/Providers/ViewTweaksServiceProvider.php
similarity index 95%
rename from app/Providers/ViewTweaksServiceProvider.php
rename to app/App/Providers/ViewTweaksServiceProvider.php
index f1f1554ae..16b5c1f97 100644
--- a/app/Providers/ViewTweaksServiceProvider.php
+++ b/app/App/Providers/ViewTweaksServiceProvider.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BookStack\Providers;
+namespace BookStack\App\Providers;
 
 use BookStack\Entities\BreadcrumbsViewComposer;
 use Illuminate\Pagination\Paginator;
diff --git a/app/Interfaces/Sluggable.php b/app/App/Sluggable.php
similarity index 89%
rename from app/Interfaces/Sluggable.php
rename to app/App/Sluggable.php
index 2d56e847e..f8da2e265 100644
--- a/app/Interfaces/Sluggable.php
+++ b/app/App/Sluggable.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BookStack\Interfaces;
+namespace BookStack\App;
 
 /**
  * Assigned to models that can have slugs.
diff --git a/app/helpers.php b/app/App/helpers.php
similarity index 97%
rename from app/helpers.php
rename to app/App/helpers.php
index 837b7fcfd..00d3e9243 100644
--- a/app/helpers.php
+++ b/app/App/helpers.php
@@ -1,9 +1,9 @@
 <?php
 
-use BookStack\Auth\Permissions\PermissionApplicator;
-use BookStack\Auth\User;
-use BookStack\Model;
+use BookStack\App\Model;
+use BookStack\Permissions\PermissionApplicator;
 use BookStack\Settings\SettingService;
+use BookStack\Users\Models\User;
 
 /**
  * Get the path to a versioned file.
diff --git a/app/Config/app.php b/app/Config/app.php
index ed73ca612..29ab9c6dc 100644
--- a/app/Config/app.php
+++ b/app/Config/app.php
@@ -139,14 +139,14 @@ return [
         SocialiteProviders\Manager\ServiceProvider::class,
 
         // BookStack custom service providers
-        BookStack\Providers\ThemeServiceProvider::class,
-        BookStack\Providers\AppServiceProvider::class,
-        BookStack\Providers\AuthServiceProvider::class,
-        BookStack\Providers\EventServiceProvider::class,
-        BookStack\Providers\RouteServiceProvider::class,
-        BookStack\Providers\TranslationServiceProvider::class,
-        BookStack\Providers\ValidationRuleServiceProvider::class,
-        BookStack\Providers\ViewTweaksServiceProvider::class,
+        \BookStack\App\Providers\ThemeServiceProvider::class,
+        \BookStack\App\Providers\AppServiceProvider::class,
+        \BookStack\App\Providers\AuthServiceProvider::class,
+        \BookStack\App\Providers\EventServiceProvider::class,
+        \BookStack\App\Providers\RouteServiceProvider::class,
+        \BookStack\App\Providers\TranslationServiceProvider::class,
+        \BookStack\App\Providers\ValidationRuleServiceProvider::class,
+        \BookStack\App\Providers\ViewTweaksServiceProvider::class,
     ],
 
     // Class Aliases
diff --git a/app/Config/auth.php b/app/Config/auth.php
index 37190156a..b1578fdb7 100644
--- a/app/Config/auth.php
+++ b/app/Config/auth.php
@@ -59,12 +59,12 @@ return [
     'providers' => [
         'users' => [
             'driver' => 'eloquent',
-            'model'  => \BookStack\Auth\User::class,
+            'model'  => \BookStack\Users\Models\User::class,
         ],
 
         'external' => [
             'driver' => 'external-users',
-            'model'  => \BookStack\Auth\User::class,
+            'model'  => \BookStack\Users\Models\User::class,
         ],
 
         // 'users' => [
diff --git a/app/Console/Commands/ClearActivity.php b/app/Console/Commands/ClearActivity.php
index 932ba7ddd..5ccf6e972 100644
--- a/app/Console/Commands/ClearActivity.php
+++ b/app/Console/Commands/ClearActivity.php
@@ -2,7 +2,7 @@
 
 namespace BookStack\Console\Commands;
 
-use BookStack\Actions\Activity;
+use BookStack\Activity\Models\Activity;
 use Illuminate\Console\Command;
 
 class ClearActivity extends Command
diff --git a/app/Console/Commands/ClearViews.php b/app/Console/Commands/ClearViews.php
index 0fc6c0195..c76b78d23 100644
--- a/app/Console/Commands/ClearViews.php
+++ b/app/Console/Commands/ClearViews.php
@@ -2,7 +2,7 @@
 
 namespace BookStack\Console\Commands;
 
-use BookStack\Actions\View;
+use BookStack\Activity\Models\View;
 use Illuminate\Console\Command;
 
 class ClearViews extends Command
diff --git a/app/Console/Commands/CreateAdmin.php b/app/Console/Commands/CreateAdmin.php
index e4660314d..377207ed7 100644
--- a/app/Console/Commands/CreateAdmin.php
+++ b/app/Console/Commands/CreateAdmin.php
@@ -2,9 +2,9 @@
 
 namespace BookStack\Console\Commands;
 
-use BookStack\Auth\Role;
-use BookStack\Auth\UserRepo;
 use BookStack\Exceptions\NotFoundException;
+use BookStack\Users\Models\Role;
+use BookStack\Users\UserRepo;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Support\Str;
diff --git a/app/Console/Commands/DeleteUsers.php b/app/Console/Commands/DeleteUsers.php
index bc7263c77..c16a5d9a6 100644
--- a/app/Console/Commands/DeleteUsers.php
+++ b/app/Console/Commands/DeleteUsers.php
@@ -2,8 +2,8 @@
 
 namespace BookStack\Console\Commands;
 
-use BookStack\Auth\User;
-use BookStack\Auth\UserRepo;
+use BookStack\Users\Models\User;
+use BookStack\Users\UserRepo;
 use Illuminate\Console\Command;
 
 class DeleteUsers extends Command
diff --git a/app/Console/Commands/RegenerateCommentContent.php b/app/Console/Commands/RegenerateCommentContent.php
index 3e25dc8a3..3052559e3 100644
--- a/app/Console/Commands/RegenerateCommentContent.php
+++ b/app/Console/Commands/RegenerateCommentContent.php
@@ -2,8 +2,8 @@
 
 namespace BookStack\Console\Commands;
 
-use BookStack\Actions\Comment;
-use BookStack\Actions\CommentRepo;
+use BookStack\Activity\CommentRepo;
+use BookStack\Activity\Models\Comment;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\DB;
 
diff --git a/app/Console/Commands/RegeneratePermissions.php b/app/Console/Commands/RegeneratePermissions.php
index efb3535d6..27dd8ea65 100644
--- a/app/Console/Commands/RegeneratePermissions.php
+++ b/app/Console/Commands/RegeneratePermissions.php
@@ -2,7 +2,7 @@
 
 namespace BookStack\Console\Commands;
 
-use BookStack\Auth\Permissions\JointPermissionBuilder;
+use BookStack\Permissions\JointPermissionBuilder;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\DB;
 
diff --git a/app/Console/Commands/ResetMfa.php b/app/Console/Commands/ResetMfa.php
index 9074a4a46..4b1813099 100644
--- a/app/Console/Commands/ResetMfa.php
+++ b/app/Console/Commands/ResetMfa.php
@@ -2,7 +2,7 @@
 
 namespace BookStack\Console\Commands;
 
-use BookStack\Auth\User;
+use BookStack\Users\Models\User;
 use Illuminate\Console\Command;
 
 class ResetMfa extends Command
diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
index 11c8018c8..f49be1d63 100644
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -7,15 +7,6 @@ use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
 
 class Kernel extends ConsoleKernel
 {
-    /**
-     * The Artisan commands provided by your application.
-     *
-     * @var array
-     */
-    protected $commands = [
-        //
-    ];
-
     /**
      * Define the application's command schedule.
      *
diff --git a/app/Http/Controllers/Api/BookApiController.php b/app/Entities/Controllers/BookApiController.php
similarity index 98%
rename from app/Http/Controllers/Api/BookApiController.php
rename to app/Entities/Controllers/BookApiController.php
index d57b48a43..cb67184a0 100644
--- a/app/Http/Controllers/Api/BookApiController.php
+++ b/app/Entities/Controllers/BookApiController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BookStack\Http\Controllers\Api;
+namespace BookStack\Entities\Controllers;
 
 use BookStack\Api\ApiEntityListFormatter;
 use BookStack\Entities\Models\Book;
@@ -8,6 +8,7 @@ use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Models\Entity;
 use BookStack\Entities\Repos\BookRepo;
 use BookStack\Entities\Tools\BookContents;
+use BookStack\Http\ApiController;
 use Illuminate\Http\Request;
 use Illuminate\Validation\ValidationException;
 
diff --git a/app/Http/Controllers/BookController.php b/app/Entities/Controllers/BookController.php
similarity index 97%
rename from app/Http/Controllers/BookController.php
rename to app/Entities/Controllers/BookController.php
index 14c3af1cc..dcd1af5a1 100644
--- a/app/Http/Controllers/BookController.php
+++ b/app/Entities/Controllers/BookController.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace BookStack\Http\Controllers;
+namespace BookStack\Entities\Controllers;
 
-use BookStack\Actions\ActivityQueries;
-use BookStack\Actions\ActivityType;
-use BookStack\Actions\View;
+use BookStack\Activity\ActivityQueries;
+use BookStack\Activity\ActivityType;
+use BookStack\Activity\Models\View;
 use BookStack\Entities\Models\Bookshelf;
 use BookStack\Entities\Repos\BookRepo;
 use BookStack\Entities\Tools\BookContents;
@@ -14,6 +14,7 @@ use BookStack\Entities\Tools\ShelfContext;
 use BookStack\Exceptions\ImageUploadException;
 use BookStack\Exceptions\NotFoundException;
 use BookStack\Facades\Activity;
+use BookStack\Http\Controller;
 use BookStack\References\ReferenceFetcher;
 use BookStack\Util\SimpleListOptions;
 use Illuminate\Http\Request;
diff --git a/app/Http/Controllers/Api/BookExportApiController.php b/app/Entities/Controllers/BookExportApiController.php
similarity index 95%
rename from app/Http/Controllers/Api/BookExportApiController.php
rename to app/Entities/Controllers/BookExportApiController.php
index 84090befb..5b6826c19 100644
--- a/app/Http/Controllers/Api/BookExportApiController.php
+++ b/app/Entities/Controllers/BookExportApiController.php
@@ -1,9 +1,10 @@
 <?php
 
-namespace BookStack\Http\Controllers\Api;
+namespace BookStack\Entities\Controllers;
 
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Tools\ExportFormatter;
+use BookStack\Http\ApiController;
 use Throwable;
 
 class BookExportApiController extends ApiController
diff --git a/app/Http/Controllers/BookExportController.php b/app/Entities/Controllers/BookExportController.php
similarity index 96%
rename from app/Http/Controllers/BookExportController.php
rename to app/Entities/Controllers/BookExportController.php
index cc8d48a35..1a6b20db9 100644
--- a/app/Http/Controllers/BookExportController.php
+++ b/app/Entities/Controllers/BookExportController.php
@@ -1,9 +1,10 @@
 <?php
 
-namespace BookStack\Http\Controllers;
+namespace BookStack\Entities\Controllers;
 
 use BookStack\Entities\Repos\BookRepo;
 use BookStack\Entities\Tools\ExportFormatter;
+use BookStack\Http\Controller;
 use Throwable;
 
 class BookExportController extends Controller
diff --git a/app/Http/Controllers/BookSortController.php b/app/Entities/Controllers/BookSortController.php
similarity index 95%
rename from app/Http/Controllers/BookSortController.php
rename to app/Entities/Controllers/BookSortController.php
index 5d0577a74..f2310e205 100644
--- a/app/Http/Controllers/BookSortController.php
+++ b/app/Entities/Controllers/BookSortController.php
@@ -1,12 +1,13 @@
 <?php
 
-namespace BookStack\Http\Controllers;
+namespace BookStack\Entities\Controllers;
 
-use BookStack\Actions\ActivityType;
+use BookStack\Activity\ActivityType;
 use BookStack\Entities\Repos\BookRepo;
 use BookStack\Entities\Tools\BookContents;
 use BookStack\Entities\Tools\BookSortMap;
 use BookStack\Facades\Activity;
+use BookStack\Http\Controller;
 use Illuminate\Http\Request;
 
 class BookSortController extends Controller
diff --git a/app/Http/Controllers/Api/BookshelfApiController.php b/app/Entities/Controllers/BookshelfApiController.php
similarity index 98%
rename from app/Http/Controllers/Api/BookshelfApiController.php
rename to app/Entities/Controllers/BookshelfApiController.php
index b6b78e80e..9bdb8256d 100644
--- a/app/Http/Controllers/Api/BookshelfApiController.php
+++ b/app/Entities/Controllers/BookshelfApiController.php
@@ -1,9 +1,10 @@
 <?php
 
-namespace BookStack\Http\Controllers\Api;
+namespace BookStack\Entities\Controllers;
 
 use BookStack\Entities\Models\Bookshelf;
 use BookStack\Entities\Repos\BookshelfRepo;
+use BookStack\Http\ApiController;
 use Exception;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Http\Request;
diff --git a/app/Http/Controllers/BookshelfController.php b/app/Entities/Controllers/BookshelfController.php
similarity index 97%
rename from app/Http/Controllers/BookshelfController.php
rename to app/Entities/Controllers/BookshelfController.php
index d4642be78..d1b752dc2 100644
--- a/app/Http/Controllers/BookshelfController.php
+++ b/app/Entities/Controllers/BookshelfController.php
@@ -1,14 +1,15 @@
 <?php
 
-namespace BookStack\Http\Controllers;
+namespace BookStack\Entities\Controllers;
 
-use BookStack\Actions\ActivityQueries;
-use BookStack\Actions\View;
+use BookStack\Activity\ActivityQueries;
+use BookStack\Activity\Models\View;
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Repos\BookshelfRepo;
 use BookStack\Entities\Tools\ShelfContext;
 use BookStack\Exceptions\ImageUploadException;
 use BookStack\Exceptions\NotFoundException;
+use BookStack\Http\Controller;
 use BookStack\References\ReferenceFetcher;
 use BookStack\Util\SimpleListOptions;
 use Exception;
diff --git a/app/Http/Controllers/Api/ChapterApiController.php b/app/Entities/Controllers/ChapterApiController.php
similarity index 97%
rename from app/Http/Controllers/Api/ChapterApiController.php
rename to app/Entities/Controllers/ChapterApiController.php
index 8459b8449..ce20e6b96 100644
--- a/app/Http/Controllers/Api/ChapterApiController.php
+++ b/app/Entities/Controllers/ChapterApiController.php
@@ -1,10 +1,11 @@
 <?php
 
-namespace BookStack\Http\Controllers\Api;
+namespace BookStack\Entities\Controllers;
 
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Repos\ChapterRepo;
+use BookStack\Http\ApiController;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Http\Request;
 
diff --git a/app/Http/Controllers/ChapterController.php b/app/Entities/Controllers/ChapterController.php
similarity index 98%
rename from app/Http/Controllers/ChapterController.php
rename to app/Entities/Controllers/ChapterController.php
index 4d2bcb2f1..cf7611685 100644
--- a/app/Http/Controllers/ChapterController.php
+++ b/app/Entities/Controllers/ChapterController.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace BookStack\Http\Controllers;
+namespace BookStack\Entities\Controllers;
 
-use BookStack\Actions\View;
+use BookStack\Activity\Models\View;
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Repos\ChapterRepo;
 use BookStack\Entities\Tools\BookContents;
@@ -12,6 +12,7 @@ use BookStack\Entities\Tools\NextPreviousContentLocator;
 use BookStack\Exceptions\MoveOperationException;
 use BookStack\Exceptions\NotFoundException;
 use BookStack\Exceptions\PermissionsException;
+use BookStack\Http\Controller;
 use BookStack\References\ReferenceFetcher;
 use Illuminate\Http\Request;
 use Illuminate\Validation\ValidationException;
diff --git a/app/Http/Controllers/Api/ChapterExportApiController.php b/app/Entities/Controllers/ChapterExportApiController.php
similarity index 95%
rename from app/Http/Controllers/Api/ChapterExportApiController.php
rename to app/Entities/Controllers/ChapterExportApiController.php
index faf5d812e..d1523e665 100644
--- a/app/Http/Controllers/Api/ChapterExportApiController.php
+++ b/app/Entities/Controllers/ChapterExportApiController.php
@@ -1,9 +1,10 @@
 <?php
 
-namespace BookStack\Http\Controllers\Api;
+namespace BookStack\Entities\Controllers;
 
 use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Tools\ExportFormatter;
+use BookStack\Http\ApiController;
 use Throwable;
 
 class ChapterExportApiController extends ApiController
diff --git a/app/Http/Controllers/ChapterExportController.php b/app/Entities/Controllers/ChapterExportController.php
similarity index 96%
rename from app/Http/Controllers/ChapterExportController.php
rename to app/Entities/Controllers/ChapterExportController.php
index fd56d91b3..b67ec9b37 100644
--- a/app/Http/Controllers/ChapterExportController.php
+++ b/app/Entities/Controllers/ChapterExportController.php
@@ -1,10 +1,11 @@
 <?php
 
-namespace BookStack\Http\Controllers;
+namespace BookStack\Entities\Controllers;
 
 use BookStack\Entities\Repos\ChapterRepo;
 use BookStack\Entities\Tools\ExportFormatter;
 use BookStack\Exceptions\NotFoundException;
+use BookStack\Http\Controller;
 use Throwable;
 
 class ChapterExportController extends Controller
diff --git a/app/Http/Controllers/Api/PageApiController.php b/app/Entities/Controllers/PageApiController.php
similarity index 98%
rename from app/Http/Controllers/Api/PageApiController.php
rename to app/Entities/Controllers/PageApiController.php
index de729b469..28dd36f97 100644
--- a/app/Http/Controllers/Api/PageApiController.php
+++ b/app/Entities/Controllers/PageApiController.php
@@ -1,12 +1,13 @@
 <?php
 
-namespace BookStack\Http\Controllers\Api;
+namespace BookStack\Entities\Controllers;
 
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Models\Page;
 use BookStack\Entities\Repos\PageRepo;
 use BookStack\Exceptions\PermissionsException;
+use BookStack\Http\ApiController;
 use Exception;
 use Illuminate\Http\Request;
 
diff --git a/app/Http/Controllers/PageController.php b/app/Entities/Controllers/PageController.php
similarity index 99%
rename from app/Http/Controllers/PageController.php
rename to app/Entities/Controllers/PageController.php
index 9e09aed16..a6ef68dd7 100644
--- a/app/Http/Controllers/PageController.php
+++ b/app/Entities/Controllers/PageController.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace BookStack\Http\Controllers;
+namespace BookStack\Entities\Controllers;
 
-use BookStack\Actions\View;
+use BookStack\Activity\Models\View;
 use BookStack\Entities\Models\Page;
 use BookStack\Entities\Repos\PageRepo;
 use BookStack\Entities\Tools\BookContents;
@@ -13,6 +13,7 @@ use BookStack\Entities\Tools\PageEditActivity;
 use BookStack\Entities\Tools\PageEditorData;
 use BookStack\Exceptions\NotFoundException;
 use BookStack\Exceptions\PermissionsException;
+use BookStack\Http\Controller;
 use BookStack\References\ReferenceFetcher;
 use Exception;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
diff --git a/app/Http/Controllers/Api/PageExportApiController.php b/app/Entities/Controllers/PageExportApiController.php
similarity index 95%
rename from app/Http/Controllers/Api/PageExportApiController.php
rename to app/Entities/Controllers/PageExportApiController.php
index f2edffba3..d936a0de2 100644
--- a/app/Http/Controllers/Api/PageExportApiController.php
+++ b/app/Entities/Controllers/PageExportApiController.php
@@ -1,9 +1,10 @@
 <?php
 
-namespace BookStack\Http\Controllers\Api;
+namespace BookStack\Entities\Controllers;
 
 use BookStack\Entities\Models\Page;
 use BookStack\Entities\Tools\ExportFormatter;
+use BookStack\Http\ApiController;
 use Throwable;
 
 class PageExportApiController extends ApiController
diff --git a/app/Http/Controllers/PageExportController.php b/app/Entities/Controllers/PageExportController.php
similarity index 97%
rename from app/Http/Controllers/PageExportController.php
rename to app/Entities/Controllers/PageExportController.php
index 62101d339..31862c8ac 100644
--- a/app/Http/Controllers/PageExportController.php
+++ b/app/Entities/Controllers/PageExportController.php
@@ -1,11 +1,12 @@
 <?php
 
-namespace BookStack\Http\Controllers;
+namespace BookStack\Entities\Controllers;
 
 use BookStack\Entities\Repos\PageRepo;
 use BookStack\Entities\Tools\ExportFormatter;
 use BookStack\Entities\Tools\PageContent;
 use BookStack\Exceptions\NotFoundException;
+use BookStack\Http\Controller;
 use Throwable;
 
 class PageExportController extends Controller
diff --git a/app/Http/Controllers/PageRevisionController.php b/app/Entities/Controllers/PageRevisionController.php
similarity index 97%
rename from app/Http/Controllers/PageRevisionController.php
rename to app/Entities/Controllers/PageRevisionController.php
index 3da5e7c2d..a723513a8 100644
--- a/app/Http/Controllers/PageRevisionController.php
+++ b/app/Entities/Controllers/PageRevisionController.php
@@ -1,13 +1,14 @@
 <?php
 
-namespace BookStack\Http\Controllers;
+namespace BookStack\Entities\Controllers;
 
-use BookStack\Actions\ActivityType;
+use BookStack\Activity\ActivityType;
 use BookStack\Entities\Models\PageRevision;
 use BookStack\Entities\Repos\PageRepo;
 use BookStack\Entities\Tools\PageContent;
 use BookStack\Exceptions\NotFoundException;
 use BookStack\Facades\Activity;
+use BookStack\Http\Controller;
 use BookStack\Util\SimpleListOptions;
 use Illuminate\Http\Request;
 use Ssddanbrown\HtmlDiff\Diff;
diff --git a/app/Http/Controllers/PageTemplateController.php b/app/Entities/Controllers/PageTemplateController.php
similarity index 94%
rename from app/Http/Controllers/PageTemplateController.php
rename to app/Entities/Controllers/PageTemplateController.php
index 1e24c29ee..e4e7b5680 100644
--- a/app/Http/Controllers/PageTemplateController.php
+++ b/app/Entities/Controllers/PageTemplateController.php
@@ -1,9 +1,10 @@
 <?php
 
-namespace BookStack\Http\Controllers;
+namespace BookStack\Entities\Controllers;
 
 use BookStack\Entities\Repos\PageRepo;
 use BookStack\Exceptions\NotFoundException;
+use BookStack\Http\Controller;
 use Illuminate\Http\Request;
 
 class PageTemplateController extends Controller
diff --git a/app/Http/Controllers/Api/RecycleBinApiController.php b/app/Entities/Controllers/RecycleBinApiController.php
similarity index 97%
rename from app/Http/Controllers/Api/RecycleBinApiController.php
rename to app/Entities/Controllers/RecycleBinApiController.php
index f327bae93..bf22d7dcd 100644
--- a/app/Http/Controllers/Api/RecycleBinApiController.php
+++ b/app/Entities/Controllers/RecycleBinApiController.php
@@ -1,12 +1,13 @@
 <?php
 
-namespace BookStack\Http\Controllers\Api;
+namespace BookStack\Entities\Controllers;
 
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\BookChild;
 use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Models\Deletion;
 use BookStack\Entities\Repos\DeletionRepo;
+use BookStack\Http\ApiController;
 use Closure;
 use Illuminate\Database\Eloquent\Builder;
 
diff --git a/app/Http/Controllers/RecycleBinController.php b/app/Entities/Controllers/RecycleBinController.php
similarity index 97%
rename from app/Http/Controllers/RecycleBinController.php
rename to app/Entities/Controllers/RecycleBinController.php
index 82e3f660b..30b184bbe 100644
--- a/app/Http/Controllers/RecycleBinController.php
+++ b/app/Entities/Controllers/RecycleBinController.php
@@ -1,12 +1,13 @@
 <?php
 
-namespace BookStack\Http\Controllers;
+namespace BookStack\Entities\Controllers;
 
-use BookStack\Actions\ActivityType;
+use BookStack\Activity\ActivityType;
 use BookStack\Entities\Models\Deletion;
 use BookStack\Entities\Models\Entity;
 use BookStack\Entities\Repos\DeletionRepo;
 use BookStack\Entities\Tools\TrashCan;
+use BookStack\Http\Controller;
 
 class RecycleBinController extends Controller
 {
diff --git a/app/Interfaces/Deletable.php b/app/Entities/Models/Deletable.php
similarity index 87%
rename from app/Interfaces/Deletable.php
rename to app/Entities/Models/Deletable.php
index be9b4ac41..a2c7fad81 100644
--- a/app/Interfaces/Deletable.php
+++ b/app/Entities/Models/Deletable.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BookStack\Interfaces;
+namespace BookStack\Entities\Models;
 
 use Illuminate\Database\Eloquent\Relations\MorphMany;
 
diff --git a/app/Entities/Models/Deletion.php b/app/Entities/Models/Deletion.php
index 25f0ea6db..a73437c94 100644
--- a/app/Entities/Models/Deletion.php
+++ b/app/Entities/Models/Deletion.php
@@ -2,9 +2,8 @@
 
 namespace BookStack\Entities\Models;
 
-use BookStack\Auth\User;
-use BookStack\Interfaces\Deletable;
-use BookStack\Interfaces\Loggable;
+use BookStack\Activity\Models\Loggable;
+use BookStack\Users\Models\User;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
diff --git a/app/Entities/Models/Entity.php b/app/Entities/Models/Entity.php
index 8bfe69365..496ea46b6 100644
--- a/app/Entities/Models/Entity.php
+++ b/app/Entities/Models/Entity.php
@@ -2,27 +2,26 @@
 
 namespace BookStack\Entities\Models;
 
-use BookStack\Actions\Activity;
-use BookStack\Actions\Comment;
-use BookStack\Actions\Favourite;
-use BookStack\Actions\Tag;
-use BookStack\Actions\View;
-use BookStack\Auth\Permissions\EntityPermission;
-use BookStack\Auth\Permissions\JointPermission;
-use BookStack\Auth\Permissions\JointPermissionBuilder;
-use BookStack\Auth\Permissions\PermissionApplicator;
+use BookStack\Activity\Models\Activity;
+use BookStack\Activity\Models\Comment;
+use BookStack\Activity\Models\Favouritable;
+use BookStack\Activity\Models\Favourite;
+use BookStack\Activity\Models\Loggable;
+use BookStack\Activity\Models\Tag;
+use BookStack\Activity\Models\View;
+use BookStack\Activity\Models\Viewable;
+use BookStack\App\Model;
+use BookStack\App\Sluggable;
 use BookStack\Entities\Tools\SlugGenerator;
-use BookStack\Interfaces\Deletable;
-use BookStack\Interfaces\Favouritable;
-use BookStack\Interfaces\Loggable;
-use BookStack\Interfaces\Sluggable;
-use BookStack\Interfaces\Viewable;
-use BookStack\Model;
+use BookStack\Permissions\JointPermissionBuilder;
+use BookStack\Permissions\Models\EntityPermission;
+use BookStack\Permissions\Models\JointPermission;
+use BookStack\Permissions\PermissionApplicator;
 use BookStack\References\Reference;
 use BookStack\Search\SearchIndex;
 use BookStack\Search\SearchTerm;
-use BookStack\Traits\HasCreatorAndUpdater;
-use BookStack\Traits\HasOwner;
+use BookStack\Users\Models\HasCreatorAndUpdater;
+use BookStack\Users\Models\HasOwner;
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;
diff --git a/app/Entities/Models/Page.php b/app/Entities/Models/Page.php
index a224071cc..40acb9a35 100644
--- a/app/Entities/Models/Page.php
+++ b/app/Entities/Models/Page.php
@@ -2,8 +2,8 @@
 
 namespace BookStack\Entities\Models;
 
-use BookStack\Auth\Permissions\PermissionApplicator;
 use BookStack\Entities\Tools\PageContent;
+use BookStack\Permissions\PermissionApplicator;
 use BookStack\Uploads\Attachment;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;
diff --git a/app/Entities/Models/PageRevision.php b/app/Entities/Models/PageRevision.php
index cd22db0c8..10ff6d901 100644
--- a/app/Entities/Models/PageRevision.php
+++ b/app/Entities/Models/PageRevision.php
@@ -2,9 +2,9 @@
 
 namespace BookStack\Entities\Models;
 
-use BookStack\Auth\User;
-use BookStack\Interfaces\Loggable;
-use BookStack\Model;
+use BookStack\Activity\Models\Loggable;
+use BookStack\App\Model;
+use BookStack\Users\Models\User;
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
diff --git a/app/Entities/Queries/EntityQuery.php b/app/Entities/Queries/EntityQuery.php
index 5ab882ca8..2246e13b1 100644
--- a/app/Entities/Queries/EntityQuery.php
+++ b/app/Entities/Queries/EntityQuery.php
@@ -2,8 +2,8 @@
 
 namespace BookStack\Entities\Queries;
 
-use BookStack\Auth\Permissions\PermissionApplicator;
 use BookStack\Entities\EntityProvider;
+use BookStack\Permissions\PermissionApplicator;
 
 abstract class EntityQuery
 {
diff --git a/app/Entities/Queries/Popular.php b/app/Entities/Queries/Popular.php
index fafd60c59..9b7049ae3 100644
--- a/app/Entities/Queries/Popular.php
+++ b/app/Entities/Queries/Popular.php
@@ -2,7 +2,7 @@
 
 namespace BookStack\Entities\Queries;
 
-use BookStack\Actions\View;
+use BookStack\Activity\Models\View;
 use Illuminate\Support\Facades\DB;
 
 class Popular extends EntityQuery
diff --git a/app/Entities/Queries/RecentlyViewed.php b/app/Entities/Queries/RecentlyViewed.php
index 0f5c68041..ffa346888 100644
--- a/app/Entities/Queries/RecentlyViewed.php
+++ b/app/Entities/Queries/RecentlyViewed.php
@@ -2,7 +2,7 @@
 
 namespace BookStack\Entities\Queries;
 
-use BookStack\Actions\View;
+use BookStack\Activity\Models\View;
 use Illuminate\Support\Collection;
 
 class RecentlyViewed extends EntityQuery
diff --git a/app/Entities/Queries/TopFavourites.php b/app/Entities/Queries/TopFavourites.php
index 0b9a5ba23..3f8d2e62e 100644
--- a/app/Entities/Queries/TopFavourites.php
+++ b/app/Entities/Queries/TopFavourites.php
@@ -2,7 +2,7 @@
 
 namespace BookStack\Entities\Queries;
 
-use BookStack\Actions\Favourite;
+use BookStack\Activity\Models\Favourite;
 use Illuminate\Database\Query\JoinClause;
 
 class TopFavourites extends EntityQuery
diff --git a/app/Entities/Repos/BaseRepo.php b/app/Entities/Repos/BaseRepo.php
index 815c0bb2e..2894a04e3 100644
--- a/app/Entities/Repos/BaseRepo.php
+++ b/app/Entities/Repos/BaseRepo.php
@@ -2,7 +2,7 @@
 
 namespace BookStack\Entities\Repos;
 
-use BookStack\Actions\TagRepo;
+use BookStack\Activity\TagRepo;
 use BookStack\Entities\Models\Entity;
 use BookStack\Entities\Models\HasCoverImage;
 use BookStack\Exceptions\ImageUploadException;
diff --git a/app/Entities/Repos/BookRepo.php b/app/Entities/Repos/BookRepo.php
index b5944fd46..737caa70b 100644
--- a/app/Entities/Repos/BookRepo.php
+++ b/app/Entities/Repos/BookRepo.php
@@ -2,8 +2,8 @@
 
 namespace BookStack\Entities\Repos;
 
-use BookStack\Actions\ActivityType;
-use BookStack\Actions\TagRepo;
+use BookStack\Activity\ActivityType;
+use BookStack\Activity\TagRepo;
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Tools\TrashCan;
 use BookStack\Exceptions\ImageUploadException;
diff --git a/app/Entities/Repos/BookshelfRepo.php b/app/Entities/Repos/BookshelfRepo.php
index d7759deb4..27333b5b1 100644
--- a/app/Entities/Repos/BookshelfRepo.php
+++ b/app/Entities/Repos/BookshelfRepo.php
@@ -2,7 +2,7 @@
 
 namespace BookStack\Entities\Repos;
 
-use BookStack\Actions\ActivityType;
+use BookStack\Activity\ActivityType;
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Bookshelf;
 use BookStack\Entities\Tools\TrashCan;
diff --git a/app/Entities/Repos/ChapterRepo.php b/app/Entities/Repos/ChapterRepo.php
index 2b81891af..588854c7e 100644
--- a/app/Entities/Repos/ChapterRepo.php
+++ b/app/Entities/Repos/ChapterRepo.php
@@ -2,7 +2,7 @@
 
 namespace BookStack\Entities\Repos;
 
-use BookStack\Actions\ActivityType;
+use BookStack\Activity\ActivityType;
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Models\Entity;
diff --git a/app/Entities/Repos/DeletionRepo.php b/app/Entities/Repos/DeletionRepo.php
index 5d53013dc..e47192cc2 100644
--- a/app/Entities/Repos/DeletionRepo.php
+++ b/app/Entities/Repos/DeletionRepo.php
@@ -2,7 +2,7 @@
 
 namespace BookStack\Entities\Repos;
 
-use BookStack\Actions\ActivityType;
+use BookStack\Activity\ActivityType;
 use BookStack\Entities\Models\Deletion;
 use BookStack\Entities\Tools\TrashCan;
 use BookStack\Facades\Activity;
diff --git a/app/Entities/Repos/PageRepo.php b/app/Entities/Repos/PageRepo.php
index c8eddc398..521519dc0 100644
--- a/app/Entities/Repos/PageRepo.php
+++ b/app/Entities/Repos/PageRepo.php
@@ -2,7 +2,7 @@
 
 namespace BookStack\Entities\Repos;
 
-use BookStack\Actions\ActivityType;
+use BookStack\Activity\ActivityType;
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Models\Entity;
diff --git a/app/Entities/Tools/Cloner.php b/app/Entities/Tools/Cloner.php
index 5594c33a6..f7ed4b72d 100644
--- a/app/Entities/Tools/Cloner.php
+++ b/app/Entities/Tools/Cloner.php
@@ -2,7 +2,7 @@
 
 namespace BookStack\Entities\Tools;
 
-use BookStack\Actions\Tag;
+use BookStack\Activity\Models\Tag;
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Bookshelf;
 use BookStack\Entities\Models\Chapter;
diff --git a/app/Entities/Tools/HierarchyTransformer.php b/app/Entities/Tools/HierarchyTransformer.php
index 43cf2390e..cd6c548fe 100644
--- a/app/Entities/Tools/HierarchyTransformer.php
+++ b/app/Entities/Tools/HierarchyTransformer.php
@@ -2,7 +2,7 @@
 
 namespace BookStack\Entities\Tools;
 
-use BookStack\Actions\ActivityType;
+use BookStack\Activity\ActivityType;
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Bookshelf;
 use BookStack\Entities\Models\Chapter;
diff --git a/app/Entities/Tools/PermissionsUpdater.php b/app/Entities/Tools/PermissionsUpdater.php
index 36ed7ccde..324755e4d 100644
--- a/app/Entities/Tools/PermissionsUpdater.php
+++ b/app/Entities/Tools/PermissionsUpdater.php
@@ -2,14 +2,14 @@
 
 namespace BookStack\Entities\Tools;
 
-use BookStack\Actions\ActivityType;
-use BookStack\Auth\Permissions\EntityPermission;
-use BookStack\Auth\Role;
-use BookStack\Auth\User;
+use BookStack\Activity\ActivityType;
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Bookshelf;
 use BookStack\Entities\Models\Entity;
 use BookStack\Facades\Activity;
+use BookStack\Permissions\Models\EntityPermission;
+use BookStack\Users\Models\Role;
+use BookStack\Users\Models\User;
 use Illuminate\Http\Request;
 
 class PermissionsUpdater
diff --git a/app/Entities/Tools/SlugGenerator.php b/app/Entities/Tools/SlugGenerator.php
index 9fd9036ad..5df300bb0 100644
--- a/app/Entities/Tools/SlugGenerator.php
+++ b/app/Entities/Tools/SlugGenerator.php
@@ -2,9 +2,9 @@
 
 namespace BookStack\Entities\Tools;
 
+use BookStack\App\Model;
+use BookStack\App\Sluggable;
 use BookStack\Entities\Models\BookChild;
-use BookStack\Interfaces\Sluggable;
-use BookStack\Model;
 use Illuminate\Support\Str;
 
 class SlugGenerator
diff --git a/app/Exceptions/StoppedAuthenticationException.php b/app/Exceptions/StoppedAuthenticationException.php
index b9aadb03f..51e48aa1c 100644
--- a/app/Exceptions/StoppedAuthenticationException.php
+++ b/app/Exceptions/StoppedAuthenticationException.php
@@ -2,8 +2,8 @@
 
 namespace BookStack\Exceptions;
 
-use BookStack\Auth\Access\LoginService;
-use BookStack\Auth\User;
+use BookStack\Access\LoginService;
+use BookStack\Users\Models\User;
 use Illuminate\Contracts\Support\Responsable;
 use Illuminate\Http\Request;
 
diff --git a/app/Facades/Activity.php b/app/Facades/Activity.php
index ec3d28cc0..5251d5cbb 100644
--- a/app/Facades/Activity.php
+++ b/app/Facades/Activity.php
@@ -5,7 +5,7 @@ namespace BookStack\Facades;
 use Illuminate\Support\Facades\Facade;
 
 /**
- * @mixin \BookStack\Actions\ActivityLogger
+ * @mixin \BookStack\Activity\Tools\ActivityLogger
  */
 class Activity extends Facade
 {
diff --git a/app/Http/Controllers/Api/ApiController.php b/app/Http/ApiController.php
similarity index 93%
rename from app/Http/Controllers/Api/ApiController.php
rename to app/Http/ApiController.php
index 5c448e49f..c0dbe2fca 100644
--- a/app/Http/Controllers/Api/ApiController.php
+++ b/app/Http/ApiController.php
@@ -1,9 +1,8 @@
 <?php
 
-namespace BookStack\Http\Controllers\Api;
+namespace BookStack\Http;
 
 use BookStack\Api\ListingResponseBuilder;
-use BookStack\Http\Controllers\Controller;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Http\JsonResponse;
 
diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controller.php
similarity index 96%
rename from app/Http/Controllers/Controller.php
rename to app/Http/Controller.php
index f6dc1dbca..78b899d25 100644
--- a/app/Http/Controllers/Controller.php
+++ b/app/Http/Controller.php
@@ -1,12 +1,11 @@
 <?php
 
-namespace BookStack\Http\Controllers;
+namespace BookStack\Http;
 
+use BookStack\Activity\Models\Loggable;
+use BookStack\App\Model;
 use BookStack\Exceptions\NotifyException;
 use BookStack\Facades\Activity;
-use BookStack\Http\Responses\DownloadResponseFactory;
-use BookStack\Interfaces\Loggable;
-use BookStack\Model;
 use Illuminate\Foundation\Bus\DispatchesJobs;
 use Illuminate\Foundation\Validation\ValidatesRequests;
 use Illuminate\Http\JsonResponse;
diff --git a/app/Http/Responses/DownloadResponseFactory.php b/app/Http/DownloadResponseFactory.php
similarity index 98%
rename from app/Http/Responses/DownloadResponseFactory.php
rename to app/Http/DownloadResponseFactory.php
index ec742fc47..20032f525 100644
--- a/app/Http/Responses/DownloadResponseFactory.php
+++ b/app/Http/DownloadResponseFactory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BookStack\Http\Responses;
+namespace BookStack\Http;
 
 use BookStack\Util\WebSafeMimeSniffer;
 use Illuminate\Http\Request;
diff --git a/app/Http/Middleware/AuthenticatedOrPendingMfa.php b/app/Http/Middleware/AuthenticatedOrPendingMfa.php
index 0a0588864..24d88c909 100644
--- a/app/Http/Middleware/AuthenticatedOrPendingMfa.php
+++ b/app/Http/Middleware/AuthenticatedOrPendingMfa.php
@@ -2,8 +2,8 @@
 
 namespace BookStack\Http\Middleware;
 
-use BookStack\Auth\Access\LoginService;
-use BookStack\Auth\Access\Mfa\MfaSession;
+use BookStack\Access\LoginService;
+use BookStack\Access\Mfa\MfaSession;
 use Closure;
 
 class AuthenticatedOrPendingMfa
diff --git a/app/Http/Middleware/CheckEmailConfirmed.php b/app/Http/Middleware/CheckEmailConfirmed.php
index 7dd970ade..4b2737d28 100644
--- a/app/Http/Middleware/CheckEmailConfirmed.php
+++ b/app/Http/Middleware/CheckEmailConfirmed.php
@@ -2,8 +2,8 @@
 
 namespace BookStack\Http\Middleware;
 
-use BookStack\Auth\Access\EmailConfirmationService;
-use BookStack\Auth\User;
+use BookStack\Access\EmailConfirmationService;
+use BookStack\Users\Models\User;
 use Closure;
 
 /**
diff --git a/app/Http/Middleware/Localization.php b/app/Http/Middleware/Localization.php
index 3a2dd2190..47723e242 100644
--- a/app/Http/Middleware/Localization.php
+++ b/app/Http/Middleware/Localization.php
@@ -2,7 +2,7 @@
 
 namespace BookStack\Http\Middleware;
 
-use BookStack\Util\LanguageManager;
+use BookStack\Translation\LanguageManager;
 use Carbon\Carbon;
 use Closure;
 
diff --git a/app/Http/Middleware/RedirectIfAuthenticated.php b/app/Http/Middleware/RedirectIfAuthenticated.php
index ee7fe880c..069973a95 100644
--- a/app/Http/Middleware/RedirectIfAuthenticated.php
+++ b/app/Http/Middleware/RedirectIfAuthenticated.php
@@ -2,7 +2,7 @@
 
 namespace BookStack\Http\Middleware;
 
-use BookStack\Providers\RouteServiceProvider;
+use BookStack\App\Providers\RouteServiceProvider;
 use Closure;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
diff --git a/app/Http/Requests/Request.php b/app/Http/Requests/Request.php
deleted file mode 100644
index cda901e44..000000000
--- a/app/Http/Requests/Request.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-namespace BookStack\Http\Requests;
-
-use Illuminate\Foundation\Http\FormRequest;
-
-abstract class Request extends FormRequest
-{
-    //
-}
diff --git a/app/Notifications/UserInvite.php b/app/Notifications/UserInvite.php
index 3bae32721..8804df586 100644
--- a/app/Notifications/UserInvite.php
+++ b/app/Notifications/UserInvite.php
@@ -2,7 +2,7 @@
 
 namespace BookStack\Notifications;
 
-use BookStack\Auth\User;
+use BookStack\Users\Models\User;
 use Illuminate\Notifications\Messages\MailMessage;
 
 class UserInvite extends MailNotification
diff --git a/app/Http/Controllers/Api/ContentPermissionApiController.php b/app/Permissions/ContentPermissionApiController.php
similarity index 98%
rename from app/Http/Controllers/Api/ContentPermissionApiController.php
rename to app/Permissions/ContentPermissionApiController.php
index 47a0d3782..cd561fdee 100644
--- a/app/Http/Controllers/Api/ContentPermissionApiController.php
+++ b/app/Permissions/ContentPermissionApiController.php
@@ -1,10 +1,11 @@
 <?php
 
-namespace BookStack\Http\Controllers\Api;
+namespace BookStack\Permissions;
 
 use BookStack\Entities\EntityProvider;
 use BookStack\Entities\Models\Entity;
 use BookStack\Entities\Tools\PermissionsUpdater;
+use BookStack\Http\ApiController;
 use Illuminate\Http\Request;
 
 class ContentPermissionApiController extends ApiController
diff --git a/app/Auth/Permissions/EntityPermissionEvaluator.php b/app/Permissions/EntityPermissionEvaluator.php
similarity index 97%
rename from app/Auth/Permissions/EntityPermissionEvaluator.php
rename to app/Permissions/EntityPermissionEvaluator.php
index 51db45bbc..06f0126ad 100644
--- a/app/Auth/Permissions/EntityPermissionEvaluator.php
+++ b/app/Permissions/EntityPermissionEvaluator.php
@@ -1,9 +1,10 @@
 <?php
 
-namespace BookStack\Auth\Permissions;
+namespace BookStack\Permissions;
 
-use BookStack\Auth\Role;
 use BookStack\Entities\Models\Entity;
+use BookStack\Permissions\Models\EntityPermission;
+use BookStack\Users\Models\Role;
 use Illuminate\Database\Eloquent\Builder;
 
 class EntityPermissionEvaluator
diff --git a/app/Auth/Permissions/JointPermissionBuilder.php b/app/Permissions/JointPermissionBuilder.php
similarity index 98%
rename from app/Auth/Permissions/JointPermissionBuilder.php
rename to app/Permissions/JointPermissionBuilder.php
index 4132a19af..945909631 100644
--- a/app/Auth/Permissions/JointPermissionBuilder.php
+++ b/app/Permissions/JointPermissionBuilder.php
@@ -1,14 +1,15 @@
 <?php
 
-namespace BookStack\Auth\Permissions;
+namespace BookStack\Permissions;
 
-use BookStack\Auth\Role;
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\BookChild;
 use BookStack\Entities\Models\Bookshelf;
 use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Models\Entity;
 use BookStack\Entities\Models\Page;
+use BookStack\Permissions\Models\JointPermission;
+use BookStack\Users\Models\Role;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection as EloquentCollection;
 use Illuminate\Support\Facades\DB;
diff --git a/app/Auth/Permissions/MassEntityPermissionEvaluator.php b/app/Permissions/MassEntityPermissionEvaluator.php
similarity index 96%
rename from app/Auth/Permissions/MassEntityPermissionEvaluator.php
rename to app/Permissions/MassEntityPermissionEvaluator.php
index a9deba16d..4be69808b 100644
--- a/app/Auth/Permissions/MassEntityPermissionEvaluator.php
+++ b/app/Permissions/MassEntityPermissionEvaluator.php
@@ -1,6 +1,8 @@
 <?php
 
-namespace BookStack\Auth\Permissions;
+namespace BookStack\Permissions;
+
+use BookStack\Permissions\Models\EntityPermission;
 
 class MassEntityPermissionEvaluator extends EntityPermissionEvaluator
 {
diff --git a/app/Auth/Permissions/EntityPermission.php b/app/Permissions/Models/EntityPermission.php
similarity index 90%
rename from app/Auth/Permissions/EntityPermission.php
rename to app/Permissions/Models/EntityPermission.php
index 603cf61ad..1ef9c2886 100644
--- a/app/Auth/Permissions/EntityPermission.php
+++ b/app/Permissions/Models/EntityPermission.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace BookStack\Auth\Permissions;
+namespace BookStack\Permissions\Models;
 
-use BookStack\Auth\Role;
-use BookStack\Model;
+use BookStack\App\Model;
+use BookStack\Users\Models\Role;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 /**
diff --git a/app/Auth/Permissions/JointPermission.php b/app/Permissions/Models/JointPermission.php
similarity index 85%
rename from app/Auth/Permissions/JointPermission.php
rename to app/Permissions/Models/JointPermission.php
index e10c560d0..baf096fca 100644
--- a/app/Auth/Permissions/JointPermission.php
+++ b/app/Permissions/Models/JointPermission.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace BookStack\Auth\Permissions;
+namespace BookStack\Permissions\Models;
 
-use BookStack\Auth\Role;
+use BookStack\App\Model;
 use BookStack\Entities\Models\Entity;
-use BookStack\Model;
+use BookStack\Users\Models\Role;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\MorphOne;
 
diff --git a/app/Auth/Permissions/RolePermission.php b/app/Permissions/Models/RolePermission.php
similarity index 86%
rename from app/Auth/Permissions/RolePermission.php
rename to app/Permissions/Models/RolePermission.php
index 467c43ce2..d43313ea0 100644
--- a/app/Auth/Permissions/RolePermission.php
+++ b/app/Permissions/Models/RolePermission.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace BookStack\Auth\Permissions;
+namespace BookStack\Permissions\Models;
 
-use BookStack\Auth\Role;
-use BookStack\Model;
+use BookStack\App\Model;
+use BookStack\Users\Models\Role;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 
 /**
diff --git a/app/Auth/Permissions/PermissionApplicator.php b/app/Permissions/PermissionApplicator.php
similarity index 96%
rename from app/Auth/Permissions/PermissionApplicator.php
rename to app/Permissions/PermissionApplicator.php
index 84ac27f87..8a02f82e8 100644
--- a/app/Auth/Permissions/PermissionApplicator.php
+++ b/app/Permissions/PermissionApplicator.php
@@ -1,14 +1,15 @@
 <?php
 
-namespace BookStack\Auth\Permissions;
+namespace BookStack\Permissions;
 
-use BookStack\Auth\Role;
-use BookStack\Auth\User;
+use BookStack\App\Model;
 use BookStack\Entities\Models\Entity;
 use BookStack\Entities\Models\Page;
-use BookStack\Model;
-use BookStack\Traits\HasCreatorAndUpdater;
-use BookStack\Traits\HasOwner;
+use BookStack\Permissions\Models\EntityPermission;
+use BookStack\Users\Models\HasCreatorAndUpdater;
+use BookStack\Users\Models\HasOwner;
+use BookStack\Users\Models\Role;
+use BookStack\Users\Models\User;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Query\Builder as QueryBuilder;
 use InvalidArgumentException;
diff --git a/app/Auth/Permissions/PermissionFormData.php b/app/Permissions/PermissionFormData.php
similarity index 93%
rename from app/Auth/Permissions/PermissionFormData.php
rename to app/Permissions/PermissionFormData.php
index 8044a3c56..eea1230fc 100644
--- a/app/Auth/Permissions/PermissionFormData.php
+++ b/app/Permissions/PermissionFormData.php
@@ -1,9 +1,10 @@
 <?php
 
-namespace BookStack\Auth\Permissions;
+namespace BookStack\Permissions;
 
-use BookStack\Auth\Role;
 use BookStack\Entities\Models\Entity;
+use BookStack\Permissions\Models\EntityPermission;
+use BookStack\Users\Models\Role;
 
 class PermissionFormData
 {
diff --git a/app/Auth/Permissions/PermissionStatus.php b/app/Permissions/PermissionStatus.php
similarity index 80%
rename from app/Auth/Permissions/PermissionStatus.php
rename to app/Permissions/PermissionStatus.php
index f8e55c20b..6cecc8afd 100644
--- a/app/Auth/Permissions/PermissionStatus.php
+++ b/app/Permissions/PermissionStatus.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BookStack\Auth\Permissions;
+namespace BookStack\Permissions;
 
 class PermissionStatus
 {
diff --git a/app/Http/Controllers/PermissionsController.php b/app/Permissions/PermissionsController.php
similarity index 97%
rename from app/Http/Controllers/PermissionsController.php
rename to app/Permissions/PermissionsController.php
index 7d908733b..f2014ea73 100644
--- a/app/Http/Controllers/PermissionsController.php
+++ b/app/Permissions/PermissionsController.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace BookStack\Http\Controllers;
+namespace BookStack\Permissions;
 
-use BookStack\Auth\Permissions\EntityPermission;
-use BookStack\Auth\Permissions\PermissionFormData;
-use BookStack\Auth\Role;
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Bookshelf;
 use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Models\Page;
 use BookStack\Entities\Tools\PermissionsUpdater;
+use BookStack\Http\Controller;
+use BookStack\Permissions\Models\EntityPermission;
+use BookStack\Users\Models\Role;
 use Illuminate\Http\Request;
 
 class PermissionsController extends Controller
diff --git a/app/Auth/Permissions/PermissionsRepo.php b/app/Permissions/PermissionsRepo.php
similarity index 96%
rename from app/Auth/Permissions/PermissionsRepo.php
rename to app/Permissions/PermissionsRepo.php
index 75354e79b..889a6ea08 100644
--- a/app/Auth/Permissions/PermissionsRepo.php
+++ b/app/Permissions/PermissionsRepo.php
@@ -1,11 +1,12 @@
 <?php
 
-namespace BookStack\Auth\Permissions;
+namespace BookStack\Permissions;
 
-use BookStack\Actions\ActivityType;
-use BookStack\Auth\Role;
+use BookStack\Activity\ActivityType;
 use BookStack\Exceptions\PermissionsException;
 use BookStack\Facades\Activity;
+use BookStack\Permissions\Models\RolePermission;
+use BookStack\Users\Models\Role;
 use Exception;
 use Illuminate\Database\Eloquent\Collection;
 
diff --git a/app/Auth/Permissions/SimpleEntityData.php b/app/Permissions/SimpleEntityData.php
similarity index 94%
rename from app/Auth/Permissions/SimpleEntityData.php
rename to app/Permissions/SimpleEntityData.php
index 2128451fe..0eab5f070 100644
--- a/app/Auth/Permissions/SimpleEntityData.php
+++ b/app/Permissions/SimpleEntityData.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BookStack\Auth\Permissions;
+namespace BookStack\Permissions;
 
 use BookStack\Entities\Models\Entity;
 
diff --git a/app/References/CrossLinkParser.php b/app/References/CrossLinkParser.php
index e7afea5f1..88ca5d6a7 100644
--- a/app/References/CrossLinkParser.php
+++ b/app/References/CrossLinkParser.php
@@ -2,7 +2,7 @@
 
 namespace BookStack\References;
 
-use BookStack\Model;
+use BookStack\App\Model;
 use BookStack\References\ModelResolvers\BookLinkModelResolver;
 use BookStack\References\ModelResolvers\BookshelfLinkModelResolver;
 use BookStack\References\ModelResolvers\ChapterLinkModelResolver;
diff --git a/app/References/ModelResolvers/BookLinkModelResolver.php b/app/References/ModelResolvers/BookLinkModelResolver.php
index 12b2c594a..d404fe2fd 100644
--- a/app/References/ModelResolvers/BookLinkModelResolver.php
+++ b/app/References/ModelResolvers/BookLinkModelResolver.php
@@ -2,8 +2,8 @@
 
 namespace BookStack\References\ModelResolvers;
 
+use BookStack\App\Model;
 use BookStack\Entities\Models\Book;
-use BookStack\Model;
 
 class BookLinkModelResolver implements CrossLinkModelResolver
 {
diff --git a/app/References/ModelResolvers/BookshelfLinkModelResolver.php b/app/References/ModelResolvers/BookshelfLinkModelResolver.php
index 5d403ac69..cc9df034e 100644
--- a/app/References/ModelResolvers/BookshelfLinkModelResolver.php
+++ b/app/References/ModelResolvers/BookshelfLinkModelResolver.php
@@ -2,8 +2,8 @@
 
 namespace BookStack\References\ModelResolvers;
 
+use BookStack\App\Model;
 use BookStack\Entities\Models\Bookshelf;
-use BookStack\Model;
 
 class BookshelfLinkModelResolver implements CrossLinkModelResolver
 {
diff --git a/app/References/ModelResolvers/ChapterLinkModelResolver.php b/app/References/ModelResolvers/ChapterLinkModelResolver.php
index b3eb7e7dc..4733c68ee 100644
--- a/app/References/ModelResolvers/ChapterLinkModelResolver.php
+++ b/app/References/ModelResolvers/ChapterLinkModelResolver.php
@@ -2,8 +2,8 @@
 
 namespace BookStack\References\ModelResolvers;
 
+use BookStack\App\Model;
 use BookStack\Entities\Models\Chapter;
-use BookStack\Model;
 
 class ChapterLinkModelResolver implements CrossLinkModelResolver
 {
diff --git a/app/References/ModelResolvers/CrossLinkModelResolver.php b/app/References/ModelResolvers/CrossLinkModelResolver.php
index f2cb49779..67d9214c5 100644
--- a/app/References/ModelResolvers/CrossLinkModelResolver.php
+++ b/app/References/ModelResolvers/CrossLinkModelResolver.php
@@ -2,7 +2,7 @@
 
 namespace BookStack\References\ModelResolvers;
 
-use BookStack\Model;
+use BookStack\App\Model;
 
 interface CrossLinkModelResolver
 {
diff --git a/app/References/ModelResolvers/PageLinkModelResolver.php b/app/References/ModelResolvers/PageLinkModelResolver.php
index bf08d7bfc..736382bec 100644
--- a/app/References/ModelResolvers/PageLinkModelResolver.php
+++ b/app/References/ModelResolvers/PageLinkModelResolver.php
@@ -2,8 +2,8 @@
 
 namespace BookStack\References\ModelResolvers;
 
+use BookStack\App\Model;
 use BookStack\Entities\Models\Page;
-use BookStack\Model;
 
 class PageLinkModelResolver implements CrossLinkModelResolver
 {
diff --git a/app/References/ModelResolvers/PagePermalinkModelResolver.php b/app/References/ModelResolvers/PagePermalinkModelResolver.php
index 9537ee268..9ed00b36d 100644
--- a/app/References/ModelResolvers/PagePermalinkModelResolver.php
+++ b/app/References/ModelResolvers/PagePermalinkModelResolver.php
@@ -2,8 +2,8 @@
 
 namespace BookStack\References\ModelResolvers;
 
+use BookStack\App\Model;
 use BookStack\Entities\Models\Page;
-use BookStack\Model;
 
 class PagePermalinkModelResolver implements CrossLinkModelResolver
 {
diff --git a/app/References/Reference.php b/app/References/Reference.php
index 0e5b17d0b..df8a3a789 100644
--- a/app/References/Reference.php
+++ b/app/References/Reference.php
@@ -2,7 +2,7 @@
 
 namespace BookStack\References;
 
-use BookStack\Auth\Permissions\JointPermission;
+use BookStack\Permissions\Models\JointPermission;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
diff --git a/app/Http/Controllers/ReferenceController.php b/app/References/ReferenceController.php
similarity index 96%
rename from app/Http/Controllers/ReferenceController.php
rename to app/References/ReferenceController.php
index b9b3e0eab..d6978dd5b 100644
--- a/app/Http/Controllers/ReferenceController.php
+++ b/app/References/ReferenceController.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace BookStack\Http\Controllers;
+namespace BookStack\References;
 
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Bookshelf;
 use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Models\Page;
-use BookStack\References\ReferenceFetcher;
+use BookStack\Http\Controller;
 
 class ReferenceController extends Controller
 {
diff --git a/app/References/ReferenceFetcher.php b/app/References/ReferenceFetcher.php
index 415791857..c4a7d31b6 100644
--- a/app/References/ReferenceFetcher.php
+++ b/app/References/ReferenceFetcher.php
@@ -2,9 +2,9 @@
 
 namespace BookStack\References;
 
-use BookStack\Auth\Permissions\PermissionApplicator;
 use BookStack\Entities\Models\Entity;
 use BookStack\Entities\Models\Page;
+use BookStack\Permissions\PermissionApplicator;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Relations\Relation;
diff --git a/app/Http/Controllers/Api/SearchApiController.php b/app/Search/SearchApiController.php
similarity index 93%
rename from app/Http/Controllers/Api/SearchApiController.php
rename to app/Search/SearchApiController.php
index bf59ec671..d1619e118 100644
--- a/app/Http/Controllers/Api/SearchApiController.php
+++ b/app/Search/SearchApiController.php
@@ -1,12 +1,10 @@
 <?php
 
-namespace BookStack\Http\Controllers\Api;
+namespace BookStack\Search;
 
 use BookStack\Api\ApiEntityListFormatter;
 use BookStack\Entities\Models\Entity;
-use BookStack\Search\SearchOptions;
-use BookStack\Search\SearchResultsFormatter;
-use BookStack\Search\SearchRunner;
+use BookStack\Http\ApiController;
 use Illuminate\Http\Request;
 
 class SearchApiController extends ApiController
diff --git a/app/Http/Controllers/SearchController.php b/app/Search/SearchController.php
similarity index 96%
rename from app/Http/Controllers/SearchController.php
rename to app/Search/SearchController.php
index 8df5cfafb..4b134f11e 100644
--- a/app/Http/Controllers/SearchController.php
+++ b/app/Search/SearchController.php
@@ -1,12 +1,10 @@
 <?php
 
-namespace BookStack\Http\Controllers;
+namespace BookStack\Search;
 
 use BookStack\Entities\Queries\Popular;
 use BookStack\Entities\Tools\SiblingFetcher;
-use BookStack\Search\SearchOptions;
-use BookStack\Search\SearchResultsFormatter;
-use BookStack\Search\SearchRunner;
+use BookStack\Http\Controller;
 use Illuminate\Http\Request;
 
 class SearchController extends Controller
diff --git a/app/Search/SearchIndex.php b/app/Search/SearchIndex.php
index 25389226a..e882e987b 100644
--- a/app/Search/SearchIndex.php
+++ b/app/Search/SearchIndex.php
@@ -2,7 +2,7 @@
 
 namespace BookStack\Search;
 
-use BookStack\Actions\Tag;
+use BookStack\Activity\Models\Tag;
 use BookStack\Entities\EntityProvider;
 use BookStack\Entities\Models\Entity;
 use BookStack\Entities\Models\Page;
diff --git a/app/Search/SearchResultsFormatter.php b/app/Search/SearchResultsFormatter.php
index 9cbc5ee68..02a40632e 100644
--- a/app/Search/SearchResultsFormatter.php
+++ b/app/Search/SearchResultsFormatter.php
@@ -2,7 +2,7 @@
 
 namespace BookStack\Search;
 
-use BookStack\Actions\Tag;
+use BookStack\Activity\Models\Tag;
 use BookStack\Entities\Models\Entity;
 use Illuminate\Support\HtmlString;
 
diff --git a/app/Search/SearchRunner.php b/app/Search/SearchRunner.php
index a0fd1fe3d..fc36cb816 100644
--- a/app/Search/SearchRunner.php
+++ b/app/Search/SearchRunner.php
@@ -2,12 +2,12 @@
 
 namespace BookStack\Search;
 
-use BookStack\Auth\Permissions\PermissionApplicator;
-use BookStack\Auth\User;
 use BookStack\Entities\EntityProvider;
 use BookStack\Entities\Models\BookChild;
 use BookStack\Entities\Models\Entity;
 use BookStack\Entities\Models\Page;
+use BookStack\Permissions\PermissionApplicator;
+use BookStack\Users\Models\User;
 use Illuminate\Database\Connection;
 use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
 use Illuminate\Database\Eloquent\Collection as EloquentCollection;
diff --git a/app/Search/SearchTerm.php b/app/Search/SearchTerm.php
index d416b0059..ba45bb329 100644
--- a/app/Search/SearchTerm.php
+++ b/app/Search/SearchTerm.php
@@ -2,7 +2,7 @@
 
 namespace BookStack\Search;
 
-use BookStack\Model;
+use BookStack\App\Model;
 
 class SearchTerm extends Model
 {
diff --git a/app/Http/Controllers/MaintenanceController.php b/app/Settings/MaintenanceController.php
similarity index 97%
rename from app/Http/Controllers/MaintenanceController.php
rename to app/Settings/MaintenanceController.php
index 8bfefb7ac..9c48a4323 100644
--- a/app/Http/Controllers/MaintenanceController.php
+++ b/app/Settings/MaintenanceController.php
@@ -1,9 +1,10 @@
 <?php
 
-namespace BookStack\Http\Controllers;
+namespace BookStack\Settings;
 
-use BookStack\Actions\ActivityType;
+use BookStack\Activity\ActivityType;
 use BookStack\Entities\Tools\TrashCan;
+use BookStack\Http\Controller;
 use BookStack\Notifications\TestEmail;
 use BookStack\References\ReferenceStore;
 use BookStack\Uploads\ImageService;
diff --git a/app/Settings/Setting.php b/app/Settings/Setting.php
index c0492e6c1..2bd564088 100644
--- a/app/Settings/Setting.php
+++ b/app/Settings/Setting.php
@@ -2,7 +2,7 @@
 
 namespace BookStack\Settings;
 
-use BookStack\Model;
+use BookStack\App\Model;
 
 class Setting extends Model
 {
diff --git a/app/Http/Controllers/SettingController.php b/app/Settings/SettingController.php
similarity index 91%
rename from app/Http/Controllers/SettingController.php
rename to app/Settings/SettingController.php
index 1e13d7cb7..ffdd7545e 100644
--- a/app/Http/Controllers/SettingController.php
+++ b/app/Settings/SettingController.php
@@ -1,11 +1,10 @@
 <?php
 
-namespace BookStack\Http\Controllers;
+namespace BookStack\Settings;
 
-use BookStack\Actions\ActivityType;
-use BookStack\Auth\User;
-use BookStack\Settings\AppSettingsStore;
-use BookStack\Uploads\ImageRepo;
+use BookStack\Activity\ActivityType;
+use BookStack\Http\Controller;
+use BookStack\Users\Models\User;
 use Illuminate\Http\Request;
 
 class SettingController extends Controller
diff --git a/app/Settings/SettingService.php b/app/Settings/SettingService.php
index 9bcd6c7ec..1c5cbdf5a 100644
--- a/app/Settings/SettingService.php
+++ b/app/Settings/SettingService.php
@@ -2,7 +2,7 @@
 
 namespace BookStack\Settings;
 
-use BookStack\Auth\User;
+use BookStack\Users\Models\User;
 
 /**
  * Class SettingService
diff --git a/app/Http/Controllers/StatusController.php b/app/Settings/StatusController.php
similarity index 95%
rename from app/Http/Controllers/StatusController.php
rename to app/Settings/StatusController.php
index ab4f67d0a..5193bc50d 100644
--- a/app/Http/Controllers/StatusController.php
+++ b/app/Settings/StatusController.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace BookStack\Http\Controllers;
+namespace BookStack\Settings;
 
+use BookStack\Http\Controller;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Session;
diff --git a/app/Theming/ThemeEvents.php b/app/Theming/ThemeEvents.php
index aacef80cf..994c3ec0d 100644
--- a/app/Theming/ThemeEvents.php
+++ b/app/Theming/ThemeEvents.php
@@ -26,7 +26,7 @@ class ThemeEvents
      * the type before making use of this parameter.
      *
      * @param string                                $type
-     * @param string|\BookStack\Interfaces\Loggable $detail
+     * @param string|\BookStack\Activity\Models\Loggable $detail
      */
     const ACTIVITY_LOGGED = 'activity_logged';
 
@@ -34,7 +34,7 @@ class ThemeEvents
      * Application boot-up.
      * After main services are registered.
      *
-     * @param \BookStack\Application $app
+     * @param \BookStack\App\Application $app
      */
     const APP_BOOT = 'app_boot';
 
@@ -45,7 +45,7 @@ class ThemeEvents
      * after registration. This is not emitted upon API usage.
      *
      * @param string               $authSystem
-     * @param \BookStack\Auth\User $user
+     * @param \BookStack\Users\Models\User $user
      */
     const AUTH_LOGIN = 'auth_login';
 
@@ -56,7 +56,7 @@ class ThemeEvents
      * by LDAP, SAML and social systems. It only includes self-registrations.
      *
      * @param string               $authSystem
-     * @param \BookStack\Auth\User $user
+     * @param \BookStack\Users\Models\User $user
      */
     const AUTH_REGISTER = 'auth_register';
 
@@ -133,9 +133,9 @@ class ThemeEvents
      * of the system default.
      *
      * @param string                                $event
-     * @param \BookStack\Actions\Webhook            $webhook
-     * @param string|\BookStack\Interfaces\Loggable $detail
-     * @param \BookStack\Auth\User                  $initiator
+     * @param \BookStack\Activity\Models\Webhook            $webhook
+     * @param string|\BookStack\Activity\Models\Loggable $detail
+     * @param \BookStack\Users\Models\User                  $initiator
      * @param int                                   $initiatedTime
      */
     const WEBHOOK_CALL_BEFORE = 'webhook_call_before';
diff --git a/app/Theming/ThemeService.php b/app/Theming/ThemeService.php
index 275dc9d8c..bb91643e3 100644
--- a/app/Theming/ThemeService.php
+++ b/app/Theming/ThemeService.php
@@ -2,7 +2,7 @@
 
 namespace BookStack\Theming;
 
-use BookStack\Auth\Access\SocialAuthService;
+use BookStack\Access\SocialAuthService;
 use Illuminate\Console\Application;
 use Illuminate\Console\Application as Artisan;
 use Symfony\Component\Console\Command\Command;
diff --git a/app/Util/LanguageManager.php b/app/Translation/LanguageManager.php
similarity index 99%
rename from app/Util/LanguageManager.php
rename to app/Translation/LanguageManager.php
index 93c992fcc..39dee8461 100644
--- a/app/Util/LanguageManager.php
+++ b/app/Translation/LanguageManager.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BookStack\Util;
+namespace BookStack\Translation;
 
 use Illuminate\Http\Request;
 
diff --git a/app/Uploads/Attachment.php b/app/Uploads/Attachment.php
index e33b13db4..4fd6d4cdc 100644
--- a/app/Uploads/Attachment.php
+++ b/app/Uploads/Attachment.php
@@ -2,13 +2,13 @@
 
 namespace BookStack\Uploads;
 
-use BookStack\Auth\Permissions\JointPermission;
-use BookStack\Auth\Permissions\PermissionApplicator;
-use BookStack\Auth\User;
+use BookStack\App\Model;
 use BookStack\Entities\Models\Entity;
 use BookStack\Entities\Models\Page;
-use BookStack\Model;
-use BookStack\Traits\HasCreatorAndUpdater;
+use BookStack\Permissions\Models\JointPermission;
+use BookStack\Permissions\PermissionApplicator;
+use BookStack\Users\Models\HasCreatorAndUpdater;
+use BookStack\Users\Models\User;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
diff --git a/app/Http/Controllers/Api/AttachmentApiController.php b/app/Uploads/Controllers/AttachmentApiController.php
similarity index 98%
rename from app/Http/Controllers/Api/AttachmentApiController.php
rename to app/Uploads/Controllers/AttachmentApiController.php
index 9fc7f3bde..2e6d16205 100644
--- a/app/Http/Controllers/Api/AttachmentApiController.php
+++ b/app/Uploads/Controllers/AttachmentApiController.php
@@ -1,9 +1,10 @@
 <?php
 
-namespace BookStack\Http\Controllers\Api;
+namespace BookStack\Uploads\Controllers;
 
 use BookStack\Entities\Models\Page;
 use BookStack\Exceptions\FileUploadException;
+use BookStack\Http\ApiController;
 use BookStack\Uploads\Attachment;
 use BookStack\Uploads\AttachmentService;
 use Exception;
diff --git a/app/Http/Controllers/AttachmentController.php b/app/Uploads/Controllers/AttachmentController.php
similarity index 99%
rename from app/Http/Controllers/AttachmentController.php
rename to app/Uploads/Controllers/AttachmentController.php
index b6ce261d4..92f23465d 100644
--- a/app/Http/Controllers/AttachmentController.php
+++ b/app/Uploads/Controllers/AttachmentController.php
@@ -1,10 +1,11 @@
 <?php
 
-namespace BookStack\Http\Controllers;
+namespace BookStack\Uploads\Controllers;
 
 use BookStack\Entities\Repos\PageRepo;
 use BookStack\Exceptions\FileUploadException;
 use BookStack\Exceptions\NotFoundException;
+use BookStack\Http\Controller;
 use BookStack\Uploads\Attachment;
 use BookStack\Uploads\AttachmentService;
 use Exception;
diff --git a/app/Http/Controllers/Images/DrawioImageController.php b/app/Uploads/Controllers/DrawioImageController.php
similarity index 96%
rename from app/Http/Controllers/Images/DrawioImageController.php
rename to app/Uploads/Controllers/DrawioImageController.php
index ce857cf52..35deada88 100644
--- a/app/Http/Controllers/Images/DrawioImageController.php
+++ b/app/Uploads/Controllers/DrawioImageController.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace BookStack\Http\Controllers\Images;
+namespace BookStack\Uploads\Controllers;
 
 use BookStack\Exceptions\ImageUploadException;
-use BookStack\Http\Controllers\Controller;
+use BookStack\Http\Controller;
 use BookStack\Uploads\ImageRepo;
 use Exception;
 use Illuminate\Http\Request;
diff --git a/app/Http/Controllers/Images/GalleryImageController.php b/app/Uploads/Controllers/GalleryImageController.php
similarity index 95%
rename from app/Http/Controllers/Images/GalleryImageController.php
rename to app/Uploads/Controllers/GalleryImageController.php
index c01eccfee..fb74d6203 100644
--- a/app/Http/Controllers/Images/GalleryImageController.php
+++ b/app/Uploads/Controllers/GalleryImageController.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace BookStack\Http\Controllers\Images;
+namespace BookStack\Uploads\Controllers;
 
 use BookStack\Exceptions\ImageUploadException;
-use BookStack\Http\Controllers\Controller;
+use BookStack\Http\Controller;
 use BookStack\Uploads\ImageRepo;
 use Illuminate\Http\Request;
 use Illuminate\Validation\ValidationException;
diff --git a/app/Http/Controllers/Images/ImageController.php b/app/Uploads/Controllers/ImageController.php
similarity index 97%
rename from app/Http/Controllers/Images/ImageController.php
rename to app/Uploads/Controllers/ImageController.php
index cd6b2d406..fea0713a2 100644
--- a/app/Http/Controllers/Images/ImageController.php
+++ b/app/Uploads/Controllers/ImageController.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace BookStack\Http\Controllers\Images;
+namespace BookStack\Uploads\Controllers;
 
 use BookStack\Exceptions\ImageUploadException;
 use BookStack\Exceptions\NotFoundException;
-use BookStack\Http\Controllers\Controller;
+use BookStack\Http\Controller;
 use BookStack\Uploads\Image;
 use BookStack\Uploads\ImageRepo;
 use BookStack\Uploads\ImageService;
diff --git a/app/Http/Controllers/Api/ImageGalleryApiController.php b/app/Uploads/Controllers/ImageGalleryApiController.php
similarity index 98%
rename from app/Http/Controllers/Api/ImageGalleryApiController.php
rename to app/Uploads/Controllers/ImageGalleryApiController.php
index 3dba3d464..1614b6445 100644
--- a/app/Http/Controllers/Api/ImageGalleryApiController.php
+++ b/app/Uploads/Controllers/ImageGalleryApiController.php
@@ -1,8 +1,9 @@
 <?php
 
-namespace BookStack\Http\Controllers\Api;
+namespace BookStack\Uploads\Controllers;
 
 use BookStack\Entities\Models\Page;
+use BookStack\Http\ApiController;
 use BookStack\Uploads\Image;
 use BookStack\Uploads\ImageRepo;
 use Illuminate\Http\Request;
diff --git a/app/Uploads/Image.php b/app/Uploads/Image.php
index 0ab0b612a..9f571693a 100644
--- a/app/Uploads/Image.php
+++ b/app/Uploads/Image.php
@@ -2,11 +2,11 @@
 
 namespace BookStack\Uploads;
 
-use BookStack\Auth\Permissions\JointPermission;
-use BookStack\Auth\Permissions\PermissionApplicator;
+use BookStack\App\Model;
 use BookStack\Entities\Models\Page;
-use BookStack\Model;
-use BookStack\Traits\HasCreatorAndUpdater;
+use BookStack\Permissions\Models\JointPermission;
+use BookStack\Permissions\PermissionApplicator;
+use BookStack\Users\Models\HasCreatorAndUpdater;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\HasMany;
diff --git a/app/Uploads/ImageRepo.php b/app/Uploads/ImageRepo.php
index 2c643a58b..2d35d96ff 100644
--- a/app/Uploads/ImageRepo.php
+++ b/app/Uploads/ImageRepo.php
@@ -2,9 +2,9 @@
 
 namespace BookStack\Uploads;
 
-use BookStack\Auth\Permissions\PermissionApplicator;
 use BookStack\Entities\Models\Page;
 use BookStack\Exceptions\ImageUploadException;
+use BookStack\Permissions\PermissionApplicator;
 use Exception;
 use Illuminate\Database\Eloquent\Builder;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
diff --git a/app/Uploads/UserAvatars.php b/app/Uploads/UserAvatars.php
index 49a54bbbb..89e88bd19 100644
--- a/app/Uploads/UserAvatars.php
+++ b/app/Uploads/UserAvatars.php
@@ -2,8 +2,8 @@
 
 namespace BookStack\Uploads;
 
-use BookStack\Auth\User;
 use BookStack\Exceptions\HttpFetchException;
+use BookStack\Users\Models\User;
 use Exception;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Str;
diff --git a/app/Http/Controllers/Api/RoleApiController.php b/app/Users/Controllers/RoleApiController.php
similarity index 96%
rename from app/Http/Controllers/Api/RoleApiController.php
rename to app/Users/Controllers/RoleApiController.php
index 6986c73f7..5f4f2999b 100644
--- a/app/Http/Controllers/Api/RoleApiController.php
+++ b/app/Users/Controllers/RoleApiController.php
@@ -1,9 +1,10 @@
 <?php
 
-namespace BookStack\Http\Controllers\Api;
+namespace BookStack\Users\Controllers;
 
-use BookStack\Auth\Permissions\PermissionsRepo;
-use BookStack\Auth\Role;
+use BookStack\Http\ApiController;
+use BookStack\Permissions\PermissionsRepo;
+use BookStack\Users\Models\Role;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 
diff --git a/app/Http/Controllers/RoleController.php b/app/Users/Controllers/RoleController.php
similarity index 95%
rename from app/Http/Controllers/RoleController.php
rename to app/Users/Controllers/RoleController.php
index 6d397bdae..f6472e4de 100644
--- a/app/Http/Controllers/RoleController.php
+++ b/app/Users/Controllers/RoleController.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace BookStack\Http\Controllers;
+namespace BookStack\Users\Controllers;
 
-use BookStack\Auth\Permissions\PermissionsRepo;
-use BookStack\Auth\Queries\RolesAllPaginatedAndSorted;
-use BookStack\Auth\Role;
 use BookStack\Exceptions\PermissionsException;
+use BookStack\Http\Controller;
+use BookStack\Permissions\PermissionsRepo;
+use BookStack\Users\Models\Role;
+use BookStack\Users\Queries\RolesAllPaginatedAndSorted;
 use BookStack\Util\SimpleListOptions;
 use Exception;
 use Illuminate\Http\Request;
-use Illuminate\Validation\ValidationException;
 
 class RoleController extends Controller
 {
diff --git a/app/Http/Controllers/Api/UserApiController.php b/app/Users/Controllers/UserApiController.php
similarity index 97%
rename from app/Http/Controllers/Api/UserApiController.php
rename to app/Users/Controllers/UserApiController.php
index da6ca4321..759aafbd8 100644
--- a/app/Http/Controllers/Api/UserApiController.php
+++ b/app/Users/Controllers/UserApiController.php
@@ -1,10 +1,11 @@
 <?php
 
-namespace BookStack\Http\Controllers\Api;
+namespace BookStack\Users\Controllers;
 
-use BookStack\Auth\User;
-use BookStack\Auth\UserRepo;
 use BookStack\Exceptions\UserUpdateException;
+use BookStack\Http\ApiController;
+use BookStack\Users\Models\User;
+use BookStack\Users\UserRepo;
 use Closure;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
diff --git a/app/Http/Controllers/UserController.php b/app/Users/Controllers/UserController.php
similarity index 96%
rename from app/Http/Controllers/UserController.php
rename to app/Users/Controllers/UserController.php
index cd95f7220..b185f0856 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Users/Controllers/UserController.php
@@ -1,14 +1,15 @@
 <?php
 
-namespace BookStack\Http\Controllers;
+namespace BookStack\Users\Controllers;
 
-use BookStack\Auth\Access\SocialAuthService;
-use BookStack\Auth\Queries\UsersAllPaginatedAndSorted;
-use BookStack\Auth\Role;
-use BookStack\Auth\UserRepo;
+use BookStack\Access\SocialAuthService;
 use BookStack\Exceptions\ImageUploadException;
 use BookStack\Exceptions\UserUpdateException;
+use BookStack\Http\Controller;
 use BookStack\Uploads\ImageRepo;
+use BookStack\Users\Models\Role;
+use BookStack\Users\Queries\UsersAllPaginatedAndSorted;
+use BookStack\Users\UserRepo;
 use BookStack\Util\SimpleListOptions;
 use Exception;
 use Illuminate\Http\Request;
diff --git a/app/Http/Controllers/UserPreferencesController.php b/app/Users/Controllers/UserPreferencesController.php
similarity index 97%
rename from app/Http/Controllers/UserPreferencesController.php
rename to app/Users/Controllers/UserPreferencesController.php
index 560dd1632..b20a8aa37 100644
--- a/app/Http/Controllers/UserPreferencesController.php
+++ b/app/Users/Controllers/UserPreferencesController.php
@@ -1,9 +1,10 @@
 <?php
 
-namespace BookStack\Http\Controllers;
+namespace BookStack\Users\Controllers;
 
-use BookStack\Auth\UserRepo;
+use BookStack\Http\Controller;
 use BookStack\Settings\UserShortcutMap;
+use BookStack\Users\UserRepo;
 use Illuminate\Http\Request;
 
 class UserPreferencesController extends Controller
diff --git a/app/Http/Controllers/UserProfileController.php b/app/Users/Controllers/UserProfileController.php
similarity index 74%
rename from app/Http/Controllers/UserProfileController.php
rename to app/Users/Controllers/UserProfileController.php
index e75aced12..bdf268260 100644
--- a/app/Http/Controllers/UserProfileController.php
+++ b/app/Users/Controllers/UserProfileController.php
@@ -1,11 +1,12 @@
 <?php
 
-namespace BookStack\Http\Controllers;
+namespace BookStack\Users\Controllers;
 
-use BookStack\Actions\ActivityQueries;
-use BookStack\Auth\Queries\UserContentCounts;
-use BookStack\Auth\Queries\UserRecentlyCreatedContent;
-use BookStack\Auth\UserRepo;
+use BookStack\Activity\ActivityQueries;
+use BookStack\Http\Controller;
+use BookStack\Users\Queries\UserContentCounts;
+use BookStack\Users\Queries\UserRecentlyCreatedContent;
+use BookStack\Users\UserRepo;
 
 class UserProfileController extends Controller
 {
diff --git a/app/Http/Controllers/UserSearchController.php b/app/Users/Controllers/UserSearchController.php
similarity index 89%
rename from app/Http/Controllers/UserSearchController.php
rename to app/Users/Controllers/UserSearchController.php
index df234347c..1c7786f58 100644
--- a/app/Http/Controllers/UserSearchController.php
+++ b/app/Users/Controllers/UserSearchController.php
@@ -1,8 +1,9 @@
 <?php
 
-namespace BookStack\Http\Controllers;
+namespace BookStack\Users\Controllers;
 
-use BookStack\Auth\User;
+use BookStack\Http\Controller;
+use BookStack\Users\Models\User;
 use Illuminate\Http\Request;
 
 class UserSearchController extends Controller
diff --git a/app/Traits/HasCreatorAndUpdater.php b/app/Users/Models/HasCreatorAndUpdater.php
similarity index 90%
rename from app/Traits/HasCreatorAndUpdater.php
rename to app/Users/Models/HasCreatorAndUpdater.php
index 7c60be750..5ff46bc3c 100644
--- a/app/Traits/HasCreatorAndUpdater.php
+++ b/app/Users/Models/HasCreatorAndUpdater.php
@@ -1,8 +1,7 @@
 <?php
 
-namespace BookStack\Traits;
+namespace BookStack\Users\Models;
 
-use BookStack\Auth\User;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 /**
diff --git a/app/Traits/HasOwner.php b/app/Users/Models/HasOwner.php
similarity index 84%
rename from app/Traits/HasOwner.php
rename to app/Users/Models/HasOwner.php
index c0fefafa9..eb830ef6f 100644
--- a/app/Traits/HasOwner.php
+++ b/app/Users/Models/HasOwner.php
@@ -1,8 +1,7 @@
 <?php
 
-namespace BookStack\Traits;
+namespace BookStack\Users\Models;
 
-use BookStack\Auth\User;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 /**
diff --git a/app/Auth/Role.php b/app/Users/Models/Role.php
similarity index 92%
rename from app/Auth/Role.php
rename to app/Users/Models/Role.php
index 8f9702fa0..d1452e66b 100644
--- a/app/Auth/Role.php
+++ b/app/Users/Models/Role.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace BookStack\Auth;
+namespace BookStack\Users\Models;
 
-use BookStack\Auth\Permissions\EntityPermission;
-use BookStack\Auth\Permissions\JointPermission;
-use BookStack\Auth\Permissions\RolePermission;
-use BookStack\Interfaces\Loggable;
-use BookStack\Model;
+use BookStack\Activity\Models\Loggable;
+use BookStack\App\Model;
+use BookStack\Permissions\Models\EntityPermission;
+use BookStack\Permissions\Models\JointPermission;
+use BookStack\Permissions\Models\RolePermission;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
diff --git a/app/Auth/User.php b/app/Users/Models/User.php
similarity index 97%
rename from app/Auth/User.php
rename to app/Users/Models/User.php
index 90bb3d68e..08cab69fb 100644
--- a/app/Auth/User.php
+++ b/app/Users/Models/User.php
@@ -1,14 +1,15 @@
 <?php
 
-namespace BookStack\Auth;
+namespace BookStack\Users\Models;
 
-use BookStack\Actions\Favourite;
+use BookStack\Access\Mfa\MfaValue;
+use BookStack\Access\SocialAccount;
+use BookStack\Activity\Models\Favourite;
+use BookStack\Activity\Models\Loggable;
 use BookStack\Api\ApiToken;
-use BookStack\Auth\Access\Mfa\MfaValue;
+use BookStack\App\Model;
+use BookStack\App\Sluggable;
 use BookStack\Entities\Tools\SlugGenerator;
-use BookStack\Interfaces\Loggable;
-use BookStack\Interfaces\Sluggable;
-use BookStack\Model;
 use BookStack\Notifications\ResetPassword;
 use BookStack\Uploads\Image;
 use Carbon\Carbon;
diff --git a/app/Auth/Queries/RolesAllPaginatedAndSorted.php b/app/Users/Queries/RolesAllPaginatedAndSorted.php
similarity index 93%
rename from app/Auth/Queries/RolesAllPaginatedAndSorted.php
rename to app/Users/Queries/RolesAllPaginatedAndSorted.php
index 9ee4f6c24..7fd4048df 100644
--- a/app/Auth/Queries/RolesAllPaginatedAndSorted.php
+++ b/app/Users/Queries/RolesAllPaginatedAndSorted.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace BookStack\Auth\Queries;
+namespace BookStack\Users\Queries;
 
-use BookStack\Auth\Role;
+use BookStack\Users\Models\Role;
 use BookStack\Util\SimpleListOptions;
 use Illuminate\Pagination\LengthAwarePaginator;
 
diff --git a/app/Auth/Queries/UserContentCounts.php b/app/Users/Queries/UserContentCounts.php
similarity index 91%
rename from app/Auth/Queries/UserContentCounts.php
rename to app/Users/Queries/UserContentCounts.php
index 397719383..178d8536b 100644
--- a/app/Auth/Queries/UserContentCounts.php
+++ b/app/Users/Queries/UserContentCounts.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace BookStack\Auth\Queries;
+namespace BookStack\Users\Queries;
 
-use BookStack\Auth\User;
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Bookshelf;
 use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Models\Page;
+use BookStack\Users\Models\User;
 
 /**
  * Get asset created counts for the given user.
diff --git a/app/Auth/Queries/UserRecentlyCreatedContent.php b/app/Users/Queries/UserRecentlyCreatedContent.php
similarity index 93%
rename from app/Auth/Queries/UserRecentlyCreatedContent.php
rename to app/Users/Queries/UserRecentlyCreatedContent.php
index 5060227c0..23db2c1f1 100644
--- a/app/Auth/Queries/UserRecentlyCreatedContent.php
+++ b/app/Users/Queries/UserRecentlyCreatedContent.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace BookStack\Auth\Queries;
+namespace BookStack\Users\Queries;
 
-use BookStack\Auth\User;
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Bookshelf;
 use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Models\Page;
+use BookStack\Users\Models\User;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;
 
diff --git a/app/Auth/Queries/UsersAllPaginatedAndSorted.php b/app/Users/Queries/UsersAllPaginatedAndSorted.php
similarity index 94%
rename from app/Auth/Queries/UsersAllPaginatedAndSorted.php
rename to app/Users/Queries/UsersAllPaginatedAndSorted.php
index 29b6a8969..3ef12e07b 100644
--- a/app/Auth/Queries/UsersAllPaginatedAndSorted.php
+++ b/app/Users/Queries/UsersAllPaginatedAndSorted.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace BookStack\Auth\Queries;
+namespace BookStack\Users\Queries;
 
-use BookStack\Auth\User;
+use BookStack\Users\Models\User;
 use BookStack\Util\SimpleListOptions;
 use Illuminate\Pagination\LengthAwarePaginator;
 
diff --git a/app/Auth/UserRepo.php b/app/Users/UserRepo.php
similarity index 97%
rename from app/Auth/UserRepo.php
rename to app/Users/UserRepo.php
index 2c27f34a7..408ee6a8e 100644
--- a/app/Auth/UserRepo.php
+++ b/app/Users/UserRepo.php
@@ -1,14 +1,16 @@
 <?php
 
-namespace BookStack\Auth;
+namespace BookStack\Users;
 
-use BookStack\Actions\ActivityType;
-use BookStack\Auth\Access\UserInviteService;
+use BookStack\Access\UserInviteService;
+use BookStack\Activity\ActivityType;
 use BookStack\Entities\EntityProvider;
 use BookStack\Exceptions\NotifyException;
 use BookStack\Exceptions\UserUpdateException;
 use BookStack\Facades\Activity;
 use BookStack\Uploads\UserAvatars;
+use BookStack\Users\Models\Role;
+use BookStack\Users\Models\User;
 use Exception;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Log;
diff --git a/bootstrap/app.php b/bootstrap/app.php
index 6538aa81c..12cc2dce2 100644
--- a/bootstrap/app.php
+++ b/bootstrap/app.php
@@ -11,7 +11,7 @@
 |
 */
 
-$app = new BookStack\Application(
+$app = new \BookStack\App\Application(
     dirname(__DIR__)
 );
 
diff --git a/composer.json b/composer.json
index 44143e042..eba231d44 100644
--- a/composer.json
+++ b/composer.json
@@ -58,7 +58,7 @@
             "Database\\Seeders\\": "database/seeders/"
         },
         "files": [
-            "app/helpers.php"
+            "app/App/helpers.php"
         ]
     },
     "autoload-dev": {
diff --git a/database/factories/Actions/CommentFactory.php b/database/factories/Activity/Models/CommentFactory.php
similarity index 82%
rename from database/factories/Actions/CommentFactory.php
rename to database/factories/Activity/Models/CommentFactory.php
index e81f3fe2c..4b76cd11d 100644
--- a/database/factories/Actions/CommentFactory.php
+++ b/database/factories/Activity/Models/CommentFactory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Database\Factories\Actions;
+namespace Database\Factories\Activity\Models;
 
 use Illuminate\Database\Eloquent\Factories\Factory;
 
@@ -11,7 +11,7 @@ class CommentFactory extends Factory
      *
      * @var string
      */
-    protected $model = \BookStack\Actions\Comment::class;
+    protected $model = \BookStack\Activity\Models\Comment::class;
 
     /**
      * Define the model's default state.
diff --git a/database/factories/Actions/TagFactory.php b/database/factories/Activity/Models/TagFactory.php
similarity index 80%
rename from database/factories/Actions/TagFactory.php
rename to database/factories/Activity/Models/TagFactory.php
index 8b9c529f2..8a60c2528 100644
--- a/database/factories/Actions/TagFactory.php
+++ b/database/factories/Activity/Models/TagFactory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Database\Factories\Actions;
+namespace Database\Factories\Activity\Models;
 
 use Illuminate\Database\Eloquent\Factories\Factory;
 
@@ -11,7 +11,7 @@ class TagFactory extends Factory
      *
      * @var string
      */
-    protected $model = \BookStack\Actions\Tag::class;
+    protected $model = \BookStack\Activity\Models\Tag::class;
 
     /**
      * Define the model's default state.
diff --git a/database/factories/Actions/WebhookFactory.php b/database/factories/Activity/Models/WebhookFactory.php
similarity index 84%
rename from database/factories/Actions/WebhookFactory.php
rename to database/factories/Activity/Models/WebhookFactory.php
index c7393b32c..721481a8a 100644
--- a/database/factories/Actions/WebhookFactory.php
+++ b/database/factories/Activity/Models/WebhookFactory.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Database\Factories\Actions;
+namespace Database\Factories\Activity\Models;
 
-use BookStack\Actions\Webhook;
+use BookStack\Activity\Models\Webhook;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 class WebhookFactory extends Factory
diff --git a/database/factories/Actions/WebhookTrackedEventFactory.php b/database/factories/Activity/Models/WebhookTrackedEventFactory.php
similarity index 76%
rename from database/factories/Actions/WebhookTrackedEventFactory.php
rename to database/factories/Activity/Models/WebhookTrackedEventFactory.php
index 71b8774bc..61f733a6b 100644
--- a/database/factories/Actions/WebhookTrackedEventFactory.php
+++ b/database/factories/Activity/Models/WebhookTrackedEventFactory.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Database\Factories\Actions;
+namespace Database\Factories\Activity\Models;
 
-use BookStack\Actions\ActivityType;
-use BookStack\Actions\Webhook;
+use BookStack\Activity\ActivityType;
+use BookStack\Activity\Models\Webhook;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 class WebhookTrackedEventFactory extends Factory
diff --git a/database/factories/Uploads/AttachmentFactory.php b/database/factories/Uploads/AttachmentFactory.php
index 30722265d..83dec6525 100644
--- a/database/factories/Uploads/AttachmentFactory.php
+++ b/database/factories/Uploads/AttachmentFactory.php
@@ -2,8 +2,8 @@
 
 namespace Database\Factories\Uploads;
 
-use BookStack\Auth\User;
 use BookStack\Entities\Models\Page;
+use BookStack\Users\Models\User;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 /**
diff --git a/database/factories/Auth/RoleFactory.php b/database/factories/Users/Models/RoleFactory.php
similarity index 83%
rename from database/factories/Auth/RoleFactory.php
rename to database/factories/Users/Models/RoleFactory.php
index 6ab3d710e..2dd202a3a 100644
--- a/database/factories/Auth/RoleFactory.php
+++ b/database/factories/Users/Models/RoleFactory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Database\Factories\Auth;
+namespace Database\Factories\Users\Models;
 
 use Illuminate\Database\Eloquent\Factories\Factory;
 
@@ -11,7 +11,7 @@ class RoleFactory extends Factory
      *
      * @var string
      */
-    protected $model = \BookStack\Auth\Role::class;
+    protected $model = \BookStack\Users\Models\Role::class;
 
     /**
      * Define the model's default state.
diff --git a/database/factories/Auth/UserFactory.php b/database/factories/Users/Models/UserFactory.php
similarity index 90%
rename from database/factories/Auth/UserFactory.php
rename to database/factories/Users/Models/UserFactory.php
index 6ff62a975..83810a92a 100644
--- a/database/factories/Auth/UserFactory.php
+++ b/database/factories/Users/Models/UserFactory.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Database\Factories\Auth;
+namespace Database\Factories\Users\Models;
 
-use BookStack\Auth\User;
+use BookStack\Users\Models\User;
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Illuminate\Support\Str;
 
diff --git a/database/migrations/2023_01_24_104625_refactor_joint_permissions_storage.php b/database/migrations/2023_01_24_104625_refactor_joint_permissions_storage.php
index 411868c8e..53994c52b 100644
--- a/database/migrations/2023_01_24_104625_refactor_joint_permissions_storage.php
+++ b/database/migrations/2023_01_24_104625_refactor_joint_permissions_storage.php
@@ -1,6 +1,6 @@
 <?php
 
-use BookStack\Auth\Permissions\JointPermissionBuilder;
+use BookStack\Permissions\JointPermissionBuilder;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\DB;
diff --git a/database/seeders/DummyContentSeeder.php b/database/seeders/DummyContentSeeder.php
index f61e4e13d..0f030d671 100644
--- a/database/seeders/DummyContentSeeder.php
+++ b/database/seeders/DummyContentSeeder.php
@@ -3,14 +3,14 @@
 namespace Database\Seeders;
 
 use BookStack\Api\ApiToken;
-use BookStack\Auth\Permissions\JointPermissionBuilder;
-use BookStack\Auth\Permissions\RolePermission;
-use BookStack\Auth\Role;
-use BookStack\Auth\User;
 use BookStack\Entities\Models\Bookshelf;
 use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Models\Page;
+use BookStack\Permissions\JointPermissionBuilder;
+use BookStack\Permissions\Models\RolePermission;
 use BookStack\Search\SearchIndex;
+use BookStack\Users\Models\Role;
+use BookStack\Users\Models\User;
 use Illuminate\Database\Seeder;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Str;
diff --git a/database/seeders/LargeContentSeeder.php b/database/seeders/LargeContentSeeder.php
index d0e65f974..bb9b087d2 100644
--- a/database/seeders/LargeContentSeeder.php
+++ b/database/seeders/LargeContentSeeder.php
@@ -2,13 +2,13 @@
 
 namespace Database\Seeders;
 
-use BookStack\Auth\Permissions\JointPermissionBuilder;
-use BookStack\Auth\Role;
-use BookStack\Auth\User;
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Models\Page;
+use BookStack\Permissions\JointPermissionBuilder;
 use BookStack\Search\SearchIndex;
+use BookStack\Users\Models\Role;
+use BookStack\Users\Models\User;
 use Illuminate\Database\Seeder;
 use Illuminate\Support\Str;
 
diff --git a/resources/views/entities/body-tag-classes.blade.php b/resources/views/entities/body-tag-classes.blade.php
index 2edb3e040..08427f1a5 100644
--- a/resources/views/entities/body-tag-classes.blade.php
+++ b/resources/views/entities/body-tag-classes.blade.php
@@ -1 +1 @@
-@push('body-class', e((new \BookStack\Actions\TagClassGenerator($entity->tags->all()))->generateAsString() . ' '))
\ No newline at end of file
+@push('body-class', e((new \BookStack\Activity\Tools\TagClassGenerator($entity->tags->all()))->generateAsString() . ' '))
\ No newline at end of file
diff --git a/resources/views/form/entity-permissions.blade.php b/resources/views/form/entity-permissions.blade.php
index 9bf309fb8..8eddac8de 100644
--- a/resources/views/form/entity-permissions.blade.php
+++ b/resources/views/form/entity-permissions.blade.php
@@ -1,5 +1,5 @@
 <?php
-  /** @var \BookStack\Auth\Permissions\PermissionFormData $data */
+/** @var \BookStack\Permissions\PermissionFormData $data */
 ?>
 <form component="entity-permissions"
       option:entity-permissions:entity-type="{{ $model->getType() }}"
@@ -48,7 +48,8 @@
 
     <div class="flex-container-row justify-flex-end mb-xl">
         <div class="flex-container-row items-center gap-m">
-            <label for="role_select" class="m-none p-none"><span class="bold">{{ trans('entities.permissions_role_override') }}</span></label>
+            <label for="role_select" class="m-none p-none"><span
+                        class="bold">{{ trans('entities.permissions_role_override') }}</span></label>
             <select name="role_select" id="role_select" refs="entity-permissions@role-select">
                 <option value="">{{ trans('common.select') }}</option>
                 @foreach($data->rolesNotAssigned() as $role)
diff --git a/resources/views/settings/audit.blade.php b/resources/views/settings/audit.blade.php
index abb9c2771..b575968e2 100644
--- a/resources/views/settings/audit.blade.php
+++ b/resources/views/settings/audit.blade.php
@@ -1,120 +1,132 @@
 @extends('layouts.simple')
 
 @section('body')
-<div class="container">
+    <div class="container">
 
-    @include('settings.parts.navbar', ['selected' => 'audit'])
+        @include('settings.parts.navbar', ['selected' => 'audit'])
 
-    <div class="card content-wrap auto-height">
-        <h1 class="list-heading">{{ trans('settings.audit') }}</h1>
-        <p class="text-muted">{{ trans('settings.audit_desc') }}</p>
+        <div class="card content-wrap auto-height">
+            <h1 class="list-heading">{{ trans('settings.audit') }}</h1>
+            <p class="text-muted">{{ trans('settings.audit_desc') }}</p>
 
-        <form action="{{ url('/settings/audit') }}" method="get" class="flex-container-row wrap justify-flex-start gap-x-m gap-y-xs">
+            <form action="{{ url('/settings/audit') }}" method="get"
+                  class="flex-container-row wrap justify-flex-start gap-x-m gap-y-xs">
 
-            @foreach(request()->only(['order', 'sort']) as $key => $val)
-                <input type="hidden" name="{{ $key }}" value="{{ $val }}">
-            @endforeach
+                @foreach(request()->only(['order', 'sort']) as $key => $val)
+                    <input type="hidden" name="{{ $key }}" value="{{ $val }}">
+                @endforeach
 
-            <div component="dropdown" class="list-sort-type dropdown-container">
-                <label for="">{{ trans('settings.audit_event_filter') }}</label>
-                <button refs="dropdown@toggle"
-                        type="button"
-                        aria-haspopup="true"
-                        aria-expanded="false"
-                        aria-label="{{ trans('common.sort_options') }}"
-                        class="input-base text-left">{{ $filters['event'] ?: trans('settings.audit_event_filter_no_filter') }}</button>
-                <ul refs="dropdown@menu" class="dropdown-menu">
-                    <li @if($filters['event'] === '') class="active" @endif><a href="{{ sortUrl('/settings/audit', array_filter(request()->except('page')), ['event' => '']) }}" class="text-item">{{ trans('settings.audit_event_filter_no_filter') }}</a></li>
-                    @foreach($activityTypes as $type)
-                        <li @if($type === $filters['event']) class="active" @endif><a href="{{ sortUrl('/settings/audit', array_filter(request()->except('page')), ['event' => $type]) }}" class="text-item">{{ $type }}</a></li>
-                    @endforeach
-                </ul>
-            </div>
-
-            @if(!empty($filters['event']))
-                <input type="hidden" name="event" value="{{ $filters['event'] }}">
-            @endif
-
-            @foreach(['date_from', 'date_to'] as $filterKey)
-                <div class=>
-                    <label for="audit_filter_{{ $filterKey }}">{{ trans('settings.audit_' . $filterKey) }}</label>
-                    <input id="audit_filter_{{ $filterKey }}"
-                           component="submit-on-change"
-                           type="date"
-                           name="{{ $filterKey }}"
-                           value="{{ $filters[$filterKey] ?? '' }}">
+                <div component="dropdown" class="list-sort-type dropdown-container">
+                    <label for="">{{ trans('settings.audit_event_filter') }}</label>
+                    <button refs="dropdown@toggle"
+                            type="button"
+                            aria-haspopup="true"
+                            aria-expanded="false"
+                            aria-label="{{ trans('common.sort_options') }}"
+                            class="input-base text-left">{{ $filters['event'] ?: trans('settings.audit_event_filter_no_filter') }}</button>
+                    <ul refs="dropdown@menu" class="dropdown-menu">
+                        <li @if($filters['event'] === '') class="active" @endif><a
+                                    href="{{ sortUrl('/settings/audit', array_filter(request()->except('page')), ['event' => '']) }}"
+                                    class="text-item">{{ trans('settings.audit_event_filter_no_filter') }}</a></li>
+                        @foreach($activityTypes as $type)
+                            <li @if($type === $filters['event']) class="active" @endif><a
+                                        href="{{ sortUrl('/settings/audit', array_filter(request()->except('page')), ['event' => $type]) }}"
+                                        class="text-item">{{ $type }}</a></li>
+                        @endforeach
+                    </ul>
                 </div>
-            @endforeach
 
-            <div class="form-group"
-                 component="submit-on-change"
-                 option:submit-on-change:filter='[name="user"]'>
-                <label for="owner">{{ trans('settings.audit_table_user') }}</label>
-                @include('form.user-select', ['user' => $filters['user'] ? \BookStack\Auth\User::query()->find($filters['user']) : null, 'name' => 'user'])
-            </div>
+                @if(!empty($filters['event']))
+                    <input type="hidden" name="event" value="{{ $filters['event'] }}">
+                @endif
+
+                @foreach(['date_from', 'date_to'] as $filterKey)
+                    <div class=>
+                        <label for="audit_filter_{{ $filterKey }}">{{ trans('settings.audit_' . $filterKey) }}</label>
+                        <input id="audit_filter_{{ $filterKey }}"
+                               component="submit-on-change"
+                               type="date"
+                               name="{{ $filterKey }}"
+                               value="{{ $filters[$filterKey] ?? '' }}">
+                    </div>
+                @endforeach
+
+                <div class="form-group"
+                     component="submit-on-change"
+                     option:submit-on-change:filter='[name="user"]'>
+                    <label for="owner">{{ trans('settings.audit_table_user') }}</label>
+                    @include('form.user-select', ['user' => $filters['user'] ? \BookStack\Users\Models\User::query()->find($filters['user']) : null, 'name' => 'user'])
+                </div>
 
 
-            <div class="form-group">
-                <label for="ip">{{ trans('settings.audit_table_ip') }}</label>
-                @include('form.text', ['name' => 'ip', 'model' => (object) $filters])
-                <input type="submit" style="display: none">
-            </div>
-        </form>
+                <div class="form-group">
+                    <label for="ip">{{ trans('settings.audit_table_ip') }}</label>
+                    @include('form.text', ['name' => 'ip', 'model' => (object) $filters])
+                    <input type="submit" style="display: none">
+                </div>
+            </form>
 
-        <hr class="mt-m mb-s">
+            <hr class="mt-m mb-s">
 
-        <div class="flex-container-row justify-space-between items-center wrap">
-            <div class="flex-2 min-width-xl">{{ $activities->links() }}</div>
-            <div class="flex-none min-width-m py-m">
-                @include('common.sort', array_merge($listOptions->getSortControlData(), ['useQuery' => true]))
-            </div>
-        </div>
-
-        <div class="item-list">
-            <div class="item-list-row flex-container-row items-center bold hide-under-m">
-                <div class="flex-2 px-m py-xs flex-container-row items-center">{{ trans('settings.audit_table_user') }}</div>
-                <div class="flex-2 px-m py-xs">{{ trans('settings.audit_table_event') }}</div>
-                <div class="flex-3 px-m py-xs">{{ trans('settings.audit_table_related') }}</div>
-                <div class="flex-container-row flex-3">
-                    <div class="flex px-m py-xs">{{ trans('settings.audit_table_ip') }}</div>
-                    <div class="flex-2 px-m py-xs text-right">{{ trans('settings.audit_table_date') }}</div>
+            <div class="flex-container-row justify-space-between items-center wrap">
+                <div class="flex-2 min-width-xl">{{ $activities->links() }}</div>
+                <div class="flex-none min-width-m py-m">
+                    @include('common.sort', array_merge($listOptions->getSortControlData(), ['useQuery' => true]))
                 </div>
             </div>
-            @foreach($activities as $activity)
-                <div class="item-list-row flex-container-row items-center wrap py-xxs">
-                    <div class="flex-2 px-m py-xxs flex-container-row items-center min-width-m">
-                        @include('settings.parts.table-user', ['user' => $activity->user, 'user_id' => $activity->user_id])
-                    </div>
-                    <div class="flex-2 px-m py-xxs min-width-m"><strong class="mr-xs hide-over-m">{{ trans('settings.audit_table_event') }}:</strong> {{ $activity->type }}</div>
-                    <div class="flex-3 px-m py-xxs min-width-l">
-                        @if($activity->entity)
-                            <a href="{{ $activity->entity->getUrl() }}" class="flex-container-row items-center">
-                                <span role="presentation" class="icon flex-none text-{{$activity->entity->getType()}}">@icon($activity->entity->getType())</span>
-                                <div class="flex text-{{ $activity->entity->getType() }}">
-                                    {{ $activity->entity->name }}
-                                </div>
-                            </a>
-                        @elseif($activity->detail && $activity->isForEntity())
-                            <div>
-                                {{ trans('settings.audit_deleted_item') }} <br>
-                                {{ trans('settings.audit_deleted_item_name', ['name' => $activity->detail]) }}
-                            </div>
-                        @elseif($activity->detail)
-                            <div>{{ $activity->detail }}</div>
-                        @endif
-                    </div>
+
+            <div class="item-list">
+                <div class="item-list-row flex-container-row items-center bold hide-under-m">
+                    <div class="flex-2 px-m py-xs flex-container-row items-center">{{ trans('settings.audit_table_user') }}</div>
+                    <div class="flex-2 px-m py-xs">{{ trans('settings.audit_table_event') }}</div>
+                    <div class="flex-3 px-m py-xs">{{ trans('settings.audit_table_related') }}</div>
                     <div class="flex-container-row flex-3">
-                        <div class="flex px-m py-xxs min-width-xs"><strong class="mr-xs hide-over-m">{{ trans('settings.audit_table_ip') }}:<br></strong> {{ $activity->ip }}</div>
-                        <div class="flex-2 px-m py-xxs text-m-right min-width-xs"><strong class="mr-xs hide-over-m">{{ trans('settings.audit_table_date') }}:<br></strong> {{ $activity->created_at }}</div>
+                        <div class="flex px-m py-xs">{{ trans('settings.audit_table_ip') }}</div>
+                        <div class="flex-2 px-m py-xs text-right">{{ trans('settings.audit_table_date') }}</div>
                     </div>
                 </div>
-            @endforeach
+                @foreach($activities as $activity)
+                    <div class="item-list-row flex-container-row items-center wrap py-xxs">
+                        <div class="flex-2 px-m py-xxs flex-container-row items-center min-width-m">
+                            @include('settings.parts.table-user', ['user' => $activity->user, 'user_id' => $activity->user_id])
+                        </div>
+                        <div class="flex-2 px-m py-xxs min-width-m"><strong
+                                    class="mr-xs hide-over-m">{{ trans('settings.audit_table_event') }}
+                                :</strong> {{ $activity->type }}</div>
+                        <div class="flex-3 px-m py-xxs min-width-l">
+                            @if($activity->entity)
+                                <a href="{{ $activity->entity->getUrl() }}" class="flex-container-row items-center">
+                                    <span role="presentation"
+                                          class="icon flex-none text-{{$activity->entity->getType()}}">@icon($activity->entity->getType())</span>
+                                    <div class="flex text-{{ $activity->entity->getType() }}">
+                                        {{ $activity->entity->name }}
+                                    </div>
+                                </a>
+                            @elseif($activity->detail && $activity->isForEntity())
+                                <div>
+                                    {{ trans('settings.audit_deleted_item') }} <br>
+                                    {{ trans('settings.audit_deleted_item_name', ['name' => $activity->detail]) }}
+                                </div>
+                            @elseif($activity->detail)
+                                <div>{{ $activity->detail }}</div>
+                            @endif
+                        </div>
+                        <div class="flex-container-row flex-3">
+                            <div class="flex px-m py-xxs min-width-xs"><strong
+                                        class="mr-xs hide-over-m">{{ trans('settings.audit_table_ip') }}
+                                    :<br></strong> {{ $activity->ip }}</div>
+                            <div class="flex-2 px-m py-xxs text-m-right min-width-xs"><strong
+                                        class="mr-xs hide-over-m">{{ trans('settings.audit_table_date') }}
+                                    :<br></strong> {{ $activity->created_at }}</div>
+                        </div>
+                    </div>
+                @endforeach
+            </div>
+
+            <div class="py-m">
+                {{ $activities->links() }}
+            </div>
         </div>
 
-        <div class="py-m">
-            {{ $activities->links() }}
-        </div>
     </div>
-
-</div>
 @stop
diff --git a/resources/views/settings/registration.blade.php b/resources/views/settings/registration.blade.php
index e60704aeb..1666cef53 100644
--- a/resources/views/settings/registration.blade.php
+++ b/resources/views/settings/registration.blade.php
@@ -24,9 +24,12 @@
                     @endif
 
                     <label for="setting-registration-role">{{ trans('settings.reg_default_role') }}</label>
-                    <select id="setting-registration-role" name="setting-registration-role" @if($errors->has('setting-registration-role')) class="neg" @endif>
-                        <option value="0" @if(intval(setting('registration-role', '0')) === 0) selected @endif>-- {{ trans('common.none') }} --</option>
-                        @foreach(\BookStack\Auth\Role::all() as $role)
+                    <select id="setting-registration-role" name="setting-registration-role"
+                            @if($errors->has('setting-registration-role')) class="neg" @endif>
+                        <option value="0" @if(intval(setting('registration-role', '0')) === 0) selected @endif>
+                            -- {{ trans('common.none') }} --
+                        </option>
+                        @foreach(\BookStack\Users\Models\Role::all() as $role)
                             <option value="{{$role->id}}"
                                     data-system-role-name="{{ $role->system_name ?? '' }}"
                                     @if(intval(setting('registration-role', '0')) === $role->id) selected @endif
@@ -40,11 +43,14 @@
 
             <div class="grid half gap-xl">
                 <div>
-                    <label for="setting-registration-restrict" class="setting-list-label">{{ trans('settings.reg_confirm_restrict_domain') }}</label>
+                    <label for="setting-registration-restrict"
+                           class="setting-list-label">{{ trans('settings.reg_confirm_restrict_domain') }}</label>
                     <p class="small">{!! trans('settings.reg_confirm_restrict_domain_desc') !!}</p>
                 </div>
                 <div class="pt-xs">
-                    <input type="text" id="setting-registration-restrict" name="setting-registration-restrict" placeholder="{{ trans('settings.reg_confirm_restrict_domain_placeholder') }}" value="{{ setting('registration-restrict', '') }}">
+                    <input type="text" id="setting-registration-restrict" name="setting-registration-restrict"
+                           placeholder="{{ trans('settings.reg_confirm_restrict_domain_placeholder') }}"
+                           value="{{ setting('registration-restrict', '') }}">
                 </div>
             </div>
 
diff --git a/resources/views/settings/webhooks/parts/form.blade.php b/resources/views/settings/webhooks/parts/form.blade.php
index c8592e266..56929e3ce 100644
--- a/resources/views/settings/webhooks/parts/form.blade.php
+++ b/resources/views/settings/webhooks/parts/form.blade.php
@@ -48,7 +48,7 @@
         <hr class="my-s">
 
         <div class="dual-column-content toggle-switch-list">
-            @foreach(\BookStack\Actions\ActivityType::all() as $activityType)
+            @foreach(\BookStack\Activity\ActivityType::all() as $activityType)
                 <div>
                     @include('form.custom-checkbox', [
                        'name' => 'events[]',
diff --git a/resources/views/tags/index.blade.php b/resources/views/tags/index.blade.php
index b6b3325e0..0a853162d 100644
--- a/resources/views/tags/index.blade.php
+++ b/resources/views/tags/index.blade.php
@@ -27,7 +27,7 @@
             @if($nameFilter)
                 <div class="my-m">
                     <strong class="mr-xs">{{ trans('common.filter_active') }}</strong>
-                    @include('entities.tag', ['tag' => new \BookStack\Actions\Tag(['name' => $nameFilter])])
+                    @include('entities.tag', ['tag' => new \BookStack\Activity\Models\Tag(['name' => $nameFilter])])
                     <form method="get" action="{{ url("/tags") }}" class="inline block">
                         @include('form.request-query-inputs', ['params' => ['search']])
                         <button class="text-button text-warn">@icon('close'){{ trans('common.filter_clear') }}</button>
diff --git a/routes/api.php b/routes/api.php
index c809cdb3a..04c94a966 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -3,24 +3,17 @@
 /**
  * Routes for the BookStack API.
  * Routes have a uri prefix of /api/.
- * Controllers are all within app/Http/Controllers/Api.
+ * Controllers all end with "ApiController"
  */
 
-use BookStack\Http\Controllers\Api\ApiDocsController;
-use BookStack\Http\Controllers\Api\AttachmentApiController;
-use BookStack\Http\Controllers\Api\BookApiController;
-use BookStack\Http\Controllers\Api\BookExportApiController;
-use BookStack\Http\Controllers\Api\BookshelfApiController;
-use BookStack\Http\Controllers\Api\ChapterApiController;
-use BookStack\Http\Controllers\Api\ChapterExportApiController;
-use BookStack\Http\Controllers\Api\ContentPermissionApiController;
-use BookStack\Http\Controllers\Api\ImageGalleryApiController;
-use BookStack\Http\Controllers\Api\PageApiController;
-use BookStack\Http\Controllers\Api\PageExportApiController;
-use BookStack\Http\Controllers\Api\RecycleBinApiController;
-use BookStack\Http\Controllers\Api\RoleApiController;
-use BookStack\Http\Controllers\Api\SearchApiController;
-use BookStack\Http\Controllers\Api\UserApiController;
+use BookStack\Api\ApiDocsController;
+use BookStack\Entities\Controllers as EntityControllers;
+use BookStack\Permissions\ContentPermissionApiController;
+use BookStack\Search\SearchApiController;
+use BookStack\Uploads\Controllers\AttachmentApiController;
+use BookStack\Uploads\Controllers\ImageGalleryApiController;
+use BookStack\Users\Controllers\RoleApiController;
+use BookStack\Users\Controllers\UserApiController;
 use Illuminate\Support\Facades\Route;
 
 Route::get('docs.json', [ApiDocsController::class, 'json']);
@@ -31,38 +24,38 @@ Route::get('attachments/{id}', [AttachmentApiController::class, 'read']);
 Route::put('attachments/{id}', [AttachmentApiController::class, 'update']);
 Route::delete('attachments/{id}', [AttachmentApiController::class, 'delete']);
 
-Route::get('books', [BookApiController::class, 'list']);
-Route::post('books', [BookApiController::class, 'create']);
-Route::get('books/{id}', [BookApiController::class, 'read']);
-Route::put('books/{id}', [BookApiController::class, 'update']);
-Route::delete('books/{id}', [BookApiController::class, 'delete']);
+Route::get('books', [EntityControllers\BookApiController::class, 'list']);
+Route::post('books', [EntityControllers\BookApiController::class, 'create']);
+Route::get('books/{id}', [EntityControllers\BookApiController::class, 'read']);
+Route::put('books/{id}', [EntityControllers\BookApiController::class, 'update']);
+Route::delete('books/{id}', [EntityControllers\BookApiController::class, 'delete']);
 
-Route::get('books/{id}/export/html', [BookExportApiController::class, 'exportHtml']);
-Route::get('books/{id}/export/pdf', [BookExportApiController::class, 'exportPdf']);
-Route::get('books/{id}/export/plaintext', [BookExportApiController::class, 'exportPlainText']);
-Route::get('books/{id}/export/markdown', [BookExportApiController::class, 'exportMarkdown']);
+Route::get('books/{id}/export/html', [EntityControllers\BookExportApiController::class, 'exportHtml']);
+Route::get('books/{id}/export/pdf', [EntityControllers\BookExportApiController::class, 'exportPdf']);
+Route::get('books/{id}/export/plaintext', [EntityControllers\BookExportApiController::class, 'exportPlainText']);
+Route::get('books/{id}/export/markdown', [EntityControllers\BookExportApiController::class, 'exportMarkdown']);
 
-Route::get('chapters', [ChapterApiController::class, 'list']);
-Route::post('chapters', [ChapterApiController::class, 'create']);
-Route::get('chapters/{id}', [ChapterApiController::class, 'read']);
-Route::put('chapters/{id}', [ChapterApiController::class, 'update']);
-Route::delete('chapters/{id}', [ChapterApiController::class, 'delete']);
+Route::get('chapters', [EntityControllers\ChapterApiController::class, 'list']);
+Route::post('chapters', [EntityControllers\ChapterApiController::class, 'create']);
+Route::get('chapters/{id}', [EntityControllers\ChapterApiController::class, 'read']);
+Route::put('chapters/{id}', [EntityControllers\ChapterApiController::class, 'update']);
+Route::delete('chapters/{id}', [EntityControllers\ChapterApiController::class, 'delete']);
 
-Route::get('chapters/{id}/export/html', [ChapterExportApiController::class, 'exportHtml']);
-Route::get('chapters/{id}/export/pdf', [ChapterExportApiController::class, 'exportPdf']);
-Route::get('chapters/{id}/export/plaintext', [ChapterExportApiController::class, 'exportPlainText']);
-Route::get('chapters/{id}/export/markdown', [ChapterExportApiController::class, 'exportMarkdown']);
+Route::get('chapters/{id}/export/html', [EntityControllers\ChapterExportApiController::class, 'exportHtml']);
+Route::get('chapters/{id}/export/pdf', [EntityControllers\ChapterExportApiController::class, 'exportPdf']);
+Route::get('chapters/{id}/export/plaintext', [EntityControllers\ChapterExportApiController::class, 'exportPlainText']);
+Route::get('chapters/{id}/export/markdown', [EntityControllers\ChapterExportApiController::class, 'exportMarkdown']);
 
-Route::get('pages', [PageApiController::class, 'list']);
-Route::post('pages', [PageApiController::class, 'create']);
-Route::get('pages/{id}', [PageApiController::class, 'read']);
-Route::put('pages/{id}', [PageApiController::class, 'update']);
-Route::delete('pages/{id}', [PageApiController::class, 'delete']);
+Route::get('pages', [EntityControllers\PageApiController::class, 'list']);
+Route::post('pages', [EntityControllers\PageApiController::class, 'create']);
+Route::get('pages/{id}', [EntityControllers\PageApiController::class, 'read']);
+Route::put('pages/{id}', [EntityControllers\PageApiController::class, 'update']);
+Route::delete('pages/{id}', [EntityControllers\PageApiController::class, 'delete']);
 
-Route::get('pages/{id}/export/html', [PageExportApiController::class, 'exportHtml']);
-Route::get('pages/{id}/export/pdf', [PageExportApiController::class, 'exportPdf']);
-Route::get('pages/{id}/export/plaintext', [PageExportApiController::class, 'exportPlainText']);
-Route::get('pages/{id}/export/markdown', [PageExportApiController::class, 'exportMarkdown']);
+Route::get('pages/{id}/export/html', [EntityControllers\PageExportApiController::class, 'exportHtml']);
+Route::get('pages/{id}/export/pdf', [EntityControllers\PageExportApiController::class, 'exportPdf']);
+Route::get('pages/{id}/export/plaintext', [EntityControllers\PageExportApiController::class, 'exportPlainText']);
+Route::get('pages/{id}/export/markdown', [EntityControllers\PageExportApiController::class, 'exportMarkdown']);
 
 Route::get('image-gallery', [ImageGalleryApiController::class, 'list']);
 Route::post('image-gallery', [ImageGalleryApiController::class, 'create']);
@@ -72,11 +65,11 @@ Route::delete('image-gallery/{id}', [ImageGalleryApiController::class, 'delete']
 
 Route::get('search', [SearchApiController::class, 'all']);
 
-Route::get('shelves', [BookshelfApiController::class, 'list']);
-Route::post('shelves', [BookshelfApiController::class, 'create']);
-Route::get('shelves/{id}', [BookshelfApiController::class, 'read']);
-Route::put('shelves/{id}', [BookshelfApiController::class, 'update']);
-Route::delete('shelves/{id}', [BookshelfApiController::class, 'delete']);
+Route::get('shelves', [EntityControllers\BookshelfApiController::class, 'list']);
+Route::post('shelves', [EntityControllers\BookshelfApiController::class, 'create']);
+Route::get('shelves/{id}', [EntityControllers\BookshelfApiController::class, 'read']);
+Route::put('shelves/{id}', [EntityControllers\BookshelfApiController::class, 'update']);
+Route::delete('shelves/{id}', [EntityControllers\BookshelfApiController::class, 'delete']);
 
 Route::get('users', [UserApiController::class, 'list']);
 Route::post('users', [UserApiController::class, 'create']);
@@ -90,9 +83,9 @@ Route::get('roles/{id}', [RoleApiController::class, 'read']);
 Route::put('roles/{id}', [RoleApiController::class, 'update']);
 Route::delete('roles/{id}', [RoleApiController::class, 'delete']);
 
-Route::get('recycle-bin', [RecycleBinApiController::class, 'list']);
-Route::put('recycle-bin/{deletionId}', [RecycleBinApiController::class, 'restore']);
-Route::delete('recycle-bin/{deletionId}', [RecycleBinApiController::class, 'destroy']);
+Route::get('recycle-bin', [EntityControllers\RecycleBinApiController::class, 'list']);
+Route::put('recycle-bin/{deletionId}', [EntityControllers\RecycleBinApiController::class, 'restore']);
+Route::delete('recycle-bin/{deletionId}', [EntityControllers\RecycleBinApiController::class, 'destroy']);
 
 Route::get('content-permissions/{contentType}/{contentId}', [ContentPermissionApiController::class, 'read']);
 Route::put('content-permissions/{contentType}/{contentId}', [ContentPermissionApiController::class, 'update']);
diff --git a/routes/console.php b/routes/console.php
deleted file mode 100644
index e05f4c9a1..000000000
--- a/routes/console.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-use Illuminate\Foundation\Inspiring;
-use Illuminate\Support\Facades\Artisan;
-
-/*
-|--------------------------------------------------------------------------
-| Console Routes
-|--------------------------------------------------------------------------
-|
-| This file is where you may define all of your Closure based console
-| commands. Each Closure is bound to a command instance allowing a
-| simple approach to interacting with each command's IO methods.
-|
-*/
-
-Artisan::command('inspire', function () {
-    $this->comment(Inspiring::quote());
-})->purpose('Display an inspiring quote');
diff --git a/routes/web.php b/routes/web.php
index 937dc0c6c..92e0a003a 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -1,44 +1,23 @@
 <?php
 
-use BookStack\Http\Controllers\Api;
-use BookStack\Http\Controllers\AttachmentController;
-use BookStack\Http\Controllers\AuditLogController;
-use BookStack\Http\Controllers\Auth;
-use BookStack\Http\Controllers\BookController;
-use BookStack\Http\Controllers\BookExportController;
-use BookStack\Http\Controllers\BookshelfController;
-use BookStack\Http\Controllers\BookSortController;
-use BookStack\Http\Controllers\ChapterController;
-use BookStack\Http\Controllers\ChapterExportController;
-use BookStack\Http\Controllers\CommentController;
-use BookStack\Http\Controllers\FavouriteController;
-use BookStack\Http\Controllers\HomeController;
-use BookStack\Http\Controllers\Images;
-use BookStack\Http\Controllers\MaintenanceController;
-use BookStack\Http\Controllers\PageController;
-use BookStack\Http\Controllers\PageExportController;
-use BookStack\Http\Controllers\PageRevisionController;
-use BookStack\Http\Controllers\PageTemplateController;
-use BookStack\Http\Controllers\PermissionsController;
-use BookStack\Http\Controllers\RecycleBinController;
-use BookStack\Http\Controllers\ReferenceController;
-use BookStack\Http\Controllers\RoleController;
-use BookStack\Http\Controllers\SearchController;
-use BookStack\Http\Controllers\SettingController;
-use BookStack\Http\Controllers\StatusController;
-use BookStack\Http\Controllers\TagController;
-use BookStack\Http\Controllers\UserApiTokenController;
-use BookStack\Http\Controllers\UserController;
-use BookStack\Http\Controllers\UserPreferencesController;
-use BookStack\Http\Controllers\UserProfileController;
-use BookStack\Http\Controllers\UserSearchController;
-use BookStack\Http\Controllers\WebhookController;
+use BookStack\Access\Controllers as AccessControllers;
+use BookStack\Activity\Controllers as ActivityControllers;
+use BookStack\Api\ApiDocsController;
+use BookStack\Api\UserApiTokenController;
+use BookStack\App\HomeController;
+use BookStack\Entities\Controllers as EntityControllers;
 use BookStack\Http\Middleware\VerifyCsrfToken;
+use BookStack\Permissions\PermissionsController;
+use BookStack\References\ReferenceController;
+use BookStack\Search\SearchController;
+use BookStack\Settings as SettingControllers;
+use BookStack\Uploads\Controllers as UploadControllers;
+use BookStack\Users\Controllers as UserControllers;
 use Illuminate\Session\Middleware\StartSession;
 use Illuminate\Support\Facades\Route;
 use Illuminate\View\Middleware\ShareErrorsFromSession;
 
-Route::get('/status', [StatusController::class, 'show']);
+Route::get('/status', [SettingControllers\StatusController::class, 'show']);
 Route::get('/robots.txt', [HomeController::class, 'robots']);
 Route::get('/favicon.ico', [HomeController::class, 'favicon']);
 
@@ -46,152 +25,152 @@ Route::get('/favicon.ico', [HomeController::class, 'favicon']);
 Route::middleware('auth')->group(function () {
 
     // Secure images routing
-    Route::get('/uploads/images/{path}', [Images\ImageController::class, 'showImage'])
+    Route::get('/uploads/images/{path}', [UploadControllers\ImageController::class, 'showImage'])
         ->where('path', '.*$');
 
     // API docs routes
     Route::redirect('/api', '/api/docs');
-    Route::get('/api/docs', [Api\ApiDocsController::class, 'display']);
+    Route::get('/api/docs', [ApiDocsController::class, 'display']);
 
-    Route::get('/pages/recently-updated', [PageController::class, 'showRecentlyUpdated']);
+    Route::get('/pages/recently-updated', [EntityControllers\PageController::class, 'showRecentlyUpdated']);
 
     // Shelves
-    Route::get('/create-shelf', [BookshelfController::class, 'create']);
-    Route::get('/shelves/', [BookshelfController::class, 'index']);
-    Route::post('/shelves/', [BookshelfController::class, 'store']);
-    Route::get('/shelves/{slug}/edit', [BookshelfController::class, 'edit']);
-    Route::get('/shelves/{slug}/delete', [BookshelfController::class, 'showDelete']);
-    Route::get('/shelves/{slug}', [BookshelfController::class, 'show']);
-    Route::put('/shelves/{slug}', [BookshelfController::class, 'update']);
-    Route::delete('/shelves/{slug}', [BookshelfController::class, 'destroy']);
+    Route::get('/create-shelf', [EntityControllers\BookshelfController::class, 'create']);
+    Route::get('/shelves/', [EntityControllers\BookshelfController::class, 'index']);
+    Route::post('/shelves/', [EntityControllers\BookshelfController::class, 'store']);
+    Route::get('/shelves/{slug}/edit', [EntityControllers\BookshelfController::class, 'edit']);
+    Route::get('/shelves/{slug}/delete', [EntityControllers\BookshelfController::class, 'showDelete']);
+    Route::get('/shelves/{slug}', [EntityControllers\BookshelfController::class, 'show']);
+    Route::put('/shelves/{slug}', [EntityControllers\BookshelfController::class, 'update']);
+    Route::delete('/shelves/{slug}', [EntityControllers\BookshelfController::class, 'destroy']);
     Route::get('/shelves/{slug}/permissions', [PermissionsController::class, 'showForShelf']);
     Route::put('/shelves/{slug}/permissions', [PermissionsController::class, 'updateForShelf']);
     Route::post('/shelves/{slug}/copy-permissions', [PermissionsController::class, 'copyShelfPermissionsToBooks']);
     Route::get('/shelves/{slug}/references', [ReferenceController::class, 'shelf']);
 
     // Book Creation
-    Route::get('/shelves/{shelfSlug}/create-book', [BookController::class, 'create']);
-    Route::post('/shelves/{shelfSlug}/create-book', [BookController::class, 'store']);
-    Route::get('/create-book', [BookController::class, 'create']);
+    Route::get('/shelves/{shelfSlug}/create-book', [EntityControllers\BookController::class, 'create']);
+    Route::post('/shelves/{shelfSlug}/create-book', [EntityControllers\BookController::class, 'store']);
+    Route::get('/create-book', [EntityControllers\BookController::class, 'create']);
 
     // Books
-    Route::get('/books/', [BookController::class, 'index']);
-    Route::post('/books/', [BookController::class, 'store']);
-    Route::get('/books/{slug}/edit', [BookController::class, 'edit']);
-    Route::put('/books/{slug}', [BookController::class, 'update']);
-    Route::delete('/books/{id}', [BookController::class, 'destroy']);
-    Route::get('/books/{slug}/sort-item', [BookSortController::class, 'showItem']);
-    Route::get('/books/{slug}', [BookController::class, 'show']);
+    Route::get('/books/', [EntityControllers\BookController::class, 'index']);
+    Route::post('/books/', [EntityControllers\BookController::class, 'store']);
+    Route::get('/books/{slug}/edit', [EntityControllers\BookController::class, 'edit']);
+    Route::put('/books/{slug}', [EntityControllers\BookController::class, 'update']);
+    Route::delete('/books/{id}', [EntityControllers\BookController::class, 'destroy']);
+    Route::get('/books/{slug}/sort-item', [EntityControllers\BookSortController::class, 'showItem']);
+    Route::get('/books/{slug}', [EntityControllers\BookController::class, 'show']);
     Route::get('/books/{bookSlug}/permissions', [PermissionsController::class, 'showForBook']);
     Route::put('/books/{bookSlug}/permissions', [PermissionsController::class, 'updateForBook']);
-    Route::get('/books/{slug}/delete', [BookController::class, 'showDelete']);
-    Route::get('/books/{bookSlug}/copy', [BookController::class, 'showCopy']);
-    Route::post('/books/{bookSlug}/copy', [BookController::class, 'copy']);
-    Route::post('/books/{bookSlug}/convert-to-shelf', [BookController::class, 'convertToShelf']);
-    Route::get('/books/{bookSlug}/sort', [BookSortController::class, 'show']);
-    Route::put('/books/{bookSlug}/sort', [BookSortController::class, 'update']);
+    Route::get('/books/{slug}/delete', [EntityControllers\BookController::class, 'showDelete']);
+    Route::get('/books/{bookSlug}/copy', [EntityControllers\BookController::class, 'showCopy']);
+    Route::post('/books/{bookSlug}/copy', [EntityControllers\BookController::class, 'copy']);
+    Route::post('/books/{bookSlug}/convert-to-shelf', [EntityControllers\BookController::class, 'convertToShelf']);
+    Route::get('/books/{bookSlug}/sort', [EntityControllers\BookSortController::class, 'show']);
+    Route::put('/books/{bookSlug}/sort', [EntityControllers\BookSortController::class, 'update']);
     Route::get('/books/{slug}/references', [ReferenceController::class, 'book']);
-    Route::get('/books/{bookSlug}/export/html', [BookExportController::class, 'html']);
-    Route::get('/books/{bookSlug}/export/pdf', [BookExportController::class, 'pdf']);
-    Route::get('/books/{bookSlug}/export/markdown', [BookExportController::class, 'markdown']);
-    Route::get('/books/{bookSlug}/export/zip', [BookExportController::class, 'zip']);
-    Route::get('/books/{bookSlug}/export/plaintext', [BookExportController::class, 'plainText']);
+    Route::get('/books/{bookSlug}/export/html', [EntityControllers\BookExportController::class, 'html']);
+    Route::get('/books/{bookSlug}/export/pdf', [EntityControllers\BookExportController::class, 'pdf']);
+    Route::get('/books/{bookSlug}/export/markdown', [EntityControllers\BookExportController::class, 'markdown']);
+    Route::get('/books/{bookSlug}/export/zip', [EntityControllers\BookExportController::class, 'zip']);
+    Route::get('/books/{bookSlug}/export/plaintext', [EntityControllers\BookExportController::class, 'plainText']);
 
     // Pages
-    Route::get('/books/{bookSlug}/create-page', [PageController::class, 'create']);
-    Route::post('/books/{bookSlug}/create-guest-page', [PageController::class, 'createAsGuest']);
-    Route::get('/books/{bookSlug}/draft/{pageId}', [PageController::class, 'editDraft']);
-    Route::post('/books/{bookSlug}/draft/{pageId}', [PageController::class, 'store']);
-    Route::get('/books/{bookSlug}/page/{pageSlug}', [PageController::class, 'show']);
-    Route::get('/books/{bookSlug}/page/{pageSlug}/export/pdf', [PageExportController::class, 'pdf']);
-    Route::get('/books/{bookSlug}/page/{pageSlug}/export/html', [PageExportController::class, 'html']);
-    Route::get('/books/{bookSlug}/page/{pageSlug}/export/markdown', [PageExportController::class, 'markdown']);
-    Route::get('/books/{bookSlug}/page/{pageSlug}/export/plaintext', [PageExportController::class, 'plainText']);
-    Route::get('/books/{bookSlug}/page/{pageSlug}/edit', [PageController::class, 'edit']);
-    Route::get('/books/{bookSlug}/page/{pageSlug}/move', [PageController::class, 'showMove']);
-    Route::put('/books/{bookSlug}/page/{pageSlug}/move', [PageController::class, 'move']);
-    Route::get('/books/{bookSlug}/page/{pageSlug}/copy', [PageController::class, 'showCopy']);
-    Route::post('/books/{bookSlug}/page/{pageSlug}/copy', [PageController::class, 'copy']);
-    Route::get('/books/{bookSlug}/page/{pageSlug}/delete', [PageController::class, 'showDelete']);
-    Route::get('/books/{bookSlug}/draft/{pageId}/delete', [PageController::class, 'showDeleteDraft']);
+    Route::get('/books/{bookSlug}/create-page', [EntityControllers\PageController::class, 'create']);
+    Route::post('/books/{bookSlug}/create-guest-page', [EntityControllers\PageController::class, 'createAsGuest']);
+    Route::get('/books/{bookSlug}/draft/{pageId}', [EntityControllers\PageController::class, 'editDraft']);
+    Route::post('/books/{bookSlug}/draft/{pageId}', [EntityControllers\PageController::class, 'store']);
+    Route::get('/books/{bookSlug}/page/{pageSlug}', [EntityControllers\PageController::class, 'show']);
+    Route::get('/books/{bookSlug}/page/{pageSlug}/export/pdf', [EntityControllers\PageExportController::class, 'pdf']);
+    Route::get('/books/{bookSlug}/page/{pageSlug}/export/html', [EntityControllers\PageExportController::class, 'html']);
+    Route::get('/books/{bookSlug}/page/{pageSlug}/export/markdown', [EntityControllers\PageExportController::class, 'markdown']);
+    Route::get('/books/{bookSlug}/page/{pageSlug}/export/plaintext', [EntityControllers\PageExportController::class, 'plainText']);
+    Route::get('/books/{bookSlug}/page/{pageSlug}/edit', [EntityControllers\PageController::class, 'edit']);
+    Route::get('/books/{bookSlug}/page/{pageSlug}/move', [EntityControllers\PageController::class, 'showMove']);
+    Route::put('/books/{bookSlug}/page/{pageSlug}/move', [EntityControllers\PageController::class, 'move']);
+    Route::get('/books/{bookSlug}/page/{pageSlug}/copy', [EntityControllers\PageController::class, 'showCopy']);
+    Route::post('/books/{bookSlug}/page/{pageSlug}/copy', [EntityControllers\PageController::class, 'copy']);
+    Route::get('/books/{bookSlug}/page/{pageSlug}/delete', [EntityControllers\PageController::class, 'showDelete']);
+    Route::get('/books/{bookSlug}/draft/{pageId}/delete', [EntityControllers\PageController::class, 'showDeleteDraft']);
     Route::get('/books/{bookSlug}/page/{pageSlug}/permissions', [PermissionsController::class, 'showForPage']);
     Route::put('/books/{bookSlug}/page/{pageSlug}/permissions', [PermissionsController::class, 'updateForPage']);
     Route::get('/books/{bookSlug}/page/{pageSlug}/references', [ReferenceController::class, 'page']);
-    Route::put('/books/{bookSlug}/page/{pageSlug}', [PageController::class, 'update']);
-    Route::delete('/books/{bookSlug}/page/{pageSlug}', [PageController::class, 'destroy']);
-    Route::delete('/books/{bookSlug}/draft/{pageId}', [PageController::class, 'destroyDraft']);
+    Route::put('/books/{bookSlug}/page/{pageSlug}', [EntityControllers\PageController::class, 'update']);
+    Route::delete('/books/{bookSlug}/page/{pageSlug}', [EntityControllers\PageController::class, 'destroy']);
+    Route::delete('/books/{bookSlug}/draft/{pageId}', [EntityControllers\PageController::class, 'destroyDraft']);
 
     // Revisions
-    Route::get('/books/{bookSlug}/page/{pageSlug}/revisions', [PageRevisionController::class, 'index']);
-    Route::get('/books/{bookSlug}/page/{pageSlug}/revisions/{revId}', [PageRevisionController::class, 'show']);
-    Route::get('/books/{bookSlug}/page/{pageSlug}/revisions/{revId}/changes', [PageRevisionController::class, 'changes']);
-    Route::put('/books/{bookSlug}/page/{pageSlug}/revisions/{revId}/restore', [PageRevisionController::class, 'restore']);
-    Route::delete('/books/{bookSlug}/page/{pageSlug}/revisions/{revId}/delete', [PageRevisionController::class, 'destroy']);
+    Route::get('/books/{bookSlug}/page/{pageSlug}/revisions', [EntityControllers\PageRevisionController::class, 'index']);
+    Route::get('/books/{bookSlug}/page/{pageSlug}/revisions/{revId}', [EntityControllers\PageRevisionController::class, 'show']);
+    Route::get('/books/{bookSlug}/page/{pageSlug}/revisions/{revId}/changes', [EntityControllers\PageRevisionController::class, 'changes']);
+    Route::put('/books/{bookSlug}/page/{pageSlug}/revisions/{revId}/restore', [EntityControllers\PageRevisionController::class, 'restore']);
+    Route::delete('/books/{bookSlug}/page/{pageSlug}/revisions/{revId}/delete', [EntityControllers\PageRevisionController::class, 'destroy']);
 
     // Chapters
-    Route::get('/books/{bookSlug}/chapter/{chapterSlug}/create-page', [PageController::class, 'create']);
-    Route::post('/books/{bookSlug}/chapter/{chapterSlug}/create-guest-page', [PageController::class, 'createAsGuest']);
-    Route::get('/books/{bookSlug}/create-chapter', [ChapterController::class, 'create']);
-    Route::post('/books/{bookSlug}/create-chapter', [ChapterController::class, 'store']);
-    Route::get('/books/{bookSlug}/chapter/{chapterSlug}', [ChapterController::class, 'show']);
-    Route::put('/books/{bookSlug}/chapter/{chapterSlug}', [ChapterController::class, 'update']);
-    Route::get('/books/{bookSlug}/chapter/{chapterSlug}/move', [ChapterController::class, 'showMove']);
-    Route::put('/books/{bookSlug}/chapter/{chapterSlug}/move', [ChapterController::class, 'move']);
-    Route::get('/books/{bookSlug}/chapter/{chapterSlug}/copy', [ChapterController::class, 'showCopy']);
-    Route::post('/books/{bookSlug}/chapter/{chapterSlug}/copy', [ChapterController::class, 'copy']);
-    Route::get('/books/{bookSlug}/chapter/{chapterSlug}/edit', [ChapterController::class, 'edit']);
-    Route::post('/books/{bookSlug}/chapter/{chapterSlug}/convert-to-book', [ChapterController::class, 'convertToBook']);
+    Route::get('/books/{bookSlug}/chapter/{chapterSlug}/create-page', [EntityControllers\PageController::class, 'create']);
+    Route::post('/books/{bookSlug}/chapter/{chapterSlug}/create-guest-page', [EntityControllers\PageController::class, 'createAsGuest']);
+    Route::get('/books/{bookSlug}/create-chapter', [EntityControllers\ChapterController::class, 'create']);
+    Route::post('/books/{bookSlug}/create-chapter', [EntityControllers\ChapterController::class, 'store']);
+    Route::get('/books/{bookSlug}/chapter/{chapterSlug}', [EntityControllers\ChapterController::class, 'show']);
+    Route::put('/books/{bookSlug}/chapter/{chapterSlug}', [EntityControllers\ChapterController::class, 'update']);
+    Route::get('/books/{bookSlug}/chapter/{chapterSlug}/move', [EntityControllers\ChapterController::class, 'showMove']);
+    Route::put('/books/{bookSlug}/chapter/{chapterSlug}/move', [EntityControllers\ChapterController::class, 'move']);
+    Route::get('/books/{bookSlug}/chapter/{chapterSlug}/copy', [EntityControllers\ChapterController::class, 'showCopy']);
+    Route::post('/books/{bookSlug}/chapter/{chapterSlug}/copy', [EntityControllers\ChapterController::class, 'copy']);
+    Route::get('/books/{bookSlug}/chapter/{chapterSlug}/edit', [EntityControllers\ChapterController::class, 'edit']);
+    Route::post('/books/{bookSlug}/chapter/{chapterSlug}/convert-to-book', [EntityControllers\ChapterController::class, 'convertToBook']);
     Route::get('/books/{bookSlug}/chapter/{chapterSlug}/permissions', [PermissionsController::class, 'showForChapter']);
-    Route::get('/books/{bookSlug}/chapter/{chapterSlug}/export/pdf', [ChapterExportController::class, 'pdf']);
-    Route::get('/books/{bookSlug}/chapter/{chapterSlug}/export/html', [ChapterExportController::class, 'html']);
-    Route::get('/books/{bookSlug}/chapter/{chapterSlug}/export/markdown', [ChapterExportController::class, 'markdown']);
-    Route::get('/books/{bookSlug}/chapter/{chapterSlug}/export/plaintext', [ChapterExportController::class, 'plainText']);
+    Route::get('/books/{bookSlug}/chapter/{chapterSlug}/export/pdf', [EntityControllers\ChapterExportController::class, 'pdf']);
+    Route::get('/books/{bookSlug}/chapter/{chapterSlug}/export/html', [EntityControllers\ChapterExportController::class, 'html']);
+    Route::get('/books/{bookSlug}/chapter/{chapterSlug}/export/markdown', [EntityControllers\ChapterExportController::class, 'markdown']);
+    Route::get('/books/{bookSlug}/chapter/{chapterSlug}/export/plaintext', [EntityControllers\ChapterExportController::class, 'plainText']);
     Route::put('/books/{bookSlug}/chapter/{chapterSlug}/permissions', [PermissionsController::class, 'updateForChapter']);
     Route::get('/books/{bookSlug}/chapter/{chapterSlug}/references', [ReferenceController::class, 'chapter']);
-    Route::get('/books/{bookSlug}/chapter/{chapterSlug}/delete', [ChapterController::class, 'showDelete']);
-    Route::delete('/books/{bookSlug}/chapter/{chapterSlug}', [ChapterController::class, 'destroy']);
+    Route::get('/books/{bookSlug}/chapter/{chapterSlug}/delete', [EntityControllers\ChapterController::class, 'showDelete']);
+    Route::delete('/books/{bookSlug}/chapter/{chapterSlug}', [EntityControllers\ChapterController::class, 'destroy']);
 
     // User Profile routes
-    Route::get('/user/{slug}', [UserProfileController::class, 'show']);
+    Route::get('/user/{slug}', [UserControllers\UserProfileController::class, 'show']);
 
     // Image routes
-    Route::get('/images/gallery', [Images\GalleryImageController::class, 'list']);
-    Route::post('/images/gallery', [Images\GalleryImageController::class, 'create']);
-    Route::get('/images/drawio', [Images\DrawioImageController::class, 'list']);
-    Route::get('/images/drawio/base64/{id}', [Images\DrawioImageController::class, 'getAsBase64']);
-    Route::post('/images/drawio', [Images\DrawioImageController::class, 'create']);
-    Route::get('/images/edit/{id}', [Images\ImageController::class, 'edit']);
-    Route::put('/images/{id}', [Images\ImageController::class, 'update']);
-    Route::delete('/images/{id}', [Images\ImageController::class, 'destroy']);
+    Route::get('/images/gallery', [UploadControllers\GalleryImageController::class, 'list']);
+    Route::post('/images/gallery', [UploadControllers\GalleryImageController::class, 'create']);
+    Route::get('/images/drawio', [UploadControllers\DrawioImageController::class, 'list']);
+    Route::get('/images/drawio/base64/{id}', [UploadControllers\DrawioImageController::class, 'getAsBase64']);
+    Route::post('/images/drawio', [UploadControllers\DrawioImageController::class, 'create']);
+    Route::get('/images/edit/{id}', [UploadControllers\ImageController::class, 'edit']);
+    Route::put('/images/{id}', [UploadControllers\ImageController::class, 'update']);
+    Route::delete('/images/{id}', [UploadControllers\ImageController::class, 'destroy']);
 
     // Attachments routes
-    Route::get('/attachments/{id}', [AttachmentController::class, 'get']);
-    Route::post('/attachments/upload', [AttachmentController::class, 'upload']);
-    Route::post('/attachments/upload/{id}', [AttachmentController::class, 'uploadUpdate']);
-    Route::post('/attachments/link', [AttachmentController::class, 'attachLink']);
-    Route::put('/attachments/{id}', [AttachmentController::class, 'update']);
-    Route::get('/attachments/edit/{id}', [AttachmentController::class, 'getUpdateForm']);
-    Route::get('/attachments/get/page/{pageId}', [AttachmentController::class, 'listForPage']);
-    Route::put('/attachments/sort/page/{pageId}', [AttachmentController::class, 'sortForPage']);
-    Route::delete('/attachments/{id}', [AttachmentController::class, 'delete']);
+    Route::get('/attachments/{id}', [UploadControllers\AttachmentController::class, 'get']);
+    Route::post('/attachments/upload', [UploadControllers\AttachmentController::class, 'upload']);
+    Route::post('/attachments/upload/{id}', [UploadControllers\AttachmentController::class, 'uploadUpdate']);
+    Route::post('/attachments/link', [UploadControllers\AttachmentController::class, 'attachLink']);
+    Route::put('/attachments/{id}', [UploadControllers\AttachmentController::class, 'update']);
+    Route::get('/attachments/edit/{id}', [UploadControllers\AttachmentController::class, 'getUpdateForm']);
+    Route::get('/attachments/get/page/{pageId}', [UploadControllers\AttachmentController::class, 'listForPage']);
+    Route::put('/attachments/sort/page/{pageId}', [UploadControllers\AttachmentController::class, 'sortForPage']);
+    Route::delete('/attachments/{id}', [UploadControllers\AttachmentController::class, 'delete']);
 
     // AJAX routes
-    Route::put('/ajax/page/{id}/save-draft', [PageController::class, 'saveDraft']);
-    Route::get('/ajax/page/{id}', [PageController::class, 'getPageAjax']);
-    Route::delete('/ajax/page/{id}', [PageController::class, 'ajaxDestroy']);
+    Route::put('/ajax/page/{id}/save-draft', [EntityControllers\PageController::class, 'saveDraft']);
+    Route::get('/ajax/page/{id}', [EntityControllers\PageController::class, 'getPageAjax']);
+    Route::delete('/ajax/page/{id}', [EntityControllers\PageController::class, 'ajaxDestroy']);
 
     // Tag routes
-    Route::get('/tags', [TagController::class, 'index']);
-    Route::get('/ajax/tags/suggest/names', [TagController::class, 'getNameSuggestions']);
-    Route::get('/ajax/tags/suggest/values', [TagController::class, 'getValueSuggestions']);
+    Route::get('/tags', [ActivityControllers\TagController::class, 'index']);
+    Route::get('/ajax/tags/suggest/names', [ActivityControllers\TagController::class, 'getNameSuggestions']);
+    Route::get('/ajax/tags/suggest/values', [ActivityControllers\TagController::class, 'getValueSuggestions']);
 
     // Comments
-    Route::post('/comment/{pageId}', [CommentController::class, 'savePageComment']);
-    Route::put('/comment/{id}', [CommentController::class, 'update']);
-    Route::delete('/comment/{id}', [CommentController::class, 'destroy']);
+    Route::post('/comment/{pageId}', [ActivityControllers\CommentController::class, 'savePageComment']);
+    Route::put('/comment/{id}', [ActivityControllers\CommentController::class, 'update']);
+    Route::delete('/comment/{id}', [ActivityControllers\CommentController::class, 'destroy']);
 
     // Links
-    Route::get('/link/{id}', [PageController::class, 'redirectFromLink']);
+    Route::get('/link/{id}', [EntityControllers\PageController::class, 'redirectFromLink']);
 
     // Search
     Route::get('/search', [SearchController::class, 'search']);
@@ -202,16 +181,16 @@ Route::middleware('auth')->group(function () {
     Route::get('/search/suggest', [SearchController::class, 'searchSuggestions']);
 
     // User Search
-    Route::get('/search/users/select', [UserSearchController::class, 'forSelect']);
+    Route::get('/search/users/select', [UserControllers\UserSearchController::class, 'forSelect']);
 
     // Template System
-    Route::get('/templates', [PageTemplateController::class, 'list']);
-    Route::get('/templates/{templateId}', [PageTemplateController::class, 'get']);
+    Route::get('/templates', [EntityControllers\PageTemplateController::class, 'list']);
+    Route::get('/templates/{templateId}', [EntityControllers\PageTemplateController::class, 'get']);
 
     // Favourites
-    Route::get('/favourites', [FavouriteController::class, 'index']);
-    Route::post('/favourites/add', [FavouriteController::class, 'add']);
-    Route::post('/favourites/remove', [FavouriteController::class, 'remove']);
+    Route::get('/favourites', [ActivityControllers\FavouriteController::class, 'index']);
+    Route::post('/favourites/add', [ActivityControllers\FavouriteController::class, 'add']);
+    Route::post('/favourites/remove', [ActivityControllers\FavouriteController::class, 'remove']);
 
     // Other Pages
     Route::get('/', [HomeController::class, 'index']);
@@ -221,41 +200,41 @@ Route::middleware('auth')->group(function () {
     Route::get('/permissions/form-row/{entityType}/{roleId}', [PermissionsController::class, 'formRowForRole']);
 
     // Maintenance
-    Route::get('/settings/maintenance', [MaintenanceController::class, 'index']);
-    Route::delete('/settings/maintenance/cleanup-images', [MaintenanceController::class, 'cleanupImages']);
-    Route::post('/settings/maintenance/send-test-email', [MaintenanceController::class, 'sendTestEmail']);
-    Route::post('/settings/maintenance/regenerate-references', [MaintenanceController::class, 'regenerateReferences']);
+    Route::get('/settings/maintenance', [SettingControllers\MaintenanceController::class, 'index']);
+    Route::delete('/settings/maintenance/cleanup-images', [SettingControllers\MaintenanceController::class, 'cleanupImages']);
+    Route::post('/settings/maintenance/send-test-email', [SettingControllers\MaintenanceController::class, 'sendTestEmail']);
+    Route::post('/settings/maintenance/regenerate-references', [SettingControllers\MaintenanceController::class, 'regenerateReferences']);
 
     // Recycle Bin
-    Route::get('/settings/recycle-bin', [RecycleBinController::class, 'index']);
-    Route::post('/settings/recycle-bin/empty', [RecycleBinController::class, 'empty']);
-    Route::get('/settings/recycle-bin/{id}/destroy', [RecycleBinController::class, 'showDestroy']);
-    Route::delete('/settings/recycle-bin/{id}', [RecycleBinController::class, 'destroy']);
-    Route::get('/settings/recycle-bin/{id}/restore', [RecycleBinController::class, 'showRestore']);
-    Route::post('/settings/recycle-bin/{id}/restore', [RecycleBinController::class, 'restore']);
+    Route::get('/settings/recycle-bin', [EntityControllers\RecycleBinController::class, 'index']);
+    Route::post('/settings/recycle-bin/empty', [EntityControllers\RecycleBinController::class, 'empty']);
+    Route::get('/settings/recycle-bin/{id}/destroy', [EntityControllers\RecycleBinController::class, 'showDestroy']);
+    Route::delete('/settings/recycle-bin/{id}', [EntityControllers\RecycleBinController::class, 'destroy']);
+    Route::get('/settings/recycle-bin/{id}/restore', [EntityControllers\RecycleBinController::class, 'showRestore']);
+    Route::post('/settings/recycle-bin/{id}/restore', [EntityControllers\RecycleBinController::class, 'restore']);
 
     // Audit Log
-    Route::get('/settings/audit', [AuditLogController::class, 'index']);
+    Route::get('/settings/audit', [ActivityControllers\AuditLogController::class, 'index']);
 
     // Users
-    Route::get('/settings/users', [UserController::class, 'index']);
-    Route::get('/settings/users/create', [UserController::class, 'create']);
-    Route::get('/settings/users/{id}/delete', [UserController::class, 'delete']);
-    Route::post('/settings/users/create', [UserController::class, 'store']);
-    Route::get('/settings/users/{id}', [UserController::class, 'edit']);
-    Route::put('/settings/users/{id}', [UserController::class, 'update']);
-    Route::delete('/settings/users/{id}', [UserController::class, 'destroy']);
+    Route::get('/settings/users', [UserControllers\UserController::class, 'index']);
+    Route::get('/settings/users/create', [UserControllers\UserController::class, 'create']);
+    Route::get('/settings/users/{id}/delete', [UserControllers\UserController::class, 'delete']);
+    Route::post('/settings/users/create', [UserControllers\UserController::class, 'store']);
+    Route::get('/settings/users/{id}', [UserControllers\UserController::class, 'edit']);
+    Route::put('/settings/users/{id}', [UserControllers\UserController::class, 'update']);
+    Route::delete('/settings/users/{id}', [UserControllers\UserController::class, 'destroy']);
 
     // User Preferences
     Route::redirect('/preferences', '/');
-    Route::get('/preferences/shortcuts', [UserPreferencesController::class, 'showShortcuts']);
-    Route::put('/preferences/shortcuts', [UserPreferencesController::class, 'updateShortcuts']);
-    Route::patch('/preferences/change-view/{type}', [UserPreferencesController::class, 'changeView']);
-    Route::patch('/preferences/change-sort/{type}', [UserPreferencesController::class, 'changeSort']);
-    Route::patch('/preferences/change-expansion/{type}', [UserPreferencesController::class, 'changeExpansion']);
-    Route::patch('/preferences/toggle-dark-mode', [UserPreferencesController::class, 'toggleDarkMode']);
-    Route::patch('/preferences/update-code-language-favourite', [UserPreferencesController::class, 'updateCodeLanguageFavourite']);
-    Route::patch('/preferences/update-boolean', [UserPreferencesController::class, 'updateBooleanPreference']);
+    Route::get('/preferences/shortcuts', [UserControllers\UserPreferencesController::class, 'showShortcuts']);
+    Route::put('/preferences/shortcuts', [UserControllers\UserPreferencesController::class, 'updateShortcuts']);
+    Route::patch('/preferences/change-view/{type}', [UserControllers\UserPreferencesController::class, 'changeView']);
+    Route::patch('/preferences/change-sort/{type}', [UserControllers\UserPreferencesController::class, 'changeSort']);
+    Route::patch('/preferences/change-expansion/{type}', [UserControllers\UserPreferencesController::class, 'changeExpansion']);
+    Route::patch('/preferences/toggle-dark-mode', [UserControllers\UserPreferencesController::class, 'toggleDarkMode']);
+    Route::patch('/preferences/update-code-language-favourite', [UserControllers\UserPreferencesController::class, 'updateCodeLanguageFavourite']);
+    Route::patch('/preferences/update-boolean', [UserControllers\UserPreferencesController::class, 'updateBooleanPreference']);
 
     // User API Tokens
     Route::get('/settings/users/{userId}/create-api-token', [UserApiTokenController::class, 'create']);
@@ -266,89 +245,89 @@ Route::middleware('auth')->group(function () {
     Route::delete('/settings/users/{userId}/api-tokens/{tokenId}', [UserApiTokenController::class, 'destroy']);
 
     // Roles
-    Route::get('/settings/roles', [RoleController::class, 'index']);
-    Route::get('/settings/roles/new', [RoleController::class, 'create']);
-    Route::post('/settings/roles/new', [RoleController::class, 'store']);
-    Route::get('/settings/roles/delete/{id}', [RoleController::class, 'showDelete']);
-    Route::delete('/settings/roles/delete/{id}', [RoleController::class, 'delete']);
-    Route::get('/settings/roles/{id}', [RoleController::class, 'edit']);
-    Route::put('/settings/roles/{id}', [RoleController::class, 'update']);
+    Route::get('/settings/roles', [UserControllers\RoleController::class, 'index']);
+    Route::get('/settings/roles/new', [UserControllers\RoleController::class, 'create']);
+    Route::post('/settings/roles/new', [UserControllers\RoleController::class, 'store']);
+    Route::get('/settings/roles/delete/{id}', [UserControllers\RoleController::class, 'showDelete']);
+    Route::delete('/settings/roles/delete/{id}', [UserControllers\RoleController::class, 'delete']);
+    Route::get('/settings/roles/{id}', [UserControllers\RoleController::class, 'edit']);
+    Route::put('/settings/roles/{id}', [UserControllers\RoleController::class, 'update']);
 
     // Webhooks
-    Route::get('/settings/webhooks', [WebhookController::class, 'index']);
-    Route::get('/settings/webhooks/create', [WebhookController::class, 'create']);
-    Route::post('/settings/webhooks/create', [WebhookController::class, 'store']);
-    Route::get('/settings/webhooks/{id}', [WebhookController::class, 'edit']);
-    Route::put('/settings/webhooks/{id}', [WebhookController::class, 'update']);
-    Route::get('/settings/webhooks/{id}/delete', [WebhookController::class, 'delete']);
-    Route::delete('/settings/webhooks/{id}', [WebhookController::class, 'destroy']);
+    Route::get('/settings/webhooks', [ActivityControllers\WebhookController::class, 'index']);
+    Route::get('/settings/webhooks/create', [ActivityControllers\WebhookController::class, 'create']);
+    Route::post('/settings/webhooks/create', [ActivityControllers\WebhookController::class, 'store']);
+    Route::get('/settings/webhooks/{id}', [ActivityControllers\WebhookController::class, 'edit']);
+    Route::put('/settings/webhooks/{id}', [ActivityControllers\WebhookController::class, 'update']);
+    Route::get('/settings/webhooks/{id}/delete', [ActivityControllers\WebhookController::class, 'delete']);
+    Route::delete('/settings/webhooks/{id}', [ActivityControllers\WebhookController::class, 'destroy']);
 
     // Settings
-    Route::get('/settings', [SettingController::class, 'index'])->name('settings');
-    Route::get('/settings/{category}', [SettingController::class, 'category'])->name('settings.category');
-    Route::post('/settings/{category}', [SettingController::class, 'update']);
+    Route::get('/settings', [SettingControllers\SettingController::class, 'index'])->name('settings');
+    Route::get('/settings/{category}', [SettingControllers\SettingController::class, 'category'])->name('settings.category');
+    Route::post('/settings/{category}', [SettingControllers\SettingController::class, 'update']);
 });
 
 // MFA routes
 Route::middleware('mfa-setup')->group(function () {
-    Route::get('/mfa/setup', [Auth\MfaController::class, 'setup']);
-    Route::get('/mfa/totp/generate', [Auth\MfaTotpController::class, 'generate']);
-    Route::post('/mfa/totp/confirm', [Auth\MfaTotpController::class, 'confirm']);
-    Route::get('/mfa/backup_codes/generate', [Auth\MfaBackupCodesController::class, 'generate']);
-    Route::post('/mfa/backup_codes/confirm', [Auth\MfaBackupCodesController::class, 'confirm']);
+    Route::get('/mfa/setup', [AccessControllers\MfaController::class, 'setup']);
+    Route::get('/mfa/totp/generate', [AccessControllers\MfaTotpController::class, 'generate']);
+    Route::post('/mfa/totp/confirm', [AccessControllers\MfaTotpController::class, 'confirm']);
+    Route::get('/mfa/backup_codes/generate', [AccessControllers\MfaBackupCodesController::class, 'generate']);
+    Route::post('/mfa/backup_codes/confirm', [AccessControllers\MfaBackupCodesController::class, 'confirm']);
 });
 Route::middleware('guest')->group(function () {
-    Route::get('/mfa/verify', [Auth\MfaController::class, 'verify']);
-    Route::post('/mfa/totp/verify', [Auth\MfaTotpController::class, 'verify']);
-    Route::post('/mfa/backup_codes/verify', [Auth\MfaBackupCodesController::class, 'verify']);
+    Route::get('/mfa/verify', [AccessControllers\MfaController::class, 'verify']);
+    Route::post('/mfa/totp/verify', [AccessControllers\MfaTotpController::class, 'verify']);
+    Route::post('/mfa/backup_codes/verify', [AccessControllers\MfaBackupCodesController::class, 'verify']);
 });
-Route::delete('/mfa/{method}/remove', [Auth\MfaController::class, 'remove'])->middleware('auth');
+Route::delete('/mfa/{method}/remove', [AccessControllers\MfaController::class, 'remove'])->middleware('auth');
 
 // Social auth routes
-Route::get('/login/service/{socialDriver}', [Auth\SocialController::class, 'login']);
-Route::get('/login/service/{socialDriver}/callback', [Auth\SocialController::class, 'callback']);
-Route::post('/login/service/{socialDriver}/detach', [Auth\SocialController::class, 'detach'])->middleware('auth');
-Route::get('/register/service/{socialDriver}', [Auth\SocialController::class, 'register']);
+Route::get('/login/service/{socialDriver}', [AccessControllers\SocialController::class, 'login']);
+Route::get('/login/service/{socialDriver}/callback', [AccessControllers\SocialController::class, 'callback']);
+Route::post('/login/service/{socialDriver}/detach', [AccessControllers\SocialController::class, 'detach'])->middleware('auth');
+Route::get('/register/service/{socialDriver}', [AccessControllers\SocialController::class, 'register']);
 
 // Login/Logout routes
-Route::get('/login', [Auth\LoginController::class, 'getLogin']);
-Route::post('/login', [Auth\LoginController::class, 'login']);
-Route::post('/logout', [Auth\LoginController::class, 'logout']);
-Route::get('/register', [Auth\RegisterController::class, 'getRegister']);
-Route::get('/register/confirm', [Auth\ConfirmEmailController::class, 'show']);
-Route::get('/register/confirm/awaiting', [Auth\ConfirmEmailController::class, 'showAwaiting']);
-Route::post('/register/confirm/resend', [Auth\ConfirmEmailController::class, 'resend']);
-Route::get('/register/confirm/{token}', [Auth\ConfirmEmailController::class, 'showAcceptForm']);
-Route::post('/register/confirm/accept', [Auth\ConfirmEmailController::class, 'confirm']);
-Route::post('/register', [Auth\RegisterController::class, 'postRegister']);
+Route::get('/login', [AccessControllers\LoginController::class, 'getLogin']);
+Route::post('/login', [AccessControllers\LoginController::class, 'login']);
+Route::post('/logout', [AccessControllers\LoginController::class, 'logout']);
+Route::get('/register', [AccessControllers\RegisterController::class, 'getRegister']);
+Route::get('/register/confirm', [AccessControllers\ConfirmEmailController::class, 'show']);
+Route::get('/register/confirm/awaiting', [AccessControllers\ConfirmEmailController::class, 'showAwaiting']);
+Route::post('/register/confirm/resend', [AccessControllers\ConfirmEmailController::class, 'resend']);
+Route::get('/register/confirm/{token}', [AccessControllers\ConfirmEmailController::class, 'showAcceptForm']);
+Route::post('/register/confirm/accept', [AccessControllers\ConfirmEmailController::class, 'confirm']);
+Route::post('/register', [AccessControllers\RegisterController::class, 'postRegister']);
 
 // SAML routes
-Route::post('/saml2/login', [Auth\Saml2Controller::class, 'login']);
-Route::post('/saml2/logout', [Auth\Saml2Controller::class, 'logout']);
-Route::get('/saml2/metadata', [Auth\Saml2Controller::class, 'metadata']);
-Route::get('/saml2/sls', [Auth\Saml2Controller::class, 'sls']);
-Route::post('/saml2/acs', [Auth\Saml2Controller::class, 'startAcs'])->withoutMiddleware([
+Route::post('/saml2/login', [AccessControllers\Saml2Controller::class, 'login']);
+Route::post('/saml2/logout', [AccessControllers\Saml2Controller::class, 'logout']);
+Route::get('/saml2/metadata', [AccessControllers\Saml2Controller::class, 'metadata']);
+Route::get('/saml2/sls', [AccessControllers\Saml2Controller::class, 'sls']);
+Route::post('/saml2/acs', [AccessControllers\Saml2Controller::class, 'startAcs'])->withoutMiddleware([
     StartSession::class,
     ShareErrorsFromSession::class,
     VerifyCsrfToken::class,
 ]);
-Route::get('/saml2/acs', [Auth\Saml2Controller::class, 'processAcs']);
+Route::get('/saml2/acs', [AccessControllers\Saml2Controller::class, 'processAcs']);
 
 // OIDC routes
-Route::post('/oidc/login', [Auth\OidcController::class, 'login']);
-Route::get('/oidc/callback', [Auth\OidcController::class, 'callback']);
+Route::post('/oidc/login', [AccessControllers\OidcController::class, 'login']);
+Route::get('/oidc/callback', [AccessControllers\OidcController::class, 'callback']);
 
 // User invitation routes
-Route::get('/register/invite/{token}', [Auth\UserInviteController::class, 'showSetPassword']);
-Route::post('/register/invite/{token}', [Auth\UserInviteController::class, 'setPassword']);
+Route::get('/register/invite/{token}', [AccessControllers\UserInviteController::class, 'showSetPassword']);
+Route::post('/register/invite/{token}', [AccessControllers\UserInviteController::class, 'setPassword']);
 
 // Password reset link request routes
-Route::get('/password/email', [Auth\ForgotPasswordController::class, 'showLinkRequestForm']);
-Route::post('/password/email', [Auth\ForgotPasswordController::class, 'sendResetLinkEmail']);
+Route::get('/password/email', [AccessControllers\ForgotPasswordController::class, 'showLinkRequestForm']);
+Route::post('/password/email', [AccessControllers\ForgotPasswordController::class, 'sendResetLinkEmail']);
 
 // Password reset routes
-Route::get('/password/reset/{token}', [Auth\ResetPasswordController::class, 'showResetForm']);
-Route::post('/password/reset', [Auth\ResetPasswordController::class, 'reset']);
+Route::get('/password/reset/{token}', [AccessControllers\ResetPasswordController::class, 'showResetForm']);
+Route::post('/password/reset', [AccessControllers\ResetPasswordController::class, 'reset']);
 
 // Metadata routes
 Route::view('/help/wysiwyg', 'help.wysiwyg');
diff --git a/tests/Actions/AuditLogTest.php b/tests/Actions/AuditLogTest.php
index 52b45e712..5e355ca09 100644
--- a/tests/Actions/AuditLogTest.php
+++ b/tests/Actions/AuditLogTest.php
@@ -2,12 +2,12 @@
 
 namespace Tests\Actions;
 
-use BookStack\Actions\Activity;
-use BookStack\Actions\ActivityLogger;
-use BookStack\Actions\ActivityType;
-use BookStack\Auth\UserRepo;
+use BookStack\Activity\ActivityType;
+use BookStack\Activity\Models\Activity;
+use BookStack\Activity\Tools\ActivityLogger;
 use BookStack\Entities\Repos\PageRepo;
 use BookStack\Entities\Tools\TrashCan;
+use BookStack\Users\UserRepo;
 use Carbon\Carbon;
 use Tests\TestCase;
 
diff --git a/tests/Actions/WebhookCallTest.php b/tests/Actions/WebhookCallTest.php
index 078b8bdf4..f2def087b 100644
--- a/tests/Actions/WebhookCallTest.php
+++ b/tests/Actions/WebhookCallTest.php
@@ -2,11 +2,11 @@
 
 namespace Tests\Actions;
 
-use BookStack\Actions\ActivityLogger;
-use BookStack\Actions\ActivityType;
-use BookStack\Actions\DispatchWebhookJob;
-use BookStack\Actions\Webhook;
-use BookStack\Auth\User;
+use BookStack\Activity\ActivityType;
+use BookStack\Activity\DispatchWebhookJob;
+use BookStack\Activity\Models\Webhook;
+use BookStack\Activity\Tools\ActivityLogger;
+use BookStack\Users\Models\User;
 use Illuminate\Http\Client\Request;
 use Illuminate\Support\Facades\Bus;
 use Illuminate\Support\Facades\Http;
diff --git a/tests/Actions/WebhookFormatTesting.php b/tests/Actions/WebhookFormatTesting.php
index be67d4d52..b4fa49532 100644
--- a/tests/Actions/WebhookFormatTesting.php
+++ b/tests/Actions/WebhookFormatTesting.php
@@ -2,9 +2,9 @@
 
 namespace Tests\Actions;
 
-use BookStack\Actions\ActivityType;
-use BookStack\Actions\Webhook;
-use BookStack\Actions\WebhookFormatter;
+use BookStack\Activity\ActivityType;
+use BookStack\Activity\Models\Webhook;
+use BookStack\Activity\Tools\WebhookFormatter;
 use Illuminate\Support\Arr;
 use Tests\TestCase;
 
diff --git a/tests/Actions/WebhookManagementTest.php b/tests/Actions/WebhookManagementTest.php
index 52838beca..05475b699 100644
--- a/tests/Actions/WebhookManagementTest.php
+++ b/tests/Actions/WebhookManagementTest.php
@@ -2,8 +2,8 @@
 
 namespace Tests\Actions;
 
-use BookStack\Actions\ActivityType;
-use BookStack\Actions\Webhook;
+use BookStack\Activity\ActivityType;
+use BookStack\Activity\Models\Webhook;
 use Tests\TestCase;
 
 class WebhookManagementTest extends TestCase
diff --git a/tests/Api/ApiAuthTest.php b/tests/Api/ApiAuthTest.php
index 038c4e067..93e4b02e4 100644
--- a/tests/Api/ApiAuthTest.php
+++ b/tests/Api/ApiAuthTest.php
@@ -2,9 +2,9 @@
 
 namespace Tests\Api;
 
-use BookStack\Auth\Permissions\RolePermission;
-use BookStack\Auth\Role;
-use BookStack\Auth\User;
+use BookStack\Permissions\Models\RolePermission;
+use BookStack\Users\Models\Role;
+use BookStack\Users\Models\User;
 use Carbon\Carbon;
 use Tests\TestCase;
 
diff --git a/tests/Api/RolesApiTest.php b/tests/Api/RolesApiTest.php
index 515dabe68..d6ba22ab6 100644
--- a/tests/Api/RolesApiTest.php
+++ b/tests/Api/RolesApiTest.php
@@ -2,9 +2,9 @@
 
 namespace Tests\Api;
 
-use BookStack\Actions\ActivityType;
-use BookStack\Auth\Role;
-use BookStack\Auth\User;
+use BookStack\Activity\ActivityType;
+use BookStack\Users\Models\Role;
+use BookStack\Users\Models\User;
 use Tests\TestCase;
 
 class RolesApiTest extends TestCase
diff --git a/tests/Api/TestsApi.php b/tests/Api/TestsApi.php
index c566fd8de..466acbffb 100644
--- a/tests/Api/TestsApi.php
+++ b/tests/Api/TestsApi.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Api;
 
-use BookStack\Auth\User;
+use BookStack\Users\Models\User;
 
 trait TestsApi
 {
diff --git a/tests/Api/UsersApiTest.php b/tests/Api/UsersApiTest.php
index fadd2610c..6af9c2a7a 100644
--- a/tests/Api/UsersApiTest.php
+++ b/tests/Api/UsersApiTest.php
@@ -2,11 +2,11 @@
 
 namespace Tests\Api;
 
-use BookStack\Actions\ActivityType;
-use BookStack\Auth\Role;
-use BookStack\Auth\User;
+use BookStack\Activity\ActivityType;
 use BookStack\Entities\Models\Entity;
 use BookStack\Notifications\UserInvite;
+use BookStack\Users\Models\Role;
+use BookStack\Users\Models\User;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Notification;
 use Tests\TestCase;
diff --git a/tests/Auth/AuthTest.php b/tests/Auth/AuthTest.php
index fe7e62568..0164978d8 100644
--- a/tests/Auth/AuthTest.php
+++ b/tests/Auth/AuthTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Auth;
 
-use BookStack\Auth\Access\Mfa\MfaSession;
+use BookStack\Access\Mfa\MfaSession;
 use Illuminate\Testing\TestResponse;
 use Tests\TestCase;
 
diff --git a/tests/Auth/GroupSyncServiceTest.php b/tests/Auth/GroupSyncServiceTest.php
index dbf4110d8..fee2ae406 100644
--- a/tests/Auth/GroupSyncServiceTest.php
+++ b/tests/Auth/GroupSyncServiceTest.php
@@ -2,9 +2,9 @@
 
 namespace Tests\Auth;
 
-use BookStack\Auth\Access\GroupSyncService;
-use BookStack\Auth\Role;
-use BookStack\Auth\User;
+use BookStack\Access\GroupSyncService;
+use BookStack\Users\Models\Role;
+use BookStack\Users\Models\User;
 use Tests\TestCase;
 
 class GroupSyncServiceTest extends TestCase
diff --git a/tests/Auth/LdapTest.php b/tests/Auth/LdapTest.php
index cac2ea5e1..97a91aba7 100644
--- a/tests/Auth/LdapTest.php
+++ b/tests/Auth/LdapTest.php
@@ -2,10 +2,10 @@
 
 namespace Tests\Auth;
 
-use BookStack\Auth\Access\Ldap;
-use BookStack\Auth\Access\LdapService;
-use BookStack\Auth\Role;
-use BookStack\Auth\User;
+use BookStack\Access\Ldap;
+use BookStack\Access\LdapService;
+use BookStack\Users\Models\Role;
+use BookStack\Users\Models\User;
 use Illuminate\Testing\TestResponse;
 use Mockery\MockInterface;
 use Tests\TestCase;
diff --git a/tests/Auth/MfaConfigurationTest.php b/tests/Auth/MfaConfigurationTest.php
index fb941f00b..1f359b41a 100644
--- a/tests/Auth/MfaConfigurationTest.php
+++ b/tests/Auth/MfaConfigurationTest.php
@@ -2,10 +2,10 @@
 
 namespace Tests\Auth;
 
-use BookStack\Actions\ActivityType;
-use BookStack\Auth\Access\Mfa\MfaValue;
-use BookStack\Auth\Role;
-use BookStack\Auth\User;
+use BookStack\Access\Mfa\MfaValue;
+use BookStack\Activity\ActivityType;
+use BookStack\Users\Models\Role;
+use BookStack\Users\Models\User;
 use PragmaRX\Google2FA\Google2FA;
 use Tests\TestCase;
 
diff --git a/tests/Auth/MfaVerificationTest.php b/tests/Auth/MfaVerificationTest.php
index e23250314..2fa272e33 100644
--- a/tests/Auth/MfaVerificationTest.php
+++ b/tests/Auth/MfaVerificationTest.php
@@ -2,12 +2,12 @@
 
 namespace Tests\Auth;
 
-use BookStack\Auth\Access\LoginService;
-use BookStack\Auth\Access\Mfa\MfaValue;
-use BookStack\Auth\Access\Mfa\TotpService;
-use BookStack\Auth\Role;
-use BookStack\Auth\User;
+use BookStack\Access\LoginService;
+use BookStack\Access\Mfa\MfaValue;
+use BookStack\Access\Mfa\TotpService;
 use BookStack\Exceptions\StoppedAuthenticationException;
+use BookStack\Users\Models\Role;
+use BookStack\Users\Models\User;
 use Illuminate\Support\Facades\Hash;
 use PragmaRX\Google2FA\Google2FA;
 use Tests\TestCase;
diff --git a/tests/Auth/OidcTest.php b/tests/Auth/OidcTest.php
index 41727e7b7..191a25f88 100644
--- a/tests/Auth/OidcTest.php
+++ b/tests/Auth/OidcTest.php
@@ -2,11 +2,11 @@
 
 namespace Tests\Auth;
 
-use BookStack\Actions\ActivityType;
-use BookStack\Auth\Role;
-use BookStack\Auth\User;
+use BookStack\Activity\ActivityType;
 use BookStack\Facades\Theme;
 use BookStack\Theming\ThemeEvents;
+use BookStack\Users\Models\Role;
+use BookStack\Users\Models\User;
 use GuzzleHttp\Psr7\Request;
 use GuzzleHttp\Psr7\Response;
 use Illuminate\Testing\TestResponse;
diff --git a/tests/Auth/RegistrationTest.php b/tests/Auth/RegistrationTest.php
index 5c3aab6a8..bc190afd8 100644
--- a/tests/Auth/RegistrationTest.php
+++ b/tests/Auth/RegistrationTest.php
@@ -2,9 +2,9 @@
 
 namespace Tests\Auth;
 
-use BookStack\Auth\Role;
-use BookStack\Auth\User;
 use BookStack\Notifications\ConfirmEmail;
+use BookStack\Users\Models\Role;
+use BookStack\Users\Models\User;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Notification;
 use Tests\TestCase;
diff --git a/tests/Auth/ResetPasswordTest.php b/tests/Auth/ResetPasswordTest.php
index 72e26f10c..b97a2f2d3 100644
--- a/tests/Auth/ResetPasswordTest.php
+++ b/tests/Auth/ResetPasswordTest.php
@@ -2,8 +2,8 @@
 
 namespace Tests\Auth;
 
-use BookStack\Auth\User;
 use BookStack\Notifications\ResetPassword;
+use BookStack\Users\Models\User;
 use Illuminate\Support\Facades\Notification;
 use Tests\TestCase;
 
diff --git a/tests/Auth/Saml2Test.php b/tests/Auth/Saml2Test.php
index 1a3e4abbe..801682a00 100644
--- a/tests/Auth/Saml2Test.php
+++ b/tests/Auth/Saml2Test.php
@@ -2,8 +2,8 @@
 
 namespace Tests\Auth;
 
-use BookStack\Auth\Role;
-use BookStack\Auth\User;
+use BookStack\Users\Models\Role;
+use BookStack\Users\Models\User;
 use Tests\TestCase;
 
 class Saml2Test extends TestCase
diff --git a/tests/Auth/SocialAuthTest.php b/tests/Auth/SocialAuthTest.php
index 24deedd5f..5b7071a07 100644
--- a/tests/Auth/SocialAuthTest.php
+++ b/tests/Auth/SocialAuthTest.php
@@ -2,9 +2,9 @@
 
 namespace Tests\Auth;
 
-use BookStack\Actions\ActivityType;
-use BookStack\Auth\SocialAccount;
-use BookStack\Auth\User;
+use BookStack\Access\SocialAccount;
+use BookStack\Activity\ActivityType;
+use BookStack\Users\Models\User;
 use Illuminate\Support\Facades\DB;
 use Laravel\Socialite\Contracts\Factory;
 use Laravel\Socialite\Contracts\Provider;
diff --git a/tests/Auth/UserInviteTest.php b/tests/Auth/UserInviteTest.php
index e82ce4638..7488ac776 100644
--- a/tests/Auth/UserInviteTest.php
+++ b/tests/Auth/UserInviteTest.php
@@ -2,9 +2,9 @@
 
 namespace Tests\Auth;
 
-use BookStack\Auth\Access\UserInviteService;
-use BookStack\Auth\User;
+use BookStack\Access\UserInviteService;
 use BookStack\Notifications\UserInvite;
+use BookStack\Users\Models\User;
 use Carbon\Carbon;
 use Illuminate\Notifications\Messages\MailMessage;
 use Illuminate\Support\Facades\DB;
diff --git a/tests/Commands/ClearActivityCommandTest.php b/tests/Commands/ClearActivityCommandTest.php
index b2624e23d..410a39aa8 100644
--- a/tests/Commands/ClearActivityCommandTest.php
+++ b/tests/Commands/ClearActivityCommandTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Commands;
 
-use BookStack\Actions\ActivityType;
+use BookStack\Activity\ActivityType;
 use BookStack\Facades\Activity;
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\DB;
diff --git a/tests/Commands/CreateAdminCommandTest.php b/tests/Commands/CreateAdminCommandTest.php
index 1d8915b3a..95a39c497 100644
--- a/tests/Commands/CreateAdminCommandTest.php
+++ b/tests/Commands/CreateAdminCommandTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Commands;
 
-use BookStack\Auth\User;
+use BookStack\Users\Models\User;
 use Illuminate\Support\Facades\Auth;
 use Tests\TestCase;
 
diff --git a/tests/Commands/RegenerateCommentContentCommandTest.php b/tests/Commands/RegenerateCommentContentCommandTest.php
index 08f137777..4940d66c3 100644
--- a/tests/Commands/RegenerateCommentContentCommandTest.php
+++ b/tests/Commands/RegenerateCommentContentCommandTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Commands;
 
-use BookStack\Actions\Comment;
+use BookStack\Activity\Models\Comment;
 use Tests\TestCase;
 
 class RegenerateCommentContentCommandTest extends TestCase
diff --git a/tests/Commands/RegeneratePermissionsCommandTest.php b/tests/Commands/RegeneratePermissionsCommandTest.php
index 9cf7dec93..75c6c1b38 100644
--- a/tests/Commands/RegeneratePermissionsCommandTest.php
+++ b/tests/Commands/RegeneratePermissionsCommandTest.php
@@ -3,8 +3,7 @@
 namespace Tests\Commands;
 
 use BookStack\Auth\Permissions\CollapsedPermission;
-use BookStack\Auth\Permissions\EntityPermission;
-use BookStack\Auth\Permissions\JointPermission;
+use BookStack\Permissions\Models\JointPermission;
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\DB;
 use Tests\TestCase;
diff --git a/tests/Commands/ResetMfaCommandTest.php b/tests/Commands/ResetMfaCommandTest.php
index e65a048ef..85f8f6430 100644
--- a/tests/Commands/ResetMfaCommandTest.php
+++ b/tests/Commands/ResetMfaCommandTest.php
@@ -2,8 +2,8 @@
 
 namespace Tests\Commands;
 
-use BookStack\Auth\Access\Mfa\MfaValue;
-use BookStack\Auth\User;
+use BookStack\Access\Mfa\MfaValue;
+use BookStack\Users\Models\User;
 use Tests\TestCase;
 
 class ResetMfaCommandTest extends TestCase
diff --git a/tests/DebugViewTest.php b/tests/DebugViewTest.php
index ec66de10a..43de9f175 100644
--- a/tests/DebugViewTest.php
+++ b/tests/DebugViewTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests;
 
-use BookStack\Auth\Access\SocialAuthService;
+use BookStack\Access\SocialAuthService;
 use Illuminate\Testing\TestResponse;
 
 class DebugViewTest extends TestCase
diff --git a/tests/Entity/BookShelfTest.php b/tests/Entity/BookShelfTest.php
index 2e7d41d64..a10a56e9e 100644
--- a/tests/Entity/BookShelfTest.php
+++ b/tests/Entity/BookShelfTest.php
@@ -2,10 +2,10 @@
 
 namespace Tests\Entity;
 
-use BookStack\Auth\User;
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Bookshelf;
 use BookStack\Uploads\Image;
+use BookStack\Users\Models\User;
 use Illuminate\Support\Str;
 use Tests\TestCase;
 
diff --git a/tests/Entity/CommentTest.php b/tests/Entity/CommentTest.php
index 99e3525a0..1159df79d 100644
--- a/tests/Entity/CommentTest.php
+++ b/tests/Entity/CommentTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Entity;
 
-use BookStack\Actions\Comment;
+use BookStack\Activity\Models\Comment;
 use BookStack\Entities\Models\Page;
 use Tests\TestCase;
 
diff --git a/tests/Entity/ConvertTest.php b/tests/Entity/ConvertTest.php
index 4beec7fa6..decda5224 100644
--- a/tests/Entity/ConvertTest.php
+++ b/tests/Entity/ConvertTest.php
@@ -2,8 +2,8 @@
 
 namespace Tests\Entity;
 
-use BookStack\Actions\ActivityType;
-use BookStack\Actions\Tag;
+use BookStack\Activity\ActivityType;
+use BookStack\Activity\Models\Tag;
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Bookshelf;
 use BookStack\Entities\Models\Chapter;
diff --git a/tests/Entity/EntityAccessTest.php b/tests/Entity/EntityAccessTest.php
index ab7587a3b..2b7e5d5dd 100644
--- a/tests/Entity/EntityAccessTest.php
+++ b/tests/Entity/EntityAccessTest.php
@@ -2,8 +2,8 @@
 
 namespace Tests\Entity;
 
-use BookStack\Auth\UserRepo;
 use BookStack\Entities\Models\Entity;
+use BookStack\Users\UserRepo;
 use Tests\TestCase;
 
 class EntityAccessTest extends TestCase
diff --git a/tests/Entity/EntitySearchTest.php b/tests/Entity/EntitySearchTest.php
index 170269941..af06ae72a 100644
--- a/tests/Entity/EntitySearchTest.php
+++ b/tests/Entity/EntitySearchTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Entity;
 
-use BookStack\Actions\Tag;
+use BookStack\Activity\Models\Tag;
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Bookshelf;
 use Tests\TestCase;
diff --git a/tests/Entity/ExportTest.php b/tests/Entity/ExportTest.php
index 6ae8dcde3..2b5244bf0 100644
--- a/tests/Entity/ExportTest.php
+++ b/tests/Entity/ExportTest.php
@@ -2,7 +2,6 @@
 
 namespace Tests\Entity;
 
-use BookStack\Auth\Role;
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Models\Page;
diff --git a/tests/Entity/PageRevisionTest.php b/tests/Entity/PageRevisionTest.php
index 0df37728e..97d5a6664 100644
--- a/tests/Entity/PageRevisionTest.php
+++ b/tests/Entity/PageRevisionTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Entity;
 
-use BookStack\Actions\ActivityType;
+use BookStack\Activity\ActivityType;
 use BookStack\Entities\Models\Page;
 use Tests\TestCase;
 
diff --git a/tests/Entity/TagTest.php b/tests/Entity/TagTest.php
index 7e6674959..c1240e955 100644
--- a/tests/Entity/TagTest.php
+++ b/tests/Entity/TagTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Entity;
 
-use BookStack\Actions\Tag;
+use BookStack\Activity\Models\Tag;
 use BookStack\Entities\Models\Entity;
 use BookStack\Entities\Models\Page;
 use Tests\TestCase;
diff --git a/tests/FavouriteTest.php b/tests/FavouriteTest.php
index 7778aa8e9..0e30cbd58 100644
--- a/tests/FavouriteTest.php
+++ b/tests/FavouriteTest.php
@@ -2,8 +2,8 @@
 
 namespace Tests;
 
-use BookStack\Actions\Favourite;
-use BookStack\Auth\User;
+use BookStack\Activity\Models\Favourite;
+use BookStack\Users\Models\User;
 
 class FavouriteTest extends TestCase
 {
diff --git a/tests/Helpers/EntityProvider.php b/tests/Helpers/EntityProvider.php
index 8b045db54..ddc854290 100644
--- a/tests/Helpers/EntityProvider.php
+++ b/tests/Helpers/EntityProvider.php
@@ -2,7 +2,6 @@
 
 namespace Tests\Helpers;
 
-use BookStack\Auth\User;
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Bookshelf;
 use BookStack\Entities\Models\Chapter;
@@ -12,6 +11,7 @@ use BookStack\Entities\Repos\BookRepo;
 use BookStack\Entities\Repos\BookshelfRepo;
 use BookStack\Entities\Repos\ChapterRepo;
 use BookStack\Entities\Repos\PageRepo;
+use BookStack\Users\Models\User;
 use Illuminate\Database\Eloquent\Builder;
 
 /**
diff --git a/tests/Helpers/PermissionsProvider.php b/tests/Helpers/PermissionsProvider.php
index b93c45e25..512f43fb6 100644
--- a/tests/Helpers/PermissionsProvider.php
+++ b/tests/Helpers/PermissionsProvider.php
@@ -2,11 +2,11 @@
 
 namespace Tests\Helpers;
 
-use BookStack\Auth\Permissions\EntityPermission;
-use BookStack\Auth\Permissions\RolePermission;
-use BookStack\Auth\Role;
-use BookStack\Auth\User;
 use BookStack\Entities\Models\Entity;
+use BookStack\Permissions\Models\EntityPermission;
+use BookStack\Permissions\Models\RolePermission;
+use BookStack\Users\Models\Role;
+use BookStack\Users\Models\User;
 
 class PermissionsProvider
 {
diff --git a/tests/Helpers/UserRoleProvider.php b/tests/Helpers/UserRoleProvider.php
index 8c2718bc3..b86e90394 100644
--- a/tests/Helpers/UserRoleProvider.php
+++ b/tests/Helpers/UserRoleProvider.php
@@ -2,9 +2,9 @@
 
 namespace Tests\Helpers;
 
-use BookStack\Auth\Permissions\PermissionsRepo;
-use BookStack\Auth\Role;
-use BookStack\Auth\User;
+use BookStack\Permissions\PermissionsRepo;
+use BookStack\Users\Models\Role;
+use BookStack\Users\Models\User;
 
 class UserRoleProvider
 {
diff --git a/tests/HomepageTest.php b/tests/HomepageTest.php
index c7e8b69bb..eb552b2e2 100644
--- a/tests/HomepageTest.php
+++ b/tests/HomepageTest.php
@@ -2,8 +2,8 @@
 
 namespace Tests;
 
-use BookStack\Auth\Role;
-use BookStack\Auth\User;
+use BookStack\Users\Models\Role;
+use BookStack\Users\Models\User;
 
 class HomepageTest extends TestCase
 {
diff --git a/tests/Permissions/EntityOwnerChangeTest.php b/tests/Permissions/EntityOwnerChangeTest.php
index e94759760..f00254922 100644
--- a/tests/Permissions/EntityOwnerChangeTest.php
+++ b/tests/Permissions/EntityOwnerChangeTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Permissions;
 
-use BookStack\Auth\User;
+use BookStack\Users\Models\User;
 use Tests\TestCase;
 
 class EntityOwnerChangeTest extends TestCase
diff --git a/tests/Permissions/EntityPermissionsTest.php b/tests/Permissions/EntityPermissionsTest.php
index 99a8bd88c..3c4bf4a77 100644
--- a/tests/Permissions/EntityPermissionsTest.php
+++ b/tests/Permissions/EntityPermissionsTest.php
@@ -2,13 +2,13 @@
 
 namespace Tests\Permissions;
 
-use BookStack\Auth\Role;
-use BookStack\Auth\User;
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Bookshelf;
 use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Models\Entity;
 use BookStack\Entities\Models\Page;
+use BookStack\Users\Models\Role;
+use BookStack\Users\Models\User;
 use Exception;
 use Illuminate\Support\Str;
 use Tests\TestCase;
diff --git a/tests/Permissions/RolesTest.php b/tests/Permissions/RolesTest.php
index 971479e28..dafa1f2bb 100644
--- a/tests/Permissions/RolesTest.php
+++ b/tests/Permissions/RolesTest.php
@@ -2,16 +2,16 @@
 
 namespace Tests\Permissions;
 
-use BookStack\Actions\ActivityType;
-use BookStack\Actions\Comment;
-use BookStack\Auth\Role;
-use BookStack\Auth\User;
+use BookStack\Activity\ActivityType;
+use BookStack\Activity\Models\Comment;
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Bookshelf;
 use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Models\Entity;
 use BookStack\Entities\Models\Page;
 use BookStack\Uploads\Image;
+use BookStack\Users\Models\Role;
+use BookStack\Users\Models\User;
 use Illuminate\Testing\TestResponse;
 use Tests\TestCase;
 
diff --git a/tests/Permissions/Scenarios/PermissionScenarioTestCase.php b/tests/Permissions/Scenarios/PermissionScenarioTestCase.php
index 5352f468a..2299fe878 100644
--- a/tests/Permissions/Scenarios/PermissionScenarioTestCase.php
+++ b/tests/Permissions/Scenarios/PermissionScenarioTestCase.php
@@ -2,8 +2,8 @@
 
 namespace Tests\Permissions\Scenarios;
 
-use BookStack\Auth\User;
 use BookStack\Entities\Models\Entity;
+use BookStack\Users\Models\User;
 use Tests\TestCase;
 
 // Cases defined in dev/docs/permission-scenario-testing.md
diff --git a/tests/PublicActionTest.php b/tests/PublicActionTest.php
index e21afdf33..97299f757 100644
--- a/tests/PublicActionTest.php
+++ b/tests/PublicActionTest.php
@@ -2,11 +2,11 @@
 
 namespace Tests;
 
-use BookStack\Auth\Permissions\RolePermission;
-use BookStack\Auth\Role;
-use BookStack\Auth\User;
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Chapter;
+use BookStack\Permissions\Models\RolePermission;
+use BookStack\Users\Models\Role;
+use BookStack\Users\Models\User;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\View;
 
diff --git a/tests/References/ReferencesTest.php b/tests/References/ReferencesTest.php
index 4330598ba..a19e1b901 100644
--- a/tests/References/ReferencesTest.php
+++ b/tests/References/ReferencesTest.php
@@ -2,9 +2,9 @@
 
 namespace Tests\References;
 
+use BookStack\App\Model;
 use BookStack\Entities\Repos\PageRepo;
 use BookStack\Entities\Tools\TrashCan;
-use BookStack\Model;
 use BookStack\References\Reference;
 use Tests\TestCase;
 
diff --git a/tests/Settings/RegenerateReferencesTest.php b/tests/Settings/RegenerateReferencesTest.php
index 239f50e76..25832b03e 100644
--- a/tests/Settings/RegenerateReferencesTest.php
+++ b/tests/Settings/RegenerateReferencesTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Settings;
 
-use BookStack\Actions\ActivityType;
+use BookStack\Activity\ActivityType;
 use BookStack\References\ReferenceStore;
 use Tests\TestCase;
 
diff --git a/tests/ThemeTest.php b/tests/ThemeTest.php
index bc8163056..6976f2384 100644
--- a/tests/ThemeTest.php
+++ b/tests/ThemeTest.php
@@ -2,15 +2,15 @@
 
 namespace Tests;
 
-use BookStack\Actions\ActivityType;
-use BookStack\Actions\DispatchWebhookJob;
-use BookStack\Actions\Webhook;
-use BookStack\Auth\User;
+use BookStack\Activity\ActivityType;
+use BookStack\Activity\DispatchWebhookJob;
+use BookStack\Activity\Models\Webhook;
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Page;
 use BookStack\Entities\Tools\PageContent;
 use BookStack\Facades\Theme;
 use BookStack\Theming\ThemeEvents;
+use BookStack\Users\Models\User;
 use Illuminate\Console\Command;
 use Illuminate\Http\Client\Request as HttpClientRequest;
 use Illuminate\Http\Request;
diff --git a/tests/Unit/IpFormatterTest.php b/tests/Unit/IpFormatterTest.php
index 928b1ab10..148782575 100644
--- a/tests/Unit/IpFormatterTest.php
+++ b/tests/Unit/IpFormatterTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit;
 
-use BookStack\Actions\IpFormatter;
+use BookStack\Activity\Tools\IpFormatter;
 use Tests\TestCase;
 
 class IpFormatterTest extends TestCase
diff --git a/tests/Unit/OidcIdTokenTest.php b/tests/Unit/OidcIdTokenTest.php
index ad91eecd8..6302f84c7 100644
--- a/tests/Unit/OidcIdTokenTest.php
+++ b/tests/Unit/OidcIdTokenTest.php
@@ -2,8 +2,8 @@
 
 namespace Tests\Unit;
 
-use BookStack\Auth\Access\Oidc\OidcIdToken;
-use BookStack\Auth\Access\Oidc\OidcInvalidTokenException;
+use BookStack\Access\Oidc\OidcIdToken;
+use BookStack\Access\Oidc\OidcInvalidTokenException;
 use Tests\Helpers\OidcJwtHelper;
 use Tests\TestCase;
 
diff --git a/tests/Uploads/AvatarTest.php b/tests/Uploads/AvatarTest.php
index 57f28db42..2217cd2ba 100644
--- a/tests/Uploads/AvatarTest.php
+++ b/tests/Uploads/AvatarTest.php
@@ -2,9 +2,9 @@
 
 namespace Tests\Uploads;
 
-use BookStack\Auth\User;
 use BookStack\Exceptions\HttpFetchException;
 use BookStack\Uploads\HttpFetcher;
+use BookStack\Users\Models\User;
 use Tests\TestCase;
 
 class AvatarTest extends TestCase
diff --git a/tests/User/UserApiTokenTest.php b/tests/User/UserApiTokenTest.php
index 93070b712..75de49aed 100644
--- a/tests/User/UserApiTokenTest.php
+++ b/tests/User/UserApiTokenTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\User;
 
-use BookStack\Actions\ActivityType;
+use BookStack\Activity\ActivityType;
 use BookStack\Api\ApiToken;
 use Carbon\Carbon;
 use Tests\TestCase;
diff --git a/tests/User/UserManagementTest.php b/tests/User/UserManagementTest.php
index 7ccc5b773..df60bede6 100644
--- a/tests/User/UserManagementTest.php
+++ b/tests/User/UserManagementTest.php
@@ -2,11 +2,11 @@
 
 namespace Tests\User;
 
-use BookStack\Actions\ActivityType;
-use BookStack\Auth\Access\UserInviteService;
-use BookStack\Auth\Role;
-use BookStack\Auth\User;
+use BookStack\Access\UserInviteService;
+use BookStack\Activity\ActivityType;
 use BookStack\Uploads\Image;
+use BookStack\Users\Models\Role;
+use BookStack\Users\Models\User;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Str;
 use Mockery\MockInterface;
diff --git a/tests/User/UserProfileTest.php b/tests/User/UserProfileTest.php
index c507e8fa6..4bfb3c878 100644
--- a/tests/User/UserProfileTest.php
+++ b/tests/User/UserProfileTest.php
@@ -3,8 +3,8 @@
 namespace Tests\User;
 
 use Activity;
-use BookStack\Actions\ActivityType;
-use BookStack\Auth\User;
+use BookStack\Activity\ActivityType;
+use BookStack\Users\Models\User;
 use Tests\TestCase;
 
 class UserProfileTest extends TestCase
diff --git a/tests/User/UserSearchTest.php b/tests/User/UserSearchTest.php
index 1b3ca8a35..1387311ce 100644
--- a/tests/User/UserSearchTest.php
+++ b/tests/User/UserSearchTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\User;
 
-use BookStack\Auth\User;
+use BookStack\Users\Models\User;
 use Tests\TestCase;
 
 class UserSearchTest extends TestCase