From 95a008a7823f28fa6a1172798e0d7565385055d4 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Mon, 20 Feb 2017 23:08:14 +0100
Subject: [PATCH] Continued: - removed more [EOF] (own old style) - removed
 more closing PHP tag as this is discouraged - added namespaces + some more
 deprecation (can be replaced with generic   exceptions)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 application/tests/config.php                           |  3 ---
 application/tests/data.php                             |  3 ---
 application/tests/debug.php                            |  3 ---
 application/tests/init.php                             |  3 ---
 application/tests/starter.php                          |  3 ---
 contrib/chash/chash.php                                |  3 ---
 contrib/lfdb2/read.php                                 |  3 ---
 contrib/lfdb2/write.php                                |  3 ---
 inc/config.php                                         |  3 ---
 inc/database/lib-local.php                             |  3 ---
 inc/includes.php                                       |  3 ---
 .../actions/html/class_HtmlLoginProfileAction.php      |  4 +---
 .../class_LoginAfterRegistrationAction.php             |  7 ++++---
 inc/main/classes/class_FrameworkArrayObject.php        | 10 +++++++---
 inc/main/classes/client/http/class_HttpClient.php      |  7 ++++---
 .../commands/console/class_ConsoleFuseCommand.php      |  7 ++++---
 .../classes/commands/html/class_HtmlConfirmCommand.php |  7 ++++---
 .../classes/commands/html/class_HtmlDoFormCommand.php  |  6 +++---
 .../classes/commands/html/class_HtmlHomeCommand.php    |  7 ++++---
 .../commands/html/class_HtmlLoginAreaCommand.php       |  7 ++++---
 .../classes/commands/html/class_HtmlLoginCommand.php   |  4 +---
 .../commands/html/class_HtmlLoginFailedCommand.php     |  7 ++++---
 .../classes/commands/html/class_HtmlLogoutCommand.php  |  7 ++++---
 .../commands/html/class_HtmlLogoutDoneCommand.php      |  7 ++++---
 .../classes/commands/html/class_HtmlProblemCommand.php |  7 ++++---
 .../commands/html/class_HtmlRegisterCommand.php        |  4 +---
 .../commands/html/class_HtmlResendLinkCommand.php      |  7 ++++---
 .../classes/commands/html/class_HtmlStatusCommand.php  |  7 ++++---
 .../commands/image/class_ImageCodeCaptchaCommand.php   |  7 ++++---
 .../classes/container/socket/class_SocketContainer.php |  7 ++++---
 .../console/class_ConsoleDefaultController.php         |  7 ++++---
 .../console/class_ConsoleDefaultNewsController.php     |  7 ++++---
 .../controller/html/class_HtmlConfirmController.php    |  7 ++++---
 .../controller/html/class_HtmlDefaultController.php    |  7 ++++---
 .../html/class_HtmlDefaultNewsController.php           |  7 ++++---
 .../controller/html/class_HtmlLoginController.php      |  7 ++++---
 .../html/class_HtmlLoginFailedController.php           |  7 ++++---
 .../controller/html/class_HtmlLogoutController.php     |  7 ++++---
 .../controller/html/class_HtmlLogoutDoneController.php |  7 ++++---
 .../controller/html/class_HtmlProblemController.php    |  7 ++++---
 .../controller/html/class_HtmlStatusController.php     |  7 ++++---
 .../html/form/class_HtmlDoFormController.php           |  7 ++++---
 .../html/login/class_HtmlLoginAreaController.php       |  7 ++++---
 .../image/captcha/class_ImageCodeCaptchaController.php |  7 ++++---
 .../controller/image/class_ImageDefaultController.php  |  7 ++++---
 .../classes/criteria/dataset/class_DataSetCriteria.php |  7 ++++---
 .../classes/criteria/search/class_SearchCriteria.php   |  7 ++++---
 .../classes/criteria/update/class_UpdateCriteria.php   |  7 ++++---
 .../database/backend/class_CachedLocalFileDatabase.php |  7 ++++---
 .../frontend/class_PaymentsDatabaseWrapper.php         |  7 ++++---
 .../database/result/class_CachedDatabaseResult.php     |  7 ++++---
 .../template/class_XmlRewriterTemplateDecorator.php    |  4 +---
 .../decorator/xml/class_XmlCompactorDecorator.php      |  7 ++++---
 .../discovery/payment/class_LocalPaymentDiscovery.php  |  4 +---
 .../classes/factories/cache/class_CacheFactory.php     |  7 ++++---
 .../classes/factories/client/class_ClientFactory.php   |  7 ++++---
 .../database/class_DatabaseWrapperFactory.php          |  7 ++++---
 .../classes/factories/html/class_HtmlNewsFactory.php   |  7 ++++---
 .../factories/index/class_FileStackIndexFactory.php    |  7 ++++---
 .../classes/factories/login/class_LoginFactory.php     |  7 ++++---
 .../classes/factories/objects/class_ObjectFactory.php  |  4 +---
 .../factories/registry/class_SocketRegistryFactory.php |  7 ++++---
 .../factories/stacks/class_FileStackFactory.php        |  4 +---
 inc/main/classes/factories/user/class_UserFactory.php  |  4 +---
 .../factories/xml/class_XmlTemplateEngineFactory.php   |  7 ++++---
 inc/main/classes/feature/fuse/class_FuseFeature.php    |  7 ++++---
 .../file_directories/binary/class_BaseBinaryFile.php   |  7 ++++---
 .../file_directories/binary/index/class_IndexFile.php  |  7 ++++---
 .../file_directories/binary/stack/class_StackFile.php  |  7 ++++---
 .../file_directories/io_stream/class_FileIoStream.php  |  2 +-
 .../output/raw/class_FrameworkRawFileOutputPointer.php |  7 ++++---
 .../text/class_FrameworkTextFileOutputPointer.php      |  7 ++++---
 .../file_directories/text/class_BaseTextFile.php       |  7 ++++---
 .../text/input/class_BaseInputTextFile.php             |  7 ++++---
 .../text/input/csv/class_CsvInputFile.php              |  3 +--
 .../text/output/class_BaseOutputTextFile.php           |  7 ++++---
 inc/main/classes/filter/auth/class_UserAuthFilter.php  |  7 ++++---
 .../classes/filter/change/class_EmailChangeFilter.php  |  7 ++++---
 .../filter/change/class_PasswordChangeFilter.php       |  7 ++++---
 .../filter/checkboxes/class_RulesAcceptedFilter.php    |  7 ++++---
 .../filter/crypto/class_CaptchaEncryptFilter.php       |  7 ++++---
 .../filter/guest/class_UserNameIsGuestFilter.php       |  7 ++++---
 .../classes/filter/news/class_NewsDownloadFilter.php   |  7 ++++---
 .../classes/filter/news/class_NewsProcessFilter.php    |  7 ++++---
 inc/main/classes/filter/null/class_NullFilter.php      |  7 ++++---
 .../filter/payment/class_PaymentDiscoveryFilter.php    |  7 ++++---
 .../update/class_UserStatusConfimedUpdateFilter.php    |  7 ++++---
 .../classes/filter/update/class_UserUpdateFilter.php   |  7 ++++---
 .../filter/validator/class_EmailValidatorFilter.php    |  7 ++++---
 .../filter/validator/class_PasswordValidatorFilter.php |  7 ++++---
 .../filter/validator/class_UserNameValidatorFilter.php |  7 ++++---
 .../verifier/class_AccountPasswordVerifierFilter.php   |  7 ++++---
 .../filter/verifier/class_BirthdayVerifierFilter.php   |  7 ++++---
 .../verifier/class_ConfirmCodeVerifierFilter.php       |  7 ++++---
 .../class_GraphicalCodeCaptchaVerifierFilter.php       |  7 ++++---
 .../verifier/class_PasswordGuestVerifierFilter.php     |  7 ++++---
 .../filter/verifier/class_PasswordVerifierFilter.php   |  7 ++++---
 .../filter/verifier/class_UserGuestVerifierFilter.php  |  7 ++++---
 .../filter/verifier/class_UserNameVerifierFilter.php   |  7 ++++---
 .../filter/verifier/class_UserStatusVerifierFilter.php |  7 ++++---
 .../verifier/class_UserUnconfirmedVerifierFilter.php   |  7 ++++---
 .../classes/handler/raw_data/class_BaseDataHandler.php |  7 ++++---
 .../raw_data/network/class_BaseRawDataHandler.php      |  7 ++++---
 inc/main/classes/handler/tasks/class_TaskHandler.php   |  7 ++++---
 .../helper/captcha/images/class_ImageHelper.php        |  4 +---
 .../helper/html/blocks/class_HtmlBlockHelper.php       |  4 +---
 inc/main/classes/helper/html/class_BaseHtmlHelper.php  |  7 ++++---
 .../classes/helper/html/links/class_HtmlLinkHelper.php |  4 +---
 .../classes/helper/login/class_BaseLoginHelper.php     |  7 ++++---
 .../classes/iterator/default/class_DefaultIterator.php |  7 ++++---
 inc/main/classes/iterator/file/class_FileIterator.php  |  7 ++++---
 .../classes/listener/class_BaseListenerDecorator.php   |  7 ++++---
 .../listener/socket/class_SocketFileListener.php       |  7 ++++---
 .../decorator/class_SocketFileListenerDecorator.php    |  7 ++++---
 inc/main/classes/lists/groups/class_ListGroupList.php  |  7 ++++---
 inc/main/classes/lists/tasks/class_TaskList.php        |  7 ++++---
 inc/main/classes/mailer/debug/class_DebugMailer.php    |  4 +---
 .../classes/output/console/class_ConsoleOutput.php     |  4 +---
 .../classes/output/debug/class_BaseDebugOutput.php     |  7 ++++---
 .../output/debug/error/class_DebugErrorLogOutput.php   |  7 ++++---
 .../classes/output/debug/web/class_DebugWebOutput.php  |  7 ++++---
 inc/main/classes/output/web/class_WebOutput.php        |  4 +---
 inc/main/classes/parser/xml/class_XmlParser.php        |  4 +---
 inc/main/classes/registry/generic/class_Registry.php   |  1 -
 inc/main/classes/registry/sub/class_SubRegistry.php    |  1 -
 .../classes/request/console/class_ConsoleRequest.php   |  7 ++++---
 inc/main/classes/request/html/class_HtmlRequest.php    |  7 ++++---
 .../resolver/action/class_BaseActionResolver.php       |  7 ++++---
 .../resolver/action/html/class_HtmlActionResolver.php  |  4 +---
 .../resolver/command/class_BaseCommandResolver.php     |  7 ++++---
 .../command/console/class_ConsoleCommandResolver.php   |  4 +---
 .../command/image/class_ImageCommandResolver.php       |  4 +---
 .../controller/class_BaseControllerResolver.php        |  7 ++++---
 .../console/class_ConsoleControllerResolver.php        |  4 +---
 .../controller/html/class_HtmlControllerResolver.php   |  4 +---
 .../controller/image/class_ImageControllerResolver.php |  4 +---
 .../classes/response/console/class_ConsoleResponse.php |  7 ++-----
 inc/main/classes/response/html/class_HtmlResponse.php  |  4 +---
 .../classes/response/image/class_ImageResponse.php     |  4 +---
 inc/main/classes/stacker/fifo/class_FiFoStacker.php    |  7 ++++---
 inc/main/classes/stacker/file/class_BaseFileStack.php  |  7 ++++---
 inc/main/classes/stacker/filo/class_FiLoStacker.php    |  7 ++++---
 inc/main/classes/streams/crypto/class_McryptStream.php |  8 +++++---
 .../classes/streams/crypto/class_NullCryptoStream.php  |  7 ++++---
 inc/main/classes/tasks/idle/class_IdleLoopTask.php     |  7 ++++---
 .../template/console/class_ConsoleTemplateEngine.php   |  4 +---
 .../classes/template/html/class_HtmlTemplateEngine.php |  4 +---
 .../template/image/class_ImageTemplateEngine.php       |  4 +---
 .../classes/template/mail/class_MailTemplateEngine.php |  4 +---
 .../classes/template/menu/class_MenuTemplateEngine.php |  4 +---
 inc/main/classes/user/guest/class_Guest.php            |  4 +---
 inc/main/classes/user/member/class_Member.php          |  4 +---
 .../classes/visitor/tasks/class_ActiveTaskVisitor.php  |  7 ++++---
 .../visitor/tasks/class_ShutdownTaskVisitor.php        |  7 ++++---
 .../actions/class_InvalidActionException.php           |  7 ++++---
 .../auth/class_UserAuthorizationException.php          |  7 ++++---
 .../base64/class_Base64EncodingBadException.php        |  8 +++++---
 .../base64/class_Base64EncodingModuloException.php     |  8 +++++---
 inc/main/exceptions/class_FrameworkException.php       |  7 ++++---
 .../class_MismatchingCompressorsException.php          |  8 +++++---
 .../config/class_ConfigEntryIsEmptyException.php       |  4 +---
 .../class_ConfigValueTypeUnsupportedException.php      |  8 +++++---
 .../exceptions/config/class_NoConfigEntryException.php |  7 ++++---
 .../class_ConnectionAlreadyRegisteredException.php     |  7 ++++---
 .../controller/class_DefaultControllerException.php    |  7 ++++---
 .../controller/class_InvalidControllerException.php    |  6 ++++--
 .../crypto/class_EncryptInvalidLengthException.php     |  8 +++++---
 .../crypto/class_EncryptMissingException.php           |  8 +++++---
 .../exceptions/database/general/class_SqlException.php |  7 ++++---
 .../class_SavePathIsNoDirectoryException.php           |  8 +++++---
 .../class_SavePathReadProtectedException.php           |  8 +++++---
 .../class_SavePathWriteProtectedException.php          |  8 +++++---
 .../class_FeatureMethodNotCallableException.php        |  7 ++++---
 .../class_DirPointerNotOpenedException.php             |  9 +++++----
 .../file_directory/class_FileIsEmptyException.php      |  8 +++++---
 .../class_FileWriteProtectedException.php              |  8 +++++---
 .../class_InvalidDataLengthException.php               |  8 +++++---
 .../exceptions/filter/class_FilterChainException.php   |  7 ++++---
 .../filter/class_InvalidFilterChainException.php       |  8 +++++---
 .../exceptions/helper/class_FormClosedException.php    |  8 +++++---
 .../helper/class_FormGroupClosedException.php          |  8 +++++---
 .../exceptions/helper/class_FormOpenedException.php    |  8 +++++---
 .../class_HelperGroupAlreadyCreatedException.php       |  8 +++++---
 .../class_HelperNoPreviousOpenedSubGroupException.php  |  8 +++++---
 .../class_HelperSubGroupAlreadyCreatedException.php    |  8 +++++---
 .../helper/class_InvalidFormNameException.php          |  8 +++++---
 .../exceptions/helper/class_NoGroupOpenedException.php |  8 +++++---
 .../helper/class_UserInstanceMissingException.php      |  8 +++++---
 .../class_InvalidLanguagePathStringException.php       |  8 +++++---
 .../class_LanguagePathIsNoDirectoryException.php       |  8 +++++---
 .../class_LanguagePathReadProtectedException.php       |  8 +++++---
 .../result/class_InvalidDatabaseResultException.php    |  7 ++++---
 .../exceptions/result/class_ResultUpdateException.php  |  7 ++++---
 .../socket/class_AbstractSocketException.php           |  6 +++---
 .../socket/class_InvalidServerSocketException.php      |  7 ++++---
 .../exceptions/socket/class_InvalidSocketException.php |  7 ++++---
 .../socket/class_NoSocketErrorDetectedException.php    |  8 +++++---
 .../socket/class_NoSocketRegisteredException.php       |  7 ++++---
 .../socket/class_SocketAlreadyRegisteredException.php  |  8 +++++---
 .../exceptions/socket/class_SocketBindingException.php |  7 ++++---
 .../socket/class_SocketConnectionException.php         |  7 ++++---
 .../socket/class_SocketCreationException.php           |  7 ++++---
 .../exceptions/socket/class_SocketOptionException.php  |  7 ++++---
 .../socket/class_SocketShutdownException.php           |  7 ++++---
 .../class_UnsupportedSocketErrorHandlerException.php   |  7 ++++---
 .../class_AlreadyInitializedStackerException.php       |  7 ++++---
 .../exceptions/stacker/class_EmptyStackerException.php |  8 +++++---
 .../exceptions/stacker/class_FullStackerException.php  |  7 ++++---
 .../exceptions/stacker/class_NoStackerException.php    |  7 ++++---
 .../state/class_InvalidStateInstanceException.php      |  7 ++++---
 .../state/class_UnexpectedStateException.php           |  7 ++++---
 .../state/class_UnresolveableStateException.php        |  7 ++++---
 .../template/class_BasePathIsNoDirectoryException.php  |  8 +++++---
 .../template/class_BasePathReadProtectedException.php  |  8 +++++---
 .../template/class_InvalidBasePathStringException.php  |  8 +++++---
 .../exceptions/template/class_NoVariableException.php  |  8 +++++---
 .../template/class_UnexpectedTemplateTypeException.php |  8 +++++---
 .../exceptions/xml/class_InvalidXmlNodeException.php   |  7 ++++---
 .../exceptions/xml/class_XmlNodeMismatchException.php  |  7 ++++---
 inc/main/exceptions/xml/class_XmlParserException.php   |  7 ++++---
 .../interfaces/actions/commands/class_Commandable.php  |  7 ++++---
 .../block/calculatable/class_CalculatableBlock.php     |  7 ++++---
 .../criteria/extended/class_LocalSearchCriteria.php    |  7 ++++---
 .../criteria/extended/class_LocalUpdateCriteria.php    |  7 ++++---
 .../criteria/extended/class_StoreableCriteria.php      |  7 ++++---
 .../database/backend/class_DatabaseBackend.php         |  7 ++++---
 .../database/middleware/class_DatabaseConnector.php    |  7 ++++---
 .../database/wrapper/class_BookablePointsWrapper.php   |  7 ++++---
 .../interfaces/handler/class_HandleableDataSet.php     |  7 ++++---
 .../handler/protocol/class_HandleableProtocol.php      |  7 ++++---
 .../interfaces/handler/task/class_HandleableTask.php   |  7 ++++---
 .../interfaces/helper/login/class_HelpableLogin.php    |  7 ++++---
 .../helper/template/class_HelpableTemplate.php         |  7 ++++---
 .../interfaces/index/stack/class_IndexableStack.php    |  7 ++++---
 inc/main/interfaces/io/class_StreamableInput.php       |  7 ++++---
 inc/main/interfaces/io/class_StreamableOutput.php      |  7 ++++---
 .../interfaces/io/file/class_FileInputStreamer.php     |  7 ++++---
 .../interfaces/io/file/class_FileOutputStreamer.php    |  7 ++++---
 .../interfaces/io/file/csv/class_CsvInputStreamer.php  |  7 ++++---
 inc/main/interfaces/io/output/class_OutputStreamer.php |  7 ++++---
 inc/main/interfaces/io/pointer/class_InputPointer.php  |  7 ++++---
 inc/main/interfaces/io/pointer/class_OutputPointer.php |  7 ++++---
 .../io/pointer/io/class_InputOutputPointer.php         |  7 ++++---
 .../iterator/class_SeekableWritableFileIterator.php    |  7 ++++---
 inc/main/interfaces/points/class_BookablePoints.php    |  7 ++++---
 .../interfaces/registration/class_UserRegister.php     |  7 ++++---
 .../resolver/actions/class_ActionResolver.php          |  7 ++++---
 .../resolver/commands/class_CommandResolver.php        |  7 ++++---
 .../resolver/controller/class_ControllerResolver.php   |  7 ++++---
 .../interfaces/resolver/state/class_StateResolver.php  |  7 ++++---
 inc/main/interfaces/result/class_UpdateableResult.php  |  7 ++++---
 .../interfaces/stacker/file/class_StackableFile.php    |  7 ++++---
 .../streams/crypto/class_EncryptableStream.php         |  7 ++++---
 .../interfaces/streams/input/class_InputStream.php     |  7 ++++---
 .../interfaces/streams/output/class_OutputStream.php   |  7 ++++---
 .../interfaces/user/extended/class_ManageableGuest.php |  7 ++++---
 .../user/extended/class_ManageableMember.php           |  7 ++++---
 .../visitor/decorator/class_DecoratorVisitor.php       |  7 ++++---
 .../visitor/listener/class_ListenerVisitor.php         |  7 ++++---
 inc/main/interfaces/visitor/pool/class_PoolVisitor.php |  7 ++++---
 .../interfaces/visitor/tasks/class_TaskVisitor.php     |  7 ++++---
 .../middleware/compressor/class_CompressorChannel.php  |  7 ++++---
 .../middleware/database/class_DatabaseConnection.php   |  4 +---
 inc/main/middleware/debug/class_DebugMiddleware.php    |  7 ++++---
 inc/main/middleware/io/class_FileIoHandler.php         |  1 -
 index.php                                              |  3 ---
 266 files changed, 936 insertions(+), 791 deletions(-)

diff --git a/application/tests/config.php b/application/tests/config.php
index a34a3c07..64ea955d 100644
--- a/application/tests/config.php
+++ b/application/tests/config.php
@@ -29,6 +29,3 @@ $cfg = FrameworkConfiguration::getSelfInstance();
 
 // CFG: DEFAULT-CONSOLE-COMMAND
 $cfg->setConfigEntry('default_console_command', 'tests');
