diff --git a/README.md b/README.md
index 36bd4c2..4ea268d 100644
--- a/README.md
+++ b/README.md
@@ -94,7 +94,7 @@ First of all, we need to create a new subclass of *MultiForm*.
 For the above example, our multi-form will be called *SurveyForm*
 
 ```php
-use SilverStripe\MultiForm\Models\MultiForm;
+use SilverStripe\MultiForm\Forms\MultiForm;
 
 class SurveyForm extends MultiForm {
 
@@ -127,7 +127,7 @@ subclass of MultiForm, SurveyForm, and tell it that SurveyFormPersonalDetailsSte
 is the first step.
 
 ```php
-use SilverStripe\MultiForm\Models\MultiForm;
+use SilverStripe\MultiForm\Forms\MultiForm;
 
 class SurveyForm extends MultiForm
 {
@@ -393,7 +393,7 @@ So, we must write some code on our subclass of *MultiForm*, overloading
 Here is an example of what we could do here:
 
 ```php 
-use SilverStripe\MultiForm\Models\MultiForm;
+use SilverStripe\MultiForm\Forms\MultiForm;
 use SilverStripe\Forms\FieldList;
 use SilverStripe\Forms\EmailField;
 
@@ -580,7 +580,7 @@ For example:
 
 ```php
 use SilverStripe\Dev\Debug;
-use SilverStripe\MultiForm\Models\MultiForm;
+use SilverStripe\MultiForm\Forms\MultiForm;
 use SilverStripe\MultiForm\Models\MultiFormStep;
 
 class SurveyForm extends MultiForm
diff --git a/src/Models/MultiForm.php b/src/Forms/MultiForm.php
similarity index 99%
rename from src/Models/MultiForm.php
rename to src/Forms/MultiForm.php
index 0c8e158..75e5ee2 100644
--- a/src/Models/MultiForm.php
+++ b/src/Forms/MultiForm.php
@@ -1,20 +1,20 @@
 <?php
 
-namespace SilverStripe\MultiForm\Models;
+namespace SilverStripe\MultiForm\Forms;
 
 use SilverStripe\Control\Controller;
 use SilverStripe\Control\HTTPResponse;
-use SilverStripe\Control\Session;
 use SilverStripe\Core\Convert;
 use SilverStripe\Core\Injector\Injector;
 use SilverStripe\Forms\FieldList;
 use SilverStripe\Forms\Form;
 use SilverStripe\Forms\FormAction;
 use SilverStripe\Forms\HiddenField;
+use SilverStripe\MultiForm\Models\MultiFormSession;
+use SilverStripe\MultiForm\Models\MultiFormStep;
 use SilverStripe\ORM\ArrayList;
 use SilverStripe\ORM\DataList;
 use SilverStripe\ORM\DataObject;
-use SilverStripe\View\SSViewer;
 
 /**
  * MultiForm manages the loading of single form steps, and acts as a state
diff --git a/tests/MultiFormTest.php b/tests/MultiFormTest.php
index 8aff129..2f42ae2 100644
--- a/tests/MultiFormTest.php
+++ b/tests/MultiFormTest.php
@@ -7,7 +7,7 @@ use SilverStripe\Control\Session;
 use SilverStripe\Core\Config\Config;
 use SilverStripe\Core\Injector\Injector;
 use SilverStripe\Dev\FunctionalTest;
-use SilverStripe\MultiForm\Models\MultiForm;
+use SilverStripe\MultiForm\Forms\MultiForm;
 use SilverStripe\MultiForm\Models\MultiFormSession;
 use SilverStripe\MultiForm\Tests\Stubs\MultiFormTestController;
 use SilverStripe\MultiForm\Tests\Stubs\MultiFormTestForm;
diff --git a/tests/Stubs/MultiFormTestForm.php b/tests/Stubs/MultiFormTestForm.php
index 2da6b1e..22fbff9 100644
--- a/tests/Stubs/MultiFormTestForm.php
+++ b/tests/Stubs/MultiFormTestForm.php
@@ -3,7 +3,7 @@
 namespace SilverStripe\MultiForm\Tests\Stubs;
 
 use SilverStripe\Dev\TestOnly;
-use SilverStripe\MultiForm\Models\MultiForm;
+use SilverStripe\MultiForm\Forms\MultiForm;
 
 class MultiFormTestForm extends MultiForm implements TestOnly
 {