diff --git a/src/__tests__/components/dialog/edit-widget-control-creator.js b/src/__tests__/widget/edit-widget-control-creator.js
similarity index 68%
rename from src/__tests__/components/dialog/edit-widget-control-creator.js
rename to src/__tests__/widget/edit-widget-control-creator.js
index d93cdbe..fb5cfab 100644
--- a/src/__tests__/components/dialog/edit-widget-control-creator.js
+++ b/src/__tests__/widget/edit-widget-control-creator.js
@@ -1,22 +1,22 @@
 
 import { expect } from 'chai';
 
-import createControls from '../../../components/dialogs/edit-widget-control-creator';
-import EditWidgetTextControl from '../../../components/dialogs/edit-widget-text-control';
-import EditWidgetColorControl from '../../../components/dialogs/edit-widget-color-control';
-import EditWidgetTimeControl from '../../../components/dialogs/edit-widget-time-control';
-import EditImageWidgetControl from '../../../components/dialogs/edit-widget-image-control';
-import EditWidgetSimulationControl from '../../../components/dialogs/edit-widget-simulation-control';
-import EditWidgetSignalControl from '../../../components/dialogs/edit-widget-signal-control';
-import EditWidgetSignalsControl from '../../../components/dialogs/edit-widget-signals-control';
-import EditWidgetOrientation from '../../../components/dialogs/edit-widget-orientation';
-import EditWidgetTextSizeControl from '../../../components/dialogs/edit-widget-text-size-control';
-import EditWidgetAspectControl from '../../../components/dialogs/edit-widget-aspect-control';
-import EditWidgetCheckboxControl from '../../../components/dialogs/edit-widget-checkbox-control';
-import EditWidgetMinMaxControl from '../../../components/dialogs/edit-widget-min-max-control';
-import EditWidgetColorZonesControl from '../../../components/dialogs/edit-widget-color-zones-control';
-import EditWidgetHTMLContent from '../../../components/dialogs/edit-widget-html-content';
-import EditWidgetNumberControl from '../../../components/dialogs/edit-widget-number-control';
+import createControls from '../../widget/edit-widget-control-creator';
+import EditWidgetTextControl from '../../widget/edit-widget-text-control';
+import EditWidgetColorControl from '../../widget/edit-widget-color-control';
+import EditWidgetTimeControl from '../../widget/edit-widget-time-control';
+import EditImageWidgetControl from '../../widget/edit-widget-image-control';
+import EditWidgetSimulationControl from '../../widget/edit-widget-simulation-control';
+import EditWidgetSignalControl from '../../widget/edit-widget-signal-control';
+import EditWidgetSignalsControl from '../../widget/edit-widget-signals-control';
+import EditWidgetOrientation from '../../widget/edit-widget-orientation';
+import EditWidgetTextSizeControl from '../../widget/edit-widget-text-size-control';
+import EditWidgetAspectControl from '../../widget/edit-widget-aspect-control';
+import EditWidgetCheckboxControl from '../../widget/edit-widget-checkbox-control';
+import EditWidgetMinMaxControl from '../../widget/edit-widget-min-max-control';
+import EditWidgetColorZonesControl from '../../widget/edit-widget-color-zones-control';
+import EditWidgetHTMLContent from '../../widget/edit-widget-html-content';
+import EditWidgetNumberControl from '../../widget/edit-widget-number-control';
 
 describe('edit widget control creator', () => {
     it('should not return null', () => {
diff --git a/src/containers/app.js b/src/app.js
similarity index 81%
rename from src/containers/app.js
rename to src/app.js
index 93c860e..cd07f75 100644
--- a/src/containers/app.js
+++ b/src/app.js
@@ -28,30 +28,30 @@ import { Redirect, Route } from 'react-router-dom';
 import { Col } from 'react-bootstrap';
 import { Hidden } from 'react-grid-system'
 
-import AppDispatcher from '../app-dispatcher';
-import ScenarioStore from '../stores/scenario-store';
-import SimulatorStore from '../stores/simulator-store';
-import UserStore from '../stores/user-store';
-import NotificationsDataManager from '../data-managers/notifications-data-manager';
+import AppDispatcher from './common/app-dispatcher';
+import ScenarioStore from './scenario/scenario-store';
+import SimulatorStore from './simulator/simulator-store';
+import UserStore from './user/user-store';
+import NotificationsDataManager from './common/data-managers/notifications-data-manager';
 
-import Home from '../components/home';
-import Header from '../components/header';
-import Footer from '../components/footer';
-import SidebarMenu from '../components/menu-sidebar';
-import HeaderMenu from '../components/header-menu';
+import Home from './common/home';
+import Header from './common/header';
+import Footer from './common/footer';
+import SidebarMenu from './common/menu-sidebar';
+import HeaderMenu from './common/header-menu';
 
-//import Projects from './projects';
-//import Project from './project';
-import Simulators from './simulators';
-import Visualization from './visualization';
-//import Simulations from './simulations';
-//import Simulation from './simulation';
-import Scenarios from './scenarios'
-import Scenario from './scenario'
-import SimulationModel from './simulation-model';
-import Users from './users';
+//import Projects from './project/projects';
+//import Project from './project/project';
+import Simulators from './simulator/simulators';
+import Visualization from './visualization/visualization';
+//import Simulations from './simulation/simulations';
+//import Simulation from './simulation/simulation';
+import Scenarios from './scenario/scenarios';
+import Scenario from './scenario/scenario';
+import SimulationModel from './simulationmodel/simulation-model';
+import Users from './user/users';
 
-import '../styles/app.css';
+import './styles/app.css';
 
 class App extends React.Component {
 
@@ -167,6 +167,6 @@ class App extends React.Component {
 //<Route exact path="/simulations" component={Simulations} />
 //<Route path="/simulations/:simulation" component={Simulation} />
 
-let fluxContainerConverter = require('./FluxContainerConverter');
+let fluxContainerConverter = require('./common/FluxContainerConverter');
 export default Container.create(fluxContainerConverter.convert(App));
 //DragDropContext(HTML5Backend)(Container.create(App));
diff --git a/src/containers/FluxContainerConverter.js b/src/common/FluxContainerConverter.js
similarity index 100%
rename from src/containers/FluxContainerConverter.js
rename to src/common/FluxContainerConverter.js
diff --git a/src/api/rest-api.js b/src/common/api/rest-api.js
similarity index 100%
rename from src/api/rest-api.js
rename to src/common/api/rest-api.js
diff --git a/src/api/websocket-api.js b/src/common/api/websocket-api.js
similarity index 100%
rename from src/api/websocket-api.js
rename to src/common/api/websocket-api.js
diff --git a/src/app-dispatcher.js b/src/common/app-dispatcher.js
similarity index 100%
rename from src/app-dispatcher.js
rename to src/common/app-dispatcher.js
diff --git a/src/stores/array-store.js b/src/common/array-store.js
similarity index 98%
rename from src/stores/array-store.js
rename to src/common/array-store.js
index 2d4be7c..70e9c9e 100644
--- a/src/stores/array-store.js
+++ b/src/common/array-store.js
@@ -21,7 +21,7 @@
 
 import { ReduceStore } from 'flux/utils';
 
-import AppDispatcher from '../app-dispatcher';
+import AppDispatcher from './app-dispatcher';
 
 class ArrayStore extends ReduceStore {
   constructor(type, dataManager) {
diff --git a/src/data-managers/notifications-data-manager.js b/src/common/data-managers/notifications-data-manager.js
similarity index 100%
rename from src/data-managers/notifications-data-manager.js
rename to src/common/data-managers/notifications-data-manager.js
diff --git a/src/data-managers/notifications-factory.js b/src/common/data-managers/notifications-factory.js
similarity index 100%
rename from src/data-managers/notifications-factory.js
rename to src/common/data-managers/notifications-factory.js
diff --git a/src/data-managers/rest-data-manager.js b/src/common/data-managers/rest-data-manager.js
similarity index 100%
rename from src/data-managers/rest-data-manager.js
rename to src/common/data-managers/rest-data-manager.js
diff --git a/src/components/dialogs/delete-dialog.js b/src/common/dialogs/delete-dialog.js
similarity index 100%
rename from src/components/dialogs/delete-dialog.js
rename to src/common/dialogs/delete-dialog.js
diff --git a/src/components/dialogs/dialog.js b/src/common/dialogs/dialog.js
similarity index 100%
rename from src/components/dialogs/dialog.js
rename to src/common/dialogs/dialog.js
diff --git a/src/components/editable-header.js b/src/common/editable-header.js
similarity index 100%
rename from src/components/editable-header.js
rename to src/common/editable-header.js
diff --git a/src/components/footer.js b/src/common/footer.js
similarity index 100%
rename from src/components/footer.js
rename to src/common/footer.js
diff --git a/src/components/header-menu.js b/src/common/header-menu.js
similarity index 100%
rename from src/components/header-menu.js
rename to src/common/header-menu.js
diff --git a/src/components/header.js b/src/common/header.js
similarity index 100%
rename from src/components/header.js
rename to src/common/header.js
diff --git a/src/components/home.js b/src/common/home.js
similarity index 99%
rename from src/components/home.js
rename to src/common/home.js
index 70dedbd..e866249 100644
--- a/src/components/home.js
+++ b/src/common/home.js
@@ -26,7 +26,7 @@ import React from 'react';
 //import RestAPI from '../api/rest-api';
 
 import config from '../config';
-import UserStore from "../stores/user-store";
+import UserStore from "../user/user-store";
 
 class Home extends React.Component {
   constructor(props) {
diff --git a/src/components/icon.js b/src/common/icon.js
similarity index 100%
rename from src/components/icon.js
rename to src/common/icon.js
diff --git a/src/components/menu-sidebar.js b/src/common/menu-sidebar.js
similarity index 100%
rename from src/components/menu-sidebar.js
rename to src/common/menu-sidebar.js
diff --git a/src/components/parameters-editor.js b/src/common/parameters-editor.js
similarity index 100%
rename from src/components/parameters-editor.js
rename to src/common/parameters-editor.js
diff --git a/src/components/table-column.js b/src/common/table-column.js
similarity index 100%
rename from src/components/table-column.js
rename to src/common/table-column.js
diff --git a/src/components/table.js b/src/common/table.js
similarity index 100%
rename from src/components/table.js
rename to src/common/table.js
diff --git a/src/stores/file-store.js b/src/file/file-store.js
similarity index 93%
rename from src/stores/file-store.js
rename to src/file/file-store.js
index 1437652..f2d3a07 100644
--- a/src/stores/file-store.js
+++ b/src/file/file-store.js
@@ -19,8 +19,8 @@
  * along with VILLASweb. If not, see <http://www.gnu.org/licenses/>.
  ******************************************************************************/
 
-import ArrayStore from './array-store';
-import FilesDataManager from '../data-managers/files-data-manager';
+import ArrayStore from '../common/array-store';
+import FilesDataManager from './files-data-manager';
 
 class FileStore extends ArrayStore {
   constructor() {
diff --git a/src/data-managers/files-data-manager.js b/src/file/files-data-manager.js
similarity index 90%
rename from src/data-managers/files-data-manager.js
rename to src/file/files-data-manager.js
index b9fbd91..e92aeff 100644
--- a/src/data-managers/files-data-manager.js
+++ b/src/file/files-data-manager.js
@@ -19,9 +19,9 @@
  * along with VILLASweb. If not, see <http://www.gnu.org/licenses/>.
  ******************************************************************************/
 
-import RestDataManager from './rest-data-manager';
-import RestAPI from '../api/rest-api';
-import AppDispatcher from '../app-dispatcher';
+import RestDataManager from '../common/data-managers/rest-data-manager';
+import RestAPI from '../common/api/rest-api';
+import AppDispatcher from '../common/app-dispatcher';
 
 class FilesDataManager extends RestDataManager {
   constructor() {
diff --git a/src/containers/select-file.js b/src/file/select-file.js
similarity index 93%
rename from src/containers/select-file.js
rename to src/file/select-file.js
index 3eb97c1..fafe98f 100644
--- a/src/containers/select-file.js
+++ b/src/file/select-file.js
@@ -23,10 +23,10 @@ import React from 'react';
 import { Container } from 'flux/utils';
 import { FormGroup, FormControl, FormLabel, Button, ProgressBar, Col } from 'react-bootstrap';
 
-import FileStore from '../stores/file-store';
-import UserStore from '../stores/user-store';
+import FileStore from './file-store';
+import UserStore from '../user/user-store';
 
-import AppDispatcher from '../app-dispatcher';
+import AppDispatcher from '../common/app-dispatcher';
 
 class SelectFile extends React.Component {
     static getStores() {
@@ -107,12 +107,12 @@ class SelectFile extends React.Component {
     }
 
     render() {
-        const fileOptions = this.state.files.map(f => 
+        const fileOptions = this.state.files.map(f =>
             <option key={f._id} value={f._id}>{f.name}</option>
         );
 
         const progressBarStyle = {
-            marginLeft: '100px', 
+            marginLeft: '100px',
             marginTop: '-25px'
         };
 
@@ -121,7 +121,7 @@ class SelectFile extends React.Component {
                 <Col componentClass={FormLabel} sm={3} md={2}>
                     {this.props.name}
                 </Col>
-                
+
                 <Col sm={9} md={10}>
                     <FormControl disabled={this.props.disabled} componentClass='select' placeholder='Select file' onChange={this.handleChange}>
                         {fileOptions}
@@ -148,5 +148,5 @@ class SelectFile extends React.Component {
     }
 }
 
-let fluxContainerConverter = require('./FluxContainerConverter');
+let fluxContainerConverter = require('../common/FluxContainerConverter');
 export default Container.create(fluxContainerConverter.convert(SelectFile));
diff --git a/src/components/dialogs/edit-project.js b/src/project/edit-project.js
similarity index 98%
rename from src/components/dialogs/edit-project.js
rename to src/project/edit-project.js
index 6f2081d..918633d 100644
--- a/src/components/dialogs/edit-project.js
+++ b/src/project/edit-project.js
@@ -22,7 +22,7 @@
 import React from 'react';
 import { FormGroup, FormControl, FormLabel } from 'react-bootstrap';
 
-import Dialog from './dialog';
+import Dialog from '../common/dialogs/dialog';
 
 class EditProjectDialog extends React.Component {
   valid: true;
diff --git a/src/components/dialogs/new-project.js b/src/project/new-project.js
similarity index 98%
rename from src/components/dialogs/new-project.js
rename to src/project/new-project.js
index b9a2bbd..c18cd89 100644
--- a/src/components/dialogs/new-project.js
+++ b/src/project/new-project.js
@@ -22,7 +22,7 @@
 import React from 'react';
 import { FormGroup, FormControl, FormLabel } from 'react-bootstrap';
 
-import Dialog from './dialog';
+import Dialog from '../common/dialogs/dialog';
 
 class NewProjectDialog extends React.Component {
   valid: false;
diff --git a/src/stores/project-store.js b/src/project/project-store.js
similarity index 89%
rename from src/stores/project-store.js
rename to src/project/project-store.js
index 0df9380..99b9bba 100644
--- a/src/stores/project-store.js
+++ b/src/project/project-store.js
@@ -19,7 +19,7 @@
  * along with VILLASweb. If not, see <http://www.gnu.org/licenses/>.
  ******************************************************************************/
 
-import ArrayStore from './array-store';
-import ProjectsDataManager from '../data-managers/projects-data-manager';
+import ArrayStore from '../common/array-store';
+import ProjectsDataManager from './projects-data-manager';
 
 export default new ArrayStore('projects', ProjectsDataManager);
diff --git a/src/containers/project.js b/src/project/project.js
similarity index 89%
rename from src/containers/project.js
rename to src/project/project.js
index 74e2da4..78679d7 100644
--- a/src/containers/project.js
+++ b/src/project/project.js
@@ -24,20 +24,20 @@ import { Container } from 'flux/utils';
 import { Button } from 'react-bootstrap';
 import FileSaver from 'file-saver';
 
-import AppDispatcher from '../app-dispatcher';
-import ProjectStore from '../stores/project-store';
-import UserStore from '../stores/user-store';
-import VisualizationStore from '../stores/visualization-store';
-import SimulationStore from '../stores/simulation-store';
+import AppDispatcher from '../common/app-dispatcher';
+import ProjectStore from './project-store';
+import UserStore from '../user/user-store';
+import VisualizationStore from '../visualization/visualization-store';
+import SimulationStore from '../simulation/simulation-store';
 
-import Icon from '../components/icon';
-import CustomTable from '../components/table';
-import TableColumn from '../components/table-column';
-import NewVisualzationDialog from '../components/dialogs/new-visualization';
-import EditVisualizationDialog from '../components/dialogs/edit-visualization';
-import ImportVisualizationDialog from '../components/dialogs/import-visualization';
+import Icon from '../common/icon';
+import CustomTable from '../common/table';
+import TableColumn from '../common/table-column';
+import NewVisualzationDialog from '../visualization/new-visualization';
+import EditVisualizationDialog from '../visualization/edit-visualization';
+import ImportVisualizationDialog from '../visualization/import-visualization';
 
-import DeleteDialog from '../components/dialogs/delete-dialog';
+import DeleteDialog from '../common/dialogs/delete-dialog';
 
 class Visualizations extends Component {
   static getStores() {
@@ -231,5 +231,5 @@ class Visualizations extends Component {
   }
 }
 
-let fluxContainerConverter = require('./FluxContainerConverter');
+let fluxContainerConverter = require('../common/FluxContainerConverter');
 export default Container.create(fluxContainerConverter.convert(Visualizations), {withProps: true});
diff --git a/src/data-managers/projects-data-manager.js b/src/project/projects-data-manager.js
similarity index 92%
rename from src/data-managers/projects-data-manager.js
rename to src/project/projects-data-manager.js
index e1b8167..669e58a 100644
--- a/src/data-managers/projects-data-manager.js
+++ b/src/project/projects-data-manager.js
@@ -19,6 +19,6 @@
  * along with VILLASweb. If not, see <http://www.gnu.org/licenses/>.
  ******************************************************************************/
 
-import RestDataManager from './rest-data-manager';
+import RestDataManager from '../common/data-managers/rest-data-manager';
 
 export default new RestDataManager('project', '/projects');
diff --git a/src/containers/projects.js b/src/project/projects.js
similarity index 87%
rename from src/containers/projects.js
rename to src/project/projects.js
index d42bd64..4aba7cf 100644
--- a/src/containers/projects.js
+++ b/src/project/projects.js
@@ -23,18 +23,18 @@ import React from 'react';
 import { Container } from 'flux/utils';
 import { Button } from 'react-bootstrap';
 
-import AppDispatcher from '../app-dispatcher';
-import ProjectStore from '../stores/project-store';
-import UserStore from '../stores/user-store';
-import SimulationStore from '../stores/simulation-store';
+import AppDispatcher from '../common/app-dispatcher';
+import ProjectStore from './project-store';
+import UserStore from '../user/user-store';
+import SimulationStore from '../simulation/simulation-store';
 
-import Icon from '../components/icon';
-import Table from '../components/table';
-import TableColumn from '../components/table-column';
-import NewProjectDialog from '../components/dialogs/new-project';
-import EditProjectDialog from '../components/dialogs/edit-project';
+import Icon from '../common/icon';
+import Table from '../common/table';
+import TableColumn from '../common/table-column';
+import NewProjectDialog from './new-project';
+import EditProjectDialog from './edit-project';
 
-import DeleteDialog from '../components/dialogs/delete-dialog';
+import DeleteDialog from '../common/dialogs/delete-dialog';
 
 class Projects extends React.Component {
   static getStores() {
@@ -156,5 +156,5 @@ class Projects extends React.Component {
   }
 }
 
-let fluxContainerConverter = require('./FluxContainerConverter');
+let fluxContainerConverter = require('../common/FluxContainerConverter');
 export default Container.create(fluxContainerConverter.convert(Projects));
diff --git a/src/router.js b/src/router.js
index d9f3e45..aee9c0f 100644
--- a/src/router.js
+++ b/src/router.js
@@ -22,9 +22,9 @@
 import React from 'react';
 import { BrowserRouter, Route, Switch } from 'react-router-dom';
 
-import App from './containers/app';
-import Login from './containers/login';
-import Logout from './containers/logout';
+import App from './app';
+import Login from './user/login';
+import Logout from './user/logout';
 
 class Root extends React.Component {
   render() {
diff --git a/src/components/dialogs/edit-scenario.js b/src/scenario/edit-scenario.js
similarity index 96%
rename from src/components/dialogs/edit-scenario.js
rename to src/scenario/edit-scenario.js
index 0ce5dd6..4cebf47 100644
--- a/src/components/dialogs/edit-scenario.js
+++ b/src/scenario/edit-scenario.js
@@ -22,8 +22,8 @@
 import React from 'react';
 import {FormGroup, FormControl, FormLabel, Col} from 'react-bootstrap';
 
-import Dialog from './dialog';
-import ParametersEditor from '../parameters-editor';
+import Dialog from '../common/dialogs/dialog';
+import ParametersEditor from '../common/parameters-editor';
 
 class EditScenarioDialog extends React.Component {
   valid = true;
diff --git a/src/components/dialogs/import-scenario.js b/src/scenario/import-scenario.js
similarity index 97%
rename from src/components/dialogs/import-scenario.js
rename to src/scenario/import-scenario.js
index bab9f46..8402e23 100644
--- a/src/components/dialogs/import-scenario.js
+++ b/src/scenario/import-scenario.js
@@ -22,8 +22,8 @@
 import React from 'react';
 import {FormGroup, FormControl, FormLabel, Col} from 'react-bootstrap';
 
-import Dialog from './dialog';
-import ParametersEditor from '../parameters-editor';
+import Dialog from '../common/dialogs/dialog';
+import ParametersEditor from '../common/parameters-editor';
 
 class ImportScenarioDialog extends React.Component {
   valid = false;
diff --git a/src/components/dialogs/new-scenario.js b/src/scenario/new-scenario.js
similarity index 95%
rename from src/components/dialogs/new-scenario.js
rename to src/scenario/new-scenario.js
index ff8dc68..c7323c5 100644
--- a/src/components/dialogs/new-scenario.js
+++ b/src/scenario/new-scenario.js
@@ -22,8 +22,8 @@
 import React from 'react';
 import {FormGroup, FormControl, FormLabel, Col} from 'react-bootstrap';
 
-import Dialog from './dialog';
-import ParametersEditor from '../parameters-editor';
+import Dialog from '../common/dialogs/dialog';
+import ParametersEditor from '../common/parameters-editor';
 
 class NewScenarioDialog extends React.Component {
   valid = false;
diff --git a/src/scenario/scenario-store.js b/src/scenario/scenario-store.js
new file mode 100644
index 0000000..cd45335
--- /dev/null
+++ b/src/scenario/scenario-store.js
@@ -0,0 +1,63 @@
+/**
+ * File: scenario-store.js
+ * Author: Sonja Happ <sonja.happ@eonerc.rwth-aachen.de>
+ * Date: 20.08.2019
+ *
+ * This file is part of VILLASweb.
+ *
+ * VILLASweb is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * VILLASweb is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with VILLASweb. If not, see <http://www.gnu.org/licenses/>.
+ ************************************************************s*****************/
+
+
+import ScenariosDataManager from './scenarios-data-manager';
+import ArrayStore from '../common/array-store';
+//import UsersDataManager from "../user/users-data-manager";
+//import SimulatorDataDataManager from "../simulator/simulator-data-data-manager";
+//import AppDispatcher from "../common/app-dispatcher";
+
+export default new ArrayStore('scenarios', ScenariosDataManager);
+
+
+// class ScenariosStore extends ReduceStore {
+//   constructor() {
+//     super('scenarios', ScenariosDataManager);
+//   }
+//
+//   getInitialState() {
+//     return {
+//       scenarios: [],
+//
+//     };
+//   }
+//
+//   reduce(state, action) {
+//     switch (action.type) {
+//       case 'scenarios/load-models':
+//         // request simulation model data of scenario
+//         ScenariosDataManager.getSimulationModels(action.token, action.scenarioID);
+//
+//         return Object.assign({}, state, { token: action.token, simulationmodels: action.simulationmodels});
+//
+//       case 'scenarios/load-dashboards':
+//         // request dashboard data of scenario
+//         ScenariosDataManager.getDashboards(action.token, action.scenarioID);
+//
+//         return Object.assign({}, state, { token: action.token, dashboards: action.dashboards});
+//       default:
+//         return state;
+//     }
+//   }
+// }
+//
+// export default new ScenariosStore();
diff --git a/src/containers/scenario.js b/src/scenario/scenario.js
similarity index 92%
rename from src/containers/scenario.js
rename to src/scenario/scenario.js
index ae03741..681dfc5 100644
--- a/src/containers/scenario.js
+++ b/src/scenario/scenario.js
@@ -25,19 +25,19 @@ import { Button } from 'react-bootstrap';
 import FileSaver from 'file-saver';
 import _ from 'lodash';
 
-import ScenarioStore from '../stores/scenario-store';
-import SimulatorStore from '../stores/simulator-store';
-import SimulationModelStore from '../stores/simulation-model-store';
-import UserStore from '../stores/user-store';
-import AppDispatcher from '../app-dispatcher';
+import ScenarioStore from './scenario-store';
+import SimulatorStore from '../simulator/simulator-store';
+import SimulationModelStore from '../simulationmodel/simulation-model-store';
+import UserStore from '../user/user-store';
+import AppDispatcher from '../common/app-dispatcher';
 
-import Icon from '../components/icon';
-import Table from '../components/table';
-import TableColumn from '../components/table-column';
-import ImportSimulationModelDialog from '../components/dialogs/import-simulation-model';
+import Icon from '../common/icon';
+import Table from '../common/table';
+import TableColumn from '../common/table-column';
+import ImportSimulationModelDialog from '../simulationmodel/import-simulation-model';
 
-import SimulatorAction from '../components/simulator-action';
-import DeleteDialog from '../components/dialogs/delete-dialog';
+import SimulatorAction from '../simulator/simulator-action';
+import DeleteDialog from '../common/dialogs/delete-dialog';
 
 class Scenario extends React.Component {
   static getStores() {
@@ -293,5 +293,5 @@ class Scenario extends React.Component {
   }
 }
 
-let fluxContainerConverter = require('./FluxContainerConverter');
+let fluxContainerConverter = require('../common/FluxContainerConverter');
 export default Container.create(fluxContainerConverter.convert(Scenario), { withProps: true });
diff --git a/src/data-managers/scenarios-data-manager.js b/src/scenario/scenarios-data-manager.js
similarity index 91%
rename from src/data-managers/scenarios-data-manager.js
rename to src/scenario/scenarios-data-manager.js
index 136ee3d..3ab824a 100644
--- a/src/data-managers/scenarios-data-manager.js
+++ b/src/scenario/scenarios-data-manager.js
@@ -19,9 +19,9 @@
  * along with VILLASweb. If not, see <http://www.gnu.org/licenses/>.
  ******************************************************************************/
 
-import RestDataManager from './rest-data-manager';
-import RestAPI from "../api/rest-api";
-import AppDispatcher from "../app-dispatcher";
+import RestDataManager from '../common/data-managers/rest-data-manager';
+import RestAPI from "../common/api/rest-api";
+import AppDispatcher from "../common/app-dispatcher";
 
 class ScenariosDataManager extends RestDataManager {
   constructor() {
diff --git a/src/containers/scenarios.js b/src/scenario/scenarios.js
similarity index 91%
rename from src/containers/scenarios.js
rename to src/scenario/scenarios.js
index 72b63ee..864e552 100644
--- a/src/containers/scenarios.js
+++ b/src/scenario/scenarios.js
@@ -24,21 +24,21 @@ import { Container } from 'flux/utils';
 import { Button } from 'react-bootstrap';
 import FileSaver from 'file-saver';
 
-import AppDispatcher from '../app-dispatcher';
-import ScenarioStore from '../stores/scenario-store';
-import UserStore from '../stores/user-store';
-import SimulatorStore from '../stores/simulator-store';
-import SimulationModelStore from '../stores/simulation-model-store';
+import AppDispatcher from '../common/app-dispatcher';
+import ScenarioStore from './scenario-store';
+import UserStore from '../user/user-store';
+import SimulatorStore from '../simulator/simulator-store';
+import SimulationModelStore from '../simulationmodel/simulation-model-store';
 
-import Icon from '../components/icon';
-import Table from '../components/table';
-import TableColumn from '../components/table-column';
-import NewScenarioDialog from '../components/dialogs/new-scenario';
-import EditScenarioDialog from '../components/dialogs/edit-scenario';
-import ImportScenarioDialog from '../components/dialogs/import-scenario';
+import Icon from '../common/icon';
+import Table from '../common/table';
+import TableColumn from '../common/table-column';
+import NewScenarioDialog from './new-scenario';
+import EditScenarioDialog from './edit-scenario';
+import ImportScenarioDialog from './import-scenario';
 
-import SimulatorAction from '../components/simulator-action';
-import DeleteDialog from '../components/dialogs/delete-dialog';
+import SimulatorAction from '../simulator/simulator-action';
+import DeleteDialog from '../common/dialogs/delete-dialog';
 
 class Scenarios extends Component {
   static getStores() {
@@ -324,5 +324,5 @@ class Scenarios extends Component {
   }
 }
 
-let fluxContainerConverter = require('./FluxContainerConverter');
+let fluxContainerConverter = require('../common/FluxContainerConverter');
 export default Container.create(fluxContainerConverter.convert(Scenarios));
diff --git a/src/components/dialogs/edit-simulation.js b/src/simulation/edit-simulation.js
similarity index 96%
rename from src/components/dialogs/edit-simulation.js
rename to src/simulation/edit-simulation.js
index a312406..7a99ab6 100644
--- a/src/components/dialogs/edit-simulation.js
+++ b/src/simulation/edit-simulation.js
@@ -22,8 +22,8 @@
 import React from 'react';
 import { FormGroup, FormControl, FormLabel } from 'react-bootstrap';
 
-import Dialog from './dialog';
-import ParametersEditor from '../parameters-editor';
+import Dialog from '../common/dialogs/dialog';
+import ParametersEditor from '../common/parameters-editor';
 
 class EditSimulationDialog extends React.Component {
     valid = true;
diff --git a/src/components/dialogs/import-simulation.js b/src/simulation/import-simulation.js
similarity index 97%
rename from src/components/dialogs/import-simulation.js
rename to src/simulation/import-simulation.js
index 1aadb37..afb1438 100644
--- a/src/components/dialogs/import-simulation.js
+++ b/src/simulation/import-simulation.js
@@ -22,8 +22,8 @@
 import React from 'react';
 import { FormGroup, FormControl, FormLabel } from 'react-bootstrap';
 
-import Dialog from './dialog';
-import ParametersEditor from '../parameters-editor';
+import Dialog from '../common/dialogs/dialog';
+import ParametersEditor from '../common/parameters-editor';
 
 class ImportSimulationDialog extends React.Component {
     valid = false;
@@ -47,7 +47,7 @@ class ImportSimulationDialog extends React.Component {
 
             return;
         }
-        
+
         if (this.valid && this.props.onClose != null) {
             this.props.onClose(this.state);
         }
@@ -62,7 +62,7 @@ class ImportSimulationDialog extends React.Component {
 
             return;
         }
-            
+
         this.setState({ [e.target.id]: e.target.value });
     }
 
diff --git a/src/components/dialogs/new-simulation.js b/src/simulation/new-simulation.js
similarity index 96%
rename from src/components/dialogs/new-simulation.js
rename to src/simulation/new-simulation.js
index 3d32e2d..a6b1c8f 100644
--- a/src/components/dialogs/new-simulation.js
+++ b/src/simulation/new-simulation.js
@@ -22,8 +22,8 @@
 import React from 'react';
 import { FormGroup, FormControl, FormLabel } from 'react-bootstrap';
 
-import Dialog from './dialog';
-import ParametersEditor from '../parameters-editor';
+import Dialog from '../common/dialogs/dialog';
+import ParametersEditor from '../common/parameters-editor';
 
 class NewSimulationDialog extends React.Component {
     valid = false;
@@ -42,7 +42,7 @@ class NewSimulationDialog extends React.Component {
             if (this.props.onClose != null) {
                 this.props.onClose();
             }
-            
+
             return;
         }
 
diff --git a/src/stores/simulation-store.js b/src/simulation/simulation-store.js
similarity index 88%
rename from src/stores/simulation-store.js
rename to src/simulation/simulation-store.js
index 87f4676..fbc63eb 100644
--- a/src/stores/simulation-store.js
+++ b/src/simulation/simulation-store.js
@@ -19,7 +19,7 @@
  * along with VILLASweb. If not, see <http://www.gnu.org/licenses/>.
  ******************************************************************************/
 
-import ArrayStore from './array-store';
-import SimulationsDataManager from '../data-managers/simulations-data-manager';
+import ArrayStore from '../common/array-store';
+import SimulationsDataManager from './simulations-data-manager';
 
 export default new ArrayStore('simulations', SimulationsDataManager);
diff --git a/src/containers/simulation.js b/src/simulation/simulation.js
similarity index 92%
rename from src/containers/simulation.js
rename to src/simulation/simulation.js
index 7a66ea1..db49b0f 100644
--- a/src/containers/simulation.js
+++ b/src/simulation/simulation.js
@@ -25,19 +25,19 @@ import { Button } from 'react-bootstrap';
 import FileSaver from 'file-saver';
 import _ from 'lodash';
 
-import SimulationStore from '../stores/simulation-store';
-import SimulatorStore from '../stores/simulator-store';
-import SimulationModelStore from '../stores/simulation-model-store';
-import UserStore from '../stores/user-store';
-import AppDispatcher from '../app-dispatcher';
+import SimulationStore from './simulation-store';
+import SimulatorStore from '../simulator/simulator-store';
+import SimulationModelStore from '../simulationmodel/simulation-model-store';
+import UserStore from '../user/user-store';
+import AppDispatcher from '../common/app-dispatcher';
 
-import Icon from '../components/icon';
-import Table from '../components/table';
-import TableColumn from '../components/table-column';
-import ImportSimulationModelDialog from '../components/dialogs/import-simulation-model';
+import Icon from '../common/icon';
+import Table from '../common/table';
+import TableColumn from '../common/table-column';
+import ImportSimulationModelDialog from '../simulationmodel/import-simulation-model';
 
-import SimulatorAction from '../components/simulator-action';
-import DeleteDialog from '../components/dialogs/delete-dialog';
+import SimulatorAction from '../simulator/simulator-action';
+import DeleteDialog from '../common/dialogs/delete-dialog';
 
 class Simulation extends React.Component {
   static getStores() {
@@ -285,5 +285,5 @@ class Simulation extends React.Component {
   }
 }
 
-let fluxContainerConverter = require('./FluxContainerConverter');
+let fluxContainerConverter = require('../common/FluxContainerConverter');
 export default Container.create(fluxContainerConverter.convert(Simulation), { withProps: true });
diff --git a/src/data-managers/simulations-data-manager.js b/src/simulation/simulations-data-manager.js
similarity index 93%
rename from src/data-managers/simulations-data-manager.js
rename to src/simulation/simulations-data-manager.js
index 30885aa..3090820 100644
--- a/src/data-managers/simulations-data-manager.js
+++ b/src/simulation/simulations-data-manager.js
@@ -19,6 +19,6 @@
  * along with VILLASweb. If not, see <http://www.gnu.org/licenses/>.
  ******************************************************************************/
 
-import RestDataManager from './rest-data-manager';
+import RestDataManager from '../common/data-managers/rest-data-manager';
 
 export default new RestDataManager('simulation', '/simulations', [ '_id', 'name', 'projects', 'models', 'startParameters' ]);
diff --git a/src/containers/simulations.js b/src/simulation/simulations.js
similarity index 91%
rename from src/containers/simulations.js
rename to src/simulation/simulations.js
index 5f9429f..c74801c 100644
--- a/src/containers/simulations.js
+++ b/src/simulation/simulations.js
@@ -24,21 +24,21 @@ import { Container } from 'flux/utils';
 import { Button } from 'react-bootstrap';
 import FileSaver from 'file-saver';
 
-import AppDispatcher from '../app-dispatcher';
-import SimulationStore from '../stores/simulation-store';
-import UserStore from '../stores/user-store';
-import SimulatorStore from '../stores/simulator-store';
-import SimulationModelStore from '../stores/simulation-model-store';
+import AppDispatcher from '../common/app-dispatcher';
+import SimulationStore from './simulation-store';
+import UserStore from '../user/user-store';
+import SimulatorStore from '../simulator/simulator-store';
+import SimulationModelStore from '../simulationmodel/simulation-model-store';
 
-import Icon from '../components/icon';
-import Table from '../components/table';
-import TableColumn from '../components/table-column';
-import NewSimulationDialog from '../components/dialogs/new-simulation';
-import EditSimulationDialog from '../components/dialogs/edit-simulation';
-import ImportSimulationDialog from '../components/dialogs/import-simulation';
+import Icon from '../common/icon';
+import Table from '../common/table';
+import TableColumn from '../common/table-column';
+import NewSimulationDialog from './new-simulation';
+import EditSimulationDialog from './edit-simulation';
+import ImportSimulationDialog from './import-simulation';
 
-import SimulatorAction from '../components/simulator-action';
-import DeleteDialog from '../components/dialogs/delete-dialog';
+import SimulatorAction from '../simulator/simulator-action';
+import DeleteDialog from '../common/dialogs/delete-dialog';
 
 class Simulations extends Component {
   static getStores() {
@@ -325,5 +325,5 @@ class Simulations extends Component {
   }
 }
 
-let fluxContainerConverter = require('./FluxContainerConverter');
+let fluxContainerConverter = require('../common/FluxContainerConverter');
 export default Container.create(fluxContainerConverter.convert(Simulations));
diff --git a/src/components/dialogs/import-simulation-model.js b/src/simulationmodel/import-simulation-model.js
similarity index 98%
rename from src/components/dialogs/import-simulation-model.js
rename to src/simulationmodel/import-simulation-model.js
index 55e7a2b..991c76a 100644
--- a/src/components/dialogs/import-simulation-model.js
+++ b/src/simulationmodel/import-simulation-model.js
@@ -23,7 +23,7 @@ import React from 'react';
 import { FormGroup, FormControl, FormLabel } from 'react-bootstrap';
 import _ from 'lodash';
 
-import Dialog from './dialog';
+import Dialog from '../common/dialogs/dialog';
 
 class ImportSimulationModelDialog extends React.Component {
   imported = false;
diff --git a/src/components/signal-mapping.js b/src/simulationmodel/signal-mapping.js
similarity index 97%
rename from src/components/signal-mapping.js
rename to src/simulationmodel/signal-mapping.js
index 0a66ac5..ca65eac 100644
--- a/src/components/signal-mapping.js
+++ b/src/simulationmodel/signal-mapping.js
@@ -24,8 +24,8 @@ import PropTypes from 'prop-types';
 import { FormGroup, FormControl, FormLabel, FormText } from 'react-bootstrap';
 import validator from 'validator';
 
-import Table from './table';
-import TableColumn from './table-column';
+import Table from '../common/table';
+import TableColumn from '../common/table-column';
 
 class SignalMapping extends React.Component {
     constructor(props) {
diff --git a/src/stores/simulation-model-store.js b/src/simulationmodel/simulation-model-store.js
similarity index 87%
rename from src/stores/simulation-model-store.js
rename to src/simulationmodel/simulation-model-store.js
index 73d3dd2..0f06101 100644
--- a/src/stores/simulation-model-store.js
+++ b/src/simulationmodel/simulation-model-store.js
@@ -19,7 +19,7 @@
  * along with VILLASweb. If not, see <http://www.gnu.org/licenses/>.
  ******************************************************************************/
 
-import ArrayStore from './array-store';
-import SimulationModelsDataManager from '../data-managers/simulation-models-data-manager';
+import ArrayStore from '../common/array-store';
+import SimulationModelsDataManager from './simulation-models-data-manager';
 
 export default new ArrayStore('simulationModels', SimulationModelsDataManager);
diff --git a/src/containers/simulation-model.js b/src/simulationmodel/simulation-model.js
similarity index 91%
rename from src/containers/simulation-model.js
rename to src/simulationmodel/simulation-model.js
index 2f536ec..e716191 100644
--- a/src/containers/simulation-model.js
+++ b/src/simulationmodel/simulation-model.js
@@ -23,15 +23,15 @@ import React from 'react';
 import { Container } from 'flux/utils';
 import { Button, Col, Form, FormLabel } from 'react-bootstrap';
 
-import SimulationModelStore from '../stores/simulation-model-store';
-import UserStore from '../stores/user-store';
-import AppDispatcher from '../app-dispatcher';
+import SimulationModelStore from './simulation-model-store';
+import UserStore from '../user/user-store';
+import AppDispatcher from '../common/app-dispatcher';
 
-import SelectSimulator from './select-simulator';
-import SelectFile from './select-file';
-import SignalMapping from '../components/signal-mapping';
-import EditableHeader from '../components/editable-header';
-import ParametersEditor from '../components/parameters-editor';
+import SelectSimulator from '../simulator/select-simulator';
+import SelectFile from '../file/select-file';
+import SignalMapping from './signal-mapping';
+import EditableHeader from '../common/editable-header';
+import ParametersEditor from '../common/parameters-editor';
 
 class SimulationModel extends React.Component {
     static getStores() {
@@ -168,5 +168,5 @@ class SimulationModel extends React.Component {
     }
 }
 
-let fluxContainerConverter = require('./FluxContainerConverter');
+let fluxContainerConverter = require('../common/FluxContainerConverter');
 export default Container.create(fluxContainerConverter.convert(SimulationModel), { withProps: true });
diff --git a/src/data-managers/simulation-models-data-manager.js b/src/simulationmodel/simulation-models-data-manager.js
similarity index 92%
rename from src/data-managers/simulation-models-data-manager.js
rename to src/simulationmodel/simulation-models-data-manager.js
index 5496268..cd41baf 100644
--- a/src/data-managers/simulation-models-data-manager.js
+++ b/src/simulationmodel/simulation-models-data-manager.js
@@ -19,8 +19,8 @@
  * along with VILLASweb. If not, see <http://www.gnu.org/licenses/>.
  ******************************************************************************/
 
-import RestDataManager from './rest-data-manager';
-import AppDispatcher from '../app-dispatcher';
+import RestDataManager from '../common/data-managers/rest-data-manager';
+import AppDispatcher from '../common/app-dispatcher';
 
 class SimulationModelDataManager extends RestDataManager {
   constructor() {
diff --git a/src/components/dialogs/edit-simulator.js b/src/simulator/edit-simulator.js
similarity index 96%
rename from src/components/dialogs/edit-simulator.js
rename to src/simulator/edit-simulator.js
index 89ff7e7..17358ad 100644
--- a/src/components/dialogs/edit-simulator.js
+++ b/src/simulator/edit-simulator.js
@@ -23,8 +23,8 @@ import React from 'react';
 import { FormGroup, FormControl, FormLabel } from 'react-bootstrap';
 import _ from 'lodash';
 
-import Dialog from './dialog';
-import ParametersEditor from '../parameters-editor';
+import Dialog from '../common/dialogs/dialog';
+import ParametersEditor from '../common/parameters-editor';
 
 class EditSimulatorDialog extends React.Component {
   valid = true;
diff --git a/src/components/dialogs/import-simulator.js b/src/simulator/import-simulator.js
similarity index 96%
rename from src/components/dialogs/import-simulator.js
rename to src/simulator/import-simulator.js
index e884002..4368c60 100644
--- a/src/components/dialogs/import-simulator.js
+++ b/src/simulator/import-simulator.js
@@ -23,7 +23,7 @@ import React from 'react';
 import { FormGroup, FormControl, FormLabel } from 'react-bootstrap';
 import _ from 'lodash';
 
-import Dialog from './dialog';
+import Dialog from '../common/dialogs/dialog';
 
 class ImportSimulatorDialog extends React.Component {
   valid = false;
@@ -42,7 +42,7 @@ class ImportSimulatorDialog extends React.Component {
   onClose(canceled) {
     if (canceled === false) {
       if (this.valid) {
-        const data = { 
+        const data = {
           properties: {
             name: this.state.name
           },
@@ -83,10 +83,10 @@ class ImportSimulatorDialog extends React.Component {
       // read simulator
       const simulator = JSON.parse(event.target.result);
       self.imported = true;
-      self.setState({ 
-        name: _.get(simulator, 'properties.name') || _.get(simulator, 'rawProperties.name'), 
+      self.setState({
+        name: _.get(simulator, 'properties.name') || _.get(simulator, 'rawProperties.name'),
         endpoint: _.get(simulator, 'properties.endpoint') || _.get(simulator, 'rawProperties.endpoint'),
-        uuid: simulator.uuid 
+        uuid: simulator.uuid
       });
     };
 
diff --git a/src/components/dialogs/new-simulator.js b/src/simulator/new-simulator.js
similarity index 98%
rename from src/components/dialogs/new-simulator.js
rename to src/simulator/new-simulator.js
index ea7335a..6116d12 100644
--- a/src/components/dialogs/new-simulator.js
+++ b/src/simulator/new-simulator.js
@@ -22,7 +22,7 @@
 import React from 'react';
 import { FormGroup, FormControl, FormLabel } from 'react-bootstrap';
 
-import Dialog from './dialog';
+import Dialog from '../common/dialogs/dialog';
 
 class NewSimulatorDialog extends React.Component {
   valid = false;
diff --git a/src/containers/select-simulator.js b/src/simulator/select-simulator.js
similarity index 93%
rename from src/containers/select-simulator.js
rename to src/simulator/select-simulator.js
index 4b69ff1..2061adf 100644
--- a/src/containers/select-simulator.js
+++ b/src/simulator/select-simulator.js
@@ -24,7 +24,7 @@ import { Container } from 'flux/utils';
 import { FormGroup, FormControl, FormLabel, Col } from 'react-bootstrap';
 import _ from 'lodash';
 
-import SimulatorStore from '../stores/simulator-store';
+import SimulatorStore from './simulator-store';
 
 class SelectSimulator extends React.Component {
     static getStores() {
@@ -67,7 +67,7 @@ class SelectSimulator extends React.Component {
     }
 
     render() {
-        const simulatorOptions = this.state.simulators.map(s => 
+        const simulatorOptions = this.state.simulators.map(s =>
             <option key={s._id} value={s._id}>{_.get(s, 'properties.name') || _.get(s, 'rawProperties.name') || s.uuid}</option>
         );
 
@@ -85,5 +85,5 @@ class SelectSimulator extends React.Component {
     }
 }
 
-let fluxContainerConverter = require('./FluxContainerConverter');
+let fluxContainerConverter = require('../common/FluxContainerConverter');
 export default Container.create(fluxContainerConverter.convert(SelectSimulator));
diff --git a/src/components/simulator-action.js b/src/simulator/simulator-action.js
similarity index 100%
rename from src/components/simulator-action.js
rename to src/simulator/simulator-action.js
diff --git a/src/data-managers/simulator-data-data-manager.js b/src/simulator/simulator-data-data-manager.js
similarity index 97%
rename from src/data-managers/simulator-data-data-manager.js
rename to src/simulator/simulator-data-data-manager.js
index 3154115..94e31a0 100644
--- a/src/data-managers/simulator-data-data-manager.js
+++ b/src/simulator/simulator-data-data-manager.js
@@ -19,8 +19,8 @@
  * along with VILLASweb. If not, see <http://www.gnu.org/licenses/>.
  ******************************************************************************/
 
-import WebsocketAPI from '../api/websocket-api';
-import AppDispatcher from '../app-dispatcher';
+import WebsocketAPI from '../common/api/websocket-api';
+import AppDispatcher from '../common/app-dispatcher';
 
 const OFFSET_TYPE = 2;
 const OFFSET_VERSION = 4;
diff --git a/src/stores/simulator-data-store.js b/src/simulator/simulator-data-store.js
similarity index 96%
rename from src/stores/simulator-data-store.js
rename to src/simulator/simulator-data-store.js
index 1c4c8bf..bb84442 100644
--- a/src/stores/simulator-data-store.js
+++ b/src/simulator/simulator-data-store.js
@@ -21,8 +21,8 @@
 
 import { ReduceStore } from 'flux/utils';
 
-import AppDispatcher from '../app-dispatcher';
-import SimulatorDataDataManager from '../data-managers/simulator-data-data-manager';
+import AppDispatcher from '../common/app-dispatcher';
+import SimulatorDataDataManager from './simulator-data-data-manager';
 
 const MAX_VALUES = 10000;
 
diff --git a/src/stores/simulator-store.js b/src/simulator/simulator-store.js
similarity index 92%
rename from src/stores/simulator-store.js
rename to src/simulator/simulator-store.js
index 03ecf73..7b51818 100644
--- a/src/stores/simulator-store.js
+++ b/src/simulator/simulator-store.js
@@ -21,9 +21,9 @@
 
 import _ from 'lodash';
 
-import ArrayStore from './array-store';
-import SimulatorsDataManager from '../data-managers/simulators-data-manager';
-import SimulatorDataDataManager from '../data-managers/simulator-data-data-manager';
+import ArrayStore from '../common/array-store';
+import SimulatorsDataManager from './simulators-data-manager';
+import SimulatorDataDataManager from './simulator-data-data-manager';
 
 class SimulatorStore extends ArrayStore {
   constructor() {
diff --git a/src/data-managers/simulators-data-manager.js b/src/simulator/simulators-data-manager.js
similarity index 89%
rename from src/data-managers/simulators-data-manager.js
rename to src/simulator/simulators-data-manager.js
index 4c34f51..df08f95 100644
--- a/src/data-managers/simulators-data-manager.js
+++ b/src/simulator/simulators-data-manager.js
@@ -19,9 +19,9 @@
  * along with VILLASweb. If not, see <http://www.gnu.org/licenses/>.
  ******************************************************************************/
 
-import RestDataManager from './rest-data-manager';
-import RestAPI from '../api/rest-api';
-import AppDispatcher from '../app-dispatcher';
+import RestDataManager from '../common/data-managers/rest-data-manager';
+import RestAPI from '../common/api/rest-api';
+import AppDispatcher from '../common/app-dispatcher';
 
 class SimulatorsDataManager extends RestDataManager {
     constructor() {
diff --git a/src/containers/simulators.js b/src/simulator/simulators.js
similarity index 93%
rename from src/containers/simulators.js
rename to src/simulator/simulators.js
index c44567f..d0d8e4f 100644
--- a/src/containers/simulators.js
+++ b/src/simulator/simulators.js
@@ -25,19 +25,19 @@ import { Button } from 'react-bootstrap';
 import FileSaver from 'file-saver';
 import _ from 'lodash';
 
-import AppDispatcher from '../app-dispatcher';
-import SimulatorStore from '../stores/simulator-store';
-import UserStore from '../stores/user-store';
+import AppDispatcher from '../common/app-dispatcher';
+import SimulatorStore from './simulator-store';
+import UserStore from '../user/user-store';
 
-import Icon from '../components/icon';
-import Table from '../components/table';
-import TableColumn from '../components/table-column';
-import NewSimulatorDialog from '../components/dialogs/new-simulator';
-import EditSimulatorDialog from '../components/dialogs/edit-simulator';
-import ImportSimulatorDialog from '../components/dialogs/import-simulator';
+import Icon from '../common/icon';
+import Table from '../common/table';
+import TableColumn from '../common/table-column';
+import NewSimulatorDialog from './new-simulator';
+import EditSimulatorDialog from './edit-simulator';
+import ImportSimulatorDialog from './import-simulator';
 
-import SimulatorAction from '../components/simulator-action';
-import DeleteDialog from '../components/dialogs/delete-dialog';
+import SimulatorAction from './simulator-action';
+import DeleteDialog from '../common/dialogs/delete-dialog';
 
 class Simulators extends Component {
   static getStores() {
@@ -330,5 +330,5 @@ class Simulators extends Component {
   }
 }
 
-let fluxContainerConverter = require('./FluxContainerConverter');
+let fluxContainerConverter = require('../common/FluxContainerConverter');
 export default Container.create(fluxContainerConverter.convert(Simulators));
diff --git a/src/stores/scenario-store.js b/src/stores/scenario-store.js
deleted file mode 100644
index c7e4dc4..0000000
--- a/src/stores/scenario-store.js
+++ /dev/null
@@ -1,63 +0,0 @@
-/**
- * File: scenario-store.js
- * Author: Sonja Happ <sonja.happ@eonerc.rwth-aachen.de>
- * Date: 20.08.2019
- *
- * This file is part of VILLASweb.
- *
- * VILLASweb is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * VILLASweb is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with VILLASweb. If not, see <http://www.gnu.org/licenses/>.
- ************************************************************s*****************/
-
-import ArrayStore from './array-store';
-import ScenariosDataManager from '../data-managers/scenarios-data-manager';
-import UsersDataManager from "../data-managers/users-data-manager";
-import SimulatorDataDataManager from "../data-managers/simulator-data-data-manager";
-import {ReduceStore} from "flux/utils";
-import AppDispatcher from "../app-dispatcher";
-
-//export default new ArrayStore('scenarios', ScenariosDataManager);
-
-
-class ScenariosStore extends ReduceStore {
-  constructor() {
-    super('scenarios', ScenariosDataManager);
-  }
-
-  getInitialState() {
-    return {
-      scenarios: [],
-
-    };
-  }
-
-  reduce(state, action) {
-    switch (action.type) {
-      case 'scenarios/load-models':
-        // request simulation model data of scenario
-        ScenariosDataManager.getSimulationModels(action.token, action.scenarioID);
-
-        return Object.assign({}, state, { token: action.token, simulationmodels: action.simulationmodels});
-
-      case 'scenarios/load-dashboards':
-        // request dashboard data of scenario
-        ScenariosDataManager.getDashboards(action.token, action.scenarioID);
-
-        return Object.assign({}, state, { token: action.token, dashboards: action.dashboards});
-      default:
-        return state;
-    }
-  }
-}
-
-export default new ScenariosStore();
diff --git a/src/components/dialogs/edit-user.js b/src/user/edit-user.js
similarity index 98%
rename from src/components/dialogs/edit-user.js
rename to src/user/edit-user.js
index 0d901bd..59cafc7 100644
--- a/src/components/dialogs/edit-user.js
+++ b/src/user/edit-user.js
@@ -22,7 +22,7 @@
 import React from 'react';
 import {FormGroup, FormControl, FormLabel, Col} from 'react-bootstrap';
 
-import Dialog from './dialog';
+import Dialog from '../common/dialogs/dialog';
 
 class EditUserDialog extends React.Component {
   valid: true;
diff --git a/src/components/login-form.js b/src/user/login-form.js
similarity index 98%
rename from src/components/login-form.js
rename to src/user/login-form.js
index 7747723..a038f38 100644
--- a/src/components/login-form.js
+++ b/src/user/login-form.js
@@ -22,7 +22,7 @@
 import React, { Component } from 'react';
 import { Form, Button, FormGroup, FormControl, FormLabel, Col } from 'react-bootstrap';
 
-import AppDispatcher from '../app-dispatcher';
+import AppDispatcher from '../common/app-dispatcher';
 
 class LoginForm extends Component {
   constructor(props) {
diff --git a/src/containers/login.js b/src/user/login.js
similarity index 87%
rename from src/containers/login.js
rename to src/user/login.js
index 93afa80..3f1e3b6 100644
--- a/src/containers/login.js
+++ b/src/user/login.js
@@ -25,13 +25,13 @@ import { NavbarBrand } from 'react-bootstrap';
 import NotificationSystem from 'react-notification-system';
 import { Redirect } from 'react-router-dom';
 
-import LoginForm from '../components/login-form';
-import Header from '../components/header';
-import Footer from '../components/footer';
-import NotificationsDataManager from '../data-managers/notifications-data-manager';
+import LoginForm from './login-form';
+import Header from '../common/header';
+import Footer from '../common/footer';
+import NotificationsDataManager from '../common/data-managers/notifications-data-manager';
 
-import AppDispatcher from '../app-dispatcher';
-import UserStore from '../stores/user-store';
+import AppDispatcher from '../common/app-dispatcher';
+import UserStore from './user-store';
 
 class Login extends Component {
   static getStores() {
@@ -97,5 +97,5 @@ class Login extends Component {
   }
 }
 
-let fluxContainerConverter = require('./FluxContainerConverter');
+let fluxContainerConverter = require('../common/FluxContainerConverter');
 export default Container.create(fluxContainerConverter.convert(Login));
diff --git a/src/containers/logout.js b/src/user/logout.js
similarity index 95%
rename from src/containers/logout.js
rename to src/user/logout.js
index 9fa39ae..2e19b43 100644
--- a/src/containers/logout.js
+++ b/src/user/logout.js
@@ -22,7 +22,7 @@
 import React from 'react';
 import { Redirect } from 'react-router-dom';
 
-import AppDispatcher from '../app-dispatcher';
+import AppDispatcher from '../common/app-dispatcher';
 
 class Logout extends React.Component {
   componentWillMount() {
diff --git a/src/components/dialogs/new-user.js b/src/user/new-user.js
similarity index 98%
rename from src/components/dialogs/new-user.js
rename to src/user/new-user.js
index e711596..5919568 100644
--- a/src/components/dialogs/new-user.js
+++ b/src/user/new-user.js
@@ -22,7 +22,7 @@
 import React from 'react';
 import { FormGroup, FormControl, FormLabel, FormText, Col } from 'react-bootstrap';
 
-import Dialog from './dialog';
+import Dialog from '../common/dialogs/dialog';
 
 class NewUserDialog extends React.Component {
   valid: false;
diff --git a/src/stores/user-store.js b/src/user/user-store.js
similarity index 91%
rename from src/stores/user-store.js
rename to src/user/user-store.js
index c3c563f..c925a35 100644
--- a/src/stores/user-store.js
+++ b/src/user/user-store.js
@@ -21,9 +21,9 @@
 
 import { ReduceStore } from 'flux/utils';
 
-import AppDispatcher from '../app-dispatcher';
-import UsersDataManager from '../data-managers/users-data-manager';
-import SimulatorDataDataManager from '../data-managers/simulator-data-data-manager';
+import AppDispatcher from '../common/app-dispatcher';
+import UsersDataManager from './users-data-manager';
+import SimulatorDataDataManager from '../simulator/simulator-data-data-manager';
 
 class UserStore extends ReduceStore {
   constructor() {
@@ -73,7 +73,7 @@ class UserStore extends ReduceStore {
           state = Object.assign({}, state, { loginMessage: 'Wrong credentials! Please try again.' });
         }
 
-        return state;    
+        return state;
 
       default:
         return state;
diff --git a/src/data-managers/users-data-manager.js b/src/user/users-data-manager.js
similarity index 91%
rename from src/data-managers/users-data-manager.js
rename to src/user/users-data-manager.js
index 692b18b..6ce0c7a 100644
--- a/src/data-managers/users-data-manager.js
+++ b/src/user/users-data-manager.js
@@ -19,9 +19,9 @@
  * along with VILLASweb. If not, see <http://www.gnu.org/licenses/>.
  ******************************************************************************/
 
-import RestDataManager from './rest-data-manager';
-import RestAPI from '../api/rest-api';
-import AppDispatcher from '../app-dispatcher';
+import RestDataManager from '../common/data-managers/rest-data-manager';
+import RestAPI from '../common/api/rest-api';
+import AppDispatcher from '../common/app-dispatcher';
 
 class UsersDataManager extends RestDataManager {
   constructor() {
@@ -57,7 +57,7 @@ class UsersDataManager extends RestDataManager {
       });
     });
   }
-  
+
 }
 
 export default new UsersDataManager();
diff --git a/src/stores/users-store.js b/src/user/users-store.js
similarity index 91%
rename from src/stores/users-store.js
rename to src/user/users-store.js
index e42b1ed..44622ba 100644
--- a/src/stores/users-store.js
+++ b/src/user/users-store.js
@@ -19,9 +19,9 @@
  * along with VILLASweb. If not, see <http://www.gnu.org/licenses/>.
  ******************************************************************************/
 
-import ArrayStore from './array-store';
-import UsersDataManager from '../data-managers/users-data-manager';
-import NotificationsDataManager from '../data-managers/notifications-data-manager';
+import ArrayStore from '../common/array-store';
+import UsersDataManager from './users-data-manager';
+import NotificationsDataManager from '../common/data-managers/notifications-data-manager';
 
 class UsersStore extends ArrayStore {
   constructor() {
diff --git a/src/containers/users.js b/src/user/users.js
similarity index 88%
rename from src/containers/users.js
rename to src/user/users.js
index b61e16c..304412f 100644
--- a/src/containers/users.js
+++ b/src/user/users.js
@@ -23,17 +23,17 @@ import React, { Component } from 'react';
 import { Container } from 'flux/utils';
 import { Button } from 'react-bootstrap';
 
-import AppDispatcher from '../app-dispatcher';
-import UserStore from '../stores/user-store';
-import UsersStore from '../stores/users-store';
+import AppDispatcher from '../common/app-dispatcher';
+import UserStore from './user-store';
+import UsersStore from './users-store';
 
-import Icon from '../components/icon';
-import Table from '../components/table';
-import TableColumn from '../components/table-column';
-import NewUserDialog from '../components/dialogs/new-user';
-import EditUserDialog from '../components/dialogs/edit-user';
+import Icon from '../common/icon';
+import Table from '../common/table';
+import TableColumn from '../common/table-column';
+import NewUserDialog from './new-user';
+import EditUserDialog from './edit-user';
 
-import DeleteDialog from '../components/dialogs/delete-dialog';
+import DeleteDialog from '../common/dialogs/delete-dialog';
 
 class Users extends Component {
   static getStores() {
@@ -140,5 +140,5 @@ class Users extends Component {
   }
 }
 
-let fluxContainerConverter = require('./FluxContainerConverter');
+let fluxContainerConverter = require('../common/FluxContainerConverter');
 export default Container.create(fluxContainerConverter.convert(Users));
diff --git a/src/components/dropzone.js b/src/visualization/dropzone.js
similarity index 100%
rename from src/components/dropzone.js
rename to src/visualization/dropzone.js
diff --git a/src/components/dialogs/edit-visualization.js b/src/visualization/edit-visualization.js
similarity index 98%
rename from src/components/dialogs/edit-visualization.js
rename to src/visualization/edit-visualization.js
index 565e141..c8514c8 100644
--- a/src/components/dialogs/edit-visualization.js
+++ b/src/visualization/edit-visualization.js
@@ -22,7 +22,7 @@
 import React from 'react';
 import { FormGroup, FormControl, FormLabel } from 'react-bootstrap';
 
-import Dialog from './dialog';
+import Dialog from '../common/dialogs/dialog';
 
 class EditVisualizationDialog extends React.Component {
   valid: false;
diff --git a/src/components/grid.js b/src/visualization/grid.js
similarity index 100%
rename from src/components/grid.js
rename to src/visualization/grid.js
diff --git a/src/components/dialogs/import-visualization.js b/src/visualization/import-visualization.js
similarity index 98%
rename from src/components/dialogs/import-visualization.js
rename to src/visualization/import-visualization.js
index 22188f2..a833d70 100644
--- a/src/components/dialogs/import-visualization.js
+++ b/src/visualization/import-visualization.js
@@ -22,7 +22,7 @@
 import React from 'react';
 import { FormGroup, FormControl, FormLabel } from 'react-bootstrap';
 
-import Dialog from './dialog';
+import Dialog from '../common/dialogs/dialog';
 
 class ImportVisualizationDialog extends React.Component {
   valid = false;
diff --git a/src/components/dialogs/new-visualization.js b/src/visualization/new-visualization.js
similarity index 98%
rename from src/components/dialogs/new-visualization.js
rename to src/visualization/new-visualization.js
index 2427340..5618c14 100644
--- a/src/components/dialogs/new-visualization.js
+++ b/src/visualization/new-visualization.js
@@ -22,7 +22,7 @@
 import React from 'react';
 import { FormGroup, FormControl, FormLabel } from 'react-bootstrap';
 
-import Dialog from './dialog';
+import Dialog from '../common/dialogs/dialog';
 
 class NewVisualzationDialog extends React.Component {
   valid: false;
diff --git a/src/components/toolbox-item.js b/src/visualization/toolbox-item.js
similarity index 98%
rename from src/components/toolbox-item.js
rename to src/visualization/toolbox-item.js
index a4f5b14..be498f4 100644
--- a/src/components/toolbox-item.js
+++ b/src/visualization/toolbox-item.js
@@ -22,7 +22,7 @@
 import React from 'react';
 import { DragSource } from 'react-dnd';
 import classNames from 'classnames';
-import Icon from './icon';
+import Icon from '../common/icon';
 
 const toolboxItemSource = {
   beginDrag(props) {
diff --git a/src/stores/visualization-store.js b/src/visualization/visualization-store.js
similarity index 88%
rename from src/stores/visualization-store.js
rename to src/visualization/visualization-store.js
index ba69682..adadd2d 100644
--- a/src/stores/visualization-store.js
+++ b/src/visualization/visualization-store.js
@@ -19,7 +19,7 @@
  * along with VILLASweb. If not, see <http://www.gnu.org/licenses/>.
  ******************************************************************************/
 
-import ArrayStore from './array-store';
-import VisualizationsDataManager from '../data-managers/visualizations-data-manager';
+import ArrayStore from '../common/array-store';
+import VisualizationsDataManager from './visualizations-data-manager';
 
 export default new ArrayStore('visualizations', VisualizationsDataManager);
diff --git a/src/containers/visualization.js b/src/visualization/visualization.js
similarity index 95%
rename from src/containers/visualization.js
rename to src/visualization/visualization.js
index 36fac12..59ffbc1 100644
--- a/src/containers/visualization.js
+++ b/src/visualization/visualization.js
@@ -27,23 +27,23 @@ import Fullscreenable from 'react-fullscreenable';
 import Slider from 'rc-slider';
 import classNames from 'classnames';
 
-import Icon from '../components/icon';
-import WidgetFactory from '../components/widget-factory';
-import ToolboxItem from '../components/toolbox-item';
-import Dropzone from '../components/dropzone';
-import Widget from './widget';
-import EditWidget from '../components/dialogs/edit-widget';
-import Grid from '../components/grid';
+import Icon from '../common/icon';
+import WidgetFactory from '../widget/widget-factory';
+import ToolboxItem from './toolbox-item';
+import Dropzone from './dropzone';
+import Widget from '../widget/widget';
+import EditWidget from '../widget/edit-widget';
+import Grid from './grid';
 
-import UserStore from '../stores/user-store';
-import VisualizationStore from '../stores/visualization-store';
-import ProjectStore from '../stores/project-store';
-import SimulationStore from '../stores/simulation-store';
-import SimulationModelStore from '../stores/simulation-model-store';
-import FileStore from '../stores/file-store';
-import AppDispatcher from '../app-dispatcher';
-import NotificationsDataManager from '../data-managers/notifications-data-manager';
-import NotificationsFactory from '../data-managers/notifications-factory';
+import UserStore from '../user/user-store';
+import VisualizationStore from './visualization-store';
+import ProjectStore from '../project/project-store';
+import SimulationStore from '../simulation/simulation-store';
+import SimulationModelStore from '../simulationmodel/simulation-model-store';
+import FileStore from '../file/file-store';
+import AppDispatcher from '../common/app-dispatcher';
+import NotificationsDataManager from '../common/data-managers/notifications-data-manager';
+import NotificationsFactory from '../common/data-managers/notifications-factory';
 
 import 'react-contexify/dist/ReactContexify.min.css';
 
@@ -547,5 +547,5 @@ class Visualization extends React.Component {
   }
 }
 
-let fluxContainerConverter = require('./FluxContainerConverter');
+let fluxContainerConverter = require('../common/FluxContainerConverter');
 export default Fullscreenable()(Container.create(fluxContainerConverter.convert(Visualization), { withProps: true }));
diff --git a/src/data-managers/visualizations-data-manager.js b/src/visualization/visualizations-data-manager.js
similarity index 92%
rename from src/data-managers/visualizations-data-manager.js
rename to src/visualization/visualizations-data-manager.js
index b141880..ee12b3e 100644
--- a/src/data-managers/visualizations-data-manager.js
+++ b/src/visualization/visualizations-data-manager.js
@@ -19,6 +19,6 @@
  * along with VILLASweb. If not, see <http://www.gnu.org/licenses/>.
  ******************************************************************************/
 
-import RestDataManager from './rest-data-manager';
+import RestDataManager from '../common/data-managers/rest-data-manager';
 
 export default new RestDataManager('visualization', '/visualizations');
diff --git a/src/components/dialogs/edit-widget-aspect-control.js b/src/widget/edit-widget-aspect-control.js
similarity index 100%
rename from src/components/dialogs/edit-widget-aspect-control.js
rename to src/widget/edit-widget-aspect-control.js
diff --git a/src/components/dialogs/edit-widget-checkbox-control.js b/src/widget/edit-widget-checkbox-control.js
similarity index 100%
rename from src/components/dialogs/edit-widget-checkbox-control.js
rename to src/widget/edit-widget-checkbox-control.js
diff --git a/src/components/dialogs/edit-widget-color-control.js b/src/widget/edit-widget-color-control.js
similarity index 100%
rename from src/components/dialogs/edit-widget-color-control.js
rename to src/widget/edit-widget-color-control.js
diff --git a/src/components/dialogs/edit-widget-color-zones-control.js b/src/widget/edit-widget-color-zones-control.js
similarity index 96%
rename from src/components/dialogs/edit-widget-color-zones-control.js
rename to src/widget/edit-widget-color-zones-control.js
index 3fd97d4..c124353 100644
--- a/src/components/dialogs/edit-widget-color-zones-control.js
+++ b/src/widget/edit-widget-color-zones-control.js
@@ -23,9 +23,9 @@ import React from 'react';
 import { FormGroup, FormLabel, Button } from 'react-bootstrap';
 
 
-import Icon from '../icon';
-import Table from '../table';
-import TableColumn from '../table-column';
+import Icon from '../common/icon';
+import Table from '../common/table';
+import TableColumn from '../common/table-column';
 
 class EditWidgetColorZonesControl extends React.Component {
   constructor(props) {
diff --git a/src/components/dialogs/edit-widget-control-creator.js b/src/widget/edit-widget-control-creator.js
similarity index 100%
rename from src/components/dialogs/edit-widget-control-creator.js
rename to src/widget/edit-widget-control-creator.js
diff --git a/src/components/dialogs/edit-widget-html-content.js b/src/widget/edit-widget-html-content.js
similarity index 100%
rename from src/components/dialogs/edit-widget-html-content.js
rename to src/widget/edit-widget-html-content.js
diff --git a/src/components/dialogs/edit-widget-image-control.js b/src/widget/edit-widget-image-control.js
similarity index 98%
rename from src/components/dialogs/edit-widget-image-control.js
rename to src/widget/edit-widget-image-control.js
index 5973a45..e9d0118 100644
--- a/src/components/dialogs/edit-widget-image-control.js
+++ b/src/widget/edit-widget-image-control.js
@@ -22,7 +22,7 @@
 import React from 'react';
 import { FormGroup, FormControl, FormLabel, Button, ProgressBar } from 'react-bootstrap';
 
-import AppDispatcher from '../../app-dispatcher';
+import AppDispatcher from '../common/app-dispatcher';
 
 class EditImageWidgetControl extends React.Component {
   constructor(props) {
@@ -50,7 +50,7 @@ class EditImageWidgetControl extends React.Component {
         formData.append(key, this.state.fileList[key]);
       }
     }
-    
+
     // upload files
     AppDispatcher.dispatch({
       type: 'files/start-upload',
diff --git a/src/components/dialogs/edit-widget-min-max-control.js b/src/widget/edit-widget-min-max-control.js
similarity index 100%
rename from src/components/dialogs/edit-widget-min-max-control.js
rename to src/widget/edit-widget-min-max-control.js
diff --git a/src/components/dialogs/edit-widget-number-control.js b/src/widget/edit-widget-number-control.js
similarity index 100%
rename from src/components/dialogs/edit-widget-number-control.js
rename to src/widget/edit-widget-number-control.js
diff --git a/src/components/dialogs/edit-widget-orientation.js b/src/widget/edit-widget-orientation.js
similarity index 98%
rename from src/components/dialogs/edit-widget-orientation.js
rename to src/widget/edit-widget-orientation.js
index 73f8830..88ee57c 100644
--- a/src/components/dialogs/edit-widget-orientation.js
+++ b/src/widget/edit-widget-orientation.js
@@ -22,7 +22,7 @@
 import React, { Component } from 'react';
 import { FormGroup, Col, Row, FormCheck, FormLabel } from 'react-bootstrap';
 
-import WidgetSlider from '../widgets/slider';
+import WidgetSlider from './widgets/slider';
 
 class EditWidgetOrientation extends Component {
   constructor(props) {
diff --git a/src/components/dialogs/edit-widget-parameters-control.js b/src/widget/edit-widget-parameters-control.js
similarity index 96%
rename from src/components/dialogs/edit-widget-parameters-control.js
rename to src/widget/edit-widget-parameters-control.js
index 0fd5695..1831a5c 100644
--- a/src/components/dialogs/edit-widget-parameters-control.js
+++ b/src/widget/edit-widget-parameters-control.js
@@ -21,7 +21,7 @@
 
 import React, { Component } from 'react';
 import { FormGroup, FormLabel } from 'react-bootstrap';
-import ParametersEditor from '../parameters-editor';
+import ParametersEditor from '../common/parameters-editor';
 
 class EditWidgetParametersControl extends Component {
   constructor(props) {
diff --git a/src/components/dialogs/edit-widget-signal-control.js b/src/widget/edit-widget-signal-control.js
similarity index 100%
rename from src/components/dialogs/edit-widget-signal-control.js
rename to src/widget/edit-widget-signal-control.js
diff --git a/src/components/dialogs/edit-widget-signals-control.js b/src/widget/edit-widget-signals-control.js
similarity index 100%
rename from src/components/dialogs/edit-widget-signals-control.js
rename to src/widget/edit-widget-signals-control.js
diff --git a/src/components/dialogs/edit-widget-simulation-control.js b/src/widget/edit-widget-simulation-control.js
similarity index 100%
rename from src/components/dialogs/edit-widget-simulation-control.js
rename to src/widget/edit-widget-simulation-control.js
diff --git a/src/components/dialogs/edit-widget-text-control.js b/src/widget/edit-widget-text-control.js
similarity index 100%
rename from src/components/dialogs/edit-widget-text-control.js
rename to src/widget/edit-widget-text-control.js
diff --git a/src/components/dialogs/edit-widget-text-size-control.js b/src/widget/edit-widget-text-size-control.js
similarity index 100%
rename from src/components/dialogs/edit-widget-text-size-control.js
rename to src/widget/edit-widget-text-size-control.js
diff --git a/src/components/dialogs/edit-widget-time-control.js b/src/widget/edit-widget-time-control.js
similarity index 100%
rename from src/components/dialogs/edit-widget-time-control.js
rename to src/widget/edit-widget-time-control.js
diff --git a/src/components/dialogs/edit-widget.js b/src/widget/edit-widget.js
similarity index 98%
rename from src/components/dialogs/edit-widget.js
rename to src/widget/edit-widget.js
index fd5debd..051feae 100644
--- a/src/components/dialogs/edit-widget.js
+++ b/src/widget/edit-widget.js
@@ -22,7 +22,7 @@
 import React from 'react';
 //import { FormGroup, FormControl, FormLabel } from 'react-bootstrap';
 
-import Dialog from './dialog';
+import Dialog from '../common/dialogs/dialog';
 
 import createControls from './edit-widget-control-creator';
 
@@ -58,7 +58,7 @@ class EditWidgetDialog extends React.Component {
     // scale width to match aspect
     const aspectRatio = file.dimensions.width / file.dimensions.height;
     changeObject.width = this.state.temporal.height * aspectRatio;
-    
+
     return changeObject;
   }
 
diff --git a/src/components/widget-factory.js b/src/widget/widget-factory.js
similarity index 100%
rename from src/components/widget-factory.js
rename to src/widget/widget-factory.js
diff --git a/src/components/widget-plot/plot-legend.js b/src/widget/widget-plot/plot-legend.js
similarity index 100%
rename from src/components/widget-plot/plot-legend.js
rename to src/widget/widget-plot/plot-legend.js
diff --git a/src/components/widget-plot/plot.js b/src/widget/widget-plot/plot.js
similarity index 100%
rename from src/components/widget-plot/plot.js
rename to src/widget/widget-plot/plot.js
diff --git a/src/containers/widget.js b/src/widget/widget.js
similarity index 88%
rename from src/containers/widget.js
rename to src/widget/widget.js
index 3a6a715..cb9944e 100644
--- a/src/containers/widget.js
+++ b/src/widget/widget.js
@@ -25,28 +25,28 @@ import { ContextMenuProvider } from 'react-contexify';
 import { Rnd } from 'react-rnd';
 import classNames from 'classnames';
 
-import AppDispatcher from '../app-dispatcher';
-import UserStore from '../stores/user-store';
-import SimulatorDataStore from '../stores/simulator-data-store';
-import SimulationModelStore from '../stores/simulation-model-store';
-import FileStore from '../stores/file-store';
+import AppDispatcher from '../common/app-dispatcher';
+import UserStore from '../user/user-store';
+import SimulatorDataStore from '../simulator/simulator-data-store';
+import SimulationModelStore from '../simulationmodel/simulation-model-store';
+import FileStore from '../file/file-store';
 
-import WidgetCustomAction from '../components/widgets/custom-action';
-import WidgetAction from '../components/widgets/action';
-import WidgetLamp from '../components/widgets/lamp';
-import WidgetValue from '../components/widgets/value';
-import WidgetPlot from '../components/widgets/plot';
-import WidgetTable from '../components/widgets/table';
-import WidgetLabel from '../components/widgets/label';
-import WidgetPlotTable from '../components/widgets/plot-table';
-import WidgetImage from '../components/widgets/image';
-import WidgetButton from '../components/widgets/button';
-import WidgetInput from '../components/widgets/input';
-import WidgetSlider from '../components/widgets/slider';
-import WidgetGauge from '../components/widgets/gauge';
-import WidgetBox from '../components/widgets/box';
-import WidgetHTML from '../components/widgets/html';
-import WidgetTopology from '../components/widgets/topology';
+import WidgetCustomAction from './widgets/custom-action';
+import WidgetAction from './widgets/action';
+import WidgetLamp from './widgets/lamp';
+import WidgetValue from './widgets/value';
+import WidgetPlot from './widgets/plot';
+import WidgetTable from './widgets/table';
+import WidgetLabel from './widgets/label';
+import WidgetPlotTable from './widgets/plot-table';
+import WidgetImage from './widgets/image';
+import WidgetButton from './widgets/button';
+import WidgetInput from './widgets/input';
+import WidgetSlider from './widgets/slider';
+import WidgetGauge from './widgets/gauge';
+import WidgetBox from './widgets/box';
+import WidgetHTML from './widgets/html';
+import WidgetTopology from './widgets/topology';
 
 import '../styles/widgets.css';
 
@@ -294,5 +294,5 @@ class Widget extends React.Component {
   }
 }
 
-let fluxContainerConverter = require('./FluxContainerConverter');
+let fluxContainerConverter = require('../common/FluxContainerConverter');
 export default Container.create(fluxContainerConverter.convert(Widget), { withProps: true });
diff --git a/src/components/widgets/action.js b/src/widget/widgets/action.js
similarity index 97%
rename from src/components/widgets/action.js
rename to src/widget/widgets/action.js
index 24e105c..0d309a8 100644
--- a/src/components/widgets/action.js
+++ b/src/widget/widgets/action.js
@@ -22,7 +22,7 @@
 
 import React, { Component } from 'react';
 import { Button, ButtonGroup } from 'react-bootstrap';
-import Icon from '../icon';
+import Icon from '../../common/icon';
 
 class WidgetAction extends Component {
   constructor(props) {
diff --git a/src/components/widgets/box.js b/src/widget/widgets/box.js
similarity index 95%
rename from src/components/widgets/box.js
rename to src/widget/widgets/box.js
index c32517f..69539ab 100644
--- a/src/components/widgets/box.js
+++ b/src/widget/widgets/box.js
@@ -22,7 +22,7 @@
 
 import React, { Component } from 'react';
 
-import EditWidgetColorControl from '../dialogs/edit-widget-color-control';
+import EditWidgetColorControl from '../edit-widget-color-control';
 
 class WidgetBox extends Component {
   render() {
diff --git a/src/components/widgets/button.js b/src/widget/widgets/button.js
similarity index 100%
rename from src/components/widgets/button.js
rename to src/widget/widgets/button.js
diff --git a/src/components/widgets/custom-action.js b/src/widget/widgets/custom-action.js
similarity index 90%
rename from src/components/widgets/custom-action.js
rename to src/widget/widgets/custom-action.js
index 4a1a7cb..6571c8f 100644
--- a/src/components/widgets/custom-action.js
+++ b/src/widget/widgets/custom-action.js
@@ -22,10 +22,10 @@
 
 import React, { Component } from 'react';
 import { Button } from 'react-bootstrap';
-import Icon from '../icon';
-import UserStore from '../../stores/user-store';
-import SimulatorStore from '../../stores/simulator-store';
-import AppDispatcher from '../../app-dispatcher';
+import Icon from '../../common/icon';
+import UserStore from '../../user/user-store';
+import SimulatorStore from '../../simulator/simulator-store';
+import AppDispatcher from '../../common/app-dispatcher';
 
 class WidgetCustomAction extends Component {
   constructor(props) {
diff --git a/src/components/widgets/gauge.js b/src/widget/widgets/gauge.js
similarity index 100%
rename from src/components/widgets/gauge.js
rename to src/widget/widgets/gauge.js
diff --git a/src/components/widgets/html.js b/src/widget/widgets/html.js
similarity index 100%
rename from src/components/widgets/html.js
rename to src/widget/widgets/html.js
diff --git a/src/components/widgets/image.js b/src/widget/widgets/image.js
similarity index 97%
rename from src/components/widgets/image.js
rename to src/widget/widgets/image.js
index 3438a51..1b73f2a 100644
--- a/src/components/widgets/image.js
+++ b/src/widget/widgets/image.js
@@ -21,7 +21,7 @@
 
 import React from 'react';
 
-import AppDispatcher from '../../app-dispatcher';
+import AppDispatcher from '../../common/app-dispatcher';
 import config from '../../config';
 
 class WidgetImage extends React.Component {
diff --git a/src/components/widgets/input.js b/src/widget/widgets/input.js
similarity index 100%
rename from src/components/widgets/input.js
rename to src/widget/widgets/input.js
diff --git a/src/components/widgets/label.js b/src/widget/widgets/label.js
similarity index 94%
rename from src/components/widgets/label.js
rename to src/widget/widgets/label.js
index 4ce680e..f53eb18 100644
--- a/src/components/widgets/label.js
+++ b/src/widget/widgets/label.js
@@ -21,7 +21,7 @@
 
 import React, { Component } from 'react';
 
-import EditWidgetColorControl from '../dialogs/edit-widget-color-control';
+import EditWidgetColorControl from '../edit-widget-color-control';
 
 class WidgetLabel extends Component {
   render() {
diff --git a/src/components/widgets/lamp.js b/src/widget/widgets/lamp.js
similarity index 96%
rename from src/components/widgets/lamp.js
rename to src/widget/widgets/lamp.js
index 5b90f56..0514047 100644
--- a/src/components/widgets/lamp.js
+++ b/src/widget/widgets/lamp.js
@@ -21,7 +21,7 @@
 
 import React, { Component } from 'react';
 
-import EditWidgetColorControl from '../dialogs/edit-widget-color-control';
+import EditWidgetColorControl from '../edit-widget-color-control';
 
 class WidgetLamp extends Component {
   constructor(props) {
diff --git a/src/components/widgets/plot-table.js b/src/widget/widgets/plot-table.js
similarity index 100%
rename from src/components/widgets/plot-table.js
rename to src/widget/widgets/plot-table.js
diff --git a/src/components/widgets/plot.js b/src/widget/widgets/plot.js
similarity index 100%
rename from src/components/widgets/plot.js
rename to src/widget/widgets/plot.js
diff --git a/src/components/widgets/slider.js b/src/widget/widgets/slider.js
similarity index 100%
rename from src/components/widgets/slider.js
rename to src/widget/widgets/slider.js
diff --git a/src/components/widgets/table.js b/src/widget/widgets/table.js
similarity index 96%
rename from src/components/widgets/table.js
rename to src/widget/widgets/table.js
index 53af120..9ac2d0e 100644
--- a/src/components/widgets/table.js
+++ b/src/widget/widgets/table.js
@@ -22,8 +22,8 @@
 import React, { Component } from 'react';
 import { format } from 'd3';
 
-import Table from '../table';
-import TableColumn from '../table-column';
+import Table from '../../common/table';
+import TableColumn from '../../common/table-column';
 
 class WidgetTable extends Component {
   constructor(props) {
diff --git a/src/components/widgets/topology.js b/src/widget/widgets/topology.js
similarity index 100%
rename from src/components/widgets/topology.js
rename to src/widget/widgets/topology.js
diff --git a/src/components/widgets/value.js b/src/widget/widgets/value.js
similarity index 100%
rename from src/components/widgets/value.js
rename to src/widget/widgets/value.js