diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..4718dc9
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,5 @@
+/tests            export-ignore
+/client/src       export-ignore
+/.gitattributes   export-ignore
+/.gitignore       export-ignore
+/.github          export-ignore
diff --git a/.gitignore b/.gitignore
index b1d62d5..649b0db 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 node_modules
 vendor
 composer.lock
+.phpunit.result.cache
diff --git a/composer.json b/composer.json
index cf0422d..995b4c0 100644
--- a/composer.json
+++ b/composer.json
@@ -32,7 +32,7 @@
     },
     "autoload": {
         "psr-4": {
-            "SilverStripe\\Forms\\": "code/",
+            "SilverStripe\\Forms\\": "src/",
             "SilverStripe\\Forms\\Tests\\": "tests/"
         }
     },
diff --git a/tests/SegmentFieldModifier/IDSegmentFieldModifierTest.php b/tests/SegmentFieldModifier/IDSegmentFieldModifierTest.php
index b64b01a..55e58e8 100644
--- a/tests/SegmentFieldModifier/IDSegmentFieldModifierTest.php
+++ b/tests/SegmentFieldModifier/IDSegmentFieldModifierTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace SilverStripe\Forms\Tests;
+namespace SilverStripe\Forms\Tests\SegmentFieldModifier;
 
 use stdClass;
 use SilverStripe\Dev\SapphireTest;
diff --git a/tests/SegmentFieldModifier/SlugSegmentFieldModifierTest.php b/tests/SegmentFieldModifier/SlugSegmentFieldModifierTest.php
index e59f52e..2512054 100644
--- a/tests/SegmentFieldModifier/SlugSegmentFieldModifierTest.php
+++ b/tests/SegmentFieldModifier/SlugSegmentFieldModifierTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace SilverStripe\Forms\Tests;
+namespace SilverStripe\Forms\Tests\SegmentFieldModifier;
 
 use SilverStripe\Control\HTTPRequest;
 use SilverStripe\Dev\SapphireTest;
diff --git a/tests/SegmentFieldTest.php b/tests/SegmentFieldTest.php
index 20ffddc..4ffa52d 100644
--- a/tests/SegmentFieldTest.php
+++ b/tests/SegmentFieldTest.php
@@ -6,7 +6,6 @@
 use SilverStripe\Dev\SapphireTest;
 use SilverStripe\Forms\Form;
 use SilverStripe\Forms\SegmentField;
-use SilverStripe\Forms\SegmentFieldModifier\AbstractSegmentFieldModifier;
 
 class SegmentFieldTest extends SapphireTest
 {