From: Roland Haeder <roland@mxchange.org>
Date: Mon, 13 Feb 2017 20:13:39 +0000 (+0100)
Subject: Continued:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=65f6c4366c9709c9c7c9070d903f1d948be0d5b0;p=core.git

Continued:
- added more namespaces
- added "import" lines for BaseFrameworkSystem

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

diff --git a/application/tests/class_ApplicationHelper.php b/application/tests/class_ApplicationHelper.php
index 68b23c5e..f210bbf4 100644
--- a/application/tests/class_ApplicationHelper.php
+++ b/application/tests/class_ApplicationHelper.php
@@ -3,6 +3,7 @@
 namespace CoreFramework\Helper\Application;
 
 // Import framework stuff
+use CoreFramework\Object\BaseFrameworkSystem;
 use CoreFramework\Registry\Registerable;
 
 /**
@@ -245,7 +246,5 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica
 	public function assignExtraTemplateData (CompileableTemplate $templateInstance) {
 		$this->partialStub('Unfinished method. templateInstance=' . $templateInstance->__toString());
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/application/tests/config.php b/application/tests/config.php
index 399453ef..a34a3c07 100644
--- a/application/tests/config.php
+++ b/application/tests/config.php
@@ -1,4 +1,7 @@
 <?php
+// Import framework stuff
+use CoreFramework\Configuration\FrameworkConfiguration;
+
 /**
  * Configuration entries for this application only
  *
diff --git a/application/tests/data.php b/application/tests/data.php
index 044cbfd2..02757850 100644
--- a/application/tests/data.php
+++ b/application/tests/data.php
@@ -1,4 +1,7 @@
 <?php
+// Import framework stuff
+use CoreFramework\Configuration\FrameworkConfiguration;
+
 /**
  * Application data
  *
diff --git a/application/tests/exceptions.php b/application/tests/exceptions.php
index 1c3c2c47..da44cf5e 100644
--- a/application/tests/exceptions.php
+++ b/application/tests/exceptions.php
@@ -1,4 +1,7 @@
 <?php
+// Import framework stuff
+use CoreFramework\Object\BaseFrameworkSystem;
+
 /**
  * An include file for setting up the exception handler of test suite
  *
@@ -138,6 +141,3 @@ assert_options(ASSERT_WARNING   , FALSE);
 assert_options(ASSERT_BAIL      , TRUE);
 assert_options(ASSERT_QUIET_EVAL, FALSE);
 assert_options(ASSERT_CALLBACK  , '__assertHandler');
-
-// [EOF]
-?>
diff --git a/application/tests/init.php b/application/tests/init.php
index 7e28c400..4db2c18d 100644
--- a/application/tests/init.php
+++ b/application/tests/init.php
@@ -1,4 +1,7 @@
 <?php
+// Import framework stuff
+use CoreFramework\Configuration\FrameworkConfiguration;
+
 /**
  * Application initializer
  *
diff --git a/application/tests/starter.php b/application/tests/starter.php
index 58bf404d..26c1080e 100644
--- a/application/tests/starter.php
+++ b/application/tests/starter.php
@@ -1,4 +1,7 @@
 <?php
+// Import framework stuff
+use CoreFramework\Configuration\FrameworkConfiguration;
+
 /**
  * The application launcher
  *
diff --git a/inc/config.php b/inc/config.php
index bef11886..605f6eab 100644
--- a/inc/config.php
+++ b/inc/config.php
@@ -1,4 +1,8 @@
 <?php
+// Import framework stuff
+use CoreFramework\Configuration\FrameworkConfiguration;
+use CoreFramework\EntryPoint\ApplicationEntryPoint;
+
 /**
  * General configuration. Do not touch this file! If you need different settings
  * create a config-local.php in this directory at and set your changed
diff --git a/inc/config/class_FrameworkConfiguration.php b/inc/config/class_FrameworkConfiguration.php
index efeac634..ebe8e445 100644
--- a/inc/config/class_FrameworkConfiguration.php
+++ b/inc/config/class_FrameworkConfiguration.php
@@ -2,7 +2,7 @@
 // Own namespace
 namespace CoreFramework\Configuration;
 
-// Load framework stuff
+// Import framework stuff
 use CoreFramework\Generic\FrameworkInterface;
 use CoreFramework\Registry\Registerable;
 
diff --git a/inc/database.php b/inc/database.php
index aa5ad741..783944a8 100644
--- a/inc/database.php
+++ b/inc/database.php
@@ -1,4 +1,8 @@
 <?php
+// Import framework stuff
+use CoreFramework\Configuration\FrameworkConfiguration;
+use CoreFramework\Object\BaseFrameworkSystem;
+
 /**
  * Initializes the database layer
  *
@@ -50,6 +54,3 @@ $connectionInstance = DatabaseConnection::createDatabaseConnection(DebugMiddlewa
 // Is the app variable there and valid?
 // @TODO Rewrite this
 if (is_object($app)) $app->setDatabaseInstance($connectionInstance);
-
-// [EOF]
-?>
diff --git a/inc/includes.php b/inc/includes.php
index 45068c84..d9f38230 100644
--- a/inc/includes.php
+++ b/inc/includes.php
@@ -1,4 +1,8 @@
 <?php
+// Import framework stuff
+use CoreFramework\Configuration\FrameworkConfiguration;
+use CoreFramework\Loader\ClassLoader;
+
 /**
  * Loads more include files by using the generic class loader
  *
@@ -35,7 +39,7 @@ ClassLoader::getSelfInstance()->loadExtraConfigs();
 
 // Register auto-load function with the SPL
 // @TODO This makes the core depending on the SPL. But it should be installed anyway.
-spl_autoload_register('ClassLoader::autoLoad');
+spl_autoload_register('CoreFramework\Loader\ClassLoader::autoLoad');
 
 // Does the user has an application specified?
 // @TODO Find a nicer OOP-ed way for this
diff --git a/inc/loader/class_ClassLoader.php b/inc/loader/class_ClassLoader.php
index d0e264fc..8ce7f4fe 100644
--- a/inc/loader/class_ClassLoader.php
+++ b/inc/loader/class_ClassLoader.php
@@ -1,4 +1,15 @@
 <?php
+// Own namespace
+namespace CoreFramework\Loader;
+
+// Import framework stuff
+use CoreFramework\Configuration\FrameworkConfiguration;
+use CoreFramework\Object\BaseFrameworkSystem;
+
+// Import SPL stuff
+use \RecursiveDirectoryIterator;
+use \RecursiveIteratorIterator;
+
 /**
  * This class loads class include files with a specific prefix and suffix
  *
@@ -476,7 +487,5 @@ class ClassLoader {
 		// And return it
 		return $includeList;
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/actions/class_BaseAction.php b/inc/main/classes/actions/class_BaseAction.php
index cbf25fe6..331eba3a 100644
--- a/inc/main/classes/actions/class_BaseAction.php
+++ b/inc/main/classes/actions/class_BaseAction.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace CoreFramework\Action;
+
+// Import framework stuff
+use CoreFramework\Object\BaseFrameworkSystem;
+
 /**
  * A general action class. You shall extend this class if you are going to write
  * your own action classes even when this class has no real content in it. We
@@ -34,7 +40,5 @@ class BaseAction extends BaseFrameworkSystem {
 		// Call parent constructor
 		parent::__construct($className);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/application/class_BaseApplication.php b/inc/main/classes/application/class_BaseApplication.php
index 915916e2..c1d94d66 100644
--- a/inc/main/classes/application/class_BaseApplication.php
+++ b/inc/main/classes/application/class_BaseApplication.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace CoreFramework\Application;
+
+// Import framework stuff
+use CoreFramework\Object\BaseFrameworkSystem;
+
 /**
  * A general application class for the ApplicationHelper classes.
  *
@@ -38,7 +44,5 @@ class BaseApplication extends BaseFrameworkSystem {
 		// Add this instance
 		$registryInstance->addInstance('application', $this);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/auth/class_CookieAuth.php b/inc/main/classes/auth/class_CookieAuth.php
index b6890c16..e08bb33b 100644
--- a/inc/main/classes/auth/class_CookieAuth.php
+++ b/inc/main/classes/auth/class_CookieAuth.php
@@ -3,6 +3,7 @@
 namespace CoreFramework\Auth;
 
 // Import framework stuff
+use CoreFramework\Object\BaseFrameworkSystem;
 use CoreFramework\Registry\Registerable;
 
 /**
@@ -122,7 +123,5 @@ class CookieAuth extends BaseFrameworkSystem implements Authorizeable, Registera
 		$this->getResponseInstance()->refreshCookie('username');
 		$this->getResponseInstance()->refreshCookie('u_hash');
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/cache/class_MemoryCache.php b/inc/main/classes/cache/class_MemoryCache.php
index 7c771af6..a3bdbd60 100644
--- a/inc/main/classes/cache/class_MemoryCache.php
+++ b/inc/main/classes/cache/class_MemoryCache.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace CoreFramework\Cache;
+
+// Import framework stuff
+use CoreFramework\Object\BaseFrameworkSystem;
+
 /**
  * A simple memory cache (similar to a registry)
  *
@@ -7,6 +13,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 InProgressCache
  *
  * 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
@@ -139,7 +146,5 @@ class MemoryCache extends BaseFrameworkSystem implements Cacheable {
 			$this->dataCache->offsetUnset($offset);
 		} // END - if
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/class_BaseFrameworkSystem.php b/inc/main/classes/class_BaseFrameworkSystem.php
index a2dfabe2..e841f005 100644
--- a/inc/main/classes/class_BaseFrameworkSystem.php
+++ b/inc/main/classes/class_BaseFrameworkSystem.php
@@ -2,9 +2,13 @@
 // Own namespace
 namespace CoreFramework\Object;
 
-// Load framework stuff
+// Import framework stuff
+use CoreFramework\Configuration\FrameworkConfiguration;
 use CoreFramework\Generic\FrameworkInterface;
 
+// Import SPL stuff
+use \stdClass;
+
 /**
  * The simulator system class is the super class of all other classes. This
  * class handles saving of games etc.
diff --git a/inc/main/classes/client/class_BaseClient.php b/inc/main/classes/client/class_BaseClient.php
index 556b6682..040046d2 100644
--- a/inc/main/classes/client/class_BaseClient.php
+++ b/inc/main/classes/client/class_BaseClient.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace CoreFramework\Client;
+
+// Import framework stuff
+use CoreFramework\Object\BaseFrameworkSystem;
+
 /**
  * A general client class
  *
@@ -32,7 +38,5 @@ class BaseClient extends BaseFrameworkSystem {
 		// Call parent constructor
 		parent::__construct($className);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/commands/class_BaseCommand.php b/inc/main/classes/commands/class_BaseCommand.php
index 0a8ef506..5984c18c 100644
--- a/inc/main/classes/commands/class_BaseCommand.php
+++ b/inc/main/classes/commands/class_BaseCommand.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace CoreFramework\Command;
+
+// Import framework stuff
+use CoreFramework\Object\BaseFrameworkSystem;
+
 /**
  * A general (base) command
  *
@@ -106,7 +112,5 @@ class BaseCommand extends BaseFrameworkSystem {
 		// Get the content back from the template engine and put it in response class
 		$templateInstance->transferToResponse($responseInstance);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/compressor/class_Bzip2Compressor.php b/inc/main/classes/compressor/class_Bzip2Compressor.php
index 6ee7c52f..4c2f7880 100644
--- a/inc/main/classes/compressor/class_Bzip2Compressor.php
+++ b/inc/main/classes/compressor/class_Bzip2Compressor.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace CoreFramework\Compressor;
+
+// Import framework stuff
+use CoreFramework\Object\BaseFrameworkSystem;
+
 /**
  * BZIP2 compression and decompression class
  *
@@ -96,7 +102,5 @@ class Bzip2Compressor extends BaseFrameworkSystem implements Compressor {
 	public final function getCompressorExtension () {
 		return 'bz2';
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/compressor/class_GzipCompressor.php b/inc/main/classes/compressor/class_GzipCompressor.php
index d2aff6aa..44f5371a 100644
--- a/inc/main/classes/compressor/class_GzipCompressor.php
+++ b/inc/main/classes/compressor/class_GzipCompressor.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace CoreFramework\Compressor;
+
+// Import framework stuff
+use CoreFramework\Object\BaseFrameworkSystem;
+
 /**
  * GZIP compression and decompression class
  *
@@ -93,7 +99,5 @@ class GzipCompressor extends BaseFrameworkSystem implements Compressor {
 	public final function getCompressorExtension () {
 		return 'gz';
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/compressor/class_NullCompressor.php b/inc/main/classes/compressor/class_NullCompressor.php
index ed4fba45..1b7a69de 100644
--- a/inc/main/classes/compressor/class_NullCompressor.php
+++ b/inc/main/classes/compressor/class_NullCompressor.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace CoreFramework\Compressor;
+
+// Import framework stuff
+use CoreFramework\Object\BaseFrameworkSystem;
+
 /**
  * Null compression and decompression class
  *
@@ -87,7 +93,5 @@ class NullCompressor extends BaseFrameworkSystem implements Compressor {
 	public final function getCompressorExtension () {
 		return 'null';
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/compressor/class_ZlibCompressor.php b/inc/main/classes/compressor/class_ZlibCompressor.php
index 22f3b78e..d5ceac39 100644
--- a/inc/main/classes/compressor/class_ZlibCompressor.php
+++ b/inc/main/classes/compressor/class_ZlibCompressor.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace CoreFramework\Compressor;
+
+// Import framework stuff
+use CoreFramework\Object\BaseFrameworkSystem;
+
 /**
  * ZLIB compression and decompression class
  *
@@ -93,7 +99,5 @@ class ZlibCompressor extends BaseFrameworkSystem implements Compressor {
 	public final function getCompressorExtension () {
 		return 'z';
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/console/class_ConsoleTools.php b/inc/main/classes/console/class_ConsoleTools.php
index ae90f5aa..0d57e341 100644
--- a/inc/main/classes/console/class_ConsoleTools.php
+++ b/inc/main/classes/console/class_ConsoleTools.php
@@ -1,4 +1,11 @@
 <?php
+// Own namespace
+namespace CoreFramework\Tools;
+
+// Import framework stuff
+use CoreFramework\Configuration\FrameworkConfiguration;
+use CoreFramework\Object\BaseFrameworkSystem;
+
 /**
  * This class contains static helper functions for console applications
  *
@@ -396,7 +403,5 @@ class ConsoleTools extends BaseFrameworkSystem {
 		// Return it
 		return $type;
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/container/class_BaseContainer.php b/inc/main/classes/container/class_BaseContainer.php
index a92c6c28..e862a6f7 100644
--- a/inc/main/classes/container/class_BaseContainer.php
+++ b/inc/main/classes/container/class_BaseContainer.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace CoreFramework\Container;
+
+// Import framework stuff
+use CoreFramework\Object\BaseFrameworkSystem;
+
 /**
  * A general Container
  *
@@ -32,7 +38,5 @@ class BaseContainer extends BaseFrameworkSystem {
 		// Call parent constructor
 		parent::__construct($className);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/controller/class_BaseController.php b/inc/main/classes/controller/class_BaseController.php
index 41bdfd0b..080a5a5e 100644
--- a/inc/main/classes/controller/class_BaseController.php
+++ b/inc/main/classes/controller/class_BaseController.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace CoreFramework\Controller;
+
+// Import framework stuff
+use CoreFramework\Object\BaseFrameworkSystem;
+
 /**
  * A generic controller class. You should extend this base class if you want to
  * write your own controller. You get the advantage that you can use the pre and
@@ -290,7 +296,5 @@ class BaseController extends BaseFrameworkSystem implements Registerable {
 	public function executeShutdownFilters (Requestable $requestInstance, Responseable $responseInstance) {
 		$this->executeFilters('shutdown', $requestInstance, $responseInstance);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/criteria/class_BaseCriteria.php b/inc/main/classes/criteria/class_BaseCriteria.php
index 2648e081..bb556c59 100644
--- a/inc/main/classes/criteria/class_BaseCriteria.php
+++ b/inc/main/classes/criteria/class_BaseCriteria.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace CoreFramework\Criteria;
+
+// Import framework stuff
+use CoreFramework\Object\BaseFrameworkSystem;
+
 /**
  * A general crtieria class
  *
@@ -482,7 +488,5 @@ class BaseCriteria extends BaseFrameworkSystem implements Criteria {
 	public final function countExclude () {
 		return $this->count('exclude');
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/crypto/class_CryptoHelper.php b/inc/main/classes/crypto/class_CryptoHelper.php
index e48b7426..9431ccc7 100644
--- a/inc/main/classes/crypto/class_CryptoHelper.php
+++ b/inc/main/classes/crypto/class_CryptoHelper.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace CoreFramework\Helper\Crypto;
+
+// Import framework stuff
+use CoreFramework\Object\BaseFrameworkSystem;
+
 /**
  * A helper class for cryptographical things like hashing passwords and so on
  *
@@ -228,7 +234,5 @@ class CryptoHelper extends BaseFrameworkSystem implements Cryptable {
 		// Return the string
 		return $str;
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/database/class_BaseDatabaseBackend.php b/inc/main/classes/database/class_BaseDatabaseBackend.php
index 40190f92..0f3887a6 100644
--- a/inc/main/classes/database/class_BaseDatabaseBackend.php
+++ b/inc/main/classes/database/class_BaseDatabaseBackend.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace CoreFramework\Database\Backend;
+
+// Import framework stuff
+use CoreFramework\Object\BaseFrameworkSystem;
+
 /**
  * An abstract database access class for handling database I/O requests
  *
@@ -91,7 +97,5 @@ abstract class BaseDatabaseBackend extends BaseFrameworkSystem implements Databa
 	 * @return	$data	A cleaned up array with only public data.
 	 */
 	public abstract function removeNonPublicDataFromArray (array $data);
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/database/class_BaseDatabaseResult.php b/inc/main/classes/database/class_BaseDatabaseResult.php
index 4d7c829f..cba50e4b 100644
--- a/inc/main/classes/database/class_BaseDatabaseResult.php
+++ b/inc/main/classes/database/class_BaseDatabaseResult.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace CoreFramework\Database\Result;
+
+// Import framework stuff
+use CoreFramework\Object\BaseFrameworkSystem;
+
 /**
  * A general class for database results
  *
@@ -32,7 +38,5 @@ class BaseDatabaseResult extends BaseFrameworkSystem {
 		// Call parent constructor
 		parent::__construct($class);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/database/class_BaseDatabaseWrapper.php b/inc/main/classes/database/class_BaseDatabaseWrapper.php
index 56a802e8..9c3a3615 100644
--- a/inc/main/classes/database/class_BaseDatabaseWrapper.php
+++ b/inc/main/classes/database/class_BaseDatabaseWrapper.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace CoreFramework\Database\Wrapper;
+
+// Import framework stuff
+use CoreFramework\Object\BaseFrameworkSystem;
+
 /**
  * A generic database wrapper
  *
@@ -274,7 +280,5 @@ class BaseDatabaseWrapper extends BaseFrameworkSystem {
 		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('WRAPPER[' . $this->__toString() . ']: data[]=' . gettype($data));
 		return $data;
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/decorator/class_BaseDecorator.php b/inc/main/classes/decorator/class_BaseDecorator.php
index d021e739..a57e154f 100644
--- a/inc/main/classes/decorator/class_BaseDecorator.php
+++ b/inc/main/classes/decorator/class_BaseDecorator.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace CoreFramework\Generic;
+
+// Import framework stuff
+use CoreFramework\Object\BaseFrameworkSystem;
+
 /**
  * A general Decorator
  *
@@ -32,7 +38,5 @@ class BaseDecorator extends BaseFrameworkSystem {
 		// Call parent constructor
 		parent::__construct($className);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/discovery/class_BaseDiscovery.php b/inc/main/classes/discovery/class_BaseDiscovery.php
index 2869c297..27896ea5 100644
--- a/inc/main/classes/discovery/class_BaseDiscovery.php
+++ b/inc/main/classes/discovery/class_BaseDiscovery.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace CoreFramework\Discovery;
+
+// Import framework stuff
+use CoreFramework\Object\BaseFrameworkSystem;
+
 /**
  * A general discovery class
  *
@@ -56,7 +62,5 @@ class BaseDiscovery extends BaseFrameworkSystem {
 	protected final function getActionName () {
 		return $this->actionName;
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/factories/class_BaseFactory.php b/inc/main/classes/factories/class_BaseFactory.php
index b8a64d0a..7a96750b 100644
--- a/inc/main/classes/factories/class_BaseFactory.php
+++ b/inc/main/classes/factories/class_BaseFactory.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace CoreFramework\Factory;
+
+// Import framework stuff
+use CoreFramework\Object\BaseFrameworkSystem;
+
 /**
  * A general (base) factory
  *
@@ -80,7 +86,5 @@ class BaseFactory extends BaseFrameworkSystem {
 	public static final function getAllCounters () {
 		return self::$objectCounters;
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/factories/logger/class_LoggerFactory.php b/inc/main/classes/factories/logger/class_LoggerFactory.php
index 379546dc..6528ed54 100644
--- a/inc/main/classes/factories/logger/class_LoggerFactory.php
+++ b/inc/main/classes/factories/logger/class_LoggerFactory.php
@@ -2,7 +2,7 @@
 // Own namespace
 namespace CoreFramework\Logging;
 
-// Load framework stuff
+// Import framework stuff
 use CoreFramework\Generic\FrameworkInterface;
 
 /**
diff --git a/inc/main/classes/factories/objects/class_ObjectFactory.php b/inc/main/classes/factories/objects/class_ObjectFactory.php
index 54308d66..84dd0fe1 100644
--- a/inc/main/classes/factories/objects/class_ObjectFactory.php
+++ b/inc/main/classes/factories/objects/class_ObjectFactory.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace CoreFramework\Factory;
+
+// Import framework stuff
+use CoreFramework\Configuration\FrameworkConfiguration;
+
 /**
  * An general object factory
  *
diff --git a/inc/main/classes/factories/stacks/class_FileStackFactory.php b/inc/main/classes/factories/stacks/class_FileStackFactory.php
index e34b0a94..d1437892 100644
--- a/inc/main/classes/factories/stacks/class_FileStackFactory.php
+++ b/inc/main/classes/factories/stacks/class_FileStackFactory.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace CoreFramework\Factory\Stack;
+
+// Import framework stuff
+use CoreFramework\Configuration\FrameworkConfiguration;
+
 /**
  * A factory class for file-based stacks
  *
diff --git a/inc/main/classes/factories/user/class_UserFactory.php b/inc/main/classes/factories/user/class_UserFactory.php
index d81131c5..a428cf00 100644
--- a/inc/main/classes/factories/user/class_UserFactory.php
+++ b/inc/main/classes/factories/user/class_UserFactory.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace CoreFramework\Factory\User;
+
+// Import framework stuff
+use CoreFramework\Configuration\FrameworkConfiguration;
+
 /**
  * A factory class for socket registries
  *
diff --git a/inc/main/classes/feature/class_BaseFeature.php b/inc/main/classes/feature/class_BaseFeature.php
index 3f125e67..75ab1189 100644
--- a/inc/main/classes/feature/class_BaseFeature.php
+++ b/inc/main/classes/feature/class_BaseFeature.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace CoreFramework\Feature;
+
+// Import framework stuff
+use CoreFramework\Object\BaseFrameworkSystem;
+
 /**
  * A general Feature class
  *
@@ -32,7 +38,5 @@ class BaseFeature extends BaseFrameworkSystem {
 		// Call parent constructor
 		parent::__construct($className);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/feature/class_FrameworkFeature.php b/inc/main/classes/feature/class_FrameworkFeature.php
index 32a326bb..616b4c3c 100644
--- a/inc/main/classes/feature/class_FrameworkFeature.php
+++ b/inc/main/classes/feature/class_FrameworkFeature.php
@@ -1,4 +1,11 @@
 <?php
+// Own namespace
+namespace CoreFramework\Feature;
+
+// Import framework stuff
+use CoreFramework\Configuration\FrameworkConfiguration;
+use CoreFramework\Object\BaseFrameworkSystem;
+
 /**
  * The general feature management class. No instance is needed as this class
  * has only public methods that are static.
@@ -164,7 +171,5 @@ class FrameworkFeature extends BaseFrameworkSystem {
 		// Return any returned value
 		return $return;
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/file_directories/class_BaseAbstractFile.php b/inc/main/classes/file_directories/class_BaseAbstractFile.php
index 0e4ec75c..66cb0193 100644
--- a/inc/main/classes/file_directories/class_BaseAbstractFile.php
+++ b/inc/main/classes/file_directories/class_BaseAbstractFile.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace CoreFramework\Filesystem\File;
+
+// Import framework stuff
+use CoreFramework\Object\BaseFrameworkSystem;
+
 /**
  * An abstract file class
  *
@@ -195,7 +201,5 @@ class BaseAbstractFile extends BaseFrameworkSystem implements FilePointer, Close
 		// Call pointer instance
 		return $this->getPointerInstance()->isEndOfFileReached();
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/file_directories/class_BaseFileIo.php b/inc/main/classes/file_directories/class_BaseFileIo.php
index 1e8579cf..870b7d90 100644
--- a/inc/main/classes/file_directories/class_BaseFileIo.php
+++ b/inc/main/classes/file_directories/class_BaseFileIo.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace CoreFramework\FileSystem;
+
+// Import framework stuff
+use CoreFramework\Object\BaseFrameworkSystem;
+
 /**
  * A general FileIo class
  *
@@ -190,7 +196,5 @@ class BaseFileIo extends BaseFrameworkSystem implements FilePointer, CloseableFi
 		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(sprintf('[%s:%d:] size=%s - EXIT!', __METHOD__, __LINE__, $size));
 		return $size;
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/file_directories/directory/class_FrameworkDirectoryPointer.php b/inc/main/classes/file_directories/directory/class_FrameworkDirectoryPointer.php
index 389500be..6f56e967 100644
--- a/inc/main/classes/file_directories/directory/class_FrameworkDirectoryPointer.php
+++ b/inc/main/classes/file_directories/directory/class_FrameworkDirectoryPointer.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace CoreFramework\Filesytem\Pointer;
+
+// Import framework stuff
+use CoreFramework\Object\BaseFrameworkSystem;
+
 /**
  * A class for directory reading and getting its contents, no recursion!
  *
@@ -250,7 +256,5 @@ class FrameworkDirectoryPointer extends BaseFrameworkSystem implements Framework
 	public final function getPathName () {
 		return $this->pathName;
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/file_directories/input/raw/class_FrameworkRawFileInputPointer.php b/inc/main/classes/file_directories/input/raw/class_FrameworkRawFileInputPointer.php
index a09f3eff..d34b1f24 100644
--- a/inc/main/classes/file_directories/input/raw/class_FrameworkRawFileInputPointer.php
+++ b/inc/main/classes/file_directories/input/raw/class_FrameworkRawFileInputPointer.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace CoreFramework\Filesystem\Pointer\Input;
+
+// Import framework stuff
+use CoreFramework\Object\BaseFrameworkSystem;
+
 /**
  * A class for reading files
  *
@@ -168,7 +174,5 @@ class FrameworkRawFileInputPointer extends BaseFileIo implements InputPointer {
 	public function key () {
 		throw new UnsupportedOperationException(array($this, __FUNCTION__), self::EXCEPTION_UNSPPORTED_OPERATION);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/file_directories/input/text/class_FrameworkTextFileInputPointer.php b/inc/main/classes/file_directories/input/text/class_FrameworkTextFileInputPointer.php
index f9cd839a..879f60fe 100644
--- a/inc/main/classes/file_directories/input/text/class_FrameworkTextFileInputPointer.php
+++ b/inc/main/classes/file_directories/input/text/class_FrameworkTextFileInputPointer.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace CoreFramework\Filesystem\Pointer\Input;
+
+// Import framework stuff
+use CoreFramework\Object\BaseFrameworkSystem;
+
 /**
  * A class for reading text files
  *
@@ -170,7 +176,5 @@ class FrameworkTextFileInputPointer extends BaseFileIo implements InputPointer {
 	public function key () {
 		throw new UnsupportedOperationException(array($this, __FUNCTION__), self::EXCEPTION_UNSPPORTED_OPERATION);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/file_directories/io/class_FrameworkFileInputOutputPointer.php b/inc/main/classes/file_directories/io/class_FrameworkFileInputOutputPointer.php
index 9f631776..056fa30f 100644
--- a/inc/main/classes/file_directories/io/class_FrameworkFileInputOutputPointer.php
+++ b/inc/main/classes/file_directories/io/class_FrameworkFileInputOutputPointer.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace CoreFramework\Filesystem\Pointer;
+
+// Import framework stuff
+use CoreFramework\Object\BaseFrameworkSystem;
+
 /**
  * A class for reading files
  *
@@ -268,7 +274,5 @@ class FrameworkFileInputOutputPointer extends BaseFileIo implements InputOutputP
 		// Return size
 		return $fileData['size'];
 	}
-}
 
-// [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 35162ee9..a9f6d0f9 100644
--- a/inc/main/classes/file_directories/io_stream/class_FileIoStream.php
+++ b/inc/main/classes/file_directories/io_stream/class_FileIoStream.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace CoreFramework\Stream;
+
+// Import framework stuff
+use CoreFramework\Object\BaseFrameworkSystem;
+
 /**
  * An universal class for file input/output streams.
  *
@@ -286,7 +292,5 @@ class FileIoStream extends BaseFrameworkSystem implements FileInputStreamer, Fil
 	public function size () {
 		$this->partialStub();
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/filesystem/class_BaseFilesystem.php b/inc/main/classes/filesystem/class_BaseFilesystem.php
index 5ad10b8c..b92b639a 100644
--- a/inc/main/classes/filesystem/class_BaseFilesystem.php
+++ b/inc/main/classes/filesystem/class_BaseFilesystem.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace CoreFramework\Filesystem;
+
+// Import framework stuff
+use CoreFramework\Object\BaseFrameworkSystem;
+
 /**
  * A general virtual file system class. For example the feature 'fuse' is using
  * this heavily.
@@ -33,7 +39,5 @@ class BaseFilesystem extends BaseFrameworkSystem {
 		// Call parent constructor
 		parent::__construct($className);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/filter/class_BaseFilter.php b/inc/main/classes/filter/class_BaseFilter.php
index b5013d8a..3dcca80f 100644
--- a/inc/main/classes/filter/class_BaseFilter.php
+++ b/inc/main/classes/filter/class_BaseFilter.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace CoreFramework\Filter;
+
+// Import framework stuff
+use CoreFramework\Object\BaseFrameworkSystem;
+
 /**
  * A general filter class
  *
@@ -35,7 +41,5 @@ class BaseFilter extends BaseFrameworkSystem {
 		// Call parent constructor
 		parent::__construct($className);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/filter/class_BaseFilterDecorator.php b/inc/main/classes/filter/class_BaseFilterDecorator.php
index ac6b36b9..68f50d0b 100644
--- a/inc/main/classes/filter/class_BaseFilterDecorator.php
+++ b/inc/main/classes/filter/class_BaseFilterDecorator.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace CoreFramework\Filter;
+
+// Import framework stuff
+use CoreFramework\Object\BaseFrameworkSystem;
+
 /**
  * A general filter decorator for decorating filters with other filters
  *
@@ -77,7 +83,5 @@ abstract class BaseFilterDecorator extends BaseFrameworkSystem implements Filter
 	 * @return	void
 	 */
 	abstract public function doExecute (Requestable $requestInstance, Responseable $responseInstance);
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/filter/class_FilterChain.php b/inc/main/classes/filter/class_FilterChain.php
index 24e19bb2..63bc8906 100644
--- a/inc/main/classes/filter/class_FilterChain.php
+++ b/inc/main/classes/filter/class_FilterChain.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace CoreFramework\Filter\Chain;
+
+// Import framework stuff
+use CoreFramework\Object\BaseFrameworkSystem;
+
 /**
  * A filter chain for pre and post filters
  *
@@ -130,7 +136,5 @@ class FilterChain extends BaseFrameworkSystem implements Registerable {
 			}
 		} // END - foreach
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/handler/class_BaseHandler.php b/inc/main/classes/handler/class_BaseHandler.php
index aa708c3e..e0a0d006 100644
--- a/inc/main/classes/handler/class_BaseHandler.php
+++ b/inc/main/classes/handler/class_BaseHandler.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace CoreFramework\Handler;
+
+// Import framework stuff
+use CoreFramework\Object\BaseFrameworkSystem;
+
 /**
  * A general Handler
  *
@@ -72,7 +78,5 @@ class BaseHandler extends BaseFrameworkSystem implements HandleableDataSet {
 		$dataSetInstance->addCriteria(NodeListDatabaseWrapper::DB_COLUMN_MESSAGE_TYPE , $messageData[NetworkPackage::MESSAGE_ARRAY_TYPE]);
 		*/
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/helper/captcha/class_BaseCaptcha.php b/inc/main/classes/helper/captcha/class_BaseCaptcha.php
index f7035490..8293b9b2 100644
--- a/inc/main/classes/helper/captcha/class_BaseCaptcha.php
+++ b/inc/main/classes/helper/captcha/class_BaseCaptcha.php
@@ -2,7 +2,7 @@
 // Own namespace
 namespace CoreFramework\Captcha;
 
