From 5d61202b79d311af10901fbc56cf9d8724a77e3e Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Fri, 19 May 2017 03:54:11 +0200
Subject: [PATCH] Next wave: - imported Registerable, DatabaseWrapperFactory -
 created namespaces
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 .../apt-proxy/console/class_NodeConsoleAptProxy.php       | 1 +
 .../hub/classes/chat/console/class_NodeConsoleChat.php    | 1 +
 .../crawler/class_CrawlerNodeCommunicator.php             | 6 ++++++
 .../communicator/miner/class_MinerNodeCommunicator.php    | 6 ++++++
 .../classes/crawler/console/class_NodeConsoleCrawler.php  | 1 +
 .../classes/cruncher/mcrypt/class_HubMcryptCruncher.php   | 1 +
 .../cruncher/class_CruncherUnitDatabaseWrapper.php        | 1 +
 .../class_NodeDistributedHashTableDatabaseWrapper.php     | 1 +
 .../node/class_NodeInformationDatabaseWrapper.php         | 1 +
 .../hub/classes/decoder/package/class_PackageDecoder.php  | 6 ++++++
 application/hub/classes/dht/node/class_NodeDhtFacade.php  | 2 ++
 .../node/class_UniversalNodeLocatorDiscovery.php          | 3 +++
 .../discovery/protocol/class_ProtocolDiscovery.php        | 6 ++++++
 .../recipient/dht/class_DhtRecipientDiscovery.php         | 3 +++
 .../recipient/package/class_PackageRecipientDiscovery.php | 3 +++
 .../recipient/socket/class_PackageSocketDiscovery.php     | 1 +
 .../class_NodeAnnouncementAnswerOkayHandler.php           | 1 +
 .../requests/class_RequestNodeListAnswerOkayHandler.php   | 3 +++
 .../hub/classes/handler/chunks/class_ChunkHandler.php     | 1 +
 .../announcement/class_NodeMessageAnnouncementHandler.php | 1 +
 .../answer/class_NodeMessageAnnouncementAnswerHandler.php | 1 +
 .../answer/class_NodeMessageDhtBootstrapAnswerHandler.php | 1 +
 .../class_NodeMessageRequestNodeListAnswerHandler.php     | 1 +
 .../dht/class_NodeMessageDhtBootstrapHandler.php          | 1 +
 .../requests/class_NodeMessageRequestNodeListHandler.php  | 1 +
 .../self-connect/class_NodeMessageSelfConnectHandler.php  | 1 +
 .../protocol/ipv4/tcp/class_TcpProtocolHandler.php        | 6 ++++++
 .../helper/connection/class_BaseConnectionHelper.php      | 1 +
 .../hub/classes/info/connection/class_ConnectionInfo.php  | 6 ++++++
 .../iterator/pool/monitor/class_MonitorPoolIterator.php   | 6 ++++++
 .../iterator/pool/tasks/class_TaskPoolIterator.php        | 6 ++++++
 .../hub/classes/lists/recipient/class_RecipientList.php   | 6 ++++++
 .../hub/classes/miner/chash/class_HubCoinMiner.php        | 1 +
 application/hub/classes/nodes/boot/class_HubBootNode.php  | 1 +
 application/hub/classes/nodes/class_BaseHubNode.php       | 1 +
 application/hub/classes/nodes/list/class_HubListNode.php  | 1 +
 .../hub/classes/nodes/master/class_HubMasterNode.php      | 1 +
 .../hub/classes/nodes/regular/class_HubRegularNode.php    | 1 +
 .../classes/package/assembler/class_PackageAssembler.php  | 1 +
 application/hub/classes/package/class_NetworkPackage.php  | 1 +
 .../package/fragmenter/class_PackageFragmenter.php        | 1 +
 .../producer/cruncher/keys/class_CruncherKeyProducer.php  | 1 +
 .../work_units/class_CruncherTestUnitProducer.php         | 2 ++
 .../miner/blocks/class_MinerRealGenesisBlockProducer.php  | 1 +
 .../hub/classes/registry/socket/class_SocketRegistry.php  | 1 +
 .../resolver/protocol/tcp/class_TcpProtocolResolver.php   | 1 +
 .../uploaded_list/class_CrawlerUploadedListScanner.php    | 6 ++++++
 .../hub/classes/source/units/class_TestUnitSource.php     | 1 +
 .../source/urls/class_CrawlerFoundRssUrlSource.php        | 6 ++++++
 .../source/urls/class_CrawlerLocalStartUrlSource.php      | 6 ++++++
 .../source/urls/class_CrawlerRssStartUrlSource.php        | 6 ++++++
 .../source/urls/class_CrawlerUploadedListUrlSource.php    | 1 +
 application/hub/classes/tags/class_BaseTag.php            | 3 +++
 .../announcement/class_XmlAnnouncementTemplateEngine.php  | 6 ++++++
 .../class_XmlAnnouncementAnswerTemplateEngine.php         | 6 ++++++
 .../template/answer/class_BaseXmlAnswerTemplateEngine.php | 6 ++++++
 .../dht/class_XmlDhtBootstrapAnswerTemplateEngine.php     | 6 ++++++
 .../class_XmlRequestNodeListAnswerTemplateEngine.php      | 6 ++++++
 .../connect/class_XmlSelfConnectTemplateEngine.php        | 6 ++++++
 .../template/dht/class_XmlDhtBootstrapTemplateEngine.php  | 6 ++++++
 .../class_XmlRequestNodeListEntryTemplateEngine.php       | 6 ++++++
 .../objects/class_XmlObjectRegistryTemplateEngine.php     | 3 ++-
 .../class_XmlCruncherTestUnitTemplateEngine.php           | 6 ++++++
 .../publish/class_XmlDhtPublishEntryTemplateEngine.php    | 6 ++++++
 .../requests/class_XmlRequestNodeListTemplateEngine.php   | 8 +++++++-
 65 files changed, 199 insertions(+), 2 deletions(-)

