5 files changed, 10 insertions, 11 deletions

diff --git a/src/components/auth/Import.js b/src/components/auth/Import.js
index 078244434..9ba14e768 100644
--- a/src/components/auth/Import.js
+++ b/src/components/auth/Import.js
@@ -41,21 +41,21 @@ export default class Import extends Component {
     intl: intlShape,
   };
 
-  prepareForm() {
-    const { services } = this.props;
-
+  componentWillMount() {
     const config = {
       fields: {
-        import: [...services.filter(s => s.recipe).map(s => ({
-          add: {
-            default: true,
-            options: s,
+        import: [...this.props.services.filter(s => s.recipe).map(s => ({
+          fields: {
+            add: {
+              default: true,
+              options: s,
+            },
           },
         }))],
       },
     };
 
-    return new Form(config, this.context.intl);
+    this.form = new Form(config, this.context.intl);
   }
 
   submit(e) {
@@ -74,7 +74,6 @@ export default class Import extends Component {
   }
 
   render() {
-    this.form = this.prepareForm();
     const { intl } = this.context;
     const { services, isSubmitting, inviteRoute } = this.props;
 
diff --git a/src/components/auth/Pricing.js b/src/components/auth/Pricing.js
index 761561a89..3cc8d5f6b 100644
--- a/src/components/auth/Pricing.js
+++ b/src/components/auth/Pricing.js
@@ -7,7 +7,7 @@ import { defineMessages, intlShape } from 'react-intl';
 // import Button from '../ui/Button';
 import Loader from '../ui/Loader';
 import Appear from '../ui/effects/Appear';
-import SubscriptionForm from '../../containers/ui/SubscriptionFormScreen';
+import SubscriptionForm from '../../containers/subscription/SubscriptionFormScreen';
 
 const messages = defineMessages({
   headline: {
diff --git a/src/components/settings/account/AccountDashboard.js b/src/components/settings/account/AccountDashboard.js
index 43272fe96..4992f0913 100644
--- a/src/components/settings/account/AccountDashboard.js
+++ b/src/components/settings/account/AccountDashboard.js
@@ -9,7 +9,7 @@ import Loader from '../../ui/Loader';
 import Button from '../../ui/Button';
 import Infobox from '../../ui/Infobox';
 import Link from '../../ui/Link';
-import SubscriptionForm from '../../../containers/ui/SubscriptionFormScreen';
+import SubscriptionForm from '../../../containers/subscription/SubscriptionFormScreen';
 
 const messages = defineMessages({
   headline: {
diff --git a/src/components/ui/Subscription.js b/src/components/subscription/SubscriptionForm.js
index dd350479d..dd350479d 100644
--- a/src/components/ui/Subscription.js
+++ b/src/components/subscription/SubscriptionForm.js
diff --git a/src/components/ui/SubscriptionPopup.js b/src/components/subscription/SubscriptionPopup.js
index 528d02907..528d02907 100644
--- a/src/components/ui/SubscriptionPopup.js
+++ b/src/components/subscription/SubscriptionPopup.js