diff --git a/docs/README.md b/docs/README.md
index dd073c0e38..db493421cf 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -53,8 +53,8 @@ for more information about installing and using the source code.
 | Name | Description | Source link |
 | ---- | ----------- | ----------- |
 | [Card view component](card-view.component.md) | Displays a configurable property list renderer. | [Source](../lib/core/card-view/components/card-view/card-view.component.ts) |
-| [Accordion group component](accordion-group.component.md) | Adds a collapsible panel to an [accordion menu](accordion.component.md). | [Source](../lib/core/collapsable/accordion-group.component.ts) |
-| [Accordion component](accordion.component.md) | Creates a collapsible accordion menu. | [Source](../lib/core/collapsable/accordion.component.ts) |
+| [Accordion group component](core/accordion-group.component.md) | Adds a collapsible panel to an accordion menu. | [Source](../lib/core/collapsable/accordion-group.component.ts) |
+| [Accordion component](core/accordion.component.md) | Creates a collapsible accordion menu. | [Source](../lib/core/collapsable/accordion.component.ts) |
 | [Data column component](data-column.component.md) | Defines column properties for DataTable, Tasklist, Document List and other components. | [Source](../lib/core/data-column/data-column.component.ts) |
 | [Datatable component](datatable.component.md) | Displays data as a table with customizable columns and presentation. | [Source](../lib/core/datatable/components/datatable/datatable.component.ts) |
 | [Form field component](form-field.component.md) | A form field in an APS form. | [Source](../lib/core/form/components/form-field/form-field.component.ts) |
@@ -81,35 +81,35 @@ for more information about installing and using the source code.
 | Name | Description | Source link |
 | ---- | ----------- | ----------- |
 | [Context menu directive](context-menu.directive.md) | Adds a context menu to a component. | [Source](../lib/core/context-menu/context-menu.directive.ts) |
-| [Highlight directive](highlight.directive.md) | Adds highlighting to selected sections of an HTML element's content. | [Source](../lib/core/directives/highlight.directive.ts) |
+| [Highlight directive](core/highlight.directive.md) | Adds highlighting to selected sections of an HTML element's content. | [Source](../lib/core/directives/highlight.directive.ts) |
 | [Logout directive](logout.directive.md) | Logs the user out when the decorated element is clicked. | [Source](../lib/core/directives/logout.directive.ts) |
 | [Node delete directive](node-delete.directive.md) | Deletes multiple files and folders. | [Source](../lib/core/directives/node-delete.directive.ts) |
 | [Node favorite directive](node-favorite.directive.md) | Selectively toggles nodes as favorite | [Source](../lib/core/directives/node-favorite.directive.ts) |
 | [Node permission directive](node-permission.directive.md) | Selectively disables an HTML element or Angular component | [Source](../lib/core/directives/node-permission.directive.ts) |
 | [Node restore directive](node-restore.directive.md) | Restores deleted nodes to their original location. | [Source](../lib/core/directives/node-restore.directive.ts) |
-| [Upload directive](upload.directive.md) | Allows your components or common HTML elements reacting on File drag and drop in order to upload content. | [Source](../lib/core/directives/upload.directive.ts) |
+| [Upload directive](core/upload.directive.md) | Allows your components or common HTML elements reacting on File drag and drop in order to upload content. | [Source](../lib/core/directives/upload.directive.ts) |
 
 ## Models
 
 | Name | Description | Source link |
 | ---- | ----------- | ----------- |
 | [Form field model](form-field.model.md) | Contains the value and metadata for a field of an [ADF Form](form.component.md). | [Source](../lib/core/form/components/widgets/core/form-field.model.ts) |
