diff --git a/.upgrade.yml b/.upgrade.yml
index 8104798..63633ab 100644
--- a/.upgrade.yml
+++ b/.upgrade.yml
@@ -1,14 +1,14 @@
 mappings:
-  MultiFormObjectDecorator: SilverStripe\MultiForm\MultiFormObjectDecorator
-  MultiForm: SilverStripe\MultiForm\MultiForm
-  MultiFormSession: SilverStripe\MultiForm\MultiFormSession
-  MultiFormStep: SilverStripe\MultiForm\MultiFormStep
-  MultiFormPurgeTask: SilverStripe\MultiForm\MultiFormPurgeTask
-  MultiFormObjectDecoratorTest: SilverStripe\MultiForm\MultiFormObjectDecoratorTest
-  MultiFormObjectDecorator_DataObject: SilverStripe\MultiForm\MultiFormObjectDecorator_DataObject
-  MultiFormTest: SilverStripe\MultiForm\MultiFormTest
-  MultiFormTest_Controller: SilverStripe\MultiForm\MultiFormTest_Controller
-  MultiFormTest_Form: SilverStripe\MultiForm\MultiFormTest_Form
-  MultiFormTest_StepOne: SilverStripe\MultiForm\MultiFormTest_StepOne
-  MultiFormTest_StepTwo: SilverStripe\MultiForm\MultiFormTest_StepTwo
-  MultiFormTest_StepThree: SilverStripe\MultiForm\MultiFormTest_StepThree
+  MultiFormObjectDecorator: SilverStripe\MultiForm\Extensions\MultiFormObjectDecorator
+  MultiForm: SilverStripe\MultiForm\Models\MultiForm
+  MultiFormSession: SilverStripe\MultiForm\Models\MultiFormSession
+  MultiFormStep: SilverStripe\MultiForm\Models\MultiFormStep
+  MultiFormPurgeTask: SilverStripe\MultiForm\Tasks\MultiFormPurgeTask
+  MultiFormObjectDecoratorTest: SilverStripe\MultiForm\Tests\MultiFormObjectDecoratorTest
+  MultiFormObjectDecoratorDataObject: SilverStripe\MultiForm\Tests\Stubs\MultiFormObjectDecoratorDataObject
+  MultiFormTest: SilverStripe\MultiForm\Tests\MultiFormTest
+  MultiFormTestController: SilverStripe\MultiForm\Tests\Stubs\MultiFormTestController
+  MultiFormTestForm: SilverStripe\MultiForm\Tests\Stubs\MultiFormTestForm
+  MultiFormTestStepOne: SilverStripe\MultiForm\Tests\Stubs\MultiFormTestStepOne
+  MultiFormTestStepTwo: SilverStripe\MultiForm\Tests\Stubs\MultiFormTestStepTwo
+  MultiFormTestStepThree: SilverStripe\MultiForm\Tests\Stubs\MultiFormTestStepThree
diff --git a/README.md b/README.md
index c46e0d2..0bb61dc 100644
--- a/README.md
+++ b/README.md
@@ -83,7 +83,9 @@ Using [Composer](https://getcomposer.org/), you can install multiform into your
 SilverStripe site using this command (while in the directory where your site is
 currently located)
 
-```composer require "silverstripe/multiform:*"```
+```
+composer require "silverstripe/multiform:*"
+```
 
 ### 2. Create subclass of MultiForm