From: Roland Haeder <roland@mxchange.org>
Date: Sat, 25 Feb 2017 14:08:14 +0000 (+0100)
Subject: Moved back out of "Generic" namespace, really no need
X-Git-Url: https://git.mxchange.org/?p=core.git;a=commitdiff_plain;h=77a30079fe9e8694514fcff26a29a0a56f9f66cd

Moved back out of "Generic" namespace, really no need

Signed-off-by: Roland Häder <roland@mxchange.org>
---

diff --git a/application/tests/class_ApplicationHelper.php b/application/tests/class_ApplicationHelper.php
index c82b00d6..a2765cc2 100644
--- a/application/tests/class_ApplicationHelper.php
+++ b/application/tests/class_ApplicationHelper.php
@@ -7,7 +7,7 @@ use CoreFramework\Manager\ManageableApplication;
 use CoreFramework\Object\BaseFrameworkSystem;
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Registry\Registerable;
-use CoreFramework\Registry\Generic\Registry;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Template\CompileableTemplate;
 
 /**
diff --git a/application/tests/classes/controller/console/class_TestsConsoleDefaultNewsController.php b/application/tests/classes/controller/console/class_TestsConsoleDefaultNewsController.php
index 355fc53f..83e9fafd 100644
--- a/application/tests/classes/controller/console/class_TestsConsoleDefaultNewsController.php
+++ b/application/tests/classes/controller/console/class_TestsConsoleDefaultNewsController.php
@@ -4,7 +4,7 @@ namespace CoreFramework\Tests\Controller;
 
 // Import framework stuff
 use CoreFramework\Controller\BaseController;
-use CoreFramework\Controller\Generic\Controller;
+use CoreFramework\Controller\Controller;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 
diff --git a/inc/main/classes/actions/html/class_HtmlLoginProfileAction.php b/inc/main/classes/actions/html/class_HtmlLoginProfileAction.php
index 8fe62d9c..9875268b 100644
--- a/inc/main/classes/actions/html/class_HtmlLoginProfileAction.php
+++ b/inc/main/classes/actions/html/class_HtmlLoginProfileAction.php
@@ -3,6 +3,7 @@
 namespace CoreFramework\Action\Login;
 
 // Import framework stuff
+use CoreFramework\Action\PerformableAction;
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Registry\Registerable;
 use CoreFramework\Request\Requestable;
@@ -30,7 +31,7 @@ use CoreFramework\Response\Responseable;
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-class HtmlLoginProfileAction extends BaseAction implements Commandable, Registerable {
+class HtmlLoginProfileAction extends BaseAction implements PerformableAction, Registerable {
 	/**
 	 * Protected constructor
 	 *
@@ -59,7 +60,7 @@ class HtmlLoginProfileAction extends BaseAction implements Commandable, Register
 	}
 
 	/**
-	 * Executes the command with given request and response objects
+	 * Executes the action with given request and response objects
 	 *
 	 * @param	$requestInstance	An instance of a class with an Requestable interface
 	 * @param	$responseInstance	An instance of a class with an Responseable interface
diff --git a/inc/main/classes/application/class_BaseApplication.php b/inc/main/classes/application/class_BaseApplication.php
index 4f977191..e638a23a 100644
--- a/inc/main/classes/application/class_BaseApplication.php
+++ b/inc/main/classes/application/class_BaseApplication.php
@@ -4,7 +4,7 @@ namespace CoreFramework\Application;
 
 // Import framework stuff
 use CoreFramework\Object\BaseFrameworkSystem;
-use CoreFramework\Registry\Generic\Registry;
+use CoreFramework\Registry\Registry;
 
 /**
  * A general application class for the ApplicationHelper classes.
diff --git a/inc/main/classes/class_BaseFrameworkSystem.php b/inc/main/classes/class_BaseFrameworkSystem.php
index 7cd7419b..ffae8184 100644
--- a/inc/main/classes/class_BaseFrameworkSystem.php
+++ b/inc/main/classes/class_BaseFrameworkSystem.php
@@ -12,7 +12,7 @@ use CoreFramework\Loader\ClassLoader;
 use CoreFramework\Manager\ManageableApplication;
 use CoreFramework\Middleware\Debug\DebugMiddleware;
 use CoreFramework\Registry\Register;
-use CoreFramework\Registry\Generic\Registry;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 use CoreFramework\Stream\Output\OutputStreamer;
diff --git a/inc/main/classes/commands/html/class_HtmlConfirmCommand.php b/inc/main/classes/commands/html/class_HtmlConfirmCommand.php
index 01cee190..526540c7 100644
--- a/inc/main/classes/commands/html/class_HtmlConfirmCommand.php
+++ b/inc/main/classes/commands/html/class_HtmlConfirmCommand.php
@@ -6,7 +6,7 @@ namespace CoreFramework\Command\Guest;
 use CoreFramework\Command\BaseCommand;
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Generic\NullPointerException;
-use CoreFramework\Registry\Generic\Registry;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 
diff --git a/inc/main/classes/commands/html/class_HtmlLoginAreaCommand.php b/inc/main/classes/commands/html/class_HtmlLoginAreaCommand.php
index 909cb92f..9bc563c0 100644
--- a/inc/main/classes/commands/html/class_HtmlLoginAreaCommand.php
+++ b/inc/main/classes/commands/html/class_HtmlLoginAreaCommand.php
@@ -6,7 +6,7 @@ namespace CoreFramework\Command\Login;
 use CoreFramework\Action\PerformableAction;
 use CoreFramework\Command\BaseCommand;
 use CoreFramework\Factory\ObjectFactory;
-use CoreFramework\Registry\Generic\Registry;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 
diff --git a/inc/main/classes/commands/html/class_HtmlLoginCommand.php b/inc/main/classes/commands/html/class_HtmlLoginCommand.php
index fefa24ae..70732468 100644
--- a/inc/main/classes/commands/html/class_HtmlLoginCommand.php
+++ b/inc/main/classes/commands/html/class_HtmlLoginCommand.php
@@ -6,7 +6,7 @@ namespace CoreFramework\Command\Login;
 use CoreFramework\Command\BaseCommand;
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Registry\Registerable;
-use CoreFramework\Registry\Generic\Registry;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 
diff --git a/inc/main/classes/commands/html/class_HtmlRegisterCommand.php b/inc/main/classes/commands/html/class_HtmlRegisterCommand.php
index 388cf4ca..aaf5c4e5 100644
--- a/inc/main/classes/commands/html/class_HtmlRegisterCommand.php
+++ b/inc/main/classes/commands/html/class_HtmlRegisterCommand.php
@@ -6,7 +6,7 @@ namespace CoreFramework\Command\Register;
 use CoreFramework\Command\BaseCommand;
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Registry\Registerable;
-use CoreFramework\Registry\Generic\Registry;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 
diff --git a/inc/main/classes/commands/html/class_HtmlResendLinkCommand.php b/inc/main/classes/commands/html/class_HtmlResendLinkCommand.php
index 57e8f64a..a8b1fc72 100644
--- a/inc/main/classes/commands/html/class_HtmlResendLinkCommand.php
+++ b/inc/main/classes/commands/html/class_HtmlResendLinkCommand.php
@@ -5,7 +5,7 @@ namespace CoreFramework\Command\Guest;
 // Import framework stuff
 use CoreFramework\Command\BaseCommand;
 use CoreFramework\Factory\ObjectFactory;
-use CoreFramework\Registry\Generic\Registry;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 
diff --git a/inc/main/classes/controller/class_BaseController.php b/inc/main/classes/controller/class_BaseController.php
index 84f2eb9a..81399137 100644
--- a/inc/main/classes/controller/class_BaseController.php
+++ b/inc/main/classes/controller/class_BaseController.php
@@ -5,7 +5,7 @@ namespace CoreFramework\Controller;
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Object\BaseFrameworkSystem;
-use CoreFramework\Registry\Generic\Registry;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Registry\Registerable;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
diff --git a/inc/main/classes/controller/console/class_ConsoleDefaultNewsController.php b/inc/main/classes/controller/console/class_ConsoleDefaultNewsController.php
index c9b9e5d1..8625a332 100644
--- a/inc/main/classes/controller/console/class_ConsoleDefaultNewsController.php
+++ b/inc/main/classes/controller/console/class_ConsoleDefaultNewsController.php
@@ -4,7 +4,7 @@ namespace CoreFramework\Controller\Default;
 
 // Import framework stuff
 use CoreFramework\Controller\BaseController;
-use CoreFramework\Controller\Generic\Controller;
+use CoreFramework\Controller\Controller;
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
diff --git a/inc/main/classes/controller/html/class_HtmlConfirmController.php b/inc/main/classes/controller/html/class_HtmlConfirmController.php
index d5477f66..0982c528 100644
--- a/inc/main/classes/controller/html/class_HtmlConfirmController.php
+++ b/inc/main/classes/controller/html/class_HtmlConfirmController.php
@@ -4,7 +4,7 @@ namespace CoreFramework\Controller\Confirm;
 
 // Import framework stuff
 use CoreFramework\Controller\BaseController;
-use CoreFramework\Controller\Generic\Controller;
+use CoreFramework\Controller\Controller;
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Response\Responseable;
 
diff --git a/inc/main/classes/controller/html/class_HtmlDefaultController.php b/inc/main/classes/controller/html/class_HtmlDefaultController.php
index 6a108016..feb18d90 100644
--- a/inc/main/classes/controller/html/class_HtmlDefaultController.php
+++ b/inc/main/classes/controller/html/class_HtmlDefaultController.php
@@ -4,7 +4,7 @@ namespace CoreFramework\Controller\Default;
 
 // Import framework stuff
 use CoreFramework\Controller\BaseController;
-use CoreFramework\Controller\Generic\Controller;
+use CoreFramework\Controller\Controller;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 
diff --git a/inc/main/classes/controller/html/class_HtmlDefaultNewsController.php b/inc/main/classes/controller/html/class_HtmlDefaultNewsController.php
index e659be7e..59d717fd 100644
--- a/inc/main/classes/controller/html/class_HtmlDefaultNewsController.php
+++ b/inc/main/classes/controller/html/class_HtmlDefaultNewsController.php
@@ -4,7 +4,7 @@ namespace CoreFramework\Controller\News;
 
 // Import framework stuff
 use CoreFramework\Controller\BaseController;
-use CoreFramework\Controller\Generic\Controller;
+use CoreFramework\Controller\Controller;
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Response\Responseable;
 
diff --git a/inc/main/classes/controller/html/class_HtmlLoginController.php b/inc/main/classes/controller/html/class_HtmlLoginController.php
index f6f9581b..181f107f 100644
--- a/inc/main/classes/controller/html/class_HtmlLoginController.php
+++ b/inc/main/classes/controller/html/class_HtmlLoginController.php
@@ -4,7 +4,7 @@ namespace CoreFramework\Controller\Login;
 
 // Import framework stuff
 use CoreFramework\Controller\BaseController;
-use CoreFramework\Controller\Generic\Controller;
+use CoreFramework\Controller\Controller;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 
diff --git a/inc/main/classes/controller/html/class_HtmlLoginFailedController.php b/inc/main/classes/controller/html/class_HtmlLoginFailedController.php
index 9d7b940e..34b52d90 100644
--- a/inc/main/classes/controller/html/class_HtmlLoginFailedController.php
+++ b/inc/main/classes/controller/html/class_HtmlLoginFailedController.php
@@ -4,7 +4,7 @@ namespace CoreFramework\Controller\Failed;
 
 // Import framework stuff
 use CoreFramework\Controller\BaseController;
-use CoreFramework\Controller\Generic\Controller;
+use CoreFramework\Controller\Controller;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 
diff --git a/inc/main/classes/controller/html/class_HtmlLogoutController.php b/inc/main/classes/controller/html/class_HtmlLogoutController.php
index 46505967..ffa9675e 100644
--- a/inc/main/classes/controller/html/class_HtmlLogoutController.php
+++ b/inc/main/classes/controller/html/class_HtmlLogoutController.php
@@ -4,7 +4,7 @@ namespace CoreFramework\Controller\Logout;
 
 // Import framework stuff
 use CoreFramework\Controller\BaseController;
-use CoreFramework\Controller\Generic\Controller;
+use CoreFramework\Controller\Controller;
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
diff --git a/inc/main/classes/controller/html/class_HtmlLogoutDoneController.php b/inc/main/classes/controller/html/class_HtmlLogoutDoneController.php
index 28460c47..1e3a2cdd 100644
--- a/inc/main/classes/controller/html/class_HtmlLogoutDoneController.php
+++ b/inc/main/classes/controller/html/class_HtmlLogoutDoneController.php
@@ -4,7 +4,7 @@ namespace CoreFramework\Controller\Logout;
 
 // Import framework stuff
 use CoreFramework\Controller\BaseController;
-use CoreFramework\Controller\Generic\Controller;
+use CoreFramework\Controller\Controller;
 use CoreFramework\Request\Requestable;
 
 /**
diff --git a/inc/main/classes/controller/html/class_HtmlProblemController.php b/inc/main/classes/controller/html/class_HtmlProblemController.php
index 3cb81435..1017a104 100644
--- a/inc/main/classes/controller/html/class_HtmlProblemController.php
+++ b/inc/main/classes/controller/html/class_HtmlProblemController.php
@@ -4,7 +4,7 @@ namespace CoreFramework\Controller\Problem;
 
 // Import framework stuff
 use CoreFramework\Controller\BaseController;
-use CoreFramework\Controller\Generic\Controller;
+use CoreFramework\Controller\Controller;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 
diff --git a/inc/main/classes/controller/html/class_HtmlRegisterController.php b/inc/main/classes/controller/html/class_HtmlRegisterController.php
index 5357cedb..e299168c 100644
--- a/inc/main/classes/controller/html/class_HtmlRegisterController.php
+++ b/inc/main/classes/controller/html/class_HtmlRegisterController.php
@@ -4,7 +4,7 @@ namespace CoreFramework\Controller\Register;
 
 // Import framework stuff
 use CoreFramework\Controller\BaseController;
-use CoreFramework\Controller\Generic\Controller;
+use CoreFramework\Controller\Controller;
 use CoreFramework\Response\Responseable;
 
 /**
diff --git a/inc/main/classes/controller/html/class_HtmlStatusController.php b/inc/main/classes/controller/html/class_HtmlStatusController.php
index 83dbe645..34901917 100644
--- a/inc/main/classes/controller/html/class_HtmlStatusController.php
+++ b/inc/main/classes/controller/html/class_HtmlStatusController.php
@@ -4,7 +4,7 @@ namespace CoreFramework\Controller\Status;
 
 // Import framework stuff
 use CoreFramework\Controller\BaseController;
-use CoreFramework\Controller\Generic\Controller;
+use CoreFramework\Controller\Controller;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 
diff --git a/inc/main/classes/controller/html/form/class_HtmlDoFormController.php b/inc/main/classes/controller/html/form/class_HtmlDoFormController.php
index 379300c5..169f0e52 100644
--- a/inc/main/classes/controller/html/form/class_HtmlDoFormController.php
+++ b/inc/main/classes/controller/html/form/class_HtmlDoFormController.php
@@ -4,7 +4,7 @@ namespace CoreFramework\Controller\Form;
 
 // Import framework stuff
 use CoreFramework\Controller\BaseController;
-use CoreFramework\Controller\Generic\Controller;
+use CoreFramework\Controller\Controller;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 
diff --git a/inc/main/classes/controller/html/login/class_HtmlLoginAreaController.php b/inc/main/classes/controller/html/login/class_HtmlLoginAreaController.php
index 0b4608a0..251f6db3 100644
--- a/inc/main/classes/controller/html/login/class_HtmlLoginAreaController.php
+++ b/inc/main/classes/controller/html/login/class_HtmlLoginAreaController.php
@@ -4,7 +4,7 @@ namespace CoreFramework\Controller\Login;
 
 // Import framework stuff
 use CoreFramework\Controller\BaseController;
-use CoreFramework\Controller\Generic\Controller;
+use CoreFramework\Controller\Controller;
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
diff --git a/inc/main/classes/controller/image/captcha/class_ImageCodeCaptchaController.php b/inc/main/classes/controller/image/captcha/class_ImageCodeCaptchaController.php
index 165dfd76..4fa888de 100644
--- a/inc/main/classes/controller/image/captcha/class_ImageCodeCaptchaController.php
+++ b/inc/main/classes/controller/image/captcha/class_ImageCodeCaptchaController.php
@@ -4,7 +4,7 @@ namespace CoreFramework\Controller\Image\Captcha;
 
 // Import framework stuff
 use CoreFramework\Controller\BaseController;
-use CoreFramework\Controller\Generic\Controller;
+use CoreFramework\Controller\Controller;
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
diff --git a/inc/main/classes/controller/image/class_ImageDefaultController.php b/inc/main/classes/controller/image/class_ImageDefaultController.php
index c1e22b8c..953cca0e 100644
--- a/inc/main/classes/controller/image/class_ImageDefaultController.php
+++ b/inc/main/classes/controller/image/class_ImageDefaultController.php
@@ -4,7 +4,7 @@ namespace CoreFramework\Controller\Default;
 
 // Import framework stuff
 use CoreFramework\Controller\BaseController;
-use CoreFramework\Controller\Generic\Controller;
+use CoreFramework\Controller\Controller;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 
diff --git a/inc/main/classes/factories/client/class_ClientFactory.php b/inc/main/classes/factories/client/class_ClientFactory.php
index 2a49abac..38f1bf83 100644
--- a/inc/main/classes/factories/client/class_ClientFactory.php
+++ b/inc/main/classes/factories/client/class_ClientFactory.php
@@ -4,7 +4,7 @@ namespace CoreFramework\Factory\Client;
 
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
-use CoreFramework\Registry\Generic\Registry;
+use CoreFramework\Registry\Registry;
 
 /**
  * An object factory for clients
diff --git a/inc/main/classes/factories/database/class_DatabaseWrapperFactory.php b/inc/main/classes/factories/database/class_DatabaseWrapperFactory.php
index 39a6668f..f0cc20bd 100644
--- a/inc/main/classes/factories/database/class_DatabaseWrapperFactory.php
+++ b/inc/main/classes/factories/database/class_DatabaseWrapperFactory.php
@@ -4,7 +4,7 @@ namespace CoreFramework\Factory\Database\Wrapper;
 
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
-use CoreFramework\Registry\Generic\Registry;
+use CoreFramework\Registry\Registry;
 
 /**
  * A factory class for socket registries
diff --git a/inc/main/classes/factories/index/class_FileStackIndexFactory.php b/inc/main/classes/factories/index/class_FileStackIndexFactory.php
index 32af8142..612bf52b 100644
--- a/inc/main/classes/factories/index/class_FileStackIndexFactory.php
+++ b/inc/main/classes/factories/index/class_FileStackIndexFactory.php
@@ -4,7 +4,7 @@ namespace CoreFramework\Factory\Filesystem\Stack;
 
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
-use CoreFramework\Registry\Generic\Registry;
+use CoreFramework\Registry\Registry;
 
 /**
  * A factory class for file-based stack indexes
diff --git a/inc/main/classes/factories/login/class_LoginFactory.php b/inc/main/classes/factories/login/class_LoginFactory.php
index bc056503..e999fcd7 100644
--- a/inc/main/classes/factories/login/class_LoginFactory.php
+++ b/inc/main/classes/factories/login/class_LoginFactory.php
@@ -4,7 +4,7 @@ namespace CoreFramework\Factory\Login;
 
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
-use CoreFramework\Registry\Generic\Registry;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 
 /**
diff --git a/inc/main/classes/factories/registry/class_SocketRegistryFactory.php b/inc/main/classes/factories/registry/class_SocketRegistryFactory.php
index 70c2d0ee..bf6f0a56 100644
--- a/inc/main/classes/factories/registry/class_SocketRegistryFactory.php
+++ b/inc/main/classes/factories/registry/class_SocketRegistryFactory.php
@@ -4,7 +4,7 @@ namespace CoreFramework\Factory\Registry;
 
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
-use CoreFramework\Registry\Generic\Registry;
+use CoreFramework\Registry\Registry;
 
 /**
  * A factory class for socket registries
diff --git a/inc/main/classes/factories/stacks/class_FileStackFactory.php b/inc/main/classes/factories/stacks/class_FileStackFactory.php
index 4116b4e1..4394ab4c 100644
--- a/inc/main/classes/factories/stacks/class_FileStackFactory.php
+++ b/inc/main/classes/factories/stacks/class_FileStackFactory.php
@@ -5,7 +5,7 @@ namespace CoreFramework\Factory\Stack;
 // Import framework stuff
 use CoreFramework\Configuration\FrameworkConfiguration;
 use CoreFramework\Factory\ObjectFactory;
-use CoreFramework\Registry\Generic\Registry;
+use CoreFramework\Registry\Registry;
 
 /**
  * A factory class for file-based stacks
diff --git a/inc/main/classes/factories/user/class_UserFactory.php b/inc/main/classes/factories/user/class_UserFactory.php
index 8abdd293..3e15d028 100644
--- a/inc/main/classes/factories/user/class_UserFactory.php
+++ b/inc/main/classes/factories/user/class_UserFactory.php
@@ -5,7 +5,7 @@ namespace CoreFramework\Factory\User;
 // Import framework stuff
 use CoreFramework\Configuration\FrameworkConfiguration;
 use CoreFramework\Factory\ObjectFactory;
-use CoreFramework\Registry\Generic\Registry;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 
 /**
diff --git a/inc/main/classes/factories/xml/class_XmlTemplateEngineFactory.php b/inc/main/classes/factories/xml/class_XmlTemplateEngineFactory.php
index 7085ea5e..2b82f60a 100644
--- a/inc/main/classes/factories/xml/class_XmlTemplateEngineFactory.php
+++ b/inc/main/classes/factories/xml/class_XmlTemplateEngineFactory.php
@@ -4,7 +4,7 @@ namespace CoreFramework\Factory\Template;
 
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
-use CoreFramework\Registry\Generic\Registry;
+use CoreFramework\Registry\Registry;
 
 /**
  * A factory class for XML template engines. All instances generated by this
diff --git a/inc/main/classes/filter/auth/class_UserAuthFilter.php b/inc/main/classes/filter/auth/class_UserAuthFilter.php
index 5ed54d72..98eb3f1e 100644
--- a/inc/main/classes/filter/auth/class_UserAuthFilter.php
+++ b/inc/main/classes/filter/auth/class_UserAuthFilter.php
@@ -5,7 +5,7 @@ namespace CoreFramework\Filter\User\Auth;
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Loader\NoClassException;
-use CoreFramework\Registry\Generic\Registry;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 
diff --git a/inc/main/classes/filter/change/class_EmailChangeFilter.php b/inc/main/classes/filter/change/class_EmailChangeFilter.php
index 700e9788..2f2188ed 100644
--- a/inc/main/classes/filter/change/class_EmailChangeFilter.php
+++ b/inc/main/classes/filter/change/class_EmailChangeFilter.php
@@ -3,7 +3,7 @@
 namespace CoreFramework\Filter\Change\Email;
 
 // Import framework stuff
-use CoreFramework\Registry\Generic\Registry;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 
diff --git a/inc/main/classes/filter/change/class_PasswordChangeFilter.php b/inc/main/classes/filter/change/class_PasswordChangeFilter.php
index d171a584..c584d283 100644
--- a/inc/main/classes/filter/change/class_PasswordChangeFilter.php
+++ b/inc/main/classes/filter/change/class_PasswordChangeFilter.php
@@ -3,7 +3,7 @@
 namespace CoreFramework\Filter\Change\Email;
 
 // Import framework stuff
-use CoreFramework\Registry\Generic\Registry;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 
diff --git a/inc/main/classes/filter/news/class_NewsDownloadFilter.php b/inc/main/classes/filter/news/class_NewsDownloadFilter.php
index 82324a27..58df0f5c 100644
--- a/inc/main/classes/filter/news/class_NewsDownloadFilter.php
+++ b/inc/main/classes/filter/news/class_NewsDownloadFilter.php
@@ -3,7 +3,7 @@
 namespace CoreFramework\Filter\News;
 
 // Import framework stuff
-use CoreFramework\Registry\Generic\Registry;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 
diff --git a/inc/main/classes/filter/payment/class_PaymentDiscoveryFilter.php b/inc/main/classes/filter/payment/class_PaymentDiscoveryFilter.php
index 426976bc..44a31f1a 100644
--- a/inc/main/classes/filter/payment/class_PaymentDiscoveryFilter.php
+++ b/inc/main/classes/filter/payment/class_PaymentDiscoveryFilter.php
@@ -7,7 +7,7 @@ use CoreFramework\Action\PerformableAction;
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Generic\NullPointerException;
 use CoreFramework\Loader\NoClassException;
-use CoreFramework\Registry\Generic\Registry;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 
diff --git a/inc/main/classes/filter/update/class_UserStatusConfimedUpdateFilter.php b/inc/main/classes/filter/update/class_UserStatusConfimedUpdateFilter.php
index 00c8bd66..f6142fbf 100644
--- a/inc/main/classes/filter/update/class_UserStatusConfimedUpdateFilter.php
+++ b/inc/main/classes/filter/update/class_UserStatusConfimedUpdateFilter.php
@@ -3,7 +3,7 @@
 namespace CoreFramework\Filter\User\Status;
 
 // Import framework stuff
-use CoreFramework\Registry\Generic\Registry;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 
diff --git a/inc/main/classes/filter/update/class_UserUpdateFilter.php b/inc/main/classes/filter/update/class_UserUpdateFilter.php
index 390366bb..a557dc7f 100644
--- a/inc/main/classes/filter/update/class_UserUpdateFilter.php
+++ b/inc/main/classes/filter/update/class_UserUpdateFilter.php
@@ -3,7 +3,7 @@
 namespace CoreFramework\Filter\User;
 
 // Import framework stuff
-use CoreFramework\Registry\Generic\Registry;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 
diff --git a/inc/main/classes/filter/validator/class_EmailValidatorFilter.php b/inc/main/classes/filter/validator/class_EmailValidatorFilter.php
index d60647b8..db4f3602 100644
--- a/inc/main/classes/filter/validator/class_EmailValidatorFilter.php
+++ b/inc/main/classes/filter/validator/class_EmailValidatorFilter.php
@@ -3,7 +3,7 @@
 namespace CoreFramework\Filter\Validator\Email;
 
 // Import framework stuff
-use CoreFramework\Registry\Generic\Registry;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 
diff --git a/inc/main/classes/filter/validator/class_UserNameValidatorFilter.php b/inc/main/classes/filter/validator/class_UserNameValidatorFilter.php
index 3d7abafa..950a0650 100644
--- a/inc/main/classes/filter/validator/class_UserNameValidatorFilter.php
+++ b/inc/main/classes/filter/validator/class_UserNameValidatorFilter.php
@@ -3,7 +3,7 @@
 namespace CoreFramework\Filter\Validator\Username;
 
 // Import framework stuff
-use CoreFramework\Registry\Generic\Registry;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 
diff --git a/inc/main/classes/filter/verifier/class_AccountPasswordVerifierFilter.php b/inc/main/classes/filter/verifier/class_AccountPasswordVerifierFilter.php
index dba14fad..ff92428d 100644
--- a/inc/main/classes/filter/verifier/class_AccountPasswordVerifierFilter.php
+++ b/inc/main/classes/filter/verifier/class_AccountPasswordVerifierFilter.php
@@ -4,7 +4,7 @@ namespace CoreFramework\Filter\Verifier\Password;
 
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
-use CoreFramework\Registry\Generic\Registry;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 
diff --git a/inc/main/classes/filter/verifier/class_ConfirmCodeVerifierFilter.php b/inc/main/classes/filter/verifier/class_ConfirmCodeVerifierFilter.php
index 7689bdcd..9ebc209a 100644
--- a/inc/main/classes/filter/verifier/class_ConfirmCodeVerifierFilter.php
+++ b/inc/main/classes/filter/verifier/class_ConfirmCodeVerifierFilter.php
@@ -3,7 +3,7 @@
 namespace CoreFramework\Filter\Verifier\Confirmation;
 
 // Import framework stuff
-use CoreFramework\Registry\Generic\Registry;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 
diff --git a/inc/main/classes/filter/verifier/class_UserGuestVerifierFilter.php b/inc/main/classes/filter/verifier/class_UserGuestVerifierFilter.php
index cc8c4ec3..3405542d 100644
--- a/inc/main/classes/filter/verifier/class_UserGuestVerifierFilter.php
+++ b/inc/main/classes/filter/verifier/class_UserGuestVerifierFilter.php
@@ -3,7 +3,7 @@
 namespace CoreFramework\Filter\Verifier\User;
 
 // Import framework stuff
-use CoreFramework\Registry\Generic\Registry;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 
diff --git a/inc/main/classes/filter/verifier/class_UserNameVerifierFilter.php b/inc/main/classes/filter/verifier/class_UserNameVerifierFilter.php
index ac56acfa..44fca1b1 100644
--- a/inc/main/classes/filter/verifier/class_UserNameVerifierFilter.php
+++ b/inc/main/classes/filter/verifier/class_UserNameVerifierFilter.php
@@ -3,7 +3,7 @@
 namespace CoreFramework\Filter\Verifier\User;
 
 // Import framework stuff
-use CoreFramework\Registry\Generic\Registry;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 
diff --git a/inc/main/classes/filter/verifier/class_UserStatusVerifierFilter.php b/inc/main/classes/filter/verifier/class_UserStatusVerifierFilter.php
index 27150412..ba9cf7ef 100644
--- a/inc/main/classes/filter/verifier/class_UserStatusVerifierFilter.php
+++ b/inc/main/classes/filter/verifier/class_UserStatusVerifierFilter.php
@@ -3,7 +3,7 @@
 namespace CoreFramework\Filter\Verifier\User;
 
 // Import framework stuff
-use CoreFramework\Registry\Generic\Registry;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 
diff --git a/inc/main/classes/filter/verifier/class_UserUnconfirmedVerifierFilter.php b/inc/main/classes/filter/verifier/class_UserUnconfirmedVerifierFilter.php
index f714fc85..628aa650 100644
--- a/inc/main/classes/filter/verifier/class_UserUnconfirmedVerifierFilter.php
+++ b/inc/main/classes/filter/verifier/class_UserUnconfirmedVerifierFilter.php
@@ -3,7 +3,7 @@
 namespace CoreFramework\Filter\Verifier\User;
 
 // Import framework stuff
-use CoreFramework\Registry\Generic\Registry;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 
diff --git a/inc/main/classes/helper/class_BaseHelper.php b/inc/main/classes/helper/class_BaseHelper.php
index 34958ab0..b0948b67 100644
--- a/inc/main/classes/helper/class_BaseHelper.php
+++ b/inc/main/classes/helper/class_BaseHelper.php
@@ -7,7 +7,7 @@ use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Generic\FrameworkInterface;
 use CoreFramework\Generic\NullPointerException;
 use CoreFramework\Object\BaseFrameworkSystem;
-use CoreFramework\Registry\Generic\Registry;
+use CoreFramework\Registry\Registry;
 
 /**
  * A generic helper class with generic methods
diff --git a/inc/main/classes/helper/html/forms/class_HtmlFormHelper.php b/inc/main/classes/helper/html/forms/class_HtmlFormHelper.php
index c56706e3..8ec16e08 100644
--- a/inc/main/classes/helper/html/forms/class_HtmlFormHelper.php
+++ b/inc/main/classes/helper/html/forms/class_HtmlFormHelper.php
@@ -5,7 +5,7 @@ namespace CoreFramework\Helper;
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Generic\NullPointerException;
-use CoreFramework\Registry\Generic\Registry;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Template\CompileableTemplate;
 
 /**
diff --git a/inc/main/classes/helper/html/links/class_HtmlLinkHelper.php b/inc/main/classes/helper/html/links/class_HtmlLinkHelper.php
index ee6e54ff..f38d05e2 100644
--- a/inc/main/classes/helper/html/links/class_HtmlLinkHelper.php
+++ b/inc/main/classes/helper/html/links/class_HtmlLinkHelper.php
@@ -5,7 +5,7 @@ namespace CoreFramework\Helper;
 // Import framework stuff
 use CoreFramework\Configuration\FrameworkConfiguration;
 use CoreFramework\Generic\NullPointerException;
-use CoreFramework\Registry\Generic\Registry;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Template\CompileableTemplate;
 
 /**
diff --git a/inc/main/classes/language/class_LanguageSystem.php b/inc/main/classes/language/class_LanguageSystem.php
index ed93bb0b..0c2875ac 100644
--- a/inc/main/classes/language/class_LanguageSystem.php
+++ b/inc/main/classes/language/class_LanguageSystem.php
@@ -6,7 +6,7 @@ namespace CoreFramework\Localization;
 use CoreFramework\Configuration\FrameworkConfiguration;
 use CoreFramework\Object\BaseFrameworkSystem;
 use CoreFramework\Registry\Registerable;
-use CoreFramework\Registry\Generic\Registry;
+use CoreFramework\Registry\Registry;
 
 /**
  * The language sub-system for handling language strings being used in the
diff --git a/inc/main/classes/registry/generic/class_Registry.php b/inc/main/classes/registry/generic/class_Registry.php
index 3647dfc7..da4c931a 100644
--- a/inc/main/classes/registry/generic/class_Registry.php
+++ b/inc/main/classes/registry/generic/class_Registry.php
@@ -1,6 +1,6 @@
 <?php
 // Own namespace
-namespace CoreFramework\Registry\Generic;
+namespace CoreFramework\Registry;
 
 // Import framework stuff
 use CoreFramework\Registry\BaseRegistry;
diff --git a/inc/main/classes/resolver/command/class_BaseCommandResolver.php b/inc/main/classes/resolver/command/class_BaseCommandResolver.php
index 5f948a56..6e469a30 100644
--- a/inc/main/classes/resolver/command/class_BaseCommandResolver.php
+++ b/inc/main/classes/resolver/command/class_BaseCommandResolver.php
@@ -3,6 +3,7 @@
 namespace CoreFramework\Resolver\Command;
 
 // Import framework stuff
+use CoreFramework\Command\Commandable;
 use CoreFramework\Command\InvalidCommandException;
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Request\Requestable;
diff --git a/inc/main/classes/resolver/controller/class_BaseControllerResolver.php b/inc/main/classes/resolver/controller/class_BaseControllerResolver.php
index 6f2da6fe..97d3607a 100644
--- a/inc/main/classes/resolver/controller/class_BaseControllerResolver.php
+++ b/inc/main/classes/resolver/controller/class_BaseControllerResolver.php
@@ -4,7 +4,7 @@ namespace CoreFramework\Resolver\Controller;
 
 // Import framework stuff
 use CoreFramework\Controller\DefaultControllerException;
-use CoreFramework\Controller\Generic\Controller;
+use CoreFramework\Controller\Controller;
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Resolver\BaseResolver;
 use CoreFramework\Resolver\Controller\ControllerResolver;
diff --git a/inc/main/classes/response/class_BaseResponse.php b/inc/main/classes/response/class_BaseResponse.php
index d0925c14..bb21e391 100644
--- a/inc/main/classes/response/class_BaseResponse.php
+++ b/inc/main/classes/response/class_BaseResponse.php
@@ -4,7 +4,7 @@ namespace CoreFramework\Response;
 
 // Import framework stuff
 use CoreFramework\Object\BaseFrameworkSystem;
-use CoreFramework\Registry\Generic\Registry;
+use CoreFramework\Registry\Registry;
 
 /**
  * A generic request class
diff --git a/inc/main/classes/template/console/class_ConsoleTemplateEngine.php b/inc/main/classes/template/console/class_ConsoleTemplateEngine.php
index be70a160..09aadd22 100644
--- a/inc/main/classes/template/console/class_ConsoleTemplateEngine.php
+++ b/inc/main/classes/template/console/class_ConsoleTemplateEngine.php
@@ -3,7 +3,7 @@
 namespace CoreFramework\Template\Engine;
 
 // Import framework stuff
-use CoreFramework\Registry\Generic\Registry;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Template\CompileableTemplate;
 
 /**
diff --git a/inc/main/classes/template/html/class_HtmlTemplateEngine.php b/inc/main/classes/template/html/class_HtmlTemplateEngine.php
index 9d7e5057..32b16fad 100644
--- a/inc/main/classes/template/html/class_HtmlTemplateEngine.php
+++ b/inc/main/classes/template/html/class_HtmlTemplateEngine.php
@@ -3,7 +3,7 @@
 namespace CoreFramework\Template\Engine;
 
 // Import framework stuff
-use CoreFramework\Registry\Generic\Registry;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Template\CompileableTemplate;
 
 /**
diff --git a/inc/main/classes/template/image/class_ImageTemplateEngine.php b/inc/main/classes/template/image/class_ImageTemplateEngine.php
index b32963dd..c438b049 100644
--- a/inc/main/classes/template/image/class_ImageTemplateEngine.php
+++ b/inc/main/classes/template/image/class_ImageTemplateEngine.php
@@ -4,7 +4,7 @@ namespace CoreFramework\Template\Engine;
 
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
-use CoreFramework\Registry\Generic\Registry;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Response\Responseable;
 use CoreFramework\Template\CompileableTemplate;
 
diff --git a/inc/main/classes/template/mail/class_MailTemplateEngine.php b/inc/main/classes/template/mail/class_MailTemplateEngine.php
index 7584dc7e..8f031a85 100644
--- a/inc/main/classes/template/mail/class_MailTemplateEngine.php
+++ b/inc/main/classes/template/mail/class_MailTemplateEngine.php
@@ -3,7 +3,7 @@
 namespace CoreFramework\Template\Engine;
 
 // Import framework stuff
-use CoreFramework\Registry\Generic\Registry;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Response\Responseable;
 use CoreFramework\Template\CompileableTemplate;
 
diff --git a/inc/main/classes/template/menu/class_MenuTemplateEngine.php b/inc/main/classes/template/menu/class_MenuTemplateEngine.php
index f00cb5b7..64ab5b3c 100644
--- a/inc/main/classes/template/menu/class_MenuTemplateEngine.php
+++ b/inc/main/classes/template/menu/class_MenuTemplateEngine.php
@@ -4,7 +4,7 @@ namespace CoreFramework\Template\Engine;
 
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
-use CoreFramework\Registry\Generic\Registry;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Template\CompileableTemplate;
 
 /**
diff --git a/inc/main/interfaces/controller/class_Controller.php b/inc/main/interfaces/controller/class_Controller.php
index e5a89457..0a2d52c4 100644
--- a/inc/main/interfaces/controller/class_Controller.php
+++ b/inc/main/interfaces/controller/class_Controller.php
@@ -1,6 +1,6 @@
 <?php
 // Own namespace
-namespace CoreFramework\Controller\Generic;
+namespace CoreFramework\Controller;
 
 // Import framework stuff
 use CoreFramework\Generic\FrameworkInterface;
diff --git a/inc/main/interfaces/resolver/actions/class_ActionResolver.php b/inc/main/interfaces/resolver/actions/class_ActionResolver.php
index ec97b79a..c63382fb 100644
--- a/inc/main/interfaces/resolver/actions/class_ActionResolver.php
+++ b/inc/main/interfaces/resolver/actions/class_ActionResolver.php
@@ -4,7 +4,7 @@ namespace CoreFramework\Resolver\Action;
 
 // Import framework stuff
 use CoreFramework\Request\Requestable;
-use CoreFramework\Resolver\Generic\Resolver;
+use CoreFramework\Resolver\Resolver;
 
 /**
  * An instance for action resolver classes
diff --git a/inc/main/interfaces/resolver/class_Resolver.php b/inc/main/interfaces/resolver/class_Resolver.php
index 437bbb86..e06bdd43 100644
--- a/inc/main/interfaces/resolver/class_Resolver.php
+++ b/inc/main/interfaces/resolver/class_Resolver.php
@@ -1,6 +1,6 @@
 <?php
 // Own namespace
-namespace CoreFramework\Resolver\Generic;
+namespace CoreFramework\Resolver;
 
 // Import framework stuff
 use CoreFramework\Generic\FrameworkInterface;
diff --git a/inc/main/interfaces/resolver/commands/class_CommandResolver.php b/inc/main/interfaces/resolver/commands/class_CommandResolver.php
index 5d5ca170..01677a3f 100644
--- a/inc/main/interfaces/resolver/commands/class_CommandResolver.php
+++ b/inc/main/interfaces/resolver/commands/class_CommandResolver.php
@@ -4,7 +4,7 @@ namespace CoreFramework\Resolver\Command;
 
 // Import framework stuff
 use CoreFramework\Request\Requestable;
-use CoreFramework\Resolver\Generic\Resolver;
+use CoreFramework\Resolver\Resolver;
 
 /**
  * An instance for command resolver classes
diff --git a/inc/main/interfaces/resolver/controller/class_ControllerResolver.php b/inc/main/interfaces/resolver/controller/class_ControllerResolver.php
index ff8f5b61..ff5e984b 100644
--- a/inc/main/interfaces/resolver/controller/class_ControllerResolver.php
+++ b/inc/main/interfaces/resolver/controller/class_ControllerResolver.php
@@ -4,7 +4,7 @@ namespace CoreFramework\Resolver\Controller;
 
 // Import framework stuff
 use CoreFramework\Resolver\Controller\ControllerResolver;
-use CoreFramework\Resolver\Generic\Resolver;
+use CoreFramework\Resolver\Resolver;
 
 /**
  * An instance for controller resolver classes
diff --git a/inc/main/interfaces/resolver/state/class_StateResolver.php b/inc/main/interfaces/resolver/state/class_StateResolver.php
index d9b8707a..9c8b952e 100644
--- a/inc/main/interfaces/resolver/state/class_StateResolver.php
+++ b/inc/main/interfaces/resolver/state/class_StateResolver.php
@@ -3,7 +3,7 @@
 namespace CoreFramework\Resolver\State;
 
 // Import framework stuff
-use CoreFramework\Resolver\Generic\Resolver;
+use CoreFramework\Resolver\Resolver;
 
 /**
  * An instance for state resolver classes