-| [Comment process model](comment-process.model.md) | Represents a comment added to a Process Services task or process instance. | [Source](../lib/core/models/comment-process.model.ts) |
-| [Product version model](product-version.model.md) | Contains version and license information classes for Alfresco products. | [Source](../lib/core/models/product-version.model.ts) |
-| [User process model](user-process.model.md) | Represents a Process Services user. | [Source](../lib/core/models/user-process.model.ts) |
-| [Bpm user model](bpm-user.model.md) | Contains information about a Process Services user. | [Source](../lib/core/userinfo/models/bpm-user.model.ts) |
-| [Ecm user model](ecm-user.model.md) | Contains information about a Content Services user. | [Source](../lib/core/userinfo/models/ecm-user.model.ts) |
+| [Comment process model](core/comment-process.model.md) | Represents a comment added to a Process Services task or process instance. | [Source](../lib/core/models/comment-process.model.ts) |
+| [Product version model](core/product-version.model.md) | Contains version and license information classes for Alfresco products. | [Source](../lib/core/models/product-version.model.ts) |
+| [User process model](core/user-process.model.md) | Represents a Process Services user. | [Source](../lib/core/models/user-process.model.ts) |
+| [Bpm user model](core/bpm-user.model.md) | Contains information about a Process Services user. | [Source](../lib/core/userinfo/models/bpm-user.model.ts) |
+| [Ecm user model](core/ecm-user.model.md) | Contains information about a Content Services user. | [Source](../lib/core/userinfo/models/ecm-user.model.ts) |
 
 ## Pipes
 
 | Name | Description | Source link |
 | ---- | ----------- | ----------- |
-| [File size pipe](file-size.pipe.md) | Converts a number of bytes to the equivalent in KB, MB, etc. | [Source](../lib/core/pipes/file-size.pipe.ts) |
-| [Mime type icon pipe](mime-type-icon.pipe.md) | Retrieves an icon to represent a MIME type. | [Source](../lib/core/pipes/mime-type-icon.pipe.ts) |
-| [Node name tooltip pipe](node-name-tooltip.pipe.md) | Formats the tooltip for a Node. | [Source](../lib/core/pipes/node-name-tooltip.pipe.ts) |
-| [Text highlight pipe](text-highlight.pipe.md) | Adds highlighting to words or sections of text that match a search string. | [Source](../lib/core/pipes/text-highlight.pipe.ts) |
-| [Time ago pipe](time-ago.pipe.md) | Converts a recent past date into a number of days ago. | [Source](../lib/core/pipes/time-ago.pipe.ts) |
-| [User initial pipe](user-initial.pipe.md) | Takes the name fields of a UserProcessModel object and extracts and formats the initials. | [Source](../lib/core/pipes/user-initial.pipe.ts) |
+| [File size pipe](core/file-size.pipe.md) | Converts a number of bytes to the equivalent in KB, MB, etc. | [Source](../lib/core/pipes/file-size.pipe.ts) |
+| [Mime type icon pipe](core/mime-type-icon.pipe.md) | Retrieves an icon to represent a MIME type. | [Source](../lib/core/pipes/mime-type-icon.pipe.ts) |
+| [Node name tooltip pipe](core/node-name-tooltip.pipe.md) | Formats the tooltip for a Node. | [Source](../lib/core/pipes/node-name-tooltip.pipe.ts) |
+| [Text highlight pipe](core/text-highlight.pipe.md) | Adds highlighting to words or sections of text that match a search string. | [Source](../lib/core/pipes/text-highlight.pipe.ts) |
+| [Time ago pipe](core/time-ago.pipe.md) | Converts a recent past date into a number of days ago. | [Source](../lib/core/pipes/time-ago.pipe.ts) |
+| [User initial pipe](core/user-initial.pipe.md) | Takes the name fields of a UserProcessModel object and extracts and formats the initials. | [Source](../lib/core/pipes/user-initial.pipe.ts) |
 
 ## Services
 
@@ -127,30 +127,30 @@ for more information about installing and using the source code.
 | [Auth guard ecm service](auth-guard-ecm.service.md) | Adds authentication with Content Services to a route within the app. | [Source](../lib/core/services/auth-guard-ecm.service.ts) |
 | [Auth guard service](auth-guard.service.md) | Adds authentication to a route within the app. | [Source](../lib/core/services/auth-guard.service.ts) |
 | [Authentication service](authentication.service.md) | Provides authentication for use with the Login component. | [Source](../lib/core/services/authentication.service.ts) |
