diff --git a/src/opnsense/mvc/app/config/loader.php b/src/opnsense/mvc/app/config/loader.php
index 882ee0811..27eb63330 100644
--- a/src/opnsense/mvc/app/config/loader.php
+++ b/src/opnsense/mvc/app/config/loader.php
@@ -8,6 +8,7 @@ $loader = new \Phalcon\Loader();
 $loader->registerDirs(
     array(
         $config->application->controllersDir,
-        $config->application->modelsDir
+        $config->application->modelsDir,
+        $config->application->libraryDir
     )
 )->register();
diff --git a/src/opnsense/mvc/app/models/OPNsense/Core/Backend.php b/src/opnsense/mvc/app/library/OPNsense/Core/Backend.php
similarity index 100%
rename from src/opnsense/mvc/app/models/OPNsense/Core/Backend.php
rename to src/opnsense/mvc/app/library/OPNsense/Core/Backend.php
diff --git a/src/opnsense/mvc/app/models/OPNsense/Core/Config.php b/src/opnsense/mvc/app/library/OPNsense/Core/Config.php
similarity index 100%
rename from src/opnsense/mvc/app/models/OPNsense/Core/Config.php
rename to src/opnsense/mvc/app/library/OPNsense/Core/Config.php
diff --git a/src/opnsense/mvc/app/models/OPNsense/Core/ConfigException.php b/src/opnsense/mvc/app/library/OPNsense/Core/ConfigException.php
similarity index 100%
rename from src/opnsense/mvc/app/models/OPNsense/Core/ConfigException.php
rename to src/opnsense/mvc/app/library/OPNsense/Core/ConfigException.php
diff --git a/src/opnsense/mvc/app/models/OPNsense/Core/Shell.php b/src/opnsense/mvc/app/library/OPNsense/Core/Shell.php
similarity index 100%
rename from src/opnsense/mvc/app/models/OPNsense/Core/Shell.php
rename to src/opnsense/mvc/app/library/OPNsense/Core/Shell.php
diff --git a/src/opnsense/mvc/app/models/OPNsense/Core/Singleton.php b/src/opnsense/mvc/app/library/OPNsense/Core/Singleton.php
similarity index 100%
rename from src/opnsense/mvc/app/models/OPNsense/Core/Singleton.php
rename to src/opnsense/mvc/app/library/OPNsense/Core/Singleton.php