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 aa05729..637da1c 100755
--- a/code/GridFieldAddNewMultiClass.php
+++ b/code/GridFieldAddNewMultiClass.php
@@ -1,7 +1,9 @@
 <?php
 
+namespace SilverStripe\Forms\GridField;
+
 use SilverStripe\Control\Controller;
-use SilverStripe\Control\SS_HTTPResponse_Exception;
+use SilverStripe\Control\HTTPResponse_Exception;
 use SilverStripe\Core\ClassInfo;
 use SilverStripe\Core\Config\Config;
 use SilverStripe\Core\Object;
@@ -10,6 +12,7 @@ use SilverStripe\Forms\GridField\GridField;
 use SilverStripe\Forms\GridField\GridField_HTMLProvider;
 use SilverStripe\Forms\GridField\GridField_URLHandler;
 use SilverStripe\View\ArrayData;
+use ReflectionClass;
 
 /**
  * A component which lets the user select from a list of classes to create a new record form.
@@ -37,7 +40,7 @@ class GridFieldAddNewMultiClass implements GridField_HTMLProvider, GridField_URL
 	/**
 	 * @var string
 	 */
-	protected $itemRequestClass = 'GridFieldAddNewMultiClassHandler';
+	protected $itemRequestClass = 'SilverStripe\\Forms\\GridField\\GridFieldAddNewMultiClassHandler';
 
 	/**
 	 * @param string $fragment the fragment to render the button in
@@ -176,7 +179,7 @@ class GridFieldAddNewMultiClass implements GridField_HTMLProvider, GridField_URL
 		}
 
 		if(!$class || !array_key_exists($class, $classes)) {
-			throw new SS_HTTPResponse_Exception(400);
+			throw new HTTPResponse_Exception(400);
 		}
 
 		$handler = Object::create($this->itemRequestClass,
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..568417a 100644
--- a/code/GridFieldEditableColumns.php
+++ b/code/GridFieldEditableColumns.php
@@ -1,7 +1,9 @@
 <?php
 
+namespace SilverStripe\Forms\GridField;
+
 use SilverStripe\Control\Controller;
-use SilverStripe\Control\SS_HTTPResponse_Exception;
+use SilverStripe\Control\HTTPResponse_Exception;
 use SilverStripe\Core\Object;
 use SilverStripe\Forms\FieldList;
 use SilverStripe\Forms\Form;
@@ -149,11 +151,11 @@ class GridFieldEditableColumns extends GridFieldDataColumns implements
 		$list = $grid->getList();
 
 		if(!ctype_digit($id)) {
-			throw new SS_HTTPResponse_Exception(null, 400);
+			throw new HTTPResponse_Exception(null, 400);
 		}
 
 		if(!$record = $list->byID($id)) {
-			throw new SS_HTTPResponse_Exception(null, 404);
+			throw new HTTPResponse_Exception(null, 404);
 		}
 
 		$form = $this->getForm($grid, $record);
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 f1d031e..79b7b5a 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;
@@ -178,7 +180,7 @@ class GridFieldOrderableRows extends RequestHandler implements
 		$classes = ClassInfo::dataClassesFor($list->dataClass());
 
 		foreach($classes as $class) {
-			if(singleton($class)->hasOwnTableDatabaseField($field)) {
+			if(singleton($class)->hasDataBaseField($field)) {
 				return $class;
 			}
 		}
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 4f171c4..127b849 100644
--- a/composer.json
+++ b/composer.json
@@ -19,7 +19,7 @@
 		"issues": "http://github.com/silverstripe-australia/silverstripe-gridfieldextensions/issues"
 	},
 	"require": {
-		"silverstripe/framework": "~3.1"
+		"silverstripe/framework": "4.0.0-alpha3 as 3.4.1"
 	},
 	"extra": {
 		"installer-name": "gridfieldextensions",
@@ -33,5 +33,10 @@
 	},
 	"replace": {
 		"ajshort/silverstripe-gridfieldextensions": "self.version"
-	}
+	},
+	"autoload": {
+		"psr-4": {"SilverStripe\\Forms\\GridField\\": "code/"}
+	},
+	"prefer-stable": true,
+	"minimum-stability": "dev"
 }
diff --git a/javascript/GridFieldExtensions.js b/javascript/GridFieldExtensions.js
index 435cdb6..8987740 100644
--- a/javascript/GridFieldExtensions.js
+++ b/javascript/GridFieldExtensions.js
@@ -221,7 +221,7 @@
 				var cls  = this.parents(".ss-gridfield-add-new-multi-class").find("select").val();
 
 				if(cls && cls.length) {
-					this.getGridField().showDetailView(link.replace("{class}", cls));
+					this.getGridField().showDetailView(link.replace("{class}", encodeURI(cls)));
 				}
 
 				return false;
diff --git a/templates/GridFieldAddExistingSearchButton.ss b/templates/SilverStripe/Forms/GridField/GridFieldAddExistingSearchButton.ss
similarity index 100%
rename from templates/GridFieldAddExistingSearchButton.ss
rename to templates/SilverStripe/Forms/GridField/GridFieldAddExistingSearchButton.ss
diff --git a/templates/GridFieldAddExistingSearchHandler.ss b/templates/SilverStripe/Forms/GridField/GridFieldAddExistingSearchHandler.ss
similarity index 100%
rename from templates/GridFieldAddExistingSearchHandler.ss
rename to templates/SilverStripe/Forms/GridField/GridFieldAddExistingSearchHandler.ss
diff --git a/templates/GridFieldAddNewInlineButton.ss b/templates/SilverStripe/Forms/GridField/GridFieldAddNewInlineButton.ss
similarity index 100%
rename from templates/GridFieldAddNewInlineButton.ss
rename to templates/SilverStripe/Forms/GridField/GridFieldAddNewInlineButton.ss
diff --git a/templates/GridFieldAddNewInlineRow.ss b/templates/SilverStripe/Forms/GridField/GridFieldAddNewInlineRow.ss
similarity index 100%
rename from templates/GridFieldAddNewInlineRow.ss
rename to templates/SilverStripe/Forms/GridField/GridFieldAddNewInlineRow.ss
diff --git a/templates/GridFieldAddNewMultiClass.ss b/templates/SilverStripe/Forms/GridField/GridFieldAddNewMultiClass.ss
similarity index 100%
rename from templates/GridFieldAddNewMultiClass.ss
rename to templates/SilverStripe/Forms/GridField/GridFieldAddNewMultiClass.ss
diff --git a/templates/GridFieldExternalLink.ss b/templates/SilverStripe/Forms/GridField/GridFieldExternalLink.ss
similarity index 100%
rename from templates/GridFieldExternalLink.ss
rename to templates/SilverStripe/Forms/GridField/GridFieldExternalLink.ss
diff --git a/templates/GridFieldRequestHandler.ss b/templates/SilverStripe/Forms/GridField/GridFieldRequestHandler.ss
similarity index 100%
rename from templates/GridFieldRequestHandler.ss
rename to templates/SilverStripe/Forms/GridField/GridFieldRequestHandler.ss
diff --git a/templates/GridFieldTitleHeader.ss b/templates/SilverStripe/Forms/GridField/GridFieldTitleHeader.ss
similarity index 100%
rename from templates/GridFieldTitleHeader.ss
rename to templates/SilverStripe/Forms/GridField/GridFieldTitleHeader.ss