[ADF-4252] Added doc link fixing tool (#4461)

* [ADF-4252] Added basic fixer for link and image URLs

* [ADF-4252] Added full check to link fixing tool

* [ADF-4252] Manually replaced http Github doc URLs

* [ADF-4252] Fixed rel note doc links with tool

docs/release-notes/RelNote161.md

@@ -38,7 +38,7 @@ The release can be found on GitHub at [this link.](https://github.com/Alfresco/a
 
 The roadmap for ADF is taking form, and we have a high focus on bringing in engaging design and UX, as well as add more and more content capabilities into ADF.
 
-Our focus while developing ADF 1.6.1 has been improving the Document List, Improved Preview, Finalize the design of the [Login component,](../core/login.component.md) External configuration, Performance enhancements for development, improvements in forms as well as paving the way for editing metadata and using forms for content.
+Our focus while developing ADF 1.6.1 has been improving the Document List, Improved Preview, Finalize the design of the [Login component,](../core/components/login.component.md) External configuration, Performance enhancements for development, improvements in forms as well as paving the way for editing metadata and using forms for content.
 
 This release builds on last month's contains bug fixes and new feature. See the list below for major details.
 
@@ -53,9 +53,9 @@ Below the most relevant features of this release.
 -   New extension support in viewer
 -   Extend TypeScript definitions for JS-API
 -   ADF Card View
--   [Task Header Component](../process-services/task-header.component.md)
--   Process and [Task attachment list component](../process-services/task-attachment-list.component.md)
--   Add [people Component](../process-services/people.component.md)
+-   [Task Header Component](../process-services/components/task-header.component.md)
+-   Process and [Task attachment list component](../process-services/components/task-attachment-list.component.md)
+-   Add [people Component](../process-services/components/people.component.md)
 -   Breadcrumb root path personalisation
 -   [`Form`](../../lib/process-services/task-list/models/form.model.ts) events bus
 -   [`Form`](../../lib/process-services/task-list/models/form.model.ts) render independent from APS
@@ -67,7 +67,7 @@ Below the most relevant features of this release.
 
 ![](images/Screen+Shot+2017-06-29+at+00.12.55.png)
 
-_The ng2-alfresco-viewer if the [renditions service](../core/renditions.service.md) can convert the unsupported document in PDF will show a pop up with the double possibility to Download the file or convert it to PDF._
+_The ng2-alfresco-viewer if the [renditions service](../core/services/renditions.service.md) can convert the unsupported document in PDF will show a pop up with the double possibility to Download the file or convert it to PDF._
 
 ### 2. Datatable loading state
 
@@ -174,11 +174,11 @@ Result:
 
 This component was already present in the previous ADF versions but we changed the design and improve the code.
 
-With this component, you can easily involve a person into a task. The component itself is composed of two different component, the [search component,](../content-services/search.component.md) the [people list component](../process-services/people-list.component.md).
+With this component, you can easily involve a person into a task. The component itself is composed of two different component, the [search component,](../content-services/components/search.component.md) the [people list component](../process-services/components/people-list.component.md).
 
-The [search component](../content-services/search.component.md) has the goal to find a person not involved and show the results in a list. The list is always a [data table component](../../lib/core/datatable/components/datatable/datatable.component.ts) with the action menu disabled.
+The [search component](../content-services/components/search.component.md) has the goal to find a person not involved and show the results in a list. The list is always a [data table component](../../lib/core/datatable/components/datatable/datatable.component.ts) with the action menu disabled.
 
-The [people list component](../process-services/people-list.component.md) shows all the people involved in a task in a list.
+The [people list component](../process-services/components/people-list.component.md) shows all the people involved in a task in a list.
 
 The component is a wrapper of the data-table component with a custom action i.e. Remove the person from the list.
 
@@ -279,13 +279,13 @@ And the underlying component controller code can be as follows:
 
 #### Parsing form definitions
 
-The [`FormService`](../core/form.service.md) got a new API to parse form definitions from JSON into the [`FormModel`](../../lib/core/form/components/widgets/core/form.model.ts) instances without using [`Form`](../../lib/process-services/task-list/models/form.model.ts) Component like it was previously.
+The [`FormService`](../core/services/form.service.md) got a new API to parse form definitions from JSON into the [`FormModel`](../../lib/core/form/components/widgets/core/form.model.ts) instances without using [`Form`](../../lib/process-services/task-list/models/form.model.ts) Component like it was previously.
 
     formService.parseForm(formDefinitionJSON)
 
 #### Controlling outcome actions
 
-It is now possible to control what happens when end users click the form outcome buttons, like Save, Complete, etc. The [`FormService`](../core/form.service.md) gets a new cancellable event called "executeOutcome" for that purpose.
+It is now possible to control what happens when end users click the form outcome buttons, like Save, Complete, etc. The [`FormService`](../core/services/form.service.md) gets a new cancellable event called "executeOutcome" for that purpose.
 
     export class FormDemoComponent implements OnInit {
 
@@ -315,7 +315,7 @@ By default, all application settings are stored in the "app.config.json" file in
 You can get more details on application configuration in the following articles:
 
 -   [Demo App Readme](../..//demo-shell/README.md#application-settings-server-side)
--   [AppConfigService Readme](../core/app-config.service.md)
+-   [AppConfigService Readme](../core/services/app-config.service.md)
 
 ### 13. Proxy settings and CORS
 
@@ -369,10 +369,10 @@ Below you can find a detailed list of tickets addressed in the new release. For
 -   \[[ADF-622](https://issues.alfresco.com/jira/browse/ADF-622)] - Extend TypeScript definitions for JS-API
 -   \[[ADF-631](https://issues.alfresco.com/jira/browse/ADF-631)] - Viewer - Should play also the mp3 file
 -   \[[ADF-667](https://issues.alfresco.com/jira/browse/ADF-667)] - It should be possible to disable row selection in Document List
--   \[[ADF-710](https://issues.alfresco.com/jira/browse/ADF-710)] - Create a [Process Attachment List component](../process-services/process-attachment-list.component.md)
+-   \[[ADF-710](https://issues.alfresco.com/jira/browse/ADF-710)] - Create a [Process Attachment List component](../process-services/components/process-attachment-list.component.md)
 -   \[[ADF-712](https://issues.alfresco.com/jira/browse/ADF-712)] - Task Attachment - Provide a way to attach a new content
 -   \[[ADF-713](https://issues.alfresco.com/jira/browse/ADF-713)] - Process Attachment - Provide a way to attach a new content
--   \[[ADF-793](https://issues.alfresco.com/jira/browse/ADF-793)] - Convert to PDF the document that the [renditions service](../core/renditions.service.md) provide
+-   \[[ADF-793](https://issues.alfresco.com/jira/browse/ADF-793)] - Convert to PDF the document that the [renditions service](../core/services/renditions.service.md) provide
 -   \[[ADF-804](https://issues.alfresco.com/jira/browse/ADF-804)] - Add proxy configuration in demo shell
 -   \[[ADF-843](https://issues.alfresco.com/jira/browse/ADF-843)] - [`Form`](../../lib/process-services/task-list/models/form.model.ts) events bus
 -   \[[ADF-845](https://issues.alfresco.com/jira/browse/ADF-845)] - Breadcrumb path personalisation
@@ -411,7 +411,7 @@ Below you can find a detailed list of tickets addressed in the new release. For
 -   \[[ADF-737](https://issues.alfresco.com/jira/browse/ADF-737)] - Analytics report - Should expose the Models
 -   \[[ADF-739](https://issues.alfresco.com/jira/browse/ADF-739)] - Viewer within tasks and processes does not display all supported file extensions.
 -   \[[ADF-759](https://issues.alfresco.com/jira/browse/ADF-759)] - Cannot use script.sh with node 8.0.0 and npm 5.0. 
--   \[[ADF-765](https://issues.alfresco.com/jira/browse/ADF-765)] - [Rating Component](../content-services/rating.component.md) is not working.
+-   \[[ADF-765](https://issues.alfresco.com/jira/browse/ADF-765)] - [Rating Component](../content-services/components/rating.component.md) is not working.
 -   \[[ADF-766](https://issues.alfresco.com/jira/browse/ADF-766)] - "Remove" file option within the Attachment list is not working.
 -   \[[ADF-779](https://issues.alfresco.com/jira/browse/ADF-779)] - Broken thumbnails are displayed in Processes Attachment list.
 -   \[[ADF-781](https://issues.alfresco.com/jira/browse/ADF-781)] - Folder content is not uploaded if a folder with the same name already exists
@@ -423,7 +423,7 @@ Below you can find a detailed list of tickets addressed in the new release. For
 -   \[[ADF-833](https://issues.alfresco.com/jira/browse/ADF-833)] - Data table - single and double click
 -   \[[ADF-842](https://issues.alfresco.com/jira/browse/ADF-842)] - Error is received in console log when a form is completed
 -   \[[ADF-883](https://issues.alfresco.com/jira/browse/ADF-883)] - [`UserInfo`](../../lib/content-services/document-list/models/document-library.model.ts) - Build errors
--   \[[ADF-884](https://issues.alfresco.com/jira/browse/ADF-884)] - [`FormComponent`](../core/form.component.md) - Compilation error
+-   \[[ADF-884](https://issues.alfresco.com/jira/browse/ADF-884)] - [`FormComponent`](../core/components/form.component.md) - Compilation error
 -   \[[ADF-893](https://issues.alfresco.com/jira/browse/ADF-893)] - Create Attachment Task/Process - Compilation error
 -   \[[ADF-897](https://issues.alfresco.com/jira/browse/ADF-897)] - ActivitiPeopleList - use the prexif adf
 -   \[[ADF-906](https://issues.alfresco.com/jira/browse/ADF-906)] - data property on activiti-form component do not react on changes - 2007 Github

docs/release-notes/RelNote170.md

@@ -42,7 +42,7 @@ The release can be found on GitHub at [this link.](https://github.com/Alfresco/a
 
 ## Goals for this release
 
-In the ADF 1.7 release we've had a big focus on Content capabilities. We brought in a new design for the Document List and the Uploader. Quite a few changes has made its way in to the release, breadcrumbs now has multiple modes (drop down and normal) and has been separated from the document list. The [pagination component](../core/pagination.component.md) is now separated from the document list and has a new design too, and we've added toolbars to the document list. We will continue this effort to split up into more granular components and improve the design.
+In the ADF 1.7 release we've had a big focus on Content capabilities. We brought in a new design for the Document List and the Uploader. Quite a few changes has made its way in to the release, breadcrumbs now has multiple modes (drop down and normal) and has been separated from the document list. The [pagination component](../core/components/pagination.component.md) is now separated from the document list and has a new design too, and we've added toolbars to the document list. We will continue this effort to split up into more granular components and improve the design.
 
 We have introduced a "Copy and Move" component that integrates into the document list. The idea is to use the same picker for both forms and document list, i.e use it to select content in a form, or select the destination to copy or move items into. This is still work in progress as some of the features in the picker, such as search highlight didn't make it in time for code freeze. We will continue to improve this in the next release.
 
@@ -57,7 +57,7 @@ Below the most relevant features of this release:
 -   ADF prefix
 -   Copy and Move Component
 -   Dropdown sites/favorites Component
--   [Toolbar Component](../core/toolbar.component.md)
+-   [Toolbar Component](../core/components/toolbar.component.md)
 -   Upload Component New design
 -   Upload ignore list configuration service
 -   Start Task New design
@@ -66,7 +66,7 @@ Below the most relevant features of this release:
 -   Login new property
 -   TaskDetails - DueDate and Description editable
 -   Configuration back end service hostname feature
--   [User Preferences Service](../core/user-preferences.service.md)
+-   [User Preferences Service](../core/services/user-preferences.service.md)
 -   Search results highlighting properties
 -   Change document list style rows based on permissions
 -   APS Audit REST API in the JS API
@@ -225,7 +225,7 @@ Developers have now a possibility storing and retrieving user preferences for ei
         }
     }
 
-The [`UserPreferencesService`](../core/user-preferences.service.md) provides an API needed to store preferences based on different profiles. You can now have multiple users on the same machine with different set of preferences (like pagination size, authentication type, etc).
+The [`UserPreferencesService`](../core/services/user-preferences.service.md) provides an API needed to store preferences based on different profiles. You can now have multiple users on the same machine with different set of preferences (like pagination size, authentication type, etc).
 
 ### 14. Search results highlighting properties
 
@@ -242,7 +242,7 @@ You can now customize the document list style row based on the permissions of th
 
 ### 16. APS Audit REST API in the JS API
 
-Two new methods has been added into the alfresco-js-api to support retrieve the audit informations inside the [process service](../process-services/process.service.md):
+Two new methods has been added into the alfresco-js-api to support retrieve the audit informations inside the [process service](../process-services/services/process.service.md):
 
 | API | Name | HTTP method | URL | Description |
 | --- | ---- | ----------- | --- | ----------- |
@@ -256,15 +256,15 @@ For further details about those endepoints please refer to the [official documen
 In the ng2-alfresco-core component, there are a lot of services that you can use out of the box outside our component and you can find the complete list [here](https://github.com/Alfresco/alfresco-ng2-components/tree/master/ng2-components#services)
 The list below is the list of the new services added in 1.7.0:
 
--   [`DeletedNodesApiService`](../core/deleted-nodes-api.service.md)
--   [`FavoritesApiService`](../core/favorites-api.service.md)
--   [`NodesApiService`](../core/nodes-api.service.md)
+-   [`DeletedNodesApiService`](../core/services/deleted-nodes-api.service.md)
+-   [`FavoritesApiService`](../core/services/favorites-api.service.md)
+-   [`NodesApiService`](../core/services/nodes-api.service.md)
 -   PeopleApiService
 -   SearchApiService
--   [`SharedLinksApiService`](../core/shared-links-api.service.md)
+-   [`SharedLinksApiService`](../core/services/shared-links-api.service.md)
 -   SitesApiService
--   [`ThumbnailService`](../core/thumbnail.service.md)
--   [`SearchService`](../core/search.service.md)
+-   [`ThumbnailService`](../core/services/thumbnail.service.md)
+-   [`SearchService`](../core/services/search.service.md)
 
 ### 18. Code Contribution Guide and CLA
 
@@ -335,7 +335,7 @@ Release Notes - Apps Development Framework - Version 1.7.
 
 -   \[[ADF-195](https://issues.alfresco.com/jira/browse/ADF-195)] - fix 'change detection crash' when using router multiple times - 1550 Github
 -   \[[ADF-334](https://issues.alfresco.com/jira/browse/ADF-334)] - "$" symbol on a currency/amount field is shown against the label - 1707 Github
--   \[[ADF-523](https://issues.alfresco.com/jira/browse/ADF-523)] - [Search Component](../content-services/search.component.md) - Unable to delete a file
+-   \[[ADF-523](https://issues.alfresco.com/jira/browse/ADF-523)] - [Search Component](../content-services/components/search.component.md) - Unable to delete a file
 -   \[[ADF-733](https://issues.alfresco.com/jira/browse/ADF-733)] - Activiti start process - AppId should not be mandatory
 -   \[[ADF-770](https://issues.alfresco.com/jira/browse/ADF-770)] - Wrong highlight is displayed around options within DocumentList.
 -   \[[ADF-778](https://issues.alfresco.com/jira/browse/ADF-778)] - "Upload Dialog" displays files that were previously uploaded on a different account.
@@ -358,11 +358,11 @@ Release Notes - Apps Development Framework - Version 1.7.
 -   \[[ADF-1048](https://issues.alfresco.com/jira/browse/ADF-1048)] - Multiple files attached to a task within a form are not displayed
 -   \[[ADF-1056](https://issues.alfresco.com/jira/browse/ADF-1056)] - [`Form`](../../lib/process-services/task-list/models/form.model.ts) List Component does not display the forms of the user
 -   \[[ADF-1068](https://issues.alfresco.com/jira/browse/ADF-1068)] - Files can be uploaded using drag and drop when 'enable file' is unchecked
--   \[[ADF-1070](https://issues.alfresco.com/jira/browse/ADF-1070)] - [User preferences service](../core/user-preferences.service.md) does not restore prefix on page reload.
+-   \[[ADF-1070](https://issues.alfresco.com/jira/browse/ADF-1070)] - [User preferences service](../core/services/user-preferences.service.md) does not restore prefix on page reload.
 -   \[[ADF-1072](https://issues.alfresco.com/jira/browse/ADF-1072)] - Unsupported type of file attached to a task or process can not be converted to pdf
 -   \[[ADF-1078](https://issues.alfresco.com/jira/browse/ADF-1078)] - [Tasks] - Task Details are displayed inside Task Filters list.
 -   \[[ADF-1079](https://issues.alfresco.com/jira/browse/ADF-1079)] - [Process Services] - Not able to start a process.
--   \[[ADF-1081](https://issues.alfresco.com/jira/browse/ADF-1081)] - Scroll bar is missing in [comments component](../core/comments.component.md)
+-   \[[ADF-1081](https://issues.alfresco.com/jira/browse/ADF-1081)] - Scroll bar is missing in [comments component](../core/components/comments.component.md)
 -   \[[ADF-1097](https://issues.alfresco.com/jira/browse/ADF-1097)] - File with unaccepted extension is uploaded when 'Format' is set to 'All files'
 -   \[[ADF-1134](https://issues.alfresco.com/jira/browse/ADF-1134)] - [Document List] Selection events not raised for certain scenarios
 -   \[[ADF-1138](https://issues.alfresco.com/jira/browse/ADF-1138)] - Start Task [`Form`](../../lib/process-services/task-list/models/form.model.ts) Assignee dropdown show null value inside
@@ -382,7 +382,7 @@ Release Notes - Apps Development Framework - Version 1.7.
 -   \[[ADF-1199](https://issues.alfresco.com/jira/browse/ADF-1199)] - `MinimalNodeEntryEntity` is missing the "allowableOperations" property
 -   \[[ADF-1200](https://issues.alfresco.com/jira/browse/ADF-1200)] - The URL validation error message is still displayed after changing the invalid url with a valid one
 -   \[[ADF-1201](https://issues.alfresco.com/jira/browse/ADF-1201)] - 508 Compliance Resolution for the App tiles. - 2131 Github
--   \[[ADF-1216](https://issues.alfresco.com/jira/browse/ADF-1216)] - The included packages are not displayed in [About Component](../core/about.component.md) if the user is logged only on Content Services
+-   \[[ADF-1216](https://issues.alfresco.com/jira/browse/ADF-1216)] - The included packages are not displayed in [About Component](../core/components/about.component.md) if the user is logged only on Content Services
 -   \[[ADF-1228](https://issues.alfresco.com/jira/browse/ADF-1228)] - Task Details - The People and Involve component are not aligned
 -   \[[ADF-1229](https://issues.alfresco.com/jira/browse/ADF-1229)] - Task Filter - Wrong task filter is selected when a new task is created
 
@@ -390,14 +390,14 @@ Release Notes - Apps Development Framework - Version 1.7.
 
 -   \[[ADF-112](https://issues.alfresco.com/jira/browse/ADF-112)] - Task Header in TaskDetails component shows DueDate but is not editable
 -   \[[ADF-402](https://issues.alfresco.com/jira/browse/ADF-402)] - Process Diagram Widget - Show the current process state
--   \[[ADF-487](https://issues.alfresco.com/jira/browse/ADF-487)] - Info tab should show [Content Service](../core/content.service.md) and [Process service](../process-services/process.service.md) information
+-   \[[ADF-487](https://issues.alfresco.com/jira/browse/ADF-487)] - Info tab should show [Content Service](../core/services/content.service.md) and [Process service](../process-services/services/process.service.md) information
 -   \[[ADF-858](https://issues.alfresco.com/jira/browse/ADF-858)] - Provide ability to attach multiple files on process Form- 1988 Github
 -   \[[ADF-917](https://issues.alfresco.com/jira/browse/ADF-917)] - Upload ignore list files configuration
 -   \[[ADF-955](https://issues.alfresco.com/jira/browse/ADF-955)] - Custom icons for selected rows
--   \[[ADF-960](https://issues.alfresco.com/jira/browse/ADF-960)] - Allow changing copyright section for [Login component](../core/login.component.md)
--   \[[ADF-967](https://issues.alfresco.com/jira/browse/ADF-967)] - Evaluate "hostname" and "port" in the [app config service](../core/app-config.service.md)
+-   \[[ADF-960](https://issues.alfresco.com/jira/browse/ADF-960)] - Allow changing copyright section for [Login component](../core/components/login.component.md)
+-   \[[ADF-967](https://issues.alfresco.com/jira/browse/ADF-967)] - Evaluate "hostname" and "port" in the [app config service](../core/services/app-config.service.md)
 -   \[[ADF-968](https://issues.alfresco.com/jira/browse/ADF-968)] - Dropdown sites and favorites
--   \[[ADF-983](https://issues.alfresco.com/jira/browse/ADF-983)] - [User Preferences Service](../core/user-preferences.service.md)
+-   \[[ADF-983](https://issues.alfresco.com/jira/browse/ADF-983)] - [User Preferences Service](../core/services/user-preferences.service.md)
 -   \[[ADF-1038](https://issues.alfresco.com/jira/browse/ADF-1038)] - Dropdown breadcrumbs
 -   \[[ADF-1039](https://issues.alfresco.com/jira/browse/ADF-1039)] - Search results highlighting
 -   \[[ADF-1040](https://issues.alfresco.com/jira/browse/ADF-1040)] - Change document list style rows based on permissions
@@ -409,7 +409,7 @@ Release Notes - Apps Development Framework - Version 1.7.
 ### Task
 
 -   \[[ADF-497](https://issues.alfresco.com/jira/browse/ADF-497)] - Improvement to task comment (activiti-comments) component - 1829 Github
--   \[[ADF-506](https://issues.alfresco.com/jira/browse/ADF-506)] - Unify [thumbnail service](../core/thumbnail.service.md) across search and document list
+-   \[[ADF-506](https://issues.alfresco.com/jira/browse/ADF-506)] - Unify [thumbnail service](../core/services/thumbnail.service.md) across search and document list
 -   \[[ADF-861](https://issues.alfresco.com/jira/browse/ADF-861)] - Add codelizer in ng2-alfresco-viewer ng2-alfresco-webscript
 -   \[[ADF-862](https://issues.alfresco.com/jira/browse/ADF-862)] - Add codelizer in ng2-alfresco-login ng2-alfresco-search
 -   \[[ADF-867](https://issues.alfresco.com/jira/browse/ADF-867)] - Add codelizer in demo-shell and genral build
@@ -424,7 +424,7 @@ Release Notes - Apps Development Framework - Version 1.7.
 -   \[[ADF-924](https://issues.alfresco.com/jira/browse/ADF-924)] - Upload Component - Import the logic/design from EFSS
 -   \[[ADF-973](https://issues.alfresco.com/jira/browse/ADF-973)] - Remove demo projects from components folder
 -   \[[ADF-992](https://issues.alfresco.com/jira/browse/ADF-992)] - Integrate SFS enhancements to Document List
--   \[[ADF-993](https://issues.alfresco.com/jira/browse/ADF-993)] - Integrate SFS enhancements for [Toolbar component](../core/toolbar.component.md)
+-   \[[ADF-993](https://issues.alfresco.com/jira/browse/ADF-993)] - Integrate SFS enhancements for [Toolbar component](../core/components/toolbar.component.md)
 -   \[[ADF-1002](https://issues.alfresco.com/jira/browse/ADF-1002)] - Attachment Task list - Add Drag and drop functionality
 -   \[[ADF-1030](https://issues.alfresco.com/jira/browse/ADF-1030)] - Datatable - enable isLoading to show the spinner in all the components
 -   \[[ADF-1044](https://issues.alfresco.com/jira/browse/ADF-1044)] - Activiti Comment - use the new design inside the demoshell

docs/release-notes/RelNote180.md

@@ -39,7 +39,7 @@ The release can be found on GitHub at [this link.](https://github.com/Alfresco/a
 
 ## Goals for this release
 
-In the ADF 1.8 release we've introduced a number of new generic features, such as Info Drawer, theming capabilities and lots of form customizations and accessibility. The task list now works with the [pagination component](../core/pagination.component.md) and we have started the work to completely redesign the [viewer component](../core/viewer.component.md).
+In the ADF 1.8 release we've introduced a number of new generic features, such as Info Drawer, theming capabilities and lots of form customizations and accessibility. The task list now works with the [pagination component](../core/components/pagination.component.md) and we have started the work to completely redesign the [viewer component](../core/components/viewer.component.md).
 We continue the effort to migrate to @angular/material, it will be a few more releases before we wrap up that work. The data table and document list continue to get new features and enhancements, with the new data sources and layout presets we open up possibilities for externalizing the layout and sources for the document list.
 
 This release builds on last month's contains bug fixes and new feature. See the list below for major details.
@@ -51,7 +51,7 @@ Please report issues with this release in the [issue tracker](https://github.com
 Below the most relevant features of this release:
 
 -   Theming ADF component
--   [Info Drawer component](../core/info-drawer.component.md)
+-   [Info Drawer component](../core/components/info-drawer.component.md)
 -   [`Form`](../../lib/process-services/task-list/models/form.model.ts) style component enhancements
 -   Empty form template
 -   Additional data sources input for Document List
@@ -78,7 +78,7 @@ When you want more customization than a pre-built theme offers, you can create y
 
 ### 2. Info Drawer component
 
-It is now possible to use the [Info Drawer component,](../core/info-drawer.component.md) which gives you a sidebar like look with tabbing support. For more information about the usage, check the documentation in the core package.
+It is now possible to use the [Info Drawer component,](../core/components/info-drawer.component.md) which gives you a sidebar like look with tabbing support. For more information about the usage, check the documentation in the core package.
 
 ![](images/info-drawer.gif)
 
@@ -105,7 +105,7 @@ New events that allow taking control over the [`Form`](../../lib/process-service
     validateForm: Subject<ValidateFormEvent>
     validateFormField: Subject<ValidateFormFieldEvent>()
 
-The [validateForm](../core/form.service.md) event is raised every time the entire [`Form`](../../lib/process-services/task-list/models/form.model.ts) is re-validated. This happens also every time a field value or some of the properties is changed (for example the "required" property). The [validateFormField](../core/form.service.md) event is raised every time a single [`Form`](../../lib/process-services/task-list/models/form.model.ts) Field is re-validated.
+The [validateForm](../core/services/form.service.md) event is raised every time the entire [`Form`](../../lib/process-services/task-list/models/form.model.ts) is re-validated. This happens also every time a field value or some of the properties is changed (for example the "required" property). The [validateFormField](../core/services/form.service.md) event is raised every time a single [`Form`](../../lib/process-services/task-list/models/form.model.ts) Field is re-validated.
 
 Both events are "cancellable", that means you can apply your own validation rules, change corresponding field validation state, or even prevent the default behaviour if needed.
 
@@ -137,7 +137,7 @@ New "getFieldById" method to simplify certain scenarios when accessing multiple
 
 The [`Form`](../../lib/process-services/task-list/models/form.model.ts) now controls all Field validators. It becomes possible managing existing validator instances, replacing them, or extending form validation with custom rules and error messages. The "adf-form" component now also supports binding custom validator sets to the underlying [FormModel,](../../lib/core/form/components/widgets/core/form.model.ts) that allows defining validation sets in your code and binding via HTML.
 
-You can read more details on the new Validation layer in the [`Form`](../../lib/process-services/task-list/models/form.model.ts) readme: [Form Field Validators](../core/form-field-validator.interface.md). The "demo shell" application has been also extended to demonstrate custom validators in action. You can check the code here: [Demo Field Validator](../core/form-field-validator.interface.md).
+You can read more details on the new Validation layer in the [`Form`](../../lib/process-services/task-list/models/form.model.ts) readme: [Form Field Validators](../core/interfaces/form-field-validator.interface.md). The "demo shell" application has been also extended to demonstrate custom validators in action. You can check the code here: [Demo Field Validator](../core/interfaces/form-field-validator.interface.md).
 
 ### 7. DataTable Accessibility Improvements
 
@@ -159,7 +159,7 @@ Further enhancements were implemented for the Copy & move dialog. From now, you
 
 ### 9. Download as a ZIP functionality
 
-The ADF framework provides support for downloading nodes (Files and Folders) as "ZIP" archives. The **alfresco-js-api** library features new support for the [Downloads](https://api-explorer.alfresco.com/api-explorer/#/downloads) API. In addition, the Core library (ng2-alfresco-core) provides a ["DownloadZipDialogComponent"](../core/download-zip.service.md) that allows invoking "Download as Zip" dialogues from any place in your code.
+The ADF framework provides support for downloading nodes (Files and Folders) as "ZIP" archives. The **alfresco-js-api** library features new support for the [Downloads](https://api-explorer.alfresco.com/api-explorer/#/downloads) API. In addition, the Core library (ng2-alfresco-core) provides a ["DownloadZipDialogComponent"](../core/services/download-zip.service.md) that allows invoking "Download as Zip" dialogues from any place in your code.
 
 ![](images/download-as-zip.gif)
 
@@ -194,7 +194,7 @@ And the code behind in this case can be as follows:
 
 ### 11. Profile picture in Comments and Involved people
 
-With the new ADF release, if the user has a profile picture, it will be shown inside the Comment/Involved [People component](../process-services/people.component.md):
+With the new ADF release, if the user has a profile picture, it will be shown inside the Comment/Involved [People component](../process-services/components/people.component.md):
 
 ![involved people component with images](images/Screen+Shot+2017-09-05+at+11.31.50.png)
 
@@ -529,7 +529,7 @@ Release Notes - Apps Development Framework - Version 1.8.
 -   \[[ADF-1300](https://issues.alfresco.com/jira/browse/ADF-1300)] - Download as a ZIP functionality demo (5.2.1 repo)
 -   \[[ADF-1318](https://issues.alfresco.com/jira/browse/ADF-1318)] - Create 'time ago' date converter
 -   \[[ADF-1356](https://issues.alfresco.com/jira/browse/ADF-1356)] - Single configuration of i18n service per project
--   \[[ADF-1372](https://issues.alfresco.com/jira/browse/ADF-1372)] - Provide support for custom tooltips for [Upload Button component](../content-services/upload-button.component.md)
+-   \[[ADF-1372](https://issues.alfresco.com/jira/browse/ADF-1372)] - Provide support for custom tooltips for [Upload Button component](../content-services/components/upload-button.component.md)
 -   \[[ADF-1404](https://issues.alfresco.com/jira/browse/ADF-1404)] - Data Column enhancements for Document List
 -   \[[ADF-1421](https://issues.alfresco.com/jira/browse/ADF-1421)] - Provide default column layout for Document List
 -   \[[ADF-1427](https://issues.alfresco.com/jira/browse/ADF-1427)] - Show custom root in the breadcrumb even if node is not loaded
@@ -539,13 +539,13 @@ Release Notes - Apps Development Framework - Version 1.8.
 ## Task
 
 -   \[[ADF-1188](https://issues.alfresco.com/jira/browse/ADF-1188)] - Upload drag drop component - Add a property to disable the component
--   \[[ADF-1306](https://issues.alfresco.com/jira/browse/ADF-1306)] - Process [Task Audit Directive](../process-services/task-audit.directive.md)
+-   \[[ADF-1306](https://issues.alfresco.com/jira/browse/ADF-1306)] - Process [Task Audit Directive](../process-services/directives/task-audit.directive.md)
 -   \[[ADF-1309](https://issues.alfresco.com/jira/browse/ADF-1309)] - [`Pagination`](../../lib/content-services/document-list/models/document-library.model.ts) of task list
 -   \[[ADF-714](https://issues.alfresco.com/jira/browse/ADF-714)] - Unify pagination across all components
 -   \[[ADF-1116](https://issues.alfresco.com/jira/browse/ADF-1116)] - Task list without any status filter
 -   \[[ADF-1139](https://issues.alfresco.com/jira/browse/ADF-1139)] - People Search - Provide a way to reset the search field when a user is selected
 -   \[[ADF-852](https://issues.alfresco.com/jira/browse/ADF-852)] - [Form] Update [`Form`](../../lib/process-services/task-list/models/form.model.ts) widget to Material library
--   \[[ADF-520](https://issues.alfresco.com/jira/browse/ADF-520)] - remove the debug button from [Analytics Component](../insights/analytics.component.md)
+-   \[[ADF-520](https://issues.alfresco.com/jira/browse/ADF-520)] - remove the debug button from [Analytics Component](../insights/components/analytics.component.md)
 -   \[[ADF-157](https://issues.alfresco.com/jira/browse/ADF-157)] - upload dialog Wrong number on File Upload Count - 1511 Github
 -   \[[ADF-569](https://issues.alfresco.com/jira/browse/ADF-569)] - Provide support to Undo uploaded files in the Upload component
 -   \[[ADF-720](https://issues.alfresco.com/jira/browse/ADF-720)] - Review all the template use

docs/release-notes/RelNote190.md

@@ -49,11 +49,11 @@ Below the most relevant features of this release:
 -   Infinite scrolling
 -   Requeue option added to adf-task-header
 -   Tasklist now support multi-select
--   [Page title service](../core/page-title.service.md)
+-   [Page title service](../core/services/page-title.service.md)
 -   Viewer enhancements
 -   Document List presets
 -   Login redirect options
--   [Logout directive](../core/logout.directive.md)
+-   [Logout directive](../core/directives/logout.directive.md)
 -   Breadcrumb enhancements
 -   Documentation
 
@@ -100,7 +100,7 @@ The component also provides a new event **rowSelected** that contains all the se
 
 ### 4.Page Title Service
 
-The 1.9.0 version features a new service ["PageTitleService"](../core/page-title.service.md) in the "ng2-alfresco-core" package. This service allows changing the title of the page (browser tab) on demand from the code. The format of the title is always "<Application Name> - <Title>" where "<Application Name>" is taken from the application configuration file:
+The 1.9.0 version features a new service ["PageTitleService"](../core/services/page-title.service.md) in the "ng2-alfresco-core" package. This service allows changing the title of the page (browser tab) on demand from the code. The format of the title is always "<Application Name> - <Title>" where "<Application Name>" is taken from the application configuration file:
 
     {
       "application": {
@@ -110,10 +110,10 @@ The 1.9.0 version features a new service ["PageTitleService"](../core/page-title
 
 ### 5.Viewer Enhancements
 
-[Viewer component](../core/viewer.component.md) has been updated with improved UI and support for integration with Angular Router.
+[Viewer component](../core/components/viewer.component.md) has been updated with improved UI and support for integration with Angular Router.
 The major features and improvements are:
 
--   New [toolbar component](../core/toolbar.component.md) for all Viewer types
+-   New [toolbar component](../core/components/toolbar.component.md) for all Viewer types
 -   Automatic PDF rendition fetching for various content types (".docx", ".pptx", etc.)
 -   Floating action toolbar for the PDF viewer
 
@@ -178,7 +178,7 @@ It is now possible to store layouts for Document List in the global application
 
 ### 7.Login redirect options
 
-The [Login component](../core/login.component.md) provides a new **successRoute** property as a way to automatically redirect the user to the particular application route upon successful sign in.
+The [Login component](../core/components/login.component.md) provides a new **successRoute** property as a way to automatically redirect the user to the particular application route upon successful sign in.
 
     <adf-login successRoute="/dashboard" ...></adf-login>
 
@@ -190,7 +190,7 @@ You can turn any clickable HTML element or other Angular Component into a Logout
 
 ### 9.Breadcrumb enhancements
 
-The [Breadcrumb component](../content-services/breadcrumb.component.md) exposes a new **rootId** property to allow you restricting the root element to a particular node. Component automatically trims the elements if full node path needs to be cut. You can use this together with the **root** property that allows renaming the root (first) element of the path.
+The [Breadcrumb component](../content-services/components/breadcrumb.component.md) exposes a new **rootId** property to allow you restricting the root element to a particular node. Component automatically trims the elements if full node path needs to be cut. You can use this together with the **root** property that allows renaming the root (first) element of the path.
 
     <adf-breadcrumb root="Personal Files" rootId="<GUID>" ...></adf-breadcrumb>
 
@@ -261,7 +261,7 @@ Release Notes - Apps Development Framework - Version 1.9.
 -   \[[ADF-1521](https://issues.alfresco.com/jira/browse/ADF-1521)] - Display value fields configured with process variables are not rendered in ADF 1.8. 
 -   \[[ADF-1523](https://issues.alfresco.com/jira/browse/ADF-1523)] - APS task form remains disabled when no custom outcome is provided in ADF 1.8. 
 -   \[[ADF-1525](https://issues.alfresco.com/jira/browse/ADF-1525)] - In APS forms, hyperlink fields are not rendered when configured with process variables
--   \[[ADF-1526](https://issues.alfresco.com/jira/browse/ADF-1526)] - The [form component](../core/form.component.md) is not responsive in ADF 1.8. 
+-   \[[ADF-1526](https://issues.alfresco.com/jira/browse/ADF-1526)] - The [form component](../core/components/form.component.md) is not responsive in ADF 1.8. 
 -   \[[ADF-1528](https://issues.alfresco.com/jira/browse/ADF-1528)] - [`Form`](../../lib/process-services/task-list/models/form.model.ts) renderer does not display generated documents - github 2303
 -   \[[ADF-1529](https://issues.alfresco.com/jira/browse/ADF-1529)] - Broken styles for toolbar buttons.
 -   \[[ADF-1530](https://issues.alfresco.com/jira/browse/ADF-1530)] - [Viewer] Extension viewer doens't work anymore
@@ -317,7 +317,7 @@ Release Notes - Apps Development Framework - Version 1.9.
 -   \[[ADF-1643](https://issues.alfresco.com/jira/browse/ADF-1643)] - [Checklist] add checklist produce a consolo error
 -   \[[ADF-1644](https://issues.alfresco.com/jira/browse/ADF-1644)] - Search Icon is not properly displayed
 -   \[[ADF-1646](https://issues.alfresco.com/jira/browse/ADF-1646)] - [Settings] prefix icon is not aligned
--   \[[ADF-1651](https://issues.alfresco.com/jira/browse/ADF-1651)] - Site List drop down from [Document List component](../content-services/document-list.component.md) does not display all sites
+-   \[[ADF-1651](https://issues.alfresco.com/jira/browse/ADF-1651)] - Site List drop down from [Document List component](../content-services/components/document-list.component.md) does not display all sites
 -   \[[ADF-1653](https://issues.alfresco.com/jira/browse/ADF-1653)] - Suggestion list on people widget is still displayed after deleting all letters inside the input
 -   \[[ADF-1654](https://issues.alfresco.com/jira/browse/ADF-1654)] - Cannot add a checklist within a task.
 -   \[[ADF-1662](https://issues.alfresco.com/jira/browse/ADF-1662)] - [User info] name is not centered
@@ -339,7 +339,7 @@ Release Notes - Apps Development Framework - Version 1.9.
 -   \[[ADF-1477](https://issues.alfresco.com/jira/browse/ADF-1477)] - Automatic i18n support for breadcrumb root element
 -   \[[ADF-1522](https://issues.alfresco.com/jira/browse/ADF-1522)] - Load Document List presets from the app.config file
 -   \[[ADF-1524](https://issues.alfresco.com/jira/browse/ADF-1524)] - Provide support for route to redirect on successful Login
--   \[[ADF-1613](https://issues.alfresco.com/jira/browse/ADF-1613)] - [Logout directive](../core/logout.directive.md)
+-   \[[ADF-1613](https://issues.alfresco.com/jira/browse/ADF-1613)] - [Logout directive](../core/directives/logout.directive.md)
 
 ## Task
 
@@ -350,7 +350,7 @@ Release Notes - Apps Development Framework - Version 1.9.
 -   \[[ADF-1249](https://issues.alfresco.com/jira/browse/ADF-1249)] - Remove mdl from ng2-activiti-diagrams
 -   \[[ADF-1250](https://issues.alfresco.com/jira/browse/ADF-1250)] - Remove mdl from ng2-activiti-analytics
 -   \[[ADF-1251](https://issues.alfresco.com/jira/browse/ADF-1251)] - Remove mdl from demo shell
--   \[[ADF-1492](https://issues.alfresco.com/jira/browse/ADF-1492)] - Document List - Export [`ContentNodeSelectorComponent`](../content-services/content-node-selector.component.md) and [ContentNodeSelectorComponentData](../../lib/content-services/content-node-selector/content-node-selector.component-data.interface.ts)
+-   \[[ADF-1492](https://issues.alfresco.com/jira/browse/ADF-1492)] - Document List - Export [`ContentNodeSelectorComponent`](../content-services/components/content-node-selector.component.md) and [ContentNodeSelectorComponentData](../../lib/content-services/content-node-selector/content-node-selector.component-data.interface.ts)
 -   \[[ADF-1496](https://issues.alfresco.com/jira/browse/ADF-1496)] - Remove "Disable upload button when user has no permissions" switch.
 -   \[[ADF-1504](https://issues.alfresco.com/jira/browse/ADF-1504)] - Rename UserInfoComponentModule to [`UserInfoModule`](../../lib/core/userinfo/userinfo.module.ts)
 -   \[[ADF-1515](https://issues.alfresco.com/jira/browse/ADF-1515)] - Internationalization - ADF strings review

docs/release-notes/RelNote200.md

@@ -66,7 +66,7 @@ Please note the only major version valid for the package @alfresco/adf-insights
 
 ## Goals for this release
 
-While this release had a high focus on stabilization and bug fixes, we have also introduced new and enhanced features. These include a completely revamped [Viewer component,](../core/viewer.component.md) a new metadata component and file versioning. Also, ADF is now localized into 11 different languages. In total we have closed around 242 issues in JIRA.
+While this release had a high focus on stabilization and bug fixes, we have also introduced new and enhanced features. These include a completely revamped [Viewer component,](../core/components/viewer.component.md) a new metadata component and file versioning. Also, ADF is now localized into 11 different languages. In total we have closed around 242 issues in JIRA.
 
 Since we follow [SEMVER](https://semver.org), we can only introduce breaking changes in major releases. We learned a lot and we needed to restructure and rename components to make things easier moving forward. You can see all the details about the breaking changes below.
 We have continued to expand and rewrite our documentation. We now have a new component catalog
@@ -88,22 +88,22 @@ Below the most relevant features of this release:
 -   Create Folder and Edit Folder dialogues
 -   Editable file metadata
 -   File versioning
--   [Search Component](../content-services/search.component.md) refatoring
+-   [Search Component](../content-services/components/search.component.md) refatoring
 -   Max file size constraints properties in Upload Button
 -   Register Alfresco file type icons within the mat-icon
--   [`LogService`](../core/log.service.md) configuration
+-   [`LogService`](../core/services/log.service.md) configuration
 -   Favorite node Directive
 -   Delete multiple nodes directive
 -   Task Attachment list customizable template
 -   CS and PS setting host component
--   Complete [process service](../process-services/process.service.md) type definition in the alfresco-js-api
+-   Complete [process service](../process-services/services/process.service.md) type definition in the alfresco-js-api
 -   Redirect to original path upon successful login
 -   Task List override the default columns
 -   Internationalization support
 
 ### 1. Viewer Enhancements
 
-The [Viewer component](../core/viewer.component.md) has been enhanced with the following features:
+The [Viewer component](../core/components/viewer.component.md) has been enhanced with the following features:
 
 -   Automatic PDF renditions for APS content
 -   Automatic PDF renditions for ACS content
@@ -115,16 +115,16 @@ The [Viewer component](../core/viewer.component.md) has been enhanced with the f
 -   Custom "traffic light" menu that you can fill with your own content
 -   Ability to download the file previewed
 -   Ability to hide/show any button on the toolbar
--   Ability to hide, show or even replace entire [toolbar component](../core/toolbar.component.md)
+-   Ability to hide, show or even replace entire [toolbar component](../core/components/toolbar.component.md)
 
 ![](images/pastedImage_1.png)
 
-It is now very simple to use the [Viewer component](../core/viewer.component.md) in an "Inline" mode on a separate page when using the Angular Router.
+It is now very simple to use the [Viewer component](../core/components/viewer.component.md) in an "Inline" mode on a separate page when using the Angular Router.
 This allows you to have separate URLs for previewing content and later revisiting a file by navigating to a corresponding link.
 
 In addition, the "Overlay" mode has been stabilised. It now handles subsequent reopenings correctly.
 
-You can find more details in the corresponding documentation: [Viewer Component](../core/viewer.component.md).
+You can find more details in the corresponding documentation: [Viewer Component](../core/components/viewer.component.md).
 
 ### 2. Pagination Component and DocumentList integration
 
@@ -137,7 +137,7 @@ ADF provides a lightweight integration with the DocumentList component out of th
     <adf-pagination [target]="documentList" ...>
     </adf-pagination>
 
-For more details on custom pagination features see the following article: [Pagination Component](../core/pagination.component.md)
+For more details on custom pagination features see the following article: [Pagination Component](../core/components/pagination.component.md)
 
 ### 3. Create Folder and Edit Folder dialogs
 
@@ -158,8 +158,8 @@ In order to greatly simplify your development experience, two extra Angular dire
 
 For more details please refer to:
 
--   [Folder Create directive](../content-services/folder-create.directive.md)
--   [Folder Edit directive](../content-services/folder-edit.directive.md)
+-   [Folder Create directive](../content-services/directives/folder-create.directive.md)
+-   [Folder Edit directive](../content-services/directives/folder-edit.directive.md)
 
 ### 4. Editable file metadata
 
@@ -179,7 +179,7 @@ You can now see and restore previous versions of a file node. This component can
 
 ### 6. Search Component refactoring
 
-We have completely separated the documentlist component from the [search component](../content-services/search.component.md). We also support customizing the search result with any template you like and optionally creating your own custom search autocomplete.
+We have completely separated the documentlist component from the [search component](../content-services/components/search.component.md). We also support customizing the search result with any template you like and optionally creating your own custom search autocomplete.
 
 The adf-search-control provides you with a standard input search with an pre-styled autocomplete table :
 
@@ -219,16 +219,16 @@ This allows you to fetch the search result typed from the input/textarea element
 
 For more details please refer to:
 
--   [Search Control Component](../content-services/search-control.component.md)
--   [Search Component](../content-services/search.component.md)
+-   [Search Control Component](../content-services/components/search-control.component.md)
+-   [Search Component](../content-services/components/search.component.md)
 
 ### 7. Max file size constraints properties in Upload Button
 
-The [upload button component](../content-services/upload-button.component.md) now provides a new parameter to disallow uploading files larger than a certain size (in bytes):
+The [upload button component](../content-services/components/upload-button.component.md) now provides a new parameter to disallow uploading files larger than a certain size (in bytes):
 
     <adf-upload-button [maxFilesSize]="20"></adf-upload-button>
 
-For more details please refer to [Upload button documentation](../content-services/upload-button.component.md)
+For more details please refer to [Upload button documentation](../content-services/components/upload-button.component.md)
 
 ### 8. Register Alfresco file type icons within the mat-icon
 
@@ -241,7 +241,7 @@ All the ADF MIME type icons are now registered into the [MatIconRegistry](https:
     constructor(public thumbnailService: ThumbnailService) {
     }
 
-To see the list of all supported MIME types please refer to [Thumbnail service documentation](../core/thumbnail.service.md).
+To see the list of all supported MIME types please refer to [Thumbnail service documentation](../core/services/thumbnail.service.md).
 
 ### 9. LogService configuration
 
@@ -252,11 +252,11 @@ By default the level is TRACE. If you want to silence all log output in ADF you
         "logLevel": " SILENT"
     }
 
-The [log service](../core/log.service.md) provides 6 level of logs: TRACE, DEBUG, INFO, WARN, ERROR, SILENT. For more information please refer to [log service documentation.](../core/log.service.md)
+The [log service](../core/services/log.service.md) provides 6 level of logs: TRACE, DEBUG, INFO, WARN, ERROR, SILENT. For more information please refer to [log service documentation.](../core/services/log.service.md)
 
 ### 10. Favorite node directive
 
-The [NodeFavoriteDirective](../core/node-favorite.directive.md) instance can be bound to a button to retrieve and manage a favorites node list:
+The [NodeFavoriteDirective](../core/directives/node-favorite.directive.md) instance can be bound to a button to retrieve and manage a favorites node list:
 
     <button mat-icon-button
             #favorite="adfFavorite"
@@ -280,7 +280,7 @@ Deletes multiple files and folders.
 
 ### 12. Task Attachment List customizable template
 
-If there are no attachments for the selected task the [Task Attachment List component](../process-services/task-attachment-list.component.md) shows a basic empty template.
+If there are no attachments for the selected task the [Task Attachment List component](../process-services/components/task-attachment-list.component.md) shows a basic empty template.
 
 ![Task Attachment List basic empty template](images/default-no-content-template.png)
 
@@ -295,7 +295,7 @@ If you want to customize and render a custom template, you can inject the **adf-
         </adf-empty-list>
     </adf-task-attachment-list>
 
-Note that the [Task Attachment List component](../process-services/task-attachment-list.component.md) doesn't provide the Drag & Drop feature out-of-the-box. To add it, you must use an **adf-upload-drag-area** as the parent of this component. You can also specify a custom template:
+Note that the [Task Attachment List component](../process-services/components/task-attachment-list.component.md) doesn't provide the Drag & Drop feature out-of-the-box. To add it, you must use an **adf-upload-drag-area** as the parent of this component. You can also specify a custom template:
 
     <adf-upload-drag-area
         [parentId]="YOUR_TASK_ID">
@@ -320,17 +320,17 @@ This component is a form that allows you to validate and set the URL of your CS
 
 ![](images/host-settings-component.png)
 
-For more information please refer to [host component documentation.](../core/host-settings.component.md)
+For more information please refer to [host component documentation.](../core/components/host-settings.component.md)
 
 ### 14. Complete process service type definition in the alfresco-js-api
 
-We have added all the [process service](../process-services/process.service.md) related models, class methods and type in the type definition file of the alfresco-js-api to help you with the autocomplete of your IDE.
+We have added all the [process service](../process-services/services/process.service.md) related models, class methods and type in the type definition file of the alfresco-js-api to help you with the autocomplete of your IDE.
 
 ![](images/type+definition.gif)
 
 ### 15. Redirect to original path upon successful login
 
-The [Login component](../core/login.component.md) now redirects users back to the originally requested URLs.
+The [Login component](../core/components/login.component.md) now redirects users back to the originally requested URLs.
 
 For example, if you have a route "/my-files" protected by the **[`AuthGuardEcm`](../../lib/core/services/auth-guard-ecm.service.ts)** (for ACS-related content) or **[`AuthGuardBpm`](../../lib/core/services/auth-guard-bpm.service.ts)** (for APS-related content), users may be redirected to a "/login" route if they are not authenticated. Upon successful login, the user is then redirected back to the "/my-files" page.
 
@@ -404,10 +404,10 @@ Also, the Document List now provides a customizable screen for permission errors
 -   Clean old prefix TAG name support
 -   Rename 'extension-viewer' component to 'adf-viewer-extension'
 -   Upload button and Drag area deprecated properties has been removed
--   DocumentList has been separated from the [search component](../content-services/search.component.md)
+-   DocumentList has been separated from the [search component](../content-services/components/search.component.md)
 -   'md' prefix is not supported anymore
 -   Internal pagination has been removed from the  DocumentList
--   Internal search documentlist has been separated from the [search component](../content-services/search.component.md)
+-   Internal search documentlist has been separated from the [search component](../content-services/components/search.component.md)
 
 ### New name packages
 
@@ -477,7 +477,7 @@ The **extension-viewer** tag (used to extend the viewer behavior to open extensi
 | Properties | Description |
 | ---------- | ----------- |
 | enabled | Deprecated in 1.6.0 in favor of disabled input property |
-| showNotificationBar | Deprecated in 1.6.0 you can use [`UploadService`](../core/upload.service.md) events and [`NotificationService`](../core/notification.service.md) api instead. |
+| showNotificationBar | Deprecated in 1.6.0 you can use [`UploadService`](../core/services/upload.service.md) events and [`NotificationService`](../core/services/notification.service.md) api instead. |
 | currentFolderPath | Deprecated in 1.6.0, this property is not used for couple of releases already. Use rootFolderId instead. |
 | rootFolderId | Deprecated in 1.6.0, this property is not used for couple of releases already. Use parentId instead |
 
@@ -485,13 +485,13 @@ The **extension-viewer** tag (used to extend the viewer behavior to open extensi
 
 | Properties | Description |
 | ---------- | ----------- |
-| showNotificationBar | Deprecated in 1.6.0 you can use [`UploadService`](../core/upload.service.md) events and [NotificationService](../core/notification.service.md) api instead. |
+| showNotificationBar | Deprecated in 1.6.0 you can use [`UploadService`](../core/services/upload.service.md) events and [NotificationService](../core/services/notification.service.md) api instead. |
 | currentFolderPath | Deprecated in 1.6.0, this property is not used for couple of releases already. Use rootFolderId instead. |
 | disableWithNoPermission | Deprecated in 1.8.0, use the button with combination of adf-node-permission directive |
 
 ### Internal pagination has been removed from the DocumentList
 
-The [search component](../content-services/search.component.md) has received a big refactor in this release in order to use the new search API. This gives better configurability as described above. The decoupling of the internal documentlist from the search allows you to customize the search result as you wish.
+The [search component](../content-services/components/search.component.md) has received a big refactor in this release in order to use the new search API. This gives better configurability as described above. The decoupling of the internal documentlist from the search allows you to customize the search result as you wish.
 Learn how to show the search result in a document list [here](https://github.com/Alfresco/alfresco-ng2-components/tree/master/demo-shell/src/app/components/search).
 
 ### Internal search documentlist has been removed from the search component
@@ -577,7 +577,7 @@ Release Notes - Apps Development Framework - Version 2.0.
 ### New Feature
 
 -   \[[ADF-788](https://issues.alfresco.com/jira/browse/ADF-788)] - [Upload] Support for max file size constraints in Upload components
--   \[[ADF-1004](https://issues.alfresco.com/jira/browse/ADF-1004)] - [Alfresco JS API]Complete [process service](../process-services/process.service.md) definition file in the alfresco-js-api
+-   \[[ADF-1004](https://issues.alfresco.com/jira/browse/ADF-1004)] - [Alfresco JS API]Complete [process service](../process-services/services/process.service.md) definition file in the alfresco-js-api
 -   \[[ADF-1065](https://issues.alfresco.com/jira/browse/ADF-1065)] - [Login] Make Login events strongly typed
 -   \[[ADF-1084](https://issues.alfresco.com/jira/browse/ADF-1084)] - [Service] Register Alfresco file type icons within the mat-icon
 -   \[[ADF-1596](https://issues.alfresco.com/jira/browse/ADF-1596)] - [Destination Picker] Search input ignores input up to 4 characters
@@ -596,7 +596,7 @@ Release Notes - Apps Development Framework - Version 2.0.
 -   \[[ADF-1840](https://issues.alfresco.com/jira/browse/ADF-1840)] - [Document List] Create a generic permission denied page
 -   \[[ADF-1841](https://issues.alfresco.com/jira/browse/ADF-1841)] - [Metadata] Default metadata Nodes property editing
 -   \[[ADF-1906](https://issues.alfresco.com/jira/browse/ADF-1906)] - [Accordion Menu] Tooltip configuration
--   \[[ADF-1918](https://issues.alfresco.com/jira/browse/ADF-1918)] - [Search] Use the new Search api service for the [search component](../content-services/search.component.md)
+-   \[[ADF-1918](https://issues.alfresco.com/jira/browse/ADF-1918)] - [Search] Use the new Search api service for the [search component](../content-services/components/search.component.md)
 
 ### Documentation
 
@@ -611,7 +611,7 @@ Release Notes - Apps Development Framework - Version 2.0.
 
 -   \[[ADF-1235](https://issues.alfresco.com/jira/browse/ADF-1235)] - We have to get rid of MDL to use only material2
 -   \[[ADF-1475](https://issues.alfresco.com/jira/browse/ADF-1475)] - Upgrade to Angular 5
--   \[[ADF-1779](https://issues.alfresco.com/jira/browse/ADF-1779)] - [Search component](../content-services/search.component.md) refactoring
+-   \[[ADF-1779](https://issues.alfresco.com/jira/browse/ADF-1779)] - [Search component](../content-services/components/search.component.md) refactoring
 -   \[[ADF-1793](https://issues.alfresco.com/jira/browse/ADF-1793)] - [Viewer] Extensibility
 
 ### Story
@@ -620,12 +620,12 @@ Release Notes - Apps Development Framework - Version 2.0.
 
 ### Task
 
--   \[[ADF-829](https://issues.alfresco.com/jira/browse/ADF-829)] - [Viewer component](../core/viewer.component.md) doesn't support internationalisation
+-   \[[ADF-829](https://issues.alfresco.com/jira/browse/ADF-829)] - [Viewer component](../core/components/viewer.component.md) doesn't support internationalisation
 -   \[[ADF-1333](https://issues.alfresco.com/jira/browse/ADF-1333)] - Debouncing search in the object picker component
 -   \[[ADF-1614](https://issues.alfresco.com/jira/browse/ADF-1614)] - /deep/ combinator is no longer supported
--   \[[ADF-1620](https://issues.alfresco.com/jira/browse/ADF-1620)] - [Login component](../core/login.component.md) streamline
+-   \[[ADF-1620](https://issues.alfresco.com/jira/browse/ADF-1620)] - [Login component](../core/components/login.component.md) streamline
 -   \[[ADF-1645](https://issues.alfresco.com/jira/browse/ADF-1645)] - Consistently use the same type for Process App ID
--   \[[ADF-1659](https://issues.alfresco.com/jira/browse/ADF-1659)] - [Search component] The [search component](../content-services/search.component.md) should not have an embedded document list
+-   \[[ADF-1659](https://issues.alfresco.com/jira/browse/ADF-1659)] - [Search component] The [search component](../content-services/components/search.component.md) should not have an embedded document list
 -   \[[ADF-1672](https://issues.alfresco.com/jira/browse/ADF-1672)] - Start Process - Improve the look and feel
 -   \[[ADF-1679](https://issues.alfresco.com/jira/browse/ADF-1679)] - Error messages into form field validator are not being translated
 -   \[[ADF-1681](https://issues.alfresco.com/jira/browse/ADF-1681)] - User profile component - As default should show the initials
@@ -638,7 +638,7 @@ Release Notes - Apps Development Framework - Version 2.0.
 -   \[[ADF-1724](https://issues.alfresco.com/jira/browse/ADF-1724)] - Remove all the console log
 -   \[[ADF-1731](https://issues.alfresco.com/jira/browse/ADF-1731)] - Update Material 2.0.0-beta.12
 -   \[[ADF-1735](https://issues.alfresco.com/jira/browse/ADF-1735)] - tasklist.component has wrong name should be task-list.component
--   \[[ADF-1742](https://issues.alfresco.com/jira/browse/ADF-1742)] - Add test cases to cover [viewer component](../core/viewer.component.md)
+-   \[[ADF-1742](https://issues.alfresco.com/jira/browse/ADF-1742)] - Add test cases to cover [viewer component](../core/components/viewer.component.md)
 -   \[[ADF-1746](https://issues.alfresco.com/jira/browse/ADF-1746)] - Pipe for node tooltip formatting
 -   \[[ADF-1748](https://issues.alfresco.com/jira/browse/ADF-1748)] - Remove MDL dependency
 -   \[[ADF-1775](https://issues.alfresco.com/jira/browse/ADF-1775)] - No input and No Output rename rule
@@ -694,7 +694,7 @@ Release Notes - Apps Development Framework - Version 2.0.
 -   \[[ADF-1693](https://issues.alfresco.com/jira/browse/ADF-1693)] - [Dailog Upload] wrong positioning
 -   \[[ADF-1696](https://issues.alfresco.com/jira/browse/ADF-1696)] - File viewer is not rendered on the entire page
 -   \[[ADF-1697](https://issues.alfresco.com/jira/browse/ADF-1697)] - Demo shell - Task infodrawer wrong tabs name
--   \[[ADF-1702](https://issues.alfresco.com/jira/browse/ADF-1702)] - The bottom part of the [Login component](../core/login.component.md) text is cut off
+-   \[[ADF-1702](https://issues.alfresco.com/jira/browse/ADF-1702)] - The bottom part of the [Login component](../core/components/login.component.md) text is cut off
 -   \[[ADF-1704](https://issues.alfresco.com/jira/browse/ADF-1704)] - Invalid characters breaks file upload widget
 -   \[[ADF-1707](https://issues.alfresco.com/jira/browse/ADF-1707)] - [App component](../../demo-shell/src/app/app.component.ts) - The app name is not translated
 -   \[[ADF-1709](https://issues.alfresco.com/jira/browse/ADF-1709)] - The error message of date widget is not displayed anymore when clicking on another widget
@@ -705,9 +705,9 @@ Release Notes - Apps Development Framework - Version 2.0.
 -   \[[ADF-1718](https://issues.alfresco.com/jira/browse/ADF-1718)] - [`Pagination`](../../lib/content-services/document-list/models/document-library.model.ts) should not be displayed on Search Results page when there are no results
 -   \[[ADF-1720](https://issues.alfresco.com/jira/browse/ADF-1720)] - Date-time picker is not working properly with other Date Display Format than default
 -   \[[ADF-1722](https://issues.alfresco.com/jira/browse/ADF-1722)] - [object Object] appears in People control when selecting the same name
--   \[[ADF-1725](https://issues.alfresco.com/jira/browse/ADF-1725)] - [Process service](../process-services/process.service.md) page doesn't look cool in small breakpoint. Need responsiveness.
+-   \[[ADF-1725](https://issues.alfresco.com/jira/browse/ADF-1725)] - [Process service](../process-services/services/process.service.md) page doesn't look cool in small breakpoint. Need responsiveness.
 -   \[[ADF-1726](https://issues.alfresco.com/jira/browse/ADF-1726)] - Process and Task service attachments are not responsive.
--   \[[ADF-1732](https://issues.alfresco.com/jira/browse/ADF-1732)] - [Search component](../content-services/search.component.md) is not working properly on Demo Shell in a specific case
+-   \[[ADF-1732](https://issues.alfresco.com/jira/browse/ADF-1732)] - [Search component](../content-services/components/search.component.md) is not working properly on Demo Shell in a specific case
 -   \[[ADF-1737](https://issues.alfresco.com/jira/browse/ADF-1737)] - getFileContent response returns empty object when it's a PDF file
 -   \[[ADF-1738](https://issues.alfresco.com/jira/browse/ADF-1738)] - Search suggestion dialog's design is not as expected
 -   \[[ADF-1740](https://issues.alfresco.com/jira/browse/ADF-1740)] - 'Start Process' button is enabled if required field 'name' is empty.
@@ -725,14 +725,14 @@ Release Notes - Apps Development Framework - Version 2.0.
 -   \[[ADF-1771](https://issues.alfresco.com/jira/browse/ADF-1771)] - Upload widget clears out filename on cancel but uploads file
 -   \[[ADF-1772](https://issues.alfresco.com/jira/browse/ADF-1772)] - task app tooltip is not localised and key is displayed
 -   \[[ADF-1777](https://issues.alfresco.com/jira/browse/ADF-1777)] - [Angular CLI] Production build compilation issue with Search
--   \[[ADF-1780](https://issues.alfresco.com/jira/browse/ADF-1780)] - [mobile] Cannot access any component other than the [login component](../core/login.component.md)
+-   \[[ADF-1780](https://issues.alfresco.com/jira/browse/ADF-1780)] - [mobile] Cannot access any component other than the [login component](../core/components/login.component.md)
 -   \[[ADF-1781](https://issues.alfresco.com/jira/browse/ADF-1781)] - Task List - The default columns are not localised
 -   \[[ADF-1782](https://issues.alfresco.com/jira/browse/ADF-1782)] - Language menu - The selector name is wrong
 -   \[[ADF-1783](https://issues.alfresco.com/jira/browse/ADF-1783)] - [Mobile] User info cards are not fully displayed
 -   \[[ADF-1784](https://issues.alfresco.com/jira/browse/ADF-1784)] - [Mobile] Empty folder image should not display drag and drop image
 -   \[[ADF-1794](https://issues.alfresco.com/jira/browse/ADF-1794)] - Document List - Sites - users can see sites they are not members of
 -   \[[ADF-1800](https://issues.alfresco.com/jira/browse/ADF-1800)] - [diagrams.service](../../lib/insights/diagram/services/diagrams.service.ts).ts is not using the alfresco-js-api
--   \[[ADF-1802](https://issues.alfresco.com/jira/browse/ADF-1802)] - [`NodeNameTooltipPipe`](../core/node-name-tooltip.pipe.md) is not exported by the ng2-alfresco-core
+-   \[[ADF-1802](https://issues.alfresco.com/jira/browse/ADF-1802)] - [`NodeNameTooltipPipe`](../core/pipes/node-name-tooltip.pipe.md) is not exported by the ng2-alfresco-core
 -   \[[ADF-1815](https://issues.alfresco.com/jira/browse/ADF-1815)] - Sorting content by name is not working properly
 -   \[[ADF-1818](https://issues.alfresco.com/jira/browse/ADF-1818)] - Add Missing Create person API in JS-API
 -   \[[ADF-1824](https://issues.alfresco.com/jira/browse/ADF-1824)] - Moment js security issue
@@ -745,7 +745,7 @@ Release Notes - Apps Development Framework - Version 2.0.
 -   \[[ADF-1838](https://issues.alfresco.com/jira/browse/ADF-1838)] - A new task can not be started because the Start Task is not properly displayed
 -   \[[ADF-1839](https://issues.alfresco.com/jira/browse/ADF-1839)] - Login does not switch user preferences
 -   \[[ADF-1856](https://issues.alfresco.com/jira/browse/ADF-1856)] - Document List - location fails for a user that has granular permissions
--   \[[ADF-1859](https://issues.alfresco.com/jira/browse/ADF-1859)] - The [document list component](../content-services/document-list.component.md) no longer exports [`ShareDataRow`](../../lib/content-services/document-list/data/share-data-row.model.ts)
+-   \[[ADF-1859](https://issues.alfresco.com/jira/browse/ADF-1859)] - The [document list component](../content-services/components/document-list.component.md) no longer exports [`ShareDataRow`](../../lib/content-services/document-list/data/share-data-row.model.ts)
 -   \[[ADF-1860](https://issues.alfresco.com/jira/browse/ADF-1860)] - NodesApi.getNodeChildren has wrong return type
 -   \[[ADF-1861](https://issues.alfresco.com/jira/browse/ADF-1861)] - Line breaks not displayed in "Display Text" widget in forms
 -   \[[ADF-1862](https://issues.alfresco.com/jira/browse/ADF-1862)] - Adf toolbar should get the background color from the theme
@@ -755,16 +755,16 @@ Release Notes - Apps Development Framework - Version 2.0.
 -   \[[ADF-1872](https://issues.alfresco.com/jira/browse/ADF-1872)] - TaskList Component - Doesn't show the currentTaskId highlited
 -   \[[ADF-1875](https://issues.alfresco.com/jira/browse/ADF-1875)] - [`ProcessList`](../../lib/process-services/mock/process/process.model.mock.ts) Component - Doesn't show the currentProcessId highlighted
 -   \[[ADF-1877](https://issues.alfresco.com/jira/browse/ADF-1877)] - Layout demo shell not localized
--   \[[ADF-1878](https://issues.alfresco.com/jira/browse/ADF-1878)] - [Translation service](../core/translation.service.md) not using fallback language for unsupported locale
+-   \[[ADF-1878](https://issues.alfresco.com/jira/browse/ADF-1878)] - [Translation service](../core/services/translation.service.md) not using fallback language for unsupported locale
 -   \[[ADF-1879](https://issues.alfresco.com/jira/browse/ADF-1879)] - ADF Process Services is not working properly
 -   \[[ADF-1885](https://issues.alfresco.com/jira/browse/ADF-1885)] - Once accessed process services components appear throughout app
 -   \[[ADF-1890](https://issues.alfresco.com/jira/browse/ADF-1890)] - Viewer - Content projection for sidebar only works if sidebarPosition is left
 -   \[[ADF-1891](https://issues.alfresco.com/jira/browse/ADF-1891)] - [`ActivitiContentService`](../../lib/core/form/services/activiti-alfresco.service.ts) is not exported
--   \[[ADF-1898](https://issues.alfresco.com/jira/browse/ADF-1898)] - [`ProcessService`](../process-services/process.service.md).createOrUpdateProcessInstanceVariables has incorrect method signature
--   \[[ADF-1900](https://issues.alfresco.com/jira/browse/ADF-1900)] - [`ProcessService`](../process-services/process.service.md).getProcessInstanceVariables has incorrect method signature
--   \[[ADF-1901](https://issues.alfresco.com/jira/browse/ADF-1901)] - [`ProcessService`](../process-services/process.service.md).createDefaultFilters has incorrect method signature
+-   \[[ADF-1898](https://issues.alfresco.com/jira/browse/ADF-1898)] - [`ProcessService`](../process-services/services/process.service.md).createOrUpdateProcessInstanceVariables has incorrect method signature
+-   \[[ADF-1900](https://issues.alfresco.com/jira/browse/ADF-1900)] - [`ProcessService`](../process-services/services/process.service.md).getProcessInstanceVariables has incorrect method signature
+-   \[[ADF-1901](https://issues.alfresco.com/jira/browse/ADF-1901)] - [`ProcessService`](../process-services/services/process.service.md).createDefaultFilters has incorrect method signature
 -   \[[ADF-1902](https://issues.alfresco.com/jira/browse/ADF-1902)] - Buttons of the Create / Edit folder dialog do not match design
--   \[[ADF-1907](https://issues.alfresco.com/jira/browse/ADF-1907)] - [`UploadService`](../core/upload.service.md) is not exported from [`UploadModule`](../../lib/content-services/upload/upload.module.ts)
+-   \[[ADF-1907](https://issues.alfresco.com/jira/browse/ADF-1907)] - [`UploadService`](../core/services/upload.service.md) is not exported from [`UploadModule`](../../lib/content-services/upload/upload.module.ts)
 -   \[[ADF-1908](https://issues.alfresco.com/jira/browse/ADF-1908)] - Not able to select a form on Start Task
 -   \[[ADF-1909](https://issues.alfresco.com/jira/browse/ADF-1909)] - [`TaskListModel`](../../lib/process-services/task-list/models/task-list.model.ts) is not exported from ActivitiTaskListModule
 -   \[[ADF-1911](https://issues.alfresco.com/jira/browse/ADF-1911)] - Content can be uploaded on Search Result Page when no results are found

docs/release-notes/RelNote210.md

@@ -54,7 +54,7 @@ We will keep these packages until material data picker supports setting the time
 
 Continuing on our journey for ADF, this release had a big focus on enhancing the Alfresco Digital Business Platform story. We have added new features to enable deeper Process and Content integration between ACS and APS, meaning you can now browse and attach content from ACS in your APS Forms. We've also added more configuration around the Process Start [Form,](../../lib/process-services/task-list/models/form.model.ts) allowing you to pre-populate fields. This enables use cases to start processes directly from a document.
 
-The [Content Metadata component](../content-services/content-metadata.component.md) also got a lot of new features: It now has full support for custom metadata and aspects. It's dynamic and has complex configuration to enable exactly which aspects and properties you want to show in your app. These are just a few highlights for this release. See the full details below.
+The [Content Metadata component](../content-services/components/content-metadata.component.md) also got a lot of new features: It now has full support for custom metadata and aspects. It's dynamic and has complex configuration to enable exactly which aspects and properties you want to show in your app. These are just a few highlights for this release. See the full details below.
 
 This release builds on the one from last month and contains bug fixes and new features as listed below.
 Please report issues with this release in the [issue tracker](https://github.com/Alfresco/alfresco-ng2-components/issues). You can collaborate on this release or share feedback by using the discussion tools on [Gitter](https://gitter.im/Alfresco/alfresco-ng2-components).
@@ -66,19 +66,19 @@ Below are the most important new features of this release:
 -   Viewer Enhancements
 -   Upload file from CS widget
 -   Attach Folder from CS Widget
--   [Content metadata component](../content-services/content-metadata.component.md) enhancements
+-   [Content metadata component](../content-services/components/content-metadata.component.md) enhancements
 -   Start process from a file
 -   Start form process pre-filling value
 -   Task List - Support custom HTML template and static columns
 -   Sidebar action menu
--   [Infinite pagination component](../core/infinite-pagination.component.md) enhancement
+-   [Infinite pagination component](../core/components/infinite-pagination.component.md) enhancement
 -   App drop-down dialog selector
 -   JS-API Governance
 -   Documentation enhancements
 
 ### 1. Viewer Enhancements
 
-In this release, the [Viewer component](../core/viewer.component.md) got improved styles and document processing enhancements:
+In this release, the [Viewer component](../core/components/viewer.component.md) got improved styles and document processing enhancements:
 
 -   better handling of PDF documents
 -   improved fallback to PDF rendition of certain documents
@@ -89,7 +89,7 @@ In this release, the [Viewer component](../core/viewer.component.md) got improve
 
 ![](images/pastedImage_1.gif)
 
-In this release we have re-enabled and improved the upload file widget of our [form component](../core/form.component.md).
+In this release we have re-enabled and improved the upload file widget of our [form component](../core/components/form.component.md).
 We have added the option to choose the file to upload from a configured ECM repository of APS.
 
 This allows you to start the navigation of ECM folders starting from a configured folder or just from the root. It also has an option to restrict the selection to files.
@@ -107,11 +107,11 @@ As you can see this widget works like the attach file widget in terms of navigat
 
 ![](images/content-metadata.gif)
 
-The purpose of the [content metadata component](../content-services/content-metadata.component.md) is to display the metadata belonging to a given node. Until now, the component was capable of displaying and making the basic properties editable, but with the latest enhancements, all of the system wide and custom aspects related to a particular node can be displayed and edited.
+The purpose of the [content metadata component](../content-services/components/content-metadata.component.md) is to display the metadata belonging to a given node. Until now, the component was capable of displaying and making the basic properties editable, but with the latest enhancements, all of the system wide and custom aspects related to a particular node can be displayed and edited.
 
 The component can be configured from the application configuration. This way, you can easily restrict the displayed metadata to a list of aspects or even further, to just a subset or properties belonging to an aspect.
 
-For more information about the component see its [documentation](https://community.alfresco.com/docs/DOC-7301-introduction-to-the-new-content-metadata-component) or [this article](../content-services/content-metadata.component.md).
+For more information about the component see its [documentation](https://community.alfresco.com/docs/DOC-7301-introduction-to-the-new-content-metadata-component) or [this article](../content-services/components/content-metadata.component.md).
 
 ### 5. Start process from a file
 
@@ -146,7 +146,7 @@ Note that in the object above, the key file is the name of the attach file field
 
 For more information about this functionality see the documentation section linked below:
 
--   [Attaching a File to the start form of the process](../process-services/start-process.component.md#attaching-a-file-to-the-start-form-of-the-process)
+-   [Attaching a File to the start form of the process](../process-services/components/start-process.component.md#attaching-a-file-to-the-start-form-of-the-process)
 
 ### 6. Start form process prefilling values
 
@@ -169,7 +169,7 @@ Here is an example of how to pass in form field values to initialize the start f
 With these settings, the start form will appear with the values above already filled in.
 For more information about this functionality see the following link:
 
--   [Custom data form example](../process-services/start-process.component.md#custom-data-example)
+-   [Custom data form example](../process-services/components/start-process.component.md#custom-data-example)
 
 ### 7. Task List - Support custom HTML template and static columns
 
@@ -252,17 +252,17 @@ This is the result:
 
 ![Sidebar action menu mobile device](images/Screen+Shot+2018-01-26+at+16.06.24.png)
 
-You can use the same component also to create a [Content Service](../core/content.service.md) menu as shown below:
+You can use the same component also to create a [Content Service](../core/services/content.service.md) menu as shown below:
 
 ![Sidebar action menu content service](images/Screen+Shot+2018-01-26+at+16.28.15.png)
 
 For more information about this functionality see the following link:
 
--   [Sidebar component](../core/sidebar-action-menu.component.md)
+-   [Sidebar component](../core/components/sidebar-action-menu.component.md)
 
 ### 9. Infinite pagination component enhancement
 
-We have added the [target] property in the [infinite pagination component](../core/infinite-pagination.component.md) to bring it in line with the [pagination component](../core/pagination.component.md). With this, the link between the infinite pagination and its target is simpler:
+We have added the [target] property in the [infinite pagination component](../core/components/infinite-pagination.component.md) to bring it in line with the [pagination component](../core/components/pagination.component.md). With this, the link between the infinite pagination and its target is simpler:
 
     <adf-infinite-pagination
         [target]="documentList"
@@ -271,7 +271,7 @@ We have added the [target] property in the [infinite pagination component](../co
 
 For more information about the infinite pagination see the following links:
 
--   [Infinite pagination component](../core/infinite-pagination.component.md)
+-   [Infinite pagination component](../core/components/infinite-pagination.component.md)
 -   [Paginated component interface](../../lib/core/pagination/paginated-component.interface.ts)
 
 ### 10. App drop-down dialog selector
@@ -340,8 +340,8 @@ Release Notes - Apps Development Framework - Version 2.1.
 -   \[[ADF-2060](https://issues.alfresco.com/jira/browse/ADF-2060)] - sidebarTemplate missing documentation
 -   \[[ADF-2122](https://issues.alfresco.com/jira/browse/ADF-2122)] - Incorrect product naming reference on [`Form`](../../lib/process-services/task-list/models/form.model.ts) Extensibility and Customisation page
 -   \[[ADF-2125](https://issues.alfresco.com/jira/browse/ADF-2125)] - App generator has wrong documentation
--   \[[ADF-2160](https://issues.alfresco.com/jira/browse/ADF-2160)] - combined handler missing in [Content Action component](../content-services/content-action.component.md) documentation
--   \[[ADF-2162](https://issues.alfresco.com/jira/browse/ADF-2162)] - [Notification service](../core/notification.service.md) missing screenshot
+-   \[[ADF-2160](https://issues.alfresco.com/jira/browse/ADF-2160)] - combined handler missing in [Content Action component](../content-services/components/content-action.component.md) documentation
+-   \[[ADF-2162](https://issues.alfresco.com/jira/browse/ADF-2162)] - [Notification service](../core/services/notification.service.md) missing screenshot
 
 ### Feature
 
@@ -426,16 +426,16 @@ Release Notes - Apps Development Framework - Version 2.1.
 -   \[[ADF-1607](https://issues.alfresco.com/jira/browse/ADF-1607)] - Create a test case on TestRail for the ADF settings.
 -   \[[ADF-1705](https://issues.alfresco.com/jira/browse/ADF-1705)] - Add test cases to cover pagination - new design
 -   \[[ADF-1775](https://issues.alfresco.com/jira/browse/ADF-1775)] - No input and No Output rename rule
--   \[[ADF-1799](https://issues.alfresco.com/jira/browse/ADF-1799)] - [Test Automation] Review [user info component](../core/user-info.component.md) automated suite
--   \[[ADF-1858](https://issues.alfresco.com/jira/browse/ADF-1858)] - [Test Automation] create [viewer component](../core/viewer.component.md) automated suite.
--   \[[ADF-1892](https://issues.alfresco.com/jira/browse/ADF-1892)] - [Test Automation] implement [document list component](../content-services/document-list.component.md) - main suite.
+-   \[[ADF-1799](https://issues.alfresco.com/jira/browse/ADF-1799)] - [Test Automation] Review [user info component](../core/components/user-info.component.md) automated suite
+-   \[[ADF-1858](https://issues.alfresco.com/jira/browse/ADF-1858)] - [Test Automation] create [viewer component](../core/components/viewer.component.md) automated suite.
+-   \[[ADF-1892](https://issues.alfresco.com/jira/browse/ADF-1892)] - [Test Automation] implement [document list component](../content-services/components/document-list.component.md) - main suite.
 -   \[[ADF-1947](https://issues.alfresco.com/jira/browse/ADF-1947)] - Viewer with custom implementation.
 -   \[[ADF-1952](https://issues.alfresco.com/jira/browse/ADF-1952)] - Split the current test suites to test cases in Test Rail
 -   \[[ADF-1983](https://issues.alfresco.com/jira/browse/ADF-1983)] - Creation of a test case to cover ACS metadata editing
 -   \[[ADF-2056](https://issues.alfresco.com/jira/browse/ADF-2056)] - Update dependencies
 -   \[[ADF-2074](https://issues.alfresco.com/jira/browse/ADF-2074)] - [Test Automation] implement uploader component - main suite.
 -   \[[ADF-2084](https://issues.alfresco.com/jira/browse/ADF-2084)] - [Test Automation] create test for datatable
--   \[[ADF-2090](https://issues.alfresco.com/jira/browse/ADF-2090)] - [Test Automation] Review [search component](../content-services/search.component.md) tests
+-   \[[ADF-2090](https://issues.alfresco.com/jira/browse/ADF-2090)] - [Test Automation] Review [search component](../content-services/components/search.component.md) tests
 -   \[[ADF-2094](https://issues.alfresco.com/jira/browse/ADF-2094)] - Task [`Form`](../../lib/process-services/task-list/models/form.model.ts) - Doesn't follow the specification
 -   \[[ADF-2095](https://issues.alfresco.com/jira/browse/ADF-2095)] - Start Task - The start button should have the primary colour
 -   \[[ADF-2096](https://issues.alfresco.com/jira/browse/ADF-2096)] - Info Drawer - Should use the Flex Css

docs/release-notes/RelNote220.md

@@ -119,14 +119,14 @@ Using the CSS you can target any outcome ID and change the style as in this exam
 
 ### Viewer enhancements
 
-In this release, the [Viewer component](../core/viewer.component.md) has received the following set of improvements and enhancements:
+In this release, the [Viewer component](../core/components/viewer.component.md) has received the following set of improvements and enhancements:
 
 -   Thumbnails for PDF view, with the option to provide your own Thumbnails template if needed
 -   Image view now features a floating action toolbar with extra actions: zoom in/out, rotate, reset to default size
 -   Image view now supports panning of the images. Hardware-accelerated styles were used to enable panning of zoomed in or large images with the highest performance and efficiency
 -   The viewer has greatly improved maintenance of the Renditions (see possible conversion options here: [File types that support preview and thumbnail generation | Alfresco Documentation](https://docs.alfresco.com/5.2/references/valid-transformations-preview.html) )
 -   Support for "carousel" modes and document navigation options (extra buttons you can enable and provide handlers for). This feature will be fully demonstrated in the upcoming "Alfresco Content Application" release.
--   It is now possible to provide custom menu buttons for the Viewer toolbar. See more details in the docs: [alfresco-ng2-components/viewer.component.md at development · Alfresco/alfresco-ng2-components · GitHub ](../core/viewer.component.md#custom-toolbar-buttons)
+-   It is now possible to provide custom menu buttons for the Viewer toolbar. See more details in the docs: [alfresco-ng2-components/viewer.component.md at development · Alfresco/alfresco-ng2-components · GitHub ](../core/components/viewer.component.md#custom-toolbar-buttons)
 
 ![PDF thumbnails](images/pdf-thumbnails.png)
 
@@ -143,7 +143,7 @@ For the current release, the Destination Picker UI has been greatly improved.
 
 ### Process Pagination - There is no way to paginate the result
 
-With ADF 2.2.0 the processes list result are easy to paginate. You just need to pass the process list reference #processList as target of the [pagination component](../core/pagination.component.md)
+With ADF 2.2.0 the processes list result are easy to paginate. You just need to pass the process list reference #processList as target of the [pagination component](../core/components/pagination.component.md)
 
     <adf-process-instance-list
        #processList
@@ -171,7 +171,7 @@ With ADF 2.2.0, the app list component is shows the mat-spinner until the apps a
 
 ### Task Header - Make it customizable from the config file
 
-You can decide which properties the [Task header component](../process-services/task-header.component.md) should render from the app.config.json file. By default, the component will render all the available properties. You can restrict those by changing app.config.json.
+You can decide which properties the [Task header component](../process-services/components/task-header.component.md) should render from the app.config.json file. By default, the component will render all the available properties. You can restrict those by changing app.config.json.
 For instance, in this example, I would like to show the id, priority, parentName, and status.
 
     "adf-task-header": {
@@ -251,7 +251,7 @@ Clicking on the Remove button will remove the file from the Upload widget value.
 
 ### Search custom empty template
 
-We enhanced the [search control component](../content-services/search-control.component.md) by adding the option of customizing the template shown when no result is found via the tag _adf-empty-search-result._
+We enhanced the [search control component](../content-services/components/search-control.component.md) by adding the option of customizing the template shown when no result is found via the tag _adf-empty-search-result._
 
     <adf-search-control [highlight]="true"
      (optionClicked)="onItemClicked($event)"
@@ -308,7 +308,7 @@ Release Notes - Apps Development Framework - Version 2.2.
 
 ### Feature
 
--   \[[ADF-1532](https://issues.alfresco.com/jira/browse/ADF-1532)] - Inconsistent assignee selection view in [`StartTaskComponent`](../process-services/start-task.component.md) (ng2-activiti-tasklist)
+-   \[[ADF-1532](https://issues.alfresco.com/jira/browse/ADF-1532)] - Inconsistent assignee selection view in [`StartTaskComponent`](../process-services/components/start-task.component.md) (ng2-activiti-tasklist)
 -   \[[ADF-1925](https://issues.alfresco.com/jira/browse/ADF-1925)] - Add new Datetime form widget to ADF
 -   \[[ADF-2064](https://issues.alfresco.com/jira/browse/ADF-2064)] - Provide support for lazy loading
 -   \[[ADF-2123](https://issues.alfresco.com/jira/browse/ADF-2123)] - Process [`Pagination`](../../lib/content-services/document-list/models/document-library.model.ts) - There is no way to paginate the result
@@ -333,7 +333,7 @@ Release Notes - Apps Development Framework - Version 2.2.
 
 ### Bug
 
--   \[[ADF-1899](https://issues.alfresco.com/jira/browse/ADF-1899)] - [`ProcessService`](../process-services/process.service.md).deleteProcessInstanceVariable has incorrect method signature
+-   \[[ADF-1899](https://issues.alfresco.com/jira/browse/ADF-1899)] - [`ProcessService`](../process-services/services/process.service.md).deleteProcessInstanceVariable has incorrect method signature
 -   \[[ADF-2000](https://issues.alfresco.com/jira/browse/ADF-2000)] - Destination picker is not completely translated
 -   \[[ADF-2026](https://issues.alfresco.com/jira/browse/ADF-2026)] - Breadcrumb displays wrong path after reloading the page.
 -   \[[ADF-2077](https://issues.alfresco.com/jira/browse/ADF-2077)] - [Destination picker] User should not be able to copy / move items into a site outside of the documentLibrary
@@ -367,11 +367,11 @@ Release Notes - Apps Development Framework - Version 2.2.
 -   \[[ADF-2302](https://issues.alfresco.com/jira/browse/ADF-2302)] - Generator install dependencies missing
 -   \[[ADF-2305](https://issues.alfresco.com/jira/browse/ADF-2305)] - Process app tiles on process workspace landing page show "..." in Firefox
 -   \[[ADF-2310](https://issues.alfresco.com/jira/browse/ADF-2310)] - Error is thrown if isSelectionValid optional property is not defined
--   \[[ADF-2311](https://issues.alfresco.com/jira/browse/ADF-2311)] - [Content Metadata Card component](../content-services/content-metadata-card.component.md) does not work for folder node.
+-   \[[ADF-2311](https://issues.alfresco.com/jira/browse/ADF-2311)] - [Content Metadata Card component](../content-services/components/content-metadata-card.component.md) does not work for folder node.
 -   \[[ADF-2324](https://issues.alfresco.com/jira/browse/ADF-2324)] - Process [`Pagination`](../../lib/content-services/document-list/models/document-library.model.ts) - Items per page is not saved on user preferences
 -   \[[ADF-2329](https://issues.alfresco.com/jira/browse/ADF-2329)] - Start Task form elements are not properly aligned in other themes than Developer Theme
 -   \[[ADF-2338](https://issues.alfresco.com/jira/browse/ADF-2338)] - Close 'X' button for Document Thumbnail Pane is not displayed
--   \[[ADF-2342](https://issues.alfresco.com/jira/browse/ADF-2342)] - Password can be retrieved from the [login component](../core/login.component.md)
+-   \[[ADF-2342](https://issues.alfresco.com/jira/browse/ADF-2342)] - Password can be retrieved from the [login component](../core/components/login.component.md)
 -   \[[ADF-2343](https://issues.alfresco.com/jira/browse/ADF-2343)] - [Demo shell] Not able to create a new folder on content services page
 -   \[[ADF-2344](https://issues.alfresco.com/jira/browse/ADF-2344)] - Drag and drop image is not properly displayed on Process Services
 -   \[[ADF-2346](https://issues.alfresco.com/jira/browse/ADF-2346)] - Name and profile picture is not displayed when trying to assign a user to a task.
@@ -392,7 +392,7 @@ Release Notes - Apps Development Framework - Version 2.2.
 ### Task
 
 -   \[[ADF-2316](https://issues.alfresco.com/jira/browse/ADF-2316)] - Upgrade to ngx-translate/core 9.1.1
--   \[[ADF-1876](https://issues.alfresco.com/jira/browse/ADF-1876)] - Add the possibility to have a custom "No result found" template for [search component](../content-services/search.component.md)
+-   \[[ADF-1876](https://issues.alfresco.com/jira/browse/ADF-1876)] - Add the possibility to have a custom "No result found" template for [search component](../content-services/components/search.component.md)
 -   \[[ADF-1952](https://issues.alfresco.com/jira/browse/ADF-1952)] - Split the current test suites to test cases in Test Rail
 -   \[[ADF-2085](https://issues.alfresco.com/jira/browse/ADF-2085)] - [Test Automation] create test for starting a task
 -   \[[ADF-2087](https://issues.alfresco.com/jira/browse/ADF-2087)] - [Test Automation] Create test to cover starting a process
@@ -406,7 +406,7 @@ Release Notes - Apps Development Framework - Version 2.2.
 -   \[[ADF-2229](https://issues.alfresco.com/jira/browse/ADF-2229)] - Refactoring viewer tests
 -   \[[ADF-2236](https://issues.alfresco.com/jira/browse/ADF-2236)] - Export test
 -   \[[ADF-2245](https://issues.alfresco.com/jira/browse/ADF-2245)] - Setting Component - Emit an event to detect the changed url
--   \[[ADF-2261](https://issues.alfresco.com/jira/browse/ADF-2261)] - Missing documentation to render json in a [form component](../core/form.component.md)
+-   \[[ADF-2261](https://issues.alfresco.com/jira/browse/ADF-2261)] - Missing documentation to render json in a [form component](../core/components/form.component.md)
 -   \[[ADF-2267](https://issues.alfresco.com/jira/browse/ADF-2267)] - [Login Component] Password field autocomplete
 -   \[[ADF-2293](https://issues.alfresco.com/jira/browse/ADF-2293)] - Ripristinate the loading in the generator/ demo shell
 -   \[[ADF-2307](https://issues.alfresco.com/jira/browse/ADF-2307)] - Add a data-automation-id tag for Process Services navigation bar.

docs/release-notes/RelNote230.md

@@ -65,9 +65,9 @@ Below are the most important new features of this release:
 -   Lock File
 -   Comment a [Node](https://github.com/Alfresco/alfresco-js-api/blob/development/src/api/content-rest-api/docs/Node.md)
 -   Inherit Permission Button
--   [Permission List Component](../content-services/permission-list.component.md)
--   [Sidenav Layout Component](../core/sidenav-layout.component.md)
--   [Content metadata component](../content-services/content-metadata.component.md) enhancement
+-   [Permission List Component](../content-services/components/permission-list.component.md)
+-   [Sidenav Layout Component](../core/components/sidenav-layout.component.md)
+-   [Content metadata component](../content-services/components/content-metadata.component.md) enhancement
 -   Search Enhancements
 -   Search Chip List
 -   Version Management Enhancements
@@ -101,7 +101,7 @@ When a file is locked it can be locked and unlocked by default only by the user
 
 ### Comment a Node
 
-The [comments component](../core/comments.component.md) can now be used also on files.
+The [comments component](../core/components/comments.component.md) can now be used also on files.
 
     <adf-comments
      [nodeId]="YOUR_NODE_ID"
@@ -190,7 +190,7 @@ The working demo can be found in the "demo shell" application.
 
 ### Search Chip List
 
-This is a new component that allows you to display a list of chips reflecting the facet queries and facet buckets user has selected in the [Search Filter component](../content-services/search-filter.component.md). It is possible to remove the chips to perform an automatic data update.
+This is a new component that allows you to display a list of chips reflecting the facet queries and facet buckets user has selected in the [Search Filter component](../content-services/components/search-filter.component.md). It is possible to remove the chips to perform an automatic data update.
 
 ![Selected Facets](images/selected-facets.png)
 
@@ -255,7 +255,7 @@ Release Notes - Apps Development Framework - Version 2.3.0
 -   \[[ADF-2360](https://issues.alfresco.com/jira/browse/ADF-2360)] - Wiki test style
 -   \[[ADF-2451](https://issues.alfresco.com/jira/browse/ADF-2451)] - Initial doc review
 -   \[[ADF-2456](https://issues.alfresco.com/jira/browse/ADF-2456)] - Document List documentation for properties needs enhancements
--   \[[ADF-2458](https://issues.alfresco.com/jira/browse/ADF-2458)] - Overhaul [process.service](../process-services/process.service.md).md doc file
+-   \[[ADF-2458](https://issues.alfresco.com/jira/browse/ADF-2458)] - Overhaul [process.service](../process-services/services/process.service.md).md doc file
 -   \[[ADF-2463](https://issues.alfresco.com/jira/browse/ADF-2463)] - Organise doc files into library subfolders
 -   \[[ADF-2526](https://issues.alfresco.com/jira/browse/ADF-2526)] - Fix interpolation markers in doc code samples
 -   \[[ADF-2596](https://issues.alfresco.com/jira/browse/ADF-2596)] - Properties of renamed input/output are wrong
@@ -270,17 +270,17 @@ Release Notes - Apps Development Framework - Version 2.3.0
 -   \[[ADF-2433](https://issues.alfresco.com/jira/browse/ADF-2433)] - Calling custom REST end points with JS API
 -   \[[ADF-2434](https://issues.alfresco.com/jira/browse/ADF-2434)] - Rename file and folders
 -   \[[ADF-2435](https://issues.alfresco.com/jira/browse/ADF-2435)] - SSO AuthGuards
--   \[[ADF-2452](https://issues.alfresco.com/jira/browse/ADF-2452)] - [Task Standalone component](../process-services/task-standalone.component.md)
+-   \[[ADF-2452](https://issues.alfresco.com/jira/browse/ADF-2452)] - [Task Standalone component](../process-services/components/task-standalone.component.md)
 -   \[[ADF-2457](https://issues.alfresco.com/jira/browse/ADF-2457)] - Comment component - Hide the table header
 -   \[[ADF-2459](https://issues.alfresco.com/jira/browse/ADF-2459)] - ADF Pipeline build - is not running the production mode
--   \[[ADF-2477](https://issues.alfresco.com/jira/browse/ADF-2477)] - Message bus in [log service](../core/log.service.md)
+-   \[[ADF-2477](https://issues.alfresco.com/jira/browse/ADF-2477)] - Message bus in [log service](../core/services/log.service.md)
 -   \[[ADF-2493](https://issues.alfresco.com/jira/browse/ADF-2493)] - alfresco-js-api search api regeneration
 -   \[[ADF-2504](https://issues.alfresco.com/jira/browse/ADF-2504)] - Provide Option to Disable Metadata Edit
 -   \[[ADF-2528](https://issues.alfresco.com/jira/browse/ADF-2528)] - Share Directive
 -   \[[ADF-2540](https://issues.alfresco.com/jira/browse/ADF-2540)] - Lock and Unlock directive
 -   \[[ADF-2542](https://issues.alfresco.com/jira/browse/ADF-2542)] - Permission display component
 -   \[[ADF-2559](https://issues.alfresco.com/jira/browse/ADF-2559)] - Import the Sidebar component in ADF
--   \[[ADF-2588](https://issues.alfresco.com/jira/browse/ADF-2588)] - Make comment components compatible with [content service](../core/content.service.md)
+-   \[[ADF-2588](https://issues.alfresco.com/jira/browse/ADF-2588)] - Make comment components compatible with [content service](../core/services/content.service.md)
 -   \[[ADF-2609](https://issues.alfresco.com/jira/browse/ADF-2609)] - Provide a way to change the BPM context
 -   \[[ADF-2614](https://issues.alfresco.com/jira/browse/ADF-2614)] - Edit icon misses in Info-drawer Assignee
 -   \[[ADF-2632](https://issues.alfresco.com/jira/browse/ADF-2632)] - Version Manager should support application configuration settings
@@ -339,7 +339,7 @@ Release Notes - Apps Development Framework - Version 2.3.0
 -   \[[ADF-2492](https://issues.alfresco.com/jira/browse/ADF-2492)] - Task without a form is not displayed when assignment is preselected on APS
 -   \[[ADF-2500](https://issues.alfresco.com/jira/browse/ADF-2500)] - The full content of Trashcan is not displayed.
 -   \[[ADF-2501](https://issues.alfresco.com/jira/browse/ADF-2501)] - Checkbox form Widget - TASK "Complete" button not grayed out when widget set as required
--   \[[ADF-2514](https://issues.alfresco.com/jira/browse/ADF-2514)] - AOT build [process service](../process-services/process.service.md) error in typescript compiler
+-   \[[ADF-2514](https://issues.alfresco.com/jira/browse/ADF-2514)] - AOT build [process service](../process-services/services/process.service.md) error in typescript compiler
 -   \[[ADF-2522](https://issues.alfresco.com/jira/browse/ADF-2522)] - Date and time widget - Incorrect min/max values applied
 -   \[[ADF-2535](https://issues.alfresco.com/jira/browse/ADF-2535)] - Content Metadata - group title translation
 -   \[[ADF-2575](https://issues.alfresco.com/jira/browse/ADF-2575)] - User details are not displayed when searching for a user to add it to 'involve people' on a task
@@ -354,7 +354,7 @@ Release Notes - Apps Development Framework - Version 2.3.0
 -   \[[ADF-2630](https://issues.alfresco.com/jira/browse/ADF-2630)] - demo shell: tabs of the info drawer are not translated
 -   \[[ADF-2634](https://issues.alfresco.com/jira/browse/ADF-2634)] - [Node](https://github.com/Alfresco/alfresco-js-api/blob/development/src/api/content-rest-api/docs/Node.md) Version List actions are not localised
 -   \[[ADF-2636](https://issues.alfresco.com/jira/browse/ADF-2636)] - Console gives an error when trying to load ADF on safari
--   \[[ADF-2660](https://issues.alfresco.com/jira/browse/ADF-2660)] - ADF [Process Service](../process-services/process.service.md) lib is not importing the content dependency
+-   \[[ADF-2660](https://issues.alfresco.com/jira/browse/ADF-2660)] - ADF [Process Service](../process-services/services/process.service.md) lib is not importing the content dependency
 -   \[[ADF-2662](https://issues.alfresco.com/jira/browse/ADF-2662)] - [Settings Component] Still able to sign in when changing APS or ACS URLS to invalid URL
 -   \[[ADF-2669](https://issues.alfresco.com/jira/browse/ADF-2669)] - Delete version confirmation dialog has wrong 'cancel' color
 -   \[[ADF-2673](https://issues.alfresco.com/jira/browse/ADF-2673)] - [`DebugAppConfigService`](../../lib/core/app-config/debug-app-config.service.ts) breaks default values for application config
@@ -379,7 +379,7 @@ Release Notes - Apps Development Framework - Version 2.3.0
 ### New Feature
 
 -   \[[ADF-2306](https://issues.alfresco.com/jira/browse/ADF-2306)] - DocumentList should let configure the includeFields request to the server
--   \[[ADF-2361](https://issues.alfresco.com/jira/browse/ADF-2361)] - rootId behavior of [`BreadcrumbComponent`](../content-services/breadcrumb.component.md)
+-   \[[ADF-2361](https://issues.alfresco.com/jira/browse/ADF-2361)] - rootId behavior of [`BreadcrumbComponent`](../content-services/components/breadcrumb.component.md)
 -   \[[ADF-2415](https://issues.alfresco.com/jira/browse/ADF-2415)] - PDF Viewer - open password protected files
 -   \[[ADF-2552](https://issues.alfresco.com/jira/browse/ADF-2552)] - Create a directive to add/remove inherited permissions
 -   \[[ADF-2553](https://issues.alfresco.com/jira/browse/ADF-2553)] - Add a dropdown choice for role into permission list for locally set permissions
@@ -395,7 +395,7 @@ Release Notes - Apps Development Framework - Version 2.3.0
 -   \[[ADF-2376](https://issues.alfresco.com/jira/browse/ADF-2376)] - Remove logs in instances
 -   \[[ADF-2380](https://issues.alfresco.com/jira/browse/ADF-2380)] - Adding start task tests for custom app
 -   \[[ADF-2394](https://issues.alfresco.com/jira/browse/ADF-2394)] - Process List Component - Should expose the mutiSelect property
--   \[[ADF-2405](https://issues.alfresco.com/jira/browse/ADF-2405)] - [Process Service](../process-services/process.service.md) - Add a new method to get all process definition versions
+-   \[[ADF-2405](https://issues.alfresco.com/jira/browse/ADF-2405)] - [Process Service](../process-services/services/process.service.md) - Add a new method to get all process definition versions
 -   \[[ADF-2412](https://issues.alfresco.com/jira/browse/ADF-2412)] - Task List - refactoring
 -   \[[ADF-2417](https://issues.alfresco.com/jira/browse/ADF-2417)] - Remove the default [Node](https://github.com/Alfresco/alfresco-js-api/blob/development/src/api/content-rest-api/docs/Node.md) ID from tag page in demo-shell
 -   \[[ADF-2424](https://issues.alfresco.com/jira/browse/ADF-2424)] - Docker file size decreasing

docs/release-notes/RelNote240.md

@@ -62,7 +62,7 @@ Below are the most important new features of this release:
 -   [`ProcessList`](../../lib/process-services/mock/process/process.model.mock.ts) Empty Page
 -   Error Page Component
 -   Search Improvements 
--   [App config pipe](../core/app-config.pipe.md)
+-   [App config pipe](../core/pipes/app-config.pipe.md)
 -   Intercepting and Resuming Upload
 -   Conditional Visibility for Data Columns
 -   Conditional States for Content Actions
@@ -72,7 +72,7 @@ Below are the most important new features of this release:
 
 With ADF 2.4.0 we support SSO as login for CS and PS both of which include native support for using Keycloak.
 For more information about how to configure SSO on ADF please refer to:
-[the SSO section of the Login component docs.](https://github.com/Alfresco/alfresco-ng2-components/blob/development/docs/core/login.component.md#single-sign-on-sso)
+[the SSO section of the Login component docs.](../core/components/login.component.md#single-sign-on-sso)
 
 **Please note that the SSO support requires ACS 6.0, APS 1.9 or later using Keycloak.**
 
@@ -101,7 +101,7 @@ Once the Keycloak login is performed the user is redirected back to the app base
 ### File versioning enhancement
 
 With ADF 2.4.0, you can now upload minor or major versions of a file. We have also removed the restriction where you were limited to uploading only same file types as new versions.
-For more information about this component please refer to [the official documentation.](https://github.com/Alfresco/alfresco-ng2-components/blob/development/docs/content-services/version-manager.component.md)
+For more information about this component please refer to [the official documentation.](../content-services/components/version-manager.component.md)
 
 ![Verrsioning](images/Jun-24-2018+18-53-43.gif)
 
@@ -110,7 +110,7 @@ For more information about this component please refer to [the official document
 We have created a general-purpose Empty Page Component to allow you to have a consistent empty state for your tables.
 This component needs just 3 inputs: icon, title, and subtitle.
 You can also transclude external content into the component's body.
-For more information about this component please refer to [the official documentation.](https://github.com/Alfresco/alfresco-ng2-components/blob/development/docs/core/empty-content.component.md) 
+For more information about this component please refer to [the official documentation.](../core/components/empty-content.component.md) 
 
 ![Empty Page State](images/EmptyPage.gif)
 
@@ -131,7 +131,7 @@ You can still override it from the parent component using `<ng-template>`.
 ### Error Page Component
 
 We have created an error page component that will show buttons and messages relevant to the error that occurred (404, 403, etc...)
-For more information about this component please refer to [the official documentation.](https://github.com/Alfresco/alfresco-ng2-components/blob/development/docs/core/error-content.component.md) 
+For more information about this component please refer to [the official documentation.](../core/components/error-content.component.md) 
 
 ![404Example](images/404Error.gif)
 
@@ -145,7 +145,7 @@ In this release we have provided a great number of Search enhancements.
 -   Server-side sorting with full customization support
 -   Support for custom widgets in the Search Filter
 -   Multi-select facet, Date range facet, Number range facet,  Slider range facet
-    A full list of details and examples is available in the [Search filter component documentation.](https://github.com/Alfresco/alfresco-ng2-components/blob/development/docs/content-services/search-filter.component.md)
+    A full list of details and examples is available in the [Search filter component documentation.](../content-services/components/search-filter.component.md)
 
 ![](images/pastedImage_1.png)
 
@@ -159,7 +159,7 @@ In 2.4.0 we provide a special Angular Pipe to deal with application configuratio
 
 Developers can also provide fallback values and chain the pipe with other pipes, such as Translate.
 
-You can find details and examples on the [App config pipe page.](https://github.com/Alfresco/alfresco-ng2-components/blob/development/docs/core/app-config.pipe.md)
+You can find details and examples on the [App config pipe page.](../core/pipes/app-config.pipe.md)
 
 ### Intercepting and Resuming Upload
 
@@ -172,7 +172,7 @@ You can now intercept a file or folder upload to perform additional actions. Wit
 
 Note that this feature applies to all methods of uploading (drag and drop, buttons, etc).
 
-You can find more details and examples of how to set up the confirmation dialog on the [Upload drag area page.](https://github.com/Alfresco/alfresco-ng2-components/blob/development/docs/content-services/upload-drag-area.component.md#intercepting-uploads)
+You can find more details and examples of how to set up the confirmation dialog on the [Upload drag area page.](../content-services/components/upload-drag-area.component.md#intercepting-uploads)
 
 ![](images/adf-download-intercept.gif)
 
@@ -186,7 +186,7 @@ You can now toggle Data Column visibility based on a static value or expression.
         title="MY.RESOURCE.KEY">
     </data-column>
 
-Find more details and examples on the [Document list component page.](https://github.com/Alfresco/alfresco-ng2-components/blob/development/docs/content-services/document-list.component.md#conditional-visibility)
+Find more details and examples on the [Document list component page.](../content-services/components/document-list.component.md#conditional-visibility)
 
 ### Conditional States for Content Actions
 
@@ -196,12 +196,12 @@ Specifically, you can:
 -   Set static values
 -   Bind to functions that take the corresponding node and evaluate the state
 
-More details are available on the [Content action component page.](https://github.com/Alfresco/alfresco-ng2-components/blob/development/docs/content-services/content-action.component.md#conditional-visibility)
+More details are available on the [Content action component page.](../content-services/components/content-action.component.md#conditional-visibility)
 
 ### Responsive Button Menu
 
 We have added a new component which allows you add a custom list of buttons. The list will automatically collapse into a burger menu choice for small screens so the menu button will always fit inside your page.
-See the [Buttons menu component page](https://github.com/Alfresco/alfresco-ng2-components/blob/development/docs/core/buttons-menu.component.md) for more information.
+See the [Buttons menu component page](../core/components/buttons-menu.component.md) for more information.
 
 ![Responsive Button Menu](images/ButtonMenuResponsive.gif)
 
@@ -234,14 +234,14 @@ Release Notes - Apps Development Framework - Version 2.4.0
 -   \[[ADF-2437](https://issues.alfresco.com/jira/browse/ADF-2437)] - Provide instructions on Tomcat deployment
 -   \[[ADF-2525](https://issues.alfresco.com/jira/browse/ADF-2525)] - Documentation for the Faceted Search
 -   \[[ADF-2643](https://issues.alfresco.com/jira/browse/ADF-2643)] - Update CS and PS supported documentation
--   \[[ADF-2688](https://issues.alfresco.com/jira/browse/ADF-2688)] - [Content Node Selector component](../content-services/content-node-selector.component.md) properties documentation
+-   \[[ADF-2688](https://issues.alfresco.com/jira/browse/ADF-2688)] - [Content Node Selector component](../content-services/components/content-node-selector.component.md) properties documentation
 -   \[[ADF-2789](https://issues.alfresco.com/jira/browse/ADF-2789)] - alfresco-js-api downlaodapi
 -   \[[ADF-2847](https://issues.alfresco.com/jira/browse/ADF-2847)] - Update all doc file structures to match script requirements
 -   \[[ADF-2969](https://issues.alfresco.com/jira/browse/ADF-2969)] - Move doc tools into the new tools folder
 -   \[[ADF-2989](https://issues.alfresco.com/jira/browse/ADF-2989)] - Pre-populating Start Process [`Form`](../../lib/process-services/task-list/models/form.model.ts) with multiple files from ACS doesn't work
 -   \[[ADF-3049](https://issues.alfresco.com/jira/browse/ADF-3049)] - Release Note 2.4.0
 -   \[[ADF-3087](https://issues.alfresco.com/jira/browse/ADF-3087)] - Better explanation of replacing i18n keys in the user guide
--   \[[ADF-3142](https://issues.alfresco.com/jira/browse/ADF-3142)] - [Login component](../core/login.component.md) should explain what "remember me" is for
+-   \[[ADF-3142](https://issues.alfresco.com/jira/browse/ADF-3142)] - [Login component](../core/components/login.component.md) should explain what "remember me" is for
 -   \[[ADF-3150](https://issues.alfresco.com/jira/browse/ADF-3150)] - Doc tool configuration settings should all be in one place
 
 ### Feature
@@ -259,17 +259,17 @@ Release Notes - Apps Development Framework - Version 2.4.0
 -   \[[ADF-2650](https://issues.alfresco.com/jira/browse/ADF-2650)] - Responsive buttons component
 -   \[[ADF-2753](https://issues.alfresco.com/jira/browse/ADF-2753)] - Error pages component
 -   \[[ADF-2795](https://issues.alfresco.com/jira/browse/ADF-2795)] - OpenID Connect Implicit Flow support
--   \[[ADF-2852](https://issues.alfresco.com/jira/browse/ADF-2852)] - Create an [about component](../core/about.component.md)
+-   \[[ADF-2852](https://issues.alfresco.com/jira/browse/ADF-2852)] - Create an [about component](../core/components/about.component.md)
 -   \[[ADF-2930](https://issues.alfresco.com/jira/browse/ADF-2930)] - Introduce general purpose "Empty Page" component
 -   \[[ADF-2961](https://issues.alfresco.com/jira/browse/ADF-2961)] - Application config - Hard-coded protocols for ecmHost and bpmHost
 -   \[[ADF-2973](https://issues.alfresco.com/jira/browse/ADF-2973)] - Angular pipe to get application configuration settings
--   \[[ADF-2975](https://issues.alfresco.com/jira/browse/ADF-2975)] - New "nodeType" input for [Upload Button Component](../content-services/upload-button.component.md)
+-   \[[ADF-2975](https://issues.alfresco.com/jira/browse/ADF-2975)] - New "nodeType" input for [Upload Button Component](../content-services/components/upload-button.component.md)
 -   \[[ADF-2984](https://issues.alfresco.com/jira/browse/ADF-2984)] - Show date invalid message on search date range picker
--   \[[ADF-3028](https://issues.alfresco.com/jira/browse/ADF-3028)] - [Page Title Service](../core/page-title.service.md) should support i18n
+-   \[[ADF-3028](https://issues.alfresco.com/jira/browse/ADF-3028)] - [Page Title Service](../core/services/page-title.service.md) should support i18n
 -   \[[ADF-3041](https://issues.alfresco.com/jira/browse/ADF-3041)] - TaskList Component - Empty State issue.
 -   \[[ADF-3066](https://issues.alfresco.com/jira/browse/ADF-3066)] - [`ProcessList`](../../lib/process-services/mock/process/process.model.mock.ts) Component - Empty State issue.
 -   \[[ADF-3095](https://issues.alfresco.com/jira/browse/ADF-3095)] - Upload and DragArea component events to intercept uploads
--   \[[ADF-3118](https://issues.alfresco.com/jira/browse/ADF-3118)] - [Notification Service](../core/notification.service.md) should support i18n resource keys
+-   \[[ADF-3118](https://issues.alfresco.com/jira/browse/ADF-3118)] - [Notification Service](../core/services/notification.service.md) should support i18n resource keys
 
 ### Story
 
@@ -316,7 +316,7 @@ Release Notes - Apps Development Framework - Version 2.4.0
 -   \[[ADF-2760](https://issues.alfresco.com/jira/browse/ADF-2760)] - Background colour for document lists is not white
 -   \[[ADF-2766](https://issues.alfresco.com/jira/browse/ADF-2766)] - Download [Node](https://github.com/Alfresco/alfresco-js-api/blob/development/src/api/content-rest-api/docs/Node.md) Directive does not work with Shared Links
 -   \[[ADF-2767](https://issues.alfresco.com/jira/browse/ADF-2767)] - Side nav is not responsive
--   \[[ADF-2771](https://issues.alfresco.com/jira/browse/ADF-2771)] - [Sidebar action menu component](../core/sidebar-action-menu.component.md) - UX review
+-   \[[ADF-2771](https://issues.alfresco.com/jira/browse/ADF-2771)] - [Sidebar action menu component](../core/components/sidebar-action-menu.component.md) - UX review
 -   \[[ADF-2772](https://issues.alfresco.com/jira/browse/ADF-2772)] - Sidenav Layout - UX review
 -   \[[ADF-2786](https://issues.alfresco.com/jira/browse/ADF-2786)] - Search Filter: AOT build error
 -   \[[ADF-2792](https://issues.alfresco.com/jira/browse/ADF-2792)] - [`Pagination`](../../lib/content-services/document-list/models/document-library.model.ts) - does not return to previous page when current is empty
@@ -441,10 +441,10 @@ Release Notes - Apps Development Framework - Version 2.4.0
 -   \[[ADF-2906](https://issues.alfresco.com/jira/browse/ADF-2906)] - Add the style form zeplin in the adf-empty-list component
 -   \[[ADF-2912](https://issues.alfresco.com/jira/browse/ADF-2912)] - Group EVERYONE should always be showed for search on add permission results
 -   \[[ADF-2913](https://issues.alfresco.com/jira/browse/ADF-2913)] - Search Filter does not preserve original query
--   \[[ADF-2988](https://issues.alfresco.com/jira/browse/ADF-2988)] - Replace existing Alfresco Logo on the [login component](../core/login.component.md)
+-   \[[ADF-2988](https://issues.alfresco.com/jira/browse/ADF-2988)] - Replace existing Alfresco Logo on the [login component](../core/components/login.component.md)
 -   \[[ADF-3037](https://issues.alfresco.com/jira/browse/ADF-3037)] - [js-api] Add newly introduced isFavorite property to Nodes
 -   \[[ADF-3042](https://issues.alfresco.com/jira/browse/ADF-3042)] - Use the custom date adapter from adf-core on Search Date Range widget
--   \[[ADF-3062](https://issues.alfresco.com/jira/browse/ADF-3062)] - [`NodeFavoriteDirective`](../core/node-favorite.directive.md) should support ACS 5x and 6x
+-   \[[ADF-3062](https://issues.alfresco.com/jira/browse/ADF-3062)] - [`NodeFavoriteDirective`](../core/directives/node-favorite.directive.md) should support ACS 5x and 6x
 -   \[[ADF-3088](https://issues.alfresco.com/jira/browse/ADF-3088)] - Remove sub component folder in the core
 -   \[[ADF-3094](https://issues.alfresco.com/jira/browse/ADF-3094)] - Test ADF against ACS6
 -   \[[ADF-3114](https://issues.alfresco.com/jira/browse/ADF-3114)] - CardViewItemProperty extra custom data

docs/release-notes/RelNote250.md

@@ -67,7 +67,7 @@ Below are the most important new features of this release:
 -   **General Header component**
 -   **Card view new property types rendering**
 -   **Default metadata properties hide/show property**
--   **[`NotificationService`](../core/notification.service.md) expose MatSnackBarConfig**
+-   **[`NotificationService`](../core/services/notification.service.md) expose MatSnackBarConfig**
 -   **Dynamic Table - Datetime widget**
 -   **Attach a form to a standalone Task**
 -   **Task list/Process list processDefinitionId filter**
@@ -100,7 +100,7 @@ This component is a reusable header for Alfresco applications. It displays a cus
 ![Empty Page State](images/header.gif)
 
 For more information about this component please refer to the 
-[official documentation](https://github.com/Alfresco/alfresco-ng2-components/blob/development/docs/core/header.component.md).
+[official documentation](../core/components/header.component.md).
 
 ### Default metadata properties hide/show
 
@@ -135,11 +135,11 @@ KeyValuePairs is a map key value that is rendered as shown in the image to the l
 ![Card view](images/cardview.gif)
 
 For more information about this component please refer to the 
-[official documentation](https://github.com/Alfresco/alfresco-ng2-components/blob/development/docs/core/card-view.component.md).
+[official documentation](../core/components/card-view.component.md).
 
 ### NotificationService customizability improvement
 
-The [NotificationService](../core/notification.service.md) now exposes a new input parameter to allow a full customization of the notification message: 
+The [NotificationService](../core/services/notification.service.md) now exposes a new input parameter to allow a full customization of the notification message: 
 
 -   Direction : Text layout direction for the snack bar.
 -   Duration : The length of time in milliseconds to wait before automatically dismissing the snack bar.
@@ -150,7 +150,7 @@ The [NotificationService](../core/notification.service.md) now exposes a new inp
 ![Notification](images/notification2.gif)
 
 For more information about this component please refer to the 
-[official documentation](https://github.com/Alfresco/alfresco-ng2-components/blob/development/docs/core/notification.service.md).
+[official documentation](../core/services/notification.service.md).
 
 ### Dynamic Table - Datetime widget
 
@@ -169,7 +169,7 @@ You can now attach a form to a new task that is not part of a Process using the
 ![Standalone task](images/Standalone+task.gif)
 
 For more information about this component please refer to the 
-[official documentation](https://github.com/Alfresco/alfresco-ng2-components/blob/development/docs/process-services/task-standalone.component.md). 
+[official documentation](../process-services/components/task-standalone.component.md). 
 
 ### Task list/Process list processDefinitionId filter
 
@@ -263,7 +263,7 @@ Release Notes - Apps Development Framework - Version 2.5.0
     ] - ProcessFilter - the method ng doesn't check the property filterParam
 -   \[
     [ADF-3286](https://issues.alfresco.com/jira/browse/ADF-3286)
-    ] - [`NotificationService`](../core/notification.service.md) expose MatSnackBarConfig
+    ] - [`NotificationService`](../core/services/notification.service.md) expose MatSnackBarConfig
 -   \[
     [ADF-3299](https://issues.alfresco.com/jira/browse/ADF-3299)
     ] - Upgrade Angular
@@ -368,7 +368,7 @@ Release Notes - Apps Development Framework - Version 2.5.0
     ] - Search on document picker with custom site list has problems
 -   \[
     [ADF-3365](https://issues.alfresco.com/jira/browse/ADF-3365)
-    ] - ADF [search filter component](../content-services/search-filter.component.md) doesn't provide the option to control the order of the facets
+    ] - ADF [search filter component](../content-services/components/search-filter.component.md) doesn't provide the option to control the order of the facets
 -   \[
     [ADF-3373](https://issues.alfresco.com/jira/browse/ADF-3373)
     ] - Refresh button is not displayed on the form
@@ -431,10 +431,10 @@ Release Notes - Apps Development Framework - Version 2.5.0
     ] - Move ADF E2E tests
 -   \[
     [ADF-3259](https://issues.alfresco.com/jira/browse/ADF-3259)
-    ] - Consolidate [login component](../core/login.component.md)
+    ] - Consolidate [login component](../core/components/login.component.md)
 -   \[
     [ADF-3273](https://issues.alfresco.com/jira/browse/ADF-3273)
-    ] - Consolidating the [User info component](../core/user-info.component.md)
+    ] - Consolidating the [User info component](../core/components/user-info.component.md)
 -   \[
     [ADF-3305](https://issues.alfresco.com/jira/browse/ADF-3305)
     ] - Expose the alfresco logo image
@@ -452,13 +452,13 @@ Release Notes - Apps Development Framework - Version 2.5.0
     ] - Create automated tests for Task list - Start Task
 -   \[
     [ADF-3335](https://issues.alfresco.com/jira/browse/ADF-3335)
-    ] - Create automated tests for [Task filters component](../process-services/task-filters.component.md)
+    ] - Create automated tests for [Task filters component](../process-services/components/task-filters.component.md)
 -   \[
     [ADF-3336](https://issues.alfresco.com/jira/browse/ADF-3336)
     ] - Create automated tests for Document List
 -   \[
     [ADF-3337](https://issues.alfresco.com/jira/browse/ADF-3337)
-    ] - Create automated tests for [Process filters component](../process-services/process-filters.component.md)
+    ] - Create automated tests for [Process filters component](../process-services/components/process-filters.component.md)
 -   \[
     [ADF-3339](https://issues.alfresco.com/jira/browse/ADF-3339)
     ] - Create component in demo-shell to facilitate the testing of the header component
@@ -560,7 +560,7 @@ Release Notes - Apps Development Framework - Version 2.5.0
     ] - Upload file - TaskList - Task App
 -   \[
     [ADF-3319](https://issues.alfresco.com/jira/browse/ADF-3319)
-    ] - [Empty list component](../core/empty-list.component.md)
+    ] - [Empty list component](../core/components/empty-list.component.md)
 -   \[
     [ADF-3369](https://issues.alfresco.com/jira/browse/ADF-3369)
     ] - Add 'showHeaderContent' property of adf-task-details set on false on Demo-Shell

docs/release-notes/RelNote260.md

@@ -51,14 +51,14 @@ Below are the most important new features of this release:
 -   **Show sidebar on the right option**
 -   **Double sidebar for viewer**
 -   **Smart folder icon**
--   **[Tag node list component](../content-services/tag-node-list.component.md) has a configurable delete button for tag**
--   **Validation summary for [form component](../core/form.component.md)**
+-   **[Tag node list component](../content-services/components/tag-node-list.component.md) has a configurable delete button for tag**
+-   **Validation summary for [form component](../core/components/form.component.md)**
 -   **Share link with expiry date**
 -   **Base extensibility support**
 
 ### Show more/less tag
 
-The **[Tag List Component](../content-services/tag-list.component.md)** has two new buttons that allow the user to see more/less tags. This turns out to be more useful than showing the whole list of tags related to a node. This functionality is already embedded into the component and the user doesn't have to do anything to make it work.
+The **[Tag List Component](../content-services/components/tag-list.component.md)** has two new buttons that allow the user to see more/less tags. This turns out to be more useful than showing the whole list of tags related to a node. This functionality is already embedded into the component and the user doesn't have to do anything to make it work.
 
     <adf-tag-list></adf-tag-list>
 
@@ -74,7 +74,7 @@ The **Sidenav Component** now accepts the **position** as an input parameter so
 
 ### Double sidebar for viewer
 
-An extra sidebar is now available to use within the **[Viewer Component](../core/viewer.component.md)**. This helps the user to organise the information related to the node in a better way.
+An extra sidebar is now available to use within the **[Viewer Component](../core/components/viewer.component.md)**. This helps the user to organise the information related to the node in a better way.
 
      <ng-template #sidebarRightTemplate>
        //your right sidebar content here
@@ -180,7 +180,7 @@ Release Notes - Apps Development Framework - Version 2.6.
 -   \[[ADF-2640](https://issues.alfresco.com/jira/browse/ADF-2640)] - adf-tag-node-list with remove option configurable
 -   \[[ADF-2921](https://issues.alfresco.com/jira/browse/ADF-2921)] - Icons for smart folders, links and folders with rules
 -   \[[ADF-3308](https://issues.alfresco.com/jira/browse/ADF-3308)] - [ProcessList](../../lib/process-services/mock/process/process.model.mock.ts) Component - Provide a way to filter the list by fields
--   \[[ADF-3352](https://issues.alfresco.com/jira/browse/ADF-3352)] - [Viewer Component](../core/viewer.component.md) - Allow multiple side bar
+-   \[[ADF-3352](https://issues.alfresco.com/jira/browse/ADF-3352)] - [Viewer Component](../core/components/viewer.component.md) - Allow multiple side bar
 -   \[[ADF-3382](https://issues.alfresco.com/jira/browse/ADF-3382)] - Start a Process - Change the process definition from a dropdown to autocomplete
 -   \[[ADF-3397](https://issues.alfresco.com/jira/browse/ADF-3397)] - Task Filter - Doesn't show the right icon
 -   \[[ADF-3415](https://issues.alfresco.com/jira/browse/ADF-3415)] - Process Filter - Doesn't show the right icon
@@ -188,8 +188,8 @@ Release Notes - Apps Development Framework - Version 2.6.
 -   \[[ADF-3438](https://issues.alfresco.com/jira/browse/ADF-3438)] - Task List Demo Page - Add page/size parameters
 -   \[[ADF-3443](https://issues.alfresco.com/jira/browse/ADF-3443)] - Move print from ACA to ADF
 -   \[[ADF-3499](https://issues.alfresco.com/jira/browse/ADF-3499)] - ACS APS Integration - Not able to upload a file in case the user has more than one alfresco repositories
--   \[[ADF-3507](https://issues.alfresco.com/jira/browse/ADF-3507)] - Show more/fewer tags buttons in [Tag List Component](../content-services/tag-list.component.md)
--   \[[ADF-3512](https://issues.alfresco.com/jira/browse/ADF-3512)] - [SidenavLayoutComponent](../core/sidenav-layout.component.md) option to show the sidebar on the right
+-   \[[ADF-3507](https://issues.alfresco.com/jira/browse/ADF-3507)] - Show more/fewer tags buttons in [Tag List Component](../content-services/components/tag-list.component.md)
+-   \[[ADF-3512](https://issues.alfresco.com/jira/browse/ADF-3512)] - [SidenavLayoutComponent](../core/components/sidenav-layout.component.md) option to show the sidebar on the right
 -   \[[ADF-3553](https://issues.alfresco.com/jira/browse/ADF-3553)] - Cache management for application configuration file
 -   \[[ADF-3570](https://issues.alfresco.com/jira/browse/ADF-3570)] - Migration to APS2 - Add a interceptor to be able to use APS2 API
 -   \[[ADF-3607](https://issues.alfresco.com/jira/browse/ADF-3607)] - [Demo shell] JSON Editor in [Form](../../lib/process-services/task-list/models/form.model.ts) Page
@@ -247,7 +247,7 @@ Release Notes - Apps Development Framework - Version 2.6.
 
 ### Task
 
--   \[[ADF-3335](https://issues.alfresco.com/jira/browse/ADF-3335)] - Create automated tests for [Task filters component](../process-services/task-filters.component.md)
+-   \[[ADF-3335](https://issues.alfresco.com/jira/browse/ADF-3335)] - Create automated tests for [Task filters component](../process-services/components/task-filters.component.md)
 -   \[[ADF-3393](https://issues.alfresco.com/jira/browse/ADF-3393)] - Add delete AWS environment in the creator/destructor script
 -   \[[ADF-3480](https://issues.alfresco.com/jira/browse/ADF-3480)] - Fix failing automated tests
 -   \[[ADF-3504](https://issues.alfresco.com/jira/browse/ADF-3504)] - Add needed images to stack adf-acs6. 
@@ -274,8 +274,8 @@ Release Notes - Apps Development Framework - Version 2.6.
 -   \[[ADF-3376](https://issues.alfresco.com/jira/browse/ADF-3376)] - Create automated tests for comments - Process services - Process
 -   \[[ADF-3377](https://issues.alfresco.com/jira/browse/ADF-3377)] - Create automated tests for comments - Process services - Tasks
 -   \[[ADF-3378](https://issues.alfresco.com/jira/browse/ADF-3378)] - Create automated tests for comments - Content Services PT2
--   \[[ADF-3414](https://issues.alfresco.com/jira/browse/ADF-3414)] - Create automated test for [Attach form component](../process-services/attach-form.component.md)
--   \[[ADF-3481](https://issues.alfresco.com/jira/browse/ADF-3481)] - Updated automated tests for [attach form component](../process-services/attach-form.component.md)
+-   \[[ADF-3414](https://issues.alfresco.com/jira/browse/ADF-3414)] - Create automated test for [Attach form component](../process-services/components/attach-form.component.md)
+-   \[[ADF-3481](https://issues.alfresco.com/jira/browse/ADF-3481)] - Updated automated tests for [attach form component](../process-services/components/attach-form.component.md)
 -   \[[ADF-3519](https://issues.alfresco.com/jira/browse/ADF-3519)] - Fixing tests for Task Filters
 -   \[[ADF-3520](https://issues.alfresco.com/jira/browse/ADF-3520)] - Fixing tests for Document List - Actions
 -   \[[ADF-3521](https://issues.alfresco.com/jira/browse/ADF-3521)] - Fixing tests for Version - Actions

docs/release-notes/RelNote300.md

@@ -77,7 +77,7 @@ This new functionality lets you group different facet queries under custom label
 
 ![Grouped Facet Queries](../docassets/images/search-facet-queries-groups.png)
 
-Please refer to the [search filter component documentation](../content-services/search-filter.component.md#facet-queries) for more details.
+Please refer to the [search filter component documentation](../content-services/components/search-filter.component.md#facet-queries) for more details.
 
 #### filterWithContains
 
@@ -104,25 +104,24 @@ This configuration is usually needed when you are dealing with **Kerberos**.
 
 For more details please see the links below:
 
-- [App config withCredentials configuration](../core/app-config.service.md)
-- [Login component withCredentials behaviour](../core/login.component.md)
-- [alfresco-js-api withCredentials PR](https://github.com/Alfresco/alfresco-js-api/pull/358/files)
-
+-   [App config withCredentials configuration](../core/services/app-config.service.md)
+-   [Login component withCredentials behaviour](../core/components/login.component.md)
+-   [alfresco-js-api withCredentials PR](https://github.com/Alfresco/alfresco-js-api/pull/358/files)
 
 ### JS-API in Typescript
 
-The [Alfresco JS-API layer](https://github.com/Alfresco/alfresco-js-api) has been rewritten in [TypeScript](https://en.wikipedia.org/wiki/TypeScript). *Note that the output of the project is still JavaScript code so you can use in the usual way.*
+The [Alfresco JS-API layer](https://github.com/Alfresco/alfresco-js-api) has been rewritten in [TypeScript](https://en.wikipedia.org/wiki/TypeScript). _Note that the output of the project is still JavaScript code so you can use in the usual way._
 This rewrite has been necessary to make the JS-API  lighter and  faster with the following benefits:
 
-- Tree-shakable.
-- Strong typing enhances code quality and readability.
-- In the JS-API project, it is now easier to generate new code thanks our code generator template.
-- TypeScript already provides a number of features that are planned for future version of JavaScript.
-- Intellisense in your IDE will now work much better with the JS-API
+-   Tree-shakable.
+-   Strong typing enhances code quality and readability.
+-   In the JS-API project, it is now easier to generate new code thanks our code generator template.
+-   TypeScript already provides a number of features that are planned for future version of JavaScript.
+-   Intellisense in your IDE will now work much better with the JS-API
 
 Note that the following old package names have been deprecated: **alfresco-js-api**, **alfresco-js-api-node**.
 
-The Node and Browser version are now both in: ***@alfresco/js-api***
+The Node and Browser version are now both in: **_@alfresco/js-api_**
 Refer to the official [Alfresco JS-API documenation](https://github.com/Alfresco/alfresco-js-api) to learn more about this.
 
 ### Angular 7
@@ -130,8 +129,8 @@ Refer to the official [Alfresco JS-API documenation](https://github.com/Alfresco
 Alfresco ADF 3.0.0 has been updated to version 7.0.3 of Angular and Material.
 Refer to the official project CHANGELOG files to find out what's new inside:
 
-- [Angular 7 CHANGELOG](https://github.com/angular/angular/blob/master/CHANGELOG.md)
-- [Material 7 CHANGELOG](https://github.com/angular/material2/blob/master/CHANGELOG.md)
+-   [Angular 7 CHANGELOG](https://github.com/angular/angular/blob/master/CHANGELOG.md)
+-   [Material 7 CHANGELOG](https://github.com/angular/material2/blob/master/CHANGELOG.md)
 
 ### Create library Component
 
@@ -139,13 +138,13 @@ You can now create a new Content Services document library/site with the Create
 
 ![Dropdown sites](../docassets/images/CreateLibraryDialog.png)
 
- For more information about the dialog, see the [component documentation](../content-services/library.dialog.md)
+ For more information about the dialog, see the [component documentation](../content-services/dialogs/library.dialog.md)
 
-###  Tree view component
+### Tree view component
 
 ![TreeView component screenshot](../docassets/images/tree-view.png)
 
-Shows the folder and subfolders of a node as a tree view. For more information about the Tree View component, see the [component documentation](../content-services/tree-view.component.md)
+Shows the folder and subfolders of a node as a tree view. For more information about the Tree View component, see the [component documentation](../content-services/components/tree-view.component.md)
 
 #### Basic Usage
 
@@ -155,7 +154,6 @@ Shows the folder and subfolders of a node as a tree view. For more information a
 </adf-tree-view-list>
 ```
 
-
 ### Deprecation removal
 
 Following the [SEMVER 2.0](https://semver.org/) strategy, ADF 3.0.0 introduces breaking changes only in major versions like this one. For this reason, all the features, components and services, marked as deprecated in ADF 2.X, have been removed.
@@ -173,38 +171,38 @@ links to documentation and source code:
 
 | Name | Description | Source link |
 | ---- | ----------- | ----------- |
-| [App list cloud component](../process-services-cloud/app-list-cloud.component.md) ![Experimental](../docassets/images/ExperimentalIcon.png) | Shows all deployed cloud application instances. | [Source](../../lib/process-services-cloud/src/lib/app/components/app-list-cloud.component.ts) |
-| [Group cloud component](../process-services-cloud/group-cloud.component.md) ![Experimental](../docassets/images/ExperimentalIcon.png) | Searches Groups. | [Source](../../lib/process-services-cloud/src/lib/group/components/group-cloud.component.ts) |
-| [Edit process filter cloud component](../process-services-cloud/edit-process-filter-cloud.component.md) ![Experimental](../docassets/images/ExperimentalIcon.png) | Shows Process Filter Details. | [Source](../../lib/process-services-cloud/src/lib/process/process-filters/components/edit-process-filter-cloud.component.ts) |
-| [Process filters cloud component](../process-services-cloud/process-filters-cloud.component.md) ![Experimental](../docassets/images/ExperimentalIcon.png) | Lists all available process filters and allows to select a filter. | [Source](../../lib/process-services-cloud/src/lib/process/process-filters/components/process-filters-cloud.component.ts) |
-| [Process list cloud component](../process-services-cloud/process-list-cloud.component.md) ![Experimental](../docassets/images/ExperimentalIcon.png) | Renders a list containing all the process instances matched by the parameters specified. | [Source](../../lib/process-services-cloud/src/lib/process/process-list/components/process-list-cloud.component.ts) |
-| [Start process cloud component](../process-services-cloud/start-process-cloud.component.md) ![Experimental](../docassets/images/ExperimentalIcon.png) | Starts a process. | [Source](../../lib/process-services-cloud/src/lib/process/start-process/components/start-process-cloud.component.ts) |
-| [People cloud component](../process-services-cloud/people-cloud.component.md) ![Experimental](../docassets/images/ExperimentalIcon.png) | Allows one or more users to be selected (with auto-suggestion) based on the input parameters. | [Source](../../lib/process-services-cloud/src/lib/task/start-task/components/people-cloud/people-cloud.component.ts) |
-| [Start task cloud component](../process-services-cloud/start-task-cloud.component.md) ![Experimental](../docassets/images/ExperimentalIcon.png) | Creates/starts a new task for the specified app. | [Source](../../lib/process-services-cloud/src/lib/task/start-task/components/start-task-cloud.component.ts) |
-| [Edit task filter cloud component](../process-services-cloud/edit-task-filter-cloud.component.md) ![Experimental](../docassets/images/ExperimentalIcon.png) | Edits Task Filter Details. | [Source](../../lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filter-cloud.component.ts) |
-| [Task filters cloud component](../process-services-cloud/task-filters-cloud.component.md) ![Experimental](../docassets/images/ExperimentalIcon.png) | Shows all available filters. | [Source](../../lib/process-services-cloud/src/lib/task/task-filters/components/task-filters-cloud.component.ts) |
-| [Task header cloud component](../process-services-cloud/task-header-cloud.component.md) ![Experimental](../docassets/images/ExperimentalIcon.png) | Shows all the information related to a task. | [Source](../../lib/process-services-cloud/src/lib/task/task-header/components/task-header-cloud.component.ts) |
-| [Task list cloud component](../process-services-cloud/task-list-cloud.component.md) ![Experimental](../docassets/images/ExperimentalIcon.png) | Renders a list containing all the tasks matched by the parameters specified. | [Source](../../lib/process-services-cloud/src/lib/task/task-list/components/task-list-cloud.component.ts) |
+| [App list cloud component](../process-services-cloud/components/app-list-cloud.component.md) ![Experimental](../docassets/images/ExperimentalIcon.png) | Shows all deployed cloud application instances. | [Source](../../lib/process-services-cloud/src/lib/app/components/app-list-cloud.component.ts) |
+| [Group cloud component](../process-services-cloud/components/group-cloud.component.md) ![Experimental](../docassets/images/ExperimentalIcon.png) | Searches Groups. | [Source](../../lib/process-services-cloud/src/lib/group/components/group-cloud.component.ts) |
+| [Edit process filter cloud component](../process-services-cloud/components/edit-process-filter-cloud.component.md) ![Experimental](../docassets/images/ExperimentalIcon.png) | Shows Process Filter Details. | [Source](../../lib/process-services-cloud/src/lib/process/process-filters/components/edit-process-filter-cloud.component.ts) |
+| [Process filters cloud component](../process-services-cloud/components/process-filters-cloud.component.md) ![Experimental](../docassets/images/ExperimentalIcon.png) | Lists all available process filters and allows to select a filter. | [Source](../../lib/process-services-cloud/src/lib/process/process-filters/components/process-filters-cloud.component.ts) |
+| [Process list cloud component](../process-services-cloud/components/process-list-cloud.component.md) ![Experimental](../docassets/images/ExperimentalIcon.png) | Renders a list containing all the process instances matched by the parameters specified. | [Source](../../lib/process-services-cloud/src/lib/process/process-list/components/process-list-cloud.component.ts) |
+| [Start process cloud component](../process-services-cloud/components/start-process-cloud.component.md) ![Experimental](../docassets/images/ExperimentalIcon.png) | Starts a process. | [Source](../../lib/process-services-cloud/src/lib/process/start-process/components/start-process-cloud.component.ts) |
+| [People cloud component](../process-services-cloud/components/people-cloud.component.md) ![Experimental](../docassets/images/ExperimentalIcon.png) | Allows one or more users to be selected (with auto-suggestion) based on the input parameters. | [Source](../../lib/process-services-cloud/src/lib/task/start-task/components/people-cloud/people-cloud.component.ts) |
+| [Start task cloud component](../process-services-cloud/components/start-task-cloud.component.md) ![Experimental](../docassets/images/ExperimentalIcon.png) | Creates/starts a new task for the specified app. | [Source](../../lib/process-services-cloud/src/lib/task/start-task/components/start-task-cloud.component.ts) |
+| [Edit task filter cloud component](../process-services-cloud/components/edit-task-filter-cloud.component.md) ![Experimental](../docassets/images/ExperimentalIcon.png) | Edits Task Filter Details. | [Source](../../lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filter-cloud.component.ts) |
+| [Task filters cloud component](../process-services-cloud/components/task-filters-cloud.component.md) ![Experimental](../docassets/images/ExperimentalIcon.png) | Shows all available filters. | [Source](../../lib/process-services-cloud/src/lib/task/task-filters/components/task-filters-cloud.component.ts) |
+| [Task header cloud component](../process-services-cloud/components/task-header-cloud.component.md) ![Experimental](../docassets/images/ExperimentalIcon.png) | Shows all the information related to a task. | [Source](../../lib/process-services-cloud/src/lib/task/task-header/components/task-header-cloud.component.ts) |
+| [Task list cloud component](../process-services-cloud/components/task-list-cloud.component.md) ![Experimental](../docassets/images/ExperimentalIcon.png) | Renders a list containing all the tasks matched by the parameters specified. | [Source](../../lib/process-services-cloud/src/lib/task/task-list/components/task-list-cloud.component.ts) |
 
 #### Pipes
 
 | Name | Description | Source link |
 | ---- | ----------- | ----------- |
-| [Group initial pipe](../process-services-cloud/group-initial.pipe.md) | Extracts the initial character from a group name. | [Source](../../lib/process-services-cloud/src/lib/group/pipe/group-initial.pipe.ts) |
+| [Group initial pipe](../process-services-cloud/pipes/group-initial.pipe.md) | Extracts the initial character from a group name. | [Source](../../lib/process-services-cloud/src/lib/group/pipe/group-initial.pipe.ts) |
 
 #### Services
 
 | Name | Description | Source link |
 | ---- | ----------- | ----------- |
-| [Apps process cloud service](../process-services-cloud/apps-process-cloud.service.md) ![Experimental](../docassets/images/ExperimentalIcon.png) | Gets details of deployed apps for the current user.  | [Source](../../lib/process-services-cloud/src/lib/app/services/apps-process-cloud.service.ts) |
-| [Group cloud service](../process-services-cloud/group-cloud.service.md) ![Experimental](../docassets/images/ExperimentalIcon.png) | Searches and gets information for groups.  | [Source](../../lib/process-services-cloud/src/lib/group/services/group-cloud.service.ts) |
-| [Process filter cloud service](../process-services-cloud/process-filter-cloud.service.md) ![Experimental](../docassets/images/ExperimentalIcon.png) | Manage Process Filters, which are pre-configured Process Instance queries.  | [Source](../../lib/process-services-cloud/src/lib/process/process-filters/services/process-filter-cloud.service.ts) |
-| [Process list cloud service](../process-services-cloud/process-list-cloud.service.md) ![Experimental](../docassets/images/ExperimentalIcon.png) | Searches processes.  | [Source](../../lib/process-services-cloud/src/lib/process/process-list/services/process-list-cloud.service.ts) |
-| [Start process cloud service](../process-services-cloud/start-process-cloud.service.md) ![Experimental](../docassets/images/ExperimentalIcon.png) | Gets process definitions and starts processes.  | [Source](../../lib/process-services-cloud/src/lib/process/start-process/services/start-process-cloud.service.ts) |
-| [Start task cloud service](../process-services-cloud/start-task-cloud.service.md) ![Experimental](../docassets/images/ExperimentalIcon.png) | Starts standalone tasks.  | [Source](../../lib/process-services-cloud/src/lib/task/start-task/services/start-task-cloud.service.ts) |
-| [Task filter cloud service](../process-services-cloud/task-filter-cloud.service.md) ![Experimental](../docassets/images/ExperimentalIcon.png) | Manages task filters.  | [Source](../../lib/process-services-cloud/src/lib/task/task-filters/services/task-filter-cloud.service.ts) |
-| [Task header cloud service](../process-services-cloud/task-header-cloud.service.md) ![Experimental](../docassets/images/ExperimentalIcon.png) | Manages cloud tasks.  | [Source](../../lib/process-services-cloud/src/lib/task/task-header/services/task-header-cloud.service.ts) |
-| [Task list cloud service](../process-services-cloud/task-list-cloud.service.md) ![Experimental](../docassets/images/ExperimentalIcon.png) | Searches tasks.  | [Source](../../lib/process-services-cloud/src/lib/task/task-list/services/task-list-cloud.service.ts) |
+| [Apps process cloud service](../process-services-cloud/services/apps-process-cloud.service.md) ![Experimental](../docassets/images/ExperimentalIcon.png) | Gets details of deployed apps for the current user. | [Source](../../lib/process-services-cloud/src/lib/app/services/apps-process-cloud.service.ts) |
+| [Group cloud service](../process-services-cloud/services/group-cloud.service.md) ![Experimental](../docassets/images/ExperimentalIcon.png) | Searches and gets information for groups. | [Source](../../lib/process-services-cloud/src/lib/group/services/group-cloud.service.ts) |
+| [Process filter cloud service](../process-services-cloud/services/process-filter-cloud.service.md) ![Experimental](../docassets/images/ExperimentalIcon.png) | Manage Process Filters, which are pre-configured Process Instance queries. | [Source](../../lib/process-services-cloud/src/lib/process/process-filters/services/process-filter-cloud.service.ts) |
+| [Process list cloud service](../process-services-cloud/services/process-list-cloud.service.md) ![Experimental](../docassets/images/ExperimentalIcon.png) | Searches processes. | [Source](../../lib/process-services-cloud/src/lib/process/process-list/services/process-list-cloud.service.ts) |
+| [Start process cloud service](../process-services-cloud/services/start-process-cloud.service.md) ![Experimental](../docassets/images/ExperimentalIcon.png) | Gets process definitions and starts processes. | [Source](../../lib/process-services-cloud/src/lib/process/start-process/services/start-process-cloud.service.ts) |
+| [Start task cloud service](../process-services-cloud/services/start-task-cloud.service.md) ![Experimental](../docassets/images/ExperimentalIcon.png) | Starts standalone tasks. | [Source](../../lib/process-services-cloud/src/lib/task/start-task/services/start-task-cloud.service.ts) |
+| [Task filter cloud service](../process-services-cloud/services/task-filter-cloud.service.md) ![Experimental](../docassets/images/ExperimentalIcon.png) | Manages task filters. | [Source](../../lib/process-services-cloud/src/lib/task/task-filters/services/task-filter-cloud.service.ts) |
+| [Task header cloud service](../process-services-cloud/services/task-header-cloud.service.md) ![Experimental](../docassets/images/ExperimentalIcon.png) | Manages cloud tasks. | [Source](../../lib/process-services-cloud/src/lib/task/task-header/services/task-header-cloud.service.ts) |
+| [Task list cloud service](../process-services-cloud/services/task-list-cloud.service.md) ![Experimental](../docassets/images/ExperimentalIcon.png) | Searches tasks. | [Source](../../lib/process-services-cloud/src/lib/task/task-list/services/task-list-cloud.service.ts) |
 
 <!--process-services-cloud end-->
 
@@ -216,13 +214,13 @@ This release includes: French, German, Italian, Spanish, Japanese, Dutch, Norweg
 
 Below is a brief list of references to help you start using the new release:
 
-- [Getting started guides with Alfresco Application Development Framework](https://community.alfresco.com/community/application-development-framework/pages/get-started)
-- [Alfresco ADF Documentation on the Builder Network](../README.md)
-- [Gitter chat supporting Alfresco ADF](https://gitter.im/Alfresco/alfresco-ng2-components)
-- [ADF examples on GitHub](https://github.com/Alfresco/adf-examples)
-- [Official GitHub Project - alfresco-ng2-components](https://github.com/Alfresco/alfresco-ng2-components)
-- [Official GitHub Project - alfresco-js-api](https://github.com/Alfresco/alfresco-js-api)
-- [Official GitHub Project - generator-ng2-alfresco-app](https://github.com/Alfresco/generator-ng2-alfresco-app)
+-   [Getting started guides with Alfresco Application Development Framework](https://community.alfresco.com/community/application-development-framework/pages/get-started)
+-   [Alfresco ADF Documentation on the Builder Network](../README.md)
+-   [Gitter chat supporting Alfresco ADF](https://gitter.im/Alfresco/alfresco-ng2-components)
+-   [ADF examples on GitHub](https://github.com/Alfresco/adf-examples)
+-   [Official GitHub Project - alfresco-ng2-components](https://github.com/Alfresco/alfresco-ng2-components)
+-   [Official GitHub Project - alfresco-js-api](https://github.com/Alfresco/alfresco-js-api)
+-   [Official GitHub Project - generator-ng2-alfresco-app](https://github.com/Alfresco/generator-ng2-alfresco-app)
 
 Please refer to the [official documentation](http://docs.alfresco.com/) for further details and suggestions.
 
@@ -241,7 +239,7 @@ Universal icon component that supports Material Ligatures and custom registered
 <adf-icon value="my-company:my-icon"></adf-icon>
 ```
 
-See Icon Component [documentation](https://github.com/Alfresco/alfresco-ng2-components/blob/master/docs/core/icon.component.md) for more details.
+See Icon Component [documentation](../core/components/icon.component.md) for more details.
 
 ## Issues addressed
 

tools/doc/doctool.config.json

@@ -24,8 +24,7 @@
             "fileChecker"
         ],
         "dev": [
-            "sourceLinker",
-            "gqIndex"
+            "linkFixer"
         ]
     },
     "statusIcons": {

tools/doc/mqDefs.js

@@ -184,3 +184,32 @@ var Text = /** @class */ (function () {
     return Text;
 }());
 exports.Text = Text;
+var libNamesRegex = /content-services|core|extensions|insights|process-services|process-services-cloud/;
+var Docset = /** @class */ (function () {
+    function Docset(mdCache) {
+        var _this = this;
+        this.docs = [];
+        var pathnames = Object.keys(mdCache);
+        pathnames.forEach(function (pathname) {
+            if (!pathname.match(/README/) &&
+                pathname.match(libNamesRegex)) {
+                var doc = new Root(mdCache[pathname].mdInTree);
+                doc.id = pathname.replace(/\\/g, '/');
+                _this.docs.push(doc);
+            }
+        });
+    }
+    Docset.prototype.documents = function (args) {
+        if (args['idFilter'] === '') {
+            return this.docs;
+        }
+        else {
+            return this.docs.filter(function (doc) { return doc.id.indexOf(args['idFilter'] + '/') !== -1; });
+        }
+    };
+    Docset.prototype.size = function () {
+        return this.docs.length;
+    };
+    return Docset;
+}());
+exports.Docset = Docset;

tools/doc/mqDefs.ts

@@ -247,3 +247,40 @@ export class Text {
         return this.orig.value;
     }
 }
+
+
+let libNamesRegex = /content-services|core|extensions|insights|process-services|process-services-cloud/;
+
+
+export class Docset {
+    public docs: Root[];
+
+    constructor(mdCache) {
+        this.docs = [];
+
+        let pathnames = Object.keys(mdCache);
+
+        pathnames.forEach(pathname => {
+
+            if (!pathname.match(/README/) &&
+                pathname.match(libNamesRegex)
+            ) {
+                let doc = new Root(mdCache[pathname].mdInTree);
+                doc.id = pathname.replace(/\\/g, '/');
+                this.docs.push(doc);
+            }
+        });
+    }
+
+    documents(args): Root[] {
+        if (args['idFilter'] === '') {
+            return this.docs;
+        } else {
+            return this.docs.filter(doc => doc.id.indexOf(args['idFilter'] + '/') !== -1);
+        }
+    }
+
+    size(): number {
+        return this.docs.length;
+    }
+}

tools/doc/tools/gqIndex.js

@@ -8,14 +8,13 @@ var frontMatter = require("remark-frontmatter");
 var replaceZone = require("mdast-zone");
 var graphql_1 = require("graphql");
 var MQ = require("../mqDefs");
-var libNamesRegex = /content-services|core|extensions|insights|process-services|process-services-cloud/;
 var libNamesList = [
     'content-services', 'core', 'extensions',
     'insights', 'process-services', 'process-services-cloud'
 ];
 var query = "\n    query libIndex($libName: String) {\n        documents(idFilter: $libName) {\n            title: metadata(key: \"Title\")\n            status: metadata(key: \"Status\")\n            id\n            classType: folder(depth: 2)\n            heading {\n                link {\n                    url\n                }\n            }\n            paragraph {\n                plaintext\n            }\n        }\n    }\n";
 function processDocs(mdCache, aggData, _errorMessages) {
-    var docset = new GQDocset(mdCache);
+    var docset = new MQ.Docset(mdCache);
     var templateFilePath = path.resolve(__dirname, '..', 'templates', 'gqIndex.ejs');
     var templateSource = fs.readFileSync(templateFilePath, 'utf8');
     var template = ejs.compile(templateSource);
@@ -49,30 +48,3 @@ function processDocs(mdCache, aggData, _errorMessages) {
     });
 }
 exports.processDocs = processDocs;
-var GQDocset = /** @class */ (function () {
-    function GQDocset(mdCache) {
-        var _this = this;
-        this.docs = [];
-        var pathnames = Object.keys(mdCache);
-        pathnames.forEach(function (pathname) {
-            if (!pathname.match(/README/) &&
-                pathname.match(libNamesRegex)) {
-                var doc = new MQ.Root(mdCache[pathname].mdInTree);
-                doc.id = pathname.replace(/\\/g, '/');
-                _this.docs.push(doc);
-            }
-        });
-    }
-    GQDocset.prototype.documents = function (args) {
-        if (args['idFilter'] === '') {
-            return this.docs;
-        }
-        else {
-            return this.docs.filter(function (doc) { return doc.id.indexOf(args['idFilter'] + '/') !== -1; });
-        }
-    };
-    GQDocset.prototype.size = function () {
-        return this.docs.length;
-    };
-    return GQDocset;
-}());

tools/doc/tools/gqIndex.ts

@@ -11,7 +11,6 @@ import { graphql, buildSchema } from 'graphql';
 
 import * as MQ from '../mqDefs';
 
-let libNamesRegex = /content-services|core|extensions|insights|process-services|process-services-cloud/;
 let libNamesList = [
     'content-services', 'core', 'extensions',
     'insights', 'process-services', 'process-services-cloud'
@@ -39,7 +38,7 @@ let query = `
 
 
 export function processDocs(mdCache, aggData, _errorMessages) {
-    let docset: GQDocset = new GQDocset(mdCache);
+    let docset: MQ.Docset = new MQ.Docset(mdCache);
 
     let templateFilePath = path.resolve(__dirname, '..', 'templates', 'gqIndex.ejs');
     let templateSource = fs.readFileSync(templateFilePath, 'utf8');
@@ -82,35 +81,3 @@ export function processDocs(mdCache, aggData, _errorMessages) {
 }
 
 
-class GQDocset {
-    public docs: MQ.Root[];
-
-    constructor(mdCache) {
-        this.docs = [];
-
-        let pathnames = Object.keys(mdCache);
-
-        pathnames.forEach(pathname => {
-
-            if (!pathname.match(/README/) &&
-                pathname.match(libNamesRegex)
-            ) {
-                let doc = new MQ.Root(mdCache[pathname].mdInTree);
-                doc.id = pathname.replace(/\\/g, '/');
-                this.docs.push(doc);
-            }
-        });
-    }
-
-    documents(args): MQ.Root[] {
-        if (args['idFilter'] === '') {
-            return this.docs;
-        } else {
-            return this.docs.filter(doc => doc.id.indexOf(args['idFilter'] + '/') !== -1);
-        }
-    }
-
-    size(): number {
-        return this.docs.length;
-    }
-}

tools/doc/tools/linkFixer.js

@@ -0,0 +1,96 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var path = require("path");
+var fs = require("fs");
+var unist_util_select_1 = require("unist-util-select");
+var angFilenameRegex = /([a-zA-Z0-9\-]+)\.((component)|(dialog)|(directive)|(interface)|(model)|(pipe)|(service)|(widget))/;
+var suffixesNotToCheck = /\.ts/;
+function processDocs(mdCache, aggData, errorMessages) {
+    var pathnames = Object.keys(mdCache);
+    var linkSet = new LinkSet(pathnames);
+    var imageFolderPath = path.resolve(aggData['rootFolder'], 'docs', 'docassets', 'images');
+    var imageSet = new LinkSet(getImagePaths(imageFolderPath));
+    pathnames.forEach(function (pathname) {
+        var fileBaseName = path.basename(pathname, '.md');
+        /*
+        if (!fileBaseName.match(angFilenameRegex)) {
+            return;
+        }
+        */
+        var tree = mdCache[pathname].mdOutTree;
+        fixUrls(tree, pathname, linkSet, 'link');
+        fixUrls(tree, pathname, imageSet, 'image');
+    });
+}
+exports.processDocs = processDocs;
+function fixUrls(tree, docFilePath, linkSet, selector) {
+    var linksInDoc = unist_util_select_1.selectAll(selector, tree);
+    var errors = [];
+    linksInDoc.forEach(function (linkElem) {
+        var origFullUrlPath = path.resolve(path.dirname(docFilePath), linkElem.url);
+        var hashPos = origFullUrlPath.indexOf('#');
+        var anchor = '';
+        if (hashPos !== -1) {
+            anchor = origFullUrlPath.substring(hashPos);
+            origFullUrlPath = origFullUrlPath.substring(0, hashPos);
+        }
+        if (!linkElem.url.match(/http:|https:|ftp:|mailto:/) &&
+            !path.extname(origFullUrlPath).match(suffixesNotToCheck) &&
+            (origFullUrlPath !== '') &&
+            !fs.existsSync(origFullUrlPath)) {
+            var newUrl = linkSet.update(origFullUrlPath) || origFullUrlPath;
+            linkElem.url = path.relative(path.dirname(docFilePath), newUrl).replace(/\\/g, '/') + anchor;
+            errors.push("Bad link: " + origFullUrlPath + "\nReplacing with " + linkElem.url);
+        } /*else {
+            console.log(`Link OK: ${origFullUrlPath}`);
+        }
+        */
+    });
+    if (errors.length > 0) {
+        showMessages("File: " + docFilePath + ":", errors);
+    }
+}
+function showMessages(groupName, messages) {
+    console.group(groupName);
+    messages.forEach(function (message) {
+        console.log(message);
+    });
+    console.groupEnd();
+}
+function getImagePaths(imageFolderPath) {
+    return fs.readdirSync(imageFolderPath)
+        .map(function (imageFileName) { return path.resolve(imageFolderPath, imageFileName); });
+}
+var LinkSet = /** @class */ (function () {
+    function LinkSet(urls) {
+        var _this = this;
+        this.links = new Map();
+        urls.forEach(function (url) {
+            var fileName = path.basename(url);
+            if (_this.links.has(fileName)) {
+                var item = _this.links.get(fileName);
+                item.push(url);
+            }
+            else {
+                _this.links.set(fileName, [url]);
+            }
+        });
+    }
+    LinkSet.prototype.update = function (oldUrl) {
+        var oldFileName = path.basename(oldUrl);
+        if (!this.links.has(oldFileName)) {
+            return '';
+        }
+        else {
+            var candidates = this.links.get(oldFileName);
+            if (candidates.length === 1) {
+                return candidates[0];
+            }
+            else {
+                console.log("Multiple candidates for " + oldUrl);
+                return '';
+            }
+        }
+    };
+    return LinkSet;
+}());

tools/doc/tools/linkFixer.ts

@@ -0,0 +1,122 @@
+import * as path from 'path';
+import * as fs from 'fs';
+
+import { selectAll } from 'unist-util-select';
+import { MDAST } from 'mdast';
+
+
+const angFilenameRegex = /([a-zA-Z0-9\-]+)\.((component)|(dialog)|(directive)|(interface)|(model)|(pipe)|(service)|(widget))/;
+const suffixesNotToCheck = /\.ts/;
+
+export function processDocs(mdCache, aggData, errorMessages) {
+    var pathnames = Object.keys(mdCache);
+
+    let linkSet = new LinkSet(pathnames);
+    
+    let imageFolderPath = path.resolve(aggData['rootFolder'], 'docs', 'docassets', 'images');
+
+    let imageSet = new LinkSet(getImagePaths(imageFolderPath));
+
+    pathnames.forEach(pathname => {
+        let fileBaseName = path.basename(pathname, '.md');
+
+        /*
+        if (!fileBaseName.match(angFilenameRegex)) {
+            return;
+        }
+        */
+        let tree = mdCache[pathname].mdOutTree;
+        
+        fixUrls(tree, pathname, linkSet, 'link');
+        fixUrls(tree, pathname, imageSet, 'image');
+    });
+}
+
+
+function fixUrls(tree: MDAST.Root, docFilePath: string, linkSet: LinkSet, selector: string) {
+    let linksInDoc = selectAll(selector, tree);
+
+    let errors: string[] = [];
+
+    linksInDoc.forEach(linkElem => {
+        let origFullUrlPath = path.resolve(path.dirname(docFilePath), linkElem.url);
+
+        let hashPos = origFullUrlPath.indexOf('#');
+        let anchor = '';
+
+        if (hashPos !== -1) {
+            anchor = origFullUrlPath.substring(hashPos);
+            origFullUrlPath = origFullUrlPath.substring(0, hashPos);
+        }
+
+        if (!linkElem.url.match(/http:|https:|ftp:|mailto:/) &&
+            !path.extname(origFullUrlPath).match(suffixesNotToCheck) &&
+            (origFullUrlPath !== '') &&
+            !fs.existsSync(origFullUrlPath)
+        ) {
+            let newUrl = linkSet.update(origFullUrlPath) || origFullUrlPath; 
+            linkElem.url = path.relative(path.dirname(docFilePath), newUrl).replace(/\\/g,'/') + anchor;
+            errors.push(`Bad link: ${origFullUrlPath}\nReplacing with ${linkElem.url}`);
+        } /*else {
+            console.log(`Link OK: ${origFullUrlPath}`);
+        }
+        */
+    });
+
+    if (errors.length > 0) {
+        showMessages(`File: ${docFilePath}:`, errors);
+    }
+}
+
+
+function showMessages(groupName: string, messages: string[]) {
+    console.group(groupName);
+
+    messages.forEach(message => {
+        console.log(message);
+    });
+
+    console.groupEnd();
+}
+
+function getImagePaths(imageFolderPath: string): string[] {
+    return fs.readdirSync(imageFolderPath)
+    .map(imageFileName => path.resolve(imageFolderPath, imageFileName));
+}
+
+
+class LinkSet {
+    links: Map<string, string[]>;
+
+    constructor(urls: string[]) {
+        this.links = new Map();
+
+        urls.forEach(url => {
+            let fileName = path.basename(url);
+            
+            if (this.links.has(fileName)) {
+                let item = this.links.get(fileName);
+                item.push(url);
+            } else {
+                this.links.set(fileName, [url]);
+            }
+        }); 
+    }
+
+    update(oldUrl: string): string {
+        let oldFileName = path.basename(oldUrl);
+
+        if (!this.links.has(oldFileName)) {
+            return '';
+        } else {
+            let candidates = this.links.get(oldFileName);
+
+            if (candidates.length === 1) {
+                return candidates[0];
+            } else {
+                console.log(`Multiple candidates for ${oldUrl}`);
+                return '';
+            }
+        }
+    }
+}

tools/doc/tsconfig.json

@@ -7,12 +7,13 @@
       "target": "es5",
       "types": ["node", "@paperist/types-remark"],
       "lib": [
-        "es5"
+        "es2015"
       ]
     },
     "files": [
         "remarkGraphQl.ts",
         "mqDefs.ts",
-        "tools/gqIndex.ts"
+        "tools/gqIndex.ts",
+        "tools/linkFixer.ts"
     ]
   }