diff --git a/.upgrade.yml b/.upgrade.yml
new file mode 100644
index 0000000..06ad44d
--- /dev/null
+++ b/.upgrade.yml
@@ -0,0 +1,14 @@
+mappings:
+  ChosenDropdownField: UncleCheese\BootstrapForms\ChosenDropdownField
+  BootstrapUserForm: UncleCheese\BootstrapForms\BootstrapUserForm
+  BootstrapFormAction: UncleCheese\BootstrapForms\BootstrapFormAction
+  BootstrapTextField: UncleCheese\BootstrapForms\BootstrapTextField
+  BootstrapFormField: UncleCheese\BootstrapForms\BootstrapFormField
+  ChosenListboxField: UncleCheese\BootstrapForms\ChosenListboxField
+  SimpleHtmlEditorField: UncleCheese\BootstrapForms\SimpleHtmlEditorField
+  BootstrapButtonGroupField: UncleCheese\BootstrapForms\BootstrapButtonGroupField
+  BootstrapDropdownField: UncleCheese\BootstrapForms\BootstrapDropdownField
+  BootstrapForm: UncleCheese\BootstrapForms\BootstrapForm
+  BootstrapFieldList: UncleCheese\BootstrapForms\BootstrapFieldList
+  BootstrapOptionsetField: UncleCheese\BootstrapForms\BootstrapOptionsetField
+  BootstrapMemberLoginForm: UncleCheese\BootstrapForms\BootstrapMemberLoginForm
diff --git a/_config/config.yml b/_config/config.yml
index 853ed32..9c11a1d 100644
--- a/_config/config.yml
+++ b/_config/config.yml
@@ -1,38 +1,39 @@
+---
 name: BootstrapForm
 ---
-BootstrapForm:
+UncleCheese\BootstrapForms\BootstrapForm:
   bootstrap_included: false
   jquery_included: false
   bootstrap_form_included: false
   bootstrap_select_included: false
   inline_fields:
-    - CheckboxField
-    - FormAction
-FormField:
+    - SilverStripe\Forms\CheckboxField
+    - SilverStripe\Forms\FormAction
+SilverStripe\Forms\FormField:
   extensions:
-    - BootstrapFormField
-TextField:
+    - UncleCheese\BootstrapForms\BootstrapFormField
+SilverStripe\Forms\TextField:
   extensions:
-    - BootstrapTextField
-OptionsetField:
+    - UncleCheese\BootstrapForms\BootstrapTextField
+SilverStripe\Forms\OptionsetField:
   extensions:
-    - BootstrapOptionsetField
-FormAction:
+    - UncleCheese\BootstrapForms\BootstrapOptionsetField
+SilverStripe\Forms\FormAction:
   extensions:
-    - BootstrapFormAction
-TextareaField:
+    - UncleCheese\BootstrapForms\BootstrapFormAction
+SilverStripe\Forms\TextareaField:
   extensions:
-    - BootstrapTextField
-FieldList:
+    - UncleCheese\BootstrapForms\BootstrapTextField
+SilverStripe\Forms\FieldList:
   extensions:
-    - BootstrapFieldList
-Injector:
-  MemberLoginForm:
-    class: BootstrapMemberLoginForm
+    - UncleCheese\BootstrapForms\BootstrapFieldList
+SilverStripe\Core\Injector\Injector:
+  SilverStripe\Security\MemberAuthenticator\MemberLoginForm:
+    class: UncleCheese\BootstrapForms\BootstrapMemberLoginForm
 ---
 only:
   moduleexists: userforms
 ---
-UserDefinedForm_Controller:
+SilverStripe\UserForms\Control\UserDefinedFormController:
   extensions:
-    - BootstrapUserForm
+    - UncleCheese\BootstrapForms\BootstrapUserForm
diff --git a/code/BootstrapButtonGroupField.php b/code/BootstrapButtonGroupField.php
index 6244f53..1f9bfde 100644
--- a/code/BootstrapButtonGroupField.php
+++ b/code/BootstrapButtonGroupField.php
@@ -1,5 +1,12 @@
 <?php
 
