diff --git a/.upgrade.yml b/.upgrade.yml
new file mode 100644
index 0000000..1f11da7
--- /dev/null
+++ b/.upgrade.yml
@@ -0,0 +1,9 @@
+mappings:
+  PostgreSQLConnector: SilverStripe\PostgreSQL\PostgreSQLConnector
+  PostgreSQLDatabase: SilverStripe\PostgreSQL\PostgreSQLDatabase
+  PostgreSQLDatabaseConfigurationHelper: SilverStripe\PostgreSQL\PostgreSQLDatabaseConfigurationHelper
+  PostgreSQLQuery: SilverStripe\PostgreSQL\PostgreSQLQuery
+  PostgreSQLQueryBuilder: SilverStripe\PostgreSQL\PostgreSQLQueryBuilder
+  PostgreSQLSchemaManager: SilverStripe\PostgreSQL\PostgreSQLSchemaManager
+  PostgreSQLConnectorTest: SilverStripe\PostgreSQL\Test\PostgreSQLConnectorTest
+  PostgreSQLDatabaseTest: SilverStripe\PostgreSQL\Test\PostgreSQLDatabaseTest
diff --git a/_config/connectors.yml b/_config/connectors.yml
index 7792b20..1da3e7a 100644
--- a/_config/connectors.yml
+++ b/_config/connectors.yml
@@ -3,14 +3,21 @@ name: postgresqlconnectors
 ---
 Injector:
   PostgrePDODatabase:
-    class: 'PostgreSQLDatabase'
+    class: 'SilverStripe\PostgreSQL\PostgreSQLDatabase'
     properties:
       connector: %$PDOConnector
       schemaManager: %$PostgreSQLSchemaManager
       queryBuilder: %$PostgreSQLQueryBuilder
   PostgreSQLDatabase:
-    class: 'PostgreSQLDatabase'
+    class: 'SilverStripe\PostgreSQL\PostgreSQLDatabase'
     properties:
       connector: %$PostgreSQLConnector
       schemaManager: %$PostgreSQLSchemaManager
