From e846ee2bfd5833a9df8da8c5445ef7b445dcfdee Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Tue, 25 Aug 2015 18:46:34 +0200
Subject: [PATCH] Updated 'core' + renamed main->classes

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 application/city/{main => classes}/.htaccess                    | 0
 application/city/{main => classes}/actions/.htaccess            | 0
 application/city/{main => classes}/actions/class_               | 0
 .../city/{main => classes}/actions/class_BaseCityAction.php     | 0
 application/city/{main => classes}/actions/html/.htaccess       | 0
 application/city/{main => classes}/actions/html/city/.htaccess  | 0
 .../actions/html/city/class_HtmlCityLoginCityMapAction.php      | 0
 .../actions/html/class_HtmlCityLoginGovernmentAction.php        | 0
 .../actions/html/class_HtmlCityLoginLogoutAction.php            | 0
 .../actions/html/class_HtmlCityLoginProfileAction.php           | 0
 .../actions/html/class_HtmlCityLoginStatusProblemAction.php     | 0
 .../actions/html/class_HtmlCityLoginWelcomeAction.php           | 0
 application/city/{main => classes}/city_daemon/.htaccess        | 0
 application/city/{main => classes}/city_daemon/class_           | 0
 .../city/{main => classes}/city_daemon/class_BaseCityDaemon.php | 0
 .../city/{main => classes}/city_daemon/default/.htaccess        | 0
 .../city_daemon/default/class_SimulationDefaultCityDaemon.php   | 0
 application/city/{main => classes}/class_                       | 0
 application/city/{main => classes}/class_Base                   | 0
 application/city/{main => classes}/class_BaseCitySystem.php     | 0
 application/city/{main => classes}/commands/.htaccess           | 0
 application/city/{main => classes}/commands/console/.htaccess   | 0
 .../commands/console/class_CityConsoleDaemonCommand.php         | 0
 application/city/{main => classes}/commands/html/.htaccess      | 0
 .../commands/html/class_CityHtmlCityGuestLoginCommand.php       | 0
 .../commands/html/class_CityHtmlCityMapCommand.php              | 0
 .../commands/html/class_CityHtmlCityRegisterCommand.php         | 0
 .../commands/html/class_CityHtmlCityUserLoginCommand.php        | 0
 .../commands/html/class_CityHtmlConfirmCommand.php              | 0
 .../commands/html/class_CityHtmlDoFormCommand.php               | 0
 .../commands/html/class_CityHtmlHomeCommand.php                 | 0
 .../commands/html/class_CityHtmlLoginAreaCommand.php            | 0
 .../commands/html/class_CityHtmlLoginCommand.php                | 0
 .../commands/html/class_CityHtmlLoginFailedCommand.php          | 0
 .../commands/html/class_CityHtmlLogoutCommand.php               | 0
 .../commands/html/class_CityHtmlRegisterCommand.php             | 0
 .../commands/html/class_CityHtmlResendLinkCommand.php           | 0
 .../commands/html/class_HtmlLogoutDoneCommand.php               | 0
 application/city/{main => classes}/controller/.htaccess         | 0
 application/city/{main => classes}/controller/console/.htaccess | 0
 .../console/class_CityConsoleDefaultNewsController.php          | 0
 application/city/{main => classes}/controller/html/.htaccess    | 0
 .../controller/html/class_CityHtmlConfirmController.php         | 0
 .../controller/html/class_CityHtmlDefaultNewsController.php     | 0
 .../controller/html/class_CityHtmlLoginController.php           | 0
 .../controller/html/class_CityHtmlLoginFailedController.php     | 0
 .../controller/html/class_CityHtmlLogoutController.php          | 0
 .../controller/html/class_CityHtmlLogoutDoneController.php      | 0
 .../controller/html/class_CityHtmlRegisterController.php        | 0
 .../city/{main => classes}/controller/html/form/.htaccess       | 0
 .../controller/html/form/class_CityHtmlDoFormController.php     | 0
 .../city/{main => classes}/controller/html/login/.htaccess      | 0
 .../controller/html/login/class_CityHtmlLoginAreaController.php | 0
 application/city/{main => classes}/database/.htaccess           | 0
 application/city/{main => classes}/database/frontend/.htaccess  | 0
 .../city/{main => classes}/database/frontend/city/.htaccess     | 0
 .../frontend/city/class_CityInformationDatabaseWrapper.php      | 0
 .../{main => classes}/database/frontend/city_entities/.htaccess | 0
 .../database/frontend/city_entities/districts/.htaccess         | 0
 .../districts/class_CityDistrictsDatabaseWrapper.php            | 0
 .../database/frontend/city_entities/lots/.htaccess              | 0
 .../city_entities/lots/class_CityLotsDatabaseWrapper.php        | 0
 .../database/frontend/city_entities/sections/.htaccess          | 0
 .../sections/class_CitySectionsDatabaseWrapper.php              | 0
 .../city/{main => classes}/database/frontend/region/.htaccess   | 0
 .../frontend/region/class_RegionInformationDatabaseWrapper.php  | 0
 .../{main => classes}/database/frontend/region_map/.htaccess    | 0
 .../frontend/region_map/class_RegionMapDatabaseWrapper.php      | 0
 application/city/{main => classes}/factories/.htaccess          | 0
 .../city/{main => classes}/factories/city_daemon/.htaccess      | 0
 .../factories/city_daemon/class_CityDaemonFactory.php           | 0
 application/city/{main => classes}/factories/manager/.htaccess  | 0
 .../factories/manager/class_ManagerFactory.php                  | 0
 application/city/{main => classes}/factories/states/.htaccess   | 0
 .../city/{main => classes}/factories/states/city/.htaccess      | 0
 .../factories/states/city/class_CityStateFactory.php            | 0
 application/city/{main => classes}/filter/.htaccess             | 0
 application/city/{main => classes}/filter/bootstrap/.htaccess   | 0
 .../filter/bootstrap/class_CityDaemonBootstrap                  | 0
 .../city/{main => classes}/filter/bootstrap/init/.htaccess      | 0
 .../init/class_CityDaemonBootstrapInitDaemonFilter.php          | 0
 application/city/{main => classes}/filter/city_daemon/.htaccess | 0
 .../city/{main => classes}/filter/city_daemon/class_CityDaemon  | 0
 .../filter/city_daemon/class_CityDaemonInitializationFilter.php | 0
 .../city_daemon/class_CityDaemonPhpRequirementsFilter.php       | 0
 .../filter/city_daemon/class_CityDaemonWelcomeTeaserFilter.php  | 0
 application/city/{main => classes}/filter/class_                | 0
 .../city/{main => classes}/filter/class_BaseCityFilter.php      | 0
 application/city/{main => classes}/filter/shutdown/.htaccess    | 0
 .../city/{main => classes}/filter/shutdown/city/.htaccess       | 0
 .../filter/shutdown/city/class_CityDaemonShutdown               | 0
 .../filter/shutdown/city/class_CityDaemonShutdownCityFilter.php | 0
 .../shutdown/city/class_CityDaemonShutdownTaskHandlerFilter.php | 0
 application/city/{main => classes}/filter/task/.htaccess        | 0
 .../city/{main => classes}/filter/task/city_daemon/.htaccess    | 0
 .../class_CityDaemonTaskHandlerInitializerFilter.php            | 0
 application/city/{main => classes}/filter/verifier/.htaccess    | 0
 .../filter/verifier/class_CityNameVerifierFilter.php            | 0
 application/city/{main => classes}/login/.htaccess              | 0
 .../city/{main => classes}/login/class_CityGuestLogin.php       | 0
 .../city/{main => classes}/login/class_CityUserLogin.php        | 0
 application/city/{main => classes}/login/helper/.htaccess       | 0
 .../{main => classes}/login/helper/class_CityLoginHelper.php    | 0
 application/city/{main => classes}/manager/.htaccess            | 0
 application/city/{main => classes}/manager/city/.htaccess       | 0
 .../city/{main => classes}/manager/city/class_CityManager.php   | 0
 .../city/{main => classes}/manager/city_entities/.htaccess      | 0
 .../{main => classes}/manager/city_entities/districts/.htaccess | 0
 .../city_entities/districts/class_CityDistrictsManager.php      | 0
 .../city/{main => classes}/manager/city_entities/lots/.htaccess | 0
 .../manager/city_entities/lots/class_CityLotsManager.php        | 0
 .../{main => classes}/manager/city_entities/sections/.htaccess  | 0
 .../city_entities/sections/class_CitySectionsManager.php        | 0
 application/city/{main => classes}/manager/class_               | 0
 .../city/{main => classes}/manager/class_BaseManager.php        | 0
 application/city/{main => classes}/manager/region/.htaccess     | 0
 .../{main => classes}/manager/region/class_RegionManager.php    | 0
 .../{main => classes}/manager/region/class_RegionMapManager.php | 0
 application/city/{main => classes}/menu/.htaccess               | 0
 application/city/{main => classes}/menu/class_City              | 0
 .../city/{main => classes}/menu/class_CityConfirmMenu.php       | 0
 application/city/{main => classes}/menu/class_CityHomeMenu.php  | 0
 .../city/{main => classes}/menu/class_CityLoginAreaMenu.php     | 0
 .../city/{main => classes}/menu/class_CityLoginFailedMenu.php   | 0
 application/city/{main => classes}/menu/class_CityLoginMenu.php | 0
 .../city/{main => classes}/menu/class_CityLogoutMenu.php        | 0
 .../city/{main => classes}/menu/class_CityRegisterMenu.php      | 0
 .../city/{main => classes}/menu/class_CityStatusMenu.php        | 0
 application/city/{main => classes}/menu/government/.htaccess    | 0
 .../menu/government/class_CityGovernmentFailedAreaMenu.php      | 0
 application/city/{main => classes}/registration/.htaccess       | 0
 .../{main => classes}/registration/class_CityRegistration.php   | 0
 application/city/{main => classes}/resolver/.htaccess           | 0
 application/city/{main => classes}/resolver/command/.htaccess   | 0
 .../city/{main => classes}/resolver/command/console/.htaccess   | 0
 .../command/console/class_CityConsoleCommandResolver.php        | 0
 .../city/{main => classes}/resolver/command/html/.htaccess      | 0
 .../resolver/command/html/class_CityHtmlCommandResolver.php     | 0
 .../city/{main => classes}/resolver/controller/.htaccess        | 0
 .../{main => classes}/resolver/controller/console/.htaccess     | 0
 .../controller/console/class_CityConsoleControllerResolver.php  | 0
 .../city/{main => classes}/resolver/controller/html/.htaccess   | 0
 .../controller/html/class_CityHtmlControllerResolver.php        | 0
 .../city/{main => classes}/resolver/controller/image/.htaccess  | 0
 .../controller/image/class_CityImageControllerResolver.php      | 0
 application/city/{main => classes}/states/.htaccess             | 0
 application/city/{main => classes}/states/city/.htaccess        | 0
 application/city/{main => classes}/states/city/active/.htaccess | 0
 .../states/city/active/class_CityActiveState.php                | 0
 application/city/{main => classes}/states/city/class_           | 0
 .../city/{main => classes}/states/city/class_BaseCityState.php  | 0
 application/city/{main => classes}/states/city/init/.htaccess   | 0
 .../{main => classes}/states/city/init/class_CityInitState.php  | 0
 application/city/{main => classes}/tasks/.htaccess              | 0
 application/city/{main => classes}/tasks/class_BaseCityTask.php | 0
 application/city/{main => classes}/tasks/daemon/.htaccess       | 0
 .../city/{main => classes}/tasks/daemon/building/.htaccess      | 0
 .../daemon/building/class_CityDaemonBuildingGrowthTask.php      | 0
 .../city/{main => classes}/tasks/daemon/class_CityDaemon        | 0
 .../city/{main => classes}/tasks/daemon/household/.htaccess     | 0
 .../daemon/household/class_CityDaemonHouseholdGrowthTask.php    | 0
 .../city/{main => classes}/tasks/daemon/map_expander/.htaccess  | 0
 .../daemon/map_expander/class_CityDaemonMapExpanderTask.php     | 0
 core                                                            | 2 +-
 164 files changed, 1 insertion(+), 1 deletion(-)
 rename application/city/{main => classes}/.htaccess (100%)
 rename application/city/{main => classes}/actions/.htaccess (100%)
 rename application/city/{main => classes}/actions/class_ (100%)
 rename application/city/{main => classes}/actions/class_BaseCityAction.php (100%)
 rename application/city/{main => classes}/actions/html/.htaccess (100%)
 rename application/city/{main => classes}/actions/html/city/.htaccess (100%)
 rename application/city/{main => classes}/actions/html/city/class_HtmlCityLoginCityMapAction.php (100%)
 rename application/city/{main => classes}/actions/html/class_HtmlCityLoginGovernmentAction.php (100%)
 rename application/city/{main => classes}/actions/html/class_HtmlCityLoginLogoutAction.php (100%)
 rename application/city/{main => classes}/actions/html/class_HtmlCityLoginProfileAction.php (100%)
 rename application/city/{main => classes}/actions/html/class_HtmlCityLoginStatusProblemAction.php (100%)
 rename application/city/{main => classes}/actions/html/class_HtmlCityLoginWelcomeAction.php (100%)
 rename application/city/{main => classes}/city_daemon/.htaccess (100%)
 rename application/city/{main => classes}/city_daemon/class_ (100%)
 rename application/city/{main => classes}/city_daemon/class_BaseCityDaemon.php (100%)
 rename application/city/{main => classes}/city_daemon/default/.htaccess (100%)
 rename application/city/{main => classes}/city_daemon/default/class_SimulationDefaultCityDaemon.php (100%)
 rename application/city/{main => classes}/class_ (100%)
 rename application/city/{main => classes}/class_Base (100%)
 rename application/city/{main => classes}/class_BaseCitySystem.php (100%)
 rename application/city/{main => classes}/commands/.htaccess (100%)
 rename application/city/{main => classes}/commands/console/.htaccess (100%)
 rename application/city/{main => classes}/commands/console/class_CityConsoleDaemonCommand.php (100%)
 rename application/city/{main => classes}/commands/html/.htaccess (100%)
 rename application/city/{main => classes}/commands/html/class_CityHtmlCityGuestLoginCommand.php (100%)
 rename application/city/{main => classes}/commands/html/class_CityHtmlCityMapCommand.php (100%)
 rename application/city/{main => classes}/commands/html/class_CityHtmlCityRegisterCommand.php (100%)
 rename application/city/{main => classes}/commands/html/class_CityHtmlCityUserLoginCommand.php (100%)
 rename application/city/{main => classes}/commands/html/class_CityHtmlConfirmCommand.php (100%)
 rename application/city/{main => classes}/commands/html/class_CityHtmlDoFormCommand.php (100%)
 rename application/city/{main => classes}/commands/html/class_CityHtmlHomeCommand.php (100%)
 rename application/city/{main => classes}/commands/html/class_CityHtmlLoginAreaCommand.php (100%)
 rename application/city/{main => classes}/commands/html/class_CityHtmlLoginCommand.php (100%)
 rename application/city/{main => classes}/commands/html/class_CityHtmlLoginFailedCommand.php (100%)
 rename application/city/{main => classes}/commands/html/class_CityHtmlLogoutCommand.php (100%)
 rename application/city/{main => classes}/commands/html/class_CityHtmlRegisterCommand.php (100%)
 rename application/city/{main => classes}/commands/html/class_CityHtmlResendLinkCommand.php (100%)
 rename application/city/{main => classes}/commands/html/class_HtmlLogoutDoneCommand.php (100%)
 rename application/city/{main => classes}/controller/.htaccess (100%)
 rename application/city/{main => classes}/controller/console/.htaccess (100%)
 rename application/city/{main => classes}/controller/console/class_CityConsoleDefaultNewsController.php (100%)
 rename application/city/{main => classes}/controller/html/.htaccess (100%)
 rename application/city/{main => classes}/controller/html/class_CityHtmlConfirmController.php (100%)
 rename application/city/{main => classes}/controller/html/class_CityHtmlDefaultNewsController.php (100%)
 rename application/city/{main => classes}/controller/html/class_CityHtmlLoginController.php (100%)
 rename application/city/{main => classes}/controller/html/class_CityHtmlLoginFailedController.php (100%)
 rename application/city/{main => classes}/controller/html/class_CityHtmlLogoutController.php (100%)
 rename application/city/{main => classes}/controller/html/class_CityHtmlLogoutDoneController.php (100%)
 rename application/city/{main => classes}/controller/html/class_CityHtmlRegisterController.php (100%)
 rename application/city/{main => classes}/controller/html/form/.htaccess (100%)
 rename application/city/{main => classes}/controller/html/form/class_CityHtmlDoFormController.php (100%)
 rename application/city/{main => classes}/controller/html/login/.htaccess (100%)
 rename application/city/{main => classes}/controller/html/login/class_CityHtmlLoginAreaController.php (100%)
 rename application/city/{main => classes}/database/.htaccess (100%)
 rename application/city/{main => classes}/database/frontend/.htaccess (100%)
 rename application/city/{main => classes}/database/frontend/city/.htaccess (100%)
 rename application/city/{main => classes}/database/frontend/city/class_CityInformationDatabaseWrapper.php (100%)
 rename application/city/{main => classes}/database/frontend/city_entities/.htaccess (100%)
 rename application/city/{main => classes}/database/frontend/city_entities/districts/.htaccess (100%)
 rename application/city/{main => classes}/database/frontend/city_entities/districts/class_CityDistrictsDatabaseWrapper.php (100%)
 rename application/city/{main => classes}/database/frontend/city_entities/lots/.htaccess (100%)
 rename application/city/{main => classes}/database/frontend/city_entities/lots/class_CityLotsDatabaseWrapper.php (100%)
 rename application/city/{main => classes}/database/frontend/city_entities/sections/.htaccess (100%)
 rename application/city/{main => classes}/database/frontend/city_entities/sections/class_CitySectionsDatabaseWrapper.php (100%)
 rename application/city/{main => classes}/database/frontend/region/.htaccess (100%)
 rename application/city/{main => classes}/database/frontend/region/class_RegionInformationDatabaseWrapper.php (100%)
 rename application/city/{main => classes}/database/frontend/region_map/.htaccess (100%)
 rename application/city/{main => classes}/database/frontend/region_map/class_RegionMapDatabaseWrapper.php (100%)
 rename application/city/{main => classes}/factories/.htaccess (100%)
 rename application/city/{main => classes}/factories/city_daemon/.htaccess (100%)
 rename application/city/{main => classes}/factories/city_daemon/class_CityDaemonFactory.php (100%)
 rename application/city/{main => classes}/factories/manager/.htaccess (100%)
 rename application/city/{main => classes}/factories/manager/class_ManagerFactory.php (100%)
 rename application/city/{main => classes}/factories/states/.htaccess (100%)
 rename application/city/{main => classes}/factories/states/city/.htaccess (100%)
 rename application/city/{main => classes}/factories/states/city/class_CityStateFactory.php (100%)
 rename application/city/{main => classes}/filter/.htaccess (100%)
 rename application/city/{main => classes}/filter/bootstrap/.htaccess (100%)
 rename application/city/{main => classes}/filter/bootstrap/class_CityDaemonBootstrap (100%)
 rename application/city/{main => classes}/filter/bootstrap/init/.htaccess (100%)
 rename application/city/{main => classes}/filter/bootstrap/init/class_CityDaemonBootstrapInitDaemonFilter.php (100%)
 rename application/city/{main => classes}/filter/city_daemon/.htaccess (100%)
 rename application/city/{main => classes}/filter/city_daemon/class_CityDaemon (100%)
 rename application/city/{main => classes}/filter/city_daemon/class_CityDaemonInitializationFilter.php (100%)
 rename application/city/{main => classes}/filter/city_daemon/class_CityDaemonPhpRequirementsFilter.php (100%)
 rename application/city/{main => classes}/filter/city_daemon/class_CityDaemonWelcomeTeaserFilter.php (100%)
 rename application/city/{main => classes}/filter/class_ (100%)
 rename application/city/{main => classes}/filter/class_BaseCityFilter.php (100%)
 rename application/city/{main => classes}/filter/shutdown/.htaccess (100%)
 rename application/city/{main => classes}/filter/shutdown/city/.htaccess (100%)
 rename application/city/{main => classes}/filter/shutdown/city/class_CityDaemonShutdown (100%)
 rename application/city/{main => classes}/filter/shutdown/city/class_CityDaemonShutdownCityFilter.php (100%)
 rename application/city/{main => classes}/filter/shutdown/city/class_CityDaemonShutdownTaskHandlerFilter.php (100%)
 rename application/city/{main => classes}/filter/task/.htaccess (100%)
 rename application/city/{main => classes}/filter/task/city_daemon/.htaccess (100%)
 rename application/city/{main => classes}/filter/task/city_daemon/class_CityDaemonTaskHandlerInitializerFilter.php (100%)
 rename application/city/{main => classes}/filter/verifier/.htaccess (100%)
 rename application/city/{main => classes}/filter/verifier/class_CityNameVerifierFilter.php (100%)
 rename application/city/{main => classes}/login/.htaccess (100%)
 rename application/city/{main => classes}/login/class_CityGuestLogin.php (100%)
 rename application/city/{main => classes}/login/class_CityUserLogin.php (100%)
 rename application/city/{main => classes}/login/helper/.htaccess (100%)
 rename application/city/{main => classes}/login/helper/class_CityLoginHelper.php (100%)
 rename application/city/{main => classes}/manager/.htaccess (100%)
 rename application/city/{main => classes}/manager/city/.htaccess (100%)
 rename application/city/{main => classes}/manager/city/class_CityManager.php (100%)
 rename application/city/{main => classes}/manager/city_entities/.htaccess (100%)
 rename application/city/{main => classes}/manager/city_entities/districts/.htaccess (100%)
 rename application/city/{main => classes}/manager/city_entities/districts/class_CityDistrictsManager.php (100%)
 rename application/city/{main => classes}/manager/city_entities/lots/.htaccess (100%)
 rename application/city/{main => classes}/manager/city_entities/lots/class_CityLotsManager.php (100%)
 rename application/city/{main => classes}/manager/city_entities/sections/.htaccess (100%)
 rename application/city/{main => classes}/manager/city_entities/sections/class_CitySectionsManager.php (100%)
 rename application/city/{main => classes}/manager/class_ (100%)
 rename application/city/{main => classes}/manager/class_BaseManager.php (100%)
 rename application/city/{main => classes}/manager/region/.htaccess (100%)
 rename application/city/{main => classes}/manager/region/class_RegionManager.php (100%)
 rename application/city/{main => classes}/manager/region/class_RegionMapManager.php (100%)
 rename application/city/{main => classes}/menu/.htaccess (100%)
 rename application/city/{main => classes}/menu/class_City (100%)
 rename application/city/{main => classes}/menu/class_CityConfirmMenu.php (100%)
 rename application/city/{main => classes}/menu/class_CityHomeMenu.php (100%)
 rename application/city/{main => classes}/menu/class_CityLoginAreaMenu.php (100%)
 rename application/city/{main => classes}/menu/class_CityLoginFailedMenu.php (100%)
 rename application/city/{main => classes}/menu/class_CityLoginMenu.php (100%)
 rename application/city/{main => classes}/menu/class_CityLogoutMenu.php (100%)
 rename application/city/{main => classes}/menu/class_CityRegisterMenu.php (100%)
 rename application/city/{main => classes}/menu/class_CityStatusMenu.php (100%)
 rename application/city/{main => classes}/menu/government/.htaccess (100%)
 rename application/city/{main => classes}/menu/government/class_CityGovernmentFailedAreaMenu.php (100%)
 rename application/city/{main => classes}/registration/.htaccess (100%)
 rename application/city/{main => classes}/registration/class_CityRegistration.php (100%)
 rename application/city/{main => classes}/resolver/.htaccess (100%)
 rename application/city/{main => classes}/resolver/command/.htaccess (100%)
 rename application/city/{main => classes}/resolver/command/console/.htaccess (100%)
 rename application/city/{main => classes}/resolver/command/console/class_CityConsoleCommandResolver.php (100%)
 rename application/city/{main => classes}/resolver/command/html/.htaccess (100%)
 rename application/city/{main => classes}/resolver/command/html/class_CityHtmlCommandResolver.php (100%)
 rename application/city/{main => classes}/resolver/controller/.htaccess (100%)
 rename application/city/{main => classes}/resolver/controller/console/.htaccess (100%)
 rename application/city/{main => classes}/resolver/controller/console/class_CityConsoleControllerResolver.php (100%)
 rename application/city/{main => classes}/resolver/controller/html/.htaccess (100%)
 rename application/city/{main => classes}/resolver/controller/html/class_CityHtmlControllerResolver.php (100%)
 rename application/city/{main => classes}/resolver/controller/image/.htaccess (100%)
 rename application/city/{main => classes}/resolver/controller/image/class_CityImageControllerResolver.php (100%)
 rename application/city/{main => classes}/states/.htaccess (100%)
 rename application/city/{main => classes}/states/city/.htaccess (100%)
 rename application/city/{main => classes}/states/city/active/.htaccess (100%)
 rename application/city/{main => classes}/states/city/active/class_CityActiveState.php (100%)
 rename application/city/{main => classes}/states/city/class_ (100%)
 rename application/city/{main => classes}/states/city/class_BaseCityState.php (100%)
 rename application/city/{main => classes}/states/city/init/.htaccess (100%)
 rename application/city/{main => classes}/states/city/init/class_CityInitState.php (100%)
 rename application/city/{main => classes}/tasks/.htaccess (100%)
 rename application/city/{main => classes}/tasks/class_BaseCityTask.php (100%)
 rename application/city/{main => classes}/tasks/daemon/.htaccess (100%)
 rename application/city/{main => classes}/tasks/daemon/building/.htaccess (100%)
 rename application/city/{main => classes}/tasks/daemon/building/class_CityDaemonBuildingGrowthTask.php (100%)
 rename application/city/{main => classes}/tasks/daemon/class_CityDaemon (100%)
 rename application/city/{main => classes}/tasks/daemon/household/.htaccess (100%)
 rename application/city/{main => classes}/tasks/daemon/household/class_CityDaemonHouseholdGrowthTask.php (100%)
 rename application/city/{main => classes}/tasks/daemon/map_expander/.htaccess (100%)
 rename application/city/{main => classes}/tasks/daemon/map_expander/class_CityDaemonMapExpanderTask.php (100%)

