From: Roland Häder <roland@mxchange.org>
Date: Mon, 1 Jan 2018 04:23:32 +0000 (+0100)
Subject: Next wave:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=2f13b8829ca1aaa76fe28448223230502adfb93f;p=city.git

Next wave:
- "imported" classes/interfaces
- created new namespaces
- updated configuration entries

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

diff --git a/application/city/classes/city_daemon/class_ b/application/city/classes/city_daemon/class_
index 3733a98..8e70ece 100644
--- a/application/city/classes/city_daemon/class_
+++ b/application/city/classes/city_daemon/class_
@@ -2,7 +2,11 @@
 // Own namespace
 namespace Org\Mxchange\City\Daemon\Simulation;
 
+// Import own stuff
+use Org\Mxchange\City\Helper\CityHelper;
+
 // Import framework stuff
+use Org\Mxchange\CoreFramework\Handler\Task\HandleableTask;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 
 /**
diff --git a/application/city/classes/city_daemon/class_BaseCityDaemon.php b/application/city/classes/city_daemon/class_BaseCityDaemon.php
index 2d17669..9d7302a 100644
--- a/application/city/classes/city_daemon/class_BaseCityDaemon.php
+++ b/application/city/classes/city_daemon/class_BaseCityDaemon.php
@@ -2,8 +2,15 @@
 // Own namespace
 namespace Org\Mxchange\City\Daemon;
 
+// Import own stuff
+use Org\Mxchange\City\Generic\BaseCitySystem;
+
 // Import framework stuff
+use Org\Mxchange\CoreFramework\Criteria\Add\AddableCriteria;
+use Org\Mxchange\CoreFramework\Criteria\Storing\StoreableCriteria;
+use Org\Mxchange\CoreFramework\Database\Updateable;
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Registry\Registry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
diff --git a/application/city/classes/city_daemon/default/class_SimulationDefaultCityDaemon.php b/application/city/classes/city_daemon/default/class_SimulationDefaultCityDaemon.php
index 6e278ec..2820158 100644
--- a/application/city/classes/city_daemon/default/class_SimulationDefaultCityDaemon.php
+++ b/application/city/classes/city_daemon/default/class_SimulationDefaultCityDaemon.php
@@ -4,9 +4,12 @@ namespace Org\Mxchange\City\Daemon\Simulation;
 
 // Import own stuff
 use Org\Mxchange\City\Daemon\BaseCityDaemon;
+use Org\Mxchange\City\Helper\CityHelper;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Handler\Task\HandleableTask;
+use Org\Mxchange\CoreFramework\Registry\Registry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 
 /**
diff --git a/application/city/classes/class_ b/application/city/classes/class_
index 81c9847..408811f 100644
--- a/application/city/classes/class_
+++ b/application/city/classes/class_
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Org\Mxchange\City\;
+
+// Import own stuff
+use Org\Mxchange\City\Generic\BaseCitySystem;
+
 /**
  * A ??? city class
  *
diff --git a/application/city/classes/class_Base b/application/city/classes/class_Base
index 75f0934..2b83c98 100644
--- a/application/city/classes/class_Base
+++ b/application/city/classes/class_Base
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Org\Mxchange\City\;
+
+// Import own stuff
+use Org\Mxchange\City\Generic\BaseCitySystem;
+
 /**
  * A general ??? class
  *
diff --git a/application/city/classes/class_BaseCitySystem.php b/application/city/classes/class_BaseCitySystem.php
index f4448a0..f44083a 100644
--- a/application/city/classes/class_BaseCitySystem.php
+++ b/application/city/classes/class_BaseCitySystem.php
@@ -1,4 +1,13 @@
 <?php
+// Own namespace
+namespace Org\Mxchange\City\Generic;
+
+// Import own stuff
+use Org\Mxchange\City\Helper\CityHelper;
+
+// Import framework stuff
+use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
+
 /**
  * A general city (simulation) system class
  *
diff --git a/application/city/classes/commands/console/class_CityConsoleDaemonCommand.php b/application/city/classes/commands/console/class_CityConsoleDaemonCommand.php
index 684cc1a..3262575 100644
--- a/application/city/classes/commands/console/class_CityConsoleDaemonCommand.php
+++ b/application/city/classes/commands/console/class_CityConsoleDaemonCommand.php
@@ -2,11 +2,15 @@
 // Own namespace
 namespace Org\Mxchange\City\Command;
 
+// Import own stuff
+use Org\Mxchange\City\Daemon\Factory\CityDaemonFactory;
+
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Command\BaseCommand;
 use Org\Mxchange\CoreFramework\Command\Commandable;
 use Org\Mxchange\CoreFramework\Controller\Controller;
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Registry\Registry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Resolver\Command\CommandResolver;
 use Org\Mxchange\CoreFramework\Response\Responseable;
diff --git a/application/city/classes/commands/html/class_CityHtmlConfirmCommand.php b/application/city/classes/commands/html/class_CityHtmlConfirmCommand.php
index e3f1505..1dc4b43 100644
--- a/application/city/classes/commands/html/class_CityHtmlConfirmCommand.php
+++ b/application/city/classes/commands/html/class_CityHtmlConfirmCommand.php
@@ -6,6 +6,7 @@ namespace Org\Mxchange\City\Command;
 use Org\Mxchange\CoreFramework\Command\BaseCommand;
 use Org\Mxchange\CoreFramework\Command\Commandable;
 use Org\Mxchange\CoreFramework\Controller\Controller;
+use Org\Mxchange\CoreFramework\Registry\Registry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Resolver\Command\CommandResolver;
 use Org\Mxchange\CoreFramework\Response\Responseable;
diff --git a/application/city/classes/commands/html/class_CityHtmlLoginAreaCommand.php b/application/city/classes/commands/html/class_CityHtmlLoginAreaCommand.php
index 073f0e3..024f86d 100644
--- a/application/city/classes/commands/html/class_CityHtmlLoginAreaCommand.php
+++ b/application/city/classes/commands/html/class_CityHtmlLoginAreaCommand.php
@@ -4,6 +4,7 @@ namespace Org\Mxchange\City\Command;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Controller\Controller;
+use Org\Mxchange\CoreFramework\Registry\Registry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Resolver\Command\CommandResolver;
 use Org\Mxchange\CoreFramework\Response\Responseable;
diff --git a/application/city/classes/commands/html/class_CityHtmlResendLinkCommand.php b/application/city/classes/commands/html/class_CityHtmlResendLinkCommand.php
index 3ffce95..75d6adf 100644
--- a/application/city/classes/commands/html/class_CityHtmlResendLinkCommand.php
+++ b/application/city/classes/commands/html/class_CityHtmlResendLinkCommand.php
@@ -7,6 +7,7 @@ use Org\Mxchange\CoreFramework\Command\BaseCommand;
 use Org\Mxchange\CoreFramework\Command\Commandable;
 use Org\Mxchange\CoreFramework\Controller\Controller;
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Registry\Registry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Resolver\Command\CommandResolver;
 use Org\Mxchange\CoreFramework\Response\Responseable;
diff --git a/application/city/classes/controller/console/class_CityConsoleDefaultNewsController.php b/application/city/classes/controller/console/class_CityConsoleDefaultNewsController.php
index d5e7113..761b658 100644
--- a/application/city/classes/controller/console/class_CityConsoleDefaultNewsController.php
+++ b/application/city/classes/controller/console/class_CityConsoleDefaultNewsController.php
@@ -6,6 +6,7 @@ namespace Org\Mxchange\City\Controller;
 use Org\Mxchange\CoreFramework\Controller\BaseController;
 use Org\Mxchange\CoreFramework\Controller\Controller;
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Filter\Filterable;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Resolver\Command\CommandResolver;
 use Org\Mxchange\CoreFramework\Response\Responseable;
diff --git a/application/city/classes/database/frontend/city/class_CityInformationDatabaseWrapper.php b/application/city/classes/database/frontend/city/class_CityInformationDatabaseWrapper.php
index d9acf4b..8db2bbb 100644
--- a/application/city/classes/database/frontend/city/class_CityInformationDatabaseWrapper.php
+++ b/application/city/classes/database/frontend/city/class_CityInformationDatabaseWrapper.php
@@ -4,9 +4,11 @@ namespace Org\Mxchange\City\Database\Frontend\Information;
 
 // Import own stuff
 use Org\Mxchange\City\Daemon\BaseCityDaemon;
+use Org\Mxchange\City\Helper\CityHelper;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Registry\Registry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 
 /**
diff --git a/application/city/classes/database/frontend/region/class_RegionInformationDatabaseWrapper.php b/application/city/classes/database/frontend/region/class_RegionInformationDatabaseWrapper.php
index 6fbd824..e51bf14 100644
--- a/application/city/classes/database/frontend/region/class_RegionInformationDatabaseWrapper.php
+++ b/application/city/classes/database/frontend/region/class_RegionInformationDatabaseWrapper.php
@@ -4,6 +4,7 @@ namespace Org\Mxchange\City\Database\Frontend\RegionInformation;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Registry\Registry;
 
 /**
  * A database wrapper for region informations
diff --git a/application/city/classes/database/frontend/region_map/class_RegionMapDatabaseWrapper.php b/application/city/classes/database/frontend/region_map/class_RegionMapDatabaseWrapper.php
index c2e4b30..b8fa671 100644
--- a/application/city/classes/database/frontend/region_map/class_RegionMapDatabaseWrapper.php
+++ b/application/city/classes/database/frontend/region_map/class_RegionMapDatabaseWrapper.php
@@ -4,6 +4,7 @@ namespace Org\Mxchange\City\Database\Frontend\Region;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Registry\Registry;
 
 /**
  * A database wrapper for region maps
diff --git a/application/city/classes/factories/city_daemon/class_CityDaemonFactory.php b/application/city/classes/factories/city_daemon/class_CityDaemonFactory.php
index 137e242..6165d10 100644
--- a/application/city/classes/factories/city_daemon/class_CityDaemonFactory.php
+++ b/application/city/classes/factories/city_daemon/class_CityDaemonFactory.php
@@ -4,6 +4,7 @@ namespace Org\Mxchange\City\Daemon\Factory;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Registry\Registry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
@@ -70,7 +71,7 @@ class CityDaemonFactory extends ObjectFactory {
 			}
 
 			// Now convert the city-mode in a class name
-			$className = 'Simulation' . $factoryInstance->convertToClassName($cityMode) . 'CityDaemon';
+			$className = 'Org\Mxchange\City\Daemon\Simulation\Simulation' . $factoryInstance->convertToClassName($cityMode) . 'CityDaemon';
 
 			// Get the city instance
 			$cityInstance = ObjectFactory::createObjectByName($className, array($requestInstance));
diff --git a/application/city/classes/factories/manager/class_ManagerFactory.php b/application/city/classes/factories/manager/class_ManagerFactory.php
index 03d6f05..7c2b5be 100644
--- a/application/city/classes/factories/manager/class_ManagerFactory.php
+++ b/application/city/classes/factories/manager/class_ManagerFactory.php
@@ -4,6 +4,7 @@ namespace Org\Mxchange\City\Factory\Manager;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Registry\Registry;
 
 /**
  * A factory class for managers
diff --git a/application/city/classes/factories/states/city/class_CityStateFactory.php b/application/city/classes/factories/states/city/class_CityStateFactory.php
index cf5cfcd..fd76097 100644
--- a/application/city/classes/factories/states/city/class_CityStateFactory.php
+++ b/application/city/classes/factories/states/city/class_CityStateFactory.php
@@ -2,6 +2,9 @@
 // Own namespace
 namespace Org\Mxchange\City\Factory\State;
 
+// Import own stuff
+use Org\Mxchange\City\Daemon\Factory\CityDaemonFactory;
+
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
 
diff --git a/application/city/classes/filter/bootstrap/city_daemon/class_CityDaemonBootstrap b/application/city/classes/filter/bootstrap/city_daemon/class_CityDaemonBootstrap
index e9ff89b..cc8827b 100644
--- a/application/city/classes/filter/bootstrap/city_daemon/class_CityDaemonBootstrap
+++ b/application/city/classes/filter/bootstrap/city_daemon/class_CityDaemonBootstrap
@@ -2,7 +2,12 @@
 // Own namespace
 namespace Org\Mxchange\City\Daemon\Filter\Bootstrap;
 
+// Import own stuff
+use Org\Mxchange\City\Daemon\Factory\CityDaemonFactory;
+use Org\Mxchange\City\Filter\BaseCityFilter;
+
 // Import framework stuff
+use Org\Mxchange\CoreFramework\Filter\Filterable;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
diff --git a/application/city/classes/filter/bootstrap/city_daemon/class_CityDaemonBootstrapExtraBootstrappingFilter.php b/application/city/classes/filter/bootstrap/city_daemon/class_CityDaemonBootstrapExtraBootstrappingFilter.php
index d1840eb..a9c9013 100644
--- a/application/city/classes/filter/bootstrap/city_daemon/class_CityDaemonBootstrapExtraBootstrappingFilter.php
+++ b/application/city/classes/filter/bootstrap/city_daemon/class_CityDaemonBootstrapExtraBootstrappingFilter.php
@@ -2,7 +2,12 @@
 // Own namespace
 namespace Org\Mxchange\City\Daemon\Filter\Bootstrap;
 
+// Import own stuff
+use Org\Mxchange\City\Daemon\Factory\CityDaemonFactory;
+use Org\Mxchange\City\Filter\BaseCityFilter;
+
 // Import framework stuff
+use Org\Mxchange\CoreFramework\Filter\Filterable;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
diff --git a/application/city/classes/filter/bootstrap/class_CityDaemonBootstrap b/application/city/classes/filter/bootstrap/class_CityDaemonBootstrap
index 38b096f..c31cbc4 100644
--- a/application/city/classes/filter/bootstrap/class_CityDaemonBootstrap
+++ b/application/city/classes/filter/bootstrap/class_CityDaemonBootstrap
@@ -2,7 +2,12 @@
 // Own namespace
 namespace Org\Mxchange\City\Daemon\Filter\Bootstrap;
 
+// Import own stuff
+use Org\Mxchange\City\Filter\BaseCityFilter;
+
 // Import framework stuff
+use Org\Mxchange\CoreFramework\Filter\Filterable;
+use Org\Mxchange\CoreFramework\Registry\Registry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
diff --git a/application/city/classes/filter/bootstrap/init/class_CityDaemonBootstrapInitDaemonFilter.php b/application/city/classes/filter/bootstrap/init/class_CityDaemonBootstrapInitDaemonFilter.php
index 34aca07..5502409 100644
--- a/application/city/classes/filter/bootstrap/init/class_CityDaemonBootstrapInitDaemonFilter.php
+++ b/application/city/classes/filter/bootstrap/init/class_CityDaemonBootstrapInitDaemonFilter.php
@@ -2,7 +2,12 @@
 // Own namespace
 namespace Org\Mxchange\City\Daemon\Filter\Bootstrap;
 
+// Import own stuff
+use Org\Mxchange\City\Daemon\Factory\CityDaemonFactory;
+use Org\Mxchange\City\Filter\BaseCityFilter;
+
 // Import framework stuff
+use Org\Mxchange\CoreFramework\Filter\Filterable;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
diff --git a/application/city/classes/filter/city_daemon/class_CityDaemon b/application/city/classes/filter/city_daemon/class_CityDaemon
index a91b265..e6d9538 100644
--- a/application/city/classes/filter/city_daemon/class_CityDaemon
+++ b/application/city/classes/filter/city_daemon/class_CityDaemon
@@ -2,7 +2,11 @@
 // Own namespace
 namespace Org\Mxchange\City\Daemon\Filter;
 
+// Import own stuff
+use Org\Mxchange\City\Filter\BaseCityFilter;
+
 // Import framework stuff
+use Org\Mxchange\CoreFramework\Filter\Filterable;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
diff --git a/application/city/classes/filter/city_daemon/class_CityDaemonInitializationFilter.php b/application/city/classes/filter/city_daemon/class_CityDaemonInitializationFilter.php
index e94f998..58d8960 100644
--- a/application/city/classes/filter/city_daemon/class_CityDaemonInitializationFilter.php
+++ b/application/city/classes/filter/city_daemon/class_CityDaemonInitializationFilter.php
@@ -2,7 +2,12 @@
 // Own namespace
 namespace Org\Mxchange\City\Daemon\Filter\Initialization;
 
+// Import own stuff
+use Org\Mxchange\City\Daemon\Factory\CityDaemonFactory;
+use Org\Mxchange\City\Filter\BaseCityFilter;
+
 // Import framework stuff
+use Org\Mxchange\CoreFramework\Filter\Filterable;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
diff --git a/application/city/classes/filter/city_daemon/class_CityDaemonPhpRequirementsFilter.php b/application/city/classes/filter/city_daemon/class_CityDaemonPhpRequirementsFilter.php
index 31e68a3..d93c5cf 100644
--- a/application/city/classes/filter/city_daemon/class_CityDaemonPhpRequirementsFilter.php
+++ b/application/city/classes/filter/city_daemon/class_CityDaemonPhpRequirementsFilter.php
@@ -2,7 +2,11 @@
 // Own namespace
 namespace Org\Mxchange\City\Daemon\Filter;
 
+// Import own stuff
+use Org\Mxchange\City\Filter\BaseCityFilter;
+
 // Import framework stuff
+use Org\Mxchange\CoreFramework\Filter\Filterable;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
diff --git a/application/city/classes/filter/city_daemon/class_CityDaemonWelcomeTeaserFilter.php b/application/city/classes/filter/city_daemon/class_CityDaemonWelcomeTeaserFilter.php
index 45148ff..ba17da8 100644
--- a/application/city/classes/filter/city_daemon/class_CityDaemonWelcomeTeaserFilter.php
+++ b/application/city/classes/filter/city_daemon/class_CityDaemonWelcomeTeaserFilter.php
@@ -2,7 +2,12 @@
 // Own namespace
 namespace Org\Mxchange\City\Daemon\Filter;
 
+// Import own stuff
+use Org\Mxchange\City\Daemon\Factory\CityDaemonFactory;
+use Org\Mxchange\City\Filter\BaseCityFilter;
+
 // Import framework stuff
+use Org\Mxchange\CoreFramework\Filter\Filterable;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
diff --git a/application/city/classes/filter/class_ b/application/city/classes/filter/class_
index 14ac2dd..1f26eb1 100644
--- a/application/city/classes/filter/class_
+++ b/application/city/classes/filter/class_
@@ -2,7 +2,12 @@
 // Own namespace
 namespace Org\Mxchange\City\!!!\Filter;
 
+// Import own stuff
+use Org\Mxchange\City\Filter\BaseCityFilter;
+
 // Import framework stuff
+use Org\Mxchange\CoreFramework\Filter\Filterable;
+use Org\Mxchange\CoreFramework\Registry\Registry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
diff --git a/application/city/classes/filter/class_BaseCityFilter.php b/application/city/classes/filter/class_BaseCityFilter.php
index 8f36956..0e22c15 100644
--- a/application/city/classes/filter/class_BaseCityFilter.php
+++ b/application/city/classes/filter/class_BaseCityFilter.php
@@ -1,4 +1,12 @@
 <?php
+// Own namespace
+namespace Org\Mxchange\City\Filter;
+
+// Import framework stuff
+use Org\Mxchange\CoreFramework\Filter\BaseFilter;
+use Org\Mxchange\CoreFramework\Request\Requestable;
+use Org\Mxchange\CoreFramework\Response\Responseable;
+
 /**
  * A generic filter for hub project
  *
diff --git a/application/city/classes/filter/shutdown/city/class_CityDaemonShutdown b/application/city/classes/filter/shutdown/city/class_CityDaemonShutdown
index 2d151fa..5a7cdc0 100644
--- a/application/city/classes/filter/shutdown/city/class_CityDaemonShutdown
+++ b/application/city/classes/filter/shutdown/city/class_CityDaemonShutdown
@@ -2,7 +2,12 @@
 // Own namespace
 namespace Org\Mxchange\City\Daemon\Filter\Shutdown;
 
+// Import own stuff
+use Org\Mxchange\City\Filter\BaseCityFilter;
+
 // Import framework stuff
+use Org\Mxchange\CoreFramework\Filter\Filterable;
+use Org\Mxchange\CoreFramework\Registry\Registry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
diff --git a/application/city/classes/filter/shutdown/city/class_CityDaemonShutdownCityFilter.php b/application/city/classes/filter/shutdown/city/class_CityDaemonShutdownCityFilter.php
index 12c3d47..72e5d1e 100644
--- a/application/city/classes/filter/shutdown/city/class_CityDaemonShutdownCityFilter.php
+++ b/application/city/classes/filter/shutdown/city/class_CityDaemonShutdownCityFilter.php
@@ -2,7 +2,12 @@
 // Own namespace
 namespace Org\Mxchange\City\Daemon\Filter\Shutdown;
 
+// Import own stuff
+use Org\Mxchange\City\Daemon\Factory\CityDaemonFactory;
+use Org\Mxchange\City\Filter\BaseCityFilter;
+
 // Import framework stuff
+use Org\Mxchange\CoreFramework\Filter\Filterable;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
diff --git a/application/city/classes/filter/shutdown/city/class_CityDaemonShutdownTaskHandlerFilter.php b/application/city/classes/filter/shutdown/city/class_CityDaemonShutdownTaskHandlerFilter.php
index 8eb3714..d61e4a0 100644
--- a/application/city/classes/filter/shutdown/city/class_CityDaemonShutdownTaskHandlerFilter.php
+++ b/application/city/classes/filter/shutdown/city/class_CityDaemonShutdownTaskHandlerFilter.php
@@ -2,7 +2,12 @@
 // Own namespace
 namespace Org\Mxchange\City\Daemon\Filter\Shutdown;
 
+// Import own stuff
+use Org\Mxchange\City\Filter\BaseCityFilter;
+
 // Import framework stuff
+use Org\Mxchange\CoreFramework\Filter\Filterable;
+use Org\Mxchange\CoreFramework\Registry\Registry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
diff --git a/application/city/classes/filter/task/city_daemon/class_CityDaemonTaskHandlerInitializerFilter.php b/application/city/classes/filter/task/city_daemon/class_CityDaemonTaskHandlerInitializerFilter.php
index 949dfe2..1ad38df 100644
--- a/application/city/classes/filter/task/city_daemon/class_CityDaemonTaskHandlerInitializerFilter.php
+++ b/application/city/classes/filter/task/city_daemon/class_CityDaemonTaskHandlerInitializerFilter.php
@@ -1,9 +1,14 @@
 <?php
 // Own namespace
-namespace Org\Mxchange\City\Daemon\Filter\Tasks;
+namespace Org\Mxchange\City\Daemon\Filter\Initialization\Tasks;
+
+// Import own stuff
+use Org\Mxchange\City\Daemon\Factory\CityDaemonFactory;
+use Org\Mxchange\City\Filter\BaseCityFilter;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Filter\Filterable;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
diff --git a/application/city/classes/filter/verifier/class_CityNameVerifierFilter.php b/application/city/classes/filter/verifier/class_CityNameVerifierFilter.php
index 4770b8b..c2ab884 100644
--- a/application/city/classes/filter/verifier/class_CityNameVerifierFilter.php
+++ b/application/city/classes/filter/verifier/class_CityNameVerifierFilter.php
@@ -3,6 +3,8 @@
 namespace Org\Mxchange\City\Filter\Verifier;
 
 // Import framework stuff
+use Org\Mxchange\CoreFramework\Filter\BaseFilter;
+use Org\Mxchange\CoreFramework\Filter\Filterable;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
diff --git a/application/city/classes/login/class_CityGuestLogin.php b/application/city/classes/login/class_CityGuestLogin.php
index 14aab58..3ec12fc 100644
--- a/application/city/classes/login/class_CityGuestLogin.php
+++ b/application/city/classes/login/class_CityGuestLogin.php
@@ -4,6 +4,7 @@ namespace Org\Mxchange\City\Login\Guest;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
diff --git a/application/city/classes/login/class_CityUserLogin.php b/application/city/classes/login/class_CityUserLogin.php
index 8d5d84a..7ab7f2d 100644
--- a/application/city/classes/login/class_CityUserLogin.php
+++ b/application/city/classes/login/class_CityUserLogin.php
@@ -4,6 +4,8 @@ namespace Org\Mxchange\City\Login\User;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
+use Org\Mxchange\CoreFramework\Registry\Registry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
diff --git a/application/city/classes/login/helper/class_CityLoginHelper.php b/application/city/classes/login/helper/class_CityLoginHelper.php
index d9652bc..0a8b33c 100644
--- a/application/city/classes/login/helper/class_CityLoginHelper.php
+++ b/application/city/classes/login/helper/class_CityLoginHelper.php
@@ -4,6 +4,7 @@ namespace Org\Mxchange\City\Helper\Login;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Registry\Registry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 
 /**
@@ -116,6 +117,3 @@ class CityLoginHelper extends BaseLoginHelper implements HelpableLogin {
 		Registry::getRegistry()->addInstance('login', $loginInstance);
 	}
 }
-
-//
-?>
diff --git a/application/city/classes/manager/city_entities/districts/class_CityDistrictsManager.php b/application/city/classes/manager/city_entities/districts/class_CityDistrictsManager.php
index b2bc775..63147d6 100644
--- a/application/city/classes/manager/city_entities/districts/class_CityDistrictsManager.php
+++ b/application/city/classes/manager/city_entities/districts/class_CityDistrictsManager.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Org\Mxchange\City\Manager\District;
+
+// Import framework stuff
+use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
+
 /**
  * A city districts manager
  *
diff --git a/application/city/classes/manager/city_entities/lots/class_CityLotsManager.php b/application/city/classes/manager/city_entities/lots/class_CityLotsManager.php
index d158558..3650cc2 100644
--- a/application/city/classes/manager/city_entities/lots/class_CityLotsManager.php
+++ b/application/city/classes/manager/city_entities/lots/class_CityLotsManager.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Org\Mxchange\City\Manager\Lots;
+
+// Import framework stuff
+use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
+
 /**
  * A city lots manager
  *
diff --git a/application/city/classes/manager/city_entities/sections/class_CitySectionsManager.php b/application/city/classes/manager/city_entities/sections/class_CitySectionsManager.php
index 6e54096..903d837 100644
--- a/application/city/classes/manager/city_entities/sections/class_CitySectionsManager.php
+++ b/application/city/classes/manager/city_entities/sections/class_CitySectionsManager.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Org\Mxchange\City\Manager\Sections;
+
+// Import framework stuff
+use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
+
 /**
  * A city sections manager
  *
diff --git a/application/city/classes/manager/class_ b/application/city/classes/manager/class_
index b8c291d..880f586 100644
--- a/application/city/classes/manager/class_
+++ b/application/city/classes/manager/class_
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Org\Mxchange\City\Manager\;
+
+// Import framework stuff
+use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
+
 /**
  * A ??? manager
  *
diff --git a/application/city/classes/manager/class_BaseManager.php b/application/city/classes/manager/class_BaseManager.php
index 1f281bc..7ceaa13 100644
--- a/application/city/classes/manager/class_BaseManager.php
+++ b/application/city/classes/manager/class_BaseManager.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Org\Mxchange\City\Manager;
+
+// Import own stuff
+use Org\Mxchange\City\Generic\BaseCitySystem;
+
 /**
  * A general Manager class
  *
diff --git a/application/city/classes/registration/class_CityRegistration.php b/application/city/classes/registration/class_CityRegistration.php
index 4bda7ca..f20f9eb 100644
--- a/application/city/classes/registration/class_CityRegistration.php
+++ b/application/city/classes/registration/class_CityRegistration.php
@@ -3,6 +3,7 @@
 namespace Org\Mxchange\City\Registration;
 
 // Import framework stuff
+use Org\Mxchange\CoreFramework\Criteria\Storing\StoreableCriteria;
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 
@@ -210,6 +211,3 @@ class CityRegistration extends BaseRegistration implements UserRegister {
 		$criteriaInstance->addCriteria('registered', date('Y-m-d H:i:s', time()));
 	}
 }
-
-//
-?>
diff --git a/application/city/classes/states/city/active/class_CityActiveState.php b/application/city/classes/states/city/active/class_CityActiveState.php
index bb3473a..56a7821 100644
--- a/application/city/classes/states/city/active/class_CityActiveState.php
+++ b/application/city/classes/states/city/active/class_CityActiveState.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Org\Mxchange\City\State\Active;
+
+// Import own stuff
+use Org\Mxchange\City\Daemon\Factory\CityDaemonFactory;
+
 /**
  * A active city state class
  *
diff --git a/application/city/classes/tasks/class_BaseCityTask.php b/application/city/classes/tasks/class_BaseCityTask.php
index 92550f6..edca046 100644
--- a/application/city/classes/tasks/class_BaseCityTask.php
+++ b/application/city/classes/tasks/class_BaseCityTask.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Org\Mxchange\City\Task;
+
+// Import own stuff
+use Org\Mxchange\City\Helper\CityHelper;
+
 /**
  * A general CityTask class
  *
diff --git a/application/city/classes/tasks/daemon/building/class_CityDaemonBuildingGrowthTask.php b/application/city/classes/tasks/daemon/building/class_CityDaemonBuildingGrowthTask.php
index b536f75..084dbc5 100644
--- a/application/city/classes/tasks/daemon/building/class_CityDaemonBuildingGrowthTask.php
+++ b/application/city/classes/tasks/daemon/building/class_CityDaemonBuildingGrowthTask.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Org\Mxchange\City\Daemon\Task\Growth\Building;
+
+// Import own stuff
+use Org\Mxchange\City\Daemon\Factory\CityDaemonFactory;
+
 /**
  * A BuildingGrowth city daemon-task
  *
diff --git a/application/city/classes/tasks/daemon/household/class_CityDaemonHouseholdGrowthTask.php b/application/city/classes/tasks/daemon/household/class_CityDaemonHouseholdGrowthTask.php
index 5b749ca..2b25dd2 100644
--- a/application/city/classes/tasks/daemon/household/class_CityDaemonHouseholdGrowthTask.php
+++ b/application/city/classes/tasks/daemon/household/class_CityDaemonHouseholdGrowthTask.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Org\Mxchange\City\Daemon\Task\Growth\Household;
+
+// Import own stuff
+use Org\Mxchange\City\Daemon\Factory\CityDaemonFactory;
+
 /**
  * A HouseholdGrowth city daemon-task
  *
diff --git a/application/city/classes/tasks/daemon/map_expander/class_CityDaemonMapExpanderTask.php b/application/city/classes/tasks/daemon/map_expander/class_CityDaemonMapExpanderTask.php
index fa7db40..d5b29a3 100644
--- a/application/city/classes/tasks/daemon/map_expander/class_CityDaemonMapExpanderTask.php
+++ b/application/city/classes/tasks/daemon/map_expander/class_CityDaemonMapExpanderTask.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Org\Mxchange\City\Daemon\Task\Expander\Map;
+
+// Import own stuff
+use Org\Mxchange\City\Daemon\Factory\CityDaemonFactory;
+
 /**
  * A map expander task for the daemon
  *
diff --git a/application/city/config.php b/application/city/config.php
index a31b52f..ff7bb46 100644
--- a/application/city/config.php
+++ b/application/city/config.php
@@ -35,13 +35,13 @@ $cfg = FrameworkBootstrap::getConfigurationInstance();
 $cfg->setConfigEntry('city_default_mode', 'default');
 
 // CFG: NEWS-DOWNLOAD-FILTER
-$cfg->setConfigEntry('news_download_filter', 'NewsDownloadFilter');
+$cfg->setConfigEntry('news_download_filter', 'Org\Mxchange\CoreFramework\Filter\News\NewsDownloadFilter');
 
 // CFG: NEWS-PROCESS-FILTER
-$cfg->setConfigEntry('news_process_filter', 'NewsProcessFilter');
+$cfg->setConfigEntry('news_process_filter', 'Org\Mxchange\CoreFramework\Filter\News\NewsProcessFilter');
 
 // CFG: NEWS-READER-CLASS
-$cfg->setConfigEntry('news_reader_class', 'ConsoleNewsReader');
+$cfg->setConfigEntry('news_reader_class', 'Org\Mxchange\CoreFramework\Reader\News\Console\ConsoleNewsReader');
 
 // CFG: CITY-INFO-DB-WRAPPER-CLASS
 $cfg->setConfigEntry('city_info_db_wrapper_class', 'CityInformationDatabaseWrapper');
@@ -520,31 +520,31 @@ $cfg->setConfigEntry('default_city_console_controller', 'daemon');
 $cfg->setConfigEntry('city_console_cmd_daemon_resolver_class', 'Org\Mxchange\City\Resolver\Command\CityConsoleCommandResolver');
 
 // CFG: CITY-DAEMON-PHP-REQUIREMENTS-FILTER
-$cfg->setConfigEntry('city_daemon_php_requirements_filter', 'CityDaemonPhpRequirementsFilter');
+$cfg->setConfigEntry('city_daemon_php_requirements_filter', 'Org\Mxchange\City\Daemon\Filter\CityDaemonPhpRequirementsFilter');
 
 // CFG: CITY-DAEMON-INITIALIZER-FILTER
-$cfg->setConfigEntry('city_daemon_initializer_filter', 'CityDaemonInitializationFilter');
+$cfg->setConfigEntry('city_daemon_initializer_filter', 'Org\Mxchange\City\Daemon\Filter\Initialization\CityDaemonInitializationFilter');
 
 // CFG: CITY-DAEMON-ACTIVATION-TASK-HANDLER-INITIALIZER-FILTER
-$cfg->setConfigEntry('city_daemon_activation_task_handler_initializer_filter', 'CityDaemonTaskHandlerInitializerFilter');
+$cfg->setConfigEntry('city_daemon_activation_task_handler_initializer_filter', 'Org\Mxchange\City\Daemon\Filter\Initialization\Tasks\CityDaemonTaskHandlerInitializerFilter');
 
 // CFG: CITY-DAEMON-WELCOME-TEASER-FILTER
-$cfg->setConfigEntry('city_daemon_welcome_teaser_filter', 'CityDaemonWelcomeTeaserFilter');
+$cfg->setConfigEntry('city_daemon_welcome_teaser_filter', 'Org\Mxchange\City\Daemon\Filter\CityDaemonWelcomeTeaserFilter');
 
 // CFG: CITY-DAEMON-BOOTSTRAP-INIT-DAEMON-FILTER
-$cfg->setConfigEntry('city_daemon_bootstrap_init_daemon_filter', 'CityDaemonBootstrapInitDaemonFilter');
+$cfg->setConfigEntry('city_daemon_bootstrap_init_daemon_filter', 'Org\Mxchange\City\Daemon\Filter\Bootstrap\CityDaemonBootstrapInitDaemonFilter');
 
 // CFG: CITY-DAEMON-BOOTSTRAP-EXTRA-BOOTSTRAPPING-FILTER
-$cfg->setConfigEntry('city_daemon_bootstrap_extra_bootstrapping_filter', 'CityDaemonBootstrapExtraBootstrappingFilter');
+$cfg->setConfigEntry('city_daemon_bootstrap_extra_bootstrapping_filter', 'Org\Mxchange\City\Daemon\Filter\Bootstrap\CityDaemonBootstrapExtraBootstrappingFilter');
 
 // CFG: CITY-DAEMON-SHUTDOWN-TASK-HANDLER-FILTER
-$cfg->setConfigEntry('city_daemon_shutdown_task_handler_filter', 'CityDaemonShutdownTaskHandlerFilter');
+$cfg->setConfigEntry('city_daemon_shutdown_task_handler_filter', 'Org\Mxchange\City\Daemon\Filter\Shutdown\CityDaemonShutdownTaskHandlerFilter');
 
 // CFG: CITY-DAEMON-SHUTDOWN-CITY-FILTER
-$cfg->setConfigEntry('city_daemon_shutdown_city_filter', 'CityDaemonShutdownCityFilter');
+$cfg->setConfigEntry('city_daemon_shutdown_city_filter', 'Org\Mxchange\City\Daemon\Filter\Shutdown\CityDaemonShutdownCityFilter');
 
 // CFG: NEWS-READER-DAEMON-CLASS
-$cfg->setConfigEntry('news_reader_daemon_class', 'ConsoleNewsReader');
+$cfg->setConfigEntry('news_reader_daemon_class', 'Org\Mxchange\CoreFramework\Reader\News\Console\ConsoleNewsReader');
 
 // CFG: NEWS-DAEMON-LIMIT
 $cfg->setConfigEntry('news_daemon_limit', 5);
diff --git a/application/city/interfaces/database/frontend/city/class_CityInformationWrapper.php b/application/city/interfaces/database/frontend/city/class_CityInformationWrapper.php
index 370dc04..74d85cc 100644
--- a/application/city/interfaces/database/frontend/city/class_CityInformationWrapper.php
+++ b/application/city/interfaces/database/frontend/city/class_CityInformationWrapper.php
@@ -4,6 +4,7 @@ namespace Org\Mxchange\City\Database\Frontend\Information;
 
 // Import own stuff
 use Org\Mxchange\City\Daemon\BaseCityDaemon;
+use Org\Mxchange\City\Helper\CityHelper;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Request\Requestable;
diff --git a/application/city/interfaces/helper/city/class_CityHelper.php b/application/city/interfaces/helper/city/class_CityHelper.php
index 4c57cf6..1bdea86 100644
--- a/application/city/interfaces/helper/city/class_CityHelper.php
+++ b/application/city/interfaces/helper/city/class_CityHelper.php
@@ -3,6 +3,9 @@
 namespace Org\Mxchange\City\Helper;
 
 // Import framework stuff
+use Org\Mxchange\CoreFramework\Criteria\Add\AddableCriteria;
+use Org\Mxchange\CoreFramework\Handler\Task\HandleableTask;
+use Org\Mxchange\CoreFramework\Helper\Helper;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
diff --git a/core b/core
index 1abe771..edbaec7 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit 1abe7710d866014d74aebda110633e29bf907dee
+Subproject commit edbaec7aa8e1019d10b7a3351e1629fed93740f4