-// Load framework stuff
+// Import framework stuff
 use CoreFramework\Generic\FrameworkInterface;
 
 /**
diff --git a/inc/main/classes/helper/captcha/web/class_GraphicalCodeCaptcha.php b/inc/main/classes/helper/captcha/web/class_GraphicalCodeCaptcha.php
index a380b310..513ae522 100644
--- a/inc/main/classes/helper/captcha/web/class_GraphicalCodeCaptcha.php
+++ b/inc/main/classes/helper/captcha/web/class_GraphicalCodeCaptcha.php
@@ -2,7 +2,7 @@
 // Own namespace
 namespace CoreFramework\Captcha;
 
-// Load framework stuff
+// Import framework stuff
 use CoreFramework\Generic\FrameworkInterface;
 
 /**
diff --git a/inc/main/classes/helper/class_BaseHelper.php b/inc/main/classes/helper/class_BaseHelper.php
index 253a6362..af3222b0 100644
--- a/inc/main/classes/helper/class_BaseHelper.php
+++ b/inc/main/classes/helper/class_BaseHelper.php
@@ -2,8 +2,9 @@
 // Own namespace
 namespace CoreFramework\Helper;
 
-// Load framework stuff
+// Import framework stuff
 use CoreFramework\Generic\FrameworkInterface;
+use CoreFramework\Object\BaseFrameworkSystem;
 
 /**
  * A generic helper class with generic methods
diff --git a/inc/main/classes/helper/html/links/class_HtmlLinkHelper.php b/inc/main/classes/helper/html/links/class_HtmlLinkHelper.php
index d5dffec9..ef5c22ab 100644
--- a/inc/main/classes/helper/html/links/class_HtmlLinkHelper.php
+++ b/inc/main/classes/helper/html/links/class_HtmlLinkHelper.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace CoreFramework\Helper;
+
+// Import framework stuff
+use CoreFramework\Configuration\FrameworkConfiguration;
+
 /**
  * A helper for web links
  *
diff --git a/inc/main/classes/images/class_BaseImage.php b/inc/main/classes/images/class_BaseImage.php
index 618e2c4b..15ee4963 100644
--- a/inc/main/classes/images/class_BaseImage.php
+++ b/inc/main/classes/images/class_BaseImage.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace CoreFramework\Image;
+
+// Import framework stuff
+use CoreFramework\Object\BaseFrameworkSystem;
+
 /**
  * A general image class
  *
@@ -556,6 +562,5 @@ class BaseImage extends BaseFrameworkSystem implements Registerable {
 		// And return it
 		return $imageContent;
 	}
+
 }
-// [EOF]
-?>
diff --git a/inc/main/classes/images/extended/class_PngImage.php b/inc/main/classes/images/extended/class_PngImage.php
index 54484ed8..6a6f1d29 100644
--- a/inc/main/classes/images/extended/class_PngImage.php
+++ b/inc/main/classes/images/extended/class_PngImage.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace CoreFramework\Image;
+
+// Import framework stuff
+use CoreFramework\Object\BaseFrameworkSystem;
+
 /**
  * A PNG image generator
  *
@@ -73,7 +79,5 @@ class PngImage extends BaseImage {
 		// Finish the image and send it to a cache file
 		imagepng($this->getImageResource(), $cacheFile, 9, PNG_ALL_FILTERS);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/index/class_BaseIndex.php b/inc/main/classes/index/class_BaseIndex.php
index 5b2c4c47..c6be8290 100644
--- a/inc/main/classes/index/class_BaseIndex.php
+++ b/inc/main/classes/index/class_BaseIndex.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace CoreFramework\Index;
+
+// Import framework stuff
+use CoreFramework\Object\BaseFrameworkSystem;
+
 /**
  * A general index class
  *
@@ -349,7 +355,5 @@ class BaseIndex extends BaseFrameworkSystem {
 		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/iterator/class_BaseIterator.php b/inc/main/classes/iterator/class_BaseIterator.php
index edc49866..a51da231 100644
--- a/inc/main/classes/iterator/class_BaseIterator.php
+++ b/inc/main/classes/iterator/class_BaseIterator.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace CoreFramework\Iterator;
+
+// Import framework stuff
+use CoreFramework\Object\BaseFrameworkSystem;
+
 /**
  * A general iterator
  *
@@ -32,7 +38,5 @@ class BaseIterator extends BaseFrameworkSystem {
 		// Call parent constructor
 		parent::__construct($className);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/language/class_LanguageSystem.php b/inc/main/classes/language/class_LanguageSystem.php
index c2cbe482..7d2ac750 100644
--- a/inc/main/classes/language/class_LanguageSystem.php
+++ b/inc/main/classes/language/class_LanguageSystem.php
@@ -3,6 +3,8 @@
 namespace CoreFramework\Localization;
 
 // Import framework stuff
+use CoreFramework\Configuration\FrameworkConfiguration;
+use CoreFramework\Object\BaseFrameworkSystem;
 use CoreFramework\Registry\Registerable;
 
 /**
@@ -218,7 +220,5 @@ class LanguageSystem extends BaseFrameworkSystem implements ManageableLanguage,
 		// Return the text
 		return $messageText;
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/listener/class_BaseListener.php b/inc/main/classes/listener/class_BaseListener.php
index f94dae90..28f5fd64 100644
--- a/inc/main/classes/listener/class_BaseListener.php
+++ b/inc/main/classes/listener/class_BaseListener.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace CoreFramework\Listener;
+
+// Import framework stuff
+use CoreFramework\Object\BaseFrameworkSystem;
+
 /**
  * A general listener class
  *
@@ -591,7 +597,5 @@ class BaseListener extends BaseFrameworkSystem implements Visitable {
 		// Advance to next entry. This should be the last line.
 		$this->getIteratorInstance()->next();
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/lists/class_BaseList.php b/inc/main/classes/lists/class_BaseList.php
index 2eb7809d..e0bba6ba 100644
--- a/inc/main/classes/lists/class_BaseList.php
+++ b/inc/main/classes/lists/class_BaseList.php
@@ -2,8 +2,9 @@
 // Own namespace
 namespace CoreFramework\Lists;
 
-// Load framework stuff
+// Import framework stuff
 use CoreFramework\Generic\FrameworkInterface;
+use CoreFramework\Object\BaseFrameworkSystem;
 
 /**
  * A general list class
diff --git a/inc/main/classes/mailer/class_BaseMailer.php b/inc/main/classes/mailer/class_BaseMailer.php
index d4472f7b..b137e5ff 100644
--- a/inc/main/classes/mailer/class_BaseMailer.php
+++ b/inc/main/classes/mailer/class_BaseMailer.php
@@ -2,7 +2,8 @@
 // Own namespace
 namespace CoreFramework\Mailer;
 
-// Load framework stuff
+// Import framework stuff
+use CoreFramework\Object\BaseFrameworkSystem;
 use CoreFramework\Generic\FrameworkInterface;
 
 /**
diff --git a/inc/main/classes/menu/class_BaseMenu.php b/inc/main/classes/menu/class_BaseMenu.php
index 7bb97e16..7fa4cef4 100644
--- a/inc/main/classes/menu/class_BaseMenu.php
+++ b/inc/main/classes/menu/class_BaseMenu.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace CoreFramework\Menu;
+
+// Import framework stuff
+use CoreFramework\Object\BaseFrameworkSystem;
+
 /**
  * A general menu system class
  *
@@ -83,7 +89,5 @@ class BaseMenu extends BaseFrameworkSystem {
 		$templateInstance->assignVariable('menu', $this->getTemplateInstance()->getMenuContent());
 		//* DEBUG */ $templateInstance->debugInstance();
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/output/class_BaseOutput.php b/inc/main/classes/output/class_BaseOutput.php
index 0ef79b56..61067790 100644
--- a/inc/main/classes/output/class_BaseOutput.php
+++ b/inc/main/classes/output/class_BaseOutput.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace CoreFramework\Output;
+
+// Import framework stuff
+use CoreFramework\Object\BaseFrameworkSystem;
+
 /**
  * Generic output class
  *
@@ -32,7 +38,5 @@ class BaseOutput extends BaseFrameworkSystem {
 		// Call parent constructor
 		parent::__construct($className);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/output/console/class_ConsoleOutput.php b/inc/main/classes/output/console/class_ConsoleOutput.php
index 6b153891..ddec2cc0 100644
--- a/inc/main/classes/output/console/class_ConsoleOutput.php
+++ b/inc/main/classes/output/console/class_ConsoleOutput.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace CoreFramework\Output;
+
+// Import framework stuff
+use CoreFramework\Configuration\FrameworkConfiguration;
+
 /**
  * This class simply puts text without any HTML code out. This class is suiable
  * for console output
diff --git a/inc/main/classes/parser/class_BaseParser.php b/inc/main/classes/parser/class_BaseParser.php
index 1f2c3736..3fffe562 100644
--- a/inc/main/classes/parser/class_BaseParser.php
+++ b/inc/main/classes/parser/class_BaseParser.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace CoreFramework\Parser;
+
+// Import framework stuff
+use CoreFramework\Object\BaseFrameworkSystem;
+
 /**
  * A general Parser
  *
@@ -32,7 +38,5 @@ class BaseParser extends BaseFrameworkSystem {
 		// Call parent constructor
 		parent::__construct($className);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/points/class_UserPoints.php b/inc/main/classes/points/class_UserPoints.php
index dd625e45..a1c79f62 100644
--- a/inc/main/classes/points/class_UserPoints.php
+++ b/inc/main/classes/points/class_UserPoints.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace CoreFramework\User\Point;
+
+// Import framework stuff
+use CoreFramework\Object\BaseFrameworkSystem;
+
 /**
  * A class for handling user points which can be real or Internet currency
  *
@@ -177,7 +183,5 @@ class UserPoints extends BaseFrameworkSystem implements Registerable, BookablePo
 		// Add amount
 		$criteriaInstance->addCriteria(UserPointsDatabaseWrapper::DB_COLUMN_POINTS, $this->getAmount());
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/reader/class_ConsoleNewsReader.php b/inc/main/classes/reader/class_ConsoleNewsReader.php
index e78a7eb4..9de20b50 100644
--- a/inc/main/classes/reader/class_ConsoleNewsReader.php
+++ b/inc/main/classes/reader/class_ConsoleNewsReader.php
@@ -3,6 +3,7 @@
 namespace CoreFramework\Reader\News;
 
 // Import framework stuff
+use CoreFramework\Object\BaseFrameworkSystem;
 use CoreFramework\Registry\Registerable;
 
 /**
@@ -83,7 +84,5 @@ class ConsoleNewsReader extends BaseFrameworkSystem implements ReadableNews, Reg
 		// Save that resultInstance in this class
 		$this->setResultInstance($resultInstance);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/reader/class_DefaultNewsReader.php b/inc/main/classes/reader/class_DefaultNewsReader.php
index 460f13a4..988a04f2 100644
--- a/inc/main/classes/reader/class_DefaultNewsReader.php
+++ b/inc/main/classes/reader/class_DefaultNewsReader.php
@@ -3,6 +3,7 @@
 namespace CoreFramework\Reader\News;
 
 // Import framework stuff
+use CoreFramework\Object\BaseFrameworkSystem;
 use CoreFramework\Registry\Registerable;
 
 /**
@@ -83,7 +84,5 @@ class DefaultNewsReader extends BaseFrameworkSystem implements ReadableNews, Reg
 		// Save that resultInstance in this class
 		$this->setResultInstance($resultInstance);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/registration/class_BaseRegistration.php b/inc/main/classes/registration/class_BaseRegistration.php
index ceb80835..783d87a5 100644
--- a/inc/main/classes/registration/class_BaseRegistration.php
+++ b/inc/main/classes/registration/class_BaseRegistration.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace CoreFramework\Registration;
+
+// Import framework stuff
+use CoreFramework\Object\BaseFrameworkSystem;
+
 /**
  * A general registration class.
  *
@@ -95,7 +101,5 @@ class BaseRegistration extends BaseFrameworkSystem {
 		// Execute all post filters
 		$this->postRegistrationFilter->processFilters($this->getRequestInstance(), $this->getResponseInstance());
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/registry/class_BaseRegistry.php b/inc/main/classes/registry/class_BaseRegistry.php
index c94df61a..a2e22c66 100644
--- a/inc/main/classes/registry/class_BaseRegistry.php
+++ b/inc/main/classes/registry/class_BaseRegistry.php
@@ -2,6 +2,9 @@
 // Own namespace
 namespace CoreFramework\Registry;
 
+// Import framework stuff
+use CoreFramework\Object\BaseFrameworkSystem;
+
 /**
  * A general Registry
  *
@@ -221,7 +224,5 @@ class BaseRegistry extends BaseFrameworkSystem implements Registerable {
 		// Return it
 		return $registryKey;
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/request/class_BaseRequest.php b/inc/main/classes/request/class_BaseRequest.php
index 6eb057c6..49130652 100644
--- a/inc/main/classes/request/class_BaseRequest.php
+++ b/inc/main/classes/request/class_BaseRequest.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace CoreFramework\Request;
+
+// Import framework stuff
+use CoreFramework\Object\BaseFrameworkSystem;
+
 /**
  * A general request class
  *
@@ -130,7 +136,5 @@ class BaseRequest extends BaseFrameworkSystem {
 	public final function isRequestValid () {
 		return $this->requestIsValid;
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/resolver/class_BaseResolver.php b/inc/main/classes/resolver/class_BaseResolver.php
index 4c450502..395cc863 100644
--- a/inc/main/classes/resolver/class_BaseResolver.php
+++ b/inc/main/classes/resolver/class_BaseResolver.php
@@ -2,8 +2,9 @@
 // Own namespace
 namespace CoreFramework\Resolver;
 
-// Load framework stuff
+// Import framework stuff
 use CoreFramework\Generic\FrameworkInterface;
+use CoreFramework\Object\BaseFrameworkSystem;
 
 /**
  * A generic resolver class
diff --git a/inc/main/classes/response/class_BaseResponse.php b/inc/main/classes/response/class_BaseResponse.php
index acfb1fec..05fde732 100644
--- a/inc/main/classes/response/class_BaseResponse.php
+++ b/inc/main/classes/response/class_BaseResponse.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace CoreFramework\Response;
+
+// Import framework stuff
+use CoreFramework\Object\BaseFrameworkSystem;
+
 /**
  * A generic request class
  *
@@ -243,7 +249,5 @@ class BaseResponse extends BaseFrameworkSystem {
 		// Return it
 		return $defaultCommand;
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/rng/class_RandomNumberGenerator.php b/inc/main/classes/rng/class_RandomNumberGenerator.php
index 7eda8f00..515d7881 100644
--- a/inc/main/classes/rng/class_RandomNumberGenerator.php
+++ b/inc/main/classes/rng/class_RandomNumberGenerator.php
@@ -2,7 +2,8 @@
 // Own namespace
 namespace CoreFramework\Crypto\RandomNumber;
 
-// Load framework stuff
+// Import framework stuff
+use CoreFramework\Object\BaseFrameworkSystem;
 use CoreFramework\Generic\FrameworkInterface;
 
 /**
diff --git a/inc/main/classes/scrypt/class_Scrypt.php b/inc/main/classes/scrypt/class_Scrypt.php
index 6fabd03f..6adee7a7 100644
--- a/inc/main/classes/scrypt/class_Scrypt.php
+++ b/inc/main/classes/scrypt/class_Scrypt.php
@@ -1,4 +1,9 @@
 <?php
+// Own namespace
+namespace Scrypt;
+
+// Import framework stuff
+use CoreFramework\Object\BaseFrameworkSystem;
 
 /**
  * This file contains a 'core-d' version of the example helper classes for the
diff --git a/inc/main/classes/stacker/class_BaseStacker.php b/inc/main/classes/stacker/class_BaseStacker.php
index 9e8be8df..a054afca 100644
--- a/inc/main/classes/stacker/class_BaseStacker.php
+++ b/inc/main/classes/stacker/class_BaseStacker.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace CoreFramework\Stacker;
+
+// Import framework stuff
+use CoreFramework\Object\BaseFrameworkSystem;
+
 /**
  * A general Stacker
  *
@@ -263,7 +269,5 @@ class BaseStacker extends BaseFrameworkSystem {
 		// Now, remove the last entry, we don't care about the return value here, see elseif() block above
 		return $this->shiftGenericArrayElement('stacks', $stackerName, 'entries');
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/states/class_BaseState.php b/inc/main/classes/states/class_BaseState.php
index 5fbce2ce..c11ce464 100644
--- a/inc/main/classes/states/class_BaseState.php
+++ b/inc/main/classes/states/class_BaseState.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace CoreFramework\State;
+
+// Import framework stuff
+use CoreFramework\Object\BaseFrameworkSystem;
+
 /**
  * A general state class
  *
@@ -71,7 +77,5 @@ class BaseState extends BaseFrameworkSystem implements Stateable {
 	public function executeState (Executor $executorInstance) {
 		throw new UnsupportedOperationException(array($this, __FUNCTION__, $executorInstance), self::EXCEPTION_UNSPPORTED_OPERATION);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/streams/class_BaseStream.php b/inc/main/classes/streams/class_BaseStream.php
index 4c84c61e..2e8e379b 100644
--- a/inc/main/classes/streams/class_BaseStream.php
+++ b/inc/main/classes/streams/class_BaseStream.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace CoreFramework\Stream;
+
+// Import framework stuff
+use CoreFramework\Object\BaseFrameworkSystem;
+
 /**
  * A general stream class
  *
@@ -32,7 +38,5 @@ class BaseStream extends BaseFrameworkSystem {
 		// Call parent constructor
 		parent::__construct($className);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/tasks/class_BaseTask.php b/inc/main/classes/tasks/class_BaseTask.php
index 7b35b8bd..9ddf7fc9 100644
--- a/inc/main/classes/tasks/class_BaseTask.php
+++ b/inc/main/classes/tasks/class_BaseTask.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace CoreFramework\Task;
+
+// Import framework stuff
+use CoreFramework\Object\BaseFrameworkSystem;
+
 /**
  * A general Task
  *
@@ -32,7 +38,5 @@ class BaseTask extends BaseFrameworkSystem {
 		// Call parent constructor
 		parent::__construct($className);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/template/class_BaseTemplateEngine.php b/inc/main/classes/template/class_BaseTemplateEngine.php
index 25d2d2c5..657efbd0 100644
--- a/inc/main/classes/template/class_BaseTemplateEngine.php
+++ b/inc/main/classes/template/class_BaseTemplateEngine.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace CoreFramework\TemplateEngine;
+
+// Import framework stuff
+use CoreFramework\Object\BaseFrameworkSystem;
+
 /**
  * A generic template engine
  *
@@ -1625,7 +1631,5 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
 		// Return compacted content
 		return $compactedContent;
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/user/class_BaseUser.php b/inc/main/classes/user/class_BaseUser.php
index 855eab62..65af3b2f 100644
--- a/inc/main/classes/user/class_BaseUser.php
+++ b/inc/main/classes/user/class_BaseUser.php
@@ -1,6 +1,12 @@
 <?php
+// Own namespace
+namespace CoreFramework\User;
+
+// Import framework stuff
+use CoreFramework\Object\BaseFrameworkSystem;
+
 /**
- * A general user class 
+ * A general user class
  *
  * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
@@ -357,7 +363,5 @@ class BaseUser extends BaseFrameworkSystem implements Updateable {
 		// Return it
 		return $isGuest;
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/classes/visitor/class_BaseVisitor.php b/inc/main/classes/visitor/class_BaseVisitor.php
index 305e9230..d6c73a45 100644
--- a/inc/main/classes/visitor/class_BaseVisitor.php
+++ b/inc/main/classes/visitor/class_BaseVisitor.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace CoreFramework\Visitor;
+
+// Import framework stuff
+use CoreFramework\Object\BaseFrameworkSystem;
+
 /**
  * A general visitor class
  *
@@ -56,7 +62,5 @@ class BaseVisitor extends BaseFrameworkSystem {
 	public final function getVisitorMode () {
 		return $this->visitorMode;
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/config/class_ConfigEntryIsEmptyException.php b/inc/main/exceptions/config/class_ConfigEntryIsEmptyException.php
index b601ef77..367d2d87 100644
--- a/inc/main/exceptions/config/class_ConfigEntryIsEmptyException.php
+++ b/inc/main/exceptions/config/class_ConfigEntryIsEmptyException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Configuration;
+
 /**
  * An exception thrown when a configuration entry is empty
  *
diff --git a/inc/main/exceptions/database/local_file/class_SavePathIsEmptyException.php b/inc/main/exceptions/database/local_file/class_SavePathIsEmptyException.php
index d188f159..6447f931 100644
--- a/inc/main/exceptions/database/local_file/class_SavePathIsEmptyException.php
+++ b/inc/main/exceptions/database/local_file/class_SavePathIsEmptyException.php
@@ -2,7 +2,7 @@
 // Own namespace
 namespace CoreFramework\Deprecated;
 
-// Load framework stuff
+// Import framework stuff
 use CoreFramework\Generic\FrameworkInterface;
 
 /**
diff --git a/inc/main/exceptions/file_directory/class_InvalidResourceException.php b/inc/main/exceptions/file_directory/class_InvalidResourceException.php
index 14a143a0..22a6adea 100644
--- a/inc/main/exceptions/file_directory/class_InvalidResourceException.php
+++ b/inc/main/exceptions/file_directory/class_InvalidResourceException.php
@@ -2,7 +2,7 @@
 // Own namespace
 namespace CoreFramework\Handler\Resource;
 
-// Load framework stuff
+// Import framework stuff
 use CoreFramework\Generic\FrameworkInterface;
 
 /**
diff --git a/inc/main/exceptions/file_directory/class_PathIsEmptyException.php b/inc/main/exceptions/file_directory/class_PathIsEmptyException.php
index 569f0714..7f7755f8 100644
--- a/inc/main/exceptions/file_directory/class_PathIsEmptyException.php
+++ b/inc/main/exceptions/file_directory/class_PathIsEmptyException.php
@@ -2,7 +2,7 @@
 // Own namespace
 namespace CoreFramework\Filesystem;
 
-// Load framework stuff
+// Import framework stuff
 use CoreFramework\Generic\FrameworkInterface;
 
 /**
diff --git a/inc/main/exceptions/language/class_LanguagePathIsEmptyException.php b/inc/main/exceptions/language/class_LanguagePathIsEmptyException.php
index 5e8191bc..0f6055d6 100644
--- a/inc/main/exceptions/language/class_LanguagePathIsEmptyException.php
+++ b/inc/main/exceptions/language/class_LanguagePathIsEmptyException.php
@@ -2,7 +2,7 @@
 // Own namespace
 namespace CoreFramework\Localization;
 
-// Load framework stuff
+// Import framework stuff
 use CoreFramework\Generic\FrameworkInterface;
 
 /**
diff --git a/inc/main/exceptions/main/class_DimNotFoundInArrayException.php b/inc/main/exceptions/main/class_DimNotFoundInArrayException.php
index c58591b1..858119e9 100644
--- a/inc/main/exceptions/main/class_DimNotFoundInArrayException.php
+++ b/inc/main/exceptions/main/class_DimNotFoundInArrayException.php
@@ -2,7 +2,7 @@
 // Own namespace
 namespace CoreFramework\Deprecated;
 
-// Load framework stuff
+// Import framework stuff
 use CoreFramework\Generic\FrameworkInterface;
 
 /**
diff --git a/inc/main/exceptions/main/class_InvalidObjectException.php b/inc/main/exceptions/main/class_InvalidObjectException.php
index 7ce7a937..3bf2207d 100644
--- a/inc/main/exceptions/main/class_InvalidObjectException.php
+++ b/inc/main/exceptions/main/class_InvalidObjectException.php
@@ -2,7 +2,7 @@
 // Own namespace
 namespace CoreFramework\Deprecated;
 
-// Load framework stuff
+// Import framework stuff
 use CoreFramework\Generic\FrameworkInterface;
 
 /**
diff --git a/inc/main/exceptions/main/class_NullPointerException.php b/inc/main/exceptions/main/class_NullPointerException.php
index b998fe7e..57af796a 100644
--- a/inc/main/exceptions/main/class_NullPointerException.php
+++ b/inc/main/exceptions/main/class_NullPointerException.php
@@ -2,7 +2,7 @@
 // Own namespace
 namespace CoreFramework\Generic;
 
-// Load framework stuff
+// Import framework stuff
 use CoreFramework\Generic\FrameworkInterface;
 
 /**
diff --git a/inc/main/exceptions/main/class_ResponseHeadersAlreadySentException.php b/inc/main/exceptions/main/class_ResponseHeadersAlreadySentException.php
index 77424c37..5c7f98eb 100644
--- a/inc/main/exceptions/main/class_ResponseHeadersAlreadySentException.php
+++ b/inc/main/exceptions/main/class_ResponseHeadersAlreadySentException.php
@@ -2,7 +2,7 @@
 // Own namespace
 namespace CoreFramework\Response;
 
-// Load framework stuff
+// Import framework stuff
 use CoreFramework\Generic\FrameworkInterface;
 
 /**
diff --git a/inc/main/exceptions/main/class_UnsupportedOperationException.php b/inc/main/exceptions/main/class_UnsupportedOperationException.php
index 8afaec33..17756b99 100644
--- a/inc/main/exceptions/main/class_UnsupportedOperationException.php
+++ b/inc/main/exceptions/main/class_UnsupportedOperationException.php
@@ -2,7 +2,7 @@
 // Own namespace
 namespace CoreFramework\Generic;
 
-// Load framework stuff
+// Import framework stuff
 use CoreFramework\Generic\FrameworkInterface;
 
 /**
diff --git a/inc/main/exceptions/template/class_BasePathIsEmptyException.php b/inc/main/exceptions/template/class_BasePathIsEmptyException.php
index aed9cdf7..2c066ef4 100644
--- a/inc/main/exceptions/template/class_BasePathIsEmptyException.php
+++ b/inc/main/exceptions/template/class_BasePathIsEmptyException.php
@@ -2,7 +2,7 @@
 // Own namespace
 namespace CoreFramework\Template;
 
-// Load framework stuff
+// Import framework stuff
 use CoreFramework\Generic\FrameworkInterface;
 
 /**
diff --git a/inc/main/exceptions/template/class_UnsupportedTemplateEngineException.php b/inc/main/exceptions/template/class_UnsupportedTemplateEngineException.php
index 06ae2fb6..4061fe66 100644
--- a/inc/main/exceptions/template/class_UnsupportedTemplateEngineException.php
+++ b/inc/main/exceptions/template/class_UnsupportedTemplateEngineException.php
@@ -2,7 +2,7 @@
 // Own namespace
 namespace CoreFramework\Template;
 
-// Load framework stuff
+// Import framework stuff
 use CoreFramework\Generic\FrameworkInterface;
 
 /**
diff --git a/inc/main/interfaces/actions/class_PerformableAction.php b/inc/main/interfaces/actions/class_PerformableAction.php
index ee4943c6..39e96a87 100644
--- a/inc/main/interfaces/actions/class_PerformableAction.php
+++ b/inc/main/interfaces/actions/class_PerformableAction.php
@@ -2,7 +2,7 @@
 // Own namespace
 namespace CoreFramework\Action;
 
-// Load framework stuff
+// Import framework stuff
 use CoreFramework\Generic\FrameworkInterface;
 
 /**
diff --git a/inc/main/interfaces/application/class_ManageableApplication.php b/inc/main/interfaces/application/class_ManageableApplication.php
index d2fbbe40..382c9547 100644
--- a/inc/main/interfaces/application/class_ManageableApplication.php
+++ b/inc/main/interfaces/application/class_ManageableApplication.php
@@ -2,7 +2,7 @@
 // Own namespace
 namespace CoreFramework\Manager;
 
-// Load framework stuff
+// Import framework stuff
 use CoreFramework\Generic\FrameworkInterface;
 
 /**
diff --git a/inc/main/interfaces/auth/class_Authorizeable.php b/inc/main/interfaces/auth/class_Authorizeable.php
index af8e897f..fe389d28 100644
--- a/inc/main/interfaces/auth/class_Authorizeable.php
+++ b/inc/main/interfaces/auth/class_Authorizeable.php
@@ -2,7 +2,7 @@
 // Own namespace
 namespace CoreFramework\Auth;
 
-// Load framework stuff
+// Import framework stuff
 use CoreFramework\Generic\FrameworkInterface;
 
 /**
diff --git a/inc/main/interfaces/block/class_Block.php b/inc/main/interfaces/block/class_Block.php
index a424ad04..3677e62b 100644
--- a/inc/main/interfaces/block/class_Block.php
+++ b/inc/main/interfaces/block/class_Block.php
@@ -2,7 +2,7 @@
 // Own namespace
 namespace CoreFramework\Filesystem;
 
-// Load framework stuff
+// Import framework stuff
 use CoreFramework\Generic\FrameworkInterface;
 
 /**
diff --git a/inc/main/interfaces/cache/class_Cacheable.php b/inc/main/interfaces/cache/class_Cacheable.php
index d83846a0..cdcc173b 100644
--- a/inc/main/interfaces/cache/class_Cacheable.php
+++ b/inc/main/interfaces/cache/class_Cacheable.php
@@ -2,7 +2,7 @@
 // Own namespace
 namespace CoreFramework\Cache;
 
-// Load framework stuff
+// Import framework stuff
 use CoreFramework\Generic\FrameworkInterface;
 
 /**
diff --git a/inc/main/interfaces/captcha/class_SolveableCaptcha.php b/inc/main/interfaces/captcha/class_SolveableCaptcha.php
index 763c5f82..5f20ee59 100644
--- a/inc/main/interfaces/captcha/class_SolveableCaptcha.php
+++ b/inc/main/interfaces/captcha/class_SolveableCaptcha.php
@@ -2,7 +2,7 @@
 // Own namespace
 namespace CoreFramework\Captcha;
 
-// Load framework stuff
+// Import framework stuff
 use CoreFramework\Generic\FrameworkInterface;
 
 
diff --git a/inc/main/interfaces/client/class_Client.php b/inc/main/interfaces/client/class_Client.php
index e26ac7a9..bb2f50b3 100644
--- a/inc/main/interfaces/client/class_Client.php
+++ b/inc/main/interfaces/client/class_Client.php
@@ -2,7 +2,7 @@
 // Own namespace
 namespace CoreFramework\Client;
 
-// Load framework stuff
+// Import framework stuff
 use CoreFramework\Generic\FrameworkInterface;
 
 /**
diff --git a/inc/main/interfaces/compressor/class_Compressor.php b/inc/main/interfaces/compressor/class_Compressor.php
index 2f2037e7..d06283f3 100644
--- a/inc/main/interfaces/compressor/class_Compressor.php
+++ b/inc/main/interfaces/compressor/class_Compressor.php
@@ -2,7 +2,7 @@
 // Own namespace
 namespace CoreFramework\Compression;
 
-// Load framework stuff
+// Import framework stuff
 use CoreFramework\Generic\FrameworkInterface;
 
 /**
diff --git a/inc/main/interfaces/controller/class_Controller.php b/inc/main/interfaces/controller/class_Controller.php
index 3d73ce15..75bcc658 100644
--- a/inc/main/interfaces/controller/class_Controller.php
+++ b/inc/main/interfaces/controller/class_Controller.php
@@ -2,7 +2,7 @@
 // Own namespace
 namespace CoreFramework\Controller;
 
-// Load framework stuff
+// Import framework stuff
 use CoreFramework\Generic\FrameworkInterface;
 
 /**
diff --git a/inc/main/interfaces/criteria/class_Criteria.php b/inc/main/interfaces/criteria/class_Criteria.php
index fc8414b5..0506238f 100644
--- a/inc/main/interfaces/criteria/class_Criteria.php
+++ b/inc/main/interfaces/criteria/class_Criteria.php
@@ -2,7 +2,7 @@
 // Own namespace
 namespace CoreFramework\Criteria;
 
-// Load framework stuff
+// Import framework stuff
 use CoreFramework\Generic\FrameworkInterface;
 
 /**
diff --git a/inc/main/interfaces/criteria/extended/class_AddableCriteria.php b/inc/main/interfaces/criteria/extended/class_AddableCriteria.php
index 71673a84..ddc2bd07 100644
--- a/inc/main/interfaces/criteria/extended/class_AddableCriteria.php
+++ b/inc/main/interfaces/criteria/extended/class_AddableCriteria.php
@@ -2,7 +2,7 @@
 // Own namespace
 namespace CoreFramework\Criteria;
 
-// Load framework stuff
+// Import framework stuff
 use CoreFramework\Generic\FrameworkInterface;
 
 /**
diff --git a/inc/main/interfaces/crypto/class_Cryptable.php b/inc/main/interfaces/crypto/class_Cryptable.php
index 4dcfef40..c667d3bf 100644
--- a/inc/main/interfaces/crypto/class_Cryptable.php
+++ b/inc/main/interfaces/crypto/class_Cryptable.php
@@ -2,7 +2,7 @@
 // Own namespace
 namespace CoreFramework\Cryto;
 
-// Load framework stuff
+// Import framework stuff
 use CoreFramework\Generic\FrameworkInterface;
 
 /**
diff --git a/inc/main/interfaces/database/class_DatabaseWrapper.php b/inc/main/interfaces/database/class_DatabaseWrapper.php
index c38585d0..31e7e872 100644
--- a/inc/main/interfaces/database/class_DatabaseWrapper.php
+++ b/inc/main/interfaces/database/class_DatabaseWrapper.php
@@ -2,7 +2,7 @@
 // Own namespace
 namespace CoreFramework\Wrapper\Database;
 
-// Load framework stuff
+// Import framework stuff
 use CoreFramework\Generic\FrameworkInterface;
 
 /**
diff --git a/inc/main/interfaces/database/class_FrameworkDatabase.php b/inc/main/interfaces/database/class_FrameworkDatabase.php
index d982c6ed..633b4966 100644
--- a/inc/main/interfaces/database/class_FrameworkDatabase.php
+++ b/inc/main/interfaces/database/class_FrameworkDatabase.php
@@ -2,7 +2,7 @@
 // Own namespace
 namespace CoreFramework\Database;
 
-// Load framework stuff
+// Import framework stuff
 use CoreFramework\Generic\FrameworkInterface;
 
 /**
diff --git a/inc/main/interfaces/database/class_Updateable.php b/inc/main/interfaces/database/class_Updateable.php
index 70f26343..d2fcbcfb 100644
--- a/inc/main/interfaces/database/class_Updateable.php
+++ b/inc/main/interfaces/database/class_Updateable.php
@@ -2,7 +2,7 @@
 // Own namespace
 namespace CoreFramework\Database;
 
-// Load framework stuff
+// Import framework stuff
 use CoreFramework\Generic\FrameworkInterface;
 
 /**
diff --git a/inc/main/interfaces/debug/class_Debugger.php b/inc/main/interfaces/debug/class_Debugger.php
index b6961585..7ee86072 100644
--- a/inc/main/interfaces/debug/class_Debugger.php
+++ b/inc/main/interfaces/debug/class_Debugger.php
@@ -2,7 +2,7 @@
 // Own namespace
 namespace CoreFramework\Debug;
 
-// Load framework stuff
+// Import framework stuff
 use CoreFramework\Generic\FrameworkInterface;
 
 /**
diff --git a/inc/main/interfaces/discovery/class_Discoverable.php b/inc/main/interfaces/discovery/class_Discoverable.php
index a28c1f6c..1357fc0e 100644
--- a/inc/main/interfaces/discovery/class_Discoverable.php
+++ b/inc/main/interfaces/discovery/class_Discoverable.php
@@ -2,7 +2,7 @@
 // Own namespace
 namespace CoreFramework\Discovery;
 
-// Load framework stuff
+// Import framework stuff
 use CoreFramework\Generic\FrameworkInterface;
 
 /**
diff --git a/inc/main/interfaces/feature/class_Feature.php b/inc/main/interfaces/feature/class_Feature.php
index 6485e738..9b301858 100644
--- a/inc/main/interfaces/feature/class_Feature.php
+++ b/inc/main/interfaces/feature/class_Feature.php
@@ -2,7 +2,7 @@
 // Own namespace
 namespace CoreFramework\Feature;
 
-// Load framework stuff
+// Import framework stuff
 use CoreFramework\Generic\FrameworkInterface;
 
 /**
diff --git a/inc/main/interfaces/filesystem/class_Filesystem.php b/inc/main/interfaces/filesystem/class_Filesystem.php
index c588bb7b..1f54684a 100644
--- a/inc/main/interfaces/filesystem/class_Filesystem.php
+++ b/inc/main/interfaces/filesystem/class_Filesystem.php
@@ -2,7 +2,7 @@
 // Own namespace
 namespace CoreFramework\FileSystem;
 
-// Load framework stuff
+// Import framework stuff
 use CoreFramework\Generic\FrameworkInterface;
 
 /**
diff --git a/inc/main/interfaces/filter/class_Filterable.php b/inc/main/interfaces/filter/class_Filterable.php
index 5956f964..a69046d0 100644
--- a/inc/main/interfaces/filter/class_Filterable.php
+++ b/inc/main/interfaces/filter/class_Filterable.php
@@ -2,7 +2,7 @@
 // Own namespace
 namespace CoreFramework\Filter;
 
-// Load framework stuff
+// Import framework stuff
 use CoreFramework\Generic\FrameworkInterface;
 
 /**
diff --git a/inc/main/interfaces/handler/class_Handleable.php b/inc/main/interfaces/handler/class_Handleable.php
index 9944d031..dcae6306 100644
--- a/inc/main/interfaces/handler/class_Handleable.php
+++ b/inc/main/interfaces/handler/class_Handleable.php
@@ -2,7 +2,7 @@
 // Own namespace
 namespace CoreFramework\Handler;
 
-// Load framework stuff
+// Import framework stuff
 use CoreFramework\Generic\FrameworkInterface;
 
 /**
diff --git a/inc/main/interfaces/helper/class_Helper.php b/inc/main/interfaces/helper/class_Helper.php
index 4308a748..5fdecab9 100644
--- a/inc/main/interfaces/helper/class_Helper.php
+++ b/inc/main/interfaces/helper/class_Helper.php
@@ -2,7 +2,7 @@
 // Own namespace
 namespace CoreFramework\Helper;
 
-// Load framework stuff
+// Import framework stuff
 use CoreFramework\Generic\FrameworkInterface;
 
 /**
diff --git a/inc/main/interfaces/index/class_Indexable.php b/inc/main/interfaces/index/class_Indexable.php
index 48c7c0da..8c15b85a 100644
--- a/inc/main/interfaces/index/class_Indexable.php
+++ b/inc/main/interfaces/index/class_Indexable.php
@@ -2,7 +2,7 @@
 // Own namespace
 namespace CoreFramework\Index;
 
-// Load framework stuff
+// Import framework stuff
 use CoreFramework\Generic\FrameworkInterface;
 
 /**
diff --git a/inc/main/interfaces/io/class_CloseableFile.php b/inc/main/interfaces/io/class_CloseableFile.php
index 28f540f5..1cc96b79 100644
--- a/inc/main/interfaces/io/class_CloseableFile.php
+++ b/inc/main/interfaces/io/class_CloseableFile.php
@@ -2,7 +2,7 @@
 // Own namespace
 namespace CoreFramework\Filesystem;
 
-// Load framework stuff
+// Import framework stuff
 use CoreFramework\Generic\FrameworkInterface;
 
 
diff --git a/inc/main/interfaces/io/class_FilePointer.php b/inc/main/interfaces/io/class_FilePointer.php
index 97442f73..f028738a 100644
--- a/inc/main/interfaces/io/class_FilePointer.php
+++ b/inc/main/interfaces/io/class_FilePointer.php
@@ -2,7 +2,7 @@
 // Own namespace
 namespace CoreFramework\Filesystem;
 
-// Load framework stuff
+// Import framework stuff
 use CoreFramework\Generic\FrameworkInterface;
 
 /**
diff --git a/inc/main/interfaces/io/class_Streamable.php b/inc/main/interfaces/io/class_Streamable.php
index d745474d..049fa1a3 100644
--- a/inc/main/interfaces/io/class_Streamable.php
+++ b/inc/main/interfaces/io/class_Streamable.php
@@ -2,7 +2,7 @@
 // Own namespace
 namespace CoreFramework\Streams;
 
-// Load framework stuff
+// Import framework stuff
 use CoreFramework\Generic\FrameworkInterface;
 
 /**
diff --git a/inc/main/interfaces/io/directory/class_FrameworkDirectory.php b/inc/main/interfaces/io/directory/class_FrameworkDirectory.php
index c2d4ed0a..17860e30 100644
--- a/inc/main/interfaces/io/directory/class_FrameworkDirectory.php
+++ b/inc/main/interfaces/io/directory/class_FrameworkDirectory.php
@@ -2,7 +2,7 @@
 // Own namespace
 namespace CoreFramework\Filesystem;
 
-// Load framework stuff
+// Import framework stuff
 use CoreFramework\Generic\FrameworkInterface;
 
 /**
diff --git a/inc/main/interfaces/io/file/handler/class_IoHandler.php b/inc/main/interfaces/io/file/handler/class_IoHandler.php
index dbd58766..a43baea9 100644
--- a/inc/main/interfaces/io/file/handler/class_IoHandler.php
+++ b/inc/main/interfaces/io/file/handler/class_IoHandler.php
@@ -2,7 +2,7 @@
 // Own namespace
 namespace CoreFramework\Handler\Stream;
 
-// Load framework stuff
+// Import framework stuff
 use CoreFramework\Generic\FrameworkInterface;
 
 /**
diff --git a/inc/main/interfaces/language/class_ManageableLanguage.php b/inc/main/interfaces/language/class_ManageableLanguage.php
index d448f022..44c5124d 100644
--- a/inc/main/interfaces/language/class_ManageableLanguage.php
+++ b/inc/main/interfaces/language/class_ManageableLanguage.php
@@ -2,7 +2,7 @@
 // Own namespace
 namespace CoreFramework\Localization;
 
-// Load framework stuff
+// Import framework stuff
 use CoreFramework\Generic\FrameworkInterface;
 
 /**
diff --git a/inc/main/interfaces/listener/class_Listenable.php b/inc/main/interfaces/listener/class_Listenable.php
index bac35bf2..20dae1f5 100644
--- a/inc/main/interfaces/listener/class_Listenable.php
+++ b/inc/main/interfaces/listener/class_Listenable.php
@@ -2,7 +2,7 @@
 // Own namespace
 namespace CoreFramework\Listener;
 
-// Load framework stuff
+// Import framework stuff
 use CoreFramework\Generic\FrameworkInterface;
 
 /**
diff --git a/inc/main/interfaces/lists/class_Listable.php b/inc/main/interfaces/lists/class_Listable.php
index 359b012d..0d96e791 100644
--- a/inc/main/interfaces/lists/class_Listable.php
+++ b/inc/main/interfaces/lists/class_Listable.php
@@ -2,7 +2,7 @@
 // Own namespace
 namespace CoreFramework\Lists;
 
-// Load framework stuff
+// Import framework stuff
 use CoreFramework\Generic\FrameworkInterface;
 
 /**
diff --git a/inc/main/interfaces/login/class_LoginableUser.php b/inc/main/interfaces/login/class_LoginableUser.php
index 6ddf2dad..4a87040b 100644
--- a/inc/main/interfaces/login/class_LoginableUser.php
+++ b/inc/main/interfaces/login/class_LoginableUser.php
@@ -2,7 +2,7 @@
 // Own namespace
 namespace CoreFramework\Auth;
 
-// Load framework stuff
+// Import framework stuff
 use CoreFramework\Generic\FrameworkInterface;
 
 /**
diff --git a/inc/main/interfaces/mailer/class_DeliverableMail.php b/inc/main/interfaces/mailer/class_DeliverableMail.php
index 8e0b31f7..144b977d 100644
--- a/inc/main/interfaces/mailer/class_DeliverableMail.php
+++ b/inc/main/interfaces/mailer/class_DeliverableMail.php
@@ -2,7 +2,7 @@
 // Own namespace
 namespace CoreFramework\Mailer;
 
-// Load framework stuff
+// Import framework stuff
 use CoreFramework\Generic\FrameworkInterface;
 
 /**
diff --git a/inc/main/interfaces/menu/class_RenderableMenu.php b/inc/main/interfaces/menu/class_RenderableMenu.php
index 5d2ba8b2..a1549dbf 100644
--- a/inc/main/interfaces/menu/class_RenderableMenu.php
+++ b/inc/main/interfaces/menu/class_RenderableMenu.php
@@ -2,7 +2,7 @@
 // Own namespace
 namespace CoreFramework\Menu;
 
-// Load framework stuff
+// Import framework stuff
 use CoreFramework\Generic\FrameworkInterface;
 
 /**
diff --git a/inc/main/interfaces/parser/class_Parseable.php b/inc/main/interfaces/parser/class_Parseable.php
index f3880bef..dc7965d7 100644
--- a/inc/main/interfaces/parser/class_Parseable.php
+++ b/inc/main/interfaces/parser/class_Parseable.php
@@ -2,7 +2,7 @@
 // Own namespace
 namespace CoreFramework\Parser;
 
-// Load framework stuff
+// Import framework stuff
 use CoreFramework\Generic\FrameworkInterface;
 
 /**
diff --git a/inc/main/interfaces/reader/class_ReadableNews.php b/inc/main/interfaces/reader/class_ReadableNews.php
index 88d4c60b..d5f7dada 100644
--- a/inc/main/interfaces/reader/class_ReadableNews.php
+++ b/inc/main/interfaces/reader/class_ReadableNews.php
@@ -2,7 +2,7 @@
 // Own namespace
 namespace CoreFramework\Reader\News;
 
-// Load framework stuff
+// Import framework stuff
 use CoreFramework\Generic\FrameworkInterface;
 
 /**
diff --git a/inc/main/interfaces/registry/class_Register.php b/inc/main/interfaces/registry/class_Register.php
index 33304d39..3fc6b55b 100644
--- a/inc/main/interfaces/registry/class_Register.php
+++ b/inc/main/interfaces/registry/class_Register.php
@@ -2,7 +2,7 @@
 // Own namespace
 namespace CoreFramework\Registry;
 
-// Load framework stuff
+// Import framework stuff
 use CoreFramework\Generic\FrameworkInterface;
 
 /**
diff --git a/inc/main/interfaces/registry/class_Registerable.php b/inc/main/interfaces/registry/class_Registerable.php
index f6905a41..551386fc 100644
--- a/inc/main/interfaces/registry/class_Registerable.php
+++ b/inc/main/interfaces/registry/class_Registerable.php
@@ -2,7 +2,7 @@
 // Own namespace
 namespace CoreFramework\Registry;
 
-// Load framework stuff
+// Import framework stuff
 use CoreFramework\Generic\FrameworkInterface;
 
 /**
diff --git a/inc/main/interfaces/request/class_Requestable.php b/inc/main/interfaces/request/class_Requestable.php
index d4a1efed..24b295a9 100644
--- a/inc/main/interfaces/request/class_Requestable.php
+++ b/inc/main/interfaces/request/class_Requestable.php
@@ -2,7 +2,7 @@
 // Own namespace
 namespace CoreFramework\Request;
 
-// Load framework stuff
+// Import framework stuff
 use CoreFramework\Generic\FrameworkInterface;
 
 /**
diff --git a/inc/main/interfaces/resolver/class_Resolver.php b/inc/main/interfaces/resolver/class_Resolver.php
index bc0c5c89..e06bdd43 100644
--- a/inc/main/interfaces/resolver/class_Resolver.php
+++ b/inc/main/interfaces/resolver/class_Resolver.php
@@ -2,7 +2,7 @@
 // Own namespace
 namespace CoreFramework\Resolver;
 
-// Load framework stuff
+// Import framework stuff
 use CoreFramework\Generic\FrameworkInterface;
 
 /**
diff --git a/inc/main/interfaces/response/class_Responseable.php b/inc/main/interfaces/response/class_Responseable.php
index d42751ec..dbd09ef8 100644
--- a/inc/main/interfaces/response/class_Responseable.php
+++ b/inc/main/interfaces/response/class_Responseable.php
@@ -2,7 +2,7 @@
 // Own namespace
 namespace CoreFramework\Response;
 
-// Load framework stuff
+// Import framework stuff
 use CoreFramework\Generic\FrameworkInterface;
 
 /**
diff --git a/inc/main/interfaces/result/class_SearchableResult.php b/inc/main/interfaces/result/class_SearchableResult.php
index 57282f47..4bd1b761 100644
--- a/inc/main/interfaces/result/class_SearchableResult.php
+++ b/inc/main/interfaces/result/class_SearchableResult.php
@@ -2,7 +2,7 @@
 // Own namespace
 namespace CoreFramework\Database\Result;
 
-// Load framework stuff
+// Import framework stuff
 use CoreFramework\Generic\FrameworkInterface;
 
 /**
diff --git a/inc/main/interfaces/stacker/class_Stackable.php b/inc/main/interfaces/stacker/class_Stackable.php
index c20937f5..8d28f94c 100644
--- a/inc/main/interfaces/stacker/class_Stackable.php
+++ b/inc/main/interfaces/stacker/class_Stackable.php
@@ -2,7 +2,7 @@
 // Own namespace
 namespace CoreFramework\Stackable;
 
-// Load framework stuff
+// Import framework stuff
 use CoreFramework\Generic\FrameworkInterface;
 
 /**
diff --git a/inc/main/interfaces/state/class_Stateable.php b/inc/main/interfaces/state/class_Stateable.php
index f9ab6cb5..f7944684 100644
--- a/inc/main/interfaces/state/class_Stateable.php
+++ b/inc/main/interfaces/state/class_Stateable.php
@@ -2,7 +2,7 @@
 // Own namespace
 namespace CoreFramework\State;
 
-// Load framework stuff
+// Import framework stuff
 use CoreFramework\Generic\FrameworkInterface;
 
 /**
diff --git a/inc/main/interfaces/streams/class_Stream.php b/inc/main/interfaces/streams/class_Stream.php
index ce54671f..33a5f120 100644
--- a/inc/main/interfaces/streams/class_Stream.php
+++ b/inc/main/interfaces/streams/class_Stream.php
@@ -2,7 +2,7 @@
 // Own namespace
 namespace CoreFramework\Stream;
 
-// Load framework stuff
+// Import framework stuff
 use CoreFramework\Generic\FrameworkInterface;
 
 /**
diff --git a/inc/main/interfaces/tasks/class_Taskable.php b/inc/main/interfaces/tasks/class_Taskable.php
index a82d74c2..07260579 100644
--- a/inc/main/interfaces/tasks/class_Taskable.php
+++ b/inc/main/interfaces/tasks/class_Taskable.php
@@ -2,7 +2,7 @@
 // Own namespace
 namespace CoreFramework\Task;
 
-// Load framework stuff
+// Import framework stuff
 use CoreFramework\Generic\FrameworkInterface;
 
 /**
diff --git a/inc/main/interfaces/template/class_CompileableTemplate.php b/inc/main/interfaces/template/class_CompileableTemplate.php
index 8b8e7a96..ac5999e2 100644
--- a/inc/main/interfaces/template/class_CompileableTemplate.php
+++ b/inc/main/interfaces/template/class_CompileableTemplate.php
@@ -2,7 +2,7 @@
 // Own namespace
 namespace CoreFramework\Template;
 
-// Load framework stuff
+// Import framework stuff
 use CoreFramework\Generic\FrameworkInterface;
 
 /**
diff --git a/inc/main/interfaces/template/view/class_ViewHelper.php b/inc/main/interfaces/template/view/class_ViewHelper.php
index 0dcd8b89..5e9ee1d8 100644
--- a/inc/main/interfaces/template/view/class_ViewHelper.php
+++ b/inc/main/interfaces/template/view/class_ViewHelper.php
@@ -2,7 +2,7 @@
 // Own namespace
 namespace CoreFramework\Helper\View;
 
-// Load framework stuff
+// Import framework stuff
 use CoreFramework\Generic\FrameworkInterface;
 
 /**
diff --git a/inc/main/interfaces/user/class_ManageableAccount.php b/inc/main/interfaces/user/class_ManageableAccount.php
index eca48209..20576bd8 100644
--- a/inc/main/interfaces/user/class_ManageableAccount.php
+++ b/inc/main/interfaces/user/class_ManageableAccount.php
@@ -2,7 +2,7 @@
 // Own namespace
 namespace CoreFramework\User;
 
-// Load framework stuff
+// Import framework stuff
 use CoreFramework\Generic\FrameworkInterface;
 
 /**
diff --git a/inc/main/interfaces/visitor/class_Visitable.php b/inc/main/interfaces/visitor/class_Visitable.php
index cc7cc699..816913a8 100644
--- a/inc/main/interfaces/visitor/class_Visitable.php
+++ b/inc/main/interfaces/visitor/class_Visitable.php
@@ -2,7 +2,7 @@
 // Own namespace
 namespace CoreFramework\Visitor;
 
-// Load framework stuff
+// Import framework stuff
 use CoreFramework\Generic\FrameworkInterface;
 
 /**
diff --git a/inc/main/interfaces/visitor/class_Visitor.php b/inc/main/interfaces/visitor/class_Visitor.php
index 90abc4ad..872404d0 100644
--- a/inc/main/interfaces/visitor/class_Visitor.php
+++ b/inc/main/interfaces/visitor/class_Visitor.php
@@ -2,7 +2,7 @@
 // Own namespace
 namespace CoreFramework\Visitor;
 
-// Load framework stuff
+// Import framework stuff
 use CoreFramework\Generic\FrameworkInterface;
 
 /**
diff --git a/inc/main/middleware/class_BaseMiddleware.php b/inc/main/middleware/class_BaseMiddleware.php
index 71af5515..695d2be6 100644
--- a/inc/main/middleware/class_BaseMiddleware.php
+++ b/inc/main/middleware/class_BaseMiddleware.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace CoreFramework\Middleware;
+
+// Import framework stuff
+use CoreFramework\Object\BaseFrameworkSystem;
+
 /**
  * An abstract middleware class for all other middlware classes
  *
@@ -32,7 +38,5 @@ class BaseMiddleware extends BaseFrameworkSystem {
 		// Call parent constructor
 		parent::__construct($className);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/middleware/io/class_FileIoHandler.php b/inc/main/middleware/io/class_FileIoHandler.php
index f85d4fd2..4966e75d 100644
--- a/inc/main/middleware/io/class_FileIoHandler.php
+++ b/inc/main/middleware/io/class_FileIoHandler.php
@@ -2,7 +2,7 @@
 // Own namespace
 namespace CoreFramework\Handler\Filesystem;
 
-// Load framework stuff
+// Import framework stuff
 use CoreFramework\Generic\FrameworkInterface;
 
 /**
diff --git a/inc/main/third_party/api/primusportal/class_PrimeraApi.php b/inc/main/third_party/api/primusportal/class_PrimeraApi.php
index b78bf55d..20288de8 100644
--- a/inc/main/third_party/api/primusportal/class_PrimeraApi.php
+++ b/inc/main/third_party/api/primusportal/class_PrimeraApi.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace PrimeraPortal\Api;
+
+// Import framework stuff
+use CoreFramework\Object\BaseFrameworkSystem;
+
 /**
  * PrimeraApi
  * -------------------------------------------
@@ -252,12 +258,12 @@ class PrimeraApi extends BaseFrameworkSystem {
 		$postReturn = $this->parseContent( $this->queryApi($postData) );
 
 		$this->data = $postReturn;
+
 		if ($postReturn['status'] == self::PI_GET_PRIMERA_DONE) {
 			$primera = $postReturn['primera'];
 		} // END - if
+
 		return $primera;
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/third_party/api/wernisportal/class_WernisApi.php b/inc/main/third_party/api/wernisportal/class_WernisApi.php
index 65bf0372..c64fba3e 100644
--- a/inc/main/third_party/api/wernisportal/class_WernisApi.php
+++ b/inc/main/third_party/api/wernisportal/class_WernisApi.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Wds66\Api;
+
+// Import framework stuff
+use CoreFramework\Object\BaseFrameworkSystem;
+
 /**
  * Class for connecting to the Wernis-Portal at http://www.wds66.com
  *
@@ -418,7 +424,5 @@ class WernisApi extends BaseFrameworkSystem {
 		// Return response
 		return $response;
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/selector.php b/inc/selector.php
index 01377960..19095dc1 100644
--- a/inc/selector.php
+++ b/inc/selector.php
@@ -1,4 +1,8 @@
 <?php
+// Import framework stuff
+use CoreFramework\Configuration\FrameworkConfiguration;
+use CoreFramework\Object\BaseFrameworkSystem;
+
 /**
  * The application selector main include file
  *
@@ -78,6 +82,3 @@ unset($appInc);
 unset($configAppIncludes);
 unset($appFqFn);
 unset($basePathFile);
-
-// [EOF]
-?>
diff --git a/index.php b/index.php
index b54c7661..34e000d4 100644
--- a/index.php
+++ b/index.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace (watch out: core)
+namespace CoreFramework\EntryPoint;
+
+// Import framework stuff
+use CoreFramework\Configuration\FrameworkConfiguration;
+
 /**
  * The main class with the entry point to the whole application. This class
  * "emulates" Java's entry point call. Additionally it covers local