diff --git a/demo-shell/package.json b/demo-shell/package.json
index 771c923f23..d8d085166e 100644
--- a/demo-shell/package.json
+++ b/demo-shell/package.json
@@ -7,8 +7,8 @@
     "ng": "ng",
     "prestart": "npm run validate-config",
     "start": "npm run server-versions && rimraf dist && ng serve --host 0.0.0.0 --proxy-config proxy.conf.js --app dist --open",
-    "start:dev": " npm run lint && npm run server-versions && rimraf dist && npm run clean-lib-angular && concurrently \"ng serve --host 0.0.0.0 --disable-host-check --app dev pp-dev --proxy-config proxy.conf.js --open\" \"npm run style:dev --watch\" \"npm run copy:dev\" ",
-    "start:dist": "npm run server-versions && rimraf dist && node --max_old_space_size=30000 node_modules/.bin/ng serve --prod --host 0.0.0.0 --disable-host-check --app dist --proxy-config proxy.conf.js -open",
+    "start:dev": " npm run lint && npm run server-versions && rimraf dist && npm run clean-lib-angular && concurrently \"ng serve --host 0.0.0.0 --disable-host-check --app dev --proxy-config proxy.conf.js --open\" \"npm run style:dev --watch\" \"npm run copy:dev\" ",
+    "start:dist": "npm run server-versions && rimraf dist && ng serve --prod --host 0.0.0.0 --disable-host-check --app dist --proxy-config proxy.conf.js --open",
     "build": "npm run validate-config && npm run server-versions && rimraf dist && ng build --app dist",
     "build:dev": "npm run validate-config && npm run lint && npm run style:dev && npm run server-versions && rimraf dist && ng build --app dev",
     "build:dist": "npm run validate-config && npm run server-versions && rimraf dist && ng build --prod --app dist",