-| [Comment process service](comment-process.service.md) | Adds and retrieves comments for task and process instances in Process Services. | [Source](../lib/core/services/comment-process.service.ts) |
-| [Content service](content.service.md) | Accesses app-generated data objects via URLs and file downloads. | [Source](../lib/core/services/content.service.ts) |
-| [Cookie service](cookie.service.md) | Stores key-value data items as browser cookies. | [Source](../lib/core/services/cookie.service.ts) |
+| [Comment process service](core/comment-process.service.md) | Adds and retrieves comments for task and process instances in Process Services. | [Source](../lib/core/services/comment-process.service.ts) |
+| [Content service](core/content.service.md) | Accesses app-generated data objects via URLs and file downloads. | [Source](../lib/core/services/content.service.ts) |
+| [Cookie service](core/cookie.service.md) | Stores key-value data items as browser cookies. | [Source](../lib/core/services/cookie.service.ts) |
 | [Deleted nodes api service](deleted-nodes-api.service.md) | Gets a list of Content Services nodes currently in the trash. | [Source](../lib/core/services/deleted-nodes-api.service.ts) |
-| [Discovery api service](discovery-api.service.md) | Gets version and license information for Process Services and Content Services. | [Source](../lib/core/services/discovery-api.service.ts) |
+| [Discovery api service](core/discovery-api.service.md) | Gets version and license information for Process Services and Content Services. | [Source](../lib/core/services/discovery-api.service.ts) |
 | [Favorites api service](favorites-api.service.md) | Gets a list of items a user has marked as their favorites. | [Source](../lib/core/services/favorites-api.service.ts) |
-| [Highlight transform service](highlight-transform.service.md) | Adds HTML to a string to highlight chosen sections. | [Source](../lib/core/services/highlight-transform.service.ts) |
+| [Highlight transform service](core/highlight-transform.service.md) | Adds HTML to a string to highlight chosen sections. | [Source](../lib/core/services/highlight-transform.service.ts) |
 | [Log service](log.service.md) | Provide a log functionality for your ADF application. | [Source](../lib/core/services/log.service.ts) |
 | [Nodes api service](nodes-api.service.md) | Accesses and manipulates ACS document nodes using their node IDs. | [Source](../lib/core/services/nodes-api.service.ts) |
-| [Notification service](notification.service.md) | Shows a notification message with optional feedback. | [Source](../lib/core/services/notification.service.ts) |
-| [Page title service](page-title.service.md) | Sets the page title. | [Source](../lib/core/services/page-title.service.ts) |
-| [People content service](people-content.service.md) | Gets information about a Content Services user. | [Source](../lib/core/services/people-content.service.ts) |
-| [People process service](people-process.service.md) | Gets information about Process Services users. | [Source](../lib/core/services/people-process.service.ts) |
+| [Notification service](core/notification.service.md) | Shows a notification message with optional feedback. | [Source](../lib/core/services/notification.service.ts) |
+| [Page title service](core/page-title.service.md) | Sets the page title. | [Source](../lib/core/services/page-title.service.ts) |
+| [People content service](core/people-content.service.md) | Gets information about a Content Services user. | [Source](../lib/core/services/people-content.service.ts) |
+| [People process service](core/people-process.service.md) | Gets information about Process Services users. | [Source](../lib/core/services/people-process.service.ts) |
 | [Renditions service](renditions.service.md) ![Deprecated](docassets/images/DeprecatedIcon.png) | Manages prearranged conversions of content to different formats. | [Source](../lib/core/services/renditions.service.ts) |
 | [Search configuration service](search-configuration.service.md) | Provides fine control of parameters to a search. | [Source](../lib/core/services/search-configuration.service.ts) |
-| [Shared links api service](shared-links-api.service.md) | Finds shared links to Content Services items. | [Source](../lib/core/services/shared-links-api.service.ts) |
+| [Shared links api service](core/shared-links-api.service.md) | Finds shared links to Content Services items. | [Source](../lib/core/services/shared-links-api.service.ts) |
 | [Sites service](sites.service.md) | Accesses and manipulates sites from a Content Services repository. | [Source](../lib/core/services/sites.service.ts) |
