diff --git a/.upgrade.yml b/.upgrade.yml
new file mode 100644
index 0000000..7df432a
--- /dev/null
+++ b/.upgrade.yml
@@ -0,0 +1,3 @@
+mappings:
+  BannerImage: Burnbright\SilverstripeBanner\BannerImage
+  BannersExtension: Burnbright\SilverstripeBanner\BannersExtension
diff --git a/_config.php b/_config.php
deleted file mode 100644
index b3d9bbc..0000000
--- a/_config.php
+++ /dev/null
@@ -1 +0,0 @@
-<?php
diff --git a/_config/legacy.yml b/_config/legacy.yml
new file mode 100644
index 0000000..b904ca4
--- /dev/null
+++ b/_config/legacy.yml
@@ -0,0 +1,3 @@
+SilverStripe\ORM\DatabaseAdmin:
+  classname_value_remapping:
+    BannerImage: Burnbright\SilverstripeBanner\BannerImage
\ No newline at end of file
diff --git a/composer.json b/composer.json
index c1523b3..8efebab 100644
--- a/composer.json
+++ b/composer.json
@@ -4,10 +4,13 @@
     "type": "silverstripe-vendormodule",
     "keywords": ["silverstripe", "banner", "carousel", "slider"],
     "require": {
-
+        "silverstripe/vendor-plugin": "^1",
+        "silverstripe/framework": "^4"
     },
-    "suggests": {
-
+    "autoload": {
+        "psr-4": {
+            "Burnbright\\SilverstripeBanner\\": "src/"
+        }
     },
     "license": "BSD-2",
     "authors": [
@@ -16,7 +19,6 @@
             "email": "jeremy@burnbright.net"
         }
     ],
-    "minimum-stability": "dev",
     "extra": {
 		"installer-name": "banner"
     }
diff --git a/code/BannerImage.php b/src/BannerImage.php
similarity index 67%
rename from code/BannerImage.php
rename to src/BannerImage.php
index de254fa..536b2a4 100644
--- a/code/BannerImage.php
+++ b/src/BannerImage.php
@@ -1,24 +1,33 @@
 <?php
 
+namespace Burnbright\SilverstripeBanner;
+
+use SilverStripe\ORM\DataObject;
+use SilverStripe\Security\Permission;
+use Image;
+use Page;
+
 class BannerImage extends DataObject
 {
 
+    private static $table_name = "BannerImage";
+
     private static $db = array(
         'Title' => 'Varchar(255)',
         'SubTitle' => 'Varchar(255)',
-        'Link' => 'LinkField',
+        // 'Link' => 'LinkField', // TODO: support linking banners in ss4
         'Sort' => 'Int'
     );
 
     private static $has_one = array(
-        'Image' => 'Image',
-        'Parent' => 'Page'
+        'Image' => Image::class,
+        'Parent' => Page::class
     );
 
     private static $summary_fields = array(
         'Image.CMSThumbnail' => 'Image',
         'CMSTitle' => 'Title',
-        'Link' => 'Link'
+        // 'Link' => 'Link'
     );
 
     private static $default_sort = "\"Sort\" ASC, \"ID\" ASC";
@@ -44,22 +53,22 @@ public function getCMSTitle()
         }
     }
 
-    public function canCreate($member = null)
+    public function canCreate($member = null, $context = [])
     {
         return Permission::check("CMS_ACCESS_CMSMain");
     }
 
-    public function canEdit($member = null)
+    public function canEdit($member = null, $context = [])
     {
         return Permission::check("CMS_ACCESS_CMSMain");
     }
 
-    public function canDelete($member = null)
+    public function canDelete($member = null, $context = [])
     {
         return Permission::check("CMS_ACCESS_CMSMain");
     }
 
-    public function canView($member = null)
+    public function canView($member = null, $context = [])
     {
         return Permission::check("CMS_ACCESS_CMSMain");
     }
diff --git a/code/BannersExtension.php b/src/BannersExtension.php
similarity index 68%
rename from code/BannersExtension.php
rename to src/BannersExtension.php
index 9105a7a..2ceb9b2 100644
--- a/code/BannersExtension.php
+++ b/src/BannersExtension.php
@@ -1,10 +1,19 @@
 <?php
 
+namespace Burnbright\SilverstripeBanner;
+
+use BannerImage;
+use SilverStripe\Forms\FieldList;
+use SilverStripe\ORM\DataExtension;
+use SilverStripe\Forms\GridField\GridField;
+use Symbiote\GridFieldExtensions\GridFieldOrderableRows;
+use SilverStripe\Forms\GridField\GridFieldConfig_RecordEditor;
+
 class BannersExtension extends DataExtension
 {
     
     public static $has_many = array(
-        'Banners' => 'BannerImage'
+        'Banners' => BannerImage::class
     );
 
     public function updateCMSFields(FieldList $fields)