@@ -100,8 +100,7 @@
     "zone.js": "0.8.14"
   },
   "devDependencies": {
-    "@angular-devkit/core": "0.0.28",
-    "@angular/cli": "1.6.5",
+    "@angular/cli": "1.7.4",
     "@angular/compiler-cli": "^5.2.0",
     "@angular/language-service": "^5.2.0",
     "@types/jasmine": "~2.8.3",
diff --git a/lib/content-services/breadcrumb/public-api.ts b/lib/content-services/breadcrumb/public-api.ts
index 0c0fd3e774..1e8ac5ddb4 100644
--- a/lib/content-services/breadcrumb/public-api.ts
+++ b/lib/content-services/breadcrumb/public-api.ts
@@ -17,3 +17,5 @@
 
 export * from './breadcrumb.component';
 export * from './dropdown-breadcrumb.component';
+
+export * from './breadcrumb.module';
diff --git a/lib/content-services/content-metadata/public-api.ts b/lib/content-services/content-metadata/public-api.ts
index 5106171501..900d8df13e 100644
--- a/lib/content-services/content-metadata/public-api.ts
+++ b/lib/content-services/content-metadata/public-api.ts
@@ -15,12 +15,15 @@
  * limitations under the License.
  */
 
-export { ContentMetadataCardComponent } from './components/content-metadata-card/content-metadata-card.component';
-export { BasicPropertiesService } from './services/basic-properties.service';
-export { ContentMetadataService } from './services/content-metadata.service';
-export { PropertyDescriptorsService } from './services/property-descriptors.service';
-export { PropertyGroupTranslatorService } from './services/property-groups-translator.service';
-export { AspectOrientedConfigService } from './services/config/aspect-oriented-config.service';
-export { ContentMetadataConfigFactory } from './services/config/content-metadata-config.factory';
-export { IndifferentConfigService } from './services/config/indifferent-config.service';
-export { LayoutOrientedConfigService } from './services/config/layout-oriented-config.service';
+export * from './components/content-metadata-card/content-metadata-card.component';
+export * from './services/basic-properties.service';
+export * from './services/content-metadata.service';
+export * from './services/property-descriptors.service';
+export * from './services/property-groups-translator.service';
+export * from './services/config/content-metadata-config.factory';
+
+export * from './services/config/indifferent-config.service';
+export * from './services/config/layout-oriented-config.service';
+export * from './services/config/aspect-oriented-config.service';
+
+export * from './content-metadata.module';
diff --git a/lib/content-services/content-metadata/services/config/aspect-oriented-config.service.ts b/lib/content-services/content-metadata/services/config/aspect-oriented-config.service.ts
index a997509c78..3de9b02dc1 100644
--- a/lib/content-services/content-metadata/services/config/aspect-oriented-config.service.ts
+++ b/lib/content-services/content-metadata/services/config/aspect-oriented-config.service.ts
@@ -16,13 +16,13 @@
  */
 
 import { Injectable } from '@angular/core';
-import { ContentMetadataConfig, AspectOrientedConfig, OrganisedPropertyGroup, PropertyGroupContainer } from '../../interfaces/content-metadata.interfaces';
+import { ContentMetadataConfig, OrganisedPropertyGroup, PropertyGroupContainer } from '../../interfaces/content-metadata.interfaces';
 import { getGroup, getProperty } from './property-group-reader';
 
 @Injectable()
 export class AspectOrientedConfigService implements ContentMetadataConfig {
 
-    constructor(private config: AspectOrientedConfig) {}
+    constructor(private config: any) {}
 
     public isGroupAllowed(groupName: string): boolean {
         const groupNames = Object.keys(this.config);
diff --git a/lib/content-services/content-metadata/services/config/indifferent-config.service.ts b/lib/content-services/content-metadata/services/config/indifferent-config.service.ts
index 84471501b5..de55bc285c 100644
--- a/lib/content-services/content-metadata/services/config/indifferent-config.service.ts
+++ b/lib/content-services/content-metadata/services/config/indifferent-config.service.ts
@@ -16,17 +16,14 @@
  */
 
 import { Injectable } from '@angular/core';
-import {
-    ContentMetadataConfig,
-    InDifferentConfig,
-    OrganisedPropertyGroup,
+import { ContentMetadataConfig, OrganisedPropertyGroup,
     PropertyGroupContainer
 } from '../../interfaces/content-metadata.interfaces';
 
 @Injectable()
 export class IndifferentConfigService implements ContentMetadataConfig {
 
-    constructor(config: InDifferentConfig) {}
+    constructor(config: any) {}
 
     public isGroupAllowed(groupName: string): boolean {
         return true;
diff --git a/lib/content-services/content-metadata/services/config/layout-oriented-config.service.ts b/lib/content-services/content-metadata/services/config/layout-oriented-config.service.ts
index 20b565940f..4098212307 100644
--- a/lib/content-services/content-metadata/services/config/layout-oriented-config.service.ts
+++ b/lib/content-services/content-metadata/services/config/layout-oriented-config.service.ts
@@ -18,7 +18,6 @@
 import { Injectable } from '@angular/core';
 import {
     ContentMetadataConfig,
-    LayoutOrientedConfig,
     LayoutOrientedConfigItem,
     OrganisedPropertyGroup,
     PropertyGroupContainer
@@ -28,7 +27,7 @@ import { getProperty } from './property-group-reader';
 @Injectable()
 export class LayoutOrientedConfigService implements ContentMetadataConfig {
 
-    constructor(private config: LayoutOrientedConfig) {}
+    constructor(private config: any) {}
 
     public isGroupAllowed(groupName: string): boolean {
         return this.getMatchingGroups(groupName).length > 0;
diff --git a/lib/content-services/content-node-selector/public-api.ts b/lib/content-services/content-node-selector/public-api.ts
index e5247a1d0a..6b4ee5dfb2 100644
--- a/lib/content-services/content-node-selector/public-api.ts
+++ b/lib/content-services/content-node-selector/public-api.ts
@@ -21,3 +21,5 @@ export * from './content-node-selector-panel.component';
 export * from './content-node-selector.component';
 export * from './content-node-selector.service';
 export * from './content-node-dialog.service';
+
+export * from './content-node-selector.module';
diff --git a/lib/content-services/dialogs/public-api.ts b/lib/content-services/dialogs/public-api.ts
index 1ee5bb5d6e..dab370de9b 100644
--- a/lib/content-services/dialogs/public-api.ts
+++ b/lib/content-services/dialogs/public-api.ts
@@ -20,3 +20,5 @@ export * from './folder.dialog';
 export * from './node-lock.dialog';
 export * from './share.dialog';
 export * from './confirm.dialog';
+
+export * from './dialog.module';
diff --git a/lib/content-services/directives/public-api.ts b/lib/content-services/directives/public-api.ts
index a8f2d374a4..bc108d59f3 100644
--- a/lib/content-services/directives/public-api.ts
+++ b/lib/content-services/directives/public-api.ts
@@ -17,3 +17,5 @@
 
 export * from './node-download.directive';
 export * from './node-share.directive';
+
+export * from './content-directive.module';
diff --git a/lib/content-services/document-list/public-api.ts b/lib/content-services/document-list/public-api.ts
index 2bbabefeba..589e698348 100644
--- a/lib/content-services/document-list/public-api.ts
+++ b/lib/content-services/document-list/public-api.ts
@@ -42,3 +42,5 @@ export * from './models/content-action.model';
 export * from './models/document-library.model';
 export * from './models/permissions.model';
 export * from './models/permissions-style.model';
+
+export * from './document-list.module';
diff --git a/lib/content-services/folder-directive/public-api.ts b/lib/content-services/folder-directive/public-api.ts
index 1ab82b1839..b7fa62fe1c 100644
--- a/lib/content-services/folder-directive/public-api.ts
+++ b/lib/content-services/folder-directive/public-api.ts
@@ -17,3 +17,5 @@
 
 export * from './folder-create.directive';
 export * from './folder-edit.directive';
+
+export * from './folder-directive.module';
diff --git a/lib/content-services/index.ts b/lib/content-services/index.ts
index fd6832da53..94f6543f5b 100644
--- a/lib/content-services/index.ts
+++ b/lib/content-services/index.ts
@@ -15,36 +15,20 @@
  * limitations under the License.
  */
 
-export * from './content.module';
-
-export * from './social/social.module';
-export * from './tag/tag.module';
-export * from './webscript/webscript.module';
-export * from './document-list/document-list.module';
-export * from './upload/upload.module';
-export * from './search/search.module';
-export * from './site-dropdown/sites-dropdown.module';
-export * from './breadcrumb/breadcrumb.module';
-export * from './version-manager/version-manager.module';
-export * from './content-node-selector/content-node-selector.module';
-export * from './dialogs/dialog.module';
-export * from './folder-directive/folder-directive.module';
-export * from './content-metadata/content-metadata.module';
-export * from './directives/content-directive.module';
-export * from './permission-manager/permission-manager.module';
-
-export * from './directives';
-export * from './social';
-export * from './tag';
-export * from './webscript';
-export * from './document-list';
-export * from './upload';
-export * from './search';
-export * from './site-dropdown';
-export * from './breadcrumb';
-export * from './version-manager';
-export * from './content-node-selector';
-export * from './dialogs';
-export * from './folder-directive';
-export * from './content-metadata';
+export * from './directives/index';
+export * from './social/index';
+export * from './tag/index';
+export * from './webscript/index';
+export * from './document-list/index';
+export * from './upload/index';
+export * from './search/index';
+export * from './site-dropdown/index';
+export * from './breadcrumb/index';
+export * from './version-manager/index';
+export * from './content-node-selector/index';
+export * from './dialogs/index';
+export * from './folder-directive/index';
+export * from './content-metadata/index';
 export * from './permission-manager';
+
+export * from './content.module';
diff --git a/lib/content-services/permission-manager/public-api.ts b/lib/content-services/permission-manager/public-api.ts
index 4b1f46f576..a1d5c9ceb7 100644
--- a/lib/content-services/permission-manager/public-api.ts
+++ b/lib/content-services/permission-manager/public-api.ts
@@ -15,7 +15,9 @@
  * limitations under the License.
  */
 
- export * from './components/permission-list/permission-list.component';
- export * from './components/inherited-button.directive';
- export * from './services/node-permission.service';
- export * from './models/permission.model';
+export * from './components/permission-list/permission-list.component';
+export * from './components/inherited-button.directive';
+export * from './services/node-permission.service';
+export * from './models/permission.model';
+
+export * from './permission-manager.module';
diff --git a/lib/content-services/search/public-api.ts b/lib/content-services/search/public-api.ts
index 18ad1f7552..0e66590069 100644
--- a/lib/content-services/search/public-api.ts
+++ b/lib/content-services/search/public-api.ts
@@ -34,3 +34,5 @@ export * from './components/search-trigger.directive';
 export * from './components/empty-search-result.component';
 export * from './components/search-filter/search-filter.component';
 export * from './components/search-chip-list/search-chip-list.component';
+
+export * from './search.module';
diff --git a/lib/content-services/site-dropdown/public-api.ts b/lib/content-services/site-dropdown/public-api.ts
index df5de69d30..a0ca7c76bc 100644
--- a/lib/content-services/site-dropdown/public-api.ts
+++ b/lib/content-services/site-dropdown/public-api.ts
@@ -16,3 +16,5 @@
  */
 
 export * from './sites-dropdown.component';
+
+export * from './sites-dropdown.module';
diff --git a/lib/content-services/social/public-api.ts b/lib/content-services/social/public-api.ts
index f0bc0d9c1b..685f2f7780 100644
--- a/lib/content-services/social/public-api.ts
+++ b/lib/content-services/social/public-api.ts
@@ -19,3 +19,5 @@ export * from './rating.component';
 export * from './like.component';
 
 export * from './services/rating.service';
+
+export * from './social.module';
diff --git a/lib/content-services/tag/public-api.ts b/lib/content-services/tag/public-api.ts
index 698fafacfe..c264dc8ecb 100644
--- a/lib/content-services/tag/public-api.ts
+++ b/lib/content-services/tag/public-api.ts
@@ -20,3 +20,5 @@ export * from './tag-list.component';
 export * from './tag-node-list.component';
 
 export * from './services/tag.service';
+
+export * from './tag.module';
diff --git a/lib/content-services/upload/public-api.ts b/lib/content-services/upload/public-api.ts
index a9379cff6f..be5289313a 100644
--- a/lib/content-services/upload/public-api.ts
+++ b/lib/content-services/upload/public-api.ts
@@ -25,3 +25,5 @@ export * from './components/file-uploading-list-row.component';
 export * from './directives/file-draggable.directive';
 
 export * from './components/base-upload/upload-base';
+
+export * from './upload.module';
diff --git a/lib/content-services/version-manager/public-api.ts b/lib/content-services/version-manager/public-api.ts
index fa3187d8d3..cb6154bcc0 100644
--- a/lib/content-services/version-manager/public-api.ts
+++ b/lib/content-services/version-manager/public-api.ts
@@ -18,3 +18,5 @@
 export * from './version-list.component';
 export * from './version-manager.component';
 export * from './version-upload.component';
+
+export * from './version-manager.module';
diff --git a/lib/content-services/webscript/public-api.ts b/lib/content-services/webscript/public-api.ts
index 4553bb86ff..9d288621d4 100644
--- a/lib/content-services/webscript/public-api.ts
+++ b/lib/content-services/webscript/public-api.ts
@@ -16,3 +16,5 @@
  */
 
 export * from './webscript.component';
+
+export * from './webscript.module';
diff --git a/lib/core/app-config/public-api.ts b/lib/core/app-config/public-api.ts
index 525f118217..f1eec1d6c2 100644
--- a/lib/core/app-config/public-api.ts
+++ b/lib/core/app-config/public-api.ts
@@ -16,3 +16,5 @@
  */
 
 export * from './app-config.service';
+
+export * from './app-config.module';
diff --git a/lib/core/card-view/public-api.ts b/lib/core/card-view/public-api.ts
index 6d6b8d8bc0..68ec4b151c 100644
--- a/lib/core/card-view/public-api.ts
+++ b/lib/core/card-view/public-api.ts
@@ -28,3 +28,5 @@ export * from './validators/card-view.validators';
 export * from './models/card-view.models';
 export * from './services/card-view.services';
 export * from './directives/card-view-content-proxy.directive';
+
+export * from './card-view.module';
diff --git a/lib/core/collapsable/public-api.ts b/lib/core/collapsable/public-api.ts
index ec2f49afd5..764809d4bb 100644
--- a/lib/core/collapsable/public-api.ts
+++ b/lib/core/collapsable/public-api.ts
@@ -17,3 +17,5 @@
 
 export * from './accordion-group.component';
 export * from './accordion.component';
+
+export * from './collapsable.module';
diff --git a/lib/core/comments/public-api.ts b/lib/core/comments/public-api.ts
index 0d90f17352..f142a50639 100644
--- a/lib/core/comments/public-api.ts
+++ b/lib/core/comments/public-api.ts
@@ -17,3 +17,5 @@
 
 export * from './comment-list.component';
 export * from './comments.component';
+
+export * from './comments.module';
diff --git a/lib/core/data-column/public-api.ts b/lib/core/data-column/public-api.ts
index bd1d36ebf5..61d7507a95 100644
--- a/lib/core/data-column/public-api.ts
+++ b/lib/core/data-column/public-api.ts
@@ -17,3 +17,5 @@
 
 export * from './data-column-list.component';
 export * from './data-column.component';
+
+export * from './data-column.module';
diff --git a/lib/core/datatable/components/datatable/datatable.component.ts b/lib/core/datatable/components/datatable/datatable.component.ts
index c0c297ab17..9cc9e52d7f 100644
--- a/lib/core/datatable/components/datatable/datatable.component.ts
+++ b/lib/core/datatable/components/datatable/datatable.component.ts
@@ -29,7 +29,7 @@ import { DataRowEvent } from '../../data/data-row-event.model';
 import { DataRow } from '../../data/data-row.model';
 import { DataSorting } from '../../data/data-sorting.model';
 import { DataTableAdapter } from '../../data/datatable-adapter';
-import { ThumbnailService } from '../../../services';
+import { ThumbnailService } from '../../../services/thumbnail.service';
 
 import { ObjectDataRow } from '../../data/object-datarow.model';
 import { ObjectDataTableAdapter } from '../../data/object-datatable-adapter';
diff --git a/lib/core/datatable/public-api.ts b/lib/core/datatable/public-api.ts
index cab9abbf48..ddde741fe0 100644
--- a/lib/core/datatable/public-api.ts
+++ b/lib/core/datatable/public-api.ts
@@ -39,3 +39,5 @@ export * from './components/datatable/location-cell.component';
 export * from './directives/loading-template.directive';
 export * from './directives/no-content-template.directive';
 export * from './directives/no-permission-template.directive';
+
+export * from './datatable.module';
diff --git a/lib/core/directives/public-api.ts b/lib/core/directives/public-api.ts
index ab67eb7ff9..da1370d4af 100644
--- a/lib/core/directives/public-api.ts
+++ b/lib/core/directives/public-api.ts
@@ -22,3 +22,5 @@ export * from './node-favorite.directive';
 export * from './node-permission.directive';
 export * from './node-restore.directive';
 export * from './upload.directive';
+
+export * from './directive.module';
diff --git a/lib/core/form/public-api.ts b/lib/core/form/public-api.ts
index bfc50da1cc..264d34622d 100644
--- a/lib/core/form/public-api.ts
+++ b/lib/core/form/public-api.ts
@@ -30,3 +30,5 @@ export * from './services/process-content.service';
 export * from './services/activiti-alfresco.service';
 
 export * from './events/index';
+
+export * from './form.module';
diff --git a/lib/core/index.ts b/lib/core/index.ts
index c3e5c4208c..a95dd93036 100644
--- a/lib/core/index.ts
+++ b/lib/core/index.ts
@@ -15,53 +15,33 @@
  * limitations under the License.
  */
 
+export * from './viewer/index';
+export * from './userinfo/index';
+export * from './toolbar/index';
+export * from './settings/index';
+export * from './pagination/index';
+export * from './login/index';
+export * from './language-menu/index';
+export * from './info-drawer/index';
+export * from './sidebar/index';
+export * from './data-column/index';
+export * from './datatable/index';
+export * from './context-menu/index';
+export * from './collapsable/index';
+export * from './card-view/index';
+export * from './app-config/index';
+export * from './form/index';
+export * from './sidenav-layout/index';
+export * from './comments/index';
+
+export * from './pipes/index';
+export * from './services/index';
+export * from './directives/index';
+
+export * from './utils/index';
+export * from './interface/index';
+export * from './models/index';
+export * from './events/index';
+export * from './mock/index';
+
 export * from './core.module';
-
-export * from './viewer/viewer.module';
-export * from './userinfo/userinfo.module';
-export * from './toolbar/toolbar.module';
-export * from './settings/host-settings.module';
-export * from './pagination/pagination.module';
-export * from './login/login.module';
-export * from './language-menu/language-menu.module';
-export * from './info-drawer/info-drawer.module';
-export * from './data-column/data-column.module';
-export * from './datatable/datatable.module';
-export * from './context-menu/context-menu.module';
-export * from './collapsable/collapsable.module';
-export * from './card-view/card-view.module';
-export * from './app-config/app-config.module';
-export * from './form/form.module';
-export * from './sidenav-layout/sidenav-layout.module';
-export * from './pipes/pipe.module';
-export * from './directives/directive.module';
-export * from './comments/comments.module';
-
-export * from './viewer';
-export * from './userinfo';
-export * from './toolbar';
-export * from './settings';
-export * from './pagination';
-export * from './login';
-export * from './language-menu';
-export * from './info-drawer';
-export * from './sidebar';
-export * from './data-column';
-export * from './datatable';
-export * from './context-menu';
-export * from './collapsable';
-export * from './card-view';
-export * from './app-config';
-export * from './form';
-export * from './sidenav-layout';
-export * from './comments';
-
-export * from './pipes';
-export * from './services';
-export * from './directives';
-
-export * from './utils';
-export * from './interface';
-export * from './models';
-export * from './events';
-export * from './mock';
diff --git a/lib/core/info-drawer/public-api.ts b/lib/core/info-drawer/public-api.ts
index 360822491d..a3d16721e9 100644
--- a/lib/core/info-drawer/public-api.ts
+++ b/lib/core/info-drawer/public-api.ts
@@ -17,3 +17,5 @@
 
 export * from './info-drawer-layout.component';
 export * from './info-drawer.component';
+
+export * from './info-drawer.module';
diff --git a/lib/core/language-menu/public-api.ts b/lib/core/language-menu/public-api.ts
index ce3dc00e07..87d2ac9368 100644
--- a/lib/core/language-menu/public-api.ts
+++ b/lib/core/language-menu/public-api.ts
@@ -16,3 +16,5 @@
  */
 
 export * from './language-menu.component';
+
+export * from './language-menu.module';
diff --git a/lib/core/pagination/public-api.ts b/lib/core/pagination/public-api.ts
index 9234c4c96f..b653e0c72a 100644
--- a/lib/core/pagination/public-api.ts
+++ b/lib/core/pagination/public-api.ts
@@ -19,3 +19,5 @@ export * from './pagination.component';
 export * from './infinite-pagination.component';
 export * from './paginated-component.interface';
 export * from './pagination-component.interface';
+
+export * from './pagination.module';
diff --git a/lib/core/pipes/public-api.ts b/lib/core/pipes/public-api.ts
index d36dd4cb3c..3ff5d5af91 100644
--- a/lib/core/pipes/public-api.ts
+++ b/lib/core/pipes/public-api.ts
@@ -21,3 +21,5 @@ export * from './node-name-tooltip.pipe';
 export * from './text-highlight.pipe';
 export * from './time-ago.pipe';
 export * from './user-initial.pipe';
+
+export * from './pipe.module';
diff --git a/lib/core/settings/public-api.ts b/lib/core/settings/public-api.ts
index f9337f341c..3898afd3d7 100644
--- a/lib/core/settings/public-api.ts
+++ b/lib/core/settings/public-api.ts
@@ -16,3 +16,5 @@
  */
 
 export * from './host-settings.component';
+
+export * from './host-settings.module';
diff --git a/lib/core/sidenav-layout/public-api.ts b/lib/core/sidenav-layout/public-api.ts
index f4ddfbd0b1..300a5ec5b5 100644
--- a/lib/core/sidenav-layout/public-api.ts
+++ b/lib/core/sidenav-layout/public-api.ts
@@ -16,3 +16,5 @@
  */
 
 export * from './components/sidenav-layout/sidenav-layout.component';
+
+export * from './sidenav-layout.module';
diff --git a/lib/core/toolbar/public-api.ts b/lib/core/toolbar/public-api.ts
index e1bab3768a..a9c342342a 100644
--- a/lib/core/toolbar/public-api.ts
+++ b/lib/core/toolbar/public-api.ts
@@ -18,3 +18,5 @@
 export * from './toolbar-divider.component';
 export * from './toolbar-title.component';
 export * from './toolbar.component';
+
+export * from './toolbar.module';
diff --git a/lib/core/userinfo/public-api.ts b/lib/core/userinfo/public-api.ts
index 488ede49b6..1e4709092c 100644
--- a/lib/core/userinfo/public-api.ts
+++ b/lib/core/userinfo/public-api.ts
@@ -18,3 +18,5 @@
 export * from './components/user-info.component';
 export * from './services/bpm-user.service';
 export * from './services/ecm-user.service';
+
+export * from './userinfo.module';
diff --git a/lib/core/viewer/public-api.ts b/lib/core/viewer/public-api.ts
index 42bf483599..856057e1d4 100644
--- a/lib/core/viewer/public-api.ts
+++ b/lib/core/viewer/public-api.ts
@@ -31,3 +31,5 @@ export * from './components/viewer-toolbar-actions.component';
 export * from './components/viewer.component';
 
 export * from './directives/viewer-extension.directive';
+
+export * from './viewer.module';
diff --git a/lib/insights/analytics-process/public-api.ts b/lib/insights/analytics-process/public-api.ts
index f79e735584..59dacfb4eb 100644
--- a/lib/insights/analytics-process/public-api.ts
+++ b/lib/insights/analytics-process/public-api.ts
@@ -21,3 +21,5 @@ export * from './components/analytics-report-list.component';
 export * from './components/analytics-report-parameters.component';
 
 export * from './services/analytics.service';
+
+export * from './analytics-process.module';
diff --git a/lib/insights/diagram/public-api.ts b/lib/insights/diagram/public-api.ts
index 7d1b08c069..19d0c230ef 100644
--- a/lib/insights/diagram/public-api.ts
+++ b/lib/insights/diagram/public-api.ts
@@ -45,3 +45,5 @@ export * from './models/report/reportDefinition.model';
 export * from './models/report/reportParameterDetails.model';
 export * from './models/report/reportParameters.model';
 export * from './models/report/reportQuery.model';
+
+export * from './diagram.module';
diff --git a/lib/insights/index.ts b/lib/insights/index.ts
index e9b19ef037..19b8492e1e 100644
--- a/lib/insights/index.ts
+++ b/lib/insights/index.ts
@@ -15,10 +15,7 @@
  * limitations under the License.
  */
 
+export * from './analytics-process/index';
+export * from './diagram/index';
+
 export * from './insights.module';
-
-export * from './analytics-process/analytics-process.module';
-export * from './diagram/diagram.module';
-
-export * from './analytics-process';
-export * from './diagram';
diff --git a/lib/process-services/app-list/public-api.ts b/lib/process-services/app-list/public-api.ts
index 48eb0254f0..9d3a028e27 100644
--- a/lib/process-services/app-list/public-api.ts
+++ b/lib/process-services/app-list/public-api.ts
@@ -17,3 +17,5 @@
 
 export * from './apps-list.component';
 export * from './select-apps-dialog-component';
+
+export * from './apps-list.module';
diff --git a/lib/process-services/attachment/public-api.ts b/lib/process-services/attachment/public-api.ts
index 114020d82b..31955fcb88 100644
--- a/lib/process-services/attachment/public-api.ts
+++ b/lib/process-services/attachment/public-api.ts
@@ -19,3 +19,5 @@ export * from './task-attachment-list.component';
 export * from './process-attachment-list.component';
 export * from './create-process-attachment.component';
 export * from './create-task-attachment.component';
+
+export * from './attachment.module';
diff --git a/lib/process-services/content-widget/public-api.ts b/lib/process-services/content-widget/public-api.ts
index 592b6804b9..ed02aab9f0 100644
--- a/lib/process-services/content-widget/public-api.ts
+++ b/lib/process-services/content-widget/public-api.ts
@@ -17,3 +17,5 @@
 
 export * from './attach-file-widget.component';
 export * from './attach-folder-widget.component';
+
+export * from './content-widget.module';
diff --git a/lib/process-services/index.ts b/lib/process-services/index.ts
index e459b12c77..7e05146622 100644
--- a/lib/process-services/index.ts
+++ b/lib/process-services/index.ts
@@ -15,31 +15,19 @@
  * limitations under the License.
  */
 
-export * from './process.module';
-
-export * from './process-list/process-list.module';
-export * from './task-list/task-list.module';
-export * from './app-list/apps-list.module';
-export * from './attachment/attachment.module';
-
 /** @deprecated in 2.3.0, part of the module moved in the core */
 export { CommentsModule } from '@alfresco/adf-core';
-
-export * from './process-comments/process-comments.module';
-
-export * from './people/people.module';
-export * from './content-widget/content-widget.module';
-
-export * from './process-list';
-export * from './task-list';
-export * from './app-list';
-export * from './attachment';
-
 /** @deprecated in 2.3.0, component moved in the core */
 export { CommentListComponent } from '@alfresco/adf-core';
 /** @deprecated in 2.3.0, component moved in the core */
 export { CommentsComponent } from '@alfresco/adf-core';
 
-export * from './process-comments';
-export * from './people';
-export * from './content-widget';
+export * from './process-list/index';
+export * from './task-list/index';
+export * from './app-list/index';
+export * from './attachment/index';
+export * from './process-comments/index';
+export * from './people/index';
+export * from './content-widget/index';
+
+export * from './process.module';
diff --git a/lib/process-services/people/public-api.ts b/lib/process-services/people/public-api.ts
index 8fda01de55..4d6c754e05 100644
--- a/lib/process-services/people/public-api.ts
+++ b/lib/process-services/people/public-api.ts
@@ -25,3 +25,5 @@ export * from './interfaces/perform-search-callback.interface';
 
 export * from './directives/people-search-action-label.directive';
 export * from './directives/people-search-title.directive';
+
+export * from './people.module';
diff --git a/lib/process-services/process-comments/public-api.ts b/lib/process-services/process-comments/public-api.ts
index 6b3195aa5c..fa1fe513b8 100644
--- a/lib/process-services/process-comments/public-api.ts
+++ b/lib/process-services/process-comments/public-api.ts
@@ -16,3 +16,5 @@
  */
 
 export * from './process-comments.component';
+
+export * from './process-comments.module';
diff --git a/lib/process-services/process-list/public-api.ts b/lib/process-services/process-list/public-api.ts
index c43c21ca29..2063e10006 100644
--- a/lib/process-services/process-list/public-api.ts
+++ b/lib/process-services/process-list/public-api.ts
@@ -34,3 +34,5 @@ export * from './models/process-definition.model';
 export * from './models/process-instance.model';
 export * from './models/process-instance-filter.model';
 export * from './models/process-instance-variable.model';
+
+export * from './process-list.module';
diff --git a/lib/process-services/task-list/public-api.ts b/lib/process-services/task-list/public-api.ts
index 031f1e8d2f..fcfc927ea9 100644
--- a/lib/process-services/task-list/public-api.ts
+++ b/lib/process-services/task-list/public-api.ts
@@ -38,3 +38,5 @@ export * from './models/task-details.model';
 export * from './models/task-list.model';
 export * from './models/user-event.model';
 export * from './models/user-group.model';
+
+export * from './task-list.module';