diff --git a/packages/unleash-frontend-next/src/component/feature/add-container.jsx b/packages/unleash-frontend-next/src/component/feature/add-container.jsx
index 3ece661dcd..9ba291f664 100644
--- a/packages/unleash-frontend-next/src/component/feature/add-container.jsx
+++ b/packages/unleash-frontend-next/src/component/feature/add-container.jsx
@@ -3,7 +3,7 @@ import { hashHistory } from 'react-router';
 
 
 import { createFeatureToggles } from '../../store/feature-actions';
-import AddComponent from './add-component';
+import AddComponent from './form/add-component';
 import { createMapper, createActions } from '../input-helpers';
 
 const ID = 'add-feature-toggle';
diff --git a/packages/unleash-frontend-next/src/component/feature/edit-container.jsx b/packages/unleash-frontend-next/src/component/feature/edit-container.jsx
index d707c14d22..286ef9c936 100644
--- a/packages/unleash-frontend-next/src/component/feature/edit-container.jsx
+++ b/packages/unleash-frontend-next/src/component/feature/edit-container.jsx
@@ -2,7 +2,7 @@ import { connect } from 'react-redux';
 import { hashHistory } from 'react-router';
 
 import { requestUpdateFeatureToggle } from '../../store/feature-actions';
-import AddComponent from './add-component';
+import AddComponent from './form/add-component';
 import { createMapper, createActions } from '../input-helpers';
 
 const ID = 'edit-feature-toggle';
diff --git a/packages/unleash-frontend-next/src/component/feature/add-component.jsx b/packages/unleash-frontend-next/src/component/feature/form/add-component.jsx
similarity index 100%
rename from packages/unleash-frontend-next/src/component/feature/add-component.jsx
rename to packages/unleash-frontend-next/src/component/feature/form/add-component.jsx
diff --git a/packages/unleash-frontend-next/src/component/feature/strategies-add.jsx b/packages/unleash-frontend-next/src/component/feature/form/strategies-add.jsx
similarity index 100%
rename from packages/unleash-frontend-next/src/component/feature/strategies-add.jsx
rename to packages/unleash-frontend-next/src/component/feature/form/strategies-add.jsx
diff --git a/packages/unleash-frontend-next/src/component/feature/strategies-list.jsx b/packages/unleash-frontend-next/src/component/feature/form/strategies-list.jsx
similarity index 100%
rename from packages/unleash-frontend-next/src/component/feature/strategies-list.jsx
rename to packages/unleash-frontend-next/src/component/feature/form/strategies-list.jsx
diff --git a/packages/unleash-frontend-next/src/component/feature/strategies-section-container.jsx b/packages/unleash-frontend-next/src/component/feature/form/strategies-section-container.jsx
similarity index 77%
rename from packages/unleash-frontend-next/src/component/feature/strategies-section-container.jsx
rename to packages/unleash-frontend-next/src/component/feature/form/strategies-section-container.jsx
index a5c4fa24a7..7f12216935 100644
--- a/packages/unleash-frontend-next/src/component/feature/strategies-section-container.jsx
+++ b/packages/unleash-frontend-next/src/component/feature/form/strategies-section-container.jsx
@@ -1,6 +1,6 @@
 import { connect } from 'react-redux';
 import StrategiesSection from './strategies-section';
-import { fetchStrategies } from '../../store/strategy-actions';
+import { fetchStrategies } from '../../../store/strategy-actions';
 
 
 export default connect((state) => ({
diff --git a/packages/unleash-frontend-next/src/component/feature/strategies-section.jsx b/packages/unleash-frontend-next/src/component/feature/form/strategies-section.jsx
similarity index 100%
rename from packages/unleash-frontend-next/src/component/feature/strategies-section.jsx
rename to packages/unleash-frontend-next/src/component/feature/form/strategies-section.jsx
diff --git a/packages/unleash-frontend-next/src/component/feature/strategy-configure.jsx b/packages/unleash-frontend-next/src/component/feature/form/strategy-configure.jsx
similarity index 100%
rename from packages/unleash-frontend-next/src/component/feature/strategy-configure.jsx
rename to packages/unleash-frontend-next/src/component/feature/form/strategy-configure.jsx