From: Roland Häder <roland@mxchange.org>
Date: Fri, 19 May 2017 00:20:43 +0000 (+0200)
Subject: Next larger wave:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=40ad72f9b87e12a73bf74ffda16aff06b8fecf15;p=hub.git

Next larger wave:
- imported all (?) object factories
- created more namespaces

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

diff --git a/application/hub/classes/commands/console/class_HubConsoleAptProxyCommand.php b/application/hub/classes/commands/console/class_HubConsoleAptProxyCommand.php
index 839a82b66..fec457461 100644
--- a/application/hub/classes/commands/console/class_HubConsoleAptProxyCommand.php
+++ b/application/hub/classes/commands/console/class_HubConsoleAptProxyCommand.php
@@ -6,6 +6,7 @@ namespace Hub\Command;
 use CoreFramework\Command\BaseCommand;
 use CoreFramework\Command\Commandable;
 use CoreFramework\Controller\Controller;
+use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Resolver\Command\CommandResolver;
 use CoreFramework\Response\Responseable;
diff --git a/application/hub/classes/commands/console/class_HubConsoleChatCommand.php b/application/hub/classes/commands/console/class_HubConsoleChatCommand.php
index 43e94f098..ecfc236a8 100644
--- a/application/hub/classes/commands/console/class_HubConsoleChatCommand.php
+++ b/application/hub/classes/commands/console/class_HubConsoleChatCommand.php
@@ -6,6 +6,7 @@ namespace Hub\Command;
 use CoreFramework\Command\BaseCommand;
 use CoreFramework\Command\Commandable;
 use CoreFramework\Controller\Controller;
+use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Resolver\Command\CommandResolver;
 use CoreFramework\Response\Responseable;
diff --git a/application/hub/classes/commands/console/class_HubConsoleCrawlerCommand.php b/application/hub/classes/commands/console/class_HubConsoleCrawlerCommand.php
index 4bafac6d0..713662ef6 100644
--- a/application/hub/classes/commands/console/class_HubConsoleCrawlerCommand.php
+++ b/application/hub/classes/commands/console/class_HubConsoleCrawlerCommand.php
@@ -6,6 +6,7 @@ namespace Hub\Command;
 use CoreFramework\Command\BaseCommand;
 use CoreFramework\Command\Commandable;
 use CoreFramework\Controller\Controller;
+use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Resolver\Command\CommandResolver;
 use CoreFramework\Response\Responseable;
diff --git a/application/hub/classes/commands/console/class_HubConsoleCruncherCommand.php b/application/hub/classes/commands/console/class_HubConsoleCruncherCommand.php
index b8da2bc15..87689b593 100644
--- a/application/hub/classes/commands/console/class_HubConsoleCruncherCommand.php
+++ b/application/hub/classes/commands/console/class_HubConsoleCruncherCommand.php
@@ -6,6 +6,7 @@ namespace Hub\Command;
 use CoreFramework\Command\BaseCommand;
 use CoreFramework\Command\Commandable;
 use CoreFramework\Controller\Controller;
+use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Resolver\Command\CommandResolver;
 use CoreFramework\Response\Responseable;
diff --git a/application/hub/classes/commands/console/class_HubConsoleMainCommand.php b/application/hub/classes/commands/console/class_HubConsoleMainCommand.php
index db9deed0e..2d4ac91a4 100644
--- a/application/hub/classes/commands/console/class_HubConsoleMainCommand.php
+++ b/application/hub/classes/commands/console/class_HubConsoleMainCommand.php
@@ -8,6 +8,7 @@ use Hub\Factory\Node\NodeObjectFactory;
 // Import framework stuff
 use CoreFramework\Command\BaseCommand;
 use CoreFramework\Command\Commandable;
+use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Controller\Controller;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Resolver\Command\CommandResolver;
diff --git a/application/hub/classes/commands/console/class_HubConsoleMinerCommand.php b/application/hub/classes/commands/console/class_HubConsoleMinerCommand.php
index 9e0d72f4a..6e73dc9ea 100644
--- a/application/hub/classes/commands/console/class_HubConsoleMinerCommand.php
+++ b/application/hub/classes/commands/console/class_HubConsoleMinerCommand.php
@@ -6,6 +6,7 @@ namespace Hub\Command;
 use CoreFramework\Command\BaseCommand;
 use CoreFramework\Command\Commandable;
 use CoreFramework\Controller\Controller;
+use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Resolver\Command\CommandResolver;
 use CoreFramework\Response\Responseable;
diff --git a/application/hub/classes/commands/html/class_HubHtmlIndexCommand.php b/application/hub/classes/commands/html/class_HubHtmlIndexCommand.php
index 82efd47fb..95f04f901 100644
--- a/application/hub/classes/commands/html/class_HubHtmlIndexCommand.php
+++ b/application/hub/classes/commands/html/class_HubHtmlIndexCommand.php
@@ -6,6 +6,7 @@ namespace Hub\Command;
 use CoreFramework\Command\BaseCommand;
 use CoreFramework\Command\Commandable;
 use CoreFramework\Controller\Controller;
+use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Resolver\Command\CommandResolver;
 use CoreFramework\Response\Responseable;
diff --git a/application/hub/classes/controller/console/class_HubConsoleDefaultNewsController.php b/application/hub/classes/controller/console/class_HubConsoleDefaultNewsController.php
index 32c98b6c8..7786a60d3 100644
--- a/application/hub/classes/controller/console/class_HubConsoleDefaultNewsController.php
+++ b/application/hub/classes/controller/console/class_HubConsoleDefaultNewsController.php
@@ -5,6 +5,7 @@ namespace Hub\Controller;
 // Import framework stuff
 use CoreFramework\Controller\BaseController;
 use CoreFramework\Controller\Controller;