-| [Storage service](storage.service.md) | Stores items in the form of key-value pairs. | [Source](../lib/core/services/storage.service.ts) |
-| [Thumbnail service](thumbnail.service.md) | Retrieves an SVG thumbnail image to represent a document type. | [Source](../lib/core/services/thumbnail.service.ts) |
+| [Storage service](core/storage.service.md) | Stores items in the form of key-value pairs. | [Source](../lib/core/services/storage.service.ts) |
+| [Thumbnail service](core/thumbnail.service.md) | Retrieves an SVG thumbnail image to represent a document type. | [Source](../lib/core/services/thumbnail.service.ts) |
 | [Translation service](translation.service.md) | Supports localisation. | [Source](../lib/core/services/translation.service.ts) |
 | [Upload service](upload.service.md) | Provides access to various APIs related to file upload features. | [Source](../lib/core/services/upload.service.ts) |
 | [User preferences service](user-preferences.service.md) | Stores preferences for components. | [Source](../lib/core/services/user-preferences.service.ts) |
-| [Bpm user service](bpm-user.service.md) | Gets information about the current Process Services user. | [Source](../lib/core/userinfo/services/bpm-user.service.ts) |
-| [Ecm user service](ecm-user.service.md) | Gets information about a Content Services user. | [Source](../lib/core/userinfo/services/ecm-user.service.ts) |
+| [Bpm user service](core/bpm-user.service.md) | Gets information about the current Process Services user. | [Source](../lib/core/userinfo/services/bpm-user.service.ts) |
+| [Ecm user service](core/ecm-user.service.md) | Gets information about a Content Services user. | [Source](../lib/core/userinfo/services/ecm-user.service.ts) |
 
 ## Widgets
 
@@ -204,6 +204,7 @@ for more information about installing and using the source code.
 | [Version list component](version-list.component.md) ![Experimental](docassets/images/ExperimentalIcon.png) | Displays the version history of a node in a [Version Manager component](version-manager.component.md) | [Source](../lib/content-services/version-manager/version-list.component.ts) |
 | [Version manager component](version-manager.component.md) ![Experimental](docassets/images/ExperimentalIcon.png) | Displays the version history of a node with the ability to upload a new version. | [Source](../lib/content-services/version-manager/version-manager.component.ts) |
 | [Webscript component](webscript.component.md) | Provides access to Webscript features. | [Source](../lib/content-services/webscript/webscript.component.ts) |
+| _Upload version button component_ | _Not currently documented_ | [Source](../lib/content-services/upload/components/upload-version-button.component.ts) |
 
 ## Directives
 
@@ -292,7 +293,7 @@ for more information about installing and using the source code.
 | Name | Description | Source link |
 | ---- | ----------- | ----------- |
 | [Process filter service](process-filter.service.md) | Manage Process Filters, which are pre-configured Process Instance queries.  | [Source](../lib/process-services/process-list/services/process-filter.service.ts) |
-| [Process service](process.service.md) | Manage Process Instances, Process Variables, and Process Audit Log.  | [Source](../lib/process-services/process-list/services/process.service.ts) |
+| [Process service](process.service.md) | Manages Process Instances, Process Variables, and Process Audit Log.  | [Source](../lib/process-services/process-list/services/process.service.ts) |
 | [Task filter service](task-filter.service.md) | Manage Task Filters, which are pre-configured Task Instance queries.  | [Source](../lib/process-services/task-list/services/task-filter.service.ts) |
 | [Tasklist service](tasklist.service.md) | Manage Task Instances.  | [Source](../lib/process-services/task-list/services/tasklist.service.ts) |
 
diff --git a/docs/content-action.component.md b/docs/content-action.component.md
index cd137b79f6..166370751c 100644
--- a/docs/content-action.component.md
+++ b/docs/content-action.component.md
@@ -182,7 +182,7 @@ an item for users who don't have permission to use it (set `disableWithNoPermiss
 
 You can also implement the `permissionEvent` to handle permission errors
 (to show the user a notification, for example). Subscribe to this event from your component
