diff --git a/code/search/FullTextSearch.php b/code/search/FullTextSearch.php
index 636bbaa..2feb51a 100644
--- a/code/search/FullTextSearch.php
+++ b/code/search/FullTextSearch.php
@@ -1,5 +1,5 @@
 <?php
-
+namespace SilverStripe\FullTextSearch\Search;
 use SilverStripe\Core\Config\Config;
 use SilverStripe\Core\ClassInfo;
 /**
diff --git a/code/search/SearchIntrospection.php b/code/search/SearchIntrospection.php
index 389ed05..6305e43 100644
--- a/code/search/SearchIntrospection.php
+++ b/code/search/SearchIntrospection.php
@@ -1,5 +1,5 @@
 <?php
-
+namespace SilverStripe\FullTextSearch\Search;
 use SilverStripe\Core\ClassInfo;
 use SilverStripe\ORM\DataObject;
 /**
diff --git a/code/search/SearchQuery.php b/code/search/SearchQuery.php
index beb3767..37a28d3 100644
--- a/code/search/SearchQuery.php
+++ b/code/search/SearchQuery.php
@@ -1,5 +1,5 @@
 <?php
-
+namespace SilverStripe\FullTextSearch\Search;
 /**
  * Represents a search query
  *
diff --git a/code/search/SearchUpdater.php b/code/search/SearchUpdater.php
index cb21301..b1fa58d 100644
--- a/code/search/SearchUpdater.php
+++ b/code/search/SearchUpdater.php
@@ -1,5 +1,5 @@
 <?php
-
+namespace SilverStripe\FullTextSearch\Search;
 /**
  * This class is responsible for capturing changes to DataObjects and triggering index updates of the resulting dirty index
  * items.
diff --git a/code/search/SearchVariant.php b/code/search/SearchVariant.php
index 978e867..f8a68ad 100644
--- a/code/search/SearchVariant.php
+++ b/code/search/SearchVariant.php
@@ -1,5 +1,5 @@
 <?php
-
+namespace SilverStripe\FullTextSearch\Search;
 use SilverStripe\Core\ClassInfo;
 /**
  * A Search Variant handles decorators and other situations where the items to reindex or search through are modified
diff --git a/code/search/SearchVariantSiteTreeSubsitesPolyhome.php b/code/search/SearchVariantSiteTreeSubsitesPolyhome.php
index 52fc83d..100788a 100644
--- a/code/search/SearchVariantSiteTreeSubsitesPolyhome.php
+++ b/code/search/SearchVariantSiteTreeSubsitesPolyhome.php
@@ -1,4 +1,5 @@
 <?php
+namespace SilverStripe\FullTextSearch\Search;
 
 class SearchVariantSiteTreeSubsitesPolyhome extends SearchVariant
 {
diff --git a/code/search/SearchVariantSubsites.php b/code/search/SearchVariantSubsites.php
index 8f52ac2..3a00d23 100644
--- a/code/search/SearchVariantSubsites.php
+++ b/code/search/SearchVariantSubsites.php
@@ -1,5 +1,5 @@
 <?php
-
+namespace SilverStripe\FullTextSearch\Search;
 class SearchVariantSubsites extends SearchVariant
 {
     public function appliesToEnvironment()
diff --git a/code/search/SearchVariantVersioned.php b/code/search/SearchVariantVersioned.php
index a3187d6..cdeaebe 100644
--- a/code/search/SearchVariantVersioned.php
+++ b/code/search/SearchVariantVersioned.php
@@ -1,5 +1,5 @@
 <?php
-
+namespace SilverStripe\FullTextSearch\Search;
 class SearchVariantVersioned extends SearchVariant
 {
     public function appliesToEnvironment()
diff --git a/code/search/processors/SearchUpdateBatchedProcessor.php b/code/search/processors/SearchUpdateBatchedProcessor.php
index b684939..eaf2fd4 100644
--- a/code/search/processors/SearchUpdateBatchedProcessor.php
+++ b/code/search/processors/SearchUpdateBatchedProcessor.php
@@ -1,5 +1,5 @@
 <?php
-
+namespace SilverStripe\FullTextSearch\Search\Processors;
 /**
  * Provides batching of search updates
  */