-      queryBuilder: %$PostgreSQLQueryBuilder
\ No newline at end of file
+      queryBuilder: %$PostgreSQLQueryBuilder
+  PostgreSQLConnector:
+    class: 'SilverStripe\PostgreSQL\PostgreSQLConnector'
+    type: prototype
+  PostgreSQLSchemaManager:
+    class: 'SilverStripe\PostgreSQL\PostgreSQLSchemaManager'
+  PostgreSQLQueryBuilder:
+    class: 'SilverStripe\PostgreSQL\PostgreSQLQueryBuilder'
diff --git a/_register_database.php b/_register_database.php
index 95eacce..9872131 100644
--- a/_register_database.php
+++ b/_register_database.php
@@ -2,7 +2,7 @@
 
 // PDO Postgre database
 DatabaseAdapterRegistry::register(array(
-    'class' => 'PostgrePDODatabase',
+    'class' => 'SilverStripe\\PostgreSQL\PostgrePDODatabase',
     'title' => 'PostgreSQL 8.3+ (using PDO)',
     'helperPath' => dirname(__FILE__).'/code/PostgreSQLDatabaseConfigurationHelper.php',
     'supported' => (class_exists('PDO') && in_array('postgresql', PDO::getAvailableDrivers())),
@@ -15,7 +15,7 @@ DatabaseAdapterRegistry::register(array(
 
 // PDO Postgre database
 DatabaseAdapterRegistry::register(array(
-    'class' => 'PostgreSQLDatabase',
+    'class' => 'SilverStripe\\PostgreSQL\PostgreSQLDatabase',
     'title' => 'PostgreSQL 8.3+ (using pg_connect)',
     'helperPath' => dirname(__FILE__).'/code/PostgreSQLDatabaseConfigurationHelper.php',
     'supported' => function_exists('pg_connect'),
diff --git a/code/PostgreSQLConnector.php b/code/PostgreSQLConnector.php
index 3dd945d..5196462 100644
--- a/code/PostgreSQLConnector.php
+++ b/code/PostgreSQLConnector.php
@@ -1,5 +1,13 @@
 <?php
 
+namespace SilverStripe\PostgreSQL;
+
+
+use ErrorException;
+use SilverStripe\ORM\Connect\DBConnector;
+
+
+
 /**
  * PostgreSQL connector class using the PostgreSQL specific api
  * 
diff --git a/code/PostgreSQLDatabase.php b/code/PostgreSQLDatabase.php
index 00a7cbe..ad705d0 100644
--- a/code/PostgreSQLDatabase.php
+++ b/code/PostgreSQLDatabase.php
@@ -1,5 +1,21 @@
 <?php
 
+namespace SilverStripe\PostgreSQL;
+
+use SilverStripe\ORM\Connect\SS_Database;
+use Config;
+use ErrorException;
+
+use Exception;
+
+
+use PaginatedList;
+use SilverStripe\ORM\DB;
+use SilverStripe\ORM\DataObject;
+use SilverStripe\ORM\ArrayList;
+
+
+
 /**
  * PostgreSQL connector class.
  * 
@@ -35,7 +51,7 @@ class PostgreSQLDatabase extends SS_Database
      */
     public static function default_fts_cluster_method()
     {
-        return Config::inst()->get('PostgreSQLDatabase', 'default_fts_cluster_method');
+        return Config::inst()->get('SilverStripe\\PostgreSQL\\PostgreSQLDatabase', 'default_fts_cluster_method');
     }
 
     /**
@@ -45,7 +61,7 @@ class PostgreSQLDatabase extends SS_Database
      */
     public static function default_fts_search_method()
     {
-        return Config::inst()->get('PostgreSQLDatabase', 'default_fts_search_method');
+        return Config::inst()->get('SilverStripe\\PostgreSQL\\PostgreSQLDatabase', 'default_fts_search_method');
     }
 
     /**
@@ -61,7 +77,7 @@ class PostgreSQLDatabase extends SS_Database
      */
     public static function allow_query_master_postgres()
     {
-        return Config::inst()->get('PostgreSQLDatabase', 'allow_query_master_postgres');
+        return Config::inst()->get('SilverStripe\\PostgreSQL\\PostgreSQLDatabase', 'allow_query_master_postgres');
     }
 
     /**
@@ -76,7 +92,7 @@ class PostgreSQLDatabase extends SS_Database
      */
     public static function model_schema_as_database()
     {
-        return Config::inst()->get('PostgreSQLDatabase', 'model_schema_as_database');
+        return Config::inst()->get('SilverStripe\\PostgreSQL\\PostgreSQLDatabase', 'model_schema_as_database');
     }
 
     /**
@@ -88,7 +104,7 @@ class PostgreSQLDatabase extends SS_Database
      */
     public static function search_language()
     {
-        return Config::inst()->get('PostgreSQLDatabase', 'search_language');
+        return Config::inst()->get('SilverStripe\\PostgreSQL\\PostgreSQLDatabase', 'search_language');
     }
 
     /**
diff --git a/code/PostgreSQLDatabaseConfigurationHelper.php b/code/PostgreSQLDatabaseConfigurationHelper.php
index cf7ba7c..5afa4b3 100644
--- a/code/PostgreSQLDatabaseConfigurationHelper.php
+++ b/code/PostgreSQLDatabaseConfigurationHelper.php
@@ -1,4 +1,12 @@
 <?php
+
+namespace SilverStripe\PostgreSQL;
+
+use DatabaseConfigurationHelper;
+use PDO;
+use Exception;
+use DatabaseAdapterRegistry;
+
 /**
  * This is a helper class for the SS installer.
  * 
diff --git a/code/PostgreSQLQuery.php b/code/PostgreSQLQuery.php
index 7b1fc7e..a6e195d 100644
--- a/code/PostgreSQLQuery.php
+++ b/code/PostgreSQLQuery.php
@@ -1,8 +1,15 @@
 <?php
 
+namespace SilverStripe\PostgreSQL;
+
+
+use SilverStripe\ORM\Connect\SS_Query;
+
+
+
 /**
  * A result-set from a PostgreSQL database.
- * 
+ *
  * @package sapphire
  * @subpackage model
  */
diff --git a/code/PostgreSQLQueryBuilder.php b/code/PostgreSQLQueryBuilder.php
index bc3f4c1..66c8fd9 100644
--- a/code/PostgreSQLQueryBuilder.php
+++ b/code/PostgreSQLQueryBuilder.php
@@ -1,5 +1,15 @@
 <?php
 
+namespace SilverStripe\PostgreSQL;
+
+
+
+use InvalidArgumentException;
+use SilverStripe\ORM\Queries\SQLSelect;
+use SilverStripe\ORM\Connect\DBQueryBuilder;
+
+
+
 class PostgreSQLQueryBuilder extends DBQueryBuilder
 {
     /**
diff --git a/code/PostgreSQLSchemaManager.php b/code/PostgreSQLSchemaManager.php
index 3e0f4d6..9da071d 100644
--- a/code/PostgreSQLSchemaManager.php
+++ b/code/PostgreSQLSchemaManager.php
@@ -1,8 +1,16 @@
 <?php
 
+namespace SilverStripe\PostgreSQL;
+
+
+use Deprecation;
+use Database;
+use SilverStripe\ORM\Connect\DBSchemaManager;
+
+
+
 /**
  * PostgreSQL schema manager
- * 
  * @package sapphire
  * @subpackage model
  */
diff --git a/composer.json b/composer.json
index ca49087..5c2c439 100644
--- a/composer.json
+++ b/composer.json
@@ -16,5 +16,10 @@
 		"branch-alias": {
 			"dev-master": "2.0.x-dev"
 		}
+	},
+	"autoload": {
+		"psr-4": {
+			"SilverStripe\\PostgreSQL\\": "code/"
+		}
 	}
 }
diff --git a/tests/PostgreSQLConnectorTest.php b/tests/PostgreSQLConnectorTest.php
index 6dba478..a408298 100644
--- a/tests/PostgreSQLConnectorTest.php
+++ b/tests/PostgreSQLConnectorTest.php
@@ -1,5 +1,13 @@
 <?php
 
+namespace SilverStripe\PostgreSQL\Test;
+
+use SapphireTest;
+
+use SilverStripe\PostgreSQL\PostgreSQLConnector;
+
+
+
 /**
  * Description of PostgreSQLConnectorTest
  *
diff --git a/tests/PostgreSQLDatabaseTest.php b/tests/PostgreSQLDatabaseTest.php
index 393538d..f35c139 100644
--- a/tests/PostgreSQLDatabaseTest.php
+++ b/tests/PostgreSQLDatabaseTest.php
@@ -1,4 +1,18 @@
 <?php
+
+namespace SilverStripe\PostgreSQL\Test;
+
+use SapphireTest;
+
+
+use Page;
+use Exception;
+
+use SilverStripe\ORM\DB;
+use SilverStripe\PostgreSQL\PostgreSQLDatabase;
+use SilverStripe\ORM\DataObject;
+
+
 /**
  * @package postgresql
  * @subpackage tests