-and use the [Notification service](notification.service.md) to show a message.
+and use the [Notification service](core/notification.service.md) to show a message.
 
 ```html
 <adf-document-list [contentActions]="true"...>
diff --git a/docs/accordion-group.component.md b/docs/core/accordion-group.component.md
similarity index 90%
rename from docs/accordion-group.component.md
rename to docs/core/accordion-group.component.md
index 4a7b5cdc1d..ec0b88c5c7 100644
--- a/docs/accordion-group.component.md
+++ b/docs/core/accordion-group.component.md
@@ -4,9 +4,9 @@ Status: Active
 ---
 # Accordion Group component
 
-Adds a collapsible panel to an [accordion menu](accordion.component.md).
+Adds a collapsible panel to an accordion menu.
 
-![Accordion menu screenshot](docassets/images/accordion-menu.png)
+![Accordion menu screenshot](../docassets/images/accordion-menu.png)
 
 ## Basic Usage
 
diff --git a/docs/accordion.component.md b/docs/core/accordion.component.md
similarity index 85%
rename from docs/accordion.component.md
rename to docs/core/accordion.component.md
index 7f861da9ab..ef99d53417 100644
--- a/docs/accordion.component.md
+++ b/docs/core/accordion.component.md
@@ -6,7 +6,7 @@ Status: Active
 
 Creates a collapsible accordion menu.
 
-![Accordion menu screenshot](docassets/images/accordion-menu.png)
+![Accordion menu screenshot](../docassets/images/accordion-menu.png)
 
 ## Basic Usage
 
@@ -44,7 +44,7 @@ properties (title, selection status, etc).
 
 ### Example
 
-You can use an accordion menu to wrap a [process filter](process-filters.component.md), as shown in
+You can use an accordion menu to wrap a [process filter](../process-filters.component.md), as shown in
 the following example:
 
 ```html
