You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2020/07/21 05:18:42 UTC

[ignite-web-console] branch ignite-13038 updated: IGNITE-13038 Moved Web Console to separate repository.

This is an automated email from the ASF dual-hosted git repository.

akuznetsov pushed a commit to branch ignite-13038
in repository https://gitbox.apache.org/repos/asf/ignite-web-console.git


The following commit(s) were added to refs/heads/ignite-13038 by this push:
     new 203f20c  IGNITE-13038 Moved Web Console to separate repository.
203f20c is described below

commit 203f20c6b02639adfe0a281ced77d609b01885f7
Author: Alexey Kuznetsov <ak...@apache.org>
AuthorDate: Tue Jul 21 12:07:52 2020 +0700

    IGNITE-13038 Moved Web Console to separate repository.
---
 .gitignore                                         |   2 +
 DEVNOTES.txt                                       |  36 ++--
 {frontend/test/ci => docker/web-agent}/Dockerfile  |  32 ++-
 docker/web-agent/README.txt                        |  36 ++++
 docker/web-console/standalone/Dockerfile           |  84 ++++++++
 docker/web-console/standalone/README.txt           |  35 ++++
 .../web-console/standalone/docker-entrypoint.sh    |  14 +-
 .../web-console/standalone}/nginx/nginx.conf       |  58 +++---
 .../web-console/standalone}/nginx/web-console.conf |   4 +-
 {backend => modules/backend}/.eslintrc             |   0
 {backend => modules/backend}/.gitignore            |   0
 .../backend}/agent_dists/README.txt                |   0
 {backend => modules/backend}/app/agentSocket.js    |   0
 {backend => modules/backend}/app/agentsHandler.js  |   0
 {backend => modules/backend}/app/apiServer.js      |   0
 .../backend}/app/browsersHandler.js                |   0
 {backend => modules/backend}/app/configure.js      |   0
 {backend => modules/backend}/app/mongo.js          |   0
 {backend => modules/backend}/app/nconf.js          |   0
 {backend => modules/backend}/app/routes.js         |   0
 {backend => modules/backend}/app/schemas.js        |   0
 {backend => modules/backend}/app/settings.js       |   0
 .../backend}/config/settings.json.sample           |   0
 .../backend}/errors/AppErrorException.js           |   0
 .../backend}/errors/AuthFailedException.js         |   0
 .../backend}/errors/DuplicateKeyException.js       |   0
 .../backend}/errors/IllegalAccessError.js          |   0
 .../backend}/errors/IllegalArgumentException.js    |   0
 .../errors/MissingConfirmRegistrationException.js  |   0
 .../backend}/errors/MissingResourceException.js    |   0
 .../backend}/errors/ServerErrorException.js        |   0
 {backend => modules/backend}/errors/index.js       |   0
 {backend => modules/backend}/index.js              |   0
 {backend => modules/backend}/injector.js           |   0
 {backend => modules/backend}/launch-tools.js       |   0
 {backend => modules/backend}/middlewares/api.js    |   0
 {backend => modules/backend}/middlewares/demo.js   |   0
 {backend => modules/backend}/middlewares/host.js   |   0
 {backend => modules/backend}/middlewares/user.js   |   0
 .../migrations/1502249492000-invalidate_rename.js  |   0
 .../migrations/1502432624000-cache-index.js        |   0
 .../migrations/1504672035000-igfs-index.js         |   0
 .../migrations/1505114649000-models-index.js       |   0
 .../1508395969410-init-registered-date.js          |   0
 .../migrations/1516948939797-migrate-configs.js    |   0
 .../1547440382485-account-make-email-unique.js     |   0
 {backend => modules/backend}/migrations/README.txt |   0
 .../backend}/migrations/migration-utils.js         |   0
 {backend => modules/backend}/package-lock.json     |   0
 {backend => modules/backend}/package.json          |   0
 {backend => modules/backend}/routes/activities.js  |   0
 {backend => modules/backend}/routes/admin.js       |   0
 {backend => modules/backend}/routes/caches.js      |   0
 {backend => modules/backend}/routes/clusters.js    |   0
 .../backend}/routes/configuration.js               |   0
 {backend => modules/backend}/routes/demo.js        |   0
 .../backend}/routes/demo/caches.json               |   0
 .../backend}/routes/demo/clusters.json             |   0
 .../backend}/routes/demo/domains.json              |   0
 .../backend}/routes/demo/igfss.json                |   0
 {backend => modules/backend}/routes/domains.js     |   0
 {backend => modules/backend}/routes/downloads.js   |   0
 {backend => modules/backend}/routes/igfss.js       |   0
 {backend => modules/backend}/routes/notebooks.js   |   0
 {backend => modules/backend}/routes/profile.js     |   0
 {backend => modules/backend}/routes/public.js      |   0
 {backend => modules/backend}/services/Utils.js     |   0
 .../backend}/services/activities.js                |   0
 {backend => modules/backend}/services/auth.js      |   0
 {backend => modules/backend}/services/caches.js    |   0
 {backend => modules/backend}/services/clusters.js  |   0
 .../backend}/services/configurations.js            |   0
 {backend => modules/backend}/services/domains.js   |   0
 {backend => modules/backend}/services/downloads.js |   0
 {backend => modules/backend}/services/igfss.js     |   0
 {backend => modules/backend}/services/mails.js     |   0
 {backend => modules/backend}/services/notebooks.js |   0
 .../backend}/services/notifications.js             |   0
 {backend => modules/backend}/services/sessions.js  |   0
 {backend => modules/backend}/services/spaces.js    |   0
 {backend => modules/backend}/services/users.js     |   0
 {backend => modules/backend}/templates/base.html   |   0
 {backend => modules/backend}/test/app/db.js        |   0
 {backend => modules/backend}/test/app/httpAgent.js |   0
 {backend => modules/backend}/test/app/mail.js      |   0
 {backend => modules/backend}/test/app/settings.js  |   0
 .../backend}/test/config/settings.json             |   0
 .../backend}/test/data/accounts.json               |   0
 {backend => modules/backend}/test/data/caches.json |   0
 .../backend}/test/data/clusters.json               |   0
 .../backend}/test/data/domains.json                |   0
 {backend => modules/backend}/test/data/igfss.json  |   0
 {backend => modules/backend}/test/data/spaces.json |   0
 {backend => modules/backend}/test/index.js         |   0
 {backend => modules/backend}/test/injector.js      |   0
 .../backend}/test/routes/clusters.js               |   0
 {backend => modules/backend}/test/routes/public.js |   0
 .../backend}/test/unit/ActivitiesService.test.js   |   0
 .../backend}/test/unit/AuthService.test.js         |   0
 .../backend}/test/unit/CacheService.test.js        |   0
 .../backend}/test/unit/ClusterService.test.js      |   0
 .../backend}/test/unit/DomainService.test.js       |   0
 .../backend}/test/unit/IgfsService.test.js         |   0
 .../backend}/test/unit/Utils.test.js               |   0
 modules/compatibility/README.txt                   |   3 +
 {web-agent => modules/compatibility}/pom.xml       |  76 +++----
 .../console/configuration/FieldProcessingInfo.java |   0
 .../ignite/console/configuration/MetadataInfo.java |   0
 .../WebConsoleConfigurationSelfTest.java           |   1 -
 .../ignite/console/configuration/WrongFields.java  |   0
 .../console/testsuites/WebConsoleTestSuite.java    |   0
 {e2e => modules/e2e}/docker-compose.yml            |   0
 {e2e => modules/e2e}/testcafe/.eslintrc            |   0
 {e2e => modules/e2e}/testcafe/Dockerfile           |   0
 .../e2e}/testcafe/components/FormField.js          |   0
 .../e2e}/testcafe/components/ListEditable.js       |   0
 .../e2e}/testcafe/components/PanelCollapsible.js   |   0
 {e2e => modules/e2e}/testcafe/components/Table.js  |   0
 .../e2e}/testcafe/components/confirmation.js       |   0
 .../e2e}/testcafe/components/modalInput.js         |   0
 .../e2e}/testcafe/components/no-data.js            |   0
 .../e2e}/testcafe/components/notifications.js      |   0
 .../components/pageAdvancedConfiguration.js        |   0
 .../e2e}/testcafe/components/pageConfiguration.js  |   0
 .../e2e}/testcafe/components/topNavigation.js      |   0
 .../e2e}/testcafe/components/userMenu.js           |   0
 .../e2e}/testcafe/environment/envtools.js          |   0
 .../e2e}/testcafe/environment/launch-env.js        |   0
 .../e2e}/testcafe/fixtures/admin-panel.js          |   8 +-
 .../e2e}/testcafe/fixtures/auth/forgot-password.js |   3 +-
 .../e2e}/testcafe/fixtures/auth/logout.js          |   2 +-
 .../fixtures/auth/signup-validation-local.js       |   0
 .../e2e}/testcafe/fixtures/auth/signup.js          |   2 +-
 .../e2e}/testcafe/fixtures/configuration/basic.js  |   0
 .../configuration/clusterFormChangeDetection.js    |   0
 .../fixtures/configuration/newClusterWithCache.js  |   0
 .../testcafe/fixtures/configuration/overview.js    |   1 -
 .../e2e}/testcafe/fixtures/menu-smoke.js           |   8 +-
 .../testcafe/fixtures/queries/notebooks-list.js    |   8 +-
 .../testcafe/fixtures/user-profile/credentials.js  |   4 +-
 .../e2e}/testcafe/fixtures/user-profile/profile.js |   5 +-
 {e2e => modules/e2e}/testcafe/helpers.js           |   0
 {e2e => modules/e2e}/testcafe/index.js             |   0
 {e2e => modules/e2e}/testcafe/package.json         |   0
 .../PageConfigurationAdvancedCluster.js            |   0
 .../testcafe/page-models/PageConfigurationBasic.js |   0
 .../page-models/PageConfigurationOverview.js       |   0
 .../e2e}/testcafe/page-models/PageQueries.js       |   9 +-
 .../page-models/pageConfigurationAdvancedIGFS.js   |   0
 .../page-models/pageConfigurationAdvancedModels.js |   0
 .../testcafe/page-models/pageForgotPassword.js     |   0
 .../e2e}/testcafe/page-models/pageProfile.js       |   0
 .../e2e}/testcafe/page-models/pageSignin.js        |   0
 .../e2e}/testcafe/page-models/pageSignup.js        |   0
 {e2e => modules/e2e}/testcafe/roles.js             |   4 +-
 {e2e => modules/e2e}/testcafe/testcafe-runner.js   |   0
 {e2e => modules/e2e}/testenv/Dockerfile            |   0
 {e2e => modules/e2e}/testenv/nginx/nginx.conf      |   0
 .../e2e}/testenv/nginx/web-console.conf            |   0
 {frontend => modules/frontend}/.babelrc            |   0
 {frontend => modules/frontend}/.eslintrc           |   0
 {frontend => modules/frontend}/.gitignore          |   0
 {frontend => modules/frontend}/app/app.config.js   |  10 +-
 {frontend => modules/frontend}/app/app.d.ts        |   0
 {frontend => modules/frontend}/app/app.js          |  13 +-
 .../frontend}/app/browserUpdate/index.js           |   0
 .../frontend}/app/browserUpdate/style.scss         |   0
 .../activities-user-dialog.controller.js           |   0
 .../activities-user-dialog.tpl.pug                 |   0
 .../app/components/activities-user-dialog/index.js |   0
 .../app/components/breadcrumbs/component.js        |   0
 .../frontend}/app/components/breadcrumbs/index.js  |   0
 .../app/components/breadcrumbs/style.scss          |   0
 .../app/components/breadcrumbs/template.pug        |   0
 .../app/components/bs-select-menu/controller.js    |   0
 .../app/components/bs-select-menu/directive.js     |   0
 .../app/components/bs-select-menu/index.js         |   0
 .../app/components/bs-select-menu/index.spec.js    |   0
 .../app/components/bs-select-menu/strip.filter.js  |   0
 .../app/components/bs-select-menu/style.scss       |   0
 .../app/components/bs-select-menu/template.pug     |   0
 .../bs-select-menu/transcludeToBody.directive.js   |   0
 .../components/cluster-security-icon/component.js  |   0
 .../app/components/cluster-security-icon/index.js  |   0
 .../components/cluster-security-icon/template.pug  |   0
 .../app/components/cluster-selector/component.js   |   0
 .../app/components/cluster-selector/controller.js  |   4 +-
 .../app/components/cluster-selector/index.js       |   0
 .../app/components/cluster-selector/style.scss     |   0
 .../app/components/cluster-selector/template.pug   |   0
 .../connected-clusters-badge/controller.js         |   0
 .../components/connected-clusters-badge/index.js   |   0
 .../components/connected-clusters-badge/style.scss |   0
 .../connected-clusters-badge/template.pug          |   0
 .../components/cell-logout/index.js                |   0
 .../components/cell-logout/template.pug            |   0
 .../components/cell-status/index.ts                |   0
 .../components/list/column-defs.js                 |   0
 .../components/list/controller.js                  |   0
 .../components/list/index.js                       |   0
 .../components/list/style.scss                     |   0
 .../components/list/template.tpl.pug               |   0
 .../connected-clusters-dialog/controller.js        |   0
 .../components/connected-clusters-dialog/index.js  |   0
 .../connected-clusters-dialog/service.js           |   0
 .../connected-clusters-dialog/style.scss           |   0
 .../connected-clusters-dialog/template.tpl.pug     |   0
 .../dialog-admin-create-user/component.ts          |   0
 .../dialog-admin-create-user/controller.ts         |   0
 .../components/dialog-admin-create-user/index.ts   |   0
 .../components/dialog-admin-create-user/state.ts   |   0
 .../dialog-admin-create-user/template.pug          |   0
 .../components/form-field-size/controller.ts       |   0
 .../form-field/components/form-field-size/index.js |   0
 .../components/form-field-size/style.scss          |   0
 .../components/form-field-size/template.pug        |   0
 .../form-field/copyInputValueButton.directive.js   |   0
 .../form-field/igniteFormField.directive.ts        |   0
 .../frontend}/app/components/form-field/index.js   |   2 +-
 .../form-field/showValidationError.directive.ts    |   0
 .../frontend}/app/components/form-field/style.scss |   0
 .../app/components/form-signup/component.ts        |   0
 .../app/components/form-signup/controller.ts       |   0
 .../frontend}/app/components/form-signup/index.ts  |   0
 .../app/components/form-signup/style.scss          |   0
 .../app/components/form-signup/template.pug        |   0
 .../components/global-progress-line/component.ts   |   0
 .../components/global-progress-line/controller.ts  |   0
 .../app/components/global-progress-line/index.ts   |   0
 .../app/components/global-progress-line/style.scss |   0
 .../components/global-progress-line/template.pug   |   0
 .../components/grid-column-selector/component.js   |   0
 .../components/grid-column-selector/controller.js  |   0
 .../grid-column-selector/controller.spec.js        |   0
 .../app/components/grid-column-selector/index.js   |   0
 .../app/components/grid-column-selector/style.scss |   0
 .../components/grid-column-selector/template.pug   |   0
 .../app/components/grid-export/component.js        |   0
 .../frontend}/app/components/grid-export/index.js  |   0
 .../app/components/grid-export/style.scss          |   0
 .../app/components/grid-export/template.pug        |   0
 .../app/components/grid-item-selected/component.js |   0
 .../components/grid-item-selected/controller.js    |   0
 .../app/components/grid-item-selected/index.js     |   0
 .../app/components/grid-item-selected/style.scss   |   0
 .../app/components/grid-item-selected/template.pug |   0
 .../app/components/grid-no-data/component.js       |   0
 .../app/components/grid-no-data/controller.js      |   0
 .../frontend}/app/components/grid-no-data/index.js |   0
 .../app/components/grid-no-data/style.scss         |   0
 .../app/components/grid-showing-rows/component.js  |   0
 .../app/components/grid-showing-rows/controller.js |   0
 .../app/components/grid-showing-rows/index.js      |   0
 .../app/components/grid-showing-rows/style.scss    |   0
 .../components/grid-showing-rows/template.tpl.pug  |   0
 .../ignite-chart-series-selector/component.js      |   0
 .../ignite-chart-series-selector/controller.js     |   0
 .../ignite-chart-series-selector/index.js          |   0
 .../ignite-chart-series-selector/template.pug      |   0
 .../app/components/ignite-chart/component.ts       |   2 +-
 .../components/chart-no-data/component.ts          |   0
 .../components/chart-no-data/controller.ts         |   2 +-
 .../ignite-chart/components/chart-no-data/index.ts |   0
 .../components/chart-no-data/template.tpl.pug      |   0
 .../app/components/ignite-chart/controller.js      |   0
 .../frontend}/app/components/ignite-chart/index.js |   0
 .../app/components/ignite-chart/style.scss         |   0
 .../app/components/ignite-chart/template.tpl.pug   |   0
 .../app/components/ignite-icon/directive.js        |   0
 .../frontend}/app/components/ignite-icon/index.js  |   0
 .../app/components/ignite-icon/service.js          |   0
 .../app/components/ignite-icon/style.scss          |   0
 .../frontend}/app/components/input-dialog/index.js |   0
 .../input-dialog/input-dialog.controller.js        |   0
 .../input-dialog/input-dialog.service.ts           |   0
 .../components/input-dialog/input-dialog.tpl.pug   |   0
 .../app/components/list-editable/component.js      |   0
 .../component.spec.js                              |   0
 .../list-editable-add-item-button/component.ts     |   0
 .../has-items-template.pug                         |   0
 .../list-editable-add-item-button/index.ts         |   0
 .../no-items-template.pug                          |   0
 .../list-editable-add-item-button/style.scss       |   0
 .../list-editable-cols/cols.directive.js           |   0
 .../components/list-editable-cols/cols.style.scss  |   0
 .../list-editable-cols/cols.template.pug           |   0
 .../components/list-editable-cols/index.js         |   0
 .../components/list-editable-cols/row.directive.js |   0
 .../components/list-editable-one-way/directive.ts  |   0
 .../components/list-editable-one-way/index.ts      |   0
 .../list-editable-save-on-changes/directives.ts    |   2 +-
 .../list-editable-save-on-changes/index.ts         |   2 +-
 .../list-editable-transclude/directive.ts          |   0
 .../components/list-editable-transclude/index.ts   |   0
 .../app/components/list-editable/controller.ts     |   0
 .../app/components/list-editable/index.ts          |   0
 .../app/components/list-editable/style.scss        |   0
 .../app/components/list-editable/template.pug      |   0
 .../list-of-registered-users/categories.js         |   0
 .../list-of-registered-users/column-defs.js        |   0
 .../list-of-registered-users/controller.js         |   0
 .../components/list-of-registered-users/index.js   |   0
 .../components/list-of-registered-users/style.scss |   0
 .../list-of-registered-users/template.tpl.pug      |   0
 .../frontend}/app/components/no-data/component.ts  |   0
 .../frontend}/app/components/no-data/controller.ts |   0
 .../frontend}/app/components/no-data/index.ts      |   0
 .../frontend}/app/components/no-data/style.scss    |   0
 .../app/components/no-data/template.tpl.pug        |   0
 .../app/components/page-admin/controller.ts        |   0
 .../frontend}/app/components/page-admin/index.js   |   0
 .../frontend}/app/components/page-admin/style.scss |   0
 .../app/components/page-admin/template.tpl.pug     |   0
 .../components/page-forgot-password/component.js   |   0
 .../components/page-forgot-password/controller.js  |   0
 .../app/components/page-forgot-password/index.js   |   0
 .../app/components/page-forgot-password/run.js     |   0
 .../app/components/page-forgot-password/style.scss |   0
 .../components/page-forgot-password/template.pug   |   0
 .../app/components/page-forgot-password/types.ts   |   0
 .../frontend}/app/components/page-landing/index.js |   0
 .../app/components/page-landing/public.pug         |   0
 .../app/components/page-landing/style.scss         |   0
 .../app/components/page-landing/template.pug       |   0
 .../components/page-password-changed/controller.ts |   0
 .../app/components/page-password-changed/index.js  |   0
 .../components/page-password-changed/style.scss    |   0
 .../components/page-password-changed/template.pug  |   0
 .../components/page-password-reset/controller.js   |   0
 .../app/components/page-password-reset/index.js    |   0
 .../app/components/page-password-reset/style.scss  |   0
 .../components/page-password-reset/template.pug    |   0
 .../app/components/page-profile/component.js       |   0
 .../app/components/page-profile/controller.js      |   0
 .../frontend}/app/components/page-profile/index.js |   0
 .../app/components/page-profile/style.scss         |   0
 .../app/components/page-profile/template.pug       |   0
 .../app/components/page-queries/component.js       |   0
 .../ignite-information/information.directive.js    |   0
 .../components/ignite-information/information.pug  |   0
 .../components/ignite-information/information.scss |   0
 .../components/query-actions-button/component.ts   |   0
 .../components/query-actions-button/controller.ts  |   0
 .../components/query-actions-button/template.pug   |   0
 .../components/queries-notebook/controller.ts      |  20 +-
 .../components/queries-notebook/index.js           |   2 +-
 .../components/queries-notebook/style.scss         |   0
 .../components/queries-notebook/template.tpl.pug   |   0
 .../queries-notebooks-list/controller.js           |   0
 .../components/queries-notebooks-list/index.js     |   2 +-
 .../components/queries-notebooks-list/style.scss   |   0
 .../queries-notebooks-list/template.tpl.pug        |   0
 .../frontend}/app/components/page-queries/index.ts |   2 +-
 .../app/components/page-queries/notebook.data.js   |   0
 .../components/page-queries/notebook.service.js    |   0
 .../app/components/page-queries/style.scss         |   0
 .../app/components/page-queries/template.tpl.pug   |   0
 .../app/components/page-signin/component.ts        |   0
 .../app/components/page-signin/controller.ts       |   0
 .../frontend}/app/components/page-signin/index.ts  |   0
 .../frontend}/app/components/page-signin/run.ts    |   2 +-
 .../app/components/page-signin/style.scss          |   0
 .../app/components/page-signin/template.pug        |   0
 .../page-signup-confirmation/component.ts          |   0
 .../page-signup-confirmation/controller.ts         |   0
 .../components/page-signup-confirmation/index.ts   |   0
 .../components/page-signup-confirmation/state.ts   |   2 +-
 .../components/page-signup-confirmation/style.scss |   0
 .../page-signup-confirmation/template.tpl.pug      |   0
 .../app/components/page-signup/component.js        |   0
 .../app/components/page-signup/controller.ts       |   2 +-
 .../frontend}/app/components/page-signup/index.js  |   0
 .../frontend}/app/components/page-signup/run.js    |   0
 .../app/components/page-signup/style.scss          |   0
 .../app/components/page-signup/template.pug        |   0
 .../app/components/panel-collapsible/component.js  |   0
 .../app/components/panel-collapsible/controller.js |   0
 .../app/components/panel-collapsible/index.js      |   0
 .../app/components/panel-collapsible/index.spec.js |   0
 .../app/components/panel-collapsible/style.scss    |   0
 .../app/components/panel-collapsible/template.pug  |   0
 .../panel-collapsible/transcludeDirective.js       |   0
 .../app/components/password-visibility/index.js    |   0
 .../components/password-visibility/index.spec.js   |   0
 .../password-visibility/root.directive.js          |   0
 .../app/components/password-visibility/style.scss  |   0
 .../password-visibility/toggle-button.component.js |   0
 .../permanent-notifications}/component.ts          |   0
 .../permanent-notifications/controller.ts          |   0
 .../components/permanent-notifications/index.ts    |   0
 .../components/permanent-notifications/style.scss  |   0
 .../permanent-notifications/template.pug           |   0
 .../app/components/progress-line/component.js      |   0
 .../app/components/progress-line/controller.js     |   0
 .../app/components/progress-line/index.js          |   0
 .../app/components/progress-line/index.spec.js     |   0
 .../app/components/progress-line/style.scss        |   0
 .../app/components/progress-line/template.pug      |   0
 .../protect-from-bs-select-render/directive.js     |   0
 .../protect-from-bs-select-render/index.js         |   0
 .../app/components/status-output/component.ts      |   0
 .../components/status-output/componentFactory.ts   |   0
 .../app/components/status-output/controller.ts     |   2 +-
 .../app/components/status-output/index.ts          |   1 +
 .../app/components/status-output/style.scss        |   0
 .../app/components/status-output/template.tpl.pug  |   0
 .../app/components/timed-redirection/component.ts  |   0
 .../app/components/timed-redirection/controller.ts |   0
 .../app/components/timed-redirection/index.ts      |   0
 .../app/components/timed-redirection/style.scss    |   0
 .../app/components/timed-redirection/template.pug  |   0
 .../components/ui-grid-column-resizer/directive.js |   0
 .../app/components/ui-grid-column-resizer/index.js |   0
 .../app/components/ui-grid-filters/directive.js    |   0
 .../app/components/ui-grid-filters/index.js        |   0
 .../app/components/ui-grid-filters/style.scss      |   0
 .../app/components/ui-grid-filters/template.pug    |   0
 .../app/components/ui-grid-hovering/cell.js        |   0
 .../app/components/ui-grid-hovering/hovering.js    |   0
 .../app/components/ui-grid-hovering/index.js       |   0
 .../app/components/ui-grid-hovering/style.scss     |   0
 .../app/components/ui-grid-hovering/viewport.js    |   0
 .../frontend}/app/components/ui-grid/component.js  |   0
 .../frontend}/app/components/ui-grid/controller.js |   0
 .../frontend}/app/components/ui-grid/decorator.js  |   0
 .../frontend}/app/components/ui-grid/index.js      |   0
 .../frontend}/app/components/ui-grid/style.scss    |   0
 .../frontend}/app/components/ui-grid/template.pug  |   0
 .../components/user-notifications/controller.js    |   0
 .../app/components/user-notifications/index.js     |   0
 .../app/components/user-notifications/service.js   |   0
 .../app/components/user-notifications/style.scss   |   0
 .../components/user-notifications/template.tpl.pug |   0
 .../app/components/version-picker/component.js     |   0
 .../app/components/version-picker/index.js         |   0
 .../app/components/version-picker/style.scss       |   0
 .../app/components/version-picker/template.pug     |   0
 .../app/components/web-console-footer/component.js |   0
 .../components/web-console-footer/controller.ts    |   0
 .../app/components/web-console-footer/index.js     |   0
 .../app/components/web-console-footer/style.scss   |   0
 .../app/components/web-console-footer/template.pug |   0
 .../app/components/web-console-header/component.ts |   0
 .../components/demo-mode-button/component.ts       |   0
 .../components/demo-mode-button/controller.ts      |   0
 .../components/demo-mode-button/template.pug       |   0
 .../components/user-menu/component.ts              |   0
 .../components/user-menu/controller.ts             |   0
 .../components/user-menu/style.scss                |   0
 .../components/user-menu/template.pug              |   0
 .../web-console-header-content/component.ts        |   0
 .../web-console-header-content/controller.ts       |   0
 .../web-console-header-content/style.scss          |   0
 .../web-console-header-content/template.pug        |   0
 .../app/components/web-console-header/index.js     |   0
 .../app/components/web-console-header/style.scss   |   0
 .../app/components/web-console-header/template.pug |   0
 .../components/web-console-sidebar}/component.ts   |   0
 .../components/web-console-sidebar/controller.ts   |   0
 .../app/components/web-console-sidebar/index.ts    |   0
 .../app/components/web-console-sidebar/style.scss  |   0
 .../components/web-console-sidebar/template.pug    |   0
 .../web-console-sidebar-navigation/component.ts    |   0
 .../web-console-sidebar-navigation/controller.ts   |   0
 .../web-console-sidebar-navigation/style.scss      |   0
 .../web-console-sidebar-navigation/template.pug    |   0
 .../web-console-sidebar-overflow/component.ts      |   0
 .../web-console-sidebar-overflow/controller.ts     |   0
 .../web-console-sidebar-overflow/style.scss        |   0
 .../web-console-sidebar-overflow/template.pug      |   0
 .../button-download-project/component.ts           |   0
 .../components/button-download-project/index.ts    |   0
 .../button-download-project/template.pug           |   0
 .../components/button-import-models/component.ts   |   0
 .../components/button-import-models/index.ts       |   0
 .../components/button-import-models/style.scss     |   0
 .../components/button-import-models/template.pug   |   0
 .../components/button-preview-project/component.ts |   0
 .../components/button-preview-project/index.ts     |   0
 .../components/button-preview-project/template.pug |   0
 .../configuration/components/fakeUICanExit.spec.js |   0
 .../app/configuration/components/fakeUICanExit.ts  |   0
 .../configuration/components/formUICanExitGuard.ts |   0
 .../components/modal-import-models/component.js    |   1 -
 .../components/modal-import-models/index.ts        |   0
 .../selected-items-amount-indicator/component.ts   |   0
 .../selected-items-amount-indicator/style.scss     |   0
 .../selected-items-amount-indicator/template.pug   |   0
 .../components/modal-import-models/service.ts      |   2 +-
 .../step-indicator/component.ts                    |   0
 .../modal-import-models/step-indicator/style.scss  |   0
 .../step-indicator/template.pug                    |   0
 .../components/modal-import-models/style.scss      |   0
 .../tables-action-cell/component.ts                |   0
 .../tables-action-cell/style.scss                  |   0
 .../tables-action-cell/template.pug                |   0
 .../modal-import-models/template.tpl.pug           |   0
 .../components/modal-preview-project/component.ts  |   0
 .../components/modal-preview-project/controller.ts |   0
 .../components/modal-preview-project/index.ts      |   0
 .../components/modal-preview-project/service.ts    |   0
 .../components/modal-preview-project/style.scss    |   0
 .../components/modal-preview-project/template.pug  |   0
 .../page-configure-advanced}/component.ts          |   0
 .../components/cache-edit-form/component.ts        |   0
 .../components/cache-edit-form/controller.ts       |   0
 .../components/cache-edit-form/index.ts            |   0
 .../components/cache-edit-form}/style.scss         |   0
 .../components/cache-edit-form/template.tpl.pug    |   0
 .../cache-edit-form/templates/affinity.pug         |   0
 .../cache-edit-form/templates/concurrency.pug      |   0
 .../cache-edit-form/templates/general.pug          |   0
 .../cache-edit-form/templates/key-cfg.pug          |   0
 .../cache-edit-form/templates/memory.pug           |   0
 .../components/cache-edit-form/templates/misc.pug  |   0
 .../templates/near-cache-client.pug                |   0
 .../templates/near-cache-server.pug                |   0
 .../cache-edit-form/templates/node-filter.pug      |   0
 .../components/cache-edit-form/templates/query.pug |   0
 .../cache-edit-form/templates/rebalance.pug        |   0
 .../cache-edit-form/templates/statistics.pug       |   0
 .../components/cache-edit-form/templates/store.pug |   0
 .../components/cluster-edit-form/component.ts      |   0
 .../cluster-edit-form/controller.spec.js           |   0
 .../components/cluster-edit-form/controller.ts     |   0
 .../components/cluster-edit-form/index.ts          |   1 +
 .../components/cluster-edit-form}/style.scss       |   0
 .../components/cluster-edit-form/template.tpl.pug  |   0
 .../cluster-edit-form/templates/atomic.pug         |   0
 .../cluster-edit-form/templates/attributes.pug     |   0
 .../cluster-edit-form/templates/binary.pug         |   0
 .../cluster-edit-form/templates/cache-key-cfg.pug  |   0
 .../cluster-edit-form/templates/checkpoint.pug     |   0
 .../cluster-edit-form/templates/checkpoint/fs.pug  |   0
 .../templates/checkpoint/jdbc.pug                  |   0
 .../cluster-edit-form/templates/checkpoint/s3.pug  |   0
 .../templates/client-connector.pug                 |   0
 .../cluster-edit-form/templates/collision.pug      |   0
 .../templates/collision/custom.pug                 |   0
 .../templates/collision/fifo-queue.pug             |   0
 .../templates/collision/job-stealing.pug           |   0
 .../templates/collision/priority-queue.pug         |   0
 .../cluster-edit-form/templates/communication.pug  |   0
 .../cluster-edit-form/templates/connector.pug      |   0
 .../cluster-edit-form/templates/data-storage.pug   |   0
 .../cluster-edit-form/templates/deployment.pug     |   0
 .../cluster-edit-form/templates/discovery.pug      |   0
 .../cluster-edit-form/templates/encryption.pug     |   0
 .../cluster-edit-form/templates/events.pug         |   0
 .../cluster-edit-form/templates/failover.pug       |   0
 .../cluster-edit-form/templates/general.pug        |   0
 .../templates/general/discovery/cloud.pug          |   0
 .../templates/general/discovery/google.pug         |   0
 .../templates/general/discovery/jdbc.pug           |   0
 .../templates/general/discovery/kubernetes.pug     |   0
 .../templates/general/discovery/multicast.pug      |   0
 .../templates/general/discovery/s3.pug             |   0
 .../templates/general/discovery/shared.pug         |   0
 .../templates/general/discovery/vm.pug             |   0
 .../templates/general/discovery/zookeeper.pug      |   0
 .../retrypolicy/bounded-exponential-backoff.pug    |   0
 .../discovery/zookeeper/retrypolicy/custom.pug     |   0
 .../zookeeper/retrypolicy/exponential-backoff.pug  |   0
 .../discovery/zookeeper/retrypolicy/forever.pug    |   0
 .../discovery/zookeeper/retrypolicy/n-times.pug    |   0
 .../discovery/zookeeper/retrypolicy/one-time.pug   |   0
 .../zookeeper/retrypolicy/until-elapsed.pug        |   0
 .../cluster-edit-form/templates/hadoop.pug         |   0
 .../cluster-edit-form/templates/load-balancing.pug |   0
 .../cluster-edit-form/templates/logger.pug         |   0
 .../cluster-edit-form/templates/logger/custom.pug  |   0
 .../cluster-edit-form/templates/logger/log4j.pug   |   0
 .../cluster-edit-form/templates/logger/log4j2.pug  |   0
 .../cluster-edit-form/templates/marshaller.pug     |   0
 .../cluster-edit-form/templates/memory.pug         |   0
 .../cluster-edit-form/templates/metrics.pug        |   0
 .../cluster-edit-form/templates/misc.pug           |   0
 .../cluster-edit-form/templates/mvcc.pug           |   0
 .../cluster-edit-form/templates/odbc.pug           |   0
 .../cluster-edit-form/templates/persistence.pug    |   0
 .../cluster-edit-form/templates/service.pug        |   0
 .../cluster-edit-form/templates/sql-connector.pug  |   0
 .../components/cluster-edit-form/templates/ssl.pug |   0
 .../cluster-edit-form/templates/swap.pug           |   0
 .../cluster-edit-form/templates/thread.pug         |   0
 .../cluster-edit-form/templates/time.pug           |   0
 .../cluster-edit-form/templates/transactions.pug   |   0
 .../components/igfs-edit-form/component.ts         |   0
 .../components/igfs-edit-form/controller.ts        |   0
 .../components/igfs-edit-form/index.ts             |   1 +
 .../components/igfs-edit-form/style.scss           |   0
 .../components/igfs-edit-form/template.tpl.pug     |   0
 .../components/igfs-edit-form/templates/dual.pug   |   0
 .../igfs-edit-form/templates/fragmentizer.pug      |   0
 .../igfs-edit-form/templates/general.pug           |   0
 .../components/igfs-edit-form/templates/ipc.pug    |   0
 .../components/igfs-edit-form/templates/misc.pug   |   0
 .../igfs-edit-form/templates/secondary.pug         |   0
 .../components/model-edit-form/component.js        |   0
 .../components/model-edit-form/controller.ts       |   0
 .../components/model-edit-form/index.js            |   1 +
 .../components/model-edit-form/style.scss          |   0
 .../components/model-edit-form/template.tpl.pug    |   0
 .../model-edit-form/templates/general.pug          |   0
 .../components/model-edit-form/templates/query.pug |   0
 .../components/model-edit-form/templates/store.pug |   0
 .../page-configure-advanced-caches/component.ts    |   0
 .../page-configure-advanced-caches/controller.ts   |   8 +-
 .../page-configure-advanced-caches/index.ts        |   0
 .../page-configure-advanced-caches/template.pug    |   0
 .../page-configure-advanced-cluster/component.ts   |   0
 .../page-configure-advanced-cluster/controller.ts  |   2 +-
 .../page-configure-advanced-cluster/index.ts       |   0
 .../page-configure-advanced-cluster/template.pug   |   0
 .../page-configure-advanced-igfs/component.ts      |   0
 .../page-configure-advanced-igfs/controller.ts     |   8 +-
 .../page-configure-advanced-igfs/index.ts          |   0
 .../page-configure-advanced-igfs/template.pug      |   0
 .../page-configure-advanced-models/component.ts    |   0
 .../page-configure-advanced-models/controller.ts   |  10 +-
 .../hasIndex.template.pug                          |   0
 .../page-configure-advanced-models/index.ts        |   0
 .../keyCell.template.pug                           |   0
 .../page-configure-advanced-models/style.scss      |   0
 .../page-configure-advanced-models/template.pug    |   0
 .../valueCell.template.pug                         |   0
 .../page-configure-advanced/controller.ts          |   0
 .../components/page-configure-advanced/index.ts    |   0
 .../components/page-configure-advanced/style.scss  |   0
 .../page-configure-advanced/template.pug           |   0
 .../components/page-configure-basic/component.ts   |   0
 .../components/page-configure-basic/controller.ts  |   9 +-
 .../components/page-configure-basic/index.ts       |   0
 .../page-configure-basic/reducer.spec.js           |   8 +-
 .../components/page-configure-basic/reducer.ts     |   3 +-
 .../components/page-configure-basic/style.scss     |   0
 .../components/page-configure-basic/template.pug   |   0
 .../page-configure-overview}/component.ts          |   0
 .../pco-grid-column-categories/directive.ts        |   0
 .../page-configure-overview/controller.ts          |  23 +--
 .../components/page-configure-overview/index.ts    |   0
 .../components/page-configure-overview/style.scss  |   0
 .../page-configure-overview/template.pug           |   0
 .../components/page-configure/component.ts         |   0
 .../components/page-configure/controller.ts        |   4 +-
 .../components/page-configure/index.ts             |   0
 .../components/page-configure/style.scss           |   0
 .../components/page-configure/template.pug         |   0
 .../components/pc-items-table/component.js         |   0
 .../components/pc-items-table/controller.js        |   0
 .../components/pc-items-table/decorator.js         |   0
 .../components/pc-items-table/index.js             |   0
 .../components/pc-items-table/style.scss           |   0
 .../components/pc-items-table/template.pug         |   0
 .../components/pc-split-button/component.ts        |   0
 .../components/pc-split-button/controller.ts       |   0
 .../components/pc-split-button/index.ts            |   0
 .../components/pc-split-button/template.pug        |   0
 .../components/pc-ui-grid-filters/directive.ts     |   0
 .../components/pc-ui-grid-filters/index.ts         |   0
 .../components/pc-ui-grid-filters/style.scss       |   0
 .../components/pc-ui-grid-filters/template.pug     |   0
 .../configuration/components/pcIsInCollection.ts   |   0
 .../app/configuration/components/pcValidation.ts   |   0
 .../components/preview-panel/directive.ts          |   0
 .../components/preview-panel/index.ts              |   0
 .../configuration/components/ui-ace-java/index.ts  |   0
 .../ui-ace-java/ui-ace-java.controller.ts          |   0
 .../ui-ace-java/ui-ace-java.directive.ts           |   0
 .../components/ui-ace-java/ui-ace-java.pug         |   0
 .../components/ui-ace-spring/index.ts              |   0
 .../ui-ace-spring/ui-ace-spring.controller.ts      |   0
 .../ui-ace-spring/ui-ace-spring.directive.ts       |   0
 .../components/ui-ace-spring/ui-ace-spring.pug     |   0
 .../components/ui-ace-tabs.directive.ts            |   0
 .../configuration/components/ui-ace.controller.js  |   0
 .../frontend}/app/configuration/defaultNames.ts    |   0
 .../generator/JavaTypesNonEnum.service.spec.ts     |   3 +-
 .../generator/JavaTypesNonEnum.service.ts          |   0
 .../generator/configuration.module.js              |   1 -
 .../generator/generator/AbstractTransformer.js     |   0
 .../generator/ArtifactVersionChecker.service.js    |   0
 .../app/configuration/generator/generator/Beans.js |   0
 .../generator/generator/ConfigurationGenerator.js  |   9 +-
 .../generator/generator/Custom.service.js          |   0
 .../generator/generator/Docker.service.js          |   0
 .../generator/generator/Docker.service.spec.js     |   0
 .../generator/generator/JavaTransformer.service.js |   2 +-
 .../generator/generator/Maven.service.js           |   1 -
 .../generator/generator/PlatformGenerator.js       |   2 +-
 .../generator/generator/Properties.service.js      |   0
 .../generator/generator/Readme.service.js          |   0
 .../generator/SharpTransformer.service.js          |   0
 .../generator/SpringTransformer.service.js         |   2 +-
 .../generator/generator/StringBuilder.js           |   0
 .../generator/defaults/Cache.platform.service.js   |   0
 .../generator/generator/defaults/Cache.service.js  |   0
 .../generator/defaults/Cluster.platform.service.js |   0
 .../generator/defaults/Cluster.service.js          |   0
 .../generator/defaults/Event-groups.service.js     |   1 -
 .../generator/generator/defaults/IGFS.service.js   |   0
 .../app/configuration/icons/configuration.icon.svg |   0
 .../frontend}/app/configuration/index.lazy.ts      |   4 +-
 .../frontend}/app/configuration/index.ts           |  26 +--
 .../frontend}/app/configuration/mixins.pug         |   0
 .../frontend}/app/configuration/services/Caches.ts |   2 +-
 .../app/configuration/services/Clusters.spec.js    |   0
 .../app/configuration/services/Clusters.ts         |   2 +-
 .../services/ConfigChangesGuard.spec.js            |   0
 .../configuration/services/ConfigChangesGuard.ts   |   2 +-
 .../services/ConfigSelectionManager.ts             |   4 +-
 .../services/ConfigurationDownload.spec.js         |   0
 .../services/ConfigurationDownload.ts              |   0
 .../services/ConfigurationResource.spec.js         |   4 +-
 .../services/ConfigurationResource.ts              |   0
 .../app/configuration/services/ConfigureState.ts   |   4 +-
 .../frontend}/app/configuration/services/IGFSs.ts  |   0
 .../frontend}/app/configuration/services/Models.ts |   2 +-
 .../app/configuration/services/PageConfigure.ts    |   6 +-
 .../app/configuration/services/SummaryZipper.ts    |   0
 .../app/configuration/services/summary.worker.js   |   0
 .../frontend}/app/configuration/states.ts          |  16 +-
 .../app/configuration/store/actionCreators.js      |  16 +-
 .../app/configuration/store/actionTypes.js         |   0
 .../frontend}/app/configuration/store/effects.js   |  17 +-
 .../app/configuration/store/effects.spec.js        |   0
 .../frontend}/app/configuration/store/reducer.js   |   5 +-
 .../app/configuration/store/reducer.spec.js        |  10 +-
 .../frontend}/app/configuration/store/selectors.ts |   5 +-
 .../configuration/transitionHooks/errorState.ts    |   2 +-
 .../frontend}/app/configuration/types/index.ts     |   0
 .../app/core/activities/Activities.data.ts         |   0
 .../frontend}/app/core/admin/Admin.data.js         |   0
 {frontend => modules/frontend}/app/core/index.js   |   0
 .../frontend}/app/core/utils/maskNull.js           |   0
 .../frontend}/app/data/colors.json                 |   0
 .../frontend}/app/data/countries.json              |   0
 .../frontend}/app/data/demo-info.json              |   0
 .../frontend}/app/data/dialects.json               |   0
 .../frontend}/app/data/event-groups.json           |   0
 .../frontend}/app/data/getting-started.json        |   0
 {frontend => modules/frontend}/app/data/i18n.js    |   0
 .../frontend}/app/data/java-classes.json           |   0
 .../frontend}/app/data/java-keywords.json          |   0
 .../frontend}/app/data/java-primitives.json        |   0
 .../frontend}/app/data/jdbc-types.json             |   0
 .../frontend}/app/data/pom-dependencies.json       |   0
 .../frontend}/app/data/sql-keywords.json           |   0
 .../app/directives/auto-focus.directive.js         |   0
 .../frontend}/app/directives/btn-ignite-link.js    |   0
 .../app/directives/copy-to-clipboard.directive.js  |   0
 .../hide-on-state-change.directive.js              |   0
 .../frontend}/app/directives/match.directive.js    |   0
 .../app/directives/match.directive.spec.js         |   0
 .../app/directives/on-click-focus.directive.js     |   0
 .../directives/on-enter-focus-move.directive.js    |   0
 .../frontend}/app/directives/on-enter.directive.js |   0
 .../app/directives/on-escape.directive.js          |   0
 .../app/directives/on-focus-out.directive.js       |   0
 .../app/directives/retain-selection.directive.js   |   0
 .../frontend}/app/errors/CancellationError.js      |   0
 .../frontend}/app/filters/byName.filter.js         |   0
 .../frontend}/app/filters/bytes.filter.js          |   0
 .../frontend}/app/filters/bytes.filter.spec.js     |   4 +-
 .../frontend}/app/filters/default-name.filter.js   |   0
 .../app/filters/domainsValidation.filter.js        |   0
 .../frontend}/app/filters/duration.filter.js       |   0
 .../frontend}/app/filters/hasPojo.filter.js        |   0
 .../frontend}/app/filters/id8.filter.js            |   0
 .../app/filters/uiGridSubcategories.filter.js      |   0
 .../frontend}/app/helpers/jade/mixins.pug          |   0
 .../frontend}/app/modules/ace.module.js            |   0
 .../app/modules/agent/AgentManager.service.js      |   2 +-
 .../app/modules/agent/AgentModal.service.js        |   0
 .../frontend}/app/modules/agent/agent.module.js    |   0
 .../agent/components/cluster-login/component.js    |   0
 .../agent/components/cluster-login/index.js        |   0
 .../agent/components/cluster-login/service.js      |   0
 .../agent/components/cluster-login/template.pug    |   0
 .../app/modules/agent/decompress.worker.js         |   0
 .../frontend}/app/modules/agent/types/Cluster.js   |   0
 .../app/modules/agent/types/ClusterSecrets.js      |   0
 .../modules/agent/types/ClusterSecretsManager.js   |   0
 .../app/modules/branding/branding.module.js        |   0
 .../app/modules/branding/branding.service.js       |   0
 .../app/modules/branding/features.directive.js     |   0
 .../app/modules/branding/terms.directive.js        |   0
 .../frontend}/app/modules/cluster/Cache.js         |   0
 .../frontend}/app/modules/cluster/CacheMetrics.js  |   0
 .../frontend}/app/modules/cluster/NodeMetrics.js   |   0
 .../frontend}/app/modules/demo/Demo.module.js      |   0
 .../app/modules/dialog/dialog-content.directive.js |   0
 .../app/modules/dialog/dialog-title.directive.js   |   0
 .../app/modules/dialog/dialog.controller.js        |   0
 .../app/modules/dialog/dialog.directive.js         |   0
 .../frontend}/app/modules/dialog/dialog.factory.js |   0
 .../frontend}/app/modules/dialog/dialog.module.js  |   0
 .../frontend}/app/modules/dialog/dialog.tpl.pug    |   0
 .../form/field/bs-select-placeholder.directive.js  |   0
 .../form/field/input/autofocus.directive.js        |   0
 .../frontend}/app/modules/form/form.module.js      |   3 -
 .../app/modules/form/services/FormGUID.service.js  |   0
 .../modules/form/validator/ipaddress.directive.js  |   0
 .../validator/java-built-in-class.directive.js     |   0
 .../form/validator/java-identifier.directive.js    |   0
 .../form/validator/java-keywords.directive.js      |   0
 .../form/validator/java-package-name.directive.js  |   0
 .../validator/java-package-specified.directive.js  |   0
 .../form/validator/property-unique.directive.js    |   0
 .../property-value-specified.directive.js          |   0
 .../app/modules/form/validator/unique.directive.js |   0
 .../app/modules/form/validator/uuid.directive.js   |   0
 .../getting-started/GettingStarted.provider.js     |   5 +-
 .../app/modules/loading/loading.directive.js       |   0
 .../app/modules/loading/loading.module.js          |   0
 .../frontend}/app/modules/loading/loading.pug      |   0
 .../frontend}/app/modules/loading/loading.scss     |   0
 .../app/modules/loading/loading.service.js         |   0
 .../app/modules/navbar/Userbar.provider.js         |   0
 .../frontend}/app/modules/navbar/navbar.module.js  |   0
 .../frontend}/app/modules/nodes/Nodes.service.js   |   0
 .../app/modules/nodes/nodes-dialog.controller.js   |   0
 .../frontend}/app/modules/nodes/nodes-dialog.scss  |   0
 .../app/modules/nodes/nodes-dialog.tpl.pug         |   0
 .../frontend}/app/modules/nodes/nodes.module.js    |   0
 .../frontend}/app/modules/socket.module.js         |   0
 .../frontend}/app/modules/states/admin.state.js    |   0
 .../frontend}/app/modules/states/errors.state.js   |   0
 .../frontend}/app/modules/states/logout.state.js   |   0
 .../frontend}/app/modules/states/settings.state.js |   1 -
 .../frontend}/app/modules/user/Auth.service.ts     |   0
 .../frontend}/app/modules/user/User.service.js     |   0
 .../modules/user/emailConfirmationInterceptor.ts   |   0
 .../frontend}/app/modules/user/permissions.js      |   0
 .../frontend}/app/modules/user/user.module.js      |   0
 .../frontend}/app/primitives/badge/index.scss      |   0
 .../frontend}/app/primitives/btn-group/index.pug   |   0
 .../frontend}/app/primitives/btn/index.scss        |   0
 .../frontend}/app/primitives/checkbox/index.scss   |   0
 .../frontend}/app/primitives/datepicker/index.pug  |   0
 .../frontend}/app/primitives/datepicker/index.scss |   0
 .../frontend}/app/primitives/dropdown/index.pug    |   0
 .../frontend}/app/primitives/dropdown/index.scss   |   0
 .../app/primitives/form-field/checkbox.pug         |   0
 .../app/primitives/form-field/dropdown.pug         |   0
 .../frontend}/app/primitives/form-field/email.pug  |   0
 .../frontend}/app/primitives/form-field/error.pug  |   0
 .../frontend}/app/primitives/form-field/index.pug  |   0
 .../frontend}/app/primitives/form-field/index.scss |   0
 .../frontend}/app/primitives/form-field/input.pug  |   0
 .../frontend}/app/primitives/form-field/label.pug  |   0
 .../frontend}/app/primitives/form-field/number.pug |   0
 .../app/primitives/form-field/password.pug         |   0
 .../frontend}/app/primitives/form-field/phone.pug  |   0
 .../frontend}/app/primitives/form-field/radio.pug  |   0
 .../frontend}/app/primitives/form-field/text.pug   |   0
 .../app/primitives/form-field/tooltip.pug          |   0
 .../app/primitives/form-field/typeahead.pug        |   0
 .../frontend}/app/primitives/grid/index.scss       |   0
 .../frontend}/app/primitives/index.js              |   0
 .../frontend}/app/primitives/modal/index.scss      |   0
 .../frontend}/app/primitives/page/index.scss       |   0
 .../frontend}/app/primitives/panel/index.scss      |   0
 .../app/primitives/spinner-circle/index.scss       |   0
 .../frontend}/app/primitives/switcher/index.pug    |   0
 .../frontend}/app/primitives/switcher/index.scss   |   0
 .../frontend}/app/primitives/table/index.scss      |   0
 .../frontend}/app/primitives/tabs/index.scss       |   0
 .../frontend}/app/primitives/timepicker/index.pug  |   0
 .../frontend}/app/primitives/timepicker/index.scss |   0
 .../frontend}/app/primitives/tooltip/index.scss    |   0
 .../frontend}/app/primitives/typography/index.scss |   0
 .../app/primitives/ui-grid-header/index.scss       |   0
 .../app/primitives/ui-grid-header/index.tpl.pug    |   0
 .../app/primitives/ui-grid-settings/index.scss     |   0
 .../frontend}/app/primitives/ui-grid/index.scss    |   0
 .../app/services/AngularStrapSelect.decorator.js   |   0
 .../app/services/AngularStrapTooltip.decorator.js  |   0
 {frontend => modules/frontend}/app/services/CSV.js |   0
 .../frontend}/app/services/ChartColors.service.js  |   0
 .../frontend}/app/services/Confirm.service.js      |   0
 .../frontend}/app/services/ConfirmBatch.service.js |   0
 .../app/services/CopyToClipboard.service.js        |   0
 .../frontend}/app/services/Countries.service.js    |   0
 .../frontend}/app/services/DefaultState.js         |   0
 .../frontend}/app/services/ErrorParser.service.js  |   0
 .../frontend}/app/services/ErrorPopover.service.js |   0
 .../frontend}/app/services/Focus.service.js        |   0
 .../frontend}/app/services/FormUtils.service.js    |   0
 .../frontend}/app/services/InetAddress.service.js  |   0
 .../frontend}/app/services/JavaTypes.service.js    |   3 -
 .../frontend}/app/services/JavaTypes.spec.js       |   3 +-
 .../frontend}/app/services/LegacyTable.service.js  |   0
 .../frontend}/app/services/LegacyUtils.service.js  |   0
 .../frontend}/app/services/Messages.service.js     |   0
 .../app/services/ModelNormalizer.service.js        |   0
 .../frontend}/app/services/SqlTypes.service.js     |   2 -
 .../frontend}/app/services/Version.service.js      |   2 +-
 .../frontend}/app/services/Version.spec.js         |   5 +-
 .../frontend}/app/services/exceptionHandler.js     |   0
 .../frontend}/app/services/index.js                |   0
 .../frontend}/app/services/store.ts                |   2 +-
 .../frontend}/app/store/actions/ui.ts              |   0
 .../frontend}/app/store/actions/user.ts            |   0
 .../frontend}/app/store/effects/ui.ts              |   2 +-
 {frontend => modules/frontend}/app/store/index.ts  |   2 +-
 {frontend => modules/frontend}/app/store/ofType.ts |   0
 .../frontend}/app/store/reducers/ui.ts             |   8 +-
 .../frontend}/app/store/reduxDebug.ts              |   4 +-
 .../app/store/reduxDevtoolsIntegration.js          |   0
 .../frontend}/app/store/selectors/ui.ts            |   6 +-
 {frontend => modules/frontend}/app/style.scss      |   0
 {frontend => modules/frontend}/app/types/index.ts  |   0
 .../frontend}/app/utils/SimpleWorkerPool.js        |   4 +-
 .../frontend}/app/utils/dialogState.ts             |   2 +-
 {frontend => modules/frontend}/app/utils/id8.js    |   0
 .../frontend}/app/utils/lodashMixins.js            |   0
 .../frontend}/app/utils/uniqueName.js              |   0
 {frontend => modules/frontend}/app/vendor.js       |   0
 {frontend => modules/frontend}/index.js            |   0
 {frontend => modules/frontend}/package-lock.json   |   0
 {frontend => modules/frontend}/package.json        |   0
 {frontend => modules/frontend}/public/favicon.ico  | Bin
 .../frontend}/public/images/cache.png              | Bin
 .../frontend}/public/images/checkbox-active.svg    |   0
 .../frontend}/public/images/checkbox.svg           |   0
 .../frontend}/public/images/cluster-quick.png      | Bin
 .../frontend}/public/images/cluster.png            | Bin
 .../frontend}/public/images/collapse.svg           |   0
 .../frontend}/public/images/domains.png            | Bin
 .../frontend}/public/images/expand.svg             |   0
 .../frontend}/public/images/icons/alert.icon.svg   |   0
 .../public/images/icons/attention.icon.svg         |   0
 .../frontend}/public/images/icons/check.icon.svg   |   0
 .../public/images/icons/checkmark.icon.svg         |   0
 .../frontend}/public/images/icons/clock.icon.svg   |   0
 .../frontend}/public/images/icons/cluster.icon.svg |   0
 .../public/images/icons/collapse.icon.svg          |   0
 .../frontend}/public/images/icons/copy.icon.svg    |   0
 .../frontend}/public/images/icons/cross.icon.svg   |   0
 .../frontend}/public/images/icons/csv.icon.svg     |   0
 .../public/images/icons/download.icon.svg          |   0
 .../public/images/icons/downloadAgent.icon.svg     |   0
 .../public/images/icons/exclamation.icon.svg       |   0
 .../frontend}/public/images/icons/exit.icon.svg    |   0
 .../frontend}/public/images/icons/expand.icon.svg  |   0
 .../public/images/icons/eyeClosed.icon.svg         |   0
 .../public/images/icons/eyeOpened.icon.svg         |   0
 .../frontend}/public/images/icons/filter.icon.svg  |   0
 .../frontend}/public/images/icons/gear.icon.svg    |   0
 .../frontend}/public/images/icons/home.icon.svg    |   0
 .../frontend}/public/images/icons/index.js         |   0
 .../frontend}/public/images/icons/info.icon.svg    |   0
 .../public/images/icons/lockClosed.icon.svg        |   0
 .../public/images/icons/lockOpened.icon.svg        |   0
 .../frontend}/public/images/icons/manual.icon.svg  |   0
 .../frontend}/public/images/icons/menu.icon.svg    |   0
 .../frontend}/public/images/icons/plus.icon.svg    |   0
 .../frontend}/public/images/icons/refresh.icon.svg |   0
 .../frontend}/public/images/icons/search.icon.svg  |   0
 .../frontend}/public/images/icons/sort.icon.svg    |   0
 .../frontend}/public/images/icons/sql.icon.svg     |   0
 .../public/images/icons/structure.icon.svg         |   0
 .../frontend}/public/images/igfs.png               | Bin
 .../frontend}/public/images/ignite-logo.svg        |   0
 .../frontend}/public/images/ignite-puzzle.png      | Bin
 .../frontend}/public/images/multicluster.png       | Bin
 .../public/images/page-landing-ui-sample.png       | Bin
 .../frontend}/public/images/pb-ignite.png          | Bin
 .../frontend}/public/images/preview.png            | Bin
 .../frontend}/public/images/query-table.png        | Bin
 .../public/stylesheets/_bootstrap-custom.scss      |   0
 .../public/stylesheets/_bootstrap-variables.scss   |   0
 .../public/stylesheets/_font-awesome-custom.scss   |   0
 .../frontend}/public/stylesheets/blocks/error.scss |   0
 .../frontend}/public/stylesheets/form-field.scss   |   0
 .../frontend}/public/stylesheets/style.scss        |   0
 .../frontend}/public/stylesheets/variables.scss    |   0
 .../frontend}/test/check-doc-links/Dockerfile      |   0
 .../test/check-doc-links/check-doc-links.js        |   0
 .../test/check-doc-links/docker-compose.yml        |   0
 .../frontend}/test/ci/.dockerignore                |   0
 {frontend => modules/frontend}/test/ci/Dockerfile  |   0
 .../frontend}/test/ci/docker-compose.yml           |   0
 {frontend => modules/frontend}/test/karma.conf.js  |   0
 .../frontend}/test/unit/SqlTypes.test.js           |   5 +-
 .../frontend}/test/unit/UserAuth.test.js           |   2 +-
 .../frontend}/test/unit/defaultName.filter.test.js |   2 +-
 {frontend => modules/frontend}/tsconfig.json       |   0
 {frontend => modules/frontend}/views/base.pug      |   0
 {frontend => modules/frontend}/views/index.pug     |   0
 {frontend => modules/frontend}/views/public.pug    |   0
 .../frontend}/views/sql/cache-metadata.tpl.pug     |   0
 .../frontend}/views/sql/chart-settings.tpl.pug     |   0
 .../frontend}/views/sql/paragraph-rate.tpl.pug     |   0
 .../views/templates/agent-download.tpl.pug         |   0
 .../frontend}/views/templates/alert.tpl.pug        |   0
 .../views/templates/batch-confirm.tpl.pug          |   0
 .../frontend}/views/templates/confirm.tpl.pug      |   0
 .../frontend}/views/templates/demo-info.tpl.pug    |   0
 .../frontend}/views/templates/dropdown.tpl.pug     |   0
 .../views/templates/getting-started.tpl.pug        |   0
 .../frontend}/views/templates/message.tpl.pug      |   0
 .../views/templates/validation-error.tpl.pug       |   0
 .../frontend}/webpack/webpack.common.js            |   0
 .../frontend}/webpack/webpack.dev.js               |   0
 .../frontend}/webpack/webpack.prod.js              |   0
 .../frontend}/webpack/webpack.test.js              |   0
 {web-agent => modules/web-agent}/.gitignore        |   0
 {web-agent => modules/web-agent}/README.txt        |   0
 .../web-agent}/assembly/release-web-agent.xml      |   0
 .../web-agent}/bin/ignite-web-agent.bat            |   0
 .../web-agent}/bin/ignite-web-agent.sh             |   0
 .../web-agent}/bin/include/functions.sh            |   0
 {web-agent => modules/web-agent}/demo/README.txt   |   0
 {web-agent => modules/web-agent}/demo/db-init.sql  |   0
 .../web-agent}/jdbc-drivers/README.txt             |   0
 {web-agent => modules/web-agent}/logs/README.txt   |   0
 {web-agent => modules/web-agent}/pom.xml           |  12 +-
 .../ignite/console/agent/AgentConfiguration.java   |   0
 .../apache/ignite/console/agent/AgentLauncher.java |   0
 .../apache/ignite/console/agent/AgentUtils.java    |   0
 .../ignite/console/agent/ProxyAuthException.java   |   0
 .../ignite/console/agent/ProxyAuthenticator.java   |   0
 .../apache/ignite/console/agent/db/DbColumn.java   |   0
 .../ignite/console/agent/db/DbMetadataReader.java  |   0
 .../apache/ignite/console/agent/db/DbSchema.java   |   0
 .../apache/ignite/console/agent/db/DbTable.java    |   0
 .../agent/db/dialect/DB2MetadataDialect.java       |   0
 .../agent/db/dialect/DatabaseMetadataDialect.java  |   1 -
 .../agent/db/dialect/JdbcMetadataDialect.java      |   1 -
 .../agent/db/dialect/MySQLMetadataDialect.java     |   0
 .../agent/db/dialect/OracleMetadataDialect.java    |   1 -
 .../console/agent/handlers/AbstractListener.java   |   0
 .../console/agent/handlers/ClusterListener.java    |   0
 .../console/agent/handlers/DatabaseListener.java   |   0
 .../console/agent/handlers/RestListener.java       |   0
 .../ignite/console/agent/rest/RestExecutor.java    |   0
 .../ignite/console/agent/rest/RestResult.java      |   0
 .../ignite/console/demo/AgentClusterDemo.java      |   0
 .../apache/ignite/console/demo/AgentDemoUtils.java |   0
 .../ignite/console/demo/AgentMetadataDemo.java     |   0
 .../org/apache/ignite/console/demo/model/Car.java  |   0
 .../apache/ignite/console/demo/model/Country.java  |   0
 .../ignite/console/demo/model/Department.java      |   0
 .../apache/ignite/console/demo/model/Employee.java |   0
 .../apache/ignite/console/demo/model/Parking.java  |   0
 .../demo/service/DemoCachesLoadService.java        |   0
 .../demo/service/DemoComputeLoadService.java       |   0
 .../demo/service/DemoRandomCacheLoadService.java   |   0
 .../demo/service/DemoServiceClusterSingleton.java  |   0
 .../demo/service/DemoServiceKeyAffinity.java       |   0
 .../demo/service/DemoServiceMultipleInstances.java |   0
 .../demo/service/DemoServiceNodeSingleton.java     |   0
 .../console/demo/task/DemoCancellableTask.java     |   0
 .../ignite/console/demo/task/DemoComputeTask.java  |   0
 .../web-agent}/src/main/resources/log4j.properties |   0
 .../console/agent/rest/RestExecutorSelfTest.java   |   2 +-
 .../ignite/testsuites/IgniteWebAgentTestSuite.java |   0
 .../web-agent}/src/test/resources/ca.jks           | Bin
 .../web-agent}/src/test/resources/client.jks       | Bin
 .../web-agent}/src/test/resources/generate.bat     |   0
 .../web-agent}/src/test/resources/generate.sh      |   0
 .../src/test/resources/jetty-with-ciphers-0.xml    |   4 +-
 .../src/test/resources/jetty-with-ciphers-1.xml    |   4 +-
 .../src/test/resources/jetty-with-ciphers-2.xml    |   4 +-
 .../src/test/resources/jetty-with-ssl.xml          |   4 +-
 .../web-agent}/src/test/resources/server.jks       | Bin
 parent/pom.xml                                     | 230 +++++++++++++++++++++
 pom.xml                                            |  56 +----
 1070 files changed, 722 insertions(+), 402 deletions(-)

diff --git a/.gitignore b/.gitignore
index e99ad51..7bf9a55 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,6 @@
+*.iml
 .npmrc
 build/
 node_modules/
 package-lock.json
+.idea/
diff --git a/DEVNOTES.txt b/DEVNOTES.txt
index 417829e..531c1ea 100644
--- a/DEVNOTES.txt
+++ b/DEVNOTES.txt
@@ -2,13 +2,13 @@ Ignite Web Console Build Instructions
 =====================================
 1. Install MongoDB (version >=3.0) using instructions from http://docs.mongodb.org/manual/installation.
 2. Install Node.js (version >=8.0.0) using installer from https://nodejs.org/en/download/current for your OS.
-3. Change directory to 'modules/web-console/backend' and
+3. Change directory to 'modules/backend' and
  run "npm install --no-optional" for download backend dependencies.
-4. Change directory to 'modules/web-console/frontend' and
+4. Change directory to 'modules/frontend' and
  run "npm install --no-optional" for download frontend dependencies.
-5. Build ignite-web-agent module follow instructions from 'modules/web-console/web-agent/README.txt'.
-6. Copy ignite-web-agent-<version>.zip from 'modules/web-console/web-agent/target'
- to 'modules/web-console/backend/agent_dists' folder.
+5. Build ignite-web-agent module follow instructions from 'modules/web-agent/README.txt'.
+6. Copy ignite-web-agent-<version>.zip from 'modules/web-agent/target'
+ to 'modules/backend/agent_dists' folder.
 
 Steps 1 - 4 should be executed once.
 
@@ -17,10 +17,10 @@ Ignite Web Console Run In Development Mode
 1. Configure MongoDB to run as service or in terminal change dir to $MONGO_INSTALL_DIR/server/3.2/bin
   and start MongoDB by executing "mongod".
 
-2. In new terminal change directory to 'modules/web-console/backend'.
+2. In new terminal change directory to 'modules/backend'.
    If needed run "npm install --no-optional" (if dependencies changed) and run "npm start" to start backend.
 
-3. In new terminal change directory to 'modules/web-console/frontend'.
+3. In new terminal change directory to 'modules/frontend'.
   If needed run "npm install --no-optional" (if dependencies changed) and start webpack in development mode "npm run dev".
 
 4. In browser open: http://localhost:9000
@@ -37,7 +37,7 @@ Ignite Web Console Direct-Install Maven Build Instructions
 To build direct-install archive from sources run following command in Ignite project root folder:
 "mvn clean package -pl :ignite-web-console -am -P web-console,direct-install,lgpl -DskipTests=true -DskipClientDocs -Dmaven.javadoc.skip=true"
 
-Assembled archive can be found here: `modules/web-console/target/ignite-web-console-direct-install-*.zip`.
+Assembled archive can be found here: `modules/target/ignite-web-console-direct-install-*.zip`.
 
 
 Ignite Web Console Docker Images Build Instructions
@@ -55,8 +55,8 @@ Ignite Web Console Backend Docker Image Build Manual Instructions
 ====================================================================
 Install Docker (version >=17.05) using instructions from https://www.docker.com/community-edition.
 
-1. Build Apache Ignite Web Agent archive as described in `modules/web-console/web-agent/README.txt`.
-2. Goto Web Console's module directory: `cd modules/web-console`
+1. Build Apache Ignite Web Agent archive as described in `modules/web-agent/README.txt`.
+2. Goto Web Console's root directory.
 3. Build docker image:
 
 "docker build . -t apacheignite/web-console-backend[:<version>] -f docker/compose/backend/Dockerfile"
@@ -68,8 +68,8 @@ Ignite Web Console Frontend Docker Image Build Manual Instructions
 ====================================================================
 Install Docker (version >=17.05) using instructions from https://www.docker.com/community-edition.
 
-1. Build Apache Ignite Web Agent archive as described in `modules/web-console/web-agent/README.txt`.
-2. Goto Web Console's module directory: `cd modules/web-console`
+1. Build Apache Ignite Web Agent archive as described in `modules/web-agent/README.txt`.
+2. Goto Web Console's root directory.
 3. Build docker image:
 
 "docker build . -t apacheignite/web-console-frontend[:<version>] -f docker/compose/frontend/Dockerfile"
@@ -84,15 +84,15 @@ E2E tests are performed with TestCafe framework - https://testcafe.devexpress.co
 To launch tests on your local machine you will need:
 1. Install and launch MongoDB.
 2. Optionally install Chromium (https://www.chromium.org/getting-involved/download-chromium or https://chromium.woolyss.com).
-   You may use any other browser, just set 'BROWSERS' constant in 'modules/web-console/e2e/testcafe/index.js'.
-3. In new terminal change directory to 'modules/web-console/e2e/testcafe' folder and execute: "npm install".
+   You may use any other browser, just set 'BROWSERS' constant in 'modules/e2e/testcafe/index.js'.
+3. In new terminal change directory to 'modules/e2e/testcafe' folder and execute: "npm install".
 4. To start test environment and tests execute: "npm run test".
 
 During developing tests you may need to run some particular tests without running all suites.
 For this case you need to run environment and test separately.
 To perform it do the following:
 1. Ensure that MongoDB is up and running and all dependencies for backend and frontend are installed.
-2. Open directory "modules/web-console/e2e/testcafe" in terminal. Install dependencies for E2E testing with "npm install" command.
+2. Open directory "modules/e2e/testcafe" in terminal. Install dependencies for E2E testing with "npm install" command.
 3. Execute command "npm run env". This will start backend and frontend environment.
 4. Open another terminal window and run command "node index.js" in the same directory. This will run only tests without launching environment.
 
@@ -106,7 +106,7 @@ You can modify the following params with environment variables:
 
 You can run tests in docker:
 1. Install docker and docker-compose.
-2. Execute in terminal: "docker-compose up --build --abort-on-container-exit" in directory "modules/web-console/e2e".
+2. Execute in terminal: "docker-compose up --build --abort-on-container-exit" in directory "modules/e2e".
 3. If you need to cleanup docker container then execute "docker-compose down".
 
 
@@ -115,7 +115,7 @@ Frontend unit tests
 Unit tests are performed with Mocha framework - https://mochajs.org
 
 To launch tests on your local machine you will need:
-1. In new terminal change directory to 'modules/web-console/frontend' folder and execute: "npm install".
+1. In new terminal change directory to 'modules/frontend' folder and execute: "npm install".
 2. To start test environment and tests execute: "npm run test".
 
 
@@ -124,7 +124,7 @@ Backend unit tests
 Unit tests are performed with Mocha framework - https://mochajs.org
 
 To launch tests on your local machine you will need:
-1. In new terminal change directory to 'modules/web-console/backend' folder and execute: "npm install".
+1. In new terminal change directory to 'modules/backend' folder and execute: "npm install".
 2. To start test environment and tests execute: "npm run test".
 
 
diff --git a/frontend/test/ci/Dockerfile b/docker/web-agent/Dockerfile
similarity index 52%
copy from frontend/test/ci/Dockerfile
copy to docker/web-agent/Dockerfile
index 7b1d602..7e45ad3 100644
--- a/frontend/test/ci/Dockerfile
+++ b/docker/web-agent/Dockerfile
@@ -15,20 +15,32 @@
 # limitations under the License.
 #
 
-FROM node:8-alpine
+# Start from Java 8 based on Alpine Linux image (~5Mb)
+FROM openjdk:8-jre-alpine
 
-ENV NPM_CONFIG_LOGLEVEL error
+# Provide default arguments
+ARG DEFAULT_DRIVER_FOLDER="/opt/ignite/drivers"
+ARG DEFAULT_NODE_URI="http://localhost:8080"
+ARG DEFAULT_SERVER_URI="http://localhost"
+ARG DEFAULT_TOKENS="NO_TOKENS"
 
-RUN apk --no-cache --repository http://dl-3.alpinelinux.org/alpine/edge/testing/ add \
- chromium xwininfo xvfb dbus eudev ttf-freefont fluxbox
+ENV DRIVER_FOLDER=$DEFAULT_DRIVER_FOLDER
+ENV NODE_URI=$DEFAULT_NODE_URI
+ENV SERVER_URI=$DEFAULT_SERVER_URI
+ENV TOKENS=$DEFAULT_TOKENS
 
-ENV CHROME_BIN /usr/bin/chromium-browser
+# Settings
+USER root
+ENV AGENT_HOME /opt/ignite/ignite-web-agent
+WORKDIR ${AGENT_HOME} 
 
-WORKDIR /opt/web-console/frontend
+# Add missing software
+RUN apk --no-cache \
+    add bash
 
-COPY ./package*.json ./
-RUN npm install --no-optional
+# Copy main binary archive
+COPY ignite-web-agent* ./
 
-COPY . .
+# Entrypoint
+CMD ./ignite-web-agent.sh -d ${DRIVER_FOLDER} -n ${NODE_URI} -s ${SERVER_URI} -t ${TOKENS}
 
-ENTRYPOINT ["npm", "test"]
diff --git a/docker/web-agent/README.txt b/docker/web-agent/README.txt
new file mode 100644
index 0000000..b217d1c
--- /dev/null
+++ b/docker/web-agent/README.txt
@@ -0,0 +1,36 @@
+Apache Ignite Web Agent Docker module
+=====================================
+Apache Ignite Web Agent Docker module provides Dockerfile and accompanying files
+for building docker image of Web Agent.
+
+
+Build image
+===========
+1) Build Apache Ignite Web Console module
+
+        mvn clean install -T 2C \
+                          -Pall-java,all-scala,licenses,web-console \
+                          -pl :ignite-web-console -am \
+                          -DskipTests
+
+2) Go to Apache Ignite Web Console Docker module directory and copy Apache
+   Ignite Web Agent's binary archive
+
+        cd docker/web-agent
+        cp -rfv ../../modules/web-agent/target/ignite-web-agent-*.zip ./
+
+3) Unpack and remove Apache Ignite Web Agent's binary archive
+
+        unzip ignite-web-agent-*.zip
+        rm -rf ignite-web-agent-*.zip
+
+4) Build docker image
+
+        docker build . -t apacheignite/web-agent[:<version>]
+
+   Prepared image will be available in local docker registry (can be seen
+   issuing `docker images` command)
+
+5) Clean up
+
+        rm -rf ignite-web-agent*
diff --git a/docker/web-console/standalone/Dockerfile b/docker/web-console/standalone/Dockerfile
new file mode 100644
index 0000000..bd03c7d
--- /dev/null
+++ b/docker/web-console/standalone/Dockerfile
@@ -0,0 +1,84 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+#~~~~~~~~~~~~~~~~~~#
+#  Frontend build  #
+#~~~~~~~~~~~~~~~~~~#
+FROM node:10-stretch as frontend-build
+
+ENV NPM_CONFIG_LOGLEVEL error
+
+WORKDIR /opt/web-console
+
+# Install node modules and build sources
+COPY frontend frontend
+RUN cd frontend && \
+    npm install --no-optional && \
+    npm run build
+
+
+#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~#
+#  Web Console Standalone assemble  #
+#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~#
+FROM node:10-stretch
+
+ENV NPM_CONFIG_LOGLEVEL error
+
+# Install global node packages
+RUN npm install -g pm2
+
+# Update software sources and install missing applications
+RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 9DA31620334BD75D9DCB49F368818C72E52529D4 \
+    && echo "deb http://repo.mongodb.org/apt/debian stretch/mongodb-org/4.0 main" | tee /etc/apt/sources.list.d/mongodb-org-4.0.list
+    apt update && \
+    apt install -y --no-install-recommends \
+        nginx-light \
+        mongodb-org-server \
+        dos2unix && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/*
+
+WORKDIR /opt/web-console
+
+# Install node modules for backend
+COPY backend/package*.json backend/
+RUN cd backend && \
+    npm install --no-optional --production
+
+# Copy and build sources
+COPY backend backend
+RUN cd backend && \
+    npm run build
+
+# Copy Ignite Web Agent module package
+COPY ignite-web-agent-*.zip backend/agent_dists
+
+# Copy previously built frontend
+COPY --from=frontend-build /opt/web-console/frontend/build static
+
+# Copy and fix entrypoint script
+COPY docker-entrypoint.sh docker-entrypoint.sh
+RUN chmod +x docker-entrypoint.sh \
+    && dos2unix docker-entrypoint.sh
+
+# Copy nginx configuration
+COPY nginx/* /etc/nginx/
+
+EXPOSE 80
+
+ENTRYPOINT ["/opt/web-console/docker-entrypoint.sh"]
+
diff --git a/docker/web-console/standalone/README.txt b/docker/web-console/standalone/README.txt
new file mode 100644
index 0000000..c97e792
--- /dev/null
+++ b/docker/web-console/standalone/README.txt
@@ -0,0 +1,35 @@
+Apache Ignite Web Console Standalone Docker module
+==================================================
+Apache Ignite Web Console Standalone Docker module provides Dockerfile and accompanying files
+for building docker image of Web Console.
+
+
+Ignite Web Console Standalone Docker Image Build Instructions
+=============================================================
+1) Build ignite-web-console module
+
+        mvn clean install -P web-console -DskipTests -T 2C -pl :ignite-web-console -am
+
+2) Copy ignite-web-agent-<version>.zip from 'modules/web-console/web-agent/target'
+   to 'docker/web-console/standalone' directory
+
+        cp -rf modules/web-console/web-agent/target/ignite-web-agent-*.zip docker/web-console/standalone
+
+3) Go to Apache Ignite Web Console Docker module directory and copy Apache
+   Ignite Web Console's frontend and backend directory
+
+        cd docker/web-console/standalone
+        cp -rf ../../../modules/web-console/backend ./
+        cp -rf ../../../modules/web-console/frontend ./
+
+4) Build docker image
+
+        docker build . -t apacheignite/web-console-standalone:[:<version>]
+
+   Prepared image will be available in local docker registry (can be seen
+   issuing `docker images` command)
+
+5) Clean up
+
+        rm -rf backend frontend ignite-web-agent*
+
diff --git a/frontend/test/ci/docker-compose.yml b/docker/web-console/standalone/docker-entrypoint.sh
similarity index 83%
copy from frontend/test/ci/docker-compose.yml
copy to docker/web-console/standalone/docker-entrypoint.sh
index 69667e6..6757de6 100644
--- a/frontend/test/ci/docker-compose.yml
+++ b/docker/web-console/standalone/docker-entrypoint.sh
@@ -1,3 +1,4 @@
+#!/bin/sh
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
@@ -15,11 +16,8 @@
 # limitations under the License.
 #
 
-version: '2'
-services:
-  unit_tests:
-    build:
-      context: '../../'
-      dockerfile: './test/ci/Dockerfile'
-    environment:
-      - TEST_REPORTER=teamcity
\ No newline at end of file
+/usr/bin/mongod --fork --config=/etc/mongod.conf
+
+service nginx start
+
+cd backend && pm2 start ./index.js --no-daemon
diff --git a/e2e/testenv/nginx/nginx.conf b/docker/web-console/standalone/nginx/nginx.conf
similarity index 51%
copy from e2e/testenv/nginx/nginx.conf
copy to docker/web-console/standalone/nginx/nginx.conf
index 169b334..dbc79d7 100644
--- a/e2e/testenv/nginx/nginx.conf
+++ b/docker/web-console/standalone/nginx/nginx.conf
@@ -15,41 +15,41 @@
 # limitations under the License.
 #
 
-user nginx;
-worker_processes 1;
+user  www-data;
+worker_processes  1;
 
 error_log  /var/log/nginx/error.log  warn;
 pid        /var/run/nginx.pid;
 
 events {
-  worker_connections  128;
+    worker_connections  128;
 }
 
 http {
-  server_tokens off;
-  sendfile            on;
-  tcp_nopush          on;
-
-  keepalive_timeout   60;
-  tcp_nodelay         on;
-
-  client_max_body_size 100m;
-
-  #access log
-  log_format main '$http_host $remote_addr - $remote_user [$time_local] '
-  '"$request" $status $bytes_sent '
-  '"$http_referer" "$http_user_agent" '
-  '"$gzip_ratio"';
-
-  include /etc/nginx/mime.types;
-  default_type  application/octet-stream;
-  gzip on;
-  gzip_disable "msie6";
-  gzip_types text/plain text/css text/xml text/javascript application/json application/x-javascript application/xml application/xml+rss application/javascript;
-  gzip_vary on;
-  gzip_comp_level 5;
-
-  access_log  /var/log/nginx/access.log  main;
-  #conf.d
-  include web-console.conf ;
+    server_tokens off;
+    sendfile            on;
+    tcp_nopush          on;
+
+    keepalive_timeout   60;
+    tcp_nodelay         on;
+
+    client_max_body_size 100m;
+
+    #access log
+    log_format main '$http_host $remote_addr - $remote_user [$time_local] '
+    '"$request" $status $bytes_sent '
+    '"$http_referer" "$http_user_agent" '
+    '"$gzip_ratio"';
+
+    include /etc/nginx/mime.types;
+    default_type  application/octet-stream;
+    gzip on;
+    gzip_disable "msie6";
+    gzip_types text/plain text/css text/xml text/javascript application/json application/x-javascript application/xml application/xml+rss application/javascript;
+    gzip_vary on;
+    gzip_comp_level 5;
+
+    access_log  /var/log/nginx/access.log  main;
+    #conf.d
+    include web-console.conf ;
 }
diff --git a/e2e/testenv/nginx/web-console.conf b/docker/web-console/standalone/nginx/web-console.conf
similarity index 95%
copy from e2e/testenv/nginx/web-console.conf
copy to docker/web-console/standalone/nginx/web-console.conf
index c57c0d4..caf171e 100644
--- a/e2e/testenv/nginx/web-console.conf
+++ b/docker/web-console/standalone/nginx/web-console.conf
@@ -20,10 +20,10 @@ upstream backend-api {
 }
 
 server {
-  listen 9001;
+  listen 80;
   server_name _;
 
-  set $ignite_console_dir /opt/web-console/frontend/build;
+  set $ignite_console_dir /opt/web-console/static;
 
   root $ignite_console_dir;
 
diff --git a/backend/.eslintrc b/modules/backend/.eslintrc
similarity index 100%
rename from backend/.eslintrc
rename to modules/backend/.eslintrc
diff --git a/backend/.gitignore b/modules/backend/.gitignore
similarity index 100%
rename from backend/.gitignore
rename to modules/backend/.gitignore
diff --git a/backend/agent_dists/README.txt b/modules/backend/agent_dists/README.txt
similarity index 100%
rename from backend/agent_dists/README.txt
rename to modules/backend/agent_dists/README.txt
diff --git a/backend/app/agentSocket.js b/modules/backend/app/agentSocket.js
similarity index 100%
rename from backend/app/agentSocket.js
rename to modules/backend/app/agentSocket.js
diff --git a/backend/app/agentsHandler.js b/modules/backend/app/agentsHandler.js
similarity index 100%
rename from backend/app/agentsHandler.js
rename to modules/backend/app/agentsHandler.js
diff --git a/backend/app/apiServer.js b/modules/backend/app/apiServer.js
similarity index 100%
rename from backend/app/apiServer.js
rename to modules/backend/app/apiServer.js
diff --git a/backend/app/browsersHandler.js b/modules/backend/app/browsersHandler.js
similarity index 100%
rename from backend/app/browsersHandler.js
rename to modules/backend/app/browsersHandler.js
diff --git a/backend/app/configure.js b/modules/backend/app/configure.js
similarity index 100%
rename from backend/app/configure.js
rename to modules/backend/app/configure.js
diff --git a/backend/app/mongo.js b/modules/backend/app/mongo.js
similarity index 100%
rename from backend/app/mongo.js
rename to modules/backend/app/mongo.js
diff --git a/backend/app/nconf.js b/modules/backend/app/nconf.js
similarity index 100%
rename from backend/app/nconf.js
rename to modules/backend/app/nconf.js
diff --git a/backend/app/routes.js b/modules/backend/app/routes.js
similarity index 100%
rename from backend/app/routes.js
rename to modules/backend/app/routes.js
diff --git a/backend/app/schemas.js b/modules/backend/app/schemas.js
similarity index 100%
rename from backend/app/schemas.js
rename to modules/backend/app/schemas.js
diff --git a/backend/app/settings.js b/modules/backend/app/settings.js
similarity index 100%
rename from backend/app/settings.js
rename to modules/backend/app/settings.js
diff --git a/backend/config/settings.json.sample b/modules/backend/config/settings.json.sample
similarity index 100%
rename from backend/config/settings.json.sample
rename to modules/backend/config/settings.json.sample
diff --git a/backend/errors/AppErrorException.js b/modules/backend/errors/AppErrorException.js
similarity index 100%
rename from backend/errors/AppErrorException.js
rename to modules/backend/errors/AppErrorException.js
diff --git a/backend/errors/AuthFailedException.js b/modules/backend/errors/AuthFailedException.js
similarity index 100%
rename from backend/errors/AuthFailedException.js
rename to modules/backend/errors/AuthFailedException.js
diff --git a/backend/errors/DuplicateKeyException.js b/modules/backend/errors/DuplicateKeyException.js
similarity index 100%
rename from backend/errors/DuplicateKeyException.js
rename to modules/backend/errors/DuplicateKeyException.js
diff --git a/backend/errors/IllegalAccessError.js b/modules/backend/errors/IllegalAccessError.js
similarity index 100%
rename from backend/errors/IllegalAccessError.js
rename to modules/backend/errors/IllegalAccessError.js
diff --git a/backend/errors/IllegalArgumentException.js b/modules/backend/errors/IllegalArgumentException.js
similarity index 100%
rename from backend/errors/IllegalArgumentException.js
rename to modules/backend/errors/IllegalArgumentException.js
diff --git a/backend/errors/MissingConfirmRegistrationException.js b/modules/backend/errors/MissingConfirmRegistrationException.js
similarity index 100%
rename from backend/errors/MissingConfirmRegistrationException.js
rename to modules/backend/errors/MissingConfirmRegistrationException.js
diff --git a/backend/errors/MissingResourceException.js b/modules/backend/errors/MissingResourceException.js
similarity index 100%
rename from backend/errors/MissingResourceException.js
rename to modules/backend/errors/MissingResourceException.js
diff --git a/backend/errors/ServerErrorException.js b/modules/backend/errors/ServerErrorException.js
similarity index 100%
rename from backend/errors/ServerErrorException.js
rename to modules/backend/errors/ServerErrorException.js
diff --git a/backend/errors/index.js b/modules/backend/errors/index.js
similarity index 100%
rename from backend/errors/index.js
rename to modules/backend/errors/index.js
diff --git a/backend/index.js b/modules/backend/index.js
similarity index 100%
rename from backend/index.js
rename to modules/backend/index.js
diff --git a/backend/injector.js b/modules/backend/injector.js
similarity index 100%
rename from backend/injector.js
rename to modules/backend/injector.js
diff --git a/backend/launch-tools.js b/modules/backend/launch-tools.js
similarity index 100%
rename from backend/launch-tools.js
rename to modules/backend/launch-tools.js
diff --git a/backend/middlewares/api.js b/modules/backend/middlewares/api.js
similarity index 100%
rename from backend/middlewares/api.js
rename to modules/backend/middlewares/api.js
diff --git a/backend/middlewares/demo.js b/modules/backend/middlewares/demo.js
similarity index 100%
rename from backend/middlewares/demo.js
rename to modules/backend/middlewares/demo.js
diff --git a/backend/middlewares/host.js b/modules/backend/middlewares/host.js
similarity index 100%
rename from backend/middlewares/host.js
rename to modules/backend/middlewares/host.js
diff --git a/backend/middlewares/user.js b/modules/backend/middlewares/user.js
similarity index 100%
rename from backend/middlewares/user.js
rename to modules/backend/middlewares/user.js
diff --git a/backend/migrations/1502249492000-invalidate_rename.js b/modules/backend/migrations/1502249492000-invalidate_rename.js
similarity index 100%
rename from backend/migrations/1502249492000-invalidate_rename.js
rename to modules/backend/migrations/1502249492000-invalidate_rename.js
diff --git a/backend/migrations/1502432624000-cache-index.js b/modules/backend/migrations/1502432624000-cache-index.js
similarity index 100%
rename from backend/migrations/1502432624000-cache-index.js
rename to modules/backend/migrations/1502432624000-cache-index.js
diff --git a/backend/migrations/1504672035000-igfs-index.js b/modules/backend/migrations/1504672035000-igfs-index.js
similarity index 100%
rename from backend/migrations/1504672035000-igfs-index.js
rename to modules/backend/migrations/1504672035000-igfs-index.js
diff --git a/backend/migrations/1505114649000-models-index.js b/modules/backend/migrations/1505114649000-models-index.js
similarity index 100%
rename from backend/migrations/1505114649000-models-index.js
rename to modules/backend/migrations/1505114649000-models-index.js
diff --git a/backend/migrations/1508395969410-init-registered-date.js b/modules/backend/migrations/1508395969410-init-registered-date.js
similarity index 100%
rename from backend/migrations/1508395969410-init-registered-date.js
rename to modules/backend/migrations/1508395969410-init-registered-date.js
diff --git a/backend/migrations/1516948939797-migrate-configs.js b/modules/backend/migrations/1516948939797-migrate-configs.js
similarity index 100%
rename from backend/migrations/1516948939797-migrate-configs.js
rename to modules/backend/migrations/1516948939797-migrate-configs.js
diff --git a/backend/migrations/1547440382485-account-make-email-unique.js b/modules/backend/migrations/1547440382485-account-make-email-unique.js
similarity index 100%
rename from backend/migrations/1547440382485-account-make-email-unique.js
rename to modules/backend/migrations/1547440382485-account-make-email-unique.js
diff --git a/backend/migrations/README.txt b/modules/backend/migrations/README.txt
similarity index 100%
rename from backend/migrations/README.txt
rename to modules/backend/migrations/README.txt
diff --git a/backend/migrations/migration-utils.js b/modules/backend/migrations/migration-utils.js
similarity index 100%
rename from backend/migrations/migration-utils.js
rename to modules/backend/migrations/migration-utils.js
diff --git a/backend/package-lock.json b/modules/backend/package-lock.json
similarity index 100%
rename from backend/package-lock.json
rename to modules/backend/package-lock.json
diff --git a/backend/package.json b/modules/backend/package.json
similarity index 100%
rename from backend/package.json
rename to modules/backend/package.json
diff --git a/backend/routes/activities.js b/modules/backend/routes/activities.js
similarity index 100%
rename from backend/routes/activities.js
rename to modules/backend/routes/activities.js
diff --git a/backend/routes/admin.js b/modules/backend/routes/admin.js
similarity index 100%
rename from backend/routes/admin.js
rename to modules/backend/routes/admin.js
diff --git a/backend/routes/caches.js b/modules/backend/routes/caches.js
similarity index 100%
rename from backend/routes/caches.js
rename to modules/backend/routes/caches.js
diff --git a/backend/routes/clusters.js b/modules/backend/routes/clusters.js
similarity index 100%
rename from backend/routes/clusters.js
rename to modules/backend/routes/clusters.js
diff --git a/backend/routes/configuration.js b/modules/backend/routes/configuration.js
similarity index 100%
rename from backend/routes/configuration.js
rename to modules/backend/routes/configuration.js
diff --git a/backend/routes/demo.js b/modules/backend/routes/demo.js
similarity index 100%
rename from backend/routes/demo.js
rename to modules/backend/routes/demo.js
diff --git a/backend/routes/demo/caches.json b/modules/backend/routes/demo/caches.json
similarity index 100%
rename from backend/routes/demo/caches.json
rename to modules/backend/routes/demo/caches.json
diff --git a/backend/routes/demo/clusters.json b/modules/backend/routes/demo/clusters.json
similarity index 100%
rename from backend/routes/demo/clusters.json
rename to modules/backend/routes/demo/clusters.json
diff --git a/backend/routes/demo/domains.json b/modules/backend/routes/demo/domains.json
similarity index 100%
rename from backend/routes/demo/domains.json
rename to modules/backend/routes/demo/domains.json
diff --git a/backend/routes/demo/igfss.json b/modules/backend/routes/demo/igfss.json
similarity index 100%
rename from backend/routes/demo/igfss.json
rename to modules/backend/routes/demo/igfss.json
diff --git a/backend/routes/domains.js b/modules/backend/routes/domains.js
similarity index 100%
rename from backend/routes/domains.js
rename to modules/backend/routes/domains.js
diff --git a/backend/routes/downloads.js b/modules/backend/routes/downloads.js
similarity index 100%
rename from backend/routes/downloads.js
rename to modules/backend/routes/downloads.js
diff --git a/backend/routes/igfss.js b/modules/backend/routes/igfss.js
similarity index 100%
rename from backend/routes/igfss.js
rename to modules/backend/routes/igfss.js
diff --git a/backend/routes/notebooks.js b/modules/backend/routes/notebooks.js
similarity index 100%
rename from backend/routes/notebooks.js
rename to modules/backend/routes/notebooks.js
diff --git a/backend/routes/profile.js b/modules/backend/routes/profile.js
similarity index 100%
rename from backend/routes/profile.js
rename to modules/backend/routes/profile.js
diff --git a/backend/routes/public.js b/modules/backend/routes/public.js
similarity index 100%
rename from backend/routes/public.js
rename to modules/backend/routes/public.js
diff --git a/backend/services/Utils.js b/modules/backend/services/Utils.js
similarity index 100%
rename from backend/services/Utils.js
rename to modules/backend/services/Utils.js
diff --git a/backend/services/activities.js b/modules/backend/services/activities.js
similarity index 100%
rename from backend/services/activities.js
rename to modules/backend/services/activities.js
diff --git a/backend/services/auth.js b/modules/backend/services/auth.js
similarity index 100%
rename from backend/services/auth.js
rename to modules/backend/services/auth.js
diff --git a/backend/services/caches.js b/modules/backend/services/caches.js
similarity index 100%
rename from backend/services/caches.js
rename to modules/backend/services/caches.js
diff --git a/backend/services/clusters.js b/modules/backend/services/clusters.js
similarity index 100%
rename from backend/services/clusters.js
rename to modules/backend/services/clusters.js
diff --git a/backend/services/configurations.js b/modules/backend/services/configurations.js
similarity index 100%
rename from backend/services/configurations.js
rename to modules/backend/services/configurations.js
diff --git a/backend/services/domains.js b/modules/backend/services/domains.js
similarity index 100%
rename from backend/services/domains.js
rename to modules/backend/services/domains.js
diff --git a/backend/services/downloads.js b/modules/backend/services/downloads.js
similarity index 100%
rename from backend/services/downloads.js
rename to modules/backend/services/downloads.js
diff --git a/backend/services/igfss.js b/modules/backend/services/igfss.js
similarity index 100%
rename from backend/services/igfss.js
rename to modules/backend/services/igfss.js
diff --git a/backend/services/mails.js b/modules/backend/services/mails.js
similarity index 100%
rename from backend/services/mails.js
rename to modules/backend/services/mails.js
diff --git a/backend/services/notebooks.js b/modules/backend/services/notebooks.js
similarity index 100%
rename from backend/services/notebooks.js
rename to modules/backend/services/notebooks.js
diff --git a/backend/services/notifications.js b/modules/backend/services/notifications.js
similarity index 100%
rename from backend/services/notifications.js
rename to modules/backend/services/notifications.js
diff --git a/backend/services/sessions.js b/modules/backend/services/sessions.js
similarity index 100%
rename from backend/services/sessions.js
rename to modules/backend/services/sessions.js
diff --git a/backend/services/spaces.js b/modules/backend/services/spaces.js
similarity index 100%
rename from backend/services/spaces.js
rename to modules/backend/services/spaces.js
diff --git a/backend/services/users.js b/modules/backend/services/users.js
similarity index 100%
rename from backend/services/users.js
rename to modules/backend/services/users.js
diff --git a/backend/templates/base.html b/modules/backend/templates/base.html
similarity index 100%
rename from backend/templates/base.html
rename to modules/backend/templates/base.html
diff --git a/backend/test/app/db.js b/modules/backend/test/app/db.js
similarity index 100%
rename from backend/test/app/db.js
rename to modules/backend/test/app/db.js
diff --git a/backend/test/app/httpAgent.js b/modules/backend/test/app/httpAgent.js
similarity index 100%
rename from backend/test/app/httpAgent.js
rename to modules/backend/test/app/httpAgent.js
diff --git a/backend/test/app/mail.js b/modules/backend/test/app/mail.js
similarity index 100%
rename from backend/test/app/mail.js
rename to modules/backend/test/app/mail.js
diff --git a/backend/test/app/settings.js b/modules/backend/test/app/settings.js
similarity index 100%
rename from backend/test/app/settings.js
rename to modules/backend/test/app/settings.js
diff --git a/backend/test/config/settings.json b/modules/backend/test/config/settings.json
similarity index 100%
rename from backend/test/config/settings.json
rename to modules/backend/test/config/settings.json
diff --git a/backend/test/data/accounts.json b/modules/backend/test/data/accounts.json
similarity index 100%
rename from backend/test/data/accounts.json
rename to modules/backend/test/data/accounts.json
diff --git a/backend/test/data/caches.json b/modules/backend/test/data/caches.json
similarity index 100%
rename from backend/test/data/caches.json
rename to modules/backend/test/data/caches.json
diff --git a/backend/test/data/clusters.json b/modules/backend/test/data/clusters.json
similarity index 100%
rename from backend/test/data/clusters.json
rename to modules/backend/test/data/clusters.json
diff --git a/backend/test/data/domains.json b/modules/backend/test/data/domains.json
similarity index 100%
rename from backend/test/data/domains.json
rename to modules/backend/test/data/domains.json
diff --git a/backend/test/data/igfss.json b/modules/backend/test/data/igfss.json
similarity index 100%
rename from backend/test/data/igfss.json
rename to modules/backend/test/data/igfss.json
diff --git a/backend/test/data/spaces.json b/modules/backend/test/data/spaces.json
similarity index 100%
rename from backend/test/data/spaces.json
rename to modules/backend/test/data/spaces.json
diff --git a/backend/test/index.js b/modules/backend/test/index.js
similarity index 100%
rename from backend/test/index.js
rename to modules/backend/test/index.js
diff --git a/backend/test/injector.js b/modules/backend/test/injector.js
similarity index 100%
rename from backend/test/injector.js
rename to modules/backend/test/injector.js
diff --git a/backend/test/routes/clusters.js b/modules/backend/test/routes/clusters.js
similarity index 100%
rename from backend/test/routes/clusters.js
rename to modules/backend/test/routes/clusters.js
diff --git a/backend/test/routes/public.js b/modules/backend/test/routes/public.js
similarity index 100%
rename from backend/test/routes/public.js
rename to modules/backend/test/routes/public.js
diff --git a/backend/test/unit/ActivitiesService.test.js b/modules/backend/test/unit/ActivitiesService.test.js
similarity index 100%
rename from backend/test/unit/ActivitiesService.test.js
rename to modules/backend/test/unit/ActivitiesService.test.js
diff --git a/backend/test/unit/AuthService.test.js b/modules/backend/test/unit/AuthService.test.js
similarity index 100%
rename from backend/test/unit/AuthService.test.js
rename to modules/backend/test/unit/AuthService.test.js
diff --git a/backend/test/unit/CacheService.test.js b/modules/backend/test/unit/CacheService.test.js
similarity index 100%
rename from backend/test/unit/CacheService.test.js
rename to modules/backend/test/unit/CacheService.test.js
diff --git a/backend/test/unit/ClusterService.test.js b/modules/backend/test/unit/ClusterService.test.js
similarity index 100%
rename from backend/test/unit/ClusterService.test.js
rename to modules/backend/test/unit/ClusterService.test.js
diff --git a/backend/test/unit/DomainService.test.js b/modules/backend/test/unit/DomainService.test.js
similarity index 100%
rename from backend/test/unit/DomainService.test.js
rename to modules/backend/test/unit/DomainService.test.js
diff --git a/backend/test/unit/IgfsService.test.js b/modules/backend/test/unit/IgfsService.test.js
similarity index 100%
rename from backend/test/unit/IgfsService.test.js
rename to modules/backend/test/unit/IgfsService.test.js
diff --git a/backend/test/unit/Utils.test.js b/modules/backend/test/unit/Utils.test.js
similarity index 100%
rename from backend/test/unit/Utils.test.js
rename to modules/backend/test/unit/Utils.test.js
diff --git a/modules/compatibility/README.txt b/modules/compatibility/README.txt
new file mode 100644
index 0000000..3b6734f
--- /dev/null
+++ b/modules/compatibility/README.txt
@@ -0,0 +1,3 @@
+Compatibility tests
+======================================
+Tests for compatibility between Ignite Configuration and Web Console Configuration Wizard.
diff --git a/web-agent/pom.xml b/modules/compatibility/pom.xml
similarity index 74%
copy from web-agent/pom.xml
copy to modules/compatibility/pom.xml
index 1eaad3b..0b4826d 100644
--- a/web-agent/pom.xml
+++ b/modules/compatibility/pom.xml
@@ -27,10 +27,10 @@
         <groupId>org.apache.ignite</groupId>
         <artifactId>ignite-parent</artifactId>
         <version>1</version>
-        <relativePath>../../../parent</relativePath>
+        <relativePath>../../parent</relativePath>
     </parent>
 
-    <artifactId>ignite-web-agent</artifactId>
+    <artifactId>compatibility</artifactId>
     <packaging>jar</packaging>
     <version>2.10.0-SNAPSHOT</version>
     <url>http://ignite.apache.org</url>
@@ -39,73 +39,47 @@
         <maven.build.timestamp.format>yyMMddHHmmss</maven.build.timestamp.format>
     </properties>
 
-    <dependencies>
-        <dependency>
-            <groupId>io.socket</groupId>
-            <artifactId>socket.io-client</artifactId>
-            <version>1.0.0</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.fasterxml.jackson.datatype</groupId>
-            <artifactId>jackson-datatype-json-org</artifactId>
-            <version>${jackson.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.beust</groupId>
-            <artifactId>jcommander</artifactId>
-            <version>1.58</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.squareup.okhttp3</groupId>
-            <artifactId>okhttp</artifactId>
-            <version>3.12.0</version>
-        </dependency>
+    <repositories>
+        <repository>
+            <id>GridGain External Repository</id>
+            <url>https://www.gridgainsystems.com/nexus/content/repositories/external/</url>
+        </repository>
+    </repositories>
 
+    <dependencies>
         <dependency>
             <groupId>org.apache.ignite</groupId>
-            <artifactId>ignite-indexing</artifactId>
-            <version>${project.version}</version>
+            <artifactId>ignite-core</artifactId>
+            <version>${ignite.version}</version>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.ignite</groupId>
-            <artifactId>ignite-rest-http</artifactId>
-            <version>${project.version}</version>
+            <artifactId>ignite-aws</artifactId>
+            <version>${ignite.version}</version>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.ignite</groupId>
-            <artifactId>ignite-spring</artifactId>
-            <version>${project.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.springframework</groupId>
-                    <artifactId>spring-aop</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.springframework</groupId>
-                    <artifactId>spring-tx</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.springframework</groupId>
-                    <artifactId>spring-jdbc</artifactId>
-                </exclusion>
-            </exclusions>
+            <artifactId>ignite-hadoop</artifactId>
+            <version>${ignite.version}</version>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.ignite</groupId>
-            <artifactId>ignite-slf4j</artifactId>
-            <version>${project.version}</version>
+            <artifactId>ignite-hibernate_5.1</artifactId>
+            <version>2.7.2</version>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>jul-to-slf4j</artifactId>
-            <version>${slf4j.version}</version>
+            <groupId>org.apache.ignite</groupId>
+            <artifactId>ignite-urideploy</artifactId>
+            <version>${ignite.version}</version>
+            <scope>test</scope>
         </dependency>
     </dependencies>
 
diff --git a/src/test/java/org/apache/ignite/console/configuration/FieldProcessingInfo.java b/modules/compatibility/src/test/java/org/apache/ignite/console/configuration/FieldProcessingInfo.java
similarity index 100%
rename from src/test/java/org/apache/ignite/console/configuration/FieldProcessingInfo.java
rename to modules/compatibility/src/test/java/org/apache/ignite/console/configuration/FieldProcessingInfo.java
diff --git a/src/test/java/org/apache/ignite/console/configuration/MetadataInfo.java b/modules/compatibility/src/test/java/org/apache/ignite/console/configuration/MetadataInfo.java
similarity index 100%
rename from src/test/java/org/apache/ignite/console/configuration/MetadataInfo.java
rename to modules/compatibility/src/test/java/org/apache/ignite/console/configuration/MetadataInfo.java
diff --git a/src/test/java/org/apache/ignite/console/configuration/WebConsoleConfigurationSelfTest.java b/modules/compatibility/src/test/java/org/apache/ignite/console/configuration/WebConsoleConfigurationSelfTest.java
similarity index 99%
rename from src/test/java/org/apache/ignite/console/configuration/WebConsoleConfigurationSelfTest.java
rename to modules/compatibility/src/test/java/org/apache/ignite/console/configuration/WebConsoleConfigurationSelfTest.java
index 9ecc368..5a72fc2 100644
--- a/src/test/java/org/apache/ignite/console/configuration/WebConsoleConfigurationSelfTest.java
+++ b/modules/compatibility/src/test/java/org/apache/ignite/console/configuration/WebConsoleConfigurationSelfTest.java
@@ -234,7 +234,6 @@ public class WebConsoleConfigurationSelfTest {
         igniteCfgPropsExcl.add("segmentationResolvers");
         igniteCfgPropsExcl.add("autoActivationEnabled");
         igniteCfgPropsExcl.add("igniteHome");
-        igniteCfgPropsExcl.add("platformConfiguration");
 
         metadata.put(IgniteConfiguration.class,
             new MetadataInfo(igniteCfgProps, igniteCfgPropsDep, igniteCfgPropsExcl));
diff --git a/src/test/java/org/apache/ignite/console/configuration/WrongFields.java b/modules/compatibility/src/test/java/org/apache/ignite/console/configuration/WrongFields.java
similarity index 100%
rename from src/test/java/org/apache/ignite/console/configuration/WrongFields.java
rename to modules/compatibility/src/test/java/org/apache/ignite/console/configuration/WrongFields.java
diff --git a/src/test/java/org/apache/ignite/console/testsuites/WebConsoleTestSuite.java b/modules/compatibility/src/test/java/org/apache/ignite/console/testsuites/WebConsoleTestSuite.java
similarity index 100%
rename from src/test/java/org/apache/ignite/console/testsuites/WebConsoleTestSuite.java
rename to modules/compatibility/src/test/java/org/apache/ignite/console/testsuites/WebConsoleTestSuite.java
diff --git a/e2e/docker-compose.yml b/modules/e2e/docker-compose.yml
similarity index 100%
rename from e2e/docker-compose.yml
rename to modules/e2e/docker-compose.yml
diff --git a/e2e/testcafe/.eslintrc b/modules/e2e/testcafe/.eslintrc
similarity index 100%
rename from e2e/testcafe/.eslintrc
rename to modules/e2e/testcafe/.eslintrc
diff --git a/e2e/testcafe/Dockerfile b/modules/e2e/testcafe/Dockerfile
similarity index 100%
rename from e2e/testcafe/Dockerfile
rename to modules/e2e/testcafe/Dockerfile
diff --git a/e2e/testcafe/components/FormField.js b/modules/e2e/testcafe/components/FormField.js
similarity index 100%
rename from e2e/testcafe/components/FormField.js
rename to modules/e2e/testcafe/components/FormField.js
diff --git a/e2e/testcafe/components/ListEditable.js b/modules/e2e/testcafe/components/ListEditable.js
similarity index 100%
rename from e2e/testcafe/components/ListEditable.js
rename to modules/e2e/testcafe/components/ListEditable.js
diff --git a/e2e/testcafe/components/PanelCollapsible.js b/modules/e2e/testcafe/components/PanelCollapsible.js
similarity index 100%
rename from e2e/testcafe/components/PanelCollapsible.js
rename to modules/e2e/testcafe/components/PanelCollapsible.js
diff --git a/e2e/testcafe/components/Table.js b/modules/e2e/testcafe/components/Table.js
similarity index 100%
rename from e2e/testcafe/components/Table.js
rename to modules/e2e/testcafe/components/Table.js
diff --git a/e2e/testcafe/components/confirmation.js b/modules/e2e/testcafe/components/confirmation.js
similarity index 100%
rename from e2e/testcafe/components/confirmation.js
rename to modules/e2e/testcafe/components/confirmation.js
diff --git a/e2e/testcafe/components/modalInput.js b/modules/e2e/testcafe/components/modalInput.js
similarity index 100%
rename from e2e/testcafe/components/modalInput.js
rename to modules/e2e/testcafe/components/modalInput.js
diff --git a/e2e/testcafe/components/no-data.js b/modules/e2e/testcafe/components/no-data.js
similarity index 100%
rename from e2e/testcafe/components/no-data.js
rename to modules/e2e/testcafe/components/no-data.js
diff --git a/e2e/testcafe/components/notifications.js b/modules/e2e/testcafe/components/notifications.js
similarity index 100%
rename from e2e/testcafe/components/notifications.js
rename to modules/e2e/testcafe/components/notifications.js
diff --git a/e2e/testcafe/components/pageAdvancedConfiguration.js b/modules/e2e/testcafe/components/pageAdvancedConfiguration.js
similarity index 100%
rename from e2e/testcafe/components/pageAdvancedConfiguration.js
rename to modules/e2e/testcafe/components/pageAdvancedConfiguration.js
diff --git a/e2e/testcafe/components/pageConfiguration.js b/modules/e2e/testcafe/components/pageConfiguration.js
similarity index 100%
rename from e2e/testcafe/components/pageConfiguration.js
rename to modules/e2e/testcafe/components/pageConfiguration.js
diff --git a/e2e/testcafe/components/topNavigation.js b/modules/e2e/testcafe/components/topNavigation.js
similarity index 100%
rename from e2e/testcafe/components/topNavigation.js
rename to modules/e2e/testcafe/components/topNavigation.js
diff --git a/e2e/testcafe/components/userMenu.js b/modules/e2e/testcafe/components/userMenu.js
similarity index 100%
rename from e2e/testcafe/components/userMenu.js
rename to modules/e2e/testcafe/components/userMenu.js
diff --git a/e2e/testcafe/environment/envtools.js b/modules/e2e/testcafe/environment/envtools.js
similarity index 100%
rename from e2e/testcafe/environment/envtools.js
rename to modules/e2e/testcafe/environment/envtools.js
diff --git a/e2e/testcafe/environment/launch-env.js b/modules/e2e/testcafe/environment/launch-env.js
similarity index 100%
rename from e2e/testcafe/environment/launch-env.js
rename to modules/e2e/testcafe/environment/launch-env.js
diff --git a/e2e/testcafe/fixtures/admin-panel.js b/modules/e2e/testcafe/fixtures/admin-panel.js
similarity index 90%
rename from e2e/testcafe/fixtures/admin-panel.js
rename to modules/e2e/testcafe/fixtures/admin-panel.js
index 0851d3f..b49a9ce 100644
--- a/e2e/testcafe/fixtures/admin-panel.js
+++ b/modules/e2e/testcafe/fixtures/admin-panel.js
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-import { Selector } from 'testcafe';
-import { AngularJSSelector } from 'testcafe-angular-selectors';
-import { dropTestDB, insertTestUser, resolveUrl } from '../environment/envtools';
-import { createRegularUser } from '../roles';
+import {Selector} from 'testcafe';
+import {AngularJSSelector} from 'testcafe-angular-selectors';
+import {dropTestDB, insertTestUser, resolveUrl} from '../environment/envtools';
+import {createRegularUser} from '../roles';
 
 const regularUser = createRegularUser();
 
diff --git a/e2e/testcafe/fixtures/auth/forgot-password.js b/modules/e2e/testcafe/fixtures/auth/forgot-password.js
similarity index 93%
rename from e2e/testcafe/fixtures/auth/forgot-password.js
rename to modules/e2e/testcafe/fixtures/auth/forgot-password.js
index 7a9f796..f9e2d8b 100644
--- a/e2e/testcafe/fixtures/auth/forgot-password.js
+++ b/modules/e2e/testcafe/fixtures/auth/forgot-password.js
@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-import { dropTestDB, resolveUrl, insertTestUser } from '../../environment/envtools';
-import {PageSignIn} from '../../page-models/pageSignin';
+import {dropTestDB, insertTestUser, resolveUrl} from '../../environment/envtools';
 import {errorNotification} from '../../components/notifications';
 import {pageForgotPassword as page} from '../../page-models/pageForgotPassword';
 
diff --git a/e2e/testcafe/fixtures/auth/logout.js b/modules/e2e/testcafe/fixtures/auth/logout.js
similarity index 95%
rename from e2e/testcafe/fixtures/auth/logout.js
rename to modules/e2e/testcafe/fixtures/auth/logout.js
index de495ef..118ce28 100644
--- a/e2e/testcafe/fixtures/auth/logout.js
+++ b/modules/e2e/testcafe/fixtures/auth/logout.js
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import {dropTestDB, resolveUrl, insertTestUser} from '../../environment/envtools';
+import {dropTestDB, insertTestUser, resolveUrl} from '../../environment/envtools';
 import {createRegularUser} from '../../roles';
 import {userMenu} from '../../components/userMenu';
 import {pageSignin} from '../../page-models/pageSignin';
diff --git a/e2e/testcafe/fixtures/auth/signup-validation-local.js b/modules/e2e/testcafe/fixtures/auth/signup-validation-local.js
similarity index 100%
rename from e2e/testcafe/fixtures/auth/signup-validation-local.js
rename to modules/e2e/testcafe/fixtures/auth/signup-validation-local.js
diff --git a/e2e/testcafe/fixtures/auth/signup.js b/modules/e2e/testcafe/fixtures/auth/signup.js
similarity index 97%
rename from e2e/testcafe/fixtures/auth/signup.js
rename to modules/e2e/testcafe/fixtures/auth/signup.js
index 062d96a..0580355 100644
--- a/e2e/testcafe/fixtures/auth/signup.js
+++ b/modules/e2e/testcafe/fixtures/auth/signup.js
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import {dropTestDB, resolveUrl, insertTestUser} from '../../environment/envtools';
+import {dropTestDB, insertTestUser, resolveUrl} from '../../environment/envtools';
 import {pageSignup as page} from '../../page-models/pageSignup';
 import {errorNotification} from '../../components/notifications';
 import {userMenu} from '../../components/userMenu';
diff --git a/e2e/testcafe/fixtures/configuration/basic.js b/modules/e2e/testcafe/fixtures/configuration/basic.js
similarity index 100%
rename from e2e/testcafe/fixtures/configuration/basic.js
rename to modules/e2e/testcafe/fixtures/configuration/basic.js
diff --git a/e2e/testcafe/fixtures/configuration/clusterFormChangeDetection.js b/modules/e2e/testcafe/fixtures/configuration/clusterFormChangeDetection.js
similarity index 100%
rename from e2e/testcafe/fixtures/configuration/clusterFormChangeDetection.js
rename to modules/e2e/testcafe/fixtures/configuration/clusterFormChangeDetection.js
diff --git a/e2e/testcafe/fixtures/configuration/newClusterWithCache.js b/modules/e2e/testcafe/fixtures/configuration/newClusterWithCache.js
similarity index 100%
rename from e2e/testcafe/fixtures/configuration/newClusterWithCache.js
rename to modules/e2e/testcafe/fixtures/configuration/newClusterWithCache.js
diff --git a/e2e/testcafe/fixtures/configuration/overview.js b/modules/e2e/testcafe/fixtures/configuration/overview.js
similarity index 99%
rename from e2e/testcafe/fixtures/configuration/overview.js
rename to modules/e2e/testcafe/fixtures/configuration/overview.js
index 8d7093a..7f48ab1 100644
--- a/e2e/testcafe/fixtures/configuration/overview.js
+++ b/modules/e2e/testcafe/fixtures/configuration/overview.js
@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-import {Selector} from 'testcafe';
 import {getLocationPathname} from '../../helpers';
 import {dropTestDB, insertTestUser, resolveUrl} from '../../environment/envtools';
 import {createRegularUser} from '../../roles';
diff --git a/e2e/testcafe/fixtures/menu-smoke.js b/modules/e2e/testcafe/fixtures/menu-smoke.js
similarity index 85%
rename from e2e/testcafe/fixtures/menu-smoke.js
rename to modules/e2e/testcafe/fixtures/menu-smoke.js
index 9b3853a..615bcd5 100644
--- a/e2e/testcafe/fixtures/menu-smoke.js
+++ b/modules/e2e/testcafe/fixtures/menu-smoke.js
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-import { Selector } from 'testcafe';
-import { dropTestDB, insertTestUser, resolveUrl } from '../environment/envtools';
-import { createRegularUser } from '../roles';
-import { queriesNavButton, configureNavButton } from '../components/topNavigation';
+import {Selector} from 'testcafe';
+import {dropTestDB, insertTestUser, resolveUrl} from '../environment/envtools';
+import {createRegularUser} from '../roles';
+import {configureNavButton, queriesNavButton} from '../components/topNavigation';
 
 const regularUser = createRegularUser();
 
diff --git a/e2e/testcafe/fixtures/queries/notebooks-list.js b/modules/e2e/testcafe/fixtures/queries/notebooks-list.js
similarity index 89%
rename from e2e/testcafe/fixtures/queries/notebooks-list.js
rename to modules/e2e/testcafe/fixtures/queries/notebooks-list.js
index 6037b28..c7ddc2a 100644
--- a/e2e/testcafe/fixtures/queries/notebooks-list.js
+++ b/modules/e2e/testcafe/fixtures/queries/notebooks-list.js
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { Selector } from 'testcafe';
-import { dropTestDB, insertTestUser, resolveUrl } from '../../environment/envtools';
-import { createRegularUser } from '../../roles';
-import { PageQueriesNotebooksList } from '../../page-models/PageQueries';
+import {Selector} from 'testcafe';
+import {dropTestDB, insertTestUser, resolveUrl} from '../../environment/envtools';
+import {createRegularUser} from '../../roles';
+import {PageQueriesNotebooksList} from '../../page-models/PageQueries';
 
 const regularUser = createRegularUser();
 const notebooksListPage = new PageQueriesNotebooksList();
diff --git a/e2e/testcafe/fixtures/user-profile/credentials.js b/modules/e2e/testcafe/fixtures/user-profile/credentials.js
similarity index 94%
rename from e2e/testcafe/fixtures/user-profile/credentials.js
rename to modules/e2e/testcafe/fixtures/user-profile/credentials.js
index ea18aaf..ad944bc 100644
--- a/e2e/testcafe/fixtures/user-profile/credentials.js
+++ b/modules/e2e/testcafe/fixtures/user-profile/credentials.js
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-import { dropTestDB, insertTestUser, resolveUrl } from '../../environment/envtools';
-import { createRegularUser } from '../../roles';
+import {dropTestDB, insertTestUser, resolveUrl} from '../../environment/envtools';
+import {createRegularUser} from '../../roles';
 import {pageProfile} from '../../page-models/pageProfile';
 import {confirmation} from '../../components/confirmation';
 import {successNotification} from '../../components/notifications';
diff --git a/e2e/testcafe/fixtures/user-profile/profile.js b/modules/e2e/testcafe/fixtures/user-profile/profile.js
similarity index 92%
rename from e2e/testcafe/fixtures/user-profile/profile.js
rename to modules/e2e/testcafe/fixtures/user-profile/profile.js
index d6030d9..69be02d 100644
--- a/e2e/testcafe/fixtures/user-profile/profile.js
+++ b/modules/e2e/testcafe/fixtures/user-profile/profile.js
@@ -15,9 +15,8 @@
  * limitations under the License.
  */
 
-import { Selector } from 'testcafe';
-import { dropTestDB, insertTestUser, resolveUrl } from '../../environment/envtools';
-import { createRegularUser } from '../../roles';
+import {dropTestDB, insertTestUser, resolveUrl} from '../../environment/envtools';
+import {createRegularUser} from '../../roles';
 import {pageProfile} from '../../page-models/pageProfile';
 
 const regularUser = createRegularUser();
diff --git a/e2e/testcafe/helpers.js b/modules/e2e/testcafe/helpers.js
similarity index 100%
rename from e2e/testcafe/helpers.js
rename to modules/e2e/testcafe/helpers.js
diff --git a/e2e/testcafe/index.js b/modules/e2e/testcafe/index.js
similarity index 100%
rename from e2e/testcafe/index.js
rename to modules/e2e/testcafe/index.js
diff --git a/e2e/testcafe/package.json b/modules/e2e/testcafe/package.json
similarity index 100%
rename from e2e/testcafe/package.json
rename to modules/e2e/testcafe/package.json
diff --git a/e2e/testcafe/page-models/PageConfigurationAdvancedCluster.js b/modules/e2e/testcafe/page-models/PageConfigurationAdvancedCluster.js
similarity index 100%
rename from e2e/testcafe/page-models/PageConfigurationAdvancedCluster.js
rename to modules/e2e/testcafe/page-models/PageConfigurationAdvancedCluster.js
diff --git a/e2e/testcafe/page-models/PageConfigurationBasic.js b/modules/e2e/testcafe/page-models/PageConfigurationBasic.js
similarity index 100%
rename from e2e/testcafe/page-models/PageConfigurationBasic.js
rename to modules/e2e/testcafe/page-models/PageConfigurationBasic.js
diff --git a/e2e/testcafe/page-models/PageConfigurationOverview.js b/modules/e2e/testcafe/page-models/PageConfigurationOverview.js
similarity index 100%
rename from e2e/testcafe/page-models/PageConfigurationOverview.js
rename to modules/e2e/testcafe/page-models/PageConfigurationOverview.js
diff --git a/e2e/testcafe/page-models/PageQueries.js b/modules/e2e/testcafe/page-models/PageQueries.js
similarity index 92%
rename from e2e/testcafe/page-models/PageQueries.js
rename to modules/e2e/testcafe/page-models/PageQueries.js
index 2853a4c..a33ab75 100644
--- a/e2e/testcafe/page-models/PageQueries.js
+++ b/modules/e2e/testcafe/page-models/PageQueries.js
@@ -15,11 +15,10 @@
  * limitations under the License.
  */
 
-
-import { Selector, t } from 'testcafe';
-import { ModalInput } from '../components/modalInput';
-import { confirmation } from '../components/confirmation';
-import { mouseenterTrigger } from '../helpers';
+import {Selector, t} from 'testcafe';
+import {ModalInput} from '../components/modalInput';
+import {confirmation} from '../components/confirmation';
+import {mouseenterTrigger} from '../helpers';
 import _ from 'lodash';
 
 export class PageQueriesNotebooksList {
diff --git a/e2e/testcafe/page-models/pageConfigurationAdvancedIGFS.js b/modules/e2e/testcafe/page-models/pageConfigurationAdvancedIGFS.js
similarity index 100%
rename from e2e/testcafe/page-models/pageConfigurationAdvancedIGFS.js
rename to modules/e2e/testcafe/page-models/pageConfigurationAdvancedIGFS.js
diff --git a/e2e/testcafe/page-models/pageConfigurationAdvancedModels.js b/modules/e2e/testcafe/page-models/pageConfigurationAdvancedModels.js
similarity index 100%
rename from e2e/testcafe/page-models/pageConfigurationAdvancedModels.js
rename to modules/e2e/testcafe/page-models/pageConfigurationAdvancedModels.js
diff --git a/e2e/testcafe/page-models/pageForgotPassword.js b/modules/e2e/testcafe/page-models/pageForgotPassword.js
similarity index 100%
rename from e2e/testcafe/page-models/pageForgotPassword.js
rename to modules/e2e/testcafe/page-models/pageForgotPassword.js
diff --git a/e2e/testcafe/page-models/pageProfile.js b/modules/e2e/testcafe/page-models/pageProfile.js
similarity index 100%
rename from e2e/testcafe/page-models/pageProfile.js
rename to modules/e2e/testcafe/page-models/pageProfile.js
diff --git a/e2e/testcafe/page-models/pageSignin.js b/modules/e2e/testcafe/page-models/pageSignin.js
similarity index 100%
rename from e2e/testcafe/page-models/pageSignin.js
rename to modules/e2e/testcafe/page-models/pageSignin.js
diff --git a/e2e/testcafe/page-models/pageSignup.js b/modules/e2e/testcafe/page-models/pageSignup.js
similarity index 100%
rename from e2e/testcafe/page-models/pageSignup.js
rename to modules/e2e/testcafe/page-models/pageSignup.js
diff --git a/e2e/testcafe/roles.js b/modules/e2e/testcafe/roles.js
similarity index 93%
rename from e2e/testcafe/roles.js
rename to modules/e2e/testcafe/roles.js
index ae5a6a5..c4b2e3b 100644
--- a/e2e/testcafe/roles.js
+++ b/modules/e2e/testcafe/roles.js
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-import { Role, t } from 'testcafe';
-import { resolveUrl } from './environment/envtools';
+import {Role, t} from 'testcafe';
+import {resolveUrl} from './environment/envtools';
 import {pageSignin as page} from './page-models/pageSignin';
 
 export const createRegularUser = () => {
diff --git a/e2e/testcafe/testcafe-runner.js b/modules/e2e/testcafe/testcafe-runner.js
similarity index 100%
rename from e2e/testcafe/testcafe-runner.js
rename to modules/e2e/testcafe/testcafe-runner.js
diff --git a/e2e/testenv/Dockerfile b/modules/e2e/testenv/Dockerfile
similarity index 100%
rename from e2e/testenv/Dockerfile
rename to modules/e2e/testenv/Dockerfile
diff --git a/e2e/testenv/nginx/nginx.conf b/modules/e2e/testenv/nginx/nginx.conf
similarity index 100%
rename from e2e/testenv/nginx/nginx.conf
rename to modules/e2e/testenv/nginx/nginx.conf
diff --git a/e2e/testenv/nginx/web-console.conf b/modules/e2e/testenv/nginx/web-console.conf
similarity index 100%
rename from e2e/testenv/nginx/web-console.conf
rename to modules/e2e/testenv/nginx/web-console.conf
diff --git a/frontend/.babelrc b/modules/frontend/.babelrc
similarity index 100%
rename from frontend/.babelrc
rename to modules/frontend/.babelrc
diff --git a/frontend/.eslintrc b/modules/frontend/.eslintrc
similarity index 100%
rename from frontend/.eslintrc
rename to modules/frontend/.eslintrc
diff --git a/frontend/.gitignore b/modules/frontend/.gitignore
similarity index 100%
rename from frontend/.gitignore
rename to modules/frontend/.gitignore
diff --git a/frontend/app/app.config.js b/modules/frontend/app/app.config.js
similarity index 98%
rename from frontend/app/app.config.js
rename to modules/frontend/app/app.config.js
index 04c02ea..b40add5 100644
--- a/frontend/app/app.config.js
+++ b/modules/frontend/app/app.config.js
@@ -22,7 +22,11 @@ import isNil from 'lodash/isNil';
 import isEmpty from 'lodash/isEmpty';
 import mixin from 'lodash/mixin';
 
-import {user as userAction, register as registerStore} from './store';
+import {register as registerStore, user as userAction} from './store';
+import alertTemplateUrl from 'views/templates/alert.tpl.pug';
+import dropdownTemplateUrl from 'views/templates/dropdown.tpl.pug';
+import validationTemplateUrl from 'views/templates/validation-error.tpl.pug';
+
 const nonNil = negate(isNil);
 const nonEmpty = negate(isEmpty);
 
@@ -31,10 +35,6 @@ mixin({
     nonEmpty
 });
 
-import alertTemplateUrl from 'views/templates/alert.tpl.pug';
-import dropdownTemplateUrl from 'views/templates/dropdown.tpl.pug';
-import validationTemplateUrl from 'views/templates/validation-error.tpl.pug';
-
 const igniteConsoleCfg = angular.module('ignite-console.config', ['ngAnimate', 'mgcrea.ngStrap']);
 
 igniteConsoleCfg.run(registerStore);
diff --git a/frontend/app/app.d.ts b/modules/frontend/app/app.d.ts
similarity index 100%
rename from frontend/app/app.d.ts
rename to modules/frontend/app/app.d.ts
diff --git a/frontend/app/app.js b/modules/frontend/app/app.js
similarity index 99%
rename from frontend/app/app.js
rename to modules/frontend/app/app.js
index 4d048ab..499c5b0 100644
--- a/frontend/app/app.js
+++ b/modules/frontend/app/app.js
@@ -34,7 +34,6 @@ import './modules/states/logout.state';
 import './modules/states/admin.state';
 import './modules/states/errors.state';
 import './modules/states/settings.state';
-
 // ignite:modules
 import './core';
 import './modules/user/user.module';
@@ -45,11 +44,9 @@ import './modules/dialog/dialog.module';
 import './modules/ace.module';
 import './modules/loading/loading.module';
 import servicesModule from './services';
-// endignite
-
+import igniteServices from './services';
 // Data
 import i18n from './data/i18n';
-
 // Directives.
 import igniteAutoFocus from './directives/auto-focus.directive';
 import igniteCopyToClipboard from './directives/copy-to-clipboard.directive';
@@ -62,10 +59,9 @@ import igniteOnEscape from './directives/on-escape.directive';
 import igniteOnFocusOut from './directives/on-focus-out.directive';
 import igniteRetainSelection from './directives/retain-selection.directive';
 import btnIgniteLink from './directives/btn-ignite-link';
-
 // Services.
 import ChartColors from './services/ChartColors.service';
-import {default as IgniteConfirm, Confirm} from './services/Confirm.service';
+import {Confirm, default as IgniteConfirm} from './services/Confirm.service';
 import ConfirmBatch from './services/ConfirmBatch.service';
 import CopyToClipboard from './services/CopyToClipboard.service';
 import Countries from './services/Countries.service';
@@ -87,7 +83,6 @@ import {Store} from './services/store';
 
 import AngularStrapTooltip from './services/AngularStrapTooltip.decorator';
 import AngularStrapSelect from './services/AngularStrapSelect.decorator';
-
 // Filters.
 import byName from './filters/byName.filter';
 import bytes from './filters/bytes.filter';
@@ -97,7 +92,6 @@ import duration from './filters/duration.filter';
 import hasPojo from './filters/hasPojo.filter';
 import uiGridSubcategories from './filters/uiGridSubcategories.filter';
 import id8 from './filters/id8.filter';
-
 // Components
 import igniteListOfRegisteredUsers from './components/list-of-registered-users';
 import dialogAdminCreateUser from './components/dialog-admin-create-user';
@@ -149,10 +143,9 @@ import signupConfirmation from './components/page-signup-confirmation';
 import noDataCmp from './components/no-data';
 import globalProgressBar from './components/global-progress-line';
 
-import igniteServices from './services';
-
 import baseTemplate from 'views/base.pug';
 import * as icons from '../public/images/icons';
+// endignite
 
 export default angular
     .module('ignite-console', [
diff --git a/frontend/app/browserUpdate/index.js b/modules/frontend/app/browserUpdate/index.js
similarity index 100%
rename from frontend/app/browserUpdate/index.js
rename to modules/frontend/app/browserUpdate/index.js
diff --git a/frontend/app/browserUpdate/style.scss b/modules/frontend/app/browserUpdate/style.scss
similarity index 100%
rename from frontend/app/browserUpdate/style.scss
rename to modules/frontend/app/browserUpdate/style.scss
diff --git a/frontend/app/components/activities-user-dialog/activities-user-dialog.controller.js b/modules/frontend/app/components/activities-user-dialog/activities-user-dialog.controller.js
similarity index 100%
rename from frontend/app/components/activities-user-dialog/activities-user-dialog.controller.js
rename to modules/frontend/app/components/activities-user-dialog/activities-user-dialog.controller.js
diff --git a/frontend/app/components/activities-user-dialog/activities-user-dialog.tpl.pug b/modules/frontend/app/components/activities-user-dialog/activities-user-dialog.tpl.pug
similarity index 100%
rename from frontend/app/components/activities-user-dialog/activities-user-dialog.tpl.pug
rename to modules/frontend/app/components/activities-user-dialog/activities-user-dialog.tpl.pug
diff --git a/frontend/app/components/activities-user-dialog/index.js b/modules/frontend/app/components/activities-user-dialog/index.js
similarity index 100%
rename from frontend/app/components/activities-user-dialog/index.js
rename to modules/frontend/app/components/activities-user-dialog/index.js
diff --git a/frontend/app/components/breadcrumbs/component.js b/modules/frontend/app/components/breadcrumbs/component.js
similarity index 100%
rename from frontend/app/components/breadcrumbs/component.js
rename to modules/frontend/app/components/breadcrumbs/component.js
diff --git a/frontend/app/components/breadcrumbs/index.js b/modules/frontend/app/components/breadcrumbs/index.js
similarity index 100%
rename from frontend/app/components/breadcrumbs/index.js
rename to modules/frontend/app/components/breadcrumbs/index.js
diff --git a/frontend/app/components/breadcrumbs/style.scss b/modules/frontend/app/components/breadcrumbs/style.scss
similarity index 100%
rename from frontend/app/components/breadcrumbs/style.scss
rename to modules/frontend/app/components/breadcrumbs/style.scss
diff --git a/frontend/app/components/breadcrumbs/template.pug b/modules/frontend/app/components/breadcrumbs/template.pug
similarity index 100%
rename from frontend/app/components/breadcrumbs/template.pug
rename to modules/frontend/app/components/breadcrumbs/template.pug
diff --git a/frontend/app/components/bs-select-menu/controller.js b/modules/frontend/app/components/bs-select-menu/controller.js
similarity index 100%
rename from frontend/app/components/bs-select-menu/controller.js
rename to modules/frontend/app/components/bs-select-menu/controller.js
diff --git a/frontend/app/components/bs-select-menu/directive.js b/modules/frontend/app/components/bs-select-menu/directive.js
similarity index 100%
rename from frontend/app/components/bs-select-menu/directive.js
rename to modules/frontend/app/components/bs-select-menu/directive.js
diff --git a/frontend/app/components/bs-select-menu/index.js b/modules/frontend/app/components/bs-select-menu/index.js
similarity index 100%
rename from frontend/app/components/bs-select-menu/index.js
rename to modules/frontend/app/components/bs-select-menu/index.js
diff --git a/frontend/app/components/bs-select-menu/index.spec.js b/modules/frontend/app/components/bs-select-menu/index.spec.js
similarity index 100%
rename from frontend/app/components/bs-select-menu/index.spec.js
rename to modules/frontend/app/components/bs-select-menu/index.spec.js
diff --git a/frontend/app/components/bs-select-menu/strip.filter.js b/modules/frontend/app/components/bs-select-menu/strip.filter.js
similarity index 100%
rename from frontend/app/components/bs-select-menu/strip.filter.js
rename to modules/frontend/app/components/bs-select-menu/strip.filter.js
diff --git a/frontend/app/components/bs-select-menu/style.scss b/modules/frontend/app/components/bs-select-menu/style.scss
similarity index 100%
rename from frontend/app/components/bs-select-menu/style.scss
rename to modules/frontend/app/components/bs-select-menu/style.scss
diff --git a/frontend/app/components/bs-select-menu/template.pug b/modules/frontend/app/components/bs-select-menu/template.pug
similarity index 100%
rename from frontend/app/components/bs-select-menu/template.pug
rename to modules/frontend/app/components/bs-select-menu/template.pug
diff --git a/frontend/app/components/bs-select-menu/transcludeToBody.directive.js b/modules/frontend/app/components/bs-select-menu/transcludeToBody.directive.js
similarity index 100%
rename from frontend/app/components/bs-select-menu/transcludeToBody.directive.js
rename to modules/frontend/app/components/bs-select-menu/transcludeToBody.directive.js
diff --git a/frontend/app/components/cluster-security-icon/component.js b/modules/frontend/app/components/cluster-security-icon/component.js
similarity index 100%
rename from frontend/app/components/cluster-security-icon/component.js
rename to modules/frontend/app/components/cluster-security-icon/component.js
diff --git a/frontend/app/components/cluster-security-icon/index.js b/modules/frontend/app/components/cluster-security-icon/index.js
similarity index 100%
rename from frontend/app/components/cluster-security-icon/index.js
rename to modules/frontend/app/components/cluster-security-icon/index.js
diff --git a/frontend/app/components/cluster-security-icon/template.pug b/modules/frontend/app/components/cluster-security-icon/template.pug
similarity index 100%
rename from frontend/app/components/cluster-security-icon/template.pug
rename to modules/frontend/app/components/cluster-security-icon/template.pug
diff --git a/frontend/app/components/cluster-selector/component.js b/modules/frontend/app/components/cluster-selector/component.js
similarity index 100%
rename from frontend/app/components/cluster-selector/component.js
rename to modules/frontend/app/components/cluster-selector/component.js
diff --git a/frontend/app/components/cluster-selector/controller.js b/modules/frontend/app/components/cluster-selector/controller.js
similarity index 97%
rename from frontend/app/components/cluster-selector/controller.js
rename to modules/frontend/app/components/cluster-selector/controller.js
index 97dd3b7..28ccf27 100644
--- a/frontend/app/components/cluster-selector/controller.js
+++ b/modules/frontend/app/components/cluster-selector/controller.js
@@ -17,8 +17,8 @@
 
 import _ from 'lodash';
 
-import { BehaviorSubject } from 'rxjs';
-import {tap, filter, combineLatest} from 'rxjs/operators';
+import {BehaviorSubject} from 'rxjs';
+import {combineLatest, filter, tap} from 'rxjs/operators';
 import {CancellationError} from 'app/errors/CancellationError';
 
 export default class {
diff --git a/frontend/app/components/cluster-selector/index.js b/modules/frontend/app/components/cluster-selector/index.js
similarity index 100%
rename from frontend/app/components/cluster-selector/index.js
rename to modules/frontend/app/components/cluster-selector/index.js
diff --git a/frontend/app/components/cluster-selector/style.scss b/modules/frontend/app/components/cluster-selector/style.scss
similarity index 100%
rename from frontend/app/components/cluster-selector/style.scss
rename to modules/frontend/app/components/cluster-selector/style.scss
diff --git a/frontend/app/components/cluster-selector/template.pug b/modules/frontend/app/components/cluster-selector/template.pug
similarity index 100%
rename from frontend/app/components/cluster-selector/template.pug
rename to modules/frontend/app/components/cluster-selector/template.pug
diff --git a/frontend/app/components/connected-clusters-badge/controller.js b/modules/frontend/app/components/connected-clusters-badge/controller.js
similarity index 100%
rename from frontend/app/components/connected-clusters-badge/controller.js
rename to modules/frontend/app/components/connected-clusters-badge/controller.js
diff --git a/frontend/app/components/connected-clusters-badge/index.js b/modules/frontend/app/components/connected-clusters-badge/index.js
similarity index 100%
rename from frontend/app/components/connected-clusters-badge/index.js
rename to modules/frontend/app/components/connected-clusters-badge/index.js
diff --git a/frontend/app/components/connected-clusters-badge/style.scss b/modules/frontend/app/components/connected-clusters-badge/style.scss
similarity index 100%
rename from frontend/app/components/connected-clusters-badge/style.scss
rename to modules/frontend/app/components/connected-clusters-badge/style.scss
diff --git a/frontend/app/components/connected-clusters-badge/template.pug b/modules/frontend/app/components/connected-clusters-badge/template.pug
similarity index 100%
rename from frontend/app/components/connected-clusters-badge/template.pug
rename to modules/frontend/app/components/connected-clusters-badge/template.pug
diff --git a/frontend/app/components/connected-clusters-dialog/components/cell-logout/index.js b/modules/frontend/app/components/connected-clusters-dialog/components/cell-logout/index.js
similarity index 100%
rename from frontend/app/components/connected-clusters-dialog/components/cell-logout/index.js
rename to modules/frontend/app/components/connected-clusters-dialog/components/cell-logout/index.js
diff --git a/frontend/app/components/connected-clusters-dialog/components/cell-logout/template.pug b/modules/frontend/app/components/connected-clusters-dialog/components/cell-logout/template.pug
similarity index 100%
rename from frontend/app/components/connected-clusters-dialog/components/cell-logout/template.pug
rename to modules/frontend/app/components/connected-clusters-dialog/components/cell-logout/template.pug
diff --git a/frontend/app/components/connected-clusters-dialog/components/cell-status/index.ts b/modules/frontend/app/components/connected-clusters-dialog/components/cell-status/index.ts
similarity index 100%
rename from frontend/app/components/connected-clusters-dialog/components/cell-status/index.ts
rename to modules/frontend/app/components/connected-clusters-dialog/components/cell-status/index.ts
diff --git a/frontend/app/components/connected-clusters-dialog/components/list/column-defs.js b/modules/frontend/app/components/connected-clusters-dialog/components/list/column-defs.js
similarity index 100%
rename from frontend/app/components/connected-clusters-dialog/components/list/column-defs.js
rename to modules/frontend/app/components/connected-clusters-dialog/components/list/column-defs.js
diff --git a/frontend/app/components/connected-clusters-dialog/components/list/controller.js b/modules/frontend/app/components/connected-clusters-dialog/components/list/controller.js
similarity index 100%
rename from frontend/app/components/connected-clusters-dialog/components/list/controller.js
rename to modules/frontend/app/components/connected-clusters-dialog/components/list/controller.js
diff --git a/frontend/app/components/connected-clusters-dialog/components/list/index.js b/modules/frontend/app/components/connected-clusters-dialog/components/list/index.js
similarity index 100%
rename from frontend/app/components/connected-clusters-dialog/components/list/index.js
rename to modules/frontend/app/components/connected-clusters-dialog/components/list/index.js
diff --git a/frontend/app/components/connected-clusters-dialog/components/list/style.scss b/modules/frontend/app/components/connected-clusters-dialog/components/list/style.scss
similarity index 100%
rename from frontend/app/components/connected-clusters-dialog/components/list/style.scss
rename to modules/frontend/app/components/connected-clusters-dialog/components/list/style.scss
diff --git a/frontend/app/components/connected-clusters-dialog/components/list/template.tpl.pug b/modules/frontend/app/components/connected-clusters-dialog/components/list/template.tpl.pug
similarity index 100%
rename from frontend/app/components/connected-clusters-dialog/components/list/template.tpl.pug
rename to modules/frontend/app/components/connected-clusters-dialog/components/list/template.tpl.pug
diff --git a/frontend/app/components/connected-clusters-dialog/controller.js b/modules/frontend/app/components/connected-clusters-dialog/controller.js
similarity index 100%
rename from frontend/app/components/connected-clusters-dialog/controller.js
rename to modules/frontend/app/components/connected-clusters-dialog/controller.js
diff --git a/frontend/app/components/connected-clusters-dialog/index.js b/modules/frontend/app/components/connected-clusters-dialog/index.js
similarity index 100%
rename from frontend/app/components/connected-clusters-dialog/index.js
rename to modules/frontend/app/components/connected-clusters-dialog/index.js
diff --git a/frontend/app/components/connected-clusters-dialog/service.js b/modules/frontend/app/components/connected-clusters-dialog/service.js
similarity index 100%
rename from frontend/app/components/connected-clusters-dialog/service.js
rename to modules/frontend/app/components/connected-clusters-dialog/service.js
diff --git a/frontend/app/components/connected-clusters-dialog/style.scss b/modules/frontend/app/components/connected-clusters-dialog/style.scss
similarity index 100%
rename from frontend/app/components/connected-clusters-dialog/style.scss
rename to modules/frontend/app/components/connected-clusters-dialog/style.scss
diff --git a/frontend/app/components/connected-clusters-dialog/template.tpl.pug b/modules/frontend/app/components/connected-clusters-dialog/template.tpl.pug
similarity index 100%
rename from frontend/app/components/connected-clusters-dialog/template.tpl.pug
rename to modules/frontend/app/components/connected-clusters-dialog/template.tpl.pug
diff --git a/frontend/app/components/dialog-admin-create-user/component.ts b/modules/frontend/app/components/dialog-admin-create-user/component.ts
similarity index 100%
rename from frontend/app/components/dialog-admin-create-user/component.ts
rename to modules/frontend/app/components/dialog-admin-create-user/component.ts
diff --git a/frontend/app/components/dialog-admin-create-user/controller.ts b/modules/frontend/app/components/dialog-admin-create-user/controller.ts
similarity index 100%
rename from frontend/app/components/dialog-admin-create-user/controller.ts
rename to modules/frontend/app/components/dialog-admin-create-user/controller.ts
diff --git a/frontend/app/components/dialog-admin-create-user/index.ts b/modules/frontend/app/components/dialog-admin-create-user/index.ts
similarity index 100%
rename from frontend/app/components/dialog-admin-create-user/index.ts
rename to modules/frontend/app/components/dialog-admin-create-user/index.ts
diff --git a/frontend/app/components/dialog-admin-create-user/state.ts b/modules/frontend/app/components/dialog-admin-create-user/state.ts
similarity index 100%
rename from frontend/app/components/dialog-admin-create-user/state.ts
rename to modules/frontend/app/components/dialog-admin-create-user/state.ts
diff --git a/frontend/app/components/dialog-admin-create-user/template.pug b/modules/frontend/app/components/dialog-admin-create-user/template.pug
similarity index 100%
rename from frontend/app/components/dialog-admin-create-user/template.pug
rename to modules/frontend/app/components/dialog-admin-create-user/template.pug
diff --git a/frontend/app/components/form-field/components/form-field-size/controller.ts b/modules/frontend/app/components/form-field/components/form-field-size/controller.ts
similarity index 100%
rename from frontend/app/components/form-field/components/form-field-size/controller.ts
rename to modules/frontend/app/components/form-field/components/form-field-size/controller.ts
diff --git a/frontend/app/components/form-field/components/form-field-size/index.js b/modules/frontend/app/components/form-field/components/form-field-size/index.js
similarity index 100%
rename from frontend/app/components/form-field/components/form-field-size/index.js
rename to modules/frontend/app/components/form-field/components/form-field-size/index.js
diff --git a/frontend/app/components/form-field/components/form-field-size/style.scss b/modules/frontend/app/components/form-field/components/form-field-size/style.scss
similarity index 100%
rename from frontend/app/components/form-field/components/form-field-size/style.scss
rename to modules/frontend/app/components/form-field/components/form-field-size/style.scss
diff --git a/frontend/app/components/form-field/components/form-field-size/template.pug b/modules/frontend/app/components/form-field/components/form-field-size/template.pug
similarity index 100%
rename from frontend/app/components/form-field/components/form-field-size/template.pug
rename to modules/frontend/app/components/form-field/components/form-field-size/template.pug
diff --git a/frontend/app/components/form-field/copyInputValueButton.directive.js b/modules/frontend/app/components/form-field/copyInputValueButton.directive.js
similarity index 100%
rename from frontend/app/components/form-field/copyInputValueButton.directive.js
rename to modules/frontend/app/components/form-field/copyInputValueButton.directive.js
diff --git a/frontend/app/components/form-field/igniteFormField.directive.ts b/modules/frontend/app/components/form-field/igniteFormField.directive.ts
similarity index 100%
rename from frontend/app/components/form-field/igniteFormField.directive.ts
rename to modules/frontend/app/components/form-field/igniteFormField.directive.ts
diff --git a/frontend/app/components/form-field/index.js b/modules/frontend/app/components/form-field/index.js
similarity index 94%
rename from frontend/app/components/form-field/index.js
rename to modules/frontend/app/components/form-field/index.js
index da49e2e..3f9a620 100644
--- a/frontend/app/components/form-field/index.js
+++ b/modules/frontend/app/components/form-field/index.js
@@ -21,7 +21,7 @@ import {directive as igniteFormField} from './igniteFormField.directive';
 import {directive as showValidationError} from './showValidationError.directive';
 import {directive as copyInputValue} from './copyInputValueButton.directive';
 
-import { default as formFieldSize } from './components/form-field-size';
+import {default as formFieldSize} from './components/form-field-size';
 
 export default angular
     .module('ignite-console.form-field', [])
diff --git a/frontend/app/components/form-field/showValidationError.directive.ts b/modules/frontend/app/components/form-field/showValidationError.directive.ts
similarity index 100%
rename from frontend/app/components/form-field/showValidationError.directive.ts
rename to modules/frontend/app/components/form-field/showValidationError.directive.ts
diff --git a/frontend/app/components/form-field/style.scss b/modules/frontend/app/components/form-field/style.scss
similarity index 100%
rename from frontend/app/components/form-field/style.scss
rename to modules/frontend/app/components/form-field/style.scss
diff --git a/frontend/app/components/form-signup/component.ts b/modules/frontend/app/components/form-signup/component.ts
similarity index 100%
rename from frontend/app/components/form-signup/component.ts
rename to modules/frontend/app/components/form-signup/component.ts
diff --git a/frontend/app/components/form-signup/controller.ts b/modules/frontend/app/components/form-signup/controller.ts
similarity index 100%
rename from frontend/app/components/form-signup/controller.ts
rename to modules/frontend/app/components/form-signup/controller.ts
diff --git a/frontend/app/components/form-signup/index.ts b/modules/frontend/app/components/form-signup/index.ts
similarity index 100%
rename from frontend/app/components/form-signup/index.ts
rename to modules/frontend/app/components/form-signup/index.ts
diff --git a/frontend/app/components/form-signup/style.scss b/modules/frontend/app/components/form-signup/style.scss
similarity index 100%
rename from frontend/app/components/form-signup/style.scss
rename to modules/frontend/app/components/form-signup/style.scss
diff --git a/frontend/app/components/form-signup/template.pug b/modules/frontend/app/components/form-signup/template.pug
similarity index 100%
rename from frontend/app/components/form-signup/template.pug
rename to modules/frontend/app/components/form-signup/template.pug
diff --git a/frontend/app/components/global-progress-line/component.ts b/modules/frontend/app/components/global-progress-line/component.ts
similarity index 100%
rename from frontend/app/components/global-progress-line/component.ts
rename to modules/frontend/app/components/global-progress-line/component.ts
diff --git a/frontend/app/components/global-progress-line/controller.ts b/modules/frontend/app/components/global-progress-line/controller.ts
similarity index 100%
rename from frontend/app/components/global-progress-line/controller.ts
rename to modules/frontend/app/components/global-progress-line/controller.ts
diff --git a/frontend/app/components/global-progress-line/index.ts b/modules/frontend/app/components/global-progress-line/index.ts
similarity index 100%
rename from frontend/app/components/global-progress-line/index.ts
rename to modules/frontend/app/components/global-progress-line/index.ts
diff --git a/frontend/app/components/global-progress-line/style.scss b/modules/frontend/app/components/global-progress-line/style.scss
similarity index 100%
rename from frontend/app/components/global-progress-line/style.scss
rename to modules/frontend/app/components/global-progress-line/style.scss
diff --git a/frontend/app/components/global-progress-line/template.pug b/modules/frontend/app/components/global-progress-line/template.pug
similarity index 100%
rename from frontend/app/components/global-progress-line/template.pug
rename to modules/frontend/app/components/global-progress-line/template.pug
diff --git a/frontend/app/components/grid-column-selector/component.js b/modules/frontend/app/components/grid-column-selector/component.js
similarity index 100%
rename from frontend/app/components/grid-column-selector/component.js
rename to modules/frontend/app/components/grid-column-selector/component.js
diff --git a/frontend/app/components/grid-column-selector/controller.js b/modules/frontend/app/components/grid-column-selector/controller.js
similarity index 100%
rename from frontend/app/components/grid-column-selector/controller.js
rename to modules/frontend/app/components/grid-column-selector/controller.js
diff --git a/frontend/app/components/grid-column-selector/controller.spec.js b/modules/frontend/app/components/grid-column-selector/controller.spec.js
similarity index 100%
rename from frontend/app/components/grid-column-selector/controller.spec.js
rename to modules/frontend/app/components/grid-column-selector/controller.spec.js
diff --git a/frontend/app/components/grid-column-selector/index.js b/modules/frontend/app/components/grid-column-selector/index.js
similarity index 100%
rename from frontend/app/components/grid-column-selector/index.js
rename to modules/frontend/app/components/grid-column-selector/index.js
diff --git a/frontend/app/components/grid-column-selector/style.scss b/modules/frontend/app/components/grid-column-selector/style.scss
similarity index 100%
rename from frontend/app/components/grid-column-selector/style.scss
rename to modules/frontend/app/components/grid-column-selector/style.scss
diff --git a/frontend/app/components/grid-column-selector/template.pug b/modules/frontend/app/components/grid-column-selector/template.pug
similarity index 100%
rename from frontend/app/components/grid-column-selector/template.pug
rename to modules/frontend/app/components/grid-column-selector/template.pug
diff --git a/frontend/app/components/grid-export/component.js b/modules/frontend/app/components/grid-export/component.js
similarity index 100%
rename from frontend/app/components/grid-export/component.js
rename to modules/frontend/app/components/grid-export/component.js
diff --git a/frontend/app/components/grid-export/index.js b/modules/frontend/app/components/grid-export/index.js
similarity index 100%
rename from frontend/app/components/grid-export/index.js
rename to modules/frontend/app/components/grid-export/index.js
diff --git a/frontend/app/components/grid-export/style.scss b/modules/frontend/app/components/grid-export/style.scss
similarity index 100%
rename from frontend/app/components/grid-export/style.scss
rename to modules/frontend/app/components/grid-export/style.scss
diff --git a/frontend/app/components/grid-export/template.pug b/modules/frontend/app/components/grid-export/template.pug
similarity index 100%
rename from frontend/app/components/grid-export/template.pug
rename to modules/frontend/app/components/grid-export/template.pug
diff --git a/frontend/app/components/grid-item-selected/component.js b/modules/frontend/app/components/grid-item-selected/component.js
similarity index 100%
rename from frontend/app/components/grid-item-selected/component.js
rename to modules/frontend/app/components/grid-item-selected/component.js
diff --git a/frontend/app/components/grid-item-selected/controller.js b/modules/frontend/app/components/grid-item-selected/controller.js
similarity index 100%
rename from frontend/app/components/grid-item-selected/controller.js
rename to modules/frontend/app/components/grid-item-selected/controller.js
diff --git a/frontend/app/components/grid-item-selected/index.js b/modules/frontend/app/components/grid-item-selected/index.js
similarity index 100%
rename from frontend/app/components/grid-item-selected/index.js
rename to modules/frontend/app/components/grid-item-selected/index.js
diff --git a/frontend/app/components/grid-item-selected/style.scss b/modules/frontend/app/components/grid-item-selected/style.scss
similarity index 100%
rename from frontend/app/components/grid-item-selected/style.scss
rename to modules/frontend/app/components/grid-item-selected/style.scss
diff --git a/frontend/app/components/grid-item-selected/template.pug b/modules/frontend/app/components/grid-item-selected/template.pug
similarity index 100%
rename from frontend/app/components/grid-item-selected/template.pug
rename to modules/frontend/app/components/grid-item-selected/template.pug
diff --git a/frontend/app/components/grid-no-data/component.js b/modules/frontend/app/components/grid-no-data/component.js
similarity index 100%
rename from frontend/app/components/grid-no-data/component.js
rename to modules/frontend/app/components/grid-no-data/component.js
diff --git a/frontend/app/components/grid-no-data/controller.js b/modules/frontend/app/components/grid-no-data/controller.js
similarity index 100%
rename from frontend/app/components/grid-no-data/controller.js
rename to modules/frontend/app/components/grid-no-data/controller.js
diff --git a/frontend/app/components/grid-no-data/index.js b/modules/frontend/app/components/grid-no-data/index.js
similarity index 100%
rename from frontend/app/components/grid-no-data/index.js
rename to modules/frontend/app/components/grid-no-data/index.js
diff --git a/frontend/app/components/grid-no-data/style.scss b/modules/frontend/app/components/grid-no-data/style.scss
similarity index 100%
rename from frontend/app/components/grid-no-data/style.scss
rename to modules/frontend/app/components/grid-no-data/style.scss
diff --git a/frontend/app/components/grid-showing-rows/component.js b/modules/frontend/app/components/grid-showing-rows/component.js
similarity index 100%
rename from frontend/app/components/grid-showing-rows/component.js
rename to modules/frontend/app/components/grid-showing-rows/component.js
diff --git a/frontend/app/components/grid-showing-rows/controller.js b/modules/frontend/app/components/grid-showing-rows/controller.js
similarity index 100%
rename from frontend/app/components/grid-showing-rows/controller.js
rename to modules/frontend/app/components/grid-showing-rows/controller.js
diff --git a/frontend/app/components/grid-showing-rows/index.js b/modules/frontend/app/components/grid-showing-rows/index.js
similarity index 100%
rename from frontend/app/components/grid-showing-rows/index.js
rename to modules/frontend/app/components/grid-showing-rows/index.js
diff --git a/frontend/app/components/grid-showing-rows/style.scss b/modules/frontend/app/components/grid-showing-rows/style.scss
similarity index 100%
rename from frontend/app/components/grid-showing-rows/style.scss
rename to modules/frontend/app/components/grid-showing-rows/style.scss
diff --git a/frontend/app/components/grid-showing-rows/template.tpl.pug b/modules/frontend/app/components/grid-showing-rows/template.tpl.pug
similarity index 100%
rename from frontend/app/components/grid-showing-rows/template.tpl.pug
rename to modules/frontend/app/components/grid-showing-rows/template.tpl.pug
diff --git a/frontend/app/components/ignite-chart-series-selector/component.js b/modules/frontend/app/components/ignite-chart-series-selector/component.js
similarity index 100%
rename from frontend/app/components/ignite-chart-series-selector/component.js
rename to modules/frontend/app/components/ignite-chart-series-selector/component.js
diff --git a/frontend/app/components/ignite-chart-series-selector/controller.js b/modules/frontend/app/components/ignite-chart-series-selector/controller.js
similarity index 100%
rename from frontend/app/components/ignite-chart-series-selector/controller.js
rename to modules/frontend/app/components/ignite-chart-series-selector/controller.js
diff --git a/frontend/app/components/ignite-chart-series-selector/index.js b/modules/frontend/app/components/ignite-chart-series-selector/index.js
similarity index 100%
rename from frontend/app/components/ignite-chart-series-selector/index.js
rename to modules/frontend/app/components/ignite-chart-series-selector/index.js
diff --git a/frontend/app/components/ignite-chart-series-selector/template.pug b/modules/frontend/app/components/ignite-chart-series-selector/template.pug
similarity index 100%
rename from frontend/app/components/ignite-chart-series-selector/template.pug
rename to modules/frontend/app/components/ignite-chart-series-selector/template.pug
diff --git a/frontend/app/components/ignite-chart/component.ts b/modules/frontend/app/components/ignite-chart/component.ts
similarity index 95%
rename from frontend/app/components/ignite-chart/component.ts
rename to modules/frontend/app/components/ignite-chart/component.ts
index 91a816e..ebe9fdf 100644
--- a/frontend/app/components/ignite-chart/component.ts
+++ b/modules/frontend/app/components/ignite-chart/component.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { IgniteChartController } from './controller';
+import {IgniteChartController} from './controller';
 import templateUrl from './template.tpl.pug';
 
 export default {
diff --git a/frontend/app/components/ignite-chart/components/chart-no-data/component.ts b/modules/frontend/app/components/ignite-chart/components/chart-no-data/component.ts
similarity index 100%
rename from frontend/app/components/ignite-chart/components/chart-no-data/component.ts
rename to modules/frontend/app/components/ignite-chart/components/chart-no-data/component.ts
diff --git a/frontend/app/components/ignite-chart/components/chart-no-data/controller.ts b/modules/frontend/app/components/ignite-chart/components/chart-no-data/controller.ts
similarity index 97%
rename from frontend/app/components/ignite-chart/components/chart-no-data/controller.ts
rename to modules/frontend/app/components/ignite-chart/components/chart-no-data/controller.ts
index 6acf8cf..525c62c 100644
--- a/frontend/app/components/ignite-chart/components/chart-no-data/controller.ts
+++ b/modules/frontend/app/components/ignite-chart/components/chart-no-data/controller.ts
@@ -16,7 +16,7 @@
  */
 
 import {merge} from 'rxjs';
-import {tap, pluck, distinctUntilChanged} from 'rxjs/operators';
+import {distinctUntilChanged, pluck, tap} from 'rxjs/operators';
 
 import {WellKnownOperationStatus} from 'app/types';
 import {IgniteChartController} from '../../controller';
diff --git a/frontend/app/components/ignite-chart/components/chart-no-data/index.ts b/modules/frontend/app/components/ignite-chart/components/chart-no-data/index.ts
similarity index 100%
rename from frontend/app/components/ignite-chart/components/chart-no-data/index.ts
rename to modules/frontend/app/components/ignite-chart/components/chart-no-data/index.ts
diff --git a/frontend/app/components/ignite-chart/components/chart-no-data/template.tpl.pug b/modules/frontend/app/components/ignite-chart/components/chart-no-data/template.tpl.pug
similarity index 100%
rename from frontend/app/components/ignite-chart/components/chart-no-data/template.tpl.pug
rename to modules/frontend/app/components/ignite-chart/components/chart-no-data/template.tpl.pug
diff --git a/frontend/app/components/ignite-chart/controller.js b/modules/frontend/app/components/ignite-chart/controller.js
similarity index 100%
rename from frontend/app/components/ignite-chart/controller.js
rename to modules/frontend/app/components/ignite-chart/controller.js
diff --git a/frontend/app/components/ignite-chart/index.js b/modules/frontend/app/components/ignite-chart/index.js
similarity index 100%
rename from frontend/app/components/ignite-chart/index.js
rename to modules/frontend/app/components/ignite-chart/index.js
diff --git a/frontend/app/components/ignite-chart/style.scss b/modules/frontend/app/components/ignite-chart/style.scss
similarity index 100%
rename from frontend/app/components/ignite-chart/style.scss
rename to modules/frontend/app/components/ignite-chart/style.scss
diff --git a/frontend/app/components/ignite-chart/template.tpl.pug b/modules/frontend/app/components/ignite-chart/template.tpl.pug
similarity index 100%
rename from frontend/app/components/ignite-chart/template.tpl.pug
rename to modules/frontend/app/components/ignite-chart/template.tpl.pug
diff --git a/frontend/app/components/ignite-icon/directive.js b/modules/frontend/app/components/ignite-icon/directive.js
similarity index 100%
rename from frontend/app/components/ignite-icon/directive.js
rename to modules/frontend/app/components/ignite-icon/directive.js
diff --git a/frontend/app/components/ignite-icon/index.js b/modules/frontend/app/components/ignite-icon/index.js
similarity index 100%
rename from frontend/app/components/ignite-icon/index.js
rename to modules/frontend/app/components/ignite-icon/index.js
diff --git a/frontend/app/components/ignite-icon/service.js b/modules/frontend/app/components/ignite-icon/service.js
similarity index 100%
rename from frontend/app/components/ignite-icon/service.js
rename to modules/frontend/app/components/ignite-icon/service.js
diff --git a/frontend/app/components/ignite-icon/style.scss b/modules/frontend/app/components/ignite-icon/style.scss
similarity index 100%
rename from frontend/app/components/ignite-icon/style.scss
rename to modules/frontend/app/components/ignite-icon/style.scss
diff --git a/frontend/app/components/input-dialog/index.js b/modules/frontend/app/components/input-dialog/index.js
similarity index 100%
rename from frontend/app/components/input-dialog/index.js
rename to modules/frontend/app/components/input-dialog/index.js
diff --git a/frontend/app/components/input-dialog/input-dialog.controller.js b/modules/frontend/app/components/input-dialog/input-dialog.controller.js
similarity index 100%
rename from frontend/app/components/input-dialog/input-dialog.controller.js
rename to modules/frontend/app/components/input-dialog/input-dialog.controller.js
diff --git a/frontend/app/components/input-dialog/input-dialog.service.ts b/modules/frontend/app/components/input-dialog/input-dialog.service.ts
similarity index 100%
rename from frontend/app/components/input-dialog/input-dialog.service.ts
rename to modules/frontend/app/components/input-dialog/input-dialog.service.ts
diff --git a/frontend/app/components/input-dialog/input-dialog.tpl.pug b/modules/frontend/app/components/input-dialog/input-dialog.tpl.pug
similarity index 100%
rename from frontend/app/components/input-dialog/input-dialog.tpl.pug
rename to modules/frontend/app/components/input-dialog/input-dialog.tpl.pug
diff --git a/frontend/app/components/list-editable/component.js b/modules/frontend/app/components/list-editable/component.js
similarity index 100%
rename from frontend/app/components/list-editable/component.js
rename to modules/frontend/app/components/list-editable/component.js
diff --git a/frontend/app/components/list-editable/components/list-editable-add-item-button/component.spec.js b/modules/frontend/app/components/list-editable/components/list-editable-add-item-button/component.spec.js
similarity index 100%
rename from frontend/app/components/list-editable/components/list-editable-add-item-button/component.spec.js
rename to modules/frontend/app/components/list-editable/components/list-editable-add-item-button/component.spec.js
diff --git a/frontend/app/components/list-editable/components/list-editable-add-item-button/component.ts b/modules/frontend/app/components/list-editable/components/list-editable-add-item-button/component.ts
similarity index 100%
rename from frontend/app/components/list-editable/components/list-editable-add-item-button/component.ts
rename to modules/frontend/app/components/list-editable/components/list-editable-add-item-button/component.ts
diff --git a/frontend/app/components/list-editable/components/list-editable-add-item-button/has-items-template.pug b/modules/frontend/app/components/list-editable/components/list-editable-add-item-button/has-items-template.pug
similarity index 100%
rename from frontend/app/components/list-editable/components/list-editable-add-item-button/has-items-template.pug
rename to modules/frontend/app/components/list-editable/components/list-editable-add-item-button/has-items-template.pug
diff --git a/frontend/app/components/list-editable/components/list-editable-add-item-button/index.ts b/modules/frontend/app/components/list-editable/components/list-editable-add-item-button/index.ts
similarity index 100%
rename from frontend/app/components/list-editable/components/list-editable-add-item-button/index.ts
rename to modules/frontend/app/components/list-editable/components/list-editable-add-item-button/index.ts
diff --git a/frontend/app/components/list-editable/components/list-editable-add-item-button/no-items-template.pug b/modules/frontend/app/components/list-editable/components/list-editable-add-item-button/no-items-template.pug
similarity index 100%
rename from frontend/app/components/list-editable/components/list-editable-add-item-button/no-items-template.pug
rename to modules/frontend/app/components/list-editable/components/list-editable-add-item-button/no-items-template.pug
diff --git a/frontend/app/components/list-editable/components/list-editable-add-item-button/style.scss b/modules/frontend/app/components/list-editable/components/list-editable-add-item-button/style.scss
similarity index 100%
rename from frontend/app/components/list-editable/components/list-editable-add-item-button/style.scss
rename to modules/frontend/app/components/list-editable/components/list-editable-add-item-button/style.scss
diff --git a/frontend/app/components/list-editable/components/list-editable-cols/cols.directive.js b/modules/frontend/app/components/list-editable/components/list-editable-cols/cols.directive.js
similarity index 100%
rename from frontend/app/components/list-editable/components/list-editable-cols/cols.directive.js
rename to modules/frontend/app/components/list-editable/components/list-editable-cols/cols.directive.js
diff --git a/frontend/app/components/list-editable/components/list-editable-cols/cols.style.scss b/modules/frontend/app/components/list-editable/components/list-editable-cols/cols.style.scss
similarity index 100%
rename from frontend/app/components/list-editable/components/list-editable-cols/cols.style.scss
rename to modules/frontend/app/components/list-editable/components/list-editable-cols/cols.style.scss
diff --git a/frontend/app/components/list-editable/components/list-editable-cols/cols.template.pug b/modules/frontend/app/components/list-editable/components/list-editable-cols/cols.template.pug
similarity index 100%
rename from frontend/app/components/list-editable/components/list-editable-cols/cols.template.pug
rename to modules/frontend/app/components/list-editable/components/list-editable-cols/cols.template.pug
diff --git a/frontend/app/components/list-editable/components/list-editable-cols/index.js b/modules/frontend/app/components/list-editable/components/list-editable-cols/index.js
similarity index 100%
rename from frontend/app/components/list-editable/components/list-editable-cols/index.js
rename to modules/frontend/app/components/list-editable/components/list-editable-cols/index.js
diff --git a/frontend/app/components/list-editable/components/list-editable-cols/row.directive.js b/modules/frontend/app/components/list-editable/components/list-editable-cols/row.directive.js
similarity index 100%
rename from frontend/app/components/list-editable/components/list-editable-cols/row.directive.js
rename to modules/frontend/app/components/list-editable/components/list-editable-cols/row.directive.js
diff --git a/frontend/app/components/list-editable/components/list-editable-one-way/directive.ts b/modules/frontend/app/components/list-editable/components/list-editable-one-way/directive.ts
similarity index 100%
rename from frontend/app/components/list-editable/components/list-editable-one-way/directive.ts
rename to modules/frontend/app/components/list-editable/components/list-editable-one-way/directive.ts
diff --git a/frontend/app/components/list-editable/components/list-editable-one-way/index.ts b/modules/frontend/app/components/list-editable/components/list-editable-one-way/index.ts
similarity index 100%
rename from frontend/app/components/list-editable/components/list-editable-one-way/index.ts
rename to modules/frontend/app/components/list-editable/components/list-editable-one-way/index.ts
diff --git a/frontend/app/components/list-editable/components/list-editable-save-on-changes/directives.ts b/modules/frontend/app/components/list-editable/components/list-editable-save-on-changes/directives.ts
similarity index 96%
rename from frontend/app/components/list-editable/components/list-editable-save-on-changes/directives.ts
rename to modules/frontend/app/components/list-editable/components/list-editable-save-on-changes/directives.ts
index b3cab9e..409e907 100644
--- a/frontend/app/components/list-editable/components/list-editable-save-on-changes/directives.ts
+++ b/modules/frontend/app/components/list-editable/components/list-editable-save-on-changes/directives.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import {default as ListEditableController, ID, ItemScope} from '../../controller';
+import {default as ListEditableController, ItemScope} from '../../controller';
 import {ListEditableTransclude} from '../list-editable-transclude/directive';
 
 const CUSTOM_EVENT_TYPE = '$ngModel.change';
diff --git a/frontend/app/components/list-editable/components/list-editable-save-on-changes/index.ts b/modules/frontend/app/components/list-editable/components/list-editable-save-on-changes/index.ts
similarity index 94%
rename from frontend/app/components/list-editable/components/list-editable-save-on-changes/index.ts
rename to modules/frontend/app/components/list-editable/components/list-editable-save-on-changes/index.ts
index 18e26db..c73495d 100644
--- a/frontend/app/components/list-editable/components/list-editable-save-on-changes/index.ts
+++ b/modules/frontend/app/components/list-editable/components/list-editable-save-on-changes/index.ts
@@ -16,7 +16,7 @@
  */
 
 import angular from 'angular';
-import {ngModel, listEditableTransclude} from './directives';
+import {listEditableTransclude, ngModel} from './directives';
 
 export default angular
     .module('list-editable.save-on-changes', [])
diff --git a/frontend/app/components/list-editable/components/list-editable-transclude/directive.ts b/modules/frontend/app/components/list-editable/components/list-editable-transclude/directive.ts
similarity index 100%
rename from frontend/app/components/list-editable/components/list-editable-transclude/directive.ts
rename to modules/frontend/app/components/list-editable/components/list-editable-transclude/directive.ts
diff --git a/frontend/app/components/list-editable/components/list-editable-transclude/index.ts b/modules/frontend/app/components/list-editable/components/list-editable-transclude/index.ts
similarity index 100%
rename from frontend/app/components/list-editable/components/list-editable-transclude/index.ts
rename to modules/frontend/app/components/list-editable/components/list-editable-transclude/index.ts
diff --git a/frontend/app/components/list-editable/controller.ts b/modules/frontend/app/components/list-editable/controller.ts
similarity index 100%
rename from frontend/app/components/list-editable/controller.ts
rename to modules/frontend/app/components/list-editable/controller.ts
diff --git a/frontend/app/components/list-editable/index.ts b/modules/frontend/app/components/list-editable/index.ts
similarity index 100%
rename from frontend/app/components/list-editable/index.ts
rename to modules/frontend/app/components/list-editable/index.ts
diff --git a/frontend/app/components/list-editable/style.scss b/modules/frontend/app/components/list-editable/style.scss
similarity index 100%
rename from frontend/app/components/list-editable/style.scss
rename to modules/frontend/app/components/list-editable/style.scss
diff --git a/frontend/app/components/list-editable/template.pug b/modules/frontend/app/components/list-editable/template.pug
similarity index 100%
rename from frontend/app/components/list-editable/template.pug
rename to modules/frontend/app/components/list-editable/template.pug
diff --git a/frontend/app/components/list-of-registered-users/categories.js b/modules/frontend/app/components/list-of-registered-users/categories.js
similarity index 100%
rename from frontend/app/components/list-of-registered-users/categories.js
rename to modules/frontend/app/components/list-of-registered-users/categories.js
diff --git a/frontend/app/components/list-of-registered-users/column-defs.js b/modules/frontend/app/components/list-of-registered-users/column-defs.js
similarity index 100%
rename from frontend/app/components/list-of-registered-users/column-defs.js
rename to modules/frontend/app/components/list-of-registered-users/column-defs.js
diff --git a/frontend/app/components/list-of-registered-users/controller.js b/modules/frontend/app/components/list-of-registered-users/controller.js
similarity index 100%
rename from frontend/app/components/list-of-registered-users/controller.js
rename to modules/frontend/app/components/list-of-registered-users/controller.js
diff --git a/frontend/app/components/list-of-registered-users/index.js b/modules/frontend/app/components/list-of-registered-users/index.js
similarity index 100%
rename from frontend/app/components/list-of-registered-users/index.js
rename to modules/frontend/app/components/list-of-registered-users/index.js
diff --git a/frontend/app/components/list-of-registered-users/style.scss b/modules/frontend/app/components/list-of-registered-users/style.scss
similarity index 100%
rename from frontend/app/components/list-of-registered-users/style.scss
rename to modules/frontend/app/components/list-of-registered-users/style.scss
diff --git a/frontend/app/components/list-of-registered-users/template.tpl.pug b/modules/frontend/app/components/list-of-registered-users/template.tpl.pug
similarity index 100%
rename from frontend/app/components/list-of-registered-users/template.tpl.pug
rename to modules/frontend/app/components/list-of-registered-users/template.tpl.pug
diff --git a/frontend/app/components/no-data/component.ts b/modules/frontend/app/components/no-data/component.ts
similarity index 100%
rename from frontend/app/components/no-data/component.ts
rename to modules/frontend/app/components/no-data/component.ts
diff --git a/frontend/app/components/no-data/controller.ts b/modules/frontend/app/components/no-data/controller.ts
similarity index 100%
rename from frontend/app/components/no-data/controller.ts
rename to modules/frontend/app/components/no-data/controller.ts
diff --git a/frontend/app/components/no-data/index.ts b/modules/frontend/app/components/no-data/index.ts
similarity index 100%
rename from frontend/app/components/no-data/index.ts
rename to modules/frontend/app/components/no-data/index.ts
diff --git a/frontend/app/components/no-data/style.scss b/modules/frontend/app/components/no-data/style.scss
similarity index 100%
rename from frontend/app/components/no-data/style.scss
rename to modules/frontend/app/components/no-data/style.scss
diff --git a/frontend/app/components/no-data/template.tpl.pug b/modules/frontend/app/components/no-data/template.tpl.pug
similarity index 100%
rename from frontend/app/components/no-data/template.tpl.pug
rename to modules/frontend/app/components/no-data/template.tpl.pug
diff --git a/frontend/app/components/page-admin/controller.ts b/modules/frontend/app/components/page-admin/controller.ts
similarity index 100%
rename from frontend/app/components/page-admin/controller.ts
rename to modules/frontend/app/components/page-admin/controller.ts
diff --git a/frontend/app/components/page-admin/index.js b/modules/frontend/app/components/page-admin/index.js
similarity index 100%
rename from frontend/app/components/page-admin/index.js
rename to modules/frontend/app/components/page-admin/index.js
diff --git a/frontend/app/components/page-admin/style.scss b/modules/frontend/app/components/page-admin/style.scss
similarity index 100%
rename from frontend/app/components/page-admin/style.scss
rename to modules/frontend/app/components/page-admin/style.scss
diff --git a/frontend/app/components/page-admin/template.tpl.pug b/modules/frontend/app/components/page-admin/template.tpl.pug
similarity index 100%
rename from frontend/app/components/page-admin/template.tpl.pug
rename to modules/frontend/app/components/page-admin/template.tpl.pug
diff --git a/frontend/app/components/page-forgot-password/component.js b/modules/frontend/app/components/page-forgot-password/component.js
similarity index 100%
rename from frontend/app/components/page-forgot-password/component.js
rename to modules/frontend/app/components/page-forgot-password/component.js
diff --git a/frontend/app/components/page-forgot-password/controller.js b/modules/frontend/app/components/page-forgot-password/controller.js
similarity index 100%
rename from frontend/app/components/page-forgot-password/controller.js
rename to modules/frontend/app/components/page-forgot-password/controller.js
diff --git a/frontend/app/components/page-forgot-password/index.js b/modules/frontend/app/components/page-forgot-password/index.js
similarity index 100%
rename from frontend/app/components/page-forgot-password/index.js
rename to modules/frontend/app/components/page-forgot-password/index.js
diff --git a/frontend/app/components/page-forgot-password/run.js b/modules/frontend/app/components/page-forgot-password/run.js
similarity index 100%
rename from frontend/app/components/page-forgot-password/run.js
rename to modules/frontend/app/components/page-forgot-password/run.js
diff --git a/frontend/app/components/page-forgot-password/style.scss b/modules/frontend/app/components/page-forgot-password/style.scss
similarity index 100%
rename from frontend/app/components/page-forgot-password/style.scss
rename to modules/frontend/app/components/page-forgot-password/style.scss
diff --git a/frontend/app/components/page-forgot-password/template.pug b/modules/frontend/app/components/page-forgot-password/template.pug
similarity index 100%
rename from frontend/app/components/page-forgot-password/template.pug
rename to modules/frontend/app/components/page-forgot-password/template.pug
diff --git a/frontend/app/components/page-forgot-password/types.ts b/modules/frontend/app/components/page-forgot-password/types.ts
similarity index 100%
rename from frontend/app/components/page-forgot-password/types.ts
rename to modules/frontend/app/components/page-forgot-password/types.ts
diff --git a/frontend/app/components/page-landing/index.js b/modules/frontend/app/components/page-landing/index.js
similarity index 100%
rename from frontend/app/components/page-landing/index.js
rename to modules/frontend/app/components/page-landing/index.js
diff --git a/frontend/app/components/page-landing/public.pug b/modules/frontend/app/components/page-landing/public.pug
similarity index 100%
rename from frontend/app/components/page-landing/public.pug
rename to modules/frontend/app/components/page-landing/public.pug
diff --git a/frontend/app/components/page-landing/style.scss b/modules/frontend/app/components/page-landing/style.scss
similarity index 100%
rename from frontend/app/components/page-landing/style.scss
rename to modules/frontend/app/components/page-landing/style.scss
diff --git a/frontend/app/components/page-landing/template.pug b/modules/frontend/app/components/page-landing/template.pug
similarity index 100%
rename from frontend/app/components/page-landing/template.pug
rename to modules/frontend/app/components/page-landing/template.pug
diff --git a/frontend/app/components/page-password-changed/controller.ts b/modules/frontend/app/components/page-password-changed/controller.ts
similarity index 100%
rename from frontend/app/components/page-password-changed/controller.ts
rename to modules/frontend/app/components/page-password-changed/controller.ts
diff --git a/frontend/app/components/page-password-changed/index.js b/modules/frontend/app/components/page-password-changed/index.js
similarity index 100%
rename from frontend/app/components/page-password-changed/index.js
rename to modules/frontend/app/components/page-password-changed/index.js
diff --git a/frontend/app/components/page-password-changed/style.scss b/modules/frontend/app/components/page-password-changed/style.scss
similarity index 100%
rename from frontend/app/components/page-password-changed/style.scss
rename to modules/frontend/app/components/page-password-changed/style.scss
diff --git a/frontend/app/components/page-password-changed/template.pug b/modules/frontend/app/components/page-password-changed/template.pug
similarity index 100%
rename from frontend/app/components/page-password-changed/template.pug
rename to modules/frontend/app/components/page-password-changed/template.pug
diff --git a/frontend/app/components/page-password-reset/controller.js b/modules/frontend/app/components/page-password-reset/controller.js
similarity index 100%
rename from frontend/app/components/page-password-reset/controller.js
rename to modules/frontend/app/components/page-password-reset/controller.js
diff --git a/frontend/app/components/page-password-reset/index.js b/modules/frontend/app/components/page-password-reset/index.js
similarity index 100%
rename from frontend/app/components/page-password-reset/index.js
rename to modules/frontend/app/components/page-password-reset/index.js
diff --git a/frontend/app/components/page-password-reset/style.scss b/modules/frontend/app/components/page-password-reset/style.scss
similarity index 100%
rename from frontend/app/components/page-password-reset/style.scss
rename to modules/frontend/app/components/page-password-reset/style.scss
diff --git a/frontend/app/components/page-password-reset/template.pug b/modules/frontend/app/components/page-password-reset/template.pug
similarity index 100%
rename from frontend/app/components/page-password-reset/template.pug
rename to modules/frontend/app/components/page-password-reset/template.pug
diff --git a/frontend/app/components/page-profile/component.js b/modules/frontend/app/components/page-profile/component.js
similarity index 100%
rename from frontend/app/components/page-profile/component.js
rename to modules/frontend/app/components/page-profile/component.js
diff --git a/frontend/app/components/page-profile/controller.js b/modules/frontend/app/components/page-profile/controller.js
similarity index 100%
rename from frontend/app/components/page-profile/controller.js
rename to modules/frontend/app/components/page-profile/controller.js
diff --git a/frontend/app/components/page-profile/index.js b/modules/frontend/app/components/page-profile/index.js
similarity index 100%
rename from frontend/app/components/page-profile/index.js
rename to modules/frontend/app/components/page-profile/index.js
diff --git a/frontend/app/components/page-profile/style.scss b/modules/frontend/app/components/page-profile/style.scss
similarity index 100%
rename from frontend/app/components/page-profile/style.scss
rename to modules/frontend/app/components/page-profile/style.scss
diff --git a/frontend/app/components/page-profile/template.pug b/modules/frontend/app/components/page-profile/template.pug
similarity index 100%
rename from frontend/app/components/page-profile/template.pug
rename to modules/frontend/app/components/page-profile/template.pug
diff --git a/frontend/app/components/page-queries/component.js b/modules/frontend/app/components/page-queries/component.js
similarity index 100%
rename from frontend/app/components/page-queries/component.js
rename to modules/frontend/app/components/page-queries/component.js
diff --git a/frontend/app/components/page-queries/components/queries-notebook/components/ignite-information/information.directive.js b/modules/frontend/app/components/page-queries/components/queries-notebook/components/ignite-information/information.directive.js
similarity index 100%
rename from frontend/app/components/page-queries/components/queries-notebook/components/ignite-information/information.directive.js
rename to modules/frontend/app/components/page-queries/components/queries-notebook/components/ignite-information/information.directive.js
diff --git a/frontend/app/components/page-queries/components/queries-notebook/components/ignite-information/information.pug b/modules/frontend/app/components/page-queries/components/queries-notebook/components/ignite-information/information.pug
similarity index 100%
rename from frontend/app/components/page-queries/components/queries-notebook/components/ignite-information/information.pug
rename to modules/frontend/app/components/page-queries/components/queries-notebook/components/ignite-information/information.pug
diff --git a/frontend/app/components/page-queries/components/queries-notebook/components/ignite-information/information.scss b/modules/frontend/app/components/page-queries/components/queries-notebook/components/ignite-information/information.scss
similarity index 100%
rename from frontend/app/components/page-queries/components/queries-notebook/components/ignite-information/information.scss
rename to modules/frontend/app/components/page-queries/components/queries-notebook/components/ignite-information/information.scss
diff --git a/frontend/app/components/page-queries/components/queries-notebook/components/query-actions-button/component.ts b/modules/frontend/app/components/page-queries/components/queries-notebook/components/query-actions-button/component.ts
similarity index 100%
rename from frontend/app/components/page-queries/components/queries-notebook/components/query-actions-button/component.ts
rename to modules/frontend/app/components/page-queries/components/queries-notebook/components/query-actions-button/component.ts
diff --git a/frontend/app/components/page-queries/components/queries-notebook/components/query-actions-button/controller.ts b/modules/frontend/app/components/page-queries/components/queries-notebook/components/query-actions-button/controller.ts
similarity index 100%
rename from frontend/app/components/page-queries/components/queries-notebook/components/query-actions-button/controller.ts
rename to modules/frontend/app/components/page-queries/components/queries-notebook/components/query-actions-button/controller.ts
diff --git a/frontend/app/components/page-queries/components/queries-notebook/components/query-actions-button/template.pug b/modules/frontend/app/components/page-queries/components/queries-notebook/components/query-actions-button/template.pug
similarity index 100%
rename from frontend/app/components/page-queries/components/queries-notebook/components/query-actions-button/template.pug
rename to modules/frontend/app/components/page-queries/components/queries-notebook/components/query-actions-button/template.pug
diff --git a/frontend/app/components/page-queries/components/queries-notebook/controller.ts b/modules/frontend/app/components/page-queries/components/queries-notebook/controller.ts
similarity index 99%
rename from frontend/app/components/page-queries/components/queries-notebook/controller.ts
rename to modules/frontend/app/components/page-queries/components/queries-notebook/controller.ts
index 372513a..95df0c6 100644
--- a/frontend/app/components/page-queries/components/queries-notebook/controller.ts
+++ b/modules/frontend/app/components/page-queries/components/queries-notebook/controller.ts
@@ -18,8 +18,24 @@
 import _ from 'lodash';
 import {nonEmpty, nonNil} from 'app/utils/lodashMixins';
 import id8 from 'app/utils/id8';
-import {Subject, defer, from, of, merge, timer, EMPTY} from 'rxjs';
-import {catchError, distinctUntilChanged, expand, exhaustMap, filter, finalize, first, ignoreElements, map, mergeMap, pluck, switchMap, takeUntil, takeWhile, take, tap} from 'rxjs/operators';
+import {defer, EMPTY, from, merge, of, Subject, timer} from 'rxjs';
+import {
+    catchError,
+    distinctUntilChanged,
+    exhaustMap,
+    expand,
+    filter,
+    finalize,
+    first,
+    ignoreElements,
+    map,
+    pluck,
+    switchMap,
+    take,
+    takeUntil,
+    takeWhile,
+    tap
+} from 'rxjs/operators';
 
 import {CSV} from 'app/services/CSV';
 
diff --git a/frontend/app/components/page-queries/components/queries-notebook/index.js b/modules/frontend/app/components/page-queries/components/queries-notebook/index.js
similarity index 96%
rename from frontend/app/components/page-queries/components/queries-notebook/index.js
rename to modules/frontend/app/components/page-queries/components/queries-notebook/index.js
index 051c7fe..42f2d07 100644
--- a/frontend/app/components/page-queries/components/queries-notebook/index.js
+++ b/modules/frontend/app/components/page-queries/components/queries-notebook/index.js
@@ -17,7 +17,7 @@
 
 import angular from 'angular';
 import templateUrl from './template.tpl.pug';
-import { NotebookCtrl } from './controller';
+import {NotebookCtrl} from './controller';
 import NotebookData from '../../notebook.data';
 import {component as actions} from './components/query-actions-button/component';
 import {default as igniteInformation} from './components/ignite-information/information.directive';
diff --git a/frontend/app/components/page-queries/components/queries-notebook/style.scss b/modules/frontend/app/components/page-queries/components/queries-notebook/style.scss
similarity index 100%
rename from frontend/app/components/page-queries/components/queries-notebook/style.scss
rename to modules/frontend/app/components/page-queries/components/queries-notebook/style.scss
diff --git a/frontend/app/components/page-queries/components/queries-notebook/template.tpl.pug b/modules/frontend/app/components/page-queries/components/queries-notebook/template.tpl.pug
similarity index 100%
rename from frontend/app/components/page-queries/components/queries-notebook/template.tpl.pug
rename to modules/frontend/app/components/page-queries/components/queries-notebook/template.tpl.pug
diff --git a/frontend/app/components/page-queries/components/queries-notebooks-list/controller.js b/modules/frontend/app/components/page-queries/components/queries-notebooks-list/controller.js
similarity index 100%
rename from frontend/app/components/page-queries/components/queries-notebooks-list/controller.js
rename to modules/frontend/app/components/page-queries/components/queries-notebooks-list/controller.js
diff --git a/frontend/app/components/page-queries/components/queries-notebooks-list/index.js b/modules/frontend/app/components/page-queries/components/queries-notebooks-list/index.js
similarity index 95%
rename from frontend/app/components/page-queries/components/queries-notebooks-list/index.js
rename to modules/frontend/app/components/page-queries/components/queries-notebooks-list/index.js
index 5d5ee61..a50198e 100644
--- a/frontend/app/components/page-queries/components/queries-notebooks-list/index.js
+++ b/modules/frontend/app/components/page-queries/components/queries-notebooks-list/index.js
@@ -17,7 +17,7 @@
 
 import angular from 'angular';
 import templateUrl from './template.tpl.pug';
-import { NotebooksListCtrl } from './controller';
+import {NotebooksListCtrl} from './controller';
 import './style.scss';
 
 export default angular.module('ignite-console.sql.notebooks-list', [])
diff --git a/frontend/app/components/page-queries/components/queries-notebooks-list/style.scss b/modules/frontend/app/components/page-queries/components/queries-notebooks-list/style.scss
similarity index 100%
rename from frontend/app/components/page-queries/components/queries-notebooks-list/style.scss
rename to modules/frontend/app/components/page-queries/components/queries-notebooks-list/style.scss
diff --git a/frontend/app/components/page-queries/components/queries-notebooks-list/template.tpl.pug b/modules/frontend/app/components/page-queries/components/queries-notebooks-list/template.tpl.pug
similarity index 100%
rename from frontend/app/components/page-queries/components/queries-notebooks-list/template.tpl.pug
rename to modules/frontend/app/components/page-queries/components/queries-notebooks-list/template.tpl.pug
diff --git a/frontend/app/components/page-queries/index.ts b/modules/frontend/app/components/page-queries/index.ts
similarity index 98%
rename from frontend/app/components/page-queries/index.ts
rename to modules/frontend/app/components/page-queries/index.ts
index 81dbcf2..34fa388 100644
--- a/frontend/app/components/page-queries/index.ts
+++ b/modules/frontend/app/components/page-queries/index.ts
@@ -24,7 +24,7 @@ import queriesNotebook from './components/queries-notebook';
 import pageQueriesCmp from './component';
 import {default as ActivitiesData} from 'app/core/activities/Activities.data';
 import Notebook from './notebook.service';
-import {navigationMenuItem, AppStore} from '../../store';
+import {AppStore, navigationMenuItem} from '../../store';
 
 /**
  * @param {import('@uirouter/angularjs').UIRouter} $uiRouter
diff --git a/frontend/app/components/page-queries/notebook.data.js b/modules/frontend/app/components/page-queries/notebook.data.js
similarity index 100%
rename from frontend/app/components/page-queries/notebook.data.js
rename to modules/frontend/app/components/page-queries/notebook.data.js
diff --git a/frontend/app/components/page-queries/notebook.service.js b/modules/frontend/app/components/page-queries/notebook.service.js
similarity index 100%
rename from frontend/app/components/page-queries/notebook.service.js
rename to modules/frontend/app/components/page-queries/notebook.service.js
diff --git a/frontend/app/components/page-queries/style.scss b/modules/frontend/app/components/page-queries/style.scss
similarity index 100%
rename from frontend/app/components/page-queries/style.scss
rename to modules/frontend/app/components/page-queries/style.scss
diff --git a/frontend/app/components/page-queries/template.tpl.pug b/modules/frontend/app/components/page-queries/template.tpl.pug
similarity index 100%
rename from frontend/app/components/page-queries/template.tpl.pug
rename to modules/frontend/app/components/page-queries/template.tpl.pug
diff --git a/frontend/app/components/page-signin/component.ts b/modules/frontend/app/components/page-signin/component.ts
similarity index 100%
rename from frontend/app/components/page-signin/component.ts
rename to modules/frontend/app/components/page-signin/component.ts
diff --git a/frontend/app/components/page-signin/controller.ts b/modules/frontend/app/components/page-signin/controller.ts
similarity index 100%
rename from frontend/app/components/page-signin/controller.ts
rename to modules/frontend/app/components/page-signin/controller.ts
diff --git a/frontend/app/components/page-signin/index.ts b/modules/frontend/app/components/page-signin/index.ts
similarity index 100%
rename from frontend/app/components/page-signin/index.ts
rename to modules/frontend/app/components/page-signin/index.ts
diff --git a/frontend/app/components/page-signin/run.ts b/modules/frontend/app/components/page-signin/run.ts
similarity index 97%
rename from frontend/app/components/page-signin/run.ts
rename to modules/frontend/app/components/page-signin/run.ts
index 1d13397..62f786e 100644
--- a/frontend/app/components/page-signin/run.ts
+++ b/modules/frontend/app/components/page-signin/run.ts
@@ -16,7 +16,7 @@
  */
 
 import publicTemplate from '../../../views/public.pug';
-import {UIRouter, StateParams} from '@uirouter/angularjs';
+import {StateParams, UIRouter} from '@uirouter/angularjs';
 import {IIgniteNg1StateDeclaration} from 'app/types';
 
 export type PageSigninStateParams = StateParams & {activationToken?: string};
diff --git a/frontend/app/components/page-signin/style.scss b/modules/frontend/app/components/page-signin/style.scss
similarity index 100%
rename from frontend/app/components/page-signin/style.scss
rename to modules/frontend/app/components/page-signin/style.scss
diff --git a/frontend/app/components/page-signin/template.pug b/modules/frontend/app/components/page-signin/template.pug
similarity index 100%
rename from frontend/app/components/page-signin/template.pug
rename to modules/frontend/app/components/page-signin/template.pug
diff --git a/frontend/app/components/page-signup-confirmation/component.ts b/modules/frontend/app/components/page-signup-confirmation/component.ts
similarity index 100%
rename from frontend/app/components/page-signup-confirmation/component.ts
rename to modules/frontend/app/components/page-signup-confirmation/component.ts
diff --git a/frontend/app/components/page-signup-confirmation/controller.ts b/modules/frontend/app/components/page-signup-confirmation/controller.ts
similarity index 100%
rename from frontend/app/components/page-signup-confirmation/controller.ts
rename to modules/frontend/app/components/page-signup-confirmation/controller.ts
diff --git a/frontend/app/components/page-signup-confirmation/index.ts b/modules/frontend/app/components/page-signup-confirmation/index.ts
similarity index 100%
rename from frontend/app/components/page-signup-confirmation/index.ts
rename to modules/frontend/app/components/page-signup-confirmation/index.ts
diff --git a/frontend/app/components/page-signup-confirmation/state.ts b/modules/frontend/app/components/page-signup-confirmation/state.ts
similarity index 96%
rename from frontend/app/components/page-signup-confirmation/state.ts
rename to modules/frontend/app/components/page-signup-confirmation/state.ts
index fb1b6a4..31ad0d8 100644
--- a/frontend/app/components/page-signup-confirmation/state.ts
+++ b/modules/frontend/app/components/page-signup-confirmation/state.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import {UIRouter, StateParams} from '@uirouter/angularjs';
+import {StateParams, UIRouter} from '@uirouter/angularjs';
 import {IIgniteNg1StateDeclaration} from '../../types';
 import publicTemplate from '../../../views/public.pug';
 
diff --git a/frontend/app/components/page-signup-confirmation/style.scss b/modules/frontend/app/components/page-signup-confirmation/style.scss
similarity index 100%
rename from frontend/app/components/page-signup-confirmation/style.scss
rename to modules/frontend/app/components/page-signup-confirmation/style.scss
diff --git a/frontend/app/components/page-signup-confirmation/template.tpl.pug b/modules/frontend/app/components/page-signup-confirmation/template.tpl.pug
similarity index 100%
rename from frontend/app/components/page-signup-confirmation/template.tpl.pug
rename to modules/frontend/app/components/page-signup-confirmation/template.tpl.pug
diff --git a/frontend/app/components/page-signup/component.js b/modules/frontend/app/components/page-signup/component.js
similarity index 100%
rename from frontend/app/components/page-signup/component.js
rename to modules/frontend/app/components/page-signup/component.js
diff --git a/frontend/app/components/page-signup/controller.ts b/modules/frontend/app/components/page-signup/controller.ts
similarity index 98%
rename from frontend/app/components/page-signup/controller.ts
rename to modules/frontend/app/components/page-signup/controller.ts
index 9ace2b6..6e29869 100644
--- a/frontend/app/components/page-signup/controller.ts
+++ b/modules/frontend/app/components/page-signup/controller.ts
@@ -19,7 +19,7 @@ import Auth from '../../modules/user/Auth.service';
 import MessagesFactory from '../../services/Messages.service';
 import FormUtilsFactoryFactory from '../../services/FormUtils.service';
 import {ISignupData} from '../form-signup';
-import {get, eq, pipe} from 'lodash/fp';
+import {eq, get, pipe} from 'lodash/fp';
 
 const EMAIL_NOT_CONFIRMED_ERROR_CODE = 10104;
 const isEmailConfirmationError = pipe(get('data.errorCode'), eq(EMAIL_NOT_CONFIRMED_ERROR_CODE));
diff --git a/frontend/app/components/page-signup/index.js b/modules/frontend/app/components/page-signup/index.js
similarity index 100%
rename from frontend/app/components/page-signup/index.js
rename to modules/frontend/app/components/page-signup/index.js
diff --git a/frontend/app/components/page-signup/run.js b/modules/frontend/app/components/page-signup/run.js
similarity index 100%
rename from frontend/app/components/page-signup/run.js
rename to modules/frontend/app/components/page-signup/run.js
diff --git a/frontend/app/components/page-signup/style.scss b/modules/frontend/app/components/page-signup/style.scss
similarity index 100%
rename from frontend/app/components/page-signup/style.scss
rename to modules/frontend/app/components/page-signup/style.scss
diff --git a/frontend/app/components/page-signup/template.pug b/modules/frontend/app/components/page-signup/template.pug
similarity index 100%
rename from frontend/app/components/page-signup/template.pug
rename to modules/frontend/app/components/page-signup/template.pug
diff --git a/frontend/app/components/panel-collapsible/component.js b/modules/frontend/app/components/panel-collapsible/component.js
similarity index 100%
rename from frontend/app/components/panel-collapsible/component.js
rename to modules/frontend/app/components/panel-collapsible/component.js
diff --git a/frontend/app/components/panel-collapsible/controller.js b/modules/frontend/app/components/panel-collapsible/controller.js
similarity index 100%
rename from frontend/app/components/panel-collapsible/controller.js
rename to modules/frontend/app/components/panel-collapsible/controller.js
diff --git a/frontend/app/components/panel-collapsible/index.js b/modules/frontend/app/components/panel-collapsible/index.js
similarity index 100%
rename from frontend/app/components/panel-collapsible/index.js
rename to modules/frontend/app/components/panel-collapsible/index.js
diff --git a/frontend/app/components/panel-collapsible/index.spec.js b/modules/frontend/app/components/panel-collapsible/index.spec.js
similarity index 100%
rename from frontend/app/components/panel-collapsible/index.spec.js
rename to modules/frontend/app/components/panel-collapsible/index.spec.js
diff --git a/frontend/app/components/panel-collapsible/style.scss b/modules/frontend/app/components/panel-collapsible/style.scss
similarity index 100%
rename from frontend/app/components/panel-collapsible/style.scss
rename to modules/frontend/app/components/panel-collapsible/style.scss
diff --git a/frontend/app/components/panel-collapsible/template.pug b/modules/frontend/app/components/panel-collapsible/template.pug
similarity index 100%
rename from frontend/app/components/panel-collapsible/template.pug
rename to modules/frontend/app/components/panel-collapsible/template.pug
diff --git a/frontend/app/components/panel-collapsible/transcludeDirective.js b/modules/frontend/app/components/panel-collapsible/transcludeDirective.js
similarity index 100%
rename from frontend/app/components/panel-collapsible/transcludeDirective.js
rename to modules/frontend/app/components/panel-collapsible/transcludeDirective.js
diff --git a/frontend/app/components/password-visibility/index.js b/modules/frontend/app/components/password-visibility/index.js
similarity index 100%
rename from frontend/app/components/password-visibility/index.js
rename to modules/frontend/app/components/password-visibility/index.js
diff --git a/frontend/app/components/password-visibility/index.spec.js b/modules/frontend/app/components/password-visibility/index.spec.js
similarity index 100%
rename from frontend/app/components/password-visibility/index.spec.js
rename to modules/frontend/app/components/password-visibility/index.spec.js
diff --git a/frontend/app/components/password-visibility/root.directive.js b/modules/frontend/app/components/password-visibility/root.directive.js
similarity index 100%
rename from frontend/app/components/password-visibility/root.directive.js
rename to modules/frontend/app/components/password-visibility/root.directive.js
diff --git a/frontend/app/components/password-visibility/style.scss b/modules/frontend/app/components/password-visibility/style.scss
similarity index 100%
rename from frontend/app/components/password-visibility/style.scss
rename to modules/frontend/app/components/password-visibility/style.scss
diff --git a/frontend/app/components/password-visibility/toggle-button.component.js b/modules/frontend/app/components/password-visibility/toggle-button.component.js
similarity index 100%
rename from frontend/app/components/password-visibility/toggle-button.component.js
rename to modules/frontend/app/components/password-visibility/toggle-button.component.js
diff --git a/frontend/app/components/web-console-sidebar/component.ts b/modules/frontend/app/components/permanent-notifications/component.ts
similarity index 100%
rename from frontend/app/components/web-console-sidebar/component.ts
rename to modules/frontend/app/components/permanent-notifications/component.ts
diff --git a/frontend/app/components/permanent-notifications/controller.ts b/modules/frontend/app/components/permanent-notifications/controller.ts
similarity index 100%
rename from frontend/app/components/permanent-notifications/controller.ts
rename to modules/frontend/app/components/permanent-notifications/controller.ts
diff --git a/frontend/app/components/permanent-notifications/index.ts b/modules/frontend/app/components/permanent-notifications/index.ts
similarity index 100%
rename from frontend/app/components/permanent-notifications/index.ts
rename to modules/frontend/app/components/permanent-notifications/index.ts
diff --git a/frontend/app/components/permanent-notifications/style.scss b/modules/frontend/app/components/permanent-notifications/style.scss
similarity index 100%
rename from frontend/app/components/permanent-notifications/style.scss
rename to modules/frontend/app/components/permanent-notifications/style.scss
diff --git a/frontend/app/components/permanent-notifications/template.pug b/modules/frontend/app/components/permanent-notifications/template.pug
similarity index 100%
rename from frontend/app/components/permanent-notifications/template.pug
rename to modules/frontend/app/components/permanent-notifications/template.pug
diff --git a/frontend/app/components/progress-line/component.js b/modules/frontend/app/components/progress-line/component.js
similarity index 100%
rename from frontend/app/components/progress-line/component.js
rename to modules/frontend/app/components/progress-line/component.js
diff --git a/frontend/app/components/progress-line/controller.js b/modules/frontend/app/components/progress-line/controller.js
similarity index 100%
rename from frontend/app/components/progress-line/controller.js
rename to modules/frontend/app/components/progress-line/controller.js
diff --git a/frontend/app/components/progress-line/index.js b/modules/frontend/app/components/progress-line/index.js
similarity index 100%
rename from frontend/app/components/progress-line/index.js
rename to modules/frontend/app/components/progress-line/index.js
diff --git a/frontend/app/components/progress-line/index.spec.js b/modules/frontend/app/components/progress-line/index.spec.js
similarity index 100%
rename from frontend/app/components/progress-line/index.spec.js
rename to modules/frontend/app/components/progress-line/index.spec.js
diff --git a/frontend/app/components/progress-line/style.scss b/modules/frontend/app/components/progress-line/style.scss
similarity index 100%
rename from frontend/app/components/progress-line/style.scss
rename to modules/frontend/app/components/progress-line/style.scss
diff --git a/frontend/app/components/progress-line/template.pug b/modules/frontend/app/components/progress-line/template.pug
similarity index 100%
rename from frontend/app/components/progress-line/template.pug
rename to modules/frontend/app/components/progress-line/template.pug
diff --git a/frontend/app/components/protect-from-bs-select-render/directive.js b/modules/frontend/app/components/protect-from-bs-select-render/directive.js
similarity index 100%
rename from frontend/app/components/protect-from-bs-select-render/directive.js
rename to modules/frontend/app/components/protect-from-bs-select-render/directive.js
diff --git a/frontend/app/components/protect-from-bs-select-render/index.js b/modules/frontend/app/components/protect-from-bs-select-render/index.js
similarity index 100%
rename from frontend/app/components/protect-from-bs-select-render/index.js
rename to modules/frontend/app/components/protect-from-bs-select-render/index.js
diff --git a/frontend/app/components/status-output/component.ts b/modules/frontend/app/components/status-output/component.ts
similarity index 100%
rename from frontend/app/components/status-output/component.ts
rename to modules/frontend/app/components/status-output/component.ts
diff --git a/frontend/app/components/status-output/componentFactory.ts b/modules/frontend/app/components/status-output/componentFactory.ts
similarity index 100%
rename from frontend/app/components/status-output/componentFactory.ts
rename to modules/frontend/app/components/status-output/componentFactory.ts
diff --git a/frontend/app/components/status-output/controller.ts b/modules/frontend/app/components/status-output/controller.ts
similarity index 97%
rename from frontend/app/components/status-output/controller.ts
rename to modules/frontend/app/components/status-output/controller.ts
index e9baab1..f5a8179 100644
--- a/frontend/app/components/status-output/controller.ts
+++ b/modules/frontend/app/components/status-output/controller.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import {StatusOptions, StatusOption} from './index';
+import {StatusOption, StatusOptions} from './index';
 
 interface Changes extends ng.IOnChangesObject {
     value: ng.IChangesObject<string>,
diff --git a/frontend/app/components/status-output/index.ts b/modules/frontend/app/components/status-output/index.ts
similarity index 99%
rename from frontend/app/components/status-output/index.ts
rename to modules/frontend/app/components/status-output/index.ts
index c24d438..0c902b2 100644
--- a/frontend/app/components/status-output/index.ts
+++ b/modules/frontend/app/components/status-output/index.ts
@@ -16,6 +16,7 @@
  */
 
 import {component} from './component';
+
 export {componentFactory} from './componentFactory';
 
 export interface StatusOption {
diff --git a/frontend/app/components/status-output/style.scss b/modules/frontend/app/components/status-output/style.scss
similarity index 100%
rename from frontend/app/components/status-output/style.scss
rename to modules/frontend/app/components/status-output/style.scss
diff --git a/frontend/app/components/status-output/template.tpl.pug b/modules/frontend/app/components/status-output/template.tpl.pug
similarity index 100%
rename from frontend/app/components/status-output/template.tpl.pug
rename to modules/frontend/app/components/status-output/template.tpl.pug
diff --git a/frontend/app/components/timed-redirection/component.ts b/modules/frontend/app/components/timed-redirection/component.ts
similarity index 100%
rename from frontend/app/components/timed-redirection/component.ts
rename to modules/frontend/app/components/timed-redirection/component.ts
diff --git a/frontend/app/components/timed-redirection/controller.ts b/modules/frontend/app/components/timed-redirection/controller.ts
similarity index 100%
rename from frontend/app/components/timed-redirection/controller.ts
rename to modules/frontend/app/components/timed-redirection/controller.ts
diff --git a/frontend/app/components/timed-redirection/index.ts b/modules/frontend/app/components/timed-redirection/index.ts
similarity index 100%
rename from frontend/app/components/timed-redirection/index.ts
rename to modules/frontend/app/components/timed-redirection/index.ts
diff --git a/frontend/app/components/timed-redirection/style.scss b/modules/frontend/app/components/timed-redirection/style.scss
similarity index 100%
rename from frontend/app/components/timed-redirection/style.scss
rename to modules/frontend/app/components/timed-redirection/style.scss
diff --git a/frontend/app/components/timed-redirection/template.pug b/modules/frontend/app/components/timed-redirection/template.pug
similarity index 100%
rename from frontend/app/components/timed-redirection/template.pug
rename to modules/frontend/app/components/timed-redirection/template.pug
diff --git a/frontend/app/components/ui-grid-column-resizer/directive.js b/modules/frontend/app/components/ui-grid-column-resizer/directive.js
similarity index 100%
rename from frontend/app/components/ui-grid-column-resizer/directive.js
rename to modules/frontend/app/components/ui-grid-column-resizer/directive.js
diff --git a/frontend/app/components/ui-grid-column-resizer/index.js b/modules/frontend/app/components/ui-grid-column-resizer/index.js
similarity index 100%
rename from frontend/app/components/ui-grid-column-resizer/index.js
rename to modules/frontend/app/components/ui-grid-column-resizer/index.js
diff --git a/frontend/app/components/ui-grid-filters/directive.js b/modules/frontend/app/components/ui-grid-filters/directive.js
similarity index 100%
rename from frontend/app/components/ui-grid-filters/directive.js
rename to modules/frontend/app/components/ui-grid-filters/directive.js
diff --git a/frontend/app/components/ui-grid-filters/index.js b/modules/frontend/app/components/ui-grid-filters/index.js
similarity index 100%
rename from frontend/app/components/ui-grid-filters/index.js
rename to modules/frontend/app/components/ui-grid-filters/index.js
diff --git a/frontend/app/components/ui-grid-filters/style.scss b/modules/frontend/app/components/ui-grid-filters/style.scss
similarity index 100%
rename from frontend/app/components/ui-grid-filters/style.scss
rename to modules/frontend/app/components/ui-grid-filters/style.scss
diff --git a/frontend/app/components/ui-grid-filters/template.pug b/modules/frontend/app/components/ui-grid-filters/template.pug
similarity index 100%
rename from frontend/app/components/ui-grid-filters/template.pug
rename to modules/frontend/app/components/ui-grid-filters/template.pug
diff --git a/frontend/app/components/ui-grid-hovering/cell.js b/modules/frontend/app/components/ui-grid-hovering/cell.js
similarity index 100%
rename from frontend/app/components/ui-grid-hovering/cell.js
rename to modules/frontend/app/components/ui-grid-hovering/cell.js
diff --git a/frontend/app/components/ui-grid-hovering/hovering.js b/modules/frontend/app/components/ui-grid-hovering/hovering.js
similarity index 100%
rename from frontend/app/components/ui-grid-hovering/hovering.js
rename to modules/frontend/app/components/ui-grid-hovering/hovering.js
diff --git a/frontend/app/components/ui-grid-hovering/index.js b/modules/frontend/app/components/ui-grid-hovering/index.js
similarity index 100%
rename from frontend/app/components/ui-grid-hovering/index.js
rename to modules/frontend/app/components/ui-grid-hovering/index.js
diff --git a/frontend/app/components/ui-grid-hovering/style.scss b/modules/frontend/app/components/ui-grid-hovering/style.scss
similarity index 100%
rename from frontend/app/components/ui-grid-hovering/style.scss
rename to modules/frontend/app/components/ui-grid-hovering/style.scss
diff --git a/frontend/app/components/ui-grid-hovering/viewport.js b/modules/frontend/app/components/ui-grid-hovering/viewport.js
similarity index 100%
rename from frontend/app/components/ui-grid-hovering/viewport.js
rename to modules/frontend/app/components/ui-grid-hovering/viewport.js
diff --git a/frontend/app/components/ui-grid/component.js b/modules/frontend/app/components/ui-grid/component.js
similarity index 100%
rename from frontend/app/components/ui-grid/component.js
rename to modules/frontend/app/components/ui-grid/component.js
diff --git a/frontend/app/components/ui-grid/controller.js b/modules/frontend/app/components/ui-grid/controller.js
similarity index 100%
rename from frontend/app/components/ui-grid/controller.js
rename to modules/frontend/app/components/ui-grid/controller.js
diff --git a/frontend/app/components/ui-grid/decorator.js b/modules/frontend/app/components/ui-grid/decorator.js
similarity index 100%
rename from frontend/app/components/ui-grid/decorator.js
rename to modules/frontend/app/components/ui-grid/decorator.js
diff --git a/frontend/app/components/ui-grid/index.js b/modules/frontend/app/components/ui-grid/index.js
similarity index 100%
rename from frontend/app/components/ui-grid/index.js
rename to modules/frontend/app/components/ui-grid/index.js
diff --git a/frontend/app/components/ui-grid/style.scss b/modules/frontend/app/components/ui-grid/style.scss
similarity index 100%
rename from frontend/app/components/ui-grid/style.scss
rename to modules/frontend/app/components/ui-grid/style.scss
diff --git a/frontend/app/components/ui-grid/template.pug b/modules/frontend/app/components/ui-grid/template.pug
similarity index 100%
rename from frontend/app/components/ui-grid/template.pug
rename to modules/frontend/app/components/ui-grid/template.pug
diff --git a/frontend/app/components/user-notifications/controller.js b/modules/frontend/app/components/user-notifications/controller.js
similarity index 100%
rename from frontend/app/components/user-notifications/controller.js
rename to modules/frontend/app/components/user-notifications/controller.js
diff --git a/frontend/app/components/user-notifications/index.js b/modules/frontend/app/components/user-notifications/index.js
similarity index 100%
rename from frontend/app/components/user-notifications/index.js
rename to modules/frontend/app/components/user-notifications/index.js
diff --git a/frontend/app/components/user-notifications/service.js b/modules/frontend/app/components/user-notifications/service.js
similarity index 100%
rename from frontend/app/components/user-notifications/service.js
rename to modules/frontend/app/components/user-notifications/service.js
diff --git a/frontend/app/components/user-notifications/style.scss b/modules/frontend/app/components/user-notifications/style.scss
similarity index 100%
rename from frontend/app/components/user-notifications/style.scss
rename to modules/frontend/app/components/user-notifications/style.scss
diff --git a/frontend/app/components/user-notifications/template.tpl.pug b/modules/frontend/app/components/user-notifications/template.tpl.pug
similarity index 100%
rename from frontend/app/components/user-notifications/template.tpl.pug
rename to modules/frontend/app/components/user-notifications/template.tpl.pug
diff --git a/frontend/app/components/version-picker/component.js b/modules/frontend/app/components/version-picker/component.js
similarity index 100%
rename from frontend/app/components/version-picker/component.js
rename to modules/frontend/app/components/version-picker/component.js
diff --git a/frontend/app/components/version-picker/index.js b/modules/frontend/app/components/version-picker/index.js
similarity index 100%
rename from frontend/app/components/version-picker/index.js
rename to modules/frontend/app/components/version-picker/index.js
diff --git a/frontend/app/components/version-picker/style.scss b/modules/frontend/app/components/version-picker/style.scss
similarity index 100%
rename from frontend/app/components/version-picker/style.scss
rename to modules/frontend/app/components/version-picker/style.scss
diff --git a/frontend/app/components/version-picker/template.pug b/modules/frontend/app/components/version-picker/template.pug
similarity index 100%
rename from frontend/app/components/version-picker/template.pug
rename to modules/frontend/app/components/version-picker/template.pug
diff --git a/frontend/app/components/web-console-footer/component.js b/modules/frontend/app/components/web-console-footer/component.js
similarity index 100%
rename from frontend/app/components/web-console-footer/component.js
rename to modules/frontend/app/components/web-console-footer/component.js
diff --git a/frontend/app/components/web-console-footer/controller.ts b/modules/frontend/app/components/web-console-footer/controller.ts
similarity index 100%
rename from frontend/app/components/web-console-footer/controller.ts
rename to modules/frontend/app/components/web-console-footer/controller.ts
diff --git a/frontend/app/components/web-console-footer/index.js b/modules/frontend/app/components/web-console-footer/index.js
similarity index 100%
rename from frontend/app/components/web-console-footer/index.js
rename to modules/frontend/app/components/web-console-footer/index.js
diff --git a/frontend/app/components/web-console-footer/style.scss b/modules/frontend/app/components/web-console-footer/style.scss
similarity index 100%
rename from frontend/app/components/web-console-footer/style.scss
rename to modules/frontend/app/components/web-console-footer/style.scss
diff --git a/frontend/app/components/web-console-footer/template.pug b/modules/frontend/app/components/web-console-footer/template.pug
similarity index 100%
rename from frontend/app/components/web-console-footer/template.pug
rename to modules/frontend/app/components/web-console-footer/template.pug
diff --git a/frontend/app/components/web-console-header/component.ts b/modules/frontend/app/components/web-console-header/component.ts
similarity index 100%
rename from frontend/app/components/web-console-header/component.ts
rename to modules/frontend/app/components/web-console-header/component.ts
diff --git a/frontend/app/components/web-console-header/components/demo-mode-button/component.ts b/modules/frontend/app/components/web-console-header/components/demo-mode-button/component.ts
similarity index 100%
rename from frontend/app/components/web-console-header/components/demo-mode-button/component.ts
rename to modules/frontend/app/components/web-console-header/components/demo-mode-button/component.ts
diff --git a/frontend/app/components/web-console-header/components/demo-mode-button/controller.ts b/modules/frontend/app/components/web-console-header/components/demo-mode-button/controller.ts
similarity index 100%
rename from frontend/app/components/web-console-header/components/demo-mode-button/controller.ts
rename to modules/frontend/app/components/web-console-header/components/demo-mode-button/controller.ts
diff --git a/frontend/app/components/web-console-header/components/demo-mode-button/template.pug b/modules/frontend/app/components/web-console-header/components/demo-mode-button/template.pug
similarity index 100%
rename from frontend/app/components/web-console-header/components/demo-mode-button/template.pug
rename to modules/frontend/app/components/web-console-header/components/demo-mode-button/template.pug
diff --git a/frontend/app/components/web-console-header/components/user-menu/component.ts b/modules/frontend/app/components/web-console-header/components/user-menu/component.ts
similarity index 100%
rename from frontend/app/components/web-console-header/components/user-menu/component.ts
rename to modules/frontend/app/components/web-console-header/components/user-menu/component.ts
diff --git a/frontend/app/components/web-console-header/components/user-menu/controller.ts b/modules/frontend/app/components/web-console-header/components/user-menu/controller.ts
similarity index 100%
rename from frontend/app/components/web-console-header/components/user-menu/controller.ts
rename to modules/frontend/app/components/web-console-header/components/user-menu/controller.ts
diff --git a/frontend/app/components/web-console-header/components/user-menu/style.scss b/modules/frontend/app/components/web-console-header/components/user-menu/style.scss
similarity index 100%
rename from frontend/app/components/web-console-header/components/user-menu/style.scss
rename to modules/frontend/app/components/web-console-header/components/user-menu/style.scss
diff --git a/frontend/app/components/web-console-header/components/user-menu/template.pug b/modules/frontend/app/components/web-console-header/components/user-menu/template.pug
similarity index 100%
rename from frontend/app/components/web-console-header/components/user-menu/template.pug
rename to modules/frontend/app/components/web-console-header/components/user-menu/template.pug
diff --git a/frontend/app/components/web-console-header/components/web-console-header-content/component.ts b/modules/frontend/app/components/web-console-header/components/web-console-header-content/component.ts
similarity index 100%
rename from frontend/app/components/web-console-header/components/web-console-header-content/component.ts
rename to modules/frontend/app/components/web-console-header/components/web-console-header-content/component.ts
diff --git a/frontend/app/components/web-console-header/components/web-console-header-content/controller.ts b/modules/frontend/app/components/web-console-header/components/web-console-header-content/controller.ts
similarity index 100%
rename from frontend/app/components/web-console-header/components/web-console-header-content/controller.ts
rename to modules/frontend/app/components/web-console-header/components/web-console-header-content/controller.ts
diff --git a/frontend/app/components/web-console-header/components/web-console-header-content/style.scss b/modules/frontend/app/components/web-console-header/components/web-console-header-content/style.scss
similarity index 100%
rename from frontend/app/components/web-console-header/components/web-console-header-content/style.scss
rename to modules/frontend/app/components/web-console-header/components/web-console-header-content/style.scss
diff --git a/frontend/app/components/web-console-header/components/web-console-header-content/template.pug b/modules/frontend/app/components/web-console-header/components/web-console-header-content/template.pug
similarity index 100%
rename from frontend/app/components/web-console-header/components/web-console-header-content/template.pug
rename to modules/frontend/app/components/web-console-header/components/web-console-header-content/template.pug
diff --git a/frontend/app/components/web-console-header/index.js b/modules/frontend/app/components/web-console-header/index.js
similarity index 100%
rename from frontend/app/components/web-console-header/index.js
rename to modules/frontend/app/components/web-console-header/index.js
diff --git a/frontend/app/components/web-console-header/style.scss b/modules/frontend/app/components/web-console-header/style.scss
similarity index 100%
rename from frontend/app/components/web-console-header/style.scss
rename to modules/frontend/app/components/web-console-header/style.scss
diff --git a/frontend/app/components/web-console-header/template.pug b/modules/frontend/app/components/web-console-header/template.pug
similarity index 100%
rename from frontend/app/components/web-console-header/template.pug
rename to modules/frontend/app/components/web-console-header/template.pug
diff --git a/frontend/app/components/permanent-notifications/component.ts b/modules/frontend/app/components/web-console-sidebar/component.ts
similarity index 100%
rename from frontend/app/components/permanent-notifications/component.ts
rename to modules/frontend/app/components/web-console-sidebar/component.ts
diff --git a/frontend/app/components/web-console-sidebar/controller.ts b/modules/frontend/app/components/web-console-sidebar/controller.ts
similarity index 100%
rename from frontend/app/components/web-console-sidebar/controller.ts
rename to modules/frontend/app/components/web-console-sidebar/controller.ts
diff --git a/frontend/app/components/web-console-sidebar/index.ts b/modules/frontend/app/components/web-console-sidebar/index.ts
similarity index 100%
rename from frontend/app/components/web-console-sidebar/index.ts
rename to modules/frontend/app/components/web-console-sidebar/index.ts
diff --git a/frontend/app/components/web-console-sidebar/style.scss b/modules/frontend/app/components/web-console-sidebar/style.scss
similarity index 100%
rename from frontend/app/components/web-console-sidebar/style.scss
rename to modules/frontend/app/components/web-console-sidebar/style.scss
diff --git a/frontend/app/components/web-console-sidebar/template.pug b/modules/frontend/app/components/web-console-sidebar/template.pug
similarity index 100%
rename from frontend/app/components/web-console-sidebar/template.pug
rename to modules/frontend/app/components/web-console-sidebar/template.pug
diff --git a/frontend/app/components/web-console-sidebar/web-console-sidebar-navigation/component.ts b/modules/frontend/app/components/web-console-sidebar/web-console-sidebar-navigation/component.ts
similarity index 100%
rename from frontend/app/components/web-console-sidebar/web-console-sidebar-navigation/component.ts
rename to modules/frontend/app/components/web-console-sidebar/web-console-sidebar-navigation/component.ts
diff --git a/frontend/app/components/web-console-sidebar/web-console-sidebar-navigation/controller.ts b/modules/frontend/app/components/web-console-sidebar/web-console-sidebar-navigation/controller.ts
similarity index 100%
rename from frontend/app/components/web-console-sidebar/web-console-sidebar-navigation/controller.ts
rename to modules/frontend/app/components/web-console-sidebar/web-console-sidebar-navigation/controller.ts
diff --git a/frontend/app/components/web-console-sidebar/web-console-sidebar-navigation/style.scss b/modules/frontend/app/components/web-console-sidebar/web-console-sidebar-navigation/style.scss
similarity index 100%
rename from frontend/app/components/web-console-sidebar/web-console-sidebar-navigation/style.scss
rename to modules/frontend/app/components/web-console-sidebar/web-console-sidebar-navigation/style.scss
diff --git a/frontend/app/components/web-console-sidebar/web-console-sidebar-navigation/template.pug b/modules/frontend/app/components/web-console-sidebar/web-console-sidebar-navigation/template.pug
similarity index 100%
rename from frontend/app/components/web-console-sidebar/web-console-sidebar-navigation/template.pug
rename to modules/frontend/app/components/web-console-sidebar/web-console-sidebar-navigation/template.pug
diff --git a/frontend/app/components/web-console-sidebar/web-console-sidebar-overflow/component.ts b/modules/frontend/app/components/web-console-sidebar/web-console-sidebar-overflow/component.ts
similarity index 100%
rename from frontend/app/components/web-console-sidebar/web-console-sidebar-overflow/component.ts
rename to modules/frontend/app/components/web-console-sidebar/web-console-sidebar-overflow/component.ts
diff --git a/frontend/app/components/web-console-sidebar/web-console-sidebar-overflow/controller.ts b/modules/frontend/app/components/web-console-sidebar/web-console-sidebar-overflow/controller.ts
similarity index 100%
rename from frontend/app/components/web-console-sidebar/web-console-sidebar-overflow/controller.ts
rename to modules/frontend/app/components/web-console-sidebar/web-console-sidebar-overflow/controller.ts
diff --git a/frontend/app/components/web-console-sidebar/web-console-sidebar-overflow/style.scss b/modules/frontend/app/components/web-console-sidebar/web-console-sidebar-overflow/style.scss
similarity index 100%
rename from frontend/app/components/web-console-sidebar/web-console-sidebar-overflow/style.scss
rename to modules/frontend/app/components/web-console-sidebar/web-console-sidebar-overflow/style.scss
diff --git a/frontend/app/components/web-console-sidebar/web-console-sidebar-overflow/template.pug b/modules/frontend/app/components/web-console-sidebar/web-console-sidebar-overflow/template.pug
similarity index 100%
rename from frontend/app/components/web-console-sidebar/web-console-sidebar-overflow/template.pug
rename to modules/frontend/app/components/web-console-sidebar/web-console-sidebar-overflow/template.pug
diff --git a/frontend/app/configuration/components/button-download-project/component.ts b/modules/frontend/app/configuration/components/button-download-project/component.ts
similarity index 100%
rename from frontend/app/configuration/components/button-download-project/component.ts
rename to modules/frontend/app/configuration/components/button-download-project/component.ts
diff --git a/frontend/app/configuration/components/button-download-project/index.ts b/modules/frontend/app/configuration/components/button-download-project/index.ts
similarity index 100%
rename from frontend/app/configuration/components/button-download-project/index.ts
rename to modules/frontend/app/configuration/components/button-download-project/index.ts
diff --git a/frontend/app/configuration/components/button-download-project/template.pug b/modules/frontend/app/configuration/components/button-download-project/template.pug
similarity index 100%
rename from frontend/app/configuration/components/button-download-project/template.pug
rename to modules/frontend/app/configuration/components/button-download-project/template.pug
diff --git a/frontend/app/configuration/components/button-import-models/component.ts b/modules/frontend/app/configuration/components/button-import-models/component.ts
similarity index 100%
rename from frontend/app/configuration/components/button-import-models/component.ts
rename to modules/frontend/app/configuration/components/button-import-models/component.ts
diff --git a/frontend/app/configuration/components/button-import-models/index.ts b/modules/frontend/app/configuration/components/button-import-models/index.ts
similarity index 100%
rename from frontend/app/configuration/components/button-import-models/index.ts
rename to modules/frontend/app/configuration/components/button-import-models/index.ts
diff --git a/frontend/app/configuration/components/button-import-models/style.scss b/modules/frontend/app/configuration/components/button-import-models/style.scss
similarity index 100%
rename from frontend/app/configuration/components/button-import-models/style.scss
rename to modules/frontend/app/configuration/components/button-import-models/style.scss
diff --git a/frontend/app/configuration/components/button-import-models/template.pug b/modules/frontend/app/configuration/components/button-import-models/template.pug
similarity index 100%
rename from frontend/app/configuration/components/button-import-models/template.pug
rename to modules/frontend/app/configuration/components/button-import-models/template.pug
diff --git a/frontend/app/configuration/components/button-preview-project/component.ts b/modules/frontend/app/configuration/components/button-preview-project/component.ts
similarity index 100%
rename from frontend/app/configuration/components/button-preview-project/component.ts
rename to modules/frontend/app/configuration/components/button-preview-project/component.ts
diff --git a/frontend/app/configuration/components/button-preview-project/index.ts b/modules/frontend/app/configuration/components/button-preview-project/index.ts
similarity index 100%
rename from frontend/app/configuration/components/button-preview-project/index.ts
rename to modules/frontend/app/configuration/components/button-preview-project/index.ts
diff --git a/frontend/app/configuration/components/button-preview-project/template.pug b/modules/frontend/app/configuration/components/button-preview-project/template.pug
similarity index 100%
rename from frontend/app/configuration/components/button-preview-project/template.pug
rename to modules/frontend/app/configuration/components/button-preview-project/template.pug
diff --git a/frontend/app/configuration/components/fakeUICanExit.spec.js b/modules/frontend/app/configuration/components/fakeUICanExit.spec.js
similarity index 100%
rename from frontend/app/configuration/components/fakeUICanExit.spec.js
rename to modules/frontend/app/configuration/components/fakeUICanExit.spec.js
diff --git a/frontend/app/configuration/components/fakeUICanExit.ts b/modules/frontend/app/configuration/components/fakeUICanExit.ts
similarity index 100%
rename from frontend/app/configuration/components/fakeUICanExit.ts
rename to modules/frontend/app/configuration/components/fakeUICanExit.ts
diff --git a/frontend/app/configuration/components/formUICanExitGuard.ts b/modules/frontend/app/configuration/components/formUICanExitGuard.ts
similarity index 100%
rename from frontend/app/configuration/components/formUICanExitGuard.ts
rename to modules/frontend/app/configuration/components/formUICanExitGuard.ts
diff --git a/frontend/app/configuration/components/modal-import-models/component.js b/modules/frontend/app/configuration/components/modal-import-models/component.js
similarity index 99%
rename from frontend/app/configuration/components/modal-import-models/component.js
rename to modules/frontend/app/configuration/components/modal-import-models/component.js
index 9fe23ec..dae0eb3 100644
--- a/frontend/app/configuration/components/modal-import-models/component.js
+++ b/modules/frontend/app/configuration/components/modal-import-models/component.js
@@ -26,7 +26,6 @@ import {distinctUntilChanged, filter, map, pluck, switchMap, take, tap} from 'rx
 import ObjectID from 'bson-objectid';
 import {uniqueName} from 'app/utils/uniqueName';
 import {defaultNames} from '../../defaultNames';
-
 // eslint-disable-next-line
 import {UIRouter} from '@uirouter/angularjs'
 import {default as IgniteConfirmBatch} from 'app/services/ConfirmBatch.service';
diff --git a/frontend/app/configuration/components/modal-import-models/index.ts b/modules/frontend/app/configuration/components/modal-import-models/index.ts
similarity index 100%
rename from frontend/app/configuration/components/modal-import-models/index.ts
rename to modules/frontend/app/configuration/components/modal-import-models/index.ts
diff --git a/frontend/app/configuration/components/modal-import-models/selected-items-amount-indicator/component.ts b/modules/frontend/app/configuration/components/modal-import-models/selected-items-amount-indicator/component.ts
similarity index 100%
rename from frontend/app/configuration/components/modal-import-models/selected-items-amount-indicator/component.ts
rename to modules/frontend/app/configuration/components/modal-import-models/selected-items-amount-indicator/component.ts
diff --git a/frontend/app/configuration/components/modal-import-models/selected-items-amount-indicator/style.scss b/modules/frontend/app/configuration/components/modal-import-models/selected-items-amount-indicator/style.scss
similarity index 100%
rename from frontend/app/configuration/components/modal-import-models/selected-items-amount-indicator/style.scss
rename to modules/frontend/app/configuration/components/modal-import-models/selected-items-amount-indicator/style.scss
diff --git a/frontend/app/configuration/components/modal-import-models/selected-items-amount-indicator/template.pug b/modules/frontend/app/configuration/components/modal-import-models/selected-items-amount-indicator/template.pug
similarity index 100%
rename from frontend/app/configuration/components/modal-import-models/selected-items-amount-indicator/template.pug
rename to modules/frontend/app/configuration/components/modal-import-models/selected-items-amount-indicator/template.pug
diff --git a/frontend/app/configuration/components/modal-import-models/service.ts b/modules/frontend/app/configuration/components/modal-import-models/service.ts
similarity index 97%
rename from frontend/app/configuration/components/modal-import-models/service.ts
rename to modules/frontend/app/configuration/components/modal-import-models/service.ts
index c440fe8..c6aaa6f 100644
--- a/frontend/app/configuration/components/modal-import-models/service.ts
+++ b/modules/frontend/app/configuration/components/modal-import-models/service.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import {UIRouter, StateDeclaration, StateService} from '@uirouter/angularjs';
+import {StateDeclaration, StateService, UIRouter} from '@uirouter/angularjs';
 import AgentManager from 'app/modules/agent/AgentManager.service';
 
 export default class ModalImportModels {
diff --git a/frontend/app/configuration/components/modal-import-models/step-indicator/component.ts b/modules/frontend/app/configuration/components/modal-import-models/step-indicator/component.ts
similarity index 100%
rename from frontend/app/configuration/components/modal-import-models/step-indicator/component.ts
rename to modules/frontend/app/configuration/components/modal-import-models/step-indicator/component.ts
diff --git a/frontend/app/configuration/components/modal-import-models/step-indicator/style.scss b/modules/frontend/app/configuration/components/modal-import-models/step-indicator/style.scss
similarity index 100%
rename from frontend/app/configuration/components/modal-import-models/step-indicator/style.scss
rename to modules/frontend/app/configuration/components/modal-import-models/step-indicator/style.scss
diff --git a/frontend/app/configuration/components/modal-import-models/step-indicator/template.pug b/modules/frontend/app/configuration/components/modal-import-models/step-indicator/template.pug
similarity index 100%
rename from frontend/app/configuration/components/modal-import-models/step-indicator/template.pug
rename to modules/frontend/app/configuration/components/modal-import-models/step-indicator/template.pug
diff --git a/frontend/app/configuration/components/modal-import-models/style.scss b/modules/frontend/app/configuration/components/modal-import-models/style.scss
similarity index 100%
rename from frontend/app/configuration/components/modal-import-models/style.scss
rename to modules/frontend/app/configuration/components/modal-import-models/style.scss
diff --git a/frontend/app/configuration/components/modal-import-models/tables-action-cell/component.ts b/modules/frontend/app/configuration/components/modal-import-models/tables-action-cell/component.ts
similarity index 100%
rename from frontend/app/configuration/components/modal-import-models/tables-action-cell/component.ts
rename to modules/frontend/app/configuration/components/modal-import-models/tables-action-cell/component.ts
diff --git a/frontend/app/configuration/components/modal-import-models/tables-action-cell/style.scss b/modules/frontend/app/configuration/components/modal-import-models/tables-action-cell/style.scss
similarity index 100%
rename from frontend/app/configuration/components/modal-import-models/tables-action-cell/style.scss
rename to modules/frontend/app/configuration/components/modal-import-models/tables-action-cell/style.scss
diff --git a/frontend/app/configuration/components/modal-import-models/tables-action-cell/template.pug b/modules/frontend/app/configuration/components/modal-import-models/tables-action-cell/template.pug
similarity index 100%
rename from frontend/app/configuration/components/modal-import-models/tables-action-cell/template.pug
rename to modules/frontend/app/configuration/components/modal-import-models/tables-action-cell/template.pug
diff --git a/frontend/app/configuration/components/modal-import-models/template.tpl.pug b/modules/frontend/app/configuration/components/modal-import-models/template.tpl.pug
similarity index 100%
rename from frontend/app/configuration/components/modal-import-models/template.tpl.pug
rename to modules/frontend/app/configuration/components/modal-import-models/template.tpl.pug
diff --git a/frontend/app/configuration/components/modal-preview-project/component.ts b/modules/frontend/app/configuration/components/modal-preview-project/component.ts
similarity index 100%
rename from frontend/app/configuration/components/modal-preview-project/component.ts
rename to modules/frontend/app/configuration/components/modal-preview-project/component.ts
diff --git a/frontend/app/configuration/components/modal-preview-project/controller.ts b/modules/frontend/app/configuration/components/modal-preview-project/controller.ts
similarity index 100%
rename from frontend/app/configuration/components/modal-preview-project/controller.ts
rename to modules/frontend/app/configuration/components/modal-preview-project/controller.ts
diff --git a/frontend/app/configuration/components/modal-preview-project/index.ts b/modules/frontend/app/configuration/components/modal-preview-project/index.ts
similarity index 100%
rename from frontend/app/configuration/components/modal-preview-project/index.ts
rename to modules/frontend/app/configuration/components/modal-preview-project/index.ts
diff --git a/frontend/app/configuration/components/modal-preview-project/service.ts b/modules/frontend/app/configuration/components/modal-preview-project/service.ts
similarity index 100%
rename from frontend/app/configuration/components/modal-preview-project/service.ts
rename to modules/frontend/app/configuration/components/modal-preview-project/service.ts
diff --git a/frontend/app/configuration/components/modal-preview-project/style.scss b/modules/frontend/app/configuration/components/modal-preview-project/style.scss
similarity index 100%
rename from frontend/app/configuration/components/modal-preview-project/style.scss
rename to modules/frontend/app/configuration/components/modal-preview-project/style.scss
diff --git a/frontend/app/configuration/components/modal-preview-project/template.pug b/modules/frontend/app/configuration/components/modal-preview-project/template.pug
similarity index 100%
rename from frontend/app/configuration/components/modal-preview-project/template.pug
rename to modules/frontend/app/configuration/components/modal-preview-project/template.pug
diff --git a/frontend/app/configuration/components/page-configure-overview/component.ts b/modules/frontend/app/configuration/components/page-configure-advanced/component.ts
similarity index 100%
rename from frontend/app/configuration/components/page-configure-overview/component.ts
rename to modules/frontend/app/configuration/components/page-configure-advanced/component.ts
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/cache-edit-form/component.ts b/modules/frontend/app/configuration/components/page-configure-advanced/components/cache-edit-form/component.ts
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/cache-edit-form/component.ts
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/cache-edit-form/component.ts
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/cache-edit-form/controller.ts b/modules/frontend/app/configuration/components/page-configure-advanced/components/cache-edit-form/controller.ts
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/cache-edit-form/controller.ts
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/cache-edit-form/controller.ts
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/cache-edit-form/index.ts b/modules/frontend/app/configuration/components/page-configure-advanced/components/cache-edit-form/index.ts
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/cache-edit-form/index.ts
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/cache-edit-form/index.ts
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/style.scss b/modules/frontend/app/configuration/components/page-configure-advanced/components/cache-edit-form/style.scss
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/style.scss
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/cache-edit-form/style.scss
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/cache-edit-form/template.tpl.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/cache-edit-form/template.tpl.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/cache-edit-form/template.tpl.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/cache-edit-form/template.tpl.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/cache-edit-form/templates/affinity.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/cache-edit-form/templates/affinity.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/cache-edit-form/templates/affinity.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/cache-edit-form/templates/affinity.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/cache-edit-form/templates/concurrency.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/cache-edit-form/templates/concurrency.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/cache-edit-form/templates/concurrency.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/cache-edit-form/templates/concurrency.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/cache-edit-form/templates/general.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/cache-edit-form/templates/general.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/cache-edit-form/templates/general.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/cache-edit-form/templates/general.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/cache-edit-form/templates/key-cfg.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/cache-edit-form/templates/key-cfg.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/cache-edit-form/templates/key-cfg.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/cache-edit-form/templates/key-cfg.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/cache-edit-form/templates/memory.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/cache-edit-form/templates/memory.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/cache-edit-form/templates/memory.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/cache-edit-form/templates/memory.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/cache-edit-form/templates/misc.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/cache-edit-form/templates/misc.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/cache-edit-form/templates/misc.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/cache-edit-form/templates/misc.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/cache-edit-form/templates/near-cache-client.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/cache-edit-form/templates/near-cache-client.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/cache-edit-form/templates/near-cache-client.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/cache-edit-form/templates/near-cache-client.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/cache-edit-form/templates/near-cache-server.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/cache-edit-form/templates/near-cache-server.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/cache-edit-form/templates/near-cache-server.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/cache-edit-form/templates/near-cache-server.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/cache-edit-form/templates/node-filter.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/cache-edit-form/templates/node-filter.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/cache-edit-form/templates/node-filter.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/cache-edit-form/templates/node-filter.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/cache-edit-form/templates/query.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/cache-edit-form/templates/query.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/cache-edit-form/templates/query.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/cache-edit-form/templates/query.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/cache-edit-form/templates/rebalance.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/cache-edit-form/templates/rebalance.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/cache-edit-form/templates/rebalance.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/cache-edit-form/templates/rebalance.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/cache-edit-form/templates/statistics.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/cache-edit-form/templates/statistics.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/cache-edit-form/templates/statistics.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/cache-edit-form/templates/statistics.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/cache-edit-form/templates/store.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/cache-edit-form/templates/store.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/cache-edit-form/templates/store.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/cache-edit-form/templates/store.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/component.ts b/modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/component.ts
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/component.ts
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/component.ts
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/controller.spec.js b/modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/controller.spec.js
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/controller.spec.js
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/controller.spec.js
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/controller.ts b/modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/controller.ts
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/controller.ts
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/controller.ts
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/index.ts b/modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/index.ts
similarity index 99%
rename from frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/index.ts
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/index.ts
index 9ca47fa..84f7601 100644
--- a/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/index.ts
+++ b/modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/index.ts
@@ -17,6 +17,7 @@
 
 import angular from 'angular';
 import component from './component';
+
 export default angular
     .module('configuration.cluster-edit-form', [])
     .component('clusterEditForm', component);
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/cache-edit-form/style.scss b/modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/style.scss
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/cache-edit-form/style.scss
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/style.scss
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/template.tpl.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/template.tpl.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/template.tpl.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/template.tpl.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/atomic.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/atomic.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/atomic.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/atomic.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/attributes.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/attributes.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/attributes.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/attributes.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/binary.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/binary.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/binary.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/binary.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/cache-key-cfg.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/cache-key-cfg.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/cache-key-cfg.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/cache-key-cfg.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/checkpoint.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/checkpoint.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/checkpoint.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/checkpoint.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/checkpoint/fs.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/checkpoint/fs.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/checkpoint/fs.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/checkpoint/fs.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/checkpoint/jdbc.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/checkpoint/jdbc.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/checkpoint/jdbc.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/checkpoint/jdbc.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/checkpoint/s3.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/checkpoint/s3.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/checkpoint/s3.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/checkpoint/s3.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/client-connector.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/client-connector.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/client-connector.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/client-connector.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/collision.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/collision.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/collision.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/collision.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/collision/custom.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/collision/custom.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/collision/custom.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/collision/custom.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/collision/fifo-queue.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/collision/fifo-queue.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/collision/fifo-queue.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/collision/fifo-queue.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/collision/job-stealing.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/collision/job-stealing.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/collision/job-stealing.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/collision/job-stealing.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/collision/priority-queue.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/collision/priority-queue.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/collision/priority-queue.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/collision/priority-queue.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/communication.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/communication.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/communication.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/communication.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/connector.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/connector.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/connector.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/connector.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/data-storage.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/data-storage.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/data-storage.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/data-storage.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/deployment.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/deployment.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/deployment.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/deployment.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/discovery.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/discovery.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/discovery.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/discovery.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/encryption.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/encryption.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/encryption.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/encryption.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/events.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/events.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/events.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/events.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/failover.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/failover.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/failover.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/failover.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/general.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/general.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/general.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/general.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/general/discovery/cloud.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/general/discovery/cloud.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/general/discovery/cloud.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/general/discovery/cloud.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/general/discovery/google.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/general/discovery/google.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/general/discovery/google.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/general/discovery/google.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/general/discovery/jdbc.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/general/discovery/jdbc.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/general/discovery/jdbc.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/general/discovery/jdbc.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/general/discovery/kubernetes.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/general/discovery/kubernetes.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/general/discovery/kubernetes.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/general/discovery/kubernetes.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/general/discovery/multicast.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/general/discovery/multicast.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/general/discovery/multicast.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/general/discovery/multicast.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/general/discovery/s3.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/general/discovery/s3.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/general/discovery/s3.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/general/discovery/s3.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/general/discovery/shared.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/general/discovery/shared.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/general/discovery/shared.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/general/discovery/shared.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/general/discovery/vm.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/general/discovery/vm.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/general/discovery/vm.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/general/discovery/vm.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/general/discovery/zookeeper.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/general/discovery/zookeeper.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/general/discovery/zookeeper.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/general/discovery/zookeeper.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/general/discovery/zookeeper/retrypolicy/bounded-exponential-backoff.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/general/discovery/zookeeper/retrypolicy/bounded-exponential-backoff.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/general/discovery/zookeeper/retrypolicy/bounded-exponential-backoff.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/general/discovery/zookeeper/retrypolicy/bounded-exponential-backoff.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/general/discovery/zookeeper/retrypolicy/custom.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/general/discovery/zookeeper/retrypolicy/custom.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/general/discovery/zookeeper/retrypolicy/custom.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/general/discovery/zookeeper/retrypolicy/custom.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/general/discovery/zookeeper/retrypolicy/exponential-backoff.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/general/discovery/zookeeper/retrypolicy/exponential-backoff.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/general/discovery/zookeeper/retrypolicy/exponential-backoff.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/general/discovery/zookeeper/retrypolicy/exponential-backoff.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/general/discovery/zookeeper/retrypolicy/forever.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/general/discovery/zookeeper/retrypolicy/forever.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/general/discovery/zookeeper/retrypolicy/forever.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/general/discovery/zookeeper/retrypolicy/forever.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/general/discovery/zookeeper/retrypolicy/n-times.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/general/discovery/zookeeper/retrypolicy/n-times.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/general/discovery/zookeeper/retrypolicy/n-times.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/general/discovery/zookeeper/retrypolicy/n-times.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/general/discovery/zookeeper/retrypolicy/one-time.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/general/discovery/zookeeper/retrypolicy/one-time.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/general/discovery/zookeeper/retrypolicy/one-time.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/general/discovery/zookeeper/retrypolicy/one-time.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/general/discovery/zookeeper/retrypolicy/until-elapsed.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/general/discovery/zookeeper/retrypolicy/until-elapsed.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/general/discovery/zookeeper/retrypolicy/until-elapsed.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/general/discovery/zookeeper/retrypolicy/until-elapsed.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/hadoop.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/hadoop.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/hadoop.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/hadoop.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/load-balancing.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/load-balancing.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/load-balancing.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/load-balancing.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/logger.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/logger.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/logger.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/logger.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/logger/custom.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/logger/custom.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/logger/custom.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/logger/custom.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/logger/log4j.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/logger/log4j.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/logger/log4j.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/logger/log4j.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/logger/log4j2.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/logger/log4j2.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/logger/log4j2.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/logger/log4j2.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/marshaller.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/marshaller.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/marshaller.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/marshaller.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/memory.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/memory.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/memory.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/memory.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/metrics.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/metrics.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/metrics.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/metrics.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/misc.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/misc.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/misc.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/misc.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/mvcc.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/mvcc.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/mvcc.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/mvcc.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/odbc.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/odbc.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/odbc.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/odbc.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/persistence.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/persistence.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/persistence.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/persistence.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/service.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/service.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/service.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/service.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/sql-connector.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/sql-connector.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/sql-connector.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/sql-connector.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/ssl.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/ssl.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/ssl.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/ssl.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/swap.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/swap.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/swap.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/swap.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/thread.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/thread.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/thread.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/thread.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/time.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/time.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/time.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/time.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/transactions.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/transactions.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/transactions.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/cluster-edit-form/templates/transactions.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/igfs-edit-form/component.ts b/modules/frontend/app/configuration/components/page-configure-advanced/components/igfs-edit-form/component.ts
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/igfs-edit-form/component.ts
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/igfs-edit-form/component.ts
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/igfs-edit-form/controller.ts b/modules/frontend/app/configuration/components/page-configure-advanced/components/igfs-edit-form/controller.ts
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/igfs-edit-form/controller.ts
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/igfs-edit-form/controller.ts
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/igfs-edit-form/index.ts b/modules/frontend/app/configuration/components/page-configure-advanced/components/igfs-edit-form/index.ts
similarity index 99%
rename from frontend/app/configuration/components/page-configure-advanced/components/igfs-edit-form/index.ts
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/igfs-edit-form/index.ts
index ad3db52..411d0e7 100644
--- a/frontend/app/configuration/components/page-configure-advanced/components/igfs-edit-form/index.ts
+++ b/modules/frontend/app/configuration/components/page-configure-advanced/components/igfs-edit-form/index.ts
@@ -17,6 +17,7 @@
 
 import angular from 'angular';
 import component from './component';
+
 export default angular
     .module('configuration.igfs-edit-form', [])
     .component('igfsEditForm', component);
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/igfs-edit-form/style.scss b/modules/frontend/app/configuration/components/page-configure-advanced/components/igfs-edit-form/style.scss
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/igfs-edit-form/style.scss
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/igfs-edit-form/style.scss
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/igfs-edit-form/template.tpl.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/igfs-edit-form/template.tpl.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/igfs-edit-form/template.tpl.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/igfs-edit-form/template.tpl.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/igfs-edit-form/templates/dual.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/igfs-edit-form/templates/dual.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/igfs-edit-form/templates/dual.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/igfs-edit-form/templates/dual.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/igfs-edit-form/templates/fragmentizer.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/igfs-edit-form/templates/fragmentizer.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/igfs-edit-form/templates/fragmentizer.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/igfs-edit-form/templates/fragmentizer.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/igfs-edit-form/templates/general.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/igfs-edit-form/templates/general.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/igfs-edit-form/templates/general.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/igfs-edit-form/templates/general.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/igfs-edit-form/templates/ipc.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/igfs-edit-form/templates/ipc.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/igfs-edit-form/templates/ipc.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/igfs-edit-form/templates/ipc.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/igfs-edit-form/templates/misc.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/igfs-edit-form/templates/misc.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/igfs-edit-form/templates/misc.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/igfs-edit-form/templates/misc.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/igfs-edit-form/templates/secondary.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/igfs-edit-form/templates/secondary.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/igfs-edit-form/templates/secondary.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/igfs-edit-form/templates/secondary.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/model-edit-form/component.js b/modules/frontend/app/configuration/components/page-configure-advanced/components/model-edit-form/component.js
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/model-edit-form/component.js
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/model-edit-form/component.js
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/model-edit-form/controller.ts b/modules/frontend/app/configuration/components/page-configure-advanced/components/model-edit-form/controller.ts
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/model-edit-form/controller.ts
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/model-edit-form/controller.ts
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/model-edit-form/index.js b/modules/frontend/app/configuration/components/page-configure-advanced/components/model-edit-form/index.js
similarity index 99%
rename from frontend/app/configuration/components/page-configure-advanced/components/model-edit-form/index.js
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/model-edit-form/index.js
index f81b893..f9642c9 100644
--- a/frontend/app/configuration/components/page-configure-advanced/components/model-edit-form/index.js
+++ b/modules/frontend/app/configuration/components/page-configure-advanced/components/model-edit-form/index.js
@@ -17,6 +17,7 @@
 
 import angular from 'angular';
 import component from './component';
+
 export default angular
     .module('configuration.model-edit-form', [])
     .component('modelEditForm', component);
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/model-edit-form/style.scss b/modules/frontend/app/configuration/components/page-configure-advanced/components/model-edit-form/style.scss
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/model-edit-form/style.scss
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/model-edit-form/style.scss
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/model-edit-form/template.tpl.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/model-edit-form/template.tpl.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/model-edit-form/template.tpl.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/model-edit-form/template.tpl.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/model-edit-form/templates/general.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/model-edit-form/templates/general.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/model-edit-form/templates/general.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/model-edit-form/templates/general.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/model-edit-form/templates/query.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/model-edit-form/templates/query.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/model-edit-form/templates/query.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/model-edit-form/templates/query.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/model-edit-form/templates/store.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/model-edit-form/templates/store.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/model-edit-form/templates/store.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/model-edit-form/templates/store.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/page-configure-advanced-caches/component.ts b/modules/frontend/app/configuration/components/page-configure-advanced/components/page-configure-advanced-caches/component.ts
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/page-configure-advanced-caches/component.ts
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/page-configure-advanced-caches/component.ts
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/page-configure-advanced-caches/controller.ts b/modules/frontend/app/configuration/components/page-configure-advanced/components/page-configure-advanced-caches/controller.ts
similarity index 95%
rename from frontend/app/configuration/components/page-configure-advanced/components/page-configure-advanced-caches/controller.ts
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/page-configure-advanced-caches/controller.ts
index f16b14a..97ae6e1 100644
--- a/frontend/app/configuration/components/page-configure-advanced/components/page-configure-advanced-caches/controller.ts
+++ b/modules/frontend/app/configuration/components/page-configure-advanced/components/page-configure-advanced-caches/controller.ts
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-import {Subject, merge, combineLatest} from 'rxjs';
-import {tap, map, refCount, pluck, publishReplay, switchMap, distinctUntilChanged} from 'rxjs/operators';
-import {UIRouter, TransitionService, StateService} from '@uirouter/angularjs';
+import {combineLatest, merge, Subject} from 'rxjs';
+import {distinctUntilChanged, map, pluck, publishReplay, refCount, switchMap, tap} from 'rxjs/operators';
+import {StateService, TransitionService, UIRouter} from '@uirouter/angularjs';
 import naturalCompare from 'natural-compare-lite';
-import {removeClusterItems, advancedSaveCache} from '../../../../store/actionCreators';
+import {advancedSaveCache, removeClusterItems} from '../../../../store/actionCreators';
 import ConfigureState from '../../../../services/ConfigureState';
 import ConfigSelectors from '../../../../store/selectors';
 import Caches from '../../../../services/Caches';
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/page-configure-advanced-caches/index.ts b/modules/frontend/app/configuration/components/page-configure-advanced/components/page-configure-advanced-caches/index.ts
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/page-configure-advanced-caches/index.ts
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/page-configure-advanced-caches/index.ts
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/page-configure-advanced-caches/template.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/page-configure-advanced-caches/template.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/page-configure-advanced-caches/template.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/page-configure-advanced-caches/template.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/page-configure-advanced-cluster/component.ts b/modules/frontend/app/configuration/components/page-configure-advanced/components/page-configure-advanced-cluster/component.ts
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/page-configure-advanced-cluster/component.ts
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/page-configure-advanced-cluster/component.ts
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/page-configure-advanced-cluster/controller.ts b/modules/frontend/app/configuration/components/page-configure-advanced/components/page-configure-advanced-cluster/controller.ts
similarity index 95%
rename from frontend/app/configuration/components/page-configure-advanced/components/page-configure-advanced-cluster/controller.ts
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/page-configure-advanced-cluster/controller.ts
index dfbc38b..ff9fae9 100644
--- a/frontend/app/configuration/components/page-configure-advanced/components/page-configure-advanced-cluster/controller.ts
+++ b/modules/frontend/app/configuration/components/page-configure-advanced/components/page-configure-advanced-cluster/controller.ts
@@ -18,7 +18,7 @@
 import {default as ConfigSelectors} from '../../../../store/selectors';
 import {default as ConfigureState} from '../../../../services/ConfigureState';
 import {advancedSaveCluster} from '../../../../store/actionCreators';
-import {take, pluck, switchMap, map, filter, distinctUntilChanged, publishReplay, refCount} from 'rxjs/operators';
+import {distinctUntilChanged, filter, map, pluck, publishReplay, refCount, switchMap, take} from 'rxjs/operators';
 import {UIRouter} from '@uirouter/angularjs';
 
 // Controller for Clusters screen.
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/page-configure-advanced-cluster/index.ts b/modules/frontend/app/configuration/components/page-configure-advanced/components/page-configure-advanced-cluster/index.ts
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/page-configure-advanced-cluster/index.ts
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/page-configure-advanced-cluster/index.ts
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/page-configure-advanced-cluster/template.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/page-configure-advanced-cluster/template.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/page-configure-advanced-cluster/template.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/page-configure-advanced-cluster/template.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/page-configure-advanced-igfs/component.ts b/modules/frontend/app/configuration/components/page-configure-advanced/components/page-configure-advanced-igfs/component.ts
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/page-configure-advanced-igfs/component.ts
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/page-configure-advanced-igfs/component.ts
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/page-configure-advanced-igfs/controller.ts b/modules/frontend/app/configuration/components/page-configure-advanced/components/page-configure-advanced-igfs/controller.ts
similarity index 94%
rename from frontend/app/configuration/components/page-configure-advanced/components/page-configure-advanced-igfs/controller.ts
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/page-configure-advanced-igfs/controller.ts
index 742791e..d4b7a46 100644
--- a/frontend/app/configuration/components/page-configure-advanced/components/page-configure-advanced-igfs/controller.ts
+++ b/modules/frontend/app/configuration/components/page-configure-advanced/components/page-configure-advanced-igfs/controller.ts
@@ -15,15 +15,15 @@
  * limitations under the License.
  */
 
-import {Observable, Subject, combineLatest, merge} from 'rxjs';
-import {tap, map, distinctUntilChanged, pluck, publishReplay, refCount, switchMap} from 'rxjs/operators';
+import {combineLatest, merge, Observable, Subject} from 'rxjs';
+import {distinctUntilChanged, map, pluck, publishReplay, refCount, switchMap, tap} from 'rxjs/operators';
 import naturalCompare from 'natural-compare-lite';
 import get from 'lodash/get';
-import {removeClusterItems, advancedSaveIGFS} from '../../../../store/actionCreators';
+import {advancedSaveIGFS, removeClusterItems} from '../../../../store/actionCreators';
 import ConfigureState from '../../../../services/ConfigureState';
 import ConfigSelectors from '../../../../store/selectors';
 import IGFSs from '../../../../services/IGFSs';
-import {UIRouter, StateService} from '@uirouter/angularjs';
+import {StateService, UIRouter} from '@uirouter/angularjs';
 import ConfigSelectionManager from '../../../../services/ConfigSelectionManager';
 import {ShortIGFS} from '../../../../types';
 import {IColumnDefOf} from 'ui-grid';
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/page-configure-advanced-igfs/index.ts b/modules/frontend/app/configuration/components/page-configure-advanced/components/page-configure-advanced-igfs/index.ts
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/page-configure-advanced-igfs/index.ts
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/page-configure-advanced-igfs/index.ts
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/page-configure-advanced-igfs/template.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/page-configure-advanced-igfs/template.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/page-configure-advanced-igfs/template.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/page-configure-advanced-igfs/template.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/page-configure-advanced-models/component.ts b/modules/frontend/app/configuration/components/page-configure-advanced/components/page-configure-advanced-models/component.ts
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/page-configure-advanced-models/component.ts
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/page-configure-advanced-models/component.ts
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/page-configure-advanced-models/controller.ts b/modules/frontend/app/configuration/components/page-configure-advanced/components/page-configure-advanced-models/controller.ts
similarity index 94%
rename from frontend/app/configuration/components/page-configure-advanced/components/page-configure-advanced-models/controller.ts
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/page-configure-advanced-models/controller.ts
index 84d6891..8394965 100644
--- a/frontend/app/configuration/components/page-configure-advanced/components/page-configure-advanced-models/controller.ts
+++ b/modules/frontend/app/configuration/components/page-configure-advanced/components/page-configure-advanced-models/controller.ts
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-import {Subject, Observable, combineLatest, merge} from 'rxjs';
-import {pluck, tap, publishReplay, refCount, distinctUntilChanged, switchMap, map} from 'rxjs/operators';
+import {combineLatest, merge, Observable, Subject} from 'rxjs';
+import {distinctUntilChanged, map, pluck, publishReplay, refCount, switchMap, tap} from 'rxjs/operators';
 
 import get from 'lodash/get';
 
@@ -24,14 +24,14 @@ import hasIndexTemplate from './hasIndex.template.pug';
 import keyCellTemplate from './keyCell.template.pug';
 import valueCellTemplate from './valueCell.template.pug';
 
-import {removeClusterItems, advancedSaveModel} from '../../../../store/actionCreators';
+import {advancedSaveModel, removeClusterItems} from '../../../../store/actionCreators';
 
 import {default as ConfigSelectors} from '../../../../store/selectors';
 import {default as ConfigureState} from '../../../../services/ConfigureState';
 import {default as Models} from '../../../../services/Models';
 
-import {UIRouter, StateService} from '@uirouter/angularjs';
-import {ShortDomainModel, DomainModel, ShortCache} from '../../../../types';
+import {StateService, UIRouter} from '@uirouter/angularjs';
+import {DomainModel, ShortCache, ShortDomainModel} from '../../../../types';
 import {IColumnDefOf} from 'ui-grid';
 import ConfigSelectionManager from '../../../../services/ConfigSelectionManager';
 
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/page-configure-advanced-models/hasIndex.template.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/page-configure-advanced-models/hasIndex.template.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/page-configure-advanced-models/hasIndex.template.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/page-configure-advanced-models/hasIndex.template.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/page-configure-advanced-models/index.ts b/modules/frontend/app/configuration/components/page-configure-advanced/components/page-configure-advanced-models/index.ts
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/page-configure-advanced-models/index.ts
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/page-configure-advanced-models/index.ts
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/page-configure-advanced-models/keyCell.template.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/page-configure-advanced-models/keyCell.template.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/page-configure-advanced-models/keyCell.template.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/page-configure-advanced-models/keyCell.template.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/page-configure-advanced-models/style.scss b/modules/frontend/app/configuration/components/page-configure-advanced/components/page-configure-advanced-models/style.scss
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/page-configure-advanced-models/style.scss
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/page-configure-advanced-models/style.scss
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/page-configure-advanced-models/template.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/page-configure-advanced-models/template.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/page-configure-advanced-models/template.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/page-configure-advanced-models/template.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/components/page-configure-advanced-models/valueCell.template.pug b/modules/frontend/app/configuration/components/page-configure-advanced/components/page-configure-advanced-models/valueCell.template.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/components/page-configure-advanced-models/valueCell.template.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/components/page-configure-advanced-models/valueCell.template.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/controller.ts b/modules/frontend/app/configuration/components/page-configure-advanced/controller.ts
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/controller.ts
rename to modules/frontend/app/configuration/components/page-configure-advanced/controller.ts
diff --git a/frontend/app/configuration/components/page-configure-advanced/index.ts b/modules/frontend/app/configuration/components/page-configure-advanced/index.ts
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/index.ts
rename to modules/frontend/app/configuration/components/page-configure-advanced/index.ts
diff --git a/frontend/app/configuration/components/page-configure-advanced/style.scss b/modules/frontend/app/configuration/components/page-configure-advanced/style.scss
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/style.scss
rename to modules/frontend/app/configuration/components/page-configure-advanced/style.scss
diff --git a/frontend/app/configuration/components/page-configure-advanced/template.pug b/modules/frontend/app/configuration/components/page-configure-advanced/template.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/template.pug
rename to modules/frontend/app/configuration/components/page-configure-advanced/template.pug
diff --git a/frontend/app/configuration/components/page-configure-basic/component.ts b/modules/frontend/app/configuration/components/page-configure-basic/component.ts
similarity index 100%
rename from frontend/app/configuration/components/page-configure-basic/component.ts
rename to modules/frontend/app/configuration/components/page-configure-basic/component.ts
diff --git a/frontend/app/configuration/components/page-configure-basic/controller.ts b/modules/frontend/app/configuration/components/page-configure-basic/controller.ts
similarity index 97%
rename from frontend/app/configuration/components/page-configure-basic/controller.ts
rename to modules/frontend/app/configuration/components/page-configure-basic/controller.ts
index 24b16bb..6bce731 100644
--- a/frontend/app/configuration/components/page-configure-basic/controller.ts
+++ b/modules/frontend/app/configuration/components/page-configure-basic/controller.ts
@@ -16,16 +16,11 @@
  */
 
 import {forkJoin, merge} from 'rxjs';
-import {map, tap, pluck, take, filter, distinctUntilChanged, switchMap, publishReplay, refCount} from 'rxjs/operators';
+import {distinctUntilChanged, filter, map, pluck, publishReplay, refCount, switchMap, take, tap} from 'rxjs/operators';
 import cloneDeep from 'lodash/cloneDeep';
 import get from 'lodash/get';
 import naturalCompare from 'natural-compare-lite';
-import {
-    changeItem,
-    removeClusterItems,
-    basicSave,
-    basicSaveAndDownload
-} from '../../store/actionCreators';
+import {basicSave, basicSaveAndDownload, changeItem, removeClusterItems} from '../../store/actionCreators';
 
 import {Confirm} from 'app/services/Confirm.service';
 import ConfigureState from '../../services/ConfigureState';
diff --git a/frontend/app/configuration/components/page-configure-basic/index.ts b/modules/frontend/app/configuration/components/page-configure-basic/index.ts
similarity index 100%
rename from frontend/app/configuration/components/page-configure-basic/index.ts
rename to modules/frontend/app/configuration/components/page-configure-basic/index.ts
diff --git a/frontend/app/configuration/components/page-configure-basic/reducer.spec.js b/modules/frontend/app/configuration/components/page-configure-basic/reducer.spec.js
similarity index 98%
rename from frontend/app/configuration/components/page-configure-basic/reducer.spec.js
rename to modules/frontend/app/configuration/components/page-configure-basic/reducer.spec.js
index 3489bf8..6383e61 100644
--- a/frontend/app/configuration/components/page-configure-basic/reducer.spec.js
+++ b/modules/frontend/app/configuration/components/page-configure-basic/reducer.spec.js
@@ -18,13 +18,7 @@
 import {suite, test} from 'mocha';
 import {assert} from 'chai';
 
-import {
-    SET_CLUSTER,
-    ADD_NEW_CACHE,
-    REMOVE_CACHE,
-    SET_SELECTED_CACHES,
-    reducer
-} from './reducer';
+import {ADD_NEW_CACHE, reducer, REMOVE_CACHE, SET_CLUSTER, SET_SELECTED_CACHES} from './reducer';
 
 suite('page-configure-basic component reducer', () => {
     test('Default state', () => {
diff --git a/frontend/app/configuration/components/page-configure-basic/reducer.ts b/modules/frontend/app/configuration/components/page-configure-basic/reducer.ts
similarity index 99%
rename from frontend/app/configuration/components/page-configure-basic/reducer.ts
rename to modules/frontend/app/configuration/components/page-configure-basic/reducer.ts
index 1bc7a26..ee978a2 100644
--- a/frontend/app/configuration/components/page-configure-basic/reducer.ts
+++ b/modules/frontend/app/configuration/components/page-configure-basic/reducer.ts
@@ -16,14 +16,13 @@
  */
 
 import cloneDeep from 'lodash/cloneDeep';
+import {uniqueName} from 'app/utils/uniqueName';
 
 export const ADD_NEW_CACHE = Symbol('ADD_NEW_CACHE');
 export const REMOVE_CACHE = Symbol('REMOVE_CACHE');
 export const SET_SELECTED_CACHES = Symbol('SET_SELECTED_CACHES');
 export const SET_CLUSTER = Symbol('SET_CLUSTER');
 
-import {uniqueName} from 'app/utils/uniqueName';
-
 const defaults = {
     clusterID: -1,
     cluster: null,
diff --git a/frontend/app/configuration/components/page-configure-basic/style.scss b/modules/frontend/app/configuration/components/page-configure-basic/style.scss
similarity index 100%
rename from frontend/app/configuration/components/page-configure-basic/style.scss
rename to modules/frontend/app/configuration/components/page-configure-basic/style.scss
diff --git a/frontend/app/configuration/components/page-configure-basic/template.pug b/modules/frontend/app/configuration/components/page-configure-basic/template.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-basic/template.pug
rename to modules/frontend/app/configuration/components/page-configure-basic/template.pug
diff --git a/frontend/app/configuration/components/page-configure-advanced/component.ts b/modules/frontend/app/configuration/components/page-configure-overview/component.ts
similarity index 100%
rename from frontend/app/configuration/components/page-configure-advanced/component.ts
rename to modules/frontend/app/configuration/components/page-configure-overview/component.ts
diff --git a/frontend/app/configuration/components/page-configure-overview/components/pco-grid-column-categories/directive.ts b/modules/frontend/app/configuration/components/page-configure-overview/components/pco-grid-column-categories/directive.ts
similarity index 100%
rename from frontend/app/configuration/components/page-configure-overview/components/pco-grid-column-categories/directive.ts
rename to modules/frontend/app/configuration/components/page-configure-overview/components/pco-grid-column-categories/directive.ts
diff --git a/frontend/app/configuration/components/page-configure-overview/controller.ts b/modules/frontend/app/configuration/components/page-configure-overview/controller.ts
similarity index 99%
rename from frontend/app/configuration/components/page-configure-overview/controller.ts
rename to modules/frontend/app/configuration/components/page-configure-overview/controller.ts
index f4c1e11..6d6f4f4 100644
--- a/frontend/app/configuration/components/page-configure-overview/controller.ts
+++ b/modules/frontend/app/configuration/components/page-configure-overview/controller.ts
@@ -15,20 +15,9 @@
  * limitations under the License.
  */
 
-import {Subject, Observable} from 'rxjs';
+import {Observable, Subject} from 'rxjs';
 import {map} from 'rxjs/operators';
 import naturalCompare from 'natural-compare-lite';
-
-const cellTemplate = (state) => `
-    <div class="ui-grid-cell-contents">
-        <a
-            class="link-success"
-            ui-sref="${state}({clusterID: row.entity._id})"
-            title='Click to edit'
-        >{{ row.entity[col.field] }}</a>
-    </div>
-`;
-
 import {default as ConfigureState} from '../../services/ConfigureState';
 import {default as ConfigSelectors} from '../../store/selectors';
 import {default as Clusters} from '../../services/Clusters';
@@ -41,6 +30,16 @@ import {UIRouter} from '@uirouter/angularjs';
 import {ShortCluster} from '../../types';
 import {IColumnDefOf} from 'ui-grid';
 
+const cellTemplate = (state) => `
+    <div class="ui-grid-cell-contents">
+        <a
+            class="link-success"
+            ui-sref="${state}({clusterID: row.entity._id})"
+            title='Click to edit'
+        >{{ row.entity[col.field] }}</a>
+    </div>
+`;
+
 export default class PageConfigureOverviewController {
     static $inject = [
         '$uiRouter',
diff --git a/frontend/app/configuration/components/page-configure-overview/index.ts b/modules/frontend/app/configuration/components/page-configure-overview/index.ts
similarity index 100%
rename from frontend/app/configuration/components/page-configure-overview/index.ts
rename to modules/frontend/app/configuration/components/page-configure-overview/index.ts
diff --git a/frontend/app/configuration/components/page-configure-overview/style.scss b/modules/frontend/app/configuration/components/page-configure-overview/style.scss
similarity index 100%
rename from frontend/app/configuration/components/page-configure-overview/style.scss
rename to modules/frontend/app/configuration/components/page-configure-overview/style.scss
diff --git a/frontend/app/configuration/components/page-configure-overview/template.pug b/modules/frontend/app/configuration/components/page-configure-overview/template.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure-overview/template.pug
rename to modules/frontend/app/configuration/components/page-configure-overview/template.pug
diff --git a/frontend/app/configuration/components/page-configure/component.ts b/modules/frontend/app/configuration/components/page-configure/component.ts
similarity index 100%
rename from frontend/app/configuration/components/page-configure/component.ts
rename to modules/frontend/app/configuration/components/page-configure/component.ts
diff --git a/frontend/app/configuration/components/page-configure/controller.ts b/modules/frontend/app/configuration/components/page-configure/controller.ts
similarity index 95%
rename from frontend/app/configuration/components/page-configure/controller.ts
rename to modules/frontend/app/configuration/components/page-configure/controller.ts
index f270bb6..d8d55ea 100644
--- a/frontend/app/configuration/components/page-configure/controller.ts
+++ b/modules/frontend/app/configuration/components/page-configure/controller.ts
@@ -16,8 +16,8 @@
  */
 
 import get from 'lodash/get';
-import {Observable, combineLatest} from 'rxjs';
-import {pluck, switchMap, map} from 'rxjs/operators';
+import {combineLatest, Observable} from 'rxjs';
+import {map, pluck, switchMap} from 'rxjs/operators';
 import {default as ConfigureState} from '../../services/ConfigureState';
 import {default as ConfigSelectors} from '../../store/selectors';
 import {UIRouter} from '@uirouter/angularjs';
diff --git a/frontend/app/configuration/components/page-configure/index.ts b/modules/frontend/app/configuration/components/page-configure/index.ts
similarity index 100%
rename from frontend/app/configuration/components/page-configure/index.ts
rename to modules/frontend/app/configuration/components/page-configure/index.ts
diff --git a/frontend/app/configuration/components/page-configure/style.scss b/modules/frontend/app/configuration/components/page-configure/style.scss
similarity index 100%
rename from frontend/app/configuration/components/page-configure/style.scss
rename to modules/frontend/app/configuration/components/page-configure/style.scss
diff --git a/frontend/app/configuration/components/page-configure/template.pug b/modules/frontend/app/configuration/components/page-configure/template.pug
similarity index 100%
rename from frontend/app/configuration/components/page-configure/template.pug
rename to modules/frontend/app/configuration/components/page-configure/template.pug
diff --git a/frontend/app/configuration/components/pc-items-table/component.js b/modules/frontend/app/configuration/components/pc-items-table/component.js
similarity index 100%
rename from frontend/app/configuration/components/pc-items-table/component.js
rename to modules/frontend/app/configuration/components/pc-items-table/component.js
diff --git a/frontend/app/configuration/components/pc-items-table/controller.js b/modules/frontend/app/configuration/components/pc-items-table/controller.js
similarity index 100%
rename from frontend/app/configuration/components/pc-items-table/controller.js
rename to modules/frontend/app/configuration/components/pc-items-table/controller.js
diff --git a/frontend/app/configuration/components/pc-items-table/decorator.js b/modules/frontend/app/configuration/components/pc-items-table/decorator.js
similarity index 100%
rename from frontend/app/configuration/components/pc-items-table/decorator.js
rename to modules/frontend/app/configuration/components/pc-items-table/decorator.js
diff --git a/frontend/app/configuration/components/pc-items-table/index.js b/modules/frontend/app/configuration/components/pc-items-table/index.js
similarity index 100%
rename from frontend/app/configuration/components/pc-items-table/index.js
rename to modules/frontend/app/configuration/components/pc-items-table/index.js
diff --git a/frontend/app/configuration/components/pc-items-table/style.scss b/modules/frontend/app/configuration/components/pc-items-table/style.scss
similarity index 100%
rename from frontend/app/configuration/components/pc-items-table/style.scss
rename to modules/frontend/app/configuration/components/pc-items-table/style.scss
diff --git a/frontend/app/configuration/components/pc-items-table/template.pug b/modules/frontend/app/configuration/components/pc-items-table/template.pug
similarity index 100%
rename from frontend/app/configuration/components/pc-items-table/template.pug
rename to modules/frontend/app/configuration/components/pc-items-table/template.pug
diff --git a/frontend/app/configuration/components/pc-split-button/component.ts b/modules/frontend/app/configuration/components/pc-split-button/component.ts
similarity index 100%
rename from frontend/app/configuration/components/pc-split-button/component.ts
rename to modules/frontend/app/configuration/components/pc-split-button/component.ts
diff --git a/frontend/app/configuration/components/pc-split-button/controller.ts b/modules/frontend/app/configuration/components/pc-split-button/controller.ts
similarity index 100%
rename from frontend/app/configuration/components/pc-split-button/controller.ts
rename to modules/frontend/app/configuration/components/pc-split-button/controller.ts
diff --git a/frontend/app/configuration/components/pc-split-button/index.ts b/modules/frontend/app/configuration/components/pc-split-button/index.ts
similarity index 100%
rename from frontend/app/configuration/components/pc-split-button/index.ts
rename to modules/frontend/app/configuration/components/pc-split-button/index.ts
diff --git a/frontend/app/configuration/components/pc-split-button/template.pug b/modules/frontend/app/configuration/components/pc-split-button/template.pug
similarity index 100%
rename from frontend/app/configuration/components/pc-split-button/template.pug
rename to modules/frontend/app/configuration/components/pc-split-button/template.pug
diff --git a/frontend/app/configuration/components/pc-ui-grid-filters/directive.ts b/modules/frontend/app/configuration/components/pc-ui-grid-filters/directive.ts
similarity index 100%
rename from frontend/app/configuration/components/pc-ui-grid-filters/directive.ts
rename to modules/frontend/app/configuration/components/pc-ui-grid-filters/directive.ts
diff --git a/frontend/app/configuration/components/pc-ui-grid-filters/index.ts b/modules/frontend/app/configuration/components/pc-ui-grid-filters/index.ts
similarity index 100%
rename from frontend/app/configuration/components/pc-ui-grid-filters/index.ts
rename to modules/frontend/app/configuration/components/pc-ui-grid-filters/index.ts
diff --git a/frontend/app/configuration/components/pc-ui-grid-filters/style.scss b/modules/frontend/app/configuration/components/pc-ui-grid-filters/style.scss
similarity index 100%
rename from frontend/app/configuration/components/pc-ui-grid-filters/style.scss
rename to modules/frontend/app/configuration/components/pc-ui-grid-filters/style.scss
diff --git a/frontend/app/configuration/components/pc-ui-grid-filters/template.pug b/modules/frontend/app/configuration/components/pc-ui-grid-filters/template.pug
similarity index 100%
rename from frontend/app/configuration/components/pc-ui-grid-filters/template.pug
rename to modules/frontend/app/configuration/components/pc-ui-grid-filters/template.pug
diff --git a/frontend/app/configuration/components/pcIsInCollection.ts b/modules/frontend/app/configuration/components/pcIsInCollection.ts
similarity index 100%
rename from frontend/app/configuration/components/pcIsInCollection.ts
rename to modules/frontend/app/configuration/components/pcIsInCollection.ts
diff --git a/frontend/app/configuration/components/pcValidation.ts b/modules/frontend/app/configuration/components/pcValidation.ts
similarity index 100%
rename from frontend/app/configuration/components/pcValidation.ts
rename to modules/frontend/app/configuration/components/pcValidation.ts
diff --git a/frontend/app/configuration/components/preview-panel/directive.ts b/modules/frontend/app/configuration/components/preview-panel/directive.ts
similarity index 100%
rename from frontend/app/configuration/components/preview-panel/directive.ts
rename to modules/frontend/app/configuration/components/preview-panel/directive.ts
diff --git a/frontend/app/configuration/components/preview-panel/index.ts b/modules/frontend/app/configuration/components/preview-panel/index.ts
similarity index 100%
rename from frontend/app/configuration/components/preview-panel/index.ts
rename to modules/frontend/app/configuration/components/preview-panel/index.ts
diff --git a/frontend/app/configuration/components/ui-ace-java/index.ts b/modules/frontend/app/configuration/components/ui-ace-java/index.ts
similarity index 100%
rename from frontend/app/configuration/components/ui-ace-java/index.ts
rename to modules/frontend/app/configuration/components/ui-ace-java/index.ts
diff --git a/frontend/app/configuration/components/ui-ace-java/ui-ace-java.controller.ts b/modules/frontend/app/configuration/components/ui-ace-java/ui-ace-java.controller.ts
similarity index 100%
rename from frontend/app/configuration/components/ui-ace-java/ui-ace-java.controller.ts
rename to modules/frontend/app/configuration/components/ui-ace-java/ui-ace-java.controller.ts
diff --git a/frontend/app/configuration/components/ui-ace-java/ui-ace-java.directive.ts b/modules/frontend/app/configuration/components/ui-ace-java/ui-ace-java.directive.ts
similarity index 100%
rename from frontend/app/configuration/components/ui-ace-java/ui-ace-java.directive.ts
rename to modules/frontend/app/configuration/components/ui-ace-java/ui-ace-java.directive.ts
diff --git a/frontend/app/configuration/components/ui-ace-java/ui-ace-java.pug b/modules/frontend/app/configuration/components/ui-ace-java/ui-ace-java.pug
similarity index 100%
rename from frontend/app/configuration/components/ui-ace-java/ui-ace-java.pug
rename to modules/frontend/app/configuration/components/ui-ace-java/ui-ace-java.pug
diff --git a/frontend/app/configuration/components/ui-ace-spring/index.ts b/modules/frontend/app/configuration/components/ui-ace-spring/index.ts
similarity index 100%
rename from frontend/app/configuration/components/ui-ace-spring/index.ts
rename to modules/frontend/app/configuration/components/ui-ace-spring/index.ts
diff --git a/frontend/app/configuration/components/ui-ace-spring/ui-ace-spring.controller.ts b/modules/frontend/app/configuration/components/ui-ace-spring/ui-ace-spring.controller.ts
similarity index 100%
rename from frontend/app/configuration/components/ui-ace-spring/ui-ace-spring.controller.ts
rename to modules/frontend/app/configuration/components/ui-ace-spring/ui-ace-spring.controller.ts
diff --git a/frontend/app/configuration/components/ui-ace-spring/ui-ace-spring.directive.ts b/modules/frontend/app/configuration/components/ui-ace-spring/ui-ace-spring.directive.ts
similarity index 100%
rename from frontend/app/configuration/components/ui-ace-spring/ui-ace-spring.directive.ts
rename to modules/frontend/app/configuration/components/ui-ace-spring/ui-ace-spring.directive.ts
diff --git a/frontend/app/configuration/components/ui-ace-spring/ui-ace-spring.pug b/modules/frontend/app/configuration/components/ui-ace-spring/ui-ace-spring.pug
similarity index 100%
rename from frontend/app/configuration/components/ui-ace-spring/ui-ace-spring.pug
rename to modules/frontend/app/configuration/components/ui-ace-spring/ui-ace-spring.pug
diff --git a/frontend/app/configuration/components/ui-ace-tabs.directive.ts b/modules/frontend/app/configuration/components/ui-ace-tabs.directive.ts
similarity index 100%
rename from frontend/app/configuration/components/ui-ace-tabs.directive.ts
rename to modules/frontend/app/configuration/components/ui-ace-tabs.directive.ts
diff --git a/frontend/app/configuration/components/ui-ace.controller.js b/modules/frontend/app/configuration/components/ui-ace.controller.js
similarity index 100%
rename from frontend/app/configuration/components/ui-ace.controller.js
rename to modules/frontend/app/configuration/components/ui-ace.controller.js
diff --git a/frontend/app/configuration/defaultNames.ts b/modules/frontend/app/configuration/defaultNames.ts
similarity index 100%
rename from frontend/app/configuration/defaultNames.ts
rename to modules/frontend/app/configuration/defaultNames.ts
diff --git a/frontend/app/configuration/generator/JavaTypesNonEnum.service.spec.ts b/modules/frontend/app/configuration/generator/JavaTypesNonEnum.service.spec.ts
similarity index 98%
rename from frontend/app/configuration/generator/JavaTypesNonEnum.service.spec.ts
rename to modules/frontend/app/configuration/generator/JavaTypesNonEnum.service.spec.ts
index 065392e..c63977f 100644
--- a/frontend/app/configuration/generator/JavaTypesNonEnum.service.spec.ts
+++ b/modules/frontend/app/configuration/generator/JavaTypesNonEnum.service.spec.ts
@@ -21,11 +21,10 @@ import ClusterDflts from './generator/defaults/Cluster.service';
 import CacheDflts from './generator/defaults/Cache.service';
 import IgfsDflts from './generator/defaults/IGFS.service';
 import JavaTypes from 'app/services/JavaTypes.service';
+import {assert} from 'chai';
 
 const instance = new JavaTypesNonEnum(new ClusterDflts(), new CacheDflts(), new IgfsDflts(), new JavaTypes());
 
-import { assert } from 'chai';
-
 suite('JavaTypesNonEnum', () => {
     test('nonEnum', () => {
         assert.equal(instance.nonEnum('org.apache.ignite.cache.CacheMode'), false);
diff --git a/frontend/app/configuration/generator/JavaTypesNonEnum.service.ts b/modules/frontend/app/configuration/generator/JavaTypesNonEnum.service.ts
similarity index 100%
rename from frontend/app/configuration/generator/JavaTypesNonEnum.service.ts
rename to modules/frontend/app/configuration/generator/JavaTypesNonEnum.service.ts
diff --git a/frontend/app/configuration/generator/configuration.module.js b/modules/frontend/app/configuration/generator/configuration.module.js
similarity index 99%
rename from frontend/app/configuration/generator/configuration.module.js
rename to modules/frontend/app/configuration/generator/configuration.module.js
index fbbfc01..3bd9024 100644
--- a/frontend/app/configuration/generator/configuration.module.js
+++ b/modules/frontend/app/configuration/generator/configuration.module.js
@@ -36,7 +36,6 @@ import IgniteReadmeGenerator from './generator/Readme.service';
 import IgniteCustomGenerator from './generator/Custom.service';
 import IgniteArtifactVersionUtils from './generator/ArtifactVersionChecker.service';
 
-
 // Ignite events groups.
 export default angular
     .module('ignite-console.configuration.generator', [])
diff --git a/frontend/app/configuration/generator/generator/AbstractTransformer.js b/modules/frontend/app/configuration/generator/generator/AbstractTransformer.js
similarity index 100%
rename from frontend/app/configuration/generator/generator/AbstractTransformer.js
rename to modules/frontend/app/configuration/generator/generator/AbstractTransformer.js
diff --git a/frontend/app/configuration/generator/generator/ArtifactVersionChecker.service.js b/modules/frontend/app/configuration/generator/generator/ArtifactVersionChecker.service.js
similarity index 100%
rename from frontend/app/configuration/generator/generator/ArtifactVersionChecker.service.js
rename to modules/frontend/app/configuration/generator/generator/ArtifactVersionChecker.service.js
diff --git a/frontend/app/configuration/generator/generator/Beans.js b/modules/frontend/app/configuration/generator/generator/Beans.js
similarity index 100%
rename from frontend/app/configuration/generator/generator/Beans.js
rename to modules/frontend/app/configuration/generator/generator/Beans.js
diff --git a/frontend/app/configuration/generator/generator/ConfigurationGenerator.js b/modules/frontend/app/configuration/generator/generator/ConfigurationGenerator.js
similarity index 99%
rename from frontend/app/configuration/generator/generator/ConfigurationGenerator.js
rename to modules/frontend/app/configuration/generator/generator/ConfigurationGenerator.js
index c2057e0..76d3118 100644
--- a/frontend/app/configuration/generator/generator/ConfigurationGenerator.js
+++ b/modules/frontend/app/configuration/generator/generator/ConfigurationGenerator.js
@@ -17,7 +17,7 @@
 
 import DFLT_DIALECTS from 'app/data/dialects.json';
 
-import { EmptyBean, Bean } from './Beans';
+import {Bean, EmptyBean} from './Beans';
 
 import IgniteClusterDefaults from './defaults/Cluster.service';
 import IgniteEventGroups from './defaults/Event-groups.service';
@@ -30,7 +30,9 @@ import VersionService from 'app/services/Version.service';
 
 import _ from 'lodash';
 import isNil from 'lodash/isNil';
-import {nonNil, nonEmpty} from 'app/utils/lodashMixins';
+import {nonEmpty, nonNil} from 'app/utils/lodashMixins';
+// Pom dependency information.
+import POM_DEPENDENCIES from 'app/data/pom-dependencies.json';
 
 const clusterDflts = new IgniteClusterDefaults();
 const cacheDflts = new IgniteCacheDefaults();
@@ -38,9 +40,6 @@ const igfsDflts = new IgniteIGFSDefaults();
 const javaTypes = new JavaTypes(clusterDflts, cacheDflts, igfsDflts);
 const versionService = new VersionService();
 
-// Pom dependency information.
-import POM_DEPENDENCIES from 'app/data/pom-dependencies.json';
-
 export default class IgniteConfigurationGenerator {
     static eventGrps = new IgniteEventGroups();
 
diff --git a/frontend/app/configuration/generator/generator/Custom.service.js b/modules/frontend/app/configuration/generator/generator/Custom.service.js
similarity index 100%
rename from frontend/app/configuration/generator/generator/Custom.service.js
rename to modules/frontend/app/configuration/generator/generator/Custom.service.js
diff --git a/frontend/app/configuration/generator/generator/Docker.service.js b/modules/frontend/app/configuration/generator/generator/Docker.service.js
similarity index 100%
rename from frontend/app/configuration/generator/generator/Docker.service.js
rename to modules/frontend/app/configuration/generator/generator/Docker.service.js
diff --git a/frontend/app/configuration/generator/generator/Docker.service.spec.js b/modules/frontend/app/configuration/generator/generator/Docker.service.spec.js
similarity index 100%
rename from frontend/app/configuration/generator/generator/Docker.service.spec.js
rename to modules/frontend/app/configuration/generator/generator/Docker.service.spec.js
diff --git a/frontend/app/configuration/generator/generator/JavaTransformer.service.js b/modules/frontend/app/configuration/generator/generator/JavaTransformer.service.js
similarity index 99%
rename from frontend/app/configuration/generator/generator/JavaTransformer.service.js
rename to modules/frontend/app/configuration/generator/generator/JavaTransformer.service.js
index ec60b74..a9df3d2 100644
--- a/frontend/app/configuration/generator/generator/JavaTransformer.service.js
+++ b/modules/frontend/app/configuration/generator/generator/JavaTransformer.service.js
@@ -17,7 +17,7 @@
 
 import {nonEmpty} from 'app/utils/lodashMixins';
 
-import { Bean } from './Beans';
+import {Bean} from './Beans';
 
 import AbstractTransformer from './AbstractTransformer';
 import StringBuilder from './StringBuilder';
diff --git a/frontend/app/configuration/generator/generator/Maven.service.js b/modules/frontend/app/configuration/generator/generator/Maven.service.js
similarity index 99%
rename from frontend/app/configuration/generator/generator/Maven.service.js
rename to modules/frontend/app/configuration/generator/generator/Maven.service.js
index 83ffdeb..fa99534 100644
--- a/frontend/app/configuration/generator/generator/Maven.service.js
+++ b/modules/frontend/app/configuration/generator/generator/Maven.service.js
@@ -20,7 +20,6 @@ import _ from 'lodash';
 import StringBuilder from './StringBuilder';
 import ArtifactVersionChecker from './ArtifactVersionChecker.service';
 import VersionService from 'app/services/Version.service';
-
 // Pom dependency information.
 import POM_DEPENDENCIES from 'app/data/pom-dependencies.json';
 
diff --git a/frontend/app/configuration/generator/generator/PlatformGenerator.js b/modules/frontend/app/configuration/generator/generator/PlatformGenerator.js
similarity index 99%
rename from frontend/app/configuration/generator/generator/PlatformGenerator.js
rename to modules/frontend/app/configuration/generator/generator/PlatformGenerator.js
index 5f7eed2..0cb38a7 100644
--- a/frontend/app/configuration/generator/generator/PlatformGenerator.js
+++ b/modules/frontend/app/configuration/generator/generator/PlatformGenerator.js
@@ -18,7 +18,7 @@
 import _ from 'lodash';
 
 import {nonEmpty} from 'app/utils/lodashMixins';
-import { EmptyBean, Bean } from './Beans';
+import {Bean, EmptyBean} from './Beans';
 
 /**
  * @param {import('app/services/JavaTypes.service').default} JavaTypes
diff --git a/frontend/app/configuration/generator/generator/Properties.service.js b/modules/frontend/app/configuration/generator/generator/Properties.service.js
similarity index 100%
rename from frontend/app/configuration/generator/generator/Properties.service.js
rename to modules/frontend/app/configuration/generator/generator/Properties.service.js
diff --git a/frontend/app/configuration/generator/generator/Readme.service.js b/modules/frontend/app/configuration/generator/generator/Readme.service.js
similarity index 100%
rename from frontend/app/configuration/generator/generator/Readme.service.js
rename to modules/frontend/app/configuration/generator/generator/Readme.service.js
diff --git a/frontend/app/configuration/generator/generator/SharpTransformer.service.js b/modules/frontend/app/configuration/generator/generator/SharpTransformer.service.js
similarity index 100%
rename from frontend/app/configuration/generator/generator/SharpTransformer.service.js
rename to modules/frontend/app/configuration/generator/generator/SharpTransformer.service.js
diff --git a/frontend/app/configuration/generator/generator/SpringTransformer.service.js b/modules/frontend/app/configuration/generator/generator/SpringTransformer.service.js
similarity index 99%
rename from frontend/app/configuration/generator/generator/SpringTransformer.service.js
rename to modules/frontend/app/configuration/generator/generator/SpringTransformer.service.js
index 1424c4c..6ce50d4 100644
--- a/frontend/app/configuration/generator/generator/SpringTransformer.service.js
+++ b/modules/frontend/app/configuration/generator/generator/SpringTransformer.service.js
@@ -17,7 +17,7 @@
 
 import _ from 'lodash';
 
-import { Bean } from './Beans';
+import {Bean} from './Beans';
 
 import AbstractTransformer from './AbstractTransformer';
 import StringBuilder from './StringBuilder';
diff --git a/frontend/app/configuration/generator/generator/StringBuilder.js b/modules/frontend/app/configuration/generator/generator/StringBuilder.js
similarity index 100%
rename from frontend/app/configuration/generator/generator/StringBuilder.js
rename to modules/frontend/app/configuration/generator/generator/StringBuilder.js
diff --git a/frontend/app/configuration/generator/generator/defaults/Cache.platform.service.js b/modules/frontend/app/configuration/generator/generator/defaults/Cache.platform.service.js
similarity index 100%
rename from frontend/app/configuration/generator/generator/defaults/Cache.platform.service.js
rename to modules/frontend/app/configuration/generator/generator/defaults/Cache.platform.service.js
diff --git a/frontend/app/configuration/generator/generator/defaults/Cache.service.js b/modules/frontend/app/configuration/generator/generator/defaults/Cache.service.js
similarity index 100%
rename from frontend/app/configuration/generator/generator/defaults/Cache.service.js
rename to modules/frontend/app/configuration/generator/generator/defaults/Cache.service.js
diff --git a/frontend/app/configuration/generator/generator/defaults/Cluster.platform.service.js b/modules/frontend/app/configuration/generator/generator/defaults/Cluster.platform.service.js
similarity index 100%
rename from frontend/app/configuration/generator/generator/defaults/Cluster.platform.service.js
rename to modules/frontend/app/configuration/generator/generator/defaults/Cluster.platform.service.js
diff --git a/frontend/app/configuration/generator/generator/defaults/Cluster.service.js b/modules/frontend/app/configuration/generator/generator/defaults/Cluster.service.js
similarity index 100%
rename from frontend/app/configuration/generator/generator/defaults/Cluster.service.js
rename to modules/frontend/app/configuration/generator/generator/defaults/Cluster.service.js
diff --git a/frontend/app/configuration/generator/generator/defaults/Event-groups.service.js b/modules/frontend/app/configuration/generator/generator/defaults/Event-groups.service.js
similarity index 99%
rename from frontend/app/configuration/generator/generator/defaults/Event-groups.service.js
rename to modules/frontend/app/configuration/generator/generator/defaults/Event-groups.service.js
index 315da1f..e5a11ed 100644
--- a/frontend/app/configuration/generator/generator/defaults/Event-groups.service.js
+++ b/modules/frontend/app/configuration/generator/generator/defaults/Event-groups.service.js
@@ -16,7 +16,6 @@
  */
 
 import _ from 'lodash';
-
 // Events groups.
 import EVENT_GROUPS from 'app/data/event-groups.json';
 
diff --git a/frontend/app/configuration/generator/generator/defaults/IGFS.service.js b/modules/frontend/app/configuration/generator/generator/defaults/IGFS.service.js
similarity index 100%
rename from frontend/app/configuration/generator/generator/defaults/IGFS.service.js
rename to modules/frontend/app/configuration/generator/generator/defaults/IGFS.service.js
diff --git a/frontend/app/configuration/icons/configuration.icon.svg b/modules/frontend/app/configuration/icons/configuration.icon.svg
similarity index 100%
rename from frontend/app/configuration/icons/configuration.icon.svg
rename to modules/frontend/app/configuration/icons/configuration.icon.svg
diff --git a/frontend/app/configuration/index.lazy.ts b/modules/frontend/app/configuration/index.lazy.ts
similarity index 94%
rename from frontend/app/configuration/index.lazy.ts
rename to modules/frontend/app/configuration/index.lazy.ts
index 79324a5..d4d87c9 100644
--- a/frontend/app/configuration/index.lazy.ts
+++ b/modules/frontend/app/configuration/index.lazy.ts
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-import {UIRouter, LazyLoadResult} from '@uirouter/angularjs';
+import {LazyLoadResult, UIRouter} from '@uirouter/angularjs';
 import {default as configurationIcon} from './icons/configuration.icon.svg';
 import {default as IconsService} from '../components/ignite-icon/service';
-import {navigationMenuItem, AppStore} from '../store';
+import {AppStore, navigationMenuItem} from '../store';
 
 export default angular
     .module('ignite-console.configuration-lazy', [])
diff --git a/frontend/app/configuration/index.ts b/modules/frontend/app/configuration/index.ts
similarity index 98%
rename from frontend/app/configuration/index.ts
rename to modules/frontend/app/configuration/index.ts
index c1fac18..abaf013 100644
--- a/frontend/app/configuration/index.ts
+++ b/modules/frontend/app/configuration/index.ts
@@ -19,7 +19,7 @@ import uiValidate from 'angular-ui-validate';
 import {UIRouterRx} from '@uirouter/rx';
 import {UIRouter} from '@uirouter/angularjs';
 
-import {withLatestFrom, tap, filter, scan} from 'rxjs/operators';
+import {filter, scan, tap, withLatestFrom} from 'rxjs/operators';
 
 import generatorModule from './generator/configuration.module';
 
@@ -63,23 +63,23 @@ import uiAceSpring from './components/ui-ace-spring';
 import {registerStates} from './states';
 
 import {
-    editReducer2,
-    shortObjectsReducer,
+    basicCachesActionTypes,
+    cachesActionTypes,
+    clustersActionTypes,
     editReducer,
-    loadingReducer,
+    editReducer2,
+    igfssActionTypes,
     itemsEditReducerFactory,
-    mapStoreReducerFactory,
+    loadingReducer,
     mapCacheReducerFactory,
-    basicCachesActionTypes,
-    clustersActionTypes,
-    shortClustersActionTypes,
-    cachesActionTypes,
-    shortCachesActionTypes,
+    mapStoreReducerFactory,
     modelsActionTypes,
-    shortModelsActionTypes,
-    igfssActionTypes,
+    refsReducer,
+    shortCachesActionTypes,
+    shortClustersActionTypes,
     shortIGFSsActionTypes,
-    refsReducer
+    shortModelsActionTypes,
+    shortObjectsReducer
 } from './store/reducer';
 
 import {errorState} from './transitionHooks/errorState';
diff --git a/frontend/app/configuration/mixins.pug b/modules/frontend/app/configuration/mixins.pug
similarity index 100%
rename from frontend/app/configuration/mixins.pug
rename to modules/frontend/app/configuration/mixins.pug
diff --git a/frontend/app/configuration/services/Caches.ts b/modules/frontend/app/configuration/services/Caches.ts
similarity index 99%
rename from frontend/app/configuration/services/Caches.ts
rename to modules/frontend/app/configuration/services/Caches.ts
index d1ea010..bf78771 100644
--- a/frontend/app/configuration/services/Caches.ts
+++ b/modules/frontend/app/configuration/services/Caches.ts
@@ -18,7 +18,7 @@
 import get from 'lodash/get';
 import ObjectID from 'bson-objectid';
 import omit from 'lodash/fp/omit';
-import {CacheModes, AtomicityModes, ShortCache} from '../types';
+import {AtomicityModes, CacheModes, ShortCache} from '../types';
 import {Menu} from 'app/types';
 
 export default class Caches {
diff --git a/frontend/app/configuration/services/Clusters.spec.js b/modules/frontend/app/configuration/services/Clusters.spec.js
similarity index 100%
rename from frontend/app/configuration/services/Clusters.spec.js
rename to modules/frontend/app/configuration/services/Clusters.spec.js
diff --git a/frontend/app/configuration/services/Clusters.ts b/modules/frontend/app/configuration/services/Clusters.ts
similarity index 99%
rename from frontend/app/configuration/services/Clusters.ts
rename to modules/frontend/app/configuration/services/Clusters.ts
index ba6ddc6..5e79a5e 100644
--- a/frontend/app/configuration/services/Clusters.ts
+++ b/modules/frontend/app/configuration/services/Clusters.ts
@@ -21,7 +21,7 @@ import {from} from 'rxjs';
 import ObjectID from 'bson-objectid/objectid';
 import {uniqueName} from 'app/utils/uniqueName';
 import omit from 'lodash/fp/omit';
-import {DiscoveryKinds, ShortDomainModel, ShortCluster, FailoverSPIs, LoadBalancingKinds} from '../types';
+import {DiscoveryKinds, FailoverSPIs, LoadBalancingKinds, ShortCluster, ShortDomainModel} from '../types';
 import {Menu} from 'app/types';
 
 const uniqueNameValidator = (defaultName = '') => (a, items = []) => {
diff --git a/frontend/app/configuration/services/ConfigChangesGuard.spec.js b/modules/frontend/app/configuration/services/ConfigChangesGuard.spec.js
similarity index 100%
rename from frontend/app/configuration/services/ConfigChangesGuard.spec.js
rename to modules/frontend/app/configuration/services/ConfigChangesGuard.spec.js
diff --git a/frontend/app/configuration/services/ConfigChangesGuard.ts b/modules/frontend/app/configuration/services/ConfigChangesGuard.ts
similarity index 98%
rename from frontend/app/configuration/services/ConfigChangesGuard.ts
rename to modules/frontend/app/configuration/services/ConfigChangesGuard.ts
index 70467f4..87dc6d3 100644
--- a/frontend/app/configuration/services/ConfigChangesGuard.ts
+++ b/modules/frontend/app/configuration/services/ConfigChangesGuard.ts
@@ -16,7 +16,7 @@
  */
 
 import {of} from 'rxjs';
-import {switchMap, catchError} from 'rxjs/operators';
+import {catchError, switchMap} from 'rxjs/operators';
 import {Confirm} from 'app/services/Confirm.service';
 import {DiffPatcher} from 'jsondiffpatch';
 import {html} from 'jsondiffpatch/public/build/jsondiffpatch-formatters.js';
diff --git a/frontend/app/configuration/services/ConfigSelectionManager.ts b/modules/frontend/app/configuration/services/ConfigSelectionManager.ts
similarity index 96%
rename from frontend/app/configuration/services/ConfigSelectionManager.ts
rename to modules/frontend/app/configuration/services/ConfigSelectionManager.ts
index 380542c..e121587 100644
--- a/frontend/app/configuration/services/ConfigSelectionManager.ts
+++ b/modules/frontend/app/configuration/services/ConfigSelectionManager.ts
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-import {Observable, merge} from 'rxjs';
-import {share, distinctUntilChanged, startWith, filter, map, pluck, withLatestFrom, mapTo} from 'rxjs/operators';
+import {merge, Observable} from 'rxjs';
+import {distinctUntilChanged, filter, map, mapTo, pluck, share, startWith, withLatestFrom} from 'rxjs/operators';
 import {RejectType, TransitionService} from '@uirouter/angularjs';
 import isEqual from 'lodash/isEqual';
 
diff --git a/frontend/app/configuration/services/ConfigurationDownload.spec.js b/modules/frontend/app/configuration/services/ConfigurationDownload.spec.js
similarity index 100%
rename from frontend/app/configuration/services/ConfigurationDownload.spec.js
rename to modules/frontend/app/configuration/services/ConfigurationDownload.spec.js
diff --git a/frontend/app/configuration/services/ConfigurationDownload.ts b/modules/frontend/app/configuration/services/ConfigurationDownload.ts
similarity index 100%
rename from frontend/app/configuration/services/ConfigurationDownload.ts
rename to modules/frontend/app/configuration/services/ConfigurationDownload.ts
diff --git a/frontend/app/configuration/services/ConfigurationResource.spec.js b/modules/frontend/app/configuration/services/ConfigurationResource.spec.js
similarity index 97%
rename from frontend/app/configuration/services/ConfigurationResource.spec.js
rename to modules/frontend/app/configuration/services/ConfigurationResource.spec.js
index d52d94a..47fdc91 100644
--- a/frontend/app/configuration/services/ConfigurationResource.spec.js
+++ b/modules/frontend/app/configuration/services/ConfigurationResource.spec.js
@@ -17,8 +17,8 @@
 
 import configurationResource from './ConfigurationResource';
 
-import { suite, test } from 'mocha';
-import { assert } from 'chai';
+import {suite, test} from 'mocha';
+import {assert} from 'chai';
 
 const CHECKED_CONFIGURATION = {
     spaces: [{
diff --git a/frontend/app/configuration/services/ConfigurationResource.ts b/modules/frontend/app/configuration/services/ConfigurationResource.ts
similarity index 100%
rename from frontend/app/configuration/services/ConfigurationResource.ts
rename to modules/frontend/app/configuration/services/ConfigurationResource.ts
diff --git a/frontend/app/configuration/services/ConfigureState.ts b/modules/frontend/app/configuration/services/ConfigureState.ts
similarity index 95%
rename from frontend/app/configuration/services/ConfigureState.ts
rename to modules/frontend/app/configuration/services/ConfigureState.ts
index b2e10f7..8484818 100644
--- a/frontend/app/configuration/services/ConfigureState.ts
+++ b/modules/frontend/app/configuration/services/ConfigureState.ts
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-import {Subject, BehaviorSubject} from 'rxjs';
-import {tap, scan} from 'rxjs/operators';
+import {BehaviorSubject, Subject} from 'rxjs';
+import {scan, tap} from 'rxjs/operators';
 
 export default class ConfigureState {
     actions$: Subject<{type: string}>;
diff --git a/frontend/app/configuration/services/IGFSs.ts b/modules/frontend/app/configuration/services/IGFSs.ts
similarity index 100%
rename from frontend/app/configuration/services/IGFSs.ts
rename to modules/frontend/app/configuration/services/IGFSs.ts
diff --git a/frontend/app/configuration/services/Models.ts b/modules/frontend/app/configuration/services/Models.ts
similarity index 98%
rename from frontend/app/configuration/services/Models.ts
rename to modules/frontend/app/configuration/services/Models.ts
index 1fda485..065bbe5 100644
--- a/frontend/app/configuration/services/Models.ts
+++ b/modules/frontend/app/configuration/services/Models.ts
@@ -17,7 +17,7 @@
 
 import ObjectID from 'bson-objectid';
 import omit from 'lodash/fp/omit';
-import {DomainModel, IndexField, ShortDomainModel, Index, Field, KeyField, ValueField} from '../types';
+import {DomainModel, Field, Index, IndexField, KeyField, ShortDomainModel, ValueField} from '../types';
 
 export default class Models {
     static $inject = ['$http'];
diff --git a/frontend/app/configuration/services/PageConfigure.ts b/modules/frontend/app/configuration/services/PageConfigure.ts
similarity index 95%
rename from frontend/app/configuration/services/PageConfigure.ts
rename to modules/frontend/app/configuration/services/PageConfigure.ts
index b7f04ee..f3f7346 100644
--- a/frontend/app/configuration/services/PageConfigure.ts
+++ b/modules/frontend/app/configuration/services/PageConfigure.ts
@@ -18,11 +18,9 @@
 import cloneDeep from 'lodash/cloneDeep';
 
 import {merge, timer} from 'rxjs';
-import {take, tap, ignoreElements, filter, map, pluck} from 'rxjs/operators';
+import {filter, ignoreElements, map, pluck, take, tap} from 'rxjs/operators';
 
-import {
-    ofType
-} from '../store/effects';
+import {ofType} from '../store/effects';
 
 import {default as ConfigureState} from './ConfigureState';
 import {default as ConfigSelectors} from '../store/selectors';
diff --git a/frontend/app/configuration/services/SummaryZipper.ts b/modules/frontend/app/configuration/services/SummaryZipper.ts
similarity index 100%
rename from frontend/app/configuration/services/SummaryZipper.ts
rename to modules/frontend/app/configuration/services/SummaryZipper.ts
diff --git a/frontend/app/configuration/services/summary.worker.js b/modules/frontend/app/configuration/services/summary.worker.js
similarity index 100%
rename from frontend/app/configuration/services/summary.worker.js
rename to modules/frontend/app/configuration/services/summary.worker.js
diff --git a/frontend/app/configuration/states.ts b/modules/frontend/app/configuration/states.ts
similarity index 94%
rename from frontend/app/configuration/states.ts
rename to modules/frontend/app/configuration/states.ts
index 33e4dab..dad16b3 100644
--- a/frontend/app/configuration/states.ts
+++ b/modules/frontend/app/configuration/states.ts
@@ -17,13 +17,17 @@
 
 import {StateParams} from '@uirouter/angularjs';
 
-import pageConfigureAdvancedClusterComponent from './components/page-configure-advanced/components/page-configure-advanced-cluster/component';
-import pageConfigureAdvancedModelsComponent from './components/page-configure-advanced/components/page-configure-advanced-models/component';
-import pageConfigureAdvancedCachesComponent from './components/page-configure-advanced/components/page-configure-advanced-caches/component';
-import pageConfigureAdvancedIGFSComponent from './components/page-configure-advanced/components/page-configure-advanced-igfs/component';
+import pageConfigureAdvancedClusterComponent
+    from './components/page-configure-advanced/components/page-configure-advanced-cluster/component';
+import pageConfigureAdvancedModelsComponent
+    from './components/page-configure-advanced/components/page-configure-advanced-models/component';
+import pageConfigureAdvancedCachesComponent
+    from './components/page-configure-advanced/components/page-configure-advanced-caches/component';
+import pageConfigureAdvancedIGFSComponent
+    from './components/page-configure-advanced/components/page-configure-advanced-igfs/component';
 
-import {from, combineLatest} from 'rxjs';
-import {switchMap, take, map} from 'rxjs/operators';
+import {combineLatest, from} from 'rxjs';
+import {map, switchMap, take} from 'rxjs/operators';
 
 export type ClusterParams = ({clusterID: string} | {clusterID: 'new'}) & StateParams;
 
diff --git a/frontend/app/configuration/store/actionCreators.js b/modules/frontend/app/configuration/store/actionCreators.js
similarity index 98%
rename from frontend/app/configuration/store/actionCreators.js
rename to modules/frontend/app/configuration/store/actionCreators.js
index d6b1749..50b8e17 100644
--- a/frontend/app/configuration/store/actionCreators.js
+++ b/modules/frontend/app/configuration/store/actionCreators.js
@@ -16,20 +16,20 @@
  */
 
 import {
-    REMOVE_CLUSTER_ITEMS,
-    REMOVE_CLUSTER_ITEMS_CONFIRMED,
-    ADVANCED_SAVE_COMPLETE_CONFIGURATION,
-    CONFIRM_CLUSTERS_REMOVAL,
-    CONFIRM_CLUSTERS_REMOVAL_OK,
-    COMPLETE_CONFIGURATION,
-    ADVANCED_SAVE_CLUSTER,
     ADVANCED_SAVE_CACHE,
+    ADVANCED_SAVE_CLUSTER,
+    ADVANCED_SAVE_COMPLETE_CONFIGURATION,
     ADVANCED_SAVE_IGFS,
     ADVANCED_SAVE_MODEL,
     BASIC_SAVE,
     BASIC_SAVE_AND_DOWNLOAD,
+    BASIC_SAVE_ERR,
     BASIC_SAVE_OK,
-    BASIC_SAVE_ERR
+    COMPLETE_CONFIGURATION,
+    CONFIRM_CLUSTERS_REMOVAL,
+    CONFIRM_CLUSTERS_REMOVAL_OK,
+    REMOVE_CLUSTER_ITEMS,
+    REMOVE_CLUSTER_ITEMS_CONFIRMED
 } from './actionTypes';
 
 /**
diff --git a/frontend/app/configuration/store/actionTypes.js b/modules/frontend/app/configuration/store/actionTypes.js
similarity index 100%
rename from frontend/app/configuration/store/actionTypes.js
rename to modules/frontend/app/configuration/store/actionTypes.js
diff --git a/frontend/app/configuration/store/effects.js b/modules/frontend/app/configuration/store/effects.js
similarity index 99%
rename from frontend/app/configuration/store/effects.js
rename to modules/frontend/app/configuration/store/effects.js
index ed90b43..4d65035 100644
--- a/frontend/app/configuration/store/effects.js
+++ b/modules/frontend/app/configuration/store/effects.js
@@ -15,8 +15,21 @@
  * limitations under the License.
  */
 
-import {merge, empty, of, from} from 'rxjs';
-import {mapTo, filter, tap, ignoreElements, exhaustMap, switchMap, map, pluck, withLatestFrom, take, catchError, zip} from 'rxjs/operators';
+import {empty, from, merge, of} from 'rxjs';
+import {
+    catchError,
+    exhaustMap,
+    filter,
+    ignoreElements,
+    map,
+    mapTo,
+    pluck,
+    switchMap,
+    take,
+    tap,
+    withLatestFrom,
+    zip
+} from 'rxjs/operators';
 import uniq from 'lodash/uniq';
 import {uniqueName} from 'app/utils/uniqueName';
 import {defaultNames} from '../defaultNames';
diff --git a/frontend/app/configuration/store/effects.spec.js b/modules/frontend/app/configuration/store/effects.spec.js
similarity index 100%
rename from frontend/app/configuration/store/effects.spec.js
rename to modules/frontend/app/configuration/store/effects.spec.js
diff --git a/frontend/app/configuration/store/reducer.js b/modules/frontend/app/configuration/store/reducer.js
similarity index 99%
rename from frontend/app/configuration/store/reducer.js
rename to modules/frontend/app/configuration/store/reducer.js
index 2b7dd8b..10374a9 100644
--- a/frontend/app/configuration/store/reducer.js
+++ b/modules/frontend/app/configuration/store/reducer.js
@@ -17,6 +17,7 @@
 
 import difference from 'lodash/difference';
 import capitalize from 'lodash/capitalize';
+import {REMOVE_CLUSTER_ITEMS_CONFIRMED} from './actionTypes';
 
 export const LOAD_LIST = Symbol('LOAD_LIST');
 export const ADD_CLUSTER = Symbol('ADD_CLUSTER');
@@ -29,10 +30,6 @@ export const UPDATE_CACHE = Symbol('UPDATE_CACHE');
 export const UPSERT_CACHES = Symbol('UPSERT_CACHES');
 export const REMOVE_CACHE = Symbol('REMOVE_CACHE');
 
-import {
-    REMOVE_CLUSTER_ITEMS_CONFIRMED
-} from './actionTypes';
-
 const defaults = {clusters: new Map(), caches: new Map(), spaces: new Map()};
 
 const mapByID = (items) => {
diff --git a/frontend/app/configuration/store/reducer.spec.js b/modules/frontend/app/configuration/store/reducer.spec.js
similarity index 99%
rename from frontend/app/configuration/store/reducer.spec.js
rename to modules/frontend/app/configuration/store/reducer.spec.js
index 19bf663..e969da9 100644
--- a/frontend/app/configuration/store/reducer.spec.js
+++ b/modules/frontend/app/configuration/store/reducer.spec.js
@@ -19,15 +19,15 @@ import {suite, test} from 'mocha';
 import {assert} from 'chai';
 
 import {
+    ADD_CACHE,
     ADD_CLUSTER,
+    reducer,
+    REMOVE_CACHE,
     REMOVE_CLUSTERS,
-    UPDATE_CLUSTER,
-    UPSERT_CLUSTERS,
-    ADD_CACHE,
     UPDATE_CACHE,
+    UPDATE_CLUSTER,
     UPSERT_CACHES,
-    REMOVE_CACHE,
-    reducer
+    UPSERT_CLUSTERS
 } from './reducer';
 
 suite('page-configure component reducer', () => {
diff --git a/frontend/app/configuration/store/selectors.ts b/modules/frontend/app/configuration/store/selectors.ts
similarity index 97%
rename from frontend/app/configuration/store/selectors.ts
rename to modules/frontend/app/configuration/store/selectors.ts
index 58b4409..53bd0f8 100644
--- a/frontend/app/configuration/store/selectors.ts
+++ b/modules/frontend/app/configuration/store/selectors.ts
@@ -16,10 +16,9 @@
  */
 
 import {uniqueName} from 'app/utils/uniqueName';
-import {of, empty, combineLatest, forkJoin, pipe} from 'rxjs';
-import {filter, pluck, map, switchMap, take, distinctUntilChanged, exhaustMap} from 'rxjs/operators';
+import {combineLatest, empty, forkJoin, of, pipe} from 'rxjs';
+import {distinctUntilChanged, exhaustMap, filter, map, pluck, switchMap, take} from 'rxjs/operators';
 import {defaultNames} from '../defaultNames';
-import {DomainModel, ShortCluster} from '../types';
 
 import {default as Caches} from '../services/Caches';
 import {default as Clusters} from '../services/Clusters';
diff --git a/frontend/app/configuration/transitionHooks/errorState.ts b/modules/frontend/app/configuration/transitionHooks/errorState.ts
similarity index 97%
rename from frontend/app/configuration/transitionHooks/errorState.ts
rename to modules/frontend/app/configuration/transitionHooks/errorState.ts
index c2e9c8e..2de2d29 100644
--- a/frontend/app/configuration/transitionHooks/errorState.ts
+++ b/modules/frontend/app/configuration/transitionHooks/errorState.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import {RejectType, UIRouter, Transition, HookMatchCriteria} from '@uirouter/angularjs';
+import {HookMatchCriteria, RejectType, Transition, UIRouter} from '@uirouter/angularjs';
 
 const isPromise = (object): object is Promise<any> => object && typeof object.then === 'function';
 const match: HookMatchCriteria = {
diff --git a/frontend/app/configuration/types/index.ts b/modules/frontend/app/configuration/types/index.ts
similarity index 100%
rename from frontend/app/configuration/types/index.ts
rename to modules/frontend/app/configuration/types/index.ts
diff --git a/frontend/app/core/activities/Activities.data.ts b/modules/frontend/app/core/activities/Activities.data.ts
similarity index 100%
rename from frontend/app/core/activities/Activities.data.ts
rename to modules/frontend/app/core/activities/Activities.data.ts
diff --git a/frontend/app/core/admin/Admin.data.js b/modules/frontend/app/core/admin/Admin.data.js
similarity index 100%
rename from frontend/app/core/admin/Admin.data.js
rename to modules/frontend/app/core/admin/Admin.data.js
diff --git a/frontend/app/core/index.js b/modules/frontend/app/core/index.js
similarity index 100%
rename from frontend/app/core/index.js
rename to modules/frontend/app/core/index.js
diff --git a/frontend/app/core/utils/maskNull.js b/modules/frontend/app/core/utils/maskNull.js
similarity index 100%
rename from frontend/app/core/utils/maskNull.js
rename to modules/frontend/app/core/utils/maskNull.js
diff --git a/frontend/app/data/colors.json b/modules/frontend/app/data/colors.json
similarity index 100%
rename from frontend/app/data/colors.json
rename to modules/frontend/app/data/colors.json
diff --git a/frontend/app/data/countries.json b/modules/frontend/app/data/countries.json
similarity index 100%
rename from frontend/app/data/countries.json
rename to modules/frontend/app/data/countries.json
diff --git a/frontend/app/data/demo-info.json b/modules/frontend/app/data/demo-info.json
similarity index 100%
rename from frontend/app/data/demo-info.json
rename to modules/frontend/app/data/demo-info.json
diff --git a/frontend/app/data/dialects.json b/modules/frontend/app/data/dialects.json
similarity index 100%
rename from frontend/app/data/dialects.json
rename to modules/frontend/app/data/dialects.json
diff --git a/frontend/app/data/event-groups.json b/modules/frontend/app/data/event-groups.json
similarity index 100%
rename from frontend/app/data/event-groups.json
rename to modules/frontend/app/data/event-groups.json
diff --git a/frontend/app/data/getting-started.json b/modules/frontend/app/data/getting-started.json
similarity index 100%
rename from frontend/app/data/getting-started.json
rename to modules/frontend/app/data/getting-started.json
diff --git a/frontend/app/data/i18n.js b/modules/frontend/app/data/i18n.js
similarity index 100%
rename from frontend/app/data/i18n.js
rename to modules/frontend/app/data/i18n.js
diff --git a/frontend/app/data/java-classes.json b/modules/frontend/app/data/java-classes.json
similarity index 100%
rename from frontend/app/data/java-classes.json
rename to modules/frontend/app/data/java-classes.json
diff --git a/frontend/app/data/java-keywords.json b/modules/frontend/app/data/java-keywords.json
similarity index 100%
rename from frontend/app/data/java-keywords.json
rename to modules/frontend/app/data/java-keywords.json
diff --git a/frontend/app/data/java-primitives.json b/modules/frontend/app/data/java-primitives.json
similarity index 100%
rename from frontend/app/data/java-primitives.json
rename to modules/frontend/app/data/java-primitives.json
diff --git a/frontend/app/data/jdbc-types.json b/modules/frontend/app/data/jdbc-types.json
similarity index 100%
rename from frontend/app/data/jdbc-types.json
rename to modules/frontend/app/data/jdbc-types.json
diff --git a/frontend/app/data/pom-dependencies.json b/modules/frontend/app/data/pom-dependencies.json
similarity index 100%
rename from frontend/app/data/pom-dependencies.json
rename to modules/frontend/app/data/pom-dependencies.json
diff --git a/frontend/app/data/sql-keywords.json b/modules/frontend/app/data/sql-keywords.json
similarity index 100%
rename from frontend/app/data/sql-keywords.json
rename to modules/frontend/app/data/sql-keywords.json
diff --git a/frontend/app/directives/auto-focus.directive.js b/modules/frontend/app/directives/auto-focus.directive.js
similarity index 100%
rename from frontend/app/directives/auto-focus.directive.js
rename to modules/frontend/app/directives/auto-focus.directive.js
diff --git a/frontend/app/directives/btn-ignite-link.js b/modules/frontend/app/directives/btn-ignite-link.js
similarity index 100%
rename from frontend/app/directives/btn-ignite-link.js
rename to modules/frontend/app/directives/btn-ignite-link.js
diff --git a/frontend/app/directives/copy-to-clipboard.directive.js b/modules/frontend/app/directives/copy-to-clipboard.directive.js
similarity index 100%
rename from frontend/app/directives/copy-to-clipboard.directive.js
rename to modules/frontend/app/directives/copy-to-clipboard.directive.js
diff --git a/frontend/app/directives/hide-on-state-change/hide-on-state-change.directive.js b/modules/frontend/app/directives/hide-on-state-change/hide-on-state-change.directive.js
similarity index 100%
rename from frontend/app/directives/hide-on-state-change/hide-on-state-change.directive.js
rename to modules/frontend/app/directives/hide-on-state-change/hide-on-state-change.directive.js
diff --git a/frontend/app/directives/match.directive.js b/modules/frontend/app/directives/match.directive.js
similarity index 100%
rename from frontend/app/directives/match.directive.js
rename to modules/frontend/app/directives/match.directive.js
diff --git a/frontend/app/directives/match.directive.spec.js b/modules/frontend/app/directives/match.directive.spec.js
similarity index 100%
rename from frontend/app/directives/match.directive.spec.js
rename to modules/frontend/app/directives/match.directive.spec.js
diff --git a/frontend/app/directives/on-click-focus.directive.js b/modules/frontend/app/directives/on-click-focus.directive.js
similarity index 100%
rename from frontend/app/directives/on-click-focus.directive.js
rename to modules/frontend/app/directives/on-click-focus.directive.js
diff --git a/frontend/app/directives/on-enter-focus-move.directive.js b/modules/frontend/app/directives/on-enter-focus-move.directive.js
similarity index 100%
rename from frontend/app/directives/on-enter-focus-move.directive.js
rename to modules/frontend/app/directives/on-enter-focus-move.directive.js
diff --git a/frontend/app/directives/on-enter.directive.js b/modules/frontend/app/directives/on-enter.directive.js
similarity index 100%
rename from frontend/app/directives/on-enter.directive.js
rename to modules/frontend/app/directives/on-enter.directive.js
diff --git a/frontend/app/directives/on-escape.directive.js b/modules/frontend/app/directives/on-escape.directive.js
similarity index 100%
rename from frontend/app/directives/on-escape.directive.js
rename to modules/frontend/app/directives/on-escape.directive.js
diff --git a/frontend/app/directives/on-focus-out.directive.js b/modules/frontend/app/directives/on-focus-out.directive.js
similarity index 100%
rename from frontend/app/directives/on-focus-out.directive.js
rename to modules/frontend/app/directives/on-focus-out.directive.js
diff --git a/frontend/app/directives/retain-selection.directive.js b/modules/frontend/app/directives/retain-selection.directive.js
similarity index 100%
rename from frontend/app/directives/retain-selection.directive.js
rename to modules/frontend/app/directives/retain-selection.directive.js
diff --git a/frontend/app/errors/CancellationError.js b/modules/frontend/app/errors/CancellationError.js
similarity index 100%
rename from frontend/app/errors/CancellationError.js
rename to modules/frontend/app/errors/CancellationError.js
diff --git a/frontend/app/filters/byName.filter.js b/modules/frontend/app/filters/byName.filter.js
similarity index 100%
rename from frontend/app/filters/byName.filter.js
rename to modules/frontend/app/filters/byName.filter.js
diff --git a/frontend/app/filters/bytes.filter.js b/modules/frontend/app/filters/bytes.filter.js
similarity index 100%
rename from frontend/app/filters/bytes.filter.js
rename to modules/frontend/app/filters/bytes.filter.js
diff --git a/frontend/app/filters/bytes.filter.spec.js b/modules/frontend/app/filters/bytes.filter.spec.js
similarity index 95%
rename from frontend/app/filters/bytes.filter.spec.js
rename to modules/frontend/app/filters/bytes.filter.spec.js
index 884e43e..fd92db3 100644
--- a/frontend/app/filters/bytes.filter.spec.js
+++ b/modules/frontend/app/filters/bytes.filter.spec.js
@@ -17,8 +17,8 @@
 
 import bytesFilter from './bytes.filter';
 
-import { suite, test } from 'mocha';
-import { assert } from 'chai';
+import {suite, test} from 'mocha';
+import {assert} from 'chai';
 
 const bytesFilterInstance = bytesFilter();
 
diff --git a/frontend/app/filters/default-name.filter.js b/modules/frontend/app/filters/default-name.filter.js
similarity index 100%
rename from frontend/app/filters/default-name.filter.js
rename to modules/frontend/app/filters/default-name.filter.js
diff --git a/frontend/app/filters/domainsValidation.filter.js b/modules/frontend/app/filters/domainsValidation.filter.js
similarity index 100%
rename from frontend/app/filters/domainsValidation.filter.js
rename to modules/frontend/app/filters/domainsValidation.filter.js
diff --git a/frontend/app/filters/duration.filter.js b/modules/frontend/app/filters/duration.filter.js
similarity index 100%
rename from frontend/app/filters/duration.filter.js
rename to modules/frontend/app/filters/duration.filter.js
diff --git a/frontend/app/filters/hasPojo.filter.js b/modules/frontend/app/filters/hasPojo.filter.js
similarity index 100%
rename from frontend/app/filters/hasPojo.filter.js
rename to modules/frontend/app/filters/hasPojo.filter.js
diff --git a/frontend/app/filters/id8.filter.js b/modules/frontend/app/filters/id8.filter.js
similarity index 100%
rename from frontend/app/filters/id8.filter.js
rename to modules/frontend/app/filters/id8.filter.js
diff --git a/frontend/app/filters/uiGridSubcategories.filter.js b/modules/frontend/app/filters/uiGridSubcategories.filter.js
similarity index 100%
rename from frontend/app/filters/uiGridSubcategories.filter.js
rename to modules/frontend/app/filters/uiGridSubcategories.filter.js
diff --git a/frontend/app/helpers/jade/mixins.pug b/modules/frontend/app/helpers/jade/mixins.pug
similarity index 100%
rename from frontend/app/helpers/jade/mixins.pug
rename to modules/frontend/app/helpers/jade/mixins.pug
diff --git a/frontend/app/modules/ace.module.js b/modules/frontend/app/modules/ace.module.js
similarity index 100%
rename from frontend/app/modules/ace.module.js
rename to modules/frontend/app/modules/ace.module.js
diff --git a/frontend/app/modules/agent/AgentManager.service.js b/modules/frontend/app/modules/agent/AgentManager.service.js
similarity index 99%
rename from frontend/app/modules/agent/AgentManager.service.js
rename to modules/frontend/app/modules/agent/AgentManager.service.js
index 04a7dbc..878d17d 100644
--- a/frontend/app/modules/agent/AgentManager.service.js
+++ b/modules/frontend/app/modules/agent/AgentManager.service.js
@@ -19,7 +19,7 @@ import _ from 'lodash';
 import {nonEmpty, nonNil} from 'app/utils/lodashMixins';
 
 import {BehaviorSubject} from 'rxjs';
-import {first, pluck, tap, distinctUntilChanged, map, filter} from 'rxjs/operators';
+import {distinctUntilChanged, filter, first, map, pluck, tap} from 'rxjs/operators';
 
 import io from 'socket.io-client';
 
diff --git a/frontend/app/modules/agent/AgentModal.service.js b/modules/frontend/app/modules/agent/AgentModal.service.js
similarity index 100%
rename from frontend/app/modules/agent/AgentModal.service.js
rename to modules/frontend/app/modules/agent/AgentModal.service.js
diff --git a/frontend/app/modules/agent/agent.module.js b/modules/frontend/app/modules/agent/agent.module.js
similarity index 100%
rename from frontend/app/modules/agent/agent.module.js
rename to modules/frontend/app/modules/agent/agent.module.js
diff --git a/frontend/app/modules/agent/components/cluster-login/component.js b/modules/frontend/app/modules/agent/components/cluster-login/component.js
similarity index 100%
rename from frontend/app/modules/agent/components/cluster-login/component.js
rename to modules/frontend/app/modules/agent/components/cluster-login/component.js
diff --git a/frontend/app/modules/agent/components/cluster-login/index.js b/modules/frontend/app/modules/agent/components/cluster-login/index.js
similarity index 100%
rename from frontend/app/modules/agent/components/cluster-login/index.js
rename to modules/frontend/app/modules/agent/components/cluster-login/index.js
diff --git a/frontend/app/modules/agent/components/cluster-login/service.js b/modules/frontend/app/modules/agent/components/cluster-login/service.js
similarity index 100%
rename from frontend/app/modules/agent/components/cluster-login/service.js
rename to modules/frontend/app/modules/agent/components/cluster-login/service.js
diff --git a/frontend/app/modules/agent/components/cluster-login/template.pug b/modules/frontend/app/modules/agent/components/cluster-login/template.pug
similarity index 100%
rename from frontend/app/modules/agent/components/cluster-login/template.pug
rename to modules/frontend/app/modules/agent/components/cluster-login/template.pug
diff --git a/frontend/app/modules/agent/decompress.worker.js b/modules/frontend/app/modules/agent/decompress.worker.js
similarity index 100%
rename from frontend/app/modules/agent/decompress.worker.js
rename to modules/frontend/app/modules/agent/decompress.worker.js
diff --git a/frontend/app/modules/agent/types/Cluster.js b/modules/frontend/app/modules/agent/types/Cluster.js
similarity index 100%
rename from frontend/app/modules/agent/types/Cluster.js
rename to modules/frontend/app/modules/agent/types/Cluster.js
diff --git a/frontend/app/modules/agent/types/ClusterSecrets.js b/modules/frontend/app/modules/agent/types/ClusterSecrets.js
similarity index 100%
rename from frontend/app/modules/agent/types/ClusterSecrets.js
rename to modules/frontend/app/modules/agent/types/ClusterSecrets.js
diff --git a/frontend/app/modules/agent/types/ClusterSecretsManager.js b/modules/frontend/app/modules/agent/types/ClusterSecretsManager.js
similarity index 100%
rename from frontend/app/modules/agent/types/ClusterSecretsManager.js
rename to modules/frontend/app/modules/agent/types/ClusterSecretsManager.js
diff --git a/frontend/app/modules/branding/branding.module.js b/modules/frontend/app/modules/branding/branding.module.js
similarity index 100%
rename from frontend/app/modules/branding/branding.module.js
rename to modules/frontend/app/modules/branding/branding.module.js
diff --git a/frontend/app/modules/branding/branding.service.js b/modules/frontend/app/modules/branding/branding.service.js
similarity index 100%
rename from frontend/app/modules/branding/branding.service.js
rename to modules/frontend/app/modules/branding/branding.service.js
diff --git a/frontend/app/modules/branding/features.directive.js b/modules/frontend/app/modules/branding/features.directive.js
similarity index 100%
rename from frontend/app/modules/branding/features.directive.js
rename to modules/frontend/app/modules/branding/features.directive.js
diff --git a/frontend/app/modules/branding/terms.directive.js b/modules/frontend/app/modules/branding/terms.directive.js
similarity index 100%
rename from frontend/app/modules/branding/terms.directive.js
rename to modules/frontend/app/modules/branding/terms.directive.js
diff --git a/frontend/app/modules/cluster/Cache.js b/modules/frontend/app/modules/cluster/Cache.js
similarity index 100%
rename from frontend/app/modules/cluster/Cache.js
rename to modules/frontend/app/modules/cluster/Cache.js
diff --git a/frontend/app/modules/cluster/CacheMetrics.js b/modules/frontend/app/modules/cluster/CacheMetrics.js
similarity index 100%
rename from frontend/app/modules/cluster/CacheMetrics.js
rename to modules/frontend/app/modules/cluster/CacheMetrics.js
diff --git a/frontend/app/modules/cluster/NodeMetrics.js b/modules/frontend/app/modules/cluster/NodeMetrics.js
similarity index 100%
rename from frontend/app/modules/cluster/NodeMetrics.js
rename to modules/frontend/app/modules/cluster/NodeMetrics.js
diff --git a/frontend/app/modules/demo/Demo.module.js b/modules/frontend/app/modules/demo/Demo.module.js
similarity index 100%
rename from frontend/app/modules/demo/Demo.module.js
rename to modules/frontend/app/modules/demo/Demo.module.js
diff --git a/frontend/app/modules/dialog/dialog-content.directive.js b/modules/frontend/app/modules/dialog/dialog-content.directive.js
similarity index 100%
rename from frontend/app/modules/dialog/dialog-content.directive.js
rename to modules/frontend/app/modules/dialog/dialog-content.directive.js
diff --git a/frontend/app/modules/dialog/dialog-title.directive.js b/modules/frontend/app/modules/dialog/dialog-title.directive.js
similarity index 100%
rename from frontend/app/modules/dialog/dialog-title.directive.js
rename to modules/frontend/app/modules/dialog/dialog-title.directive.js
diff --git a/frontend/app/modules/dialog/dialog.controller.js b/modules/frontend/app/modules/dialog/dialog.controller.js
similarity index 100%
rename from frontend/app/modules/dialog/dialog.controller.js
rename to modules/frontend/app/modules/dialog/dialog.controller.js
diff --git a/frontend/app/modules/dialog/dialog.directive.js b/modules/frontend/app/modules/dialog/dialog.directive.js
similarity index 100%
rename from frontend/app/modules/dialog/dialog.directive.js
rename to modules/frontend/app/modules/dialog/dialog.directive.js
diff --git a/frontend/app/modules/dialog/dialog.factory.js b/modules/frontend/app/modules/dialog/dialog.factory.js
similarity index 100%
rename from frontend/app/modules/dialog/dialog.factory.js
rename to modules/frontend/app/modules/dialog/dialog.factory.js
diff --git a/frontend/app/modules/dialog/dialog.module.js b/modules/frontend/app/modules/dialog/dialog.module.js
similarity index 100%
rename from frontend/app/modules/dialog/dialog.module.js
rename to modules/frontend/app/modules/dialog/dialog.module.js
diff --git a/frontend/app/modules/dialog/dialog.tpl.pug b/modules/frontend/app/modules/dialog/dialog.tpl.pug
similarity index 100%
rename from frontend/app/modules/dialog/dialog.tpl.pug
rename to modules/frontend/app/modules/dialog/dialog.tpl.pug
diff --git a/frontend/app/modules/form/field/bs-select-placeholder.directive.js b/modules/frontend/app/modules/form/field/bs-select-placeholder.directive.js
similarity index 100%
rename from frontend/app/modules/form/field/bs-select-placeholder.directive.js
rename to modules/frontend/app/modules/form/field/bs-select-placeholder.directive.js
diff --git a/frontend/app/modules/form/field/input/autofocus.directive.js b/modules/frontend/app/modules/form/field/input/autofocus.directive.js
similarity index 100%
rename from frontend/app/modules/form/field/input/autofocus.directive.js
rename to modules/frontend/app/modules/form/field/input/autofocus.directive.js
diff --git a/frontend/app/modules/form/form.module.js b/modules/frontend/app/modules/form/form.module.js
similarity index 99%
rename from frontend/app/modules/form/form.module.js
rename to modules/frontend/app/modules/form/form.module.js
index 29afa59..b17ee87 100644
--- a/frontend/app/modules/form/form.module.js
+++ b/modules/frontend/app/modules/form/form.module.js
@@ -16,10 +16,8 @@
  */
 
 import angular from 'angular';
-
 // Field.
 import placeholder from './field/bs-select-placeholder.directive';
-
 // Validators.
 import ipaddress from './validator/ipaddress.directive';
 import javaKeywords from './validator/java-keywords.directive';
@@ -31,7 +29,6 @@ import propertyValueSpecified from './validator/property-value-specified.directi
 import propertyUnique from './validator/property-unique.directive';
 import unique from './validator/unique.directive';
 import uuid from './validator/uuid.directive';
-
 // Helpers.
 import igniteFormFieldInputAutofocus from './field/input/autofocus.directive';
 import IgniteFormGUID from './services/FormGUID.service.js';
diff --git a/frontend/app/modules/form/services/FormGUID.service.js b/modules/frontend/app/modules/form/services/FormGUID.service.js
similarity index 100%
rename from frontend/app/modules/form/services/FormGUID.service.js
rename to modules/frontend/app/modules/form/services/FormGUID.service.js
diff --git a/frontend/app/modules/form/validator/ipaddress.directive.js b/modules/frontend/app/modules/form/validator/ipaddress.directive.js
similarity index 100%
rename from frontend/app/modules/form/validator/ipaddress.directive.js
rename to modules/frontend/app/modules/form/validator/ipaddress.directive.js
diff --git a/frontend/app/modules/form/validator/java-built-in-class.directive.js b/modules/frontend/app/modules/form/validator/java-built-in-class.directive.js
similarity index 100%
rename from frontend/app/modules/form/validator/java-built-in-class.directive.js
rename to modules/frontend/app/modules/form/validator/java-built-in-class.directive.js
diff --git a/frontend/app/modules/form/validator/java-identifier.directive.js b/modules/frontend/app/modules/form/validator/java-identifier.directive.js
similarity index 100%
rename from frontend/app/modules/form/validator/java-identifier.directive.js
rename to modules/frontend/app/modules/form/validator/java-identifier.directive.js
diff --git a/frontend/app/modules/form/validator/java-keywords.directive.js b/modules/frontend/app/modules/form/validator/java-keywords.directive.js
similarity index 100%
rename from frontend/app/modules/form/validator/java-keywords.directive.js
rename to modules/frontend/app/modules/form/validator/java-keywords.directive.js
diff --git a/frontend/app/modules/form/validator/java-package-name.directive.js b/modules/frontend/app/modules/form/validator/java-package-name.directive.js
similarity index 100%
rename from frontend/app/modules/form/validator/java-package-name.directive.js
rename to modules/frontend/app/modules/form/validator/java-package-name.directive.js
diff --git a/frontend/app/modules/form/validator/java-package-specified.directive.js b/modules/frontend/app/modules/form/validator/java-package-specified.directive.js
similarity index 100%
rename from frontend/app/modules/form/validator/java-package-specified.directive.js
rename to modules/frontend/app/modules/form/validator/java-package-specified.directive.js
diff --git a/frontend/app/modules/form/validator/property-unique.directive.js b/modules/frontend/app/modules/form/validator/property-unique.directive.js
similarity index 100%
rename from frontend/app/modules/form/validator/property-unique.directive.js
rename to modules/frontend/app/modules/form/validator/property-unique.directive.js
diff --git a/frontend/app/modules/form/validator/property-value-specified.directive.js b/modules/frontend/app/modules/form/validator/property-value-specified.directive.js
similarity index 100%
rename from frontend/app/modules/form/validator/property-value-specified.directive.js
rename to modules/frontend/app/modules/form/validator/property-value-specified.directive.js
diff --git a/frontend/app/modules/form/validator/unique.directive.js b/modules/frontend/app/modules/form/validator/unique.directive.js
similarity index 100%
rename from frontend/app/modules/form/validator/unique.directive.js
rename to modules/frontend/app/modules/form/validator/unique.directive.js
diff --git a/frontend/app/modules/form/validator/uuid.directive.js b/modules/frontend/app/modules/form/validator/uuid.directive.js
similarity index 100%
rename from frontend/app/modules/form/validator/uuid.directive.js
rename to modules/frontend/app/modules/form/validator/uuid.directive.js
diff --git a/frontend/app/modules/getting-started/GettingStarted.provider.js b/modules/frontend/app/modules/getting-started/GettingStarted.provider.js
similarity index 99%
rename from frontend/app/modules/getting-started/GettingStarted.provider.js
rename to modules/frontend/app/modules/getting-started/GettingStarted.provider.js
index 14dd26a..b8142aa 100644
--- a/frontend/app/modules/getting-started/GettingStarted.provider.js
+++ b/modules/frontend/app/modules/getting-started/GettingStarted.provider.js
@@ -16,6 +16,8 @@
  */
 
 import angular from 'angular';
+import PAGES from 'app/data/getting-started.json';
+import templateUrl from 'views/templates/getting-started.tpl.pug';
 
 /**
  * @typedef GettingStartedItem
@@ -27,9 +29,6 @@ import angular from 'angular';
  * @typedef {Array<GettingStartedItem>} GettingStartedItems
  */
 
-import PAGES from 'app/data/getting-started.json';
-import templateUrl from 'views/templates/getting-started.tpl.pug';
-
 export function provider() {
     /**
      * Getting started pages.
diff --git a/frontend/app/modules/loading/loading.directive.js b/modules/frontend/app/modules/loading/loading.directive.js
similarity index 100%
rename from frontend/app/modules/loading/loading.directive.js
rename to modules/frontend/app/modules/loading/loading.directive.js
diff --git a/frontend/app/modules/loading/loading.module.js b/modules/frontend/app/modules/loading/loading.module.js
similarity index 100%
rename from frontend/app/modules/loading/loading.module.js
rename to modules/frontend/app/modules/loading/loading.module.js
diff --git a/frontend/app/modules/loading/loading.pug b/modules/frontend/app/modules/loading/loading.pug
similarity index 100%
rename from frontend/app/modules/loading/loading.pug
rename to modules/frontend/app/modules/loading/loading.pug
diff --git a/frontend/app/modules/loading/loading.scss b/modules/frontend/app/modules/loading/loading.scss
similarity index 100%
rename from frontend/app/modules/loading/loading.scss
rename to modules/frontend/app/modules/loading/loading.scss
diff --git a/frontend/app/modules/loading/loading.service.js b/modules/frontend/app/modules/loading/loading.service.js
similarity index 100%
rename from frontend/app/modules/loading/loading.service.js
rename to modules/frontend/app/modules/loading/loading.service.js
diff --git a/frontend/app/modules/navbar/Userbar.provider.js b/modules/frontend/app/modules/navbar/Userbar.provider.js
similarity index 100%
rename from frontend/app/modules/navbar/Userbar.provider.js
rename to modules/frontend/app/modules/navbar/Userbar.provider.js
diff --git a/frontend/app/modules/navbar/navbar.module.js b/modules/frontend/app/modules/navbar/navbar.module.js
similarity index 100%
rename from frontend/app/modules/navbar/navbar.module.js
rename to modules/frontend/app/modules/navbar/navbar.module.js
diff --git a/frontend/app/modules/nodes/Nodes.service.js b/modules/frontend/app/modules/nodes/Nodes.service.js
similarity index 100%
rename from frontend/app/modules/nodes/Nodes.service.js
rename to modules/frontend/app/modules/nodes/Nodes.service.js
diff --git a/frontend/app/modules/nodes/nodes-dialog.controller.js b/modules/frontend/app/modules/nodes/nodes-dialog.controller.js
similarity index 100%
rename from frontend/app/modules/nodes/nodes-dialog.controller.js
rename to modules/frontend/app/modules/nodes/nodes-dialog.controller.js
diff --git a/frontend/app/modules/nodes/nodes-dialog.scss b/modules/frontend/app/modules/nodes/nodes-dialog.scss
similarity index 100%
rename from frontend/app/modules/nodes/nodes-dialog.scss
rename to modules/frontend/app/modules/nodes/nodes-dialog.scss
diff --git a/frontend/app/modules/nodes/nodes-dialog.tpl.pug b/modules/frontend/app/modules/nodes/nodes-dialog.tpl.pug
similarity index 100%
rename from frontend/app/modules/nodes/nodes-dialog.tpl.pug
rename to modules/frontend/app/modules/nodes/nodes-dialog.tpl.pug
diff --git a/frontend/app/modules/nodes/nodes.module.js b/modules/frontend/app/modules/nodes/nodes.module.js
similarity index 100%
rename from frontend/app/modules/nodes/nodes.module.js
rename to modules/frontend/app/modules/nodes/nodes.module.js
diff --git a/frontend/app/modules/socket.module.js b/modules/frontend/app/modules/socket.module.js
similarity index 100%
rename from frontend/app/modules/socket.module.js
rename to modules/frontend/app/modules/socket.module.js
diff --git a/frontend/app/modules/states/admin.state.js b/modules/frontend/app/modules/states/admin.state.js
similarity index 100%
rename from frontend/app/modules/states/admin.state.js
rename to modules/frontend/app/modules/states/admin.state.js
diff --git a/frontend/app/modules/states/errors.state.js b/modules/frontend/app/modules/states/errors.state.js
similarity index 100%
rename from frontend/app/modules/states/errors.state.js
rename to modules/frontend/app/modules/states/errors.state.js
diff --git a/frontend/app/modules/states/logout.state.js b/modules/frontend/app/modules/states/logout.state.js
similarity index 100%
rename from frontend/app/modules/states/logout.state.js
rename to modules/frontend/app/modules/states/logout.state.js
diff --git a/frontend/app/modules/states/settings.state.js b/modules/frontend/app/modules/states/settings.state.js
similarity index 99%
rename from frontend/app/modules/states/settings.state.js
rename to modules/frontend/app/modules/states/settings.state.js
index e967bad..2c43014 100644
--- a/frontend/app/modules/states/settings.state.js
+++ b/modules/frontend/app/modules/states/settings.state.js
@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-
 import angular from 'angular';
 
 angular
diff --git a/frontend/app/modules/user/Auth.service.ts b/modules/frontend/app/modules/user/Auth.service.ts
similarity index 100%
rename from frontend/app/modules/user/Auth.service.ts
rename to modules/frontend/app/modules/user/Auth.service.ts
diff --git a/frontend/app/modules/user/User.service.js b/modules/frontend/app/modules/user/User.service.js
similarity index 100%
rename from frontend/app/modules/user/User.service.js
rename to modules/frontend/app/modules/user/User.service.js
diff --git a/frontend/app/modules/user/emailConfirmationInterceptor.ts b/modules/frontend/app/modules/user/emailConfirmationInterceptor.ts
similarity index 100%
rename from frontend/app/modules/user/emailConfirmationInterceptor.ts
rename to modules/frontend/app/modules/user/emailConfirmationInterceptor.ts
diff --git a/frontend/app/modules/user/permissions.js b/modules/frontend/app/modules/user/permissions.js
similarity index 100%
rename from frontend/app/modules/user/permissions.js
rename to modules/frontend/app/modules/user/permissions.js
diff --git a/frontend/app/modules/user/user.module.js b/modules/frontend/app/modules/user/user.module.js
similarity index 100%
rename from frontend/app/modules/user/user.module.js
rename to modules/frontend/app/modules/user/user.module.js
diff --git a/frontend/app/primitives/badge/index.scss b/modules/frontend/app/primitives/badge/index.scss
similarity index 100%
rename from frontend/app/primitives/badge/index.scss
rename to modules/frontend/app/primitives/badge/index.scss
diff --git a/frontend/app/primitives/btn-group/index.pug b/modules/frontend/app/primitives/btn-group/index.pug
similarity index 100%
rename from frontend/app/primitives/btn-group/index.pug
rename to modules/frontend/app/primitives/btn-group/index.pug
diff --git a/frontend/app/primitives/btn/index.scss b/modules/frontend/app/primitives/btn/index.scss
similarity index 100%
rename from frontend/app/primitives/btn/index.scss
rename to modules/frontend/app/primitives/btn/index.scss
diff --git a/frontend/app/primitives/checkbox/index.scss b/modules/frontend/app/primitives/checkbox/index.scss
similarity index 100%
rename from frontend/app/primitives/checkbox/index.scss
rename to modules/frontend/app/primitives/checkbox/index.scss
diff --git a/frontend/app/primitives/datepicker/index.pug b/modules/frontend/app/primitives/datepicker/index.pug
similarity index 100%
rename from frontend/app/primitives/datepicker/index.pug
rename to modules/frontend/app/primitives/datepicker/index.pug
diff --git a/frontend/app/primitives/datepicker/index.scss b/modules/frontend/app/primitives/datepicker/index.scss
similarity index 100%
rename from frontend/app/primitives/datepicker/index.scss
rename to modules/frontend/app/primitives/datepicker/index.scss
diff --git a/frontend/app/primitives/dropdown/index.pug b/modules/frontend/app/primitives/dropdown/index.pug
similarity index 100%
rename from frontend/app/primitives/dropdown/index.pug
rename to modules/frontend/app/primitives/dropdown/index.pug
diff --git a/frontend/app/primitives/dropdown/index.scss b/modules/frontend/app/primitives/dropdown/index.scss
similarity index 100%
rename from frontend/app/primitives/dropdown/index.scss
rename to modules/frontend/app/primitives/dropdown/index.scss
diff --git a/frontend/app/primitives/form-field/checkbox.pug b/modules/frontend/app/primitives/form-field/checkbox.pug
similarity index 100%
rename from frontend/app/primitives/form-field/checkbox.pug
rename to modules/frontend/app/primitives/form-field/checkbox.pug
diff --git a/frontend/app/primitives/form-field/dropdown.pug b/modules/frontend/app/primitives/form-field/dropdown.pug
similarity index 100%
rename from frontend/app/primitives/form-field/dropdown.pug
rename to modules/frontend/app/primitives/form-field/dropdown.pug
diff --git a/frontend/app/primitives/form-field/email.pug b/modules/frontend/app/primitives/form-field/email.pug
similarity index 100%
rename from frontend/app/primitives/form-field/email.pug
rename to modules/frontend/app/primitives/form-field/email.pug
diff --git a/frontend/app/primitives/form-field/error.pug b/modules/frontend/app/primitives/form-field/error.pug
similarity index 100%
rename from frontend/app/primitives/form-field/error.pug
rename to modules/frontend/app/primitives/form-field/error.pug
diff --git a/frontend/app/primitives/form-field/index.pug b/modules/frontend/app/primitives/form-field/index.pug
similarity index 100%
rename from frontend/app/primitives/form-field/index.pug
rename to modules/frontend/app/primitives/form-field/index.pug
diff --git a/frontend/app/primitives/form-field/index.scss b/modules/frontend/app/primitives/form-field/index.scss
similarity index 100%
rename from frontend/app/primitives/form-field/index.scss
rename to modules/frontend/app/primitives/form-field/index.scss
diff --git a/frontend/app/primitives/form-field/input.pug b/modules/frontend/app/primitives/form-field/input.pug
similarity index 100%
rename from frontend/app/primitives/form-field/input.pug
rename to modules/frontend/app/primitives/form-field/input.pug
diff --git a/frontend/app/primitives/form-field/label.pug b/modules/frontend/app/primitives/form-field/label.pug
similarity index 100%
rename from frontend/app/primitives/form-field/label.pug
rename to modules/frontend/app/primitives/form-field/label.pug
diff --git a/frontend/app/primitives/form-field/number.pug b/modules/frontend/app/primitives/form-field/number.pug
similarity index 100%
rename from frontend/app/primitives/form-field/number.pug
rename to modules/frontend/app/primitives/form-field/number.pug
diff --git a/frontend/app/primitives/form-field/password.pug b/modules/frontend/app/primitives/form-field/password.pug
similarity index 100%
rename from frontend/app/primitives/form-field/password.pug
rename to modules/frontend/app/primitives/form-field/password.pug
diff --git a/frontend/app/primitives/form-field/phone.pug b/modules/frontend/app/primitives/form-field/phone.pug
similarity index 100%
rename from frontend/app/primitives/form-field/phone.pug
rename to modules/frontend/app/primitives/form-field/phone.pug
diff --git a/frontend/app/primitives/form-field/radio.pug b/modules/frontend/app/primitives/form-field/radio.pug
similarity index 100%
rename from frontend/app/primitives/form-field/radio.pug
rename to modules/frontend/app/primitives/form-field/radio.pug
diff --git a/frontend/app/primitives/form-field/text.pug b/modules/frontend/app/primitives/form-field/text.pug
similarity index 100%
rename from frontend/app/primitives/form-field/text.pug
rename to modules/frontend/app/primitives/form-field/text.pug
diff --git a/frontend/app/primitives/form-field/tooltip.pug b/modules/frontend/app/primitives/form-field/tooltip.pug
similarity index 100%
rename from frontend/app/primitives/form-field/tooltip.pug
rename to modules/frontend/app/primitives/form-field/tooltip.pug
diff --git a/frontend/app/primitives/form-field/typeahead.pug b/modules/frontend/app/primitives/form-field/typeahead.pug
similarity index 100%
rename from frontend/app/primitives/form-field/typeahead.pug
rename to modules/frontend/app/primitives/form-field/typeahead.pug
diff --git a/frontend/app/primitives/grid/index.scss b/modules/frontend/app/primitives/grid/index.scss
similarity index 100%
rename from frontend/app/primitives/grid/index.scss
rename to modules/frontend/app/primitives/grid/index.scss
diff --git a/frontend/app/primitives/index.js b/modules/frontend/app/primitives/index.js
similarity index 100%
rename from frontend/app/primitives/index.js
rename to modules/frontend/app/primitives/index.js
diff --git a/frontend/app/primitives/modal/index.scss b/modules/frontend/app/primitives/modal/index.scss
similarity index 100%
rename from frontend/app/primitives/modal/index.scss
rename to modules/frontend/app/primitives/modal/index.scss
diff --git a/frontend/app/primitives/page/index.scss b/modules/frontend/app/primitives/page/index.scss
similarity index 100%
rename from frontend/app/primitives/page/index.scss
rename to modules/frontend/app/primitives/page/index.scss
diff --git a/frontend/app/primitives/panel/index.scss b/modules/frontend/app/primitives/panel/index.scss
similarity index 100%
rename from frontend/app/primitives/panel/index.scss
rename to modules/frontend/app/primitives/panel/index.scss
diff --git a/frontend/app/primitives/spinner-circle/index.scss b/modules/frontend/app/primitives/spinner-circle/index.scss
similarity index 100%
rename from frontend/app/primitives/spinner-circle/index.scss
rename to modules/frontend/app/primitives/spinner-circle/index.scss
diff --git a/frontend/app/primitives/switcher/index.pug b/modules/frontend/app/primitives/switcher/index.pug
similarity index 100%
rename from frontend/app/primitives/switcher/index.pug
rename to modules/frontend/app/primitives/switcher/index.pug
diff --git a/frontend/app/primitives/switcher/index.scss b/modules/frontend/app/primitives/switcher/index.scss
similarity index 100%
rename from frontend/app/primitives/switcher/index.scss
rename to modules/frontend/app/primitives/switcher/index.scss
diff --git a/frontend/app/primitives/table/index.scss b/modules/frontend/app/primitives/table/index.scss
similarity index 100%
rename from frontend/app/primitives/table/index.scss
rename to modules/frontend/app/primitives/table/index.scss
diff --git a/frontend/app/primitives/tabs/index.scss b/modules/frontend/app/primitives/tabs/index.scss
similarity index 100%
rename from frontend/app/primitives/tabs/index.scss
rename to modules/frontend/app/primitives/tabs/index.scss
diff --git a/frontend/app/primitives/timepicker/index.pug b/modules/frontend/app/primitives/timepicker/index.pug
similarity index 100%
rename from frontend/app/primitives/timepicker/index.pug
rename to modules/frontend/app/primitives/timepicker/index.pug
diff --git a/frontend/app/primitives/timepicker/index.scss b/modules/frontend/app/primitives/timepicker/index.scss
similarity index 100%
rename from frontend/app/primitives/timepicker/index.scss
rename to modules/frontend/app/primitives/timepicker/index.scss
diff --git a/frontend/app/primitives/tooltip/index.scss b/modules/frontend/app/primitives/tooltip/index.scss
similarity index 100%
rename from frontend/app/primitives/tooltip/index.scss
rename to modules/frontend/app/primitives/tooltip/index.scss
diff --git a/frontend/app/primitives/typography/index.scss b/modules/frontend/app/primitives/typography/index.scss
similarity index 100%
rename from frontend/app/primitives/typography/index.scss
rename to modules/frontend/app/primitives/typography/index.scss
diff --git a/frontend/app/primitives/ui-grid-header/index.scss b/modules/frontend/app/primitives/ui-grid-header/index.scss
similarity index 100%
rename from frontend/app/primitives/ui-grid-header/index.scss
rename to modules/frontend/app/primitives/ui-grid-header/index.scss
diff --git a/frontend/app/primitives/ui-grid-header/index.tpl.pug b/modules/frontend/app/primitives/ui-grid-header/index.tpl.pug
similarity index 100%
rename from frontend/app/primitives/ui-grid-header/index.tpl.pug
rename to modules/frontend/app/primitives/ui-grid-header/index.tpl.pug
diff --git a/frontend/app/primitives/ui-grid-settings/index.scss b/modules/frontend/app/primitives/ui-grid-settings/index.scss
similarity index 100%
rename from frontend/app/primitives/ui-grid-settings/index.scss
rename to modules/frontend/app/primitives/ui-grid-settings/index.scss
diff --git a/frontend/app/primitives/ui-grid/index.scss b/modules/frontend/app/primitives/ui-grid/index.scss
similarity index 100%
rename from frontend/app/primitives/ui-grid/index.scss
rename to modules/frontend/app/primitives/ui-grid/index.scss
diff --git a/frontend/app/services/AngularStrapSelect.decorator.js b/modules/frontend/app/services/AngularStrapSelect.decorator.js
similarity index 100%
rename from frontend/app/services/AngularStrapSelect.decorator.js
rename to modules/frontend/app/services/AngularStrapSelect.decorator.js
diff --git a/frontend/app/services/AngularStrapTooltip.decorator.js b/modules/frontend/app/services/AngularStrapTooltip.decorator.js
similarity index 100%
rename from frontend/app/services/AngularStrapTooltip.decorator.js
rename to modules/frontend/app/services/AngularStrapTooltip.decorator.js
diff --git a/frontend/app/services/CSV.js b/modules/frontend/app/services/CSV.js
similarity index 100%
rename from frontend/app/services/CSV.js
rename to modules/frontend/app/services/CSV.js
diff --git a/frontend/app/services/ChartColors.service.js b/modules/frontend/app/services/ChartColors.service.js
similarity index 100%
rename from frontend/app/services/ChartColors.service.js
rename to modules/frontend/app/services/ChartColors.service.js
diff --git a/frontend/app/services/Confirm.service.js b/modules/frontend/app/services/Confirm.service.js
similarity index 100%
rename from frontend/app/services/Confirm.service.js
rename to modules/frontend/app/services/Confirm.service.js
diff --git a/frontend/app/services/ConfirmBatch.service.js b/modules/frontend/app/services/ConfirmBatch.service.js
similarity index 100%
rename from frontend/app/services/ConfirmBatch.service.js
rename to modules/frontend/app/services/ConfirmBatch.service.js
diff --git a/frontend/app/services/CopyToClipboard.service.js b/modules/frontend/app/services/CopyToClipboard.service.js
similarity index 100%
rename from frontend/app/services/CopyToClipboard.service.js
rename to modules/frontend/app/services/CopyToClipboard.service.js
diff --git a/frontend/app/services/Countries.service.js b/modules/frontend/app/services/Countries.service.js
similarity index 100%
rename from frontend/app/services/Countries.service.js
rename to modules/frontend/app/services/Countries.service.js
diff --git a/frontend/app/services/DefaultState.js b/modules/frontend/app/services/DefaultState.js
similarity index 100%
rename from frontend/app/services/DefaultState.js
rename to modules/frontend/app/services/DefaultState.js
diff --git a/frontend/app/services/ErrorParser.service.js b/modules/frontend/app/services/ErrorParser.service.js
similarity index 100%
rename from frontend/app/services/ErrorParser.service.js
rename to modules/frontend/app/services/ErrorParser.service.js
diff --git a/frontend/app/services/ErrorPopover.service.js b/modules/frontend/app/services/ErrorPopover.service.js
similarity index 100%
rename from frontend/app/services/ErrorPopover.service.js
rename to modules/frontend/app/services/ErrorPopover.service.js
diff --git a/frontend/app/services/Focus.service.js b/modules/frontend/app/services/Focus.service.js
similarity index 100%
rename from frontend/app/services/Focus.service.js
rename to modules/frontend/app/services/Focus.service.js
diff --git a/frontend/app/services/FormUtils.service.js b/modules/frontend/app/services/FormUtils.service.js
similarity index 100%
rename from frontend/app/services/FormUtils.service.js
rename to modules/frontend/app/services/FormUtils.service.js
diff --git a/frontend/app/services/InetAddress.service.js b/modules/frontend/app/services/InetAddress.service.js
similarity index 100%
rename from frontend/app/services/InetAddress.service.js
rename to modules/frontend/app/services/InetAddress.service.js
diff --git a/frontend/app/services/JavaTypes.service.js b/modules/frontend/app/services/JavaTypes.service.js
similarity index 99%
rename from frontend/app/services/JavaTypes.service.js
rename to modules/frontend/app/services/JavaTypes.service.js
index d9cb04f..884e8ca 100644
--- a/frontend/app/services/JavaTypes.service.js
+++ b/modules/frontend/app/services/JavaTypes.service.js
@@ -19,13 +19,10 @@ import _ from 'lodash';
 import includes from 'lodash/includes';
 import isNil from 'lodash/isNil';
 import find from 'lodash/find';
-
 // Java built-in class names.
 import JAVA_CLASSES from '../data/java-classes.json';
-
 // Java build-in primitives.
 import JAVA_PRIMITIVES from '../data/java-primitives.json';
-
 // Java keywords.
 import JAVA_KEYWORDS from '../data/java-keywords.json';
 
diff --git a/frontend/app/services/JavaTypes.spec.js b/modules/frontend/app/services/JavaTypes.spec.js
similarity index 99%
rename from frontend/app/services/JavaTypes.spec.js
rename to modules/frontend/app/services/JavaTypes.spec.js
index 5524197..122df17 100644
--- a/frontend/app/services/JavaTypes.spec.js
+++ b/modules/frontend/app/services/JavaTypes.spec.js
@@ -16,11 +16,10 @@
  */
 
 import JavaTypes from './JavaTypes.service';
+import {assert} from 'chai';
 
 const instance = new JavaTypes();
 
-import { assert } from 'chai';
-
 suite('JavaTypesTestsSuite', () => {
     test('nonBuiltInClass', () => {
         assert.equal(instance.nonBuiltInClass('BigDecimal'), false);
diff --git a/frontend/app/services/LegacyTable.service.js b/modules/frontend/app/services/LegacyTable.service.js
similarity index 100%
rename from frontend/app/services/LegacyTable.service.js
rename to modules/frontend/app/services/LegacyTable.service.js
diff --git a/frontend/app/services/LegacyUtils.service.js b/modules/frontend/app/services/LegacyUtils.service.js
similarity index 100%
rename from frontend/app/services/LegacyUtils.service.js
rename to modules/frontend/app/services/LegacyUtils.service.js
diff --git a/frontend/app/services/Messages.service.js b/modules/frontend/app/services/Messages.service.js
similarity index 100%
rename from frontend/app/services/Messages.service.js
rename to modules/frontend/app/services/Messages.service.js
diff --git a/frontend/app/services/ModelNormalizer.service.js b/modules/frontend/app/services/ModelNormalizer.service.js
similarity index 100%
rename from frontend/app/services/ModelNormalizer.service.js
rename to modules/frontend/app/services/ModelNormalizer.service.js
diff --git a/frontend/app/services/SqlTypes.service.js b/modules/frontend/app/services/SqlTypes.service.js
similarity index 99%
rename from frontend/app/services/SqlTypes.service.js
rename to modules/frontend/app/services/SqlTypes.service.js
index 389d8e7..851c54e 100644
--- a/frontend/app/services/SqlTypes.service.js
+++ b/modules/frontend/app/services/SqlTypes.service.js
@@ -16,10 +16,8 @@
  */
 
 import _ from 'lodash';
-
 // List of H2 reserved SQL keywords.
 import H2_SQL_KEYWORDS from 'app/data/sql-keywords.json';
-
 // List of JDBC type descriptors.
 import JDBC_TYPES from 'app/data/jdbc-types.json';
 
diff --git a/frontend/app/services/Version.service.js b/modules/frontend/app/services/Version.service.js
similarity index 99%
rename from frontend/app/services/Version.service.js
rename to modules/frontend/app/services/Version.service.js
index 511cf66..cbd4b25 100644
--- a/frontend/app/services/Version.service.js
+++ b/modules/frontend/app/services/Version.service.js
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { BehaviorSubject } from 'rxjs';
+import {BehaviorSubject} from 'rxjs';
 import _ from 'lodash';
 
 /**
diff --git a/frontend/app/services/Version.spec.js b/modules/frontend/app/services/Version.spec.js
similarity index 98%
rename from frontend/app/services/Version.spec.js
rename to modules/frontend/app/services/Version.spec.js
index c0f6984..14a2588 100644
--- a/frontend/app/services/Version.spec.js
+++ b/modules/frontend/app/services/Version.spec.js
@@ -16,12 +16,11 @@
  */
 
 import VersionService from './Version.service';
+import {suite, test} from 'mocha';
+import {assert} from 'chai';
 
 const INSTANCE = new VersionService();
 
-import { suite, test } from 'mocha';
-import { assert } from 'chai';
-
 suite('VersionServiceTestsSuite', () => {
     test('Parse 1.7.0-SNAPSHOT', () => {
         const version = INSTANCE.parse('1.7.0-SNAPSHOT');
diff --git a/frontend/app/services/exceptionHandler.js b/modules/frontend/app/services/exceptionHandler.js
similarity index 100%
rename from frontend/app/services/exceptionHandler.js
rename to modules/frontend/app/services/exceptionHandler.js
diff --git a/frontend/app/services/index.js b/modules/frontend/app/services/index.js
similarity index 100%
rename from frontend/app/services/index.js
rename to modules/frontend/app/services/index.js
diff --git a/frontend/app/services/store.ts b/modules/frontend/app/services/store.ts
similarity index 98%
rename from frontend/app/services/store.ts
rename to modules/frontend/app/services/store.ts
index 4498d1e..c9e4e35 100644
--- a/frontend/app/services/store.ts
+++ b/modules/frontend/app/services/store.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import {BehaviorSubject, Subject, merge} from 'rxjs';
+import {BehaviorSubject, merge, Subject} from 'rxjs';
 import {scan, tap} from 'rxjs/operators';
 
 interface Reducer<State, Actions> {
diff --git a/frontend/app/store/actions/ui.ts b/modules/frontend/app/store/actions/ui.ts
similarity index 100%
rename from frontend/app/store/actions/ui.ts
rename to modules/frontend/app/store/actions/ui.ts
diff --git a/frontend/app/store/actions/user.ts b/modules/frontend/app/store/actions/user.ts
similarity index 100%
rename from frontend/app/store/actions/user.ts
rename to modules/frontend/app/store/actions/user.ts
diff --git a/frontend/app/store/effects/ui.ts b/modules/frontend/app/store/effects/ui.ts
similarity index 93%
rename from frontend/app/store/effects/ui.ts
rename to modules/frontend/app/store/effects/ui.ts
index 01f52ab..be5cf5d 100644
--- a/frontend/app/store/effects/ui.ts
+++ b/modules/frontend/app/store/effects/ui.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import {AppStore, USER, ofType, hideNavigationMenuItem, showNavigationMenuItem} from '..';
+import {AppStore, hideNavigationMenuItem, ofType, showNavigationMenuItem, USER} from '..';
 import {map} from 'rxjs/operators';
 
 export class UIEffects {
diff --git a/frontend/app/store/index.ts b/modules/frontend/app/store/index.ts
similarity index 96%
rename from frontend/app/store/index.ts
rename to modules/frontend/app/store/index.ts
index fa4a878..c07cff5 100644
--- a/frontend/app/store/index.ts
+++ b/modules/frontend/app/store/index.ts
@@ -17,7 +17,7 @@
 
 import {Store} from '../services/store';
 
-import {UIState, uiReducer} from './reducers/ui';
+import {uiReducer, UIState} from './reducers/ui';
 import {UIActions} from './actions/ui';
 import {UIEffects} from './effects/ui';
 
diff --git a/frontend/app/store/ofType.ts b/modules/frontend/app/store/ofType.ts
similarity index 100%
rename from frontend/app/store/ofType.ts
rename to modules/frontend/app/store/ofType.ts
diff --git a/frontend/app/store/reducers/ui.ts b/modules/frontend/app/store/reducers/ui.ts
similarity index 92%
rename from frontend/app/store/reducers/ui.ts
rename to modules/frontend/app/store/reducers/ui.ts
index 6f2859d..11cf9b8 100644
--- a/frontend/app/store/reducers/ui.ts
+++ b/modules/frontend/app/store/reducers/ui.ts
@@ -16,7 +16,13 @@
  */
 
 import {NavigationMenu} from '../../types';
-import {UIActions, TOGGLE_SIDEBAR, NAVIGATION_MENU_ITEM, HIDE_NAVIGATION_MENU_ITEM, SHOW_NAVIGATION_MENU_ITEM} from '..';
+import {
+    HIDE_NAVIGATION_MENU_ITEM,
+    NAVIGATION_MENU_ITEM,
+    SHOW_NAVIGATION_MENU_ITEM,
+    TOGGLE_SIDEBAR,
+    UIActions
+} from '..';
 
 export type UIState = {
     sidebarOpened: boolean,
diff --git a/frontend/app/store/reduxDebug.ts b/modules/frontend/app/store/reduxDebug.ts
similarity index 92%
rename from frontend/app/store/reduxDebug.ts
rename to modules/frontend/app/store/reduxDebug.ts
index 5700112..ea7fc7f 100644
--- a/frontend/app/store/reduxDebug.ts
+++ b/modules/frontend/app/store/reduxDebug.ts
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-import {reducer, devTools} from './reduxDevtoolsIntegration';
+import {devTools, reducer} from './reduxDevtoolsIntegration';
 import {AppStore} from '.';
-import {filter, withLatestFrom, tap} from 'rxjs/operators';
+import {filter, tap, withLatestFrom} from 'rxjs/operators';
 
 run.$inject = ['Store'];
 
diff --git a/frontend/app/store/reduxDevtoolsIntegration.js b/modules/frontend/app/store/reduxDevtoolsIntegration.js
similarity index 100%
rename from frontend/app/store/reduxDevtoolsIntegration.js
rename to modules/frontend/app/store/reduxDevtoolsIntegration.js
diff --git a/frontend/app/store/selectors/ui.ts b/modules/frontend/app/store/selectors/ui.ts
similarity index 90%
rename from frontend/app/store/selectors/ui.ts
rename to modules/frontend/app/store/selectors/ui.ts
index 0bd2fa9..9421547 100644
--- a/frontend/app/store/selectors/ui.ts
+++ b/modules/frontend/app/store/selectors/ui.ts
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-import {State, AppStore} from '..';
-import {pluck, map} from 'rxjs/operators';
+import {State} from '..';
+import {map, pluck} from 'rxjs/operators';
 import {pipe} from 'rxjs';
-import {memoize, orderBy} from 'lodash';
+import {orderBy} from 'lodash';
 
 const orderMenu = <T extends {order: number}>(menu: Array<T>) => orderBy(menu, 'order');
 
diff --git a/frontend/app/style.scss b/modules/frontend/app/style.scss
similarity index 100%
rename from frontend/app/style.scss
rename to modules/frontend/app/style.scss
diff --git a/frontend/app/types/index.ts b/modules/frontend/app/types/index.ts
similarity index 100%
rename from frontend/app/types/index.ts
rename to modules/frontend/app/types/index.ts
diff --git a/frontend/app/utils/SimpleWorkerPool.js b/modules/frontend/app/utils/SimpleWorkerPool.js
similarity index 97%
rename from frontend/app/utils/SimpleWorkerPool.js
rename to modules/frontend/app/utils/SimpleWorkerPool.js
index b751dc3..ab563bb 100644
--- a/frontend/app/utils/SimpleWorkerPool.js
+++ b/modules/frontend/app/utils/SimpleWorkerPool.js
@@ -16,8 +16,8 @@
  */
 
 import _ from 'lodash';
-import {Subject, race} from 'rxjs';
-import {filter, take, pluck, map} from 'rxjs/operators';
+import {race, Subject} from 'rxjs';
+import {filter, map, pluck, take} from 'rxjs/operators';
 
 /**
  * Simple implementation of workers pool.
diff --git a/frontend/app/utils/dialogState.ts b/modules/frontend/app/utils/dialogState.ts
similarity index 96%
rename from frontend/app/utils/dialogState.ts
rename to modules/frontend/app/utils/dialogState.ts
index d83c911..abadfdf 100644
--- a/frontend/app/utils/dialogState.ts
+++ b/modules/frontend/app/utils/dialogState.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import {UIRouter, StateDeclaration, Transition} from '@uirouter/angularjs';
+import {StateDeclaration, Transition, UIRouter} from '@uirouter/angularjs';
 
 export function dialogState(component: string): Partial<StateDeclaration> {
     let dialog: mgcrea.ngStrap.modal.IModal | undefined;
diff --git a/frontend/app/utils/id8.js b/modules/frontend/app/utils/id8.js
similarity index 100%
rename from frontend/app/utils/id8.js
rename to modules/frontend/app/utils/id8.js
diff --git a/frontend/app/utils/lodashMixins.js b/modules/frontend/app/utils/lodashMixins.js
similarity index 100%
rename from frontend/app/utils/lodashMixins.js
rename to modules/frontend/app/utils/lodashMixins.js
diff --git a/frontend/app/utils/uniqueName.js b/modules/frontend/app/utils/uniqueName.js
similarity index 100%
rename from frontend/app/utils/uniqueName.js
rename to modules/frontend/app/utils/uniqueName.js
diff --git a/frontend/app/vendor.js b/modules/frontend/app/vendor.js
similarity index 100%
rename from frontend/app/vendor.js
rename to modules/frontend/app/vendor.js
diff --git a/frontend/index.js b/modules/frontend/index.js
similarity index 100%
rename from frontend/index.js
rename to modules/frontend/index.js
diff --git a/frontend/package-lock.json b/modules/frontend/package-lock.json
similarity index 100%
rename from frontend/package-lock.json
rename to modules/frontend/package-lock.json
diff --git a/frontend/package.json b/modules/frontend/package.json
similarity index 100%
rename from frontend/package.json
rename to modules/frontend/package.json
diff --git a/frontend/public/favicon.ico b/modules/frontend/public/favicon.ico
similarity index 100%
rename from frontend/public/favicon.ico
rename to modules/frontend/public/favicon.ico
diff --git a/frontend/public/images/cache.png b/modules/frontend/public/images/cache.png
similarity index 100%
rename from frontend/public/images/cache.png
rename to modules/frontend/public/images/cache.png
diff --git a/frontend/public/images/checkbox-active.svg b/modules/frontend/public/images/checkbox-active.svg
similarity index 100%
rename from frontend/public/images/checkbox-active.svg
rename to modules/frontend/public/images/checkbox-active.svg
diff --git a/frontend/public/images/checkbox.svg b/modules/frontend/public/images/checkbox.svg
similarity index 100%
rename from frontend/public/images/checkbox.svg
rename to modules/frontend/public/images/checkbox.svg
diff --git a/frontend/public/images/cluster-quick.png b/modules/frontend/public/images/cluster-quick.png
similarity index 100%
rename from frontend/public/images/cluster-quick.png
rename to modules/frontend/public/images/cluster-quick.png
diff --git a/frontend/public/images/cluster.png b/modules/frontend/public/images/cluster.png
similarity index 100%
rename from frontend/public/images/cluster.png
rename to modules/frontend/public/images/cluster.png
diff --git a/frontend/public/images/collapse.svg b/modules/frontend/public/images/collapse.svg
similarity index 100%
rename from frontend/public/images/collapse.svg
rename to modules/frontend/public/images/collapse.svg
diff --git a/frontend/public/images/domains.png b/modules/frontend/public/images/domains.png
similarity index 100%
rename from frontend/public/images/domains.png
rename to modules/frontend/public/images/domains.png
diff --git a/frontend/public/images/expand.svg b/modules/frontend/public/images/expand.svg
similarity index 100%
rename from frontend/public/images/expand.svg
rename to modules/frontend/public/images/expand.svg
diff --git a/frontend/public/images/icons/alert.icon.svg b/modules/frontend/public/images/icons/alert.icon.svg
similarity index 100%
rename from frontend/public/images/icons/alert.icon.svg
rename to modules/frontend/public/images/icons/alert.icon.svg
diff --git a/frontend/public/images/icons/attention.icon.svg b/modules/frontend/public/images/icons/attention.icon.svg
similarity index 100%
rename from frontend/public/images/icons/attention.icon.svg
rename to modules/frontend/public/images/icons/attention.icon.svg
diff --git a/frontend/public/images/icons/check.icon.svg b/modules/frontend/public/images/icons/check.icon.svg
similarity index 100%
rename from frontend/public/images/icons/check.icon.svg
rename to modules/frontend/public/images/icons/check.icon.svg
diff --git a/frontend/public/images/icons/checkmark.icon.svg b/modules/frontend/public/images/icons/checkmark.icon.svg
similarity index 100%
rename from frontend/public/images/icons/checkmark.icon.svg
rename to modules/frontend/public/images/icons/checkmark.icon.svg
diff --git a/frontend/public/images/icons/clock.icon.svg b/modules/frontend/public/images/icons/clock.icon.svg
similarity index 100%
rename from frontend/public/images/icons/clock.icon.svg
rename to modules/frontend/public/images/icons/clock.icon.svg
diff --git a/frontend/public/images/icons/cluster.icon.svg b/modules/frontend/public/images/icons/cluster.icon.svg
similarity index 100%
rename from frontend/public/images/icons/cluster.icon.svg
rename to modules/frontend/public/images/icons/cluster.icon.svg
diff --git a/frontend/public/images/icons/collapse.icon.svg b/modules/frontend/public/images/icons/collapse.icon.svg
similarity index 100%
rename from frontend/public/images/icons/collapse.icon.svg
rename to modules/frontend/public/images/icons/collapse.icon.svg
diff --git a/frontend/public/images/icons/copy.icon.svg b/modules/frontend/public/images/icons/copy.icon.svg
similarity index 100%
rename from frontend/public/images/icons/copy.icon.svg
rename to modules/frontend/public/images/icons/copy.icon.svg
diff --git a/frontend/public/images/icons/cross.icon.svg b/modules/frontend/public/images/icons/cross.icon.svg
similarity index 100%
rename from frontend/public/images/icons/cross.icon.svg
rename to modules/frontend/public/images/icons/cross.icon.svg
diff --git a/frontend/public/images/icons/csv.icon.svg b/modules/frontend/public/images/icons/csv.icon.svg
similarity index 100%
rename from frontend/public/images/icons/csv.icon.svg
rename to modules/frontend/public/images/icons/csv.icon.svg
diff --git a/frontend/public/images/icons/download.icon.svg b/modules/frontend/public/images/icons/download.icon.svg
similarity index 100%
rename from frontend/public/images/icons/download.icon.svg
rename to modules/frontend/public/images/icons/download.icon.svg
diff --git a/frontend/public/images/icons/downloadAgent.icon.svg b/modules/frontend/public/images/icons/downloadAgent.icon.svg
similarity index 100%
rename from frontend/public/images/icons/downloadAgent.icon.svg
rename to modules/frontend/public/images/icons/downloadAgent.icon.svg
diff --git a/frontend/public/images/icons/exclamation.icon.svg b/modules/frontend/public/images/icons/exclamation.icon.svg
similarity index 100%
rename from frontend/public/images/icons/exclamation.icon.svg
rename to modules/frontend/public/images/icons/exclamation.icon.svg
diff --git a/frontend/public/images/icons/exit.icon.svg b/modules/frontend/public/images/icons/exit.icon.svg
similarity index 100%
rename from frontend/public/images/icons/exit.icon.svg
rename to modules/frontend/public/images/icons/exit.icon.svg
diff --git a/frontend/public/images/icons/expand.icon.svg b/modules/frontend/public/images/icons/expand.icon.svg
similarity index 100%
rename from frontend/public/images/icons/expand.icon.svg
rename to modules/frontend/public/images/icons/expand.icon.svg
diff --git a/frontend/public/images/icons/eyeClosed.icon.svg b/modules/frontend/public/images/icons/eyeClosed.icon.svg
similarity index 100%
rename from frontend/public/images/icons/eyeClosed.icon.svg
rename to modules/frontend/public/images/icons/eyeClosed.icon.svg
diff --git a/frontend/public/images/icons/eyeOpened.icon.svg b/modules/frontend/public/images/icons/eyeOpened.icon.svg
similarity index 100%
rename from frontend/public/images/icons/eyeOpened.icon.svg
rename to modules/frontend/public/images/icons/eyeOpened.icon.svg
diff --git a/frontend/public/images/icons/filter.icon.svg b/modules/frontend/public/images/icons/filter.icon.svg
similarity index 100%
rename from frontend/public/images/icons/filter.icon.svg
rename to modules/frontend/public/images/icons/filter.icon.svg
diff --git a/frontend/public/images/icons/gear.icon.svg b/modules/frontend/public/images/icons/gear.icon.svg
similarity index 100%
rename from frontend/public/images/icons/gear.icon.svg
rename to modules/frontend/public/images/icons/gear.icon.svg
diff --git a/frontend/public/images/icons/home.icon.svg b/modules/frontend/public/images/icons/home.icon.svg
similarity index 100%
rename from frontend/public/images/icons/home.icon.svg
rename to modules/frontend/public/images/icons/home.icon.svg
diff --git a/frontend/public/images/icons/index.js b/modules/frontend/public/images/icons/index.js
similarity index 100%
rename from frontend/public/images/icons/index.js
rename to modules/frontend/public/images/icons/index.js
diff --git a/frontend/public/images/icons/info.icon.svg b/modules/frontend/public/images/icons/info.icon.svg
similarity index 100%
rename from frontend/public/images/icons/info.icon.svg
rename to modules/frontend/public/images/icons/info.icon.svg
diff --git a/frontend/public/images/icons/lockClosed.icon.svg b/modules/frontend/public/images/icons/lockClosed.icon.svg
similarity index 100%
rename from frontend/public/images/icons/lockClosed.icon.svg
rename to modules/frontend/public/images/icons/lockClosed.icon.svg
diff --git a/frontend/public/images/icons/lockOpened.icon.svg b/modules/frontend/public/images/icons/lockOpened.icon.svg
similarity index 100%
rename from frontend/public/images/icons/lockOpened.icon.svg
rename to modules/frontend/public/images/icons/lockOpened.icon.svg
diff --git a/frontend/public/images/icons/manual.icon.svg b/modules/frontend/public/images/icons/manual.icon.svg
similarity index 100%
rename from frontend/public/images/icons/manual.icon.svg
rename to modules/frontend/public/images/icons/manual.icon.svg
diff --git a/frontend/public/images/icons/menu.icon.svg b/modules/frontend/public/images/icons/menu.icon.svg
similarity index 100%
rename from frontend/public/images/icons/menu.icon.svg
rename to modules/frontend/public/images/icons/menu.icon.svg
diff --git a/frontend/public/images/icons/plus.icon.svg b/modules/frontend/public/images/icons/plus.icon.svg
similarity index 100%
rename from frontend/public/images/icons/plus.icon.svg
rename to modules/frontend/public/images/icons/plus.icon.svg
diff --git a/frontend/public/images/icons/refresh.icon.svg b/modules/frontend/public/images/icons/refresh.icon.svg
similarity index 100%
rename from frontend/public/images/icons/refresh.icon.svg
rename to modules/frontend/public/images/icons/refresh.icon.svg
diff --git a/frontend/public/images/icons/search.icon.svg b/modules/frontend/public/images/icons/search.icon.svg
similarity index 100%
rename from frontend/public/images/icons/search.icon.svg
rename to modules/frontend/public/images/icons/search.icon.svg
diff --git a/frontend/public/images/icons/sort.icon.svg b/modules/frontend/public/images/icons/sort.icon.svg
similarity index 100%
rename from frontend/public/images/icons/sort.icon.svg
rename to modules/frontend/public/images/icons/sort.icon.svg
diff --git a/frontend/public/images/icons/sql.icon.svg b/modules/frontend/public/images/icons/sql.icon.svg
similarity index 100%
rename from frontend/public/images/icons/sql.icon.svg
rename to modules/frontend/public/images/icons/sql.icon.svg
diff --git a/frontend/public/images/icons/structure.icon.svg b/modules/frontend/public/images/icons/structure.icon.svg
similarity index 100%
rename from frontend/public/images/icons/structure.icon.svg
rename to modules/frontend/public/images/icons/structure.icon.svg
diff --git a/frontend/public/images/igfs.png b/modules/frontend/public/images/igfs.png
similarity index 100%
rename from frontend/public/images/igfs.png
rename to modules/frontend/public/images/igfs.png
diff --git a/frontend/public/images/ignite-logo.svg b/modules/frontend/public/images/ignite-logo.svg
similarity index 100%
rename from frontend/public/images/ignite-logo.svg
rename to modules/frontend/public/images/ignite-logo.svg
diff --git a/frontend/public/images/ignite-puzzle.png b/modules/frontend/public/images/ignite-puzzle.png
similarity index 100%
rename from frontend/public/images/ignite-puzzle.png
rename to modules/frontend/public/images/ignite-puzzle.png
diff --git a/frontend/public/images/multicluster.png b/modules/frontend/public/images/multicluster.png
similarity index 100%
rename from frontend/public/images/multicluster.png
rename to modules/frontend/public/images/multicluster.png
diff --git a/frontend/public/images/page-landing-ui-sample.png b/modules/frontend/public/images/page-landing-ui-sample.png
similarity index 100%
rename from frontend/public/images/page-landing-ui-sample.png
rename to modules/frontend/public/images/page-landing-ui-sample.png
diff --git a/frontend/public/images/pb-ignite.png b/modules/frontend/public/images/pb-ignite.png
similarity index 100%
rename from frontend/public/images/pb-ignite.png
rename to modules/frontend/public/images/pb-ignite.png
diff --git a/frontend/public/images/preview.png b/modules/frontend/public/images/preview.png
similarity index 100%
rename from frontend/public/images/preview.png
rename to modules/frontend/public/images/preview.png
diff --git a/frontend/public/images/query-table.png b/modules/frontend/public/images/query-table.png
similarity index 100%
rename from frontend/public/images/query-table.png
rename to modules/frontend/public/images/query-table.png
diff --git a/frontend/public/stylesheets/_bootstrap-custom.scss b/modules/frontend/public/stylesheets/_bootstrap-custom.scss
similarity index 100%
rename from frontend/public/stylesheets/_bootstrap-custom.scss
rename to modules/frontend/public/stylesheets/_bootstrap-custom.scss
diff --git a/frontend/public/stylesheets/_bootstrap-variables.scss b/modules/frontend/public/stylesheets/_bootstrap-variables.scss
similarity index 100%
rename from frontend/public/stylesheets/_bootstrap-variables.scss
rename to modules/frontend/public/stylesheets/_bootstrap-variables.scss
diff --git a/frontend/public/stylesheets/_font-awesome-custom.scss b/modules/frontend/public/stylesheets/_font-awesome-custom.scss
similarity index 100%
rename from frontend/public/stylesheets/_font-awesome-custom.scss
rename to modules/frontend/public/stylesheets/_font-awesome-custom.scss
diff --git a/frontend/public/stylesheets/blocks/error.scss b/modules/frontend/public/stylesheets/blocks/error.scss
similarity index 100%
rename from frontend/public/stylesheets/blocks/error.scss
rename to modules/frontend/public/stylesheets/blocks/error.scss
diff --git a/frontend/public/stylesheets/form-field.scss b/modules/frontend/public/stylesheets/form-field.scss
similarity index 100%
rename from frontend/public/stylesheets/form-field.scss
rename to modules/frontend/public/stylesheets/form-field.scss
diff --git a/frontend/public/stylesheets/style.scss b/modules/frontend/public/stylesheets/style.scss
similarity index 100%
rename from frontend/public/stylesheets/style.scss
rename to modules/frontend/public/stylesheets/style.scss
diff --git a/frontend/public/stylesheets/variables.scss b/modules/frontend/public/stylesheets/variables.scss
similarity index 100%
rename from frontend/public/stylesheets/variables.scss
rename to modules/frontend/public/stylesheets/variables.scss
diff --git a/frontend/test/check-doc-links/Dockerfile b/modules/frontend/test/check-doc-links/Dockerfile
similarity index 100%
rename from frontend/test/check-doc-links/Dockerfile
rename to modules/frontend/test/check-doc-links/Dockerfile
diff --git a/frontend/test/check-doc-links/check-doc-links.js b/modules/frontend/test/check-doc-links/check-doc-links.js
similarity index 100%
rename from frontend/test/check-doc-links/check-doc-links.js
rename to modules/frontend/test/check-doc-links/check-doc-links.js
diff --git a/frontend/test/check-doc-links/docker-compose.yml b/modules/frontend/test/check-doc-links/docker-compose.yml
similarity index 100%
rename from frontend/test/check-doc-links/docker-compose.yml
rename to modules/frontend/test/check-doc-links/docker-compose.yml
diff --git a/frontend/test/ci/.dockerignore b/modules/frontend/test/ci/.dockerignore
similarity index 100%
rename from frontend/test/ci/.dockerignore
rename to modules/frontend/test/ci/.dockerignore
diff --git a/frontend/test/ci/Dockerfile b/modules/frontend/test/ci/Dockerfile
similarity index 100%
rename from frontend/test/ci/Dockerfile
rename to modules/frontend/test/ci/Dockerfile
diff --git a/frontend/test/ci/docker-compose.yml b/modules/frontend/test/ci/docker-compose.yml
similarity index 100%
rename from frontend/test/ci/docker-compose.yml
rename to modules/frontend/test/ci/docker-compose.yml
diff --git a/frontend/test/karma.conf.js b/modules/frontend/test/karma.conf.js
similarity index 100%
rename from frontend/test/karma.conf.js
rename to modules/frontend/test/karma.conf.js
diff --git a/frontend/test/unit/SqlTypes.test.js b/modules/frontend/test/unit/SqlTypes.test.js
similarity index 96%
rename from frontend/test/unit/SqlTypes.test.js
rename to modules/frontend/test/unit/SqlTypes.test.js
index 18b7bb6..6709293 100644
--- a/frontend/test/unit/SqlTypes.test.js
+++ b/modules/frontend/test/unit/SqlTypes.test.js
@@ -16,12 +16,11 @@
  */
 
 import SqlTypes from '../../app/services/SqlTypes.service';
+import {suite, test} from 'mocha';
+import {assert} from 'chai';
 
 const INSTANCE = new SqlTypes();
 
-import { suite, test } from 'mocha';
-import { assert } from 'chai';
-
 suite('SqlTypesTestsSuite', () => {
     test('validIdentifier', () => {
         assert.equal(INSTANCE.validIdentifier('myIdent'), true);
diff --git a/frontend/test/unit/UserAuth.test.js b/modules/frontend/test/unit/UserAuth.test.js
similarity index 96%
rename from frontend/test/unit/UserAuth.test.js
rename to modules/frontend/test/unit/UserAuth.test.js
index 7b6b24c..c8d63a2 100644
--- a/frontend/test/unit/UserAuth.test.js
+++ b/modules/frontend/test/unit/UserAuth.test.js
@@ -17,7 +17,7 @@
 
 // import AuthService from '../../app/modules/user/Auth.service';
 
-import { suite, test } from 'mocha';
+import {suite, test} from 'mocha';
 
 suite('AuthServiceTestsSuite', () => {
     test('SignIn', (done) => {
diff --git a/frontend/test/unit/defaultName.filter.test.js b/modules/frontend/test/unit/defaultName.filter.test.js
similarity index 98%
rename from frontend/test/unit/defaultName.filter.test.js
rename to modules/frontend/test/unit/defaultName.filter.test.js
index 7ecbd6f..2e66c9b 100644
--- a/frontend/test/unit/defaultName.filter.test.js
+++ b/modules/frontend/test/unit/defaultName.filter.test.js
@@ -17,7 +17,7 @@
 
 import defaultName from '../../app/filters/default-name.filter';
 
-import { assert } from 'chai';
+import {assert} from 'chai';
 
 const instance = defaultName();
 
diff --git a/frontend/tsconfig.json b/modules/frontend/tsconfig.json
similarity index 100%
rename from frontend/tsconfig.json
rename to modules/frontend/tsconfig.json
diff --git a/frontend/views/base.pug b/modules/frontend/views/base.pug
similarity index 100%
rename from frontend/views/base.pug
rename to modules/frontend/views/base.pug
diff --git a/frontend/views/index.pug b/modules/frontend/views/index.pug
similarity index 100%
rename from frontend/views/index.pug
rename to modules/frontend/views/index.pug
diff --git a/frontend/views/public.pug b/modules/frontend/views/public.pug
similarity index 100%
rename from frontend/views/public.pug
rename to modules/frontend/views/public.pug
diff --git a/frontend/views/sql/cache-metadata.tpl.pug b/modules/frontend/views/sql/cache-metadata.tpl.pug
similarity index 100%
rename from frontend/views/sql/cache-metadata.tpl.pug
rename to modules/frontend/views/sql/cache-metadata.tpl.pug
diff --git a/frontend/views/sql/chart-settings.tpl.pug b/modules/frontend/views/sql/chart-settings.tpl.pug
similarity index 100%
rename from frontend/views/sql/chart-settings.tpl.pug
rename to modules/frontend/views/sql/chart-settings.tpl.pug
diff --git a/frontend/views/sql/paragraph-rate.tpl.pug b/modules/frontend/views/sql/paragraph-rate.tpl.pug
similarity index 100%
rename from frontend/views/sql/paragraph-rate.tpl.pug
rename to modules/frontend/views/sql/paragraph-rate.tpl.pug
diff --git a/frontend/views/templates/agent-download.tpl.pug b/modules/frontend/views/templates/agent-download.tpl.pug
similarity index 100%
rename from frontend/views/templates/agent-download.tpl.pug
rename to modules/frontend/views/templates/agent-download.tpl.pug
diff --git a/frontend/views/templates/alert.tpl.pug b/modules/frontend/views/templates/alert.tpl.pug
similarity index 100%
rename from frontend/views/templates/alert.tpl.pug
rename to modules/frontend/views/templates/alert.tpl.pug
diff --git a/frontend/views/templates/batch-confirm.tpl.pug b/modules/frontend/views/templates/batch-confirm.tpl.pug
similarity index 100%
rename from frontend/views/templates/batch-confirm.tpl.pug
rename to modules/frontend/views/templates/batch-confirm.tpl.pug
diff --git a/frontend/views/templates/confirm.tpl.pug b/modules/frontend/views/templates/confirm.tpl.pug
similarity index 100%
rename from frontend/views/templates/confirm.tpl.pug
rename to modules/frontend/views/templates/confirm.tpl.pug
diff --git a/frontend/views/templates/demo-info.tpl.pug b/modules/frontend/views/templates/demo-info.tpl.pug
similarity index 100%
rename from frontend/views/templates/demo-info.tpl.pug
rename to modules/frontend/views/templates/demo-info.tpl.pug
diff --git a/frontend/views/templates/dropdown.tpl.pug b/modules/frontend/views/templates/dropdown.tpl.pug
similarity index 100%
rename from frontend/views/templates/dropdown.tpl.pug
rename to modules/frontend/views/templates/dropdown.tpl.pug
diff --git a/frontend/views/templates/getting-started.tpl.pug b/modules/frontend/views/templates/getting-started.tpl.pug
similarity index 100%
rename from frontend/views/templates/getting-started.tpl.pug
rename to modules/frontend/views/templates/getting-started.tpl.pug
diff --git a/frontend/views/templates/message.tpl.pug b/modules/frontend/views/templates/message.tpl.pug
similarity index 100%
rename from frontend/views/templates/message.tpl.pug
rename to modules/frontend/views/templates/message.tpl.pug
diff --git a/frontend/views/templates/validation-error.tpl.pug b/modules/frontend/views/templates/validation-error.tpl.pug
similarity index 100%
rename from frontend/views/templates/validation-error.tpl.pug
rename to modules/frontend/views/templates/validation-error.tpl.pug
diff --git a/frontend/webpack/webpack.common.js b/modules/frontend/webpack/webpack.common.js
similarity index 100%
rename from frontend/webpack/webpack.common.js
rename to modules/frontend/webpack/webpack.common.js
diff --git a/frontend/webpack/webpack.dev.js b/modules/frontend/webpack/webpack.dev.js
similarity index 100%
rename from frontend/webpack/webpack.dev.js
rename to modules/frontend/webpack/webpack.dev.js
diff --git a/frontend/webpack/webpack.prod.js b/modules/frontend/webpack/webpack.prod.js
similarity index 100%
rename from frontend/webpack/webpack.prod.js
rename to modules/frontend/webpack/webpack.prod.js
diff --git a/frontend/webpack/webpack.test.js b/modules/frontend/webpack/webpack.test.js
similarity index 100%
rename from frontend/webpack/webpack.test.js
rename to modules/frontend/webpack/webpack.test.js
diff --git a/web-agent/.gitignore b/modules/web-agent/.gitignore
similarity index 100%
rename from web-agent/.gitignore
rename to modules/web-agent/.gitignore
diff --git a/web-agent/README.txt b/modules/web-agent/README.txt
similarity index 100%
rename from web-agent/README.txt
rename to modules/web-agent/README.txt
diff --git a/web-agent/assembly/release-web-agent.xml b/modules/web-agent/assembly/release-web-agent.xml
similarity index 100%
rename from web-agent/assembly/release-web-agent.xml
rename to modules/web-agent/assembly/release-web-agent.xml
diff --git a/web-agent/bin/ignite-web-agent.bat b/modules/web-agent/bin/ignite-web-agent.bat
similarity index 100%
rename from web-agent/bin/ignite-web-agent.bat
rename to modules/web-agent/bin/ignite-web-agent.bat
diff --git a/web-agent/bin/ignite-web-agent.sh b/modules/web-agent/bin/ignite-web-agent.sh
similarity index 100%
rename from web-agent/bin/ignite-web-agent.sh
rename to modules/web-agent/bin/ignite-web-agent.sh
diff --git a/web-agent/bin/include/functions.sh b/modules/web-agent/bin/include/functions.sh
similarity index 100%
rename from web-agent/bin/include/functions.sh
rename to modules/web-agent/bin/include/functions.sh
diff --git a/web-agent/demo/README.txt b/modules/web-agent/demo/README.txt
similarity index 100%
rename from web-agent/demo/README.txt
rename to modules/web-agent/demo/README.txt
diff --git a/web-agent/demo/db-init.sql b/modules/web-agent/demo/db-init.sql
similarity index 100%
rename from web-agent/demo/db-init.sql
rename to modules/web-agent/demo/db-init.sql
diff --git a/web-agent/jdbc-drivers/README.txt b/modules/web-agent/jdbc-drivers/README.txt
similarity index 100%
rename from web-agent/jdbc-drivers/README.txt
rename to modules/web-agent/jdbc-drivers/README.txt
diff --git a/web-agent/logs/README.txt b/modules/web-agent/logs/README.txt
similarity index 100%
rename from web-agent/logs/README.txt
rename to modules/web-agent/logs/README.txt
diff --git a/web-agent/pom.xml b/modules/web-agent/pom.xml
similarity index 95%
rename from web-agent/pom.xml
rename to modules/web-agent/pom.xml
index 1eaad3b..bf6b9c1 100644
--- a/web-agent/pom.xml
+++ b/modules/web-agent/pom.xml
@@ -27,7 +27,7 @@
         <groupId>org.apache.ignite</groupId>
         <artifactId>ignite-parent</artifactId>
         <version>1</version>
-        <relativePath>../../../parent</relativePath>
+        <relativePath>../../parent</relativePath>
     </parent>
 
     <artifactId>ignite-web-agent</artifactId>
@@ -67,19 +67,19 @@
         <dependency>
             <groupId>org.apache.ignite</groupId>
             <artifactId>ignite-indexing</artifactId>
-            <version>${project.version}</version>
+            <version>${ignite.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.ignite</groupId>
             <artifactId>ignite-rest-http</artifactId>
-            <version>${project.version}</version>
+            <version>${ignite.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.ignite</groupId>
             <artifactId>ignite-spring</artifactId>
-            <version>${project.version}</version>
+            <version>${ignite.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.springframework</groupId>
@@ -99,7 +99,7 @@
         <dependency>
             <groupId>org.apache.ignite</groupId>
             <artifactId>ignite-slf4j</artifactId>
-            <version>${project.version}</version>
+            <version>${ignite.version}</version>
         </dependency>
 
         <dependency>
@@ -185,7 +185,7 @@
                             <descriptors>
                                 <descriptor>assembly/release-web-agent.xml</descriptor>
                             </descriptors>
-                            <finalName>ignite-web-agent-${project.version}</finalName>
+                            <finalName>ignite-web-agent-${ignite.version}</finalName>
                             <outputDirectory>target</outputDirectory>
                             <appendAssemblyId>false</appendAssemblyId>
                         </configuration>
diff --git a/web-agent/src/main/java/org/apache/ignite/console/agent/AgentConfiguration.java b/modules/web-agent/src/main/java/org/apache/ignite/console/agent/AgentConfiguration.java
similarity index 100%
rename from web-agent/src/main/java/org/apache/ignite/console/agent/AgentConfiguration.java
rename to modules/web-agent/src/main/java/org/apache/ignite/console/agent/AgentConfiguration.java
diff --git a/web-agent/src/main/java/org/apache/ignite/console/agent/AgentLauncher.java b/modules/web-agent/src/main/java/org/apache/ignite/console/agent/AgentLauncher.java
similarity index 100%
rename from web-agent/src/main/java/org/apache/ignite/console/agent/AgentLauncher.java
rename to modules/web-agent/src/main/java/org/apache/ignite/console/agent/AgentLauncher.java
diff --git a/web-agent/src/main/java/org/apache/ignite/console/agent/AgentUtils.java b/modules/web-agent/src/main/java/org/apache/ignite/console/agent/AgentUtils.java
similarity index 100%
rename from web-agent/src/main/java/org/apache/ignite/console/agent/AgentUtils.java
rename to modules/web-agent/src/main/java/org/apache/ignite/console/agent/AgentUtils.java
diff --git a/web-agent/src/main/java/org/apache/ignite/console/agent/ProxyAuthException.java b/modules/web-agent/src/main/java/org/apache/ignite/console/agent/ProxyAuthException.java
similarity index 100%
rename from web-agent/src/main/java/org/apache/ignite/console/agent/ProxyAuthException.java
rename to modules/web-agent/src/main/java/org/apache/ignite/console/agent/ProxyAuthException.java
diff --git a/web-agent/src/main/java/org/apache/ignite/console/agent/ProxyAuthenticator.java b/modules/web-agent/src/main/java/org/apache/ignite/console/agent/ProxyAuthenticator.java
similarity index 100%
rename from web-agent/src/main/java/org/apache/ignite/console/agent/ProxyAuthenticator.java
rename to modules/web-agent/src/main/java/org/apache/ignite/console/agent/ProxyAuthenticator.java
diff --git a/web-agent/src/main/java/org/apache/ignite/console/agent/db/DbColumn.java b/modules/web-agent/src/main/java/org/apache/ignite/console/agent/db/DbColumn.java
similarity index 100%
rename from web-agent/src/main/java/org/apache/ignite/console/agent/db/DbColumn.java
rename to modules/web-agent/src/main/java/org/apache/ignite/console/agent/db/DbColumn.java
diff --git a/web-agent/src/main/java/org/apache/ignite/console/agent/db/DbMetadataReader.java b/modules/web-agent/src/main/java/org/apache/ignite/console/agent/db/DbMetadataReader.java
similarity index 100%
rename from web-agent/src/main/java/org/apache/ignite/console/agent/db/DbMetadataReader.java
rename to modules/web-agent/src/main/java/org/apache/ignite/console/agent/db/DbMetadataReader.java
diff --git a/web-agent/src/main/java/org/apache/ignite/console/agent/db/DbSchema.java b/modules/web-agent/src/main/java/org/apache/ignite/console/agent/db/DbSchema.java
similarity index 100%
rename from web-agent/src/main/java/org/apache/ignite/console/agent/db/DbSchema.java
rename to modules/web-agent/src/main/java/org/apache/ignite/console/agent/db/DbSchema.java
diff --git a/web-agent/src/main/java/org/apache/ignite/console/agent/db/DbTable.java b/modules/web-agent/src/main/java/org/apache/ignite/console/agent/db/DbTable.java
similarity index 100%
rename from web-agent/src/main/java/org/apache/ignite/console/agent/db/DbTable.java
rename to modules/web-agent/src/main/java/org/apache/ignite/console/agent/db/DbTable.java
diff --git a/web-agent/src/main/java/org/apache/ignite/console/agent/db/dialect/DB2MetadataDialect.java b/modules/web-agent/src/main/java/org/apache/ignite/console/agent/db/dialect/DB2MetadataDialect.java
similarity index 100%
rename from web-agent/src/main/java/org/apache/ignite/console/agent/db/dialect/DB2MetadataDialect.java
rename to modules/web-agent/src/main/java/org/apache/ignite/console/agent/db/dialect/DB2MetadataDialect.java
diff --git a/web-agent/src/main/java/org/apache/ignite/console/agent/db/dialect/DatabaseMetadataDialect.java b/modules/web-agent/src/main/java/org/apache/ignite/console/agent/db/dialect/DatabaseMetadataDialect.java
similarity index 99%
rename from web-agent/src/main/java/org/apache/ignite/console/agent/db/dialect/DatabaseMetadataDialect.java
rename to modules/web-agent/src/main/java/org/apache/ignite/console/agent/db/dialect/DatabaseMetadataDialect.java
index 41db6c2..13faea0 100644
--- a/web-agent/src/main/java/org/apache/ignite/console/agent/db/dialect/DatabaseMetadataDialect.java
+++ b/modules/web-agent/src/main/java/org/apache/ignite/console/agent/db/dialect/DatabaseMetadataDialect.java
@@ -27,7 +27,6 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-
 import org.apache.ignite.cache.QueryIndex;
 import org.apache.ignite.cache.QueryIndexType;
 import org.apache.ignite.console.agent.db.DbColumn;
diff --git a/web-agent/src/main/java/org/apache/ignite/console/agent/db/dialect/JdbcMetadataDialect.java b/modules/web-agent/src/main/java/org/apache/ignite/console/agent/db/dialect/JdbcMetadataDialect.java
similarity index 99%
rename from web-agent/src/main/java/org/apache/ignite/console/agent/db/dialect/JdbcMetadataDialect.java
rename to modules/web-agent/src/main/java/org/apache/ignite/console/agent/db/dialect/JdbcMetadataDialect.java
index 4b401fc..c8cb24d 100644
--- a/web-agent/src/main/java/org/apache/ignite/console/agent/db/dialect/JdbcMetadataDialect.java
+++ b/modules/web-agent/src/main/java/org/apache/ignite/console/agent/db/dialect/JdbcMetadataDialect.java
@@ -28,7 +28,6 @@ import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-
 import org.apache.ignite.cache.QueryIndex;
 import org.apache.ignite.console.agent.db.DbColumn;
 import org.apache.ignite.console.agent.db.DbTable;
diff --git a/web-agent/src/main/java/org/apache/ignite/console/agent/db/dialect/MySQLMetadataDialect.java b/modules/web-agent/src/main/java/org/apache/ignite/console/agent/db/dialect/MySQLMetadataDialect.java
similarity index 100%
rename from web-agent/src/main/java/org/apache/ignite/console/agent/db/dialect/MySQLMetadataDialect.java
rename to modules/web-agent/src/main/java/org/apache/ignite/console/agent/db/dialect/MySQLMetadataDialect.java
diff --git a/web-agent/src/main/java/org/apache/ignite/console/agent/db/dialect/OracleMetadataDialect.java b/modules/web-agent/src/main/java/org/apache/ignite/console/agent/db/dialect/OracleMetadataDialect.java
similarity index 99%
rename from web-agent/src/main/java/org/apache/ignite/console/agent/db/dialect/OracleMetadataDialect.java
rename to modules/web-agent/src/main/java/org/apache/ignite/console/agent/db/dialect/OracleMetadataDialect.java
index 0708666..609510a 100644
--- a/web-agent/src/main/java/org/apache/ignite/console/agent/db/dialect/OracleMetadataDialect.java
+++ b/modules/web-agent/src/main/java/org/apache/ignite/console/agent/db/dialect/OracleMetadataDialect.java
@@ -32,7 +32,6 @@ import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-
 import org.apache.ignite.cache.QueryIndex;
 import org.apache.ignite.console.agent.db.DbColumn;
 import org.apache.ignite.console.agent.db.DbTable;
diff --git a/web-agent/src/main/java/org/apache/ignite/console/agent/handlers/AbstractListener.java b/modules/web-agent/src/main/java/org/apache/ignite/console/agent/handlers/AbstractListener.java
similarity index 100%
rename from web-agent/src/main/java/org/apache/ignite/console/agent/handlers/AbstractListener.java
rename to modules/web-agent/src/main/java/org/apache/ignite/console/agent/handlers/AbstractListener.java
diff --git a/web-agent/src/main/java/org/apache/ignite/console/agent/handlers/ClusterListener.java b/modules/web-agent/src/main/java/org/apache/ignite/console/agent/handlers/ClusterListener.java
similarity index 100%
rename from web-agent/src/main/java/org/apache/ignite/console/agent/handlers/ClusterListener.java
rename to modules/web-agent/src/main/java/org/apache/ignite/console/agent/handlers/ClusterListener.java
diff --git a/web-agent/src/main/java/org/apache/ignite/console/agent/handlers/DatabaseListener.java b/modules/web-agent/src/main/java/org/apache/ignite/console/agent/handlers/DatabaseListener.java
similarity index 100%
rename from web-agent/src/main/java/org/apache/ignite/console/agent/handlers/DatabaseListener.java
rename to modules/web-agent/src/main/java/org/apache/ignite/console/agent/handlers/DatabaseListener.java
diff --git a/web-agent/src/main/java/org/apache/ignite/console/agent/handlers/RestListener.java b/modules/web-agent/src/main/java/org/apache/ignite/console/agent/handlers/RestListener.java
similarity index 100%
rename from web-agent/src/main/java/org/apache/ignite/console/agent/handlers/RestListener.java
rename to modules/web-agent/src/main/java/org/apache/ignite/console/agent/handlers/RestListener.java
diff --git a/web-agent/src/main/java/org/apache/ignite/console/agent/rest/RestExecutor.java b/modules/web-agent/src/main/java/org/apache/ignite/console/agent/rest/RestExecutor.java
similarity index 100%
rename from web-agent/src/main/java/org/apache/ignite/console/agent/rest/RestExecutor.java
rename to modules/web-agent/src/main/java/org/apache/ignite/console/agent/rest/RestExecutor.java
diff --git a/web-agent/src/main/java/org/apache/ignite/console/agent/rest/RestResult.java b/modules/web-agent/src/main/java/org/apache/ignite/console/agent/rest/RestResult.java
similarity index 100%
rename from web-agent/src/main/java/org/apache/ignite/console/agent/rest/RestResult.java
rename to modules/web-agent/src/main/java/org/apache/ignite/console/agent/rest/RestResult.java
diff --git a/web-agent/src/main/java/org/apache/ignite/console/demo/AgentClusterDemo.java b/modules/web-agent/src/main/java/org/apache/ignite/console/demo/AgentClusterDemo.java
similarity index 100%
rename from web-agent/src/main/java/org/apache/ignite/console/demo/AgentClusterDemo.java
rename to modules/web-agent/src/main/java/org/apache/ignite/console/demo/AgentClusterDemo.java
diff --git a/web-agent/src/main/java/org/apache/ignite/console/demo/AgentDemoUtils.java b/modules/web-agent/src/main/java/org/apache/ignite/console/demo/AgentDemoUtils.java
similarity index 100%
rename from web-agent/src/main/java/org/apache/ignite/console/demo/AgentDemoUtils.java
rename to modules/web-agent/src/main/java/org/apache/ignite/console/demo/AgentDemoUtils.java
diff --git a/web-agent/src/main/java/org/apache/ignite/console/demo/AgentMetadataDemo.java b/modules/web-agent/src/main/java/org/apache/ignite/console/demo/AgentMetadataDemo.java
similarity index 100%
rename from web-agent/src/main/java/org/apache/ignite/console/demo/AgentMetadataDemo.java
rename to modules/web-agent/src/main/java/org/apache/ignite/console/demo/AgentMetadataDemo.java
diff --git a/web-agent/src/main/java/org/apache/ignite/console/demo/model/Car.java b/modules/web-agent/src/main/java/org/apache/ignite/console/demo/model/Car.java
similarity index 100%
rename from web-agent/src/main/java/org/apache/ignite/console/demo/model/Car.java
rename to modules/web-agent/src/main/java/org/apache/ignite/console/demo/model/Car.java
diff --git a/web-agent/src/main/java/org/apache/ignite/console/demo/model/Country.java b/modules/web-agent/src/main/java/org/apache/ignite/console/demo/model/Country.java
similarity index 100%
rename from web-agent/src/main/java/org/apache/ignite/console/demo/model/Country.java
rename to modules/web-agent/src/main/java/org/apache/ignite/console/demo/model/Country.java
diff --git a/web-agent/src/main/java/org/apache/ignite/console/demo/model/Department.java b/modules/web-agent/src/main/java/org/apache/ignite/console/demo/model/Department.java
similarity index 100%
rename from web-agent/src/main/java/org/apache/ignite/console/demo/model/Department.java
rename to modules/web-agent/src/main/java/org/apache/ignite/console/demo/model/Department.java
diff --git a/web-agent/src/main/java/org/apache/ignite/console/demo/model/Employee.java b/modules/web-agent/src/main/java/org/apache/ignite/console/demo/model/Employee.java
similarity index 100%
rename from web-agent/src/main/java/org/apache/ignite/console/demo/model/Employee.java
rename to modules/web-agent/src/main/java/org/apache/ignite/console/demo/model/Employee.java
diff --git a/web-agent/src/main/java/org/apache/ignite/console/demo/model/Parking.java b/modules/web-agent/src/main/java/org/apache/ignite/console/demo/model/Parking.java
similarity index 100%
rename from web-agent/src/main/java/org/apache/ignite/console/demo/model/Parking.java
rename to modules/web-agent/src/main/java/org/apache/ignite/console/demo/model/Parking.java
diff --git a/web-agent/src/main/java/org/apache/ignite/console/demo/service/DemoCachesLoadService.java b/modules/web-agent/src/main/java/org/apache/ignite/console/demo/service/DemoCachesLoadService.java
similarity index 100%
rename from web-agent/src/main/java/org/apache/ignite/console/demo/service/DemoCachesLoadService.java
rename to modules/web-agent/src/main/java/org/apache/ignite/console/demo/service/DemoCachesLoadService.java
diff --git a/web-agent/src/main/java/org/apache/ignite/console/demo/service/DemoComputeLoadService.java b/modules/web-agent/src/main/java/org/apache/ignite/console/demo/service/DemoComputeLoadService.java
similarity index 100%
rename from web-agent/src/main/java/org/apache/ignite/console/demo/service/DemoComputeLoadService.java
rename to modules/web-agent/src/main/java/org/apache/ignite/console/demo/service/DemoComputeLoadService.java
diff --git a/web-agent/src/main/java/org/apache/ignite/console/demo/service/DemoRandomCacheLoadService.java b/modules/web-agent/src/main/java/org/apache/ignite/console/demo/service/DemoRandomCacheLoadService.java
similarity index 100%
rename from web-agent/src/main/java/org/apache/ignite/console/demo/service/DemoRandomCacheLoadService.java
rename to modules/web-agent/src/main/java/org/apache/ignite/console/demo/service/DemoRandomCacheLoadService.java
diff --git a/web-agent/src/main/java/org/apache/ignite/console/demo/service/DemoServiceClusterSingleton.java b/modules/web-agent/src/main/java/org/apache/ignite/console/demo/service/DemoServiceClusterSingleton.java
similarity index 100%
rename from web-agent/src/main/java/org/apache/ignite/console/demo/service/DemoServiceClusterSingleton.java
rename to modules/web-agent/src/main/java/org/apache/ignite/console/demo/service/DemoServiceClusterSingleton.java
diff --git a/web-agent/src/main/java/org/apache/ignite/console/demo/service/DemoServiceKeyAffinity.java b/modules/web-agent/src/main/java/org/apache/ignite/console/demo/service/DemoServiceKeyAffinity.java
similarity index 100%
rename from web-agent/src/main/java/org/apache/ignite/console/demo/service/DemoServiceKeyAffinity.java
rename to modules/web-agent/src/main/java/org/apache/ignite/console/demo/service/DemoServiceKeyAffinity.java
diff --git a/web-agent/src/main/java/org/apache/ignite/console/demo/service/DemoServiceMultipleInstances.java b/modules/web-agent/src/main/java/org/apache/ignite/console/demo/service/DemoServiceMultipleInstances.java
similarity index 100%
rename from web-agent/src/main/java/org/apache/ignite/console/demo/service/DemoServiceMultipleInstances.java
rename to modules/web-agent/src/main/java/org/apache/ignite/console/demo/service/DemoServiceMultipleInstances.java
diff --git a/web-agent/src/main/java/org/apache/ignite/console/demo/service/DemoServiceNodeSingleton.java b/modules/web-agent/src/main/java/org/apache/ignite/console/demo/service/DemoServiceNodeSingleton.java
similarity index 100%
rename from web-agent/src/main/java/org/apache/ignite/console/demo/service/DemoServiceNodeSingleton.java
rename to modules/web-agent/src/main/java/org/apache/ignite/console/demo/service/DemoServiceNodeSingleton.java
diff --git a/web-agent/src/main/java/org/apache/ignite/console/demo/task/DemoCancellableTask.java b/modules/web-agent/src/main/java/org/apache/ignite/console/demo/task/DemoCancellableTask.java
similarity index 100%
rename from web-agent/src/main/java/org/apache/ignite/console/demo/task/DemoCancellableTask.java
rename to modules/web-agent/src/main/java/org/apache/ignite/console/demo/task/DemoCancellableTask.java
diff --git a/web-agent/src/main/java/org/apache/ignite/console/demo/task/DemoComputeTask.java b/modules/web-agent/src/main/java/org/apache/ignite/console/demo/task/DemoComputeTask.java
similarity index 100%
rename from web-agent/src/main/java/org/apache/ignite/console/demo/task/DemoComputeTask.java
rename to modules/web-agent/src/main/java/org/apache/ignite/console/demo/task/DemoComputeTask.java
diff --git a/web-agent/src/main/resources/log4j.properties b/modules/web-agent/src/main/resources/log4j.properties
similarity index 100%
rename from web-agent/src/main/resources/log4j.properties
rename to modules/web-agent/src/main/resources/log4j.properties
diff --git a/web-agent/src/test/java/org/apache/ignite/console/agent/rest/RestExecutorSelfTest.java b/modules/web-agent/src/test/java/org/apache/ignite/console/agent/rest/RestExecutorSelfTest.java
similarity index 99%
rename from web-agent/src/test/java/org/apache/ignite/console/agent/rest/RestExecutorSelfTest.java
rename to modules/web-agent/src/test/java/org/apache/ignite/console/agent/rest/RestExecutorSelfTest.java
index 514c7b8..40b5a67 100644
--- a/web-agent/src/test/java/org/apache/ignite/console/agent/rest/RestExecutorSelfTest.java
+++ b/modules/web-agent/src/test/java/org/apache/ignite/console/agent/rest/RestExecutorSelfTest.java
@@ -53,7 +53,7 @@ public class RestExecutorSelfTest {
     private static final String DEFAULT_CACHE_NAME = "default";
 
     /** Path to certificates and configs. */
-    private static final String PATH_TO_RESOURCES = "modules/web-console/web-agent/src/test/resources/";
+    private static final String PATH_TO_RESOURCES = "modules/web-agent/src/test/resources/";
 
     /** JSON object mapper. */
     private static final ObjectMapper MAPPER = new GridJettyObjectMapper();
diff --git a/web-agent/src/test/java/org/apache/ignite/testsuites/IgniteWebAgentTestSuite.java b/modules/web-agent/src/test/java/org/apache/ignite/testsuites/IgniteWebAgentTestSuite.java
similarity index 100%
rename from web-agent/src/test/java/org/apache/ignite/testsuites/IgniteWebAgentTestSuite.java
rename to modules/web-agent/src/test/java/org/apache/ignite/testsuites/IgniteWebAgentTestSuite.java
diff --git a/web-agent/src/test/resources/ca.jks b/modules/web-agent/src/test/resources/ca.jks
similarity index 100%
rename from web-agent/src/test/resources/ca.jks
rename to modules/web-agent/src/test/resources/ca.jks
diff --git a/web-agent/src/test/resources/client.jks b/modules/web-agent/src/test/resources/client.jks
similarity index 100%
rename from web-agent/src/test/resources/client.jks
rename to modules/web-agent/src/test/resources/client.jks
diff --git a/web-agent/src/test/resources/generate.bat b/modules/web-agent/src/test/resources/generate.bat
similarity index 100%
rename from web-agent/src/test/resources/generate.bat
rename to modules/web-agent/src/test/resources/generate.bat
diff --git a/web-agent/src/test/resources/generate.sh b/modules/web-agent/src/test/resources/generate.sh
similarity index 100%
rename from web-agent/src/test/resources/generate.sh
rename to modules/web-agent/src/test/resources/generate.sh
diff --git a/web-agent/src/test/resources/jetty-with-ciphers-0.xml b/modules/web-agent/src/test/resources/jetty-with-ciphers-0.xml
similarity index 95%
rename from web-agent/src/test/resources/jetty-with-ciphers-0.xml
rename to modules/web-agent/src/test/resources/jetty-with-ciphers-0.xml
index 5e705ac..4f26a47 100644
--- a/web-agent/src/test/resources/jetty-with-ciphers-0.xml
+++ b/modules/web-agent/src/test/resources/jetty-with-ciphers-0.xml
@@ -37,9 +37,9 @@
     </New>
 
     <New id="sslContextFactory" class="org.eclipse.jetty.util.ssl.SslContextFactory">
-        <Set name="keyStorePath">modules/web-console/web-agent/src/test/resources/server.jks</Set>
+        <Set name="keyStorePath">modules/web-agent/src/test/resources/server.jks</Set>
         <Set name="keyStorePassword">123456</Set>
-        <Set name="trustStorePath">modules/web-console/web-agent/src/test/resources/ca.jks</Set>
+        <Set name="trustStorePath">modules/web-agent/src/test/resources/ca.jks</Set>
         <Set name="trustStorePassword">123456</Set>
         <Set name="needClientAuth">true</Set>
         <Set name="includeCipherSuites">
diff --git a/web-agent/src/test/resources/jetty-with-ciphers-1.xml b/modules/web-agent/src/test/resources/jetty-with-ciphers-1.xml
similarity index 95%
rename from web-agent/src/test/resources/jetty-with-ciphers-1.xml
rename to modules/web-agent/src/test/resources/jetty-with-ciphers-1.xml
index cbcd37e..19c77ad 100644
--- a/web-agent/src/test/resources/jetty-with-ciphers-1.xml
+++ b/modules/web-agent/src/test/resources/jetty-with-ciphers-1.xml
@@ -37,9 +37,9 @@
     </New>
 
     <New id="sslContextFactory" class="org.eclipse.jetty.util.ssl.SslContextFactory">
-        <Set name="keyStorePath">modules/web-console/web-agent/src/test/resources/server.jks</Set>
+        <Set name="keyStorePath">modules/web-agent/src/test/resources/server.jks</Set>
         <Set name="keyStorePassword">123456</Set>
-        <Set name="trustStorePath">modules/web-console/web-agent/src/test/resources/ca.jks</Set>
+        <Set name="trustStorePath">modules/web-agent/src/test/resources/ca.jks</Set>
         <Set name="trustStorePassword">123456</Set>
         <Set name="needClientAuth">true</Set>
         <Set name="includeCipherSuites">
diff --git a/web-agent/src/test/resources/jetty-with-ciphers-2.xml b/modules/web-agent/src/test/resources/jetty-with-ciphers-2.xml
similarity index 95%
rename from web-agent/src/test/resources/jetty-with-ciphers-2.xml
rename to modules/web-agent/src/test/resources/jetty-with-ciphers-2.xml
index 2ca189e..5e5065f 100644
--- a/web-agent/src/test/resources/jetty-with-ciphers-2.xml
+++ b/modules/web-agent/src/test/resources/jetty-with-ciphers-2.xml
@@ -37,9 +37,9 @@
     </New>
 
     <New id="sslContextFactory" class="org.eclipse.jetty.util.ssl.SslContextFactory">
-        <Set name="keyStorePath">modules/web-console/web-agent/src/test/resources/server.jks</Set>
+        <Set name="keyStorePath">modules/web-agent/src/test/resources/server.jks</Set>
         <Set name="keyStorePassword">123456</Set>
-        <Set name="trustStorePath">modules/web-console/web-agent/src/test/resources/ca.jks</Set>
+        <Set name="trustStorePath">modules/web-agent/src/test/resources/ca.jks</Set>
         <Set name="trustStorePassword">123456</Set>
         <Set name="needClientAuth">true</Set>
         <Set name="includeCipherSuites">
diff --git a/web-agent/src/test/resources/jetty-with-ssl.xml b/modules/web-agent/src/test/resources/jetty-with-ssl.xml
similarity index 94%
rename from web-agent/src/test/resources/jetty-with-ssl.xml
rename to modules/web-agent/src/test/resources/jetty-with-ssl.xml
index 0b6ff1c..439f923 100644
--- a/web-agent/src/test/resources/jetty-with-ssl.xml
+++ b/modules/web-agent/src/test/resources/jetty-with-ssl.xml
@@ -37,9 +37,9 @@
     </New>
 
     <New id="sslContextFactory" class="org.eclipse.jetty.util.ssl.SslContextFactory">
-        <Set name="keyStorePath">modules/web-console/web-agent/src/test/resources/server.jks</Set>
+        <Set name="keyStorePath">modules/web-agent/src/test/resources/server.jks</Set>
         <Set name="keyStorePassword">123456</Set>
-        <Set name="trustStorePath">modules/web-console/web-agent/src/test/resources/ca.jks</Set>
+        <Set name="trustStorePath">modules/web-agent/src/test/resources/ca.jks</Set>
         <Set name="trustStorePassword">123456</Set>
         <Set name="needClientAuth">true</Set>
     </New>
diff --git a/web-agent/src/test/resources/server.jks b/modules/web-agent/src/test/resources/server.jks
similarity index 100%
rename from web-agent/src/test/resources/server.jks
rename to modules/web-agent/src/test/resources/server.jks
diff --git a/parent/pom.xml b/parent/pom.xml
new file mode 100644
index 0000000..0943e72
--- /dev/null
+++ b/parent/pom.xml
@@ -0,0 +1,230 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<!--
+    POM file.
+-->
+<project
+        xmlns="http://maven.apache.org/POM/4.0.0"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache</groupId>
+        <artifactId>apache</artifactId>
+        <version>16</version>
+    </parent>
+
+    <properties>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+
+        <!-- Dependency versions -->
+        <ignite.version>2.8.1</ignite.version>
+        <jackson.version>2.9.10</jackson.version>
+        <slf4j.version>1.7.7</slf4j.version>
+
+        <!-- Maven plugins versions -->
+        <maven.javadoc.plugin.version>3.2.0</maven.javadoc.plugin.version>
+    </properties>
+
+    <groupId>org.apache.ignite</groupId>
+    <artifactId>ignite-parent</artifactId>
+    <version>1</version>
+    <packaging>pom</packaging>
+
+    <url>http://ignite.apache.org</url>
+
+    <description>Web Console for Apache Ignite.</description>
+
+    <licenses>
+        <license>
+            <name>The Apache Software License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+        </license>
+    </licenses>
+
+    <mailingLists>
+        <mailingList>
+            <name>Ignite Dev List</name>
+            <subscribe>dev-subscribe@ignite.apache.org</subscribe>
+            <unsubscribe>dev-unsubscribe@ignite.apache.org</unsubscribe>
+            <post>dev@ignite.apache.org</post>
+            <archive>http://mail-archives.apache.org/mod_mbox/ignite-dev</archive>
+        </mailingList>
+    </mailingLists>
+
+    <issueManagement>
+        <system>jira</system>
+        <url>http://issues.apache.org/jira/browse/IGNITE</url>
+    </issueManagement>
+
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.13</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <profiles>
+        <profile>
+            <id>checkstyle</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-checkstyle-plugin</artifactId>
+                        <version>${maven.checkstyle.plugin.version}</version>
+                        <executions>
+                            <execution>
+                                <id>style</id>
+                                <goals>
+                                    <goal>check</goal>
+                                </goals>
+                                <phase>compile</phase>
+                                <configuration>
+                                    <consoleOutput>true</consoleOutput>
+                                    <logViolationsToConsole>true</logViolationsToConsole>
+                                    <failsOnError>true</failsOnError>
+                                    <failOnViolation>true</failOnViolation>
+                                    <outputFile>${project.build.directory}/checkstyle-result.xml</outputFile>
+                                    <configLocation>../checkstyle/checkstyle.xml</configLocation>
+                                    <suppressionsLocation>../checkstyle/checkstyle-suppressions.xml</suppressionsLocation>
+                                    <includeTestSourceDirectory>true</includeTestSourceDirectory>
+                                    <excludes>**/generated/**/*</excludes>
+                                </configuration>
+                            </execution>
+                        </executions>
+                        <dependencies>
+                            <dependency>
+                                <groupId>org.apache.ignite</groupId>
+                                <artifactId>ignite-tools</artifactId>
+                                <version>${project.version}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.puppycrawl.tools</groupId>
+                                <artifactId>checkstyle</artifactId>
+                                <version>${checkstyle.puppycrawl.version}</version>
+                            </dependency>
+                        </dependencies>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+        <profile>
+            <id>check-licenses</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.rat</groupId>
+                        <artifactId>apache-rat-plugin</artifactId>
+                        <version>0.12</version>
+                        <configuration>
+                            <addDefaultLicenseMatchers>false</addDefaultLicenseMatchers>
+                            <licenses>
+                                <license implementation="org.apache.rat.analysis.license.FullTextMatchingLicense">
+                                    <licenseFamilyCategory>IAL20</licenseFamilyCategory>
+                                    <licenseFamilyName>Ignite Apache License 2.0</licenseFamilyName>
+                                    <fullText>
+                                        Licensed to the Apache Software Foundation (ASF) under one or more
+                                        contributor license agreements.  See the NOTICE file distributed with
+                                        this work for additional information regarding copyright ownership.
+                                        The ASF licenses this file to You under the Apache License, Version 2.0
+                                        (the "License"); you may not use this file except in compliance with
+                                        the License.  You may obtain a copy of the License at
+
+                                        http://www.apache.org/licenses/LICENSE-2.0
+
+                                        Unless required by applicable law or agreed to in writing, software
+                                        distributed under the License is distributed on an "AS IS" BASIS,
+                                        WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+                                        See the License for the specific language governing permissions and
+                                        limitations under the License.
+                                    </fullText>
+                                </license>
+                            </licenses>
+                            <licenseFamilies>
+                                <licenseFamily implementation="org.apache.rat.license.SimpleLicenseFamily">
+                                    <familyName>Ignite Apache License 2.0</familyName>
+                                </licenseFamily>
+                            </licenseFamilies>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <phase>validate</phase>
+                                <goals>
+                                    <goal>check</goal>
+                                </goals>
+                                <configuration>
+                                    <excludes>
+                                        <exclude>work/**</exclude>
+                                        <exclude>**/target/**</exclude>
+                                        <exclude>**/*.log</exclude>
+                                        <exclude>**/licenses/*.txt</exclude><!--files of licenses-->
+                                        <exclude>**/*readme*.txt</exclude><!--readme files-->
+                                        <exclude>**/*.sql</exclude><!--sql files-->
+                                        <exclude>**/*README*.txt</exclude><!--readme files-->
+                                        <exclude>**/*README*.md</exclude><!--readme files-->
+                                        <exclude>**/*CONTRIBUTING*.md</exclude><!--readme files-->
+                                        <exclude>**/*index*.md</exclude><!--readme files-->
+                                        <exclude>**/*.timestamp</exclude><!--tmp-files-->
+                                        <exclude>**/*.iml</exclude><!--IDEA files-->
+                                        <exclude>**/*.csv</exclude><!--CSV files-->
+                                        <exclude>**/*.jks</exclude><!--bin-files-->
+                                        <exclude>**/pom-installed.xml</exclude><!--tmp-files-->
+                                        <exclude>**/keystore</exclude><!--bin-files-->
+                                        <exclude>**/keystore/*.jks</exclude><!--bin-files-->
+                                        <exclude>**/keystore/*.pem</exclude><!--auto generated files-->
+                                        <exclude>**/keystore/*.pfx</exclude><!--bin-files-->
+                                        <exclude>**/keystore/ca/*.jks</exclude><!--bin-files-->
+                                        <exclude>**/keystore/ca/*.key</exclude><!--bin-files-->
+                                        <exclude>**/keystore/ca/*.txt</exclude><!--auto generated files-->
+                                        <exclude>**/keystore/ca/*.txt.attr</exclude><!--auto generated files-->
+                                        <exclude>**/keystore/ca/*serial</exclude><!--auto generated files-->
+                                        <exclude>**/META-INF/services/**</exclude> <!-- Interface mappings: cannot be changed -->
+
+                                        <!-- Web Console -->
+                                        <exclude>**/web-console/**/.eslintrc</exclude>
+                                        <exclude>**/web-console/**/.babelrc</exclude>
+                                        <exclude>**/web-console/**/*.json</exclude>
+                                        <exclude>**/web-console/**/*.json.sample</exclude>
+                                        <exclude>**/web-console/backend/build/**</exclude>
+                                        <exclude>**/web-console/backend/node_modules/**</exclude>
+                                        <exclude>**/web-console/e2e/testcafe/node_modules/**</exclude>
+                                        <exclude>**/web-console/frontend/build/**</exclude>
+                                        <exclude>**/web-console/frontend/node_modules/**</exclude>
+                                        <exclude>**/web-console/frontend/**/*.png</exclude>
+                                        <exclude>**/web-console/frontend/**/*.svg</exclude>
+
+                                        <!-- Packaging -->
+                                        <exclude>packaging/**</exclude>
+                                    </excludes>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+</project>
diff --git a/pom.xml b/pom.xml
index 171a19a..c18cf81 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,12 +27,13 @@
         <groupId>org.apache.ignite</groupId>
         <artifactId>ignite-parent</artifactId>
         <version>1</version>
-        <relativePath>../../parent</relativePath>
+        <relativePath>parent</relativePath>
     </parent>
 
     <artifactId>ignite-web-console</artifactId>
     <version>2.10.0-SNAPSHOT</version>
     <url>http://ignite.apache.org</url>
+    <packaging>pom</packaging>
 
     <properties>
         <node.version>v8.11.2</node.version>
@@ -43,43 +44,10 @@
         <docker.standalone.image>web-console-standalone</docker.standalone.image>
     </properties>
 
-    <dependencies>
-        <!-- Ignite dependencies -->
-        <dependency>
-            <groupId>org.apache.ignite</groupId>
-            <artifactId>ignite-web-agent</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
-        <!-- Test dependencies -->
-        <dependency>
-            <groupId>org.apache.ignite</groupId>
-            <artifactId>ignite-hadoop</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.ignite</groupId>
-            <artifactId>ignite-aws</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.ignite</groupId>
-            <artifactId>ignite-hibernate_5.1</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.ignite</groupId>
-            <artifactId>ignite-urideploy</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
+    <modules>
+        <module>modules/web-agent</module>
+        <module>modules/compatibility</module>
+    </modules>
 
     <profiles>
         <profile>
@@ -409,18 +377,6 @@
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>test-jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-deploy-plugin</artifactId>
                 <configuration>
                     <skip>true</skip>