diff --git a/code/GridFieldAddExistingSearchButton.php b/code/GridFieldAddExistingSearchButton.php
index d300d1c..c6a47c4 100755
--- a/code/GridFieldAddExistingSearchButton.php
+++ b/code/GridFieldAddExistingSearchButton.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace SilverStripe\Forms\GridField;
+
 use SilverStripe\Forms\GridField\GridField_HTMLProvider;
 use SilverStripe\Forms\GridField\GridField_URLHandler;
 use SilverStripe\ORM\SS_List;
diff --git a/code/GridFieldAddExistingSearchHandler.php b/code/GridFieldAddExistingSearchHandler.php
index 32b905c..33b0a68 100644
--- a/code/GridFieldAddExistingSearchHandler.php
+++ b/code/GridFieldAddExistingSearchHandler.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace SilverStripe\Forms\GridField;
+
 use SilverStripe\Control\Controller;
 use SilverStripe\Control\RequestHandler;
 use SilverStripe\Forms\FieldList;
diff --git a/code/GridFieldAddNewInlineButton.php b/code/GridFieldAddNewInlineButton.php
index 559de71..6074da2 100755
--- a/code/GridFieldAddNewInlineButton.php
+++ b/code/GridFieldAddNewInlineButton.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace SilverStripe\Forms\GridField;
+
 use SilverStripe\Core\Convert;
 use SilverStripe\Core\Object;
 use SilverStripe\Forms\Form;
diff --git a/code/GridFieldAddNewMultiClass.php b/code/GridFieldAddNewMultiClass.php
index 2222d1c..9efe254 100755
--- a/code/GridFieldAddNewMultiClass.php
+++ b/code/GridFieldAddNewMultiClass.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace SilverStripe\Forms\GridField;
+
 use SilverStripe\Control\Controller;
 use SilverStripe\Control\SS_HTTPResponse_Exception;
 use SilverStripe\Core\ClassInfo;
diff --git a/code/GridFieldAddNewMultiClassHandler.php b/code/GridFieldAddNewMultiClassHandler.php
index fe87a36..e30dc6a 100644
--- a/code/GridFieldAddNewMultiClassHandler.php
+++ b/code/GridFieldAddNewMultiClassHandler.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace SilverStripe\Forms\GridField;
+
 use SilverStripe\Control\Controller;
 use SilverStripe\Forms\GridField\GridFieldDetailForm_ItemRequest;
 
diff --git a/code/GridFieldEditableColumns.php b/code/GridFieldEditableColumns.php
index 5bfdeab..6c2edaf 100644
--- a/code/GridFieldEditableColumns.php
+++ b/code/GridFieldEditableColumns.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace SilverStripe\Forms\GridField;
+
 use SilverStripe\Control\Controller;
 use SilverStripe\Control\SS_HTTPResponse_Exception;
 use SilverStripe\Core\Object;
diff --git a/code/GridFieldExtensions.php b/code/GridFieldExtensions.php
index 3b88a6d..c6aa7e2 100644
--- a/code/GridFieldExtensions.php
+++ b/code/GridFieldExtensions.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace SilverStripe\Forms\GridField;
+
 use SilverStripe\View\Requirements;
 
 /**
diff --git a/code/GridFieldExternalLink.php b/code/GridFieldExternalLink.php
index e00b7ef..b03fb5c 100644
--- a/code/GridFieldExternalLink.php
+++ b/code/GridFieldExternalLink.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace SilverStripe\Forms\GridField;
+
 use SilverStripe\Forms\GridField\GridFieldDataColumns;
 use SilverStripe\View\ArrayData;
 
diff --git a/code/GridFieldOrderableRows.php b/code/GridFieldOrderableRows.php
index e0c3851..dd3cb2c 100755
--- a/code/GridFieldOrderableRows.php
+++ b/code/GridFieldOrderableRows.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace SilverStripe\Forms\GridField;
+
 use SilverStripe\Control\Controller;
 use SilverStripe\Control\RequestHandler;
 use SilverStripe\Core\ClassInfo;
diff --git a/code/GridFieldRequestHandler.php b/code/GridFieldRequestHandler.php
index c06c324..26f013e 100644
--- a/code/GridFieldRequestHandler.php
+++ b/code/GridFieldRequestHandler.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace SilverStripe\Forms\GridField;
+
 use SilverStripe\Admin\LeftAndMain;
 use SilverStripe\Control\Controller;
 use SilverStripe\Control\RequestHandler;
diff --git a/code/GridFieldTitleHeader.php b/code/GridFieldTitleHeader.php
index 4cf9be8..c1ebbaf 100644
--- a/code/GridFieldTitleHeader.php
+++ b/code/GridFieldTitleHeader.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace SilverStripe\Forms\GridField;
+
 use SilverStripe\Forms\GridField\GridField_HTMLProvider;
 use SilverStripe\ORM\ArrayList;
 use SilverStripe\View\ArrayData;
diff --git a/composer.json b/composer.json
index fcc77df..8764453 100644
--- a/composer.json
+++ b/composer.json
@@ -19,12 +19,12 @@
 		"issues": "http://github.com/silverstripe-australia/silverstripe-gridfieldextensions/issues"
 	},
 	"require": {
-		"silverstripe/framework": "4.0.0-alpha1 as 3.4.1"
+		"silverstripe/framework": "4.0.0-alpha3 as 3.4.1"
 	},
 	"extra": {
 		"installer-name": "gridfieldextensions",
 		"branch-alias": {
-			"dev-master": "2.0.x-dev"
+			"dev-master": "1.4.x-dev"
 		},
 		"screenshots": [
 			"docs/en/_images/editable-rows.png",
@@ -34,6 +34,9 @@
 	"replace": {
 		"ajshort/silverstripe-gridfieldextensions": "self.version"
 	},
+	"autoload": {
+		"psr-4": {"SilverStripe\\Forms\\GridField\\": "code/"}
+	},
 	"prefer-stable": true,
-  	"minimum-stability": "dev"
+	"minimum-stability": "dev"
 }