+namespace UncleCheese\BootstrapForms;
+
+use SilverStripe\ORM\ArrayList;
+use SilverStripe\View\ArrayData;
+use SilverStripe\View\Requirements;
+use SilverStripe\Forms\FormField;
+
 
 class BootstrapButtonGroupField extends FormField
 {
diff --git a/code/BootstrapDropdownField.php b/code/BootstrapDropdownField.php
index 60e4ee4..81f9e9f 100644
--- a/code/BootstrapDropdownField.php
+++ b/code/BootstrapDropdownField.php
@@ -1,5 +1,13 @@
 <?php
 
+namespace UncleCheese\BootstrapForms;
+
+use SilverStripe\Core\Config\Config;
+use SilverStripe\i18n\i18n;
+use SilverStripe\View\Requirements;
+use SilverStripe\Forms\DropdownField;
+use Translatable;
+
 /**
  * Defines a FormField that uses the bootstrap-select JS plugin for making
  * dropdown fields nice.
diff --git a/code/BootstrapFieldList.php b/code/BootstrapFieldList.php
index 64b586c..ccc72ee 100644
--- a/code/BootstrapFieldList.php
+++ b/code/BootstrapFieldList.php
@@ -1,5 +1,15 @@
 <?php
 
+namespace UncleCheese\BootstrapForms;
+
+use SilverStripe\Core\Injector\Injector;
+use SilverStripe\Forms\CompositeField;
+use SilverStripe\Forms\TabSet;
+use SilverStripe\Forms\Tab;
+use SilverStripe\View\SSViewer;
+use SilverStripe\Core\ClassInfo;
+use SilverStripe\Core\Extension;
+
 
 
 class BootstrapFieldList extends Extension {
@@ -14,10 +24,10 @@ class BootstrapFieldList extends Extension {
 	 * Transforms all fields in the FieldList to use Bootstrap templates
 	 * @return FieldList
 	 */
-	public function bootstrapify() {		
+	public function bootstrapify() {
 		foreach($this->owner as $f) {
 
-			$sng = Injector::inst()->get($f->class, true, ['dummy', '']);
+			$sng = Injector::inst()->get(get_class($f), true, ['dummy', '']);
 
 			if(isset($this->ignores[$f->getName()])) continue;
 
@@ -39,19 +49,20 @@ public function bootstrapify() {
 
 			// If the user has customised the holder template already, don't apply the default one.
 			if($sng->getFieldHolderTemplate() == $f->getFieldHolderTemplate()) {
-				$template = "Bootstrap{$f->class}_holder";			
-				if(SSViewer::hasTemplate($template)) {					
-					$f->setFieldHolderTemplate($template);				
+                $className = substr(strrchr(get_class($f), "\\"), 1);
+			    $template = "UncleCheese\\BootstrapForms\\Bootstrap{$className}_holder";
+				if(SSViewer::hasTemplate($template)) {
+					$f->setFieldHolderTemplate($template);
 				}
-				else {				
-					$f->setFieldHolderTemplate("BootstrapFieldHolder");
+				else {
+					$f->setFieldHolderTemplate("UncleCheese\\BootstrapForms\\BootstrapFieldHolder");
 				}
 
 			}
 
 			// If the user has customised the field template already, don't apply the default one.
 			if($sng->getTemplate() == $f->getTemplate()) {
-				foreach(array_reverse(ClassInfo::ancestry($f)) as $className) {						
+				foreach(array_reverse(ClassInfo::ancestry($f)) as $className) {
 					$bootstrapCandidate = "Bootstrap{$className}";
 					$nativeCandidate = $className;
 					if(SSViewer::hasTemplate($bootstrapCandidate)) {
@@ -68,12 +79,12 @@ public function bootstrapify() {
 			}
 		}
 
-		return $this->owner;		
+		return $this->owner;
 	}
 
 	/**
 	 * Adds this field as ignored. Should not take on boostrap transformation
-	 * 
+	 *
 	 * @param  string $field The name of the form field
 	 * @return FieldList
 	 */
diff --git a/code/BootstrapForm.php b/code/BootstrapForm.php
index 24a9e1f..dca35af 100755
--- a/code/BootstrapForm.php
+++ b/code/BootstrapForm.php
@@ -1,5 +1,11 @@
 <?php
 
+namespace UncleCheese\BootstrapForms;
+
+use SilverStripe\Core\Config\Config;
+use SilverStripe\View\Requirements;
+use SilverStripe\Forms\Form;
+
 /**
  * Builds a form that renders {@link FormField} objects
  * using templates that are compatible with Twitter Bootstrap.
@@ -183,13 +189,13 @@ public function addWell() {
 	 */
 	public function forTemplate() {
         if($this->stat('bootstrap_included')!=false) {
-            Requirements::css(BOOTSTRAP_FORMS_DIR.'/css/bootstrap.css');
+            Requirements::css('unclecheese/bootstrap-forms: css/bootstrap.css');
 		}
 		if($this->stat('jquery_included')!=false) {
-			Requirements::javascript(THIRDPARTY_DIR."/jquery/jquery.js");
+			Requirements::javascript('silverstripe/adimin: thirdparty/jquery/jquery.js');
 		}
 		if(!$this->stat('bootstrap_form_included')!=false) {
-			Requirements::javascript(BOOTSTRAP_FORMS_DIR."/javascript/bootstrap_forms.js");
+			Requirements::javascript('unclecheese/bootstrap-forms: javascript/bootstrap_forms.js');
 		}
 		$this->addExtraClass("form-{$this->formLayout}");
 
diff --git a/code/BootstrapFormAction.php b/code/BootstrapFormAction.php
index d59df3e..220ff02 100755
--- a/code/BootstrapFormAction.php
+++ b/code/BootstrapFormAction.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace UncleCheese\BootstrapForms;
+
+use SilverStripe\ORM\DataExtension;
+
 /**
  * Creates a {@link FormAction} object that is compatible
  * with the Twitter Bootstrap CSS framework.
diff --git a/code/BootstrapFormField.php b/code/BootstrapFormField.php
index 5f9c4b0..33d55c7 100755
--- a/code/BootstrapFormField.php
+++ b/code/BootstrapFormField.php
@@ -1,5 +1,12 @@
 <?php
 
+namespace UncleCheese\BootstrapForms;
+
+use SilverStripe\Core\Convert;
+use SilverStripe\Forms\FormField;
+use SilverStripe\Core\Config\Config;
+use SilverStripe\ORM\DataExtension;
+
 /**
  * The base class for creating a {@link FormField} object
  * that is compatible with the Twitter Bootstrap CSS framework.
@@ -258,9 +265,9 @@ private function loadErrorMessage() {
 	 * @param  FormField $field
 	 */
 	public function onBeforeRender (FormField $field) {
-        $inline_fields = Config::inst()->get('BootstrapForm','inline_fields');
+        $inline_fields = Config::inst()->get(BootstrapForm::class,'inline_fields');
 
-        if(!in_array($field->class, $inline_fields )) {
+        if(!in_array(get_class($field), $inline_fields )) {
             $field->addExtraClass('form-control');
         }
 	}
diff --git a/code/BootstrapMemberLoginForm.php b/code/BootstrapMemberLoginForm.php
index 44a372e..fdbd150 100644
--- a/code/BootstrapMemberLoginForm.php
+++ b/code/BootstrapMemberLoginForm.php
@@ -1,12 +1,21 @@
 <?php
 
-class BootstrapMemberLoginForm extends MemberLoginForm {
+namespace UncleCheese\BootstrapForms;
 
+use SilverStripe\Control\Controller;
+use SilverStripe\Security\LoginForm;
+use SilverStripe\Security\MemberAuthenticator\MemberLoginForm;
 
-	public function __construct($controller = null, $name = null, $fields = null, $actions = null, $checkCurrentUser = true) {
-		if(!$controller) $controller = Controller::curr();
-		if(!$name) $name = "LoginForm";
-		parent::__construct($controller, $name, $fields, $actions, $checkCurrentUser);
+class BootstrapMemberLoginForm extends MemberLoginForm {
+	public function __construct(
+        $controller,
+        $authenticatorClass,
+        $name,
+        $fields = null,
+        $actions = null,
+        $checkCurrentUser = true
+    ) {
+		parent::__construct($controller, $authenticatorClass, $name, $fields, $actions, $checkCurrentUser);
 		$this->Fields()->bootstrapify();
 		$this->Actions()->bootstrapify();
 		$this->setTemplate("BootstrapForm");
@@ -14,4 +23,4 @@ public function __construct($controller = null, $name = null, $fields = null, $a
 		$this->invokeWithExtensions('updateBoostrapMemberLoginForm', $this);
 	}
 
-}
\ No newline at end of file
+}
diff --git a/code/BootstrapOptionsetField.php b/code/BootstrapOptionsetField.php
index f16eac4..920cd8d 100755
--- a/code/BootstrapOptionsetField.php
+++ b/code/BootstrapOptionsetField.php
@@ -1,5 +1,8 @@
 <?php
 
+namespace UncleCheese\BootstrapForms;
+
+use Exception;
 
 /**
  * Creates a {@link OptionsetField} or a subclass thereof that is compatible with the
diff --git a/code/BootstrapTextField.php b/code/BootstrapTextField.php
index e94c799..b35ae44 100755
--- a/code/BootstrapTextField.php
+++ b/code/BootstrapTextField.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace UncleCheese\BootstrapForms;
+
 /**
  * Creates a {@link TextField} or a subclass thereof that is compatible with the
  * Twitter Bootstrap CSS framework.
@@ -22,8 +24,6 @@ public function prependText($text) {
 		return $this->owner;
 	}
 
-
-
 	/**
 	 * Adds text immediately to the right, abut the form field
 	 *
@@ -69,4 +69,4 @@ public function setSpan($span) {
 	}
 
 
-}
\ No newline at end of file
+}
diff --git a/code/BootstrapUserForm.php b/code/BootstrapUserForm.php
index 729b73e..eecc26c 100644
--- a/code/BootstrapUserForm.php
+++ b/code/BootstrapUserForm.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace UncleCheese\BootstrapForms;
+
+use SilverStripe\Core\Extension;
+
 
 
 class BootstrapUserForm extends Extension {
diff --git a/code/ChosenDropdownField.php b/code/ChosenDropdownField.php
index a2f7aea..8203c2f 100755
--- a/code/ChosenDropdownField.php
+++ b/code/ChosenDropdownField.php
@@ -1,5 +1,11 @@
 <?php
 
+namespace UncleCheese\BootstrapForms;
+
+use SilverStripe\Core\Config\Config;
+use SilverStripe\View\Requirements;
+use SilverStripe\Forms\DropdownField;
+
 /**
  * Defines a FormField that uses the Chosen JS plugin for making
  * dropdown fields nice.
diff --git a/code/ChosenListboxField.php b/code/ChosenListboxField.php
index ba13ae9..6c62944 100755
--- a/code/ChosenListboxField.php
+++ b/code/ChosenListboxField.php
@@ -1,5 +1,10 @@
 <?php
 
+namespace UncleCheese\BootstrapForms;
+
+use SilverStripe\View\Requirements;
+use SilverStripe\Forms\ListboxField;
+
 class ChosenListboxField extends ListboxField {
 	/**
 	 * @var int The number of items that need to appear in the dropdown
diff --git a/code/SimpleHtmlEditorField.php b/code/SimpleHtmlEditorField.php
index 041b67d..05b3877 100755
--- a/code/SimpleHtmlEditorField.php
+++ b/code/SimpleHtmlEditorField.php
@@ -1,5 +1,10 @@
 <?php
 
+namespace UncleCheese\BootstrapForms;
+
+use SilverStripe\View\Requirements;
+use SilverStripe\Forms\TextareaField;
+
 /**
  * Defines a formfield that has HTML editing capability
  * using the TinyMCE plugin
diff --git a/composer.json b/composer.json
index f1b0beb..a60cd2c 100755
--- a/composer.json
+++ b/composer.json
@@ -1,20 +1,30 @@
 {
     "name": "unclecheese/bootstrap-forms",
     "description": "Allows you to create forms in SilverStripe that are compatible with Twitter Bootstrap.",
-    "type": "silverstripe-module",
+    "type": "silverstripe-vendormodule",
     "keywords": ["silverstripe", "bootstrap", "forms", "twitter"],
 	"license": "BSD-3-Clause",
     "authors": [
-    {
-        "name": "Uncle Cheese",
-        "email": "unclecheese@leftandmain.com"
-    }
+        {
+            "name": "Uncle Cheese",
+            "email": "unclecheese@leftandmain.com"
+        }
     ],
-    "require":
-    {
-        "silverstripe/framework": "3.*",
-	    "silverstripe/cms": "3.*"
+    "require": {
+        "silverstripe/framework": "^4",
+	    "silverstripe/cms": "^4"
+    },
+    "replace": {
+        "silverstripe/bootstrap-forms": "*"
     },
-    "replace": {"silverstripe/bootstrap-forms": "*"}
-    
+    "extra": {
+        "branch-alias": {
+            "dev-master": "2.x-dev"
+        }
+    },
+    "autoload": {
+        "psr-4": {
+            "UncleCheese\\BootstrapForms\\": "code/"
+        }
+    }
 }
diff --git a/templates/BootstrapButtonGroupField.ss b/templates/UncleCheese/BootstrapForms/BootstrapButtonGroupField.ss
similarity index 100%
rename from templates/BootstrapButtonGroupField.ss
rename to templates/UncleCheese/BootstrapForms/BootstrapButtonGroupField.ss
diff --git a/templates/BootstrapCheckboxField_holder.ss b/templates/UncleCheese/BootstrapForms/BootstrapCheckboxField_holder.ss
similarity index 100%
rename from templates/BootstrapCheckboxField_holder.ss
rename to templates/UncleCheese/BootstrapForms/BootstrapCheckboxField_holder.ss
diff --git a/templates/BootstrapCheckboxSetField.ss b/templates/UncleCheese/BootstrapForms/BootstrapCheckboxSetField.ss
similarity index 100%
rename from templates/BootstrapCheckboxSetField.ss
rename to templates/UncleCheese/BootstrapForms/BootstrapCheckboxSetField.ss
diff --git a/templates/BootstrapFieldHolder.ss b/templates/UncleCheese/BootstrapForms/BootstrapFieldHolder.ss
similarity index 100%
rename from templates/BootstrapFieldHolder.ss
rename to templates/UncleCheese/BootstrapForms/BootstrapFieldHolder.ss
diff --git a/templates/BootstrapForm.ss b/templates/UncleCheese/BootstrapForms/BootstrapForm.ss
similarity index 100%
rename from templates/BootstrapForm.ss
rename to templates/UncleCheese/BootstrapForms/BootstrapForm.ss
diff --git a/templates/BootstrapFormAction.ss b/templates/UncleCheese/BootstrapForms/BootstrapFormAction.ss
similarity index 100%
rename from templates/BootstrapFormAction.ss
rename to templates/UncleCheese/BootstrapForms/BootstrapFormAction.ss
diff --git a/templates/BootstrapOptionsetField.ss b/templates/UncleCheese/BootstrapForms/BootstrapOptionsetField.ss
similarity index 100%
rename from templates/BootstrapOptionsetField.ss
rename to templates/UncleCheese/BootstrapForms/BootstrapOptionsetField.ss
diff --git a/templates/BootstrapTabSet.ss b/templates/UncleCheese/BootstrapForms/BootstrapTabSet.ss
similarity index 100%
rename from templates/BootstrapTabSet.ss
rename to templates/UncleCheese/BootstrapForms/BootstrapTabSet.ss
diff --git a/templates/BootstrapTextField_holder.ss b/templates/UncleCheese/BootstrapForms/BootstrapTextField_holder.ss
similarity index 100%
rename from templates/BootstrapTextField_holder.ss
rename to templates/UncleCheese/BootstrapForms/BootstrapTextField_holder.ss