@@ -62,7 +62,7 @@ the following example:
 </adf-accordion>
 ```
 
-![how-create-accordion-menu](docassets/images/how-to-create-accordion-menu.png)
+![how-create-accordion-menu](../docassets/images/how-to-create-accordion-menu.png)
 
 ## See also
 
diff --git a/docs/app-config.service.md b/docs/core/app-config.service.md
similarity index 100%
rename from docs/app-config.service.md
rename to docs/core/app-config.service.md
diff --git a/docs/bpm-user.model.md b/docs/core/bpm-user.model.md
similarity index 100%
rename from docs/bpm-user.model.md
rename to docs/core/bpm-user.model.md
diff --git a/docs/bpm-user.service.md b/docs/core/bpm-user.service.md
similarity index 100%
rename from docs/bpm-user.service.md
rename to docs/core/bpm-user.service.md
diff --git a/docs/comment-process.model.md b/docs/core/comment-process.model.md
similarity index 100%
rename from docs/comment-process.model.md
rename to docs/core/comment-process.model.md
diff --git a/docs/comment-process.service.md b/docs/core/comment-process.service.md
similarity index 100%
rename from docs/comment-process.service.md
rename to docs/core/comment-process.service.md
diff --git a/docs/content.service.md b/docs/core/content.service.md
similarity index 100%
rename from docs/content.service.md
rename to docs/core/content.service.md
diff --git a/docs/cookie.service.md b/docs/core/cookie.service.md
similarity index 100%
rename from docs/cookie.service.md
rename to docs/core/cookie.service.md
diff --git a/docs/discovery-api.service.md b/docs/core/discovery-api.service.md
similarity index 100%
rename from docs/discovery-api.service.md
rename to docs/core/discovery-api.service.md
diff --git a/docs/ecm-user.model.md b/docs/core/ecm-user.model.md
similarity index 100%
rename from docs/ecm-user.model.md
rename to docs/core/ecm-user.model.md
diff --git a/docs/ecm-user.service.md b/docs/core/ecm-user.service.md
similarity index 100%
rename from docs/ecm-user.service.md
rename to docs/core/ecm-user.service.md
diff --git a/docs/file-size.pipe.md b/docs/core/file-size.pipe.md
similarity index 100%
rename from docs/file-size.pipe.md
rename to docs/core/file-size.pipe.md
diff --git a/docs/highlight-transform.service.md b/docs/core/highlight-transform.service.md
similarity index 100%
rename from docs/highlight-transform.service.md
rename to docs/core/highlight-transform.service.md
diff --git a/docs/highlight.directive.md b/docs/core/highlight.directive.md
similarity index 100%
rename from docs/highlight.directive.md
rename to docs/core/highlight.directive.md
diff --git a/docs/mime-type-icon.pipe.md b/docs/core/mime-type-icon.pipe.md
similarity index 100%
rename from docs/mime-type-icon.pipe.md
rename to docs/core/mime-type-icon.pipe.md
diff --git a/docs/node-name-tooltip.pipe.md b/docs/core/node-name-tooltip.pipe.md
similarity index 100%
rename from docs/node-name-tooltip.pipe.md
rename to docs/core/node-name-tooltip.pipe.md
diff --git a/docs/notification.service.md b/docs/core/notification.service.md
similarity index 100%
rename from docs/notification.service.md
rename to docs/core/notification.service.md
diff --git a/docs/page-title.service.md b/docs/core/page-title.service.md
similarity index 100%
rename from docs/page-title.service.md
rename to docs/core/page-title.service.md
diff --git a/docs/people-content.service.md b/docs/core/people-content.service.md
similarity index 100%
rename from docs/people-content.service.md
rename to docs/core/people-content.service.md
diff --git a/docs/people-process.service.md b/docs/core/people-process.service.md
similarity index 100%
rename from docs/people-process.service.md
rename to docs/core/people-process.service.md
diff --git a/docs/product-version.model.md b/docs/core/product-version.model.md
similarity index 100%
rename from docs/product-version.model.md
rename to docs/core/product-version.model.md
diff --git a/docs/shared-links-api.service.md b/docs/core/shared-links-api.service.md
similarity index 100%
rename from docs/shared-links-api.service.md
rename to docs/core/shared-links-api.service.md
diff --git a/docs/storage.service.md b/docs/core/storage.service.md
similarity index 100%
rename from docs/storage.service.md
rename to docs/core/storage.service.md
diff --git a/docs/text-highlight.pipe.md b/docs/core/text-highlight.pipe.md
similarity index 100%
rename from docs/text-highlight.pipe.md
rename to docs/core/text-highlight.pipe.md
diff --git a/docs/thumbnail.service.md b/docs/core/thumbnail.service.md
similarity index 100%
rename from docs/thumbnail.service.md
rename to docs/core/thumbnail.service.md
diff --git a/docs/time-ago.pipe.md b/docs/core/time-ago.pipe.md
similarity index 100%
rename from docs/time-ago.pipe.md
rename to docs/core/time-ago.pipe.md
diff --git a/docs/upload.directive.md b/docs/core/upload.directive.md
similarity index 100%
rename from docs/upload.directive.md
rename to docs/core/upload.directive.md
diff --git a/docs/user-initial.pipe.md b/docs/core/user-initial.pipe.md
similarity index 100%
rename from docs/user-initial.pipe.md
rename to docs/core/user-initial.pipe.md
diff --git a/docs/user-process.model.md b/docs/core/user-process.model.md
similarity index 100%
rename from docs/user-process.model.md
rename to docs/core/user-process.model.md
diff --git a/docs/process-filters.component.md b/docs/process-filters.component.md
index 47f99a4e93..9a6afb75dd 100644
--- a/docs/process-filters.component.md
+++ b/docs/process-filters.component.md
@@ -69,7 +69,7 @@ You can use inside the filterParam one of the properties defined by [FilterParam
 
 ### How to create an accordion menu with the processes filter
 
-The process filter often works well as an item in an accordion menu. See the [Accordion component](accordion.component.md)
+The process filter often works well as an item in an accordion menu. See the [Accordion component](core/accordion.component.md)
 page for an example of how to do set this up.
 
 ## See also
diff --git a/docs/task-filters.component.md b/docs/task-filters.component.md
index 7b7c50ec3f..c214a06b9b 100644
--- a/docs/task-filters.component.md
+++ b/docs/task-filters.component.md
@@ -59,7 +59,7 @@ You can use inside the filterParam one of the properties from [FilterParamsModel
 
 ### How to create an accordion menu with the task filter
 
-The task filter often works well as an item in an accordion menu. See the [Accordion component](accordion.component.md)
+The task filter often works well as an item in an accordion menu. See the [Accordion component](core/accordion.component.md)
 page for an example of how to do set this up.
 
 ## See also
diff --git a/docs/versionIndex.md b/docs/versionIndex.md
index e2f748e253..ccf334b2b1 100644
--- a/docs/versionIndex.md
+++ b/docs/versionIndex.md
@@ -26,54 +26,54 @@ ADF version in which they were introduced. See the
 
 ## v2.0.0
 
--   [Accordion group component](accordion-group.component.md)
--   [Accordion component](accordion.component.md)
+-   [Accordion group component](core/accordion-group.component.md)
+-   [Accordion component](core/accordion.component.md)
 -   [Activiti alfresco service](activiti-alfresco.service.md)
 -   [Alfresco api service](alfresco-api.service.md)
 -   [Alfresco content service](alfresco-content.service.md)
 -   [Analytics generator component](analytics-generator.component.md)
 -   [Analytics report list component](analytics-report-list.component.md)
 -   [Analytics component](analytics.component.md)
--   [App config service](app-config.service.md)
+-   [App config service](core/app-config.service.md)
 -   [Apps list component](apps-list.component.md)
 -   [Apps process service](apps-process.service.md)
 -   [Auth guard bpm service](auth-guard-bpm.service.md)
 -   [Auth guard ecm service](auth-guard-ecm.service.md)
 -   [Auth guard service](auth-guard.service.md)
 -   [Authentication service](authentication.service.md)
--   [Bpm user model](bpm-user.model.md)
--   [Bpm user service](bpm-user.service.md)
+-   [Bpm user model](core/bpm-user.model.md)
+-   [Bpm user service](core/bpm-user.service.md)
 -   [Breadcrumb component](breadcrumb.component.md)
 -   [Card view update service](card-view-update.service.md)
 -   [Card view component](card-view.component.md)
 -   [Checklist component](checklist.component.md)
 -   [Comment list component](comment-list.component.md)
--   [Comment process model](comment-process.model.md)
--   [Comment process service](comment-process.service.md)
+-   [Comment process model](core/comment-process.model.md)
+-   [Comment process service](core/comment-process.service.md)
 -   [Comments component](comments.component.md)
 -   [Content action component](content-action.component.md)
 -   [Content node selector component](content-node-selector.component.md)
--   [Content service](content.service.md)
+-   [Content service](core/content.service.md)
 -   [Content widget](content.widget.md)
 -   [Context menu directive](context-menu.directive.md)
--   [Cookie service](cookie.service.md)
+-   [Cookie service](core/cookie.service.md)
 -   [Create process attachment component](create-process-attachment.component.md)
 -   [Create task attachment component](create-task-attachment.component.md)
 -   [Data column component](data-column.component.md)
 -   [Datatable component](datatable.component.md)
 -   [Deleted nodes api service](deleted-nodes-api.service.md)
 -   [Diagram component](diagram.component.md)
--   [Discovery api service](discovery-api.service.md)
+-   [Discovery api service](core/discovery-api.service.md)
 -   [Document actions service](document-actions.service.md)
 -   [Document library model](document-library.model.md)
 -   [Document list component](document-list.component.md)
 -   [Document list service](document-list.service.md)
 -   [Dropdown breadcrumb component](dropdown-breadcrumb.component.md)
--   [Ecm user model](ecm-user.model.md)
--   [Ecm user service](ecm-user.service.md)
+-   [Ecm user model](core/ecm-user.model.md)
+-   [Ecm user service](core/ecm-user.service.md)
 -   [Favorites api service](favorites-api.service.md)
 -   [File draggable directive](file-draggable.directive.md)
--   [File size pipe](file-size.pipe.md)
+-   [File size pipe](core/file-size.pipe.md)
 -   [File uploading dialog component](file-uploading-dialog.component.md)
 -   [Filter model](filter.model.md)
 -   [Folder actions service](folder-actions.service.md)
@@ -85,8 +85,8 @@ ADF version in which they were introduced. See the
 -   [Form rendering service](form-rendering.service.md)
 -   [Form component](form.component.md)
 -   [Form service](form.service.md)
--   [Highlight transform service](highlight-transform.service.md)
--   [Highlight directive](highlight.directive.md)
+-   [Highlight transform service](core/highlight-transform.service.md)
+-   [Highlight directive](core/highlight.directive.md)
 -   [Host settings component](host-settings.component.md)
 -   [Infinite pagination component](infinite-pagination.component.md)
 -   [Info drawer layout component](info-drawer-layout.component.md)
@@ -96,20 +96,20 @@ ADF version in which they were introduced. See the
 -   [Log service](log.service.md)
 -   [Login component](login.component.md)
 -   [Logout directive](logout.directive.md)
--   [Mime type icon pipe](mime-type-icon.pipe.md)
+-   [Mime type icon pipe](core/mime-type-icon.pipe.md)
 -   [Node delete directive](node-delete.directive.md)
 -   [Node favorite directive](node-favorite.directive.md)
--   [Node name tooltip pipe](node-name-tooltip.pipe.md)
+-   [Node name tooltip pipe](core/node-name-tooltip.pipe.md)
 -   [Node permission directive](node-permission.directive.md)
 -   [Node restore directive](node-restore.directive.md)
 -   [Node service](node.service.md)
 -   [Nodes api service](nodes-api.service.md)
--   [Notification service](notification.service.md)
--   [Page title service](page-title.service.md)
+-   [Notification service](core/notification.service.md)
+-   [Page title service](core/page-title.service.md)
 -   [Pagination component](pagination.component.md)
--   [People content service](people-content.service.md)
+-   [People content service](core/people-content.service.md)
 -   [People list component](people-list.component.md)
--   [People process service](people-process.service.md)
+-   [People process service](core/people-process.service.md)
 -   [People search component](people-search.component.md)
 -   [People component](people.component.md)
 -   [Permissions style model](permissions-style.model.md)
@@ -124,7 +124,7 @@ ADF version in which they were introduced. See the
 -   [Process instance tasks component](process-instance-tasks.component.md)
 -   [Process list component](process-list.component.md)
 -   [Process service](process.service.md)
--   [Product version model](product-version.model.md)
+-   [Product version model](core/product-version.model.md)
 -   [Rating component](rating.component.md)
 -   [Rating service](rating.service.md)
 -   [Renditions service](renditions.service.md)
@@ -132,14 +132,14 @@ ADF version in which they were introduced. See the
 -   [Search control component](search-control.component.md)
 -   [Search component](search.component.md)
 -   [Select apps dialog component](select-apps-dialog.component.md)
--   [Shared links api service](shared-links-api.service.md)
+-   [Shared links api service](core/shared-links-api.service.md)
 -   [Site model](site.model.md)
 -   [Sites dropdown component](sites-dropdown.component.md)
 -   [Sites service](sites.service.md)
 -   [Start form component](start-form.component.md)
 -   [Start process component](start-process.component.md)
 -   [Start task component](start-task.component.md)
--   [Storage service](storage.service.md)
+-   [Storage service](core/storage.service.md)
 -   [Tag actions component](tag-actions.component.md)
 -   [Tag list component](tag-list.component.md)
 -   [Tag node list component](tag-node-list.component.md)
@@ -153,22 +153,22 @@ ADF version in which they were introduced. See the
 -   [Task header component](task-header.component.md)
 -   [Task list component](task-list.component.md)
 -   [Tasklist service](tasklist.service.md)
--   [Text highlight pipe](text-highlight.pipe.md)
+-   [Text highlight pipe](core/text-highlight.pipe.md)
 -   [Text mask component](text-mask.component.md)
--   [Thumbnail service](thumbnail.service.md)
--   [Time ago pipe](time-ago.pipe.md)
+-   [Thumbnail service](core/thumbnail.service.md)
+-   [Time ago pipe](core/time-ago.pipe.md)
 -   [Toolbar divider component](toolbar-divider.component.md)
 -   [Toolbar title component](toolbar-title.component.md)
 -   [Toolbar component](toolbar.component.md)
 -   [Translation service](translation.service.md)
 -   [Upload button component](upload-button.component.md)
 -   [Upload drag area component](upload-drag-area.component.md)
--   [Upload directive](upload.directive.md)
+-   [Upload directive](core/upload.directive.md)
 -   [Upload service](upload.service.md)
 -   [User info component](user-info.component.md)
--   [User initial pipe](user-initial.pipe.md)
+-   [User initial pipe](core/user-initial.pipe.md)
 -   [User preferences service](user-preferences.service.md)
--   [User process model](user-process.model.md)
+-   [User process model](core/user-process.model.md)
 -   [Version list component](version-list.component.md)
 -   [Version manager component](version-manager.component.md)
 -   [Viewer component](viewer.component.md)