+use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Resolver\Command\CommandResolver;
 use CoreFramework\Response\Responseable;
diff --git a/application/hub/classes/cruncher/mcrypt/class_HubMcryptCruncher.php b/application/hub/classes/cruncher/mcrypt/class_HubMcryptCruncher.php
index 600d6babc..c35977bbe 100644
--- a/application/hub/classes/cruncher/mcrypt/class_HubMcryptCruncher.php
+++ b/application/hub/classes/cruncher/mcrypt/class_HubMcryptCruncher.php
@@ -4,6 +4,7 @@ namespace Hub\Cruncher\Mcrypt;
 
 // Import framework stuff
 use CoreFramework\Controller\Controller;
+use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Response\Responseable;
 
 /**
diff --git a/application/hub/classes/database/frontend/cruncher/class_CruncherUnitDatabaseWrapper.php b/application/hub/classes/database/frontend/cruncher/class_CruncherUnitDatabaseWrapper.php
index 9beb90018..eefacad0b 100644
--- a/application/hub/classes/database/frontend/cruncher/class_CruncherUnitDatabaseWrapper.php
+++ b/application/hub/classes/database/frontend/cruncher/class_CruncherUnitDatabaseWrapper.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Hub\Database\Frontend\Cruncher\Unit;
+
+// Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
+
 /**
  * A database wrapper for cruncher work/test units
  *
diff --git a/application/hub/classes/database/frontend/node/class_NodeDistributedHashTableDatabaseWrapper.php b/application/hub/classes/database/frontend/node/class_NodeDistributedHashTableDatabaseWrapper.php
index 7e074d925..24232404b 100644
--- a/application/hub/classes/database/frontend/node/class_NodeDistributedHashTableDatabaseWrapper.php
+++ b/application/hub/classes/database/frontend/node/class_NodeDistributedHashTableDatabaseWrapper.php
@@ -5,6 +5,9 @@ namespace Hub\Database\Frontend\Node\Dht;
 // Import application-specific stuff
 use Hub\Factory\Node\NodeObjectFactory;
 
+// Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
+
 /**
  * A database wrapper for distributed hash tables
  *
diff --git a/application/hub/classes/database/frontend/node/class_NodeInformationDatabaseWrapper.php b/application/hub/classes/database/frontend/node/class_NodeInformationDatabaseWrapper.php
index 4aa5d467d..c105b7c1b 100644
--- a/application/hub/classes/database/frontend/node/class_NodeInformationDatabaseWrapper.php
+++ b/application/hub/classes/database/frontend/node/class_NodeInformationDatabaseWrapper.php
@@ -3,6 +3,7 @@
 namespace Hub\Database\Frontend\Node\Information;
 
 // Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Request\Requestable;
 
 /**
diff --git a/application/hub/classes/database/frontend/states/class_PeerStateLookupDatabaseWrapper.php b/application/hub/classes/database/frontend/states/class_PeerStateLookupDatabaseWrapper.php
index 2b26a84b3..a7bbe4e82 100644
--- a/application/hub/classes/database/frontend/states/class_PeerStateLookupDatabaseWrapper.php
+++ b/application/hub/classes/database/frontend/states/class_PeerStateLookupDatabaseWrapper.php
@@ -2,9 +2,12 @@
 // Own namespace
 namespace Hub\Database\Frontend\Node\PeerState;
 
-// Import hub-specific sutff
+// Import application-specific sutff
 use Hub\Tools\HubTools;
 
+// Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
+
 /**
  * A database wrapper for peer state lookups
  *
diff --git a/application/hub/classes/dht/node/class_NodeDhtFacade.php b/application/hub/classes/dht/node/class_NodeDhtFacade.php
index 72b2b161c..e8f1a2420 100644
--- a/application/hub/classes/dht/node/class_NodeDhtFacade.php
+++ b/application/hub/classes/dht/node/class_NodeDhtFacade.php
@@ -5,6 +5,9 @@ namespace Hub\Node\Dht;
 // Import hub-specific stuff
 use Hub\Generic\BaseHubSystem;
 
+// Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
+
 /**
  * A Node DHT facade class
  *
diff --git a/application/hub/classes/factories/chain/class_PackageFilterChainFactory.php b/application/hub/classes/factories/chain/class_PackageFilterChainFactory.php
index 9cd32b50e..755787506 100644
--- a/application/hub/classes/factories/chain/class_PackageFilterChainFactory.php
+++ b/application/hub/classes/factories/chain/class_PackageFilterChainFactory.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Hub\Factory\FilterChain\Package;
+
+// Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
+
 /**
  * A factory class for network packages
  *
diff --git a/application/hub/classes/factories/chunks/class_ChunkHandlerFactory.php b/application/hub/classes/factories/chunks/class_ChunkHandlerFactory.php
index 3cda26f3d..d9242cf44 100644
--- a/application/hub/classes/factories/chunks/class_ChunkHandlerFactory.php
+++ b/application/hub/classes/factories/chunks/class_ChunkHandlerFactory.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Hub\Factory\Handler\Chunk;
+
+// Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
+
 /**
  * A factory class for chunk handler
  *
diff --git a/application/hub/classes/factories/communicator/class_CommunicatorFactory.php b/application/hub/classes/factories/communicator/class_CommunicatorFactory.php
index 8a7ba8aa7..47cbfcde0 100644
--- a/application/hub/classes/factories/communicator/class_CommunicatorFactory.php
+++ b/application/hub/classes/factories/communicator/class_CommunicatorFactory.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Hub\Factory\Communicator;
+
+// Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
+
 /**
  * A factory class for communicator
  *
diff --git a/application/hub/classes/factories/decoder/class_DecoderFactory.php b/application/hub/classes/factories/decoder/class_DecoderFactory.php
index 7125c6a9f..1fb21442a 100644
--- a/application/hub/classes/factories/decoder/class_DecoderFactory.php
+++ b/application/hub/classes/factories/decoder/class_DecoderFactory.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Hub\Factory\Decoder;
+
+// Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
+
 /**
  * A factory class for Decodeable objects
  *
diff --git a/application/hub/classes/factories/discovery/class_PackageDiscoveryFactory.php b/application/hub/classes/factories/discovery/class_PackageDiscoveryFactory.php
index ef5725663..7b595eeaf 100644
--- a/application/hub/classes/factories/discovery/class_PackageDiscoveryFactory.php
+++ b/application/hub/classes/factories/discovery/class_PackageDiscoveryFactory.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Hub\Factory\Discovery\Package;
+
+// Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
+
 /**
  * A factory class for package discovery
  *
diff --git a/application/hub/classes/factories/discovery/class_SocketDiscoveryFactory.php b/application/hub/classes/factories/discovery/class_SocketDiscoveryFactory.php
index 6991c7fa5..a1a634f8a 100644
--- a/application/hub/classes/factories/discovery/class_SocketDiscoveryFactory.php
+++ b/application/hub/classes/factories/discovery/class_SocketDiscoveryFactory.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Hub\Factory\Discovery\Socket;
+
+// Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
+
 /**
  * A factory class for socket discovery
  *
diff --git a/application/hub/classes/factories/handler/class_MessageTypeHandlerFactory.php b/application/hub/classes/factories/handler/class_MessageTypeHandlerFactory.php
index ce750231f..157b877de 100644
--- a/application/hub/classes/factories/handler/class_MessageTypeHandlerFactory.php
+++ b/application/hub/classes/factories/handler/class_MessageTypeHandlerFactory.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Hub\Factory\Handler\Message;
+
+// Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
+
 /**
  * A factory class for message type handlers
  *
diff --git a/application/hub/classes/factories/handler/class_ProtocolHandlerFactory.php b/application/hub/classes/factories/handler/class_ProtocolHandlerFactory.php
index 880f889bf..c10bb85b1 100644
--- a/application/hub/classes/factories/handler/class_ProtocolHandlerFactory.php
+++ b/application/hub/classes/factories/handler/class_ProtocolHandlerFactory.php
@@ -1,4 +1,9 @@
 <?php
+// Own namespace
+namespace Hub\Factory\Handler\Protocol;
+
+// Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
 /**
  * A factory class for protocol handlers
  *
diff --git a/application/hub/classes/factories/info/class_ConnectionInfoFactory.php b/application/hub/classes/factories/info/class_ConnectionInfoFactory.php
index fde9a37df..3871f6dc4 100644
--- a/application/hub/classes/factories/info/class_ConnectionInfoFactory.php
+++ b/application/hub/classes/factories/info/class_ConnectionInfoFactory.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Hub\Factory\Connection;
+
+// Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
+
 /**
  * A factory class for ShareableInfo
  *
diff --git a/application/hub/classes/factories/lists/class_RecipientListFactory.php b/application/hub/classes/factories/lists/class_RecipientListFactory.php
index c94b18c83..11dae1ff2 100644
--- a/application/hub/classes/factories/lists/class_RecipientListFactory.php
+++ b/application/hub/classes/factories/lists/class_RecipientListFactory.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Hub\Factory\List\Recipient;
+
+// Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
+
 /**
  * A factory class for recipient lists
  *
diff --git a/application/hub/classes/factories/node/class_NodeObjectFactory.php b/application/hub/classes/factories/node/class_NodeObjectFactory.php
index 4fd26c8de..146896c0c 100644
--- a/application/hub/classes/factories/node/class_NodeObjectFactory.php
+++ b/application/hub/classes/factories/node/class_NodeObjectFactory.php
@@ -3,6 +3,7 @@
 namespace Hub\Factory\Node;
 
 // Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 
diff --git a/application/hub/classes/factories/package/assembler/class_PackageAssemblerFactory.php b/application/hub/classes/factories/package/assembler/class_PackageAssemblerFactory.php
index 43bccf466..e7306ad10 100644
--- a/application/hub/classes/factories/package/assembler/class_PackageAssemblerFactory.php
+++ b/application/hub/classes/factories/package/assembler/class_PackageAssemblerFactory.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Hub\Factory\Assembler\Package;
+
+// Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
+
 /**
  * A factory class for package assembler
  *
diff --git a/application/hub/classes/factories/package/class_NetworkPackageFactory.php b/application/hub/classes/factories/package/class_NetworkPackageFactory.php
index 725c6768b..ac2f793e3 100644
--- a/application/hub/classes/factories/package/class_NetworkPackageFactory.php
+++ b/application/hub/classes/factories/package/class_NetworkPackageFactory.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Hub\Factory\Network;
+
+// Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
+
 /**
  * A factory class for network packages
  *
diff --git a/application/hub/classes/factories/package/fragmenter/class_FragmenterFactory.php b/application/hub/classes/factories/package/fragmenter/class_FragmenterFactory.php
index 53ccc271a..7d8d26635 100644
--- a/application/hub/classes/factories/package/fragmenter/class_FragmenterFactory.php
+++ b/application/hub/classes/factories/package/fragmenter/class_FragmenterFactory.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Hub\Factory\Fragmenter;
+
+// Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
+
 /**
  * A factory class for fragmenter
  *
diff --git a/application/hub/classes/factories/producer/class_ProducerFactory.php b/application/hub/classes/factories/producer/class_ProducerFactory.php
index 91a6f9b1e..7b3720086 100644
--- a/application/hub/classes/factories/producer/class_ProducerFactory.php
+++ b/application/hub/classes/factories/producer/class_ProducerFactory.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Hub\Factory\Producer;
+
+// Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
+
 /**
  * A factory class for producer
  *
diff --git a/application/hub/classes/factories/registry/class_ObjectTypeRegistryFactory.php b/application/hub/classes/factories/registry/class_ObjectTypeRegistryFactory.php
index 23dae6b51..72b3e38ea 100644
--- a/application/hub/classes/factories/registry/class_ObjectTypeRegistryFactory.php
+++ b/application/hub/classes/factories/registry/class_ObjectTypeRegistryFactory.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Hub\Factory\Registry\Object;
+
+// Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
+
 /**
  * A factory class for network packages
  *
diff --git a/application/hub/classes/factories/resolver/class_ProtocolResolverFactory.php b/application/hub/classes/factories/resolver/class_ProtocolResolverFactory.php
index 2e9b07ef2..ca5ccf636 100644
--- a/application/hub/classes/factories/resolver/class_ProtocolResolverFactory.php
+++ b/application/hub/classes/factories/resolver/class_ProtocolResolverFactory.php
@@ -4,6 +4,7 @@ namespace Hub\Factory\Resolver;
 
 // Import framework stuff
 use CoreFramework\Configuration\FrameworkConfiguration;
+use CoreFramework\Factory\ObjectFactory;
 
 /**
  * A factory class for ProtocolResolver
diff --git a/application/hub/classes/factories/scanner/class_ScannerObjectFactory.php b/application/hub/classes/factories/scanner/class_ScannerObjectFactory.php
index d6f0129f2..87d1c614d 100644
--- a/application/hub/classes/factories/scanner/class_ScannerObjectFactory.php
+++ b/application/hub/classes/factories/scanner/class_ScannerObjectFactory.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Hub\Factory\Scanner;
+
+// Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
+
 /**
  * A factory class for scanners
  *
diff --git a/application/hub/classes/factories/socket/class_SocketFactory.php b/application/hub/classes/factories/socket/class_SocketFactory.php
index ec1c9c22a..fcf4f499d 100644
--- a/application/hub/classes/factories/socket/class_SocketFactory.php
+++ b/application/hub/classes/factories/socket/class_SocketFactory.php
@@ -3,6 +3,7 @@
 namespace Hub\Factory\Socket;
 
 // Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Configuration\FrameworkConfiguration;
 
 /**
diff --git a/application/hub/classes/factories/source/units/class_UnitSourceFactory.php b/application/hub/classes/factories/source/units/class_UnitSourceFactory.php
index dcb967c1b..837dc5224 100644
--- a/application/hub/classes/factories/source/units/class_UnitSourceFactory.php
+++ b/application/hub/classes/factories/source/units/class_UnitSourceFactory.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Hub\Source\Unit;
+
+// Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
+
 /**
  * A factory class for unit sources
  *
diff --git a/application/hub/classes/factories/source/url/class_UrlSourceObjectFactory.php b/application/hub/classes/factories/source/url/class_UrlSourceObjectFactory.php
index fe2025fab..fed603d29 100644
--- a/application/hub/classes/factories/source/url/class_UrlSourceObjectFactory.php
+++ b/application/hub/classes/factories/source/url/class_UrlSourceObjectFactory.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Hub\Source\Url;
+
+// Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
+
 /**
  * A factory class for URL sources
  *
@@ -57,7 +63,7 @@ class UrlSourceObjectFactory extends ObjectFactory {
 			$sourceInstance = Registry::getRegistry()->getInstance('source_' . $sourceType);
 		} else {
 			// Get the source instance
-			$sourceInstance = ObjectFactory::createObjectByConfiguredName($sourceType . '_class');
+			$sourceInstance = self::createObjectByConfiguredName($sourceType . '_class');
 
 			// Add it to the registry
 			Registry::getRegistry()->addInstance('source_' . $sourceType, $sourceInstance);
diff --git a/application/hub/classes/factories/states/communicator/class_CommunicatorStateFactory.php b/application/hub/classes/factories/states/communicator/class_CommunicatorStateFactory.php
index 6cdfc6a76..affed62bd 100644
--- a/application/hub/classes/factories/states/communicator/class_CommunicatorStateFactory.php
+++ b/application/hub/classes/factories/states/communicator/class_CommunicatorStateFactory.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Hub\Factory\State\Communicator;
+
+// Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
+
 /**
  * A factory class for communicator states
  *
diff --git a/application/hub/classes/factories/states/crawler/class_CrawlerStateFactory.php b/application/hub/classes/factories/states/crawler/class_CrawlerStateFactory.php
index e1ee18e3b..2cee0ad99 100644
--- a/application/hub/classes/factories/states/crawler/class_CrawlerStateFactory.php
+++ b/application/hub/classes/factories/states/crawler/class_CrawlerStateFactory.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Hub\Factory\State\Crawler;
+
+// Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
+
 /**
  * A factory class for crawler states
  *
diff --git a/application/hub/classes/factories/states/cruncher/class_CruncherStateFactory.php b/application/hub/classes/factories/states/cruncher/class_CruncherStateFactory.php
index eac13d2e2..399ead21b 100644
--- a/application/hub/classes/factories/states/cruncher/class_CruncherStateFactory.php
+++ b/application/hub/classes/factories/states/cruncher/class_CruncherStateFactory.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Hub\Factory\State\Cruncher;
+
+// Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
+
 /**
  * A factory class for cruncher states
  *
diff --git a/application/hub/classes/factories/states/dht/class_DhtStateFactory.php b/application/hub/classes/factories/states/dht/class_DhtStateFactory.php
index 0d786bd80..b940aafd3 100644
--- a/application/hub/classes/factories/states/dht/class_DhtStateFactory.php
+++ b/application/hub/classes/factories/states/dht/class_DhtStateFactory.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Hub\Factory\State\Dht;
+
+// Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
+
 /**
  * A factory class for DHT states
  *
diff --git a/application/hub/classes/factories/states/miner/class_MinerStateFactory.php b/application/hub/classes/factories/states/miner/class_MinerStateFactory.php
index 068a0a756..0c3b620e6 100644
--- a/application/hub/classes/factories/states/miner/class_MinerStateFactory.php
+++ b/application/hub/classes/factories/states/miner/class_MinerStateFactory.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Hub\Factory\State\Miner;
+
+// Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
+
 /**
  * A factory class for miner states
  *
diff --git a/application/hub/classes/factories/states/node/class_NodeStateFactory.php b/application/hub/classes/factories/states/node/class_NodeStateFactory.php
index 4224bf70b..71e5b7c3f 100644
--- a/application/hub/classes/factories/states/node/class_NodeStateFactory.php
+++ b/application/hub/classes/factories/states/node/class_NodeStateFactory.php
@@ -5,6 +5,9 @@ namespace Hub\Factory\State\Node;
 // Import application-specific stuff
 use Hub\Factory\Node\NodeObjectFactory;
 
+// Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
+
 /**
  * A factory class for node states
  *
diff --git a/application/hub/classes/factories/states/peer/class_PeerStateFactory.php b/application/hub/classes/factories/states/peer/class_PeerStateFactory.php
index 2c9239877..fdfb7fdf8 100644
--- a/application/hub/classes/factories/states/peer/class_PeerStateFactory.php
+++ b/application/hub/classes/factories/states/peer/class_PeerStateFactory.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Hub\Factory\State\Peer;
+
+// Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
+
 /**
  * A factory class for peer states
  *
diff --git a/application/hub/classes/factories/tags/class_PackageTagsFactory.php b/application/hub/classes/factories/tags/class_PackageTagsFactory.php
index 1fde988bf..f7ad8436a 100644
--- a/application/hub/classes/factories/tags/class_PackageTagsFactory.php
+++ b/application/hub/classes/factories/tags/class_PackageTagsFactory.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Hub\Factory\Tag\Package;
+
+// Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
+
 /**
  * A factory class for network packages
  *
diff --git a/application/hub/classes/filter/activation/node/class_NodeActivationAnnouncementFilter.php b/application/hub/classes/filter/activation/node/class_NodeActivationAnnouncementFilter.php
index 873acc51c..ba0551678 100644
--- a/application/hub/classes/filter/activation/node/class_NodeActivationAnnouncementFilter.php
+++ b/application/hub/classes/filter/activation/node/class_NodeActivationAnnouncementFilter.php
@@ -3,6 +3,7 @@
 namespace Hub\Filter\Activation\Node\Announcement;
 
 // Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 
diff --git a/application/hub/classes/filter/apt-proxy/class_AptProxyInitializationFilter.php b/application/hub/classes/filter/apt-proxy/class_AptProxyInitializationFilter.php
index 56a94c499..580433292 100644
--- a/application/hub/classes/filter/apt-proxy/class_AptProxyInitializationFilter.php
+++ b/application/hub/classes/filter/apt-proxy/class_AptProxyInitializationFilter.php
@@ -3,6 +3,7 @@
 namespace Hub\AptProxy\Filter\Initialization;
 
 // Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 
diff --git a/application/hub/classes/filter/chat/class_ChatInitializationFilter.php b/application/hub/classes/filter/chat/class_ChatInitializationFilter.php
index 90f7a4d63..a8ec86e1e 100644
--- a/application/hub/classes/filter/chat/class_ChatInitializationFilter.php
+++ b/application/hub/classes/filter/chat/class_ChatInitializationFilter.php
@@ -3,6 +3,7 @@
 namespace Hub\Chat\Filter\Initialization;
 
 // Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 
diff --git a/application/hub/classes/filter/crawler/class_CrawlerInitializationFilter.php b/application/hub/classes/filter/crawler/class_CrawlerInitializationFilter.php
index e6c379f12..6a94fa42b 100644
--- a/application/hub/classes/filter/crawler/class_CrawlerInitializationFilter.php
+++ b/application/hub/classes/filter/crawler/class_CrawlerInitializationFilter.php
@@ -3,6 +3,7 @@
 namespace Hub\Crawler\Filter\Initialization;
 
 // Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 
diff --git a/application/hub/classes/filter/cruncher/class_CruncherInitializationFilter.php b/application/hub/classes/filter/cruncher/class_CruncherInitializationFilter.php
index dfc11fda9..6a61ca888 100644
--- a/application/hub/classes/filter/cruncher/class_CruncherInitializationFilter.php
+++ b/application/hub/classes/filter/cruncher/class_CruncherInitializationFilter.php
@@ -3,6 +3,7 @@
 namespace Hub\Cruncher\Filter\Initialization;
 
 // Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 
diff --git a/application/hub/classes/filter/miner/class_MinerInitializationFilter.php b/application/hub/classes/filter/miner/class_MinerInitializationFilter.php
index 0d39e7935..e36e35038 100644
--- a/application/hub/classes/filter/miner/class_MinerInitializationFilter.php
+++ b/application/hub/classes/filter/miner/class_MinerInitializationFilter.php
@@ -3,6 +3,7 @@
 namespace Hub\Miner\Filter\Initialization;
 
 // Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 
diff --git a/application/hub/classes/filter/task/apt-proxy/class_AptProxyTaskHandlerInitializerFilter.php b/application/hub/classes/filter/task/apt-proxy/class_AptProxyTaskHandlerInitializerFilter.php
index f92467a9d..ad42e61d9 100644
--- a/application/hub/classes/filter/task/apt-proxy/class_AptProxyTaskHandlerInitializerFilter.php
+++ b/application/hub/classes/filter/task/apt-proxy/class_AptProxyTaskHandlerInitializerFilter.php
@@ -3,6 +3,7 @@
 namespace Hub\Filter\Initializer\AptProxy\Handler\Task;
 
 // Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 
diff --git a/application/hub/classes/filter/task/chat/class_ChatTaskHandlerInitializerFilter.php b/application/hub/classes/filter/task/chat/class_ChatTaskHandlerInitializerFilter.php
index be8fb65cd..2a61aaf4d 100644
--- a/application/hub/classes/filter/task/chat/class_ChatTaskHandlerInitializerFilter.php
+++ b/application/hub/classes/filter/task/chat/class_ChatTaskHandlerInitializerFilter.php
@@ -3,6 +3,7 @@
 namespace Hub\Filter\Initializer\Chat\Handler\Task;
 
 // Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 
diff --git a/application/hub/classes/filter/task/crawler/class_CrawlerTaskHandlerInitializerFilter.php b/application/hub/classes/filter/task/crawler/class_CrawlerTaskHandlerInitializerFilter.php
index 0e41a7822..c85134eed 100644
--- a/application/hub/classes/filter/task/crawler/class_CrawlerTaskHandlerInitializerFilter.php
+++ b/application/hub/classes/filter/task/crawler/class_CrawlerTaskHandlerInitializerFilter.php
@@ -3,6 +3,7 @@
 namespace Hub\Filter\Initializer\Crawler\Handler\Task;
 
 // Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 
diff --git a/application/hub/classes/filter/task/cruncher/class_CruncherTaskHandlerInitializerFilter.php b/application/hub/classes/filter/task/cruncher/class_CruncherTaskHandlerInitializerFilter.php
index 4eb9bd55d..a852aa2b0 100644
--- a/application/hub/classes/filter/task/cruncher/class_CruncherTaskHandlerInitializerFilter.php
+++ b/application/hub/classes/filter/task/cruncher/class_CruncherTaskHandlerInitializerFilter.php
@@ -3,6 +3,7 @@
 namespace Hub\Filter\Initializer\Cruncher\Handler\Task;
 
 // Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 
diff --git a/application/hub/classes/filter/task/miner/class_MinerTaskHandlerInitializerFilter.php b/application/hub/classes/filter/task/miner/class_MinerTaskHandlerInitializerFilter.php
index edba04f69..37098f5ba 100644
--- a/application/hub/classes/filter/task/miner/class_MinerTaskHandlerInitializerFilter.php
+++ b/application/hub/classes/filter/task/miner/class_MinerTaskHandlerInitializerFilter.php
@@ -3,6 +3,7 @@
 namespace Hub\Filter\Initializer\Miner\Handler\Task;
 
 // Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 
diff --git a/application/hub/classes/filter/task/node/class_NodeTaskHandlerInitializerFilter.php b/application/hub/classes/filter/task/node/class_NodeTaskHandlerInitializerFilter.php
index ba0fc3238..6458bedb0 100644
--- a/application/hub/classes/filter/task/node/class_NodeTaskHandlerInitializerFilter.php
+++ b/application/hub/classes/filter/task/node/class_NodeTaskHandlerInitializerFilter.php
@@ -6,6 +6,7 @@ namespace Hub\Filter\Initializer\Node\Handler\Task;
 use Hub\Factory\Node\NodeObjectFactory;
 
 // Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 
diff --git a/application/hub/classes/handler/chunks/class_ChunkHandler.php b/application/hub/classes/handler/chunks/class_ChunkHandler.php
index 5afb9c91e..7ecde3826 100644
--- a/application/hub/classes/handler/chunks/class_ChunkHandler.php
+++ b/application/hub/classes/handler/chunks/class_ChunkHandler.php
@@ -1,4 +1,13 @@
 <?php
+// Own namespace
+namespace Hub\Handler\Chunk;
+
+// Import application-specific stuff
+use Hub\Factory\Fragmenter\FragmenterFactory;
+
+// Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
+
 /**
  * A Chunk handler
  *
diff --git a/application/hub/classes/helper/connection/class_BaseConnectionHelper.php b/application/hub/classes/helper/connection/class_BaseConnectionHelper.php
index a40d1508c..b9c4ac42b 100644
--- a/application/hub/classes/helper/connection/class_BaseConnectionHelper.php
+++ b/application/hub/classes/helper/connection/class_BaseConnectionHelper.php
@@ -1,4 +1,13 @@
 <?php
+// Own namespace
+namespace Hub\Helper\Connection;
+
+// Import application-specific stuff
+use Hub\Factory\Fragmenter\FragmenterFactory;
+
+// Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
+
 /**
  * A general ConnectionHelper class
  *
diff --git a/application/hub/classes/helper/messages/crypto/class_CryptoRandomUnitMessageHelper.php b/application/hub/classes/helper/messages/crypto/class_CryptoRandomUnitMessageHelper.php
index b91e729e0..f345ca7d8 100644
--- a/application/hub/classes/helper/messages/crypto/class_CryptoRandomUnitMessageHelper.php
+++ b/application/hub/classes/helper/messages/crypto/class_CryptoRandomUnitMessageHelper.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Hub\Helper\Crypto\Message\RandomUnit;
+
+// Import application-specific stuff
+use Hub\Factory\Source\Unit\UnitSourceFactory;
+
 /**
  * A CryptoRandom message helper
  *
diff --git a/application/hub/classes/listener/tcp/class_TcpListener.php b/application/hub/classes/listener/tcp/class_TcpListener.php
index 73d4b7089..98606282e 100644
--- a/application/hub/classes/listener/tcp/class_TcpListener.php
+++ b/application/hub/classes/listener/tcp/class_TcpListener.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Hub\Listener\Tcp;
+
+// Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
+
 /**
  * A TCP connection listener
  *
diff --git a/application/hub/classes/listener/udp/class_UdpListener.php b/application/hub/classes/listener/udp/class_UdpListener.php
index 91f976889..95e184e88 100644
--- a/application/hub/classes/listener/udp/class_UdpListener.php
+++ b/application/hub/classes/listener/udp/class_UdpListener.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Hub\Listener\Udp;
+
+// Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
+
 /**
  * An UDP connection listener
  *
diff --git a/application/hub/classes/lists/pool/class_PoolEntriesList.php b/application/hub/classes/lists/pool/class_PoolEntriesList.php
index 41e29f8b6..3b19329fa 100644
--- a/application/hub/classes/lists/pool/class_PoolEntriesList.php
+++ b/application/hub/classes/lists/pool/class_PoolEntriesList.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Hub\List\Pool;
+
+// Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
+
 /**
  * A list for pool entries
  *
diff --git a/application/hub/classes/miner/chash/class_HubCoinMiner.php b/application/hub/classes/miner/chash/class_HubCoinMiner.php
index f35f86926..3b3c67991 100644
--- a/application/hub/classes/miner/chash/class_HubCoinMiner.php
+++ b/application/hub/classes/miner/chash/class_HubCoinMiner.php
@@ -4,6 +4,7 @@ namespace Hub\Miner;
 
 // Import framework stuff
 use CoreFramework\Controller\Controller;
+use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Response\Responseable;
 
 /**
diff --git a/application/hub/classes/nodes/boot/class_HubBootNode.php b/application/hub/classes/nodes/boot/class_HubBootNode.php
index 4912b2e1f..42e3ff334 100644
--- a/application/hub/classes/nodes/boot/class_HubBootNode.php
+++ b/application/hub/classes/nodes/boot/class_HubBootNode.php
@@ -3,6 +3,7 @@
 namespace Hub\Node\Boot;
 
 // Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Request\Requestable;
 
 /**
diff --git a/application/hub/classes/nodes/list/class_HubListNode.php b/application/hub/classes/nodes/list/class_HubListNode.php
index 27311aa87..7964998c4 100644
--- a/application/hub/classes/nodes/list/class_HubListNode.php
+++ b/application/hub/classes/nodes/list/class_HubListNode.php
@@ -3,6 +3,7 @@
 namespace Hub\Node\Backup;
 
 // Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Request\Requestable;
 
 /**
diff --git a/application/hub/classes/nodes/master/class_HubMasterNode.php b/application/hub/classes/nodes/master/class_HubMasterNode.php
index 80c5f7188..0cff95538 100644
--- a/application/hub/classes/nodes/master/class_HubMasterNode.php
+++ b/application/hub/classes/nodes/master/class_HubMasterNode.php
@@ -3,6 +3,7 @@
 namespace Hub\Node\Master;
 
 // Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Request\Requestable;
 
 /**
diff --git a/application/hub/classes/nodes/regular/class_HubRegularNode.php b/application/hub/classes/nodes/regular/class_HubRegularNode.php
index c61741f75..0ed0498eb 100644
--- a/application/hub/classes/nodes/regular/class_HubRegularNode.php
+++ b/application/hub/classes/nodes/regular/class_HubRegularNode.php
@@ -3,6 +3,7 @@
 namespace Hub\Node\Regular;
 
 // Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Request\Requestable;
 
 /**
diff --git a/application/hub/classes/package/assembler/class_PackageAssembler.php b/application/hub/classes/package/assembler/class_PackageAssembler.php
index c1b21928f..1563d5068 100644
--- a/application/hub/classes/package/assembler/class_PackageAssembler.php
+++ b/application/hub/classes/package/assembler/class_PackageAssembler.php
@@ -5,6 +5,9 @@ namespace Hub\Network\Package\Assembler;
 // Import hub-specific stuff
 use Hub\Generic\BaseHubSystem;
 
+// Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
+
 /**
  * A PackageAssembler class to assemble a package content stream fragemented
  * by PackageFragmenter back to a raw package data array.
diff --git a/application/hub/classes/package/class_NetworkPackage.php b/application/hub/classes/package/class_NetworkPackage.php
index 97cd6b1a8..281dc1c88 100644
--- a/application/hub/classes/package/class_NetworkPackage.php
+++ b/application/hub/classes/package/class_NetworkPackage.php
@@ -3,6 +3,7 @@
 namespace Hub\Network\Package;
 
 // Import application-specific stuff
+use Hub\Factory\Assembler\Package\PackageAssemblerFactory;
 use Hub\Factory\Dht\DhtObjectFactory;
 use Hub\Factory\Node\NodeObjectFactory;
 use Hub\Generic\BaseHubSystem;
diff --git a/application/hub/classes/package/fragmenter/class_PackageFragmenter.php b/application/hub/classes/package/fragmenter/class_PackageFragmenter.php
index f98f191bf..cba3ca140 100644
--- a/application/hub/classes/package/fragmenter/class_PackageFragmenter.php
+++ b/application/hub/classes/package/fragmenter/class_PackageFragmenter.php
@@ -5,6 +5,9 @@ namespace Hub\Network\Package\Fragment;
 // Import hub-specific stuff
 use Hub\Generic\BaseHubSystem;
 
+// Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
+
 /**
  * A PackageFragmenter class to fragment package data into smaller chunks for
  * delivery. This class calculates a final hash on the raw input data and
diff --git a/application/hub/classes/pools/listener/class_DefaultListenerPool.php b/application/hub/classes/pools/listener/class_DefaultListenerPool.php
index cd9016fc9..80b0ca2b4 100644
--- a/application/hub/classes/pools/listener/class_DefaultListenerPool.php
+++ b/application/hub/classes/pools/listener/class_DefaultListenerPool.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Hub\Pool\Listener;
+
+// Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
+
 /**
  * A default listener pool
  *
diff --git a/application/hub/classes/producer/cruncher/keys/class_CruncherKeyProducer.php b/application/hub/classes/producer/cruncher/keys/class_CruncherKeyProducer.php
index 7099f01fa..63eb4b3b4 100644
--- a/application/hub/classes/producer/cruncher/keys/class_CruncherKeyProducer.php
+++ b/application/hub/classes/producer/cruncher/keys/class_CruncherKeyProducer.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Hub\Producer\Cruncher\Key;
+
+// Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
+
 /**
  * A CruncherKey producer class
  *
diff --git a/application/hub/classes/producer/cruncher/work_units/class_CruncherTestUnitProducer.php b/application/hub/classes/producer/cruncher/work_units/class_CruncherTestUnitProducer.php
index 38ab0d81b..2ebf8dd9b 100644
--- a/application/hub/classes/producer/cruncher/work_units/class_CruncherTestUnitProducer.php
+++ b/application/hub/classes/producer/cruncher/work_units/class_CruncherTestUnitProducer.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Hub\Cruncher\Producer\Unit;
+
+// Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
+
 /**
  * A CruncherTestUnit producer class
  *
diff --git a/application/hub/classes/producer/miner/blocks/class_MinerRealGenesisBlockProducer.php b/application/hub/classes/producer/miner/blocks/class_MinerRealGenesisBlockProducer.php
index 0abd16c37..05cb3c8c8 100644
--- a/application/hub/classes/producer/miner/blocks/class_MinerRealGenesisBlockProducer.php
+++ b/application/hub/classes/producer/miner/blocks/class_MinerRealGenesisBlockProducer.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Hub\Miner\Producer\Block\Genesis;
+
+// Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
+
 /**
  * A MinerRealGenesisBlock producer class
  *
diff --git a/application/hub/classes/recipient/dht/class_DhtRecipient.php b/application/hub/classes/recipient/dht/class_DhtRecipient.php
index 2160cf80a..44025f3c9 100644
--- a/application/hub/classes/recipient/dht/class_DhtRecipient.php
+++ b/application/hub/classes/recipient/dht/class_DhtRecipient.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Hub\Recipient\Dht;
+
+// Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
+
 /**
  * A DHT recipient
  *
diff --git a/application/hub/classes/registry/socket/class_SocketRegistry.php b/application/hub/classes/registry/socket/class_SocketRegistry.php
index fc138573d..ab51e5ec5 100644
--- a/application/hub/classes/registry/socket/class_SocketRegistry.php
+++ b/application/hub/classes/registry/socket/class_SocketRegistry.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Hub\Registry\Socket;
+
+// Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
+
 /**
  * A Socket registry
  *
diff --git a/application/hub/classes/resolver/protocol/tcp/class_TcpProtocolResolver.php b/application/hub/classes/resolver/protocol/tcp/class_TcpProtocolResolver.php
index a7f79e98c..ae1b5df8c 100644
--- a/application/hub/classes/resolver/protocol/tcp/class_TcpProtocolResolver.php
+++ b/application/hub/classes/resolver/protocol/tcp/class_TcpProtocolResolver.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Hub\Resolver\Protocol\Tcp;
+
+// Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
+
 /**
  * A TCP protocol resolver class
  *
diff --git a/application/hub/classes/resolver/state/class_BaseStateResolver.php b/application/hub/classes/resolver/state/class_BaseStateResolver.php
index 8744b7156..0d9472704 100644
--- a/application/hub/classes/resolver/state/class_BaseStateResolver.php
+++ b/application/hub/classes/resolver/state/class_BaseStateResolver.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Hub\Resolver\State;
+
+// Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
+
 /**
  * A generic state resolver class
  *
diff --git a/application/hub/classes/source/units/class_TestUnitSource.php b/application/hub/classes/source/units/class_TestUnitSource.php
index eef01ff2a..87263d717 100644
--- a/application/hub/classes/source/units/class_TestUnitSource.php
+++ b/application/hub/classes/source/units/class_TestUnitSource.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Hub\Source\Unit;
+
+// Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
+
 /**
  * A TestUnit source class
  *
diff --git a/application/hub/classes/source/urls/class_CrawlerUploadedListUrlSource.php b/application/hub/classes/source/urls/class_CrawlerUploadedListUrlSource.php
index c6cfc318f..7c0ee3ceb 100644
--- a/application/hub/classes/source/urls/class_CrawlerUploadedListUrlSource.php
+++ b/application/hub/classes/source/urls/class_CrawlerUploadedListUrlSource.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Hub\Crawler\Source\Url\UploadList;
+
+// Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
+
 /**
  * A UploadedList URL source class for crawlers
  *
diff --git a/application/hub/classes/tasks/crawler/class_BaseUrlSourceTask.php b/application/hub/classes/tasks/crawler/class_BaseUrlSourceTask.php
index 9399ae89c..aef7b719a 100644
--- a/application/hub/classes/tasks/crawler/class_BaseUrlSourceTask.php
+++ b/application/hub/classes/tasks/crawler/class_BaseUrlSourceTask.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Hub\Task\Source\Url;
+
+// Import application-specific stuff
+use Hub\Source\Url\UrlSourceObjectFactory;
+
 /**
  * A general URL source Task
  *
diff --git a/application/hub/classes/tasks/crawler/scanner/uploaded_list/class_CrawlerUploadedListScannerTask.php b/application/hub/classes/tasks/crawler/scanner/uploaded_list/class_CrawlerUploadedListScannerTask.php
index 773838b37..b346cf7cb 100644
--- a/application/hub/classes/tasks/crawler/scanner/uploaded_list/class_CrawlerUploadedListScannerTask.php
+++ b/application/hub/classes/tasks/crawler/scanner/uploaded_list/class_CrawlerUploadedListScannerTask.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Hub\Task\Crawler\Scanner\UploadedList;
+
+// Import application-specific stuff
+use Hub\Factory\Scanner\ScannerObjectFactory;
+
 /**
  * A UploadedList scanner task for crawlers
  *