diff --git a/apps/documenteditor/mobile/src/components/edit/controller/EditChart.jsx b/apps/documenteditor/mobile/src/controller/edit/EditChart.jsx
similarity index 96%
rename from apps/documenteditor/mobile/src/components/edit/controller/EditChart.jsx
rename to apps/documenteditor/mobile/src/controller/edit/EditChart.jsx
index 388bc52bc8..3068365c22 100644
--- a/apps/documenteditor/mobile/src/components/edit/controller/EditChart.jsx
+++ b/apps/documenteditor/mobile/src/controller/edit/EditChart.jsx
@@ -1,9 +1,9 @@
 import React, {Component} from 'react';
 import { f7 } from 'framework7-react';
-import {Device} from '../../../../../../common/mobile/utils/device';
+import {Device} from '../../../../../common/mobile/utils/device';
 import {observer, inject} from "mobx-react";
 
-import { EditChart } from '../EditChart'
+import { EditChart } from '../../view/edit/EditChart'
 
 class EditChartController extends Component {
     constructor (props) {
diff --git a/apps/documenteditor/mobile/src/components/edit/controller/EditHeader.jsx b/apps/documenteditor/mobile/src/controller/edit/EditHeader.jsx
similarity index 96%
rename from apps/documenteditor/mobile/src/components/edit/controller/EditHeader.jsx
rename to apps/documenteditor/mobile/src/controller/edit/EditHeader.jsx
index 9a498c5915..c05a7ca348 100644
--- a/apps/documenteditor/mobile/src/components/edit/controller/EditHeader.jsx
+++ b/apps/documenteditor/mobile/src/controller/edit/EditHeader.jsx
@@ -1,6 +1,6 @@
 import React, {Component} from 'react';
 
-import EditHeader from '../EditHeader';
+import EditHeader from '../../view/edit/EditHeader';
 
 class EditHeaderController extends Component {
     constructor (props) {
diff --git a/apps/documenteditor/mobile/src/components/edit/controller/EditHyperlink.jsx b/apps/documenteditor/mobile/src/controller/edit/EditHyperlink.jsx
similarity index 94%
rename from apps/documenteditor/mobile/src/components/edit/controller/EditHyperlink.jsx
rename to apps/documenteditor/mobile/src/controller/edit/EditHyperlink.jsx
index 0123754076..cfb79fed11 100644
--- a/apps/documenteditor/mobile/src/components/edit/controller/EditHyperlink.jsx
+++ b/apps/documenteditor/mobile/src/controller/edit/EditHyperlink.jsx
@@ -1,10 +1,10 @@
 import React, {Component} from 'react';
 import { f7 } from 'framework7-react';
-import {Device} from '../../../../../../common/mobile/utils/device';
+import {Device} from '../../../../../common/mobile/utils/device';
 import {observer, inject} from "mobx-react";
 import { withTranslation } from 'react-i18next';
 
-import EditHyperlink from '../EditHyperlink';
+import EditHyperlink from '../../view/edit/EditHyperlink';
 
 class EditHyperlinkController extends Component {
     constructor (props) {
diff --git a/apps/documenteditor/mobile/src/components/edit/controller/EditImage.jsx b/apps/documenteditor/mobile/src/controller/edit/EditImage.jsx
similarity index 97%
rename from apps/documenteditor/mobile/src/components/edit/controller/EditImage.jsx
rename to apps/documenteditor/mobile/src/controller/edit/EditImage.jsx
index 106fe81878..108056b23b 100644
--- a/apps/documenteditor/mobile/src/components/edit/controller/EditImage.jsx
+++ b/apps/documenteditor/mobile/src/controller/edit/EditImage.jsx
@@ -1,9 +1,9 @@
 import React, {Component} from 'react';
 import { f7 } from 'framework7-react';
-import {Device} from '../../../../../../common/mobile/utils/device';
+import {Device} from '../../../../../common/mobile/utils/device';
 import {observer, inject} from "mobx-react";
 
-import { EditImage } from '../EditImage'
+import { EditImage } from '../../view/edit/EditImage'
 
 class EditImageController extends Component {
     constructor (props) {
diff --git a/apps/documenteditor/mobile/src/components/edit/controller/EditParagraph.jsx b/apps/documenteditor/mobile/src/controller/edit/EditParagraph.jsx
similarity index 98%
rename from apps/documenteditor/mobile/src/components/edit/controller/EditParagraph.jsx
rename to apps/documenteditor/mobile/src/controller/edit/EditParagraph.jsx
index cb702f4556..a41b624c80 100644
--- a/apps/documenteditor/mobile/src/components/edit/controller/EditParagraph.jsx
+++ b/apps/documenteditor/mobile/src/controller/edit/EditParagraph.jsx
@@ -1,5 +1,5 @@
 import React, {Component} from 'react';
-import { EditParagraph } from '../EditParagraph'
+import { EditParagraph } from '../../view/edit/EditParagraph'
 
 class EditParagraphController extends Component {
     constructor (props) {
diff --git a/apps/documenteditor/mobile/src/components/edit/controller/EditShape.jsx b/apps/documenteditor/mobile/src/controller/edit/EditShape.jsx
similarity index 97%
rename from apps/documenteditor/mobile/src/components/edit/controller/EditShape.jsx
rename to apps/documenteditor/mobile/src/controller/edit/EditShape.jsx
index 13a4e22413..c703860f1f 100644
--- a/apps/documenteditor/mobile/src/components/edit/controller/EditShape.jsx
+++ b/apps/documenteditor/mobile/src/controller/edit/EditShape.jsx
@@ -1,9 +1,9 @@
 import React, {Component} from 'react';
 import { f7 } from 'framework7-react';
-import {Device} from '../../../../../../common/mobile/utils/device';
+import {Device} from '../../../../../common/mobile/utils/device';
 import {observer, inject} from "mobx-react";
 
-import { EditShape } from '../EditShape'
+import { EditShape } from '../../view/edit/EditShape'
 
 class EditShapeController extends Component {
     constructor (props) {
diff --git a/apps/documenteditor/mobile/src/components/edit/controller/EditTable.jsx b/apps/documenteditor/mobile/src/controller/edit/EditTable.jsx
similarity index 97%
rename from apps/documenteditor/mobile/src/components/edit/controller/EditTable.jsx
rename to apps/documenteditor/mobile/src/controller/edit/EditTable.jsx
index 6087e8e91e..239fe64fa2 100644
--- a/apps/documenteditor/mobile/src/components/edit/controller/EditTable.jsx
+++ b/apps/documenteditor/mobile/src/controller/edit/EditTable.jsx
@@ -1,9 +1,9 @@
 import React, {Component} from 'react';
 import { f7 } from 'framework7-react';
-import {Device} from '../../../../../../common/mobile/utils/device';
+import {Device} from '../../../../../common/mobile/utils/device';
 import {observer, inject} from "mobx-react";
 
-import { EditTable } from '../EditTable';
+import { EditTable } from '../../view/edit/EditTable';
 
 class EditTableController extends Component {
     constructor (props) {
diff --git a/apps/documenteditor/mobile/src/components/edit/controller/EditText.jsx b/apps/documenteditor/mobile/src/controller/edit/EditText.jsx
similarity index 99%
rename from apps/documenteditor/mobile/src/components/edit/controller/EditText.jsx
rename to apps/documenteditor/mobile/src/controller/edit/EditText.jsx
index 807efcff59..21fdf96b75 100644
--- a/apps/documenteditor/mobile/src/components/edit/controller/EditText.jsx
+++ b/apps/documenteditor/mobile/src/controller/edit/EditText.jsx
@@ -1,5 +1,5 @@
 import React, {Component} from 'react';
-import { EditText } from '../EditText'
+import { EditText } from '../../view/edit/EditText'
 
 class EditTextController extends Component {
     constructor(props) {
diff --git a/apps/documenteditor/mobile/src/components/settings/controller/DocumentSettings.jsx b/apps/documenteditor/mobile/src/controller/settings/DocumentSettings.jsx
similarity index 97%
rename from apps/documenteditor/mobile/src/components/settings/controller/DocumentSettings.jsx
rename to apps/documenteditor/mobile/src/controller/settings/DocumentSettings.jsx
index b0a11ca685..b259537224 100644
--- a/apps/documenteditor/mobile/src/components/settings/controller/DocumentSettings.jsx
+++ b/apps/documenteditor/mobile/src/controller/settings/DocumentSettings.jsx
@@ -1,6 +1,6 @@
 
 import React, {Component} from 'react';
-import {DocumentSettings} from '../document-settings/DocumentSettings';
+import {DocumentSettings} from '../../view/settings/DocumentSettings';
 
 
 class DocumentSettingsController extends Component {
diff --git a/apps/documenteditor/mobile/src/js/app.js b/apps/documenteditor/mobile/src/js/app.js
index d49dc1e8cc..d2dfca6c8a 100644
--- a/apps/documenteditor/mobile/src/js/app.js
+++ b/apps/documenteditor/mobile/src/js/app.js
@@ -20,7 +20,7 @@ import '../css/icons.css';
 import '../css/app.less';
 
 // Import App Component
-import App from '../components/app.jsx';
+import App from '../view/app';
 import { I18nextProvider } from 'react-i18next';
 import i18n from './i18n';
 
diff --git a/apps/documenteditor/mobile/src/pages/home.jsx b/apps/documenteditor/mobile/src/pages/home.jsx
index 9c8d2f5bf9..25354a7174 100644
--- a/apps/documenteditor/mobile/src/pages/home.jsx
+++ b/apps/documenteditor/mobile/src/pages/home.jsx
@@ -1,8 +1,8 @@
 import React, { Component } from 'react';
 import { Page, View, Navbar, NavLeft, NavRight, Link, Icon } from 'framework7-react';
 
-import EditOptions from '../components/edit/Edit.jsx';
-import Settings from '../components/settings/Settings.jsx';
+import EditOptions from '../view/edit/Edit';
+import Settings from '../view/settings/Settings';
 import CollaborationView from '../../../../common/mobile/lib/view/Collaboration.jsx'
 
 export default class Home extends Component {
diff --git a/apps/documenteditor/mobile/src/components/app.jsx b/apps/documenteditor/mobile/src/view/app.jsx
similarity index 100%
rename from apps/documenteditor/mobile/src/components/app.jsx
rename to apps/documenteditor/mobile/src/view/app.jsx
diff --git a/apps/documenteditor/mobile/src/components/edit/Edit.jsx b/apps/documenteditor/mobile/src/view/edit/Edit.jsx
similarity index 93%
rename from apps/documenteditor/mobile/src/components/edit/Edit.jsx
rename to apps/documenteditor/mobile/src/view/edit/Edit.jsx
index 08e22e8056..c4b383947b 100644
--- a/apps/documenteditor/mobile/src/components/edit/Edit.jsx
+++ b/apps/documenteditor/mobile/src/view/edit/Edit.jsx
@@ -5,14 +5,14 @@ import { f7 } from 'framework7-react';
 import { useTranslation } from 'react-i18next';
 import {Device} from '../../../../../common/mobile/utils/device';
 
-import EditTextController from "./controller/EditText";
-import EditParagraphController from "./controller/EditParagraph";
-import EditShapeController from "./controller/EditShape";
-import EditImageController from "./controller/EditImage";
-import EditTableController from "./controller/EditTable";
-import EditChartController from "./controller/EditChart";
-import EditHyperlinkController from "./controller/EditHyperlink";
-import EditHeaderController from "./controller/EditHeader";
+import EditTextController from "../../controller/edit/EditText";
+import EditParagraphController from "../../controller/edit/EditParagraph";
+import EditShapeController from "../../controller/edit/EditShape";
+import EditImageController from "../../controller/edit/EditImage";
+import EditTableController from "../../controller/edit/EditTable";
+import EditChartController from "../../controller/edit/EditChart";
+import EditHyperlinkController from "../../controller/edit/EditHyperlink";
+import EditHeaderController from "../../controller/edit/EditHeader";
 
 import {PageAdditionalFormatting, PageBullets, PageFonts, PageLineSpacing, PageNumbers} from "./EditText";
 import {PageAdvancedSettings} from "./EditParagraph";
diff --git a/apps/documenteditor/mobile/src/components/edit/EditChart.jsx b/apps/documenteditor/mobile/src/view/edit/EditChart.jsx
similarity index 100%
rename from apps/documenteditor/mobile/src/components/edit/EditChart.jsx
rename to apps/documenteditor/mobile/src/view/edit/EditChart.jsx
diff --git a/apps/documenteditor/mobile/src/components/edit/EditHeader.jsx b/apps/documenteditor/mobile/src/view/edit/EditHeader.jsx
similarity index 100%
rename from apps/documenteditor/mobile/src/components/edit/EditHeader.jsx
rename to apps/documenteditor/mobile/src/view/edit/EditHeader.jsx
diff --git a/apps/documenteditor/mobile/src/components/edit/EditHyperlink.jsx b/apps/documenteditor/mobile/src/view/edit/EditHyperlink.jsx
similarity index 100%
rename from apps/documenteditor/mobile/src/components/edit/EditHyperlink.jsx
rename to apps/documenteditor/mobile/src/view/edit/EditHyperlink.jsx
diff --git a/apps/documenteditor/mobile/src/components/edit/EditImage.jsx b/apps/documenteditor/mobile/src/view/edit/EditImage.jsx
similarity index 100%
rename from apps/documenteditor/mobile/src/components/edit/EditImage.jsx
rename to apps/documenteditor/mobile/src/view/edit/EditImage.jsx
diff --git a/apps/documenteditor/mobile/src/components/edit/EditParagraph.jsx b/apps/documenteditor/mobile/src/view/edit/EditParagraph.jsx
similarity index 100%
rename from apps/documenteditor/mobile/src/components/edit/EditParagraph.jsx
rename to apps/documenteditor/mobile/src/view/edit/EditParagraph.jsx
diff --git a/apps/documenteditor/mobile/src/components/edit/EditShape.jsx b/apps/documenteditor/mobile/src/view/edit/EditShape.jsx
similarity index 100%
rename from apps/documenteditor/mobile/src/components/edit/EditShape.jsx
rename to apps/documenteditor/mobile/src/view/edit/EditShape.jsx
diff --git a/apps/documenteditor/mobile/src/components/edit/EditTable.jsx b/apps/documenteditor/mobile/src/view/edit/EditTable.jsx
similarity index 100%
rename from apps/documenteditor/mobile/src/components/edit/EditTable.jsx
rename to apps/documenteditor/mobile/src/view/edit/EditTable.jsx
diff --git a/apps/documenteditor/mobile/src/components/edit/EditText.jsx b/apps/documenteditor/mobile/src/view/edit/EditText.jsx
similarity index 100%
rename from apps/documenteditor/mobile/src/components/edit/EditText.jsx
rename to apps/documenteditor/mobile/src/view/edit/EditText.jsx
diff --git a/apps/documenteditor/mobile/src/components/settings/document-settings/DocumentSettings.jsx b/apps/documenteditor/mobile/src/view/settings/DocumentSettings.jsx
similarity index 100%
rename from apps/documenteditor/mobile/src/components/settings/document-settings/DocumentSettings.jsx
rename to apps/documenteditor/mobile/src/view/settings/DocumentSettings.jsx
diff --git a/apps/documenteditor/mobile/src/components/settings/Settings.jsx b/apps/documenteditor/mobile/src/view/settings/Settings.jsx
similarity index 95%
rename from apps/documenteditor/mobile/src/components/settings/Settings.jsx
rename to apps/documenteditor/mobile/src/view/settings/Settings.jsx
index 93eb1d0c61..5fb54ac8b6 100644
--- a/apps/documenteditor/mobile/src/components/settings/Settings.jsx
+++ b/apps/documenteditor/mobile/src/view/settings/Settings.jsx
@@ -2,10 +2,10 @@ import React, {Component, useEffect} from 'react';
 import {View,Page,Navbar,NavRight,Link,Popup,Popover,Icon,ListItem,List} from 'framework7-react';
 import { withTranslation } from 'react-i18next';
 import {f7} from 'framework7-react';
-import {Device} from '../../../../../common/mobile/utils/device'
+import {Device} from '../../../../../common/mobile/utils/device';
 
-import DocumentSettingsController from "../settings/controller/DocumentSettings";
-import { DocumentFormats, DocumentMargins } from "../settings/document-settings/DocumentSettings";
+import DocumentSettingsController from "../../controller/settings/DocumentSettings";
+import { DocumentFormats, DocumentMargins } from "./DocumentSettings";
 
 const routes = [
     {