diff --git a/_config/types.yml b/_config/types.yml
index 5007448b..ea32716c 100644
--- a/_config/types.yml
+++ b/_config/types.yml
@@ -5,14 +5,14 @@ Name: linkfield-types
 SilverStripe\Link\Type\Registry:
   types:
     cms:
-      classname: SilverStripe\Link\SiteTreeLink
+      classname: SilverStripe\Link\Models\SiteTreeLink
       enabled: true
     external:
-      classname: SilverStripe\Link\ExternalLink
+      classname: SilverStripe\Link\Models\ExternalLink
       enabled: true
     file:
-      classname: SilverStripe\Link\FileLink
+      classname: SilverStripe\Link\Models\FileLink
       enabled: true
     email:
-      classname: SilverStripe\Link\EmailLink
+      classname: SilverStripe\Link\Models\EmailLink
       enabled: true
diff --git a/src/Extensions/AjaxField.php b/src/Extensions/AjaxField.php
index 9c1ea7c5..03b453f2 100644
--- a/src/Extensions/AjaxField.php
+++ b/src/Extensions/AjaxField.php
@@ -4,12 +4,13 @@
 
 use SilverStripe\Core\Extension;
 use SilverStripe\Forms\FormField;
-use SilverStripe\Link;
 
 /**
- * Tweak fields that need to be serve through the DynamicLink form schema and need to be able to receive AJAX calls.
+ * Tweak fields that need to be served through the DynamicLink form schema and need to be able to receive AJAX calls.
  *
  * For example the TreeDropdownField need to be able to receive AJAX request to fetch the list of available SiteTrees.
+ *
+ * This is a bit hackish. There's probably a less dumb way of doing this.
  */
 class AjaxField extends Extension
 {
diff --git a/src/Extensions/ModalController.php b/src/Extensions/ModalController.php
index 8e83e55e..53bdca10 100644
--- a/src/Extensions/ModalController.php
+++ b/src/Extensions/ModalController.php
@@ -7,9 +7,8 @@
 use SilverStripe\Control\HTTPResponse_Exception;
 use SilverStripe\Core\Extension;
 use SilverStripe\Forms\Form;
-use SilverStripe\Link\FormFactory;
+use SilverStripe\Link\Form\FormFactory;
 use SilverStripe\Link\Type\Registry;
-use SilverStripe\View\Requirements;
 
 /**
  * Extensions to apply to ModalController so it knows how to handle the DynamicLink action.
diff --git a/src/FormFactory.php b/src/Form/FormFactory.php
similarity index 87%
rename from src/FormFactory.php
rename to src/Form/FormFactory.php
index 789b3746..8ceac8fb 100644
--- a/src/FormFactory.php
+++ b/src/Form/FormFactory.php
@@ -1,13 +1,15 @@
 <?php
 
-namespace SilverStripe\Link;
+namespace SilverStripe\Link\Form;
 
 use LogicException;
 use SilverStripe\Admin\Forms\LinkFormFactory;
 use SilverStripe\Forms\HiddenField;
-use SilverStripe\Link\Type\Registry;
 use SilverStripe\Link\Type\Type;
 
+/**
+ * Create Form schema for the LinkField based on a key provided by the request.
+ */
 class FormFactory extends LinkFormFactory
 {
     protected function getFormFields($controller, $name, $context)
diff --git a/src/JsonField.php b/src/Form/JsonField.php
similarity index 85%
rename from src/JsonField.php
rename to src/Form/JsonField.php
index 98b5b076..445b39bf 100644
--- a/src/JsonField.php
+++ b/src/Form/JsonField.php
@@ -1,20 +1,16 @@
 <?php declare(strict_types=1);
 
-namespace SilverStripe\Link;
+namespace SilverStripe\Link\Form;
 
 use InvalidArgumentException;
-use SilverStripe\Assets\File;
-use SilverStripe\Forms\FileUploadReceiver;
 use SilverStripe\Forms\FormField;
 use SilverStripe\ORM\DataObject;
 use SilverStripe\ORM\DataObjectInterface;
-use SilverStripe\ORM\RelationList;
-use SilverStripe\ORM\UnsavedRelationList;
 
 /**
- * Field design to edit complex data passed as a JSON string. Other FormFields can be built on top of this one.
+ * Field designed to edit complex data passed as a JSON string. Other FormFields can be built on top of this one.
  *
- * It will output an hidden input with serialize JSON Data.
+ * It will output a hidden input with serialize JSON Data.
  */
 abstract class JsonField extends FormField
 {
@@ -43,7 +39,7 @@ public function saveInto(DataObjectInterface $record)
         }
 
         $dataValue = $this->dataValue();
-        $value = is_array($dataValue) ? $dataValue : $this->parseString($this->dataValue());
+        $value = is_string($dataValue) ? $this->parseString($this->dataValue()) : $dataValue;
 
         if ($class = DataObject::getSchema()->hasOneComponent(get_class($record), $fieldname)) {
             /** @var JsonData|DataObject $jsonDataObject */
diff --git a/src/LinkField.php b/src/Form/LinkField.php
similarity index 63%
rename from src/LinkField.php
rename to src/Form/LinkField.php
index 64ce2c7e..77377d70 100644
--- a/src/LinkField.php
+++ b/src/Form/LinkField.php
@@ -1,11 +1,10 @@
 <?php declare(strict_types=1);
 
-namespace SilverStripe\Link;
-
-use InvalidArgumentException;
-use SilverStripe\Forms\FormField;
-use SilverStripe\Link\Type\Registry;
+namespace SilverStripe\Link\Form;
 
+/**
+ * Allows CMS users to edit a Link object.
+ */
 class LinkField extends JsonField
 {
     protected $schemaComponent = 'LinkField';
diff --git a/src/GraphQL/LinkDescriptionQuery.php b/src/GraphQL/LinkDescriptionQuery.php
index 86ae1bf7..7759c628 100644
--- a/src/GraphQL/LinkDescriptionQuery.php
+++ b/src/GraphQL/LinkDescriptionQuery.php
@@ -3,7 +3,6 @@
 
 use GraphQL\Type\Definition\ResolveInfo;
 use GraphQL\Type\Definition\Type as GraphqlType;
-use SilverStripe\GraphQL\Pagination\Connection;
 use SilverStripe\GraphQL\QueryCreator;
 use SilverStripe\Link\Type\Registry;
 
diff --git a/src/GraphQL/LinkDescriptionType.php b/src/GraphQL/LinkDescriptionType.php
index d4874d8a..3dcb8f90 100644
--- a/src/GraphQL/LinkDescriptionType.php
+++ b/src/GraphQL/LinkDescriptionType.php
@@ -4,7 +4,6 @@
 
 use GraphQL\Type\Definition\Type as GraphqlType;
 use SilverStripe\GraphQL\TypeCreator as GraphqlTypeCreator;
-use GraphQL\Type\Definition\ResolveInfo;
 
 /**
  * GraphQL type for serving a Link Description.
diff --git a/src/GraphQL/LinkTypeQuery.php b/src/GraphQL/LinkTypeQuery.php
index e328b929..c9616fc2 100644
--- a/src/GraphQL/LinkTypeQuery.php
+++ b/src/GraphQL/LinkTypeQuery.php
@@ -3,7 +3,6 @@
 
 use GraphQL\Type\Definition\ResolveInfo;
 use GraphQL\Type\Definition\Type as GraphqlType;
-use SilverStripe\GraphQL\Pagination\Connection;
 use SilverStripe\GraphQL\QueryCreator;
 use SilverStripe\Link\Type\Registry;
 use SilverStripe\Link\Type\Type;
diff --git a/src/EmailLink.php b/src/Models/EmailLink.php
similarity index 69%
rename from src/EmailLink.php
rename to src/Models/EmailLink.php
index 3c70c1cf..615a4e41 100644
--- a/src/EmailLink.php
+++ b/src/Models/EmailLink.php
@@ -1,16 +1,14 @@
 <?php declare(strict_types=1);
 
-namespace SilverStripe\Link;
+namespace SilverStripe\Link\Models;
 
-use SilverStripe\CMS\Model\SiteTree;
 use SilverStripe\Forms\EmailField;
-use SilverStripe\Forms\FieldList;
-use SilverStripe\Forms\TextField;
-use SilverStripe\Forms\TreeDropdownField;
-use SilverStripe\i18n\i18n;
-use SilverStripe\Link\Type\Type;
-use SilverStripe\View\Requirements;
 
+/**
+ * A link to an Email address.
+ *
+ * @property string $Email
+ */
 class EmailLink extends Link
 {
 
diff --git a/src/ExternalLink.php b/src/Models/ExternalLink.php
similarity index 57%
rename from src/ExternalLink.php
rename to src/Models/ExternalLink.php
index 2414729e..aab0b7ef 100644
--- a/src/ExternalLink.php
+++ b/src/Models/ExternalLink.php
@@ -1,15 +1,12 @@
 <?php declare(strict_types=1);
 
-namespace SilverStripe\Link;
-
-use SilverStripe\CMS\Model\SiteTree;
-use SilverStripe\Forms\FieldList;
-use SilverStripe\Forms\TextField;
-use SilverStripe\Forms\TreeDropdownField;
-use SilverStripe\i18n\i18n;
-use SilverStripe\Link\Type\Type;
-use SilverStripe\View\Requirements;
+namespace SilverStripe\Link\Models;
 
+/**
+ * An link to an external URL.
+ *
+ * @property string $ExternalUrl
+ */
 class ExternalLink extends Link
 {
 
diff --git a/src/FileLink.php b/src/Models/FileLink.php
similarity index 59%
rename from src/FileLink.php
rename to src/Models/FileLink.php
index ca943e9e..e98cf732 100644
--- a/src/FileLink.php
+++ b/src/Models/FileLink.php
@@ -1,14 +1,15 @@
 <?php declare(strict_types=1);
 
-namespace SilverStripe\Link;
+namespace SilverStripe\Link\Models;
 
 use SilverStripe\Assets\File;
 use SilverStripe\i18n\i18n;
 use SilverStripe\Link\Type\Type;
 
 /**
- * Class FileLink
- * @property File File
+ * A link to a File track in asset-admin
+ * @property File $File
+ * @property int $FileID
  */
 class FileLink extends Link
 {
@@ -37,19 +38,4 @@ public function getURL()
     {
         return $this->File ? $this->File->getURL() : '';
     }
-
-//    public function getCMSFields()
-//    {
-//        return parent::getCMSFields()
-//            ->addFieldToTab(
-//                'Root.Main',
-//                TreeDropdownField::create(
-//                    'SiteTreeID',
-//                    'Page',
-//                    SiteTree::class,
-//                    'ID',
-//                    'TreeTitle'
-//                )
-//            );
-//    }
 }
diff --git a/src/Link.php b/src/Models/Link.php
similarity index 93%
rename from src/Link.php
rename to src/Models/Link.php
index 9c362887..d709aa0f 100644
--- a/src/Link.php
+++ b/src/Models/Link.php
@@ -1,18 +1,22 @@
 <?php declare(strict_types=1);
 
-namespace SilverStripe\Link;
+namespace SilverStripe\Link\Models;
 
 use InvalidArgumentException;
-use LogicException;
-use SilverStripe\CMS\Model\SiteTree;
-use SilverStripe\Control\Middleware\HTTPCacheControlMiddleware;
 use SilverStripe\Forms\FieldList;
+use SilverStripe\Link\JsonData;
 use SilverStripe\Link\Type\Registry;
 use SilverStripe\Link\Type\Type;
 use SilverStripe\ORM\DataObject;
 use SilverStripe\ORM\FieldType\DBHTMLText;
 use SilverStripe\View\Requirements;
 
+/**
+ * A Link Data Object. This class should be subclass and you should never directly interact with a plain Link instance.
+ *
+ * @property string $Title
+ * @property bool $OpenInNew
+ */
 class Link extends DataObject implements JsonData, Type
 {
 
diff --git a/src/SiteTreeLink.php b/src/Models/SiteTreeLink.php
similarity index 82%
rename from src/SiteTreeLink.php
rename to src/Models/SiteTreeLink.php
index 71c71d0f..eeccb33f 100644
--- a/src/SiteTreeLink.php
+++ b/src/Models/SiteTreeLink.php
@@ -1,20 +1,16 @@
 <?php declare(strict_types=1);
 
-namespace SilverStripe\Link;
+namespace SilverStripe\Link\Models;
 
 use SilverStripe\CMS\Forms\AnchorSelectorField;
 use SilverStripe\CMS\Model\SiteTree;
-use SilverStripe\Forms\FieldList;
-use SilverStripe\Forms\TextField;
 use SilverStripe\Forms\TreeDropdownField;
-use SilverStripe\i18n\i18n;
-use SilverStripe\Link\Type\Type;
-use SilverStripe\View\Requirements;
 
 /**
- * Class SiteTreeLink
- * @property SiteTree Page
- * @property string Anchor
+ * A link to a Page in the CMS.
+ * @property SiteTree $Page
+ * @property int $PageID
+ * @property string $Anchor
  */
 class SiteTreeLink extends Link
 {
diff --git a/src/DBJson.php b/src/ORM/DBJson.php
similarity index 95%
rename from src/DBJson.php
rename to src/ORM/DBJson.php
index cedd141e..d2ce4b0c 100644
--- a/src/DBJson.php
+++ b/src/ORM/DBJson.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace SilverStripe\Link;
+namespace SilverStripe\Link\ORM;
 
 use SilverStripe\Core\Config\Config;
 use SilverStripe\ORM\DB;
 use SilverStripe\ORM\FieldType\DBField;
 
 /**
- * Represents a signed 32 bit integer field.
+ * Represents a DBField storing a JSON string
  */
 class DBJson extends DBField
 {
diff --git a/src/DBLink.php b/src/ORM/DBLink.php
similarity index 68%
rename from src/DBLink.php
rename to src/ORM/DBLink.php
index e39e341c..8dd590b5 100644
--- a/src/DBLink.php
+++ b/src/ORM/DBLink.php
@@ -1,20 +1,18 @@
 <?php
 
-namespace SilverStripe\Link;
+namespace SilverStripe\Link\ORM;
 
 use SilverStripe\Link\Type\Registry;
-use SilverStripe\ORM\DB;
-use SilverStripe\ORM\ArrayList;
 use SilverStripe\ORM\FieldType\DBHTMLText;
-use SilverStripe\View\ArrayData;
+use SilverStripe\Link\Form\LinkField;
 
+/**
+ * Represent Link object stored as a JSON string
+ */
 class DBLink extends DBJson
 {
     /**
-     * Return a rendered version of this form.
-     *
-     * This is returned when you access a form as $FormObject rather
-     * than <% with FormObject %>
+     * Load the link data into a singleton Link Object
      *
      * @return DBHTMLText
      */
diff --git a/templates/SilverStripe/Link/JsonField.ss b/templates/SilverStripe/Link/Form/JsonField.ss
similarity index 100%
rename from templates/SilverStripe/Link/JsonField.ss
rename to templates/SilverStripe/Link/Form/JsonField.ss
diff --git a/templates/SilverStripe/Link/Link.ss b/templates/SilverStripe/Link/Models/Link.ss
similarity index 100%
rename from templates/SilverStripe/Link/Link.ss
rename to templates/SilverStripe/Link/Models/Link.ss