diff --git a/bin/qualify-core-references.php b/bin/qualify-core-references.php
new file mode 100644
index 00000000..9e2c08f9
--- /dev/null
+++ b/bin/qualify-core-references.php
@@ -0,0 +1,204 @@
+<?php
+/**
+ * Rewrites bare references to FOG core classes into fully qualified ones.
+ *
+ * Plugins are global-namespace by design (ADR 0009) and have always named
+ * core classes bare -- `extends Hook`, `Route::listem()`, `new Image()`.
+ * Those resolve only because every file under fogproject's packages/web/src/
+ * ends in a class_alias() re-exporting itself globally, and that alias set is
+ * being retired (fogproject docs/composer-psr4-plan.md, ADR 0013 §2).
+ *
+ * This qualifies them: `extends \FOG\Base\Hook`, `\FOG\Router\Route::listem()`.
+ * The plugin stays in the global namespace -- only the names it reaches into
+ * core with change.
+ *
+ * The map is read from a fogproject checkout rather than hardcoded, because
+ * the bucket a class lives in is fogproject's to decide and a stale copy here
+ * would rewrite names to somewhere they are not.
+ *
+ * Tokenised, never regex: a class name in a docblock, a string or a comment
+ * must not be rewritten, and `$obj->Route` is not a class reference.
+ *
+ * Names the plugin tree itself declares are skipped even when core has one of
+ * the same name -- a plugin's own class always wins for its own references.
+ *
+ * Usage:
+ *   php bin/qualify-core-references.php --core=/path/to/fogproject [--fix]
+ *
+ * Without --fix it reports and changes nothing. Exit 1 if anything is left to
+ * do (so it doubles as a check), 0 when the tree is clean.
+ */
+
+$opts = getopt('', ['core:', 'fix']);
+$core = $opts['core'] ?? '/home/telliott/fogproject';
+$fix  = isset($opts['fix']);
+$srcRoot = rtrim($core, '/') . '/packages/web/src';
+if (!is_dir($srcRoot)) {
+    fwrite(STDERR, "no fogproject src/ at $srcRoot -- pass --core=/path/to/fogproject\n");
+    exit(2);
+}
+
+/**
+ * Core: lowercased short name => the name to write, WITHOUT a leading
+ * backslash (the rewrite adds one).
+ *
+ * Three sources, because core does not keep all its classes in one place and
+ * the src/ map alone silently misses two kinds of reference:
+ *
+ *  - packages/web/src/       PSR-4, so the path IS the name.
+ *  - packages/web/lib/       the 46 discovery-named classes, whose filenames
+ *                            are a contract with FOGPageManager and cannot be
+ *                            PSR-4. They sit in the flat FOG namespace, so a
+ *                            plugin report extends FOG\ReportManagement.
+ *  - packages/web/commons/   Initiator, which is genuinely global-namespace
+ *                            and stays that way; qualifying it is just a
+ *                            leading backslash.
+ *
+ * Only the first group's aliases are being retired, but the other two are
+ * bare names resolving by luck of the global namespace, and the test that
+ * gates this cannot tell the three apart -- nor should it have to.
+ */
+$core = [];
+$walk = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($srcRoot));
+foreach ($walk as $file) {
+    if ($file->isFile() && 'php' === $file->getExtension()) {
+        $short = $file->getBasename('.php');
+        $core[strtolower($short)] = 'FOG\\' . basename(dirname($file->getPathname())) . '\\' . $short;
+    }
+}
+$webRoot = dirname($srcRoot);
+foreach (['pages', 'hooks', 'reports', 'events'] as $dir) {
+    foreach (glob($webRoot . '/lib/' . $dir . '/*.php') as $path) {
+        $short = preg_replace('/\\.(page|hook|report|event)$/', '', basename($path, '.php'));
+        $src = file_get_contents($path);
+        if (preg_match('/^\\s*(?:final\\s+|abstract\\s+)*class\\s+(\\w+)/mi', $src, $m)) {
+            $core[strtolower($m[1])] = 'FOG\\' . $m[1];
+        }
+    }
+}
+foreach (glob($webRoot . '/commons/*.php') as $path) {
+    if (preg_match_all(
+        '/^\\s*(?:final\\s+|abstract\\s+)*class\\s+(\\w+)/mi',
+        file_get_contents($path),
+        $m
+    )) {
+        foreach ($m[1] as $name) {
+            // Global namespace, and staying there -- the leading backslash
+            // the rewrite adds is the whole change.
+            $core[strtolower($name)] = $name;
+        }
+    }
+}
+
+$root = dirname(__DIR__);
+
+/** Every class this tree declares. A plugin's own name always wins. */
+$own = [];
+$walk = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($root));
+foreach ($walk as $file) {
+    // tests/stubs is excluded here as well as from the rewrite. It declares
+    // test doubles NAMED for core classes -- FOGController, Schema -- and
+    // counting those as the tree's own would make every reference to them
+    // look like a plugin's own class and skip it. That is not hypothetical:
+    // the first run of this tool rewrote 313 references and silently left
+    // ~90 behind for exactly that reason. The strict stubs caught it.
+    if (!$file->isFile() || 'php' !== $file->getExtension()
+        || false !== strpos($file->getPathname(), '/.git/')
+        || false !== strpos($file->getPathname(), '/tests/stubs/')
+    ) {
+        continue;
+    }
+    if (preg_match_all(
+        '/^\s*(?:final\s+|abstract\s+)*(?:class|interface|trait)\s+(\w+)/mi',
+        file_get_contents($file->getPathname()),
+        $m
+    )) {
+        foreach ($m[1] as $name) {
+            $own[strtolower($name)] = true;
+        }
+    }
+}
+
+$skip = [T_WHITESPACE, T_COMMENT, T_DOC_COMMENT];
+$changedFiles = 0;
+$changedRefs = 0;
+$report = [];
+
+$walk = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($root));
+foreach ($walk as $file) {
+    $path = $file->getPathname();
+    if (!$file->isFile() || 'php' !== $file->getExtension()
+        || false !== strpos($path, '/.git/')
+        || false !== strpos($path, '/tests/stubs/')
+    ) {
+        continue;
+    }
+    $src = file_get_contents($path);
+    $tokens = token_get_all($src);
+    $count = count($tokens);
+    $out = '';
+    $hits = 0;
+    for ($i = 0; $i < $count; $i++) {
+        $token = $tokens[$i];
+        if (!is_array($token) || T_STRING !== $token[0]) {
+            $out .= is_array($token) ? $token[1] : $token;
+            continue;
+        }
+        $name = $token[1];
+        $key = strtolower($name);
+        if (!isset($core[$key]) || isset($own[$key])) {
+            $out .= $name;
+            continue;
+        }
+        // Neighbours, whitespace and comments skipped.
+        $prev = null;
+        for ($j = $i - 1; $j >= 0; $j--) {
+            if (is_array($tokens[$j]) && in_array($tokens[$j][0], $skip, true)) {
+                continue;
+            }
+            $prev = $tokens[$j];
+            break;
+        }
+        $next = null;
+        for ($j = $i + 1; $j < $count; $j++) {
+            if (is_array($tokens[$j]) && in_array($tokens[$j][0], $skip, true)) {
+                continue;
+            }
+            $next = $tokens[$j];
+            break;
+        }
+        // Already qualified, or a member/function/const name rather than a
+        // class reference.
+        $isQualified = is_array($prev)
+            && in_array($prev[0], [T_NS_SEPARATOR, T_OBJECT_OPERATOR, T_DOUBLE_COLON, T_FUNCTION, T_CONST], true);
+        $followsSeparator = is_array($next) && T_NS_SEPARATOR === $next[0];
+        $isClassRef = (is_array($next) && T_DOUBLE_COLON === $next[0])
+            || (is_array($prev) && in_array($prev[0], [T_NEW, T_EXTENDS, T_IMPLEMENTS, T_INSTANCEOF], true));
+        if ($isQualified || $followsSeparator || !$isClassRef) {
+            $out .= $name;
+            continue;
+        }
+        $out .= '\\' . $core[$key];
+        $hits++;
+    }
+    if (!$hits) {
+        continue;
+    }
+    $rel = str_replace($root . '/', '', $path);
+    $report[] = sprintf('%-58s %d', $rel, $hits);
+    $changedFiles++;
+    $changedRefs += $hits;
+    if ($fix) {
+        file_put_contents($path, $out);
+    }
+}
+
+sort($report);
+echo implode("\n", $report) . "\n";
+printf(
+    "%s: %d reference(s) in %d file(s)\n",
+    $fix ? 'rewrote' : 'would rewrite',
+    $changedRefs,
+    $changedFiles
+);
+exit($changedRefs && !$fix ? 1 : 0);
diff --git a/capone/class/capone.class.php b/capone/class/capone.class.php
index b83b2b20..b8c95563 100644
--- a/capone/class/capone.class.php
+++ b/capone/class/capone.class.php
@@ -19,7 +19,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class Capone extends FOGController
+class Capone extends \FOG\Base\FOGController
 {
     /**
      * The capone table
diff --git a/capone/class/caponemanager.class.php b/capone/class/caponemanager.class.php
index 17d76d32..923964f9 100644
--- a/capone/class/caponemanager.class.php
+++ b/capone/class/caponemanager.class.php
@@ -19,7 +19,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class CaponeManager extends FOGManagerController
+class CaponeManager extends \FOG\Base\FOGManagerController
 {
     /**
      * The base table name.
@@ -149,7 +149,7 @@ function () {
      */
     public function install()
     {
-        $res = Schema::applyUpdates($this->schema(), 0);
+        $res = \FOG\Items\Schema::applyUpdates($this->schema(), 0);
         return $res['error'] === null;
     }
     /**
@@ -159,11 +159,11 @@ public function install()
      */
     public function uninstall()
     {
-        Route::deletemass(
+        \FOG\Router\Route::deletemass(
             'setting',
             ['name' => 'FOG_PLUGIN_CAPONE_%']
         );
-        Route::deletemass(
+        \FOG\Router\Route::deletemass(
             'pxemenuoptions',
             ['name' => 'fog.capone']
         );
diff --git a/capone/hooks/addbootmenuitem.hook.php b/capone/hooks/addbootmenuitem.hook.php
index 2edaa4c0..6210fca8 100644
--- a/capone/hooks/addbootmenuitem.hook.php
+++ b/capone/hooks/addbootmenuitem.hook.php
@@ -19,7 +19,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class AddBootMenuItem extends Hook
+class AddBootMenuItem extends \FOG\Base\Hook
 {
     /**
      * The name of this hook.
diff --git a/capone/hooks/addcaponeapi.hook.php b/capone/hooks/addcaponeapi.hook.php
index 2c0edbb1..02e90453 100644
--- a/capone/hooks/addcaponeapi.hook.php
+++ b/capone/hooks/addcaponeapi.hook.php
@@ -19,7 +19,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class AddCaponeAPI extends Hook
+class AddCaponeAPI extends \FOG\Base\Hook
 {
     /**
      * Name of the hook.
diff --git a/capone/hooks/addcaponejs.hook.php b/capone/hooks/addcaponejs.hook.php
index c0469099..ede2efc7 100644
--- a/capone/hooks/addcaponejs.hook.php
+++ b/capone/hooks/addcaponejs.hook.php
@@ -19,7 +19,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class AddCaponeJS extends Hook
+class AddCaponeJS extends \FOG\Base\Hook
 {
     /**
      * The name of this hook.
diff --git a/capone/hooks/addcaponemenuitem.hook.php b/capone/hooks/addcaponemenuitem.hook.php
index 3cf2a1f3..c9cb7541 100644
--- a/capone/hooks/addcaponemenuitem.hook.php
+++ b/capone/hooks/addcaponemenuitem.hook.php
@@ -19,7 +19,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class AddCaponeMenuItem extends Hook
+class AddCaponeMenuItem extends \FOG\Base\Hook
 {
     /**
      * The name of this hook.
diff --git a/capone/pages/caponemanagement.page.php b/capone/pages/caponemanagement.page.php
index f4a561de..6f1c12f2 100644
--- a/capone/pages/caponemanagement.page.php
+++ b/capone/pages/caponemanagement.page.php
@@ -19,7 +19,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class CaponeManagement extends FOGPage
+class CaponeManagement extends \FOG\Base\FOGPage
 {
     /**
      * The node this page displays with.
@@ -133,7 +133,7 @@ function (&$serverFault) {
                 $key = trim(
                     filter_input(INPUT_POST, 'key')
                 );
-                $image = new Image($imageID);
+                $image = new \FOG\Items\Image($imageID);
                 $os = $image->getOS();
                 $osID = $os->get('id');
                 if (!$image->isValid()) {
@@ -261,7 +261,7 @@ public function caponeGeneralPost()
         $key = trim(
             filter_input(INPUT_POST, 'key')
         );
-        $image = new Image($imageID);
+        $image = new \FOG\Items\Image($imageID);
         $os = $image->getOS();
         $osID = $os->get('id');
 
@@ -321,7 +321,7 @@ public function globalsettings()
                 'FOG_PLUGIN_CAPONE_SHUTDOWN'
             ]
         ];
-        $settings = Route::getIds(
+        $settings = \FOG\Router\Route::getIds(
             'setting',
             $find,
             'value'
@@ -443,7 +443,7 @@ public function globalsettingsPost()
                 throw new \Exception(_('Unable to set action field'));
             }
             $hook = 'CAPONE_GLOBAL_EDIT_SUCCESS';
-            $code = HTTPResponseCodes::HTTP_ACCEPTED;
+            $code = \FOG\Router\HTTPResponseCodes::HTTP_ACCEPTED;
             $msg = json_encode(
                 [
                     'msg' => _('Global settings updated!'),
@@ -454,8 +454,8 @@ public function globalsettingsPost()
             $hook = 'CAPONE_GLOBAL_EDIT_FAIL';
             $code = (
                 $serverFault ?
-                HTTPResponseCodes::HTTP_INTERNAL_SERVER_ERROR :
-                HTTPResponseCodes::HTTP_BAD_REQUEST
+                \FOG\Router\HTTPResponseCodes::HTTP_INTERNAL_SERVER_ERROR :
+                \FOG\Router\HTTPResponseCodes::HTTP_BAD_REQUEST
             );
             $msg = json_encode(
                 [
diff --git a/capone/reg-task/caponetasking.class.php b/capone/reg-task/caponetasking.class.php
index b2a3ae46..dc193851 100644
--- a/capone/reg-task/caponetasking.class.php
+++ b/capone/reg-task/caponetasking.class.php
@@ -19,7 +19,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class CaponeTasking extends FOGBase
+class CaponeTasking extends \FOG\Base\FOGBase
 {
     /**
      * The actions supported fog capone.
@@ -62,12 +62,12 @@ public function __construct()
                 try {
                     $strSetup = "%s|%s|%s|%s|%s|%s|%s";
                     ob_start();
-                    $capones = Route::getList(
+                    $capones = \FOG\Router\Route::getList(
                         'capone',
                         ['key' => $key]
                     );
                     foreach ($capones as &$Capone) {
-                        $Image = new Image($Capone->imageID);
+                        $Image = new \FOG\Items\Image($Capone->imageID);
                         $OS = $Image->getOS();
                         $StorageNode = $Image
                             ->getStorageGroup()
diff --git a/helloworld/class/helloworld.class.php b/helloworld/class/helloworld.class.php
index fc2ab8c2..6c35f581 100644
--- a/helloworld/class/helloworld.class.php
+++ b/helloworld/class/helloworld.class.php
@@ -28,7 +28,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class HelloWorld extends FOGController
+class HelloWorld extends \FOG\Base\FOGController
 {
     /**
      * The database table this model maps to.
diff --git a/helloworld/class/helloworldmanager.class.php b/helloworld/class/helloworldmanager.class.php
index 0b81ddb8..a41c0bcd 100644
--- a/helloworld/class/helloworldmanager.class.php
+++ b/helloworld/class/helloworldmanager.class.php
@@ -28,7 +28,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class HelloWorldManager extends FOGManagerController
+class HelloWorldManager extends \FOG\Base\FOGManagerController
 {
     /**
      * The table name.
@@ -107,7 +107,7 @@ public function schema()
      */
     public function install()
     {
-        $res = Schema::applyUpdates($this->schema(), 0);
+        $res = \FOG\Items\Schema::applyUpdates($this->schema(), 0);
         return $res['error'] === null;
     }
 }
diff --git a/helloworld/hooks/addhelloworldapi.hook.php b/helloworld/hooks/addhelloworldapi.hook.php
index 7dbd9d80..fe099497 100644
--- a/helloworld/hooks/addhelloworldapi.hook.php
+++ b/helloworld/hooks/addhelloworldapi.hook.php
@@ -23,7 +23,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class AddHelloWorldAPI extends Hook
+class AddHelloWorldAPI extends \FOG\Base\Hook
 {
     /**
      * The name of this hook.
diff --git a/helloworld/hooks/addhelloworldjs.hook.php b/helloworld/hooks/addhelloworldjs.hook.php
index cc20380f..5aa0c95a 100644
--- a/helloworld/hooks/addhelloworldjs.hook.php
+++ b/helloworld/hooks/addhelloworldjs.hook.php
@@ -23,7 +23,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class AddHelloWorldJS extends Hook
+class AddHelloWorldJS extends \FOG\Base\Hook
 {
     /**
      * The name of this hook.
diff --git a/helloworld/hooks/addhelloworldmenuitem.hook.php b/helloworld/hooks/addhelloworldmenuitem.hook.php
index ec7ec07c..e63a65c1 100644
--- a/helloworld/hooks/addhelloworldmenuitem.hook.php
+++ b/helloworld/hooks/addhelloworldmenuitem.hook.php
@@ -24,7 +24,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class AddHelloWorldMenuItem extends Hook
+class AddHelloWorldMenuItem extends \FOG\Base\Hook
 {
     /**
      * The name of this hook.
diff --git a/helloworld/pages/helloworldmanagement.page.php b/helloworld/pages/helloworldmanagement.page.php
index bfc916b0..be6c9a94 100644
--- a/helloworld/pages/helloworldmanagement.page.php
+++ b/helloworld/pages/helloworldmanagement.page.php
@@ -30,7 +30,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class HelloWorldManagement extends FOGPage
+class HelloWorldManagement extends \FOG\Base\FOGPage
 {
     /**
      * The node this page operates on (matches the plugin machine name).
diff --git a/helloworld/tasks/helloworldheartbeat.task.php b/helloworld/tasks/helloworldheartbeat.task.php
index bdb7209d..6736e0fc 100644
--- a/helloworld/tasks/helloworldheartbeat.task.php
+++ b/helloworld/tasks/helloworldheartbeat.task.php
@@ -43,7 +43,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class HelloWorldHeartbeat extends PluginTask
+class HelloWorldHeartbeat extends \FOG\Base\PluginTask
 {
     /**
      * Shown in the service log instead of the class name.
@@ -98,7 +98,7 @@ public function run()
         // getCount(), not count(): count() returns void and stashes the
         // result for getData() to encode. getCount() is the wrapper that
         // hands back an int.
-        $total = Route::getCount('helloworld');
+        $total = \FOG\Router\Route::getCount('helloworld');
         $this->logLine(
             sprintf(
                 '%s: %d',
diff --git a/ldap/class/ldap.class.php b/ldap/class/ldap.class.php
index 2a2414fc..540ed4c8 100644
--- a/ldap/class/ldap.class.php
+++ b/ldap/class/ldap.class.php
@@ -23,7 +23,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class LDAP extends FOGController
+class LDAP extends \FOG\Base\FOGController
 {
     /**
      * The matching rule that makes a member= test transitive.
@@ -819,7 +819,7 @@ public function getDisplayName($user, $pass)
          * immediately if found.
          */
         $test = preg_match(
-            User::PATTERN,
+            \FOG\Items\User::PATTERN,
             $user
         );
         if (!$test) {
@@ -1115,7 +1115,7 @@ public function destroy($key = 'id')
              * each group also takes its role and user group associations
              * with it -- LDAPGroup::destroy() is what knows about those.
              */
-            $groupIds = (array)Route::getIds(
+            $groupIds = (array)\FOG\Router\Route::getIds(
                 'ldapgroup',
                 ['serverID' => $id],
                 'id'
@@ -1172,7 +1172,7 @@ public function authLDAP($user, $pass)
          * immediately if found.
          */
         $test = preg_match(
-            User::PATTERN,
+            \FOG\Items\User::PATTERN,
             $user
         );
         if (!$test) {
diff --git a/ldap/class/ldapgroup.class.php b/ldap/class/ldapgroup.class.php
index 84fcd3b0..e65c220e 100644
--- a/ldap/class/ldapgroup.class.php
+++ b/ldap/class/ldapgroup.class.php
@@ -36,7 +36,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class LDAPGroup extends FOGController
+class LDAPGroup extends \FOG\Base\FOGController
 {
     /**
      * The table name.
@@ -101,12 +101,12 @@ class LDAPGroup extends FOGController
     public static function serverLinkCell($serverID)
     {
         if (!$serverID) {
-            return Route::EMPTY_CELL;
+            return \FOG\Router\Route::EMPTY_CELL;
         }
         $name = self::getClass('LDAP', $serverID)->get('name');
         // A group outliving its server should still list, not fatal.
         if (!$name) {
-            return Route::EMPTY_CELL;
+            return \FOG\Router\Route::EMPTY_CELL;
         }
         return self::entityLink('ldap', $serverID, $name);
     }
@@ -195,7 +195,7 @@ protected function loadRoles()
     {
         $this->set(
             'roles',
-            (array)Route::getIds(
+            (array)\FOG\Router\Route::getIds(
                 'ldapgrouproleassociation',
                 ['ldapgroupID' => $this->get('id')],
                 'roleID'
@@ -211,7 +211,7 @@ protected function loadUsergroups()
     {
         $this->set(
             'usergroups',
-            (array)Route::getIds(
+            (array)\FOG\Router\Route::getIds(
                 'ldapgroupusergroupassociation',
                 ['ldapgroupID' => $this->get('id')],
                 'usergroupID'
@@ -232,11 +232,11 @@ public function destroy($key = 'id')
     {
         $id = (int)$this->get('id');
         if ($id > 0) {
-            Route::deletemass(
+            \FOG\Router\Route::deletemass(
                 'ldapgrouproleassociation',
                 ['ldapgroupID' => $id]
             );
-            Route::deletemass(
+            \FOG\Router\Route::deletemass(
                 'ldapgroupusergroupassociation',
                 ['ldapgroupID' => $id]
             );
diff --git a/ldap/class/ldapgroupmanager.class.php b/ldap/class/ldapgroupmanager.class.php
index 765e7bd2..0d739390 100644
--- a/ldap/class/ldapgroupmanager.class.php
+++ b/ldap/class/ldapgroupmanager.class.php
@@ -21,7 +21,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class LDAPGroupManager extends FOGManagerController
+class LDAPGroupManager extends \FOG\Base\FOGManagerController
 {
     /**
      * The base table name.
diff --git a/ldap/class/ldapgrouproleassociation.class.php b/ldap/class/ldapgrouproleassociation.class.php
index d7470350..c67d75e1 100644
--- a/ldap/class/ldapgrouproleassociation.class.php
+++ b/ldap/class/ldapgrouproleassociation.class.php
@@ -24,7 +24,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class LDAPGroupRoleAssociation extends FOGController
+class LDAPGroupRoleAssociation extends \FOG\Base\FOGController
 {
     /**
      * The table name.
diff --git a/ldap/class/ldapgrouproleassociationmanager.class.php b/ldap/class/ldapgrouproleassociationmanager.class.php
index 90232d24..86ace0db 100644
--- a/ldap/class/ldapgrouproleassociationmanager.class.php
+++ b/ldap/class/ldapgrouproleassociationmanager.class.php
@@ -21,7 +21,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class LDAPGroupRoleAssociationManager extends FOGManagerController
+class LDAPGroupRoleAssociationManager extends \FOG\Base\FOGManagerController
 {
     /**
      * The base table name.
diff --git a/ldap/class/ldapgroupusergroupassociation.class.php b/ldap/class/ldapgroupusergroupassociation.class.php
index 4356ee73..47398c17 100644
--- a/ldap/class/ldapgroupusergroupassociation.class.php
+++ b/ldap/class/ldapgroupusergroupassociation.class.php
@@ -25,7 +25,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class LDAPGroupUserGroupAssociation extends FOGController
+class LDAPGroupUserGroupAssociation extends \FOG\Base\FOGController
 {
     /**
      * The table name.
diff --git a/ldap/class/ldapgroupusergroupassociationmanager.class.php b/ldap/class/ldapgroupusergroupassociationmanager.class.php
index 89cf481c..2e555e04 100644
--- a/ldap/class/ldapgroupusergroupassociationmanager.class.php
+++ b/ldap/class/ldapgroupusergroupassociationmanager.class.php
@@ -21,7 +21,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class LDAPGroupUserGroupAssociationManager extends FOGManagerController
+class LDAPGroupUserGroupAssociationManager extends \FOG\Base\FOGManagerController
 {
     /**
      * The base table name.
diff --git a/ldap/class/ldapmanager.class.php b/ldap/class/ldapmanager.class.php
index 4d5d048e..596effe8 100644
--- a/ldap/class/ldapmanager.class.php
+++ b/ldap/class/ldapmanager.class.php
@@ -23,7 +23,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class LDAPManager extends FOGManagerController
+class LDAPManager extends \FOG\Base\FOGManagerController
 {
     /**
      * The base table name.
@@ -296,7 +296,7 @@ public function seedSettings()
      */
     private static function _defaultRoleId($name)
     {
-        $ids = Route::getIds('role', ['name' => $name], 'id');
+        $ids = \FOG\Router\Route::getIds('role', ['name' => $name], 'id');
         return (string)(array_shift($ids) ?: '');
     }
     /**
@@ -328,7 +328,7 @@ public function backfillIdentities()
         // throw on query errors, so stamping a column that is not there yet
         // would fail silently and leave these rows unprotected.
         $column = array_filter(
-            (array)DatabaseManager::getColumns('users', 'uAuthSource')
+            (array)\FOG\Db\DatabaseManager::getColumns('users', 'uAuthSource')
         );
         if (count($column) < 1) {
             return _(
@@ -899,7 +899,7 @@ function () {
             // through VARCHAR(1) so the conversion is by label, and carries
             // this table's nullability and defaults across (lsAllowAPI is nullable and lsUseGroupMatch has no default at all).
             function () {
-                return Schema::enumToTinyint(
+                return \FOG\Items\Schema::enumToTinyint(
                     [
                         'LDAPServers' => [
                             'lsAllowAPI',
@@ -920,7 +920,7 @@ function () {
      */
     public function install()
     {
-        $res = Schema::applyUpdates($this->schema(), 0);
+        $res = \FOG\Items\Schema::applyUpdates($this->schema(), 0);
         return $res['error'] === null;
     }
     /**
@@ -937,16 +937,16 @@ public function uninstall()
         // -- uType is a shared column anyone can write, including over the
         // API and CSV import.
         $find = ['authsource' => LDAPPluginHook::AUTH_SOURCE];
-        $userIDs = Route::getIds(
+        $userIDs = \FOG\Router\Route::getIds(
             'user',
             $find
         );
-        Route::deletemass(
+        \FOG\Router\Route::deletemass(
             'setting',
             ['category' => 'Plugin: LDAP']
         );
         if (count($userIDs ?: [])) {
-            Route::deletemass(
+            \FOG\Router\Route::deletemass(
                 'user',
                 ['id' => $userIDs]
             );
diff --git a/ldap/class/ldapusergrant.class.php b/ldap/class/ldapusergrant.class.php
index f06fad17..fca783cf 100644
--- a/ldap/class/ldapusergrant.class.php
+++ b/ldap/class/ldapusergrant.class.php
@@ -37,7 +37,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class LDAPUserGrant extends FOGController
+class LDAPUserGrant extends \FOG\Base\FOGController
 {
     /**
      * Target kinds, matching the association tables they mirror.
diff --git a/ldap/class/ldapusergrantmanager.class.php b/ldap/class/ldapusergrantmanager.class.php
index 81fc942e..fc66fecf 100644
--- a/ldap/class/ldapusergrantmanager.class.php
+++ b/ldap/class/ldapusergrantmanager.class.php
@@ -21,7 +21,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class LDAPUserGrantManager extends FOGManagerController
+class LDAPUserGrantManager extends \FOG\Base\FOGManagerController
 {
     /**
      * The base table name.
diff --git a/ldap/hooks/addldapapi.hook.php b/ldap/hooks/addldapapi.hook.php
index 27b711ff..c0deacbb 100644
--- a/ldap/hooks/addldapapi.hook.php
+++ b/ldap/hooks/addldapapi.hook.php
@@ -19,7 +19,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class AddLDAPAPI extends Hook
+class AddLDAPAPI extends \FOG\Base\Hook
 {
     /**
      * Add LDAP API
diff --git a/ldap/hooks/addldapgrouptabs.hook.php b/ldap/hooks/addldapgrouptabs.hook.php
index 2343e7e0..2b167c9b 100644
--- a/ldap/hooks/addldapgrouptabs.hook.php
+++ b/ldap/hooks/addldapgrouptabs.hook.php
@@ -37,7 +37,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class AddLDAPGroupTabs extends Hook
+class AddLDAPGroupTabs extends \FOG\Base\Hook
 {
     /**
      * The name of this hook.
@@ -118,7 +118,7 @@ public function injectTabData($arguments)
         // Without this, role.edit alone would be enough to rewrite what a
         // directory group grants -- a right the LDAP Group page itself
         // does not hand out.
-        if (!Authorization::can('ldapgroup.view')) {
+        if (!\FOG\Auth\Authorization::can('ldapgroup.view')) {
             return;
         }
         $obj = $arguments['obj'];
@@ -154,15 +154,15 @@ public function renderTab($obj, $node)
         $isRole = ('role' === $node);
 
         $props = ' method="post" action="'
-            . FOGPage::makeTabUpdateURL($slug, $obj->get('id'))
+            . \FOG\Base\FOGPage::makeTabUpdateURL($slug, $obj->get('id'))
             . '" ';
-        $buttons = FOGPage::makeButton(
+        $buttons = \FOG\Base\FOGPage::makeButton(
             "$slug-send",
             _('Add selected'),
             'btn btn-primary float-end',
             $props
         );
-        $buttons .= FOGPage::makeButton(
+        $buttons .= \FOG\Base\FOGPage::makeButton(
             "$slug-remove",
             _('Remove selected'),
             'btn btn-danger float-start',
@@ -172,7 +172,7 @@ public function renderTab($obj, $node)
         // A directory group that has not been registered here yet is the
         // normal case when wiring up a new role, and sending the admin to
         // the LDAP Group page and back is the trip this removes.
-        $createModal = FOGPage::renderAssocCreate(
+        $createModal = \FOG\Base\FOGPage::renderAssocCreate(
             $slug,
             'ldapgroup',
             $buttons,
@@ -223,20 +223,20 @@ public function renderTab($obj, $node)
         echo '</div>';
         echo '</div>';
         echo '<div class="card-footer">';
-        echo FOGPage::makeModal(
+        echo \FOG\Base\FOGPage::makeModal(
             'ldapgroupDelModal',
             _('Remove LDAP Group Associations'),
             _(
                 'Please confirm you would like to dissociate the selected '
                 . 'directory groups'
             ),
-            FOGPage::makeButton(
+            \FOG\Base\FOGPage::makeButton(
                 'closeldapgroupDeleteModal',
                 _('Cancel'),
                 'btn btn-outline-secondary float-start',
                 'data-bs-dismiss="modal"'
             )
-            . FOGPage::makeButton(
+            . \FOG\Base\FOGPage::makeButton(
                 'confirmldapgroupDeleteModal',
                 _('Remove'),
                 'btn btn-outline-secondary float-end'
@@ -277,8 +277,8 @@ public function editSuccess($arguments)
         // Same reasoning as the render gate: this writes an ldapgroup
         // association, so it takes ldapgroup.edit rather than riding in on
         // the role/usergroup edit permission that reached this POST.
-        if (!Authorization::can('ldapgroup.edit')) {
-            $arguments['code'] = HTTPResponseCodes::HTTP_FORBIDDEN;
+        if (!\FOG\Auth\Authorization::can('ldapgroup.edit')) {
+            $arguments['code'] = \FOG\Router\HTTPResponseCodes::HTTP_FORBIDDEN;
             $arguments['msg'] = json_encode(
                 [
                     'error' => _(
@@ -331,7 +331,7 @@ public function editSuccess($arguments)
             $group->save();
         }
         // A change here changes who has what, and the answer is cached.
-        Authorization::resetCache();
+        \FOG\Auth\Authorization::resetCache();
 
         $arguments['msg'] = json_encode(
             [
diff --git a/ldap/hooks/addldapjs.hook.php b/ldap/hooks/addldapjs.hook.php
index d915e873..0c25aecc 100644
--- a/ldap/hooks/addldapjs.hook.php
+++ b/ldap/hooks/addldapjs.hook.php
@@ -19,7 +19,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class AddLDAPJS extends Hook
+class AddLDAPJS extends \FOG\Base\Hook
 {
     /**
      * The name of this hook.
diff --git a/ldap/hooks/addldapmenuitem.hook.php b/ldap/hooks/addldapmenuitem.hook.php
index 21abef5d..4fbefa97 100644
--- a/ldap/hooks/addldapmenuitem.hook.php
+++ b/ldap/hooks/addldapmenuitem.hook.php
@@ -23,7 +23,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class AddLDAPMenuItem extends Hook
+class AddLDAPMenuItem extends \FOG\Base\Hook
 {
     /**
      * The second node this plugin owns: the directory groups whose
diff --git a/ldap/hooks/addldaptype.hook.php b/ldap/hooks/addldaptype.hook.php
index 27a02bfe..057cf2d8 100644
--- a/ldap/hooks/addldaptype.hook.php
+++ b/ldap/hooks/addldaptype.hook.php
@@ -19,7 +19,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class AddLDAPType extends Hook
+class AddLDAPType extends \FOG\Base\Hook
 {
     /**
      * The name of this hook.
diff --git a/ldap/hooks/ldapdeletemassitems.hook.php b/ldap/hooks/ldapdeletemassitems.hook.php
index 633bc0f3..8b23925a 100644
--- a/ldap/hooks/ldapdeletemassitems.hook.php
+++ b/ldap/hooks/ldapdeletemassitems.hook.php
@@ -19,7 +19,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class LDAPDeleteMassItems extends Hook
+class LDAPDeleteMassItems extends \FOG\Base\Hook
 {
     /**
      * The name of this hook.
diff --git a/ldap/hooks/ldappluginhook.hook.php b/ldap/hooks/ldappluginhook.hook.php
index c12898c1..b1fd511a 100644
--- a/ldap/hooks/ldappluginhook.hook.php
+++ b/ldap/hooks/ldappluginhook.hook.php
@@ -23,7 +23,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class LDAPPluginHook extends Hook
+class LDAPPluginHook extends \FOG\Base\Hook
 {
     /**
      * Legacy uType sentinels. No longer written -- retained only to read
@@ -160,7 +160,7 @@ public function checkAddUser($arguments)
         /**
          * Create our new user (initially at least)
          */
-        $items = Route::getList('ldap');
+        $items = \FOG\Router\Route::getList('ldap');
         /**
          * Authenticate against every configured LDAP server and union what
          * each one grants. Every server is asked, because a user can be
@@ -217,7 +217,7 @@ public function checkAddUser($arguments)
             $groupIds = array_merge($groupIds, $targets['usergroups']);
         }
         if (!$authenticated) {
-            $arguments['user'] = new User(-1);
+            $arguments['user'] = new \FOG\Items\User(-1);
             return;
         }
         // Rows this plugin created before it stopped storing directory
diff --git a/ldap/pages/ldapgroupmanagement.page.php b/ldap/pages/ldapgroupmanagement.page.php
index 332b91bb..ade5d165 100644
--- a/ldap/pages/ldapgroupmanagement.page.php
+++ b/ldap/pages/ldapgroupmanagement.page.php
@@ -28,7 +28,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class LDAPGroupManagement extends FOGPage
+class LDAPGroupManagement extends \FOG\Base\FOGPage
 {
     /**
      * The node this page works on.
@@ -61,8 +61,8 @@ public function __construct($name = '')
      */
     private static function _serverChoices()
     {
-        $ids = (array)Route::getIds('ldap', [], 'id');
-        $names = (array)Route::getIds('ldap', [], 'name');
+        $ids = (array)\FOG\Router\Route::getIds('ldap', [], 'id');
+        $names = (array)\FOG\Router\Route::getIds('ldap', [], 'name');
         if (count($ids) !== count($names)) {
             return [];
         }
@@ -455,7 +455,7 @@ function (&$serverFault) {
                     $serverFault = true;
                     throw new \Exception(_('LDAP Group update failed!'));
                 }
-                Authorization::resetCache();
+                \FOG\Auth\Authorization::resetCache();
             }
         );
     }
diff --git a/ldap/pages/ldapmanagement.page.php b/ldap/pages/ldapmanagement.page.php
index 49e23a13..485b0a5c 100644
--- a/ldap/pages/ldapmanagement.page.php
+++ b/ldap/pages/ldapmanagement.page.php
@@ -25,7 +25,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class LDAPManagement extends FOGPage
+class LDAPManagement extends \FOG\Base\FOGPage
 {
     /**
      * The node that uses this page
@@ -1199,7 +1199,7 @@ public function ldapGeneral()
         $buttons .= sprintf(
             '<a class="btn btn-secondary float-end" '
             . 'href="?node=ldapgroup&sub=add">%s</a>',
-            Initiator::e(_('Create New LDAP Group'))
+            \Initiator::e(_('Create New LDAP Group'))
         );
         $buttons .= self::makeButton(
             'general-delete',
@@ -1415,8 +1415,8 @@ public function globalsettings()
         // Route::names() would emit a JSON content-type header into what is
         // an HTML fragment, so build the id => name map from ids(). Both
         // calls order by name, so the two lists line up.
-        $roleIds = Route::getIds('role', [], 'id');
-        $roleNames = Route::getIds('role', [], 'name');
+        $roleIds = \FOG\Router\Route::getIds('role', [], 'id');
+        $roleNames = \FOG\Router\Route::getIds('role', [], 'name');
         $roles = (
             count($roleIds) === count($roleNames) ?
             array_combine($roleIds, $roleNames) :
@@ -1620,7 +1620,7 @@ public function globalsettingsPost()
             // role would otherwise fail silently at login.
             $validRoles = array_map(
                 'strval',
-                (array)Route::getIds('role', [], 'id')
+                (array)\FOG\Router\Route::getIds('role', [], 'id')
             );
             foreach ($roleFields as $field => $settingKey) {
                 $roleId = trim((string)filter_input(INPUT_POST, $field));
@@ -1635,7 +1635,7 @@ public function globalsettingsPost()
                 }
             }
             $hook = 'LDAP_GLOBAL_EDIT_SUCCESS';
-            $code = HTTPResponseCodes::HTTP_ACCEPTED;
+            $code = \FOG\Router\HTTPResponseCodes::HTTP_ACCEPTED;
             $msg = json_encode(
                 [
                     'msg' => _('Global settings updated!'),
@@ -1646,8 +1646,8 @@ public function globalsettingsPost()
             $hook = 'LDAP_GLOBAL_EDIT_FAIL';
             $code = (
                 $serverFault ?
-                HTTPResponseCodes::HTTP_INTERNAL_SERVER_ERROR :
-                HTTPResponseCodes::HTTP_BAD_REQUEST
+                \FOG\Router\HTTPResponseCodes::HTTP_INTERNAL_SERVER_ERROR :
+                \FOG\Router\HTTPResponseCodes::HTTP_BAD_REQUEST
             );
             $msg = json_encode(
                 [
@@ -1708,7 +1708,7 @@ public function ldapGrants()
          */
         if (!$this->obj->get('useGroupMatch')) {
             echo '<div class="alert alert-warning">';
-            echo Initiator::e(
+            echo \Initiator::e(
                 _(
                     'Group Matching is off for this server, so directory '
                     . 'groups cannot be read and these mappings are not '
@@ -1757,20 +1757,20 @@ private function _grantCard($tableId, $title, $grantHeader)
     {
         echo '<div class="card card-primary card-outline">';
         echo '<div class="card-header">';
-        echo '<h4 class="card-title">' . Initiator::e($title) . '</h4>';
+        echo '<h4 class="card-title">' . \Initiator::e($title) . '</h4>';
         echo '</div>';
         echo '<div class="card-body">';
         printf(
             '<table id="%s" class="display table table-bordered '
             . 'table-striped">',
-            Initiator::e($tableId)
+            \Initiator::e($tableId)
         );
         echo '<thead><tr class="header">';
         echo '<th data-column="0" scope="col">'
-            . Initiator::e(_('Directory Group'))
+            . \Initiator::e(_('Directory Group'))
             . '</th>';
         echo '<th data-column="1" scope="col">'
-            . Initiator::e($grantHeader)
+            . \Initiator::e($grantHeader)
             . '</th>';
         echo '</tr></thead><tbody></tbody></table>';
         echo '</div>';
@@ -1911,7 +1911,7 @@ private function _grantList($kind)
                     if (null === $d) {
                         return sprintf(
                             '%s - (%d)',
-                            Initiator::e(_('Unknown')),
+                            \Initiator::e(_('Unknown')),
                             (int)$row[$map['targetKey']]
                         );
                     }
@@ -1937,8 +1937,8 @@ private function _grantList($kind)
             ],
         ];
 
-        $this->jsonSend(HTTPResponseCodes::HTTP_SUCCESS, json_encode(
-            FOGManagerController::complex(
+        $this->jsonSend(\FOG\Router\HTTPResponseCodes::HTTP_SUCCESS, json_encode(
+            \FOG\Base\FOGManagerController::complex(
                 $pass_vars,
                 $map['assoc'],
                 $map['assocId'],
diff --git a/ldap/reports/ldap_report.report.php b/ldap/reports/ldap_report.report.php
index 95bc40b9..1846ab35 100644
--- a/ldap/reports/ldap_report.report.php
+++ b/ldap/reports/ldap_report.report.php
@@ -19,7 +19,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class LDAP_Report extends ReportManagement
+class LDAP_Report extends \FOG\ReportManagement
 {
     /**
      * The page to display.
@@ -105,9 +105,9 @@ public function file()
     public function getList()
     {
         header('Content-type: application/json');
-        Route::listem('ldap');
-        http_response_code(HTTPResponseCodes::HTTP_SUCCESS);
-        echo Route::getData();
+        \FOG\Router\Route::listem('ldap');
+        http_response_code(\FOG\Router\HTTPResponseCodes::HTTP_SUCCESS);
+        echo \FOG\Router\Route::getData();
         exit;
     }
 }
diff --git a/location/class/location.class.php b/location/class/location.class.php
index a429bbe2..4cc84fdb 100644
--- a/location/class/location.class.php
+++ b/location/class/location.class.php
@@ -21,7 +21,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class Location extends FOGController
+class Location extends \FOG\Base\FOGController
 {
     /**
      * The location table
@@ -110,7 +110,7 @@ class Location extends FOGController
      */
     public function destroy($key = 'id')
     {
-        Route::deletemass(
+        \FOG\Router\Route::deletemass(
             'locationassociation',
             ['locationID' => $this->get('id')]
         );
diff --git a/location/class/locationassociation.class.php b/location/class/locationassociation.class.php
index 600a3f12..aeb26de5 100644
--- a/location/class/locationassociation.class.php
+++ b/location/class/locationassociation.class.php
@@ -19,7 +19,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class LocationAssociation extends FOGController
+class LocationAssociation extends \FOG\Base\FOGController
 {
     /**
      * The association table.
diff --git a/location/class/locationassociationmanager.class.php b/location/class/locationassociationmanager.class.php
index 1271f268..20a77659 100644
--- a/location/class/locationassociationmanager.class.php
+++ b/location/class/locationassociationmanager.class.php
@@ -21,7 +21,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class LocationAssociationManager extends FOGManagerController
+class LocationAssociationManager extends \FOG\Base\FOGManagerController
 {
     /**
      * The base table name.
diff --git a/location/class/locationmanager.class.php b/location/class/locationmanager.class.php
index d5d4e92d..dec6fa44 100644
--- a/location/class/locationmanager.class.php
+++ b/location/class/locationmanager.class.php
@@ -19,7 +19,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class LocationManager extends FOGManagerController
+class LocationManager extends \FOG\Base\FOGManagerController
 {
     /**
      * The base table name.
@@ -153,7 +153,7 @@ public function schema()
             // truthy, silently, on every upgrading server. The helper goes
             // through VARCHAR(1) so the conversion is by label.
             function () {
-                return Schema::enumToTinyint(
+                return \FOG\Items\Schema::enumToTinyint(
                     [
                         $this->tablename => ['lTftpEnabled'],
                     ]
@@ -169,7 +169,7 @@ function () {
      */
     public function install()
     {
-        $res = Schema::applyUpdates($this->schema(), 0);
+        $res = \FOG\Items\Schema::applyUpdates($this->schema(), 0);
         return $res['error'] === null;
     }
     /**
@@ -180,7 +180,7 @@ public function install()
     public function uninstall()
     {
         $res = true;
-        Route::deletemass(
+        \FOG\Router\Route::deletemass(
             'setting',
             ['name' => 'FOG_SNAPIN_LOCATION_SEND_ENABLED']
         );
@@ -199,9 +199,9 @@ public static function buildProtocolSelectBox($preselection)
         foreach ($protocols as $short => $long) {
             printf(
                 '<option value="%s"%s>%s</option>',
-                Initiator::e($short),
+                \Initiator::e($short),
                 ($preselection === $short ? ' selected' : ''),
-                Initiator::e($long)
+                \Initiator::e($long)
             );
         }
         return '<select class="form-control" name="storagenodeprotocol" '
diff --git a/location/hooks/addlocationapi.hook.php b/location/hooks/addlocationapi.hook.php
index 42d254cb..9cb66d8c 100644
--- a/location/hooks/addlocationapi.hook.php
+++ b/location/hooks/addlocationapi.hook.php
@@ -19,7 +19,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class AddLocationAPI extends Hook
+class AddLocationAPI extends \FOG\Base\Hook
 {
     /**
      * The name of the hook.
@@ -108,14 +108,14 @@ public function adjustGetter($arguments)
     {
         switch ($arguments['classname']) {
             case 'location':
-                $arguments['data'] = FOGCore::fastmerge(
+                $arguments['data'] = \FOG\Base\FOGCore::fastmerge(
                     $arguments['class']->get(),
                     [
-                        'storagenode' => Route::getter(
+                        'storagenode' => \FOG\Router\Route::getter(
                             'storagenode',
                             $arguments['class']->get('storagenode')
                         ),
-                        'storagegroup' => Route::getter(
+                        'storagegroup' => \FOG\Router\Route::getter(
                             'storagegroup',
                             $arguments['class']->get('storagegroup')
                         )
@@ -123,10 +123,10 @@ public function adjustGetter($arguments)
                 );
                 break;
             case 'locationassociation':
-                $arguments['data'] = FOGCore::fastmerge(
+                $arguments['data'] = \FOG\Base\FOGCore::fastmerge(
                     $arguments['class']->get(),
                     [
-                        'host' => Route::getter(
+                        'host' => \FOG\Router\Route::getter(
                             'host',
                             $arguments['class']->get('host')
                         ),
@@ -156,7 +156,7 @@ public function addPluginItems($arguments)
                 if ($hostID < 1) {
                     break;
                 }
-                $locIDs = Route::getIds(
+                $locIDs = \FOG\Router\Route::getIds(
                     'locationassociation',
                     ['hostID' => $hostID],
                     'locationID'
@@ -165,12 +165,12 @@ public function addPluginItems($arguments)
                 if ($locID < 1) {
                     break;
                 }
-                $location = Route::getClass('location', $locID);
+                $location = \FOG\Router\Route::getClass('location', $locID);
                 if (!$location->isValid()) {
                     break;
                 }
-                if (Route::wantsExpand('location')) {
-                    $arguments['pluginItems']['location'] = Route::getter(
+                if (\FOG\Router\Route::wantsExpand('location')) {
+                    $arguments['pluginItems']['location'] = \FOG\Router\Route::getter(
                         'location',
                         $location
                     );
@@ -188,31 +188,31 @@ public function addPluginItems($arguments)
                 if ($locID < 1) {
                     break;
                 }
-                $hostIDs = Route::positiveIntIds(
-                    (array)Route::getIds(
+                $hostIDs = \FOG\Router\Route::positiveIntIds(
+                    (array)\FOG\Router\Route::getIds(
                         'locationassociation',
                         ['locationID' => $locID],
                         'hostID'
                     )
                 );
                 $arguments['pluginItems']['hostCount'] = count($hostIDs);
-                if (!Route::wantsExpand('hosts')) {
+                if (!\FOG\Router\Route::wantsExpand('hosts')) {
                     break;
                 }
                 $truncated = false;
-                if (count($hostIDs) > Route::EXPAND_MAX_ITEMS) {
-                    $hostIDs = array_slice($hostIDs, 0, Route::EXPAND_MAX_ITEMS);
+                if (count($hostIDs) > \FOG\Router\Route::EXPAND_MAX_ITEMS) {
+                    $hostIDs = array_slice($hostIDs, 0, \FOG\Router\Route::EXPAND_MAX_ITEMS);
                     $truncated = true;
                 }
                 $hosts = [];
                 foreach ($hostIDs as $hid) {
-                    $host = Route::getClass('host', $hid);
+                    $host = \FOG\Router\Route::getClass('host', $hid);
                     if (!$host->isValid()) {
                         continue;
                     }
-                    $g = Route::getter('host', $host);
+                    $g = \FOG\Router\Route::getter('host', $host);
                     if (is_array($g)) {
-                        $hosts[] = Route::stripSensitive('host', $g);
+                        $hosts[] = \FOG\Router\Route::stripSensitive('host', $g);
                     }
                 }
                 $arguments['pluginItems']['hosts'] = $hosts;
diff --git a/location/hooks/addlocationgroup.hook.php b/location/hooks/addlocationgroup.hook.php
index d7f0fc79..c82b438f 100644
--- a/location/hooks/addlocationgroup.hook.php
+++ b/location/hooks/addlocationgroup.hook.php
@@ -21,7 +21,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class AddLocationGroup extends Hook
+class AddLocationGroup extends \FOG\Base\Hook
 {
     /**
      * The name of this hook.
@@ -99,14 +99,14 @@ public function groupLocation($obj)
             ->buildSelectBox($locationID, 'location');
 
         $fields = [
-            FOGPage::makeLabel(
+            \FOG\Base\FOGPage::makeLabel(
                 'col-sm-3 col-form-label',
                 'location',
                 _('Group Location')
             ) => $locationSelector
         ];
 
-        $buttons = FOGPage::makeButton(
+        $buttons = \FOG\Base\FOGPage::makeButton(
             'location-send',
             _('Update'),
             'btn btn-primary float-end'
@@ -116,7 +116,7 @@ public function groupLocation($obj)
         // it, and immediately after Update so Update stays the row's rightmost
         // (primary) button with this one to its left. The modal it returns is
         // echoed after the form -- see below for why it cannot go inside.
-        $createModal = FOGPage::renderAssocCreate(
+        $createModal = \FOG\Base\FOGPage::renderAssocCreate(
             'group-location',
             'location',
             $buttons,
@@ -131,13 +131,13 @@ public function groupLocation($obj)
                 'Group' => &$obj
             ]
         );
-        $rendered = FOGPage::formFields($fields);
+        $rendered = \FOG\Base\FOGPage::formFields($fields);
         unset($fields);
 
-        echo FOGPage::makeFormTag(
+        echo \FOG\Base\FOGPage::makeFormTag(
             '',
             'group-location-form',
-            FOGPage::makeTabUpdateURL(
+            \FOG\Base\FOGPage::makeTabUpdateURL(
                 'group-location',
                 $obj->get('id')
             ),
@@ -179,13 +179,13 @@ public function groupLocationPost($obj)
         );
         $insert_fields = ['hostID', 'locationID'];
         $insert_values = [];
-        $hosts = Route::getIds(
+        $hosts = \FOG\Router\Route::getIds(
             'groupassociation',
             ['groupID' => $obj->get('id')],
             'hostID'
         );
         if (count($hosts ?: [])) {
-            Route::deletemass(
+            \FOG\Router\Route::deletemass(
                 'locationassociation',
                 ['hostID' => $hosts]
             );
@@ -228,7 +228,7 @@ public function groupAddLocationEdit($arguments)
                 default:
                     return;
             }
-            $arguments['code'] = HTTPResponseCodes::HTTP_ACCEPTED;
+            $arguments['code'] = \FOG\Router\HTTPResponseCodes::HTTP_ACCEPTED;
             $arguments['hook'] = 'GROUP_EDIT_LOCATION_SUCCESS';
             $arguments['msg'] = json_encode(
                 [
@@ -239,8 +239,8 @@ public function groupAddLocationEdit($arguments)
         } catch (\Exception $e) {
             $arguments['code'] = (
                 $arguments['serverFault'] ?
-                HTTPResponseCodes::HTTP_INTERNAL_SERVER_ERROR :
-                HTTPResponseCodes::HTTP_BAD_REQUEST
+                \FOG\Router\HTTPResponseCodes::HTTP_INTERNAL_SERVER_ERROR :
+                \FOG\Router\HTTPResponseCodes::HTTP_BAD_REQUEST
             );
             $arguments['hook'] = 'GROUP_EDIT_LOCATION_FAIL';
             $arguments['msg'] = json_encode(
@@ -269,7 +269,7 @@ public function groupAddLocationField($arguments)
             ->buildSelectBox($locationID, 'location');
 
         $arguments['fields'][
-            FOGPage::makeLabel(
+            \FOG\Base\FOGPage::makeLabel(
                 'col-sm-3 col-form-label',
                 'location',
                 _('Group Location')
diff --git a/location/hooks/addlocationhost.hook.php b/location/hooks/addlocationhost.hook.php
index 5f268399..de352cf8 100644
--- a/location/hooks/addlocationhost.hook.php
+++ b/location/hooks/addlocationhost.hook.php
@@ -21,7 +21,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class AddLocationHost extends Hook
+class AddLocationHost extends \FOG\Base\Hook
 {
     /**
      * The name of this hook.
@@ -94,7 +94,7 @@ public function hostTabData($arguments)
      */
     public function hostLocation($obj)
     {
-        $items = Route::getList('locationassociation');
+        $items = \FOG\Router\Route::getList('locationassociation');
         $location = 0;
         foreach ($items as &$item) {
             if ($item->hostID == $obj->get('id')) {
@@ -112,14 +112,14 @@ public function hostLocation($obj)
             ->buildSelectBox($locationID, 'location');
 
         $fields = [
-            FOGPage::makeLabel(
+            \FOG\Base\FOGPage::makeLabel(
                 'col-sm-3 col-form-label',
                 'location',
                 _('Host Location')
             ) => $locationSelector
         ];
 
-        $buttons = FOGPage::makeButton(
+        $buttons = \FOG\Base\FOGPage::makeButton(
             'location-send',
             _('Update'),
             'btn btn-primary float-end'
@@ -129,7 +129,7 @@ public function hostLocation($obj)
         // it, and immediately after Update so Update stays the row's rightmost
         // (primary) button with this one to its left. The modal it returns is
         // echoed after the form -- see below for why it cannot go inside.
-        $createModal = FOGPage::renderAssocCreate(
+        $createModal = \FOG\Base\FOGPage::renderAssocCreate(
             'host-location',
             'location',
             $buttons,
@@ -144,13 +144,13 @@ public function hostLocation($obj)
                 'Host' => &$obj
             ]
         );
-        $rendered = FOGPage::formFields($fields);
+        $rendered = \FOG\Base\FOGPage::formFields($fields);
         unset($fields);
 
-        echo FOGPage::makeFormTag(
+        echo \FOG\Base\FOGPage::makeFormTag(
             '',
             'host-location-form',
-            FOGPage::makeTabUpdateURL(
+            \FOG\Base\FOGPage::makeTabUpdateURL(
                 'host-location',
                 $obj->get('id')
             ),
@@ -194,7 +194,7 @@ public function hostLocationPost($obj)
         $insert_values = [];
         $hosts = [$obj->get('id')];
         if (count($hosts ?: [])) {
-            Route::deletemass(
+            \FOG\Router\Route::deletemass(
                 'locationassociation',
                 ['hostID' => $hosts]
             );
@@ -263,7 +263,7 @@ public function hostAddLocationEdit($arguments)
                 default:
                     return;
             }
-            $arguments['code'] = HTTPResponseCodes::HTTP_ACCEPTED;
+            $arguments['code'] = \FOG\Router\HTTPResponseCodes::HTTP_ACCEPTED;
             $arguments['hook'] = 'HOST_EDIT_LOCATION_SUCCESS';
             $arguments['msg'] = json_encode(
                 [
@@ -274,8 +274,8 @@ public function hostAddLocationEdit($arguments)
         } catch (\Exception $e) {
             $arguments['code'] = (
                 $arguments['serverFault'] ?
-                HTTPResponseCodes::HTTP_INTERNAL_SERVER_ERROR :
-                HTTPResponseCodes::HTTP_BAD_REQUEST
+                \FOG\Router\HTTPResponseCodes::HTTP_INTERNAL_SERVER_ERROR :
+                \FOG\Router\HTTPResponseCodes::HTTP_BAD_REQUEST
             );
             $arguments['hook'] = 'HOST_EDIT_LOCATION_FAIL';
             $arguments['msg'] = json_encode(
@@ -304,7 +304,7 @@ public function hostAddLocationField($arguments)
             ->buildSelectBox($locationID, 'location');
 
         $arguments['fields'][
-            FOGPage::makeLabel(
+            \FOG\Base\FOGPage::makeLabel(
                 'col-sm-3 col-form-label',
                 'location',
                 _('Host Location')
diff --git a/location/hooks/addlocationimport.hook.php b/location/hooks/addlocationimport.hook.php
index 0d91c0af..2c9ab6ce 100644
--- a/location/hooks/addlocationimport.hook.php
+++ b/location/hooks/addlocationimport.hook.php
@@ -24,7 +24,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class AddLocationImport extends Hook
+class AddLocationImport extends \FOG\Base\Hook
 {
     /**
      * The name of this hook.
@@ -83,7 +83,7 @@ public function primeLocationAssociations($arguments)
         if (count($ids) < 1) {
             return;
         }
-        $locations = Route::getList('Location');
+        $locations = \FOG\Router\Route::getList('Location');
         $locationNames = [];
         foreach ($locations as $l) {
             if (isset($l->id)) {
@@ -91,7 +91,7 @@ public function primeLocationAssociations($arguments)
                     ? (string)$l->name : '';
             }
         }
-        $rows = Route::getList('LocationAssociation', ['hostID' => $ids]);
+        $rows = \FOG\Router\Route::getList('LocationAssociation', ['hostID' => $ids]);
         $byHost = [];
         foreach ($rows as $r) {
             $hid = isset($r->hostID) ? (string)$r->hostID : '';
@@ -103,7 +103,7 @@ public function primeLocationAssociations($arguments)
                 $byHost[$hid][] = $locationNames[$lid];
             }
         }
-        FOGPage::primeAssociationLabel('Host', 'location', $byHost);
+        \FOG\Base\FOGPage::primeAssociationLabel('Host', 'location', $byHost);
     }
     /**
      * Registers the "location" association type for hosts. The same entry
@@ -135,7 +135,7 @@ public function addLocationAssociation($arguments)
      */
     public function getLocationNames($host)
     {
-        $locationIDs = Route::getIds(
+        $locationIDs = \FOG\Router\Route::getIds(
             'locationassociation',
             ['hostID' => $host->get('id')],
             'locationID'
@@ -165,7 +165,7 @@ public function applyLocation($host, $ids)
         if (empty($hostID) || count($ids) < 1) {
             return;
         }
-        Route::deletemass(
+        \FOG\Router\Route::deletemass(
             'locationassociation',
             ['hostID' => $hostID]
         );
diff --git a/location/hooks/addlocationjs.hook.php b/location/hooks/addlocationjs.hook.php
index 1896efb4..c5d536ea 100644
--- a/location/hooks/addlocationjs.hook.php
+++ b/location/hooks/addlocationjs.hook.php
@@ -21,7 +21,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class AddLocationJS extends Hook
+class AddLocationJS extends \FOG\Base\Hook
 {
     /**
      * The name of this hook.
diff --git a/location/hooks/addlocationmenuitem.hook.php b/location/hooks/addlocationmenuitem.hook.php
index 09bddfac..65f6fc37 100644
--- a/location/hooks/addlocationmenuitem.hook.php
+++ b/location/hooks/addlocationmenuitem.hook.php
@@ -21,7 +21,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class AddLocationMenuItem extends Hook
+class AddLocationMenuItem extends \FOG\Base\Hook
 {
     /**
      * The name of this hook.
diff --git a/location/hooks/addlocationtype.hook.php b/location/hooks/addlocationtype.hook.php
index 7b1ea6dc..3fd1bbeb 100644
--- a/location/hooks/addlocationtype.hook.php
+++ b/location/hooks/addlocationtype.hook.php
@@ -21,7 +21,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class AddLocationType extends Hook
+class AddLocationType extends \FOG\Base\Hook
 {
     /**
      * The name of this hook.
diff --git a/location/hooks/addserviceconfiguration.hook.php b/location/hooks/addserviceconfiguration.hook.php
index 4c2072ff..2ba2e5bf 100644
--- a/location/hooks/addserviceconfiguration.hook.php
+++ b/location/hooks/addserviceconfiguration.hook.php
@@ -21,7 +21,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class AddServiceConfiguration extends Hook
+class AddServiceConfiguration extends \FOG\Base\Hook
 {
     /**
      * The name of this hook.
@@ -87,12 +87,12 @@ public function addServiceCheckbox($arguments)
         $labelClass = 'col-sm-3 col-form-label';
 
         $arguments['fields'][
-            FOGPage::makeLabel(
+            \FOG\Base\FOGPage::makeLabel(
                 $labelClass,
                 'snapinsend',
                 _('Enable Sending via Location')
             )
-        ] = FOGPage::makeInput(
+        ] = \FOG\Base\FOGPage::makeInput(
             '',
             'snapinsend',
             '',
diff --git a/location/hooks/locationchangeitems.hook.php b/location/hooks/locationchangeitems.hook.php
index 14726457..bbb537f1 100644
--- a/location/hooks/locationchangeitems.hook.php
+++ b/location/hooks/locationchangeitems.hook.php
@@ -32,7 +32,7 @@
  * plugin, so an uninstalled location plugin winning the walk left the OU
  * plugin's AD hook unregistered with nothing to show for it.
  */
-class LocationChangeItems extends Hook
+class LocationChangeItems extends \FOG\Base\Hook
 {
     /**
      * The name of this hook.
@@ -91,7 +91,7 @@ public function storageNodeSetting($arguments)
         if (!$arguments['Host']->isValid()) {
             return;
         }
-        $LocationAssocs = Route::getList(
+        $LocationAssocs = \FOG\Router\Route::getList(
             'locationassociation',
             ['hostID' => $arguments['Host']->get('id')]
         );
@@ -107,7 +107,7 @@ public function storageNodeSetting($arguments)
                 && ($Task->isCapture() || $Task->isMulticast())
             ) {
                 $method = 'getMasterStorageNode';
-            } elseif ($TaskType instanceof TaskType
+            } elseif ($TaskType instanceof \FOG\Items\TaskType
                 && $TaskType->isValid()
                 && ($TaskType->isCapture() || $TaskType->isMulticast())
             ) {
@@ -151,7 +151,7 @@ public function storageGroupSetting($arguments)
         if (!$arguments['Host']->isValid()) {
             return;
         }
-        $LocationAssocs = Route::getList(
+        $LocationAssocs = \FOG\Router\Route::getList(
             'locationassociation',
             ['hostID' => $arguments['Host']->get('id')]
         );
@@ -183,7 +183,7 @@ public function bootItemSettings($arguments)
         if (!$arguments['Host']->isValid()) {
             return;
         }
-        $LocationAssocs = Route::getList(
+        $LocationAssocs = \FOG\Router\Route::getList(
             'locationassociation',
             ['hostID' => $arguments['Host']->get('id')]
         );
@@ -227,10 +227,10 @@ public function bootItemSettings($arguments)
      */
     public function alterMasters($arguments)
     {
-        if (!$arguments['FOGServiceClass'] instanceof MulticastManager) {
+        if (!$arguments['FOGServiceClass'] instanceof \FOG\Service\MulticastManager) {
             return;
         }
-        $storagenodes = Route::getIds(
+        $storagenodes = \FOG\Router\Route::getIds(
             'location',
             [],
             'storagenodeID'
@@ -243,7 +243,7 @@ public function alterMasters($arguments)
                 )
             )
         );
-        $StorageNodes = Route::getList(
+        $StorageNodes = \FOG\Router\Route::getList(
             'storagenode',
             ['id' => $storagenodeIDs]
         );
@@ -251,7 +251,7 @@ public function alterMasters($arguments)
         foreach ($StorageNodes as $ind => $StorageNode) {
             // getItem(), not indiv(): a node deleted between the list and the
             // fetch used to end the response here rather than be skipped.
-            $StorageNode = Route::getItem('storagenode', $StorageNode->id);
+            $StorageNode = \FOG\Router\Route::getItem('storagenode', $StorageNode->id);
             if (!$StorageNode || !$StorageNode->online) {
                 continue;
             }
diff --git a/location/hooks/locationdeletemassitems.hook.php b/location/hooks/locationdeletemassitems.hook.php
index 4946c620..322d41b5 100644
--- a/location/hooks/locationdeletemassitems.hook.php
+++ b/location/hooks/locationdeletemassitems.hook.php
@@ -19,7 +19,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class LocationDeleteMassItems extends Hook
+class LocationDeleteMassItems extends \FOG\Base\Hook
 {
     /**
      * The name of this hook.
diff --git a/location/pages/locationmanagement.page.php b/location/pages/locationmanagement.page.php
index 28106118..0a56cf39 100644
--- a/location/pages/locationmanagement.page.php
+++ b/location/pages/locationmanagement.page.php
@@ -21,7 +21,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class LocationManagement extends FOGPage
+class LocationManagement extends \FOG\Base\FOGPage
 {
     /**
      * The node this page operates on.
@@ -546,8 +546,8 @@ public function getHostsList()
     public function getStoragenode()
     {
         $nodeID = filter_input(INPUT_POST, 'nodeID');
-        Route::indiv('storagenode', $nodeID);
-        echo Route::getData();
+        \FOG\Router\Route::indiv('storagenode', $nodeID);
+        echo \FOG\Router\Route::getData();
         exit;
     }
     /**
@@ -558,8 +558,8 @@ public function getStoragenode()
     public function getStoragegroup()
     {
         $groupID = filter_input(INPUT_POST, 'groupID');
-        Route::indiv('storagegroup', $groupID);
-        echo Route::getData();
+        \FOG\Router\Route::indiv('storagegroup', $groupID);
+        echo \FOG\Router\Route::getData();
         exit;
     }
 }
diff --git a/location/reports/location_report.report.php b/location/reports/location_report.report.php
index 483b54c5..871749cb 100644
--- a/location/reports/location_report.report.php
+++ b/location/reports/location_report.report.php
@@ -19,7 +19,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class Location_Report extends ReportManagement
+class Location_Report extends \FOG\ReportManagement
 {
     /**
      * The page to display.
@@ -71,9 +71,9 @@ public function file()
     public function getList()
     {
         header('Content-type: application/json');
-        Route::listem('location');
-        http_response_code(HTTPResponseCodes::HTTP_SUCCESS);
-        echo Route::getData();
+        \FOG\Router\Route::listem('location');
+        http_response_code(\FOG\Router\HTTPResponseCodes::HTTP_SUCCESS);
+        echo \FOG\Router\Route::getData();
         exit;
     }
 }
diff --git a/ntfy/class/ntfy.class.php b/ntfy/class/ntfy.class.php
index c75dfa6e..41b47868 100644
--- a/ntfy/class/ntfy.class.php
+++ b/ntfy/class/ntfy.class.php
@@ -21,7 +21,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class Ntfy extends FOGController
+class Ntfy extends \FOG\Base\FOGController
 {
     /**
      * The ntfy table.
diff --git a/ntfy/class/ntfyextends.class.php b/ntfy/class/ntfyextends.class.php
index 591f129b..602fbcae 100644
--- a/ntfy/class/ntfyextends.class.php
+++ b/ntfy/class/ntfyextends.class.php
@@ -25,7 +25,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-abstract class NtfyExtends extends Event
+abstract class NtfyExtends extends \FOG\Base\Event
 {
     /**
      * The name
@@ -147,7 +147,7 @@ public function __construct()
     public function onEvent($event, $data)
     {
         self::$elements = $data;
-        $Ntfys = Route::getList('ntfy');
+        $Ntfys = \FOG\Router\Route::getList('ntfy');
         // Invoke the closure stored in the static property. Calling
         // self::$eventloop($x) directly is parsed as a static method named
         // by a local variable, not as invoking the closure.
diff --git a/ntfy/class/ntfymanager.class.php b/ntfy/class/ntfymanager.class.php
index 147384fe..b3b9b038 100644
--- a/ntfy/class/ntfymanager.class.php
+++ b/ntfy/class/ntfymanager.class.php
@@ -21,7 +21,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class NtfyManager extends FOGManagerController
+class NtfyManager extends \FOG\Base\FOGManagerController
 {
     /**
      * The base table name.
@@ -100,7 +100,7 @@ public function schema()
      */
     public function install()
     {
-        $res = Schema::applyUpdates($this->schema(), 0);
+        $res = \FOG\Items\Schema::applyUpdates($this->schema(), 0);
         return $res['error'] === null;
     }
 }
diff --git a/ntfy/hooks/addntfyapi.hook.php b/ntfy/hooks/addntfyapi.hook.php
index 7fd1bba8..f30dd01b 100644
--- a/ntfy/hooks/addntfyapi.hook.php
+++ b/ntfy/hooks/addntfyapi.hook.php
@@ -21,7 +21,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class AddNtfyAPI extends Hook
+class AddNtfyAPI extends \FOG\Base\Hook
 {
     /**
      * The name of the hook.
diff --git a/ntfy/hooks/addntfyjs.hook.php b/ntfy/hooks/addntfyjs.hook.php
index 4946744e..db647d7e 100644
--- a/ntfy/hooks/addntfyjs.hook.php
+++ b/ntfy/hooks/addntfyjs.hook.php
@@ -21,7 +21,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class AddNtfyJS extends Hook
+class AddNtfyJS extends \FOG\Base\Hook
 {
     /**
      * The name of this hook.
diff --git a/ntfy/hooks/addntfymenuitem.hook.php b/ntfy/hooks/addntfymenuitem.hook.php
index 5f4d2aea..0189ff48 100644
--- a/ntfy/hooks/addntfymenuitem.hook.php
+++ b/ntfy/hooks/addntfymenuitem.hook.php
@@ -21,7 +21,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class AddNtfyMenuItem extends Hook
+class AddNtfyMenuItem extends \FOG\Base\Hook
 {
     /**
      * The name of this hook
diff --git a/ntfy/pages/ntfymanagement.page.php b/ntfy/pages/ntfymanagement.page.php
index 1ac5eae2..5f4682e6 100644
--- a/ntfy/pages/ntfymanagement.page.php
+++ b/ntfy/pages/ntfymanagement.page.php
@@ -21,7 +21,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class NtfyManagement extends FOGPage
+class NtfyManagement extends \FOG\Base\FOGPage
 {
     /**
      * The node name
diff --git a/oidc/class/oidc.class.php b/oidc/class/oidc.class.php
index 00572c34..6c857b8f 100644
--- a/oidc/class/oidc.class.php
+++ b/oidc/class/oidc.class.php
@@ -19,7 +19,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class OIDC extends FOGController
+class OIDC extends \FOG\Base\FOGController
 {
     /**
      * Stamped on users.uAuthSource for accounts this plugin owns, and passed
diff --git a/oidc/class/oidcflow.class.php b/oidc/class/oidcflow.class.php
index c6805aab..7493d388 100644
--- a/oidc/class/oidcflow.class.php
+++ b/oidc/class/oidcflow.class.php
@@ -30,7 +30,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class OIDCFlow extends FOGBase
+class OIDCFlow extends \FOG\Base\FOGBase
 {
     /**
      * Where the one-time flow values live between the two requests.
@@ -111,7 +111,7 @@ public static function start()
         try {
             $provider = self::_enabledProvider(
                 (int)filter_var(
-                    (string)Route::queryParam('provider'),
+                    (string)\FOG\Router\Route::queryParam('provider'),
                     FILTER_VALIDATE_INT
                 )
             );
@@ -185,7 +185,7 @@ public static function callback()
                     _('The sign-in took too long; please start again')
                 );
             }
-            $error = trim((string)Route::queryParam('error'));
+            $error = trim((string)\FOG\Router\Route::queryParam('error'));
             if ('' !== $error) {
                 // The provider's own words, which are the useful ones --
                 // 'access_denied' means somebody pressed cancel.
@@ -196,13 +196,13 @@ public static function callback()
                     )
                 );
             }
-            $state = (string)Route::queryParam('state');
+            $state = (string)\FOG\Router\Route::queryParam('state');
             if (!hash_equals((string)$flow['state'], $state)) {
                 // Constant time, and the message says nothing about which
                 // half was wrong.
                 throw new \Exception(_('The sign-in could not be verified'));
             }
-            $code = (string)Route::queryParam('code');
+            $code = (string)\FOG\Router\Route::queryParam('code');
             if ('' === $code) {
                 throw new \Exception(_('The identity provider sent no code'));
             }
@@ -327,7 +327,7 @@ private static function _rememberLogout($provider, array $config, array $token)
      */
     public static function forcedProvider()
     {
-        $ids = (array)Route::getIds(
+        $ids = (array)\FOG\Router\Route::getIds(
             'oidc',
             ['enabled' => [1], 'autoRedirect' => [1]]
         );
@@ -863,7 +863,7 @@ private static function _applyGrants($provider, array $claims, $user)
         // roles changed. This request goes on to establish the session, so
         // anything it asks about permissions has to see what was just
         // written, not what the user held on the way in.
-        Authorization::resetCache();
+        \FOG\Auth\Authorization::resetCache();
     }
     /**
      * The group values this token carries.
diff --git a/oidc/class/oidcgroup.class.php b/oidc/class/oidcgroup.class.php
index b5b607dd..ae666446 100644
--- a/oidc/class/oidcgroup.class.php
+++ b/oidc/class/oidcgroup.class.php
@@ -32,7 +32,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class OIDCGroup extends FOGController
+class OIDCGroup extends \FOG\Base\FOGController
 {
     /**
      * The table name.
@@ -96,12 +96,12 @@ class OIDCGroup extends FOGController
     public static function providerLinkCell($providerID)
     {
         if (!$providerID) {
-            return Route::EMPTY_CELL;
+            return \FOG\Router\Route::EMPTY_CELL;
         }
         $name = self::getClass('OIDC', $providerID)->get('name');
         // A group outliving its provider should still list, not fatal.
         if (!$name) {
-            return Route::EMPTY_CELL;
+            return \FOG\Router\Route::EMPTY_CELL;
         }
         return self::entityLink('oidc', $providerID, $name);
     }
@@ -174,7 +174,7 @@ protected function loadRoles()
     {
         $this->set(
             'roles',
-            (array)Route::getIds(
+            (array)\FOG\Router\Route::getIds(
                 'oidcgrouproleassociation',
                 ['oidcgroupID' => $this->get('id')],
                 'roleID'
@@ -190,7 +190,7 @@ protected function loadUsergroups()
     {
         $this->set(
             'usergroups',
-            (array)Route::getIds(
+            (array)\FOG\Router\Route::getIds(
                 'oidcgroupusergroupassociation',
                 ['oidcgroupID' => $this->get('id')],
                 'usergroupID'
@@ -213,11 +213,11 @@ public function destroy($key = 'id')
     {
         $id = (int)$this->get('id');
         if ($id > 0) {
-            Route::deletemass(
+            \FOG\Router\Route::deletemass(
                 'oidcgrouproleassociation',
                 ['oidcgroupID' => $id]
             );
-            Route::deletemass(
+            \FOG\Router\Route::deletemass(
                 'oidcgroupusergroupassociation',
                 ['oidcgroupID' => $id]
             );
diff --git a/oidc/class/oidcgroupmanager.class.php b/oidc/class/oidcgroupmanager.class.php
index 756f2b51..1ad1af7a 100644
--- a/oidc/class/oidcgroupmanager.class.php
+++ b/oidc/class/oidcgroupmanager.class.php
@@ -19,7 +19,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class OIDCGroupManager extends FOGManagerController
+class OIDCGroupManager extends \FOG\Base\FOGManagerController
 {
     /**
      * The table name.
diff --git a/oidc/class/oidcgrouproleassociation.class.php b/oidc/class/oidcgrouproleassociation.class.php
index ee2979ca..4317a3fa 100644
--- a/oidc/class/oidcgrouproleassociation.class.php
+++ b/oidc/class/oidcgrouproleassociation.class.php
@@ -19,7 +19,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class OIDCGroupRoleAssociation extends FOGController
+class OIDCGroupRoleAssociation extends \FOG\Base\FOGController
 {
     /**
      * The table name.
diff --git a/oidc/class/oidcgrouproleassociationmanager.class.php b/oidc/class/oidcgrouproleassociationmanager.class.php
index 97c3e407..fe4f31bf 100644
--- a/oidc/class/oidcgrouproleassociationmanager.class.php
+++ b/oidc/class/oidcgrouproleassociationmanager.class.php
@@ -19,7 +19,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class OIDCGroupRoleAssociationManager extends FOGManagerController
+class OIDCGroupRoleAssociationManager extends \FOG\Base\FOGManagerController
 {
     /**
      * The table name.
diff --git a/oidc/class/oidcgroupusergroupassociation.class.php b/oidc/class/oidcgroupusergroupassociation.class.php
index e4e17906..f70d42ad 100644
--- a/oidc/class/oidcgroupusergroupassociation.class.php
+++ b/oidc/class/oidcgroupusergroupassociation.class.php
@@ -19,7 +19,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class OIDCGroupUserGroupAssociation extends FOGController
+class OIDCGroupUserGroupAssociation extends \FOG\Base\FOGController
 {
     /**
      * The table name.
diff --git a/oidc/class/oidcgroupusergroupassociationmanager.class.php b/oidc/class/oidcgroupusergroupassociationmanager.class.php
index f9d733f6..e5943687 100644
--- a/oidc/class/oidcgroupusergroupassociationmanager.class.php
+++ b/oidc/class/oidcgroupusergroupassociationmanager.class.php
@@ -19,7 +19,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class OIDCGroupUserGroupAssociationManager extends FOGManagerController
+class OIDCGroupUserGroupAssociationManager extends \FOG\Base\FOGManagerController
 {
     /**
      * The table name.
diff --git a/oidc/class/oidcidentity.class.php b/oidc/class/oidcidentity.class.php
index 2aa61f98..30e13673 100644
--- a/oidc/class/oidcidentity.class.php
+++ b/oidc/class/oidcidentity.class.php
@@ -34,7 +34,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class OIDCIdentity extends FOGController
+class OIDCIdentity extends \FOG\Base\FOGController
 {
     /**
      * The identity table.
diff --git a/oidc/class/oidcidentitymanager.class.php b/oidc/class/oidcidentitymanager.class.php
index af7007ae..1f9de582 100644
--- a/oidc/class/oidcidentitymanager.class.php
+++ b/oidc/class/oidcidentitymanager.class.php
@@ -19,7 +19,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class OIDCIdentityManager extends FOGManagerController
+class OIDCIdentityManager extends \FOG\Base\FOGManagerController
 {
     /**
      * The table name.
@@ -102,7 +102,7 @@ public function createSql()
      */
     public function install()
     {
-        $res = Schema::applyUpdates($this->schema(), 0);
+        $res = \FOG\Items\Schema::applyUpdates($this->schema(), 0);
         return $res['error'] === null;
     }
     /**
diff --git a/oidc/class/oidcmanager.class.php b/oidc/class/oidcmanager.class.php
index adb7c0a2..cf32eb33 100644
--- a/oidc/class/oidcmanager.class.php
+++ b/oidc/class/oidcmanager.class.php
@@ -19,7 +19,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class OIDCManager extends FOGManagerController
+class OIDCManager extends \FOG\Base\FOGManagerController
 {
     /**
      * The table name.
@@ -261,7 +261,7 @@ function () {
             // through VARCHAR(1) so the conversion is by label, and carries
             // this table's nullability and defaults across (all five are NOT NULL DEFAULT '0').
             function () {
-                return Schema::enumToTinyint(
+                return \FOG\Items\Schema::enumToTinyint(
                     [
                         'OIDCProviders' => [
                             'opAllowAPI',
@@ -282,7 +282,7 @@ function () {
      */
     public function install()
     {
-        $res = Schema::applyUpdates($this->schema(), 0);
+        $res = \FOG\Items\Schema::applyUpdates($this->schema(), 0);
         return $res['error'] === null;
     }
     /**
diff --git a/oidc/class/oidcusergrant.class.php b/oidc/class/oidcusergrant.class.php
index 33707247..5d994677 100644
--- a/oidc/class/oidcusergrant.class.php
+++ b/oidc/class/oidcusergrant.class.php
@@ -37,7 +37,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class OIDCUserGrant extends FOGController
+class OIDCUserGrant extends \FOG\Base\FOGController
 {
     /**
      * Target kinds, matching the association tables they mirror.
diff --git a/oidc/class/oidcusergrantmanager.class.php b/oidc/class/oidcusergrantmanager.class.php
index 98d2ab36..221c4711 100644
--- a/oidc/class/oidcusergrantmanager.class.php
+++ b/oidc/class/oidcusergrantmanager.class.php
@@ -19,7 +19,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class OIDCUserGrantManager extends FOGManagerController
+class OIDCUserGrantManager extends \FOG\Base\FOGManagerController
 {
     /**
      * The table name.
diff --git a/oidc/hooks/addoidcapi.hook.php b/oidc/hooks/addoidcapi.hook.php
index 8603bc92..f2fcfcfd 100644
--- a/oidc/hooks/addoidcapi.hook.php
+++ b/oidc/hooks/addoidcapi.hook.php
@@ -19,7 +19,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class AddOIDCAPI extends Hook
+class AddOIDCAPI extends \FOG\Base\Hook
 {
     /**
      * The name of this hook.
diff --git a/oidc/hooks/addoidcgrouptabs.hook.php b/oidc/hooks/addoidcgrouptabs.hook.php
index c05c39c0..f8d66ea1 100644
--- a/oidc/hooks/addoidcgrouptabs.hook.php
+++ b/oidc/hooks/addoidcgrouptabs.hook.php
@@ -41,7 +41,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class AddOIDCGroupTabs extends Hook
+class AddOIDCGroupTabs extends \FOG\Base\Hook
 {
     /**
      * The name of this hook.
@@ -132,7 +132,7 @@ public function injectTabData($arguments)
         // Without this, role.edit alone would be enough to rewrite what a
         // provider group grants -- a right the Provider Group page itself
         // does not hand out.
-        if (!Authorization::can(self::GROUP_NODE . '.view')) {
+        if (!\FOG\Auth\Authorization::can(self::GROUP_NODE . '.view')) {
             return;
         }
         $obj = $arguments['obj'];
@@ -169,15 +169,15 @@ public function renderTab($obj, $node)
         $isRole = ('role' === $node);
 
         $props = ' method="post" action="'
-            . FOGPage::makeTabUpdateURL($slug, $obj->get('id'))
+            . \FOG\Base\FOGPage::makeTabUpdateURL($slug, $obj->get('id'))
             . '" ';
-        $buttons = FOGPage::makeButton(
+        $buttons = \FOG\Base\FOGPage::makeButton(
             "$slug-send",
             _('Add selected'),
             'btn btn-primary float-end',
             $props
         );
-        $buttons .= FOGPage::makeButton(
+        $buttons .= \FOG\Base\FOGPage::makeButton(
             "$slug-remove",
             _('Remove selected'),
             'btn btn-danger float-start',
@@ -187,7 +187,7 @@ public function renderTab($obj, $node)
         // A provider group that has not been registered here yet is the
         // normal case when wiring up a new role, and sending the admin to
         // the Provider Group page and back is the trip this removes.
-        $createModal = FOGPage::renderAssocCreate(
+        $createModal = \FOG\Base\FOGPage::renderAssocCreate(
             $slug,
             self::GROUP_NODE,
             $buttons,
@@ -238,20 +238,20 @@ public function renderTab($obj, $node)
         echo '</div>';
         echo '</div>';
         echo '<div class="card-footer">';
-        echo FOGPage::makeModal(
+        echo \FOG\Base\FOGPage::makeModal(
             'oidcgroupDelModal',
             _('Remove Provider Group Associations'),
             _(
                 'Please confirm you would like to dissociate the selected '
                 . 'provider groups'
             ),
-            FOGPage::makeButton(
+            \FOG\Base\FOGPage::makeButton(
                 'closeoidcgroupDeleteModal',
                 _('Cancel'),
                 'btn btn-outline-secondary float-start',
                 'data-bs-dismiss="modal"'
             )
-            . FOGPage::makeButton(
+            . \FOG\Base\FOGPage::makeButton(
                 'confirmoidcgroupDeleteModal',
                 _('Remove'),
                 'btn btn-outline-secondary float-end'
@@ -292,8 +292,8 @@ public function editSuccess($arguments)
         // Same reasoning as the render gate: this writes an oidcgroup
         // association, so it takes oidcgroup.edit rather than riding in on
         // the role/usergroup edit permission that reached this POST.
-        if (!Authorization::can(self::GROUP_NODE . '.edit')) {
-            $arguments['code'] = HTTPResponseCodes::HTTP_FORBIDDEN;
+        if (!\FOG\Auth\Authorization::can(self::GROUP_NODE . '.edit')) {
+            $arguments['code'] = \FOG\Router\HTTPResponseCodes::HTTP_FORBIDDEN;
             $arguments['msg'] = json_encode(
                 [
                     'error' => _(
@@ -346,7 +346,7 @@ public function editSuccess($arguments)
             $group->save();
         }
         // A change here changes who has what, and the answer is cached.
-        Authorization::resetCache();
+        \FOG\Auth\Authorization::resetCache();
 
         $arguments['msg'] = json_encode(
             [
diff --git a/oidc/hooks/addoidcjs.hook.php b/oidc/hooks/addoidcjs.hook.php
index c2178928..016ff925 100644
--- a/oidc/hooks/addoidcjs.hook.php
+++ b/oidc/hooks/addoidcjs.hook.php
@@ -23,7 +23,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class AddOIDCJS extends Hook
+class AddOIDCJS extends \FOG\Base\Hook
 {
     /**
      * The name of this hook.
diff --git a/oidc/hooks/addoidcmenuitem.hook.php b/oidc/hooks/addoidcmenuitem.hook.php
index 7fbfb363..9c2f8e36 100644
--- a/oidc/hooks/addoidcmenuitem.hook.php
+++ b/oidc/hooks/addoidcmenuitem.hook.php
@@ -19,7 +19,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class AddOIDCMenuItem extends Hook
+class AddOIDCMenuItem extends \FOG\Base\Hook
 {
     /**
      * The second node this plugin owns: the provider groups whose
diff --git a/oidc/hooks/addoidcroutes.hook.php b/oidc/hooks/addoidcroutes.hook.php
index 00520b60..5a7ce2d4 100644
--- a/oidc/hooks/addoidcroutes.hook.php
+++ b/oidc/hooks/addoidcroutes.hook.php
@@ -19,7 +19,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class AddOIDCRoutes extends Hook
+class AddOIDCRoutes extends \FOG\Base\Hook
 {
     /**
      * The name of this hook.
@@ -106,7 +106,7 @@ public function routes($arguments)
      */
     public function loginButtons($arguments)
     {
-        $ids = Route::getIds('oidc', ['enabled' => [1]]);
+        $ids = \FOG\Router\Route::getIds('oidc', ['enabled' => [1]]);
         foreach ((array)$ids as $id) {
             $provider = self::getClass('OIDC', $id);
             if (!$provider->isValid()) {
diff --git a/oidc/hooks/oidcdeletemassitems.hook.php b/oidc/hooks/oidcdeletemassitems.hook.php
index b626bd5d..eb1dbc92 100644
--- a/oidc/hooks/oidcdeletemassitems.hook.php
+++ b/oidc/hooks/oidcdeletemassitems.hook.php
@@ -19,7 +19,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class OIDCDeleteMassItems extends Hook
+class OIDCDeleteMassItems extends \FOG\Base\Hook
 {
     /**
      * The name of this hook.
diff --git a/oidc/hooks/oidcloginredirect.hook.php b/oidc/hooks/oidcloginredirect.hook.php
index 03da9666..9ce843f2 100644
--- a/oidc/hooks/oidcloginredirect.hook.php
+++ b/oidc/hooks/oidcloginredirect.hook.php
@@ -19,7 +19,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class OIDCLoginRedirect extends Hook
+class OIDCLoginRedirect extends \FOG\Base\Hook
 {
     /**
      * The name of this hook.
diff --git a/oidc/hooks/oidclogout.hook.php b/oidc/hooks/oidclogout.hook.php
index a7359abe..97b77c1c 100644
--- a/oidc/hooks/oidclogout.hook.php
+++ b/oidc/hooks/oidclogout.hook.php
@@ -19,7 +19,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class OIDCLogout extends Hook
+class OIDCLogout extends \FOG\Base\Hook
 {
     /**
      * The name of this hook.
diff --git a/oidc/pages/oidcgroupmanagement.page.php b/oidc/pages/oidcgroupmanagement.page.php
index 064f53de..f5fc1c58 100644
--- a/oidc/pages/oidcgroupmanagement.page.php
+++ b/oidc/pages/oidcgroupmanagement.page.php
@@ -26,7 +26,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class OIDCGroupManagement extends FOGPage
+class OIDCGroupManagement extends \FOG\Base\FOGPage
 {
     /**
      * The node this page works on.
@@ -59,8 +59,8 @@ public function __construct($name = '')
      */
     private static function _providerChoices()
     {
-        $ids = (array)Route::getIds('oidc', [], 'id');
-        $names = (array)Route::getIds('oidc', [], 'name');
+        $ids = (array)\FOG\Router\Route::getIds('oidc', [], 'id');
+        $names = (array)\FOG\Router\Route::getIds('oidc', [], 'name');
         if (count($ids) !== count($names)) {
             return [];
         }
@@ -462,7 +462,7 @@ function (&$serverFault) {
                     $serverFault = true;
                     throw new \Exception(_('Provider group update failed!'));
                 }
-                Authorization::resetCache();
+                \FOG\Auth\Authorization::resetCache();
             }
         );
     }
diff --git a/oidc/pages/oidcmanagement.page.php b/oidc/pages/oidcmanagement.page.php
index abc2a6b5..e64cebf7 100644
--- a/oidc/pages/oidcmanagement.page.php
+++ b/oidc/pages/oidcmanagement.page.php
@@ -19,7 +19,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class OIDCManagement extends FOGPage
+class OIDCManagement extends \FOG\Base\FOGPage
 {
     /**
      * Placeholder shown in the secret field of an existing provider.
@@ -511,7 +511,7 @@ public function oidcGeneral()
                     // locked out of their own server -- and the URL is not
                     // something they could guess at that point.
                     _('the local login form stays available at %s'),
-                    '<code>' . Initiator::e(OIDC::localLoginUrl()) . '</code>'
+                    '<code>' . \Initiator::e(OIDC::localLoginUrl()) . '</code>'
                 )
                 . ')'
             ) => self::makeInput(
diff --git a/ou/class/ou.class.php b/ou/class/ou.class.php
index 8b2c94d3..f432f34b 100644
--- a/ou/class/ou.class.php
+++ b/ou/class/ou.class.php
@@ -19,7 +19,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class OU extends FOGController
+class OU extends \FOG\Base\FOGController
 {
     /**
      * The location table
@@ -66,7 +66,7 @@ class OU extends FOGController
      */
     public function destroy($key = 'id')
     {
-        Route::deletemass(
+        \FOG\Router\Route::deletemass(
             'ouassociation',
             ['ouID' => $this->get('id')]
         );
diff --git a/ou/class/ouassociation.class.php b/ou/class/ouassociation.class.php
index f80e15cb..56d656dc 100644
--- a/ou/class/ouassociation.class.php
+++ b/ou/class/ouassociation.class.php
@@ -19,7 +19,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class OUAssociation extends FOGController
+class OUAssociation extends \FOG\Base\FOGController
 {
     /**
      * The association table.
diff --git a/ou/class/ouassociationmanager.class.php b/ou/class/ouassociationmanager.class.php
index 21416d9c..4cd0877c 100644
--- a/ou/class/ouassociationmanager.class.php
+++ b/ou/class/ouassociationmanager.class.php
@@ -19,7 +19,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class OUAssociationManager extends FOGManagerController
+class OUAssociationManager extends \FOG\Base\FOGManagerController
 {
     /**
      * The base table name.
diff --git a/ou/class/oumanager.class.php b/ou/class/oumanager.class.php
index 14e20403..7b816471 100644
--- a/ou/class/oumanager.class.php
+++ b/ou/class/oumanager.class.php
@@ -19,7 +19,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class OUManager extends FOGManagerController
+class OUManager extends \FOG\Base\FOGManagerController
 {
     /**
      * The base table name.
@@ -104,7 +104,7 @@ public function schema()
      */
     public function install()
     {
-        $res = Schema::applyUpdates($this->schema(), 0);
+        $res = \FOG\Items\Schema::applyUpdates($this->schema(), 0);
         return $res['error'] === null;
     }
     /**
diff --git a/ou/hooks/addouapi.hook.php b/ou/hooks/addouapi.hook.php
index 0ac8d828..58faa732 100644
--- a/ou/hooks/addouapi.hook.php
+++ b/ou/hooks/addouapi.hook.php
@@ -19,7 +19,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class AddOUAPI extends Hook
+class AddOUAPI extends \FOG\Base\Hook
 {
     /**
      * The name of the hook.
diff --git a/ou/hooks/addougroup.hook.php b/ou/hooks/addougroup.hook.php
index ed0047dd..804acd42 100644
--- a/ou/hooks/addougroup.hook.php
+++ b/ou/hooks/addougroup.hook.php
@@ -19,7 +19,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class AddOUGroup extends Hook
+class AddOUGroup extends \FOG\Base\Hook
 {
     /**
      * The name of this hook.
@@ -97,14 +97,14 @@ public function groupOU($obj)
             ->buildSelectBox($ouID, 'ou');
 
         $fields = [
-            FOGPage::makeLabel(
+            \FOG\Base\FOGPage::makeLabel(
                 'col-sm-3 col-form-label',
                 'ou',
                 _('Group OU')
             ) => $ouSelector
         ];
 
-        $buttons = FOGPage::makeButton(
+        $buttons = \FOG\Base\FOGPage::makeButton(
             'ou-send',
             _('Update'),
             'btn btn-primary float-end'
@@ -114,7 +114,7 @@ public function groupOU($obj)
         // it, and immediately after Update so Update stays the row's rightmost
         // (primary) button with this one to its left. The modal it returns is
         // echoed after the form -- see below for why it cannot go inside.
-        $createModal = FOGPage::renderAssocCreate(
+        $createModal = \FOG\Base\FOGPage::renderAssocCreate(
             'group-ou',
             'ou',
             $buttons,
@@ -130,13 +130,13 @@ public function groupOU($obj)
                 'Group' => &$obj
             ]
         );
-        $rendered = FOGPage::formFields($fields);
+        $rendered = \FOG\Base\FOGPage::formFields($fields);
         unset($fields);
 
-        echo FOGPage::makeFormTag(
+        echo \FOG\Base\FOGPage::makeFormTag(
             '',
             'group-ou-form',
-            FOGPage::makeTabUpdateURL(
+            \FOG\Base\FOGPage::makeTabUpdateURL(
                 'group-ou',
                 $obj->get('id')
             ),
@@ -180,7 +180,7 @@ public function groupOUPost($obj)
         $insert_values = [];
         $hosts = $obj->get('hosts');
         if (count($hosts ?: [])) {
-            Route::deletemass(
+            \FOG\Router\Route::deletemass(
                 'ouassociation',
                 ['hostID' => $hosts]
             );
@@ -223,7 +223,7 @@ public function groupAddOUEdit($arguments)
                 default:
                     return;
             }
-            $arguments['code'] = HTTPResponseCodes::HTTP_ACCEPTED;
+            $arguments['code'] = \FOG\Router\HTTPResponseCodes::HTTP_ACCEPTED;
             $arguments['hook'] = 'GROUP_EDIT_OU_SUCCESS';
             $arguments['msg'] = json_encode(
                 [
@@ -234,8 +234,8 @@ public function groupAddOUEdit($arguments)
         } catch (\Exception $e) {
             $arguments['code'] = (
                 $arguments['serverFault'] ?
-                HTTPResponseCodes::HTTP_INTERNAL_SERVER_ERROR :
-                HTTPResponseCodes::HTTP_BAD_REQUEST
+                \FOG\Router\HTTPResponseCodes::HTTP_INTERNAL_SERVER_ERROR :
+                \FOG\Router\HTTPResponseCodes::HTTP_BAD_REQUEST
             );
             $arguments['hook'] = 'GROUP_EDIT_OU_FAIL';
             $arguments['msg'] = json_encode(
@@ -264,7 +264,7 @@ public function groupAddOUField($arguments)
             ->buildSelectBox($ouID, 'ou');
 
         $arguments['fields'][
-            FOGPage::makeLabel(
+            \FOG\Base\FOGPage::makeLabel(
                 'col-sm-3 col-form-label',
                 'ou',
                 _('Group OU')
diff --git a/ou/hooks/addouhost.hook.php b/ou/hooks/addouhost.hook.php
index 789f7f2c..e6f81c51 100644
--- a/ou/hooks/addouhost.hook.php
+++ b/ou/hooks/addouhost.hook.php
@@ -21,7 +21,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class AddOUHost extends Hook
+class AddOUHost extends \FOG\Base\Hook
 {
     /**
      * The name of this hook.
@@ -94,7 +94,7 @@ public function hostTabData($arguments)
      */
     public function hostOU($obj)
     {
-        $items = Route::getList('ouassociation');
+        $items = \FOG\Router\Route::getList('ouassociation');
         $ou = 0;
         foreach ($items as &$item) {
             if ($item->hostID == $obj->get('id')) {
@@ -112,14 +112,14 @@ public function hostOU($obj)
             ->buildSelectBox($ouID, 'ou');
 
         $fields = [
-            FOGPage::makeLabel(
+            \FOG\Base\FOGPage::makeLabel(
                 'col-sm-3 col-form-label',
                 'ou',
                 _('Host OU')
             ) => $ouSelector
         ];
 
-        $buttons = FOGPage::makeButton(
+        $buttons = \FOG\Base\FOGPage::makeButton(
             'ou-send',
             _('Update'),
             'btn btn-primary float-end'
@@ -129,7 +129,7 @@ public function hostOU($obj)
         // it, and immediately after Update so Update stays the row's rightmost
         // (primary) button with this one to its left. The modal it returns is
         // echoed after the form -- see below for why it cannot go inside.
-        $createModal = FOGPage::renderAssocCreate(
+        $createModal = \FOG\Base\FOGPage::renderAssocCreate(
             'host-ou',
             'ou',
             $buttons,
@@ -145,13 +145,13 @@ public function hostOU($obj)
                 'Host' => &$obj
             ]
         );
-        $rendered = FOGPage::formFields($fields);
+        $rendered = \FOG\Base\FOGPage::formFields($fields);
         unset($fields);
 
-        echo FOGPage::makeFormTag(
+        echo \FOG\Base\FOGPage::makeFormTag(
             '',
             'host-ou-form',
-            FOGPage::makeTabUpdateURL(
+            \FOG\Base\FOGPage::makeTabUpdateURL(
                 'host-ou',
                 $obj->get('id')
             ),
@@ -195,7 +195,7 @@ public function hostOUPost($obj)
         $insert_values = [];
         $hosts = [$obj->get('id')];
         if (count($hosts ?: [])) {
-            Route::deletemass(
+            \FOG\Router\Route::deletemass(
                 'ouassociation',
                 ['hostID' => $hosts]
             );
@@ -264,7 +264,7 @@ public function hostAddOUEdit($arguments)
                 default:
                     return;
             }
-            $arguments['code'] = HTTPResponseCodes::HTTP_ACCEPTED;
+            $arguments['code'] = \FOG\Router\HTTPResponseCodes::HTTP_ACCEPTED;
             $arguments['hook'] = 'HOST_EDIT_OU_SUCCESS';
             $arguments['msg'] = json_encode(
                 [
@@ -275,8 +275,8 @@ public function hostAddOUEdit($arguments)
         } catch (\Exception $e) {
             $arguments['code'] = (
                 $arguments['serverFault'] ?
-                HTTPResponseCodes::HTTP_INTERNAL_SERVER_ERROR :
-                HTTPResponseCodes::HTTP_BAD_REQUEST
+                \FOG\Router\HTTPResponseCodes::HTTP_INTERNAL_SERVER_ERROR :
+                \FOG\Router\HTTPResponseCodes::HTTP_BAD_REQUEST
             );
             $arguments['hook'] = 'HOST_EDIT_OU_FAIL';
             $arguments['msg'] = json_encode(
@@ -305,7 +305,7 @@ public function hostAddOUField($arguments)
             ->buildSelectBox($ouID, 'ou');
 
         $arguments['fields'][
-            FOGPage::makeLabel(
+            \FOG\Base\FOGPage::makeLabel(
                 'col-sm-3 col-form-label',
                 'ou',
                 _('Host OU')
diff --git a/ou/hooks/addoujs.hook.php b/ou/hooks/addoujs.hook.php
index c3ca5efb..ea4ad688 100644
--- a/ou/hooks/addoujs.hook.php
+++ b/ou/hooks/addoujs.hook.php
@@ -21,7 +21,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class AddOUJS extends Hook
+class AddOUJS extends \FOG\Base\Hook
 {
     /**
      * The name of this hook.
diff --git a/ou/hooks/addoumenuitem.hook.php b/ou/hooks/addoumenuitem.hook.php
index 646ada21..8c576ac5 100644
--- a/ou/hooks/addoumenuitem.hook.php
+++ b/ou/hooks/addoumenuitem.hook.php
@@ -21,7 +21,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class AddOUMenuItem extends Hook
+class AddOUMenuItem extends \FOG\Base\Hook
 {
     /**
      * The name of this hook.
diff --git a/ou/hooks/addoutype.hook.php b/ou/hooks/addoutype.hook.php
index 40c760e4..55ee90a1 100644
--- a/ou/hooks/addoutype.hook.php
+++ b/ou/hooks/addoutype.hook.php
@@ -21,7 +21,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class AddOUType extends Hook
+class AddOUType extends \FOG\Base\Hook
 {
     /**
      * The name of this hook.
diff --git a/ou/hooks/ouchangeitems.hook.php b/ou/hooks/ouchangeitems.hook.php
index 918dff0f..038f5280 100644
--- a/ou/hooks/ouchangeitems.hook.php
+++ b/ou/hooks/ouchangeitems.hook.php
@@ -26,7 +26,7 @@
  * old changeitems.hook.php filename and therefore its class name. Only one of
  * the two ever loaded per request, decided by readdir order.
  */
-class OUChangeItems extends Hook
+class OUChangeItems extends \FOG\Base\Hook
 {
     /**
      * The name of this hook.
@@ -76,7 +76,7 @@ public function changeADItems($arguments)
         if (!$arguments['Host']->isValid()) {
             return;
         }
-        $OUAssocs = Route::getList(
+        $OUAssocs = \FOG\Router\Route::getList(
             'ouassociation',
             ['hostID' => $arguments['Host']->get('id')]
         );
diff --git a/ou/hooks/oudeletemassitems.hook.php b/ou/hooks/oudeletemassitems.hook.php
index f1f03ab4..dd208a52 100644
--- a/ou/hooks/oudeletemassitems.hook.php
+++ b/ou/hooks/oudeletemassitems.hook.php
@@ -19,7 +19,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class OUDeleteMassItems extends Hook
+class OUDeleteMassItems extends \FOG\Base\Hook
 {
     /**
      * The name of this hook.
diff --git a/ou/pages/oumanagement.page.php b/ou/pages/oumanagement.page.php
index d10069cc..896f6bfa 100644
--- a/ou/pages/oumanagement.page.php
+++ b/ou/pages/oumanagement.page.php
@@ -21,7 +21,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class OUManagement extends FOGPage
+class OUManagement extends \FOG\Base\FOGPage
 {
     /**
      * The node this page operates on.
diff --git a/ou/reports/ou_report.report.php b/ou/reports/ou_report.report.php
index 4f4d83da..433fc5db 100644
--- a/ou/reports/ou_report.report.php
+++ b/ou/reports/ou_report.report.php
@@ -19,7 +19,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class OU_Report extends ReportManagement
+class OU_Report extends \FOG\ReportManagement
 {
     /**
      * The page to display.
@@ -67,9 +67,9 @@ public function file()
     public function getList()
     {
         header('Content-type: application/json');
-        Route::listem('ou');
-        http_response_code(HTTPResponseCodes::HTTP_SUCCESS);
-        echo Route::getData();
+        \FOG\Router\Route::listem('ou');
+        http_response_code(\FOG\Router\HTTPResponseCodes::HTTP_SUCCESS);
+        echo \FOG\Router\Route::getData();
         exit;
     }
 }
diff --git a/persistentgroups/class/persistentgroups.class.php b/persistentgroups/class/persistentgroups.class.php
index 2e73288e..42447686 100644
--- a/persistentgroups/class/persistentgroups.class.php
+++ b/persistentgroups/class/persistentgroups.class.php
@@ -19,6 +19,6 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class PersistentGroups extends FOGController
+class PersistentGroups extends \FOG\Base\FOGController
 {
 }
diff --git a/persistentgroups/class/persistentgroupsmanager.class.php b/persistentgroups/class/persistentgroupsmanager.class.php
index 2b7c9fbe..33e3169e 100644
--- a/persistentgroups/class/persistentgroupsmanager.class.php
+++ b/persistentgroups/class/persistentgroupsmanager.class.php
@@ -21,7 +21,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class PersistentGroupsManager extends FOGManagerController
+class PersistentGroupsManager extends \FOG\Base\FOGManagerController
 {
     /**
      * Returns the CREATE TRIGGER statement for this plugin.
@@ -124,7 +124,7 @@ function () {
      */
     public function install()
     {
-        $res = Schema::applyUpdates($this->schema(), 0);
+        $res = \FOG\Items\Schema::applyUpdates($this->schema(), 0);
         return $res['error'] === null;
     }
     /**
diff --git a/pushbullet/class/pushbullet.class.php b/pushbullet/class/pushbullet.class.php
index 20b586c2..6164823b 100644
--- a/pushbullet/class/pushbullet.class.php
+++ b/pushbullet/class/pushbullet.class.php
@@ -21,7 +21,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class Pushbullet extends FOGController
+class Pushbullet extends \FOG\Base\FOGController
 {
     /**
      * The pushbullet table
diff --git a/pushbullet/class/pushbulletextends.class.php b/pushbullet/class/pushbulletextends.class.php
index 38eb7601..4a3394f4 100644
--- a/pushbullet/class/pushbulletextends.class.php
+++ b/pushbullet/class/pushbulletextends.class.php
@@ -25,7 +25,7 @@
  * @license  http://opensource.org/license/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-abstract class PushbulletExtends extends Event
+abstract class PushbulletExtends extends \FOG\Base\Event
 {
     /**
      * The name of the pushbullet
@@ -109,7 +109,7 @@ public function __construct()
     public function onEvent($event, $data)
     {
         self::$elements = $data;
-        $Pushbullets = Route::getList('pushbullet');
+        $Pushbullets = \FOG\Router\Route::getList('pushbullet');
         // Invoke the closure stored in the static property. Calling
         // self::$eventloop($x) directly is parsed as a static method named
         // by a local variable, not as invoking the closure.
diff --git a/pushbullet/class/pushbulletmanager.class.php b/pushbullet/class/pushbulletmanager.class.php
index 2e565248..feca52d0 100644
--- a/pushbullet/class/pushbulletmanager.class.php
+++ b/pushbullet/class/pushbulletmanager.class.php
@@ -21,7 +21,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class PushbulletManager extends FOGManagerController
+class PushbulletManager extends \FOG\Base\FOGManagerController
 {
     /**
      * The base table name.
@@ -101,7 +101,7 @@ public function schema()
      */
     public function install()
     {
-        $res = Schema::applyUpdates($this->schema(), 0);
+        $res = \FOG\Items\Schema::applyUpdates($this->schema(), 0);
         return $res['error'] === null;
     }
 }
diff --git a/pushbullet/hooks/addpushbulletapi.hook.php b/pushbullet/hooks/addpushbulletapi.hook.php
index 3fbcc3ce..17a664a1 100644
--- a/pushbullet/hooks/addpushbulletapi.hook.php
+++ b/pushbullet/hooks/addpushbulletapi.hook.php
@@ -19,7 +19,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class AddPushbulletAPI extends Hook
+class AddPushbulletAPI extends \FOG\Base\Hook
 {
     /**
      * The name of the hook.
diff --git a/pushbullet/hooks/addpushbulletjs.hook.php b/pushbullet/hooks/addpushbulletjs.hook.php
index 578013b0..c47d1938 100644
--- a/pushbullet/hooks/addpushbulletjs.hook.php
+++ b/pushbullet/hooks/addpushbulletjs.hook.php
@@ -19,7 +19,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class AddPushbulletJS extends Hook
+class AddPushbulletJS extends \FOG\Base\Hook
 {
     /**
      * The name of this hook.
diff --git a/pushbullet/hooks/addpushbulletmenuitem.hook.php b/pushbullet/hooks/addpushbulletmenuitem.hook.php
index 2933749d..1d1891ae 100644
--- a/pushbullet/hooks/addpushbulletmenuitem.hook.php
+++ b/pushbullet/hooks/addpushbulletmenuitem.hook.php
@@ -21,7 +21,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class AddPushbulletMenuItem extends Hook
+class AddPushbulletMenuItem extends \FOG\Base\Hook
 {
     /**
      * The name of this hook
diff --git a/pushbullet/pages/pushbulletmanagement.page.php b/pushbullet/pages/pushbulletmanagement.page.php
index 360af55d..1a74f68d 100644
--- a/pushbullet/pages/pushbulletmanagement.page.php
+++ b/pushbullet/pages/pushbulletmanagement.page.php
@@ -19,7 +19,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class PushbulletManagement extends FOGPage
+class PushbulletManagement extends \FOG\Base\FOGPage
 {
     /**
      * The node name
diff --git a/slack/class/slack.class.php b/slack/class/slack.class.php
index 1715b485..610e987f 100644
--- a/slack/class/slack.class.php
+++ b/slack/class/slack.class.php
@@ -19,7 +19,7 @@
  * @license  https://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class Slack extends FOGController
+class Slack extends \FOG\Base\FOGController
 {
     /**
      * The table.
diff --git a/slack/class/slackmanager.class.php b/slack/class/slackmanager.class.php
index 845533a2..a0206277 100644
--- a/slack/class/slackmanager.class.php
+++ b/slack/class/slackmanager.class.php
@@ -19,7 +19,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class SlackManager extends FOGManagerController
+class SlackManager extends \FOG\Base\FOGManagerController
 {
     /**
      * The base table name.
@@ -92,7 +92,7 @@ public function schema()
      */
     public function install()
     {
-        $res = Schema::applyUpdates($this->schema(), 0);
+        $res = \FOG\Items\Schema::applyUpdates($this->schema(), 0);
         return $res['error'] === null;
     }
 }
diff --git a/slack/events/imagecomplete_slack.event.php b/slack/events/imagecomplete_slack.event.php
index d3bedfe2..560887d8 100644
--- a/slack/events/imagecomplete_slack.event.php
+++ b/slack/events/imagecomplete_slack.event.php
@@ -8,7 +8,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class ImageComplete_Slack extends Event
+class ImageComplete_Slack extends \FOG\Base\Event
 {
     /**
      * The name of this event
@@ -72,7 +72,7 @@ public function onEvent($event, $data)
             _('Host %1$s finished capturing image %2$s.') :
             _('Host %1$s finished deploying image %2$s.')
         );
-        $Slacks = Route::getList('slack');
+        $Slacks = \FOG\Router\Route::getList('slack');
         foreach ($Slacks as $Slack) {
             $args = [
                 'channel' => $Slack->name,
diff --git a/slack/events/imagefail_slack.event.php b/slack/events/imagefail_slack.event.php
index 0d57a41d..814305e9 100644
--- a/slack/events/imagefail_slack.event.php
+++ b/slack/events/imagefail_slack.event.php
@@ -8,7 +8,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class ImageFail_Slack extends Event
+class ImageFail_Slack extends \FOG\Base\Event
 {
     /**
      * The name of this event
@@ -66,7 +66,7 @@ public function onEvent($event, $data)
         if ('' === $reason) {
             $reason = _('no reason was reported');
         }
-        $Slacks = Route::getList('slack');
+        $Slacks = \FOG\Router\Route::getList('slack');
         foreach ($Slacks as $Slack) {
             $args = [
                 'channel' => $Slack->name,
diff --git a/slack/events/loginfailure_slack.event.php b/slack/events/loginfailure_slack.event.php
index 867aab3f..bb5f1978 100644
--- a/slack/events/loginfailure_slack.event.php
+++ b/slack/events/loginfailure_slack.event.php
@@ -9,7 +9,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class LoginFailure_Slack extends Event
+class LoginFailure_Slack extends \FOG\Base\Event
 {
     /**
      * The name of this event
@@ -52,7 +52,7 @@ public function __construct()
      */
     public function onEvent($event, $data)
     {
-        $Slacks = Route::getList('slack');
+        $Slacks = \FOG\Router\Route::getList('slack');
         $ip = filter_input(INPUT_SERVER, 'REMOTE_ADDR');
         foreach ($Slacks as $Slack) {
             $args = [
diff --git a/slack/events/snapincomplete_slack.event.php b/slack/events/snapincomplete_slack.event.php
index 8b81157c..63dea8a7 100644
--- a/slack/events/snapincomplete_slack.event.php
+++ b/slack/events/snapincomplete_slack.event.php
@@ -8,7 +8,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class SnapinComplete_Slack extends Event
+class SnapinComplete_Slack extends \FOG\Base\Event
 {
     /**
      * The name of this event
@@ -51,7 +51,7 @@ public function __construct()
      */
     public function onEvent($event, $data)
     {
-        $Slacks = Route::getList('slack');
+        $Slacks = \FOG\Router\Route::getList('slack');
         $hostname = $data['Host']->get('name');
         foreach ($Slacks as $Slack) {
             $args = [
diff --git a/slack/events/snapintaskcomplete_slack.event.php b/slack/events/snapintaskcomplete_slack.event.php
index e1c990fe..21176861 100644
--- a/slack/events/snapintaskcomplete_slack.event.php
+++ b/slack/events/snapintaskcomplete_slack.event.php
@@ -8,7 +8,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class SnapinTaskComplete_Slack extends Event
+class SnapinTaskComplete_Slack extends \FOG\Base\Event
 {
     /**
      * The name of the event
@@ -54,7 +54,7 @@ public function onEvent($event, $data)
         $hostname = $data['Host']->get('name');
         $snapinname = $data['Snapin']->get('name');
         $statuscode = $data['SnapinTask']->get('return');
-        $Slacks = Route::getList('slack');
+        $Slacks = \FOG\Router\Route::getList('slack');
         foreach ($Slacks as $Slack) {
             $args = [
                 'channel' => $Slack->name,
diff --git a/slack/hooks/addslackapi.hook.php b/slack/hooks/addslackapi.hook.php
index fd0f740a..c0da89dd 100644
--- a/slack/hooks/addslackapi.hook.php
+++ b/slack/hooks/addslackapi.hook.php
@@ -19,7 +19,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class AddSlackAPI extends Hook
+class AddSlackAPI extends \FOG\Base\Hook
 {
     /**
      * The name of the hook.
diff --git a/slack/hooks/addslackjs.hook.php b/slack/hooks/addslackjs.hook.php
index b8fb8cff..6b2986b0 100644
--- a/slack/hooks/addslackjs.hook.php
+++ b/slack/hooks/addslackjs.hook.php
@@ -19,7 +19,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class AddSlackJS extends Hook
+class AddSlackJS extends \FOG\Base\Hook
 {
     /**
      * The name of this hook.
diff --git a/slack/hooks/addslackmenuitem.hook.php b/slack/hooks/addslackmenuitem.hook.php
index 3b41dad2..d81a2869 100644
--- a/slack/hooks/addslackmenuitem.hook.php
+++ b/slack/hooks/addslackmenuitem.hook.php
@@ -19,7 +19,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class AddSlackMenuItem extends Hook
+class AddSlackMenuItem extends \FOG\Base\Hook
 {
     /**
      * Name of the hook.
diff --git a/slack/pages/slackmanagement.page.php b/slack/pages/slackmanagement.page.php
index 3a75fff4..7455f5b6 100644
--- a/slack/pages/slackmanagement.page.php
+++ b/slack/pages/slackmanagement.page.php
@@ -19,7 +19,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class SlackManagement extends FOGPage
+class SlackManagement extends \FOG\Base\FOGPage
 {
     /**
      * Node to work with.
diff --git a/subnetgroup/class/subnetgroup.class.php b/subnetgroup/class/subnetgroup.class.php
index 7e0450a0..02a08146 100644
--- a/subnetgroup/class/subnetgroup.class.php
+++ b/subnetgroup/class/subnetgroup.class.php
@@ -21,7 +21,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class SubnetGroup extends FOGController
+class SubnetGroup extends \FOG\Base\FOGController
 {
     /**
      * The table name.
diff --git a/subnetgroup/class/subnetgroupmanager.class.php b/subnetgroup/class/subnetgroupmanager.class.php
index 4d0d12d7..d633df46 100644
--- a/subnetgroup/class/subnetgroupmanager.class.php
+++ b/subnetgroup/class/subnetgroupmanager.class.php
@@ -21,7 +21,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class SubnetGroupManager extends FOGManagerController
+class SubnetGroupManager extends \FOG\Base\FOGManagerController
 {
     /**
      * The table name.
@@ -99,7 +99,7 @@ public function schema()
      */
     public function install()
     {
-        $res = Schema::applyUpdates($this->schema(), 0);
+        $res = \FOG\Items\Schema::applyUpdates($this->schema(), 0);
         return $res['error'] === null;
     }
 }
diff --git a/subnetgroup/hooks/addsubnetgroupapi.hook.php b/subnetgroup/hooks/addsubnetgroupapi.hook.php
index b4def90a..a8511819 100644
--- a/subnetgroup/hooks/addsubnetgroupapi.hook.php
+++ b/subnetgroup/hooks/addsubnetgroupapi.hook.php
@@ -21,7 +21,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class AddSubnetGroupAPI extends Hook
+class AddSubnetGroupAPI extends \FOG\Base\Hook
 {
     /**
      * The name of the hook.
diff --git a/subnetgroup/hooks/addsubnetgrouphost.hook.php b/subnetgroup/hooks/addsubnetgrouphost.hook.php
index 9de1ebd2..9070b272 100644
--- a/subnetgroup/hooks/addsubnetgrouphost.hook.php
+++ b/subnetgroup/hooks/addsubnetgrouphost.hook.php
@@ -21,7 +21,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class AddSubnetGroupHost extends Hook
+class AddSubnetGroupHost extends \FOG\Base\Hook
 {
     /**
      * The name of this hook.
@@ -98,7 +98,7 @@ public function addSubnetGroupHost($arguments)
         }
 
         // Now list our subnet groups.
-        $SNGroups = Route::getList('subnetgroup');
+        $SNGroups = \FOG\Router\Route::getList('subnetgroup');
         foreach ($SNGroups as &$SNGroup) {
             if (in_array($SNGroup->groupID, $Host->get('groups'))) {
                 $Host->removeGroup($SNGroup->groupID)->save();
diff --git a/subnetgroup/hooks/addsubnetgroupjs.hook.php b/subnetgroup/hooks/addsubnetgroupjs.hook.php
index 73f414d0..fe4f9e3a 100644
--- a/subnetgroup/hooks/addsubnetgroupjs.hook.php
+++ b/subnetgroup/hooks/addsubnetgroupjs.hook.php
@@ -21,7 +21,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class AddSubnetGroupJS extends Hook
+class AddSubnetGroupJS extends \FOG\Base\Hook
 {
     /**
      * The name of this hook.
diff --git a/subnetgroup/hooks/addsubnetgroupmenuitem.hook.php b/subnetgroup/hooks/addsubnetgroupmenuitem.hook.php
index 83b1eadd..7573847b 100644
--- a/subnetgroup/hooks/addsubnetgroupmenuitem.hook.php
+++ b/subnetgroup/hooks/addsubnetgroupmenuitem.hook.php
@@ -21,7 +21,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class AddSubnetGroupMenuItem extends Hook
+class AddSubnetGroupMenuItem extends \FOG\Base\Hook
 {
     /**
      * The name of this hook.
diff --git a/subnetgroup/hooks/addsubnetgrouptype.hook.php b/subnetgroup/hooks/addsubnetgrouptype.hook.php
index ddf265ed..6ec82c59 100644
--- a/subnetgroup/hooks/addsubnetgrouptype.hook.php
+++ b/subnetgroup/hooks/addsubnetgrouptype.hook.php
@@ -21,7 +21,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class AddSubnetGroupType extends Hook
+class AddSubnetGroupType extends \FOG\Base\Hook
 {
     /**
      * The name of this hook.
diff --git a/subnetgroup/hooks/removesubnetgroupgroup.hook.php b/subnetgroup/hooks/removesubnetgroupgroup.hook.php
index c7f3b455..e80fa9f2 100644
--- a/subnetgroup/hooks/removesubnetgroupgroup.hook.php
+++ b/subnetgroup/hooks/removesubnetgroupgroup.hook.php
@@ -21,7 +21,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class RemoveSubnetGroupGroup extends Hook
+class RemoveSubnetGroupGroup extends \FOG\Base\Hook
 {
     /**
      * The name of this hook.
@@ -69,6 +69,6 @@ public function __construct()
     public function removeSubnetGroupGroup($arguments)
     {
         $group = ['groupID' => $arguments['Group']->get('id')];
-        Route::deletemass($this->node, $group);
+        \FOG\Router\Route::deletemass($this->node, $group);
     }
 }
diff --git a/subnetgroup/pages/subnetgroupmanagement.page.php b/subnetgroup/pages/subnetgroupmanagement.page.php
index 4190cb54..89462232 100644
--- a/subnetgroup/pages/subnetgroupmanagement.page.php
+++ b/subnetgroup/pages/subnetgroupmanagement.page.php
@@ -21,7 +21,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class SubnetGroupManagement extends FOGPage
+class SubnetGroupManagement extends \FOG\Base\FOGPage
 {
     /**
      * The node this page operates on.
diff --git a/subnetgroup/reports/subnetgroup_report.report.php b/subnetgroup/reports/subnetgroup_report.report.php
index 98215ceb..e3c9196a 100644
--- a/subnetgroup/reports/subnetgroup_report.report.php
+++ b/subnetgroup/reports/subnetgroup_report.report.php
@@ -19,7 +19,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class SubnetGroup_Report extends ReportManagement
+class SubnetGroup_Report extends \FOG\ReportManagement
 {
     /**
      * The page to display.
@@ -61,9 +61,9 @@ public function file()
     public function getList()
     {
         header('Content-type: application/json');
-        Route::listem('subnetgroup');
-        http_response_code(HTTPResponseCodes::HTTP_SUCCESS);
-        echo Route::getData();
+        \FOG\Router\Route::listem('subnetgroup');
+        http_response_code(\FOG\Router\HTTPResponseCodes::HTTP_SUCCESS);
+        echo \FOG\Router\Route::getData();
         exit;
     }
 }
diff --git a/taskstateedit/class/taskstateedit.class.php b/taskstateedit/class/taskstateedit.class.php
index ad479df5..7015ed92 100644
--- a/taskstateedit/class/taskstateedit.class.php
+++ b/taskstateedit/class/taskstateedit.class.php
@@ -19,6 +19,6 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class Taskstateedit extends TaskState
+class Taskstateedit extends \FOG\Items\TaskState
 {
 }
diff --git a/taskstateedit/class/taskstateeditmanager.class.php b/taskstateedit/class/taskstateeditmanager.class.php
index 50059381..3e465ac3 100644
--- a/taskstateedit/class/taskstateeditmanager.class.php
+++ b/taskstateedit/class/taskstateeditmanager.class.php
@@ -19,7 +19,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class TaskstateeditManager extends TaskStateManager
+class TaskstateeditManager extends \FOG\Managers\TaskStateManager
 {
     /**
      * Install the plugin, table already exists.
diff --git a/taskstateedit/hooks/addtaskstateeditjs.hook.php b/taskstateedit/hooks/addtaskstateeditjs.hook.php
index 124663a2..54bc75db 100644
--- a/taskstateedit/hooks/addtaskstateeditjs.hook.php
+++ b/taskstateedit/hooks/addtaskstateeditjs.hook.php
@@ -19,7 +19,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class AddTaskStateEditJS extends Hook
+class AddTaskStateEditJS extends \FOG\Base\Hook
 {
     /**
      * The name of this hook.
diff --git a/taskstateedit/hooks/addtaskstateeditmenuitem.hook.php b/taskstateedit/hooks/addtaskstateeditmenuitem.hook.php
index b6e2c359..90a1fcef 100644
--- a/taskstateedit/hooks/addtaskstateeditmenuitem.hook.php
+++ b/taskstateedit/hooks/addtaskstateeditmenuitem.hook.php
@@ -19,7 +19,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class AddTaskstateeditMenuItem extends Hook
+class AddTaskstateeditMenuItem extends \FOG\Base\Hook
 {
     /**
      * Name of the hook.
diff --git a/taskstateedit/hooks/addtaskstatetype.hook.php b/taskstateedit/hooks/addtaskstatetype.hook.php
index e88a3add..b4e67b9f 100644
--- a/taskstateedit/hooks/addtaskstatetype.hook.php
+++ b/taskstateedit/hooks/addtaskstatetype.hook.php
@@ -19,7 +19,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class AddTaskStateType extends Hook
+class AddTaskStateType extends \FOG\Base\Hook
 {
     /**
      * Name of the hook.
diff --git a/taskstateedit/pages/taskstateeditmanagement.page.php b/taskstateedit/pages/taskstateeditmanagement.page.php
index bed7018a..1233d7e8 100644
--- a/taskstateedit/pages/taskstateeditmanagement.page.php
+++ b/taskstateedit/pages/taskstateeditmanagement.page.php
@@ -19,7 +19,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class TaskstateeditManagement extends FOGPage
+class TaskstateeditManagement extends \FOG\Base\FOGPage
 {
     /**
      * The node to work from.
diff --git a/taskstateedit/reports/taskstateedit_report.report.php b/taskstateedit/reports/taskstateedit_report.report.php
index 72d679b6..7efec0a8 100644
--- a/taskstateedit/reports/taskstateedit_report.report.php
+++ b/taskstateedit/reports/taskstateedit_report.report.php
@@ -19,7 +19,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class Taskstateedit_Report extends ReportManagement
+class Taskstateedit_Report extends \FOG\ReportManagement
 {
     /**
      * The page to display.
@@ -65,9 +65,9 @@ public function file()
     public function getList()
     {
         header('Content-type: application/json');
-        Route::listem('taskstateedit');
-        http_response_code(HTTPResponseCodes::HTTP_SUCCESS);
-        echo Route::getData();
+        \FOG\Router\Route::listem('taskstateedit');
+        http_response_code(\FOG\Router\HTTPResponseCodes::HTTP_SUCCESS);
+        echo \FOG\Router\Route::getData();
         exit;
     }
 }
diff --git a/tasktypeedit/class/tasktypeedit.class.php b/tasktypeedit/class/tasktypeedit.class.php
index b2259342..fa7d7117 100644
--- a/tasktypeedit/class/tasktypeedit.class.php
+++ b/tasktypeedit/class/tasktypeedit.class.php
@@ -19,6 +19,6 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class Tasktypeedit extends TaskType
+class Tasktypeedit extends \FOG\Items\TaskType
 {
 }
diff --git a/tasktypeedit/class/tasktypeeditmanager.class.php b/tasktypeedit/class/tasktypeeditmanager.class.php
index c2209e64..9cb518d7 100644
--- a/tasktypeedit/class/tasktypeeditmanager.class.php
+++ b/tasktypeedit/class/tasktypeeditmanager.class.php
@@ -19,7 +19,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class TasktypeeditManager extends TaskTypeManager
+class TasktypeeditManager extends \FOG\Managers\TaskTypeManager
 {
     /**
      * Install the plugin, table already exists.
diff --git a/tasktypeedit/hooks/addtasktypeeditjs.hook.php b/tasktypeedit/hooks/addtasktypeeditjs.hook.php
index c184646f..d8cd1edc 100644
--- a/tasktypeedit/hooks/addtasktypeeditjs.hook.php
+++ b/tasktypeedit/hooks/addtasktypeeditjs.hook.php
@@ -19,7 +19,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class AddTaskTypeEditJS extends Hook
+class AddTaskTypeEditJS extends \FOG\Base\Hook
 {
     /**
      * The name of this hook.
diff --git a/tasktypeedit/hooks/addtasktypeeditmenuitem.hook.php b/tasktypeedit/hooks/addtasktypeeditmenuitem.hook.php
index 0eae750f..16b3272b 100644
--- a/tasktypeedit/hooks/addtasktypeeditmenuitem.hook.php
+++ b/tasktypeedit/hooks/addtasktypeeditmenuitem.hook.php
@@ -19,7 +19,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class AddTasktypeeditMenuItem extends Hook
+class AddTasktypeeditMenuItem extends \FOG\Base\Hook
 {
     /**
      * Name of the hook.
diff --git a/tasktypeedit/hooks/addtasktypetype.hook.php b/tasktypeedit/hooks/addtasktypetype.hook.php
index bf530d59..8fdd42be 100644
--- a/tasktypeedit/hooks/addtasktypetype.hook.php
+++ b/tasktypeedit/hooks/addtasktypetype.hook.php
@@ -19,7 +19,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class AddTaskTypeType extends Hook
+class AddTaskTypeType extends \FOG\Base\Hook
 {
     /**
      * Name of the hook.
diff --git a/tasktypeedit/pages/tasktypeeditmanagement.page.php b/tasktypeedit/pages/tasktypeeditmanagement.page.php
index 22470e50..b25dc1d3 100644
--- a/tasktypeedit/pages/tasktypeeditmanagement.page.php
+++ b/tasktypeedit/pages/tasktypeeditmanagement.page.php
@@ -19,7 +19,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class TasktypeeditManagement extends FOGPage
+class TasktypeeditManagement extends \FOG\Base\FOGPage
 {
     /**
      * The node to work from.
diff --git a/tasktypeedit/reports/tasktypeedit_report.report.php b/tasktypeedit/reports/tasktypeedit_report.report.php
index 073e1ce5..8b9f5273 100644
--- a/tasktypeedit/reports/tasktypeedit_report.report.php
+++ b/tasktypeedit/reports/tasktypeedit_report.report.php
@@ -19,7 +19,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class Tasktypeedit_Report extends ReportManagement
+class Tasktypeedit_Report extends \FOG\ReportManagement
 {
     /**
      * The page to display.
@@ -75,9 +75,9 @@ public function file()
     public function getList()
     {
         header('Content-type: application/json');
-        Route::listem('tasktypeedit');
-        http_response_code(HTTPResponseCodes::HTTP_SUCCESS);
-        echo Route::getData();
+        \FOG\Router\Route::listem('tasktypeedit');
+        http_response_code(\FOG\Router\HTTPResponseCodes::HTTP_SUCCESS);
+        echo \FOG\Router\Route::getData();
         exit;
     }
 }
diff --git a/tests/core-references-are-qualified.test.php b/tests/core-references-are-qualified.test.php
new file mode 100644
index 00000000..0e6b8bc9
--- /dev/null
+++ b/tests/core-references-are-qualified.test.php
@@ -0,0 +1,177 @@
+<?php
+/**
+ * Every class a plugin reaches for that it does not declare itself must be
+ * fully qualified.
+ *
+ * Plugins are global-namespace by design (fogproject ADR 0009) and have
+ * always named FOG core classes bare -- `extends Hook`, `Route::listem()`,
+ * `new Image()`. That worked only because every file under fogproject's
+ * packages/web/src/ ended in a class_alias() re-exporting itself into the
+ * global namespace, and that alias set is being retired (ADR 0013 §2). A bare
+ * name resolves to nothing once it goes, and the failure is a fatal on the
+ * page or hook that uses it.
+ *
+ * The invariant is deliberately expressed WITHOUT a copy of core's class
+ * list. This repository is fetched on its own by bin/fetch-plugins.sh and
+ * cannot assume a fogproject checkout is anywhere nearby, and a hardcoded
+ * list here would drift from the buckets core actually declares. So the rule
+ * is the self-contained one: a name this tree does not declare, and that PHP
+ * does not already have, has to carry its namespace.
+ *
+ * bin/qualify-core-references.php is the tool that does the rewriting; this
+ * is the gate that says it was run. The tool needs a fogproject checkout,
+ * which CI does not have -- this does not.
+ *
+ * Usage: php tests/core-references-are-qualified.test.php
+ * Exit status 0 = pass, 1 = fail.
+ */
+
+$root = dirname(__DIR__);
+$fails = [];
+
+/**
+ * Every class this tree declares.
+ *
+ * tests/stubs is excluded, and that exclusion is load-bearing rather than
+ * tidiness: the stubs declare test doubles NAMED for core classes, so
+ * counting them here would make FOGController, FOGManagerController and
+ * Schema look like the tree's own and wave through every bare reference to
+ * them. The first run of the rewriting tool had exactly that bug and left
+ * ~90 references behind.
+ */
+$own = [];
+$walk = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($root));
+foreach ($walk as $file) {
+    $path = $file->getPathname();
+    if (!$file->isFile() || 'php' !== $file->getExtension()
+        || false !== strpos($path, '/.git/')
+        || false !== strpos($path, '/tests/stubs/')
+    ) {
+        continue;
+    }
+    if (preg_match_all(
+        '/^\s*(?:final\s+|abstract\s+)*(?:class|interface|trait)\s+(\w+)/mi',
+        file_get_contents($path),
+        $m
+    )) {
+        foreach ($m[1] as $name) {
+            $own[strtolower($name)] = true;
+        }
+    }
+}
+
+$skip = [T_WHITESPACE, T_COMMENT, T_DOC_COMMENT];
+$checked = 0;
+$qualified = 0;
+$walk = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($root));
+foreach ($walk as $file) {
+    $path = $file->getPathname();
+    if (!$file->isFile() || 'php' !== $file->getExtension()
+        || false !== strpos($path, '/.git/')
+        || false !== strpos($path, '/tests/')
+        || false !== strpos($path, '/bin/')
+    ) {
+        continue;
+    }
+    $rel = str_replace($root . '/', '', $path);
+    $tokens = token_get_all(file_get_contents($path));
+    $count = count($tokens);
+    for ($i = 0; $i < $count; $i++) {
+        if (!is_array($tokens[$i])) {
+            continue;
+        }
+        // PHP 8 folds \Foo\Bar into ONE T_NAME_FULLY_QUALIFIED token; 7.4
+        // emits T_NS_SEPARATOR + T_STRING per segment. This repository is
+        // tested on both, so count the 8.x form here and let the 7.4 form
+        // fall through to the T_NS_SEPARATOR check below. Either way an
+        // already-qualified name never reaches the bare-name test.
+        if (defined('T_NAME_FULLY_QUALIFIED') && T_NAME_FULLY_QUALIFIED === $tokens[$i][0]) {
+            $qualified++;
+            continue;
+        }
+        if (T_STRING !== $tokens[$i][0]) {
+            continue;
+        }
+        $name = $tokens[$i][1];
+        $prev = null;
+        for ($j = $i - 1; $j >= 0; $j--) {
+            if (is_array($tokens[$j]) && in_array($tokens[$j][0], $skip, true)) {
+                continue;
+            }
+            $prev = $tokens[$j];
+            break;
+        }
+        $next = null;
+        for ($j = $i + 1; $j < $count; $j++) {
+            if (is_array($tokens[$j]) && in_array($tokens[$j][0], $skip, true)) {
+                continue;
+            }
+            $next = $tokens[$j];
+            break;
+        }
+        // Already qualified, or a member/function/const name rather than a
+        // class reference. Whitespace is skipped in both directions because
+        // `new Foo` carries a T_WHITESPACE between the two tokens.
+        if (is_array($prev)
+            && in_array($prev[0], [T_NS_SEPARATOR, T_OBJECT_OPERATOR, T_DOUBLE_COLON, T_FUNCTION, T_CONST], true)
+        ) {
+            if (T_NS_SEPARATOR === $prev[0]) {
+                $qualified++;
+            }
+            continue;
+        }
+        if (is_array($next) && T_NS_SEPARATOR === $next[0]) {
+            continue;
+        }
+        $isClassRef = (is_array($next) && T_DOUBLE_COLON === $next[0])
+            || (is_array($prev) && in_array($prev[0], [T_NEW, T_EXTENDS, T_IMPLEMENTS, T_INSTANCEOF], true));
+        if (!$isClassRef) {
+            continue;
+        }
+        // self/parent/static are scope keywords, not class names, and PHP
+        // hands them back as T_STRING like anything else.
+        if (in_array(strtolower($name), ['self', 'parent', 'static'], true)) {
+            continue;
+        }
+        $checked++;
+        if (isset($own[strtolower($name)])) {
+            continue;
+        }
+        // A PHP built-in or an extension class, reached by its real global
+        // name -- \Exception, \PDO, \DateTime. Those genuinely live in the
+        // global namespace and are not core's to qualify.
+        if (class_exists($name) || interface_exists($name)) {
+            continue;
+        }
+        $fails[] = sprintf(
+            '%s:%d references %s bare. This tree does not declare it and PHP '
+            . 'does not have it, so it is a FOG core class resolving through '
+            . 'a compatibility alias that is being retired -- qualify it '
+            . '(run bin/qualify-core-references.php --core=/path/to/fogproject '
+            . '--fix)',
+            $rel,
+            $tokens[$i][2],
+            $name
+        );
+    }
+}
+
+$fails = array_values(array_unique($fails));
+if (count($fails)) {
+    fwrite(STDERR, 'FAIL:' . PHP_EOL);
+    foreach (array_slice($fails, 0, 25) as $fail) {
+        fwrite(STDERR, "  - $fail\n");
+    }
+    if (count($fails) > 25) {
+        fwrite(STDERR, '  ... and ' . (count($fails) - 25) . " more\n");
+    }
+    exit(1);
+}
+
+printf(
+    "ok: %d qualified reference(s), %d bare one(s) checked; every name this "
+    . "tree does not declare carries its namespace\n",
+    $qualified,
+    $checked
+);
+exit(0);
diff --git a/tests/oidc-flow-safety.test.php b/tests/oidc-flow-safety.test.php
index 9277294c..ffff40e2 100644
--- a/tests/oidc-flow-safety.test.php
+++ b/tests/oidc-flow-safety.test.php
@@ -429,7 +429,7 @@ function methodBody($src, $method)
 require $root . '/tests/stubs/fog-stubs.php';
 require $root . '/oidc/class/oidc.class.php';
 
-FOGController::$settings = ['FOG_WEB_ROOT' => 'fog', 'FOG_WEB_HOST' => 'fog.example'];
+\FOG\Base\FOGController::$settings = ['FOG_WEB_ROOT' => 'fog', 'FOG_WEB_HOST' => 'fog.example'];
 $cases = [
     // FOG_WEB_ROOT => [webrootBase, redirectUri]
     'fog' => ['/fog/', 'https://fog.example/fog/ext/oidc/callback'],
@@ -440,7 +440,7 @@ function methodBody($src, $method)
     '' => ['/', 'https://fog.example/ext/oidc/callback'],
 ];
 foreach ($cases as $setting => $want) {
-    FOGController::$settings['FOG_WEB_ROOT'] = $setting;
+    \FOG\Base\FOGController::$settings['FOG_WEB_ROOT'] = $setting;
     $gotBase = OIDC::webrootBase();
     $gotUri = OIDC::redirectUri();
     if ($gotBase !== $want[0] || $gotUri !== $want[1]) {
@@ -614,10 +614,10 @@ function methodBody($src, $method)
     ],
 ];
 foreach ($indexCases as $class => $want) {
-    Schema::$lastCall = [];
+    \FOG\Items\Schema::$lastCall = [];
     $manager = new $class();
     $manager->createSql();
-    $args = Schema::$lastCall;
+    $args = \FOG\Items\Schema::$lastCall;
     if (($args[0] ?? null) !== $want[0]) {
         fail(
             sprintf(
diff --git a/tests/oidc-provider-safety.test.php b/tests/oidc-provider-safety.test.php
index 7db29162..cc35b296 100644
--- a/tests/oidc-provider-safety.test.php
+++ b/tests/oidc-provider-safety.test.php
@@ -221,7 +221,7 @@ function () {
 // 5. The column defaults, read out of what the manager asks Schema for.
 //    Positional, because that is how Schema::createTable() is called.
 (new OIDCManager())->createSql();
-$call = Schema::$lastCall;
+$call = \FOG\Items\Schema::$lastCall;
 if (count($call) < 7) {
     fail('OIDCManager::createSql() did not reach Schema::createTable()');
 } else {
diff --git a/tests/stubs/fog-stubs.php b/tests/stubs/fog-stubs.php
index cb939cad..eb1abaf0 100644
--- a/tests/stubs/fog-stubs.php
+++ b/tests/stubs/fog-stubs.php
@@ -14,6 +14,17 @@
  * beyond that is a sign the thing under test is not pure and should be
  * pinned by inspection instead.
  *
+ * Declared in the SAME namespaces core declares them in --
+ * FOG\Base\FOGController, FOG\Base\FOGManagerController, FOG\Items\Schema --
+ * and deliberately NOT also under their bare global names.
+ *
+ * That is what makes the plugin tests a gate for the qualification sweep. A
+ * plugin file still saying `extends FOGController` resolves nothing here and
+ * fails to load, which is exactly what would happen on a real server once
+ * fogproject retires the compatibility aliases (ADR 0013 §2). Adding a global
+ * alias back would make these stubs kinder than production, and the test
+ * suite would go green on code that cannot run.
+ *
  * Requires no database, and no FOG checkout.
  *
  * PHP version 7.4+
@@ -25,112 +36,122 @@
  * @link     https://fogproject.org
  */
 
-/**
- * Enough of FOGController for a model's class body to exist.
- */
-class FOGController
-{
-    /**
-     * The globalSettings fixture getSetting() reads.
-     *
-     * @var array
-     */
-    public static $settings = [];
-    /**
-     * The values set on this object.
-     *
-     * @var array
-     */
-    protected $data = [];
-    /**
-     * Read a value.
-     *
-     * @param string $key the key
-     *
-     * @return mixed
-     */
-    public function get($key)
-    {
-        return $this->data[$key] ?? '';
-    }
-    /**
-     * Write a value.
-     *
-     * @param string $key   the key
-     * @param mixed  $value the value
-     *
-     * @return self
-     */
-    public function set($key, $value)
-    {
-        $this->data[$key] = $value;
-        return $this;
-    }
-    /**
-     * Read a setting from the fixture.
-     *
-     * @param string $key the setting name
-     *
-     * @return mixed
-     */
-    public static function getSetting($key)
-    {
-        return self::$settings[$key] ?? '';
-    }
+namespace FOG\Base {
     /**
-     * Never reached: a test asserting on save() asserts on what it refuses.
-     *
-     * @return bool
+     * Enough of FOGController for a model's class body to exist.
      */
-    public function save()
+    class FOGController
     {
-        return true;
+        /**
+         * The globalSettings fixture getSetting() reads.
+         *
+         * @var array
+         */
+        public static $settings = [];
+        /**
+         * The values set on this object.
+         *
+         * @var array
+         */
+        protected $data = [];
+        /**
+         * Read a value.
+         *
+         * @param string $key the key
+         *
+         * @return mixed
+         */
+        public function get($key)
+        {
+            return $this->data[$key] ?? '';
+        }
+        /**
+         * Write a value.
+         *
+         * @param string $key   the key
+         * @param mixed  $value the value
+         *
+         * @return self
+         */
+        public function set($key, $value)
+        {
+            $this->data[$key] = $value;
+            return $this;
+        }
+        /**
+         * Read a setting from the fixture.
+         *
+         * @param string $key the setting name
+         *
+         * @return mixed
+         */
+        public static function getSetting($key)
+        {
+            return self::$settings[$key] ?? '';
+        }
+        /**
+         * Never reached: a test asserting on save() asserts on what it refuses.
+         *
+         * @return bool
+         */
+        public function save()
+        {
+            return true;
+        }
     }
 }
 
-/**
- * Enough of FOGManagerController for a manager's class body to exist.
- */
-class FOGManagerController
-{
+namespace FOG\Base {
     /**
-     * Passes a createTable() call straight through.
-     *
-     * The real one (GH-1245) fills a default into every NOT NULL column that
-     * has none, leaving the primary key, anything the model declares
-     * required, and anything whose name ends in ID. It only ADDS -- a default
-     * the caller passed explicitly always wins -- so a pass-through here
-     * cannot mask an assertion about a default a manager sets deliberately,
-     * which is what these tests check. Reimplementing the rule in the stub
-     * would only give it somewhere to drift from.
-     *
-     * @return string
+     * Enough of FOGManagerController for a manager's class body to exist.
      */
-    public function createTableSql(...$args)
+    class FOGManagerController
     {
-        return Schema::createTable(...$args);
+        /**
+         * Passes a createTable() call straight through.
+         *
+         * The real one (GH-1245) fills a default into every NOT NULL column that
+         * has none, leaving the primary key, anything the model declares
+         * required, and anything whose name ends in ID. It only ADDS -- a default
+         * the caller passed explicitly always wins -- so a pass-through here
+         * cannot mask an assertion about a default a manager sets deliberately,
+         * which is what these tests check. Reimplementing the rule in the stub
+         * would only give it somewhere to drift from.
+         *
+         * @return string
+         */
+        public function createTableSql(...$args)
+        {
+            // Qualified: this stub sits in FOG\Base and Schema is declared in
+            // FOG\Items, so a bare name would resolve to FOG\Base\Schema and
+            // find nothing. PHP falls back to the global namespace for
+            // functions and constants, never for class names.
+            return \FOG\Items\Schema::createTable(...$args);
+        }
     }
 }
 
-/**
- * Captures what a manager asks for instead of building SQL.
- */
-class Schema
-{
-    /**
-     * The arguments of the last createTable() call.
-     *
-     * @var array
-     */
-    public static $lastCall = [];
+namespace FOG\Items {
     /**
-     * Records the call and returns a placeholder.
-     *
-     * @return string
+     * Captures what a manager asks for instead of building SQL.
      */
-    public static function createTable(...$args)
+    class Schema
     {
-        self::$lastCall = $args;
-        return 'CREATE TABLE ...';
+        /**
+         * The arguments of the last createTable() call.
+         *
+         * @var array
+         */
+        public static $lastCall = [];
+        /**
+         * Records the call and returns a placeholder.
+         *
+         * @return string
+         */
+        public static function createTable(...$args)
+        {
+            self::$lastCall = $args;
+            return 'CREATE TABLE ...';
+        }
     }
 }
diff --git a/windowskey/class/windowskey.class.php b/windowskey/class/windowskey.class.php
index cd2d835b..6ab869ab 100644
--- a/windowskey/class/windowskey.class.php
+++ b/windowskey/class/windowskey.class.php
@@ -21,7 +21,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class WindowsKey extends FOGController
+class WindowsKey extends \FOG\Base\FOGController
 {
     /**
      * The windows keys table
@@ -68,7 +68,7 @@ class WindowsKey extends FOGController
      */
     public function destroy($key = 'id')
     {
-        Route::deletemass(
+        \FOG\Router\Route::deletemass(
             'windowskeyassociation',
             ['windowskeyID' => $this->get('id')]
         );
@@ -123,7 +123,7 @@ public function removeImage($removeArray)
     protected function loadImages()
     {
         $find = ['windowskeyID' => $this->get('id')];
-        $images = Route::getIds(
+        $images = \FOG\Router\Route::getIds(
             'windowskeyassociation',
             $find,
             'imageID'
diff --git a/windowskey/class/windowskeyassociation.class.php b/windowskey/class/windowskeyassociation.class.php
index a788101e..f6bb49e1 100644
--- a/windowskey/class/windowskeyassociation.class.php
+++ b/windowskey/class/windowskeyassociation.class.php
@@ -19,7 +19,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class WindowsKeyAssociation extends FOGController
+class WindowsKeyAssociation extends \FOG\Base\FOGController
 {
     /**
      * The association table.
diff --git a/windowskey/class/windowskeyassociationmanager.class.php b/windowskey/class/windowskeyassociationmanager.class.php
index 8d1e73f9..7a7baae8 100644
--- a/windowskey/class/windowskeyassociationmanager.class.php
+++ b/windowskey/class/windowskeyassociationmanager.class.php
@@ -21,7 +21,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class WindowsKeyAssociationManager extends FOGManagerController
+class WindowsKeyAssociationManager extends \FOG\Base\FOGManagerController
 {
     /**
      * The base table name.
diff --git a/windowskey/class/windowskeymanager.class.php b/windowskey/class/windowskeymanager.class.php
index 87cfdea7..aee380c0 100644
--- a/windowskey/class/windowskeymanager.class.php
+++ b/windowskey/class/windowskeymanager.class.php
@@ -19,7 +19,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class WindowsKeyManager extends FOGManagerController
+class WindowsKeyManager extends \FOG\Base\FOGManagerController
 {
     /**
      * The base table name.
@@ -125,7 +125,7 @@ public function schema()
      */
     public function install()
     {
-        $res = Schema::applyUpdates($this->schema(), 0);
+        $res = \FOG\Items\Schema::applyUpdates($this->schema(), 0);
         return $res['error'] === null;
     }
     /**
diff --git a/windowskey/hooks/addwindowskeyapi.hook.php b/windowskey/hooks/addwindowskeyapi.hook.php
index 7aba2607..bc26bb83 100644
--- a/windowskey/hooks/addwindowskeyapi.hook.php
+++ b/windowskey/hooks/addwindowskeyapi.hook.php
@@ -19,7 +19,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class AddWindowskeyAPI extends Hook
+class AddWindowskeyAPI extends \FOG\Base\Hook
 {
     /**
      * The name of the hook.
diff --git a/windowskey/hooks/addwindowskeyimage.hook.php b/windowskey/hooks/addwindowskeyimage.hook.php
index 824c0d9b..128f5831 100644
--- a/windowskey/hooks/addwindowskeyimage.hook.php
+++ b/windowskey/hooks/addwindowskeyimage.hook.php
@@ -21,7 +21,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class AddWindowsKeyImage extends Hook
+class AddWindowsKeyImage extends \FOG\Base\Hook
 {
     /**
      * The name of this hook.
@@ -98,14 +98,14 @@ public function imageWindowskey($obj)
             ->buildSelectBox($keyID, 'windowskey');
 
         $fields = [
-            FOGPage::makeLabel(
+            \FOG\Base\FOGPage::makeLabel(
                 'col-sm-3 col-form-label',
                 'windowskey',
                 _('Windows Key')
             ) => $windowskeySelector
         ];
 
-        $buttons = FOGPage::makeButton(
+        $buttons = \FOG\Base\FOGPage::makeButton(
             'windowskey-send',
             _('Update'),
             'btn btn-primary float-end'
@@ -115,7 +115,7 @@ public function imageWindowskey($obj)
         // it, and immediately after Update so Update stays the row's rightmost
         // (primary) button with this one to its left. The modal it returns is
         // echoed after the form -- see below for why it cannot go inside.
-        $createModal = FOGPage::renderAssocCreate(
+        $createModal = \FOG\Base\FOGPage::renderAssocCreate(
             'image-windowskey',
             'windowskey',
             $buttons,
@@ -131,13 +131,13 @@ public function imageWindowskey($obj)
                 'Image' => &$obj
             ]
         );
-        $rendered = FOGPage::formFields($fields);
+        $rendered = \FOG\Base\FOGPage::formFields($fields);
         unset($fields);
 
-        echo FOGPage::makeFormTag(
+        echo \FOG\Base\FOGPage::makeFormTag(
             '',
             'image-windowskey-form',
-            FOGPage::makeTabUpdateURL(
+            \FOG\Base\FOGPage::makeTabUpdateURL(
                 'image-windowskey',
                 $obj->get('id')
             ),
@@ -179,7 +179,7 @@ public function imageWindowskeyPost($obj)
         $insert_values = [];
         $images = [$obj->get('id')];
         if (count($images ?: [])) {
-            Route::deletemass(
+            \FOG\Router\Route::deletemass(
                 'windowskeyassociation',
                 ['imageID' => $images]
             );
@@ -222,7 +222,7 @@ public function imageAddKeyEdit($arguments)
                 default:
                     return;
             }
-            $arguments['code'] = HTTPResponseCodes::HTTP_ACCEPTED;
+            $arguments['code'] = \FOG\Router\HTTPResponseCodes::HTTP_ACCEPTED;
             $arguments['hook'] = 'IMAGE_EDIT_WINDOWSKEY_SUCCESS';
             $arguments['msg'] = json_encode(
                 [
@@ -233,8 +233,8 @@ public function imageAddKeyEdit($arguments)
         } catch (\Exception $e) {
             $arguments['code'] = (
                 $arguments['serverFault'] ?
-                HTTPResponseCodes::HTTP_INTERNAL_SERVER_ERROR :
-                HTTPResponseCodes::HTTP_BAD_REQUEST
+                \FOG\Router\HTTPResponseCodes::HTTP_INTERNAL_SERVER_ERROR :
+                \FOG\Router\HTTPResponseCodes::HTTP_BAD_REQUEST
             );
             $arguments['hook'] = 'IMAGE_EDIT_WINDOWSKEY_FAIL';
             $arguments['msg'] = json_encode(
@@ -263,7 +263,7 @@ public function imageAddKeyField($arguments)
             ->buildSelectBox($keyID, 'windowskey');
 
         $arguments['fields'][
-            FOGPage::makeLabel(
+            \FOG\Base\FOGPage::makeLabel(
                 'col-sm-3 col-form-label',
                 'windowskey',
                 _('Image Windows Key')
diff --git a/windowskey/hooks/addwindowskeyjs.hook.php b/windowskey/hooks/addwindowskeyjs.hook.php
index 26e1d811..1c392a4a 100644
--- a/windowskey/hooks/addwindowskeyjs.hook.php
+++ b/windowskey/hooks/addwindowskeyjs.hook.php
@@ -19,7 +19,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class AddWindowsKeyJS extends Hook
+class AddWindowsKeyJS extends \FOG\Base\Hook
 {
     /**
      * The name of this hook.
diff --git a/windowskey/hooks/addwindowskeymenuitem.hook.php b/windowskey/hooks/addwindowskeymenuitem.hook.php
index f80383ec..fa9203a5 100644
--- a/windowskey/hooks/addwindowskeymenuitem.hook.php
+++ b/windowskey/hooks/addwindowskeymenuitem.hook.php
@@ -19,7 +19,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class AddWindowsKeyMenuItem extends Hook
+class AddWindowsKeyMenuItem extends \FOG\Base\Hook
 {
     /**
      * The name of this hook.
diff --git a/windowskey/hooks/changehostkey.hook.php b/windowskey/hooks/changehostkey.hook.php
index 54db724e..dd2c988e 100644
--- a/windowskey/hooks/changehostkey.hook.php
+++ b/windowskey/hooks/changehostkey.hook.php
@@ -21,7 +21,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class ChangeHostKey extends Hook
+class ChangeHostKey extends \FOG\Base\Hook
 {
     /**
      * The name of this hook.
@@ -72,7 +72,7 @@ public function changeHostProductKey($arguments)
             return;
         }
         $find = ['imageID' => $arguments['Task']->getImage()->get('id')];
-        $windowskeys = Route::getIds(
+        $windowskeys = \FOG\Router\Route::getIds(
             'windowskeyassociation',
             $find,
             'windowskeyID'
@@ -83,7 +83,7 @@ public function changeHostProductKey($arguments)
             return;
         }
         $find = ['id' => $windowskeys];
-        $windowskeys = Route::getIds(
+        $windowskeys = \FOG\Router\Route::getIds(
             'windowskey',
             $find,
             'key'
diff --git a/windowskey/hooks/windowskeydeletemassitems.hook.php b/windowskey/hooks/windowskeydeletemassitems.hook.php
index b7a544c9..20455796 100644
--- a/windowskey/hooks/windowskeydeletemassitems.hook.php
+++ b/windowskey/hooks/windowskeydeletemassitems.hook.php
@@ -19,7 +19,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class WindowsKeyDeleteMassItems extends Hook
+class WindowsKeyDeleteMassItems extends \FOG\Base\Hook
 {
     /**
      * The name of this hook.
diff --git a/windowskey/pages/windowskeymanagement.page.php b/windowskey/pages/windowskeymanagement.page.php
index 58f3cc9f..1b62051f 100644
--- a/windowskey/pages/windowskeymanagement.page.php
+++ b/windowskey/pages/windowskeymanagement.page.php
@@ -19,7 +19,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class WindowsKeyManagement extends FOGPage
+class WindowsKeyManagement extends \FOG\Base\FOGPage
 {
     /**
      * The node this page operates on.
diff --git a/windowskey/reports/windowskey_report.report.php b/windowskey/reports/windowskey_report.report.php
index a8ce2b2d..c302d3c4 100644
--- a/windowskey/reports/windowskey_report.report.php
+++ b/windowskey/reports/windowskey_report.report.php
@@ -19,7 +19,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class WindowsKey_Report extends ReportManagement
+class WindowsKey_Report extends \FOG\ReportManagement
 {
     /**
      * The page to display.
@@ -67,9 +67,9 @@ public function file()
     public function getList()
     {
         header('Content-type: application/json');
-        Route::listem('windowskey');
-        http_response_code(HTTPResponseCodes::HTTP_SUCCESS);
-        echo Route::getData();
+        \FOG\Router\Route::listem('windowskey');
+        http_response_code(\FOG\Router\HTTPResponseCodes::HTTP_SUCCESS);
+        echo \FOG\Router\Route::getData();
         exit;
     }
 }
diff --git a/wolbroadcast/class/wolbroadcast.class.php b/wolbroadcast/class/wolbroadcast.class.php
index 682bd94a..9d8f559b 100644
--- a/wolbroadcast/class/wolbroadcast.class.php
+++ b/wolbroadcast/class/wolbroadcast.class.php
@@ -19,7 +19,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class Wolbroadcast extends FOGController
+class Wolbroadcast extends \FOG\Base\FOGController
 {
     /**
      * The wolbroadcast table
diff --git a/wolbroadcast/class/wolbroadcastmanager.class.php b/wolbroadcast/class/wolbroadcastmanager.class.php
index ae6608a8..f656d2c6 100644
--- a/wolbroadcast/class/wolbroadcastmanager.class.php
+++ b/wolbroadcast/class/wolbroadcastmanager.class.php
@@ -19,7 +19,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class WolbroadcastManager extends FOGManagerController
+class WolbroadcastManager extends \FOG\Base\FOGManagerController
 {
     /**
      * The base table name.
@@ -99,7 +99,7 @@ public function schema()
      */
     public function install()
     {
-        $res = Schema::applyUpdates($this->schema(), 0);
+        $res = \FOG\Items\Schema::applyUpdates($this->schema(), 0);
         return $res['error'] === null;
     }
 }
diff --git a/wolbroadcast/hooks/addbroadcastaddresses.hook.php b/wolbroadcast/hooks/addbroadcastaddresses.hook.php
index 65b34b89..4cba9578 100644
--- a/wolbroadcast/hooks/addbroadcastaddresses.hook.php
+++ b/wolbroadcast/hooks/addbroadcastaddresses.hook.php
@@ -19,7 +19,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class AddBroadcastAddresses extends Hook
+class AddBroadcastAddresses extends \FOG\Base\Hook
 {
     /**
      * The name of this hook.
@@ -67,7 +67,7 @@ public function __construct()
      */
     public function addBCaddr($arguments)
     {
-        $wolbroadcasts = Route::getIds(
+        $wolbroadcasts = \FOG\Router\Route::getIds(
             'wolbroadcast',
             [],
             'broadcast'
diff --git a/wolbroadcast/hooks/addwolbroadcastapi.hook.php b/wolbroadcast/hooks/addwolbroadcastapi.hook.php
index 39a5c06c..05061417 100644
--- a/wolbroadcast/hooks/addwolbroadcastapi.hook.php
+++ b/wolbroadcast/hooks/addwolbroadcastapi.hook.php
@@ -19,7 +19,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class AddWOLBroadcastAPI extends Hook
+class AddWOLBroadcastAPI extends \FOG\Base\Hook
 {
     /**
      * The name of the hook.
diff --git a/wolbroadcast/hooks/addwolbroadcastjs.hook.php b/wolbroadcast/hooks/addwolbroadcastjs.hook.php
index 38b2a327..cebe7dd9 100644
--- a/wolbroadcast/hooks/addwolbroadcastjs.hook.php
+++ b/wolbroadcast/hooks/addwolbroadcastjs.hook.php
@@ -19,7 +19,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class AddWOLBroadcastJS extends Hook
+class AddWOLBroadcastJS extends \FOG\Base\Hook
 {
     /**
      * The name of this hook.
diff --git a/wolbroadcast/hooks/addwolbroadcastmenuitem.hook.php b/wolbroadcast/hooks/addwolbroadcastmenuitem.hook.php
index bf5cbd83..b9cbb665 100644
--- a/wolbroadcast/hooks/addwolbroadcastmenuitem.hook.php
+++ b/wolbroadcast/hooks/addwolbroadcastmenuitem.hook.php
@@ -19,7 +19,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class AddWOLBroadcastMenuItem extends Hook
+class AddWOLBroadcastMenuItem extends \FOG\Base\Hook
 {
     /**
      * The name of this hook.
diff --git a/wolbroadcast/hooks/addwolbroadcasttype.hook.php b/wolbroadcast/hooks/addwolbroadcasttype.hook.php
index fd16f47b..955fe3ca 100644
--- a/wolbroadcast/hooks/addwolbroadcasttype.hook.php
+++ b/wolbroadcast/hooks/addwolbroadcasttype.hook.php
@@ -19,7 +19,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class AddWOLBroadcastType extends Hook
+class AddWOLBroadcastType extends \FOG\Base\Hook
 {
     /**
      * The name of this hook.
diff --git a/wolbroadcast/pages/wolbroadcastmanagement.page.php b/wolbroadcast/pages/wolbroadcastmanagement.page.php
index 192587c6..69b9ac00 100644
--- a/wolbroadcast/pages/wolbroadcastmanagement.page.php
+++ b/wolbroadcast/pages/wolbroadcastmanagement.page.php
@@ -19,7 +19,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class WOLBroadcastManagement extends FOGPage
+class WOLBroadcastManagement extends \FOG\Base\FOGPage
 {
     /**
      * The node this page displays with.
diff --git a/wolbroadcast/reports/wolbroadcast_report.report.php b/wolbroadcast/reports/wolbroadcast_report.report.php
index 8c77cc6a..6cef9436 100644
--- a/wolbroadcast/reports/wolbroadcast_report.report.php
+++ b/wolbroadcast/reports/wolbroadcast_report.report.php
@@ -19,7 +19,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-class Wolbroadcast_Report extends ReportManagement
+class Wolbroadcast_Report extends \FOG\ReportManagement
 {
     /**
      * The page to display.
@@ -63,9 +63,9 @@ public function file()
     public function getList()
     {
         header('Content-type: application/json');
-        Route::listem('wolbroadcast');
-        http_response_code(HTTPResponseCodes::HTTP_SUCCESS);
-        echo Route::getData();
+        \FOG\Router\Route::listem('wolbroadcast');
+        http_response_code(\FOG\Router\HTTPResponseCodes::HTTP_SUCCESS);
+        echo \FOG\Router\Route::getData();
         exit;
     }
 }