diff --git a/composer.json b/composer.json
index 5353854..3feaeb9 100755
--- a/composer.json
+++ b/composer.json
@@ -1,9 +1,14 @@
 {
   "name": "i-lateral/silverstripe-users",
   "description": "Silverstripe framework user account management and registration module",
-    "type": "silverstripe-module",
+    "type": "silverstripe-vendormodule",
     "homepage": "http://github.com/i-lateral/silverstripe-users",
-    "keywords": ["silverstripe", "users", "account", "registration"],
+    "keywords": [
+        "silverstripe",
+        "users",
+        "account",
+        "registration"
+    ],
     "license": "BSD-3-Clause",
     "authors": [
         {
@@ -15,9 +20,11 @@
         "issues": "http://github.com/i-lateral/silverstripe-users/issues"
     },
     "require": {
-        "silverstripe/framework": ">=3.1"
+        "silverstripe/framework": "~4.0"
     },
-    "extra": {
-        "installer-name": "users"
+    "autoload": {
+        "psr-4": {
+            "ilateral\\SilverStripe\\Users\\": "src/"
+        }
     }
-}
+}
\ No newline at end of file
diff --git a/code/Users.php b/src/Users.php
similarity index 100%
rename from code/Users.php
rename to src/Users.php
diff --git a/code/control/Users_Account_Controller.php b/src/control/Users_Account_Controller.php
similarity index 100%
rename from code/control/Users_Account_Controller.php
rename to src/control/Users_Account_Controller.php
diff --git a/code/control/Users_Register_Controller.php b/src/control/Users_Register_Controller.php
similarity index 100%
rename from code/control/Users_Register_Controller.php
rename to src/control/Users_Register_Controller.php
diff --git a/code/extensions/Ext_Users_Controller.php b/src/extensions/Ext_Users_Controller.php
similarity index 100%
rename from code/extensions/Ext_Users_Controller.php
rename to src/extensions/Ext_Users_Controller.php
diff --git a/code/extensions/Ext_Users_Group.php b/src/extensions/Ext_Users_Group.php
similarity index 100%
rename from code/extensions/Ext_Users_Group.php
rename to src/extensions/Ext_Users_Group.php
diff --git a/code/extensions/Ext_Users_Member.php b/src/extensions/Ext_Users_Member.php
similarity index 100%
rename from code/extensions/Ext_Users_Member.php
rename to src/extensions/Ext_Users_Member.php
diff --git a/code/forms/Users_EditAccountForm.php b/src/forms/Users_EditAccountForm.php
similarity index 100%
rename from code/forms/Users_EditAccountForm.php
rename to src/forms/Users_EditAccountForm.php