diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..91e325d
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,21 @@
+# For more information about the properties used in this file,
+# please see the EditorConfig documentation:
+# http://editorconfig.org
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 4
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.{yml,js,json,css,scss,eslintrc}]
+indent_size = 2
+indent_style = space
+
+[composer.json]
+indent_size = 4
+
+# The indent size used in the package.json file cannot be changed:
+# https://github.com/npm/npm/pull/3180#issuecomment-16336516
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 5d9e76c..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-language: php
-
-php:
-  - 5.3
-  - 5.4
-
-before_script:
-  - composer self-update
-  - composer install --dev
\ No newline at end of file
diff --git a/README.md b/README.md
index 0087373..08ea12e 100644
--- a/README.md
+++ b/README.md
@@ -2,11 +2,6 @@
 
 A library with common functionality used by SilverStripe template developers.
 
-Thi smodule is now SilverStripe 4 compatible  
-
-For a SilverStripe `3.*` compatible version see branch `0.2`.
-For a SilverStripe `2.4` compatible version see branch `0.1`.
-
 # Installation (with composer)
 
     $ composer require heyday/silverstripe-templatehelpers
@@ -29,4 +24,4 @@ The image path helper defaults to `themes/[theme]/images/`. The path within the
 TemplateHelpers:
   dev_images: source/images
   prod_images: production/images
-```
\ No newline at end of file
+```
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/composer.json b/composer.json
index 60df95b..bd1723a 100644
--- a/composer.json
+++ b/composer.json
@@ -1,14 +1,13 @@
 {
-	"name": "heyday/silverstripe-templatehelpers",
-	"type": "silverstripe-module",
-	"description": "Simple template functionality for Silverstripe",
-	"authors": [
-		{
-			"name": "Stevie Mayhew",
-			"email": "stevie@heyday.co.nz"
-		}
-	],
-	"require": {
-		"composer/installers": "~1.0"
-	}
+    "name": "heyday/silverstripe-templatehelpers",
+    "type": "silverstripe-vendormodule",
+    "description": "Simple template functionality for Silverstripe",
+    "require": {
+        "composer/installers": "~1.0"
+    },
+    "autoload": {
+        "psr-4": {
+            "Heyday\\TemplateHelpers\\": "src/"
+        }
+    },
 }
diff --git a/code/TemplateHelpers.php b/src/TemplateHelpers.php
similarity index 96%
rename from code/TemplateHelpers.php
rename to src/TemplateHelpers.php
index 6544c75..75839f3 100644
--- a/code/TemplateHelpers.php
+++ b/src/TemplateHelpers.php
@@ -14,24 +14,24 @@
  */
 class TemplateHelpers implements TemplateGlobalProvider
 {
-    private static $casting = array(
+    private static $casting = [
         'MetaTags' => 'HTMLText',
         'addInlineScript' => 'HTMLText'
-    );
+    ];
 
     /**
      * @return array
      */
     public static function get_template_global_variables()
     {
-        return array(
+        return [
             'isDev',
             'isTest',
             'isLive',
             'addInlineScript',
             'ThemeDir',
             'ImagePath'
-        );
+        ];
     }
 
     /**
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
deleted file mode 100644
index 44263f7..0000000
--- a/tests/bootstrap.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-$filename = __DIR__ . '/../vendor/autoload.php';
-
-if (!file_exists($filename)) {
-    echo 'You must first install the vendors using composer.' . PHP_EOL;
-    exit(1);
-}
-
-require_once $filename;
\ No newline at end of file