diff --git a/code/search/processors/SearchUpdateCommitJobProcessor.php b/code/search/processors/SearchUpdateCommitJobProcessor.php
index 35144a1..b1ea96e 100644
--- a/code/search/processors/SearchUpdateCommitJobProcessor.php
+++ b/code/search/processors/SearchUpdateCommitJobProcessor.php
@@ -1,5 +1,5 @@
 <?php
-
+namespace SilverStripe\FullTextSearch\Search\Processors;
 if (!interface_exists('QueuedJob')) {
     return;
 }
diff --git a/code/search/processors/SearchUpdateImmediateProcessor.php b/code/search/processors/SearchUpdateImmediateProcessor.php
index 4ae9dae..b9c0288 100644
--- a/code/search/processors/SearchUpdateImmediateProcessor.php
+++ b/code/search/processors/SearchUpdateImmediateProcessor.php
@@ -1,5 +1,5 @@
 <?php
-
+namespace SilverStripe\FullTextSearch\Search\Processors;
 class SearchUpdateImmediateProcessor extends SearchUpdateProcessor
 {
     public function triggerProcessing()
diff --git a/code/search/processors/SearchUpdateMessageQueueProcessor.php b/code/search/processors/SearchUpdateMessageQueueProcessor.php
index cbb5028..085a4ca 100644
--- a/code/search/processors/SearchUpdateMessageQueueProcessor.php
+++ b/code/search/processors/SearchUpdateMessageQueueProcessor.php
@@ -1,5 +1,5 @@
 <?php
-
+namespace SilverStripe\FullTextSearch\Search\Processors;
 class SearchUpdateMessageQueueProcessor extends SearchUpdateProcessor
 {
     /**
diff --git a/code/search/processors/SearchUpdateProcessor.php b/code/search/processors/SearchUpdateProcessor.php
index 579a60c..ebdc84a 100644
--- a/code/search/processors/SearchUpdateProcessor.php
+++ b/code/search/processors/SearchUpdateProcessor.php
@@ -1,5 +1,5 @@
 <?php
-
+namespace SilverStripe\FullTextSearch\Search\Processors;
 abstract class SearchUpdateProcessor
 {
     /**
diff --git a/code/search/processors/SearchUpdateQueuedJobProcessor.php b/code/search/processors/SearchUpdateQueuedJobProcessor.php
index 4ce211d..17dc750 100644
--- a/code/search/processors/SearchUpdateQueuedJobProcessor.php
+++ b/code/search/processors/SearchUpdateQueuedJobProcessor.php
@@ -1,5 +1,5 @@
 <?php
-
+namespace SilverStripe\FullTextSearch\Search\Processors;
 if (!interface_exists('QueuedJob')) {
     return;
 }
diff --git a/code/solr/Solr.php b/code/solr/Solr.php
index 033fa95..c9bc780 100644
--- a/code/solr/Solr.php
+++ b/code/solr/Solr.php
@@ -1,5 +1,5 @@
 <?php
-
+namespace SilverStripe\FullTextSearch\Solr;
 use Monolog\Formatter\LineFormatter;
 use Monolog\Handler\StreamHandler;
 use Monolog\Logger;
diff --git a/code/solr/Solr3Service.php b/code/solr/Solr3Service.php
index 6c3e535..2bdcee5 100644
--- a/code/solr/Solr3Service.php
+++ b/code/solr/Solr3Service.php
@@ -1,5 +1,5 @@
 <?php
-
+namespace SilverStripe\FullTextSearch\Solr;
 class Solr3Service_Core extends SolrService_Core
 {
 }
diff --git a/code/solr/Solr4Service.php b/code/solr/Solr4Service.php
index 2606dde..9cbc36a 100644
--- a/code/solr/Solr4Service.php
+++ b/code/solr/Solr4Service.php
@@ -1,5 +1,5 @@
 <?php
-
+namespace SilverStripe\FullTextSearch\Solr;
 class Solr4Service_Core extends SolrService_Core
 {
     /**
diff --git a/code/solr/SolrConfigStore.php b/code/solr/SolrConfigStore.php
index 0f16439..5e856d3 100644
--- a/code/solr/SolrConfigStore.php
+++ b/code/solr/SolrConfigStore.php
@@ -1,5 +1,5 @@
 <?php
-
+namespace SilverStripe\FullTextSearch\Solr;
 /**
  * Class SolrConfigStore
  *
diff --git a/code/solr/SolrIndex.php b/code/solr/SolrIndex.php
index bfe7477..157b53e 100644
--- a/code/solr/SolrIndex.php
+++ b/code/solr/SolrIndex.php
@@ -1,5 +1,5 @@
 <?php
-
+namespace SilverStripe\FullTextSearch\Solr;
 Solr::include_client_api();
 
 use SilverStripe\Dev\BuildTask;
diff --git a/code/solr/SolrService.php b/code/solr/SolrService.php
index 7a4e1c6..f2766ac 100644
--- a/code/solr/SolrService.php
+++ b/code/solr/SolrService.php
@@ -1,7 +1,8 @@
 <?php
-
+namespace SilverStripe\FullTextSearch\Solr;
 Solr::include_client_api();
 use SilverStripe\Core\Config\Config;
+use \Apache_Solr_Service;
 
 /**
  * The API for accessing a specific core of a Solr server. Exactly the same as Apache_Solr_Service for now.
diff --git a/code/solr/reindex/handlers/SolrReindexBase.php b/code/solr/reindex/handlers/SolrReindexBase.php
index 86f1843..5c67f35 100644
--- a/code/solr/reindex/handlers/SolrReindexBase.php
+++ b/code/solr/reindex/handlers/SolrReindexBase.php
@@ -1,5 +1,5 @@
 <?php
-
+namespace SilverStripe\FullTextSearch\Solr\Reindex\Handlers;
 use Psr\Log\LoggerInterface;
 
 /**
diff --git a/code/solr/reindex/handlers/SolrReindexHandler.php b/code/solr/reindex/handlers/SolrReindexHandler.php
index c7b6be4..8e30546 100644
--- a/code/solr/reindex/handlers/SolrReindexHandler.php
+++ b/code/solr/reindex/handlers/SolrReindexHandler.php
@@ -1,5 +1,5 @@
 <?php
-
+namespace SilverStripe\FullTextSearch\Solr\Reindex\Handlers;
 use Psr\Log\LoggerInterface;
 
 /**
diff --git a/code/solr/reindex/handlers/SolrReindexImmediateHandler.php b/code/solr/reindex/handlers/SolrReindexImmediateHandler.php
index ae5ef73..ff173f4 100644
--- a/code/solr/reindex/handlers/SolrReindexImmediateHandler.php
+++ b/code/solr/reindex/handlers/SolrReindexImmediateHandler.php
@@ -1,5 +1,5 @@
 <?php
-
+namespace SilverStripe\FullTextSearch\Solr\Reindex\Handlers;
 use Psr\Log\LoggerInterface;
 
 /**
diff --git a/code/solr/reindex/handlers/SolrReindexMessageHandler.php b/code/solr/reindex/handlers/SolrReindexMessageHandler.php
index 9ffd4ea..71e6fba 100644
--- a/code/solr/reindex/handlers/SolrReindexMessageHandler.php
+++ b/code/solr/reindex/handlers/SolrReindexMessageHandler.php
@@ -1,5 +1,5 @@
 <?php
-
+namespace SilverStripe\FullTextSearch\Solr\Reindex\Handlers;
 use Psr\Log\LoggerInterface;
 
 if (!class_exists('MessageQueue')) {
diff --git a/code/solr/reindex/handlers/SolrReindexQueuedHandler.php b/code/solr/reindex/handlers/SolrReindexQueuedHandler.php
index 63e8d7e..444e1ec 100644
--- a/code/solr/reindex/handlers/SolrReindexQueuedHandler.php
+++ b/code/solr/reindex/handlers/SolrReindexQueuedHandler.php
@@ -1,5 +1,5 @@
 <?php
-
+namespace SilverStripe\FullTextSearch\Solr\Reindex\Handlers;
 use Psr\Log\LoggerInterface;
 
 if (!interface_exists('QueuedJob')) {
diff --git a/code/solr/reindex/jobs/SolrReindexGroupQueuedJob.php b/code/solr/reindex/jobs/SolrReindexGroupQueuedJob.php
index 7a0eb6b..5f32355 100644
--- a/code/solr/reindex/jobs/SolrReindexGroupQueuedJob.php
+++ b/code/solr/reindex/jobs/SolrReindexGroupQueuedJob.php
@@ -1,5 +1,5 @@
 <?php
-
+namespace SilverStripe\FullTextSearch\Solr\Reindex\Jobs;
 if (!interface_exists('QueuedJob')) {
     return;
 }
diff --git a/code/solr/reindex/jobs/SolrReindexQueuedJob.php b/code/solr/reindex/jobs/SolrReindexQueuedJob.php
index ce46783..0d40181 100644
--- a/code/solr/reindex/jobs/SolrReindexQueuedJob.php
+++ b/code/solr/reindex/jobs/SolrReindexQueuedJob.php
@@ -1,5 +1,5 @@
 <?php
-
+namespace SilverStripe\FullTextSearch\Solr\Reindex\Jobs;
 if (!interface_exists('QueuedJob')) {
     return;
 }
diff --git a/code/solr/reindex/jobs/SolrReindexQueuedJobBase.php b/code/solr/reindex/jobs/SolrReindexQueuedJobBase.php
index ef72c1d..3d5903e 100644
--- a/code/solr/reindex/jobs/SolrReindexQueuedJobBase.php
+++ b/code/solr/reindex/jobs/SolrReindexQueuedJobBase.php
@@ -1,5 +1,5 @@
 <?php
-
+namespace SilverStripe\FullTextSearch\Solr\Reindex\Jobs;
 use Monolog\Logger;
 use Psr\Log\LoggerInterface;
 
diff --git a/code/utils/CombinationsArrayIterator.php b/code/utils/CombinationsArrayIterator.php
index 69e5727..0e873a8 100644
--- a/code/utils/CombinationsArrayIterator.php
+++ b/code/utils/CombinationsArrayIterator.php
@@ -1,5 +1,6 @@
 <?php
-
+namespace SilverStripe\FullTextSearch\Utils;
+use Iterator;
 class CombinationsArrayIterator implements Iterator
 {
     protected $arrays;
diff --git a/code/utils/MultipleArrayIterator.php b/code/utils/MultipleArrayIterator.php
index 7b79850..d7d1185 100644
--- a/code/utils/MultipleArrayIterator.php
+++ b/code/utils/MultipleArrayIterator.php
@@ -1,5 +1,6 @@
 <?php
-
+namespace SilverStripe\FullTextSearch\Utils;
+use Iterator;
 class MultipleArrayIterator implements Iterator
 {
     protected $arrays;
diff --git a/code/utils/WebDAV.php b/code/utils/WebDAV.php
index 8c9a92c..a7002fe 100644
--- a/code/utils/WebDAV.php
+++ b/code/utils/WebDAV.php
@@ -1,5 +1,5 @@
 <?php
-
+namespace SilverStripe\FullTextSearch\Utils;
 class WebDAV
 {
     public static function curl_init($url, $method)
diff --git a/code/utils/logging/MonologFactory.php b/code/utils/logging/MonologFactory.php
index 1fcb835..bff773f 100644
--- a/code/utils/logging/MonologFactory.php
+++ b/code/utils/logging/MonologFactory.php
@@ -1,5 +1,5 @@
 <?php
-
+namespace SilverStripe\FullTextSearch\Utils\Logging;
 use Monolog\Formatter\FormatterInterface;
 use Monolog\Formatter\LineFormatter;
 use Monolog\Handler\HandlerInterface;
diff --git a/code/utils/logging/QueuedJobLogHandler.php b/code/utils/logging/QueuedJobLogHandler.php
index 9b90b51..1d4337c 100644
--- a/code/utils/logging/QueuedJobLogHandler.php
+++ b/code/utils/logging/QueuedJobLogHandler.php
@@ -1,5 +1,5 @@
 <?php
-
+namespace SilverStripe\FullTextSearch\Utils\Logging;
 use Monolog\Handler\AbstractProcessingHandler;
 use Monolog\Logger;
 
diff --git a/code/utils/logging/SearchLogFactory.php b/code/utils/logging/SearchLogFactory.php
index ac56df8..e9a7b61 100644
--- a/code/utils/logging/SearchLogFactory.php
+++ b/code/utils/logging/SearchLogFactory.php
@@ -1,5 +1,5 @@
 <?php
-
+namespace SilverStripe\FullTextSearch\Utils\Logging;
 use Psr\Log;
 
 interface SearchLogFactory