-
-// [EOF]
-?>
diff --git a/application/tests/data.php b/application/tests/data.php
index e2132b75..e1fd3230 100644
--- a/application/tests/data.php
+++ b/application/tests/data.php
@@ -35,6 +35,3 @@ $app = call_user_func_array(
 $app->setAppName('Unit tests and more');
 $app->setAppVersion('0.0.0');
 $app->setAppShortName('tests');
-
-// [EOF]
-?>
diff --git a/application/tests/debug.php b/application/tests/debug.php
index c9b72039..45cc1501 100644
--- a/application/tests/debug.php
+++ b/application/tests/debug.php
@@ -23,6 +23,3 @@
 
 // Set error reporting
 error_reporting(E_ALL | E_STRICT);
-
-// [EOF]
-?>
diff --git a/application/tests/init.php b/application/tests/init.php
index 4db2c18d..4c6879c6 100644
--- a/application/tests/init.php
+++ b/application/tests/init.php
@@ -29,6 +29,3 @@ use CoreFramework\Configuration\FrameworkConfiguration;
 
 // Get config instance
 $cfg = FrameworkConfiguration::getSelfInstance();
-
-// [EOF]
-?>
diff --git a/application/tests/starter.php b/application/tests/starter.php
index b3f8d7d8..377f4462 100644
--- a/application/tests/starter.php
+++ b/application/tests/starter.php
@@ -55,6 +55,3 @@ if ((empty($app)) || (is_null($app))) {
 
 // Call user function
 call_user_func_array(array($app, FrameworkConfiguration::getSelfInstance()->getConfigEntry('entry_method')), array());
-
-// [EOF]
-?>
diff --git a/contrib/chash/chash.php b/contrib/chash/chash.php
index 34a30b5b..41af8db1 100644
--- a/contrib/chash/chash.php
+++ b/contrib/chash/chash.php
@@ -614,6 +614,3 @@ while (TRUE) {
 
 	print ('totalReward=' . $GLOBALS['total_reward'] . ',blockValue=' . $blockValue . ',rewardPerHour=' . $rewardPerHour . PHP_EOL);
 } // END - while
-
-// [EOF]
-?>
diff --git a/contrib/lfdb2/read.php b/contrib/lfdb2/read.php
index ae573df2..da41e102 100644
--- a/contrib/lfdb2/read.php
+++ b/contrib/lfdb2/read.php
@@ -65,6 +65,3 @@ $decoded = gzuncompress($decoded);
 
 print 'Writing ' . strlen($decoded) . ' bytes to output ...' . PHP_EOL;
 file_put_contents('test.data.out' . ($__factor * 2), $decoded);
-
-// [EOF]
-?>
diff --git a/contrib/lfdb2/write.php b/contrib/lfdb2/write.php
index 25941cdd..2b25a6a6 100644
--- a/contrib/lfdb2/write.php
+++ b/contrib/lfdb2/write.php
@@ -64,6 +64,3 @@ print 'Encoded ' . strlen($str) . ' bytes into ' . strlen($encoded) . ' bytes ..
 file_put_contents('test.data.bin' . ($__factor * 2), $encoded);
 
 print 'File size is: ' . filesize('test.data.bin' . ($__factor * 2)) . ' bytes.' . PHP_EOL;
-
-// [EOF]
-?>
diff --git a/inc/config.php b/inc/config.php
index 4e9b902d..6ea2a793 100644
--- a/inc/config.php
+++ b/inc/config.php
@@ -474,6 +474,3 @@ $cfg->setConfigEntry('extension_uuid_loaded', FALSE);
 
 // Remove config from this name-space. Don't worry, no configuration is cleared.
 unset($cfg);
-
-// [EOF]
-?>
diff --git a/inc/database/lib-local.php b/inc/database/lib-local.php
index 544f50fb..b5223158 100644
--- a/inc/database/lib-local.php
+++ b/inc/database/lib-local.php
@@ -24,6 +24,3 @@
 
 // For testing purposes we use a local file database
 $databaseInstance = ObjectFactory::createObjectByConfiguredName('local_file_database_class');
-
-// [EOF]
-?>
diff --git a/inc/includes.php b/inc/includes.php
index d9f38230..7817f7aa 100644
--- a/inc/includes.php
+++ b/inc/includes.php
@@ -73,6 +73,3 @@ FrameworkConfiguration::getSelfInstance()->setConfigEntry('app_name', $applicati
 
 // Scan for all framework classes, exceptions and interfaces
 ClassLoader::scanFrameworkClasses();
-
-// [EOF]
-?>
diff --git a/inc/main/classes/actions/html/class_HtmlLoginProfileAction.php b/inc/main/classes/actions/html/class_HtmlLoginProfileAction.php
index f6538e0e..a0742f68 100644
--- a/inc/main/classes/actions/html/class_HtmlLoginProfileAction.php
+++ b/inc/main/classes/actions/html/class_HtmlLoginProfileAction.php
@@ -77,7 +77,5 @@ class HtmlLoginProfileAction extends BaseAction implements Commandable, Register
 		// Add user status filter here
 		$controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_status_filter'));
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/actions/post_registration/class_LoginAfterRegistrationAction.php b/inc/main/classes/actions/post_registration/class_LoginAfterRegistrationAction.php
index 95493604..93eaf14f 100644
--- a/inc/main/classes/actions/post_registration/class_LoginAfterRegistrationAction.php
+++ b/inc/main/classes/actions/post_registration/class_LoginAfterRegistrationAction.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Action\PostRegistration\Login;
+
 /**
  * A post registration action to login after the registration is done
  *
@@ -77,7 +80,5 @@ class LoginAfterRegistrationAction extends BaseAction implements PerformableActi
 			$responseInstance->addFatalMessage('failed_login_after_registration');
 		}
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/class_FrameworkArrayObject.php b/inc/main/classes/class_FrameworkArrayObject.php
index 223dd022..a6fa8bea 100644
--- a/inc/main/classes/class_FrameworkArrayObject.php
+++ b/inc/main/classes/class_FrameworkArrayObject.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace CoreFramework\Array;
+
+// Import SPL stuff
+use \ArrayObject;
+
 /**
  * Class for saving arrays as an object. We need this little extension for
  * some common methods used in whole application. Please see below if you
@@ -46,7 +52,5 @@ class FrameworkArrayObject extends ArrayObject {
 	public function __toString () {
 		return $this->realClass;
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/client/http/class_HttpClient.php b/inc/main/classes/client/http/class_HttpClient.php
index 22504c1f..bd06c93f 100644
--- a/inc/main/classes/client/http/class_HttpClient.php
+++ b/inc/main/classes/client/http/class_HttpClient.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Client\Http;
+
 /**
  * A HTTP client class
  *
@@ -158,7 +161,5 @@ class HttpClient extends BaseClient implements Client {
 		// Return response array
 		return $responseArray;
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/commands/console/class_ConsoleFuseCommand.php b/inc/main/classes/commands/console/class_ConsoleFuseCommand.php
index 48345447..f30aac8a 100644
--- a/inc/main/classes/commands/console/class_ConsoleFuseCommand.php
+++ b/inc/main/classes/commands/console/class_ConsoleFuseCommand.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Command\Fuse;
+
 /**
  * A Fuse console command
  *
@@ -83,7 +86,5 @@ class ConsoleFuseCommand extends BaseCommand implements Commandable {
 	public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance) {
 		// Empty for now ...
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/commands/html/class_HtmlConfirmCommand.php b/inc/main/classes/commands/html/class_HtmlConfirmCommand.php
index 076fbbb9..7534e184 100644
--- a/inc/main/classes/commands/html/class_HtmlConfirmCommand.php
+++ b/inc/main/classes/commands/html/class_HtmlConfirmCommand.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Command\Guest;
+
 /**
  * A command for the confirmation link handling
  *
@@ -140,7 +143,5 @@ class HtmlConfirmCommand extends BaseCommand implements Commandable {
 	public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance) {
 		// Empty for now
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/commands/html/class_HtmlDoFormCommand.php b/inc/main/classes/commands/html/class_HtmlDoFormCommand.php
index aab4248b..e5fd4e18 100644
--- a/inc/main/classes/commands/html/class_HtmlDoFormCommand.php
+++ b/inc/main/classes/commands/html/class_HtmlDoFormCommand.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Command\Form;
+
 /**
  * A command for the form processor
  *
@@ -73,6 +76,3 @@ class HtmlDoFormCommand extends BaseCommand implements Commandable {
 	}
 
 }
-
-// [EOF]
-?>
diff --git a/inc/main/classes/commands/html/class_HtmlHomeCommand.php b/inc/main/classes/commands/html/class_HtmlHomeCommand.php
index dbe7d4ef..b9538f8b 100644
--- a/inc/main/classes/commands/html/class_HtmlHomeCommand.php
+++ b/inc/main/classes/commands/html/class_HtmlHomeCommand.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Command\Guest;
+
 /**
  * A command for the home page
  *
@@ -126,7 +129,5 @@ class HtmlHomeCommand extends BaseCommand implements Commandable {
 	public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance) {
 		// Empty for now
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/commands/html/class_HtmlLoginAreaCommand.php b/inc/main/classes/commands/html/class_HtmlLoginAreaCommand.php
index f8057ab3..f0d8c366 100644
--- a/inc/main/classes/commands/html/class_HtmlLoginAreaCommand.php
+++ b/inc/main/classes/commands/html/class_HtmlLoginAreaCommand.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Command\Login;
+
 /**
  * A command for the login area (member/gamer area)
  *
@@ -197,7 +200,5 @@ class HtmlLoginAreaCommand extends BaseCommand implements Commandable {
 		// Remember this action in registry
 		Registry::getRegistry()->addInstance('action', $actionInstance);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/commands/html/class_HtmlLoginCommand.php b/inc/main/classes/commands/html/class_HtmlLoginCommand.php
index 1ad15d54..8e5d1521 100644
--- a/inc/main/classes/commands/html/class_HtmlLoginCommand.php
+++ b/inc/main/classes/commands/html/class_HtmlLoginCommand.php
@@ -138,7 +138,5 @@ class HtmlLoginCommand extends BaseCommand implements Commandable, Registerable
 	public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance) {
 		// Empty for now
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/commands/html/class_HtmlLoginFailedCommand.php b/inc/main/classes/commands/html/class_HtmlLoginFailedCommand.php
index 2e3e77cd..126a4240 100644
--- a/inc/main/classes/commands/html/class_HtmlLoginFailedCommand.php
+++ b/inc/main/classes/commands/html/class_HtmlLoginFailedCommand.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Command\Failed;
+
 /**
  * A command for the login failed page
  *
@@ -129,7 +132,5 @@ class HtmlLoginFailedCommand extends BaseCommand implements Commandable {
 	public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance) {
 		// Empty for now
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/commands/html/class_HtmlLogoutCommand.php b/inc/main/classes/commands/html/class_HtmlLogoutCommand.php
index 05344d32..121fb97b 100644
--- a/inc/main/classes/commands/html/class_HtmlLogoutCommand.php
+++ b/inc/main/classes/commands/html/class_HtmlLogoutCommand.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Command\Login;
+
 /**
  * A command for logout
  *
@@ -83,7 +86,5 @@ class HtmlLogoutCommand extends BaseCommand implements Commandable {
 	public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance) {
 		// Empty for now
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/commands/html/class_HtmlLogoutDoneCommand.php b/inc/main/classes/commands/html/class_HtmlLogoutDoneCommand.php
index 5842a991..4c81971b 100644
--- a/inc/main/classes/commands/html/class_HtmlLogoutDoneCommand.php
+++ b/inc/main/classes/commands/html/class_HtmlLogoutDoneCommand.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Command\Logout;
+
 /**
  * A command for the login failed page
  *
@@ -129,7 +132,5 @@ class HtmlLogoutDoneCommand extends BaseCommand implements Commandable {
 	public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance) {
 		// Empty for now
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/commands/html/class_HtmlProblemCommand.php b/inc/main/classes/commands/html/class_HtmlProblemCommand.php
index 51e6d105..562d1429 100644
--- a/inc/main/classes/commands/html/class_HtmlProblemCommand.php
+++ b/inc/main/classes/commands/html/class_HtmlProblemCommand.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Command\Failed;
+
 /**
  * A command for Problem page
  *
@@ -71,7 +74,5 @@ class HtmlProblemCommand extends BaseCommand implements Commandable {
 	public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance) {
 		// Empty for now
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/commands/html/class_HtmlRegisterCommand.php b/inc/main/classes/commands/html/class_HtmlRegisterCommand.php
index 7d6f7982..cf86494f 100644
--- a/inc/main/classes/commands/html/class_HtmlRegisterCommand.php
+++ b/inc/main/classes/commands/html/class_HtmlRegisterCommand.php
@@ -139,7 +139,5 @@ class HtmlRegisterCommand extends BaseCommand implements Commandable, Registerab
 	public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance) {
 		// Empty method
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/commands/html/class_HtmlResendLinkCommand.php b/inc/main/classes/commands/html/class_HtmlResendLinkCommand.php
index cafa6c32..823996db 100644
--- a/inc/main/classes/commands/html/class_HtmlResendLinkCommand.php
+++ b/inc/main/classes/commands/html/class_HtmlResendLinkCommand.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Command\Guest;
+
 /**
  * A command class for resending the confirmation link
  *
@@ -129,7 +132,5 @@ class HtmlResendLinkCommand extends BaseCommand implements Commandable {
 		// Filter for checking if account is unconfirmed
 		$controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_unconfirmed_filter'));
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/commands/html/class_HtmlStatusCommand.php b/inc/main/classes/commands/html/class_HtmlStatusCommand.php
index c4bf6fe4..bae495d8 100644
--- a/inc/main/classes/commands/html/class_HtmlStatusCommand.php
+++ b/inc/main/classes/commands/html/class_HtmlStatusCommand.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Command\Status;
+
 /**
  * A command for Status page
  *
@@ -127,7 +130,5 @@ class HtmlStatusCommand extends BaseCommand implements Commandable {
 	public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance) {
 		// Empty for now
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/commands/image/class_ImageCodeCaptchaCommand.php b/inc/main/classes/commands/image/class_ImageCodeCaptchaCommand.php
index 2f6d25e7..c8f45222 100644
--- a/inc/main/classes/commands/image/class_ImageCodeCaptchaCommand.php
+++ b/inc/main/classes/commands/image/class_ImageCodeCaptchaCommand.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Command\Captcha;
+
 /**
  * A command for creating code CAPTCHAs
  *
@@ -92,7 +95,5 @@ class ImageCodeCaptchaCommand extends BaseCommand implements Commandable {
 	public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance) {
 		// Extra filters here...
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/container/socket/class_SocketContainer.php b/inc/main/classes/container/socket/class_SocketContainer.php
index 9c40f74e..087f2c58 100644
--- a/inc/main/classes/container/socket/class_SocketContainer.php
+++ b/inc/main/classes/container/socket/class_SocketContainer.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Container\Socket;
+
 /**
  * A Socket Container class
  *
@@ -122,7 +125,5 @@ class SocketContainer extends BaseContainer implements Registerable {
 		// Return result
 		return $matches;
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/controller/console/class_ConsoleDefaultController.php b/inc/main/classes/controller/console/class_ConsoleDefaultController.php
index e058f4ec..bcb09fe7 100644
--- a/inc/main/classes/controller/console/class_ConsoleDefaultController.php
+++ b/inc/main/classes/controller/console/class_ConsoleDefaultController.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Controller\Default;
+
 /**
  * The default controller for all other console requests
  *
@@ -70,7 +73,5 @@ class ConsoleDefaultController extends BaseController implements Controller {
 		// Flush the response out
 		$responseInstance->flushBuffer();
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/controller/console/class_ConsoleDefaultNewsController.php b/inc/main/classes/controller/console/class_ConsoleDefaultNewsController.php
index 6c986650..27ec6d79 100644
--- a/inc/main/classes/controller/console/class_ConsoleDefaultNewsController.php
+++ b/inc/main/classes/controller/console/class_ConsoleDefaultNewsController.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Controller\Default;
+
 /**
  * The default controller with news for e.g. home or news page
  *
@@ -64,7 +67,5 @@ class ConsoleDefaultNewsController extends BaseController implements Controller
 		// Generic pre-post command execution
 		$this->executeGenericPrePostCommand($requestInstance, $responseInstance);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/controller/html/class_HtmlConfirmController.php b/inc/main/classes/controller/html/class_HtmlConfirmController.php
index 2c22095e..6821591e 100644
--- a/inc/main/classes/controller/html/class_HtmlConfirmController.php
+++ b/inc/main/classes/controller/html/class_HtmlConfirmController.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Controller\Confirm;
+
 /**
  * Controller for confirmation link
  *
@@ -67,7 +70,5 @@ class HtmlConfirmController extends BaseController implements Controller {
 		// Generic pre-post command execution
 		$this->executeGenericPrePostCommand($requestInstance, $responseInstance);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/controller/html/class_HtmlDefaultController.php b/inc/main/classes/controller/html/class_HtmlDefaultController.php
index 727592ab..29078e48 100644
--- a/inc/main/classes/controller/html/class_HtmlDefaultController.php
+++ b/inc/main/classes/controller/html/class_HtmlDefaultController.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Controller\Default;
+
 /**
  * The default controller for all other web requests
  *
@@ -70,7 +73,5 @@ class HtmlDefaultController extends BaseController implements Controller {
 		// Flush the response out
 		$responseInstance->flushBuffer();
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/controller/html/class_HtmlDefaultNewsController.php b/inc/main/classes/controller/html/class_HtmlDefaultNewsController.php
index 64a7935d..8a0ecd4f 100644
--- a/inc/main/classes/controller/html/class_HtmlDefaultNewsController.php
+++ b/inc/main/classes/controller/html/class_HtmlDefaultNewsController.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Controller\News;
+
 /**
  * The default controller with news for e.g. home or news page
  *
@@ -64,7 +67,5 @@ class HtmlDefaultNewsController extends BaseController implements Controller {
 		// Generic pre-post command execution
 		$this->executeGenericPrePostCommand($requestInstance, $responseInstance);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/controller/html/class_HtmlLoginController.php b/inc/main/classes/controller/html/class_HtmlLoginController.php
index 633a1066..e8188464 100644
--- a/inc/main/classes/controller/html/class_HtmlLoginController.php
+++ b/inc/main/classes/controller/html/class_HtmlLoginController.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Controller\Login;
+
 /**
  * Controller for login form with password reminder and maybe enabled
  * "guest-login" button
@@ -62,7 +65,5 @@ class HtmlLoginController extends BaseController implements Controller {
 		// Generic pre-post command execution
 		$this->executeGenericPrePostCommand($requestInstance, $responseInstance);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/controller/html/class_HtmlLoginFailedController.php b/inc/main/classes/controller/html/class_HtmlLoginFailedController.php
index 086e8ae7..b20e079d 100644
--- a/inc/main/classes/controller/html/class_HtmlLoginFailedController.php
+++ b/inc/main/classes/controller/html/class_HtmlLoginFailedController.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Controller\Failed;
+
 /**
  * A controller for login failed page
  *
@@ -69,7 +72,5 @@ class HtmlLoginFailedController extends BaseController implements Controller {
 		// Flush the response out
 		$responseInstance->flushBuffer();
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/controller/html/class_HtmlLogoutController.php b/inc/main/classes/controller/html/class_HtmlLogoutController.php
index 8f9d5d80..9f773c2b 100644
--- a/inc/main/classes/controller/html/class_HtmlLogoutController.php
+++ b/inc/main/classes/controller/html/class_HtmlLogoutController.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Controller\Logout;
+
 /**
  * The default controller for logout page
  *
@@ -76,7 +79,5 @@ class HtmlLogoutController extends BaseController implements Controller {
 		// Flush the response out
 		$responseInstance->flushBuffer();
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/controller/html/class_HtmlLogoutDoneController.php b/inc/main/classes/controller/html/class_HtmlLogoutDoneController.php
index e4976db4..a6092c73 100644
--- a/inc/main/classes/controller/html/class_HtmlLogoutDoneController.php
+++ b/inc/main/classes/controller/html/class_HtmlLogoutDoneController.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Controller\Logout;
+
 /**
  * Controller for logout done page
  *
@@ -61,7 +64,5 @@ class HtmlLogoutDoneController extends BaseController implements Controller {
 		// Generic pre-post command execution
 		$this->executeGenericPrePostCommand($requestInstance, $responseInstance);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/controller/html/class_HtmlProblemController.php b/inc/main/classes/controller/html/class_HtmlProblemController.php
index f3c37356..7114710d 100644
--- a/inc/main/classes/controller/html/class_HtmlProblemController.php
+++ b/inc/main/classes/controller/html/class_HtmlProblemController.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Controller\Problem;
+
 /**
  * Controller for problem requests
  *
@@ -61,7 +64,5 @@ class HtmlProblemController extends BaseController implements Controller {
 		// Generic pre-post command execution
 		$this->executeGenericPrePostCommand($requestInstance, $responseInstance);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/controller/html/class_HtmlStatusController.php b/inc/main/classes/controller/html/class_HtmlStatusController.php
index dfde9c76..1b173b2e 100644
--- a/inc/main/classes/controller/html/class_HtmlStatusController.php
+++ b/inc/main/classes/controller/html/class_HtmlStatusController.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Controller\Status;
+
 /**
  * Controller for changing user status
  *
@@ -70,7 +73,5 @@ class HtmlStatusController extends BaseController implements Controller {
 		// Flush the response out
 		$responseInstance->flushBuffer();
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/controller/html/form/class_HtmlDoFormController.php b/inc/main/classes/controller/html/form/class_HtmlDoFormController.php
index ee2c28de..e7c816d5 100644
--- a/inc/main/classes/controller/html/form/class_HtmlDoFormController.php
+++ b/inc/main/classes/controller/html/form/class_HtmlDoFormController.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Controller\Form;
+
 /**
  * A controller for handling sent forms
  *
@@ -63,7 +66,5 @@ class HtmlDoFormController extends BaseController implements Controller {
 		// Generic handling with redirect to 'login_failed'
 		$this->genericHanleRequestLoginFailedRedirect($requestInstance, $responseInstance);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/controller/html/login/class_HtmlLoginAreaController.php b/inc/main/classes/controller/html/login/class_HtmlLoginAreaController.php
index 715e6560..c90e570d 100644
--- a/inc/main/classes/controller/html/login/class_HtmlLoginAreaController.php
+++ b/inc/main/classes/controller/html/login/class_HtmlLoginAreaController.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Controller\Login;
+
 /**
  * Controller for login area with news
  *
@@ -76,7 +79,5 @@ class HtmlLoginAreaController extends BaseController implements Controller {
 		 */
 		$this->genericHanleRequestLoginAreaFailedRedirect($requestInstance, $responseInstance);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/controller/image/captcha/class_ImageCodeCaptchaController.php b/inc/main/classes/controller/image/captcha/class_ImageCodeCaptchaController.php
index d8bb509c..bb6b554e 100644
--- a/inc/main/classes/controller/image/captcha/class_ImageCodeCaptchaController.php
+++ b/inc/main/classes/controller/image/captcha/class_ImageCodeCaptchaController.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Controller\Image\Captcha;
+
 /**
  * A controller for a code-based CAPTCHA where the user has to repeat a shown code
  *
@@ -63,7 +66,5 @@ class ImageCodeCaptchaController extends BaseController implements Controller {
 		// Generic pre-post command execution
 		$this->executeGenericPrePostCommand($requestInstance, $responseInstance);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/controller/image/class_ImageDefaultController.php b/inc/main/classes/controller/image/class_ImageDefaultController.php
index 9a0292a1..63b78338 100644
--- a/inc/main/classes/controller/image/class_ImageDefaultController.php
+++ b/inc/main/classes/controller/image/class_ImageDefaultController.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Controller\Default;
+
 /**
  * A default controller for images
  *
@@ -69,7 +72,5 @@ class ImageDefaultController extends BaseController implements Controller {
 		// Flush the response out
 		$responseInstance->flushBuffer();
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/criteria/dataset/class_DataSetCriteria.php b/inc/main/classes/criteria/dataset/class_DataSetCriteria.php
index f0488c47..2e69e4c4 100644
--- a/inc/main/classes/criteria/dataset/class_DataSetCriteria.php
+++ b/inc/main/classes/criteria/dataset/class_DataSetCriteria.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Criteria\DataSet;
+
 /**
  * A set of data storeable in databases
  *
@@ -214,7 +217,5 @@ class DataSetCriteria extends BaseCriteria implements StoreableCriteria {
 		// Return it
 		return $this->primaryKeys;
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/criteria/search/class_SearchCriteria.php b/inc/main/classes/criteria/search/class_SearchCriteria.php
index 565ed93e..9a647b28 100644
--- a/inc/main/classes/criteria/search/class_SearchCriteria.php
+++ b/inc/main/classes/criteria/search/class_SearchCriteria.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Criteria\Search;
+
 /**
  * Search criteria for e.g. searching in databases. Do not use this class if
  * you are looking for a ship or company, or what ever. Instead use this class
@@ -221,7 +224,5 @@ class SearchCriteria extends BaseCriteria implements LocalSearchCriteria {
 		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('SEARCH-CRITERIA[' . __METHOD__ . ':' . __LINE__ . ']: key=' . $key . ',value[' . gettype($value) . ']=' . $value . ',isMatching=' . intval($isMatching) . ' - EXIT!');
 		return $isMatching;
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/criteria/update/class_UpdateCriteria.php b/inc/main/classes/criteria/update/class_UpdateCriteria.php
index 19b2343b..2a3e536a 100644
--- a/inc/main/classes/criteria/update/class_UpdateCriteria.php
+++ b/inc/main/classes/criteria/update/class_UpdateCriteria.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Criteria\Update;
+
 /**
  * Search criteria for e.g. searching in databases. Do not use this class if
  * you are looking for a ship or company, or what ever. Instead use this class
@@ -55,7 +58,5 @@ class UpdateCriteria extends BaseCriteria implements LocalUpdateCriteria {
 	public final function getUpdateCriteria () {
 		return $this->getCriteriaArray();
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/database/backend/class_CachedLocalFileDatabase.php b/inc/main/classes/database/backend/class_CachedLocalFileDatabase.php
index 18efa561..f39a866a 100644
--- a/inc/main/classes/database/backend/class_CachedLocalFileDatabase.php
+++ b/inc/main/classes/database/backend/class_CachedLocalFileDatabase.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Database\Backend\Lfdb;
+
 /**
  * Database backend class for storing objects in locally created files.
  *
@@ -670,7 +673,5 @@ class CachedLocalFileDatabase extends BaseDatabaseBackend implements DatabaseBac
 		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('DATABASE: tableName=' . $tableName . ',count=' . $count . ' - EXIT!');
 		return $count;
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/database/frontend/class_PaymentsDatabaseWrapper.php b/inc/main/classes/database/frontend/class_PaymentsDatabaseWrapper.php
index 2badf382..8e10e956 100644
--- a/inc/main/classes/database/frontend/class_PaymentsDatabaseWrapper.php
+++ b/inc/main/classes/database/frontend/class_PaymentsDatabaseWrapper.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Database\Wrapper;
+
 /**
  * A database wrapper for payments
  *
@@ -54,7 +57,5 @@ class PaymentsDatabaseWrapper extends BaseDatabaseWrapper implements Registerabl
 		// Return the instance
 		return $wrapperInstance;
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/database/result/class_CachedDatabaseResult.php b/inc/main/classes/database/result/class_CachedDatabaseResult.php
index b5fdf0b8..4cc7e26c 100644
--- a/inc/main/classes/database/result/class_CachedDatabaseResult.php
+++ b/inc/main/classes/database/result/class_CachedDatabaseResult.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Database\Result;
+
 /**
  * A database result class
  *
@@ -413,7 +416,5 @@ class CachedDatabaseResult extends BaseDatabaseResult implements SearchableResul
 		// Set the index
 		call_user_func_array($callBack, array($indexValue));
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/decorator/template/class_XmlRewriterTemplateDecorator.php b/inc/main/classes/decorator/template/class_XmlRewriterTemplateDecorator.php
index 884341aa..9b8221a3 100644
--- a/inc/main/classes/decorator/template/class_XmlRewriterTemplateDecorator.php
+++ b/inc/main/classes/decorator/template/class_XmlRewriterTemplateDecorator.php
@@ -446,7 +446,5 @@ class XmlRewriterTemplateDecorator extends BaseDecorator implements CompileableT
 		// Call the inner class' method but trim the characters before
 		$this->getTemplateInstance()->assignMultipleVariables($variables);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/decorator/xml/class_XmlCompactorDecorator.php b/inc/main/classes/decorator/xml/class_XmlCompactorDecorator.php
index b8e29a4a..1163a245 100644
--- a/inc/main/classes/decorator/xml/class_XmlCompactorDecorator.php
+++ b/inc/main/classes/decorator/xml/class_XmlCompactorDecorator.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Parser\Xml;
+
 /**
  * A XML compacting decorator class for XML parsers
  *
@@ -69,7 +72,5 @@ class XmlCompactorDecorator extends BaseDecorator implements Parseable {
 		// Parse the content
 		$this->getParserInstance()->parseXmlContent($content);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/discovery/payment/class_LocalPaymentDiscovery.php b/inc/main/classes/discovery/payment/class_LocalPaymentDiscovery.php
index 0864675b..bd43e942 100644
--- a/inc/main/classes/discovery/payment/class_LocalPaymentDiscovery.php
+++ b/inc/main/classes/discovery/payment/class_LocalPaymentDiscovery.php
@@ -93,7 +93,5 @@ class LocalPaymentDiscovery extends BaseDiscovery implements Discoverable, Regis
 	public function addResultsToHelper (HelpableTemplate $helperInstance) {
 		// Undone part
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/factories/cache/class_CacheFactory.php b/inc/main/classes/factories/cache/class_CacheFactory.php
index 1ca669c6..e84be052 100644
--- a/inc/main/classes/factories/cache/class_CacheFactory.php
+++ b/inc/main/classes/factories/cache/class_CacheFactory.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Factory\Cache;
+
 /**
  * A cache factory
  *
@@ -68,7 +71,5 @@ class CacheFactory extends BaseFactory {
 		// Return the instance
 		return $cacheInstance;
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/factories/client/class_ClientFactory.php b/inc/main/classes/factories/client/class_ClientFactory.php
index 2ef09fab..14b75423 100644
--- a/inc/main/classes/factories/client/class_ClientFactory.php
+++ b/inc/main/classes/factories/client/class_ClientFactory.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Factory\Client;
+
 /**
  * An object factory for clients
  *
@@ -65,7 +68,5 @@ class ClientFactory extends ObjectFactory {
 		// Return the prepared instance
 		return $clientInstance;
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/factories/database/class_DatabaseWrapperFactory.php b/inc/main/classes/factories/database/class_DatabaseWrapperFactory.php
index 9e0216f7..a5a8a02c 100644
--- a/inc/main/classes/factories/database/class_DatabaseWrapperFactory.php
+++ b/inc/main/classes/factories/database/class_DatabaseWrapperFactory.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Factory\Database\Wrapper;
+
 /**
  * A factory class for socket registries
  *
@@ -58,7 +61,5 @@ class DatabaseWrapperFactory extends ObjectFactory {
 		// Return the instance
 		return $wrapperInstance;
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/factories/html/class_HtmlNewsFactory.php b/inc/main/classes/factories/html/class_HtmlNewsFactory.php
index 8726a16c..bbeee4fc 100644
--- a/inc/main/classes/factories/html/class_HtmlNewsFactory.php
+++ b/inc/main/classes/factories/html/class_HtmlNewsFactory.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Factory\News;
+
 /**
  * A news factory for web pages
  *
@@ -78,7 +81,5 @@ class HtmlNewsFactory extends BaseFactory {
 		// Return the prepared factory instance
 		return $newsInstance;
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/factories/index/class_FileStackIndexFactory.php b/inc/main/classes/factories/index/class_FileStackIndexFactory.php
index 9c57f78a..b2a09bb9 100644
--- a/inc/main/classes/factories/index/class_FileStackIndexFactory.php
+++ b/inc/main/classes/factories/index/class_FileStackIndexFactory.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Factory\Filesystem\Stack;
+
 /**
  * A factory class for file-based stack indexes
  *
@@ -57,7 +60,5 @@ class FileStackIndexFactory extends ObjectFactory {
 		// Return the instance
 		return $indexInstance;
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/factories/login/class_LoginFactory.php b/inc/main/classes/factories/login/class_LoginFactory.php
index 1ec2a933..f5e4372b 100644
--- a/inc/main/classes/factories/login/class_LoginFactory.php
+++ b/inc/main/classes/factories/login/class_LoginFactory.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Factory\Login;
+
 /**
  * A factory class for socket registries
  *
@@ -69,7 +72,5 @@ class LoginFactory extends ObjectFactory {
 		// Return the instance
 		return $loginInstance;
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/factories/objects/class_ObjectFactory.php b/inc/main/classes/factories/objects/class_ObjectFactory.php
index 84dd0fe1..2a5a46ef 100644
--- a/inc/main/classes/factories/objects/class_ObjectFactory.php
+++ b/inc/main/classes/factories/objects/class_ObjectFactory.php
@@ -93,7 +93,5 @@ class ObjectFactory extends BaseFactory {
 		// Return the instance
 		return $objectInstance;
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/factories/registry/class_SocketRegistryFactory.php b/inc/main/classes/factories/registry/class_SocketRegistryFactory.php
index e4228a13..f1ebfcd6 100644
--- a/inc/main/classes/factories/registry/class_SocketRegistryFactory.php
+++ b/inc/main/classes/factories/registry/class_SocketRegistryFactory.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Factory\Registry;
+
 /**
  * A factory class for socket registries
  *
@@ -58,7 +61,5 @@ class SocketRegistryFactory extends ObjectFactory {
 		// Return the instance
 		return $registryInstance;
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/factories/stacks/class_FileStackFactory.php b/inc/main/classes/factories/stacks/class_FileStackFactory.php
index d1437892..77ea4158 100644
--- a/inc/main/classes/factories/stacks/class_FileStackFactory.php
+++ b/inc/main/classes/factories/stacks/class_FileStackFactory.php
@@ -69,7 +69,5 @@ class FileStackFactory extends ObjectFactory {
 		// Return the instance
 		return $stackInstance;
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/factories/user/class_UserFactory.php b/inc/main/classes/factories/user/class_UserFactory.php
index a428cf00..ac7a3a06 100644
--- a/inc/main/classes/factories/user/class_UserFactory.php
+++ b/inc/main/classes/factories/user/class_UserFactory.php
@@ -75,7 +75,5 @@ class UserFactory extends ObjectFactory {
 		// Return the instance
 		return $userInstance;
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/factories/xml/class_XmlTemplateEngineFactory.php b/inc/main/classes/factories/xml/class_XmlTemplateEngineFactory.php
index cccb9cdb..fd83f516 100644
--- a/inc/main/classes/factories/xml/class_XmlTemplateEngineFactory.php
+++ b/inc/main/classes/factories/xml/class_XmlTemplateEngineFactory.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Factory\Template;
+
 /**
  * A factory class for XML template engines. All instances generated by this
  * factory does have language support disabled and XML-compacting enabled (to
@@ -67,7 +70,5 @@ class XmlTemplateEngineFactory extends ObjectFactory {
 		// Return the instance
 		return $templateInstance;
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/feature/fuse/class_FuseFeature.php b/inc/main/classes/feature/fuse/class_FuseFeature.php
index 942520ea..60d33883 100644
--- a/inc/main/classes/feature/fuse/class_FuseFeature.php
+++ b/inc/main/classes/feature/fuse/class_FuseFeature.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Feature\Fuse;
+
 /**
  * A FUSE feature class
  *
@@ -61,7 +64,5 @@ class FuseFeature extends BaseFeature implements Feature {
 		// Return status
 		return $isAvailable;
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/file_directories/binary/class_BaseBinaryFile.php b/inc/main/classes/file_directories/binary/class_BaseBinaryFile.php
index fb571e84..15b5f0b3 100644
--- a/inc/main/classes/file_directories/binary/class_BaseBinaryFile.php
+++ b/inc/main/classes/file_directories/binary/class_BaseBinaryFile.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Filesystem\File;
+
 /**
  * A general binary file class
  *
@@ -848,7 +851,5 @@ class BaseBinaryFile extends BaseAbstractFile {
 		// @TODO Unfinished
 		$this->partialStub('length=' . $length);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/file_directories/binary/index/class_IndexFile.php b/inc/main/classes/file_directories/binary/index/class_IndexFile.php
index 32bac87c..40d8f8e1 100644
--- a/inc/main/classes/file_directories/binary/index/class_IndexFile.php
+++ b/inc/main/classes/file_directories/binary/index/class_IndexFile.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Filesystem\Index;
+
 /**
  * An index file class
  *
@@ -79,7 +82,5 @@ class IndexFile extends BaseBinaryFile implements Block {
 		self::createDebugInstance(__CLASS__)->debugOutput('[' . __METHOD__ . ':' . __LINE__ . '] groupId=' . $groupId . ',encoded()=' . strlen($encoded));
 		throw new UnsupportedOperationException(array($this, __FUNCTION__), self::EXCEPTION_UNSPPORTED_OPERATION);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/file_directories/binary/stack/class_StackFile.php b/inc/main/classes/file_directories/binary/stack/class_StackFile.php
index fc203a72..270c6f85 100644
--- a/inc/main/classes/file_directories/binary/stack/class_StackFile.php
+++ b/inc/main/classes/file_directories/binary/stack/class_StackFile.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Filesystem\Stack;
+
 /**
  * A stack file class
  *
@@ -91,7 +94,5 @@ class StackFile extends BaseBinaryFile implements Block {
 		self::createDebugInstance(__CLASS__)->debugOutput('[' . __METHOD__ . ':' . __LINE__ . '] groupId=' . $groupId . ',hash=' . $hash . ',encoded()=' . strlen($encoded));
 		throw new UnsupportedOperationException(array($this, __FUNCTION__), self::EXCEPTION_UNSPPORTED_OPERATION);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/file_directories/io_stream/class_FileIoStream.php b/inc/main/classes/file_directories/io_stream/class_FileIoStream.php
index a9f6d0f9..3de4520b 100644
--- a/inc/main/classes/file_directories/io_stream/class_FileIoStream.php
+++ b/inc/main/classes/file_directories/io_stream/class_FileIoStream.php
@@ -1,6 +1,6 @@
 <?php
 // Own namespace
-namespace CoreFramework\Stream;
+namespace CoreFramework\Stream\Filesystem;
 
 // Import framework stuff
 use CoreFramework\Object\BaseFrameworkSystem;
diff --git a/inc/main/classes/file_directories/output/raw/class_FrameworkRawFileOutputPointer.php b/inc/main/classes/file_directories/output/raw/class_FrameworkRawFileOutputPointer.php
index 1db56899..6b39bb52 100644
--- a/inc/main/classes/file_directories/output/raw/class_FrameworkRawFileOutputPointer.php
+++ b/inc/main/classes/file_directories/output/raw/class_FrameworkRawFileOutputPointer.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Filesystem\Pointer\Raw;
+
 /**
  * A class for writing files
  *
@@ -144,7 +147,5 @@ class FrameworkRawFileOutputPointer extends BaseFileIo implements OutputPointer
 	public function key () {
 		throw new UnsupportedOperationException(array($this, __FUNCTION__), self::EXCEPTION_UNSPPORTED_OPERATION);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/file_directories/output/text/class_FrameworkTextFileOutputPointer.php b/inc/main/classes/file_directories/output/text/class_FrameworkTextFileOutputPointer.php
index 1db56899..b17e3464 100644
--- a/inc/main/classes/file_directories/output/text/class_FrameworkTextFileOutputPointer.php
+++ b/inc/main/classes/file_directories/output/text/class_FrameworkTextFileOutputPointer.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Filesystem\Pointer\Text;
+
 /**
  * A class for writing files
  *
@@ -144,7 +147,5 @@ class FrameworkRawFileOutputPointer extends BaseFileIo implements OutputPointer
 	public function key () {
 		throw new UnsupportedOperationException(array($this, __FUNCTION__), self::EXCEPTION_UNSPPORTED_OPERATION);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/file_directories/text/class_BaseTextFile.php b/inc/main/classes/file_directories/text/class_BaseTextFile.php
index e0f36ec8..b69e6aee 100644
--- a/inc/main/classes/file_directories/text/class_BaseTextFile.php
+++ b/inc/main/classes/file_directories/text/class_BaseTextFile.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Filesystem\File;
+
 /**
  * A general text file class
  *
@@ -72,7 +75,5 @@ class BaseTextFile extends BaseAbstractFile {
 		self::createDebugInstance(__CLASS__)->debugOutput('[' . __METHOD__ . ':' . __LINE__ . '] fqfn=' . $fqfn);
 		throw new UnsupportedOperationException(array($this, __FUNCTION__), self::EXCEPTION_UNSPPORTED_OPERATION);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/file_directories/text/input/class_BaseInputTextFile.php b/inc/main/classes/file_directories/text/input/class_BaseInputTextFile.php
index 1fda9951..70d4ee14 100644
--- a/inc/main/classes/file_directories/text/input/class_BaseInputTextFile.php
+++ b/inc/main/classes/file_directories/text/input/class_BaseInputTextFile.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Filesystem\Text;
+
 /**
  * A general text input file class
  *
@@ -54,7 +57,5 @@ class BaseInputTextFile extends BaseTextFile {
 	 */
 	public function readLine () {
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/file_directories/text/input/csv/class_CsvInputFile.php b/inc/main/classes/file_directories/text/input/csv/class_CsvInputFile.php
index 937f80a8..0d1170b1 100644
--- a/inc/main/classes/file_directories/text/input/csv/class_CsvInputFile.php
+++ b/inc/main/classes/file_directories/text/input/csv/class_CsvInputFile.php
@@ -166,7 +166,6 @@ class CsvInputFile extends BaseInputTextFile implements CsvInputStreamer {
 		// Return it
 		return $lineArray;
 	}
+
 }
 
-// [EOF]
-?>
diff --git a/inc/main/classes/file_directories/text/output/class_BaseOutputTextFile.php b/inc/main/classes/file_directories/text/output/class_BaseOutputTextFile.php
index e4cd06f6..57bb5f18 100644
--- a/inc/main/classes/file_directories/text/output/class_BaseOutputTextFile.php
+++ b/inc/main/classes/file_directories/text/output/class_BaseOutputTextFile.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Filesystem\Text;
+
 /**
  * A general text file class
  *
@@ -46,7 +49,5 @@ class BaseOutputTextFile extends BaseAbstractFile {
 		// ... and set it here
 		$this->setPointerInstance($pointerInstance);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/filter/auth/class_UserAuthFilter.php b/inc/main/classes/filter/auth/class_UserAuthFilter.php
index 88b354b1..ff067215 100644
--- a/inc/main/classes/filter/auth/class_UserAuthFilter.php
+++ b/inc/main/classes/filter/auth/class_UserAuthFilter.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Filter\User\Auth;
+
 /**
  * A filter for checking user permissions
  *
@@ -131,7 +134,5 @@ class UserAuthFilter extends BaseFilter implements Filterable {
 		Registry::getRegistry()->addInstance('auth', $authInstance);
 		Registry::getRegistry()->addInstance('user', $userInstance);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/filter/change/class_EmailChangeFilter.php b/inc/main/classes/filter/change/class_EmailChangeFilter.php
index 4eaa678a..fe2b1e68 100644
--- a/inc/main/classes/filter/change/class_EmailChangeFilter.php
+++ b/inc/main/classes/filter/change/class_EmailChangeFilter.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Filter\Change\Email;
+
 /**
  * A filter for detecting email changes
  *
@@ -116,7 +119,5 @@ class EmailChangeFilter extends BaseFilter implements Filterable {
 		// Update the "new_email" field
 		$this->partialStub('Unfinished part.');
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/filter/change/class_PasswordChangeFilter.php b/inc/main/classes/filter/change/class_PasswordChangeFilter.php
index b5db12eb..4c4de125 100644
--- a/inc/main/classes/filter/change/class_PasswordChangeFilter.php
+++ b/inc/main/classes/filter/change/class_PasswordChangeFilter.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Filter\Change\Email;
+
 /**
  * A filter for password change detection
  *
@@ -108,7 +111,5 @@ class PasswordChangeFilter extends BaseFilter implements Filterable {
 		// Update the "password" field
 		$this->partialStub('Unfinished part.');
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/filter/checkboxes/class_RulesAcceptedFilter.php b/inc/main/classes/filter/checkboxes/class_RulesAcceptedFilter.php
index a5a7a74e..1a0729e2 100644
--- a/inc/main/classes/filter/checkboxes/class_RulesAcceptedFilter.php
+++ b/inc/main/classes/filter/checkboxes/class_RulesAcceptedFilter.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Filter\RulesCheckbox;
+
 /**
  * A filter for checking if the user has accepted the rules. This is mainly
  * used and done in registration process and should not be removed from your
@@ -71,7 +74,5 @@ class RulesAcceptedFilter extends BaseFilter implements Filterable {
 			throw new FilterChainException($this, self::EXCEPTION_FILTER_CHAIN_INTERCEPTED);
 		} // END - if
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/filter/crypto/class_CaptchaEncryptFilter.php b/inc/main/classes/filter/crypto/class_CaptchaEncryptFilter.php
index 4a75ebfa..e13ca5ac 100644
--- a/inc/main/classes/filter/crypto/class_CaptchaEncryptFilter.php
+++ b/inc/main/classes/filter/crypto/class_CaptchaEncryptFilter.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Filter\Captcha;
+
 /**
  * A filter for checking if value "encrypt" is set and fine
  *
@@ -84,7 +87,5 @@ class CaptchaEncryptFilter extends BaseFilter implements Filterable {
 		// Write it to the request
 		$requestInstance->setRequestElement('decrypted', $decryptedString);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/filter/guest/class_UserNameIsGuestFilter.php b/inc/main/classes/filter/guest/class_UserNameIsGuestFilter.php
index 3a9fdf5b..6e75e146 100644
--- a/inc/main/classes/filter/guest/class_UserNameIsGuestFilter.php
+++ b/inc/main/classes/filter/guest/class_UserNameIsGuestFilter.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Filter\User\Username;
+
 /**
  * A filter for checking if username "guest" has been choosen as configured. If
  * so the password will be set to the configured password.
@@ -64,7 +67,5 @@ class UserNameIsGuestFilter extends BaseFilter implements Filterable {
 			$requestInstance->setRequestElement('pass2', $this->getConfigInstance()->getConfigEntry('guest_login_passwd'));
 		} // END - if
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/filter/news/class_NewsDownloadFilter.php b/inc/main/classes/filter/news/class_NewsDownloadFilter.php
index c6be8464..c1da2193 100644
--- a/inc/main/classes/filter/news/class_NewsDownloadFilter.php
+++ b/inc/main/classes/filter/news/class_NewsDownloadFilter.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Filter\News;
+
 /**
  * A pre-filter for downloading news from a source. This can be a XML feed or
  * the local database. You *can* register this filter as post filter but for
@@ -61,7 +64,5 @@ class NewsDownloadFilter extends BaseFilter implements Filterable {
 		// Store the news instance in registry
 		Registry::getRegistry()->addInstance('news', $newsInstance);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/filter/news/class_NewsProcessFilter.php b/inc/main/classes/filter/news/class_NewsProcessFilter.php
index 93567111..ace93413 100644
--- a/inc/main/classes/filter/news/class_NewsProcessFilter.php
+++ b/inc/main/classes/filter/news/class_NewsProcessFilter.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Filter\News;
+
 /**
  * A post-filter for processing downloaded news. This will prepare the news fir
  * output to the template engine.
@@ -56,7 +59,5 @@ class NewsProcessFilter extends BaseFilter implements Filterable {
 	 */
 	public function execute (Requestable $requestInstance, Responseable $responseInstance) {
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/filter/null/class_NullFilter.php b/inc/main/classes/filter/null/class_NullFilter.php
index 2011f924..2228c6d3 100644
--- a/inc/main/classes/filter/null/class_NullFilter.php
+++ b/inc/main/classes/filter/null/class_NullFilter.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Filter\Generic;
+
 /**
  * As the name said: A null filter does just pass through the data. This is
  * useful to make other filters switch on/off-able.
@@ -56,7 +59,5 @@ class NullFilter extends BaseFilter implements Filterable {
 	public function execute (Requestable $requestInstance, Responseable $responseInstance) {
 		// Not implemented, just passing through
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/filter/payment/class_PaymentDiscoveryFilter.php b/inc/main/classes/filter/payment/class_PaymentDiscoveryFilter.php
index f31ad5b2..85edcc87 100644
--- a/inc/main/classes/filter/payment/class_PaymentDiscoveryFilter.php
+++ b/inc/main/classes/filter/payment/class_PaymentDiscoveryFilter.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Filter\Discovery\Payment;
+
 /**
  * A filter for payment discovery. This class discovers the payment type and
  * returns an object holding all available payment system for the requested
@@ -130,7 +133,5 @@ class PaymentDiscoveryFilter extends BaseFilter implements Filterable {
 			throw new FilterChainException($this, self::EXCEPTION_FILTER_CHAIN_INTERCEPTED);
 		}
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/filter/update/class_UserStatusConfimedUpdateFilter.php b/inc/main/classes/filter/update/class_UserStatusConfimedUpdateFilter.php
index aa1f246c..bfa4486a 100644
--- a/inc/main/classes/filter/update/class_UserStatusConfimedUpdateFilter.php
+++ b/inc/main/classes/filter/update/class_UserStatusConfimedUpdateFilter.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Filter\User\Status;
+
 /**
  * A filter for updating the user account status to confirmed
  *
@@ -68,7 +71,5 @@ class UserStatusConfimedUpdateFilter extends BaseFilter implements Filterable {
 		// Write all updates to the database
 		$userInstance->flushPendingUpdates();
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/filter/update/class_UserUpdateFilter.php b/inc/main/classes/filter/update/class_UserUpdateFilter.php
index 1c2fdf65..c64ed021 100644
--- a/inc/main/classes/filter/update/class_UserUpdateFilter.php
+++ b/inc/main/classes/filter/update/class_UserUpdateFilter.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Filter\User;
+
 /**
  * A filter for updating the user account like last activity, last action
  * performed and so on.
@@ -68,7 +71,5 @@ class UserUpdateFilter extends BaseFilter implements Filterable {
 		// Write all updates to the database
 		$userInstance->flushPendingUpdates();
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/filter/validator/class_EmailValidatorFilter.php b/inc/main/classes/filter/validator/class_EmailValidatorFilter.php
index c7063566..78b78d73 100644
--- a/inc/main/classes/filter/validator/class_EmailValidatorFilter.php
+++ b/inc/main/classes/filter/validator/class_EmailValidatorFilter.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Filter\Validator\Email;
+
 /**
  * A concrete filter for validating the email address. This filter may intercept
  * the filter chain if no email address is given or if supplied email has an
@@ -163,7 +166,5 @@ class EmailValidatorFilter extends BaseFilter implements Filterable {
 		// Return the result
 		return $alreadyTaken;
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/filter/validator/class_PasswordValidatorFilter.php b/inc/main/classes/filter/validator/class_PasswordValidatorFilter.php
index 4dec46b1..bf0bf85a 100644
--- a/inc/main/classes/filter/validator/class_PasswordValidatorFilter.php
+++ b/inc/main/classes/filter/validator/class_PasswordValidatorFilter.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Filter\Validator\Password;
+
 /**
  * A concrete filter for validating the password. This filter may intercept
  * the filter chain if no password is given or if both passwords didn't match.
@@ -98,7 +101,5 @@ class PasswordValidatorFilter extends BaseFilter implements Filterable {
 			throw new FilterChainException($this, self::EXCEPTION_FILTER_CHAIN_INTERCEPTED);
 		} // END - elseif
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/filter/validator/class_UserNameValidatorFilter.php b/inc/main/classes/filter/validator/class_UserNameValidatorFilter.php
index 1ed2e7ef..dfbb5f74 100644
--- a/inc/main/classes/filter/validator/class_UserNameValidatorFilter.php
+++ b/inc/main/classes/filter/validator/class_UserNameValidatorFilter.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Filter\Validator\Username;
+
 /**
  * A concrete filter for validating the username. This filter may intercept the
  * filter chain if no username is given or if supplied username has an invalid
@@ -133,7 +136,5 @@ class UserNameValidatorFilter extends BaseFilter implements Filterable {
 		// Return the result
 		return $alreadyTaken;
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/filter/verifier/class_AccountPasswordVerifierFilter.php b/inc/main/classes/filter/verifier/class_AccountPasswordVerifierFilter.php
index 515ba61a..b27af9ef 100644
--- a/inc/main/classes/filter/verifier/class_AccountPasswordVerifierFilter.php
+++ b/inc/main/classes/filter/verifier/class_AccountPasswordVerifierFilter.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Filter\Verifier\Password;
+
 /**
  * A concrete filter for validating the password. This filter may intercept
  * the filter chain if no password is given or the password is invalid
@@ -104,7 +107,5 @@ class AccountPasswordVerifierFilter extends BaseFilter implements Filterable {
 			throw new AccountPasswordMismatchException($this, BaseUser::EXCEPTION_USER_PASS_MISMATCH);
 		} // END - if
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/filter/verifier/class_BirthdayVerifierFilter.php b/inc/main/classes/filter/verifier/class_BirthdayVerifierFilter.php
index a6d1468e..1b1c73c4 100644
--- a/inc/main/classes/filter/verifier/class_BirthdayVerifierFilter.php
+++ b/inc/main/classes/filter/verifier/class_BirthdayVerifierFilter.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Filter\Verifier\User;
+
 /**
  * A verifier filter for birthday data
  *
@@ -108,7 +111,5 @@ class BirthdayVerifierFilter extends BaseFilter implements Filterable {
 			throw new FilterChainException($this, self::EXCEPTION_FILTER_CHAIN_INTERCEPTED);
 		} // END - if
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/filter/verifier/class_ConfirmCodeVerifierFilter.php b/inc/main/classes/filter/verifier/class_ConfirmCodeVerifierFilter.php
index 3eace252..55f7b542 100644
--- a/inc/main/classes/filter/verifier/class_ConfirmCodeVerifierFilter.php
+++ b/inc/main/classes/filter/verifier/class_ConfirmCodeVerifierFilter.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Filter\Verifier\Confirmation;
+
 /**
  * A filter for checking if supplied confirmation code is valid.
  *
@@ -96,7 +99,5 @@ class ConfirmCodeVerifierFilter extends BaseFilter implements Filterable {
 			exit();
 		} // END - if
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/filter/verifier/class_GraphicalCodeCaptchaVerifierFilter.php b/inc/main/classes/filter/verifier/class_GraphicalCodeCaptchaVerifierFilter.php
index b57c1181..f7340b71 100644
--- a/inc/main/classes/filter/verifier/class_GraphicalCodeCaptchaVerifierFilter.php
+++ b/inc/main/classes/filter/verifier/class_GraphicalCodeCaptchaVerifierFilter.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Filter\Verifier\Captcha;
+
 /**
  * A concrete filter for validating code graphical CAPTCHAs with hashes
  *
@@ -143,7 +146,5 @@ class GraphicalCodeCaptchaVerifierFilter extends BaseFilter implements Filterabl
 			throw new FilterChainException($this, self::EXCEPTION_FILTER_CHAIN_INTERCEPTED);
 		} // END - not the same!
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/filter/verifier/class_PasswordGuestVerifierFilter.php b/inc/main/classes/filter/verifier/class_PasswordGuestVerifierFilter.php
index 62321d39..1f9060a3 100644
--- a/inc/main/classes/filter/verifier/class_PasswordGuestVerifierFilter.php
+++ b/inc/main/classes/filter/verifier/class_PasswordGuestVerifierFilter.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Filter\Verifier\User;
+
 /**
  * A concrete filter for validating the guest password. This filter may intercept
  * the filter chain if no password is given or the password is invalid
@@ -79,7 +82,5 @@ class PasswordGuestVerifierFilter extends BaseFilter implements Filterable {
 			throw new FilterChainException($this, self::EXCEPTION_FILTER_CHAIN_INTERCEPTED);
 		}
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/filter/verifier/class_PasswordVerifierFilter.php b/inc/main/classes/filter/verifier/class_PasswordVerifierFilter.php
index 62130073..66714a24 100644
--- a/inc/main/classes/filter/verifier/class_PasswordVerifierFilter.php
+++ b/inc/main/classes/filter/verifier/class_PasswordVerifierFilter.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Filter\Verifier\Password;
+
 /**
  * A concrete filter for validating the password. This filter may intercept
  * the filter chain if no password is given or the password is invalid
@@ -79,7 +82,5 @@ class PasswordVerifierFilter extends BaseFilter implements Filterable {
 			throw new FilterChainException($this, self::EXCEPTION_FILTER_CHAIN_INTERCEPTED);
 		}
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/filter/verifier/class_UserGuestVerifierFilter.php b/inc/main/classes/filter/verifier/class_UserGuestVerifierFilter.php
index f4c06660..703d5ece 100644
--- a/inc/main/classes/filter/verifier/class_UserGuestVerifierFilter.php
+++ b/inc/main/classes/filter/verifier/class_UserGuestVerifierFilter.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Filter\Verifier\User;
+
 /**
  * A concrete filter for verfying the guest username. This filter may intercept the
  * filter chain if no username is given or if supplied username has an invalid
@@ -136,7 +139,5 @@ class UserGuestVerifierFilter extends BaseFilter implements Filterable {
 		// Return the result
 		return $alreadyTaken;
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/filter/verifier/class_UserNameVerifierFilter.php b/inc/main/classes/filter/verifier/class_UserNameVerifierFilter.php
index 09add35b..ba1b20ba 100644
--- a/inc/main/classes/filter/verifier/class_UserNameVerifierFilter.php
+++ b/inc/main/classes/filter/verifier/class_UserNameVerifierFilter.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Filter\Verifier\User;
+
 /**
  * A concrete filter for verfying the username. This filter may intercept the
  * filter chain if no username is given or if supplied username has an invalid
@@ -133,7 +136,5 @@ class UserNameVerifierFilter extends BaseFilter implements Filterable {
 		// Return the result
 		return $alreadyTaken;
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/filter/verifier/class_UserStatusVerifierFilter.php b/inc/main/classes/filter/verifier/class_UserStatusVerifierFilter.php
index ac73a848..b6ef58da 100644
--- a/inc/main/classes/filter/verifier/class_UserStatusVerifierFilter.php
+++ b/inc/main/classes/filter/verifier/class_UserStatusVerifierFilter.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Filter\Verifier\User;
+
 /**
  * A filter for checking if user status is GUEST or CONFIRMED.
  *
@@ -68,7 +71,5 @@ class UserStatusVerifierFilter extends BaseFilter implements Filterable {
 			exit();
 		} // END - if
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/filter/verifier/class_UserUnconfirmedVerifierFilter.php b/inc/main/classes/filter/verifier/class_UserUnconfirmedVerifierFilter.php
index e526e1ea..f71e0aa3 100644
--- a/inc/main/classes/filter/verifier/class_UserUnconfirmedVerifierFilter.php
+++ b/inc/main/classes/filter/verifier/class_UserUnconfirmedVerifierFilter.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Filter\Verifier\User;
+
 /**
  * A filter for checking if user status is UNCONFIRMED.
  *
@@ -83,7 +86,5 @@ class UserUnconfirmedVerifierFilter extends BaseFilter implements Filterable {
 		// Add this instance to registry
 		Registry::getRegistry()->addInstance('user', $userInstance);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/handler/raw_data/class_BaseDataHandler.php b/inc/main/classes/handler/raw_data/class_BaseDataHandler.php
index abf88f2e..a213ce32 100644
--- a/inc/main/classes/handler/raw_data/class_BaseDataHandler.php
+++ b/inc/main/classes/handler/raw_data/class_BaseDataHandler.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Handler\Data;
+
 /**
  * A general data Handler
  *
@@ -191,7 +194,5 @@ abstract class BaseDataHandler extends BaseHandler {
 	 * @return	void
 	 */
 	abstract protected function removeMessageConfigurationData (array $messageData);
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/handler/raw_data/network/class_BaseRawDataHandler.php b/inc/main/classes/handler/raw_data/network/class_BaseRawDataHandler.php
index 27c48b29..2e1edd24 100644
--- a/inc/main/classes/handler/raw_data/network/class_BaseRawDataHandler.php
+++ b/inc/main/classes/handler/raw_data/network/class_BaseRawDataHandler.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Handler\Raw;
+
 /**
  * A general Handler for raw data from sockets
  *
@@ -177,7 +180,5 @@ class BaseRawDataHandler extends BaseHandler {
 	public final function getErrorCode () {
 		return $this->errorCode;
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/handler/tasks/class_TaskHandler.php b/inc/main/classes/handler/tasks/class_TaskHandler.php
index 19ea2cdb..74f59c73 100644
--- a/inc/main/classes/handler/tasks/class_TaskHandler.php
+++ b/inc/main/classes/handler/tasks/class_TaskHandler.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Handler\Task;
+
 /**
  * A Task handler
  *
@@ -341,7 +344,5 @@ class TaskHandler extends BaseHandler implements Registerable, HandleableTask {
 			$this->unregisterTask($entry);
 		} // END - foreach
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/helper/captcha/images/class_ImageHelper.php b/inc/main/classes/helper/captcha/images/class_ImageHelper.php
index 1b4da344..a7a1235c 100644
--- a/inc/main/classes/helper/captcha/images/class_ImageHelper.php
+++ b/inc/main/classes/helper/captcha/images/class_ImageHelper.php
@@ -396,7 +396,5 @@ class ImageHelper extends BaseCaptcha implements HelpableTemplate {
 		// Transfer all to the template engine
 		$templateInstance->renderXmlContent($imageContent);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/helper/html/blocks/class_HtmlBlockHelper.php b/inc/main/classes/helper/html/blocks/class_HtmlBlockHelper.php
index 67a4bd8f..0855bff6 100644
--- a/inc/main/classes/helper/html/blocks/class_HtmlBlockHelper.php
+++ b/inc/main/classes/helper/html/blocks/class_HtmlBlockHelper.php
@@ -151,7 +151,5 @@ class HtmlBlockHelper extends BaseHtmlHelper implements HelpableTemplate {
 		// Transfer it to the template instance
 		$templateInstance->assignVariable($this->getBlockName(), $templateInstance->getRawTemplateData());
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/helper/html/class_BaseHtmlHelper.php b/inc/main/classes/helper/html/class_BaseHtmlHelper.php
index 5d100f77..2bc7ffb1 100644
--- a/inc/main/classes/helper/html/class_BaseHtmlHelper.php
+++ b/inc/main/classes/helper/html/class_BaseHtmlHelper.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Helper;
+
 /**
  * A general purpose web helper. You should not instance this like all the other
  * base classes. Instead write your own web helper class and inherit this class.
@@ -33,7 +36,5 @@ class BaseHtmlHelper extends BaseHelper {
 		// Call parent constructor
 		parent::__construct($className);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/helper/html/links/class_HtmlLinkHelper.php b/inc/main/classes/helper/html/links/class_HtmlLinkHelper.php
index 12a9fab5..5ffe2940 100644
--- a/inc/main/classes/helper/html/links/class_HtmlLinkHelper.php
+++ b/inc/main/classes/helper/html/links/class_HtmlLinkHelper.php
@@ -346,7 +346,5 @@ class HtmlLinkHelper extends BaseHtmlHelper implements HelpableTemplate {
 		// Add the content to the previous group
 		$this->addContentToPreviousGroup($linkContent);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/helper/login/class_BaseLoginHelper.php b/inc/main/classes/helper/login/class_BaseLoginHelper.php
index ea4764fc..e5d24bcc 100644
--- a/inc/main/classes/helper/login/class_BaseLoginHelper.php
+++ b/inc/main/classes/helper/login/class_BaseLoginHelper.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Helper\Login;
+
 /**
  * A general login helper class
  *
@@ -32,7 +35,5 @@ class BaseLoginHelper extends BaseHelper {
 		// Call parent constructor
 		parent::__construct($className);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/iterator/default/class_DefaultIterator.php b/inc/main/classes/iterator/default/class_DefaultIterator.php
index fb8494a0..d075a4ef 100644
--- a/inc/main/classes/iterator/default/class_DefaultIterator.php
+++ b/inc/main/classes/iterator/default/class_DefaultIterator.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Iterator;
+
 /**
  * A Default iterator
  *
@@ -116,7 +119,5 @@ class DefaultIterator extends BaseIterator implements Iterator {
 		// Return result
 		return $isValid;
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/iterator/file/class_FileIterator.php b/inc/main/classes/iterator/file/class_FileIterator.php
index 97293903..e28045cb 100644
--- a/inc/main/classes/iterator/file/class_FileIterator.php
+++ b/inc/main/classes/iterator/file/class_FileIterator.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Iterator\File;
+
 /**
  * A file iterator
  *
@@ -324,7 +327,5 @@ class FileIterator extends BaseIterator implements SeekableWritableFileIterator
 		print $this->getBlockInstance()->__toString() . PHP_EOL;
 		return $this->getBlockInstance()->searchNextGap($length);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/listener/class_BaseListenerDecorator.php b/inc/main/classes/listener/class_BaseListenerDecorator.php
index ae66a5c7..adaa544a 100644
--- a/inc/main/classes/listener/class_BaseListenerDecorator.php
+++ b/inc/main/classes/listener/class_BaseListenerDecorator.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Listener;
+
 /**
  * A general decorator for listeners to communicate to hubs
  *
@@ -147,7 +150,5 @@ class BaseListenerDecorator extends BaseDecorator implements Visitable {
 		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('BASE-LISTENER-DECORATOR[' . __METHOD__ . ':' . __LINE__ . '] Going to handle over some raw data to receiver instance (' . $receiverInstance->__toString() . ') ...');
 		$receiverInstance->addRawDataToIncomingStack($handlerInstance);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/listener/socket/class_SocketFileListener.php b/inc/main/classes/listener/socket/class_SocketFileListener.php
index a627c708..81ad500a 100644
--- a/inc/main/classes/listener/socket/class_SocketFileListener.php
+++ b/inc/main/classes/listener/socket/class_SocketFileListener.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Listener\Socket;
+
 /**
  * A file-based socket listener
  *
@@ -213,7 +216,5 @@ class SocketFileListener extends BaseListener implements Listenable {
 	public function monitorIncomingRawData () {
 		$this->partialStub('Need to implement this method.');
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/listener/socket/decorator/class_SocketFileListenerDecorator.php b/inc/main/classes/listener/socket/decorator/class_SocketFileListenerDecorator.php
index 1b044e4b..a2664a59 100644
--- a/inc/main/classes/listener/socket/decorator/class_SocketFileListenerDecorator.php
+++ b/inc/main/classes/listener/socket/decorator/class_SocketFileListenerDecorator.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Listener\Socket;
+
 /**
  * A decorator for the SocketFileListener to communicate to hubs
  *
@@ -91,7 +94,5 @@ class SocketFileListenerDecorator extends BaseListenerDecorator implements Liste
 		// Return the result
 		return $accepts;
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/lists/groups/class_ListGroupList.php b/inc/main/classes/lists/groups/class_ListGroupList.php
index 388ab613..096f72c8 100644
--- a/inc/main/classes/lists/groups/class_ListGroupList.php
+++ b/inc/main/classes/lists/groups/class_ListGroupList.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\List\Group;
+
 /**
  * A ListGroup list
  *
@@ -63,7 +66,5 @@ class ListGroupList extends BaseList implements Listable {
 	public function clearList () {
 		$this->partialStub('Please implement this method.');
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/lists/tasks/class_TaskList.php b/inc/main/classes/lists/tasks/class_TaskList.php
index 37b2141a..c868cd51 100644
--- a/inc/main/classes/lists/tasks/class_TaskList.php
+++ b/inc/main/classes/lists/tasks/class_TaskList.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\List\Task;
+
 /**
  * A Task list
  *
@@ -66,7 +69,5 @@ class TaskList extends BaseList implements Listable {
 		// Clear the only one group
 		$this->clearGroup('tasks');
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/mailer/debug/class_DebugMailer.php b/inc/main/classes/mailer/debug/class_DebugMailer.php
index 89a631be..6740d0ca 100644
--- a/inc/main/classes/mailer/debug/class_DebugMailer.php
+++ b/inc/main/classes/mailer/debug/class_DebugMailer.php
@@ -176,7 +176,5 @@ class DebugMailer extends BaseMailer implements DeliverableMail {
 		// Then compile it again
 		$templateInstance->compileVariables();
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/output/console/class_ConsoleOutput.php b/inc/main/classes/output/console/class_ConsoleOutput.php
index ddec2cc0..f0c94c83 100644
--- a/inc/main/classes/output/console/class_ConsoleOutput.php
+++ b/inc/main/classes/output/console/class_ConsoleOutput.php
@@ -129,7 +129,5 @@ class ConsoleOutput extends BaseOutput implements OutputStreamer {
 	public function size () {
 		throw new UnsupportedOperationException(array($this, __FUNCTION__), self::EXCEPTION_UNSPPORTED_OPERATION);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/output/debug/class_BaseDebugOutput.php b/inc/main/classes/output/debug/class_BaseDebugOutput.php
index a56f3ad4..7643d51d 100644
--- a/inc/main/classes/output/debug/class_BaseDebugOutput.php
+++ b/inc/main/classes/output/debug/class_BaseDebugOutput.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Output\Debug;
+
 /**
  * Generic debug output class
  *
@@ -56,7 +59,5 @@ class BaseDebugOutput extends BaseOutput {
 	public final function getLoggerClassName () {
 		return $this->loggerClassName;
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/output/debug/error/class_DebugErrorLogOutput.php b/inc/main/classes/output/debug/error/class_DebugErrorLogOutput.php
index edc0385d..bf02a318 100644
--- a/inc/main/classes/output/debug/error/class_DebugErrorLogOutput.php
+++ b/inc/main/classes/output/debug/error/class_DebugErrorLogOutput.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Output\Debug;
+
 /**
  * A debug output class for PHP's error_log() command
  *
@@ -127,7 +130,5 @@ class DebugErrorLogOutput extends BaseDebugOutput implements Debugger, OutputStr
 	public function size () {
 		throw new UnsupportedOperationException(array($this, __FUNCTION__), self::EXCEPTION_UNSPPORTED_OPERATION);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/output/debug/web/class_DebugWebOutput.php b/inc/main/classes/output/debug/web/class_DebugWebOutput.php
index ce686061..e34ec905 100644
--- a/inc/main/classes/output/debug/web/class_DebugWebOutput.php
+++ b/inc/main/classes/output/debug/web/class_DebugWebOutput.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Output\Debug;
+
 /**
  * A debug output class for the web browser
  *
@@ -116,7 +119,5 @@ class DebugWebOutput extends BaseDebugOutput implements Debugger, OutputStreamer
 	public function size () {
 		throw new UnsupportedOperationException(array($this, __FUNCTION__), self::EXCEPTION_UNSPPORTED_OPERATION);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/output/web/class_WebOutput.php b/inc/main/classes/output/web/class_WebOutput.php
index e08d8396..03fe275f 100644
--- a/inc/main/classes/output/web/class_WebOutput.php
+++ b/inc/main/classes/output/web/class_WebOutput.php
@@ -114,7 +114,5 @@ class WebOutput extends BaseOutput implements OutputStreamer, Registerable {
 	public function size () {
 		throw new UnsupportedOperationException(array($this, __FUNCTION__), self::EXCEPTION_UNSPPORTED_OPERATION);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/parser/xml/class_XmlParser.php b/inc/main/classes/parser/xml/class_XmlParser.php
index 13c32eb1..44c28441 100644
--- a/inc/main/classes/parser/xml/class_XmlParser.php
+++ b/inc/main/classes/parser/xml/class_XmlParser.php
@@ -115,7 +115,5 @@ class XmlParser extends BaseParser implements Parseable {
 		// Free the parser
 		xml_parser_free($xmlParser);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/registry/generic/class_Registry.php b/inc/main/classes/registry/generic/class_Registry.php
index 116a5216..3647dfc7 100644
--- a/inc/main/classes/registry/generic/class_Registry.php
+++ b/inc/main/classes/registry/generic/class_Registry.php
@@ -63,4 +63,3 @@ class Registry extends BaseRegistry implements Register {
 	}
 
 }
-// [EOF]
diff --git a/inc/main/classes/registry/sub/class_SubRegistry.php b/inc/main/classes/registry/sub/class_SubRegistry.php
index 2cf76b35..c2eb43ec 100644
--- a/inc/main/classes/registry/sub/class_SubRegistry.php
+++ b/inc/main/classes/registry/sub/class_SubRegistry.php
@@ -53,4 +53,3 @@ class SubRegistry extends BaseRegistry implements Register {
 	}
 
 }
-// [EOF]
diff --git a/inc/main/classes/request/console/class_ConsoleRequest.php b/inc/main/classes/request/console/class_ConsoleRequest.php
index 86b6c3bc..dbd81edf 100644
--- a/inc/main/classes/request/console/class_ConsoleRequest.php
+++ b/inc/main/classes/request/console/class_ConsoleRequest.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Request;
+
 /**
  * A concrete request class
  *
@@ -157,7 +160,5 @@ class ConsoleRequest extends BaseRequest implements Requestable {
 		// Not support method
 		throw new UnsupportedOperationException(array($this, __FUNCTION__, $executorInstance), self::EXCEPTION_UNSPPORTED_OPERATION);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/request/html/class_HtmlRequest.php b/inc/main/classes/request/html/class_HtmlRequest.php
index f5ca6aa3..dd2c301a 100644
--- a/inc/main/classes/request/html/class_HtmlRequest.php
+++ b/inc/main/classes/request/html/class_HtmlRequest.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Request;
+
 /**
  * A concrete and secured HTML request class to make HTML requests more abstract
  *
@@ -141,7 +144,5 @@ class HtmlRequest extends BaseRequest implements Requestable {
 		// Return the value
 		return $cookieValue;
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/resolver/action/class_BaseActionResolver.php b/inc/main/classes/resolver/action/class_BaseActionResolver.php
index 0f5c5398..c20410d3 100644
--- a/inc/main/classes/resolver/action/class_BaseActionResolver.php
+++ b/inc/main/classes/resolver/action/class_BaseActionResolver.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Resolver\Action;
+
 /**
  * A generic action resolver class
  *
@@ -114,7 +117,5 @@ class BaseActionResolver extends BaseResolver {
 		// Return the result
 		return $actionInstance;
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/resolver/action/html/class_HtmlActionResolver.php b/inc/main/classes/resolver/action/html/class_HtmlActionResolver.php
index ce2c0d7a..9c9afc72 100644
--- a/inc/main/classes/resolver/action/html/class_HtmlActionResolver.php
+++ b/inc/main/classes/resolver/action/html/class_HtmlActionResolver.php
@@ -151,7 +151,5 @@ class HtmlActionResolver extends BaseActionResolver implements ActionResolver {
 		// Return the instance
 		return $actionInstance;
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/resolver/command/class_BaseCommandResolver.php b/inc/main/classes/resolver/command/class_BaseCommandResolver.php
index c89e656a..7bfa17a2 100644
--- a/inc/main/classes/resolver/command/class_BaseCommandResolver.php
+++ b/inc/main/classes/resolver/command/class_BaseCommandResolver.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Resolver\Controller;
+
 /**
  * A generic command resolver class
  *
@@ -174,7 +177,5 @@ class BaseCommandResolver extends BaseResolver {
 		// Return the result
 		return $isValid;
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/resolver/command/console/class_ConsoleCommandResolver.php b/inc/main/classes/resolver/command/console/class_ConsoleCommandResolver.php
index 0be18596..42ac4c75 100644
--- a/inc/main/classes/resolver/command/console/class_ConsoleCommandResolver.php
+++ b/inc/main/classes/resolver/command/console/class_ConsoleCommandResolver.php
@@ -69,7 +69,5 @@ class ConsoleCommandResolver extends BaseCommandResolver implements CommandResol
 		// Return the prepared instance
 		return $resolverInstance;
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/resolver/command/image/class_ImageCommandResolver.php b/inc/main/classes/resolver/command/image/class_ImageCommandResolver.php
index 54e19d5b..4a473b52 100644
--- a/inc/main/classes/resolver/command/image/class_ImageCommandResolver.php
+++ b/inc/main/classes/resolver/command/image/class_ImageCommandResolver.php
@@ -74,7 +74,5 @@ class ImageCommandResolver extends BaseCommandResolver implements CommandResolve
 		// Return the prepared instance
 		return $resolverInstance;
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/resolver/controller/class_BaseControllerResolver.php b/inc/main/classes/resolver/controller/class_BaseControllerResolver.php
index 2ec24e4c..3f973885 100644
--- a/inc/main/classes/resolver/controller/class_BaseControllerResolver.php
+++ b/inc/main/classes/resolver/controller/class_BaseControllerResolver.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Resolver\Controller;
+
 /**
  * A generic controller resolver class
  *
@@ -173,7 +176,5 @@ class BaseControllerResolver extends BaseResolver {
 		// Return the maybe resolved instance
 		return $controllerInstance;
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/resolver/controller/console/class_ConsoleControllerResolver.php b/inc/main/classes/resolver/controller/console/class_ConsoleControllerResolver.php
index 9795d89d..dd355433 100644
--- a/inc/main/classes/resolver/controller/console/class_ConsoleControllerResolver.php
+++ b/inc/main/classes/resolver/controller/console/class_ConsoleControllerResolver.php
@@ -72,7 +72,5 @@ class ConsoleControllerResolver extends BaseControllerResolver implements Contro
 		// Return the prepared instance
 		return $resolverInstance;
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/resolver/controller/html/class_HtmlControllerResolver.php b/inc/main/classes/resolver/controller/html/class_HtmlControllerResolver.php
index a90bb66b..8882dbdb 100644
--- a/inc/main/classes/resolver/controller/html/class_HtmlControllerResolver.php
+++ b/inc/main/classes/resolver/controller/html/class_HtmlControllerResolver.php
@@ -72,7 +72,5 @@ class HtmlControllerResolver extends BaseControllerResolver implements Controlle
 		// Return the prepared instance
 		return $resolverInstance;
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/resolver/controller/image/class_ImageControllerResolver.php b/inc/main/classes/resolver/controller/image/class_ImageControllerResolver.php
index 9855742b..7098713d 100644
--- a/inc/main/classes/resolver/controller/image/class_ImageControllerResolver.php
+++ b/inc/main/classes/resolver/controller/image/class_ImageControllerResolver.php
@@ -72,7 +72,5 @@ class ImageControllerResolver extends BaseControllerResolver implements Controll
 		// Return the prepared instance
 		return $resolverInstance;
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/response/console/class_ConsoleResponse.php b/inc/main/classes/response/console/class_ConsoleResponse.php
index 430959f9..f2ba710b 100644
--- a/inc/main/classes/response/console/class_ConsoleResponse.php
+++ b/inc/main/classes/response/console/class_ConsoleResponse.php
@@ -130,13 +130,10 @@ class ConsoleResponse extends BaseResponse implements Responseable {
 	 * @param	$force	Whether we shall force the output or abort if headers are
 	 *					already sent with an exception
 	 * @return	void
-	 * @throws	ResponseHeadersAlreadySentException		Thrown if headers are
-	 *													already sent
+	 * @throws	ResponseHeadersAlreadySentException		Thrown if headers are already sent
 	 */
 	public function flushBuffer ($force = FALSE) {
 		$this->partialStub('Please implement this class.');
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/response/html/class_HtmlResponse.php b/inc/main/classes/response/html/class_HtmlResponse.php
index 9cbcea86..b9f8a9d2 100644
--- a/inc/main/classes/response/html/class_HtmlResponse.php
+++ b/inc/main/classes/response/html/class_HtmlResponse.php
@@ -211,7 +211,5 @@ class HtmlResponse extends BaseResponse implements Responseable {
 			$this->addCookie($cookieName, $_COOKIE[$cookieName], FALSE);
 		} // END - if
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/response/image/class_ImageResponse.php b/inc/main/classes/response/image/class_ImageResponse.php
index 0b60bb47..c443769d 100644
--- a/inc/main/classes/response/image/class_ImageResponse.php
+++ b/inc/main/classes/response/image/class_ImageResponse.php
@@ -243,7 +243,5 @@ class ImageResponse extends BaseResponse implements Responseable {
 			$this->addCookie($cookieName, $_COOKIE[$cookieName], FALSE);
 		} // END - if
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/stacker/fifo/class_FiFoStacker.php b/inc/main/classes/stacker/fifo/class_FiFoStacker.php
index c00801c7..abfca196 100644
--- a/inc/main/classes/stacker/fifo/class_FiFoStacker.php
+++ b/inc/main/classes/stacker/fifo/class_FiFoStacker.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Stacker;
+
 /**
  * A FiFo Stacker class
  *
@@ -92,7 +95,5 @@ class FiFoStacker extends BaseStacker implements Stackable {
 		// Call the protected method
 		return parent::getFirstValue($stackerName);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/stacker/file/class_BaseFileStack.php b/inc/main/classes/stacker/file/class_BaseFileStack.php
index dc4a33a3..3d95972c 100644
--- a/inc/main/classes/stacker/file/class_BaseFileStack.php
+++ b/inc/main/classes/stacker/file/class_BaseFileStack.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Stack\File;
+
 /**
  * A general file-based stack class
  *
@@ -610,7 +613,5 @@ class BaseFileStack extends BaseStacker {
 			self::ARRAY_INDEX_DATA_LENGTH  => strlen($rawData)
 		);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/stacker/filo/class_FiLoStacker.php b/inc/main/classes/stacker/filo/class_FiLoStacker.php
index 8450ed43..f99a16b2 100644
--- a/inc/main/classes/stacker/filo/class_FiLoStacker.php
+++ b/inc/main/classes/stacker/filo/class_FiLoStacker.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Stacker;
+
 /**
  * A FiLo Stacker class
  *
@@ -92,7 +95,5 @@ class FiLoStacker extends BaseStacker implements Stackable {
 		// Call the protected method
 		return parent::getLastValue($stackerName);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/streams/crypto/class_McryptStream.php b/inc/main/classes/streams/crypto/class_McryptStream.php
index f39b4d05..2535f812 100644
--- a/inc/main/classes/streams/crypto/class_McryptStream.php
+++ b/inc/main/classes/streams/crypto/class_McryptStream.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Stream\Crypto;
+
 /**
  * A mcrypt-based encryption stream
  *
@@ -7,6 +10,7 @@
  * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
+ * @todo		mcrypt will become deprecated, rewrite to OpenSSL
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -169,7 +173,5 @@ class McryptStream extends BaseStream implements EncryptableStream {
 		self::createDebugInstance(__CLASS__)->debugOutput('Unhandled ' . strlen($data) . ' bytes in this stream.');
 		throw new UnsupportedOperationException(array($this, __FUNCTION__), self::EXCEPTION_UNSPPORTED_OPERATION);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/streams/crypto/class_NullCryptoStream.php b/inc/main/classes/streams/crypto/class_NullCryptoStream.php
index c42e6d1f..a2f33c2c 100644
--- a/inc/main/classes/streams/crypto/class_NullCryptoStream.php
+++ b/inc/main/classes/streams/crypto/class_NullCryptoStream.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Stream\Crypto;
+
 /**
  * A null-encryption stream does not encrypt anything but can be used if e.e.
  * mcrypt is not installed.
@@ -86,7 +89,5 @@ class NullCryptoStream extends BaseStream implements EncryptableStream {
 		self::createDebugInstance(__CLASS__)->debugOutput('Unhandled ' . strlen($data) . ' bytes in this stream.');
 		throw new UnsupportedOperationException(array($this, __FUNCTION__), self::EXCEPTION_UNSPPORTED_OPERATION);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/tasks/idle/class_IdleLoopTask.php b/inc/main/classes/tasks/idle/class_IdleLoopTask.php
index 9d1fa30a..186cbf0c 100644
--- a/inc/main/classes/tasks/idle/class_IdleLoopTask.php
+++ b/inc/main/classes/tasks/idle/class_IdleLoopTask.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Task\IdleLoop;
+
 /**
  * A IdleLoop task
  *
@@ -83,7 +86,5 @@ class IdleLoopTask extends BaseTask implements Taskable, Visitable {
 		// Debug message
 		self::createDebugInstance(__CLASS__)->debugOutput('TASK[' . __METHOD__ . ':' . __LINE__ . ']: Shutting down...');
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/template/console/class_ConsoleTemplateEngine.php b/inc/main/classes/template/console/class_ConsoleTemplateEngine.php
index 6fb2d813..2ac4006a 100644
--- a/inc/main/classes/template/console/class_ConsoleTemplateEngine.php
+++ b/inc/main/classes/template/console/class_ConsoleTemplateEngine.php
@@ -88,7 +88,5 @@ class ConsoleTemplateEngine extends BaseTemplateEngine implements CompileableTem
 		// Return the prepared instance
 		return $templateInstance;
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/template/html/class_HtmlTemplateEngine.php b/inc/main/classes/template/html/class_HtmlTemplateEngine.php
index 3f919856..01653334 100644
--- a/inc/main/classes/template/html/class_HtmlTemplateEngine.php
+++ b/inc/main/classes/template/html/class_HtmlTemplateEngine.php
@@ -88,7 +88,5 @@ class HtmlTemplateEngine extends BaseTemplateEngine implements CompileableTempla
 		// Return the prepared instance
 		return $templateInstance;
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/template/image/class_ImageTemplateEngine.php b/inc/main/classes/template/image/class_ImageTemplateEngine.php
index 92c8a5c6..ade54d13 100644
--- a/inc/main/classes/template/image/class_ImageTemplateEngine.php
+++ b/inc/main/classes/template/image/class_ImageTemplateEngine.php
@@ -505,7 +505,5 @@ class ImageTemplateEngine extends BaseTemplateEngine implements CompileableTempl
 		// Load the special template
 		$this->loadTemplate($template);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/template/mail/class_MailTemplateEngine.php b/inc/main/classes/template/mail/class_MailTemplateEngine.php
index 776c0016..adfeffbe 100644
--- a/inc/main/classes/template/mail/class_MailTemplateEngine.php
+++ b/inc/main/classes/template/mail/class_MailTemplateEngine.php
@@ -359,7 +359,5 @@ class MailTemplateEngine extends BaseTemplateEngine implements CompileableTempla
 	public function transferToResponse (Responseable $responseInstance) {
 		$responseInstance->writeToBody($this->getCompiledData());
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/template/menu/class_MenuTemplateEngine.php b/inc/main/classes/template/menu/class_MenuTemplateEngine.php
index 6e281e94..69d112d5 100644
--- a/inc/main/classes/template/menu/class_MenuTemplateEngine.php
+++ b/inc/main/classes/template/menu/class_MenuTemplateEngine.php
@@ -877,7 +877,5 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla
 		// Return it
 		return $fqfn;
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/user/guest/class_Guest.php b/inc/main/classes/user/guest/class_Guest.php
index fd68a9ba..eba42dac 100644
--- a/inc/main/classes/user/guest/class_Guest.php
+++ b/inc/main/classes/user/guest/class_Guest.php
@@ -138,7 +138,5 @@ class Guest extends BaseUser implements ManageableGuest, Registerable {
 	public function flushPendingUpdates () {
 		// No updates will be flushed to database!
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/user/member/class_Member.php b/inc/main/classes/user/member/class_Member.php
index c9c87956..6be88161 100644
--- a/inc/main/classes/user/member/class_Member.php
+++ b/inc/main/classes/user/member/class_Member.php
@@ -152,7 +152,5 @@ class Member extends BaseUser implements ManageableMember, Registerable {
 		// Remember the update in database result
 		$this->getResultInstance()->add2UpdateQueue($updateInstance);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/visitor/tasks/class_ActiveTaskVisitor.php b/inc/main/classes/visitor/tasks/class_ActiveTaskVisitor.php
index 7b9e04b1..7df391ab 100644
--- a/inc/main/classes/visitor/tasks/class_ActiveTaskVisitor.php
+++ b/inc/main/classes/visitor/tasks/class_ActiveTaskVisitor.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Visitor\Task\Active;
+
 /**
  * An ActiveTask visitor
  *
@@ -98,7 +101,5 @@ class ActiveTaskVisitor extends BaseVisitor implements TaskVisitor, PoolVisitor,
 		// A decorator itself can never become an active task so this method
 		// remains empty.
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/visitor/tasks/class_ShutdownTaskVisitor.php b/inc/main/classes/visitor/tasks/class_ShutdownTaskVisitor.php
index 239ae350..01d1b6b2 100644
--- a/inc/main/classes/visitor/tasks/class_ShutdownTaskVisitor.php
+++ b/inc/main/classes/visitor/tasks/class_ShutdownTaskVisitor.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Visitor\Task\Shutdown;
+
 /**
  * An ShutdownTask visitor
  *
@@ -91,7 +94,5 @@ class ShutdownTaskVisitor extends BaseVisitor implements TaskVisitor, PoolVisito
 		// Shutdown the decorator instance
 		$decoratorInstance->doShutdown();
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/actions/class_InvalidActionException.php b/inc/main/exceptions/actions/class_InvalidActionException.php
index 1a697a1d..36b67501 100644
--- a/inc/main/exceptions/actions/class_InvalidActionException.php
+++ b/inc/main/exceptions/actions/class_InvalidActionException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Action;
+
 /**
  * This exception is thrown when a requested action is invalid
  *
@@ -41,7 +44,5 @@ class InvalidActionException extends FrameworkException {
 		// Call parent contructor with message
 		parent::__construct($message, $code);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/auth/class_UserAuthorizationException.php b/inc/main/exceptions/auth/class_UserAuthorizationException.php
index a3dfcb7a..4c99d05e 100644
--- a/inc/main/exceptions/auth/class_UserAuthorizationException.php
+++ b/inc/main/exceptions/auth/class_UserAuthorizationException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\User\Auth;
+
 /**
  * An exception thrown when authorization of the user has failed
  *
@@ -40,7 +43,5 @@ class UserAuthorizationException extends FrameworkException {
 		// Call parent exception constructor
 		parent::__construct($message, $code);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/base64/class_Base64EncodingBadException.php b/inc/main/exceptions/base64/class_Base64EncodingBadException.php
index 959d2f56..f1b02f97 100644
--- a/inc/main/exceptions/base64/class_Base64EncodingBadException.php
+++ b/inc/main/exceptions/base64/class_Base64EncodingBadException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Deprecated;
+
 /**
  * Thrown if the given data contains characters that are not valid for
  * BASE64-encoding.
@@ -8,6 +11,7 @@
  * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
+ * @deprecated	Don't use this anymore
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -41,7 +45,5 @@ class Base64EncodingBadException extends FrameworkException {
 		// Call parent exception constructor
 		parent::__construct($message, $code);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/base64/class_Base64EncodingModuloException.php b/inc/main/exceptions/base64/class_Base64EncodingModuloException.php
index a8244edf..267112fd 100644
--- a/inc/main/exceptions/base64/class_Base64EncodingModuloException.php
+++ b/inc/main/exceptions/base64/class_Base64EncodingModuloException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Deprecated;
+
 /**
  * Thrown if modulo 4 of the length of the given data is not zero.
  *
@@ -7,6 +10,7 @@
  * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
+ * @deprecated	Don't use this anymore
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -41,7 +45,5 @@ class Base64EncodingModuloException extends FrameworkException {
 		// Call parent exception constructor
 		parent::__construct($message, $code);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/class_FrameworkException.php b/inc/main/exceptions/class_FrameworkException.php
index 93af8280..d5a6da4b 100644
--- a/inc/main/exceptions/class_FrameworkException.php
+++ b/inc/main/exceptions/class_FrameworkException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Generic;
+
 /**
  * A general abstract exception. You should not throw this even when you
  * remove the "abstract" key-word. Better you make your own exception and
@@ -201,7 +204,5 @@ abstract class FrameworkException extends ReflectionException {
 	public final function getExtraData () {
 		return $this->extraData;
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/compressor/class_MismatchingCompressorsException.php b/inc/main/exceptions/compressor/class_MismatchingCompressorsException.php
index 567cac57..f54b84e3 100644
--- a/inc/main/exceptions/compressor/class_MismatchingCompressorsException.php
+++ b/inc/main/exceptions/compressor/class_MismatchingCompressorsException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Compressor;
+
 /**
  * An exception thrown when compressors are mismatching
  *
@@ -7,6 +10,7 @@
  * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
+ * @todo		Rename to CompressorMismatchException
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -45,7 +49,5 @@ class MismatchingCompressorsException extends FrameworkException {
 		// Call parent constructor
 		parent::__construct($message, $code);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/config/class_ConfigEntryIsEmptyException.php b/inc/main/exceptions/config/class_ConfigEntryIsEmptyException.php
index 367d2d87..48f36e3a 100644
--- a/inc/main/exceptions/config/class_ConfigEntryIsEmptyException.php
+++ b/inc/main/exceptions/config/class_ConfigEntryIsEmptyException.php
@@ -42,7 +42,5 @@ class ConfigEntryIsEmptyException extends FrameworkException {
 		// Call parent constructor
 		parent::__construct($message, $code);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/config/class_ConfigValueTypeUnsupportedException.php b/inc/main/exceptions/config/class_ConfigValueTypeUnsupportedException.php
index fc7edbbe..c2c0fc13 100644
--- a/inc/main/exceptions/config/class_ConfigValueTypeUnsupportedException.php
+++ b/inc/main/exceptions/config/class_ConfigValueTypeUnsupportedException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Configuration;
+
 /**
  * Thrown when the value variable type is NULL, an array, an object or a
  * resource as these values shall not be set as configuration values. Please use
@@ -9,6 +12,7 @@
  * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.ship-simu.org
+ * @todo		These are invalid argument exceptions
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -43,7 +47,5 @@ class ConfigValueTypeUnsupportedException extends FrameworkException {
 		// Call parent exception constructor
 		parent::__construct($message, $code);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/config/class_NoConfigEntryException.php b/inc/main/exceptions/config/class_NoConfigEntryException.php
index 956f37cd..08c11033 100644
--- a/inc/main/exceptions/config/class_NoConfigEntryException.php
+++ b/inc/main/exceptions/config/class_NoConfigEntryException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Configuration;
+
 /**
  * An exception thrown when a configuration entry is not found
  *
@@ -44,7 +47,5 @@ class NoConfigEntryException extends FrameworkException {
 		// Call parent constructor
 		parent::__construct($message, $code);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/connection/class_ConnectionAlreadyRegisteredException.php b/inc/main/exceptions/connection/class_ConnectionAlreadyRegisteredException.php
index b6cc9ecc..8107c5f7 100644
--- a/inc/main/exceptions/connection/class_ConnectionAlreadyRegisteredException.php
+++ b/inc/main/exceptions/connection/class_ConnectionAlreadyRegisteredException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Connection;
+
 /**
  * This exception is thrown if the connection is already registered in a matching
  * connection registry.
@@ -40,7 +43,5 @@ class ConnectionAlreadyRegisteredException extends AbstractConnectionException {
 		// Call parent exception constructor
 		parent::__construct($message, $code);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/controller/class_DefaultControllerException.php b/inc/main/exceptions/controller/class_DefaultControllerException.php
index 54169f95..9c0dec20 100644
--- a/inc/main/exceptions/controller/class_DefaultControllerException.php
+++ b/inc/main/exceptions/controller/class_DefaultControllerException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Controller;
+
 /**
  * This exception is thrown when the default controller is missing
  *
@@ -43,7 +46,5 @@ class DefaultControllerException extends FrameworkException {
 		// Call parent contructor with message
 		parent::__construct($message, $code);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/controller/class_InvalidControllerException.php b/inc/main/exceptions/controller/class_InvalidControllerException.php
index 0a0a9951..af717228 100644
--- a/inc/main/exceptions/controller/class_InvalidControllerException.php
+++ b/inc/main/exceptions/controller/class_InvalidControllerException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Controller;
+
 /**
  * This exception is thrown when the default controller is missing
  *
@@ -44,7 +47,6 @@ class InvalidControllerException extends FrameworkException {
 		// Call parent contructor with message
 		parent::__construct($message, $code);
 	}
+
 }
 
-// [EOF]
-?>
diff --git a/inc/main/exceptions/crypto/class_EncryptInvalidLengthException.php b/inc/main/exceptions/crypto/class_EncryptInvalidLengthException.php
index af8435ce..29fc9b4b 100644
--- a/inc/main/exceptions/crypto/class_EncryptInvalidLengthException.php
+++ b/inc/main/exceptions/crypto/class_EncryptInvalidLengthException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Deprecated;
+
 /**
  * An exception thrown when the decrypted "encrypt" string has an invalid length
  *
@@ -7,6 +10,7 @@
  * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
+ * @deprecated	Don't use this anymore
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -46,7 +50,5 @@ class EncryptInvalidLengthException extends FrameworkException {
 		// Call parent exception constructor
 		parent::__construct($message, $code);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/crypto/class_EncryptMissingException.php b/inc/main/exceptions/crypto/class_EncryptMissingException.php
index b58c83bd..c83dd16f 100644
--- a/inc/main/exceptions/crypto/class_EncryptMissingException.php
+++ b/inc/main/exceptions/crypto/class_EncryptMissingException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Deprecated;
+
 /**
  * An exception thrown when the "encrypt" string is missing
  *
@@ -7,6 +10,7 @@
  * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
+ * @deprecated	Don't use this anymore
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -42,7 +46,5 @@ class EncryptMissingException extends FrameworkException {
 		// Call parent exception constructor
 		parent::__construct($message, $code);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/database/general/class_SqlException.php b/inc/main/exceptions/database/general/class_SqlException.php
index 47a9269b..05003dc2 100644
--- a/inc/main/exceptions/database/general/class_SqlException.php
+++ b/inc/main/exceptions/database/general/class_SqlException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Database\Sql;
+
 /**
  * A SQL exception thrown when an SQL error was detected.
  *
@@ -41,7 +44,5 @@ class SqlException extends DatabaseException {
 		// Call parent constructor
 		parent::__construct($message, $code);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/database/local_file/class_SavePathIsNoDirectoryException.php b/inc/main/exceptions/database/local_file/class_SavePathIsNoDirectoryException.php
index 14b2ebc9..3725cf7e 100644
--- a/inc/main/exceptions/database/local_file/class_SavePathIsNoDirectoryException.php
+++ b/inc/main/exceptions/database/local_file/class_SavePathIsNoDirectoryException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Deprecated;
+
 /**
  * An exception thrown when the save path is no directory
  *
@@ -7,6 +10,7 @@
  * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
+ * @deprecated	Don't use this
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -36,7 +40,5 @@ class SavePathIsNoDirectoryException extends DatabaseException {
 		// Call parent constructor
 		parent::__construct($message, $code);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/database/local_file/class_SavePathReadProtectedException.php b/inc/main/exceptions/database/local_file/class_SavePathReadProtectedException.php
index 6ef03825..a8db0666 100644
--- a/inc/main/exceptions/database/local_file/class_SavePathReadProtectedException.php
+++ b/inc/main/exceptions/database/local_file/class_SavePathReadProtectedException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Deprecated;
+
 /**
  * An exception thrown when the save path is read-protected
  *
@@ -7,6 +10,7 @@
  * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
+ * @deprecated	Please don't use this
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -36,7 +40,5 @@ class SavePathReadProtectedException extends DatabaseException {
 		// Call parent constructor
 		parent::__construct($message, $code);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/database/local_file/class_SavePathWriteProtectedException.php b/inc/main/exceptions/database/local_file/class_SavePathWriteProtectedException.php
index 2786d45e..4db309ea 100644
--- a/inc/main/exceptions/database/local_file/class_SavePathWriteProtectedException.php
+++ b/inc/main/exceptions/database/local_file/class_SavePathWriteProtectedException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Deprecated;
+
 /**
  * An exception thrown when the save path is write-protected
  *
@@ -7,6 +10,7 @@
  * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
+ * @deprecated	Please don't use this
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -36,7 +40,5 @@ class SavePathWriteProtectedException extends DatabaseException {
 		// Call parent constructor
 		parent::__construct($message, $code);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/feature/class_FeatureMethodNotCallableException.php b/inc/main/exceptions/feature/class_FeatureMethodNotCallableException.php
index 7f07ea95..b8f35d43 100644
--- a/inc/main/exceptions/feature/class_FeatureMethodNotCallableException.php
+++ b/inc/main/exceptions/feature/class_FeatureMethodNotCallableException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Feature;
+
 /**
  * Thrown if a given feature's method is not callable
  *
@@ -40,7 +43,5 @@ class FeatureMethodNotCallableException extends FrameworkException {
 		// Call parent exception constructor
 		parent::__construct($message, $code);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/file_directory/class_DirPointerNotOpenedException.php b/inc/main/exceptions/file_directory/class_DirPointerNotOpenedException.php
index 90ba80d4..a4590f4c 100644
--- a/inc/main/exceptions/file_directory/class_DirPointerNotOpenedException.php
+++ b/inc/main/exceptions/file_directory/class_DirPointerNotOpenedException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Filesystem;
+
 /**
  * An exception thrown when a directory pointer is not opended
  *
@@ -31,12 +34,10 @@ class DirPointerNotOpenedException extends FrameworkException {
 	 */
 	public function __construct ($path, $code) {
 		// Add a message around the missing class
-		$message = sprintf('F&uuml;r den Pfad %s konnte kein Pointer initialisiert werden.', $path);
+		$message = sprintf('No pointer could be initialized for path "%s".', $path);
 
 		// Call parent constructor
 		parent::__construct($message, $code);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/file_directory/class_FileIsEmptyException.php b/inc/main/exceptions/file_directory/class_FileIsEmptyException.php
index 50d0c301..7b3df236 100644
--- a/inc/main/exceptions/file_directory/class_FileIsEmptyException.php
+++ b/inc/main/exceptions/file_directory/class_FileIsEmptyException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Deprecated;
+
 /**
  * An exception thrown when a file name is empty or NULL.
  *
@@ -7,6 +10,7 @@
  * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
+ * @deprecated	Don't use this anymore
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -33,7 +37,5 @@ class FileIsEmptyException extends FrameworkException {
 		// Call parent constructor
 		parent::__construct('No file name provided.', $code);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/file_directory/class_FileWriteProtectedException.php b/inc/main/exceptions/file_directory/class_FileWriteProtectedException.php
index 15622a63..fd6ed107 100644
--- a/inc/main/exceptions/file_directory/class_FileWriteProtectedException.php
+++ b/inc/main/exceptions/file_directory/class_FileWriteProtectedException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Deprecated;
+
 /**
  * An exception thrown when a file could not be written.
  *
@@ -7,6 +10,7 @@
  * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
+ * @deprecated	Don't use this anymore
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -36,7 +40,5 @@ class FileWriteProtectedException extends FrameworkException {
 		// Call parent constructor
 		parent::__construct($message, $code);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/file_directory/class_InvalidDataLengthException.php b/inc/main/exceptions/file_directory/class_InvalidDataLengthException.php
index 8fedb73d..98745834 100644
--- a/inc/main/exceptions/file_directory/class_InvalidDataLengthException.php
+++ b/inc/main/exceptions/file_directory/class_InvalidDataLengthException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Deprecated;
+
 /**
  * An exception thrown when the length of the data mismatch
  *
@@ -7,6 +10,7 @@
  * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
+ * @deprecated	Don't use this anymore
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -41,7 +45,5 @@ class InvalidDataLengthException extends FrameworkException {
 		// Call parent constructor
 		parent::__construct($message, $code);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/filter/class_FilterChainException.php b/inc/main/exceptions/filter/class_FilterChainException.php
index 9797bb4e..801cd47d 100644
--- a/inc/main/exceptions/filter/class_FilterChainException.php
+++ b/inc/main/exceptions/filter/class_FilterChainException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Filter\Chain;
+
 /**
  * An exception thrown in a filter chain to stop processing further filters
  *
@@ -39,7 +42,5 @@ class FilterChainException extends FrameworkException {
 		// Call the parent exception
 		parent::__construct($message, $code);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/filter/class_InvalidFilterChainException.php b/inc/main/exceptions/filter/class_InvalidFilterChainException.php
index aab82806..c8b82621 100644
--- a/inc/main/exceptions/filter/class_InvalidFilterChainException.php
+++ b/inc/main/exceptions/filter/class_InvalidFilterChainException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Deprecated;
+
 /**
  * An exception thrown in a filter chain to stop processing further filters
  *
@@ -7,6 +10,7 @@
  * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
+ * @deprecated	Don't use this anymore
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -40,7 +44,5 @@ class InvalidFilterChainException extends FrameworkException {
 		// Call the parent exception
 		parent::__construct($message, $code);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/helper/class_FormClosedException.php b/inc/main/exceptions/helper/class_FormClosedException.php
index efa1157b..252af273 100644
--- a/inc/main/exceptions/helper/class_FormClosedException.php
+++ b/inc/main/exceptions/helper/class_FormClosedException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Deprecated;
+
 /**
  * An exception thrown when the form is still closed but input field shall be
  * added to it. This should normally not happen, but well, who knows?
@@ -8,6 +11,7 @@
  * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
+ * @deprecated	Don't use this anymore
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -41,7 +45,5 @@ class FormClosedException extends FrameworkException {
 		// Call parent constructor
 		parent::__construct($message, $code);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/helper/class_FormGroupClosedException.php b/inc/main/exceptions/helper/class_FormGroupClosedException.php
index 31e53c64..6290ef73 100644
--- a/inc/main/exceptions/helper/class_FormGroupClosedException.php
+++ b/inc/main/exceptions/helper/class_FormGroupClosedException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Deprecated;
+
 /**
  * An exception thrown when a form group is still closed.
  *
@@ -7,6 +10,7 @@
  * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
+ * @deprecated	Don't use this anymore
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -40,7 +44,5 @@ class FormGroupClosedException extends FrameworkException {
 		// Call parent constructor
 		parent::__construct($message, $code);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/helper/class_FormOpenedException.php b/inc/main/exceptions/helper/class_FormOpenedException.php
index 371a5007..2a85e871 100644
--- a/inc/main/exceptions/helper/class_FormOpenedException.php
+++ b/inc/main/exceptions/helper/class_FormOpenedException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Deprecated;
+
 /**
  * An exception thrown when the form is still opened but we e.g. shall flush
  * the content.
@@ -8,6 +11,7 @@
  * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
+ * @deprecated	Don't use this anymore
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -41,7 +45,5 @@ class FormOpenedException extends FrameworkException {
 		// Call parent constructor
 		parent::__construct($message, $code);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/helper/class_HelperGroupAlreadyCreatedException.php b/inc/main/exceptions/helper/class_HelperGroupAlreadyCreatedException.php
index 46d9e9f8..3e505503 100644
--- a/inc/main/exceptions/helper/class_HelperGroupAlreadyCreatedException.php
+++ b/inc/main/exceptions/helper/class_HelperGroupAlreadyCreatedException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Deprecated;
+
 /**
  * An exception thrown when a group was added twice
  *
@@ -7,6 +10,7 @@
  * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
+ * @deprecated	Don't use this anymore
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -40,7 +44,5 @@ class HelperGroupAlreadyCreatedException extends FrameworkException {
 		// Call parent constructor
 		parent::__construct($message, $code);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/helper/class_HelperNoPreviousOpenedSubGroupException.php b/inc/main/exceptions/helper/class_HelperNoPreviousOpenedSubGroupException.php
index 92057a94..242a1ede 100644
--- a/inc/main/exceptions/helper/class_HelperNoPreviousOpenedSubGroupException.php
+++ b/inc/main/exceptions/helper/class_HelperNoPreviousOpenedSubGroupException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Deprecated;
+
 /**
  * An exception thrown when no sub group was opened previously
  *
@@ -7,6 +10,7 @@
  * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
+ * @deprecated	Don't use this anymore
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -40,7 +44,5 @@ class HelperNoPreviousOpenedSubGroupException extends FrameworkException {
 		// Call parent constructor
 		parent::__construct($message, $code);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/helper/class_HelperSubGroupAlreadyCreatedException.php b/inc/main/exceptions/helper/class_HelperSubGroupAlreadyCreatedException.php
index eea9abbb..6fae8914 100644
--- a/inc/main/exceptions/helper/class_HelperSubGroupAlreadyCreatedException.php
+++ b/inc/main/exceptions/helper/class_HelperSubGroupAlreadyCreatedException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Deprecated;
+
 /**
  * An exception thrown when a sub group was added twice
  *
@@ -7,6 +10,7 @@
  * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
+ * @deprecated	Don't use this anymore
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -40,7 +44,5 @@ class HelperSubGroupAlreadyCreatedException extends FrameworkException {
 		// Call parent constructor
 		parent::__construct($message, $code);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/helper/class_InvalidFormNameException.php b/inc/main/exceptions/helper/class_InvalidFormNameException.php
index c2198f31..d995160a 100644
--- a/inc/main/exceptions/helper/class_InvalidFormNameException.php
+++ b/inc/main/exceptions/helper/class_InvalidFormNameException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Deprecated;
+
 /**
  * An exception thrown when the form name is invalid (set to FALSE)
  *
@@ -7,6 +10,7 @@
  * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
+ * @deprecated	Don't use this anymore
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -39,7 +43,5 @@ class InvalidFormNameException extends FrameworkException {
 		// Call parent constructor
 		parent::__construct($message, $code);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/helper/class_NoGroupOpenedException.php b/inc/main/exceptions/helper/class_NoGroupOpenedException.php
index 62adcc25..1350cd27 100644
--- a/inc/main/exceptions/helper/class_NoGroupOpenedException.php
+++ b/inc/main/exceptions/helper/class_NoGroupOpenedException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Deprecated;
+
 /**
  * An exception thrown when a group was not opened before
  *
@@ -7,6 +10,7 @@
  * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
+ * @deprecated	Don't use this anymore
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -40,7 +44,5 @@ class NoGroupOpenedException extends FrameworkException {
 		// Call parent constructor
 		parent::__construct($message, $code);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/helper/class_UserInstanceMissingException.php b/inc/main/exceptions/helper/class_UserInstanceMissingException.php
index cbfc2e54..530677b1 100644
--- a/inc/main/exceptions/helper/class_UserInstanceMissingException.php
+++ b/inc/main/exceptions/helper/class_UserInstanceMissingException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Deprecated;
+
 /**
  * An exception thrown when a user instance is invalid
  *
@@ -7,6 +10,7 @@
  * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
+ * @deprecated	Don't use this anymore
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -40,7 +44,5 @@ class UserInstanceMissingException extends FrameworkException {
 		// Call parent constructor
 		parent::__construct($message, $code);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/language/class_InvalidLanguagePathStringException.php b/inc/main/exceptions/language/class_InvalidLanguagePathStringException.php
index 512b3b3c..b67a3bf8 100644
--- a/inc/main/exceptions/language/class_InvalidLanguagePathStringException.php
+++ b/inc/main/exceptions/language/class_InvalidLanguagePathStringException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Deprecated;
+
 /**
  * An exception thrown when the language path string is invalid
  *
@@ -7,6 +10,7 @@
  * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
+ * @deprecated	Don't use this anymore
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -40,7 +44,5 @@ class InvalidLanguagePathStringException extends FrameworkException {
 		// Call parent constructor
 		parent::__construct($message, $code);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/language/class_LanguagePathIsNoDirectoryException.php b/inc/main/exceptions/language/class_LanguagePathIsNoDirectoryException.php
index e2aa6f96..49d08aa1 100644
--- a/inc/main/exceptions/language/class_LanguagePathIsNoDirectoryException.php
+++ b/inc/main/exceptions/language/class_LanguagePathIsNoDirectoryException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Deprecated;
+
 /**
  * An exception thrown when the language path is no directory
  *
@@ -7,6 +10,7 @@
  * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
+ * @todo		Don't use this anymore
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -40,7 +44,5 @@ class LanguagePathIsNoDirectoryException extends FrameworkException {
 		// Call parent constructor
 		parent::__construct($message, $code);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/language/class_LanguagePathReadProtectedException.php b/inc/main/exceptions/language/class_LanguagePathReadProtectedException.php
index 92c386fa..1a9df0ff 100644
--- a/inc/main/exceptions/language/class_LanguagePathReadProtectedException.php
+++ b/inc/main/exceptions/language/class_LanguagePathReadProtectedException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Deprecated;
+
 /**
  * An exception thrown when the language path is read-protected
  *
@@ -7,6 +10,7 @@
  * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
+ * @deprecated	Don't use this anymore
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -40,7 +44,5 @@ class LanguagePathReadProtectedException extends FrameworkException {
 		// Call parent constructor
 		parent::__construct($message, $code);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/result/class_InvalidDatabaseResultException.php b/inc/main/exceptions/result/class_InvalidDatabaseResultException.php
index 32b90211..31af593b 100644
--- a/inc/main/exceptions/result/class_InvalidDatabaseResultException.php
+++ b/inc/main/exceptions/result/class_InvalidDatabaseResultException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Database\Result;
+
 /**
  * An exception thrown if a database result does not contain expected entries
  *
@@ -40,7 +43,5 @@ class InvalidDatabaseResultException extends FrameworkException {
 		// Call parent exception constructor
 		parent::__construct($message, $code);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/result/class_ResultUpdateException.php b/inc/main/exceptions/result/class_ResultUpdateException.php
index e6b39e09..6028e7f1 100644
--- a/inc/main/exceptions/result/class_ResultUpdateException.php
+++ b/inc/main/exceptions/result/class_ResultUpdateException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Result;
+
 /**
  * An exception thrown if result was not updated.
  *
@@ -39,7 +42,5 @@ class ResultUpdateException extends FrameworkException {
 		// Call parent exception constructor
 		parent::__construct($message, $code);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/socket/class_AbstractSocketException.php b/inc/main/exceptions/socket/class_AbstractSocketException.php
index 29f7383c..f4d6ec70 100644
--- a/inc/main/exceptions/socket/class_AbstractSocketException.php
+++ b/inc/main/exceptions/socket/class_AbstractSocketException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Socket;
+
 /**
  * This exception is newer thrown, it bundles all socket exceptions together to
  * one abstract exception.
@@ -25,6 +28,3 @@
 abstract class AbstractSocketException extends FrameworkException {
 	// This abstract exception is currently kept empty
 }
-
-// [EOF]
-?>
diff --git a/inc/main/exceptions/socket/class_InvalidServerSocketException.php b/inc/main/exceptions/socket/class_InvalidServerSocketException.php
index 1e0b99cd..d99e9f10 100644
--- a/inc/main/exceptions/socket/class_InvalidServerSocketException.php
+++ b/inc/main/exceptions/socket/class_InvalidServerSocketException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Socket;
+
 /**
  * This exception is thrown when the socket resource is an invalid server socket.
  *
@@ -39,7 +42,5 @@ class InvalidServerSocketException extends AbstractSocketException {
 		// Call parent exception constructor
 		parent::__construct($message, $code);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/socket/class_InvalidSocketException.php b/inc/main/exceptions/socket/class_InvalidSocketException.php
index 77ad21c9..322b7c20 100644
--- a/inc/main/exceptions/socket/class_InvalidSocketException.php
+++ b/inc/main/exceptions/socket/class_InvalidSocketException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Socket;
+
 /**
  * This exception is thrown when the socket resource is invalid or an error
  * occurs while socket initialization phase.
@@ -57,7 +60,5 @@ class InvalidSocketException extends AbstractSocketException {
 		// Call parent exception constructor
 		parent::__construct($message, $code);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/socket/class_NoSocketErrorDetectedException.php b/inc/main/exceptions/socket/class_NoSocketErrorDetectedException.php
index 048c2f40..16eb3235 100644
--- a/inc/main/exceptions/socket/class_NoSocketErrorDetectedException.php
+++ b/inc/main/exceptions/socket/class_NoSocketErrorDetectedException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Socket;
+
 /**
  * This exception is thrown when socket_last_error() has returned zero value
  * which means no error. This should not happen unless someone called
@@ -9,6 +12,7 @@
  * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
+ * @todo		Those are logic exceptions and should be rewritten
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -41,7 +45,5 @@ class NoSocketErrorDetectedException extends AbstractSocketException {
 		// Call parent exception constructor
 		parent::__construct($message, $code);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/socket/class_NoSocketRegisteredException.php b/inc/main/exceptions/socket/class_NoSocketRegisteredException.php
index 7def65ec..41d18986 100644
--- a/inc/main/exceptions/socket/class_NoSocketRegisteredException.php
+++ b/inc/main/exceptions/socket/class_NoSocketRegisteredException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Socket;
+
 /**
  * This exception is thrown when the requested socket is not thrown
  *
@@ -38,7 +41,5 @@ class NoSocketRegisteredException extends AbstractSocketException {
 		// Call parent exception constructor
 		parent::__construct($message, $code);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/socket/class_SocketAlreadyRegisteredException.php b/inc/main/exceptions/socket/class_SocketAlreadyRegisteredException.php
index 090f006f..42f6fe5b 100644
--- a/inc/main/exceptions/socket/class_SocketAlreadyRegisteredException.php
+++ b/inc/main/exceptions/socket/class_SocketAlreadyRegisteredException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Deprecated;
+
 /**
  * This exception is thrown if the socket is already registered in a matching
  * socket registry.
@@ -8,6 +11,7 @@
  * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
+ * @deprecated	Don't use this anymore
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -40,7 +44,5 @@ class SocketAlreadyRegisteredException extends AbstractSocketException {
 		// Call parent exception constructor
 		parent::__construct($message, $code);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/socket/class_SocketBindingException.php b/inc/main/exceptions/socket/class_SocketBindingException.php
index bd565c5f..1a323ea2 100644
--- a/inc/main/exceptions/socket/class_SocketBindingException.php
+++ b/inc/main/exceptions/socket/class_SocketBindingException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Socket;
+
 /**
  *
  * @author		Roland Haeder <webmaster@shipsimu.org>
@@ -41,7 +44,5 @@ class SocketBindingException extends AbstractSocketException {
 		// Call parent exception constructor
 		parent::__construct($message, $code);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/socket/class_SocketConnectionException.php b/inc/main/exceptions/socket/class_SocketConnectionException.php
index 6924f7e2..39f5088e 100644
--- a/inc/main/exceptions/socket/class_SocketConnectionException.php
+++ b/inc/main/exceptions/socket/class_SocketConnectionException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Socket;
+
 /**
  * This exception is thrown when socket_connection() could not succeed. This
  * means a lot: the connection was refused by other peer (no open port; mostly
@@ -43,7 +46,5 @@ class SocketConnectionException extends AbstractSocketException {
 		// Call parent exception constructor
 		parent::__construct($message, $code);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/socket/class_SocketCreationException.php b/inc/main/exceptions/socket/class_SocketCreationException.php
index d6c40407..6fb6abd6 100644
--- a/inc/main/exceptions/socket/class_SocketCreationException.php
+++ b/inc/main/exceptions/socket/class_SocketCreationException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Socket;
+
 /**
  * This exception is thrown when socket_create() returns a variable with
  * non-resource type. This could mean you don't have propper permission to
@@ -43,7 +46,5 @@ class SocketCreationException extends AbstractSocketException {
 		// Call parent exception constructor
 		parent::__construct($message, $code);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/socket/class_SocketOptionException.php b/inc/main/exceptions/socket/class_SocketOptionException.php
index 6e18ba45..06024d3b 100644
--- a/inc/main/exceptions/socket/class_SocketOptionException.php
+++ b/inc/main/exceptions/socket/class_SocketOptionException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Socket;
+
 /**
  * This exception is thrown when an option could not be set on given socket
  * resource. This means that the socket could be (somehow) created but cannot
@@ -43,7 +46,5 @@ class SocketOptionException extends AbstractSocketException {
 		// Call parent exception constructor
 		parent::__construct($message, $code);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/socket/class_SocketShutdownException.php b/inc/main/exceptions/socket/class_SocketShutdownException.php
index 11122ff6..405ccb23 100644
--- a/inc/main/exceptions/socket/class_SocketShutdownException.php
+++ b/inc/main/exceptions/socket/class_SocketShutdownException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Socket;
+
 /**
  * This exception is thrown if the socket cannot be shut down is not error 107
  * which is "Transport endpoint not connected".
@@ -45,7 +48,5 @@ class SocketShutdownException extends AbstractSocketException {
 		// Call parent exception constructor
 		parent::__construct($message, $code);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/socket/class_UnsupportedSocketErrorHandlerException.php b/inc/main/exceptions/socket/class_UnsupportedSocketErrorHandlerException.php
index f6f6183a..21fa173e 100644
--- a/inc/main/exceptions/socket/class_UnsupportedSocketErrorHandlerException.php
+++ b/inc/main/exceptions/socket/class_UnsupportedSocketErrorHandlerException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Socket;
+
 /**
  * This exception is thrown when a socket error handler is not (yet)
  * implemented.
@@ -42,7 +45,5 @@ class UnsupportedSocketErrorHandlerException extends AbstractSocketException {
 		// Call parent exception constructor
 		parent::__construct($message, $code);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/stacker/class_AlreadyInitializedStackerException.php b/inc/main/exceptions/stacker/class_AlreadyInitializedStackerException.php
index 358db7de..57652863 100644
--- a/inc/main/exceptions/stacker/class_AlreadyInitializedStackerException.php
+++ b/inc/main/exceptions/stacker/class_AlreadyInitializedStackerException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Deprecated;
+
 /**
  * Thrown if a stacker is already initialized
  *
@@ -41,7 +44,5 @@ class AlreadyInitializedStackerException extends FrameworkException {
 		// Call parent exception constructor
 		parent::__construct($message, $code);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/stacker/class_EmptyStackerException.php b/inc/main/exceptions/stacker/class_EmptyStackerException.php
index 014eace1..804ad6c4 100644
--- a/inc/main/exceptions/stacker/class_EmptyStackerException.php
+++ b/inc/main/exceptions/stacker/class_EmptyStackerException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Deprecated;
+
 /**
  * Thrown if a stacker is empty
  *
@@ -7,6 +10,7 @@
  * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
+ * @deprecated	Don't use this anymore
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -40,7 +44,5 @@ class EmptyStackerException extends FrameworkException {
 		// Call parent exception constructor
 		parent::__construct($message, $code);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/stacker/class_FullStackerException.php b/inc/main/exceptions/stacker/class_FullStackerException.php
index 5a942abb..7733dc63 100644
--- a/inc/main/exceptions/stacker/class_FullStackerException.php
+++ b/inc/main/exceptions/stacker/class_FullStackerException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Deprecated;
+
 /**
  * Thrown if a stacker is full
  *
@@ -40,7 +43,5 @@ class FullStackerException extends FrameworkException {
 		// Call parent exception constructor
 		parent::__construct($message, $code);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/stacker/class_NoStackerException.php b/inc/main/exceptions/stacker/class_NoStackerException.php
index 63b22a19..e69801f2 100644
--- a/inc/main/exceptions/stacker/class_NoStackerException.php
+++ b/inc/main/exceptions/stacker/class_NoStackerException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Deprecated;
+
 /**
  * Thrown if a stacker is empty
  *
@@ -40,7 +43,5 @@ class NoStackerException extends FrameworkException {
 		// Call parent exception constructor
 		parent::__construct($message, $code);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/state/class_InvalidStateInstanceException.php b/inc/main/exceptions/state/class_InvalidStateInstanceException.php
index 9aef5b8c..08815bb1 100644
--- a/inc/main/exceptions/state/class_InvalidStateInstanceException.php
+++ b/inc/main/exceptions/state/class_InvalidStateInstanceException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\State;
+
 /**
  * This exception is thrown when a state instance is invalid
  *
@@ -41,7 +44,5 @@ class InvalidStateInstanceException extends FrameworkException {
 		// Call parent constructor
 		parent::__construct($message, $code);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/state/class_UnexpectedStateException.php b/inc/main/exceptions/state/class_UnexpectedStateException.php
index 09d07815..9996702e 100644
--- a/inc/main/exceptions/state/class_UnexpectedStateException.php
+++ b/inc/main/exceptions/state/class_UnexpectedStateException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\State;
+
 /**
  * This exception is thrown when an unexpected state is detected.
  *
@@ -39,7 +42,5 @@ class UnexpectedStateException extends FrameworkException {
 		// Call parent exception constructor
 		parent::__construct($message, $code);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/state/class_UnresolveableStateException.php b/inc/main/exceptions/state/class_UnresolveableStateException.php
index 0e7aaeac..1b4973fe 100644
--- a/inc/main/exceptions/state/class_UnresolveableStateException.php
+++ b/inc/main/exceptions/state/class_UnresolveableStateException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\State;
+
 /**
  * This exception is thrown when the default state is missing
  *
@@ -44,7 +47,5 @@ class UnresolveableStateException extends FrameworkException {
 		// Call parent contructor with message
 		parent::__construct($message, $code);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/template/class_BasePathIsNoDirectoryException.php b/inc/main/exceptions/template/class_BasePathIsNoDirectoryException.php
index 61958c58..0fba91a9 100644
--- a/inc/main/exceptions/template/class_BasePathIsNoDirectoryException.php
+++ b/inc/main/exceptions/template/class_BasePathIsNoDirectoryException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Deprecated;
+
 /**
  * An exception thrown when the base path is no directory
  *
@@ -7,6 +10,7 @@
  * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
+ * @deprecated	Don't use this anymore
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -40,7 +44,5 @@ class BasePathIsNoDirectoryException extends FrameworkException {
 		// Call parent constructor
 		parent::__construct($message, $code);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/template/class_BasePathReadProtectedException.php b/inc/main/exceptions/template/class_BasePathReadProtectedException.php
index 3939ea90..ab8e0649 100644
--- a/inc/main/exceptions/template/class_BasePathReadProtectedException.php
+++ b/inc/main/exceptions/template/class_BasePathReadProtectedException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Deprecated;
+
 /**
  * An exception thrown when the base path is read-protected
  *
@@ -7,6 +10,7 @@
  * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
+ * @deprecated	Don't use this anymore
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -40,7 +44,5 @@ class BasePathReadProtectedException extends FrameworkException {
 		// Call parent constructor
 		parent::__construct($message, $code);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/template/class_InvalidBasePathStringException.php b/inc/main/exceptions/template/class_InvalidBasePathStringException.php
index 3f9f8ed6..5c89c088 100644
--- a/inc/main/exceptions/template/class_InvalidBasePathStringException.php
+++ b/inc/main/exceptions/template/class_InvalidBasePathStringException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Deprecated;
+
 /**
  * An exception thrown hen the base path string is invalid
  *
@@ -7,6 +10,7 @@
  * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
+ * @deprecated	Don't use this anymore
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -40,7 +44,5 @@ class InvalidBasePathStringException extends FrameworkException {
 		// Call parent constructor
 		parent::__construct($message, $code);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/template/class_NoVariableException.php b/inc/main/exceptions/template/class_NoVariableException.php
index 288a1b1b..ed352301 100644
--- a/inc/main/exceptions/template/class_NoVariableException.php
+++ b/inc/main/exceptions/template/class_NoVariableException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Deprecated;
+
 /**
  * An exception thrown when a variable is not set but should be.
  *
@@ -7,6 +10,7 @@
  * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
+ * @deprecated	Don't use this anymore
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -41,7 +45,5 @@ class NoVariableException extends FrameworkException {
 		// Call parent constructor
 		parent::__construct($message, $code);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/template/class_UnexpectedTemplateTypeException.php b/inc/main/exceptions/template/class_UnexpectedTemplateTypeException.php
index 1b2aa3cd..5f79b0bb 100644
--- a/inc/main/exceptions/template/class_UnexpectedTemplateTypeException.php
+++ b/inc/main/exceptions/template/class_UnexpectedTemplateTypeException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Deprecated;
+
 /**
  * An exception thrown when the template type is not supported
  *
@@ -7,6 +10,7 @@
  * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
+ * @deprecated	Don't use this anymore
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -41,7 +45,5 @@ class UnexpectedTemplateTypeException extends FrameworkException {
 		// Call parent constructor
 		parent::__construct($message, $code);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/xml/class_InvalidXmlNodeException.php b/inc/main/exceptions/xml/class_InvalidXmlNodeException.php
index 51e8d31c..9d94951a 100644
--- a/inc/main/exceptions/xml/class_InvalidXmlNodeException.php
+++ b/inc/main/exceptions/xml/class_InvalidXmlNodeException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Xml;
+
 /**
  * An exception thrown when an XML parser error was detected
  *
@@ -47,7 +50,5 @@ class InvalidXmlNodeException extends FrameworkException {
 		// Call parent exception constructor
 		parent::__construct($message, $code);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/xml/class_XmlNodeMismatchException.php b/inc/main/exceptions/xml/class_XmlNodeMismatchException.php
index 9ac8fa81..51c21164 100644
--- a/inc/main/exceptions/xml/class_XmlNodeMismatchException.php
+++ b/inc/main/exceptions/xml/class_XmlNodeMismatchException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Xml;
+
 /**
  * An exception thrown when an XML node does not match the excepted
  *
@@ -41,7 +44,5 @@ class XmlNodeMismatchException extends FrameworkException {
 		// Call parent exception constructor
 		parent::__construct($message, $code);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/xml/class_XmlParserException.php b/inc/main/exceptions/xml/class_XmlParserException.php
index 717b68f5..548b7670 100644
--- a/inc/main/exceptions/xml/class_XmlParserException.php
+++ b/inc/main/exceptions/xml/class_XmlParserException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Parser\Xml;
+
 /**
  * An exception thrown when an XML parser error was detected
  *
@@ -41,7 +44,5 @@ class XmlParserException extends FrameworkException {
 		// Call parent exception constructor
 		parent::__construct($message, $code);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/interfaces/actions/commands/class_Commandable.php b/inc/main/interfaces/actions/commands/class_Commandable.php
index 11f40bbd..ea636ff6 100644
--- a/inc/main/interfaces/actions/commands/class_Commandable.php
+++ b/inc/main/interfaces/actions/commands/class_Commandable.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Command;
+
 /**
  * An interface for commands for the front controller
  *
@@ -30,7 +33,5 @@ interface Commandable extends PerformableAction {
 	 * @return	void
 	 */
 	function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance);
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/interfaces/block/calculatable/class_CalculatableBlock.php b/inc/main/interfaces/block/calculatable/class_CalculatableBlock.php
index c2553f3f..2277bdff 100644
--- a/inc/main/interfaces/block/calculatable/class_CalculatableBlock.php
+++ b/inc/main/interfaces/block/calculatable/class_CalculatableBlock.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Filesystem\Block;
+
 /**
  * A CalculatableBlock interface
  *
@@ -28,7 +31,5 @@ interface CalculatableBlock extends Block {
 	 * @return	$length		Minimum length for one entry/block
 	 */
 	function calculateMinimumBlockLength ();
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/interfaces/criteria/extended/class_LocalSearchCriteria.php b/inc/main/interfaces/criteria/extended/class_LocalSearchCriteria.php
index 48cbc203..0e7c43ee 100644
--- a/inc/main/interfaces/criteria/extended/class_LocalSearchCriteria.php
+++ b/inc/main/interfaces/criteria/extended/class_LocalSearchCriteria.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Criteria\Local;
+
 /**
  * An interface for local criterias
  *
@@ -72,7 +75,5 @@ interface LocalSearchCriteria extends Criteria {
 	 * @return	$isMatching		Whether the key/value is matching or excluded
 	 */
 	function isCriteriaMatching ($key, $value, $separator = ',');
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/interfaces/criteria/extended/class_LocalUpdateCriteria.php b/inc/main/interfaces/criteria/extended/class_LocalUpdateCriteria.php
index 7c3f13e3..7ae53d89 100644
--- a/inc/main/interfaces/criteria/extended/class_LocalUpdateCriteria.php
+++ b/inc/main/interfaces/criteria/extended/class_LocalUpdateCriteria.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Criteria\Local;
+
 /**
  * An interface for local criterias
  *
@@ -22,7 +25,5 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 interface LocalUpdateCriteria extends Criteria {
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/interfaces/criteria/extended/class_StoreableCriteria.php b/inc/main/interfaces/criteria/extended/class_StoreableCriteria.php
index 9612582d..07fa5573 100644
--- a/inc/main/interfaces/criteria/extended/class_StoreableCriteria.php
+++ b/inc/main/interfaces/criteria/extended/class_StoreableCriteria.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Criteria;
+
 /**
  * An interface for storeable data sets
  *
@@ -88,7 +91,5 @@ interface StoreableCriteria extends Criteria {
 	 * @return	$primaryKeys	Primary key array
 	 */
 	function getPrimaryKeys ();
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/interfaces/database/backend/class_DatabaseBackend.php b/inc/main/interfaces/database/backend/class_DatabaseBackend.php
index 503ef0f9..62e116ca 100644
--- a/inc/main/interfaces/database/backend/class_DatabaseBackend.php
+++ b/inc/main/interfaces/database/backend/class_DatabaseBackend.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Database\Backend;
+
 /**
  * An interface for front-end database classes. The classes should prepare the
  * objects for saving in the database. So for server-bases database classes SQL
@@ -117,7 +120,5 @@ interface DatabaseBackend extends FrameworkDatabase {
 	 * @return	$count		Total rows of given table
 	 */
 	function countTotalRows($tableName);
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/interfaces/database/middleware/class_DatabaseConnector.php b/inc/main/interfaces/database/middleware/class_DatabaseConnector.php
index 02f81d3e..b6afce68 100644
--- a/inc/main/interfaces/database/middleware/class_DatabaseConnector.php
+++ b/inc/main/interfaces/database/middleware/class_DatabaseConnector.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Connector\Database;
+
 /**
  * An interface for middleware database classes
  *
@@ -117,7 +120,5 @@ interface DatabaseConnector extends FrameworkDatabase {
 	 * @return	$count		Total rows of given table
 	 */
 	function countTotalRows($tableName);
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/interfaces/database/wrapper/class_BookablePointsWrapper.php b/inc/main/interfaces/database/wrapper/class_BookablePointsWrapper.php
index 9d2c7d98..939d6e83 100644
--- a/inc/main/interfaces/database/wrapper/class_BookablePointsWrapper.php
+++ b/inc/main/interfaces/database/wrapper/class_BookablePointsWrapper.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Database\Wrapper;
+
 /**
  * An interface for wrapper dealing with bookable points
  *
@@ -37,7 +40,5 @@ interface BookablePointsWrapper extends DatabaseWrapper {
 	 * @return	void
 	 */
 	function doUpdateByResult (UpdateableResult $resultInstance);
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/interfaces/handler/class_HandleableDataSet.php b/inc/main/interfaces/handler/class_HandleableDataSet.php
index a848850c..f93933b4 100644
--- a/inc/main/interfaces/handler/class_HandleableDataSet.php
+++ b/inc/main/interfaces/handler/class_HandleableDataSet.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Handler\DataSet;
+
 /**
  * An interface for data set handlers
  *
@@ -30,7 +33,5 @@ interface HandleableDataSet extends Handleable {
 	 * @return	void
 	 */
 	function addArrayToDataSet (StoreableCriteria $dataSetInstance, array $messageData);
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/interfaces/handler/protocol/class_HandleableProtocol.php b/inc/main/interfaces/handler/protocol/class_HandleableProtocol.php
index 982401ac..1ffbc043 100644
--- a/inc/main/interfaces/handler/protocol/class_HandleableProtocol.php
+++ b/inc/main/interfaces/handler/protocol/class_HandleableProtocol.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Handler\Protocol;
+
 /**
  * An interface for protocol handlers
  *
@@ -52,7 +55,5 @@ interface HandleableProtocol extends Handleable {
 	 * @return	$ifMatches	Whether the found UNL matches own addresss
 	 */
 	function isOwnAddress ($unl);
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/interfaces/handler/task/class_HandleableTask.php b/inc/main/interfaces/handler/task/class_HandleableTask.php
index aa1df892..0bdc518b 100644
--- a/inc/main/interfaces/handler/task/class_HandleableTask.php
+++ b/inc/main/interfaces/handler/task/class_HandleableTask.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Handler\Task;
+
 /**
  * A HandleableTask interface
  *
@@ -64,7 +67,5 @@ interface HandleableTask extends HandleableDataSet {
 	 * @return	void
 	 */
 	function doShutdown ();
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/interfaces/helper/login/class_HelpableLogin.php b/inc/main/interfaces/helper/login/class_HelpableLogin.php
index 27aa8603..948267d8 100644
--- a/inc/main/interfaces/helper/login/class_HelpableLogin.php
+++ b/inc/main/interfaces/helper/login/class_HelpableLogin.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Helper\Login;
+
 /**
  * A helper interface for logins
  *
@@ -30,7 +33,5 @@ interface HelpableLogin extends Helper {
 	 * @return	void
 	 */
 	function executeLogin (Responseable $responseInstance);
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/interfaces/helper/template/class_HelpableTemplate.php b/inc/main/interfaces/helper/template/class_HelpableTemplate.php
index 638acda5..24c04436 100644
--- a/inc/main/interfaces/helper/template/class_HelpableTemplate.php
+++ b/inc/main/interfaces/helper/template/class_HelpableTemplate.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Helper\Template;
+
 /**
  * A helper interface for template helper ;)
  *
@@ -28,7 +31,5 @@ interface HelpableTemplate extends Helper {
 	 * @return	void
 	 */
 	function flushContent ();
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/interfaces/index/stack/class_IndexableStack.php b/inc/main/interfaces/index/stack/class_IndexableStack.php
index 2d37ff55..8ed6b26d 100644
--- a/inc/main/interfaces/index/stack/class_IndexableStack.php
+++ b/inc/main/interfaces/index/stack/class_IndexableStack.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Stack\Index;
+
 /**
  * An interface for Indexable stack classes
  *
@@ -30,7 +33,5 @@ interface IndexableStack extends Indexable, CalculatableBlock {
 	 * @return	void
 	 */
 	function addHashToIndex ($stackName, array $data);
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/interfaces/io/class_StreamableInput.php b/inc/main/interfaces/io/class_StreamableInput.php
index 2b9b2cdb..0207ef9c 100644
--- a/inc/main/interfaces/io/class_StreamableInput.php
+++ b/inc/main/interfaces/io/class_StreamableInput.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Stream\Input;
+
 /**
  * An interface for input streams
  *
@@ -22,7 +25,5 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 interface StreamableInput extends Streamable {
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/interfaces/io/class_StreamableOutput.php b/inc/main/interfaces/io/class_StreamableOutput.php
index 5b6e0ae4..846b5a71 100644
--- a/inc/main/interfaces/io/class_StreamableOutput.php
+++ b/inc/main/interfaces/io/class_StreamableOutput.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Stream\Output;
+
 /**
  * An interface for output streams
  *
@@ -22,7 +25,5 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 interface StreamableOutput extends Streamable {
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/interfaces/io/file/class_FileInputStreamer.php b/inc/main/interfaces/io/file/class_FileInputStreamer.php
index d1b43927..e9359b03 100644
--- a/inc/main/interfaces/io/file/class_FileInputStreamer.php
+++ b/inc/main/interfaces/io/file/class_FileInputStreamer.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Filesystem\Stream;
+
 /**
  * An interface for file input operations.
  *
@@ -31,7 +34,5 @@ interface FileInputStreamer extends StreamableInput {
 	 * @throws	InvalidMD5ChecksumException	If two MD5 hashes did not match
 	 */
 	function loadFileContents ($fqfn);
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/interfaces/io/file/class_FileOutputStreamer.php b/inc/main/interfaces/io/file/class_FileOutputStreamer.php
index 64b43e1e..f8d607f3 100644
--- a/inc/main/interfaces/io/file/class_FileOutputStreamer.php
+++ b/inc/main/interfaces/io/file/class_FileOutputStreamer.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Filesystem\Stream;
+
 /**
  * An interface for file output operations.
  *
@@ -31,7 +34,5 @@ interface FileOutputStreamer extends StreamableOutput {
 	 * @return	void
 	 */
 	function saveFile ($fileName, array $dataArray);
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/interfaces/io/file/csv/class_CsvInputStreamer.php b/inc/main/interfaces/io/file/csv/class_CsvInputStreamer.php
index c6ad1463..3862d788 100644
--- a/inc/main/interfaces/io/file/csv/class_CsvInputStreamer.php
+++ b/inc/main/interfaces/io/file/csv/class_CsvInputStreamer.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Stream\Filesystem;
+
 /**
  * An interface for CSV file input operations.
  *
@@ -29,7 +32,5 @@ interface CsvInputStreamer extends FileInputStreamer {
 	 * @return	$lineArray			An index array with the read line
 	 */
 	function readCsvFileLine ($columnSeparator);
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/interfaces/io/output/class_OutputStreamer.php b/inc/main/interfaces/io/output/class_OutputStreamer.php
index a4ddb8b8..ef29a35c 100644
--- a/inc/main/interfaces/io/output/class_OutputStreamer.php
+++ b/inc/main/interfaces/io/output/class_OutputStreamer.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Stream\Output;
+
 /**
  * An interface for output streams
  *
@@ -30,7 +33,5 @@ interface OutputStreamer extends StreamableOutput {
 	 * @return	void
 	 */
 	function output ($outStream = FALSE, $stripTags = FALSE);
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/interfaces/io/pointer/class_InputPointer.php b/inc/main/interfaces/io/pointer/class_InputPointer.php
index f38b9e4f..837f8ceb 100644
--- a/inc/main/interfaces/io/pointer/class_InputPointer.php
+++ b/inc/main/interfaces/io/pointer/class_InputPointer.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Filesystem\Pointer;
+
 /**
  * An interface for (mostly) file input pointers.
  *
@@ -46,7 +49,5 @@ interface InputPointer extends StreamableInput, FilePointer {
 	 * @throws	InvalidResourceException	If there is being set
 	 */
 	function read ($bytes = NULL);
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/interfaces/io/pointer/class_OutputPointer.php b/inc/main/interfaces/io/pointer/class_OutputPointer.php
index 583e1f0a..edb3c4ad 100644
--- a/inc/main/interfaces/io/pointer/class_OutputPointer.php
+++ b/inc/main/interfaces/io/pointer/class_OutputPointer.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Filesystem\Pointer;
+
 /**
  * An interface for (mostly) file output pointers.
  *
@@ -42,7 +45,5 @@ interface OutputPointer extends StreamableOutput, FilePointer {
 	 * @return	mixed			Number of writes bytes or FALSE on error
 	 */
 	function writeAtPosition ($seedPosition, $data);
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/interfaces/io/pointer/io/class_InputOutputPointer.php b/inc/main/interfaces/io/pointer/io/class_InputOutputPointer.php
index 3919d0e0..95c35166 100644
--- a/inc/main/interfaces/io/pointer/io/class_InputOutputPointer.php
+++ b/inc/main/interfaces/io/pointer/io/class_InputOutputPointer.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Filesystem\Pointer;
+
 /**
  * An interface for (mostly) file input/output pointers.
  *
@@ -50,7 +53,5 @@ interface InputOutputPointer extends InputPointer, OutputPointer {
 	 * @return	$key	Current key in iteration
 	 */
 	function key ();
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/interfaces/iterator/class_SeekableWritableFileIterator.php b/inc/main/interfaces/iterator/class_SeekableWritableFileIterator.php
index c81fc141..205fa995 100644
--- a/inc/main/interfaces/iterator/class_SeekableWritableFileIterator.php
+++ b/inc/main/interfaces/iterator/class_SeekableWritableFileIterator.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Iterator\Filesystem;
+
 /**
  * An interface for seekable iterators which also allow to write to the file
  * in different ways.
@@ -182,7 +185,5 @@ interface SeekableWritableFileIterator extends SeekableIterator {
 	 * @return	$seekPosition	Found next gap's seek position
 	 */
 	function searchNextGap ($length);
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/interfaces/points/class_BookablePoints.php b/inc/main/interfaces/points/class_BookablePoints.php
index ea7aa9be..e848b8e5 100644
--- a/inc/main/interfaces/points/class_BookablePoints.php
+++ b/inc/main/interfaces/points/class_BookablePoints.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\User\Points;
+
 /**
  * An interface for bookable points
  *
@@ -37,7 +40,5 @@ interface BookablePoints extends AddableCriteria {
 	 * @return	void
 	 */
 	function bookPointsDirectly ($amount);
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/interfaces/registration/class_UserRegister.php b/inc/main/interfaces/registration/class_UserRegister.php
index 5fce140d..6ebfe562 100644
--- a/inc/main/interfaces/registration/class_UserRegister.php
+++ b/inc/main/interfaces/registration/class_UserRegister.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\User\Registration;
+
 /**
  * A class for user registration
  *
@@ -62,7 +65,5 @@ interface UserRegister extends AddableCriteria {
 	 * @return	void
 	 */
 	function doPostAction ();
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/interfaces/resolver/actions/class_ActionResolver.php b/inc/main/interfaces/resolver/actions/class_ActionResolver.php
index 5ebd8b0c..321a3d20 100644
--- a/inc/main/interfaces/resolver/actions/class_ActionResolver.php
+++ b/inc/main/interfaces/resolver/actions/class_ActionResolver.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Resolver\Action;
+
 /**
  * An instance for action resolver classes
  *
@@ -45,7 +48,5 @@ interface ActionResolver extends Resolver {
 	 * @throws	EmptyVariableException	Thrown if given action is not set
 	 */
 	function isActionValid ($actionName);
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/interfaces/resolver/commands/class_CommandResolver.php b/inc/main/interfaces/resolver/commands/class_CommandResolver.php
index 71e440b6..26750caf 100644
--- a/inc/main/interfaces/resolver/commands/class_CommandResolver.php
+++ b/inc/main/interfaces/resolver/commands/class_CommandResolver.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Resolver\Command;
+
 /**
  * An instance for command resolver classes
  *
@@ -38,7 +41,5 @@ interface CommandResolver extends Resolver {
 	 * @throws	EmptyVariableException	Thrown if given command is not set
 	 */
 	function isCommandValid ($commandName);
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/interfaces/resolver/controller/class_ControllerResolver.php b/inc/main/interfaces/resolver/controller/class_ControllerResolver.php
index 9b80fc56..1bf389a6 100644
--- a/inc/main/interfaces/resolver/controller/class_ControllerResolver.php
+++ b/inc/main/interfaces/resolver/controller/class_ControllerResolver.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Resolver\Controller;
+
 /**
  * An instance for controller resolver classes
  *
@@ -28,7 +31,5 @@ interface ControllerResolver extends Resolver {
 	 * @return	$controllerInstance		A controller instance for the default command
 	 */
 	 function resolveController ();
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/interfaces/resolver/state/class_StateResolver.php b/inc/main/interfaces/resolver/state/class_StateResolver.php
index a48d1d6f..be7657ea 100644
--- a/inc/main/interfaces/resolver/state/class_StateResolver.php
+++ b/inc/main/interfaces/resolver/state/class_StateResolver.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Resolver\State;
+
 /**
  * An instance for state resolver classes
  *
@@ -40,7 +43,5 @@ interface StateResolver extends Resolver {
 	 * @throws	EmptyVariableException	Thrown if given state is not set
 	 */
 	function isStateValid ($stateName);
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/interfaces/result/class_UpdateableResult.php b/inc/main/interfaces/result/class_UpdateableResult.php
index d67d967b..22a19c39 100644
--- a/inc/main/interfaces/result/class_UpdateableResult.php
+++ b/inc/main/interfaces/result/class_UpdateableResult.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Result;
+
 /**
  * An interface for searchable results
  *
@@ -31,7 +34,5 @@ interface UpdateableResult extends AddableCriteria {
 	 * @throws	ResultUpdateException	If no result was updated
 	 */
 	function add2UpdateQueue (LocalUpdateCriteria $criteriaInstance);
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/interfaces/stacker/file/class_StackableFile.php b/inc/main/interfaces/stacker/file/class_StackableFile.php
index 3ecf2708..b05019a5 100644
--- a/inc/main/interfaces/stacker/file/class_StackableFile.php
+++ b/inc/main/interfaces/stacker/file/class_StackableFile.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Filesystem\Stack;
+
 /**
  * A Stackable file interface
  *
@@ -36,7 +39,5 @@ interface StackableFile extends Stackable {
 	 * @return	$size	Size (in bytes) of file
 	 */
 	function size ();
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/interfaces/streams/crypto/class_EncryptableStream.php b/inc/main/interfaces/streams/crypto/class_EncryptableStream.php
index 0c00dfdd..c8849660 100644
--- a/inc/main/interfaces/streams/crypto/class_EncryptableStream.php
+++ b/inc/main/interfaces/streams/crypto/class_EncryptableStream.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Stream\Crypto;
+
 /**
  * An EncryptableStream interface
  *
@@ -38,7 +41,5 @@ interface EncryptableStream extends Stream {
 	 * @return	$str		The unencrypted string
 	 */
 	function decryptStream ($encrypted);
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/interfaces/streams/input/class_InputStream.php b/inc/main/interfaces/streams/input/class_InputStream.php
index bbbcd309..b5982255 100644
--- a/inc/main/interfaces/streams/input/class_InputStream.php
+++ b/inc/main/interfaces/streams/input/class_InputStream.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Stream;
+
 /**
  * An InputStream interface
  *
@@ -22,7 +25,5 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 interface InputStream extends Stream {
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/interfaces/streams/output/class_OutputStream.php b/inc/main/interfaces/streams/output/class_OutputStream.php
index 83e389a8..fc4da020 100644
--- a/inc/main/interfaces/streams/output/class_OutputStream.php
+++ b/inc/main/interfaces/streams/output/class_OutputStream.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Stream;
+
 /**
  * An OutputStream interface
  *
@@ -22,7 +25,5 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 interface OutputStream extends Stream {
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/interfaces/user/extended/class_ManageableGuest.php b/inc/main/interfaces/user/extended/class_ManageableGuest.php
index 66bf4ccc..75c11c6f 100644
--- a/inc/main/interfaces/user/extended/class_ManageableGuest.php
+++ b/inc/main/interfaces/user/extended/class_ManageableGuest.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Manager\Guest;
+
 /**
  * An interface for manageable guests
  *
@@ -22,7 +25,5 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 interface ManageableGuest extends ManageableAccount {
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/interfaces/user/extended/class_ManageableMember.php b/inc/main/interfaces/user/extended/class_ManageableMember.php
index 2f625722..3095c243 100644
--- a/inc/main/interfaces/user/extended/class_ManageableMember.php
+++ b/inc/main/interfaces/user/extended/class_ManageableMember.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Manager\Login;
+
 /**
  * An interface for manageable users
  *
@@ -22,7 +25,5 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 interface ManageableMember extends ManageableAccount {
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/interfaces/visitor/decorator/class_DecoratorVisitor.php b/inc/main/interfaces/visitor/decorator/class_DecoratorVisitor.php
index 0e7a3ff3..8b7cab4c 100644
--- a/inc/main/interfaces/visitor/decorator/class_DecoratorVisitor.php
+++ b/inc/main/interfaces/visitor/decorator/class_DecoratorVisitor.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Visitor\Decorator;
+
 /**
  * An interface for the visitor implementation for decorators
  *
@@ -29,7 +32,5 @@ interface DecoratorVisitor extends Visitor {
 	 * @return	void
 	 */
 	function visitDecorator (BaseDecorator $decoratorInstance);
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/interfaces/visitor/listener/class_ListenerVisitor.php b/inc/main/interfaces/visitor/listener/class_ListenerVisitor.php
index 6e9a9007..03a4adce 100644
--- a/inc/main/interfaces/visitor/listener/class_ListenerVisitor.php
+++ b/inc/main/interfaces/visitor/listener/class_ListenerVisitor.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Visitor\Listener;
+
 /**
  * An interface for the visitor implementation for listeners
  *
@@ -29,7 +32,5 @@ interface ListenerVisitor extends Visitor {
 	 * @return	void
 	 */
 	function visitListener (Listenable $listenerInstance);
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/interfaces/visitor/pool/class_PoolVisitor.php b/inc/main/interfaces/visitor/pool/class_PoolVisitor.php
index 9b98e3e7..6a63a766 100644
--- a/inc/main/interfaces/visitor/pool/class_PoolVisitor.php
+++ b/inc/main/interfaces/visitor/pool/class_PoolVisitor.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Visitor\Pool;
+
 /**
  * An interface for the visitor implementation for pools
  *
@@ -29,7 +32,5 @@ interface PoolVisitor extends Visitor {
 	 * @return	void
 	 */
 	function visitPool (Poolable $poolInstance);
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/interfaces/visitor/tasks/class_TaskVisitor.php b/inc/main/interfaces/visitor/tasks/class_TaskVisitor.php
index 2384507e..8012b9aa 100644
--- a/inc/main/interfaces/visitor/tasks/class_TaskVisitor.php
+++ b/inc/main/interfaces/visitor/tasks/class_TaskVisitor.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Visitor\Task;
+
 /**
  * An interface for the visitor implementation for tasks
  *
@@ -29,7 +32,5 @@ interface TaskVisitor extends Visitor {
 	 * @return	void
 	 */
 	function visitTask (Taskable $taskInstance);
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/middleware/compressor/class_CompressorChannel.php b/inc/main/middleware/compressor/class_CompressorChannel.php
index 8b6dae49..7cdc9f41 100644
--- a/inc/main/middleware/compressor/class_CompressorChannel.php
+++ b/inc/main/middleware/compressor/class_CompressorChannel.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Channel\Compressor;
+
 /**
  * Middleware class for selecting the right compressor channel
  *
@@ -134,7 +137,5 @@ class CompressorChannel extends BaseMiddleware implements Registerable {
 		// Get compressor extension from current compressor
 		return $this->getCompressor()->getCompressorExtension();
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/middleware/database/class_DatabaseConnection.php b/inc/main/middleware/database/class_DatabaseConnection.php
index d0732ea4..b695c867 100644
--- a/inc/main/middleware/database/class_DatabaseConnection.php
+++ b/inc/main/middleware/database/class_DatabaseConnection.php
@@ -218,7 +218,5 @@ class DatabaseConnection extends BaseMiddleware implements DatabaseConnector, Re
 		// Return the value
 		return $count;
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/middleware/debug/class_DebugMiddleware.php b/inc/main/middleware/debug/class_DebugMiddleware.php
index 07b5ee15..09f31da0 100644
--- a/inc/main/middleware/debug/class_DebugMiddleware.php
+++ b/inc/main/middleware/debug/class_DebugMiddleware.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Middleware\Debug;
+
 /**
  * The middlware debug output system. A *real* or concrete output class shall
  * become registered with this middleware because the back-fall class will
@@ -122,7 +125,5 @@ class DebugMiddleware extends BaseMiddleware implements Registerable {
 		// Use the output instance
 		$this->getOutputInstance()->outputStream($outStream, $stripTags);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/middleware/io/class_FileIoHandler.php b/inc/main/middleware/io/class_FileIoHandler.php
index 4966e75d..e239de5d 100644
--- a/inc/main/middleware/io/class_FileIoHandler.php
+++ b/inc/main/middleware/io/class_FileIoHandler.php
@@ -204,4 +204,3 @@ class FileIoHandler extends BaseMiddleware implements IoHandler {
 	}
 
 }
-// [EOF]
diff --git a/index.php b/index.php
index 9bd38f95..9f6a0e17 100644
--- a/index.php
+++ b/index.php
@@ -228,6 +228,3 @@ define('DEVELOPER', TRUE);
 
 // Call above main() method
 ApplicationEntryPoint::main();
-
-// [EOF]
-?>
-- 
2.39.5