diff --git a/application/city/main/.htaccess b/application/city/classes/.htaccess
similarity index 100%
rename from application/city/main/.htaccess
rename to application/city/classes/.htaccess
diff --git a/application/city/main/actions/.htaccess b/application/city/classes/actions/.htaccess
similarity index 100%
rename from application/city/main/actions/.htaccess
rename to application/city/classes/actions/.htaccess
diff --git a/application/city/main/actions/class_ b/application/city/classes/actions/class_
similarity index 100%
rename from application/city/main/actions/class_
rename to application/city/classes/actions/class_
diff --git a/application/city/main/actions/class_BaseCityAction.php b/application/city/classes/actions/class_BaseCityAction.php
similarity index 100%
rename from application/city/main/actions/class_BaseCityAction.php
rename to application/city/classes/actions/class_BaseCityAction.php
diff --git a/application/city/main/actions/html/.htaccess b/application/city/classes/actions/html/.htaccess
similarity index 100%
rename from application/city/main/actions/html/.htaccess
rename to application/city/classes/actions/html/.htaccess
diff --git a/application/city/main/actions/html/city/.htaccess b/application/city/classes/actions/html/city/.htaccess
similarity index 100%
rename from application/city/main/actions/html/city/.htaccess
rename to application/city/classes/actions/html/city/.htaccess
diff --git a/application/city/main/actions/html/city/class_HtmlCityLoginCityMapAction.php b/application/city/classes/actions/html/city/class_HtmlCityLoginCityMapAction.php
similarity index 100%
rename from application/city/main/actions/html/city/class_HtmlCityLoginCityMapAction.php
rename to application/city/classes/actions/html/city/class_HtmlCityLoginCityMapAction.php
diff --git a/application/city/main/actions/html/class_HtmlCityLoginGovernmentAction.php b/application/city/classes/actions/html/class_HtmlCityLoginGovernmentAction.php
similarity index 100%
rename from application/city/main/actions/html/class_HtmlCityLoginGovernmentAction.php
rename to application/city/classes/actions/html/class_HtmlCityLoginGovernmentAction.php
diff --git a/application/city/main/actions/html/class_HtmlCityLoginLogoutAction.php b/application/city/classes/actions/html/class_HtmlCityLoginLogoutAction.php
similarity index 100%
rename from application/city/main/actions/html/class_HtmlCityLoginLogoutAction.php
rename to application/city/classes/actions/html/class_HtmlCityLoginLogoutAction.php
diff --git a/application/city/main/actions/html/class_HtmlCityLoginProfileAction.php b/application/city/classes/actions/html/class_HtmlCityLoginProfileAction.php
similarity index 100%
rename from application/city/main/actions/html/class_HtmlCityLoginProfileAction.php
rename to application/city/classes/actions/html/class_HtmlCityLoginProfileAction.php
diff --git a/application/city/main/actions/html/class_HtmlCityLoginStatusProblemAction.php b/application/city/classes/actions/html/class_HtmlCityLoginStatusProblemAction.php
similarity index 100%
rename from application/city/main/actions/html/class_HtmlCityLoginStatusProblemAction.php
rename to application/city/classes/actions/html/class_HtmlCityLoginStatusProblemAction.php
diff --git a/application/city/main/actions/html/class_HtmlCityLoginWelcomeAction.php b/application/city/classes/actions/html/class_HtmlCityLoginWelcomeAction.php
similarity index 100%
rename from application/city/main/actions/html/class_HtmlCityLoginWelcomeAction.php
rename to application/city/classes/actions/html/class_HtmlCityLoginWelcomeAction.php
diff --git a/application/city/main/city_daemon/.htaccess b/application/city/classes/city_daemon/.htaccess
similarity index 100%
rename from application/city/main/city_daemon/.htaccess
rename to application/city/classes/city_daemon/.htaccess
diff --git a/application/city/main/city_daemon/class_ b/application/city/classes/city_daemon/class_
similarity index 100%
rename from application/city/main/city_daemon/class_
rename to application/city/classes/city_daemon/class_
diff --git a/application/city/main/city_daemon/class_BaseCityDaemon.php b/application/city/classes/city_daemon/class_BaseCityDaemon.php
similarity index 100%
rename from application/city/main/city_daemon/class_BaseCityDaemon.php
rename to application/city/classes/city_daemon/class_BaseCityDaemon.php
diff --git a/application/city/main/city_daemon/default/.htaccess b/application/city/classes/city_daemon/default/.htaccess
similarity index 100%
rename from application/city/main/city_daemon/default/.htaccess
rename to application/city/classes/city_daemon/default/.htaccess
diff --git a/application/city/main/city_daemon/default/class_SimulationDefaultCityDaemon.php b/application/city/classes/city_daemon/default/class_SimulationDefaultCityDaemon.php
similarity index 100%
rename from application/city/main/city_daemon/default/class_SimulationDefaultCityDaemon.php
rename to application/city/classes/city_daemon/default/class_SimulationDefaultCityDaemon.php
diff --git a/application/city/main/class_ b/application/city/classes/class_
similarity index 100%
rename from application/city/main/class_
rename to application/city/classes/class_
diff --git a/application/city/main/class_Base b/application/city/classes/class_Base
similarity index 100%
rename from application/city/main/class_Base
rename to application/city/classes/class_Base
diff --git a/application/city/main/class_BaseCitySystem.php b/application/city/classes/class_BaseCitySystem.php
similarity index 100%
rename from application/city/main/class_BaseCitySystem.php
rename to application/city/classes/class_BaseCitySystem.php
diff --git a/application/city/main/commands/.htaccess b/application/city/classes/commands/.htaccess
similarity index 100%
rename from application/city/main/commands/.htaccess
rename to application/city/classes/commands/.htaccess
diff --git a/application/city/main/commands/console/.htaccess b/application/city/classes/commands/console/.htaccess
similarity index 100%
rename from application/city/main/commands/console/.htaccess
rename to application/city/classes/commands/console/.htaccess
diff --git a/application/city/main/commands/console/class_CityConsoleDaemonCommand.php b/application/city/classes/commands/console/class_CityConsoleDaemonCommand.php
similarity index 100%
rename from application/city/main/commands/console/class_CityConsoleDaemonCommand.php
rename to application/city/classes/commands/console/class_CityConsoleDaemonCommand.php
diff --git a/application/city/main/commands/html/.htaccess b/application/city/classes/commands/html/.htaccess
similarity index 100%
rename from application/city/main/commands/html/.htaccess
rename to application/city/classes/commands/html/.htaccess
diff --git a/application/city/main/commands/html/class_CityHtmlCityGuestLoginCommand.php b/application/city/classes/commands/html/class_CityHtmlCityGuestLoginCommand.php
similarity index 100%
rename from application/city/main/commands/html/class_CityHtmlCityGuestLoginCommand.php
rename to application/city/classes/commands/html/class_CityHtmlCityGuestLoginCommand.php
diff --git a/application/city/main/commands/html/class_CityHtmlCityMapCommand.php b/application/city/classes/commands/html/class_CityHtmlCityMapCommand.php
similarity index 100%
rename from application/city/main/commands/html/class_CityHtmlCityMapCommand.php
rename to application/city/classes/commands/html/class_CityHtmlCityMapCommand.php
diff --git a/application/city/main/commands/html/class_CityHtmlCityRegisterCommand.php b/application/city/classes/commands/html/class_CityHtmlCityRegisterCommand.php
similarity index 100%
rename from application/city/main/commands/html/class_CityHtmlCityRegisterCommand.php
rename to application/city/classes/commands/html/class_CityHtmlCityRegisterCommand.php
diff --git a/application/city/main/commands/html/class_CityHtmlCityUserLoginCommand.php b/application/city/classes/commands/html/class_CityHtmlCityUserLoginCommand.php
similarity index 100%
rename from application/city/main/commands/html/class_CityHtmlCityUserLoginCommand.php
rename to application/city/classes/commands/html/class_CityHtmlCityUserLoginCommand.php
diff --git a/application/city/main/commands/html/class_CityHtmlConfirmCommand.php b/application/city/classes/commands/html/class_CityHtmlConfirmCommand.php
similarity index 100%
rename from application/city/main/commands/html/class_CityHtmlConfirmCommand.php
rename to application/city/classes/commands/html/class_CityHtmlConfirmCommand.php
diff --git a/application/city/main/commands/html/class_CityHtmlDoFormCommand.php b/application/city/classes/commands/html/class_CityHtmlDoFormCommand.php
similarity index 100%
rename from application/city/main/commands/html/class_CityHtmlDoFormCommand.php
rename to application/city/classes/commands/html/class_CityHtmlDoFormCommand.php
diff --git a/application/city/main/commands/html/class_CityHtmlHomeCommand.php b/application/city/classes/commands/html/class_CityHtmlHomeCommand.php
similarity index 100%
rename from application/city/main/commands/html/class_CityHtmlHomeCommand.php
rename to application/city/classes/commands/html/class_CityHtmlHomeCommand.php
diff --git a/application/city/main/commands/html/class_CityHtmlLoginAreaCommand.php b/application/city/classes/commands/html/class_CityHtmlLoginAreaCommand.php
similarity index 100%
rename from application/city/main/commands/html/class_CityHtmlLoginAreaCommand.php
rename to application/city/classes/commands/html/class_CityHtmlLoginAreaCommand.php
diff --git a/application/city/main/commands/html/class_CityHtmlLoginCommand.php b/application/city/classes/commands/html/class_CityHtmlLoginCommand.php
similarity index 100%
rename from application/city/main/commands/html/class_CityHtmlLoginCommand.php
rename to application/city/classes/commands/html/class_CityHtmlLoginCommand.php
diff --git a/application/city/main/commands/html/class_CityHtmlLoginFailedCommand.php b/application/city/classes/commands/html/class_CityHtmlLoginFailedCommand.php
similarity index 100%
rename from application/city/main/commands/html/class_CityHtmlLoginFailedCommand.php
rename to application/city/classes/commands/html/class_CityHtmlLoginFailedCommand.php
diff --git a/application/city/main/commands/html/class_CityHtmlLogoutCommand.php b/application/city/classes/commands/html/class_CityHtmlLogoutCommand.php
similarity index 100%
rename from application/city/main/commands/html/class_CityHtmlLogoutCommand.php
rename to application/city/classes/commands/html/class_CityHtmlLogoutCommand.php
diff --git a/application/city/main/commands/html/class_CityHtmlRegisterCommand.php b/application/city/classes/commands/html/class_CityHtmlRegisterCommand.php
similarity index 100%
rename from application/city/main/commands/html/class_CityHtmlRegisterCommand.php
rename to application/city/classes/commands/html/class_CityHtmlRegisterCommand.php
diff --git a/application/city/main/commands/html/class_CityHtmlResendLinkCommand.php b/application/city/classes/commands/html/class_CityHtmlResendLinkCommand.php
similarity index 100%
rename from application/city/main/commands/html/class_CityHtmlResendLinkCommand.php
rename to application/city/classes/commands/html/class_CityHtmlResendLinkCommand.php
diff --git a/application/city/main/commands/html/class_HtmlLogoutDoneCommand.php b/application/city/classes/commands/html/class_HtmlLogoutDoneCommand.php
similarity index 100%
rename from application/city/main/commands/html/class_HtmlLogoutDoneCommand.php
rename to application/city/classes/commands/html/class_HtmlLogoutDoneCommand.php
diff --git a/application/city/main/controller/.htaccess b/application/city/classes/controller/.htaccess
similarity index 100%
rename from application/city/main/controller/.htaccess
rename to application/city/classes/controller/.htaccess
diff --git a/application/city/main/controller/console/.htaccess b/application/city/classes/controller/console/.htaccess
similarity index 100%
rename from application/city/main/controller/console/.htaccess
rename to application/city/classes/controller/console/.htaccess
diff --git a/application/city/main/controller/console/class_CityConsoleDefaultNewsController.php b/application/city/classes/controller/console/class_CityConsoleDefaultNewsController.php
similarity index 100%
rename from application/city/main/controller/console/class_CityConsoleDefaultNewsController.php
rename to application/city/classes/controller/console/class_CityConsoleDefaultNewsController.php
diff --git a/application/city/main/controller/html/.htaccess b/application/city/classes/controller/html/.htaccess
similarity index 100%
rename from application/city/main/controller/html/.htaccess
rename to application/city/classes/controller/html/.htaccess
diff --git a/application/city/main/controller/html/class_CityHtmlConfirmController.php b/application/city/classes/controller/html/class_CityHtmlConfirmController.php
similarity index 100%
rename from application/city/main/controller/html/class_CityHtmlConfirmController.php
rename to application/city/classes/controller/html/class_CityHtmlConfirmController.php
diff --git a/application/city/main/controller/html/class_CityHtmlDefaultNewsController.php b/application/city/classes/controller/html/class_CityHtmlDefaultNewsController.php
similarity index 100%
rename from application/city/main/controller/html/class_CityHtmlDefaultNewsController.php
rename to application/city/classes/controller/html/class_CityHtmlDefaultNewsController.php
diff --git a/application/city/main/controller/html/class_CityHtmlLoginController.php b/application/city/classes/controller/html/class_CityHtmlLoginController.php
similarity index 100%
rename from application/city/main/controller/html/class_CityHtmlLoginController.php
rename to application/city/classes/controller/html/class_CityHtmlLoginController.php
diff --git a/application/city/main/controller/html/class_CityHtmlLoginFailedController.php b/application/city/classes/controller/html/class_CityHtmlLoginFailedController.php
similarity index 100%
rename from application/city/main/controller/html/class_CityHtmlLoginFailedController.php
rename to application/city/classes/controller/html/class_CityHtmlLoginFailedController.php
diff --git a/application/city/main/controller/html/class_CityHtmlLogoutController.php b/application/city/classes/controller/html/class_CityHtmlLogoutController.php
similarity index 100%
rename from application/city/main/controller/html/class_CityHtmlLogoutController.php
rename to application/city/classes/controller/html/class_CityHtmlLogoutController.php
diff --git a/application/city/main/controller/html/class_CityHtmlLogoutDoneController.php b/application/city/classes/controller/html/class_CityHtmlLogoutDoneController.php
similarity index 100%
rename from application/city/main/controller/html/class_CityHtmlLogoutDoneController.php
rename to application/city/classes/controller/html/class_CityHtmlLogoutDoneController.php
diff --git a/application/city/main/controller/html/class_CityHtmlRegisterController.php b/application/city/classes/controller/html/class_CityHtmlRegisterController.php
similarity index 100%
rename from application/city/main/controller/html/class_CityHtmlRegisterController.php
rename to application/city/classes/controller/html/class_CityHtmlRegisterController.php
diff --git a/application/city/main/controller/html/form/.htaccess b/application/city/classes/controller/html/form/.htaccess
similarity index 100%
rename from application/city/main/controller/html/form/.htaccess
rename to application/city/classes/controller/html/form/.htaccess
diff --git a/application/city/main/controller/html/form/class_CityHtmlDoFormController.php b/application/city/classes/controller/html/form/class_CityHtmlDoFormController.php
similarity index 100%
rename from application/city/main/controller/html/form/class_CityHtmlDoFormController.php
rename to application/city/classes/controller/html/form/class_CityHtmlDoFormController.php
diff --git a/application/city/main/controller/html/login/.htaccess b/application/city/classes/controller/html/login/.htaccess
similarity index 100%
rename from application/city/main/controller/html/login/.htaccess
rename to application/city/classes/controller/html/login/.htaccess
diff --git a/application/city/main/controller/html/login/class_CityHtmlLoginAreaController.php b/application/city/classes/controller/html/login/class_CityHtmlLoginAreaController.php
similarity index 100%
rename from application/city/main/controller/html/login/class_CityHtmlLoginAreaController.php
rename to application/city/classes/controller/html/login/class_CityHtmlLoginAreaController.php
diff --git a/application/city/main/database/.htaccess b/application/city/classes/database/.htaccess
similarity index 100%
rename from application/city/main/database/.htaccess
rename to application/city/classes/database/.htaccess
diff --git a/application/city/main/database/frontend/.htaccess b/application/city/classes/database/frontend/.htaccess
similarity index 100%
rename from application/city/main/database/frontend/.htaccess
rename to application/city/classes/database/frontend/.htaccess
diff --git a/application/city/main/database/frontend/city/.htaccess b/application/city/classes/database/frontend/city/.htaccess
similarity index 100%
rename from application/city/main/database/frontend/city/.htaccess
rename to application/city/classes/database/frontend/city/.htaccess
diff --git a/application/city/main/database/frontend/city/class_CityInformationDatabaseWrapper.php b/application/city/classes/database/frontend/city/class_CityInformationDatabaseWrapper.php
similarity index 100%
rename from application/city/main/database/frontend/city/class_CityInformationDatabaseWrapper.php
rename to application/city/classes/database/frontend/city/class_CityInformationDatabaseWrapper.php
diff --git a/application/city/main/database/frontend/city_entities/.htaccess b/application/city/classes/database/frontend/city_entities/.htaccess
similarity index 100%
rename from application/city/main/database/frontend/city_entities/.htaccess
rename to application/city/classes/database/frontend/city_entities/.htaccess
diff --git a/application/city/main/database/frontend/city_entities/districts/.htaccess b/application/city/classes/database/frontend/city_entities/districts/.htaccess
similarity index 100%
rename from application/city/main/database/frontend/city_entities/districts/.htaccess
rename to application/city/classes/database/frontend/city_entities/districts/.htaccess
diff --git a/application/city/main/database/frontend/city_entities/districts/class_CityDistrictsDatabaseWrapper.php b/application/city/classes/database/frontend/city_entities/districts/class_CityDistrictsDatabaseWrapper.php
similarity index 100%
rename from application/city/main/database/frontend/city_entities/districts/class_CityDistrictsDatabaseWrapper.php
rename to application/city/classes/database/frontend/city_entities/districts/class_CityDistrictsDatabaseWrapper.php
diff --git a/application/city/main/database/frontend/city_entities/lots/.htaccess b/application/city/classes/database/frontend/city_entities/lots/.htaccess
similarity index 100%
rename from application/city/main/database/frontend/city_entities/lots/.htaccess
rename to application/city/classes/database/frontend/city_entities/lots/.htaccess
diff --git a/application/city/main/database/frontend/city_entities/lots/class_CityLotsDatabaseWrapper.php b/application/city/classes/database/frontend/city_entities/lots/class_CityLotsDatabaseWrapper.php
similarity index 100%
rename from application/city/main/database/frontend/city_entities/lots/class_CityLotsDatabaseWrapper.php
rename to application/city/classes/database/frontend/city_entities/lots/class_CityLotsDatabaseWrapper.php
diff --git a/application/city/main/database/frontend/city_entities/sections/.htaccess b/application/city/classes/database/frontend/city_entities/sections/.htaccess
similarity index 100%
rename from application/city/main/database/frontend/city_entities/sections/.htaccess
rename to application/city/classes/database/frontend/city_entities/sections/.htaccess
diff --git a/application/city/main/database/frontend/city_entities/sections/class_CitySectionsDatabaseWrapper.php b/application/city/classes/database/frontend/city_entities/sections/class_CitySectionsDatabaseWrapper.php
similarity index 100%
rename from application/city/main/database/frontend/city_entities/sections/class_CitySectionsDatabaseWrapper.php
rename to application/city/classes/database/frontend/city_entities/sections/class_CitySectionsDatabaseWrapper.php
diff --git a/application/city/main/database/frontend/region/.htaccess b/application/city/classes/database/frontend/region/.htaccess
similarity index 100%
rename from application/city/main/database/frontend/region/.htaccess
rename to application/city/classes/database/frontend/region/.htaccess
diff --git a/application/city/main/database/frontend/region/class_RegionInformationDatabaseWrapper.php b/application/city/classes/database/frontend/region/class_RegionInformationDatabaseWrapper.php
similarity index 100%
rename from application/city/main/database/frontend/region/class_RegionInformationDatabaseWrapper.php
rename to application/city/classes/database/frontend/region/class_RegionInformationDatabaseWrapper.php
diff --git a/application/city/main/database/frontend/region_map/.htaccess b/application/city/classes/database/frontend/region_map/.htaccess
similarity index 100%
rename from application/city/main/database/frontend/region_map/.htaccess
rename to application/city/classes/database/frontend/region_map/.htaccess
diff --git a/application/city/main/database/frontend/region_map/class_RegionMapDatabaseWrapper.php b/application/city/classes/database/frontend/region_map/class_RegionMapDatabaseWrapper.php
similarity index 100%
rename from application/city/main/database/frontend/region_map/class_RegionMapDatabaseWrapper.php
rename to application/city/classes/database/frontend/region_map/class_RegionMapDatabaseWrapper.php
diff --git a/application/city/main/factories/.htaccess b/application/city/classes/factories/.htaccess
similarity index 100%
rename from application/city/main/factories/.htaccess
rename to application/city/classes/factories/.htaccess
diff --git a/application/city/main/factories/city_daemon/.htaccess b/application/city/classes/factories/city_daemon/.htaccess
similarity index 100%
rename from application/city/main/factories/city_daemon/.htaccess
rename to application/city/classes/factories/city_daemon/.htaccess
diff --git a/application/city/main/factories/city_daemon/class_CityDaemonFactory.php b/application/city/classes/factories/city_daemon/class_CityDaemonFactory.php
similarity index 100%
rename from application/city/main/factories/city_daemon/class_CityDaemonFactory.php
rename to application/city/classes/factories/city_daemon/class_CityDaemonFactory.php
diff --git a/application/city/main/factories/manager/.htaccess b/application/city/classes/factories/manager/.htaccess
similarity index 100%
rename from application/city/main/factories/manager/.htaccess
rename to application/city/classes/factories/manager/.htaccess
diff --git a/application/city/main/factories/manager/class_ManagerFactory.php b/application/city/classes/factories/manager/class_ManagerFactory.php
similarity index 100%
rename from application/city/main/factories/manager/class_ManagerFactory.php
rename to application/city/classes/factories/manager/class_ManagerFactory.php
diff --git a/application/city/main/factories/states/.htaccess b/application/city/classes/factories/states/.htaccess
similarity index 100%
rename from application/city/main/factories/states/.htaccess
rename to application/city/classes/factories/states/.htaccess
diff --git a/application/city/main/factories/states/city/.htaccess b/application/city/classes/factories/states/city/.htaccess
similarity index 100%
rename from application/city/main/factories/states/city/.htaccess
rename to application/city/classes/factories/states/city/.htaccess
diff --git a/application/city/main/factories/states/city/class_CityStateFactory.php b/application/city/classes/factories/states/city/class_CityStateFactory.php
similarity index 100%
rename from application/city/main/factories/states/city/class_CityStateFactory.php
rename to application/city/classes/factories/states/city/class_CityStateFactory.php
diff --git a/application/city/main/filter/.htaccess b/application/city/classes/filter/.htaccess
similarity index 100%
rename from application/city/main/filter/.htaccess
rename to application/city/classes/filter/.htaccess
diff --git a/application/city/main/filter/bootstrap/.htaccess b/application/city/classes/filter/bootstrap/.htaccess
similarity index 100%
rename from application/city/main/filter/bootstrap/.htaccess
rename to application/city/classes/filter/bootstrap/.htaccess
diff --git a/application/city/main/filter/bootstrap/class_CityDaemonBootstrap b/application/city/classes/filter/bootstrap/class_CityDaemonBootstrap
similarity index 100%
rename from application/city/main/filter/bootstrap/class_CityDaemonBootstrap
rename to application/city/classes/filter/bootstrap/class_CityDaemonBootstrap
diff --git a/application/city/main/filter/bootstrap/init/.htaccess b/application/city/classes/filter/bootstrap/init/.htaccess
similarity index 100%
rename from application/city/main/filter/bootstrap/init/.htaccess
rename to application/city/classes/filter/bootstrap/init/.htaccess
diff --git a/application/city/main/filter/bootstrap/init/class_CityDaemonBootstrapInitDaemonFilter.php b/application/city/classes/filter/bootstrap/init/class_CityDaemonBootstrapInitDaemonFilter.php
similarity index 100%
rename from application/city/main/filter/bootstrap/init/class_CityDaemonBootstrapInitDaemonFilter.php
rename to application/city/classes/filter/bootstrap/init/class_CityDaemonBootstrapInitDaemonFilter.php
diff --git a/application/city/main/filter/city_daemon/.htaccess b/application/city/classes/filter/city_daemon/.htaccess
similarity index 100%
rename from application/city/main/filter/city_daemon/.htaccess
rename to application/city/classes/filter/city_daemon/.htaccess
diff --git a/application/city/main/filter/city_daemon/class_CityDaemon b/application/city/classes/filter/city_daemon/class_CityDaemon
similarity index 100%
rename from application/city/main/filter/city_daemon/class_CityDaemon
rename to application/city/classes/filter/city_daemon/class_CityDaemon
diff --git a/application/city/main/filter/city_daemon/class_CityDaemonInitializationFilter.php b/application/city/classes/filter/city_daemon/class_CityDaemonInitializationFilter.php
similarity index 100%
rename from application/city/main/filter/city_daemon/class_CityDaemonInitializationFilter.php
rename to application/city/classes/filter/city_daemon/class_CityDaemonInitializationFilter.php
diff --git a/application/city/main/filter/city_daemon/class_CityDaemonPhpRequirementsFilter.php b/application/city/classes/filter/city_daemon/class_CityDaemonPhpRequirementsFilter.php
similarity index 100%
rename from application/city/main/filter/city_daemon/class_CityDaemonPhpRequirementsFilter.php
rename to application/city/classes/filter/city_daemon/class_CityDaemonPhpRequirementsFilter.php
diff --git a/application/city/main/filter/city_daemon/class_CityDaemonWelcomeTeaserFilter.php b/application/city/classes/filter/city_daemon/class_CityDaemonWelcomeTeaserFilter.php
similarity index 100%
rename from application/city/main/filter/city_daemon/class_CityDaemonWelcomeTeaserFilter.php
rename to application/city/classes/filter/city_daemon/class_CityDaemonWelcomeTeaserFilter.php
diff --git a/application/city/main/filter/class_ b/application/city/classes/filter/class_
similarity index 100%
rename from application/city/main/filter/class_
rename to application/city/classes/filter/class_
diff --git a/application/city/main/filter/class_BaseCityFilter.php b/application/city/classes/filter/class_BaseCityFilter.php
similarity index 100%
rename from application/city/main/filter/class_BaseCityFilter.php
rename to application/city/classes/filter/class_BaseCityFilter.php
diff --git a/application/city/main/filter/shutdown/.htaccess b/application/city/classes/filter/shutdown/.htaccess
similarity index 100%
rename from application/city/main/filter/shutdown/.htaccess
rename to application/city/classes/filter/shutdown/.htaccess
diff --git a/application/city/main/filter/shutdown/city/.htaccess b/application/city/classes/filter/shutdown/city/.htaccess
similarity index 100%
rename from application/city/main/filter/shutdown/city/.htaccess
rename to application/city/classes/filter/shutdown/city/.htaccess
diff --git a/application/city/main/filter/shutdown/city/class_CityDaemonShutdown b/application/city/classes/filter/shutdown/city/class_CityDaemonShutdown
similarity index 100%
rename from application/city/main/filter/shutdown/city/class_CityDaemonShutdown
rename to application/city/classes/filter/shutdown/city/class_CityDaemonShutdown
diff --git a/application/city/main/filter/shutdown/city/class_CityDaemonShutdownCityFilter.php b/application/city/classes/filter/shutdown/city/class_CityDaemonShutdownCityFilter.php
similarity index 100%
rename from application/city/main/filter/shutdown/city/class_CityDaemonShutdownCityFilter.php
rename to application/city/classes/filter/shutdown/city/class_CityDaemonShutdownCityFilter.php
diff --git a/application/city/main/filter/shutdown/city/class_CityDaemonShutdownTaskHandlerFilter.php b/application/city/classes/filter/shutdown/city/class_CityDaemonShutdownTaskHandlerFilter.php
similarity index 100%
rename from application/city/main/filter/shutdown/city/class_CityDaemonShutdownTaskHandlerFilter.php
rename to application/city/classes/filter/shutdown/city/class_CityDaemonShutdownTaskHandlerFilter.php
diff --git a/application/city/main/filter/task/.htaccess b/application/city/classes/filter/task/.htaccess
similarity index 100%
rename from application/city/main/filter/task/.htaccess
rename to application/city/classes/filter/task/.htaccess
diff --git a/application/city/main/filter/task/city_daemon/.htaccess b/application/city/classes/filter/task/city_daemon/.htaccess
similarity index 100%
rename from application/city/main/filter/task/city_daemon/.htaccess
rename to application/city/classes/filter/task/city_daemon/.htaccess
diff --git a/application/city/main/filter/task/city_daemon/class_CityDaemonTaskHandlerInitializerFilter.php b/application/city/classes/filter/task/city_daemon/class_CityDaemonTaskHandlerInitializerFilter.php
similarity index 100%
rename from application/city/main/filter/task/city_daemon/class_CityDaemonTaskHandlerInitializerFilter.php
rename to application/city/classes/filter/task/city_daemon/class_CityDaemonTaskHandlerInitializerFilter.php
diff --git a/application/city/main/filter/verifier/.htaccess b/application/city/classes/filter/verifier/.htaccess
similarity index 100%
rename from application/city/main/filter/verifier/.htaccess
rename to application/city/classes/filter/verifier/.htaccess
diff --git a/application/city/main/filter/verifier/class_CityNameVerifierFilter.php b/application/city/classes/filter/verifier/class_CityNameVerifierFilter.php
similarity index 100%
rename from application/city/main/filter/verifier/class_CityNameVerifierFilter.php
rename to application/city/classes/filter/verifier/class_CityNameVerifierFilter.php
diff --git a/application/city/main/login/.htaccess b/application/city/classes/login/.htaccess
similarity index 100%
rename from application/city/main/login/.htaccess
rename to application/city/classes/login/.htaccess
diff --git a/application/city/main/login/class_CityGuestLogin.php b/application/city/classes/login/class_CityGuestLogin.php
similarity index 100%
rename from application/city/main/login/class_CityGuestLogin.php
rename to application/city/classes/login/class_CityGuestLogin.php
diff --git a/application/city/main/login/class_CityUserLogin.php b/application/city/classes/login/class_CityUserLogin.php
similarity index 100%
rename from application/city/main/login/class_CityUserLogin.php
rename to application/city/classes/login/class_CityUserLogin.php
diff --git a/application/city/main/login/helper/.htaccess b/application/city/classes/login/helper/.htaccess
similarity index 100%
rename from application/city/main/login/helper/.htaccess
rename to application/city/classes/login/helper/.htaccess
diff --git a/application/city/main/login/helper/class_CityLoginHelper.php b/application/city/classes/login/helper/class_CityLoginHelper.php
similarity index 100%
rename from application/city/main/login/helper/class_CityLoginHelper.php
rename to application/city/classes/login/helper/class_CityLoginHelper.php
diff --git a/application/city/main/manager/.htaccess b/application/city/classes/manager/.htaccess
similarity index 100%
rename from application/city/main/manager/.htaccess
rename to application/city/classes/manager/.htaccess
diff --git a/application/city/main/manager/city/.htaccess b/application/city/classes/manager/city/.htaccess
similarity index 100%
rename from application/city/main/manager/city/.htaccess
rename to application/city/classes/manager/city/.htaccess
diff --git a/application/city/main/manager/city/class_CityManager.php b/application/city/classes/manager/city/class_CityManager.php
similarity index 100%
rename from application/city/main/manager/city/class_CityManager.php
rename to application/city/classes/manager/city/class_CityManager.php
diff --git a/application/city/main/manager/city_entities/.htaccess b/application/city/classes/manager/city_entities/.htaccess
similarity index 100%
rename from application/city/main/manager/city_entities/.htaccess
rename to application/city/classes/manager/city_entities/.htaccess
diff --git a/application/city/main/manager/city_entities/districts/.htaccess b/application/city/classes/manager/city_entities/districts/.htaccess
similarity index 100%
rename from application/city/main/manager/city_entities/districts/.htaccess
rename to application/city/classes/manager/city_entities/districts/.htaccess
diff --git a/application/city/main/manager/city_entities/districts/class_CityDistrictsManager.php b/application/city/classes/manager/city_entities/districts/class_CityDistrictsManager.php
similarity index 100%
rename from application/city/main/manager/city_entities/districts/class_CityDistrictsManager.php
rename to application/city/classes/manager/city_entities/districts/class_CityDistrictsManager.php
diff --git a/application/city/main/manager/city_entities/lots/.htaccess b/application/city/classes/manager/city_entities/lots/.htaccess
similarity index 100%
rename from application/city/main/manager/city_entities/lots/.htaccess
rename to application/city/classes/manager/city_entities/lots/.htaccess
diff --git a/application/city/main/manager/city_entities/lots/class_CityLotsManager.php b/application/city/classes/manager/city_entities/lots/class_CityLotsManager.php
similarity index 100%
rename from application/city/main/manager/city_entities/lots/class_CityLotsManager.php
rename to application/city/classes/manager/city_entities/lots/class_CityLotsManager.php
diff --git a/application/city/main/manager/city_entities/sections/.htaccess b/application/city/classes/manager/city_entities/sections/.htaccess
similarity index 100%
rename from application/city/main/manager/city_entities/sections/.htaccess
rename to application/city/classes/manager/city_entities/sections/.htaccess
diff --git a/application/city/main/manager/city_entities/sections/class_CitySectionsManager.php b/application/city/classes/manager/city_entities/sections/class_CitySectionsManager.php
similarity index 100%
rename from application/city/main/manager/city_entities/sections/class_CitySectionsManager.php
rename to application/city/classes/manager/city_entities/sections/class_CitySectionsManager.php
diff --git a/application/city/main/manager/class_ b/application/city/classes/manager/class_
similarity index 100%
rename from application/city/main/manager/class_
rename to application/city/classes/manager/class_
diff --git a/application/city/main/manager/class_BaseManager.php b/application/city/classes/manager/class_BaseManager.php
similarity index 100%
rename from application/city/main/manager/class_BaseManager.php
rename to application/city/classes/manager/class_BaseManager.php
diff --git a/application/city/main/manager/region/.htaccess b/application/city/classes/manager/region/.htaccess
similarity index 100%
rename from application/city/main/manager/region/.htaccess
rename to application/city/classes/manager/region/.htaccess
diff --git a/application/city/main/manager/region/class_RegionManager.php b/application/city/classes/manager/region/class_RegionManager.php
similarity index 100%
rename from application/city/main/manager/region/class_RegionManager.php
rename to application/city/classes/manager/region/class_RegionManager.php
diff --git a/application/city/main/manager/region/class_RegionMapManager.php b/application/city/classes/manager/region/class_RegionMapManager.php
similarity index 100%
rename from application/city/main/manager/region/class_RegionMapManager.php
rename to application/city/classes/manager/region/class_RegionMapManager.php
diff --git a/application/city/main/menu/.htaccess b/application/city/classes/menu/.htaccess
similarity index 100%
rename from application/city/main/menu/.htaccess
rename to application/city/classes/menu/.htaccess
diff --git a/application/city/main/menu/class_City b/application/city/classes/menu/class_City
similarity index 100%
rename from application/city/main/menu/class_City
rename to application/city/classes/menu/class_City
diff --git a/application/city/main/menu/class_CityConfirmMenu.php b/application/city/classes/menu/class_CityConfirmMenu.php
similarity index 100%
rename from application/city/main/menu/class_CityConfirmMenu.php
rename to application/city/classes/menu/class_CityConfirmMenu.php
diff --git a/application/city/main/menu/class_CityHomeMenu.php b/application/city/classes/menu/class_CityHomeMenu.php
similarity index 100%
rename from application/city/main/menu/class_CityHomeMenu.php
rename to application/city/classes/menu/class_CityHomeMenu.php
diff --git a/application/city/main/menu/class_CityLoginAreaMenu.php b/application/city/classes/menu/class_CityLoginAreaMenu.php
similarity index 100%
rename from application/city/main/menu/class_CityLoginAreaMenu.php
rename to application/city/classes/menu/class_CityLoginAreaMenu.php
diff --git a/application/city/main/menu/class_CityLoginFailedMenu.php b/application/city/classes/menu/class_CityLoginFailedMenu.php
similarity index 100%
rename from application/city/main/menu/class_CityLoginFailedMenu.php
rename to application/city/classes/menu/class_CityLoginFailedMenu.php
diff --git a/application/city/main/menu/class_CityLoginMenu.php b/application/city/classes/menu/class_CityLoginMenu.php
similarity index 100%
rename from application/city/main/menu/class_CityLoginMenu.php
rename to application/city/classes/menu/class_CityLoginMenu.php
diff --git a/application/city/main/menu/class_CityLogoutMenu.php b/application/city/classes/menu/class_CityLogoutMenu.php
similarity index 100%
rename from application/city/main/menu/class_CityLogoutMenu.php
rename to application/city/classes/menu/class_CityLogoutMenu.php
diff --git a/application/city/main/menu/class_CityRegisterMenu.php b/application/city/classes/menu/class_CityRegisterMenu.php
similarity index 100%
rename from application/city/main/menu/class_CityRegisterMenu.php
rename to application/city/classes/menu/class_CityRegisterMenu.php
diff --git a/application/city/main/menu/class_CityStatusMenu.php b/application/city/classes/menu/class_CityStatusMenu.php
similarity index 100%
rename from application/city/main/menu/class_CityStatusMenu.php
rename to application/city/classes/menu/class_CityStatusMenu.php
diff --git a/application/city/main/menu/government/.htaccess b/application/city/classes/menu/government/.htaccess
similarity index 100%
rename from application/city/main/menu/government/.htaccess
rename to application/city/classes/menu/government/.htaccess
diff --git a/application/city/main/menu/government/class_CityGovernmentFailedAreaMenu.php b/application/city/classes/menu/government/class_CityGovernmentFailedAreaMenu.php
similarity index 100%
rename from application/city/main/menu/government/class_CityGovernmentFailedAreaMenu.php
rename to application/city/classes/menu/government/class_CityGovernmentFailedAreaMenu.php
diff --git a/application/city/main/registration/.htaccess b/application/city/classes/registration/.htaccess
similarity index 100%
rename from application/city/main/registration/.htaccess
rename to application/city/classes/registration/.htaccess
diff --git a/application/city/main/registration/class_CityRegistration.php b/application/city/classes/registration/class_CityRegistration.php
similarity index 100%
rename from application/city/main/registration/class_CityRegistration.php
rename to application/city/classes/registration/class_CityRegistration.php
diff --git a/application/city/main/resolver/.htaccess b/application/city/classes/resolver/.htaccess
similarity index 100%
rename from application/city/main/resolver/.htaccess
rename to application/city/classes/resolver/.htaccess
diff --git a/application/city/main/resolver/command/.htaccess b/application/city/classes/resolver/command/.htaccess
similarity index 100%
rename from application/city/main/resolver/command/.htaccess
rename to application/city/classes/resolver/command/.htaccess
diff --git a/application/city/main/resolver/command/console/.htaccess b/application/city/classes/resolver/command/console/.htaccess
similarity index 100%
rename from application/city/main/resolver/command/console/.htaccess
rename to application/city/classes/resolver/command/console/.htaccess
diff --git a/application/city/main/resolver/command/console/class_CityConsoleCommandResolver.php b/application/city/classes/resolver/command/console/class_CityConsoleCommandResolver.php
similarity index 100%
rename from application/city/main/resolver/command/console/class_CityConsoleCommandResolver.php
rename to application/city/classes/resolver/command/console/class_CityConsoleCommandResolver.php
diff --git a/application/city/main/resolver/command/html/.htaccess b/application/city/classes/resolver/command/html/.htaccess
similarity index 100%
rename from application/city/main/resolver/command/html/.htaccess
rename to application/city/classes/resolver/command/html/.htaccess
diff --git a/application/city/main/resolver/command/html/class_CityHtmlCommandResolver.php b/application/city/classes/resolver/command/html/class_CityHtmlCommandResolver.php
similarity index 100%
rename from application/city/main/resolver/command/html/class_CityHtmlCommandResolver.php
rename to application/city/classes/resolver/command/html/class_CityHtmlCommandResolver.php
diff --git a/application/city/main/resolver/controller/.htaccess b/application/city/classes/resolver/controller/.htaccess
similarity index 100%
rename from application/city/main/resolver/controller/.htaccess
rename to application/city/classes/resolver/controller/.htaccess
diff --git a/application/city/main/resolver/controller/console/.htaccess b/application/city/classes/resolver/controller/console/.htaccess
similarity index 100%
rename from application/city/main/resolver/controller/console/.htaccess
rename to application/city/classes/resolver/controller/console/.htaccess
diff --git a/application/city/main/resolver/controller/console/class_CityConsoleControllerResolver.php b/application/city/classes/resolver/controller/console/class_CityConsoleControllerResolver.php
similarity index 100%
rename from application/city/main/resolver/controller/console/class_CityConsoleControllerResolver.php
rename to application/city/classes/resolver/controller/console/class_CityConsoleControllerResolver.php
diff --git a/application/city/main/resolver/controller/html/.htaccess b/application/city/classes/resolver/controller/html/.htaccess
similarity index 100%
rename from application/city/main/resolver/controller/html/.htaccess
rename to application/city/classes/resolver/controller/html/.htaccess
diff --git a/application/city/main/resolver/controller/html/class_CityHtmlControllerResolver.php b/application/city/classes/resolver/controller/html/class_CityHtmlControllerResolver.php
similarity index 100%
rename from application/city/main/resolver/controller/html/class_CityHtmlControllerResolver.php
rename to application/city/classes/resolver/controller/html/class_CityHtmlControllerResolver.php
diff --git a/application/city/main/resolver/controller/image/.htaccess b/application/city/classes/resolver/controller/image/.htaccess
similarity index 100%
rename from application/city/main/resolver/controller/image/.htaccess
rename to application/city/classes/resolver/controller/image/.htaccess
diff --git a/application/city/main/resolver/controller/image/class_CityImageControllerResolver.php b/application/city/classes/resolver/controller/image/class_CityImageControllerResolver.php
similarity index 100%
rename from application/city/main/resolver/controller/image/class_CityImageControllerResolver.php
rename to application/city/classes/resolver/controller/image/class_CityImageControllerResolver.php
diff --git a/application/city/main/states/.htaccess b/application/city/classes/states/.htaccess
similarity index 100%
rename from application/city/main/states/.htaccess
rename to application/city/classes/states/.htaccess
diff --git a/application/city/main/states/city/.htaccess b/application/city/classes/states/city/.htaccess
similarity index 100%
rename from application/city/main/states/city/.htaccess
rename to application/city/classes/states/city/.htaccess
diff --git a/application/city/main/states/city/active/.htaccess b/application/city/classes/states/city/active/.htaccess
similarity index 100%
rename from application/city/main/states/city/active/.htaccess
rename to application/city/classes/states/city/active/.htaccess
diff --git a/application/city/main/states/city/active/class_CityActiveState.php b/application/city/classes/states/city/active/class_CityActiveState.php
similarity index 100%
rename from application/city/main/states/city/active/class_CityActiveState.php
rename to application/city/classes/states/city/active/class_CityActiveState.php
diff --git a/application/city/main/states/city/class_ b/application/city/classes/states/city/class_
similarity index 100%
rename from application/city/main/states/city/class_
rename to application/city/classes/states/city/class_
diff --git a/application/city/main/states/city/class_BaseCityState.php b/application/city/classes/states/city/class_BaseCityState.php
similarity index 100%
rename from application/city/main/states/city/class_BaseCityState.php
rename to application/city/classes/states/city/class_BaseCityState.php
diff --git a/application/city/main/states/city/init/.htaccess b/application/city/classes/states/city/init/.htaccess
similarity index 100%
rename from application/city/main/states/city/init/.htaccess
rename to application/city/classes/states/city/init/.htaccess
diff --git a/application/city/main/states/city/init/class_CityInitState.php b/application/city/classes/states/city/init/class_CityInitState.php
similarity index 100%
rename from application/city/main/states/city/init/class_CityInitState.php
rename to application/city/classes/states/city/init/class_CityInitState.php
diff --git a/application/city/main/tasks/.htaccess b/application/city/classes/tasks/.htaccess
similarity index 100%
rename from application/city/main/tasks/.htaccess
rename to application/city/classes/tasks/.htaccess
diff --git a/application/city/main/tasks/class_BaseCityTask.php b/application/city/classes/tasks/class_BaseCityTask.php
similarity index 100%
rename from application/city/main/tasks/class_BaseCityTask.php
rename to application/city/classes/tasks/class_BaseCityTask.php
diff --git a/application/city/main/tasks/daemon/.htaccess b/application/city/classes/tasks/daemon/.htaccess
similarity index 100%
rename from application/city/main/tasks/daemon/.htaccess
rename to application/city/classes/tasks/daemon/.htaccess
diff --git a/application/city/main/tasks/daemon/building/.htaccess b/application/city/classes/tasks/daemon/building/.htaccess
similarity index 100%
rename from application/city/main/tasks/daemon/building/.htaccess
rename to application/city/classes/tasks/daemon/building/.htaccess
diff --git a/application/city/main/tasks/daemon/building/class_CityDaemonBuildingGrowthTask.php b/application/city/classes/tasks/daemon/building/class_CityDaemonBuildingGrowthTask.php
similarity index 100%
rename from application/city/main/tasks/daemon/building/class_CityDaemonBuildingGrowthTask.php
rename to application/city/classes/tasks/daemon/building/class_CityDaemonBuildingGrowthTask.php
diff --git a/application/city/main/tasks/daemon/class_CityDaemon b/application/city/classes/tasks/daemon/class_CityDaemon
similarity index 100%
rename from application/city/main/tasks/daemon/class_CityDaemon
rename to application/city/classes/tasks/daemon/class_CityDaemon
diff --git a/application/city/main/tasks/daemon/household/.htaccess b/application/city/classes/tasks/daemon/household/.htaccess
similarity index 100%
rename from application/city/main/tasks/daemon/household/.htaccess
rename to application/city/classes/tasks/daemon/household/.htaccess
diff --git a/application/city/main/tasks/daemon/household/class_CityDaemonHouseholdGrowthTask.php b/application/city/classes/tasks/daemon/household/class_CityDaemonHouseholdGrowthTask.php
similarity index 100%
rename from application/city/main/tasks/daemon/household/class_CityDaemonHouseholdGrowthTask.php
rename to application/city/classes/tasks/daemon/household/class_CityDaemonHouseholdGrowthTask.php
diff --git a/application/city/main/tasks/daemon/map_expander/.htaccess b/application/city/classes/tasks/daemon/map_expander/.htaccess
similarity index 100%
rename from application/city/main/tasks/daemon/map_expander/.htaccess
rename to application/city/classes/tasks/daemon/map_expander/.htaccess
diff --git a/application/city/main/tasks/daemon/map_expander/class_CityDaemonMapExpanderTask.php b/application/city/classes/tasks/daemon/map_expander/class_CityDaemonMapExpanderTask.php
similarity index 100%
rename from application/city/main/tasks/daemon/map_expander/class_CityDaemonMapExpanderTask.php
rename to application/city/classes/tasks/daemon/map_expander/class_CityDaemonMapExpanderTask.php
diff --git a/core b/core
index 17f3643..7bc4014 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit 17f36438ae9e5d239cbfc019890ea81ba5f00bb1
+Subproject commit 7bc4014657a70dedfc38b9b28d134aa7c3a6158c
-- 
2.39.5