diff --git a/application/hub/classes/apt-proxy/console/class_NodeConsoleAptProxy.php b/application/hub/classes/apt-proxy/console/class_NodeConsoleAptProxy.php
index aedd80be7..8432d9bbe 100644
--- a/application/hub/classes/apt-proxy/console/class_NodeConsoleAptProxy.php
+++ b/application/hub/classes/apt-proxy/console/class_NodeConsoleAptProxy.php
@@ -4,6 +4,7 @@ namespace Hub\AptProxy;
 
 // Import framework stuff
 use CoreFramework\Controller\Controller;
+use CoreFramework\Registry\Registerable;
 use CoreFramework\Response\Responseable;
 
 /**
diff --git a/application/hub/classes/chat/console/class_NodeConsoleChat.php b/application/hub/classes/chat/console/class_NodeConsoleChat.php
index cb8e31657..f179307dc 100644
--- a/application/hub/classes/chat/console/class_NodeConsoleChat.php
+++ b/application/hub/classes/chat/console/class_NodeConsoleChat.php
@@ -4,6 +4,7 @@ namespace Hub\Chat;
 
 // Import framework stuff
 use CoreFramework\Controller\Controller;
+use CoreFramework\Registry\Registerable;
 use CoreFramework\Response\Responseable;
 
 /**
diff --git a/application/hub/classes/communicator/crawler/class_CrawlerNodeCommunicator.php b/application/hub/classes/communicator/crawler/class_CrawlerNodeCommunicator.php
index bfbc4c364..699af2d9f 100644
--- a/application/hub/classes/communicator/crawler/class_CrawlerNodeCommunicator.php
+++ b/application/hub/classes/communicator/crawler/class_CrawlerNodeCommunicator.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Hub\Crawler\Communicator\Node;
+
+// Import framework stuff
+use CoreFramework\Registry\Registerable;
+
 /**
  * A crawler->node communicator class
  *
diff --git a/application/hub/classes/communicator/miner/class_MinerNodeCommunicator.php b/application/hub/classes/communicator/miner/class_MinerNodeCommunicator.php
index 5ffb67c4c..839e3ad54 100644
--- a/application/hub/classes/communicator/miner/class_MinerNodeCommunicator.php
+++ b/application/hub/classes/communicator/miner/class_MinerNodeCommunicator.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Hub\Miner\Communicator\Node;
+
+// Import framework stuff
+use CoreFramework\Registry\Registerable;
+
 /**
  * A miner->node communicator class
  *
diff --git a/application/hub/classes/crawler/console/class_NodeConsoleCrawler.php b/application/hub/classes/crawler/console/class_NodeConsoleCrawler.php
index 4d10ae262..192d3e577 100644
--- a/application/hub/classes/crawler/console/class_NodeConsoleCrawler.php
+++ b/application/hub/classes/crawler/console/class_NodeConsoleCrawler.php
@@ -4,6 +4,7 @@ namespace Hub\Crawler;
 
 // Import framework stuff
 use CoreFramework\Controller\Controller;
+use CoreFramework\Registry\Registerable;
 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 c35977bbe..beca8241d 100644
--- a/application/hub/classes/cruncher/mcrypt/class_HubMcryptCruncher.php
+++ b/application/hub/classes/cruncher/mcrypt/class_HubMcryptCruncher.php
@@ -5,6 +5,7 @@ namespace Hub\Cruncher\Mcrypt;
 // Import framework stuff
 use CoreFramework\Controller\Controller;
 use CoreFramework\Factory\ObjectFactory;
+use CoreFramework\Registry\Registerable;
 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 eefacad0b..f659a3e88 100644
--- a/application/hub/classes/database/frontend/cruncher/class_CruncherUnitDatabaseWrapper.php
+++ b/application/hub/classes/database/frontend/cruncher/class_CruncherUnitDatabaseWrapper.php
@@ -4,6 +4,7 @@ namespace Hub\Database\Frontend\Cruncher\Unit;
 
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
+use CoreFramework\Registry\Registerable;
 
 /**
  * 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 b41984318..79e850872 100644
--- a/application/hub/classes/database/frontend/node/class_NodeDistributedHashTableDatabaseWrapper.php
+++ b/application/hub/classes/database/frontend/node/class_NodeDistributedHashTableDatabaseWrapper.php
@@ -9,6 +9,7 @@ use Hub\Node\BaseHubNode;
 // Import framework stuff
 use CoreFramework\Criteria\Storing\StoreableCriteria;
 use CoreFramework\Factory\ObjectFactory;
+use CoreFramework\Registry\Registerable;
 
 /**
  * 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 499e2a561..4c905e93a 100644
--- a/application/hub/classes/database/frontend/node/class_NodeInformationDatabaseWrapper.php
+++ b/application/hub/classes/database/frontend/node/class_NodeInformationDatabaseWrapper.php
@@ -8,6 +8,7 @@ use Hub\Node\Helper\NodeHelper;
 
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
+use CoreFramework\Registry\Registerable;
 use CoreFramework\Request\Requestable;
 
 /**
diff --git a/application/hub/classes/decoder/package/class_PackageDecoder.php b/application/hub/classes/decoder/package/class_PackageDecoder.php
index cf2ef7027..13e6396f3 100644
--- a/application/hub/classes/decoder/package/class_PackageDecoder.php
+++ b/application/hub/classes/decoder/package/class_PackageDecoder.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Hub\Decoder;
+
+// Import framework stuff
+use CoreFramework\Registry\Registerable;
+
 /**
  * A Package decoder class
  *
diff --git a/application/hub/classes/dht/node/class_NodeDhtFacade.php b/application/hub/classes/dht/node/class_NodeDhtFacade.php
index 201af81d8..bdfaa4a22 100644
--- a/application/hub/classes/dht/node/class_NodeDhtFacade.php
+++ b/application/hub/classes/dht/node/class_NodeDhtFacade.php
@@ -6,7 +6,9 @@ namespace Hub\Dht\Node;
 use Hub\Generic\BaseHubSystem;
 
 // Import framework stuff
+use CoreFramework\Factory\Database\Wrapper\DatabaseWrapperFactory;
 use CoreFramework\Factory\ObjectFactory;
+use CoreFramework\Registry\Registerable;
 
 /**
  * A Node DHT facade class
diff --git a/application/hub/classes/discovery/node/class_UniversalNodeLocatorDiscovery.php b/application/hub/classes/discovery/node/class_UniversalNodeLocatorDiscovery.php
index dab60ad1e..98841440c 100644
--- a/application/hub/classes/discovery/node/class_UniversalNodeLocatorDiscovery.php
+++ b/application/hub/classes/discovery/node/class_UniversalNodeLocatorDiscovery.php
@@ -5,6 +5,9 @@ namespace Hub\Disovery\Locator;
 // Import application-specific stuff
 use Hub\Node\Helper\NodeHelper;
 
+// Import framework stuff
+use CoreFramework\Registry\Registerable;
+
 /**
  * A UniversalNodeLocator discovery class
  *
diff --git a/application/hub/classes/discovery/protocol/class_ProtocolDiscovery.php b/application/hub/classes/discovery/protocol/class_ProtocolDiscovery.php
index 82ac8c693..0537f902b 100644
--- a/application/hub/classes/discovery/protocol/class_ProtocolDiscovery.php
+++ b/application/hub/classes/discovery/protocol/class_ProtocolDiscovery.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Hub\Discovery\Protocol;
+
+// Import framework stuff
+use CoreFramework\Registry\Registerable;
+
 /**
  * A Protocol discovery class
  *
diff --git a/application/hub/classes/discovery/recipient/dht/class_DhtRecipientDiscovery.php b/application/hub/classes/discovery/recipient/dht/class_DhtRecipientDiscovery.php
index c05c7bbe4..83bbdf5d0 100644
--- a/application/hub/classes/discovery/recipient/dht/class_DhtRecipientDiscovery.php
+++ b/application/hub/classes/discovery/recipient/dht/class_DhtRecipientDiscovery.php
@@ -5,6 +5,9 @@ namespace Hub\Discovery\Dht\Recipient;
 // Import application-specific stuff
 use Hub\Factory\Dht\DhtObjectFactory;
 
+// Import framework stuff
+use CoreFramework\Registry\Registerable;
+
 /**
  * A DhtRecipient discovery class
  *
diff --git a/application/hub/classes/discovery/recipient/package/class_PackageRecipientDiscovery.php b/application/hub/classes/discovery/recipient/package/class_PackageRecipientDiscovery.php
index c1ad01c8e..c500bf673 100644
--- a/application/hub/classes/discovery/recipient/package/class_PackageRecipientDiscovery.php
+++ b/application/hub/classes/discovery/recipient/package/class_PackageRecipientDiscovery.php
@@ -5,6 +5,9 @@ namespace Hub\Discovery\Network\Recipient;
 // Import hub-specific sutff
 use Hub\Tools\HubTools;
 
+// Import framework stuff
+use CoreFramework\Registry\Registerable;
+
 /**
  * A PackageRecipient discovery class
  *
diff --git a/application/hub/classes/discovery/recipient/socket/class_PackageSocketDiscovery.php b/application/hub/classes/discovery/recipient/socket/class_PackageSocketDiscovery.php
index a310c9c78..6de0dab0e 100644
--- a/application/hub/classes/discovery/recipient/socket/class_PackageSocketDiscovery.php
+++ b/application/hub/classes/discovery/recipient/socket/class_PackageSocketDiscovery.php
@@ -7,6 +7,7 @@ use Hub\Factory\Node\NodeObjectFactory;
 use Hub\Generic\BaseHubSystem;
 
 // Import framework stuff
+use CoreFramework\Registry\Registerable;
 use CoreFramework\Registry\Registry;
 
 /**
diff --git a/application/hub/classes/handler/answer-status/announcement/class_NodeAnnouncementAnswerOkayHandler.php b/application/hub/classes/handler/answer-status/announcement/class_NodeAnnouncementAnswerOkayHandler.php
index 8129b43f4..3494284e7 100644
--- a/application/hub/classes/handler/answer-status/announcement/class_NodeAnnouncementAnswerOkayHandler.php
+++ b/application/hub/classes/handler/answer-status/announcement/class_NodeAnnouncementAnswerOkayHandler.php
@@ -8,6 +8,7 @@ use Hub\Network\Receive\Receivable;
 use Hub\Node\BaseHubNode;
 
 // Import framework stuff
+use CoreFramework\Registry\Registerable;
 use CoreFramework\Registry\Registry;
 
 /**
diff --git a/application/hub/classes/handler/answer-status/requests/class_RequestNodeListAnswerOkayHandler.php b/application/hub/classes/handler/answer-status/requests/class_RequestNodeListAnswerOkayHandler.php
index b9447817d..0ea6e20b5 100644
--- a/application/hub/classes/handler/answer-status/requests/class_RequestNodeListAnswerOkayHandler.php
+++ b/application/hub/classes/handler/answer-status/requests/class_RequestNodeListAnswerOkayHandler.php
@@ -5,6 +5,9 @@ namespace Hub\Handler\Answer\Okay\NodeList;
 // Import application-specific stuff
 use Hub\Network\Receive\Receivable;
 
+// Import framework stuff
+use CoreFramework\Registry\Registerable;
+
 /**
  * A RequestNodeListAnswerOkay handler
  *
diff --git a/application/hub/classes/handler/chunks/class_ChunkHandler.php b/application/hub/classes/handler/chunks/class_ChunkHandler.php
index 7ecde3826..d7a93bb9a 100644
--- a/application/hub/classes/handler/chunks/class_ChunkHandler.php
+++ b/application/hub/classes/handler/chunks/class_ChunkHandler.php
@@ -7,6 +7,7 @@ use Hub\Factory\Fragmenter\FragmenterFactory;
 
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
+use CoreFramework\Registry\Registerable;
 
 /**
  * A Chunk handler
diff --git a/application/hub/classes/handler/message-types/announcement/class_NodeMessageAnnouncementHandler.php b/application/hub/classes/handler/message-types/announcement/class_NodeMessageAnnouncementHandler.php
index 3babb9f27..f4acbb39c 100644
--- a/application/hub/classes/handler/message-types/announcement/class_NodeMessageAnnouncementHandler.php
+++ b/application/hub/classes/handler/message-types/announcement/class_NodeMessageAnnouncementHandler.php
@@ -9,6 +9,7 @@ use Hub\Network\Receive\Receivable;
 
 // Import framework stuff
 use CoreFramework\Criteria\Storing\StoreableCriteria;
+use CoreFramework\Registry\Registerable;
 
 /**
  * A NodeMessageAnnouncement handler
diff --git a/application/hub/classes/handler/message-types/answer/class_NodeMessageAnnouncementAnswerHandler.php b/application/hub/classes/handler/message-types/answer/class_NodeMessageAnnouncementAnswerHandler.php
index 13448afb8..1e615b77a 100644
--- a/application/hub/classes/handler/message-types/answer/class_NodeMessageAnnouncementAnswerHandler.php
+++ b/application/hub/classes/handler/message-types/answer/class_NodeMessageAnnouncementAnswerHandler.php
@@ -8,6 +8,7 @@ use Hub\Network\Receive\Receivable;
 
 // Import framework stuff
 use CoreFramework\Criteria\Storing\StoreableCriteria;
+use CoreFramework\Registry\Registerable;
 
 /**
  * A NodeMessageAnnouncementAnswer handler
diff --git a/application/hub/classes/handler/message-types/answer/class_NodeMessageDhtBootstrapAnswerHandler.php b/application/hub/classes/handler/message-types/answer/class_NodeMessageDhtBootstrapAnswerHandler.php
index a02bac04f..66d5f7e90 100644
--- a/application/hub/classes/handler/message-types/answer/class_NodeMessageDhtBootstrapAnswerHandler.php
+++ b/application/hub/classes/handler/message-types/answer/class_NodeMessageDhtBootstrapAnswerHandler.php
@@ -8,6 +8,7 @@ use Hub\Network\Receive\Receivable;
 
 // Import framework stuff
 use CoreFramework\Criteria\Storing\StoreableCriteria;
+use CoreFramework\Registry\Registerable;
 
 /**
  * A NodeMessageDhtBootstrapAnswer handler
diff --git a/application/hub/classes/handler/message-types/answer/class_NodeMessageRequestNodeListAnswerHandler.php b/application/hub/classes/handler/message-types/answer/class_NodeMessageRequestNodeListAnswerHandler.php
index 90d00b60e..a1c4ffad2 100644
--- a/application/hub/classes/handler/message-types/answer/class_NodeMessageRequestNodeListAnswerHandler.php
+++ b/application/hub/classes/handler/message-types/answer/class_NodeMessageRequestNodeListAnswerHandler.php
@@ -8,6 +8,7 @@ use Hub\Network\Receive\Receivable;
 
 // Import framework stuff
 use CoreFramework\Criteria\Storing\StoreableCriteria;
+use CoreFramework\Registry\Registerable;
 
 /**
  * A NodeMessageRequestNodeListAnswer handler
diff --git a/application/hub/classes/handler/message-types/dht/class_NodeMessageDhtBootstrapHandler.php b/application/hub/classes/handler/message-types/dht/class_NodeMessageDhtBootstrapHandler.php
index 0f019f0f8..63ccd2468 100644
--- a/application/hub/classes/handler/message-types/dht/class_NodeMessageDhtBootstrapHandler.php
+++ b/application/hub/classes/handler/message-types/dht/class_NodeMessageDhtBootstrapHandler.php
@@ -9,6 +9,7 @@ use Hub\Network\Receive\Receivable;
 
 // Import framework stuff
 use CoreFramework\Criteria\Storing\StoreableCriteria;
+use CoreFramework\Registry\Registerable;
 
 /**
  * A NodeMessageDhtBootstrap handler
diff --git a/application/hub/classes/handler/message-types/requests/class_NodeMessageRequestNodeListHandler.php b/application/hub/classes/handler/message-types/requests/class_NodeMessageRequestNodeListHandler.php
index 4eb9e5299..4cbce50c2 100644
--- a/application/hub/classes/handler/message-types/requests/class_NodeMessageRequestNodeListHandler.php
+++ b/application/hub/classes/handler/message-types/requests/class_NodeMessageRequestNodeListHandler.php
@@ -9,6 +9,7 @@ use Hub\Node\BaseHubNode;
 
 // Import framework stuff
 use CoreFramework\Criteria\Storing\StoreableCriteria;
+use CoreFramework\Registry\Registerable;
 
 /**
  * A NodeMessageRequestNodeList handler
diff --git a/application/hub/classes/handler/message-types/self-connect/class_NodeMessageSelfConnectHandler.php b/application/hub/classes/handler/message-types/self-connect/class_NodeMessageSelfConnectHandler.php
index 3ca366005..7cfc52812 100644
--- a/application/hub/classes/handler/message-types/self-connect/class_NodeMessageSelfConnectHandler.php
+++ b/application/hub/classes/handler/message-types/self-connect/class_NodeMessageSelfConnectHandler.php
@@ -8,6 +8,7 @@ use Hub\Network\Receive\Receivable;
 
 // Import framework stuff
 use CoreFramework\Criteria\Storing\StoreableCriteria;
+use CoreFramework\Registry\Registerable;
 
 /**
  * A NodeMessageSelfConnect handler
diff --git a/application/hub/classes/handler/protocol/ipv4/tcp/class_TcpProtocolHandler.php b/application/hub/classes/handler/protocol/ipv4/tcp/class_TcpProtocolHandler.php
index 586199681..cc4469f12 100644
--- a/application/hub/classes/handler/protocol/ipv4/tcp/class_TcpProtocolHandler.php
+++ b/application/hub/classes/handler/protocol/ipv4/tcp/class_TcpProtocolHandler.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Hub\Handler\Protocol\Tcp;
+
+// Import framework stuff
+use CoreFramework\Registry\Registerable;
+
 /**
  * A TCP protocol handler (IPv4)
  *
diff --git a/application/hub/classes/helper/connection/class_BaseConnectionHelper.php b/application/hub/classes/helper/connection/class_BaseConnectionHelper.php
index 35ae5549c..64827ed43 100644
--- a/application/hub/classes/helper/connection/class_BaseConnectionHelper.php
+++ b/application/hub/classes/helper/connection/class_BaseConnectionHelper.php
@@ -8,6 +8,7 @@ use Hub\Factory\Fragmenter\FragmenterFactory;
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Registry\Registry;
+use CoreFramework\Registry\Registerable;
 
 /**
  * A general ConnectionHelper class
diff --git a/application/hub/classes/info/connection/class_ConnectionInfo.php b/application/hub/classes/info/connection/class_ConnectionInfo.php
index f3e4bfb06..5bfbe324d 100644
--- a/application/hub/classes/info/connection/class_ConnectionInfo.php
+++ b/application/hub/classes/info/connection/class_ConnectionInfo.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Hub\Information\Connection;
+
+// Import framework stuff
+use CoreFramework\Registry\Registerable;
+
 /**
  * A Connection information class
  *
diff --git a/application/hub/classes/iterator/pool/monitor/class_MonitorPoolIterator.php b/application/hub/classes/iterator/pool/monitor/class_MonitorPoolIterator.php
index d94a6f218..e0de761ad 100644
--- a/application/hub/classes/iterator/pool/monitor/class_MonitorPoolIterator.php
+++ b/application/hub/classes/iterator/pool/monitor/class_MonitorPoolIterator.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Hub\Iterator\Pool\Monitor;
+
+// Import framework stuff
+use CoreFramework\Registry\Registerable;
+
 /**
  * A MonitorPool iterator
  *
diff --git a/application/hub/classes/iterator/pool/tasks/class_TaskPoolIterator.php b/application/hub/classes/iterator/pool/tasks/class_TaskPoolIterator.php
index 7611ebc59..e066ab589 100644
--- a/application/hub/classes/iterator/pool/tasks/class_TaskPoolIterator.php
+++ b/application/hub/classes/iterator/pool/tasks/class_TaskPoolIterator.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Hub\Iterator\Pool\Task;
+
+// Import framework stuff
+use CoreFramework\Registry\Registerable;
+
 /**
  * A TaskPool iterator
  *
diff --git a/application/hub/classes/lists/recipient/class_RecipientList.php b/application/hub/classes/lists/recipient/class_RecipientList.php
index a8ac4e916..988c7d7b2 100644
--- a/application/hub/classes/lists/recipient/class_RecipientList.php
+++ b/application/hub/classes/lists/recipient/class_RecipientList.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Hub\List\Recipient;
+
+// Import framework stuff
+use CoreFramework\Registry\Registerable;
+
 /**
  * A Recipient list
  *
diff --git a/application/hub/classes/miner/chash/class_HubCoinMiner.php b/application/hub/classes/miner/chash/class_HubCoinMiner.php
index 3b3c67991..866c9d248 100644
--- a/application/hub/classes/miner/chash/class_HubCoinMiner.php
+++ b/application/hub/classes/miner/chash/class_HubCoinMiner.php
@@ -5,6 +5,7 @@ namespace Hub\Miner;
 // Import framework stuff
 use CoreFramework\Controller\Controller;
 use CoreFramework\Factory\ObjectFactory;
+use CoreFramework\Registry\Registerable;
 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 aa8390b12..a35391418 100644
--- a/application/hub/classes/nodes/boot/class_HubBootNode.php
+++ b/application/hub/classes/nodes/boot/class_HubBootNode.php
@@ -10,6 +10,7 @@ use Hub\Node\Helper\NodeHelper;
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Handler\Task\HandleableTask;
 use CoreFramework\Registry\Registry;
+use CoreFramework\Registry\Registerable;
 use CoreFramework\Request\Requestable;
 
 /**
diff --git a/application/hub/classes/nodes/class_BaseHubNode.php b/application/hub/classes/nodes/class_BaseHubNode.php
index 2db4ce189..3d29d2ab5 100644
--- a/application/hub/classes/nodes/class_BaseHubNode.php
+++ b/application/hub/classes/nodes/class_BaseHubNode.php
@@ -11,6 +11,7 @@ use Hub\Tools\HubTools;
 use CoreFramework\Criteria\Add\AddableCriteria;
 use CoreFramework\Criteria\Storing\StoreableCriteria;
 use CoreFramework\Database\Updateable;
+use CoreFramework\Factory\Database\Wrapper\DatabaseWrapperFactory;
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Object\BaseFrameworkSystem;
 use CoreFramework\Registry\Registry;
diff --git a/application/hub/classes/nodes/list/class_HubListNode.php b/application/hub/classes/nodes/list/class_HubListNode.php
index d266f9b26..f2163dbdc 100644
--- a/application/hub/classes/nodes/list/class_HubListNode.php
+++ b/application/hub/classes/nodes/list/class_HubListNode.php
@@ -10,6 +10,7 @@ use Hub\Node\Helper\NodeHelper;
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Handler\Task\HandleableTask;
 use CoreFramework\Registry\Registry;
+use CoreFramework\Registry\Registerable;
 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 77fedee73..2c4ad7fc8 100644
--- a/application/hub/classes/nodes/master/class_HubMasterNode.php
+++ b/application/hub/classes/nodes/master/class_HubMasterNode.php
@@ -10,6 +10,7 @@ use Hub\Node\Helper\NodeHelper;
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Handler\Task\HandleableTask;
 use CoreFramework\Registry\Registry;
+use CoreFramework\Registry\Registerable;
 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 d19ca84b1..cdbe9a17b 100644
--- a/application/hub/classes/nodes/regular/class_HubRegularNode.php
+++ b/application/hub/classes/nodes/regular/class_HubRegularNode.php
@@ -10,6 +10,7 @@ use Hub\Node\Helper\NodeHelper;
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Handler\Task\HandleableTask;
 use CoreFramework\Registry\Registry;
+use CoreFramework\Registry\Registerable;
 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 009ca2cc5..46748eb1e 100644
--- a/application/hub/classes/package/assembler/class_PackageAssembler.php
+++ b/application/hub/classes/package/assembler/class_PackageAssembler.php
@@ -8,6 +8,7 @@ use Hub\Network\Receive\Receivable;
 
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
+use CoreFramework\Registry\Registerable;
 
 /**
  * A PackageAssembler class to assemble a package content stream fragemented
diff --git a/application/hub/classes/package/class_NetworkPackage.php b/application/hub/classes/package/class_NetworkPackage.php
index 3cd2cbec9..d4e871b98 100644
--- a/application/hub/classes/package/class_NetworkPackage.php
+++ b/application/hub/classes/package/class_NetworkPackage.php
@@ -13,6 +13,7 @@ use Hub\Tools\HubTools;
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Registry\Registry;
+use CoreFramework\Registry\Registerable;
 
 /**
  * A NetworkPackage class. This class implements Deliverable and Receivable
diff --git a/application/hub/classes/package/fragmenter/class_PackageFragmenter.php b/application/hub/classes/package/fragmenter/class_PackageFragmenter.php
index cba3ca140..362e31594 100644
--- a/application/hub/classes/package/fragmenter/class_PackageFragmenter.php
+++ b/application/hub/classes/package/fragmenter/class_PackageFragmenter.php
@@ -7,6 +7,7 @@ use Hub\Generic\BaseHubSystem;
 
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
+use CoreFramework\Registry\Registerable;
 
 /**
  * A PackageFragmenter class to fragment package data into smaller chunks for
diff --git a/application/hub/classes/producer/cruncher/keys/class_CruncherKeyProducer.php b/application/hub/classes/producer/cruncher/keys/class_CruncherKeyProducer.php
index 63eb4b3b4..3078d680f 100644
--- a/application/hub/classes/producer/cruncher/keys/class_CruncherKeyProducer.php
+++ b/application/hub/classes/producer/cruncher/keys/class_CruncherKeyProducer.php
@@ -4,6 +4,7 @@ namespace Hub\Producer\Cruncher\Key;
 
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
+use CoreFramework\Registry\Registerable;
 
 /**
  * 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 2ebf8dd9b..59d2bc3a0 100644
--- a/application/hub/classes/producer/cruncher/work_units/class_CruncherTestUnitProducer.php
+++ b/application/hub/classes/producer/cruncher/work_units/class_CruncherTestUnitProducer.php
@@ -3,7 +3,9 @@
 namespace Hub\Cruncher\Producer\Unit;
 
 // Import framework stuff
+use CoreFramework\Factory\Database\Wrapper\DatabaseWrapperFactory;
 use CoreFramework\Factory\ObjectFactory;
+use CoreFramework\Registry\Registerable;
 
 /**
  * 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 05cb3c8c8..6006a215a 100644
--- a/application/hub/classes/producer/miner/blocks/class_MinerRealGenesisBlockProducer.php
+++ b/application/hub/classes/producer/miner/blocks/class_MinerRealGenesisBlockProducer.php
@@ -4,6 +4,7 @@ namespace Hub\Miner\Producer\Block\Genesis;
 
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
+use CoreFramework\Registry\Registerable;
 
 /**
  * A MinerRealGenesisBlock producer class
diff --git a/application/hub/classes/registry/socket/class_SocketRegistry.php b/application/hub/classes/registry/socket/class_SocketRegistry.php
index ab51e5ec5..ae7bd708d 100644
--- a/application/hub/classes/registry/socket/class_SocketRegistry.php
+++ b/application/hub/classes/registry/socket/class_SocketRegistry.php
@@ -4,6 +4,7 @@ namespace Hub\Registry\Socket;
 
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
+use CoreFramework\Registry\Registerable;
 
 /**
  * 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 bcb7859ed..14898a695 100644
--- a/application/hub/classes/resolver/protocol/tcp/class_TcpProtocolResolver.php
+++ b/application/hub/classes/resolver/protocol/tcp/class_TcpProtocolResolver.php
@@ -7,6 +7,7 @@ use Hub\Node\Helper\NodeHelper;
 
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
+use CoreFramework\Registry\Registerable;
 
 /**
  * A TCP protocol resolver class
diff --git a/application/hub/classes/scanner/crawler/uploaded_list/class_CrawlerUploadedListScanner.php b/application/hub/classes/scanner/crawler/uploaded_list/class_CrawlerUploadedListScanner.php
index 1dfac0f40..25a640c08 100644
--- a/application/hub/classes/scanner/crawler/uploaded_list/class_CrawlerUploadedListScanner.php
+++ b/application/hub/classes/scanner/crawler/uploaded_list/class_CrawlerUploadedListScanner.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Hub\Crawler\Scanner\UploadedList;
+
+// Import framework stuff
+use CoreFramework\Registry\Registerable;
+
 /**
  * A UploadedList scanner class for crawlers
  *
diff --git a/application/hub/classes/source/units/class_TestUnitSource.php b/application/hub/classes/source/units/class_TestUnitSource.php
index 87263d717..45ae0cdc9 100644
--- a/application/hub/classes/source/units/class_TestUnitSource.php
+++ b/application/hub/classes/source/units/class_TestUnitSource.php
@@ -4,6 +4,7 @@ namespace Hub\Source\Unit;
 
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
+use CoreFramework\Registry\Registerable;
 
 /**
  * A TestUnit source class
diff --git a/application/hub/classes/source/urls/class_CrawlerFoundRssUrlSource.php b/application/hub/classes/source/urls/class_CrawlerFoundRssUrlSource.php
index cad4691e7..89bb32835 100644
--- a/application/hub/classes/source/urls/class_CrawlerFoundRssUrlSource.php
+++ b/application/hub/classes/source/urls/class_CrawlerFoundRssUrlSource.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Hub\Crawler\Source\FoundRss;
+
+// Import framework stuff
+use CoreFramework\Registry\Registerable;
+
 /**
  * A FoundRss URL source class for crawlers
  *
diff --git a/application/hub/classes/source/urls/class_CrawlerLocalStartUrlSource.php b/application/hub/classes/source/urls/class_CrawlerLocalStartUrlSource.php
index fdabe0642..c89f61fef 100644
--- a/application/hub/classes/source/urls/class_CrawlerLocalStartUrlSource.php
+++ b/application/hub/classes/source/urls/class_CrawlerLocalStartUrlSource.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Hub\Crawler\Source\LocalStart;
+
+// Import framework stuff
+use CoreFramework\Registry\Registerable;
+
 /**
  * A ??? URL source class for crawlers
  *
diff --git a/application/hub/classes/source/urls/class_CrawlerRssStartUrlSource.php b/application/hub/classes/source/urls/class_CrawlerRssStartUrlSource.php
index ef6ade1bd..2f9cd10f2 100644
--- a/application/hub/classes/source/urls/class_CrawlerRssStartUrlSource.php
+++ b/application/hub/classes/source/urls/class_CrawlerRssStartUrlSource.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Hub\Crawler\Source\RssStart;
+
+// Import framework stuff
+use CoreFramework\Registry\Registerable;
+
 /**
  * A RssStart URL source class for crawlers
  *
diff --git a/application/hub/classes/source/urls/class_CrawlerUploadedListUrlSource.php b/application/hub/classes/source/urls/class_CrawlerUploadedListUrlSource.php
index 7c0ee3ceb..0d49bcd6f 100644
--- a/application/hub/classes/source/urls/class_CrawlerUploadedListUrlSource.php
+++ b/application/hub/classes/source/urls/class_CrawlerUploadedListUrlSource.php
@@ -4,6 +4,7 @@ namespace Hub\Crawler\Source\Url\UploadList;
 
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
+use CoreFramework\Registry\Registerable;
 
 /**
  * A UploadedList URL source class for crawlers
diff --git a/application/hub/classes/tags/class_BaseTag.php b/application/hub/classes/tags/class_BaseTag.php
index 15fc68a7f..cdc33767e 100644
--- a/application/hub/classes/tags/class_BaseTag.php
+++ b/application/hub/classes/tags/class_BaseTag.php
@@ -5,6 +5,9 @@ namespace Hub\Tag;
 // Import hub-specific stuff
 use Hub\Generic\BaseHubSystem;
 
+// Import framework stuff
+use CoreFramework\Registry\Registerable;
+
 /**
  * A general Tags class
  *
diff --git a/application/hub/classes/template/announcement/class_XmlAnnouncementTemplateEngine.php b/application/hub/classes/template/announcement/class_XmlAnnouncementTemplateEngine.php
index 5c528e852..24a2a0529 100644
--- a/application/hub/classes/template/announcement/class_XmlAnnouncementTemplateEngine.php
+++ b/application/hub/classes/template/announcement/class_XmlAnnouncementTemplateEngine.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Hub\Node\TemplateEngine\Xml\Announcement;
+
+// Import framework stuff
+use CoreFramework\Registry\Registerable;
+
 /**
  * An Announcement template engine class for XML templates
  *
diff --git a/application/hub/classes/template/answer/announcement/class_XmlAnnouncementAnswerTemplateEngine.php b/application/hub/classes/template/answer/announcement/class_XmlAnnouncementAnswerTemplateEngine.php
index 87ed8fa54..a952ef39f 100644
--- a/application/hub/classes/template/answer/announcement/class_XmlAnnouncementAnswerTemplateEngine.php
+++ b/application/hub/classes/template/answer/announcement/class_XmlAnnouncementAnswerTemplateEngine.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Hub\Node\TemplateEngine\Xml\Answer\Announcement;
+
+// Import framework stuff
+use CoreFramework\Registry\Registerable;
+
 /**
  * An AnnouncementAnswer template engine class for XML templates
  *
diff --git a/application/hub/classes/template/answer/class_BaseXmlAnswerTemplateEngine.php b/application/hub/classes/template/answer/class_BaseXmlAnswerTemplateEngine.php
index 261d834d1..ee8b012d1 100644
--- a/application/hub/classes/template/answer/class_BaseXmlAnswerTemplateEngine.php
+++ b/application/hub/classes/template/answer/class_BaseXmlAnswerTemplateEngine.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Hub\Node\TemplateEngine\Xml\Answer;
+
+// Import framework stuff
+use CoreFramework\Registry\Registerable;
+
 /**
  * An generic answer template engine class for XML templates
  *
diff --git a/application/hub/classes/template/answer/dht/class_XmlDhtBootstrapAnswerTemplateEngine.php b/application/hub/classes/template/answer/dht/class_XmlDhtBootstrapAnswerTemplateEngine.php
index 38a46461a..9f52a5d84 100644
--- a/application/hub/classes/template/answer/dht/class_XmlDhtBootstrapAnswerTemplateEngine.php
+++ b/application/hub/classes/template/answer/dht/class_XmlDhtBootstrapAnswerTemplateEngine.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Hub\Node\TemplateEngine\Xml\Answer\Dht\Bootstrap;
+
+// Import framework stuff
+use CoreFramework\Registry\Registerable;
+
 /**
  * An DhtBootstrapAnswer template engine class for XML templates
  *
diff --git a/application/hub/classes/template/answer/requests/class_XmlRequestNodeListAnswerTemplateEngine.php b/application/hub/classes/template/answer/requests/class_XmlRequestNodeListAnswerTemplateEngine.php
index 681078334..d58962693 100644
--- a/application/hub/classes/template/answer/requests/class_XmlRequestNodeListAnswerTemplateEngine.php
+++ b/application/hub/classes/template/answer/requests/class_XmlRequestNodeListAnswerTemplateEngine.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Hub\Node\TemplateEngine\Xml\Answer\Request\NodeList;
+
+// Import framework stuff
+use CoreFramework\Registry\Registerable;
+
 /**
  * A RequestNodeListAnswer template engine class for XML templates
  *
diff --git a/application/hub/classes/template/connect/class_XmlSelfConnectTemplateEngine.php b/application/hub/classes/template/connect/class_XmlSelfConnectTemplateEngine.php
index d0552c20d..04b936af7 100644
--- a/application/hub/classes/template/connect/class_XmlSelfConnectTemplateEngine.php
+++ b/application/hub/classes/template/connect/class_XmlSelfConnectTemplateEngine.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Hub\Node\TemplateEngine\Xml\SelfConnect;
+
+// Import framework stuff
+use CoreFramework\Registry\Registerable;
+
 /**
  * An SelfConnect template engine class for XML templates
  *
diff --git a/application/hub/classes/template/dht/class_XmlDhtBootstrapTemplateEngine.php b/application/hub/classes/template/dht/class_XmlDhtBootstrapTemplateEngine.php
index c99756b53..9213893e6 100644
--- a/application/hub/classes/template/dht/class_XmlDhtBootstrapTemplateEngine.php
+++ b/application/hub/classes/template/dht/class_XmlDhtBootstrapTemplateEngine.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Hub\Node\TemplateEngine\Xml\Dht\Bootstrap;
+
+// Import framework stuff
+use CoreFramework\Registry\Registerable;
+
 /**
  * An Bootstrap template engine class for XML templates
  *
diff --git a/application/hub/classes/template/entries/class_XmlRequestNodeListEntryTemplateEngine.php b/application/hub/classes/template/entries/class_XmlRequestNodeListEntryTemplateEngine.php
index bc95609ec..1c55b8cb5 100644
--- a/application/hub/classes/template/entries/class_XmlRequestNodeListEntryTemplateEngine.php
+++ b/application/hub/classes/template/entries/class_XmlRequestNodeListEntryTemplateEngine.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Hub\Node\TemplateEngine\Xml\Request\NodeList;
+
+// Import framework stuff
+use CoreFramework\Registry\Registerable;
+
 /**
  * An RequestNodeListEntry template engine class for XML templates
  *
diff --git a/application/hub/classes/template/objects/class_XmlObjectRegistryTemplateEngine.php b/application/hub/classes/template/objects/class_XmlObjectRegistryTemplateEngine.php
index da8e6d41d..facd95f78 100644
--- a/application/hub/classes/template/objects/class_XmlObjectRegistryTemplateEngine.php
+++ b/application/hub/classes/template/objects/class_XmlObjectRegistryTemplateEngine.php
@@ -1,9 +1,10 @@
 <?php
 // Own namespace
-namespace Hub\TemplateEngine\Xml\ObjectRegistry;
+namespace Hub\Node\TemplateEngine\Xml\ObjectRegistry;
 
 // Import framework stuff
 use CoreFramework\Registry\Registry;
+use CoreFramework\Registry\Registerable;
 
 /**
  * An ObjectRegistry template engine class for XML templates
diff --git a/application/hub/classes/template/producer/test_units/class_XmlCruncherTestUnitTemplateEngine.php b/application/hub/classes/template/producer/test_units/class_XmlCruncherTestUnitTemplateEngine.php
index 40f19412d..566a31b53 100644
--- a/application/hub/classes/template/producer/test_units/class_XmlCruncherTestUnitTemplateEngine.php
+++ b/application/hub/classes/template/producer/test_units/class_XmlCruncherTestUnitTemplateEngine.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Hub\Cruncher\TemplateEngine\Xml\TestUnit;
+
+// Import framework stuff
+use CoreFramework\Registry\Registerable;
+
 /**
  * An TestUnit template engine class for XML templates
  *
diff --git a/application/hub/classes/template/publish/class_XmlDhtPublishEntryTemplateEngine.php b/application/hub/classes/template/publish/class_XmlDhtPublishEntryTemplateEngine.php
index 167857f0e..e50525fff 100644
--- a/application/hub/classes/template/publish/class_XmlDhtPublishEntryTemplateEngine.php
+++ b/application/hub/classes/template/publish/class_XmlDhtPublishEntryTemplateEngine.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Hub\Node\TemplateEngine\Xml\Dht\Publish;
+
+// Import framework stuff
+use CoreFramework\Registry\Registerable;
+
 /**
  * An PublishEntry template engine class for XML templates
  *
diff --git a/application/hub/classes/template/requests/class_XmlRequestNodeListTemplateEngine.php b/application/hub/classes/template/requests/class_XmlRequestNodeListTemplateEngine.php
index 23b16636c..11cc1c8c3 100644
--- a/application/hub/classes/template/requests/class_XmlRequestNodeListTemplateEngine.php
+++ b/application/hub/classes/template/requests/class_XmlRequestNodeListTemplateEngine.php
@@ -1,6 +1,12 @@
 <?php
+// Own namespace
+namespace Hub\Node\TemplateEngine\Xml\Request\NodeList;
+
+// Import framework stuff
+use CoreFramework\Registry\Registerable;
+
 /**
- * An ??? template engine class for XML templates
+ * An RequestNodeList template engine class for XML templates
  *
  * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
-- 
2.39.5