diff --git a/server/zanata-frontend/.gitignore b/server/zanata-frontend/.gitignore
index d295aaf9f57..da4618d648f 100644
--- a/server/zanata-frontend/.gitignore
+++ b/server/zanata-frontend/.gitignore
@@ -11,12 +11,12 @@ dist/
coverage/
# generated css
-src/frontend/app/styles/atomic.css
+src/app/styles/atomic.css
# generated frontend icons
-src/frontend/app/components/Icon/list.js
-src/frontend/app/components/Icons/icons.svg
-src/frontend/app/components/Icons/index.jsx
+src/app/components/Icon/list.js
+src/app/components/Icons/icons.svg
+src/app/components/Icons/index.jsx
# files generated by `make storybook-static`, should never be checked in
storybook-static
diff --git a/server/zanata-frontend/README.md b/server/zanata-frontend/README.md
index 603fb826312..d66c7dccfd7 100644
--- a/server/zanata-frontend/README.md
+++ b/server/zanata-frontend/README.md
@@ -3,4 +3,4 @@
Zanata javascript module for:
- [Zanata alpha editor](./src/editor/README.md)
-- [Explore page, User profile page, Glossary page, and side menu bar](./src/frontend/README.md)
+- [Explore page, User profile page, Glossary page, and side menu bar](./src/README.md)
diff --git a/server/zanata-frontend/pom.xml b/server/zanata-frontend/pom.xml
index 9daa060e9b4..f5b948993e4 100644
--- a/server/zanata-frontend/pom.xml
+++ b/server/zanata-frontend/pom.xml
@@ -31,7 +31,7 @@
UTF-8
- ${project.basedir}/src/frontend
+ ${project.basedir}/src
draft
@@ -128,7 +128,7 @@
${bundle.dest}
- src/frontend/dist
+ src/dist
editor.min.js
editor.css
editor.css.map
diff --git a/server/zanata-frontend/src/frontend/.babelrc b/server/zanata-frontend/src/.babelrc
similarity index 100%
rename from server/zanata-frontend/src/frontend/.babelrc
rename to server/zanata-frontend/src/.babelrc
diff --git a/server/zanata-frontend/src/frontend/.csscomb.json b/server/zanata-frontend/src/.csscomb.json
similarity index 100%
rename from server/zanata-frontend/src/frontend/.csscomb.json
rename to server/zanata-frontend/src/.csscomb.json
diff --git a/server/zanata-frontend/src/frontend/.eslintignore b/server/zanata-frontend/src/.eslintignore
similarity index 100%
rename from server/zanata-frontend/src/frontend/.eslintignore
rename to server/zanata-frontend/src/.eslintignore
diff --git a/server/zanata-frontend/src/frontend/.eslintrc b/server/zanata-frontend/src/.eslintrc
similarity index 100%
rename from server/zanata-frontend/src/frontend/.eslintrc
rename to server/zanata-frontend/src/.eslintrc
diff --git a/server/zanata-frontend/src/frontend/.flowconfig b/server/zanata-frontend/src/.flowconfig
similarity index 100%
rename from server/zanata-frontend/src/frontend/.flowconfig
rename to server/zanata-frontend/src/.flowconfig
diff --git a/server/zanata-frontend/src/frontend/.jsbeautifyrc b/server/zanata-frontend/src/.jsbeautifyrc
similarity index 100%
rename from server/zanata-frontend/src/frontend/.jsbeautifyrc
rename to server/zanata-frontend/src/.jsbeautifyrc
diff --git a/server/zanata-frontend/src/frontend/.jshintrc b/server/zanata-frontend/src/.jshintrc
similarity index 100%
rename from server/zanata-frontend/src/frontend/.jshintrc
rename to server/zanata-frontend/src/.jshintrc
diff --git a/server/zanata-frontend/src/frontend/.nvmrc b/server/zanata-frontend/src/.nvmrc
similarity index 100%
rename from server/zanata-frontend/src/frontend/.nvmrc
rename to server/zanata-frontend/src/.nvmrc
diff --git a/server/zanata-frontend/src/frontend/.storybook-editor/README.md b/server/zanata-frontend/src/.storybook-editor/README.md
similarity index 100%
rename from server/zanata-frontend/src/frontend/.storybook-editor/README.md
rename to server/zanata-frontend/src/.storybook-editor/README.md
diff --git a/server/zanata-frontend/src/frontend/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap b/server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
similarity index 100%
rename from server/zanata-frontend/src/frontend/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
rename to server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
diff --git a/server/zanata-frontend/src/frontend/.storybook-editor/addons.js b/server/zanata-frontend/src/.storybook-editor/addons.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/.storybook-editor/addons.js
rename to server/zanata-frontend/src/.storybook-editor/addons.js
diff --git a/server/zanata-frontend/src/frontend/.storybook-editor/config.js b/server/zanata-frontend/src/.storybook-editor/config.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/.storybook-editor/config.js
rename to server/zanata-frontend/src/.storybook-editor/config.js
diff --git a/server/zanata-frontend/src/frontend/.storybook-editor/storybook.css b/server/zanata-frontend/src/.storybook-editor/storybook.css
similarity index 100%
rename from server/zanata-frontend/src/frontend/.storybook-editor/storybook.css
rename to server/zanata-frontend/src/.storybook-editor/storybook.css
diff --git a/server/zanata-frontend/src/frontend/.storybook-editor/storyshots-editor.test.js b/server/zanata-frontend/src/.storybook-editor/storyshots-editor.test.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/.storybook-editor/storyshots-editor.test.js
rename to server/zanata-frontend/src/.storybook-editor/storyshots-editor.test.js
diff --git a/server/zanata-frontend/src/frontend/.storybook-editor/storyshots-util.js b/server/zanata-frontend/src/.storybook-editor/storyshots-util.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/.storybook-editor/storyshots-util.js
rename to server/zanata-frontend/src/.storybook-editor/storyshots-util.js
diff --git a/server/zanata-frontend/src/frontend/.storybook-editor/webpack.config.js b/server/zanata-frontend/src/.storybook-editor/webpack.config.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/.storybook-editor/webpack.config.js
rename to server/zanata-frontend/src/.storybook-editor/webpack.config.js
diff --git a/server/zanata-frontend/src/frontend/.storybook-frontend/README.md b/server/zanata-frontend/src/.storybook-frontend/README.md
similarity index 100%
rename from server/zanata-frontend/src/frontend/.storybook-frontend/README.md
rename to server/zanata-frontend/src/.storybook-frontend/README.md
diff --git a/server/zanata-frontend/src/frontend/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap b/server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
similarity index 100%
rename from server/zanata-frontend/src/frontend/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
rename to server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
diff --git a/server/zanata-frontend/src/frontend/.storybook-frontend/addons.js b/server/zanata-frontend/src/.storybook-frontend/addons.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/.storybook-frontend/addons.js
rename to server/zanata-frontend/src/.storybook-frontend/addons.js
diff --git a/server/zanata-frontend/src/frontend/.storybook-frontend/config.js b/server/zanata-frontend/src/.storybook-frontend/config.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/.storybook-frontend/config.js
rename to server/zanata-frontend/src/.storybook-frontend/config.js
diff --git a/server/zanata-frontend/src/frontend/.storybook-frontend/storybook.less b/server/zanata-frontend/src/.storybook-frontend/storybook.less
similarity index 100%
rename from server/zanata-frontend/src/frontend/.storybook-frontend/storybook.less
rename to server/zanata-frontend/src/.storybook-frontend/storybook.less
diff --git a/server/zanata-frontend/src/frontend/.storybook-frontend/storyshots-frontend.test.js b/server/zanata-frontend/src/.storybook-frontend/storyshots-frontend.test.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/.storybook-frontend/storyshots-frontend.test.js
rename to server/zanata-frontend/src/.storybook-frontend/storyshots-frontend.test.js
diff --git a/server/zanata-frontend/src/frontend/.storybook-frontend/webpack.config.js b/server/zanata-frontend/src/.storybook-frontend/webpack.config.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/.storybook-frontend/webpack.config.js
rename to server/zanata-frontend/src/.storybook-frontend/webpack.config.js
diff --git a/server/zanata-frontend/src/frontend/.stylelintrc b/server/zanata-frontend/src/.stylelintrc
similarity index 100%
rename from server/zanata-frontend/src/frontend/.stylelintrc
rename to server/zanata-frontend/src/.stylelintrc
diff --git a/server/zanata-frontend/src/frontend/.yarn-version b/server/zanata-frontend/src/.yarn-version
similarity index 100%
rename from server/zanata-frontend/src/frontend/.yarn-version
rename to server/zanata-frontend/src/.yarn-version
diff --git a/server/zanata-frontend/src/frontend/.yarnrc b/server/zanata-frontend/src/.yarnrc
similarity index 100%
rename from server/zanata-frontend/src/frontend/.yarnrc
rename to server/zanata-frontend/src/.yarnrc
diff --git a/server/zanata-frontend/src/frontend/README.md b/server/zanata-frontend/src/README.md
similarity index 100%
rename from server/zanata-frontend/src/frontend/README.md
rename to server/zanata-frontend/src/README.md
diff --git a/server/zanata-frontend/src/frontend/__mocks__/cssMock.js b/server/zanata-frontend/src/__mocks__/cssMock.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/__mocks__/cssMock.js
rename to server/zanata-frontend/src/__mocks__/cssMock.js
diff --git a/server/zanata-frontend/src/frontend/__mocks__/mockAngularGettext.js b/server/zanata-frontend/src/__mocks__/mockAngularGettext.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/__mocks__/mockAngularGettext.js
rename to server/zanata-frontend/src/__mocks__/mockAngularGettext.js
diff --git a/server/zanata-frontend/src/frontend/app/actions/common-actions.js b/server/zanata-frontend/src/app/actions/common-actions.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/actions/common-actions.js
rename to server/zanata-frontend/src/app/actions/common-actions.js
diff --git a/server/zanata-frontend/src/frontend/app/actions/explore-actions.js b/server/zanata-frontend/src/app/actions/explore-actions.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/actions/explore-actions.js
rename to server/zanata-frontend/src/app/actions/explore-actions.js
diff --git a/server/zanata-frontend/src/frontend/app/actions/glossary-actions.js b/server/zanata-frontend/src/app/actions/glossary-actions.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/actions/glossary-actions.js
rename to server/zanata-frontend/src/app/actions/glossary-actions.js
diff --git a/server/zanata-frontend/src/frontend/app/actions/index.js b/server/zanata-frontend/src/app/actions/index.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/actions/index.js
rename to server/zanata-frontend/src/app/actions/index.js
diff --git a/server/zanata-frontend/src/frontend/app/actions/languages-actions.js b/server/zanata-frontend/src/app/actions/languages-actions.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/actions/languages-actions.js
rename to server/zanata-frontend/src/app/actions/languages-actions.js
diff --git a/server/zanata-frontend/src/frontend/app/actions/profile-actions.js b/server/zanata-frontend/src/app/actions/profile-actions.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/actions/profile-actions.js
rename to server/zanata-frontend/src/app/actions/profile-actions.js
diff --git a/server/zanata-frontend/src/frontend/app/actions/review-actions.js b/server/zanata-frontend/src/app/actions/review-actions.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/actions/review-actions.js
rename to server/zanata-frontend/src/app/actions/review-actions.js
diff --git a/server/zanata-frontend/src/frontend/app/actions/tmx-actions.js b/server/zanata-frontend/src/app/actions/tmx-actions.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/actions/tmx-actions.js
rename to server/zanata-frontend/src/app/actions/tmx-actions.js
diff --git a/server/zanata-frontend/src/frontend/app/actions/version-action-types.js b/server/zanata-frontend/src/app/actions/version-action-types.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/actions/version-action-types.js
rename to server/zanata-frontend/src/app/actions/version-action-types.js
diff --git a/server/zanata-frontend/src/frontend/app/actions/version-actions.js b/server/zanata-frontend/src/app/actions/version-actions.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/actions/version-actions.js
rename to server/zanata-frontend/src/app/actions/version-actions.js
diff --git a/server/zanata-frontend/src/frontend/app/actions/version-actions.test.js b/server/zanata-frontend/src/app/actions/version-actions.test.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/actions/version-actions.test.js
rename to server/zanata-frontend/src/app/actions/version-actions.test.js
diff --git a/server/zanata-frontend/src/frontend/app/components/Alert/Alert.story.js b/server/zanata-frontend/src/app/components/Alert/Alert.story.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Alert/Alert.story.js
rename to server/zanata-frontend/src/app/components/Alert/Alert.story.js
diff --git a/server/zanata-frontend/src/frontend/app/components/Badge/Badge.story.js b/server/zanata-frontend/src/app/components/Badge/Badge.story.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Badge/Badge.story.js
rename to server/zanata-frontend/src/app/components/Badge/Badge.story.js
diff --git a/server/zanata-frontend/src/frontend/app/components/Breadcrumbs/Breadcrumbs.story.js b/server/zanata-frontend/src/app/components/Breadcrumbs/Breadcrumbs.story.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Breadcrumbs/Breadcrumbs.story.js
rename to server/zanata-frontend/src/app/components/Breadcrumbs/Breadcrumbs.story.js
diff --git a/server/zanata-frontend/src/frontend/app/components/Button/Button.story.js b/server/zanata-frontend/src/app/components/Button/Button.story.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Button/Button.story.js
rename to server/zanata-frontend/src/app/components/Button/Button.story.js
diff --git a/server/zanata-frontend/src/frontend/app/components/DraggableVersionPanels/DraggableVersionPanels.test.js b/server/zanata-frontend/src/app/components/DraggableVersionPanels/DraggableVersionPanels.test.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/DraggableVersionPanels/DraggableVersionPanels.test.js
rename to server/zanata-frontend/src/app/components/DraggableVersionPanels/DraggableVersionPanels.test.js
diff --git a/server/zanata-frontend/src/frontend/app/components/DraggableVersionPanels/index.js b/server/zanata-frontend/src/app/components/DraggableVersionPanels/index.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/DraggableVersionPanels/index.js
rename to server/zanata-frontend/src/app/components/DraggableVersionPanels/index.js
diff --git a/server/zanata-frontend/src/frontend/app/components/Dropdown/Dropdown.story.js b/server/zanata-frontend/src/app/components/Dropdown/Dropdown.story.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Dropdown/Dropdown.story.js
rename to server/zanata-frontend/src/app/components/Dropdown/Dropdown.story.js
diff --git a/server/zanata-frontend/src/frontend/app/components/EditableText/EditableText.story.js b/server/zanata-frontend/src/app/components/EditableText/EditableText.story.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/EditableText/EditableText.story.js
rename to server/zanata-frontend/src/app/components/EditableText/EditableText.story.js
diff --git a/server/zanata-frontend/src/frontend/app/components/EditableText/index.js b/server/zanata-frontend/src/app/components/EditableText/index.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/EditableText/index.js
rename to server/zanata-frontend/src/app/components/EditableText/index.js
diff --git a/server/zanata-frontend/src/frontend/app/components/Form/Form.story.js b/server/zanata-frontend/src/app/components/Form/Form.story.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Form/Form.story.js
rename to server/zanata-frontend/src/app/components/Form/Form.story.js
diff --git a/server/zanata-frontend/src/frontend/app/components/Icon/Icon.story.js b/server/zanata-frontend/src/app/components/Icon/Icon.story.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Icon/Icon.story.js
rename to server/zanata-frontend/src/app/components/Icon/Icon.story.js
diff --git a/server/zanata-frontend/src/frontend/app/components/Icon/index.jsx b/server/zanata-frontend/src/app/components/Icon/index.jsx
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Icon/index.jsx
rename to server/zanata-frontend/src/app/components/Icon/index.jsx
diff --git a/server/zanata-frontend/src/frontend/app/components/Icons/Readme.md b/server/zanata-frontend/src/app/components/Icons/Readme.md
similarity index 89%
rename from server/zanata-frontend/src/frontend/app/components/Icons/Readme.md
rename to server/zanata-frontend/src/app/components/Icons/Readme.md
index f03fd2fe537..c1cfc554bb5 100644
--- a/server/zanata-frontend/src/frontend/app/components/Icons/Readme.md
+++ b/server/zanata-frontend/src/app/components/Icons/Readme.md
@@ -7,7 +7,7 @@ This is only needed once on the page to add all the icons to the page.
If you watch build is complaining
```
-Module not found: Error: Can't resolve './Icons' in 'platform/server/zanata-frontend/src/frontend/app/components'
+Module not found: Error: Can't resolve './Icons' in 'platform/server/zanata-frontend/src/app/components'
```
You need to run ```make draft``` first to generate the index.jsx file and then run the normal watch task.
diff --git a/server/zanata-frontend/src/frontend/app/components/Icons/index.jsx.src b/server/zanata-frontend/src/app/components/Icons/index.jsx.src
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Icons/index.jsx.src
rename to server/zanata-frontend/src/app/components/Icons/index.jsx.src
diff --git a/server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-admin.svg b/server/zanata-frontend/src/app/components/Icons/svgs/Icon-admin.svg
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-admin.svg
rename to server/zanata-frontend/src/app/components/Icons/svgs/Icon-admin.svg
diff --git a/server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-all.svg b/server/zanata-frontend/src/app/components/Icons/svgs/Icon-all.svg
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-all.svg
rename to server/zanata-frontend/src/app/components/Icons/svgs/Icon-all.svg
diff --git a/server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-assign.svg b/server/zanata-frontend/src/app/components/Icons/svgs/Icon-assign.svg
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-assign.svg
rename to server/zanata-frontend/src/app/components/Icons/svgs/Icon-assign.svg
diff --git a/server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-attach.svg b/server/zanata-frontend/src/app/components/Icons/svgs/Icon-attach.svg
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-attach.svg
rename to server/zanata-frontend/src/app/components/Icons/svgs/Icon-attach.svg
diff --git a/server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-block.svg b/server/zanata-frontend/src/app/components/Icons/svgs/Icon-block.svg
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-block.svg
rename to server/zanata-frontend/src/app/components/Icons/svgs/Icon-block.svg
diff --git a/server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-chevron-down-double.svg b/server/zanata-frontend/src/app/components/Icons/svgs/Icon-chevron-down-double.svg
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-chevron-down-double.svg
rename to server/zanata-frontend/src/app/components/Icons/svgs/Icon-chevron-down-double.svg
diff --git a/server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-chevron-down.svg b/server/zanata-frontend/src/app/components/Icons/svgs/Icon-chevron-down.svg
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-chevron-down.svg
rename to server/zanata-frontend/src/app/components/Icons/svgs/Icon-chevron-down.svg
diff --git a/server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-chevron-left.svg b/server/zanata-frontend/src/app/components/Icons/svgs/Icon-chevron-left.svg
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-chevron-left.svg
rename to server/zanata-frontend/src/app/components/Icons/svgs/Icon-chevron-left.svg
diff --git a/server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-chevron-right.svg b/server/zanata-frontend/src/app/components/Icons/svgs/Icon-chevron-right.svg
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-chevron-right.svg
rename to server/zanata-frontend/src/app/components/Icons/svgs/Icon-chevron-right.svg
diff --git a/server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-chevron-up-double.svg b/server/zanata-frontend/src/app/components/Icons/svgs/Icon-chevron-up-double.svg
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-chevron-up-double.svg
rename to server/zanata-frontend/src/app/components/Icons/svgs/Icon-chevron-up-double.svg
diff --git a/server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-chevron-up.svg b/server/zanata-frontend/src/app/components/Icons/svgs/Icon-chevron-up.svg
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-chevron-up.svg
rename to server/zanata-frontend/src/app/components/Icons/svgs/Icon-chevron-up.svg
diff --git a/server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-circle.svg b/server/zanata-frontend/src/app/components/Icons/svgs/Icon-circle.svg
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-circle.svg
rename to server/zanata-frontend/src/app/components/Icons/svgs/Icon-circle.svg
diff --git a/server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-clock.svg b/server/zanata-frontend/src/app/components/Icons/svgs/Icon-clock.svg
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-clock.svg
rename to server/zanata-frontend/src/app/components/Icons/svgs/Icon-clock.svg
diff --git a/server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-code.svg b/server/zanata-frontend/src/app/components/Icons/svgs/Icon-code.svg
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-code.svg
rename to server/zanata-frontend/src/app/components/Icons/svgs/Icon-code.svg
diff --git a/server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-comment.svg b/server/zanata-frontend/src/app/components/Icons/svgs/Icon-comment.svg
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-comment.svg
rename to server/zanata-frontend/src/app/components/Icons/svgs/Icon-comment.svg
diff --git a/server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-copy.svg b/server/zanata-frontend/src/app/components/Icons/svgs/Icon-copy.svg
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-copy.svg
rename to server/zanata-frontend/src/app/components/Icons/svgs/Icon-copy.svg
diff --git a/server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-cross-circle.svg b/server/zanata-frontend/src/app/components/Icons/svgs/Icon-cross-circle.svg
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-cross-circle.svg
rename to server/zanata-frontend/src/app/components/Icons/svgs/Icon-cross-circle.svg
diff --git a/server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-cross.svg b/server/zanata-frontend/src/app/components/Icons/svgs/Icon-cross.svg
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-cross.svg
rename to server/zanata-frontend/src/app/components/Icons/svgs/Icon-cross.svg
diff --git a/server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-dashboard.svg b/server/zanata-frontend/src/app/components/Icons/svgs/Icon-dashboard.svg
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-dashboard.svg
rename to server/zanata-frontend/src/app/components/Icons/svgs/Icon-dashboard.svg
diff --git a/server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-document.svg b/server/zanata-frontend/src/app/components/Icons/svgs/Icon-document.svg
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-document.svg
rename to server/zanata-frontend/src/app/components/Icons/svgs/Icon-document.svg
diff --git a/server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-dot.svg b/server/zanata-frontend/src/app/components/Icons/svgs/Icon-dot.svg
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-dot.svg
rename to server/zanata-frontend/src/app/components/Icons/svgs/Icon-dot.svg
diff --git a/server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-download.svg b/server/zanata-frontend/src/app/components/Icons/svgs/Icon-download.svg
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-download.svg
rename to server/zanata-frontend/src/app/components/Icons/svgs/Icon-download.svg
diff --git a/server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-edit.svg b/server/zanata-frontend/src/app/components/Icons/svgs/Icon-edit.svg
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-edit.svg
rename to server/zanata-frontend/src/app/components/Icons/svgs/Icon-edit.svg
diff --git a/server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-ellipsis.svg b/server/zanata-frontend/src/app/components/Icons/svgs/Icon-ellipsis.svg
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-ellipsis.svg
rename to server/zanata-frontend/src/app/components/Icons/svgs/Icon-ellipsis.svg
diff --git a/server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-export.svg b/server/zanata-frontend/src/app/components/Icons/svgs/Icon-export.svg
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-export.svg
rename to server/zanata-frontend/src/app/components/Icons/svgs/Icon-export.svg
diff --git a/server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-external-link.svg b/server/zanata-frontend/src/app/components/Icons/svgs/Icon-external-link.svg
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-external-link.svg
rename to server/zanata-frontend/src/app/components/Icons/svgs/Icon-external-link.svg
diff --git a/server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-filter.svg b/server/zanata-frontend/src/app/components/Icons/svgs/Icon-filter.svg
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-filter.svg
rename to server/zanata-frontend/src/app/components/Icons/svgs/Icon-filter.svg
diff --git a/server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-folder.svg b/server/zanata-frontend/src/app/components/Icons/svgs/Icon-folder.svg
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-folder.svg
rename to server/zanata-frontend/src/app/components/Icons/svgs/Icon-folder.svg
diff --git a/server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-glossary.svg b/server/zanata-frontend/src/app/components/Icons/svgs/Icon-glossary.svg
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-glossary.svg
rename to server/zanata-frontend/src/app/components/Icons/svgs/Icon-glossary.svg
diff --git a/server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-help.svg b/server/zanata-frontend/src/app/components/Icons/svgs/Icon-help.svg
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-help.svg
rename to server/zanata-frontend/src/app/components/Icons/svgs/Icon-help.svg
diff --git a/server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-history.svg b/server/zanata-frontend/src/app/components/Icons/svgs/Icon-history.svg
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-history.svg
rename to server/zanata-frontend/src/app/components/Icons/svgs/Icon-history.svg
diff --git a/server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-import.svg b/server/zanata-frontend/src/app/components/Icons/svgs/Icon-import.svg
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-import.svg
rename to server/zanata-frontend/src/app/components/Icons/svgs/Icon-import.svg
diff --git a/server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-inbox.svg b/server/zanata-frontend/src/app/components/Icons/svgs/Icon-inbox.svg
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-inbox.svg
rename to server/zanata-frontend/src/app/components/Icons/svgs/Icon-inbox.svg
diff --git a/server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-info.svg b/server/zanata-frontend/src/app/components/Icons/svgs/Icon-info.svg
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-info.svg
rename to server/zanata-frontend/src/app/components/Icons/svgs/Icon-info.svg
diff --git a/server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-keyboard.svg b/server/zanata-frontend/src/app/components/Icons/svgs/Icon-keyboard.svg
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-keyboard.svg
rename to server/zanata-frontend/src/app/components/Icons/svgs/Icon-keyboard.svg
diff --git a/server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-language.svg b/server/zanata-frontend/src/app/components/Icons/svgs/Icon-language.svg
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-language.svg
rename to server/zanata-frontend/src/app/components/Icons/svgs/Icon-language.svg
diff --git a/server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-link.svg b/server/zanata-frontend/src/app/components/Icons/svgs/Icon-link.svg
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-link.svg
rename to server/zanata-frontend/src/app/components/Icons/svgs/Icon-link.svg
diff --git a/server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-location.svg b/server/zanata-frontend/src/app/components/Icons/svgs/Icon-location.svg
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-location.svg
rename to server/zanata-frontend/src/app/components/Icons/svgs/Icon-location.svg
diff --git a/server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-locked.svg b/server/zanata-frontend/src/app/components/Icons/svgs/Icon-locked.svg
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-locked.svg
rename to server/zanata-frontend/src/app/components/Icons/svgs/Icon-locked.svg
diff --git a/server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-logout.svg b/server/zanata-frontend/src/app/components/Icons/svgs/Icon-logout.svg
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-logout.svg
rename to server/zanata-frontend/src/app/components/Icons/svgs/Icon-logout.svg
diff --git a/server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-mail.svg b/server/zanata-frontend/src/app/components/Icons/svgs/Icon-mail.svg
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-mail.svg
rename to server/zanata-frontend/src/app/components/Icons/svgs/Icon-mail.svg
diff --git a/server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-maintain.svg b/server/zanata-frontend/src/app/components/Icons/svgs/Icon-maintain.svg
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-maintain.svg
rename to server/zanata-frontend/src/app/components/Icons/svgs/Icon-maintain.svg
diff --git a/server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-menu.svg b/server/zanata-frontend/src/app/components/Icons/svgs/Icon-menu.svg
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-menu.svg
rename to server/zanata-frontend/src/app/components/Icons/svgs/Icon-menu.svg
diff --git a/server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-minus.svg b/server/zanata-frontend/src/app/components/Icons/svgs/Icon-minus.svg
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-minus.svg
rename to server/zanata-frontend/src/app/components/Icons/svgs/Icon-minus.svg
diff --git a/server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-next.svg b/server/zanata-frontend/src/app/components/Icons/svgs/Icon-next.svg
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-next.svg
rename to server/zanata-frontend/src/app/components/Icons/svgs/Icon-next.svg
diff --git a/server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-notification.svg b/server/zanata-frontend/src/app/components/Icons/svgs/Icon-notification.svg
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-notification.svg
rename to server/zanata-frontend/src/app/components/Icons/svgs/Icon-notification.svg
diff --git a/server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-piestats.svg b/server/zanata-frontend/src/app/components/Icons/svgs/Icon-piestats.svg
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-piestats.svg
rename to server/zanata-frontend/src/app/components/Icons/svgs/Icon-piestats.svg
diff --git a/server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-plus.svg b/server/zanata-frontend/src/app/components/Icons/svgs/Icon-plus.svg
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-plus.svg
rename to server/zanata-frontend/src/app/components/Icons/svgs/Icon-plus.svg
diff --git a/server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-previous.svg b/server/zanata-frontend/src/app/components/Icons/svgs/Icon-previous.svg
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-previous.svg
rename to server/zanata-frontend/src/app/components/Icons/svgs/Icon-previous.svg
diff --git a/server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-project.svg b/server/zanata-frontend/src/app/components/Icons/svgs/Icon-project.svg
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-project.svg
rename to server/zanata-frontend/src/app/components/Icons/svgs/Icon-project.svg
diff --git a/server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-refresh.svg b/server/zanata-frontend/src/app/components/Icons/svgs/Icon-refresh.svg
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-refresh.svg
rename to server/zanata-frontend/src/app/components/Icons/svgs/Icon-refresh.svg
diff --git a/server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-review.svg b/server/zanata-frontend/src/app/components/Icons/svgs/Icon-review.svg
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-review.svg
rename to server/zanata-frontend/src/app/components/Icons/svgs/Icon-review.svg
diff --git a/server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-search.svg b/server/zanata-frontend/src/app/components/Icons/svgs/Icon-search.svg
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-search.svg
rename to server/zanata-frontend/src/app/components/Icons/svgs/Icon-search.svg
diff --git a/server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-servmon.svg b/server/zanata-frontend/src/app/components/Icons/svgs/Icon-servmon.svg
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-servmon.svg
rename to server/zanata-frontend/src/app/components/Icons/svgs/Icon-servmon.svg
diff --git a/server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-settings.svg b/server/zanata-frontend/src/app/components/Icons/svgs/Icon-settings.svg
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-settings.svg
rename to server/zanata-frontend/src/app/components/Icons/svgs/Icon-settings.svg
diff --git a/server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-star-outline.svg b/server/zanata-frontend/src/app/components/Icons/svgs/Icon-star-outline.svg
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-star-outline.svg
rename to server/zanata-frontend/src/app/components/Icons/svgs/Icon-star-outline.svg
diff --git a/server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-star.svg b/server/zanata-frontend/src/app/components/Icons/svgs/Icon-star.svg
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-star.svg
rename to server/zanata-frontend/src/app/components/Icons/svgs/Icon-star.svg
diff --git a/server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-statistics.svg b/server/zanata-frontend/src/app/components/Icons/svgs/Icon-statistics.svg
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-statistics.svg
rename to server/zanata-frontend/src/app/components/Icons/svgs/Icon-statistics.svg
diff --git a/server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-suggestions.svg b/server/zanata-frontend/src/app/components/Icons/svgs/Icon-suggestions.svg
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-suggestions.svg
rename to server/zanata-frontend/src/app/components/Icons/svgs/Icon-suggestions.svg
diff --git a/server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-tick-circle.svg b/server/zanata-frontend/src/app/components/Icons/svgs/Icon-tick-circle.svg
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-tick-circle.svg
rename to server/zanata-frontend/src/app/components/Icons/svgs/Icon-tick-circle.svg
diff --git a/server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-tick.svg b/server/zanata-frontend/src/app/components/Icons/svgs/Icon-tick.svg
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-tick.svg
rename to server/zanata-frontend/src/app/components/Icons/svgs/Icon-tick.svg
diff --git a/server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-tm.svg b/server/zanata-frontend/src/app/components/Icons/svgs/Icon-tm.svg
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-tm.svg
rename to server/zanata-frontend/src/app/components/Icons/svgs/Icon-tm.svg
diff --git a/server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-translate.svg b/server/zanata-frontend/src/app/components/Icons/svgs/Icon-translate.svg
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-translate.svg
rename to server/zanata-frontend/src/app/components/Icons/svgs/Icon-translate.svg
diff --git a/server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-trash.svg b/server/zanata-frontend/src/app/components/Icons/svgs/Icon-trash.svg
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-trash.svg
rename to server/zanata-frontend/src/app/components/Icons/svgs/Icon-trash.svg
diff --git a/server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-undo.svg b/server/zanata-frontend/src/app/components/Icons/svgs/Icon-undo.svg
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-undo.svg
rename to server/zanata-frontend/src/app/components/Icons/svgs/Icon-undo.svg
diff --git a/server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-unlocked.svg b/server/zanata-frontend/src/app/components/Icons/svgs/Icon-unlocked.svg
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-unlocked.svg
rename to server/zanata-frontend/src/app/components/Icons/svgs/Icon-unlocked.svg
diff --git a/server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-upload.svg b/server/zanata-frontend/src/app/components/Icons/svgs/Icon-upload.svg
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-upload.svg
rename to server/zanata-frontend/src/app/components/Icons/svgs/Icon-upload.svg
diff --git a/server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-user.svg b/server/zanata-frontend/src/app/components/Icons/svgs/Icon-user.svg
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-user.svg
rename to server/zanata-frontend/src/app/components/Icons/svgs/Icon-user.svg
diff --git a/server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-users.svg b/server/zanata-frontend/src/app/components/Icons/svgs/Icon-users.svg
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-users.svg
rename to server/zanata-frontend/src/app/components/Icons/svgs/Icon-users.svg
diff --git a/server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-version.svg b/server/zanata-frontend/src/app/components/Icons/svgs/Icon-version.svg
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-version.svg
rename to server/zanata-frontend/src/app/components/Icons/svgs/Icon-version.svg
diff --git a/server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-warning.svg b/server/zanata-frontend/src/app/components/Icons/svgs/Icon-warning.svg
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-warning.svg
rename to server/zanata-frontend/src/app/components/Icons/svgs/Icon-warning.svg
diff --git a/server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-zanata.svg b/server/zanata-frontend/src/app/components/Icons/svgs/Icon-zanata.svg
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Icons/svgs/Icon-zanata.svg
rename to server/zanata-frontend/src/app/components/Icons/svgs/Icon-zanata.svg
diff --git a/server/zanata-frontend/src/frontend/app/components/Label/Label.story.js b/server/zanata-frontend/src/app/components/Label/Label.story.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Label/Label.story.js
rename to server/zanata-frontend/src/app/components/Label/Label.story.js
diff --git a/server/zanata-frontend/src/frontend/app/components/Link/Link.story.js b/server/zanata-frontend/src/app/components/Link/Link.story.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Link/Link.story.js
rename to server/zanata-frontend/src/app/components/Link/Link.story.js
diff --git a/server/zanata-frontend/src/frontend/app/components/Link/index.js b/server/zanata-frontend/src/app/components/Link/index.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Link/index.js
rename to server/zanata-frontend/src/app/components/Link/index.js
diff --git a/server/zanata-frontend/src/frontend/app/components/List/List.story.js b/server/zanata-frontend/src/app/components/List/List.story.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/List/List.story.js
rename to server/zanata-frontend/src/app/components/List/List.story.js
diff --git a/server/zanata-frontend/src/frontend/app/components/Loader/index.js b/server/zanata-frontend/src/app/components/Loader/index.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Loader/index.js
rename to server/zanata-frontend/src/app/components/Loader/index.js
diff --git a/server/zanata-frontend/src/frontend/app/components/LoaderText/LoaderText.story.js b/server/zanata-frontend/src/app/components/LoaderText/LoaderText.story.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/LoaderText/LoaderText.story.js
rename to server/zanata-frontend/src/app/components/LoaderText/LoaderText.story.js
diff --git a/server/zanata-frontend/src/frontend/app/components/LoaderText/index.js b/server/zanata-frontend/src/app/components/LoaderText/index.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/LoaderText/index.js
rename to server/zanata-frontend/src/app/components/LoaderText/index.js
diff --git a/server/zanata-frontend/src/frontend/app/components/LockIcon/LockIcon.test.js b/server/zanata-frontend/src/app/components/LockIcon/LockIcon.test.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/LockIcon/LockIcon.test.js
rename to server/zanata-frontend/src/app/components/LockIcon/LockIcon.test.js
diff --git a/server/zanata-frontend/src/frontend/app/components/LockIcon/index.js b/server/zanata-frontend/src/app/components/LockIcon/index.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/LockIcon/index.js
rename to server/zanata-frontend/src/app/components/LockIcon/index.js
diff --git a/server/zanata-frontend/src/frontend/app/components/LogoLoader/index.js b/server/zanata-frontend/src/app/components/LogoLoader/index.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/LogoLoader/index.js
rename to server/zanata-frontend/src/app/components/LogoLoader/index.js
diff --git a/server/zanata-frontend/src/frontend/app/components/LogoLoader/index.less b/server/zanata-frontend/src/app/components/LogoLoader/index.less
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/LogoLoader/index.less
rename to server/zanata-frontend/src/app/components/LogoLoader/index.less
diff --git a/server/zanata-frontend/src/frontend/app/components/LogoLoader/logo.svg b/server/zanata-frontend/src/app/components/LogoLoader/logo.svg
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/LogoLoader/logo.svg
rename to server/zanata-frontend/src/app/components/LogoLoader/logo.svg
diff --git a/server/zanata-frontend/src/frontend/app/components/Modal/Modal.story.js b/server/zanata-frontend/src/app/components/Modal/Modal.story.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Modal/Modal.story.js
rename to server/zanata-frontend/src/app/components/Modal/Modal.story.js
diff --git a/server/zanata-frontend/src/frontend/app/components/Modal/ModalBody.jsx b/server/zanata-frontend/src/app/components/Modal/ModalBody.jsx
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Modal/ModalBody.jsx
rename to server/zanata-frontend/src/app/components/Modal/ModalBody.jsx
diff --git a/server/zanata-frontend/src/frontend/app/components/Modal/ModalFooter.jsx b/server/zanata-frontend/src/app/components/Modal/ModalFooter.jsx
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Modal/ModalFooter.jsx
rename to server/zanata-frontend/src/app/components/Modal/ModalFooter.jsx
diff --git a/server/zanata-frontend/src/frontend/app/components/Modal/ModalHeader.jsx b/server/zanata-frontend/src/app/components/Modal/ModalHeader.jsx
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Modal/ModalHeader.jsx
rename to server/zanata-frontend/src/app/components/Modal/ModalHeader.jsx
diff --git a/server/zanata-frontend/src/frontend/app/components/Modal/ModalTitle.jsx b/server/zanata-frontend/src/app/components/Modal/ModalTitle.jsx
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Modal/ModalTitle.jsx
rename to server/zanata-frontend/src/app/components/Modal/ModalTitle.jsx
diff --git a/server/zanata-frontend/src/frontend/app/components/Modal/Readme.md b/server/zanata-frontend/src/app/components/Modal/Readme.md
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Modal/Readme.md
rename to server/zanata-frontend/src/app/components/Modal/Readme.md
diff --git a/server/zanata-frontend/src/frontend/app/components/Modal/index.jsx b/server/zanata-frontend/src/app/components/Modal/index.jsx
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Modal/index.jsx
rename to server/zanata-frontend/src/app/components/Modal/index.jsx
diff --git a/server/zanata-frontend/src/frontend/app/components/Nav/NavIcon.jsx b/server/zanata-frontend/src/app/components/Nav/NavIcon.jsx
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Nav/NavIcon.jsx
rename to server/zanata-frontend/src/app/components/Nav/NavIcon.jsx
diff --git a/server/zanata-frontend/src/frontend/app/components/Nav/NavItem.jsx b/server/zanata-frontend/src/app/components/Nav/NavItem.jsx
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Nav/NavItem.jsx
rename to server/zanata-frontend/src/app/components/Nav/NavItem.jsx
diff --git a/server/zanata-frontend/src/frontend/app/components/Nav/index.jsx b/server/zanata-frontend/src/app/components/Nav/index.jsx
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Nav/index.jsx
rename to server/zanata-frontend/src/app/components/Nav/index.jsx
diff --git a/server/zanata-frontend/src/frontend/app/components/Notification/Notification.story.js b/server/zanata-frontend/src/app/components/Notification/Notification.story.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Notification/Notification.story.js
rename to server/zanata-frontend/src/app/components/Notification/Notification.story.js
diff --git a/server/zanata-frontend/src/frontend/app/components/Notification/component.js b/server/zanata-frontend/src/app/components/Notification/component.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Notification/component.js
rename to server/zanata-frontend/src/app/components/Notification/component.js
diff --git a/server/zanata-frontend/src/frontend/app/components/Notification/index.js b/server/zanata-frontend/src/app/components/Notification/index.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Notification/index.js
rename to server/zanata-frontend/src/app/components/Notification/index.js
diff --git a/server/zanata-frontend/src/frontend/app/components/Pagination/Pagination.story.js b/server/zanata-frontend/src/app/components/Pagination/Pagination.story.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Pagination/Pagination.story.js
rename to server/zanata-frontend/src/app/components/Pagination/Pagination.story.js
diff --git a/server/zanata-frontend/src/frontend/app/components/Panel/Panel.story.js b/server/zanata-frontend/src/app/components/Panel/Panel.story.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Panel/Panel.story.js
rename to server/zanata-frontend/src/app/components/Panel/Panel.story.js
diff --git a/server/zanata-frontend/src/frontend/app/components/ProgressBar/CancellableProgressBar.js b/server/zanata-frontend/src/app/components/ProgressBar/CancellableProgressBar.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/ProgressBar/CancellableProgressBar.js
rename to server/zanata-frontend/src/app/components/ProgressBar/CancellableProgressBar.js
diff --git a/server/zanata-frontend/src/frontend/app/components/ProgressBar/CancellableProgressBar.test.js b/server/zanata-frontend/src/app/components/ProgressBar/CancellableProgressBar.test.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/ProgressBar/CancellableProgressBar.test.js
rename to server/zanata-frontend/src/app/components/ProgressBar/CancellableProgressBar.test.js
diff --git a/server/zanata-frontend/src/frontend/app/components/ProgressBar/ProgressBar.story.js b/server/zanata-frontend/src/app/components/ProgressBar/ProgressBar.story.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/ProgressBar/ProgressBar.story.js
rename to server/zanata-frontend/src/app/components/ProgressBar/ProgressBar.story.js
diff --git a/server/zanata-frontend/src/frontend/app/components/RejectionsForm/RejectionsForm.story.js b/server/zanata-frontend/src/app/components/RejectionsForm/RejectionsForm.story.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/RejectionsForm/RejectionsForm.story.js
rename to server/zanata-frontend/src/app/components/RejectionsForm/RejectionsForm.story.js
diff --git a/server/zanata-frontend/src/frontend/app/components/RejectionsForm/index.js b/server/zanata-frontend/src/app/components/RejectionsForm/index.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/RejectionsForm/index.js
rename to server/zanata-frontend/src/app/components/RejectionsForm/index.js
diff --git a/server/zanata-frontend/src/frontend/app/components/RejectionsForm/index.less b/server/zanata-frontend/src/app/components/RejectionsForm/index.less
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/RejectionsForm/index.less
rename to server/zanata-frontend/src/app/components/RejectionsForm/index.less
diff --git a/server/zanata-frontend/src/frontend/app/components/Select/index.js b/server/zanata-frontend/src/app/components/Select/index.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Select/index.js
rename to server/zanata-frontend/src/app/components/Select/index.js
diff --git a/server/zanata-frontend/src/frontend/app/components/SelectableDropdown/SelectableDropdown.test.js b/server/zanata-frontend/src/app/components/SelectableDropdown/SelectableDropdown.test.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/SelectableDropdown/SelectableDropdown.test.js
rename to server/zanata-frontend/src/app/components/SelectableDropdown/SelectableDropdown.test.js
diff --git a/server/zanata-frontend/src/frontend/app/components/SelectableDropdown/index.js b/server/zanata-frontend/src/app/components/SelectableDropdown/index.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/SelectableDropdown/index.js
rename to server/zanata-frontend/src/app/components/SelectableDropdown/index.js
diff --git a/server/zanata-frontend/src/frontend/app/components/Sidebar/Sidebar.story.js b/server/zanata-frontend/src/app/components/Sidebar/Sidebar.story.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Sidebar/Sidebar.story.js
rename to server/zanata-frontend/src/app/components/Sidebar/Sidebar.story.js
diff --git a/server/zanata-frontend/src/frontend/app/components/Sidebar/index.jsx b/server/zanata-frontend/src/app/components/Sidebar/index.jsx
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Sidebar/index.jsx
rename to server/zanata-frontend/src/app/components/Sidebar/index.jsx
diff --git a/server/zanata-frontend/src/frontend/app/components/Sidebar/index.less b/server/zanata-frontend/src/app/components/Sidebar/index.less
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Sidebar/index.less
rename to server/zanata-frontend/src/app/components/Sidebar/index.less
diff --git a/server/zanata-frontend/src/frontend/app/components/TMX/TMXExportModal.js b/server/zanata-frontend/src/app/components/TMX/TMXExportModal.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/TMX/TMXExportModal.js
rename to server/zanata-frontend/src/app/components/TMX/TMXExportModal.js
diff --git a/server/zanata-frontend/src/frontend/app/components/TMX/index.less b/server/zanata-frontend/src/app/components/TMX/index.less
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/TMX/index.less
rename to server/zanata-frontend/src/app/components/TMX/index.less
diff --git a/server/zanata-frontend/src/frontend/app/components/Table/Table.story.js b/server/zanata-frontend/src/app/components/Table/Table.story.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Table/Table.story.js
rename to server/zanata-frontend/src/app/components/Table/Table.story.js
diff --git a/server/zanata-frontend/src/frontend/app/components/Tabs/Tabs.story.js b/server/zanata-frontend/src/app/components/Tabs/Tabs.story.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Tabs/Tabs.story.js
rename to server/zanata-frontend/src/app/components/Tabs/Tabs.story.js
diff --git a/server/zanata-frontend/src/frontend/app/components/TextInput/TextInput.story.js b/server/zanata-frontend/src/app/components/TextInput/TextInput.story.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/TextInput/TextInput.story.js
rename to server/zanata-frontend/src/app/components/TextInput/TextInput.story.js
diff --git a/server/zanata-frontend/src/frontend/app/components/TextInput/index.js b/server/zanata-frontend/src/app/components/TextInput/index.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/TextInput/index.js
rename to server/zanata-frontend/src/app/components/TextInput/index.js
diff --git a/server/zanata-frontend/src/frontend/app/components/Tooltip/Tooltip.story.js b/server/zanata-frontend/src/app/components/Tooltip/Tooltip.story.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Tooltip/Tooltip.story.js
rename to server/zanata-frontend/src/app/components/Tooltip/Tooltip.story.js
diff --git a/server/zanata-frontend/src/frontend/app/components/TriCheckbox/TriCheckbox.story.js b/server/zanata-frontend/src/app/components/TriCheckbox/TriCheckbox.story.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/TriCheckbox/TriCheckbox.story.js
rename to server/zanata-frontend/src/app/components/TriCheckbox/TriCheckbox.story.js
diff --git a/server/zanata-frontend/src/frontend/app/components/TriCheckbox/TriCheckbox.test.js b/server/zanata-frontend/src/app/components/TriCheckbox/TriCheckbox.test.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/TriCheckbox/TriCheckbox.test.js
rename to server/zanata-frontend/src/app/components/TriCheckbox/TriCheckbox.test.js
diff --git a/server/zanata-frontend/src/frontend/app/components/TriCheckbox/TriCheckboxGroup.js b/server/zanata-frontend/src/app/components/TriCheckbox/TriCheckboxGroup.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/TriCheckbox/TriCheckboxGroup.js
rename to server/zanata-frontend/src/app/components/TriCheckbox/TriCheckboxGroup.js
diff --git a/server/zanata-frontend/src/frontend/app/components/TriCheckbox/index.js b/server/zanata-frontend/src/app/components/TriCheckbox/index.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/TriCheckbox/index.js
rename to server/zanata-frontend/src/app/components/TriCheckbox/index.js
diff --git a/server/zanata-frontend/src/frontend/app/components/TriCheckbox/index.less b/server/zanata-frontend/src/app/components/TriCheckbox/index.less
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/TriCheckbox/index.less
rename to server/zanata-frontend/src/app/components/TriCheckbox/index.less
diff --git a/server/zanata-frontend/src/frontend/app/components/VersionTMMergeModal/VersionTMMergeModal.story.js b/server/zanata-frontend/src/app/components/VersionTMMergeModal/VersionTMMergeModal.story.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/VersionTMMergeModal/VersionTMMergeModal.story.js
rename to server/zanata-frontend/src/app/components/VersionTMMergeModal/VersionTMMergeModal.story.js
diff --git a/server/zanata-frontend/src/frontend/app/components/VersionTMMergeModal/diagram.png b/server/zanata-frontend/src/app/components/VersionTMMergeModal/diagram.png
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/VersionTMMergeModal/diagram.png
rename to server/zanata-frontend/src/app/components/VersionTMMergeModal/diagram.png
diff --git a/server/zanata-frontend/src/frontend/app/components/Well/Well.story.js b/server/zanata-frontend/src/app/components/Well/Well.story.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/Well/Well.story.js
rename to server/zanata-frontend/src/app/components/Well/Well.story.js
diff --git a/server/zanata-frontend/src/frontend/app/components/components.story.js b/server/zanata-frontend/src/app/components/components.story.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/components.story.js
rename to server/zanata-frontend/src/app/components/components.story.js
diff --git a/server/zanata-frontend/src/frontend/app/components/foundation.story.js b/server/zanata-frontend/src/app/components/foundation.story.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/foundation.story.js
rename to server/zanata-frontend/src/app/components/foundation.story.js
diff --git a/server/zanata-frontend/src/frontend/app/components/index.js b/server/zanata-frontend/src/app/components/index.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/components/index.js
rename to server/zanata-frontend/src/app/components/index.js
diff --git a/server/zanata-frontend/src/frontend/app/config.js b/server/zanata-frontend/src/app/config.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/config.js
rename to server/zanata-frontend/src/app/config.js
diff --git a/server/zanata-frontend/src/frontend/app/constants/Messages.js b/server/zanata-frontend/src/app/constants/Messages.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/constants/Messages.js
rename to server/zanata-frontend/src/app/constants/Messages.js
diff --git a/server/zanata-frontend/src/frontend/app/constants/Options.js b/server/zanata-frontend/src/app/constants/Options.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/constants/Options.js
rename to server/zanata-frontend/src/app/constants/Options.js
diff --git a/server/zanata-frontend/src/frontend/app/containers/Admin/Review.js b/server/zanata-frontend/src/app/containers/Admin/Review.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/containers/Admin/Review.js
rename to server/zanata-frontend/src/app/containers/Admin/Review.js
diff --git a/server/zanata-frontend/src/frontend/app/containers/Admin/index.js b/server/zanata-frontend/src/app/containers/Admin/index.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/containers/Admin/index.js
rename to server/zanata-frontend/src/app/containers/Admin/index.js
diff --git a/server/zanata-frontend/src/frontend/app/containers/App.js b/server/zanata-frontend/src/app/containers/App.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/containers/App.js
rename to server/zanata-frontend/src/app/containers/App.js
diff --git a/server/zanata-frontend/src/frontend/app/containers/Explore/GroupTeaser.jsx b/server/zanata-frontend/src/app/containers/Explore/GroupTeaser.jsx
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/containers/Explore/GroupTeaser.jsx
rename to server/zanata-frontend/src/app/containers/Explore/GroupTeaser.jsx
diff --git a/server/zanata-frontend/src/frontend/app/containers/Explore/LanguageTeamTeaser.jsx b/server/zanata-frontend/src/app/containers/Explore/LanguageTeamTeaser.jsx
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/containers/Explore/LanguageTeamTeaser.jsx
rename to server/zanata-frontend/src/app/containers/Explore/LanguageTeamTeaser.jsx
diff --git a/server/zanata-frontend/src/frontend/app/containers/Explore/ProjectTeaser.jsx b/server/zanata-frontend/src/app/containers/Explore/ProjectTeaser.jsx
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/containers/Explore/ProjectTeaser.jsx
rename to server/zanata-frontend/src/app/containers/Explore/ProjectTeaser.jsx
diff --git a/server/zanata-frontend/src/frontend/app/containers/Explore/TeaserList.jsx b/server/zanata-frontend/src/app/containers/Explore/TeaserList.jsx
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/containers/Explore/TeaserList.jsx
rename to server/zanata-frontend/src/app/containers/Explore/TeaserList.jsx
diff --git a/server/zanata-frontend/src/frontend/app/containers/Explore/TeaserListHeader.jsx b/server/zanata-frontend/src/app/containers/Explore/TeaserListHeader.jsx
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/containers/Explore/TeaserListHeader.jsx
rename to server/zanata-frontend/src/app/containers/Explore/TeaserListHeader.jsx
diff --git a/server/zanata-frontend/src/frontend/app/containers/Explore/UserTeaser.jsx b/server/zanata-frontend/src/app/containers/Explore/UserTeaser.jsx
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/containers/Explore/UserTeaser.jsx
rename to server/zanata-frontend/src/app/containers/Explore/UserTeaser.jsx
diff --git a/server/zanata-frontend/src/frontend/app/containers/Explore/index.js b/server/zanata-frontend/src/app/containers/Explore/index.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/containers/Explore/index.js
rename to server/zanata-frontend/src/app/containers/Explore/index.js
diff --git a/server/zanata-frontend/src/frontend/app/containers/Explore/index.less b/server/zanata-frontend/src/app/containers/Explore/index.less
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/containers/Explore/index.less
rename to server/zanata-frontend/src/app/containers/Explore/index.less
diff --git a/server/zanata-frontend/src/frontend/app/containers/Glossary/DeleteAllEntriesModal.jsx b/server/zanata-frontend/src/app/containers/Glossary/DeleteAllEntriesModal.jsx
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/containers/Glossary/DeleteAllEntriesModal.jsx
rename to server/zanata-frontend/src/app/containers/Glossary/DeleteAllEntriesModal.jsx
diff --git a/server/zanata-frontend/src/frontend/app/containers/Glossary/DeleteEntryModal.jsx b/server/zanata-frontend/src/app/containers/Glossary/DeleteEntryModal.jsx
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/containers/Glossary/DeleteEntryModal.jsx
rename to server/zanata-frontend/src/app/containers/Glossary/DeleteEntryModal.jsx
diff --git a/server/zanata-frontend/src/frontend/app/containers/Glossary/Entry.js b/server/zanata-frontend/src/app/containers/Glossary/Entry.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/containers/Glossary/Entry.js
rename to server/zanata-frontend/src/app/containers/Glossary/Entry.js
diff --git a/server/zanata-frontend/src/frontend/app/containers/Glossary/EntryModal.js b/server/zanata-frontend/src/app/containers/Glossary/EntryModal.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/containers/Glossary/EntryModal.js
rename to server/zanata-frontend/src/app/containers/Glossary/EntryModal.js
diff --git a/server/zanata-frontend/src/frontend/app/containers/Glossary/ExportModal.js b/server/zanata-frontend/src/app/containers/Glossary/ExportModal.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/containers/Glossary/ExportModal.js
rename to server/zanata-frontend/src/app/containers/Glossary/ExportModal.js
diff --git a/server/zanata-frontend/src/frontend/app/containers/Glossary/Header.jsx b/server/zanata-frontend/src/app/containers/Glossary/Header.jsx
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/containers/Glossary/Header.jsx
rename to server/zanata-frontend/src/app/containers/Glossary/Header.jsx
diff --git a/server/zanata-frontend/src/frontend/app/containers/Glossary/ImportModal.js b/server/zanata-frontend/src/app/containers/Glossary/ImportModal.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/containers/Glossary/ImportModal.js
rename to server/zanata-frontend/src/app/containers/Glossary/ImportModal.js
diff --git a/server/zanata-frontend/src/frontend/app/containers/Glossary/NewEntryModal.js b/server/zanata-frontend/src/app/containers/Glossary/NewEntryModal.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/containers/Glossary/NewEntryModal.js
rename to server/zanata-frontend/src/app/containers/Glossary/NewEntryModal.js
diff --git a/server/zanata-frontend/src/frontend/app/containers/Glossary/ViewHeader.js b/server/zanata-frontend/src/app/containers/Glossary/ViewHeader.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/containers/Glossary/ViewHeader.js
rename to server/zanata-frontend/src/app/containers/Glossary/ViewHeader.js
diff --git a/server/zanata-frontend/src/frontend/app/containers/Glossary/index.js b/server/zanata-frontend/src/app/containers/Glossary/index.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/containers/Glossary/index.js
rename to server/zanata-frontend/src/app/containers/Glossary/index.js
diff --git a/server/zanata-frontend/src/frontend/app/containers/Glossary/index.less b/server/zanata-frontend/src/app/containers/Glossary/index.less
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/containers/Glossary/index.less
rename to server/zanata-frontend/src/app/containers/Glossary/index.less
diff --git a/server/zanata-frontend/src/frontend/app/containers/Languages/DeleteEntry.js b/server/zanata-frontend/src/app/containers/Languages/DeleteEntry.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/containers/Languages/DeleteEntry.js
rename to server/zanata-frontend/src/app/containers/Languages/DeleteEntry.js
diff --git a/server/zanata-frontend/src/frontend/app/containers/Languages/Entry.js b/server/zanata-frontend/src/app/containers/Languages/Entry.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/containers/Languages/Entry.js
rename to server/zanata-frontend/src/app/containers/Languages/Entry.js
diff --git a/server/zanata-frontend/src/frontend/app/containers/Languages/NewLanguageModal.js b/server/zanata-frontend/src/app/containers/Languages/NewLanguageModal.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/containers/Languages/NewLanguageModal.js
rename to server/zanata-frontend/src/app/containers/Languages/NewLanguageModal.js
diff --git a/server/zanata-frontend/src/frontend/app/containers/Languages/index.js b/server/zanata-frontend/src/app/containers/Languages/index.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/containers/Languages/index.js
rename to server/zanata-frontend/src/app/containers/Languages/index.js
diff --git a/server/zanata-frontend/src/frontend/app/containers/Languages/index.less b/server/zanata-frontend/src/app/containers/Languages/index.less
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/containers/Languages/index.less
rename to server/zanata-frontend/src/app/containers/Languages/index.less
diff --git a/server/zanata-frontend/src/frontend/app/containers/Project/index.js b/server/zanata-frontend/src/app/containers/Project/index.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/containers/Project/index.js
rename to server/zanata-frontend/src/app/containers/Project/index.js
diff --git a/server/zanata-frontend/src/frontend/app/containers/ProjectVersion/ProjectVersionPanels.js b/server/zanata-frontend/src/app/containers/ProjectVersion/ProjectVersionPanels.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/containers/ProjectVersion/ProjectVersionPanels.js
rename to server/zanata-frontend/src/app/containers/ProjectVersion/ProjectVersionPanels.js
diff --git a/server/zanata-frontend/src/frontend/app/containers/ProjectVersion/TMMergeImportedTM.js b/server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeImportedTM.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/containers/ProjectVersion/TMMergeImportedTM.js
rename to server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeImportedTM.js
diff --git a/server/zanata-frontend/src/frontend/app/containers/ProjectVersion/TMMergeModal.js b/server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeModal.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/containers/ProjectVersion/TMMergeModal.js
rename to server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeModal.js
diff --git a/server/zanata-frontend/src/frontend/app/containers/ProjectVersion/TMMergeOptionsCommon.js b/server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeOptionsCommon.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/containers/ProjectVersion/TMMergeOptionsCommon.js
rename to server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeOptionsCommon.js
diff --git a/server/zanata-frontend/src/frontend/app/containers/ProjectVersion/TMMergeProjectSources.js b/server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectSources.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/containers/ProjectVersion/TMMergeProjectSources.js
rename to server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectSources.js
diff --git a/server/zanata-frontend/src/frontend/app/containers/ProjectVersion/TMMergeProjectTMOptions.js b/server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectTMOptions.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/containers/ProjectVersion/TMMergeProjectTMOptions.js
rename to server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectTMOptions.js
diff --git a/server/zanata-frontend/src/frontend/app/containers/ProjectVersion/index.js b/server/zanata-frontend/src/app/containers/ProjectVersion/index.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/containers/ProjectVersion/index.js
rename to server/zanata-frontend/src/app/containers/ProjectVersion/index.js
diff --git a/server/zanata-frontend/src/frontend/app/containers/ProjectVersion/index.less b/server/zanata-frontend/src/app/containers/ProjectVersion/index.less
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/containers/ProjectVersion/index.less
rename to server/zanata-frontend/src/app/containers/ProjectVersion/index.less
diff --git a/server/zanata-frontend/src/frontend/app/containers/ProjectVersion/project-version-displays.js b/server/zanata-frontend/src/app/containers/ProjectVersion/project-version-displays.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/containers/ProjectVersion/project-version-displays.js
rename to server/zanata-frontend/src/app/containers/ProjectVersion/project-version-displays.js
diff --git a/server/zanata-frontend/src/frontend/app/containers/Root.js b/server/zanata-frontend/src/app/containers/Root.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/containers/Root.js
rename to server/zanata-frontend/src/app/containers/Root.js
diff --git a/server/zanata-frontend/src/frontend/app/containers/UserProfile/CalendarMonthMatrix.jsx b/server/zanata-frontend/src/app/containers/UserProfile/CalendarMonthMatrix.jsx
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/containers/UserProfile/CalendarMonthMatrix.jsx
rename to server/zanata-frontend/src/app/containers/UserProfile/CalendarMonthMatrix.jsx
diff --git a/server/zanata-frontend/src/frontend/app/containers/UserProfile/CalendarPeriodHeading.jsx b/server/zanata-frontend/src/app/containers/UserProfile/CalendarPeriodHeading.jsx
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/containers/UserProfile/CalendarPeriodHeading.jsx
rename to server/zanata-frontend/src/app/containers/UserProfile/CalendarPeriodHeading.jsx
diff --git a/server/zanata-frontend/src/frontend/app/containers/UserProfile/CategoryItemMatrix.jsx b/server/zanata-frontend/src/app/containers/UserProfile/CategoryItemMatrix.jsx
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/containers/UserProfile/CategoryItemMatrix.jsx
rename to server/zanata-frontend/src/app/containers/UserProfile/CategoryItemMatrix.jsx
diff --git a/server/zanata-frontend/src/frontend/app/containers/UserProfile/CategoryMatrixTable.jsx b/server/zanata-frontend/src/app/containers/UserProfile/CategoryMatrixTable.jsx
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/containers/UserProfile/CategoryMatrixTable.jsx
rename to server/zanata-frontend/src/app/containers/UserProfile/CategoryMatrixTable.jsx
diff --git a/server/zanata-frontend/src/frontend/app/containers/UserProfile/ContentStateFilter.jsx b/server/zanata-frontend/src/app/containers/UserProfile/ContentStateFilter.jsx
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/containers/UserProfile/ContentStateFilter.jsx
rename to server/zanata-frontend/src/app/containers/UserProfile/ContentStateFilter.jsx
diff --git a/server/zanata-frontend/src/frontend/app/containers/UserProfile/ContributionChart.jsx b/server/zanata-frontend/src/app/containers/UserProfile/ContributionChart.jsx
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/containers/UserProfile/ContributionChart.jsx
rename to server/zanata-frontend/src/app/containers/UserProfile/ContributionChart.jsx
diff --git a/server/zanata-frontend/src/frontend/app/containers/UserProfile/DayMatrix.jsx b/server/zanata-frontend/src/app/containers/UserProfile/DayMatrix.jsx
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/containers/UserProfile/DayMatrix.jsx
rename to server/zanata-frontend/src/app/containers/UserProfile/DayMatrix.jsx
diff --git a/server/zanata-frontend/src/frontend/app/containers/UserProfile/FilterableMatrixTable.jsx b/server/zanata-frontend/src/app/containers/UserProfile/FilterableMatrixTable.jsx
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/containers/UserProfile/FilterableMatrixTable.jsx
rename to server/zanata-frontend/src/app/containers/UserProfile/FilterableMatrixTable.jsx
diff --git a/server/zanata-frontend/src/frontend/app/containers/UserProfile/RecentContributions.jsx b/server/zanata-frontend/src/app/containers/UserProfile/RecentContributions.jsx
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/containers/UserProfile/RecentContributions.jsx
rename to server/zanata-frontend/src/app/containers/UserProfile/RecentContributions.jsx
diff --git a/server/zanata-frontend/src/frontend/app/containers/UserProfile/index.jsx b/server/zanata-frontend/src/app/containers/UserProfile/index.jsx
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/containers/UserProfile/index.jsx
rename to server/zanata-frontend/src/app/containers/UserProfile/index.jsx
diff --git a/server/zanata-frontend/src/frontend/app/containers/UserProfile/index.less b/server/zanata-frontend/src/app/containers/UserProfile/index.less
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/containers/UserProfile/index.less
rename to server/zanata-frontend/src/app/containers/UserProfile/index.less
diff --git a/server/zanata-frontend/src/frontend/app/editor/README.md b/server/zanata-frontend/src/app/editor/README.md
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/README.md
rename to server/zanata-frontend/src/app/editor/README.md
diff --git a/server/zanata-frontend/src/frontend/app/editor/actions/action-types.js b/server/zanata-frontend/src/app/editor/actions/action-types.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/actions/action-types.js
rename to server/zanata-frontend/src/app/editor/actions/action-types.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/actions/controls-header-actions.js b/server/zanata-frontend/src/app/editor/actions/controls-header-actions.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/actions/controls-header-actions.js
rename to server/zanata-frontend/src/app/editor/actions/controls-header-actions.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/actions/glossary-action-types.js b/server/zanata-frontend/src/app/editor/actions/glossary-action-types.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/actions/glossary-action-types.js
rename to server/zanata-frontend/src/app/editor/actions/glossary-action-types.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/actions/glossary-actions.js b/server/zanata-frontend/src/app/editor/actions/glossary-actions.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/actions/glossary-actions.js
rename to server/zanata-frontend/src/app/editor/actions/glossary-actions.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/actions/header-action-types.js b/server/zanata-frontend/src/app/editor/actions/header-action-types.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/actions/header-action-types.js
rename to server/zanata-frontend/src/app/editor/actions/header-action-types.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/actions/header-actions.js b/server/zanata-frontend/src/app/editor/actions/header-actions.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/actions/header-actions.js
rename to server/zanata-frontend/src/app/editor/actions/header-actions.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/actions/index.js b/server/zanata-frontend/src/app/editor/actions/index.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/actions/index.js
rename to server/zanata-frontend/src/app/editor/actions/index.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/actions/key-shortcuts-actions.js b/server/zanata-frontend/src/app/editor/actions/key-shortcuts-actions.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/actions/key-shortcuts-actions.js
rename to server/zanata-frontend/src/app/editor/actions/key-shortcuts-actions.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/actions/phrase-navigation-actions.js b/server/zanata-frontend/src/app/editor/actions/phrase-navigation-actions.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/actions/phrase-navigation-actions.js
rename to server/zanata-frontend/src/app/editor/actions/phrase-navigation-actions.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/actions/phrases-action-types.js b/server/zanata-frontend/src/app/editor/actions/phrases-action-types.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/actions/phrases-action-types.js
rename to server/zanata-frontend/src/app/editor/actions/phrases-action-types.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/actions/phrases-actions.js b/server/zanata-frontend/src/app/editor/actions/phrases-actions.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/actions/phrases-actions.js
rename to server/zanata-frontend/src/app/editor/actions/phrases-actions.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/actions/phrases-filter-actions.js b/server/zanata-frontend/src/app/editor/actions/phrases-filter-actions.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/actions/phrases-filter-actions.js
rename to server/zanata-frontend/src/app/editor/actions/phrases-filter-actions.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/actions/settings-action-types.js b/server/zanata-frontend/src/app/editor/actions/settings-action-types.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/actions/settings-action-types.js
rename to server/zanata-frontend/src/app/editor/actions/settings-action-types.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/actions/settings-actions.js b/server/zanata-frontend/src/app/editor/actions/settings-actions.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/actions/settings-actions.js
rename to server/zanata-frontend/src/app/editor/actions/settings-actions.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/actions/settings-actions.test.js b/server/zanata-frontend/src/app/editor/actions/settings-actions.test.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/actions/settings-actions.test.js
rename to server/zanata-frontend/src/app/editor/actions/settings-actions.test.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/actions/suggestions-action-types.js b/server/zanata-frontend/src/app/editor/actions/suggestions-action-types.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/actions/suggestions-action-types.js
rename to server/zanata-frontend/src/app/editor/actions/suggestions-action-types.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/actions/suggestions-actions.js b/server/zanata-frontend/src/app/editor/actions/suggestions-actions.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/actions/suggestions-actions.js
rename to server/zanata-frontend/src/app/editor/actions/suggestions-actions.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/api/index.js b/server/zanata-frontend/src/app/editor/api/index.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/api/index.js
rename to server/zanata-frontend/src/app/editor/api/index.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/api/suggestions.js b/server/zanata-frontend/src/app/editor/api/suggestions.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/api/suggestions.js
rename to server/zanata-frontend/src/app/editor/api/suggestions.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/app.css b/server/zanata-frontend/src/app/editor/app.css
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/app.css
rename to server/zanata-frontend/src/app/editor/app.css
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/ActivityFeedItem/ActivityFeedItem.story.js b/server/zanata-frontend/src/app/editor/components/ActivityFeedItem/ActivityFeedItem.story.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/ActivityFeedItem/ActivityFeedItem.story.js
rename to server/zanata-frontend/src/app/editor/components/ActivityFeedItem/ActivityFeedItem.story.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/ActivityFeedItem/index.js b/server/zanata-frontend/src/app/editor/components/ActivityFeedItem/index.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/ActivityFeedItem/index.js
rename to server/zanata-frontend/src/app/editor/components/ActivityFeedItem/index.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/ActivitySelectList/ActivitySelectList.story.js b/server/zanata-frontend/src/app/editor/components/ActivitySelectList/ActivitySelectList.story.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/ActivitySelectList/ActivitySelectList.story.js
rename to server/zanata-frontend/src/app/editor/components/ActivitySelectList/ActivitySelectList.story.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/ActivitySelectList/index.js b/server/zanata-frontend/src/app/editor/components/ActivitySelectList/index.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/ActivitySelectList/index.js
rename to server/zanata-frontend/src/app/editor/components/ActivitySelectList/index.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/Button/Button.story.js b/server/zanata-frontend/src/app/editor/components/Button/Button.story.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/Button/Button.story.js
rename to server/zanata-frontend/src/app/editor/components/Button/Button.story.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/Button/Button.test.js b/server/zanata-frontend/src/app/editor/components/Button/Button.test.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/Button/Button.test.js
rename to server/zanata-frontend/src/app/editor/components/Button/Button.test.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/Button/index.css b/server/zanata-frontend/src/app/editor/components/Button/index.css
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/Button/index.css
rename to server/zanata-frontend/src/app/editor/components/Button/index.css
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/Button/index.js b/server/zanata-frontend/src/app/editor/components/Button/index.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/Button/index.js
rename to server/zanata-frontend/src/app/editor/components/Button/index.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/CommentBox/CommentBox.story.js b/server/zanata-frontend/src/app/editor/components/CommentBox/CommentBox.story.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/CommentBox/CommentBox.story.js
rename to server/zanata-frontend/src/app/editor/components/CommentBox/CommentBox.story.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/CommentBox/index.js b/server/zanata-frontend/src/app/editor/components/CommentBox/index.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/CommentBox/index.js
rename to server/zanata-frontend/src/app/editor/components/CommentBox/index.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/DashboardLink/DashboardLink.test.js b/server/zanata-frontend/src/app/editor/components/DashboardLink/DashboardLink.test.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/DashboardLink/DashboardLink.test.js
rename to server/zanata-frontend/src/app/editor/components/DashboardLink/DashboardLink.test.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/DashboardLink/index.js b/server/zanata-frontend/src/app/editor/components/DashboardLink/index.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/DashboardLink/index.js
rename to server/zanata-frontend/src/app/editor/components/DashboardLink/index.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/DateAndTimeDisplay/DateAndTimeDisplay.story.js b/server/zanata-frontend/src/app/editor/components/DateAndTimeDisplay/DateAndTimeDisplay.story.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/DateAndTimeDisplay/DateAndTimeDisplay.story.js
rename to server/zanata-frontend/src/app/editor/components/DateAndTimeDisplay/DateAndTimeDisplay.story.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/DateAndTimeDisplay/DateAndTimeDisplay.test.js b/server/zanata-frontend/src/app/editor/components/DateAndTimeDisplay/DateAndTimeDisplay.test.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/DateAndTimeDisplay/DateAndTimeDisplay.test.js
rename to server/zanata-frontend/src/app/editor/components/DateAndTimeDisplay/DateAndTimeDisplay.test.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/DateAndTimeDisplay/index.js b/server/zanata-frontend/src/app/editor/components/DateAndTimeDisplay/index.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/DateAndTimeDisplay/index.js
rename to server/zanata-frontend/src/app/editor/components/DateAndTimeDisplay/index.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/DocsDropdown/DocsDropdown.test.js b/server/zanata-frontend/src/app/editor/components/DocsDropdown/DocsDropdown.test.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/DocsDropdown/DocsDropdown.test.js
rename to server/zanata-frontend/src/app/editor/components/DocsDropdown/DocsDropdown.test.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/DocsDropdown/index.js b/server/zanata-frontend/src/app/editor/components/DocsDropdown/index.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/DocsDropdown/index.js
rename to server/zanata-frontend/src/app/editor/components/DocsDropdown/index.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/Dropdown/Dropdown.test.js b/server/zanata-frontend/src/app/editor/components/Dropdown/Dropdown.test.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/Dropdown/Dropdown.test.js
rename to server/zanata-frontend/src/app/editor/components/Dropdown/Dropdown.test.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/Dropdown/index.css b/server/zanata-frontend/src/app/editor/components/Dropdown/index.css
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/Dropdown/index.css
rename to server/zanata-frontend/src/app/editor/components/Dropdown/index.css
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/Dropdown/index.js b/server/zanata-frontend/src/app/editor/components/Dropdown/index.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/Dropdown/index.js
rename to server/zanata-frontend/src/app/editor/components/Dropdown/index.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/EditorSearchInput/EditorSearchInput.story.js b/server/zanata-frontend/src/app/editor/components/EditorSearchInput/EditorSearchInput.story.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/EditorSearchInput/EditorSearchInput.story.js
rename to server/zanata-frontend/src/app/editor/components/EditorSearchInput/EditorSearchInput.story.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/EditorSearchInput/EditorSearchInput.test.js b/server/zanata-frontend/src/app/editor/components/EditorSearchInput/EditorSearchInput.test.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/EditorSearchInput/EditorSearchInput.test.js
rename to server/zanata-frontend/src/app/editor/components/EditorSearchInput/EditorSearchInput.test.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/EditorSearchInput/index.css b/server/zanata-frontend/src/app/editor/components/EditorSearchInput/index.css
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/EditorSearchInput/index.css
rename to server/zanata-frontend/src/app/editor/components/EditorSearchInput/index.css
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/EditorSearchInput/index.js b/server/zanata-frontend/src/app/editor/components/EditorSearchInput/index.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/EditorSearchInput/index.js
rename to server/zanata-frontend/src/app/editor/components/EditorSearchInput/index.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/FilterToggle/index.css b/server/zanata-frontend/src/app/editor/components/FilterToggle/index.css
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/FilterToggle/index.css
rename to server/zanata-frontend/src/app/editor/components/FilterToggle/index.css
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/FilterToggle/index.js b/server/zanata-frontend/src/app/editor/components/FilterToggle/index.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/FilterToggle/index.js
rename to server/zanata-frontend/src/app/editor/components/FilterToggle/index.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/GlossarySearchInput/GlossarySearchInput.story.js b/server/zanata-frontend/src/app/editor/components/GlossarySearchInput/GlossarySearchInput.story.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/GlossarySearchInput/GlossarySearchInput.story.js
rename to server/zanata-frontend/src/app/editor/components/GlossarySearchInput/GlossarySearchInput.story.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/GlossarySearchInput/index.js b/server/zanata-frontend/src/app/editor/components/GlossarySearchInput/index.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/GlossarySearchInput/index.js
rename to server/zanata-frontend/src/app/editor/components/GlossarySearchInput/index.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/GlossaryTerm/GlossaryTerm.story.js b/server/zanata-frontend/src/app/editor/components/GlossaryTerm/GlossaryTerm.story.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/GlossaryTerm/GlossaryTerm.story.js
rename to server/zanata-frontend/src/app/editor/components/GlossaryTerm/GlossaryTerm.story.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/GlossaryTerm/index.js b/server/zanata-frontend/src/app/editor/components/GlossaryTerm/index.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/GlossaryTerm/index.js
rename to server/zanata-frontend/src/app/editor/components/GlossaryTerm/index.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/GlossaryTermModal/GlossaryTermModal.story.js b/server/zanata-frontend/src/app/editor/components/GlossaryTermModal/GlossaryTermModal.story.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/GlossaryTermModal/GlossaryTermModal.story.js
rename to server/zanata-frontend/src/app/editor/components/GlossaryTermModal/GlossaryTermModal.story.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/GlossaryTermModal/component.js b/server/zanata-frontend/src/app/editor/components/GlossaryTermModal/component.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/GlossaryTermModal/component.js
rename to server/zanata-frontend/src/app/editor/components/GlossaryTermModal/component.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/GlossaryTermModal/index.css b/server/zanata-frontend/src/app/editor/components/GlossaryTermModal/index.css
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/GlossaryTermModal/index.css
rename to server/zanata-frontend/src/app/editor/components/GlossaryTermModal/index.css
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/GlossaryTermModal/index.js b/server/zanata-frontend/src/app/editor/components/GlossaryTermModal/index.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/GlossaryTermModal/index.js
rename to server/zanata-frontend/src/app/editor/components/GlossaryTermModal/index.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/IconButton/IconButton.test.js b/server/zanata-frontend/src/app/editor/components/IconButton/IconButton.test.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/IconButton/IconButton.test.js
rename to server/zanata-frontend/src/app/editor/components/IconButton/IconButton.test.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/IconButton/index.js b/server/zanata-frontend/src/app/editor/components/IconButton/index.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/IconButton/index.js
rename to server/zanata-frontend/src/app/editor/components/IconButton/index.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/IconButtonToggle/IconButtonToggle.test.js b/server/zanata-frontend/src/app/editor/components/IconButtonToggle/IconButtonToggle.test.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/IconButtonToggle/IconButtonToggle.test.js
rename to server/zanata-frontend/src/app/editor/components/IconButtonToggle/IconButtonToggle.test.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/IconButtonToggle/index.js b/server/zanata-frontend/src/app/editor/components/IconButtonToggle/index.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/IconButtonToggle/index.js
rename to server/zanata-frontend/src/app/editor/components/IconButtonToggle/index.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/InputGroup/index.css b/server/zanata-frontend/src/app/editor/components/InputGroup/index.css
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/InputGroup/index.css
rename to server/zanata-frontend/src/app/editor/components/InputGroup/index.css
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/KeyCombinations.js b/server/zanata-frontend/src/app/editor/components/KeyCombinations.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/KeyCombinations.js
rename to server/zanata-frontend/src/app/editor/components/KeyCombinations.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/LanguageSelectList/LanguageSelectList.story.js b/server/zanata-frontend/src/app/editor/components/LanguageSelectList/LanguageSelectList.story.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/LanguageSelectList/LanguageSelectList.story.js
rename to server/zanata-frontend/src/app/editor/components/LanguageSelectList/LanguageSelectList.story.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/LanguageSelectList/index.js b/server/zanata-frontend/src/app/editor/components/LanguageSelectList/index.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/LanguageSelectList/index.js
rename to server/zanata-frontend/src/app/editor/components/LanguageSelectList/index.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/LanguagesDropdown/LanguageDropdown.test.js b/server/zanata-frontend/src/app/editor/components/LanguagesDropdown/LanguageDropdown.test.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/LanguagesDropdown/LanguageDropdown.test.js
rename to server/zanata-frontend/src/app/editor/components/LanguagesDropdown/LanguageDropdown.test.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/LanguagesDropdown/index.js b/server/zanata-frontend/src/app/editor/components/LanguagesDropdown/index.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/LanguagesDropdown/index.js
rename to server/zanata-frontend/src/app/editor/components/LanguagesDropdown/index.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/NoSuggestionsPanel/NoSuggestionsPanel.test.js b/server/zanata-frontend/src/app/editor/components/NoSuggestionsPanel/NoSuggestionsPanel.test.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/NoSuggestionsPanel/NoSuggestionsPanel.test.js
rename to server/zanata-frontend/src/app/editor/components/NoSuggestionsPanel/NoSuggestionsPanel.test.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/NoSuggestionsPanel/index.js b/server/zanata-frontend/src/app/editor/components/NoSuggestionsPanel/index.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/NoSuggestionsPanel/index.js
rename to server/zanata-frontend/src/app/editor/components/NoSuggestionsPanel/index.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/Pager/Pager.test.js b/server/zanata-frontend/src/app/editor/components/Pager/Pager.test.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/Pager/Pager.test.js
rename to server/zanata-frontend/src/app/editor/components/Pager/Pager.test.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/Pager/index.js b/server/zanata-frontend/src/app/editor/components/Pager/index.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/Pager/index.js
rename to server/zanata-frontend/src/app/editor/components/Pager/index.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/PhraseStatusFilter/PhraseStatusFilter.test.js b/server/zanata-frontend/src/app/editor/components/PhraseStatusFilter/PhraseStatusFilter.test.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/PhraseStatusFilter/PhraseStatusFilter.test.js
rename to server/zanata-frontend/src/app/editor/components/PhraseStatusFilter/PhraseStatusFilter.test.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/PhraseStatusFilter/index.js b/server/zanata-frontend/src/app/editor/components/PhraseStatusFilter/index.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/PhraseStatusFilter/index.js
rename to server/zanata-frontend/src/app/editor/components/PhraseStatusFilter/index.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/ProgressBar/ProgressBar.story.js b/server/zanata-frontend/src/app/editor/components/ProgressBar/ProgressBar.story.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/ProgressBar/ProgressBar.story.js
rename to server/zanata-frontend/src/app/editor/components/ProgressBar/ProgressBar.story.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/ProgressBar/ProgressBar.test.js b/server/zanata-frontend/src/app/editor/components/ProgressBar/ProgressBar.test.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/ProgressBar/ProgressBar.test.js
rename to server/zanata-frontend/src/app/editor/components/ProgressBar/ProgressBar.test.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/ProgressBar/index.css b/server/zanata-frontend/src/app/editor/components/ProgressBar/index.css
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/ProgressBar/index.css
rename to server/zanata-frontend/src/app/editor/components/ProgressBar/index.css
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/ProgressBar/index.js b/server/zanata-frontend/src/app/editor/components/ProgressBar/index.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/ProgressBar/index.js
rename to server/zanata-frontend/src/app/editor/components/ProgressBar/index.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/ProjectVersionLink/ProjectVersionLink.test.js b/server/zanata-frontend/src/app/editor/components/ProjectVersionLink/ProjectVersionLink.test.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/ProjectVersionLink/ProjectVersionLink.test.js
rename to server/zanata-frontend/src/app/editor/components/ProjectVersionLink/ProjectVersionLink.test.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/ProjectVersionLink/index.js b/server/zanata-frontend/src/app/editor/components/ProjectVersionLink/index.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/ProjectVersionLink/index.js
rename to server/zanata-frontend/src/app/editor/components/ProjectVersionLink/index.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/RejectTranslationModal/RejectTranslationModal.story.js b/server/zanata-frontend/src/app/editor/components/RejectTranslationModal/RejectTranslationModal.story.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/RejectTranslationModal/RejectTranslationModal.story.js
rename to server/zanata-frontend/src/app/editor/components/RejectTranslationModal/RejectTranslationModal.story.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/RejectTranslationModal/index.css b/server/zanata-frontend/src/app/editor/components/RejectTranslationModal/index.css
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/RejectTranslationModal/index.css
rename to server/zanata-frontend/src/app/editor/components/RejectTranslationModal/index.css
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/RejectTranslationModal/index.js b/server/zanata-frontend/src/app/editor/components/RejectTranslationModal/index.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/RejectTranslationModal/index.js
rename to server/zanata-frontend/src/app/editor/components/RejectTranslationModal/index.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/SelectButton/SelectButton.story.js b/server/zanata-frontend/src/app/editor/components/SelectButton/SelectButton.story.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/SelectButton/SelectButton.story.js
rename to server/zanata-frontend/src/app/editor/components/SelectButton/SelectButton.story.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/SelectButton/index.js b/server/zanata-frontend/src/app/editor/components/SelectButton/index.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/SelectButton/index.js
rename to server/zanata-frontend/src/app/editor/components/SelectButton/index.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/SelectButtonList/SelectButtonList.story.js b/server/zanata-frontend/src/app/editor/components/SelectButtonList/SelectButtonList.story.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/SelectButtonList/SelectButtonList.story.js
rename to server/zanata-frontend/src/app/editor/components/SelectButtonList/SelectButtonList.story.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/SelectButtonList/index.js b/server/zanata-frontend/src/app/editor/components/SelectButtonList/index.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/SelectButtonList/index.js
rename to server/zanata-frontend/src/app/editor/components/SelectButtonList/index.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/SettingOption/SettingOption.story.js b/server/zanata-frontend/src/app/editor/components/SettingOption/SettingOption.story.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/SettingOption/SettingOption.story.js
rename to server/zanata-frontend/src/app/editor/components/SettingOption/SettingOption.story.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/SettingOption/index.js b/server/zanata-frontend/src/app/editor/components/SettingOption/index.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/SettingOption/index.js
rename to server/zanata-frontend/src/app/editor/components/SettingOption/index.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/SettingsOptions/SettingsOptions.story.js b/server/zanata-frontend/src/app/editor/components/SettingsOptions/SettingsOptions.story.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/SettingsOptions/SettingsOptions.story.js
rename to server/zanata-frontend/src/app/editor/components/SettingsOptions/SettingsOptions.story.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/SettingsOptions/index.js b/server/zanata-frontend/src/app/editor/components/SettingsOptions/index.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/SettingsOptions/index.js
rename to server/zanata-frontend/src/app/editor/components/SettingsOptions/index.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/SplitDropdown/index.css b/server/zanata-frontend/src/app/editor/components/SplitDropdown/index.css
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/SplitDropdown/index.css
rename to server/zanata-frontend/src/app/editor/components/SplitDropdown/index.css
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/SplitDropdown/index.js b/server/zanata-frontend/src/app/editor/components/SplitDropdown/index.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/SplitDropdown/index.js
rename to server/zanata-frontend/src/app/editor/components/SplitDropdown/index.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/Suggestion.js b/server/zanata-frontend/src/app/editor/components/Suggestion.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/Suggestion.js
rename to server/zanata-frontend/src/app/editor/components/Suggestion.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/SuggestionContents/SuggestionContents.test.js b/server/zanata-frontend/src/app/editor/components/SuggestionContents/SuggestionContents.test.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/SuggestionContents/SuggestionContents.test.js
rename to server/zanata-frontend/src/app/editor/components/SuggestionContents/SuggestionContents.test.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/SuggestionContents/index.js b/server/zanata-frontend/src/app/editor/components/SuggestionContents/index.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/SuggestionContents/index.js
rename to server/zanata-frontend/src/app/editor/components/SuggestionContents/index.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/SuggestionDetailsSummary/SuggestionDetailsSummary.test.js b/server/zanata-frontend/src/app/editor/components/SuggestionDetailsSummary/SuggestionDetailsSummary.test.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/SuggestionDetailsSummary/SuggestionDetailsSummary.test.js
rename to server/zanata-frontend/src/app/editor/components/SuggestionDetailsSummary/SuggestionDetailsSummary.test.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/SuggestionDetailsSummary/index.js b/server/zanata-frontend/src/app/editor/components/SuggestionDetailsSummary/index.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/SuggestionDetailsSummary/index.js
rename to server/zanata-frontend/src/app/editor/components/SuggestionDetailsSummary/index.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/SuggestionList.js b/server/zanata-frontend/src/app/editor/components/SuggestionList.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/SuggestionList.js
rename to server/zanata-frontend/src/app/editor/components/SuggestionList.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/SuggestionMatchPercent/SuggestionMatchPercent.test.js b/server/zanata-frontend/src/app/editor/components/SuggestionMatchPercent/SuggestionMatchPercent.test.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/SuggestionMatchPercent/SuggestionMatchPercent.test.js
rename to server/zanata-frontend/src/app/editor/components/SuggestionMatchPercent/SuggestionMatchPercent.test.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/SuggestionMatchPercent/index.js b/server/zanata-frontend/src/app/editor/components/SuggestionMatchPercent/index.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/SuggestionMatchPercent/index.js
rename to server/zanata-frontend/src/app/editor/components/SuggestionMatchPercent/index.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/SuggestionSearchInput/index.js b/server/zanata-frontend/src/app/editor/components/SuggestionSearchInput/index.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/SuggestionSearchInput/index.js
rename to server/zanata-frontend/src/app/editor/components/SuggestionSearchInput/index.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/SuggestionSources/SuggestionSources.test.js b/server/zanata-frontend/src/app/editor/components/SuggestionSources/SuggestionSources.test.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/SuggestionSources/SuggestionSources.test.js
rename to server/zanata-frontend/src/app/editor/components/SuggestionSources/SuggestionSources.test.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/SuggestionSources/index.js b/server/zanata-frontend/src/app/editor/components/SuggestionSources/index.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/SuggestionSources/index.js
rename to server/zanata-frontend/src/app/editor/components/SuggestionSources/index.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/SuggestionTranslationDetails.js b/server/zanata-frontend/src/app/editor/components/SuggestionTranslationDetails.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/SuggestionTranslationDetails.js
rename to server/zanata-frontend/src/app/editor/components/SuggestionTranslationDetails.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/SuggestionTranslations.js b/server/zanata-frontend/src/app/editor/components/SuggestionTranslations.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/SuggestionTranslations.js
rename to server/zanata-frontend/src/app/editor/components/SuggestionTranslations.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/SuggestionUpdateMessage.js b/server/zanata-frontend/src/app/editor/components/SuggestionUpdateMessage.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/SuggestionUpdateMessage.js
rename to server/zanata-frontend/src/app/editor/components/SuggestionUpdateMessage.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/TextDiff/TextDiff.story.js b/server/zanata-frontend/src/app/editor/components/TextDiff/TextDiff.story.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/TextDiff/TextDiff.story.js
rename to server/zanata-frontend/src/app/editor/components/TextDiff/TextDiff.story.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/TextDiff/TextDiff.test.js b/server/zanata-frontend/src/app/editor/components/TextDiff/TextDiff.test.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/TextDiff/TextDiff.test.js
rename to server/zanata-frontend/src/app/editor/components/TextDiff/TextDiff.test.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/TextDiff/index.css b/server/zanata-frontend/src/app/editor/components/TextDiff/index.css
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/TextDiff/index.css
rename to server/zanata-frontend/src/app/editor/components/TextDiff/index.css
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/TextDiff/index.js b/server/zanata-frontend/src/app/editor/components/TextDiff/index.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/TextDiff/index.js
rename to server/zanata-frontend/src/app/editor/components/TextDiff/index.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/ToggleSwitch/ToggleSwitch.test.js b/server/zanata-frontend/src/app/editor/components/ToggleSwitch/ToggleSwitch.test.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/ToggleSwitch/ToggleSwitch.test.js
rename to server/zanata-frontend/src/app/editor/components/ToggleSwitch/ToggleSwitch.test.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/ToggleSwitch/index.css b/server/zanata-frontend/src/app/editor/components/ToggleSwitch/index.css
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/ToggleSwitch/index.css
rename to server/zanata-frontend/src/app/editor/components/ToggleSwitch/index.css
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/ToggleSwitch/index.js b/server/zanata-frontend/src/app/editor/components/ToggleSwitch/index.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/ToggleSwitch/index.js
rename to server/zanata-frontend/src/app/editor/components/ToggleSwitch/index.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/TransUnit/index.css b/server/zanata-frontend/src/app/editor/components/TransUnit/index.css
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/TransUnit/index.css
rename to server/zanata-frontend/src/app/editor/components/TransUnit/index.css
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/TransUnit/index.js b/server/zanata-frontend/src/app/editor/components/TransUnit/index.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/TransUnit/index.js
rename to server/zanata-frontend/src/app/editor/components/TransUnit/index.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/TransUnitLocaleHeading.js b/server/zanata-frontend/src/app/editor/components/TransUnitLocaleHeading.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/TransUnitLocaleHeading.js
rename to server/zanata-frontend/src/app/editor/components/TransUnitLocaleHeading.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/TransUnitSourceHeader.js b/server/zanata-frontend/src/app/editor/components/TransUnitSourceHeader.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/TransUnitSourceHeader.js
rename to server/zanata-frontend/src/app/editor/components/TransUnitSourceHeader.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/TransUnitSourcePanel.js b/server/zanata-frontend/src/app/editor/components/TransUnitSourcePanel.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/TransUnitSourcePanel.js
rename to server/zanata-frontend/src/app/editor/components/TransUnitSourcePanel.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/TransUnitStatus.js b/server/zanata-frontend/src/app/editor/components/TransUnitStatus.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/TransUnitStatus.js
rename to server/zanata-frontend/src/app/editor/components/TransUnitStatus.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/TransUnitTranslationFooter.js b/server/zanata-frontend/src/app/editor/components/TransUnitTranslationFooter.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/TransUnitTranslationFooter.js
rename to server/zanata-frontend/src/app/editor/components/TransUnitTranslationFooter.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/TransUnitTranslationHeader.js b/server/zanata-frontend/src/app/editor/components/TransUnitTranslationHeader.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/TransUnitTranslationHeader.js
rename to server/zanata-frontend/src/app/editor/components/TransUnitTranslationHeader.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/TransUnitTranslationPanel.js b/server/zanata-frontend/src/app/editor/components/TransUnitTranslationPanel.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/TransUnitTranslationPanel.js
rename to server/zanata-frontend/src/app/editor/components/TransUnitTranslationPanel.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/TranslatingIndicator/TranslatingIndicator.test.js b/server/zanata-frontend/src/app/editor/components/TranslatingIndicator/TranslatingIndicator.test.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/TranslatingIndicator/TranslatingIndicator.test.js
rename to server/zanata-frontend/src/app/editor/components/TranslatingIndicator/TranslatingIndicator.test.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/TranslatingIndicator/index.js b/server/zanata-frontend/src/app/editor/components/TranslatingIndicator/index.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/TranslatingIndicator/index.js
rename to server/zanata-frontend/src/app/editor/components/TranslatingIndicator/index.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/UiLanguageDropdown/UiLanguageDropdown.test.js b/server/zanata-frontend/src/app/editor/components/UiLanguageDropdown/UiLanguageDropdown.test.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/UiLanguageDropdown/UiLanguageDropdown.test.js
rename to server/zanata-frontend/src/app/editor/components/UiLanguageDropdown/UiLanguageDropdown.test.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/UiLanguageDropdown/index.js b/server/zanata-frontend/src/app/editor/components/UiLanguageDropdown/index.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/UiLanguageDropdown/index.js
rename to server/zanata-frontend/src/app/editor/components/UiLanguageDropdown/index.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/components.story.js b/server/zanata-frontend/src/app/editor/components/components.story.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/components/components.story.js
rename to server/zanata-frontend/src/app/editor/components/components.story.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/config/intl.js b/server/zanata-frontend/src/app/editor/config/intl.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/config/intl.js
rename to server/zanata-frontend/src/app/editor/config/intl.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/containers/ActivityTab.js b/server/zanata-frontend/src/app/editor/containers/ActivityTab.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/containers/ActivityTab.js
rename to server/zanata-frontend/src/app/editor/containers/ActivityTab.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/containers/ControlsHeader.js b/server/zanata-frontend/src/app/editor/containers/ControlsHeader.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/containers/ControlsHeader.js
rename to server/zanata-frontend/src/app/editor/containers/ControlsHeader.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/containers/EditorHeader/index.css b/server/zanata-frontend/src/app/editor/containers/EditorHeader/index.css
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/containers/EditorHeader/index.css
rename to server/zanata-frontend/src/app/editor/containers/EditorHeader/index.css
diff --git a/server/zanata-frontend/src/frontend/app/editor/containers/EditorHeader/index.js b/server/zanata-frontend/src/app/editor/containers/EditorHeader/index.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/containers/EditorHeader/index.js
rename to server/zanata-frontend/src/app/editor/containers/EditorHeader/index.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/containers/GlossaryTab.js b/server/zanata-frontend/src/app/editor/containers/GlossaryTab.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/containers/GlossaryTab.js
rename to server/zanata-frontend/src/app/editor/containers/GlossaryTab.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/containers/KeyShortcutCheatSheet/index.css b/server/zanata-frontend/src/app/editor/containers/KeyShortcutCheatSheet/index.css
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/containers/KeyShortcutCheatSheet/index.css
rename to server/zanata-frontend/src/app/editor/containers/KeyShortcutCheatSheet/index.css
diff --git a/server/zanata-frontend/src/frontend/app/editor/containers/KeyShortcutCheatSheet/index.js b/server/zanata-frontend/src/app/editor/containers/KeyShortcutCheatSheet/index.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/containers/KeyShortcutCheatSheet/index.js
rename to server/zanata-frontend/src/app/editor/containers/KeyShortcutCheatSheet/index.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/containers/KeyShortcutDispatcher.js b/server/zanata-frontend/src/app/editor/containers/KeyShortcutDispatcher.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/containers/KeyShortcutDispatcher.js
rename to server/zanata-frontend/src/app/editor/containers/KeyShortcutDispatcher.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/containers/MainContent.js b/server/zanata-frontend/src/app/editor/containers/MainContent.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/containers/MainContent.js
rename to server/zanata-frontend/src/app/editor/containers/MainContent.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/containers/NavHeader.js b/server/zanata-frontend/src/app/editor/containers/NavHeader.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/containers/NavHeader.js
rename to server/zanata-frontend/src/app/editor/containers/NavHeader.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/containers/NeedSlugMessage.js b/server/zanata-frontend/src/app/editor/containers/NeedSlugMessage.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/containers/NeedSlugMessage.js
rename to server/zanata-frontend/src/app/editor/containers/NeedSlugMessage.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/containers/ParamPropDispatcher.js b/server/zanata-frontend/src/app/editor/containers/ParamPropDispatcher.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/containers/ParamPropDispatcher.js
rename to server/zanata-frontend/src/app/editor/containers/ParamPropDispatcher.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/containers/Root/index.css b/server/zanata-frontend/src/app/editor/containers/Root/index.css
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/containers/Root/index.css
rename to server/zanata-frontend/src/app/editor/containers/Root/index.css
diff --git a/server/zanata-frontend/src/frontend/app/editor/containers/Root/index.js b/server/zanata-frontend/src/app/editor/containers/Root/index.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/containers/Root/index.js
rename to server/zanata-frontend/src/app/editor/containers/Root/index.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/containers/SettingsPanel.js b/server/zanata-frontend/src/app/editor/containers/SettingsPanel.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/containers/SettingsPanel.js
rename to server/zanata-frontend/src/app/editor/containers/SettingsPanel.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/containers/Sidebar/index.css b/server/zanata-frontend/src/app/editor/containers/Sidebar/index.css
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/containers/Sidebar/index.css
rename to server/zanata-frontend/src/app/editor/containers/Sidebar/index.css
diff --git a/server/zanata-frontend/src/frontend/app/editor/containers/Sidebar/index.js b/server/zanata-frontend/src/app/editor/containers/Sidebar/index.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/containers/Sidebar/index.js
rename to server/zanata-frontend/src/app/editor/containers/Sidebar/index.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/containers/SidebarContent.js b/server/zanata-frontend/src/app/editor/containers/SidebarContent.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/containers/SidebarContent.js
rename to server/zanata-frontend/src/app/editor/containers/SidebarContent.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/containers/SuggestionDetailsModal/ImportedTMDetailPanel.js b/server/zanata-frontend/src/app/editor/containers/SuggestionDetailsModal/ImportedTMDetailPanel.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/containers/SuggestionDetailsModal/ImportedTMDetailPanel.js
rename to server/zanata-frontend/src/app/editor/containers/SuggestionDetailsModal/ImportedTMDetailPanel.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/containers/SuggestionDetailsModal/LocalProjectDetailPanel.js b/server/zanata-frontend/src/app/editor/containers/SuggestionDetailsModal/LocalProjectDetailPanel.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/containers/SuggestionDetailsModal/LocalProjectDetailPanel.js
rename to server/zanata-frontend/src/app/editor/containers/SuggestionDetailsModal/LocalProjectDetailPanel.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/containers/SuggestionDetailsModal/PlainSuggestionContents.js b/server/zanata-frontend/src/app/editor/containers/SuggestionDetailsModal/PlainSuggestionContents.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/containers/SuggestionDetailsModal/PlainSuggestionContents.js
rename to server/zanata-frontend/src/app/editor/containers/SuggestionDetailsModal/PlainSuggestionContents.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/containers/SuggestionDetailsModal/index.css b/server/zanata-frontend/src/app/editor/containers/SuggestionDetailsModal/index.css
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/containers/SuggestionDetailsModal/index.css
rename to server/zanata-frontend/src/app/editor/containers/SuggestionDetailsModal/index.css
diff --git a/server/zanata-frontend/src/frontend/app/editor/containers/SuggestionDetailsModal/index.js b/server/zanata-frontend/src/app/editor/containers/SuggestionDetailsModal/index.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/containers/SuggestionDetailsModal/index.js
rename to server/zanata-frontend/src/app/editor/containers/SuggestionDetailsModal/index.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/containers/SuggestionsBody.js b/server/zanata-frontend/src/app/editor/containers/SuggestionsBody.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/containers/SuggestionsBody.js
rename to server/zanata-frontend/src/app/editor/containers/SuggestionsBody.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/containers/SuggestionsHeader.js b/server/zanata-frontend/src/app/editor/containers/SuggestionsHeader.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/containers/SuggestionsHeader.js
rename to server/zanata-frontend/src/app/editor/containers/SuggestionsHeader.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/containers/SuggestionsPanel.js b/server/zanata-frontend/src/app/editor/containers/SuggestionsPanel.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/containers/SuggestionsPanel.js
rename to server/zanata-frontend/src/app/editor/containers/SuggestionsPanel.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/containers/TranslationInfoPanel/index.js b/server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/index.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/containers/TranslationInfoPanel/index.js
rename to server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/index.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/containers/ZanataLogoLoader.js b/server/zanata-frontend/src/app/editor/containers/ZanataLogoLoader.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/containers/ZanataLogoLoader.js
rename to server/zanata-frontend/src/app/editor/containers/ZanataLogoLoader.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/css/README.md b/server/zanata-frontend/src/app/editor/css/README.md
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/css/README.md
rename to server/zanata-frontend/src/app/editor/css/README.md
diff --git a/server/zanata-frontend/src/frontend/app/editor/css/base/index.css b/server/zanata-frontend/src/app/editor/css/base/index.css
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/css/base/index.css
rename to server/zanata-frontend/src/app/editor/css/base/index.css
diff --git a/server/zanata-frontend/src/frontend/app/editor/css/base/lib/forms.css b/server/zanata-frontend/src/app/editor/css/base/lib/forms.css
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/css/base/lib/forms.css
rename to server/zanata-frontend/src/app/editor/css/base/lib/forms.css
diff --git a/server/zanata-frontend/src/frontend/app/editor/css/base/lib/global.css b/server/zanata-frontend/src/app/editor/css/base/lib/global.css
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/css/base/lib/global.css
rename to server/zanata-frontend/src/app/editor/css/base/lib/global.css
diff --git a/server/zanata-frontend/src/frontend/app/editor/css/base/lib/headings.css b/server/zanata-frontend/src/app/editor/css/base/lib/headings.css
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/css/base/lib/headings.css
rename to server/zanata-frontend/src/app/editor/css/base/lib/headings.css
diff --git a/server/zanata-frontend/src/frontend/app/editor/css/base/lib/links.css b/server/zanata-frontend/src/app/editor/css/base/lib/links.css
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/css/base/lib/links.css
rename to server/zanata-frontend/src/app/editor/css/base/lib/links.css
diff --git a/server/zanata-frontend/src/frontend/app/editor/css/base/lib/lists.css b/server/zanata-frontend/src/app/editor/css/base/lib/lists.css
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/css/base/lib/lists.css
rename to server/zanata-frontend/src/app/editor/css/base/lib/lists.css
diff --git a/server/zanata-frontend/src/frontend/app/editor/css/base/lib/media.css b/server/zanata-frontend/src/app/editor/css/base/lib/media.css
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/css/base/lib/media.css
rename to server/zanata-frontend/src/app/editor/css/base/lib/media.css
diff --git a/server/zanata-frontend/src/frontend/app/editor/css/base/lib/misc.css b/server/zanata-frontend/src/app/editor/css/base/lib/misc.css
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/css/base/lib/misc.css
rename to server/zanata-frontend/src/app/editor/css/base/lib/misc.css
diff --git a/server/zanata-frontend/src/frontend/app/editor/css/base/lib/text.css b/server/zanata-frontend/src/app/editor/css/base/lib/text.css
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/css/base/lib/text.css
rename to server/zanata-frontend/src/app/editor/css/base/lib/text.css
diff --git a/server/zanata-frontend/src/frontend/app/editor/css/heading/index.css b/server/zanata-frontend/src/app/editor/css/heading/index.css
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/css/heading/index.css
rename to server/zanata-frontend/src/app/editor/css/heading/index.css
diff --git a/server/zanata-frontend/src/frontend/app/editor/css/links/index.css b/server/zanata-frontend/src/app/editor/css/links/index.css
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/css/links/index.css
rename to server/zanata-frontend/src/app/editor/css/links/index.css
diff --git a/server/zanata-frontend/src/frontend/app/editor/css/resizer/index.css b/server/zanata-frontend/src/app/editor/css/resizer/index.css
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/css/resizer/index.css
rename to server/zanata-frontend/src/app/editor/css/resizer/index.css
diff --git a/server/zanata-frontend/src/frontend/app/editor/css/theme/index.css b/server/zanata-frontend/src/app/editor/css/theme/index.css
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/css/theme/index.css
rename to server/zanata-frontend/src/app/editor/css/theme/index.css
diff --git a/server/zanata-frontend/src/frontend/app/editor/css/theme/lib/theme-map.css b/server/zanata-frontend/src/app/editor/css/theme/lib/theme-map.css
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/css/theme/lib/theme-map.css
rename to server/zanata-frontend/src/app/editor/css/theme/lib/theme-map.css
diff --git a/server/zanata-frontend/src/frontend/app/editor/css/theme/lib/theme.css b/server/zanata-frontend/src/app/editor/css/theme/lib/theme.css
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/css/theme/lib/theme.css
rename to server/zanata-frontend/src/app/editor/css/theme/lib/theme.css
diff --git a/server/zanata-frontend/src/frontend/app/editor/css/utils-background/index.css b/server/zanata-frontend/src/app/editor/css/utils-background/index.css
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/css/utils-background/index.css
rename to server/zanata-frontend/src/app/editor/css/utils-background/index.css
diff --git a/server/zanata-frontend/src/frontend/app/editor/css/utils-display/index.css b/server/zanata-frontend/src/app/editor/css/utils-display/index.css
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/css/utils-display/index.css
rename to server/zanata-frontend/src/app/editor/css/utils-display/index.css
diff --git a/server/zanata-frontend/src/frontend/app/editor/css/utils-layout/index.css b/server/zanata-frontend/src/app/editor/css/utils-layout/index.css
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/css/utils-layout/index.css
rename to server/zanata-frontend/src/app/editor/css/utils-layout/index.css
diff --git a/server/zanata-frontend/src/frontend/app/editor/css/utils-list/index.css b/server/zanata-frontend/src/app/editor/css/utils-list/index.css
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/css/utils-list/index.css
rename to server/zanata-frontend/src/app/editor/css/utils-list/index.css
diff --git a/server/zanata-frontend/src/frontend/app/editor/css/utils-position/index.css b/server/zanata-frontend/src/app/editor/css/utils-position/index.css
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/css/utils-position/index.css
rename to server/zanata-frontend/src/app/editor/css/utils-position/index.css
diff --git a/server/zanata-frontend/src/frontend/app/editor/css/utils-size/index.css b/server/zanata-frontend/src/app/editor/css/utils-size/index.css
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/css/utils-size/index.css
rename to server/zanata-frontend/src/app/editor/css/utils-size/index.css
diff --git a/server/zanata-frontend/src/frontend/app/editor/css/utils-space/index.css b/server/zanata-frontend/src/app/editor/css/utils-space/index.css
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/css/utils-space/index.css
rename to server/zanata-frontend/src/app/editor/css/utils-space/index.css
diff --git a/server/zanata-frontend/src/frontend/app/editor/css/utils-text/index.css b/server/zanata-frontend/src/app/editor/css/utils-text/index.css
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/css/utils-text/index.css
rename to server/zanata-frontend/src/app/editor/css/utils-text/index.css
diff --git a/server/zanata-frontend/src/frontend/app/editor/index.css b/server/zanata-frontend/src/app/editor/index.css
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/index.css
rename to server/zanata-frontend/src/app/editor/index.css
diff --git a/server/zanata-frontend/src/frontend/app/editor/index.html b/server/zanata-frontend/src/app/editor/index.html
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/index.html
rename to server/zanata-frontend/src/app/editor/index.html
diff --git a/server/zanata-frontend/src/frontend/app/editor/index.js b/server/zanata-frontend/src/app/editor/index.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/index.js
rename to server/zanata-frontend/src/app/editor/index.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/messages/en-us.json b/server/zanata-frontend/src/app/editor/messages/en-us.json
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/messages/en-us.json
rename to server/zanata-frontend/src/app/editor/messages/en-us.json
diff --git a/server/zanata-frontend/src/frontend/app/editor/messages/index.js b/server/zanata-frontend/src/app/editor/messages/index.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/messages/index.js
rename to server/zanata-frontend/src/app/editor/messages/index.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/middlewares/call-api.js b/server/zanata-frontend/src/app/editor/middlewares/call-api.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/middlewares/call-api.js
rename to server/zanata-frontend/src/app/editor/middlewares/call-api.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/middlewares/getstate-in-actions.js b/server/zanata-frontend/src/app/editor/middlewares/getstate-in-actions.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/middlewares/getstate-in-actions.js
rename to server/zanata-frontend/src/app/editor/middlewares/getstate-in-actions.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/middlewares/index.js b/server/zanata-frontend/src/app/editor/middlewares/index.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/middlewares/index.js
rename to server/zanata-frontend/src/app/editor/middlewares/index.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/middlewares/new-context-fetch.js b/server/zanata-frontend/src/app/editor/middlewares/new-context-fetch.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/middlewares/new-context-fetch.js
rename to server/zanata-frontend/src/app/editor/middlewares/new-context-fetch.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/middlewares/state-change-dispatch.js b/server/zanata-frontend/src/app/editor/middlewares/state-change-dispatch.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/middlewares/state-change-dispatch.js
rename to server/zanata-frontend/src/app/editor/middlewares/state-change-dispatch.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/middlewares/title-update.js b/server/zanata-frontend/src/app/editor/middlewares/title-update.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/middlewares/title-update.js
rename to server/zanata-frontend/src/app/editor/middlewares/title-update.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/reducers/context-reducer.js b/server/zanata-frontend/src/app/editor/reducers/context-reducer.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/reducers/context-reducer.js
rename to server/zanata-frontend/src/app/editor/reducers/context-reducer.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/reducers/context-reducer.test.js b/server/zanata-frontend/src/app/editor/reducers/context-reducer.test.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/reducers/context-reducer.test.js
rename to server/zanata-frontend/src/app/editor/reducers/context-reducer.test.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/reducers/dropdown-reducer.js b/server/zanata-frontend/src/app/editor/reducers/dropdown-reducer.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/reducers/dropdown-reducer.js
rename to server/zanata-frontend/src/app/editor/reducers/dropdown-reducer.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/reducers/dropdown-reducer.test.js b/server/zanata-frontend/src/app/editor/reducers/dropdown-reducer.test.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/reducers/dropdown-reducer.test.js
rename to server/zanata-frontend/src/app/editor/reducers/dropdown-reducer.test.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/reducers/glossary-reducer.js b/server/zanata-frontend/src/app/editor/reducers/glossary-reducer.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/reducers/glossary-reducer.js
rename to server/zanata-frontend/src/app/editor/reducers/glossary-reducer.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/reducers/glossary-reducer.test.js b/server/zanata-frontend/src/app/editor/reducers/glossary-reducer.test.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/reducers/glossary-reducer.test.js
rename to server/zanata-frontend/src/app/editor/reducers/glossary-reducer.test.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/reducers/header-data-reducer.js b/server/zanata-frontend/src/app/editor/reducers/header-data-reducer.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/reducers/header-data-reducer.js
rename to server/zanata-frontend/src/app/editor/reducers/header-data-reducer.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/reducers/header-data-reducer.test.js b/server/zanata-frontend/src/app/editor/reducers/header-data-reducer.test.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/reducers/header-data-reducer.test.js
rename to server/zanata-frontend/src/app/editor/reducers/header-data-reducer.test.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/reducers/index.js b/server/zanata-frontend/src/app/editor/reducers/index.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/reducers/index.js
rename to server/zanata-frontend/src/app/editor/reducers/index.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/reducers/phrase-reducer/filter-status-reducer.js b/server/zanata-frontend/src/app/editor/reducers/phrase-reducer/filter-status-reducer.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/reducers/phrase-reducer/filter-status-reducer.js
rename to server/zanata-frontend/src/app/editor/reducers/phrase-reducer/filter-status-reducer.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/reducers/phrase-reducer/filter-status-reducer.test.js b/server/zanata-frontend/src/app/editor/reducers/phrase-reducer/filter-status-reducer.test.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/reducers/phrase-reducer/filter-status-reducer.test.js
rename to server/zanata-frontend/src/app/editor/reducers/phrase-reducer/filter-status-reducer.test.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/reducers/phrase-reducer/index.js b/server/zanata-frontend/src/app/editor/reducers/phrase-reducer/index.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/reducers/phrase-reducer/index.js
rename to server/zanata-frontend/src/app/editor/reducers/phrase-reducer/index.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/reducers/phrase-reducer/phrase-filter-reducer.js b/server/zanata-frontend/src/app/editor/reducers/phrase-reducer/phrase-filter-reducer.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/reducers/phrase-reducer/phrase-filter-reducer.js
rename to server/zanata-frontend/src/app/editor/reducers/phrase-reducer/phrase-filter-reducer.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/reducers/phrase-reducer/phrase-filter-reducer.test.js b/server/zanata-frontend/src/app/editor/reducers/phrase-reducer/phrase-filter-reducer.test.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/reducers/phrase-reducer/phrase-filter-reducer.test.js
rename to server/zanata-frontend/src/app/editor/reducers/phrase-reducer/phrase-filter-reducer.test.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/reducers/phrase-reducer/phrase-reducer.test.js b/server/zanata-frontend/src/app/editor/reducers/phrase-reducer/phrase-reducer.test.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/reducers/phrase-reducer/phrase-reducer.test.js
rename to server/zanata-frontend/src/app/editor/reducers/phrase-reducer/phrase-reducer.test.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/reducers/settings-reducer.js b/server/zanata-frontend/src/app/editor/reducers/settings-reducer.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/reducers/settings-reducer.js
rename to server/zanata-frontend/src/app/editor/reducers/settings-reducer.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/reducers/settings-reducer.test.js b/server/zanata-frontend/src/app/editor/reducers/settings-reducer.test.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/reducers/settings-reducer.test.js
rename to server/zanata-frontend/src/app/editor/reducers/settings-reducer.test.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/reducers/suggestions-reducer.js b/server/zanata-frontend/src/app/editor/reducers/suggestions-reducer.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/reducers/suggestions-reducer.js
rename to server/zanata-frontend/src/app/editor/reducers/suggestions-reducer.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/reducers/suggestions-reducer.test.js b/server/zanata-frontend/src/app/editor/reducers/suggestions-reducer.test.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/reducers/suggestions-reducer.test.js
rename to server/zanata-frontend/src/app/editor/reducers/suggestions-reducer.test.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/reducers/ui-reducer.js b/server/zanata-frontend/src/app/editor/reducers/ui-reducer.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/reducers/ui-reducer.js
rename to server/zanata-frontend/src/app/editor/reducers/ui-reducer.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/reducers/ui-reducer.test.js b/server/zanata-frontend/src/app/editor/reducers/ui-reducer.test.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/reducers/ui-reducer.test.js
rename to server/zanata-frontend/src/app/editor/reducers/ui-reducer.test.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/selectors/index.js b/server/zanata-frontend/src/app/editor/selectors/index.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/selectors/index.js
rename to server/zanata-frontend/src/app/editor/selectors/index.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/translations/README.md b/server/zanata-frontend/src/app/editor/translations/README.md
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/translations/README.md
rename to server/zanata-frontend/src/app/editor/translations/README.md
diff --git a/server/zanata-frontend/src/frontend/app/editor/translations/de.po b/server/zanata-frontend/src/app/editor/translations/de.po
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/translations/de.po
rename to server/zanata-frontend/src/app/editor/translations/de.po
diff --git a/server/zanata-frontend/src/frontend/app/editor/translations/fr.po b/server/zanata-frontend/src/app/editor/translations/fr.po
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/translations/fr.po
rename to server/zanata-frontend/src/app/editor/translations/fr.po
diff --git a/server/zanata-frontend/src/frontend/app/editor/translations/template.pot b/server/zanata-frontend/src/app/editor/translations/template.pot
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/translations/template.pot
rename to server/zanata-frontend/src/app/editor/translations/template.pot
diff --git a/server/zanata-frontend/src/frontend/app/editor/utils/RoutingHelpers.js b/server/zanata-frontend/src/app/editor/utils/RoutingHelpers.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/utils/RoutingHelpers.js
rename to server/zanata-frontend/src/app/editor/utils/RoutingHelpers.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/utils/Util.js b/server/zanata-frontend/src/app/editor/utils/Util.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/utils/Util.js
rename to server/zanata-frontend/src/app/editor/utils/Util.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/utils/Util.test.js b/server/zanata-frontend/src/app/editor/utils/Util.test.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/utils/Util.test.js
rename to server/zanata-frontend/src/app/editor/utils/Util.test.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/utils/doc-id-util.js b/server/zanata-frontend/src/app/editor/utils/doc-id-util.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/utils/doc-id-util.js
rename to server/zanata-frontend/src/app/editor/utils/doc-id-util.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/utils/filter-util.js b/server/zanata-frontend/src/app/editor/utils/filter-util.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/utils/filter-util.js
rename to server/zanata-frontend/src/app/editor/utils/filter-util.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/utils/log-todo.js b/server/zanata-frontend/src/app/editor/utils/log-todo.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/utils/log-todo.js
rename to server/zanata-frontend/src/app/editor/utils/log-todo.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/utils/phrase-util.js b/server/zanata-frontend/src/app/editor/utils/phrase-util.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/utils/phrase-util.js
rename to server/zanata-frontend/src/app/editor/utils/phrase-util.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/utils/phrase-util.test.js b/server/zanata-frontend/src/app/editor/utils/phrase-util.test.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/utils/phrase-util.test.js
rename to server/zanata-frontend/src/app/editor/utils/phrase-util.test.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/utils/status-util.js b/server/zanata-frontend/src/app/editor/utils/status-util.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/utils/status-util.js
rename to server/zanata-frontend/src/app/editor/utils/status-util.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/utils/status-util.test.js b/server/zanata-frontend/src/app/editor/utils/status-util.test.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/utils/status-util.test.js
rename to server/zanata-frontend/src/app/editor/utils/status-util.test.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/utils/string-utils.js b/server/zanata-frontend/src/app/editor/utils/string-utils.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/utils/string-utils.js
rename to server/zanata-frontend/src/app/editor/utils/string-utils.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/utils/string-utils.test.js b/server/zanata-frontend/src/app/editor/utils/string-utils.test.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/utils/string-utils.test.js
rename to server/zanata-frontend/src/app/editor/utils/string-utils.test.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/utils/suggestion-util.js b/server/zanata-frontend/src/app/editor/utils/suggestion-util.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/utils/suggestion-util.js
rename to server/zanata-frontend/src/app/editor/utils/suggestion-util.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/watchers/index.js b/server/zanata-frontend/src/app/editor/watchers/index.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/watchers/index.js
rename to server/zanata-frontend/src/app/editor/watchers/index.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/watchers/page-number.js b/server/zanata-frontend/src/app/editor/watchers/page-number.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/watchers/page-number.js
rename to server/zanata-frontend/src/app/editor/watchers/page-number.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/watchers/phrase-detail.js b/server/zanata-frontend/src/app/editor/watchers/phrase-detail.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/watchers/phrase-detail.js
rename to server/zanata-frontend/src/app/editor/watchers/phrase-detail.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/watchers/phrase-list.js b/server/zanata-frontend/src/app/editor/watchers/phrase-list.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/watchers/phrase-list.js
rename to server/zanata-frontend/src/app/editor/watchers/phrase-list.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/watchers/selected-phrase-searches.js b/server/zanata-frontend/src/app/editor/watchers/selected-phrase-searches.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/watchers/selected-phrase-searches.js
rename to server/zanata-frontend/src/app/editor/watchers/selected-phrase-searches.js
diff --git a/server/zanata-frontend/src/frontend/app/editor/watchers/watch.js b/server/zanata-frontend/src/app/editor/watchers/watch.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/editor/watchers/watch.js
rename to server/zanata-frontend/src/app/editor/watchers/watch.js
diff --git a/server/zanata-frontend/src/frontend/app/history.js b/server/zanata-frontend/src/app/history.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/history.js
rename to server/zanata-frontend/src/app/history.js
diff --git a/server/zanata-frontend/src/frontend/app/index.js b/server/zanata-frontend/src/app/index.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/index.js
rename to server/zanata-frontend/src/app/index.js
diff --git a/server/zanata-frontend/src/frontend/app/jsf/JsfRoot.js b/server/zanata-frontend/src/app/jsf/JsfRoot.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/jsf/JsfRoot.js
rename to server/zanata-frontend/src/app/jsf/JsfRoot.js
diff --git a/server/zanata-frontend/src/frontend/app/jsf/index.js b/server/zanata-frontend/src/app/jsf/index.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/jsf/index.js
rename to server/zanata-frontend/src/app/jsf/index.js
diff --git a/server/zanata-frontend/src/frontend/app/legacy.js b/server/zanata-frontend/src/app/legacy.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/legacy.js
rename to server/zanata-frontend/src/app/legacy.js
diff --git a/server/zanata-frontend/src/frontend/app/reducers/admin-reducer.js b/server/zanata-frontend/src/app/reducers/admin-reducer.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/reducers/admin-reducer.js
rename to server/zanata-frontend/src/app/reducers/admin-reducer.js
diff --git a/server/zanata-frontend/src/frontend/app/reducers/admin-reducer.test.js b/server/zanata-frontend/src/app/reducers/admin-reducer.test.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/reducers/admin-reducer.test.js
rename to server/zanata-frontend/src/app/reducers/admin-reducer.test.js
diff --git a/server/zanata-frontend/src/frontend/app/reducers/common-reducer.js b/server/zanata-frontend/src/app/reducers/common-reducer.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/reducers/common-reducer.js
rename to server/zanata-frontend/src/app/reducers/common-reducer.js
diff --git a/server/zanata-frontend/src/frontend/app/reducers/explore-reducer.js b/server/zanata-frontend/src/app/reducers/explore-reducer.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/reducers/explore-reducer.js
rename to server/zanata-frontend/src/app/reducers/explore-reducer.js
diff --git a/server/zanata-frontend/src/frontend/app/reducers/glossary-reducer.js b/server/zanata-frontend/src/app/reducers/glossary-reducer.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/reducers/glossary-reducer.js
rename to server/zanata-frontend/src/app/reducers/glossary-reducer.js
diff --git a/server/zanata-frontend/src/frontend/app/reducers/index.js b/server/zanata-frontend/src/app/reducers/index.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/reducers/index.js
rename to server/zanata-frontend/src/app/reducers/index.js
diff --git a/server/zanata-frontend/src/frontend/app/reducers/languages-reducer.js b/server/zanata-frontend/src/app/reducers/languages-reducer.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/reducers/languages-reducer.js
rename to server/zanata-frontend/src/app/reducers/languages-reducer.js
diff --git a/server/zanata-frontend/src/frontend/app/reducers/profile-reducer.js b/server/zanata-frontend/src/app/reducers/profile-reducer.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/reducers/profile-reducer.js
rename to server/zanata-frontend/src/app/reducers/profile-reducer.js
diff --git a/server/zanata-frontend/src/frontend/app/reducers/tmx-reducer.js b/server/zanata-frontend/src/app/reducers/tmx-reducer.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/reducers/tmx-reducer.js
rename to server/zanata-frontend/src/app/reducers/tmx-reducer.js
diff --git a/server/zanata-frontend/src/frontend/app/reducers/version-reducer.js b/server/zanata-frontend/src/app/reducers/version-reducer.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/reducers/version-reducer.js
rename to server/zanata-frontend/src/app/reducers/version-reducer.js
diff --git a/server/zanata-frontend/src/frontend/app/reducers/version-reducer.test.js b/server/zanata-frontend/src/app/reducers/version-reducer.test.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/reducers/version-reducer.test.js
rename to server/zanata-frontend/src/app/reducers/version-reducer.test.js
diff --git a/server/zanata-frontend/src/frontend/app/schemas.js b/server/zanata-frontend/src/app/schemas.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/schemas.js
rename to server/zanata-frontend/src/app/schemas.js
diff --git a/server/zanata-frontend/src/frontend/app/styles/bstrap-styleguide.less b/server/zanata-frontend/src/app/styles/bstrap-styleguide.less
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/styles/bstrap-styleguide.less
rename to server/zanata-frontend/src/app/styles/bstrap-styleguide.less
diff --git a/server/zanata-frontend/src/frontend/app/styles/gwt.less b/server/zanata-frontend/src/app/styles/gwt.less
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/styles/gwt.less
rename to server/zanata-frontend/src/app/styles/gwt.less
diff --git a/server/zanata-frontend/src/frontend/app/styles/index.less b/server/zanata-frontend/src/app/styles/index.less
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/styles/index.less
rename to server/zanata-frontend/src/app/styles/index.less
diff --git a/server/zanata-frontend/src/frontend/app/styles/style.less b/server/zanata-frontend/src/app/styles/style.less
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/styles/style.less
rename to server/zanata-frontend/src/app/styles/style.less
diff --git a/server/zanata-frontend/src/frontend/app/styles/styleguide.css b/server/zanata-frontend/src/app/styles/styleguide.css
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/styles/styleguide.css
rename to server/zanata-frontend/src/app/styles/styleguide.css
diff --git a/server/zanata-frontend/src/frontend/app/styles/variables.less b/server/zanata-frontend/src/app/styles/variables.less
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/styles/variables.less
rename to server/zanata-frontend/src/app/styles/variables.less
diff --git a/server/zanata-frontend/src/frontend/app/utils/DateHelper.js b/server/zanata-frontend/src/app/utils/DateHelper.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/utils/DateHelper.js
rename to server/zanata-frontend/src/app/utils/DateHelper.js
diff --git a/server/zanata-frontend/src/frontend/app/utils/EnumValueUtils.js b/server/zanata-frontend/src/app/utils/EnumValueUtils.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/utils/EnumValueUtils.js
rename to server/zanata-frontend/src/app/utils/EnumValueUtils.js
diff --git a/server/zanata-frontend/src/frontend/app/utils/GlossaryHelper.js b/server/zanata-frontend/src/app/utils/GlossaryHelper.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/utils/GlossaryHelper.js
rename to server/zanata-frontend/src/app/utils/GlossaryHelper.js
diff --git a/server/zanata-frontend/src/frontend/app/utils/GlossaryHelper.test.js b/server/zanata-frontend/src/app/utils/GlossaryHelper.test.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/utils/GlossaryHelper.test.js
rename to server/zanata-frontend/src/app/utils/GlossaryHelper.test.js
diff --git a/server/zanata-frontend/src/frontend/app/utils/RoutingHelpers.js b/server/zanata-frontend/src/app/utils/RoutingHelpers.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/utils/RoutingHelpers.js
rename to server/zanata-frontend/src/app/utils/RoutingHelpers.js
diff --git a/server/zanata-frontend/src/frontend/app/utils/StringUtils.js b/server/zanata-frontend/src/app/utils/StringUtils.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/utils/StringUtils.js
rename to server/zanata-frontend/src/app/utils/StringUtils.js
diff --git a/server/zanata-frontend/src/frontend/app/utils/StringUtils.test.js b/server/zanata-frontend/src/app/utils/StringUtils.test.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/utils/StringUtils.test.js
rename to server/zanata-frontend/src/app/utils/StringUtils.test.js
diff --git a/server/zanata-frontend/src/frontend/app/utils/UrlHelper.js b/server/zanata-frontend/src/app/utils/UrlHelper.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/utils/UrlHelper.js
rename to server/zanata-frontend/src/app/utils/UrlHelper.js
diff --git a/server/zanata-frontend/src/frontend/app/utils/callWithSameArgs.js b/server/zanata-frontend/src/app/utils/callWithSameArgs.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/utils/callWithSameArgs.js
rename to server/zanata-frontend/src/app/utils/callWithSameArgs.js
diff --git a/server/zanata-frontend/src/frontend/app/utils/prop-types-util.js b/server/zanata-frontend/src/app/utils/prop-types-util.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/app/utils/prop-types-util.js
rename to server/zanata-frontend/src/app/utils/prop-types-util.js
diff --git a/server/zanata-frontend/src/frontend/build/messages/app/editor/components/ActivityFeedItem/index.json b/server/zanata-frontend/src/build/messages/app/editor/components/ActivityFeedItem/index.json
similarity index 100%
rename from server/zanata-frontend/src/frontend/build/messages/app/editor/components/ActivityFeedItem/index.json
rename to server/zanata-frontend/src/build/messages/app/editor/components/ActivityFeedItem/index.json
diff --git a/server/zanata-frontend/src/frontend/docs/actions.md b/server/zanata-frontend/src/docs/actions.md
similarity index 100%
rename from server/zanata-frontend/src/frontend/docs/actions.md
rename to server/zanata-frontend/src/docs/actions.md
diff --git a/server/zanata-frontend/src/frontend/docs/build.md b/server/zanata-frontend/src/docs/build.md
similarity index 100%
rename from server/zanata-frontend/src/frontend/docs/build.md
rename to server/zanata-frontend/src/docs/build.md
diff --git a/server/zanata-frontend/src/frontend/docs/components.md b/server/zanata-frontend/src/docs/components.md
similarity index 100%
rename from server/zanata-frontend/src/frontend/docs/components.md
rename to server/zanata-frontend/src/docs/components.md
diff --git a/server/zanata-frontend/src/frontend/docs/constants.md b/server/zanata-frontend/src/docs/constants.md
similarity index 100%
rename from server/zanata-frontend/src/frontend/docs/constants.md
rename to server/zanata-frontend/src/docs/constants.md
diff --git a/server/zanata-frontend/src/frontend/docs/containers.md b/server/zanata-frontend/src/docs/containers.md
similarity index 100%
rename from server/zanata-frontend/src/frontend/docs/containers.md
rename to server/zanata-frontend/src/docs/containers.md
diff --git a/server/zanata-frontend/src/frontend/docs/esnext.md b/server/zanata-frontend/src/docs/esnext.md
similarity index 100%
rename from server/zanata-frontend/src/frontend/docs/esnext.md
rename to server/zanata-frontend/src/docs/esnext.md
diff --git a/server/zanata-frontend/src/frontend/docs/index.md b/server/zanata-frontend/src/docs/index.md
similarity index 100%
rename from server/zanata-frontend/src/frontend/docs/index.md
rename to server/zanata-frontend/src/docs/index.md
diff --git a/server/zanata-frontend/src/frontend/docs/legacy.md b/server/zanata-frontend/src/docs/legacy.md
similarity index 100%
rename from server/zanata-frontend/src/frontend/docs/legacy.md
rename to server/zanata-frontend/src/docs/legacy.md
diff --git a/server/zanata-frontend/src/frontend/docs/linting.md b/server/zanata-frontend/src/docs/linting.md
similarity index 100%
rename from server/zanata-frontend/src/frontend/docs/linting.md
rename to server/zanata-frontend/src/docs/linting.md
diff --git a/server/zanata-frontend/src/frontend/docs/middleware.md b/server/zanata-frontend/src/docs/middleware.md
similarity index 100%
rename from server/zanata-frontend/src/frontend/docs/middleware.md
rename to server/zanata-frontend/src/docs/middleware.md
diff --git a/server/zanata-frontend/src/frontend/docs/readme.md b/server/zanata-frontend/src/docs/readme.md
similarity index 100%
rename from server/zanata-frontend/src/frontend/docs/readme.md
rename to server/zanata-frontend/src/docs/readme.md
diff --git a/server/zanata-frontend/src/frontend/docs/reducers.md b/server/zanata-frontend/src/docs/reducers.md
similarity index 100%
rename from server/zanata-frontend/src/frontend/docs/reducers.md
rename to server/zanata-frontend/src/docs/reducers.md
diff --git a/server/zanata-frontend/src/frontend/docs/schemas.md b/server/zanata-frontend/src/docs/schemas.md
similarity index 100%
rename from server/zanata-frontend/src/frontend/docs/schemas.md
rename to server/zanata-frontend/src/docs/schemas.md
diff --git a/server/zanata-frontend/src/frontend/docs/scripts.md b/server/zanata-frontend/src/docs/scripts.md
similarity index 100%
rename from server/zanata-frontend/src/frontend/docs/scripts.md
rename to server/zanata-frontend/src/docs/scripts.md
diff --git a/server/zanata-frontend/src/frontend/docs/styleguide.md b/server/zanata-frontend/src/docs/styleguide.md
similarity index 100%
rename from server/zanata-frontend/src/frontend/docs/styleguide.md
rename to server/zanata-frontend/src/docs/styleguide.md
diff --git a/server/zanata-frontend/src/frontend/docs/styles.md b/server/zanata-frontend/src/docs/styles.md
similarity index 100%
rename from server/zanata-frontend/src/frontend/docs/styles.md
rename to server/zanata-frontend/src/docs/styles.md
diff --git a/server/zanata-frontend/src/frontend/docs/technology.md b/server/zanata-frontend/src/docs/technology.md
similarity index 100%
rename from server/zanata-frontend/src/frontend/docs/technology.md
rename to server/zanata-frontend/src/docs/technology.md
diff --git a/server/zanata-frontend/src/frontend/docs/testing.md b/server/zanata-frontend/src/docs/testing.md
similarity index 100%
rename from server/zanata-frontend/src/frontend/docs/testing.md
rename to server/zanata-frontend/src/docs/testing.md
diff --git a/server/zanata-frontend/src/frontend/index.html b/server/zanata-frontend/src/index.html
similarity index 100%
rename from server/zanata-frontend/src/frontend/index.html
rename to server/zanata-frontend/src/index.html
diff --git a/server/zanata-frontend/src/frontend/jest.config.js b/server/zanata-frontend/src/jest.config.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/jest.config.js
rename to server/zanata-frontend/src/jest.config.js
diff --git a/server/zanata-frontend/src/frontend/jest.config.json b/server/zanata-frontend/src/jest.config.json
similarity index 100%
rename from server/zanata-frontend/src/frontend/jest.config.json
rename to server/zanata-frontend/src/jest.config.json
diff --git a/server/zanata-frontend/src/frontend/makefile b/server/zanata-frontend/src/makefile
similarity index 100%
rename from server/zanata-frontend/src/frontend/makefile
rename to server/zanata-frontend/src/makefile
diff --git a/server/zanata-frontend/src/frontend/messages/README.md b/server/zanata-frontend/src/messages/README.md
similarity index 100%
rename from server/zanata-frontend/src/frontend/messages/README.md
rename to server/zanata-frontend/src/messages/README.md
diff --git a/server/zanata-frontend/src/frontend/messages/en-us.json b/server/zanata-frontend/src/messages/en-us.json
similarity index 100%
rename from server/zanata-frontend/src/frontend/messages/en-us.json
rename to server/zanata-frontend/src/messages/en-us.json
diff --git a/server/zanata-frontend/src/frontend/package.json b/server/zanata-frontend/src/package.json
similarity index 100%
rename from server/zanata-frontend/src/frontend/package.json
rename to server/zanata-frontend/src/package.json
diff --git a/server/zanata-frontend/src/frontend/postcss.config.js b/server/zanata-frontend/src/postcss.config.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/postcss.config.js
rename to server/zanata-frontend/src/postcss.config.js
diff --git a/server/zanata-frontend/src/frontend/scripts/build-icon-spritesheet.js b/server/zanata-frontend/src/scripts/build-icon-spritesheet.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/scripts/build-icon-spritesheet.js
rename to server/zanata-frontend/src/scripts/build-icon-spritesheet.js
diff --git a/server/zanata-frontend/src/frontend/scripts/build.js b/server/zanata-frontend/src/scripts/build.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/scripts/build.js
rename to server/zanata-frontend/src/scripts/build.js
diff --git a/server/zanata-frontend/src/frontend/scripts/codemods/create-component.js b/server/zanata-frontend/src/scripts/codemods/create-component.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/scripts/codemods/create-component.js
rename to server/zanata-frontend/src/scripts/codemods/create-component.js
diff --git a/server/zanata-frontend/src/frontend/scripts/codemods/stateful.template.js b/server/zanata-frontend/src/scripts/codemods/stateful.template.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/scripts/codemods/stateful.template.js
rename to server/zanata-frontend/src/scripts/codemods/stateful.template.js
diff --git a/server/zanata-frontend/src/frontend/scripts/codemods/stateless.template.js b/server/zanata-frontend/src/scripts/codemods/stateless.template.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/scripts/codemods/stateless.template.js
rename to server/zanata-frontend/src/scripts/codemods/stateless.template.js
diff --git a/server/zanata-frontend/src/frontend/scripts/codemods/story.template.js b/server/zanata-frontend/src/scripts/codemods/story.template.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/scripts/codemods/story.template.js
rename to server/zanata-frontend/src/scripts/codemods/story.template.js
diff --git a/server/zanata-frontend/src/frontend/scripts/codemods/test.template.js b/server/zanata-frontend/src/scripts/codemods/test.template.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/scripts/codemods/test.template.js
rename to server/zanata-frontend/src/scripts/codemods/test.template.js
diff --git a/server/zanata-frontend/src/frontend/scripts/createIconsComponent.js b/server/zanata-frontend/src/scripts/createIconsComponent.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/scripts/createIconsComponent.js
rename to server/zanata-frontend/src/scripts/createIconsComponent.js
diff --git a/server/zanata-frontend/src/frontend/scripts/dev-server.config.js b/server/zanata-frontend/src/scripts/dev-server.config.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/scripts/dev-server.config.js
rename to server/zanata-frontend/src/scripts/dev-server.config.js
diff --git a/server/zanata-frontend/src/frontend/scripts/dev-server.js b/server/zanata-frontend/src/scripts/dev-server.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/scripts/dev-server.js
rename to server/zanata-frontend/src/scripts/dev-server.js
diff --git a/server/zanata-frontend/src/frontend/scripts/generateIconList.js b/server/zanata-frontend/src/scripts/generateIconList.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/scripts/generateIconList.js
rename to server/zanata-frontend/src/scripts/generateIconList.js
diff --git a/server/zanata-frontend/src/frontend/styleguide.config.js b/server/zanata-frontend/src/styleguide.config.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/styleguide.config.js
rename to server/zanata-frontend/src/styleguide.config.js
diff --git a/server/zanata-frontend/src/frontend/styleguide.html b/server/zanata-frontend/src/styleguide.html
similarity index 100%
rename from server/zanata-frontend/src/frontend/styleguide.html
rename to server/zanata-frontend/src/styleguide.html
diff --git a/server/zanata-frontend/src/frontend/webpack.config.js b/server/zanata-frontend/src/webpack.config.js
similarity index 100%
rename from server/zanata-frontend/src/frontend/webpack.config.js
rename to server/zanata-frontend/src/webpack.config.js
diff --git a/server/zanata-frontend/src/frontend/yarn.lock b/server/zanata-frontend/src/yarn.lock
similarity index 100%
rename from server/zanata-frontend/src/frontend/yarn.lock
rename to server/zanata-frontend/src/yarn.lock