diff --git a/angular.json b/angular.json
index b7a15b3fc3..1fa00ab144 100644
--- a/angular.json
+++ b/angular.json
@@ -318,7 +318,7 @@
               },
               {
                 "glob": "**/*",
-                "input": "lib/process-services/i18n",
+                "input": "lib/process-services/src/lib/i18n",
                 "output": "/assets/adf-process-services/i18n"
               },
               {
@@ -493,7 +493,7 @@
               },
               {
                 "glob": "**/*",
-                "input": "lib/process-services/i18n",
+                "input": "lib/process-services/src/lib/i18n",
                 "output": "/assets/adf-process-services/i18n"
               },
               {
@@ -676,7 +676,7 @@
         "test": {
           "builder": "@angular-devkit/build-angular:karma",
           "options": {
-            "main": "lib/process-services/test.ts",
+            "main": "lib/process-services/src/test.ts",
             "tsConfig": "lib/process-services/tsconfig.spec.json",
             "karmaConfig": "lib/process-services/karma.conf.js",
             "codeCoverage": true,
@@ -688,7 +688,7 @@
           "options": {
             "tsConfig": [
               "lib/process-services/tsconfig.lib.json",
-              "lib/process-services/tsconfig.lib.json"
+              "lib/process-services/tsconfig.spec.json"
             ],
             "exclude": [
               "**/node_modules/**"
diff --git a/demo-shell/src/custom-style-dev.scss b/demo-shell/src/custom-style-dev.scss
index a961352a35..b4e8de496d 100644
--- a/demo-shell/src/custom-style-dev.scss
+++ b/demo-shell/src/custom-style-dev.scss
@@ -5,7 +5,7 @@
 
 
 @import '../../lib/content-services/styles/index';
-@import '../../lib/process-services/styles/index';
+@import '../../lib/process-services/src/lib/styles/index';
 @import '../../lib/insights/styles/index';
 @import '../../lib/core/styles/index';
 @import '../../lib/process-services-cloud/src/lib/styles/index';
diff --git a/docs/README.md b/docs/README.md
index 0a5e30f6bd..942c8b91e9 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -112,7 +112,7 @@ for more information about installing and using the source code.
 | [Sidebar action menu component](core/components/sidebar-action-menu.component.md) | Displays a sidebar-action menu information panel. | [Source](../lib/core/layout/components/sidebar-action/sidebar-action-menu.component.ts) |
 | [Sidenav Layout component](core/components/sidenav-layout.component.md) | Displays the standard three-region ADF application layout. | [Source](../lib/core/layout/components/sidenav-layout/sidenav-layout.component.ts) |
 | [Sorting Picker Component](core/components/sorting-picker.component.md) | Selects from a set of predefined sorting definitions and directions. | [Source](../lib/core/sorting-picker/sorting-picker.component.ts) |
-| [Start Form component](core/components/start-form.component.md) | Displays the Start Form for a process. | [Source](../lib/process-services/form/start-form.component.ts) |
+| [Start Form component](core/components/start-form.component.md) | Displays the Start Form for a process. | [Source](../lib/process-services/src/lib/form/start-form.component.ts) |
 | [Text Mask directive](core/components/text-mask.component.md) | Implements text field input masks. | [Source](../lib/core/form/components/widgets/text/text-mask.component.ts) |
 | [Toolbar Divider Component](core/components/toolbar-divider.component.md) | Divides groups of elements in a Toolbar with a visual separator. | [Source](../lib/core/toolbar/toolbar-divider.component.ts) |
 | [Toolbar Title Component](core/components/toolbar-title.component.md) | Supplies custom HTML to be included in a Toolbar component title. | [Source](../lib/core/toolbar/toolbar-title.component.ts) |
@@ -355,8 +355,8 @@ for more information about installing and using the source code.
 | Name | Description | Source link |
 | ---- | ----------- | ----------- |
 | [Apps List Component](process-services/components/apps-list.component.md) | Shows all available apps. | [Source](../lib/process-services/app-list/apps-list.component.ts) |
-| [Attach Form component](process-services/components/attach-form.component.md) | This component can be used when there is no form attached to a task and you want to add one. | [Source](../lib/process-services/task-list/components/attach-form.component.ts) |
-| [Checklist Component](process-services/components/checklist.component.md) | Shows the checklist task functionality. | [Source](../lib/process-services/task-list/components/checklist.component.ts) |
+| [Attach Form component](process-services/components/attach-form.component.md) | This component can be used when there is no form attached to a task and you want to add one. | [Source](../lib/process-services/src/lib/task-list/components/attach-form.component.ts) |
+| [Checklist Component](process-services/components/checklist.component.md) | Shows the checklist task functionality. | [Source](../lib/process-services/src/lib/task-list/components/checklist.component.ts) |
 | [Create Process Attachment component](process-services/components/create-process-attachment.component.md) | Displays an Upload Component (Drag and Click) to upload the attachment to a specified process instance. | [Source](../lib/process-services/attachment/create-process-attachment.component.ts) |
 | [Create Task Attachment Component](process-services/components/create-task-attachment.component.md) | Displays an Upload Component (Drag and Click) to upload the attachment to a specified task. | [Source](../lib/process-services/attachment/create-task-attachment.component.ts) |
 | [Form component](process-services/components/form.component.md) | Shows a Form from APS | [Source](../lib/process-services/form/form.component.ts) |
diff --git a/docs/breaking-changes/breaking-change-2.6.0-3.0.0.md b/docs/breaking-changes/breaking-change-2.6.0-3.0.0.md
index 73a158e17d..441b1ae1d6 100644
--- a/docs/breaking-changes/breaking-change-2.6.0-3.0.0.md
+++ b/docs/breaking-changes/breaking-change-2.6.0-3.0.0.md
@@ -51,7 +51,7 @@ This document lists all the deprecated ADF v2.x components that were removed for
     -   `CommentProcessModel` was moved into the Core library with the name [`CommentModel`](../../lib/core/models/comment.model.ts) in v2.3.0. Now you
         can only import it from [`CoreModule`](../../lib/core/core.module.ts).
     -   [`CommentsModule`](../../lib/core/comments/comments.module.ts), [`CommentListComponent`](../core/components/comment-list.component.md), and [`CommentsComponent`](../core/components/comments.component.md) are no longer exported from
-        [`ProcessModule`](../../lib/process-services/process.module.ts) but now from [`CoreModule`](../../lib/core/core.module.ts). The old usage was deprecated in v2.3.0.
+        [`ProcessModule`](../../lib/process-services/src/lib/process.module.ts) but now from [`CoreModule`](../../lib/core/core.module.ts). The old usage was deprecated in v2.3.0.
     -   `<adf-upload-drag-area>`:  The `parentId` input has been renamed as `rootFolderId`. The old
         name was deprecated in v2.4.0.
     -   The `createFolder` event of the [`UploadBase`](../../lib/content-services/upload/components/base-upload/upload-base.ts) class (emitted when a folder was
diff --git a/docs/core/components/form-field.component.md b/docs/core/components/form-field.component.md
index 8416db91b0..8c20bf1870 100644
--- a/docs/core/components/form-field.component.md
+++ b/docs/core/components/form-field.component.md
@@ -11,14 +11,14 @@ Represents a UI field in a form.
 
 ## Basic Usage
 
-All form field editors (aka widgets) on a [`Form`](../../../lib/process-services/task-list/models/form.model.ts) are rendered by means of a [`FormFieldComponent`](../../core/components/form-field.component.md)
+All form field editors (aka widgets) on a [`Form`](../../../lib/process-services/src/lib/task-list/models/form.model.ts) are rendered by means of a [`FormFieldComponent`](../../core/components/form-field.component.md)
 that takes an instance of a [`FormFieldModel`](../../core/models/form-field.model.md):
 
 ```html
 <adf-form-field [field]="field"></adf-form-field>
 ```
 
-This component depends on the [`FormRenderingService`](../../core/services/form-rendering.service.md) to map the [`FormFieldModel`](../../core/models/form-field.model.md) to a [`Form`](../../../lib/process-services/task-list/models/form.model.ts) Field UI component
+This component depends on the [`FormRenderingService`](../../core/services/form-rendering.service.md) to map the [`FormFieldModel`](../../core/models/form-field.model.md) to a [`Form`](../../../lib/process-services/src/lib/task-list/models/form.model.ts) Field UI component
 based on the field type or the metadata information.
 
 ## Class members
@@ -38,7 +38,7 @@ uses `<adf-form-field>` components to render the form fields.
 
 Forms defined in APS have the following default mappings for the form fields:
 
-| _APS [`Form`](../../../lib/process-services/task-list/models/form.model.ts) Designer_ Widget | Field Type | Component Type |
+| _APS [`Form`](../../../lib/process-services/src/lib/task-list/models/form.model.ts) Designer_ Widget | Field Type | Component Type |
 | -------------------------------------------------------------------------------------------- | ---------- | -------------- |
 | Text | text | [`TextWidgetComponent`](../../../lib/core/form/components/widgets/text/text.widget.ts) |
 | Multi-line text | multi-line-text | [`MultilineTextWidgetComponentComponent`](../../../lib/core/form/components/widgets/multiline-text/multiline-text.widget.ts) |
diff --git a/docs/core/components/start-form.component.md b/docs/core/components/start-form.component.md
index 7d89c07f0d..817a8dec94 100644
--- a/docs/core/components/start-form.component.md
+++ b/docs/core/components/start-form.component.md
@@ -5,9 +5,9 @@ Status: Active
 Last reviewed: 2018-06-08
 ---
 
-# [Start Form component](../../../lib/process-services/form/start-form.component.ts "Defined in start-form.component.ts")
+# [Start Form component](../../../lib/process-services/src/lib/form/start-form.component.ts "Defined in start-form.component.ts")
 
-Displays the Start [`Form`](../../../lib/process-services/task-list/models/form.model.ts) for a process.
+Displays the Start [`Form`](../../../lib/process-services/src/lib/task-list/models/form.model.ts) for a process.
 
 ![Start Form screenshot](../../docassets/images/ProcessStartForm.png)
 
@@ -66,7 +66,7 @@ Displays the Start [`Form`](../../../lib/process-services/task-list/models/form.
 
 ## Details
 
-The [Start Process component](../../process-services/components/start-process.component.md) uses the Start [`Form`](../../../lib/process-services/task-list/models/form.model.ts) component
+The [Start Process component](../../process-services/components/start-process.component.md) uses the Start [`Form`](../../../lib/process-services/src/lib/task-list/models/form.model.ts) component
 to display the
 [start form](http://docs.alfresco.com/process-services1.6/topics/none_start_event.html)
 for the process.
diff --git a/docs/core/interfaces/form-field-validator.interface.md b/docs/core/interfaces/form-field-validator.interface.md
index 5c56f29c36..57f14d59ed 100644
--- a/docs/core/interfaces/form-field-validator.interface.md
+++ b/docs/core/interfaces/form-field-validator.interface.md
@@ -6,7 +6,7 @@ Status: Active
 
 # [FormFieldValidator interface](../../../lib/core/form/components/widgets/core/form-field-validator.ts "Defined in form-field-validator.ts")
 
-Defines how the input fields of [`Form`](../../../lib/process-services/task-list/models/form.model.ts) and Task Details components are validated.
+Defines how the input fields of [`Form`](../../../lib/process-services/src/lib/task-list/models/form.model.ts) and Task Details components are validated.
 
 ## Basic Usage
 
@@ -73,7 +73,7 @@ Several validator classes are predefined for you to use:
 | [`MinDateFieldValidator`](../../../lib/core/form/components/widgets/core/form-field-validator.ts) | Date within a field occurs after a certain starting point |
 | [`MaxDateFieldValidator`](../../../lib/core/form/components/widgets/core/form-field-validator.ts) | Date within a field occurs before a certain end point |
 
-The `FORM_FIELD_VALIDATORS` array contains an instance of each of these classes. You can assign this to the `fieldValidators` property of a [`Form`](../../../lib/process-services/task-list/models/form.model.ts) or [Task Details component](../../process-services/components/task-details.component.md) to enable standard validation.
+The `FORM_FIELD_VALIDATORS` array contains an instance of each of these classes. You can assign this to the `fieldValidators` property of a [`Form`](../../../lib/process-services/src/lib/task-list/models/form.model.ts) or [Task Details component](../../process-services/components/task-details.component.md) to enable standard validation.
 
 ### Custom validators
 
@@ -128,7 +128,7 @@ export class AppComponent {
 }
 ```
 
-You can now use the 'fieldValidators' property of the [`Form`](../../../lib/process-services/task-list/models/form.model.ts) or Task Details components to assign your
+You can now use the 'fieldValidators' property of the [`Form`](../../../lib/process-services/src/lib/task-list/models/form.model.ts) or Task Details components to assign your
 custom validator set:
 
 ```html
diff --git a/docs/core/models/form-field.model.md b/docs/core/models/form-field.model.md
index d116215d0c..7ce0df421f 100644
--- a/docs/core/models/form-field.model.md
+++ b/docs/core/models/form-field.model.md
@@ -7,7 +7,7 @@ Last reviewed: 2018-03-20
 
 # [Form Field model](../../../lib/core/form/components/widgets/core/form-field.model.ts "Defined in form-field.model.ts")
 
-Contains the value and metadata for a field of a [`Form`](../../../lib/process-services/task-list/models/form.model.ts) component.
+Contains the value and metadata for a field of a [`Form`](../../../lib/process-services/src/lib/task-list/models/form.model.ts) component.
 
 ## Properties
 
@@ -67,7 +67,7 @@ example, the `currency` property holds the currency symbol to be displayed next
 
 ### Validation
 
-A [`Form`](../../../lib/process-services/task-list/models/form.model.ts) or [Task Details](../../process-services/components/task-details.component.md) component can
+A [`Form`](../../../lib/process-services/src/lib/task-list/models/form.model.ts) or [Task Details](../../process-services/components/task-details.component.md) component can
 be supplied with a set of validator objects. Each validator applies a particular kind of
 check to a field. A number of [`FormFieldModel`](../../core/models/form-field.model.md) properties are used by validators. For
 example, `minValue` and `maxValue` are used to check that a numeric value falls within an
diff --git a/docs/core/services/card-item-types.service.md b/docs/core/services/card-item-types.service.md
index 8da233dd35..4673745340 100644
--- a/docs/core/services/card-item-types.service.md
+++ b/docs/core/services/card-item-types.service.md
@@ -20,7 +20,7 @@ Maps type names to field component types for the [Card View component](../compon
     -   **Returns** [`DynamicComponentResolveFunction`](../../../lib/core/services/dynamic-component-mapper.service.ts) - Resolver function
 -   **resolveComponentType**(model: [`DynamicComponentModel`](../../../lib/core/services/dynamic-component-mapper.service.ts), defaultValue: `Type<__type>` = `this.defaultValue`): `Type<__type>`<br/>
     Finds the component type that is needed to render a form field.
-    -   _model:_ [`DynamicComponentModel`](../../../lib/core/services/dynamic-component-mapper.service.ts)  - [Form](../../../lib/process-services/task-list/models/form.model.ts) field model for the field to render
+    -   _model:_ [`DynamicComponentModel`](../../../lib/core/services/dynamic-component-mapper.service.ts)  - [Form](../../../lib/process-services/src/lib/task-list/models/form.model.ts) field model for the field to render
     -   _defaultValue:_ `Type<__type>`  - Default type returned for field types that are not yet mapped.
     -   **Returns** `Type<__type>` - Component type
 -   **setComponentTypeResolver**(type: `string`, resolver: [`DynamicComponentResolveFunction`](../../../lib/core/services/dynamic-component-mapper.service.ts), override: `boolean` = `true`)<br/>
diff --git a/docs/core/services/form-rendering.service.md b/docs/core/services/form-rendering.service.md
index 011b850746..28bad282c7 100644
--- a/docs/core/services/form-rendering.service.md
+++ b/docs/core/services/form-rendering.service.md
@@ -20,7 +20,7 @@ Maps a form field type string onto the corresponding form [widget component](../
     -   **Returns** [`DynamicComponentResolveFunction`](../../../lib/core/services/dynamic-component-mapper.service.ts) - Resolver function
 -   **resolveComponentType**(model: [`DynamicComponentModel`](../../../lib/core/services/dynamic-component-mapper.service.ts), defaultValue: `Type<__type>` = `this.defaultValue`): `Type<__type>`<br/>
     Finds the component type that is needed to render a form field.
-    -   _model:_ [`DynamicComponentModel`](../../../lib/core/services/dynamic-component-mapper.service.ts)  - [Form](../../../lib/process-services/task-list/models/form.model.ts) field model for the field to render
+    -   _model:_ [`DynamicComponentModel`](../../../lib/core/services/dynamic-component-mapper.service.ts)  - [Form](../../../lib/process-services/src/lib/task-list/models/form.model.ts) field model for the field to render
     -   _defaultValue:_ `Type<__type>`  - Default type returned for field types that are not yet mapped.
     -   **Returns** `Type<__type>` - Component type
 -   **setComponentTypeResolver**(type: `string`, resolver: [`DynamicComponentResolveFunction`](../../../lib/core/services/dynamic-component-mapper.service.ts), override: `boolean` = `true`)<br/>
@@ -31,9 +31,9 @@ Maps a form field type string onto the corresponding form [widget component](../
 
 ## Details
 
-The [`Form`](../../../lib/process-services/task-list/models/form.model.ts) Field component uses this service to choose which widget to use to render an instance of a
-form field. The [`Form`](../../../lib/process-services/task-list/models/form.model.ts) Field model stores the field type name as a string (see the table below).
-The [`Form`](../../../lib/process-services/task-list/models/form.model.ts) Rendering service maintains a mapping between each type name and
+The [`Form`](../../../lib/process-services/src/lib/task-list/models/form.model.ts) Field component uses this service to choose which widget to use to render an instance of a
+form field. The [`Form`](../../../lib/process-services/src/lib/task-list/models/form.model.ts) Field model stores the field type name as a string (see the table below).
+The [`Form`](../../../lib/process-services/src/lib/task-list/models/form.model.ts) Rendering service maintains a mapping between each type name and
 a corresponding [`DynamicComponentResolveFunction`](../../../lib/core/services/dynamic-component-mapper.service.ts). The function takes a [`FormFieldModel`](../../core/models/form-field.model.md) object as its argument and
 uses the data from the object to determine which widget should be used to render the field.
 
@@ -60,7 +60,7 @@ formRenderingService.setComponentTypeResolver('text', customResolver, true);
 
 ### Default type mapping
 
-The [`Form`](../../../lib/process-services/task-list/models/form.model.ts) Rendering service is initialized with the mapping shown in the table below:
+The [`Form`](../../../lib/process-services/src/lib/task-list/models/form.model.ts) Rendering service is initialized with the mapping shown in the table below:
 
 | Stencil name | Field type string | Component type |
 | ------------ | ----------------- | -------------- |
diff --git a/docs/core/services/form.service.md b/docs/core/services/form.service.md
index 4bf16d9da4..0415effc31 100644
--- a/docs/core/services/form.service.md
+++ b/docs/core/services/form.service.md
@@ -53,15 +53,15 @@ class MyComponent {
 ### Methods
 
 -   `parseForm(json: any, data?:`[`FormValues,`](../../../lib/core/form/components/widgets/core/form-values.ts)`readOnly: boolean = false):`[`FormModel`](../../../lib/core/form/components/widgets/core/form.model.ts)  
-    Parses JSON data to create a corresponding [`Form`](../../../lib/process-services/task-list/models/form.model.ts) model.  
+    Parses JSON data to create a corresponding [`Form`](../../../lib/process-services/src/lib/task-list/models/form.model.ts) model.
     -   `json` - JSON to create the form
     -   `data` - (Optional) Values for the form fields
     -   `readOnly` - Should the form fields be read-only?
 -   `createFormFromANode(formName: string):`[`Observable`](http://reactivex.io/documentation/observable.html)`<any>`  
-    Create a [`Form`](../../../lib/process-services/task-list/models/form.model.ts) with a field for each metadata property.  
+    Create a [`Form`](../../../lib/process-services/src/lib/task-list/models/form.model.ts) with a field for each metadata property.
     -   `formName` - Name of the new form
 -   `createForm(formName: string):`[`Observable`](http://reactivex.io/documentation/observable.html)`<any>`  
-    Create a [`Form`](../../../lib/process-services/task-list/models/form.model.ts).  
+    Create a [`Form`](../../../lib/process-services/src/lib/task-list/models/form.model.ts).
     -   `formName` - Name of the new form
 -   `saveForm(formId: string, formModel: FormDefinitionModel):`[`Observable`](http://reactivex.io/documentation/observable.html)`<any>`  
     Saves a form.  
@@ -86,14 +86,14 @@ class MyComponent {
     Gets a task.  
     -   `taskId` - Task Id
 -   `saveTaskForm(taskId: string, formValues: FormValues):`[`Observable`](http://reactivex.io/documentation/observable.html)`<any>`  
-    Save Task [`Form`](../../../lib/process-services/task-list/models/form.model.ts).  
+    Save Task [`Form`](../../../lib/process-services/src/lib/task-list/models/form.model.ts).
     -   `taskId` - Task Id
-    -   `formValues` - [`Form`](../../../lib/process-services/task-list/models/form.model.ts) Values
+    -   `formValues` - [`Form`](../../../lib/process-services/src/lib/task-list/models/form.model.ts) Values
 -   `completeTaskForm(taskId: string, formValues:`[`FormValues,`](../../../lib/core/form/components/widgets/core/form-values.ts)`outcome?: string):`[`Observable`](http://reactivex.io/documentation/observable.html)`<any>`  
-    Complete Task [`Form`](../../../lib/process-services/task-list/models/form.model.ts)  
+    Complete Task [`Form`](../../../lib/process-services/src/lib/task-list/models/form.model.ts)
     -   `taskId` - Task Id
-    -   `formValues` - [`Form`](../../../lib/process-services/task-list/models/form.model.ts) Values
-    -   `outcome` - (Optional) [`Form`](../../../lib/process-services/task-list/models/form.model.ts) Outcome
+    -   `formValues` - [`Form`](../../../lib/process-services/src/lib/task-list/models/form.model.ts) Values
+    -   `outcome` - (Optional) [`Form`](../../../lib/process-services/src/lib/task-list/models/form.model.ts) Outcome
 -   `getTaskForm(taskId: string):`[`Observable`](http://reactivex.io/documentation/observable.html)`<any>`  
     Get [`Form`](../../../lib/process-services/task-list/models/form.model.ts) related to a taskId  
     -   `taskId` - Task Id
diff --git a/docs/process-services-cloud/components/process-filters-cloud.component.md b/docs/process-services-cloud/components/process-filters-cloud.component.md
index 39baa07bda..ff6b166263 100644
--- a/docs/process-services-cloud/components/process-filters-cloud.component.md
+++ b/docs/process-services-cloud/components/process-filters-cloud.component.md
@@ -25,7 +25,7 @@ Lists all available process filters and allows to select a filter.
 | Name | Type | Default value | Description |
 | ---- | ---- | ------------- | ----------- |
 | appName | `string` |  | (required) The application name |
-| filterParam | [`FilterParamsModel`](../../../lib/process-services/task-list/models/filter.model.ts) |  | (optional) The filter to be selected by default |
+| filterParam | [`FilterParamsModel`](../../../lib/process-services/src/lib/task-list/models/filter.model.ts) |  | (optional) The filter to be selected by default |
 | showIcons | `boolean` | false | (optional) Toggles showing an icon by the side of each filter |
 
 ### Events
diff --git a/docs/process-services-cloud/components/task-filters-cloud.component.md b/docs/process-services-cloud/components/task-filters-cloud.component.md
index 81fb84ef55..942fe26d88 100644
--- a/docs/process-services-cloud/components/task-filters-cloud.component.md
+++ b/docs/process-services-cloud/components/task-filters-cloud.component.md
@@ -22,7 +22,7 @@ Shows all available filters.
 | Name | Type | Default value | Description |
 | ---- | ---- | ------------- | ----------- |
 | appName | `string` |  | Display filters available to the current user for the application with the specified name. |
-| filterParam | [`FilterParamsModel`](../../../lib/process-services/task-list/models/filter.model.ts) |  | Parameters to use for the task filter cloud. If there is no match then the default filter (the first one in the list) is selected. |
+| filterParam | [`FilterParamsModel`](../../../lib/process-services/src/lib/task-list/models/filter.model.ts) |  | Parameters to use for the task filter cloud. If there is no match then the default filter (the first one in the list) is selected. |
 | showIcons | `boolean` | false | Toggles display of the filter's icons. |
 
 ### Events
@@ -45,7 +45,7 @@ Use the `filterParam` property to restrict the range of filters that are shown:
 </adf-cloud-task-filters>
 ```
 
-You can use properties from [`FilterParamsModel`](../../../lib/process-services/task-list/models/filter.model.ts)
+You can use properties from [`FilterParamsModel`](../../../lib/process-services/src/lib/task-list/models/filter.model.ts)
 as the value of `filterParam` as shown in the table below:
 
 | Name | Type | Description |
diff --git a/docs/process-services-cloud/services/form-cloud.service.md b/docs/process-services-cloud/services/form-cloud.service.md
index 95df4c0f10..35c568fb8f 100644
--- a/docs/process-services-cloud/services/form-cloud.service.md
+++ b/docs/process-services-cloud/services/form-cloud.service.md
@@ -32,8 +32,8 @@ class MyComponent {
     -   _taskId:_ `string`  - ID of the target task
     -   _processInstanceId:_ `string`  - 
     -   _formId:_ `string`  - ID of the form to complete
-    -   _formValues:_ [`FormValues`](../../../lib/core/form/components/widgets/core/form-values.ts)  - [Form](../../../lib/process-services/task-list/models/form.model.ts) values object
-    -   _outcome:_ `string`  - [Form](../../../lib/process-services/task-list/models/form.model.ts) outcome
+    -   _formValues:_ [`FormValues`](../../../lib/core/form/components/widgets/core/form-values.ts)  - [Form](../../../lib/process-services/src/lib/task-list/models/form.model.ts) values object
+    -   _outcome:_ `string`  - [Form](../../../lib/process-services/src/lib/task-list/models/form.model.ts) outcome
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskDetailsCloudModel`](../../../lib/process-services-cloud/src/lib/task/start-task/models/task-details-cloud.model.ts)`>` - Updated task details
 -   **createTemporaryRawRelatedContent**(file: `any`, nodeId: `string`, contentHost: `string`): [`Observable`](http://reactivex.io/documentation/observable.html)`<any>`<br/>
 
@@ -83,14 +83,14 @@ class MyComponent {
     -   _json:_ `any`  - JSON data to create the form
     -   _data:_ [`TaskVariableCloud`](../../../lib/process-services-cloud/src/lib/form/models/task-variable-cloud.model.ts)`[]`  - (Optional) Values for the form's fields
     -   _readOnly:_ `boolean`  - Toggles whether or not the form should be read-only
-    -   **Returns** [`FormCloud`](../../../lib/process-services-cloud/src/lib/form/models/form-cloud.model.ts) - [Form](../../../lib/process-services/task-list/models/form.model.ts) created from the JSON specification
+    -   **Returns** [`FormCloud`](../../../lib/process-services-cloud/src/lib/form/models/form-cloud.model.ts) - [Form](../../../lib/process-services/src/lib/task-list/models/form.model.ts) created from the JSON specification
 -   **saveTaskForm**(appName: `string`, taskId: `string`, processInstanceId: `string`, formId: `string`, formValues: [`FormValues`](../../../lib/core/form/components/widgets/core/form-values.ts)): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskDetailsCloudModel`](../../../lib/process-services-cloud/src/lib/task/start-task/models/task-details-cloud.model.ts)`>`<br/>
     Saves a task form.
     -   _appName:_ `string`  - Name of the app
     -   _taskId:_ `string`  - ID of the target task
     -   _processInstanceId:_ `string`  - 
     -   _formId:_ `string`  - ID of the form to save
-    -   _formValues:_ [`FormValues`](../../../lib/core/form/components/widgets/core/form-values.ts)  - [Form](../../../lib/process-services/task-list/models/form.model.ts) values object
+    -   _formValues:_ [`FormValues`](../../../lib/core/form/components/widgets/core/form-values.ts)  - [Form](../../../lib/process-services/src/lib/task-list/models/form.model.ts) values object
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskDetailsCloudModel`](../../../lib/process-services-cloud/src/lib/task/start-task/models/task-details-cloud.model.ts)`>` - Updated task details
 
 ## See also
diff --git a/docs/process-services/components/apps-list.component.md b/docs/process-services/components/apps-list.component.md
index 56d1cb9945..3412cd629e 100644
--- a/docs/process-services/components/apps-list.component.md
+++ b/docs/process-services/components/apps-list.component.md
@@ -5,7 +5,7 @@ Status: Active
 Last reviewed: 2019-01-14
 ---
 
-# [Apps List Component](../../../lib/process-services/app-list/apps-list.component.ts "Defined in apps-list.component.ts")
+# [Apps List Component](../../../lib/process-services/src/lib/app-list/apps-list.component.ts "Defined in apps-list.component.ts")
 
 Shows all available apps.
 
@@ -46,7 +46,7 @@ You can show custom content when there are no apps available by supplying an
 
 | Name | Type | Description |
 | ---- | ---- | ----------- |
-| appClick | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`AppDefinitionRepresentationModel`](../../../lib/process-services/task-list/models/filter.model.ts)`>` | Emitted when an app entry is clicked. |
+| appClick | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`AppDefinitionRepresentationModel`](../../../lib/process-services/src/lib/task-list/models/filter.model.ts)`>` | Emitted when an app entry is clicked. |
 | error | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<any>` | Emitted when an error occurs. |
 
 ## Details
diff --git a/docs/process-services/components/attach-form.component.md b/docs/process-services/components/attach-form.component.md
index fbf5bc7ddf..b78b686065 100644
--- a/docs/process-services/components/attach-form.component.md
+++ b/docs/process-services/components/attach-form.component.md
@@ -5,7 +5,7 @@ Status: Active
 Last reviewed: 2018-11-20
 ---
 
-# [Attach Form component](../../../lib/process-services/task-list/components/attach-form.component.ts "Defined in attach-form.component.ts")
+# [Attach Form component](../../../lib/process-services/src/lib/task-list/components/attach-form.component.ts "Defined in attach-form.component.ts")
 
 This component can be used when there is no form attached to a task and you want to add one.
 
diff --git a/docs/process-services/components/checklist.component.md b/docs/process-services/components/checklist.component.md
index 8a4b341e12..a40e3249d3 100644
--- a/docs/process-services/components/checklist.component.md
+++ b/docs/process-services/components/checklist.component.md
@@ -5,7 +5,7 @@ Status: Active
 Last reviewed: 2018-11-19
 ---
 
-# [Checklist Component](../../../lib/process-services/task-list/components/checklist.component.ts "Defined in checklist.component.ts")
+# [Checklist Component](../../../lib/process-services/src/lib/task-list/components/checklist.component.ts "Defined in checklist.component.ts")
 
 Shows the checklist task functionality.
 
@@ -33,6 +33,6 @@ Shows the checklist task functionality.
 
 | Name | Type | Description |
 | ---- | ---- | ----------- |
-| checklistTaskCreated | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`TaskDetailsModel`](../../../lib/process-services/task-list/models/task-details.model.ts)`>` | Emitted when a new checklist task is created. |
+| checklistTaskCreated | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`TaskDetailsModel`](../../../lib/process-services/src/lib/task-list/models/task-details.model.ts)`>` | Emitted when a new checklist task is created. |
 | checklistTaskDeleted | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<string>` | Emitted when a checklist task is deleted. |
 | error | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<any>` | Emitted when an error occurs. |
diff --git a/docs/process-services/components/create-process-attachment.component.md b/docs/process-services/components/create-process-attachment.component.md
index 9d423a195b..9524cedfbc 100644
--- a/docs/process-services/components/create-process-attachment.component.md
+++ b/docs/process-services/components/create-process-attachment.component.md
@@ -5,7 +5,7 @@ Status: Active
 Last reviewed: 2019-01-14
 ---
 
-# [Create Process Attachment component](../../../lib/process-services/attachment/create-process-attachment.component.ts "Defined in create-process-attachment.component.ts")
+# [Create Process Attachment component](../../../lib/process-services/src/lib/attachment/create-process-attachment.component.ts "Defined in create-process-attachment.component.ts")
 
 Displays an Upload Component (Drag and Click) to upload the attachment to a specified process instance.
 
diff --git a/docs/process-services/components/create-task-attachment.component.md b/docs/process-services/components/create-task-attachment.component.md
index 80b52e8b6d..4ca054a808 100644
--- a/docs/process-services/components/create-task-attachment.component.md
+++ b/docs/process-services/components/create-task-attachment.component.md
@@ -5,7 +5,7 @@ Status: Active
 Last reviewed: 2019-01-14
 ---
 
-# [Create Task Attachment Component](../../../lib/process-services/attachment/create-task-attachment.component.ts "Defined in create-task-attachment.component.ts")
+# [Create Task Attachment Component](../../../lib/process-services/src/lib/attachment/create-task-attachment.component.ts "Defined in create-task-attachment.component.ts")
 
 Displays an Upload Component (Drag and Click) to upload the attachment to a specified task.
 
diff --git a/docs/process-services/components/form.component.md b/docs/process-services/components/form.component.md
index 8b71a62b42..3c5a73cef6 100644
--- a/docs/process-services/components/form.component.md
+++ b/docs/process-services/components/form.component.md
@@ -5,9 +5,9 @@ Status: Active
 Last reviewed: 2019-01-16
 ---
 
-# [Form component](../../../lib/process-services/form/form.component.ts "Defined in form.component.ts")
+# [Form component](../../../lib/process-services/src/lib/form/form.component.ts "Defined in form.component.ts")
 
-Shows a [`Form`](../../../lib/process-services/task-list/models/form.model.ts) from APS
+Shows a [`Form`](../../../lib/process-services/src/lib/task-list/models/form.model.ts) from APS
 
 (See it live: [Form Quickstart](https://embed.plnkr.co/YSLXTqb3DtMhVJSqXKkE/))
 
@@ -178,7 +178,7 @@ The `nameNode` parameter is optional.
 </adf-form>
 ```
 
-Here, the node metadata is shown in an APS [`Form`](../../../lib/process-services/task-list/models/form.model.ts)
+Here, the node metadata is shown in an APS [`Form`](../../../lib/process-services/src/lib/task-list/models/form.model.ts)
 with the form fields themselves saved as metadata. The `nameNode` parameter is optional.
 
 ### Controlling outcome execution behaviour
@@ -349,7 +349,7 @@ In the CSS, you can target any outcome ID and change the style as in this exampl
 APS allows you to configure where to store files and folders in your on-site Alfresco repositories.
 
 If you have your repositories configured like this, you can use the attach file/folder
-form widget to get a file from those repositories and attach it to the [`Form`](../../../lib/process-services/task-list/models/form.model.ts).
+form widget to get a file from those repositories and attach it to the [`Form`](../../../lib/process-services/src/lib/task-list/models/form.model.ts).
 
 **Note:** your repositories could be configured to be on different servers from the one
 where your front-end is deployed.  Make sure you are using the right Proxy or configuration,
diff --git a/docs/process-services/components/people-list.component.md b/docs/process-services/components/people-list.component.md
index 6b43c76534..f0ad4ef0ba 100644
--- a/docs/process-services/components/people-list.component.md
+++ b/docs/process-services/components/people-list.component.md
@@ -5,7 +5,7 @@ Status: Active
 Last reviewed: 2019-01-14
 ---
 
-# [People list component](../../../lib/process-services/people/components/people-list/people-list.component.ts "Defined in people-list.component.ts")
+# [People list component](../../../lib/process-services/src/lib/people/components/people-list/people-list.component.ts "Defined in people-list.component.ts")
 
 Shows a list of users (people).
 
@@ -85,5 +85,5 @@ You can use column templates with the [people list component](people-list.compon
 
 | Name | Type | Description |
 | ---- | ---- | ----------- |
-| clickAction | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`UserEventModel`](../../../lib/process-services/task-list/models/user-event.model.ts)`>` | Emitted when the user clicks in the 'Three Dots' drop down menu for a row. |
+| clickAction | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`UserEventModel`](../../../lib/process-services/src/lib/task-list/models/user-event.model.ts)`>` | Emitted when the user clicks in the 'Three Dots' drop down menu for a row. |
 | clickRow | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`UserProcessModel`](../../core/models/user-process.model.md)`>` | Emitted when the user clicks a row in the people list. |
diff --git a/docs/process-services/components/people-search.component.md b/docs/process-services/components/people-search.component.md
index 4389ed0dd0..98621ce4be 100644
--- a/docs/process-services/components/people-search.component.md
+++ b/docs/process-services/components/people-search.component.md
@@ -5,7 +5,7 @@ Status: Active
 Last reviewed: 2018-11-14
 ---
 
-# [People Search component](../../../lib/process-services/people/components/people-search/people-search.component.ts "Defined in people-search.component.ts")
+# [People Search component](../../../lib/process-services/src/lib/people/components/people-search/people-search.component.ts "Defined in people-search.component.ts")
 
 Searches users/people.
 
diff --git a/docs/process-services/components/people.component.md b/docs/process-services/components/people.component.md
index 7f20a65315..dd61cfc886 100644
--- a/docs/process-services/components/people.component.md
+++ b/docs/process-services/components/people.component.md
@@ -5,7 +5,7 @@ Status: Active
 Last reviewed: 2018-11-19
 ---
 
-# [People Component](../../../lib/process-services/people/components/people/people.component.ts "Defined in people.component.ts")
+# [People Component](../../../lib/process-services/src/lib/people/components/people/people.component.ts "Defined in people.component.ts")
 
 Displays users involved with a specified task
 
diff --git a/docs/process-services/components/process-attachment-list.component.md b/docs/process-services/components/process-attachment-list.component.md
index 3208457218..f2fe5cb44d 100644
--- a/docs/process-services/components/process-attachment-list.component.md
+++ b/docs/process-services/components/process-attachment-list.component.md
@@ -5,7 +5,7 @@ Status: Active
 Last reviewed: 2019-01-14
 ---
 
-# [Process Attachment List component](../../../lib/process-services/attachment/process-attachment-list.component.ts "Defined in process-attachment-list.component.ts")
+# [Process Attachment List component](../../../lib/process-services/src/lib/attachment/process-attachment-list.component.ts "Defined in process-attachment-list.component.ts")
 
 Displays documents attached to a specified process instance.
 
@@ -20,7 +20,7 @@ Displays documents attached to a specified process instance.
 </adf-process-attachment-list>
 ```
 
-Make sure to override the [`UploadService`](../../core/services/upload.service.md) with the [`ProcessUploadService`](../../../lib/process-services/task-list/services/process-upload.service.ts)
+Make sure to override the [`UploadService`](../../core/services/upload.service.md) with the [`ProcessUploadService`](../../../lib/process-services/src/lib/task-list/services/process-upload.service.ts)
 
 ```ts
 import { UploadService } from '@alfresco/adf-core';
diff --git a/docs/process-services/components/process-comments.component.md b/docs/process-services/components/process-comments.component.md
index 7977890652..7bb82fdb60 100644
--- a/docs/process-services/components/process-comments.component.md
+++ b/docs/process-services/components/process-comments.component.md
@@ -4,7 +4,7 @@ Added: v2.0.0
 Status: Active
 ---
 
-# [Process Instance Comments component](../../../lib/process-services/process-comments/process-comments.component.ts "Defined in process-comments.component.ts")
+# [Process Instance Comments component](../../../lib/process-services/src/lib/process-comments/process-comments.component.ts "Defined in process-comments.component.ts")
 
 Displays comments associated with a particular process instance and allows the user to add new comments.
 
diff --git a/docs/process-services/components/process-filters.component.md b/docs/process-services/components/process-filters.component.md
index 6f35ad45b1..47f740d932 100644
--- a/docs/process-services/components/process-filters.component.md
+++ b/docs/process-services/components/process-filters.component.md
@@ -5,7 +5,7 @@ Status: Active
 Last reviewed: 2018-09-14
 ---
 
-# [Process Filters Component](../../../lib/process-services/process-list/components/process-filters.component.ts "Defined in process-filters.component.ts")
+# [Process Filters Component](../../../lib/process-services/src/lib/process-list/components/process-filters.component.ts "Defined in process-filters.component.ts")
 
 Collection of criteria used to filter process instances, which may be customized by users.
 
@@ -36,7 +36,7 @@ Collection of criteria used to filter process instances, which may be customized
 | ---- | ---- | ------------- | ----------- |
 | appId | `number` |  | Display filters available to the current user for the application with the specified ID. |
 | appName | `string` |  | Display filters available to the current user for the application with the specified name. |
-| filterParam | [`FilterProcessRepresentationModel`](../../../lib/process-services/process-list/models/filter-process.model.ts) |  | The parameters to filter the task filter. If there is no match then the default one (ie, the first filter in the list) is selected. |
+| filterParam | [`FilterProcessRepresentationModel`](../../../lib/process-services/src/lib/process-list/models/filter-process.model.ts) |  | The parameters to filter the task filter. If there is no match then the default one (ie, the first filter in the list) is selected. |
 | showIcon | `boolean` | true | Toggle to show or hide the filter's icon. |
 
 ### Events
@@ -66,7 +66,7 @@ If both `appId` and `appName` are specified then `appName` will take precedence
 </adf-process-instance-filters>
 ```
 
-You can use inside the filterParam one of the properties defined by [`FilterParamsModel`](../../../lib/process-services/task-list/models/filter.model.ts) (see below).
+You can use inside the filterParam one of the properties defined by [`FilterParamsModel`](../../../lib/process-services/src/lib/task-list/models/filter.model.ts) (see below).
 
 ### FilterParamsModel
 
diff --git a/docs/process-services/components/process-instance-details.component.md b/docs/process-services/components/process-instance-details.component.md
index f34fafd3e7..cd8a1a9955 100644
--- a/docs/process-services/components/process-instance-details.component.md
+++ b/docs/process-services/components/process-instance-details.component.md
@@ -5,7 +5,7 @@ Status: Active
 Last reviewed: 2018-11-19
 ---
 
-# [Process Details component](../../../lib/process-services/process-list/components/process-instance-details.component.ts "Defined in process-instance-details.component.ts")
+# [Process Details component](../../../lib/process-services/src/lib/process-list/components/process-instance-details.component.ts "Defined in process-instance-details.component.ts")
 
 Displays detailed information about a specified process instance
 
@@ -34,4 +34,4 @@ Displays detailed information about a specified process instance
 | error | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<any>` | Emitted when an error occurs. |
 | processCancelled | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<any>` | Emitted when the current process is cancelled by the user from within the component. |
 | showProcessDiagram | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<any>` | Emitted when the "show diagram" button is clicked. |
-| taskClick | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`TaskDetailsEvent`](../../../lib/process-services/task-list/models/task-details.event.ts)`>` | Emitted when a task is clicked. |
+| taskClick | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`TaskDetailsEvent`](../../../lib/process-services/src/lib/task-list/models/task-details.event.ts)`>` | Emitted when a task is clicked. |
diff --git a/docs/process-services/components/process-instance-header.component.md b/docs/process-services/components/process-instance-header.component.md
index d36238d702..ec6b60cd0c 100644
--- a/docs/process-services/components/process-instance-header.component.md
+++ b/docs/process-services/components/process-instance-header.component.md
@@ -5,7 +5,7 @@ Status: Active
 Last reviewed: 2019-01-14
 ---
 
-# [Process Instance Details Header component](../../../lib/process-services/process-list/components/process-instance-header.component.ts "Defined in process-instance-header.component.ts")
+# [Process Instance Details Header component](../../../lib/process-services/src/lib/process-list/components/process-instance-header.component.ts "Defined in process-instance-header.component.ts")
 
 Sub-component of the process details component, which renders some general information about the selected process.
 
@@ -25,7 +25,7 @@ Sub-component of the process details component, which renders some general infor
 
 | Name | Type | Default value | Description |
 | ---- | ---- | ------------- | ----------- |
-| processInstance | [`ProcessInstance`](../../../lib/process-services/process-list/models/process-instance.model.ts) |  | (**required**) Full details of the process instance to display information about. |
+| processInstance | [`ProcessInstance`](../../../lib/process-services/src/lib/process-list/models/process-instance.model.ts) |  | (**required**) Full details of the process instance to display information about. |
 
 ## Details
 
diff --git a/docs/process-services/components/process-instance-tasks.component.md b/docs/process-services/components/process-instance-tasks.component.md
index 3872d59229..80b30122f3 100644
--- a/docs/process-services/components/process-instance-tasks.component.md
+++ b/docs/process-services/components/process-instance-tasks.component.md
@@ -5,7 +5,7 @@ Status: Active
 Last reviewed: 2018-11-19
 ---
 
-# [Process Instance Tasks component](../../../lib/process-services/process-list/components/process-instance-tasks.component.ts "Defined in process-instance-tasks.component.ts")
+# [Process Instance Tasks component](../../../lib/process-services/src/lib/process-list/components/process-instance-tasks.component.ts "Defined in process-instance-tasks.component.ts")
 
 Lists both the active and completed tasks associated with a particular process instance
 
@@ -24,7 +24,7 @@ Lists both the active and completed tasks associated with a particular process i
 
 | Name | Type | Default value | Description |
 | ---- | ---- | ------------- | ----------- |
-| processInstanceDetails | [`ProcessInstance`](../../../lib/process-services/process-list/models/process-instance.model.ts) |  | (**required**) The ID of the process instance to display tasks for. |
+| processInstanceDetails | [`ProcessInstance`](../../../lib/process-services/src/lib/process-list/models/process-instance.model.ts) |  | (**required**) The ID of the process instance to display tasks for. |
 | showRefreshButton | `boolean` | true | Toggles whether to show a refresh button next to the list of tasks to allow it to be updated from the server. |
 
 ### Events
@@ -32,4 +32,4 @@ Lists both the active and completed tasks associated with a particular process i
 | Name | Type | Description |
 | ---- | ---- | ----------- |
 | error | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<any>` | Emitted when an error occurs. |
-| taskClick | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`TaskDetailsEvent`](../../../lib/process-services/task-list/models/task-details.event.ts)`>` | Emitted when a task is clicked. |
+| taskClick | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`TaskDetailsEvent`](../../../lib/process-services/src/lib/task-list/models/task-details.event.ts)`>` | Emitted when a task is clicked. |
diff --git a/docs/process-services/components/process-list.component.md b/docs/process-services/components/process-list.component.md
index 1176a44cc5..dd75296209 100644
--- a/docs/process-services/components/process-list.component.md
+++ b/docs/process-services/components/process-list.component.md
@@ -5,7 +5,7 @@ Status: Active
 Last reviewed: 2019-01-16
 ---
 
-# [Process Instance List](../../../lib/process-services/process-list/components/process-list.component.ts "Defined in process-list.component.ts")
+# [Process Instance List](../../../lib/process-services/src/lib/process-list/components/process-list.component.ts "Defined in process-list.component.ts")
 
 Renders a list containing all the process instances matched by the parameters specified.
 
@@ -70,12 +70,12 @@ when the process list is empty:
 | ---- | ---- | ----------- |
 | error | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<any>` | Emitted when an error occurs while loading the list of process instances from the server. |
 | rowClick | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<string>` | Emitted when a row in the process list is clicked. |
-| success | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`ProcessListModel`](../../../lib/process-services/process-list/models/process-list.model.ts)`>` | Emitted when the list of process instances has been loaded successfully from the server. |
+| success | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`ProcessListModel`](../../../lib/process-services/src/lib/process-list/models/process-list.model.ts)`>` | Emitted when the list of process instances has been loaded successfully from the server. |
 
 ## Details
 
 The list can show any of the properties of the
-[`ProcessInstance`](../../../lib/process-services/process-list/models/process-instance.model.ts)
+[`ProcessInstance`](../../../lib/process-services/src/lib/process-list/models/process-instance.model.ts)
 class. The example below shows how to define a custom schema for the list in the `app.config.json` file and access it with the `presetColumn` property:
 
 ```json
diff --git a/docs/process-services/components/select-apps-dialog.component.md b/docs/process-services/components/select-apps-dialog.component.md
index 383207998d..6c59c463a8 100644
--- a/docs/process-services/components/select-apps-dialog.component.md
+++ b/docs/process-services/components/select-apps-dialog.component.md
@@ -5,7 +5,7 @@ Status: Active
 Last reviewed: 2019-01-14
 ---
 
-# [Select App Component](../../../lib/process-services/app-list/select-apps-dialog-component.ts "Defined in select-apps-dialog-component.ts")
+# [Select App Component](../../../lib/process-services/src/lib/app-list/select-apps-dialog-component.ts "Defined in select-apps-dialog-component.ts")
 
 Shows all available apps and returns the selected app.
 
diff --git a/docs/process-services/components/start-process.component.md b/docs/process-services/components/start-process.component.md
index 7b3eed1271..f5f247d7b3 100644
--- a/docs/process-services/components/start-process.component.md
+++ b/docs/process-services/components/start-process.component.md
@@ -5,7 +5,7 @@ Status: Active
 Last reviewed: 2019-01-14
 ---
 
-# [Start Process component](../../../lib/process-services/process-list/components/start-process.component.ts "Defined in start-process.component.ts")
+# [Start Process component](../../../lib/process-services/src/lib/process-list/components/start-process.component.ts "Defined in start-process.component.ts")
 
 Starts a process.
 
@@ -44,15 +44,15 @@ Starts a process.
 | processFilterSelector | `boolean` | true | (optional) Parameter to enable selection of process when filtering. |
 | showSelectProcessDropdown | `boolean` | true | Hide or show the process selection dropdown. |
 | values | [`FormValues`](../../../lib/core/form/components/widgets/core/form-values.ts) |  | Parameter to pass form field values in the start form if one is associated. |
-| variables | [`ProcessInstanceVariable`](../../../lib/process-services/process-list/models/process-instance-variable.model.ts)`[]` |  | Variables in the input to the process [`RestVariable`](https://github.com/Alfresco/alfresco-js-api/blob/development/src/api/activiti-rest-api/docs/RestVariable.md). |
+| variables | [`ProcessInstanceVariable`](../../../lib/process-services/src/lib/process-list/models/process-instance-variable.model.ts)`[]` |  | Variables in the input to the process [`RestVariable`](https://github.com/Alfresco/alfresco-js-api/blob/development/src/api/activiti-rest-api/docs/RestVariable.md). |
 
 ### Events
 
 | Name | Type | Description |
 | ---- | ---- | ----------- |
-| cancel | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`ProcessInstance`](../../../lib/process-services/process-list/models/process-instance.model.ts)`>` | Emitted when the process is canceled. |
-| error | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`ProcessInstance`](../../../lib/process-services/process-list/models/process-instance.model.ts)`>` | Emitted when an error occurs. |
-| start | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`ProcessInstance`](../../../lib/process-services/process-list/models/process-instance.model.ts)`>` | Emitted when the process starts. |
+| cancel | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`ProcessInstance`](../../../lib/process-services/src/lib/process-list/models/process-instance.model.ts)`>` | Emitted when the process is canceled. |
+| error | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`ProcessInstance`](../../../lib/process-services/src/lib/process-list/models/process-instance.model.ts)`>` | Emitted when an error occurs. |
+| start | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`ProcessInstance`](../../../lib/process-services/src/lib/process-list/models/process-instance.model.ts)`>` | Emitted when the process starts. |
 
 ## Details
 
diff --git a/docs/process-services/components/start-task.component.md b/docs/process-services/components/start-task.component.md
index eb757644d2..faad37c266 100644
--- a/docs/process-services/components/start-task.component.md
+++ b/docs/process-services/components/start-task.component.md
@@ -5,7 +5,7 @@ Status: Active
 Last reviewed: 2019-01-14
 ---
 
-# [Start Task Component](../../../lib/process-services/task-list/components/start-task.component.ts "Defined in start-task.component.ts")
+# [Start Task Component](../../../lib/process-services/src/lib/task-list/components/start-task.component.ts "Defined in start-task.component.ts")
 
 Creates/Starts a new task for the specified app.
 
diff --git a/docs/process-services/components/task-attachment-list.component.md b/docs/process-services/components/task-attachment-list.component.md
index f32168645b..fbd8b9ac60 100644
--- a/docs/process-services/components/task-attachment-list.component.md
+++ b/docs/process-services/components/task-attachment-list.component.md
@@ -5,7 +5,7 @@ Status: Active
 Last reviewed: 2019-01-14
 ---
 
-# [Task Attachment List Component](../../../lib/process-services/attachment/task-attachment-list.component.ts "Defined in task-attachment-list.component.ts")
+# [Task Attachment List Component](../../../lib/process-services/src/lib/attachment/task-attachment-list.component.ts "Defined in task-attachment-list.component.ts")
 
 Displays documents attached to a specified task.
 
@@ -100,7 +100,7 @@ import { UploadService } from '@alfresco/adf-core';
 import { TaskUploadService } from '@alfresco/adf-process-services';
 ```
 
-Make sure you override the [`UploadService`](../../core/services/upload.service.md) with the [`TaskUploadService`](../../../lib/process-services/task-list/services/task-upload.service.ts)
+Make sure you override the [`UploadService`](../../core/services/upload.service.md) with the [`TaskUploadService`](../../../lib/process-services/src/lib/task-list/services/task-upload.service.ts)
 
 ```ts
 @Component({
diff --git a/docs/process-services/components/task-details.component.md b/docs/process-services/components/task-details.component.md
index 46e4fb37fd..81ba9d5134 100644
--- a/docs/process-services/components/task-details.component.md
+++ b/docs/process-services/components/task-details.component.md
@@ -5,7 +5,7 @@ Status: Active
 Last reviewed: 2018-11-13
 ---
 
-# [Task Details component](../../../lib/process-services/task-list/components/task-details.component.ts "Defined in task-details.component.ts")
+# [Task Details component](../../../lib/process-services/src/lib/task-list/components/task-details.component.ts "Defined in task-details.component.ts")
 
 Shows the details of the task ID passed in as input.
 
@@ -50,7 +50,7 @@ Shows the details of the task ID passed in as input.
 | formContentClicked | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`ContentLinkModel`](../../../lib/core/form/components/widgets/core/content-link.model.ts)`>` | Emitted when the form field content is clicked. |
 | formLoaded | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`FormModel`](../../../lib/core/form/components/widgets/core/form.model.ts)`>` | Emitted when the form is loaded or reloaded. |
 | formSaved | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`FormModel`](../../../lib/core/form/components/widgets/core/form.model.ts)`>` | Emitted when the form is submitted with the `Save` or custom outcomes. |
-| taskCreated | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`TaskDetailsModel`](../../../lib/process-services/task-list/models/task-details.model.ts)`>` | Emitted when a checklist task is created. |
+| taskCreated | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`TaskDetailsModel`](../../../lib/process-services/src/lib/task-list/models/task-details.model.ts)`>` | Emitted when a checklist task is created. |
 | taskDeleted | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<string>` | Emitted when a checklist task is deleted. |
 | unClaimedTask | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<string>` | Emitted when a task is unclaimed. |
 
diff --git a/docs/process-services/components/task-filters.component.md b/docs/process-services/components/task-filters.component.md
index 985caada3d..cbd04e7998 100644
--- a/docs/process-services/components/task-filters.component.md
+++ b/docs/process-services/components/task-filters.component.md
@@ -5,7 +5,7 @@ Status: Active
 Last reviewed: 2018-11-16
 ---
 
-# [Task Filters component](../../../lib/process-services/task-list/components/task-filters.component.ts "Defined in task-filters.component.ts")
+# [Task Filters component](../../../lib/process-services/src/lib/task-list/components/task-filters.component.ts "Defined in task-filters.component.ts")
 
 Shows all available filters.
 
@@ -23,7 +23,7 @@ Shows all available filters.
 | ---- | ---- | ------------- | ----------- |
 | appId | `number` |  | Display filters available to the current user for the application with the specified ID. |
 | appName | `string` |  | Display filters available to the current user for the application with the specified name. |
-| filterParam | [`FilterParamsModel`](../../../lib/process-services/task-list/models/filter.model.ts) |  | Parameters to use for the task filter. If there is no match then the default filter (the first one the list) is selected. |
+| filterParam | [`FilterParamsModel`](../../../lib/process-services/src/lib/task-list/models/filter.model.ts) |  | Parameters to use for the task filter. If there is no match then the default filter (the first one the list) is selected. |
 | showIcon | `boolean` |  | Toggles display of the filter's icon. |
 
 ### Events
@@ -31,7 +31,7 @@ Shows all available filters.
 | Name | Type | Description |
 | ---- | ---- | ----------- |
 | error | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<any>` | Emitted when an error occurs during loading. |
-| filterClick | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`FilterRepresentationModel`](../../../lib/process-services/task-list/models/filter.model.ts)`>` | Emitted when a filter in the list is clicked. |
+| filterClick | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<`[`FilterRepresentationModel`](../../../lib/process-services/src/lib/task-list/models/filter.model.ts)`>` | Emitted when a filter in the list is clicked. |
 | success | [`EventEmitter`](https://angular.io/api/core/EventEmitter)`<any>` | Emitted when the list is loaded. |
 
 ## Details
@@ -46,7 +46,7 @@ Use the `filterParam` property to restrict the range of filters that are shown:
 </adf-task-filters>
 ```
 
-You can use properties from [`FilterParamsModel`](../../../lib/process-services/task-list/models/filter.model.ts)
+You can use properties from [`FilterParamsModel`](../../../lib/process-services/src/lib/task-list/models/filter.model.ts)
 as the value of `filterParam` as shown in the table below:
 
 | Name | Type | Description |
diff --git a/docs/process-services/components/task-header.component.md b/docs/process-services/components/task-header.component.md
index 8d0bdf0de7..59fcdb44f6 100644
--- a/docs/process-services/components/task-header.component.md
+++ b/docs/process-services/components/task-header.component.md
@@ -5,7 +5,7 @@ Status: Active
 Last reviewed: 2019-01-14
 ---
 
-# [Task Header component](../../../lib/process-services/task-list/components/task-header.component.ts "Defined in task-header.component.ts")
+# [Task Header component](../../../lib/process-services/src/lib/task-list/components/task-header.component.ts "Defined in task-header.component.ts")
 
 Shows all the information related to a task.
 
@@ -26,7 +26,7 @@ Shows all the information related to a task.
 | Name | Type | Default value | Description |
 | ---- | ---- | ------------- | ----------- |
 | formName | `string` | null | The name of the form. |
-| taskDetails | [`TaskDetailsModel`](../../../lib/process-services/task-list/models/task-details.model.ts) |  | (required) Details related to the task. |
+| taskDetails | [`TaskDetailsModel`](../../../lib/process-services/src/lib/task-list/models/task-details.model.ts) |  | (required) Details related to the task. |
 
 ### Events
 
diff --git a/docs/process-services/components/task-list.component.md b/docs/process-services/components/task-list.component.md
index af8c51b303..adaa840e61 100644
--- a/docs/process-services/components/task-list.component.md
+++ b/docs/process-services/components/task-list.component.md
@@ -5,7 +5,7 @@ Status: Active
 Last reviewed: 2019-02-08
 ---
 
-# [Task List component](../../../lib/process-services/task-list/components/task-list.component.ts "Defined in task-list.component.ts")
+# [Task List component](../../../lib/process-services/src/lib/task-list/components/task-list.component.ts "Defined in task-list.component.ts")
 
 Renders a list containing all the tasks matched by the parameters specified.
 
@@ -91,7 +91,7 @@ renders details of any chosen instance.
 ### Setting the column schema
 
 You can configure the list to show any of the properties of the
-[`TaskDetailsModel`](../../../lib/process-services/task-list/models/task-details.model.ts)
+[`TaskDetailsModel`](../../../lib/process-services/src/lib/task-list/models/task-details.model.ts)
 class. The example below shows how to set up the column schema from HTML:
 
 ```html
diff --git a/docs/process-services/components/task-standalone.component.md b/docs/process-services/components/task-standalone.component.md
index e86381dd45..1e120792a5 100644
--- a/docs/process-services/components/task-standalone.component.md
+++ b/docs/process-services/components/task-standalone.component.md
@@ -5,7 +5,7 @@ Status: Active
 Last reviewed: 2018-11-19
 ---
 
-# [Task Standalone component](../../../lib/process-services/task-list/components/task-standalone.component.ts "Defined in task-standalone.component.ts")
+# [Task Standalone component](../../../lib/process-services/src/lib/task-list/components/task-standalone.component.ts "Defined in task-standalone.component.ts")
 
 This component can be used when the task doesn't belong to any processes.
 
diff --git a/docs/process-services/directives/process-audit.directive.md b/docs/process-services/directives/process-audit.directive.md
index 2500f6ab42..c22115efec 100644
--- a/docs/process-services/directives/process-audit.directive.md
+++ b/docs/process-services/directives/process-audit.directive.md
@@ -5,7 +5,7 @@ Status: Active
 Last reviewed: 2019-01-14
 ---
 
-# [Process Audit Directive](../../../lib/process-services/process-list/components/process-audit.directive.ts "Defined in process-audit.directive.ts")
+# [Process Audit Directive](../../../lib/process-services/src/lib/process-list/components/process-audit.directive.ts "Defined in process-audit.directive.ts")
 
 Fetches the Process Audit information in PDF or JSON format.
 
diff --git a/docs/process-services/directives/task-audit.directive.md b/docs/process-services/directives/task-audit.directive.md
index 688e00d89d..0bca1eedac 100644
--- a/docs/process-services/directives/task-audit.directive.md
+++ b/docs/process-services/directives/task-audit.directive.md
@@ -5,7 +5,7 @@ Status: Active
 Last reviewed: 2019-01-14
 ---
 
-# [Task Audit Directive](../../../lib/process-services/task-list/components/task-audit.directive.ts "Defined in task-audit.directive.ts")
+# [Task Audit Directive](../../../lib/process-services/src/lib/task-list/components/task-audit.directive.ts "Defined in task-audit.directive.ts")
 
 Fetches the Task Audit information in PDF or JSON format.
 
diff --git a/docs/process-services/services/process-filter.service.md b/docs/process-services/services/process-filter.service.md
index 6cb6c30fa5..6d93eaefbd 100644
--- a/docs/process-services/services/process-filter.service.md
+++ b/docs/process-services/services/process-filter.service.md
@@ -5,7 +5,7 @@ Status: Active
 Last reviewed: 2018-11-13
 ---
 
-# [Process Filter Service](../../../lib/process-services/process-list/services/process-filter.service.ts "Defined in process-filter.service.ts")
+# [Process Filter Service](../../../lib/process-services/src/lib/process-list/services/process-filter.service.ts "Defined in process-filter.service.ts")
 
 Manage Process Filters, which are pre-configured Process Instance queries. 
 
@@ -13,41 +13,41 @@ Manage Process Filters, which are pre-configured Process Instance queries.
 
 ### Methods
 
--   **addProcessFilter**(filter: [`FilterProcessRepresentationModel`](../../../lib/process-services/process-list/models/filter-process.model.ts)): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`FilterProcessRepresentationModel`](../../../lib/process-services/process-list/models/filter-process.model.ts)`>`<br/>
+-   **addProcessFilter**(filter: [`FilterProcessRepresentationModel`](../../../lib/process-services/src/lib/process-list/models/filter-process.model.ts)): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`FilterProcessRepresentationModel`](../../../lib/process-services/src/lib/process-list/models/filter-process.model.ts)`>`<br/>
     Adds a filter.
-    -   _filter:_ [`FilterProcessRepresentationModel`](../../../lib/process-services/process-list/models/filter-process.model.ts)  - The filter to add
-    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`FilterProcessRepresentationModel`](../../../lib/process-services/process-list/models/filter-process.model.ts)`>` - The filter just added
+    -   _filter:_ [`FilterProcessRepresentationModel`](../../../lib/process-services/src/lib/src/lib/process-list/models/filter-process.model.ts)  - The filter to add
+    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`FilterProcessRepresentationModel`](../../../lib/process-services/src/lib/process-list/models/filter-process.model.ts)`>` - The filter just added
 -   **callApiProcessFilters**(appId?: `number`): [`Promise`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Using_promises)`<`[`ResultListDataRepresentationUserProcessInstanceFilterRepresentation`](https://github.com/Alfresco/alfresco-js-api/blob/development/src/api/activiti-rest-api/docs/ResultListDataRepresentation%C2%ABUserProcessInstanceFilterRepresentation%C2%BB.md)`>`<br/>
     Calls `getUserProcessInstanceFilters` from the Alfresco JS API.
     -   _appId:_ `number`  - (Optional) ID of the target app
     -   **Returns** [`Promise`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Using_promises)`<`[`ResultListDataRepresentationUserProcessInstanceFilterRepresentation`](https://github.com/Alfresco/alfresco-js-api/blob/development/src/api/activiti-rest-api/docs/ResultListDataRepresentation%C2%ABUserProcessInstanceFilterRepresentation%C2%BB.md)`>` - List of filter details
--   **createDefaultFilters**(appId: `number`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`FilterProcessRepresentationModel`](../../../lib/process-services/process-list/models/filter-process.model.ts)`[]>`<br/>
+-   **createDefaultFilters**(appId: `number`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`FilterProcessRepresentationModel`](../../../lib/process-services/src/lib/process-list/models/filter-process.model.ts)`[]>`<br/>
     Creates and returns the default filters for an app.
     -   _appId:_ `number`  - ID of the target app
-    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`FilterProcessRepresentationModel`](../../../lib/process-services/process-list/models/filter-process.model.ts)`[]>` - Default filters just created
--   **getProcessFilterById**(filterId: `number`, appId?: `number`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`FilterProcessRepresentationModel`](../../../lib/process-services/process-list/models/filter-process.model.ts)`>`<br/>
+    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`FilterProcessRepresentationModel`](../../../lib/process-services/src/lib/process-list/models/filter-process.model.ts)`[]>` - Default filters just created
+-   **getProcessFilterById**(filterId: `number`, appId?: `number`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`FilterProcessRepresentationModel`](../../../lib/process-services/src/lib/process-list/models/filter-process.model.ts)`>`<br/>
     Retrieves the process filter by ID.
     -   _filterId:_ `number`  - ID of the filter
     -   _appId:_ `number`  - (Optional) ID of the target app
-    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`FilterProcessRepresentationModel`](../../../lib/process-services/process-list/models/filter-process.model.ts)`>` - Details of the filter
--   **getProcessFilterByName**(filterName: `string`, appId?: `number`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`FilterProcessRepresentationModel`](../../../lib/process-services/process-list/models/filter-process.model.ts)`>`<br/>
+    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`FilterProcessRepresentationModel`](../../../lib/process-services/src/lib/process-list/models/filter-process.model.ts)`>` - Details of the filter
+-   **getProcessFilterByName**(filterName: `string`, appId?: `number`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`FilterProcessRepresentationModel`](../../../lib/process-services/src/lib/process-list/models/filter-process.model.ts)`>`<br/>
     Retrieves the process filter by name.
     -   _filterName:_ `string`  - Name of the filter
     -   _appId:_ `number`  - (Optional) ID of the target app
-    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`FilterProcessRepresentationModel`](../../../lib/process-services/process-list/models/filter-process.model.ts)`>` - Details of the filter
--   **getProcessFilters**(appId: `number`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`FilterProcessRepresentationModel`](../../../lib/process-services/process-list/models/filter-process.model.ts)`[]>`<br/>
+    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`FilterProcessRepresentationModel`](../../../lib/process-services/src/lib/process-list/models/filter-process.model.ts)`>` - Details of the filter
+-   **getProcessFilters**(appId: `number`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`FilterProcessRepresentationModel`](../../../lib/process-services/src/lib/process-list/models/filter-process.model.ts)`[]>`<br/>
     Gets all filters defined for a Process App.
     -   _appId:_ `number`  - ID of the target app
-    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`FilterProcessRepresentationModel`](../../../lib/process-services/process-list/models/filter-process.model.ts)`[]>` - Array of filter details
--   **getRunningFilterInstance**(appId: `number`): [`FilterProcessRepresentationModel`](../../../lib/process-services/process-list/models/filter-process.model.ts)<br/>
+    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`FilterProcessRepresentationModel`](../../../lib/process-services/src/lib/process-list/models/filter-process.model.ts)`[]>` - Array of filter details
+-   **getRunningFilterInstance**(appId: `number`): [`FilterProcessRepresentationModel`](../../../lib/process-services/src/lib/process-list/models/filter-process.model.ts)<br/>
     Creates and returns a filter that matches "running" process instances.
     -   _appId:_ `number`  - ID of the target app
-    -   **Returns** [`FilterProcessRepresentationModel`](../../../lib/process-services/process-list/models/filter-process.model.ts) - Filter just created
+    -   **Returns** [`FilterProcessRepresentationModel`](../../../lib/process-services/src/lib/process-list/models/filter-process.model.ts) - Filter just created
 
 ## Details
 
 The methods of this service generally return an instance of
-[`FilterProcessRepresentationModel`](../../../lib/process-services/process-list/models/filter-process.model.ts) or an array of instances. For example, you
+[`FilterProcessRepresentationModel`](../../../lib/process-services/src/lib/process-list/models/filter-process.model.ts) or an array of instances. For example, you
 could use `getProcessFilters` as follows:
 
 ```ts
@@ -60,7 +60,7 @@ this.processFilterService.getProcessFilters(processAppId)
 });
 ```
 
-The response is an array of [`FilterProcessRepresentationModel`](../../../lib/process-services/process-list/models/filter-process.model.ts) objects:
+The response is an array of [`FilterProcessRepresentationModel`](../../../lib/process-services/src/lib/process-list/models/filter-process.model.ts) objects:
 
         filters:  
             0: {id: 15, appId: 2, name: "Running", recent: true, icon: "glyphicon-random", …}
diff --git a/docs/process-services/services/process.service.md b/docs/process-services/services/process.service.md
index d95a63c6d1..4f6297cb06 100644
--- a/docs/process-services/services/process.service.md
+++ b/docs/process-services/services/process.service.md
@@ -5,7 +5,7 @@ Status: Active
 Last reviewed: 2019-03-20
 ---
 
-# [Process Service](../../../lib/process-services/process-list/services/process.service.ts "Defined in process.service.ts")
+# [Process Service](../../../lib/process-services/src/lib/process-list/services/process.service.ts "Defined in process.service.ts")
 
 Manages process instances, process variables, and process audit Log. 
 
@@ -17,11 +17,11 @@ Manages process instances, process variables, and process audit Log.
     Cancels a process instance.
     -   _processInstanceId:_ `string`  - ID of process to cancel
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<void>` - Null response notifying when the operation is complete
--   **createOrUpdateProcessInstanceVariables**(processInstanceId: `string`, variables: [`RestVariable`](https://github.com/Alfresco/alfresco-js-api/blob/development/src/api/activiti-rest-api/docs/RestVariable.md)`[]`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`ProcessInstanceVariable`](../../../lib/process-services/process-list/models/process-instance-variable.model.ts)`[]>`<br/>
+-   **createOrUpdateProcessInstanceVariables**(processInstanceId: `string`, variables: [`RestVariable`](https://github.com/Alfresco/alfresco-js-api/blob/development/src/api/activiti-rest-api/docs/RestVariable.md)`[]`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`ProcessInstanceVariable`](../../../lib/process-services/src/lib/process-list/models/process-instance-variable.model.ts)`[]>`<br/>
     Creates or updates variables for a process instance.
     -   _processInstanceId:_ `string`  - ID of the target process
     -   _variables:_ [`RestVariable`](https://github.com/Alfresco/alfresco-js-api/blob/development/src/api/activiti-rest-api/docs/RestVariable.md)`[]`  - Variables to update
-    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`ProcessInstanceVariable`](../../../lib/process-services/process-list/models/process-instance-variable.model.ts)`[]>` - Array of instance variable info
+    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`ProcessInstanceVariable`](../../../lib/process-services/src/lib/process-list/models/process-instance-variable.model.ts)`[]>` - Array of instance variable info
 -   **deleteProcessInstanceVariable**(processInstanceId: `string`, variableName: `string`): [`Observable`](http://reactivex.io/documentation/observable.html)`<void>`<br/>
     Deletes a variable for a process instance.
     -   _processInstanceId:_ `string`  - ID of the target process
@@ -35,41 +35,41 @@ Manages process instances, process variables, and process audit Log.
     Fetches the Process Audit information as a PDF.
     -   _processId:_ `string`  - ID of the target process
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`Blob`](https://developer.mozilla.org/en-US/docs/Web/API/Blob)`>` - Binary PDF data
--   **getProcess**(processInstanceId: `string`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`ProcessInstance`](../../../lib/process-services/process-list/models/process-instance.model.ts)`>`<br/>
+-   **getProcess**(processInstanceId: `string`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`ProcessInstance`](../../../lib/process-services/src/lib/process-list/models/process-instance.model.ts)`>`<br/>
     Gets Process Instance metadata.
     -   _processInstanceId:_ `string`  - ID of the target process
-    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`ProcessInstance`](../../../lib/process-services/process-list/models/process-instance.model.ts)`>` - Metadata for the instance
+    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`ProcessInstance`](../../../lib/process-services/src/lib/process-list/models/process-instance.model.ts)`>` - Metadata for the instance
 -   **getProcessDefinitions**(appId?: `number`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`ProcessDefinitionRepresentation`](https://github.com/Alfresco/alfresco-js-api/blob/development/src/api/activiti-rest-api/docs/ProcessDefinitionRepresentation.md)`[]>`<br/>
     Gets process definitions associated with an app.
     -   _appId:_ `number`  - (Optional) ID of a target app
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`ProcessDefinitionRepresentation`](https://github.com/Alfresco/alfresco-js-api/blob/development/src/api/activiti-rest-api/docs/ProcessDefinitionRepresentation.md)`[]>` - Array of process definitions
--   **getProcessInstanceVariables**(processInstanceId: `string`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`ProcessInstanceVariable`](../../../lib/process-services/process-list/models/process-instance-variable.model.ts)`[]>`<br/>
+-   **getProcessInstanceVariables**(processInstanceId: `string`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`ProcessInstanceVariable`](../../../lib/process-services/src/lib/process-list/models/process-instance-variable.model.ts)`[]>`<br/>
     Gets the variables for a process instance.
     -   _processInstanceId:_ `string`  - ID of the target process
-    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`ProcessInstanceVariable`](../../../lib/process-services/process-list/models/process-instance-variable.model.ts)`[]>` - Array of instance variable info
--   **getProcessInstances**(requestNode: [`ProcessFilterParamRepresentationModel`](../../../lib/process-services/process-list/models/filter-process.model.ts), processDefinitionKey?: `string`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`ProcessListModel`](../../../lib/process-services/process-list/models/process-list.model.ts)`>`<br/>
+    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`ProcessInstanceVariable`](../../../lib/process-services/src/lib/process-list/models/process-instance-variable.model.ts)`[]>` - Array of instance variable info
+-   **getProcessInstances**(requestNode: [`ProcessFilterParamRepresentationModel`](../../../lib/process-services/src/lib/process-list/models/filter-process.model.ts), processDefinitionKey?: `string`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`ProcessListModel`](../../../lib/process-services/src/lib/process-list/models/process-list.model.ts)`>`<br/>
     Gets process instances for a filter and optionally a process definition.
-    -   _requestNode:_ [`ProcessFilterParamRepresentationModel`](../../../lib/process-services/process-list/models/filter-process.model.ts)  - Filter for instances
+    -   _requestNode:_ [`ProcessFilterParamRepresentationModel`](../../../lib/process-services/src/lib/process-list/models/filter-process.model.ts)  - Filter for instances
     -   _processDefinitionKey:_ `string`  - (Optional) Limits returned instances to a process definition
-    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`ProcessListModel`](../../../lib/process-services/process-list/models/process-list.model.ts)`>` - List of process instances
--   **getProcessTasks**(processInstanceId: `string`, state?: `string`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskDetailsModel`](../../../lib/process-services/task-list/models/task-details.model.ts)`[]>`<br/>
+    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`ProcessListModel`](../../../lib/process-services/src/lib/process-list/models/process-list.model.ts)`>` - List of process instances
+-   **getProcessTasks**(processInstanceId: `string`, state?: `string`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskDetailsModel`](../../../lib/process-services/src/lib/task-list/models/task-details.model.ts)`[]>`<br/>
     Gets task instances for a process instance.
     -   _processInstanceId:_ `string`  - ID of the process instance
     -   _state:_ `string`  - (Optional) Task state filter (can be "active" or "completed")
-    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskDetailsModel`](../../../lib/process-services/task-list/models/task-details.model.ts)`[]>` - Array of task instance details
--   **getProcesses**(requestNode: [`ProcessFilterParamRepresentationModel`](../../../lib/process-services/process-list/models/filter-process.model.ts), processDefinitionKey?: `string`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`ProcessListModel`](../../../lib/process-services/process-list/models/process-list.model.ts)`>`<br/>
+    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskDetailsModel`](../../../lib/process-services/src/lib/task-list/models/task-details.model.ts)`[]>` - Array of task instance details
+-   **getProcesses**(requestNode: [`ProcessFilterParamRepresentationModel`](../../../lib/process-services/src/lib/process-list/models/filter-process.model.ts), processDefinitionKey?: `string`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`ProcessListModel`](../../../lib/process-services/src/lib/process-list/models/process-list.model.ts)`>`<br/>
     Gets processes for a filter and optionally a process definition.
-    -   _requestNode:_ [`ProcessFilterParamRepresentationModel`](../../../lib/process-services/process-list/models/filter-process.model.ts)  - Filter for instances
+    -   _requestNode:_ [`ProcessFilterParamRepresentationModel`](../../../lib/process-services/src/lib/process-list/models/filter-process.model.ts)  - Filter for instances
     -   _processDefinitionKey:_ `string`  - (Optional) Limits returned instances to a process definition
-    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`ProcessListModel`](../../../lib/process-services/process-list/models/process-list.model.ts)`>` - List of processes
--   **startProcess**(processDefinitionId: `string`, name: `string`, outcome?: `string`, startFormValues?: [`FormValues`](../../../lib/core/form/components/widgets/core/form-values.ts), variables?: [`ProcessInstanceVariable`](../../../lib/process-services/process-list/models/process-instance-variable.model.ts)`[]`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`ProcessInstance`](../../../lib/process-services/process-list/models/process-instance.model.ts)`>`<br/>
+    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`ProcessListModel`](../../../lib/process-services/src/lib/process-list/models/process-list.model.ts)`>` - List of processes
+-   **startProcess**(processDefinitionId: `string`, name: `string`, outcome?: `string`, startFormValues?: [`FormValues`](../../../lib/core/form/components/widgets/core/form-values.ts), variables?: [`ProcessInstanceVariable`](../../../lib/process-services/src/lib/process-list/models/process-instance-variable.model.ts)`[]`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`ProcessInstance`](../../../lib/process-services/src/lib/process-list/models/process-instance.model.ts)`>`<br/>
     Starts a process based on a process definition, name, form values or variables.
     -   _processDefinitionId:_ `string`  - Process definition ID
     -   _name:_ `string`  - Process name
     -   _outcome:_ `string`  - (Optional) Process outcome
     -   _startFormValues:_ [`FormValues`](../../../lib/core/form/components/widgets/core/form-values.ts)  - (Optional) Values for the start form
-    -   _variables:_ [`ProcessInstanceVariable`](../../../lib/process-services/process-list/models/process-instance-variable.model.ts)`[]`  - (Optional) Array of process instance variables
-    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`ProcessInstance`](../../../lib/process-services/process-list/models/process-instance.model.ts)`>` - Details of the process instance just started
+    -   _variables:_ [`ProcessInstanceVariable`](../../../lib/process-services/src/lib/process-list/models/process-instance-variable.model.ts)`[]`  - (Optional) Array of process instance variables
+    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`ProcessInstance`](../../../lib/process-services/src/lib/process-list/models/process-instance.model.ts)`>` - Details of the process instance just started
 
 ## Details
 
@@ -113,7 +113,7 @@ this.processService.startProcess(processDefinitionId, name, outcome, startFormVa
 });
 ```
 
-A [`ProcessInstance`](../../../lib/process-services/process-list/models/process-instance.model.ts) object is returned for a successfully started process. This implements the
+A [`ProcessInstance`](../../../lib/process-services/src/lib/process-list/models/process-instance.model.ts) object is returned for a successfully started process. This implements the
 [ProcessInstanceRepresentation interface](https://github.com/Alfresco/alfresco-js-api/blob/master/src/alfresco-activiti-rest-api/docs/ProcessInstanceRepresentation.md).
 
 You can start the process with process variables instead of form field values using
diff --git a/docs/process-services/services/task-filter.service.md b/docs/process-services/services/task-filter.service.md
index 1523340683..235881ab7c 100644
--- a/docs/process-services/services/task-filter.service.md
+++ b/docs/process-services/services/task-filter.service.md
@@ -5,7 +5,7 @@ Status: Active
 Last reviewed: 2018-06-07
 ---
 
-# [Task Filter Service](../../../lib/process-services/task-list/services/task-filter.service.ts "Defined in task-filter.service.ts")
+# [Task Filter Service](../../../lib/process-services/src/lib/task-list/services/task-filter.service.ts "Defined in task-filter.service.ts")
 
 Manage Task Filters, which are pre-configured Task Instance queries. 
 
@@ -13,52 +13,52 @@ Manage Task Filters, which are pre-configured Task Instance queries.
 
 ### Methods
 
--   **addFilter**(filter: [`FilterRepresentationModel`](../../../lib/process-services/task-list/models/filter.model.ts)): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`FilterRepresentationModel`](../../../lib/process-services/task-list/models/filter.model.ts)`>`<br/>
+-   **addFilter**(filter: [`FilterRepresentationModel`](../../../lib/process-services/src/lib/task-list/models/filter.model.ts)): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`FilterRepresentationModel`](../../../lib/process-services/src/lib/task-list/models/filter.model.ts)`>`<br/>
     Adds a new task filter
-    -   _filter:_ [`FilterRepresentationModel`](../../../lib/process-services/task-list/models/filter.model.ts)  - The new filter to add
-    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`FilterRepresentationModel`](../../../lib/process-services/task-list/models/filter.model.ts)`>` - Details of task filter just added
+    -   _filter:_ [`FilterRepresentationModel`](../../../lib/process-services/src/lib/task-list/models/filter.model.ts)  - The new filter to add
+    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`FilterRepresentationModel`](../../../lib/process-services/src/lib/task-list/models/filter.model.ts)`>` - Details of task filter just added
 -   **callApiTaskFilters**(appId?: `number`): [`Promise`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Using_promises)`<any>`<br/>
     Calls `getUserTaskFilters` from the Alfresco JS API.
     -   _appId:_ `number`  - (Optional) ID of the target app
     -   **Returns** [`Promise`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Using_promises)`<any>` - List of task filters
--   **createDefaultFilters**(appId: `number`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`FilterRepresentationModel`](../../../lib/process-services/task-list/models/filter.model.ts)`[]>`<br/>
+-   **createDefaultFilters**(appId: `number`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`FilterRepresentationModel`](../../../lib/process-services/src/lib/task-list/models/filter.model.ts)`[]>`<br/>
     Creates and returns the default filters for a process app.
     -   _appId:_ `number`  - ID of the target app
-    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`FilterRepresentationModel`](../../../lib/process-services/task-list/models/filter.model.ts)`[]>` - Array of default filters just created
--   **getCompletedTasksFilterInstance**(appId: `number`): [`FilterRepresentationModel`](../../../lib/process-services/task-list/models/filter.model.ts)<br/>
+    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`FilterRepresentationModel`](../../../lib/process-services/src/lib/task-list/models/filter.model.ts)`[]>` - Array of default filters just created
+-   **getCompletedTasksFilterInstance**(appId: `number`): [`FilterRepresentationModel`](../../../lib/process-services/src/lib/task-list/models/filter.model.ts)<br/>
     Creates and returns a filter for "Completed" task instances.
     -   _appId:_ `number`  - ID of the target app
-    -   **Returns** [`FilterRepresentationModel`](../../../lib/process-services/task-list/models/filter.model.ts) - The newly created filter
--   **getInvolvedTasksFilterInstance**(appId: `number`): [`FilterRepresentationModel`](../../../lib/process-services/task-list/models/filter.model.ts)<br/>
+    -   **Returns** [`FilterRepresentationModel`](../../../lib/process-services/src/lib/task-list/models/filter.model.ts) - The newly created filter
+-   **getInvolvedTasksFilterInstance**(appId: `number`): [`FilterRepresentationModel`](../../../lib/process-services/src/lib/task-list/models/filter.model.ts)<br/>
     Creates and returns a filter for "Involved" task instances.
     -   _appId:_ `number`  - ID of the target app
-    -   **Returns** [`FilterRepresentationModel`](../../../lib/process-services/task-list/models/filter.model.ts) - The newly created filter
--   **getMyTasksFilterInstance**(appId: `number`): [`FilterRepresentationModel`](../../../lib/process-services/task-list/models/filter.model.ts)<br/>
+    -   **Returns** [`FilterRepresentationModel`](../../../lib/process-services/src/lib/task-list/models/filter.model.ts) - The newly created filter
+-   **getMyTasksFilterInstance**(appId: `number`): [`FilterRepresentationModel`](../../../lib/process-services/src/lib/task-list/models/filter.model.ts)<br/>
     Creates and returns a filter for "My Tasks" task instances.
     -   _appId:_ `number`  - ID of the target app
-    -   **Returns** [`FilterRepresentationModel`](../../../lib/process-services/task-list/models/filter.model.ts) - The newly created filter
--   **getQueuedTasksFilterInstance**(appId: `number`): [`FilterRepresentationModel`](../../../lib/process-services/task-list/models/filter.model.ts)<br/>
+    -   **Returns** [`FilterRepresentationModel`](../../../lib/process-services/src/lib/task-list/models/filter.model.ts) - The newly created filter
+-   **getQueuedTasksFilterInstance**(appId: `number`): [`FilterRepresentationModel`](../../../lib/process-services/src/lib/task-list/models/filter.model.ts)<br/>
     Creates and returns a filter for "Queued Tasks" task instances.
     -   _appId:_ `number`  - ID of the target app
-    -   **Returns** [`FilterRepresentationModel`](../../../lib/process-services/task-list/models/filter.model.ts) - The newly created filter
--   **getTaskFilterById**(filterId: `number`, appId?: `number`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`FilterRepresentationModel`](../../../lib/process-services/task-list/models/filter.model.ts)`>`<br/>
+    -   **Returns** [`FilterRepresentationModel`](../../../lib/process-services/src/lib/task-list/models/filter.model.ts) - The newly created filter
+-   **getTaskFilterById**(filterId: `number`, appId?: `number`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`FilterRepresentationModel`](../../../lib/process-services/src/lib/task-list/models/filter.model.ts)`>`<br/>
     Gets a task filter by ID.
     -   _filterId:_ `number`  - ID of the filter
     -   _appId:_ `number`  - (Optional) ID of the app for the filter
-    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`FilterRepresentationModel`](../../../lib/process-services/task-list/models/filter.model.ts)`>` - Details of task filter
--   **getTaskFilterByName**(taskName: `string`, appId?: `number`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`FilterRepresentationModel`](../../../lib/process-services/task-list/models/filter.model.ts)`>`<br/>
+    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`FilterRepresentationModel`](../../../lib/process-services/src/lib/task-list/models/filter.model.ts)`>` - Details of task filter
+-   **getTaskFilterByName**(taskName: `string`, appId?: `number`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`FilterRepresentationModel`](../../../lib/process-services/src/lib/task-list/models/filter.model.ts)`>`<br/>
     Gets a task filter by name.
     -   _taskName:_ `string`  - Name of the filter
     -   _appId:_ `number`  - (Optional) ID of the app for the filter
-    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`FilterRepresentationModel`](../../../lib/process-services/task-list/models/filter.model.ts)`>` - Details of task filter
--   **getTaskListFilters**(appId?: `number`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`FilterRepresentationModel`](../../../lib/process-services/task-list/models/filter.model.ts)`[]>`<br/>
+    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`FilterRepresentationModel`](../../../lib/process-services/src/lib/task-list/models/filter.model.ts)`>` - Details of task filter
+-   **getTaskListFilters**(appId?: `number`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`FilterRepresentationModel`](../../../lib/process-services/src/lib/task-list/models/filter.model.ts)`[]>`<br/>
     Gets all task filters for a process app.
     -   _appId:_ `number`  - (Optional) Optional ID for a specific app
-    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`FilterRepresentationModel`](../../../lib/process-services/task-list/models/filter.model.ts)`[]>` - Array of task filter details
+    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`FilterRepresentationModel`](../../../lib/process-services/src/lib/task-list/models/filter.model.ts)`[]>` - Array of task filter details
 
 ## Details
 
-The methods of this service generally return an instance of [`FilterRepresentationModel`](../../../lib/process-services/task-list/models/filter.model.ts) or
+The methods of this service generally return an instance of [`FilterRepresentationModel`](../../../lib/process-services/src/lib/task-list/models/filter.model.ts) or
 an array of instances. For example, you could use `getTaskListFilters` as follows:
 
 ```ts
@@ -70,7 +70,7 @@ this.taskFilterService.getTaskListFilters(processAppId).subscribe( (filters: Fil
 });
 ```
 
-The response is an array of [`FilterRepresentationModel`](../../../lib/process-services/task-list/models/filter.model.ts) objects:
+The response is an array of [`FilterRepresentationModel`](../../../lib/process-services/src/lib/task-list/models/filter.model.ts) objects:
 
     filters:  
         0: {id: 10, appId: 2, name: "Involved Tasks", recent: true, icon: "glyphicon-align-left", …}
diff --git a/docs/process-services/services/tasklist.service.md b/docs/process-services/services/tasklist.service.md
index fe3b84a713..2069c091ff 100644
--- a/docs/process-services/services/tasklist.service.md
+++ b/docs/process-services/services/tasklist.service.md
@@ -5,7 +5,7 @@ Status: Active
 Last reviewed: 2018-11-14
 ---
 
-# [Tasklist Service](../../../lib/process-services/task-list/services/tasklist.service.ts "Defined in tasklist.service.ts")
+# [Tasklist Service](../../../lib/process-services/src/lib/task-list/services/tasklist.service.ts "Defined in tasklist.service.ts")
 
 Manages Task Instances.
 
@@ -13,45 +13,45 @@ Manages Task Instances.
 
 ### Methods
 
--   **addTask**(task: [`TaskDetailsModel`](../../../lib/process-services/task-list/models/task-details.model.ts)): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskDetailsModel`](../../../lib/process-services/task-list/models/task-details.model.ts)`>`<br/>
+-   **addTask**(task: [`TaskDetailsModel`](../../../lib/process-services/src/lib/task-list/models/task-details.model.ts)): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskDetailsModel`](../../../lib/process-services/src/lib/task-list/models/task-details.model.ts)`>`<br/>
     Adds a subtask (ie, a checklist task) to a parent task.
-    -   _task:_ [`TaskDetailsModel`](../../../lib/process-services/task-list/models/task-details.model.ts)  - The task to add
-    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskDetailsModel`](../../../lib/process-services/task-list/models/task-details.model.ts)`>` - The subtask that was added
--   **assignTask**(taskId: `string`, requestNode: `any`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskDetailsModel`](../../../lib/process-services/task-list/models/task-details.model.ts)`>`<br/>
+    -   _task:_ [`TaskDetailsModel`](../../../lib/process-services/src/lib/task-list/models/task-details.model.ts)  - The task to add
+    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskDetailsModel`](../../../lib/process-services/src/lib/task-list/models/task-details.model.ts)`>` - The subtask that was added
+-   **assignTask**(taskId: `string`, requestNode: `any`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskDetailsModel`](../../../lib/process-services/src/lib/task-list/models/task-details.model.ts)`>`<br/>
     Assigns a task to a user or group.
     -   _taskId:_ `string`  - The task to assign
     -   _requestNode:_ `any`  - User or group to assign the task to
-    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskDetailsModel`](../../../lib/process-services/task-list/models/task-details.model.ts)`>` - Details of the assigned task
--   **assignTaskByUserId**(taskId: `string`, userId: `string`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskDetailsModel`](../../../lib/process-services/task-list/models/task-details.model.ts)`>`<br/>
+    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskDetailsModel`](../../../lib/process-services/src/lib/task-list/models/task-details.model.ts)`>` - Details of the assigned task
+-   **assignTaskByUserId**(taskId: `string`, userId: `string`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskDetailsModel`](../../../lib/process-services/src/lib/task-list/models/task-details.model.ts)`>`<br/>
     Assigns a task to a user.
     -   _taskId:_ `string`  - ID of the task to assign
     -   _userId:_ `string`  - ID of the user to assign the task to
-    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskDetailsModel`](../../../lib/process-services/task-list/models/task-details.model.ts)`>` - Details of the assigned task
+    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskDetailsModel`](../../../lib/process-services/src/lib/task-list/models/task-details.model.ts)`>` - Details of the assigned task
 -   **attachFormToATask**(taskId: `string`, formId: `number`): [`Observable`](http://reactivex.io/documentation/observable.html)`<any>`<br/>
     Attaches a form to a task.
     -   _taskId:_ `string`  - ID of the target task
     -   _formId:_ `number`  - ID of the form to add
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<any>` - Null response notifying when the operation is complete
--   **claimTask**(taskId: `string`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskDetailsModel`](../../../lib/process-services/task-list/models/task-details.model.ts)`>`<br/>
+-   **claimTask**(taskId: `string`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskDetailsModel`](../../../lib/process-services/src/lib/task-list/models/task-details.model.ts)`>`<br/>
     Claims a task for the current user.
     -   _taskId:_ `string`  - ID of the task to claim
-    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskDetailsModel`](../../../lib/process-services/task-list/models/task-details.model.ts)`>` - Details of the claimed task
+    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskDetailsModel`](../../../lib/process-services/src/lib/task-list/models/task-details.model.ts)`>` - Details of the claimed task
 -   **completeTask**(taskId: `string`): [`Observable`](http://reactivex.io/documentation/observable.html)`<any>`<br/>
     Gives completed status to a task.
     -   _taskId:_ `string`  - ID of the target task
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<any>` - Null response notifying when the operation is complete
--   **createNewTask**(task: [`TaskDetailsModel`](../../../lib/process-services/task-list/models/task-details.model.ts)): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskDetailsModel`](../../../lib/process-services/task-list/models/task-details.model.ts)`>`<br/>
+-   **createNewTask**(task: [`TaskDetailsModel`](../../../lib/process-services/src/lib/task-list/models/task-details.model.ts)): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskDetailsModel`](../../../lib/process-services/src/lib/task-list/models/task-details.model.ts)`>`<br/>
     Creates a new standalone task.
-    -   _task:_ [`TaskDetailsModel`](../../../lib/process-services/task-list/models/task-details.model.ts)  - Details of the new task
-    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskDetailsModel`](../../../lib/process-services/task-list/models/task-details.model.ts)`>` - Details of the newly created task
--   **deleteForm**(taskId: `string`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskDetailsModel`](../../../lib/process-services/task-list/models/task-details.model.ts)`>`<br/>
+    -   _task:_ [`TaskDetailsModel`](../../../lib/process-services/src/lib/task-list/models/task-details.model.ts)  - Details of the new task
+    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskDetailsModel`](../../../lib/process-services/src/lib/task-list/models/task-details.model.ts)`>` - Details of the newly created task
+-   **deleteForm**(taskId: `string`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskDetailsModel`](../../../lib/process-services/src/lib/task-list/models/task-details.model.ts)`>`<br/>
     Deletes a form from a task.
     -   _taskId:_ `string`  - Task id related to form
-    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskDetailsModel`](../../../lib/process-services/task-list/models/task-details.model.ts)`>` - Null response notifying when the operation is complete
--   **deleteTask**(taskId: `string`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskDetailsModel`](../../../lib/process-services/task-list/models/task-details.model.ts)`>`<br/>
+    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskDetailsModel`](../../../lib/process-services/src/lib/task-list/models/task-details.model.ts)`>` - Null response notifying when the operation is complete
+-   **deleteTask**(taskId: `string`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskDetailsModel`](../../../lib/process-services/src/lib/task-list/models/task-details.model.ts)`>`<br/>
     Deletes a subtask (ie, a checklist task) from a parent task.
     -   _taskId:_ `string`  - The task to delete
-    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskDetailsModel`](../../../lib/process-services/task-list/models/task-details.model.ts)`>` - Null response notifying when the operation is complete
+    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskDetailsModel`](../../../lib/process-services/src/lib/task-list/models/task-details.model.ts)`>` - Null response notifying when the operation is complete
 -   **fetchTaskAuditJsonById**(taskId: `string`): [`Observable`](http://reactivex.io/documentation/observable.html)`<any>`<br/>
     Fetch the Task Audit information in JSON format
     -   _taskId:_ `string`  - ID of the target task
@@ -60,64 +60,64 @@ Manages Task Instances.
     Fetches the Task Audit information in PDF format.
     -   _taskId:_ `string`  - ID of the target task
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`Blob`](https://developer.mozilla.org/en-US/docs/Web/API/Blob)`>` - Binary PDF data
--   **findAllTaskByState**(requestNode: [`TaskQueryRequestRepresentationModel`](../../../lib/process-services/task-list/models/filter.model.ts), state?: `string`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskListModel`](../../../lib/process-services/task-list/models/task-list.model.ts)`>`<br/>
+-   **findAllTaskByState**(requestNode: [`TaskQueryRequestRepresentationModel`](../../../lib/process-services/src/lib/task-list/models/filter.model.ts), state?: `string`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskListModel`](../../../lib/process-services/src/lib/task-list/models/task-list.model.ts)`>`<br/>
     Gets all tasks matching a query and state value.
-    -   _requestNode:_ [`TaskQueryRequestRepresentationModel`](../../../lib/process-services/task-list/models/filter.model.ts)  - Query to search for tasks.
+    -   _requestNode:_ [`TaskQueryRequestRepresentationModel`](../../../lib/process-services/src/lib/ask-list/models/filter.model.ts)  - Query to search for tasks.
     -   _state:_ `string`  - (Optional) Task state. Can be "open" or "completed".
-    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskListModel`](../../../lib/process-services/task-list/models/task-list.model.ts)`>` - List of tasks
--   **findAllTasksWithoutState**(requestNode: [`TaskQueryRequestRepresentationModel`](../../../lib/process-services/task-list/models/filter.model.ts)): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskListModel`](../../../lib/process-services/task-list/models/task-list.model.ts)`>`<br/>
+    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskListModel`](../../../lib/process-services/src/lib/task-list/models/task-list.model.ts)`>` - List of tasks
+-   **findAllTasksWithoutState**(requestNode: [`TaskQueryRequestRepresentationModel`](../../../lib/process-services/src/lib/task-list/models/filter.model.ts)): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskListModel`](../../../lib/process-services/src/lib/task-list/models/task-list.model.ts)`>`<br/>
     Gets all tasks matching the supplied query but ignoring the task state.
-    -   _requestNode:_ [`TaskQueryRequestRepresentationModel`](../../../lib/process-services/task-list/models/filter.model.ts)  - Query to search for tasks
-    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskListModel`](../../../lib/process-services/task-list/models/task-list.model.ts)`>` - List of tasks
--   **findTasksByState**(requestNode: [`TaskQueryRequestRepresentationModel`](../../../lib/process-services/task-list/models/filter.model.ts), state?: `string`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskListModel`](../../../lib/process-services/task-list/models/task-list.model.ts)`>`<br/>
+    -   _requestNode:_ [`TaskQueryRequestRepresentationModel`](../../../lib/process-services/src/lib/task-list/models/filter.model.ts)  - Query to search for tasks
+    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskListModel`](../../../lib/process-services/src/lib/task-list/models/task-list.model.ts)`>` - List of tasks
+-   **findTasksByState**(requestNode: [`TaskQueryRequestRepresentationModel`](../../../lib/process-services/src/lib/task-list/models/filter.model.ts), state?: `string`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskListModel`](../../../lib/process-services/src/lib/task-list/models/task-list.model.ts)`>`<br/>
     Gets tasks matching a query and state value.
-    -   _requestNode:_ [`TaskQueryRequestRepresentationModel`](../../../lib/process-services/task-list/models/filter.model.ts)  - Query to search for tasks
+    -   _requestNode:_ [`TaskQueryRequestRepresentationModel`](../../../lib/process-services/src/lib/task-list/models/filter.model.ts)  - Query to search for tasks
     -   _state:_ `string`  - (Optional) Task state. Can be "open" or "completed".
-    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskListModel`](../../../lib/process-services/task-list/models/task-list.model.ts)`>` - List of tasks
--   **getFilterForTaskById**(taskId: `string`, filterList: [`FilterRepresentationModel`](../../../lib/process-services/task-list/models/filter.model.ts)`[]`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`FilterRepresentationModel`](../../../lib/process-services/task-list/models/filter.model.ts)`>`<br/>
+    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskListModel`](../../../lib/process-services/src/lib/task-list/models/task-list.model.ts)`>` - List of tasks
+-   **getFilterForTaskById**(taskId: `string`, filterList: [`FilterRepresentationModel`](../../../lib/process-services/src/lib/task-list/models/filter.model.ts)`[]`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`FilterRepresentationModel`](../../../lib/process-services/src/lib/task-list/models/filter.model.ts)`>`<br/>
     Gets all the filters in the list that belong to a task.
     -   _taskId:_ `string`  - ID of the target task
-    -   _filterList:_ [`FilterRepresentationModel`](../../../lib/process-services/task-list/models/filter.model.ts)`[]`  - List of filters to search through
-    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`FilterRepresentationModel`](../../../lib/process-services/task-list/models/filter.model.ts)`>` - Filters belonging to the task
--   **getFormList**(): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`Form`](../../../lib/process-services/task-list/models/form.model.ts)`[]>`<br/>
+    -   _filterList:_ [`FilterRepresentationModel`](../../../lib/process-services/src/lib/task-list/models/filter.model.ts)`[]`  - List of filters to search through
+    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`FilterRepresentationModel`](../../../lib/process-services/src/lib/task-list/models/filter.model.ts)`>` - Filters belonging to the task
+-   **getFormList**(): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`Form`](../../../lib/process-services/src/lib/task-list/models/form.model.ts)`[]>`<br/>
     Gets all available reusable forms.
-    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`Form`](../../../lib/process-services/task-list/models/form.model.ts)`[]>` - Array of form details
--   **getTaskChecklist**(id: `string`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskDetailsModel`](../../../lib/process-services/task-list/models/task-details.model.ts)`[]>`<br/>
+    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`Form`](../../../lib/process-services/src/lib/task-list/models/form.model.ts)`[]>` - Array of form details
+-   **getTaskChecklist**(id: `string`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskDetailsModel`](../../../lib/process-services/src/lib/task-list/models/task-details.model.ts)`[]>`<br/>
     Gets the checklist for a task.
     -   _id:_ `string`  - ID of the target task
-    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskDetailsModel`](../../../lib/process-services/task-list/models/task-details.model.ts)`[]>` - Array of checklist task details
--   **getTaskDetails**(taskId: `string`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskDetailsModel`](../../../lib/process-services/task-list/models/task-details.model.ts)`>`<br/>
+    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskDetailsModel`](../../../lib/process-services/src/lib/task-list/models/task-details.model.ts)`[]>` - Array of checklist task details
+-   **getTaskDetails**(taskId: `string`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskDetailsModel`](../../../lib/process-services/src/lib/task-list/models/task-details.model.ts)`>`<br/>
     Gets details for a task.
     -   _taskId:_ `string`  - ID of the target task.
-    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskDetailsModel`](../../../lib/process-services/task-list/models/task-details.model.ts)`>` - Task details
--   **getTasks**(requestNode: [`TaskQueryRequestRepresentationModel`](../../../lib/process-services/task-list/models/filter.model.ts)): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskListModel`](../../../lib/process-services/task-list/models/task-list.model.ts)`>`<br/>
+    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskDetailsModel`](../../../lib/process-services/src/lib/task-list/models/task-details.model.ts)`>` - Task details
+-   **getTasks**(requestNode: [`TaskQueryRequestRepresentationModel`](../../../lib/process-services/src/lib/task-list/models/filter.model.ts)): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskListModel`](../../../lib/process-services/src/lib/task-list/models/task-list.model.ts)`>`<br/>
     Gets all the tasks matching the supplied query.
-    -   _requestNode:_ [`TaskQueryRequestRepresentationModel`](../../../lib/process-services/task-list/models/filter.model.ts)  - Query to search for tasks
-    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskListModel`](../../../lib/process-services/task-list/models/task-list.model.ts)`>` - List of tasks
--   **getTotalTasks**(requestNode: [`TaskQueryRequestRepresentationModel`](../../../lib/process-services/task-list/models/filter.model.ts)): [`Observable`](http://reactivex.io/documentation/observable.html)`<any>`<br/>
+    -   _requestNode:_ [`TaskQueryRequestRepresentationModel`](../../../lib/process-services/src/lib/task-list/models/filter.model.ts)  - Query to search for tasks
+    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskListModel`](../../../lib/process-services/src/lib/task-list/models/task-list.model.ts)`>` - List of tasks
+-   **getTotalTasks**(requestNode: [`TaskQueryRequestRepresentationModel`](../../../lib/process-services/src/lib/task-list/models/filter.model.ts)): [`Observable`](http://reactivex.io/documentation/observable.html)`<any>`<br/>
     Gets the total number of the tasks found by a query.
-    -   _requestNode:_ [`TaskQueryRequestRepresentationModel`](../../../lib/process-services/task-list/models/filter.model.ts)  - Query to search for tasks
+    -   _requestNode:_ [`TaskQueryRequestRepresentationModel`](../../../lib/process-services/src/lib/task-list/models/filter.model.ts)  - Query to search for tasks
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<any>` - Number of tasks
--   **isTaskRelatedToFilter**(taskId: `string`, filterModel: [`FilterRepresentationModel`](../../../lib/process-services/task-list/models/filter.model.ts)): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`FilterRepresentationModel`](../../../lib/process-services/task-list/models/filter.model.ts)`>`<br/>
+-   **isTaskRelatedToFilter**(taskId: `string`, filterModel: [`FilterRepresentationModel`](../../../lib/process-services/src/lib/task-list/models/filter.model.ts)): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`FilterRepresentationModel`](../../../lib/process-services/src/lib/task-list/models/filter.model.ts)`>`<br/>
     Checks if a taskId is filtered with the given filter.
     -   _taskId:_ `string`  - ID of the target task
-    -   _filterModel:_ [`FilterRepresentationModel`](../../../lib/process-services/task-list/models/filter.model.ts)  - The filter you want to check
+    -   _filterModel:_ [`FilterRepresentationModel`](../../../lib/process-services/src/lib/task-list/models/filter.model.ts)  - The filter you want to check
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`FilterRepresentationModel`](../../../lib/process-services/task-list/models/filter.model.ts)`>` - The filter if it is related or null otherwise
--   **unclaimTask**(taskId: `string`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskDetailsModel`](../../../lib/process-services/task-list/models/task-details.model.ts)`>`<br/>
+-   **unclaimTask**(taskId: `string`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskDetailsModel`](../../../lib/process-services/src/lib/task-list/models/task-details.model.ts)`>`<br/>
     Un-claims a task for the current user.
     -   _taskId:_ `string`  - ID of the task to unclaim
-    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskDetailsModel`](../../../lib/process-services/task-list/models/task-details.model.ts)`>` - Null response notifying when the operation is complete
--   **updateTask**(taskId: `any`, updated: `any`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskDetailsModel`](../../../lib/process-services/task-list/models/task-details.model.ts)`>`<br/>
+    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskDetailsModel`](../../../lib/process-services/src/lib/task-list/models/task-details.model.ts)`>` - Null response notifying when the operation is complete
+-   **updateTask**(taskId: `any`, updated: `any`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskDetailsModel`](../../../lib/process-services/src/lib/task-list/models/task-details.model.ts)`>`<br/>
     Updates the details (name, description, due date) for a task.
     -   _taskId:_ `any`  - ID of the task to update
     -   _updated:_ `any`  - Data to update the task (as a [`TaskUpdateRepresentation`](https://github.com/Alfresco/alfresco-js-api/blob/development/src/api/activiti-rest-api/docs/TaskUpdateRepresentation.md) instance).
-    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskDetailsModel`](../../../lib/process-services/task-list/models/task-details.model.ts)`>` - Updated task details
+    -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`TaskDetailsModel`](../../../lib/process-services/src/lib/task-list/models/task-details.model.ts)`>` - Updated task details
 
 ## Details
 
 ### Task details
 
-Several of the methods return one or more [`TaskDetailsModel`](../../../lib/process-services/task-list/models/task-details.model.ts) instances corresponding
+Several of the methods return one or more [`TaskDetailsModel`](../../../lib/process-services/src/lib/task-list/models/task-details.model.ts) instances corresponding
 to tasks or subtasks matched by a query of some kind. For example, `getTaskDetails`
 could be used as shown below:
 
@@ -130,7 +130,7 @@ this.tasklistService.getTaskDetails(taskInstanceId).subscribe( (taskInstance: Ta
 });
 ```
 
-The resulting [`TaskDetailsModel`](../../../lib/process-services/task-list/models/task-details.model.ts) object contains information like the following:
+The resulting [`TaskDetailsModel`](../../../lib/process-services/src/lib/task-list/models/task-details.model.ts) object contains information like the following:
 
         adhocTaskCanBeReassigned: false
         assignee: UserProcessModel {pictureId: null, id: 1, email: "admin@app.activiti.com", firstName: null, lastName: "Administrator"}
@@ -166,7 +166,7 @@ The resulting [`TaskDetailsModel`](../../../lib/process-services/task-list/model
 
 ### Queries
 
-Some of the methods run a search query contained in a [`TaskQueryRequestRepresentationModel`](../../../lib/process-services/task-list/models/filter.model.ts) and
+Some of the methods run a search query contained in a [`TaskQueryRequestRepresentationModel`](../../../lib/process-services/src/lib/task-list/models/filter.model.ts) and
 return the matched tasks. Below is an example of how you might run a query using `getTasks`:
 
 ```ts
@@ -205,8 +205,8 @@ The `assignment` property filters tasks based on how they are assigned (or not a
 Use `assignee` if you are interested in tasks that are assigned to a user. If you want to see 
 pooled tasks (i.e. tasks that needs to be claimed by a user), then use `candidate`.
 
-A successful query returns a [`TaskListModel`](../../../lib/process-services/task-list/models/task-list.model.ts) with the `data` property set to an array of
-[`TaskDetailsModel`](../../../lib/process-services/task-list/models/task-details.model.ts):
+A successful query returns a [`TaskListModel`](../../../lib/process-services/src/lib/task-list/models/task-list.model.ts) with the `data` property set to an array of
+[`TaskDetailsModel`](../../../lib/process-services/src/lib/task-list/models/task-details.model.ts):
 
     data:
         0: {id: "75010", name: "Approve Invoice  - Invoice-10202.pdf", description: null, category: null, assignee: {…}, …}
diff --git a/lib/config/bundle-process-services-scss.js b/lib/config/bundle-process-services-scss.js
index ac086bfc71..871df9e9f0 100644
--- a/lib/config/bundle-process-services-scss.js
+++ b/lib/config/bundle-process-services-scss.js
@@ -1,6 +1,6 @@
 var Bundler = require('scss-bundle').Bundler;
 var writeFileSync = require('fs-extra').writeFileSync;
 
-new Bundler().Bundle('./lib/process-services/styles/_index.scss', '**/*.scss').then(result => {
+new Bundler().Bundle('./lib/process-services/src/lib/styles/_index.scss', '**/*.scss').then(result => {
     writeFileSync('./lib/dist/process-services/_theming.scss', result.bundledContent);
 });
diff --git a/lib/config/bundle-scss.js b/lib/config/bundle-scss.js
index d0277356de..3efd6a1c0d 100644
--- a/lib/config/bundle-scss.js
+++ b/lib/config/bundle-scss.js
@@ -10,7 +10,7 @@ var mkdirpSync = require('fs-extra').mkdirpSync;
     writeFileSync('./lib/dist/insights/_theming.scss', result.bundledContent);
 });
 
- new Bundler().Bundle('./lib/process-services/styles/_index.scss', '**/*.scss').then(result => {
+ new Bundler().Bundle('./lib/process-services/src/lib/styles/_index.scss', '**/*.scss').then(result => {
     writeFileSync('./lib/dist/process-services/_theming.scss', result.bundledContent);
 });
 
diff --git a/lib/core/styles/prebuilt/_all-theme.scss b/lib/core/styles/prebuilt/_all-theme.scss
index 01ae43e9ee..a115e45ca9 100644
--- a/lib/core/styles/prebuilt/_all-theme.scss
+++ b/lib/core/styles/prebuilt/_all-theme.scss
@@ -1,5 +1,5 @@
 @import '../../../content-services/styles/index';
-@import '../../../process-services/styles/index';
+@import '../../../process-services/src/lib/styles/index';
 @import '../../../process-services-cloud/src/lib/styles/index';
 @import '../../../core/styles/index';
 @import '../../../insights/styles/index';
diff --git a/lib/process-services-cloud/tsconfig.json b/lib/process-services-cloud/tsconfig.json
deleted file mode 100644
index d0c8ef6d58..0000000000
--- a/lib/process-services-cloud/tsconfig.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "compilerOptions": {
-    "target": "es5",
-    "module": "commonjs",
-    "moduleResolution": "node",
-    "sourceMap": true,
-    "emitDecoratorMetadata": true,
-    "experimentalDecorators": true,
-    "skipLibCheck": false,
-    "noLib": false,
-    "allowUnreachableCode": false,
-    "allowUnusedLabels": false,
-    "noImplicitAny": false,
-    "noImplicitReturns": false,
-    "noImplicitUseStrict": false,
-    "noFallthroughCasesInSwitch": true,
-    "noUnusedLocals": true,
-    "noUnusedParameters": true,
-    "removeComments": true,
-    "declaration": true,
-    "outDir": "../dist/process-services-cloud/",
-    "baseUrl" :  "./",
-    "paths": {
-      "@alfresco/adf-content-services": ["../content-services"],
-      "@alfresco/adf-insights": ["../analytics"],
-      "@alfresco/adf-core": ["../core"]
-    },
-    "lib": [
-      "es2016",
-      "dom"
-    ],
-    "suppressImplicitAnyIndexErrors": true
-  },
-  "exclude": [
-    "demo",
-    "node_modules",
-    "dist"
-  ],
-  "angularCompilerOptions": {
-    "strictMetadataEmit": false,
-    "skipTemplateCodegen": true
-  }
-}
diff --git a/lib/process-services/ng-package.json b/lib/process-services/ng-package.json
index 3adb1b4924..5cc35ad391 100644
--- a/lib/process-services/ng-package.json
+++ b/lib/process-services/ng-package.json
@@ -1,12 +1,9 @@
 {
-  "$schema": "./node_modules/ng-packagr/ng-package.schema.json",
-  "workingDirectory": "./ng_work",
-  "src": "../process-services/",
-  "dest": "../dist/process-services/",
+  "$schema": "../../node_modules/ng-packagr/ng-package.schema.json",
+  "dest": "../dist/process-services",
   "lib": {
-    "languageLevel": [ "dom", "es2016" ],
-    "comments" : "none",
-    "entryFile": "./public-api.ts",
+    "languageLevel": ["dom", "es2017"],
+    "entryFile": "src/public-api.ts",
     "flatModuleFile": "adf-process-services",
     "umdModuleIds": {
       "@alfresco/js-api": "@alfresco/js-api",
@@ -24,7 +21,8 @@
       "moment": "moment",
       "moment-es6": "moment-es6",
       "moment/src/moment": "moment/src/moment",
-      "@ngx-translate/core": "@ngx-translate/core"
+      "@ngx-translate/core": "@ngx-translate/core",
+      "rxjs": "rxjs"
     }
   }
 }
diff --git a/lib/process-services/app-list/apps-list.component.html b/lib/process-services/src/lib/app-list/apps-list.component.html
similarity index 100%
rename from lib/process-services/app-list/apps-list.component.html
rename to lib/process-services/src/lib/app-list/apps-list.component.html
diff --git a/lib/process-services/app-list/apps-list.component.scss b/lib/process-services/src/lib/app-list/apps-list.component.scss
similarity index 100%
rename from lib/process-services/app-list/apps-list.component.scss
rename to lib/process-services/src/lib/app-list/apps-list.component.scss
diff --git a/lib/process-services/app-list/apps-list.component.spec.ts b/lib/process-services/src/lib/app-list/apps-list.component.spec.ts
similarity index 100%
rename from lib/process-services/app-list/apps-list.component.spec.ts
rename to lib/process-services/src/lib/app-list/apps-list.component.spec.ts
diff --git a/lib/process-services/app-list/apps-list.component.ts b/lib/process-services/src/lib/app-list/apps-list.component.ts
similarity index 100%
rename from lib/process-services/app-list/apps-list.component.ts
rename to lib/process-services/src/lib/app-list/apps-list.component.ts
diff --git a/lib/process-services/app-list/apps-list.module.ts b/lib/process-services/src/lib/app-list/apps-list.module.ts
similarity index 97%
rename from lib/process-services/app-list/apps-list.module.ts
rename to lib/process-services/src/lib/app-list/apps-list.module.ts
index ffb2a81864..e3532662c9 100644
--- a/lib/process-services/app-list/apps-list.module.ts
+++ b/lib/process-services/src/lib/app-list/apps-list.module.ts
@@ -29,7 +29,7 @@ import { SelectAppsDialogComponent } from './select-apps-dialog-component';
         CommonModule,
         MaterialModule,
         FlexLayoutModule,
-        CoreModule.forChild()
+        CoreModule
     ],
     declarations: [
         AppsListComponent,
diff --git a/lib/process-services/app-list/icon.model.ts b/lib/process-services/src/lib/app-list/icon.model.ts
similarity index 100%
rename from lib/process-services/app-list/icon.model.ts
rename to lib/process-services/src/lib/app-list/icon.model.ts
diff --git a/lib/process-services/app-list/index.ts b/lib/process-services/src/lib/app-list/index.ts
similarity index 100%
rename from lib/process-services/app-list/index.ts
rename to lib/process-services/src/lib/app-list/index.ts
diff --git a/lib/process-services/app-list/public-api.ts b/lib/process-services/src/lib/app-list/public-api.ts
similarity index 100%
rename from lib/process-services/app-list/public-api.ts
rename to lib/process-services/src/lib/app-list/public-api.ts
diff --git a/lib/process-services/app-list/select-apps-dialog-component.html b/lib/process-services/src/lib/app-list/select-apps-dialog-component.html
similarity index 100%
rename from lib/process-services/app-list/select-apps-dialog-component.html
rename to lib/process-services/src/lib/app-list/select-apps-dialog-component.html
diff --git a/lib/process-services/app-list/select-apps-dialog-component.spec.ts b/lib/process-services/src/lib/app-list/select-apps-dialog-component.spec.ts
similarity index 100%
rename from lib/process-services/app-list/select-apps-dialog-component.spec.ts
rename to lib/process-services/src/lib/app-list/select-apps-dialog-component.spec.ts
diff --git a/lib/process-services/app-list/select-apps-dialog-component.ts b/lib/process-services/src/lib/app-list/select-apps-dialog-component.ts
similarity index 100%
rename from lib/process-services/app-list/select-apps-dialog-component.ts
rename to lib/process-services/src/lib/app-list/select-apps-dialog-component.ts
diff --git a/lib/process-services/assets/images/alfresco-flower.svg b/lib/process-services/src/lib/assets/images/alfresco-flower.svg
similarity index 98%
rename from lib/process-services/assets/images/alfresco-flower.svg
rename to lib/process-services/src/lib/assets/images/alfresco-flower.svg
index 0b796b7d60..cd45375734 100644
--- a/lib/process-services/assets/images/alfresco-flower.svg
+++ b/lib/process-services/src/lib/assets/images/alfresco-flower.svg
@@ -1,51 +1,51 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 18.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Слой_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="17.2 134.6 562 573.1" enable-background="new 17.2 134.6 562 573.1" xml:space="preserve">
-<path fill="#FFFFFF" d="M298.2,421.3L219,340.4l-2.9-2.9c-45.4-46.5-119.5-46.5-164.7-0.2c-45.6,46.3-45.6,121.5,0,167.8
-	c45.2,46.4,119,46.4,164.4,0L298.2,421.3z"/>
-<path fill="#FFFFFF" d="M298.2,421.2v114.3l0.2,4.2c0,65.5-52.2,119-116.5,119c-64.3,0-116.5-53.1-116.5-118.6
-	c0-65.6,52.4-118.8,116.5-118.8H298.2z"/>
-<path fill="#FFFFFF" d="M298.2,421.2v114.3l0.2,4.2c0,65.5-52.2,119-116.5,119c-64.3,0-116.5-53.1-116.5-118.6
-	c0-65.6,52.4-118.8,116.5-118.8H298.2z"/>
-<path fill="#FFFFFF" d="M298.2,421.2v114.3l0.2,4.2c0,65.5-52.2,119-116.5,119c-64.3,0-116.5-53.1-116.5-118.6
-	c0-7.3,0.8-14.4,2-21.2c45.4,32.2,108.2,27.7,148.6-13.7l82.4-83.8V421.2z"/>
-<path fill="#8ABF42" d="M181.9,436.1c-56.1,0-101.6,46.5-101.6,103.8c0,57.1,45.6,103.5,101.6,103.5c56.2,0,101.7-46.4,101.7-103.5
-	v-4.5v-99.3H182.1H181.9z"/>
-<path fill="#FFFFFF" d="M298.2,421.2l79.2,80.8l3.3,2.9c45.2,46.4,45.5,121.8,0,168.1c-45.6,46.3-119.2,46.3-164.8,0
-	c-45.4-46.3-45.4-121.5,0-168L298.2,421.2z"/>
-<path fill="#8ABF42" d="M226.5,515.6c-39.8,40.5-39.8,106.2,0,146.6c39.6,40.5,104,40.5,143.8,0c39.6-40.4,39.6-106.1,0-146.6
-	l-3.3-3l-68.7-70.2l-71.7,73.1V515.6z"/>
-<path fill="#FFFFFF" d="M298.2,421.2h112.2l4.1-0.2c64.4,0,116.5,53.2,116.5,118.8c0,65.6-52,118.6-116.3,118.6
-	c-64.3,0-116.5-53.1-116.5-118.6V421.2z"/>
-<path fill="#8ABF42" d="M313.1,539.8c0,57.3,45.4,103.7,101.6,103.7c56,0,101.4-46.4,101.4-103.7c0-57.3-45.4-103.6-101.4-103.6
-	h-4.3h-97.4v103.3V539.8z"/>
-<path fill="#FFFFFF" d="M298.2,421.2l79.2-80.9l3.1-3.1c45.4-46.3,119.2-46.5,164.6-0.2c45.4,46.4,45.4,121.5,0,167.9
-	c-45.4,46.4-119.2,46.4-164.6,0L298.2,421.2z"/>
-<path fill="#8ABF42" d="M391.1,494.3c39.4,40.6,103.8,40.6,143.6,0c39.8-40.4,39.8-106,0-146.5c-39.8-40.5-104.1-40.5-143.6,0
-	l-3.3,3.2l-68.6,70.3l71.5,73L391.1,494.3z"/>
-<path fill="#FFFFFF" d="M298.2,421.2V306.8v-4.3c0-65.5,51.9-118.8,116.5-118.8c64.2,0,116.1,52.9,116.1,118.6
-	c0,65.6-52,118.8-116.1,118.8H298.2z"/>
-<path fill="#F89F31" d="M414.7,406.1c56,0,101.4-46.4,101.4-103.7c0-57.1-45.4-103.6-101.4-103.6c-56.3,0-101.8,46.5-101.8,103.6
-	l0.2,4.4v99.3h101.1H414.7z"/>
-<path fill="#FFFFFF" d="M298.2,421.2L219,340.3l-3.1-2.9c-45.4-46.5-45.4-121.8,0-168.1c45.2-46.4,119.1-46.4,164.6,0
-	c45.4,46.3,45.4,121.6,0,167.9L298.2,421.2z"/>
-<path fill="#0080C5" d="M370.1,327.6c39.6-40.5,39.6-106.2,0-146.6c-39.8-40.5-104-40.5-143.7,0c-39.8,40.4-39.8,106.1,0,146.6
-	l2.9,3.1l69,70.1l71.6-73L370.1,327.6z"/>
-<path fill="#FFFFFF" d="M298.2,422.1H186.1l-4.2,0.1c-64.1,0-116.5-53.2-116.5-118.8c0-65.5,52.2-118.7,116.3-118.7
-	c64.3,0,116.6,53.2,116.6,118.8V422.1z"/>
-<path fill="#0080C5" d="M283.5,303.5c0-57.3-45.4-103.6-101.8-103.6c-56,0-101.6,46.3-101.6,103.5c0,57.2,45.6,103.7,101.6,103.7
-	l4.4-0.1h97.4V303.8V303.5z"/>
-<path fill="#FFFFFF" d="M298.2,422.1l-281,0.1c0-30.4,11.2-60.8,34.2-84c45.2-46.3,119-46.3,164.4,0L298.2,422.1z"/>
-<path fill="#0080C5" d="M205.4,348.9l71.9,73.3h-95.5c-51.6,0-95.5,34.3-110.7,81.9c-3.1-2.7-6.4-5.5-9.3-8.7
-	c-39.8-40.5-39.8-106,0-146.5C101.3,308.4,165.8,308.4,205.4,348.9"/>
-<path fill="#005DA9" d="M205.6,349l56.9,58l-80.9,0.2c-46.6,0-85.8-31.9-97.8-75.5c38.6-22.1,89.2-16.8,121.6,17.1L205.6,349z"/>
-<path fill="#005DA9" d="M283.5,303.7l-0.1,82.1l-57.1-58.2c-32.9-33.6-38.7-84.4-17-123.8c42.7,12.2,74.2,52.2,74.2,99.8V303.7z"/>
-<path fill="#005DA9" d="M312.6,386v-82.4c0-47.5,31.5-87.5,74.2-99.8c21.6,39.5,17.6,89-16.4,123.3L312.6,386z"/>
-<path fill="#FFDE4F" d="M333.9,406.1l57.1-58.3c32.9-33.6,82.8-39.3,121.4-17.2c-12.2,43.5-49.4,74.8-95.3,75.6L333.9,406.1z"/>
-<path fill="#48A64A" d="M333.8,436.1h80.8c46.6,0,85.8,31.7,97.8,75.4c-38.9,22.2-88.7,16.3-121.8-17.2L333.8,436.1z"/>
-<path fill="#48A64A" d="M313.1,539.2v-82l57.2,58.2c32.9,33.7,38.5,84.7,16.8,124.1c-42.7-12.2-74-52.4-74-99.9V539.2z"/>
-<path fill="#48A64A" d="M226.6,515.4l56.9-58l0.1,82.4c0,47.5-31.3,87.4-74,99.7c-21.6-39.5-15.8-90.4,17-123.9V515.4z"/>
-<path fill="#48A64A" d="M182.4,436.1h80.4l-57,58.2c-32.8,33.5-83.1,39.3-121.7,17.3c12.1-43.7,51.4-75.5,98-75.5H182.4z"/>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 18.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Слой_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="17.2 134.6 562 573.1" enable-background="new 17.2 134.6 562 573.1" xml:space="preserve">
+<path fill="#FFFFFF" d="M298.2,421.3L219,340.4l-2.9-2.9c-45.4-46.5-119.5-46.5-164.7-0.2c-45.6,46.3-45.6,121.5,0,167.8
+	c45.2,46.4,119,46.4,164.4,0L298.2,421.3z"/>
+<path fill="#FFFFFF" d="M298.2,421.2v114.3l0.2,4.2c0,65.5-52.2,119-116.5,119c-64.3,0-116.5-53.1-116.5-118.6
+	c0-65.6,52.4-118.8,116.5-118.8H298.2z"/>
+<path fill="#FFFFFF" d="M298.2,421.2v114.3l0.2,4.2c0,65.5-52.2,119-116.5,119c-64.3,0-116.5-53.1-116.5-118.6
+	c0-65.6,52.4-118.8,116.5-118.8H298.2z"/>
+<path fill="#FFFFFF" d="M298.2,421.2v114.3l0.2,4.2c0,65.5-52.2,119-116.5,119c-64.3,0-116.5-53.1-116.5-118.6
+	c0-7.3,0.8-14.4,2-21.2c45.4,32.2,108.2,27.7,148.6-13.7l82.4-83.8V421.2z"/>
+<path fill="#8ABF42" d="M181.9,436.1c-56.1,0-101.6,46.5-101.6,103.8c0,57.1,45.6,103.5,101.6,103.5c56.2,0,101.7-46.4,101.7-103.5
+	v-4.5v-99.3H182.1H181.9z"/>
+<path fill="#FFFFFF" d="M298.2,421.2l79.2,80.8l3.3,2.9c45.2,46.4,45.5,121.8,0,168.1c-45.6,46.3-119.2,46.3-164.8,0
+	c-45.4-46.3-45.4-121.5,0-168L298.2,421.2z"/>
+<path fill="#8ABF42" d="M226.5,515.6c-39.8,40.5-39.8,106.2,0,146.6c39.6,40.5,104,40.5,143.8,0c39.6-40.4,39.6-106.1,0-146.6
+	l-3.3-3l-68.7-70.2l-71.7,73.1V515.6z"/>
+<path fill="#FFFFFF" d="M298.2,421.2h112.2l4.1-0.2c64.4,0,116.5,53.2,116.5,118.8c0,65.6-52,118.6-116.3,118.6
+	c-64.3,0-116.5-53.1-116.5-118.6V421.2z"/>
+<path fill="#8ABF42" d="M313.1,539.8c0,57.3,45.4,103.7,101.6,103.7c56,0,101.4-46.4,101.4-103.7c0-57.3-45.4-103.6-101.4-103.6
+	h-4.3h-97.4v103.3V539.8z"/>
+<path fill="#FFFFFF" d="M298.2,421.2l79.2-80.9l3.1-3.1c45.4-46.3,119.2-46.5,164.6-0.2c45.4,46.4,45.4,121.5,0,167.9
+	c-45.4,46.4-119.2,46.4-164.6,0L298.2,421.2z"/>
+<path fill="#8ABF42" d="M391.1,494.3c39.4,40.6,103.8,40.6,143.6,0c39.8-40.4,39.8-106,0-146.5c-39.8-40.5-104.1-40.5-143.6,0
+	l-3.3,3.2l-68.6,70.3l71.5,73L391.1,494.3z"/>
+<path fill="#FFFFFF" d="M298.2,421.2V306.8v-4.3c0-65.5,51.9-118.8,116.5-118.8c64.2,0,116.1,52.9,116.1,118.6
+	c0,65.6-52,118.8-116.1,118.8H298.2z"/>
+<path fill="#F89F31" d="M414.7,406.1c56,0,101.4-46.4,101.4-103.7c0-57.1-45.4-103.6-101.4-103.6c-56.3,0-101.8,46.5-101.8,103.6
+	l0.2,4.4v99.3h101.1H414.7z"/>
+<path fill="#FFFFFF" d="M298.2,421.2L219,340.3l-3.1-2.9c-45.4-46.5-45.4-121.8,0-168.1c45.2-46.4,119.1-46.4,164.6,0
+	c45.4,46.3,45.4,121.6,0,167.9L298.2,421.2z"/>
+<path fill="#0080C5" d="M370.1,327.6c39.6-40.5,39.6-106.2,0-146.6c-39.8-40.5-104-40.5-143.7,0c-39.8,40.4-39.8,106.1,0,146.6
+	l2.9,3.1l69,70.1l71.6-73L370.1,327.6z"/>
+<path fill="#FFFFFF" d="M298.2,422.1H186.1l-4.2,0.1c-64.1,0-116.5-53.2-116.5-118.8c0-65.5,52.2-118.7,116.3-118.7
+	c64.3,0,116.6,53.2,116.6,118.8V422.1z"/>
+<path fill="#0080C5" d="M283.5,303.5c0-57.3-45.4-103.6-101.8-103.6c-56,0-101.6,46.3-101.6,103.5c0,57.2,45.6,103.7,101.6,103.7
+	l4.4-0.1h97.4V303.8V303.5z"/>
+<path fill="#FFFFFF" d="M298.2,422.1l-281,0.1c0-30.4,11.2-60.8,34.2-84c45.2-46.3,119-46.3,164.4,0L298.2,422.1z"/>
+<path fill="#0080C5" d="M205.4,348.9l71.9,73.3h-95.5c-51.6,0-95.5,34.3-110.7,81.9c-3.1-2.7-6.4-5.5-9.3-8.7
+	c-39.8-40.5-39.8-106,0-146.5C101.3,308.4,165.8,308.4,205.4,348.9"/>
+<path fill="#005DA9" d="M205.6,349l56.9,58l-80.9,0.2c-46.6,0-85.8-31.9-97.8-75.5c38.6-22.1,89.2-16.8,121.6,17.1L205.6,349z"/>
+<path fill="#005DA9" d="M283.5,303.7l-0.1,82.1l-57.1-58.2c-32.9-33.6-38.7-84.4-17-123.8c42.7,12.2,74.2,52.2,74.2,99.8V303.7z"/>
+<path fill="#005DA9" d="M312.6,386v-82.4c0-47.5,31.5-87.5,74.2-99.8c21.6,39.5,17.6,89-16.4,123.3L312.6,386z"/>
+<path fill="#FFDE4F" d="M333.9,406.1l57.1-58.3c32.9-33.6,82.8-39.3,121.4-17.2c-12.2,43.5-49.4,74.8-95.3,75.6L333.9,406.1z"/>
+<path fill="#48A64A" d="M333.8,436.1h80.8c46.6,0,85.8,31.7,97.8,75.4c-38.9,22.2-88.7,16.3-121.8-17.2L333.8,436.1z"/>
+<path fill="#48A64A" d="M313.1,539.2v-82l57.2,58.2c32.9,33.7,38.5,84.7,16.8,124.1c-42.7-12.2-74-52.4-74-99.9V539.2z"/>
+<path fill="#48A64A" d="M226.6,515.4l56.9-58l0.1,82.4c0,47.5-31.3,87.4-74,99.7c-21.6-39.5-15.8-90.4,17-123.9V515.4z"/>
+<path fill="#48A64A" d="M182.4,436.1h80.4l-57,58.2c-32.8,33.5-83.1,39.3-121.7,17.3c12.1-43.7,51.4-75.5,98-75.5H182.4z"/>
+</svg>
diff --git a/lib/process-services/assets/images/empty_doc_lib.svg b/lib/process-services/src/lib/assets/images/empty_doc_lib.svg
similarity index 100%
rename from lib/process-services/assets/images/empty_doc_lib.svg
rename to lib/process-services/src/lib/assets/images/empty_doc_lib.svg
diff --git a/lib/process-services/attachment/attachment.module.ts b/lib/process-services/src/lib/attachment/attachment.module.ts
similarity index 98%
rename from lib/process-services/attachment/attachment.module.ts
rename to lib/process-services/src/lib/attachment/attachment.module.ts
index a9b1701616..938debac08 100644
--- a/lib/process-services/attachment/attachment.module.ts
+++ b/lib/process-services/src/lib/attachment/attachment.module.ts
@@ -26,7 +26,7 @@ import { CoreModule } from '@alfresco/adf-core';
 
 @NgModule({
     imports: [
-        CoreModule.forChild(),
+        CoreModule,
         MaterialModule
     ],
     declarations: [
diff --git a/lib/process-services/attachment/create-process-attachment.component.css b/lib/process-services/src/lib/attachment/create-process-attachment.component.css
similarity index 100%
rename from lib/process-services/attachment/create-process-attachment.component.css
rename to lib/process-services/src/lib/attachment/create-process-attachment.component.css
diff --git a/lib/process-services/attachment/create-process-attachment.component.html b/lib/process-services/src/lib/attachment/create-process-attachment.component.html
similarity index 100%
rename from lib/process-services/attachment/create-process-attachment.component.html
rename to lib/process-services/src/lib/attachment/create-process-attachment.component.html
diff --git a/lib/process-services/attachment/create-process-attachment.component.spec.ts b/lib/process-services/src/lib/attachment/create-process-attachment.component.spec.ts
similarity index 100%
rename from lib/process-services/attachment/create-process-attachment.component.spec.ts
rename to lib/process-services/src/lib/attachment/create-process-attachment.component.spec.ts
diff --git a/lib/process-services/attachment/create-process-attachment.component.ts b/lib/process-services/src/lib/attachment/create-process-attachment.component.ts
similarity index 100%
rename from lib/process-services/attachment/create-process-attachment.component.ts
rename to lib/process-services/src/lib/attachment/create-process-attachment.component.ts
diff --git a/lib/process-services/attachment/create-task-attachment.component.html b/lib/process-services/src/lib/attachment/create-task-attachment.component.html
similarity index 100%
rename from lib/process-services/attachment/create-task-attachment.component.html
rename to lib/process-services/src/lib/attachment/create-task-attachment.component.html
diff --git a/lib/process-services/attachment/create-task-attachment.component.scss b/lib/process-services/src/lib/attachment/create-task-attachment.component.scss
similarity index 100%
rename from lib/process-services/attachment/create-task-attachment.component.scss
rename to lib/process-services/src/lib/attachment/create-task-attachment.component.scss
diff --git a/lib/process-services/attachment/create-task-attachment.component.spec.ts b/lib/process-services/src/lib/attachment/create-task-attachment.component.spec.ts
similarity index 100%
rename from lib/process-services/attachment/create-task-attachment.component.spec.ts
rename to lib/process-services/src/lib/attachment/create-task-attachment.component.spec.ts
diff --git a/lib/process-services/attachment/create-task-attachment.component.ts b/lib/process-services/src/lib/attachment/create-task-attachment.component.ts
similarity index 100%
rename from lib/process-services/attachment/create-task-attachment.component.ts
rename to lib/process-services/src/lib/attachment/create-task-attachment.component.ts
diff --git a/lib/process-services/attachment/index.ts b/lib/process-services/src/lib/attachment/index.ts
similarity index 100%
rename from lib/process-services/attachment/index.ts
rename to lib/process-services/src/lib/attachment/index.ts
diff --git a/lib/process-services/attachment/process-attachment-list.component.html b/lib/process-services/src/lib/attachment/process-attachment-list.component.html
similarity index 91%
rename from lib/process-services/attachment/process-attachment-list.component.html
rename to lib/process-services/src/lib/attachment/process-attachment-list.component.html
index 95200f8f65..20423b8bc7 100644
--- a/lib/process-services/attachment/process-attachment-list.component.html
+++ b/lib/process-services/src/lib/attachment/process-attachment-list.component.html
@@ -1,7 +1,7 @@
-<adf-datatable  [rows]="attachments" 
-                [actions]="true" 
-                [loading]="isLoading" 
-                (rowDblClick)="openContent($event)" 
+<adf-datatable  [rows]="attachments"
+                [actions]="true"
+                [loading]="isLoading"
+                (rowDblClick)="openContent($event)"
                 (showRowActionsMenu)="onShowRowActionsMenu($event)"
                 (executeRowAction)="onExecuteRowAction($event)">
 
diff --git a/lib/process-services/attachment/process-attachment-list.component.scss b/lib/process-services/src/lib/attachment/process-attachment-list.component.scss
similarity index 100%
rename from lib/process-services/attachment/process-attachment-list.component.scss
rename to lib/process-services/src/lib/attachment/process-attachment-list.component.scss
diff --git a/lib/process-services/attachment/process-attachment-list.component.spec.ts b/lib/process-services/src/lib/attachment/process-attachment-list.component.spec.ts
similarity index 100%
rename from lib/process-services/attachment/process-attachment-list.component.spec.ts
rename to lib/process-services/src/lib/attachment/process-attachment-list.component.spec.ts
diff --git a/lib/process-services/attachment/process-attachment-list.component.ts b/lib/process-services/src/lib/attachment/process-attachment-list.component.ts
similarity index 100%
rename from lib/process-services/attachment/process-attachment-list.component.ts
rename to lib/process-services/src/lib/attachment/process-attachment-list.component.ts
diff --git a/lib/process-services/attachment/public-api.ts b/lib/process-services/src/lib/attachment/public-api.ts
similarity index 100%
rename from lib/process-services/attachment/public-api.ts
rename to lib/process-services/src/lib/attachment/public-api.ts
diff --git a/lib/process-services/attachment/task-attachment-list.component.html b/lib/process-services/src/lib/attachment/task-attachment-list.component.html
similarity index 100%
rename from lib/process-services/attachment/task-attachment-list.component.html
rename to lib/process-services/src/lib/attachment/task-attachment-list.component.html
diff --git a/lib/process-services/attachment/task-attachment-list.component.scss b/lib/process-services/src/lib/attachment/task-attachment-list.component.scss
similarity index 100%
rename from lib/process-services/attachment/task-attachment-list.component.scss
rename to lib/process-services/src/lib/attachment/task-attachment-list.component.scss
diff --git a/lib/process-services/attachment/task-attachment-list.component.spec.ts b/lib/process-services/src/lib/attachment/task-attachment-list.component.spec.ts
similarity index 100%
rename from lib/process-services/attachment/task-attachment-list.component.spec.ts
rename to lib/process-services/src/lib/attachment/task-attachment-list.component.spec.ts
diff --git a/lib/process-services/attachment/task-attachment-list.component.ts b/lib/process-services/src/lib/attachment/task-attachment-list.component.ts
similarity index 100%
rename from lib/process-services/attachment/task-attachment-list.component.ts
rename to lib/process-services/src/lib/attachment/task-attachment-list.component.ts
diff --git a/lib/process-services/content-widget/attach-file-widget-dialog-component.interface.ts b/lib/process-services/src/lib/content-widget/attach-file-widget-dialog-component.interface.ts
similarity index 100%
rename from lib/process-services/content-widget/attach-file-widget-dialog-component.interface.ts
rename to lib/process-services/src/lib/content-widget/attach-file-widget-dialog-component.interface.ts
diff --git a/lib/process-services/content-widget/attach-file-widget-dialog.component.html b/lib/process-services/src/lib/content-widget/attach-file-widget-dialog.component.html
similarity index 100%
rename from lib/process-services/content-widget/attach-file-widget-dialog.component.html
rename to lib/process-services/src/lib/content-widget/attach-file-widget-dialog.component.html
diff --git a/lib/process-services/content-widget/attach-file-widget-dialog.component.scss b/lib/process-services/src/lib/content-widget/attach-file-widget-dialog.component.scss
similarity index 100%
rename from lib/process-services/content-widget/attach-file-widget-dialog.component.scss
rename to lib/process-services/src/lib/content-widget/attach-file-widget-dialog.component.scss
diff --git a/lib/process-services/content-widget/attach-file-widget-dialog.component.spec.ts b/lib/process-services/src/lib/content-widget/attach-file-widget-dialog.component.spec.ts
similarity index 100%
rename from lib/process-services/content-widget/attach-file-widget-dialog.component.spec.ts
rename to lib/process-services/src/lib/content-widget/attach-file-widget-dialog.component.spec.ts
diff --git a/lib/process-services/content-widget/attach-file-widget-dialog.component.ts b/lib/process-services/src/lib/content-widget/attach-file-widget-dialog.component.ts
similarity index 100%
rename from lib/process-services/content-widget/attach-file-widget-dialog.component.ts
rename to lib/process-services/src/lib/content-widget/attach-file-widget-dialog.component.ts
diff --git a/lib/process-services/content-widget/attach-file-widget-dialog.service.spec.ts b/lib/process-services/src/lib/content-widget/attach-file-widget-dialog.service.spec.ts
similarity index 100%
rename from lib/process-services/content-widget/attach-file-widget-dialog.service.spec.ts
rename to lib/process-services/src/lib/content-widget/attach-file-widget-dialog.service.spec.ts
diff --git a/lib/process-services/content-widget/attach-file-widget-dialog.service.ts b/lib/process-services/src/lib/content-widget/attach-file-widget-dialog.service.ts
similarity index 100%
rename from lib/process-services/content-widget/attach-file-widget-dialog.service.ts
rename to lib/process-services/src/lib/content-widget/attach-file-widget-dialog.service.ts
diff --git a/lib/process-services/content-widget/attach-file-widget.component.html b/lib/process-services/src/lib/content-widget/attach-file-widget.component.html
similarity index 100%
rename from lib/process-services/content-widget/attach-file-widget.component.html
rename to lib/process-services/src/lib/content-widget/attach-file-widget.component.html
diff --git a/lib/process-services/content-widget/attach-file-widget.component.scss b/lib/process-services/src/lib/content-widget/attach-file-widget.component.scss
similarity index 100%
rename from lib/process-services/content-widget/attach-file-widget.component.scss
rename to lib/process-services/src/lib/content-widget/attach-file-widget.component.scss
diff --git a/lib/process-services/content-widget/attach-file-widget.component.ts b/lib/process-services/src/lib/content-widget/attach-file-widget.component.ts
similarity index 100%
rename from lib/process-services/content-widget/attach-file-widget.component.ts
rename to lib/process-services/src/lib/content-widget/attach-file-widget.component.ts
diff --git a/lib/process-services/content-widget/attach-file-widget.components.spec.ts b/lib/process-services/src/lib/content-widget/attach-file-widget.components.spec.ts
similarity index 100%
rename from lib/process-services/content-widget/attach-file-widget.components.spec.ts
rename to lib/process-services/src/lib/content-widget/attach-file-widget.components.spec.ts
diff --git a/lib/process-services/content-widget/attach-folder-widget.component.html b/lib/process-services/src/lib/content-widget/attach-folder-widget.component.html
similarity index 100%
rename from lib/process-services/content-widget/attach-folder-widget.component.html
rename to lib/process-services/src/lib/content-widget/attach-folder-widget.component.html
diff --git a/lib/process-services/content-widget/attach-folder-widget.component.scss b/lib/process-services/src/lib/content-widget/attach-folder-widget.component.scss
similarity index 100%
rename from lib/process-services/content-widget/attach-folder-widget.component.scss
rename to lib/process-services/src/lib/content-widget/attach-folder-widget.component.scss
diff --git a/lib/process-services/content-widget/attach-folder-widget.component.spec.ts b/lib/process-services/src/lib/content-widget/attach-folder-widget.component.spec.ts
similarity index 100%
rename from lib/process-services/content-widget/attach-folder-widget.component.spec.ts
rename to lib/process-services/src/lib/content-widget/attach-folder-widget.component.spec.ts
diff --git a/lib/process-services/content-widget/attach-folder-widget.component.ts b/lib/process-services/src/lib/content-widget/attach-folder-widget.component.ts
similarity index 100%
rename from lib/process-services/content-widget/attach-folder-widget.component.ts
rename to lib/process-services/src/lib/content-widget/attach-folder-widget.component.ts
diff --git a/lib/process-services/content-widget/content-widget.module.ts b/lib/process-services/src/lib/content-widget/content-widget.module.ts
similarity index 98%
rename from lib/process-services/content-widget/content-widget.module.ts
rename to lib/process-services/src/lib/content-widget/content-widget.module.ts
index 68ee6213e8..d3fe77794a 100644
--- a/lib/process-services/content-widget/content-widget.module.ts
+++ b/lib/process-services/src/lib/content-widget/content-widget.module.ts
@@ -26,7 +26,7 @@ import { AttachFileWidgetDialogComponent } from './attach-file-widget-dialog.com
 
 @NgModule({
     imports: [
-        CoreModule.forChild(),
+        CoreModule,
         ContentNodeSelectorModule,
         MaterialModule
     ],
diff --git a/lib/process-services/content-widget/index.ts b/lib/process-services/src/lib/content-widget/index.ts
similarity index 100%
rename from lib/process-services/content-widget/index.ts
rename to lib/process-services/src/lib/content-widget/index.ts
diff --git a/lib/process-services/content-widget/public-api.ts b/lib/process-services/src/lib/content-widget/public-api.ts
similarity index 100%
rename from lib/process-services/content-widget/public-api.ts
rename to lib/process-services/src/lib/content-widget/public-api.ts
diff --git a/lib/process-services/form/form.component.html b/lib/process-services/src/lib/form/form.component.html
similarity index 100%
rename from lib/process-services/form/form.component.html
rename to lib/process-services/src/lib/form/form.component.html
diff --git a/lib/process-services/form/form.component.spec.ts b/lib/process-services/src/lib/form/form.component.spec.ts
similarity index 100%
rename from lib/process-services/form/form.component.spec.ts
rename to lib/process-services/src/lib/form/form.component.spec.ts
diff --git a/lib/process-services/form/form.component.ts b/lib/process-services/src/lib/form/form.component.ts
similarity index 100%
rename from lib/process-services/form/form.component.ts
rename to lib/process-services/src/lib/form/form.component.ts
diff --git a/lib/process-services/form/form.component.visibility.spec.ts b/lib/process-services/src/lib/form/form.component.visibility.spec.ts
similarity index 100%
rename from lib/process-services/form/form.component.visibility.spec.ts
rename to lib/process-services/src/lib/form/form.component.visibility.spec.ts
diff --git a/lib/process-services/form/form.module.ts b/lib/process-services/src/lib/form/form.module.ts
similarity index 97%
rename from lib/process-services/form/form.module.ts
rename to lib/process-services/src/lib/form/form.module.ts
index 62c1b8e7d8..ac1d490143 100644
--- a/lib/process-services/form/form.module.ts
+++ b/lib/process-services/src/lib/form/form.module.ts
@@ -23,7 +23,7 @@ import { StartFormComponent } from './start-form.component';
 
 @NgModule({
     imports: [
-        CoreModule.forChild(),
+        CoreModule,
         MaterialModule
     ],
     declarations: [
diff --git a/lib/process-services/form/index.ts b/lib/process-services/src/lib/form/index.ts
similarity index 100%
rename from lib/process-services/form/index.ts
rename to lib/process-services/src/lib/form/index.ts
diff --git a/lib/process-services/form/public-api.ts b/lib/process-services/src/lib/form/public-api.ts
similarity index 100%
rename from lib/process-services/form/public-api.ts
rename to lib/process-services/src/lib/form/public-api.ts
diff --git a/lib/process-services/form/start-form.component.html b/lib/process-services/src/lib/form/start-form.component.html
similarity index 100%
rename from lib/process-services/form/start-form.component.html
rename to lib/process-services/src/lib/form/start-form.component.html
diff --git a/lib/process-services/src/lib/form/start-form.component.mock.ts b/lib/process-services/src/lib/form/start-form.component.mock.ts
new file mode 100644
index 0000000000..d8ae040059
--- /dev/null
+++ b/lib/process-services/src/lib/form/start-form.component.mock.ts
@@ -0,0 +1,1013 @@
+/*!
+ * @license
+ * Copyright 2019 Alfresco Software, Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export let startFormDateWidgetMock = {
+    id: 4,
+    name: 'Claim Review Process',
+    processDefinitionId: 'ClaimReviewProcess:2: 93',
+    fields: [
+        {
+            fieldType: 'ContainerRepresentation',
+            id: 1497953253784,
+            name: 'Label',
+            type: 'container',
+            value: null,
+            readOnly: false,
+            fields: {
+                1: [{
+                        fieldType: 'FormFieldRepresentation',
+                        id: 'date',
+                        name: 'date',
+                        type: 'date',
+                        value: null
+                    }]}
+        }]
+};
+
+export let startFormNumberWidgetMock = {
+    id: 4,
+    name: 'Claim Review Process',
+    processDefinitionId: 'ClaimReviewProcess:2: 93',
+    fields: [
+        {
+            fieldType: 'ContainerRepresentation',
+            id: 1497953253784,
+            name: 'Label',
+            type: 'container',
+            value: null,
+            readOnly: false,
+            fields: {
+                1: [{
+                        fieldType: 'FormFieldRepresentation',
+                        id: 'number',
+                        name: 'number widget',
+                        type: 'integer',
+                        value: null
+                    }]}
+        }]
+};
+
+export let startFormAmountWidgetMock = {
+    id: 4,
+    name: 'Claim Review Process',
+    processDefinitionId: 'ClaimReviewProcess:2: 93',
+    fields: [
+        {
+            fieldType: 'ContainerRepresentation',
+            id: 1497953253784,
+            name: 'Label',
+            type: 'container',
+            value: null,
+            readOnly: false,
+            fields: {
+                1: [{
+                        fieldType: 'FormFieldRepresentation',
+                        id: 'amount',
+                        name: 'amount widget',
+                        type: 'amount',
+                        value: null
+                    }]}
+        }]
+};
+
+export let startFormRadioButtonWidgetMock = {
+    id: 4,
+    name: 'Claim Review Process',
+    processDefinitionId: 'ClaimReviewProcess:2: 93',
+    fields: [
+        {
+            fieldType: 'ContainerRepresentation',
+            id: 1497953253784,
+            name: 'Label',
+            type: 'container',
+            value: null,
+            readOnly: false,
+            fields: {
+                1: [{
+                        fieldType: 'RestFieldRepresentation',
+                        id: 'radio-but',
+                        name: 'radio-buttons',
+                        type: 'radio-buttons',
+                        value: null
+                    }]}
+        }]
+};
+
+export let startFormTextDefinitionMock = {
+    id: 4,
+    name: 'Claim Review Process',
+    processDefinitionId: 'ClaimReviewProcess:2: 93',
+    fields: [
+        {
+            fieldType: 'ContainerRepresentation',
+            id: 1497953253784,
+            name: 'Label',
+            type: 'container',
+            value: null,
+            readOnly: false,
+            fields: {
+                1: [{
+                        fieldType: 'FormFieldRepresentation',
+                        id: 'mocktext',
+                        name: 'mockText',
+                        type: 'text',
+                        value: null
+                    }]}
+        }]
+};
+
+export let startFormDropdownDefinitionMock = {
+    id: 4,
+    name: 'Claim Review Process',
+    processDefinitionId: 'ClaimReviewProcess:2: 93',
+    fields: [
+        {
+            fieldType: 'ContainerRepresentation',
+            id: 1497953253784,
+            name: 'Label',
+            type: 'container',
+            value: null,
+            readOnly: false,
+            fields: {
+                1: [{
+
+                        fieldType: 'RestFieldRepresentation',
+                        id: 'mockTypeDropDown',
+                        name: 'mock DropDown',
+                        type: 'dropdown',
+                        value: 'Chooseone...',
+                        required: false,
+                        readOnly: false,
+                        overrideId: false,
+                        options: [
+                            {
+                                id: 'empty',
+                                name: 'Chooseone...'
+                            },
+                            {
+                                id: 'opt1',
+                                name: 'Option-1'
+                            },
+                            {
+                                id: 'opt2',
+                                name: 'Option-2'
+                            },
+                            {
+                                id: 'opt3',
+                                name: 'Option-3'
+                            },
+                            {
+                                id: 'opt2',
+                                name: 'Option-3'
+                            }
+                        ]
+                    }]}
+        }]
+};
+
+export let startMockForm = {
+    id: 4,
+    name: 'Claim Review Process',
+    processDefinitionId: 'ClaimReviewProcess:2: 93',
+    processDefinitionName: 'ClaimReviewProcess',
+    processDefinitionKey: 'ClaimReviewProcess',
+    tabs: [],
+    fields: [
+        {
+            fieldType: 'ContainerRepresentation',
+            id: 1497953253784,
+            name: 'Label',
+            type: 'container',
+            value: null,
+            required: false,
+            readOnly: false,
+            overrideId: false,
+            colspan: 1,
+            placeholder: null,
+            minLength: 0,
+            maxLength: 0,
+            minValue: null,
+            maxValue: null,
+            regexPattern: null,
+            optionType: null,
+            hasEmptyValue: null,
+            options: null,
+            restUrl: null,
+            restResponsePath: null,
+            restIdProperty: null,
+            restLabelProperty: null,
+            tab: null,
+            className: null,
+            dateDisplayFormat: null,
+            layout: null,
+            sizeX: 2,
+            sizeY: 1,
+            row: -1,
+            col: -1,
+            visibilityCondition: null,
+            numberOfColumns: 2,
+            fields: {
+                1: [
+                    {
+                        fieldType: 'FormFieldRepresentation',
+                        id: 'clientname',
+                        name: 'ClientName',
+                        type: 'text',
+                        value: null,
+                        required: true,
+                        readOnly: false,
+                        overrideId: false,
+                        colspan: 1,
+                        placeholder: null,
+                        minLength: 0,
+                        maxLength: 0,
+                        minValue: null,
+                        maxValue: null,
+                        regexPattern: null,
+                        optionType: null,
+                        hasEmptyValue: null,
+                        options: null,
+                        restUrl: null,
+                        restResponsePath: null,
+                        restIdProperty: null,
+                        restLabelProperty: null,
+                        tab: null,
+                        className: null,
+                        params: {
+                            existingColspan: 1,
+                            maxColspan: 2
+                        },
+                        dateDisplayFormat: null,
+                        layout: {
+                            row: -1,
+                            column: -1,
+                            colspan: 1
+                        },
+                        sizeX: 1,
+                        sizeY: 1,
+                        row: -1,
+                        col: -1,
+                        visibilityCondition: null
+                    }
+                ],
+                2: [
+                    {
+                        fieldType: 'FormFieldRepresentation',
+                        id: 'policyno',
+                        name: 'PolicyNo',
+                        type: 'integer',
+                        value: null,
+                        required: true,
+                        readOnly: false,
+                        overrideId: false,
+                        colspan: 1,
+                        placeholder: 'EnterPolicyName',
+                        minLength: 0,
+                        maxLength: 0,
+                        minValue: null,
+                        maxValue: null,
+                        regexPattern: null,
+                        optionType: null,
+                        hasEmptyValue: null,
+                        options: null,
+                        restUrl: null,
+                        restResponsePath: null,
+                        restIdProperty: null,
+                        restLabelProperty: null,
+                        tab: null,
+                        className: null,
+                        params: {
+                            existingColspan: 1,
+                            maxColspan: 1
+                        },
+                        dateDisplayFormat: null,
+                        layout: {
+                            row: -1,
+                            column: -1,
+                            colspan: 1
+                        },
+                        sizeX: 1,
+                        sizeY: 1,
+                        row: -1,
+                        col: -1,
+                        visibilityCondition: null
+                    }
+                ]
+            }
+        },
+        {
+            fieldType: 'ContainerRepresentation',
+            id: 1497953270269,
+            name: 'Label',
+            type: 'container',
+            value: null,
+            required: false,
+            readOnly: false,
+            overrideId: false,
+            colspan: 1,
+            placeholder: null,
+            minLength: 0,
+            maxLength: 0,
+            minValue: null,
+            maxValue: null,
+            regexPattern: null,
+            optionType: null,
+            hasEmptyValue: null,
+            options: null,
+            restUrl: null,
+            restResponsePath: null,
+            restIdProperty: null,
+            restLabelProperty: null,
+            tab: null,
+            className: null,
+            dateDisplayFormat: null,
+            layout: null,
+            sizeX: 2,
+            sizeY: 1,
+            row: -1,
+            col: -1,
+            visibilityCondition: null,
+            numberOfColumns: 2,
+            fields: {
+                1: [
+                    {
+                        fieldType: 'FormFieldRepresentation',
+                        id: 'billAmount',
+                        name: 'BillAmount',
+                        type: 'integer',
+                        value: null,
+                        required: true,
+                        readOnly: false,
+                        overrideId: false,
+                        colspan: 1,
+                        placeholder: 'EnterBillAmount',
+                        minLength: 0,
+                        maxLength: 0,
+                        minValue: null,
+                        maxValue: null,
+                        regexPattern: null,
+                        optionType: null,
+                        hasEmptyValue: null,
+                        options: null,
+                        restUrl: null,
+                        restResponsePath: null,
+                        restIdProperty: null,
+                        restLabelProperty: null,
+                        tab: null,
+                        className: null,
+                        params: {
+                            existingColspan: 1,
+                            maxColspan: 2
+                        },
+                        dateDisplayFormat: null,
+                        layout: {
+                            row: -1,
+                            column: -1,
+                            colspan: 1
+                        },
+                        sizeX: 1,
+                        sizeY: 1,
+                        row: -1,
+                        col: -1,
+                        visibilityCondition: null
+                    }
+                ],
+                2: [
+                    {
+                        fieldType: 'FormFieldRepresentation',
+                        id: 'billdate',
+                        name: 'BillDate',
+                        type: 'date',
+                        value: null,
+                        required: false,
+                        readOnly: false,
+                        overrideId: false,
+                        colspan: 1,
+                        placeholder: null,
+                        minLength: 0,
+                        maxLength: 0,
+                        minValue: null,
+                        maxValue: null,
+                        regexPattern: null,
+                        optionType: null,
+                        hasEmptyValue: null,
+                        options: null,
+                        restUrl: null,
+                        restResponsePath: null,
+                        restIdProperty: null,
+                        restLabelProperty: null,
+                        tab: null,
+                        className: 'billdate',
+                        params: {
+                            existingColspan: 1,
+                            maxColspan: 1
+                        },
+                        dateDisplayFormat: null,
+                        layout: {
+                            row: -1,
+                            column: -1,
+                            colspan: 1
+                        },
+                        sizeX: 1,
+                        sizeY: 1,
+                        row: -1,
+                        col: -1,
+                        visibilityCondition: null
+                    }
+                ]
+            }
+        },
+        {
+            fieldType: 'ContainerRepresentation',
+            id: 1497953280930,
+            name: 'Label',
+            type: 'container',
+            value: null,
+            required: false,
+            readOnly: false,
+            overrideId: false,
+            colspan: 1,
+            placeholder: null,
+            minLength: 0,
+            maxLength: 0,
+            minValue: null,
+            maxValue: null,
+            regexPattern: null,
+            optionType: null,
+            hasEmptyValue: null,
+            options: null,
+            restUrl: null,
+            restResponsePath: null,
+            restIdProperty: null,
+            restLabelProperty: null,
+            tab: null,
+            className: null,
+            dateDisplayFormat: null,
+            layout: null,
+            sizeX: 2,
+            sizeY: 1,
+            row: -1,
+            col: -1,
+            visibilityCondition: null,
+            numberOfColumns: 2,
+            fields: {
+                1: [
+                    {
+                        fieldType: 'RestFieldRepresentation',
+                        id: 'claimtype',
+                        name: 'ClaimType',
+                        type: 'dropdown',
+                        value: 'Chooseone...',
+                        required: false,
+                        readOnly: false,
+                        overrideId: false,
+                        colspan: 1,
+                        placeholder: null,
+                        minLength: 0,
+                        maxLength: 0,
+                        minValue: null,
+                        maxValue: null,
+                        regexPattern: null,
+                        optionType: null,
+                        hasEmptyValue: true,
+                        options: [
+                            {
+                                id: 'empty',
+                                name: 'Chooseone...'
+                            },
+                            {
+                                id: 'cashless',
+                                name: 'Cashless'
+                            },
+                            {
+                                id: 'reimbursement',
+                                name: 'Reimbursement'
+                            }
+                        ],
+                        restUrl: null,
+                        restResponsePath: null,
+                        restIdProperty: null,
+                        restLabelProperty: null,
+                        tab: null,
+                        className: null,
+                        params: {
+                            existingColspan: 1,
+                            maxColspan: 2
+                        },
+                        dateDisplayFormat: null,
+                        layout: {
+                            row: -1,
+                            column: -1,
+                            colspan: 1
+                        },
+                        sizeX: 1,
+                        sizeY: 1,
+                        row: -1,
+                        col: -1,
+                        visibilityCondition: null,
+                        endpoint: null,
+                        requestHeaders: null
+                    }
+                ],
+                2: [
+                    {
+                        fieldType: 'FormFieldRepresentation',
+                        id: 'hospitalName',
+                        name: 'HospitalName',
+                        type: 'text',
+                        value: null,
+                        required: false,
+                        readOnly: false,
+                        overrideId: false,
+                        colspan: 1,
+                        placeholder: 'EnterHospitalName',
+                        minLength: 0,
+                        maxLength: 0,
+                        minValue: null,
+                        maxValue: null,
+                        regexPattern: null,
+                        optionType: null,
+                        hasEmptyValue: null,
+                        options: null,
+                        restUrl: null,
+                        restResponsePath: null,
+                        restIdProperty: null,
+                        restLabelProperty: null,
+                        tab: null,
+                        className: null,
+                        params: {
+                            existingColspan: 1,
+                            maxColspan: 1
+                        },
+                        dateDisplayFormat: null,
+                        layout: {
+                            row: -1,
+                            column: -1,
+                            colspan: 1
+                        },
+                        sizeX: 1,
+                        sizeY: 1,
+                        row: -1,
+                        col: -1,
+                        visibilityCondition: null
+                    }
+                ]
+            }
+        }
+    ],
+    outcomes: [
+        {
+            id: 'approve',
+            name: 'Approve'
+        },
+        {
+            id: 'complete',
+            name: 'Complete'
+        },
+        {
+            id: 'start_process',
+            name: 'Start Process'
+        }
+    ],
+    javascriptEvents: [],
+    className: '',
+    style: '',
+    metadata: {},
+    variables: [],
+    customFieldsValueInfo: {},
+    gridsterForm: false,
+    globalDateFormat: 'D - M - YYYY'
+};
+
+export let startMockFormWithTab = {
+    id: 4,
+    taskName: 'Mock Title',
+    processDefinitionId: 'ClaimReviewProcess:2: 93',
+    processDefinitionName: 'ClaimReviewProcess',
+    processDefinitionKey: 'ClaimReviewProcess',
+    tabs: [
+        {
+            id: 'form1',
+            name: 'Tab 1'
+        },
+        {
+            id: 'form2',
+            name: 'Tab 2'
+        }
+    ],
+    fields: [
+        {
+            fieldType: 'ContainerRepresentation',
+            id: 1497953253784,
+            name: 'Label',
+            type: 'container',
+            value: null,
+            required: false,
+            readOnly: false,
+            overrideId: false,
+            colspan: 1,
+            placeholder: null,
+            minLength: 0,
+            maxLength: 0,
+            minValue: null,
+            maxValue: null,
+            regexPattern: null,
+            optionType: null,
+            hasEmptyValue: null,
+            options: null,
+            restUrl: null,
+            restResponsePath: null,
+            restIdProperty: null,
+            restLabelProperty: null,
+            tab: null,
+            className: null,
+            dateDisplayFormat: null,
+            layout: null,
+            sizeX: 2,
+            sizeY: 1,
+            row: -1,
+            col: -1,
+            visibilityCondition: null,
+            numberOfColumns: 2,
+            fields: {
+                1: [
+                    {
+                        fieldType: 'FormFieldRepresentation',
+                        id: 'clientname',
+                        name: 'ClientName',
+                        type: 'text',
+                        value: null,
+                        required: true,
+                        readOnly: false,
+                        overrideId: false,
+                        colspan: 1,
+                        placeholder: null,
+                        minLength: 0,
+                        maxLength: 0,
+                        minValue: null,
+                        maxValue: null,
+                        regexPattern: null,
+                        optionType: null,
+                        hasEmptyValue: null,
+                        options: null,
+                        restUrl: null,
+                        restResponsePath: null,
+                        restIdProperty: null,
+                        restLabelProperty: null,
+                        tab: null,
+                        className: null,
+                        params: {
+                            existingColspan: 1,
+                            maxColspan: 2
+                        },
+                        dateDisplayFormat: null,
+                        layout: {
+                            row: -1,
+                            column: -1,
+                            colspan: 1
+                        },
+                        sizeX: 1,
+                        sizeY: 1,
+                        row: -1,
+                        col: -1,
+                        visibilityCondition: null
+                    }
+                ],
+                2: [
+                    {
+                        fieldType: 'FormFieldRepresentation',
+                        id: 'policyno',
+                        name: 'PolicyNo',
+                        type: 'integer',
+                        value: null,
+                        required: true,
+                        readOnly: false,
+                        overrideId: false,
+                        colspan: 1,
+                        placeholder: 'EnterPolicyName',
+                        minLength: 0,
+                        maxLength: 0,
+                        minValue: null,
+                        maxValue: null,
+                        regexPattern: null,
+                        optionType: null,
+                        hasEmptyValue: null,
+                        options: null,
+                        restUrl: null,
+                        restResponsePath: null,
+                        restIdProperty: null,
+                        restLabelProperty: null,
+                        tab: null,
+                        className: null,
+                        params: {
+                            existingColspan: 1,
+                            maxColspan: 1
+                        },
+                        dateDisplayFormat: null,
+                        layout: {
+                            row: -1,
+                            column: -1,
+                            colspan: 1
+                        },
+                        sizeX: 1,
+                        sizeY: 1,
+                        row: -1,
+                        col: -1,
+                        visibilityCondition: null
+                    }
+                ]
+            }
+        },
+        {
+            fieldType: 'ContainerRepresentation',
+            id: 1497953270269,
+            name: 'Label',
+            type: 'container',
+            value: null,
+            required: false,
+            readOnly: false,
+            overrideId: false,
+            colspan: 1,
+            placeholder: null,
+            minLength: 0,
+            maxLength: 0,
+            minValue: null,
+            maxValue: null,
+            regexPattern: null,
+            optionType: null,
+            hasEmptyValue: null,
+            options: null,
+            restUrl: null,
+            restResponsePath: null,
+            restIdProperty: null,
+            restLabelProperty: null,
+            tab: null,
+            className: null,
+            dateDisplayFormat: null,
+            layout: null,
+            sizeX: 2,
+            sizeY: 1,
+            row: -1,
+            col: -1,
+            visibilityCondition: null,
+            numberOfColumns: 2,
+            fields: {
+                1: [
+                    {
+                        fieldType: 'FormFieldRepresentation',
+                        id: 'billAmount',
+                        name: 'BillAmount',
+                        type: 'integer',
+                        value: null,
+                        required: true,
+                        readOnly: false,
+                        overrideId: false,
+                        colspan: 1,
+                        placeholder: 'EnterBillAmount',
+                        minLength: 0,
+                        maxLength: 0,
+                        minValue: null,
+                        maxValue: null,
+                        regexPattern: null,
+                        optionType: null,
+                        hasEmptyValue: null,
+                        options: null,
+                        restUrl: null,
+                        restResponsePath: null,
+                        restIdProperty: null,
+                        restLabelProperty: null,
+                        tab: null,
+                        className: null,
+                        params: {
+                            existingColspan: 1,
+                            maxColspan: 2
+                        },
+                        dateDisplayFormat: null,
+                        layout: {
+                            row: -1,
+                            column: -1,
+                            colspan: 1
+                        },
+                        sizeX: 1,
+                        sizeY: 1,
+                        row: -1,
+                        col: -1,
+                        visibilityCondition: null
+                    }
+                ],
+                2: [
+                    {
+                        fieldType: 'FormFieldRepresentation',
+                        id: 'billdate',
+                        name: 'BillDate',
+                        type: 'date',
+                        value: null,
+                        required: false,
+                        readOnly: false,
+                        overrideId: false,
+                        colspan: 1,
+                        placeholder: null,
+                        minLength: 0,
+                        maxLength: 0,
+                        minValue: null,
+                        maxValue: null,
+                        regexPattern: null,
+                        optionType: null,
+                        hasEmptyValue: null,
+                        options: null,
+                        restUrl: null,
+                        restResponsePath: null,
+                        restIdProperty: null,
+                        restLabelProperty: null,
+                        tab: null,
+                        className: 'billdate',
+                        params: {
+                            existingColspan: 1,
+                            maxColspan: 1
+                        },
+                        dateDisplayFormat: null,
+                        layout: {
+                            row: -1,
+                            column: -1,
+                            colspan: 1
+                        },
+                        sizeX: 1,
+                        sizeY: 1,
+                        row: -1,
+                        col: -1,
+                        visibilityCondition: null
+                    }
+                ]
+            }
+        },
+        {
+            fieldType: 'ContainerRepresentation',
+            id: 1497953280930,
+            name: 'Label',
+            type: 'container',
+            value: null,
+            required: false,
+            readOnly: false,
+            overrideId: false,
+            colspan: 1,
+            placeholder: null,
+            minLength: 0,
+            maxLength: 0,
+            minValue: null,
+            maxValue: null,
+            regexPattern: null,
+            optionType: null,
+            hasEmptyValue: null,
+            options: null,
+            restUrl: null,
+            restResponsePath: null,
+            restIdProperty: null,
+            restLabelProperty: null,
+            tab: null,
+            className: null,
+            dateDisplayFormat: null,
+            layout: null,
+            sizeX: 2,
+            sizeY: 1,
+            row: -1,
+            col: -1,
+            visibilityCondition: null,
+            numberOfColumns: 2,
+            fields: {
+                1: [
+                    {
+                        fieldType: 'RestFieldRepresentation',
+                        id: 'claimtype',
+                        name: 'ClaimType',
+                        type: 'dropdown',
+                        value: 'Chooseone...',
+                        required: false,
+                        readOnly: false,
+                        overrideId: false,
+                        colspan: 1,
+                        placeholder: null,
+                        minLength: 0,
+                        maxLength: 0,
+                        minValue: null,
+                        maxValue: null,
+                        regexPattern: null,
+                        optionType: null,
+                        hasEmptyValue: true,
+                        options: [
+                            {
+                                id: 'empty',
+                                name: 'Chooseone...'
+                            },
+                            {
+                                id: 'cashless',
+                                name: 'Cashless'
+                            },
+                            {
+                                id: 'reimbursement',
+                                name: 'Reimbursement'
+                            }
+                        ],
+                        restUrl: null,
+                        restResponsePath: null,
+                        restIdProperty: null,
+                        restLabelProperty: null,
+                        tab: null,
+                        className: null,
+                        params: {
+                            existingColspan: 1,
+                            maxColspan: 2
+                        },
+                        dateDisplayFormat: null,
+                        layout: {
+                            row: -1,
+                            column: -1,
+                            colspan: 1
+                        },
+                        sizeX: 1,
+                        sizeY: 1,
+                        row: -1,
+                        col: -1,
+                        visibilityCondition: null,
+                        endpoint: null,
+                        requestHeaders: null
+                    }
+                ],
+                2: [
+                    {
+                        fieldType: 'FormFieldRepresentation',
+                        id: 'hospitalName',
+                        name: 'HospitalName',
+                        type: 'text',
+                        value: null,
+                        required: false,
+                        readOnly: false,
+                        overrideId: false,
+                        colspan: 1,
+                        placeholder: 'EnterHospitalName',
+                        minLength: 0,
+                        maxLength: 0,
+                        minValue: null,
+                        maxValue: null,
+                        regexPattern: null,
+                        optionType: null,
+                        hasEmptyValue: null,
+                        options: null,
+                        restUrl: null,
+                        restResponsePath: null,
+                        restIdProperty: null,
+                        restLabelProperty: null,
+                        tab: null,
+                        className: null,
+                        params: {
+                            existingColspan: 1,
+                            maxColspan: 1
+                        },
+                        dateDisplayFormat: null,
+                        layout: {
+                            row: -1,
+                            column: -1,
+                            colspan: 1
+                        },
+                        sizeX: 1,
+                        sizeY: 1,
+                        row: -1,
+                        col: -1,
+                        visibilityCondition: null
+                    }
+                ]
+            }
+        }
+    ],
+    outcomes: [
+        {
+            id: 'approve',
+            name: 'Approve'
+        },
+        {
+            id: 'complete',
+            name: 'Complete'
+        }
+    ],
+    javascriptEvents: [],
+    className: '',
+    style: '',
+    metadata: {},
+    variables: [],
+    customFieldsValueInfo: {},
+    gridsterForm: false,
+    globalDateFormat: 'D - M - YYYY'
+};
diff --git a/lib/process-services/form/start-form.component.scss b/lib/process-services/src/lib/form/start-form.component.scss
similarity index 100%
rename from lib/process-services/form/start-form.component.scss
rename to lib/process-services/src/lib/form/start-form.component.scss
diff --git a/lib/process-services/form/start-form.component.spec.ts b/lib/process-services/src/lib/form/start-form.component.spec.ts
similarity index 99%
rename from lib/process-services/form/start-form.component.spec.ts
rename to lib/process-services/src/lib/form/start-form.component.spec.ts
index 2069bdd414..449fb0e657 100644
--- a/lib/process-services/form/start-form.component.spec.ts
+++ b/lib/process-services/src/lib/form/start-form.component.spec.ts
@@ -18,8 +18,8 @@
 import { CUSTOM_ELEMENTS_SCHEMA, SimpleChange } from '@angular/core';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { of, throwError } from 'rxjs';
-import { startFormDateWidgetMock, startFormDropdownDefinitionMock, startFormTextDefinitionMock, startMockForm, startMockFormWithTab } from '../../core/mock';
-import { startFormAmountWidgetMock, startFormNumberWidgetMock, startFormRadioButtonWidgetMock } from '../../core/mock';
+import { startFormDateWidgetMock, startFormDropdownDefinitionMock, startFormTextDefinitionMock, startMockForm, startMockFormWithTab } from './start-form.component.mock';
+import { startFormAmountWidgetMock, startFormNumberWidgetMock, startFormRadioButtonWidgetMock } from './start-form.component.mock';
 import { StartFormComponent } from './start-form.component';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { FormService, WidgetVisibilityService, setupTestBed, CoreModule, FormModel, FormOutcomeModel } from '@alfresco/adf-core';
diff --git a/lib/process-services/form/start-form.component.ts b/lib/process-services/src/lib/form/start-form.component.ts
similarity index 100%
rename from lib/process-services/form/start-form.component.ts
rename to lib/process-services/src/lib/form/start-form.component.ts
diff --git a/lib/process-services/i18n/ar.json b/lib/process-services/src/lib/i18n/ar.json
similarity index 100%
rename from lib/process-services/i18n/ar.json
rename to lib/process-services/src/lib/i18n/ar.json
diff --git a/lib/process-services/i18n/cs.json b/lib/process-services/src/lib/i18n/cs.json
similarity index 100%
rename from lib/process-services/i18n/cs.json
rename to lib/process-services/src/lib/i18n/cs.json
diff --git a/lib/process-services/i18n/da.json b/lib/process-services/src/lib/i18n/da.json
similarity index 100%
rename from lib/process-services/i18n/da.json
rename to lib/process-services/src/lib/i18n/da.json
diff --git a/lib/process-services/i18n/de.json b/lib/process-services/src/lib/i18n/de.json
similarity index 100%
rename from lib/process-services/i18n/de.json
rename to lib/process-services/src/lib/i18n/de.json
diff --git a/lib/process-services/i18n/en.json b/lib/process-services/src/lib/i18n/en.json
similarity index 100%
rename from lib/process-services/i18n/en.json
rename to lib/process-services/src/lib/i18n/en.json
diff --git a/lib/process-services/i18n/es.json b/lib/process-services/src/lib/i18n/es.json
similarity index 100%
rename from lib/process-services/i18n/es.json
rename to lib/process-services/src/lib/i18n/es.json
diff --git a/lib/process-services/i18n/fi.json b/lib/process-services/src/lib/i18n/fi.json
similarity index 100%
rename from lib/process-services/i18n/fi.json
rename to lib/process-services/src/lib/i18n/fi.json
diff --git a/lib/process-services/i18n/fr.json b/lib/process-services/src/lib/i18n/fr.json
similarity index 100%
rename from lib/process-services/i18n/fr.json
rename to lib/process-services/src/lib/i18n/fr.json
diff --git a/lib/process-services/i18n/it.json b/lib/process-services/src/lib/i18n/it.json
similarity index 100%
rename from lib/process-services/i18n/it.json
rename to lib/process-services/src/lib/i18n/it.json
diff --git a/lib/process-services/i18n/ja.json b/lib/process-services/src/lib/i18n/ja.json
similarity index 100%
rename from lib/process-services/i18n/ja.json
rename to lib/process-services/src/lib/i18n/ja.json
diff --git a/lib/process-services/i18n/nb.json b/lib/process-services/src/lib/i18n/nb.json
similarity index 100%
rename from lib/process-services/i18n/nb.json
rename to lib/process-services/src/lib/i18n/nb.json
diff --git a/lib/process-services/i18n/nl.json b/lib/process-services/src/lib/i18n/nl.json
similarity index 100%
rename from lib/process-services/i18n/nl.json
rename to lib/process-services/src/lib/i18n/nl.json
diff --git a/lib/process-services/i18n/pl.json b/lib/process-services/src/lib/i18n/pl.json
similarity index 100%
rename from lib/process-services/i18n/pl.json
rename to lib/process-services/src/lib/i18n/pl.json
diff --git a/lib/process-services/i18n/pt-BR.json b/lib/process-services/src/lib/i18n/pt-BR.json
similarity index 100%
rename from lib/process-services/i18n/pt-BR.json
rename to lib/process-services/src/lib/i18n/pt-BR.json
diff --git a/lib/process-services/i18n/ru.json b/lib/process-services/src/lib/i18n/ru.json
similarity index 100%
rename from lib/process-services/i18n/ru.json
rename to lib/process-services/src/lib/i18n/ru.json
diff --git a/lib/process-services/i18n/sv.json b/lib/process-services/src/lib/i18n/sv.json
similarity index 100%
rename from lib/process-services/i18n/sv.json
rename to lib/process-services/src/lib/i18n/sv.json
diff --git a/lib/process-services/i18n/zh-CN.json b/lib/process-services/src/lib/i18n/zh-CN.json
similarity index 100%
rename from lib/process-services/i18n/zh-CN.json
rename to lib/process-services/src/lib/i18n/zh-CN.json
diff --git a/lib/process-services/material.module.ts b/lib/process-services/src/lib/material.module.ts
similarity index 100%
rename from lib/process-services/material.module.ts
rename to lib/process-services/src/lib/material.module.ts
diff --git a/lib/process-services/mock/apps-list.mock.ts b/lib/process-services/src/lib/mock/apps-list.mock.ts
similarity index 100%
rename from lib/process-services/mock/apps-list.mock.ts
rename to lib/process-services/src/lib/mock/apps-list.mock.ts
diff --git a/lib/process-services/mock/index.ts b/lib/process-services/src/lib/mock/index.ts
similarity index 100%
rename from lib/process-services/mock/index.ts
rename to lib/process-services/src/lib/mock/index.ts
diff --git a/lib/process-services/mock/process/process-comments.mock.ts b/lib/process-services/src/lib/mock/process/process-comments.mock.ts
similarity index 100%
rename from lib/process-services/mock/process/process-comments.mock.ts
rename to lib/process-services/src/lib/mock/process/process-comments.mock.ts
diff --git a/lib/process-services/mock/process/process-instances-list.mock.ts b/lib/process-services/src/lib/mock/process/process-instances-list.mock.ts
similarity index 100%
rename from lib/process-services/mock/process/process-instances-list.mock.ts
rename to lib/process-services/src/lib/mock/process/process-instances-list.mock.ts
diff --git a/lib/process-services/mock/process/process.model.mock.ts b/lib/process-services/src/lib/mock/process/process.model.mock.ts
similarity index 100%
rename from lib/process-services/mock/process/process.model.mock.ts
rename to lib/process-services/src/lib/mock/process/process.model.mock.ts
diff --git a/lib/process-services/mock/process/process.service.mock.ts b/lib/process-services/src/lib/mock/process/process.service.mock.ts
similarity index 100%
rename from lib/process-services/mock/process/process.service.mock.ts
rename to lib/process-services/src/lib/mock/process/process.service.mock.ts
diff --git a/lib/process-services/mock/process/start-process.component.mock.ts b/lib/process-services/src/lib/mock/process/start-process.component.mock.ts
similarity index 100%
rename from lib/process-services/mock/process/start-process.component.mock.ts
rename to lib/process-services/src/lib/mock/process/start-process.component.mock.ts
diff --git a/lib/process-services/mock/public-api.ts b/lib/process-services/src/lib/mock/public-api.ts
similarity index 100%
rename from lib/process-services/mock/public-api.ts
rename to lib/process-services/src/lib/mock/public-api.ts
diff --git a/lib/process-services/mock/task/start-task.mock.ts b/lib/process-services/src/lib/mock/task/start-task.mock.ts
similarity index 100%
rename from lib/process-services/mock/task/start-task.mock.ts
rename to lib/process-services/src/lib/mock/task/start-task.mock.ts
diff --git a/lib/process-services/mock/task/task-details.component.mock.ts b/lib/process-services/src/lib/mock/task/task-details.component.mock.ts
similarity index 100%
rename from lib/process-services/mock/task/task-details.component.mock.ts
rename to lib/process-services/src/lib/mock/task/task-details.component.mock.ts
diff --git a/lib/process-services/mock/task/task-details.mock.ts b/lib/process-services/src/lib/mock/task/task-details.mock.ts
similarity index 100%
rename from lib/process-services/mock/task/task-details.mock.ts
rename to lib/process-services/src/lib/mock/task/task-details.mock.ts
diff --git a/lib/process-services/mock/task/task-list.mock.ts b/lib/process-services/src/lib/mock/task/task-list.mock.ts
similarity index 100%
rename from lib/process-services/mock/task/task-list.mock.ts
rename to lib/process-services/src/lib/mock/task/task-list.mock.ts
diff --git a/lib/process-services/mock/task/tasklist-service.mock.ts b/lib/process-services/src/lib/mock/task/tasklist-service.mock.ts
similarity index 100%
rename from lib/process-services/mock/task/tasklist-service.mock.ts
rename to lib/process-services/src/lib/mock/task/tasklist-service.mock.ts
diff --git a/lib/process-services/people/components/people-list/people-list.component.html b/lib/process-services/src/lib/people/components/people-list/people-list.component.html
similarity index 100%
rename from lib/process-services/people/components/people-list/people-list.component.html
rename to lib/process-services/src/lib/people/components/people-list/people-list.component.html
diff --git a/lib/process-services/people/components/people-list/people-list.component.scss b/lib/process-services/src/lib/people/components/people-list/people-list.component.scss
similarity index 100%
rename from lib/process-services/people/components/people-list/people-list.component.scss
rename to lib/process-services/src/lib/people/components/people-list/people-list.component.scss
diff --git a/lib/process-services/people/components/people-list/people-list.component.spec.ts b/lib/process-services/src/lib/people/components/people-list/people-list.component.spec.ts
similarity index 100%
rename from lib/process-services/people/components/people-list/people-list.component.spec.ts
rename to lib/process-services/src/lib/people/components/people-list/people-list.component.spec.ts
diff --git a/lib/process-services/people/components/people-list/people-list.component.ts b/lib/process-services/src/lib/people/components/people-list/people-list.component.ts
similarity index 100%
rename from lib/process-services/people/components/people-list/people-list.component.ts
rename to lib/process-services/src/lib/people/components/people-list/people-list.component.ts
diff --git a/lib/process-services/people/components/people-search-field/people-search-field.component.html b/lib/process-services/src/lib/people/components/people-search-field/people-search-field.component.html
similarity index 100%
rename from lib/process-services/people/components/people-search-field/people-search-field.component.html
rename to lib/process-services/src/lib/people/components/people-search-field/people-search-field.component.html
diff --git a/lib/process-services/people/components/people-search-field/people-search-field.component.scss b/lib/process-services/src/lib/people/components/people-search-field/people-search-field.component.scss
similarity index 100%
rename from lib/process-services/people/components/people-search-field/people-search-field.component.scss
rename to lib/process-services/src/lib/people/components/people-search-field/people-search-field.component.scss
diff --git a/lib/process-services/people/components/people-search-field/people-search-field.component.spec.ts b/lib/process-services/src/lib/people/components/people-search-field/people-search-field.component.spec.ts
similarity index 100%
rename from lib/process-services/people/components/people-search-field/people-search-field.component.spec.ts
rename to lib/process-services/src/lib/people/components/people-search-field/people-search-field.component.spec.ts
diff --git a/lib/process-services/people/components/people-search-field/people-search-field.component.ts b/lib/process-services/src/lib/people/components/people-search-field/people-search-field.component.ts
similarity index 100%
rename from lib/process-services/people/components/people-search-field/people-search-field.component.ts
rename to lib/process-services/src/lib/people/components/people-search-field/people-search-field.component.ts
diff --git a/lib/process-services/people/components/people-search/people-search.component.html b/lib/process-services/src/lib/people/components/people-search/people-search.component.html
similarity index 100%
rename from lib/process-services/people/components/people-search/people-search.component.html
rename to lib/process-services/src/lib/people/components/people-search/people-search.component.html
diff --git a/lib/process-services/people/components/people-search/people-search.component.scss b/lib/process-services/src/lib/people/components/people-search/people-search.component.scss
similarity index 100%
rename from lib/process-services/people/components/people-search/people-search.component.scss
rename to lib/process-services/src/lib/people/components/people-search/people-search.component.scss
diff --git a/lib/process-services/people/components/people-search/people-search.component.spec.ts b/lib/process-services/src/lib/people/components/people-search/people-search.component.spec.ts
similarity index 100%
rename from lib/process-services/people/components/people-search/people-search.component.spec.ts
rename to lib/process-services/src/lib/people/components/people-search/people-search.component.spec.ts
diff --git a/lib/process-services/people/components/people-search/people-search.component.ts b/lib/process-services/src/lib/people/components/people-search/people-search.component.ts
similarity index 100%
rename from lib/process-services/people/components/people-search/people-search.component.ts
rename to lib/process-services/src/lib/people/components/people-search/people-search.component.ts
diff --git a/lib/process-services/people/components/people-selector/people-selector.component.html b/lib/process-services/src/lib/people/components/people-selector/people-selector.component.html
similarity index 100%
rename from lib/process-services/people/components/people-selector/people-selector.component.html
rename to lib/process-services/src/lib/people/components/people-selector/people-selector.component.html
diff --git a/lib/process-services/people/components/people-selector/people-selector.component.scss b/lib/process-services/src/lib/people/components/people-selector/people-selector.component.scss
similarity index 100%
rename from lib/process-services/people/components/people-selector/people-selector.component.scss
rename to lib/process-services/src/lib/people/components/people-selector/people-selector.component.scss
diff --git a/lib/process-services/people/components/people-selector/people-selector.component.spec.ts b/lib/process-services/src/lib/people/components/people-selector/people-selector.component.spec.ts
similarity index 100%
rename from lib/process-services/people/components/people-selector/people-selector.component.spec.ts
rename to lib/process-services/src/lib/people/components/people-selector/people-selector.component.spec.ts
diff --git a/lib/process-services/people/components/people-selector/people-selector.component.ts b/lib/process-services/src/lib/people/components/people-selector/people-selector.component.ts
similarity index 100%
rename from lib/process-services/people/components/people-selector/people-selector.component.ts
rename to lib/process-services/src/lib/people/components/people-selector/people-selector.component.ts
diff --git a/lib/process-services/people/components/people/people.component.html b/lib/process-services/src/lib/people/components/people/people.component.html
similarity index 100%
rename from lib/process-services/people/components/people/people.component.html
rename to lib/process-services/src/lib/people/components/people/people.component.html
diff --git a/lib/process-services/people/components/people/people.component.scss b/lib/process-services/src/lib/people/components/people/people.component.scss
similarity index 100%
rename from lib/process-services/people/components/people/people.component.scss
rename to lib/process-services/src/lib/people/components/people/people.component.scss
diff --git a/lib/process-services/people/components/people/people.component.spec.ts b/lib/process-services/src/lib/people/components/people/people.component.spec.ts
similarity index 100%
rename from lib/process-services/people/components/people/people.component.spec.ts
rename to lib/process-services/src/lib/people/components/people/people.component.spec.ts
diff --git a/lib/process-services/people/components/people/people.component.ts b/lib/process-services/src/lib/people/components/people/people.component.ts
similarity index 100%
rename from lib/process-services/people/components/people/people.component.ts
rename to lib/process-services/src/lib/people/components/people/people.component.ts
diff --git a/lib/process-services/people/directives/people-search-action-label.directive.ts b/lib/process-services/src/lib/people/directives/people-search-action-label.directive.ts
similarity index 100%
rename from lib/process-services/people/directives/people-search-action-label.directive.ts
rename to lib/process-services/src/lib/people/directives/people-search-action-label.directive.ts
diff --git a/lib/process-services/people/directives/people-search-title.directive.ts b/lib/process-services/src/lib/people/directives/people-search-title.directive.ts
similarity index 91%
rename from lib/process-services/people/directives/people-search-title.directive.ts
rename to lib/process-services/src/lib/people/directives/people-search-title.directive.ts
index 125432e0cf..39bb748118 100644
--- a/lib/process-services/people/directives/people-search-title.directive.ts
+++ b/lib/process-services/src/lib/people/directives/people-search-title.directive.ts
@@ -20,5 +20,5 @@ import { Directive } from '@angular/core';
 /**
  * Directive selectors without adf- prefix will be deprecated on 3.0.0
  */
-@Directive({ selector: 'adf-people-search-title, people-search-title' })
+@Directive({ selector: '[adf-people-search-title]' })
 export class PeopleSearchTitleDirective { }
diff --git a/lib/process-services/people/helpers/getDisplayUser.ts b/lib/process-services/src/lib/people/helpers/getDisplayUser.ts
similarity index 100%
rename from lib/process-services/people/helpers/getDisplayUser.ts
rename to lib/process-services/src/lib/people/helpers/getDisplayUser.ts
diff --git a/lib/process-services/people/index.ts b/lib/process-services/src/lib/people/index.ts
similarity index 100%
rename from lib/process-services/people/index.ts
rename to lib/process-services/src/lib/people/index.ts
diff --git a/lib/process-services/people/interfaces/perform-search-callback.interface.ts b/lib/process-services/src/lib/people/interfaces/perform-search-callback.interface.ts
similarity index 100%
rename from lib/process-services/people/interfaces/perform-search-callback.interface.ts
rename to lib/process-services/src/lib/people/interfaces/perform-search-callback.interface.ts
diff --git a/lib/process-services/people/people.module.scss b/lib/process-services/src/lib/people/people.module.scss
similarity index 100%
rename from lib/process-services/people/people.module.scss
rename to lib/process-services/src/lib/people/people.module.scss
diff --git a/lib/process-services/people/people.module.ts b/lib/process-services/src/lib/people/people.module.ts
similarity index 98%
rename from lib/process-services/people/people.module.ts
rename to lib/process-services/src/lib/people/people.module.ts
index 47a2286f65..00d81c0b87 100644
--- a/lib/process-services/people/people.module.ts
+++ b/lib/process-services/src/lib/people/people.module.ts
@@ -36,7 +36,7 @@ import { PeopleSearchTitleDirective } from './directives/people-search-title.dir
         ReactiveFormsModule,
         MaterialModule,
         CommonModule,
-        CoreModule.forChild()
+        CoreModule
     ],
     declarations: [
         PeopleComponent,
diff --git a/lib/process-services/people/public-api.ts b/lib/process-services/src/lib/people/public-api.ts
similarity index 100%
rename from lib/process-services/people/public-api.ts
rename to lib/process-services/src/lib/people/public-api.ts
diff --git a/lib/process-services/process-comments/index.ts b/lib/process-services/src/lib/process-comments/index.ts
similarity index 100%
rename from lib/process-services/process-comments/index.ts
rename to lib/process-services/src/lib/process-comments/index.ts
diff --git a/lib/process-services/process-comments/process-comments.component.html b/lib/process-services/src/lib/process-comments/process-comments.component.html
similarity index 100%
rename from lib/process-services/process-comments/process-comments.component.html
rename to lib/process-services/src/lib/process-comments/process-comments.component.html
diff --git a/lib/process-services/process-comments/process-comments.component.scss b/lib/process-services/src/lib/process-comments/process-comments.component.scss
similarity index 100%
rename from lib/process-services/process-comments/process-comments.component.scss
rename to lib/process-services/src/lib/process-comments/process-comments.component.scss
diff --git a/lib/process-services/process-comments/process-comments.component.spec.ts b/lib/process-services/src/lib/process-comments/process-comments.component.spec.ts
similarity index 100%
rename from lib/process-services/process-comments/process-comments.component.spec.ts
rename to lib/process-services/src/lib/process-comments/process-comments.component.spec.ts
diff --git a/lib/process-services/process-comments/process-comments.component.ts b/lib/process-services/src/lib/process-comments/process-comments.component.ts
similarity index 100%
rename from lib/process-services/process-comments/process-comments.component.ts
rename to lib/process-services/src/lib/process-comments/process-comments.component.ts
diff --git a/lib/process-services/process-comments/process-comments.module.ts b/lib/process-services/src/lib/process-comments/process-comments.module.ts
similarity index 97%
rename from lib/process-services/process-comments/process-comments.module.ts
rename to lib/process-services/src/lib/process-comments/process-comments.module.ts
index 20cbb0840e..7d2f9bc2dd 100644
--- a/lib/process-services/process-comments/process-comments.module.ts
+++ b/lib/process-services/src/lib/process-comments/process-comments.module.ts
@@ -29,7 +29,7 @@ import { ProcessCommentsComponent } from './process-comments.component';
         ReactiveFormsModule,
         MaterialModule,
         CommonModule,
-        CoreModule.forChild()
+        CoreModule
     ],
     declarations: [
         ProcessCommentsComponent
diff --git a/lib/process-services/process-comments/public-api.ts b/lib/process-services/src/lib/process-comments/public-api.ts
similarity index 100%
rename from lib/process-services/process-comments/public-api.ts
rename to lib/process-services/src/lib/process-comments/public-api.ts
diff --git a/lib/process-services/process-list/assets/images/empty_doc_lib.svg b/lib/process-services/src/lib/process-list/assets/images/empty_doc_lib.svg
similarity index 100%
rename from lib/process-services/process-list/assets/images/empty_doc_lib.svg
rename to lib/process-services/src/lib/process-list/assets/images/empty_doc_lib.svg
diff --git a/lib/process-services/process-list/components/process-audit.directive.spec.ts b/lib/process-services/src/lib/process-list/components/process-audit.directive.spec.ts
similarity index 100%
rename from lib/process-services/process-list/components/process-audit.directive.spec.ts
rename to lib/process-services/src/lib/process-list/components/process-audit.directive.spec.ts
diff --git a/lib/process-services/process-list/components/process-audit.directive.ts b/lib/process-services/src/lib/process-list/components/process-audit.directive.ts
similarity index 100%
rename from lib/process-services/process-list/components/process-audit.directive.ts
rename to lib/process-services/src/lib/process-list/components/process-audit.directive.ts
diff --git a/lib/process-services/process-list/components/process-filters.component.html b/lib/process-services/src/lib/process-list/components/process-filters.component.html
similarity index 100%
rename from lib/process-services/process-list/components/process-filters.component.html
rename to lib/process-services/src/lib/process-list/components/process-filters.component.html
diff --git a/lib/process-services/process-list/components/process-filters.component.scss b/lib/process-services/src/lib/process-list/components/process-filters.component.scss
similarity index 100%
rename from lib/process-services/process-list/components/process-filters.component.scss
rename to lib/process-services/src/lib/process-list/components/process-filters.component.scss
diff --git a/lib/process-services/process-list/components/process-filters.component.spec.ts b/lib/process-services/src/lib/process-list/components/process-filters.component.spec.ts
similarity index 100%
rename from lib/process-services/process-list/components/process-filters.component.spec.ts
rename to lib/process-services/src/lib/process-list/components/process-filters.component.spec.ts
diff --git a/lib/process-services/process-list/components/process-filters.component.ts b/lib/process-services/src/lib/process-list/components/process-filters.component.ts
similarity index 100%
rename from lib/process-services/process-list/components/process-filters.component.ts
rename to lib/process-services/src/lib/process-list/components/process-filters.component.ts
diff --git a/lib/process-services/process-list/components/process-instance-details.component.css b/lib/process-services/src/lib/process-list/components/process-instance-details.component.css
similarity index 100%
rename from lib/process-services/process-list/components/process-instance-details.component.css
rename to lib/process-services/src/lib/process-list/components/process-instance-details.component.css
diff --git a/lib/process-services/process-list/components/process-instance-details.component.html b/lib/process-services/src/lib/process-list/components/process-instance-details.component.html
similarity index 100%
rename from lib/process-services/process-list/components/process-instance-details.component.html
rename to lib/process-services/src/lib/process-list/components/process-instance-details.component.html
diff --git a/lib/process-services/process-list/components/process-instance-details.component.spec.ts b/lib/process-services/src/lib/process-list/components/process-instance-details.component.spec.ts
similarity index 100%
rename from lib/process-services/process-list/components/process-instance-details.component.spec.ts
rename to lib/process-services/src/lib/process-list/components/process-instance-details.component.spec.ts
diff --git a/lib/process-services/process-list/components/process-instance-details.component.ts b/lib/process-services/src/lib/process-list/components/process-instance-details.component.ts
similarity index 100%
rename from lib/process-services/process-list/components/process-instance-details.component.ts
rename to lib/process-services/src/lib/process-list/components/process-instance-details.component.ts
diff --git a/lib/process-services/process-list/components/process-instance-header.component.css b/lib/process-services/src/lib/process-list/components/process-instance-header.component.css
similarity index 100%
rename from lib/process-services/process-list/components/process-instance-header.component.css
rename to lib/process-services/src/lib/process-list/components/process-instance-header.component.css
diff --git a/lib/process-services/process-list/components/process-instance-header.component.html b/lib/process-services/src/lib/process-list/components/process-instance-header.component.html
similarity index 100%
rename from lib/process-services/process-list/components/process-instance-header.component.html
rename to lib/process-services/src/lib/process-list/components/process-instance-header.component.html
diff --git a/lib/process-services/process-list/components/process-instance-header.component.spec.ts b/lib/process-services/src/lib/process-list/components/process-instance-header.component.spec.ts
similarity index 100%
rename from lib/process-services/process-list/components/process-instance-header.component.spec.ts
rename to lib/process-services/src/lib/process-list/components/process-instance-header.component.spec.ts
diff --git a/lib/process-services/process-list/components/process-instance-header.component.ts b/lib/process-services/src/lib/process-list/components/process-instance-header.component.ts
similarity index 100%
rename from lib/process-services/process-list/components/process-instance-header.component.ts
rename to lib/process-services/src/lib/process-list/components/process-instance-header.component.ts
diff --git a/lib/process-services/process-list/components/process-instance-tasks.component.css b/lib/process-services/src/lib/process-list/components/process-instance-tasks.component.css
similarity index 100%
rename from lib/process-services/process-list/components/process-instance-tasks.component.css
rename to lib/process-services/src/lib/process-list/components/process-instance-tasks.component.css
diff --git a/lib/process-services/process-list/components/process-instance-tasks.component.html b/lib/process-services/src/lib/process-list/components/process-instance-tasks.component.html
similarity index 100%
rename from lib/process-services/process-list/components/process-instance-tasks.component.html
rename to lib/process-services/src/lib/process-list/components/process-instance-tasks.component.html
diff --git a/lib/process-services/process-list/components/process-instance-tasks.component.spec.ts b/lib/process-services/src/lib/process-list/components/process-instance-tasks.component.spec.ts
similarity index 100%
rename from lib/process-services/process-list/components/process-instance-tasks.component.spec.ts
rename to lib/process-services/src/lib/process-list/components/process-instance-tasks.component.spec.ts
diff --git a/lib/process-services/process-list/components/process-instance-tasks.component.ts b/lib/process-services/src/lib/process-list/components/process-instance-tasks.component.ts
similarity index 100%
rename from lib/process-services/process-list/components/process-instance-tasks.component.ts
rename to lib/process-services/src/lib/process-list/components/process-instance-tasks.component.ts
diff --git a/lib/process-services/process-list/components/process-list.component.css b/lib/process-services/src/lib/process-list/components/process-list.component.css
similarity index 100%
rename from lib/process-services/process-list/components/process-list.component.css
rename to lib/process-services/src/lib/process-list/components/process-list.component.css
diff --git a/lib/process-services/process-list/components/process-list.component.html b/lib/process-services/src/lib/process-list/components/process-list.component.html
similarity index 100%
rename from lib/process-services/process-list/components/process-list.component.html
rename to lib/process-services/src/lib/process-list/components/process-list.component.html
diff --git a/lib/process-services/process-list/components/process-list.component.spec.ts b/lib/process-services/src/lib/process-list/components/process-list.component.spec.ts
similarity index 100%
rename from lib/process-services/process-list/components/process-list.component.spec.ts
rename to lib/process-services/src/lib/process-list/components/process-list.component.spec.ts
diff --git a/lib/process-services/process-list/components/process-list.component.ts b/lib/process-services/src/lib/process-list/components/process-list.component.ts
similarity index 100%
rename from lib/process-services/process-list/components/process-list.component.ts
rename to lib/process-services/src/lib/process-list/components/process-list.component.ts
diff --git a/lib/process-services/process-list/components/start-process.component.html b/lib/process-services/src/lib/process-list/components/start-process.component.html
similarity index 100%
rename from lib/process-services/process-list/components/start-process.component.html
rename to lib/process-services/src/lib/process-list/components/start-process.component.html
diff --git a/lib/process-services/process-list/components/start-process.component.scss b/lib/process-services/src/lib/process-list/components/start-process.component.scss
similarity index 100%
rename from lib/process-services/process-list/components/start-process.component.scss
rename to lib/process-services/src/lib/process-list/components/start-process.component.scss
diff --git a/lib/process-services/process-list/components/start-process.component.spec.ts b/lib/process-services/src/lib/process-list/components/start-process.component.spec.ts
similarity index 100%
rename from lib/process-services/process-list/components/start-process.component.spec.ts
rename to lib/process-services/src/lib/process-list/components/start-process.component.spec.ts
diff --git a/lib/process-services/process-list/components/start-process.component.ts b/lib/process-services/src/lib/process-list/components/start-process.component.ts
similarity index 100%
rename from lib/process-services/process-list/components/start-process.component.ts
rename to lib/process-services/src/lib/process-list/components/start-process.component.ts
diff --git a/lib/process-services/process-list/index.ts b/lib/process-services/src/lib/process-list/index.ts
similarity index 100%
rename from lib/process-services/process-list/index.ts
rename to lib/process-services/src/lib/process-list/index.ts
diff --git a/lib/process-services/process-list/models/filter-process.model.ts b/lib/process-services/src/lib/process-list/models/filter-process.model.ts
similarity index 100%
rename from lib/process-services/process-list/models/filter-process.model.ts
rename to lib/process-services/src/lib/process-list/models/filter-process.model.ts
diff --git a/lib/process-services/process-list/models/process-definition.model.ts b/lib/process-services/src/lib/process-list/models/process-definition.model.ts
similarity index 100%
rename from lib/process-services/process-list/models/process-definition.model.ts
rename to lib/process-services/src/lib/process-list/models/process-definition.model.ts
diff --git a/lib/process-services/process-list/models/process-instance-filter.model.ts b/lib/process-services/src/lib/process-list/models/process-instance-filter.model.ts
similarity index 100%
rename from lib/process-services/process-list/models/process-instance-filter.model.ts
rename to lib/process-services/src/lib/process-list/models/process-instance-filter.model.ts
diff --git a/lib/process-services/process-list/models/process-instance-variable.model.ts b/lib/process-services/src/lib/process-list/models/process-instance-variable.model.ts
similarity index 100%
rename from lib/process-services/process-list/models/process-instance-variable.model.ts
rename to lib/process-services/src/lib/process-list/models/process-instance-variable.model.ts
diff --git a/lib/process-services/process-list/models/process-instance.model.ts b/lib/process-services/src/lib/process-list/models/process-instance.model.ts
similarity index 100%
rename from lib/process-services/process-list/models/process-instance.model.ts
rename to lib/process-services/src/lib/process-list/models/process-instance.model.ts
diff --git a/lib/process-services/process-list/models/process-list.model.ts b/lib/process-services/src/lib/process-list/models/process-list.model.ts
similarity index 100%
rename from lib/process-services/process-list/models/process-list.model.ts
rename to lib/process-services/src/lib/process-list/models/process-list.model.ts
diff --git a/lib/process-services/process-list/models/process-preset.model.ts b/lib/process-services/src/lib/process-list/models/process-preset.model.ts
similarity index 100%
rename from lib/process-services/process-list/models/process-preset.model.ts
rename to lib/process-services/src/lib/process-list/models/process-preset.model.ts
diff --git a/lib/process-services/process-list/process-list.module.ts b/lib/process-services/src/lib/process-list/process-list.module.ts
similarity index 98%
rename from lib/process-services/process-list/process-list.module.ts
rename to lib/process-services/src/lib/process-list/process-list.module.ts
index f4d6c1340c..3e6354e4e9 100644
--- a/lib/process-services/process-list/process-list.module.ts
+++ b/lib/process-services/src/lib/process-list/process-list.module.ts
@@ -42,7 +42,7 @@ import { FormModule } from '../form/form.module';
         FlexLayoutModule,
         FormsModule,
         ReactiveFormsModule,
-        CoreModule.forChild(),
+        CoreModule,
         TaskListModule,
         PeopleModule,
         ContentWidgetModule,
diff --git a/lib/process-services/process-list/public-api.ts b/lib/process-services/src/lib/process-list/public-api.ts
similarity index 100%
rename from lib/process-services/process-list/public-api.ts
rename to lib/process-services/src/lib/process-list/public-api.ts
diff --git a/lib/process-services/process-list/services/process-filter.service.spec.ts b/lib/process-services/src/lib/process-list/services/process-filter.service.spec.ts
similarity index 100%
rename from lib/process-services/process-list/services/process-filter.service.spec.ts
rename to lib/process-services/src/lib/process-list/services/process-filter.service.spec.ts
diff --git a/lib/process-services/process-list/services/process-filter.service.ts b/lib/process-services/src/lib/process-list/services/process-filter.service.ts
similarity index 100%
rename from lib/process-services/process-list/services/process-filter.service.ts
rename to lib/process-services/src/lib/process-list/services/process-filter.service.ts
diff --git a/lib/process-services/process-list/services/process.service.spec.ts b/lib/process-services/src/lib/process-list/services/process.service.spec.ts
similarity index 100%
rename from lib/process-services/process-list/services/process.service.spec.ts
rename to lib/process-services/src/lib/process-list/services/process.service.spec.ts
diff --git a/lib/process-services/process-list/services/process.service.ts b/lib/process-services/src/lib/process-list/services/process.service.ts
similarity index 100%
rename from lib/process-services/process-list/services/process.service.ts
rename to lib/process-services/src/lib/process-list/services/process.service.ts
diff --git a/lib/process-services/process.module.ts b/lib/process-services/src/lib/process.module.ts
similarity index 98%
rename from lib/process-services/process.module.ts
rename to lib/process-services/src/lib/process.module.ts
index 58de03ae24..da1639502b 100644
--- a/lib/process-services/process.module.ts
+++ b/lib/process-services/src/lib/process.module.ts
@@ -32,7 +32,7 @@ import { FormModule } from './form/form.module';
 
 @NgModule({
     imports: [
-        CoreModule.forChild(),
+        CoreModule,
         CommonModule,
         ProcessCommentsModule,
         FormsModule,
@@ -94,7 +94,7 @@ export class ProcessModule {
 
 @NgModule({
     imports: [
-        CoreModule.forChild(),
+        CoreModule,
         CommonModule,
         ProcessCommentsModule,
         FormsModule,
diff --git a/lib/process-services/styles/_index.scss b/lib/process-services/src/lib/styles/_index.scss
similarity index 100%
rename from lib/process-services/styles/_index.scss
rename to lib/process-services/src/lib/styles/_index.scss
diff --git a/lib/process-services/task-list/components/attach-form.component.html b/lib/process-services/src/lib/task-list/components/attach-form.component.html
similarity index 100%
rename from lib/process-services/task-list/components/attach-form.component.html
rename to lib/process-services/src/lib/task-list/components/attach-form.component.html
diff --git a/lib/process-services/task-list/components/attach-form.component.scss b/lib/process-services/src/lib/task-list/components/attach-form.component.scss
similarity index 100%
rename from lib/process-services/task-list/components/attach-form.component.scss
rename to lib/process-services/src/lib/task-list/components/attach-form.component.scss
diff --git a/lib/process-services/task-list/components/attach-form.component.spec.ts b/lib/process-services/src/lib/task-list/components/attach-form.component.spec.ts
similarity index 100%
rename from lib/process-services/task-list/components/attach-form.component.spec.ts
rename to lib/process-services/src/lib/task-list/components/attach-form.component.spec.ts
diff --git a/lib/process-services/task-list/components/attach-form.component.ts b/lib/process-services/src/lib/task-list/components/attach-form.component.ts
similarity index 100%
rename from lib/process-services/task-list/components/attach-form.component.ts
rename to lib/process-services/src/lib/task-list/components/attach-form.component.ts
diff --git a/lib/process-services/task-list/components/checklist.component.html b/lib/process-services/src/lib/task-list/components/checklist.component.html
similarity index 100%
rename from lib/process-services/task-list/components/checklist.component.html
rename to lib/process-services/src/lib/task-list/components/checklist.component.html
diff --git a/lib/process-services/task-list/components/checklist.component.scss b/lib/process-services/src/lib/task-list/components/checklist.component.scss
similarity index 100%
rename from lib/process-services/task-list/components/checklist.component.scss
rename to lib/process-services/src/lib/task-list/components/checklist.component.scss
diff --git a/lib/process-services/task-list/components/checklist.component.spec.ts b/lib/process-services/src/lib/task-list/components/checklist.component.spec.ts
similarity index 100%
rename from lib/process-services/task-list/components/checklist.component.spec.ts
rename to lib/process-services/src/lib/task-list/components/checklist.component.spec.ts
diff --git a/lib/process-services/task-list/components/checklist.component.ts b/lib/process-services/src/lib/task-list/components/checklist.component.ts
similarity index 100%
rename from lib/process-services/task-list/components/checklist.component.ts
rename to lib/process-services/src/lib/task-list/components/checklist.component.ts
diff --git a/lib/process-services/task-list/components/no-task-detail-template.directive.spec.ts b/lib/process-services/src/lib/task-list/components/no-task-detail-template.directive.spec.ts
similarity index 100%
rename from lib/process-services/task-list/components/no-task-detail-template.directive.spec.ts
rename to lib/process-services/src/lib/task-list/components/no-task-detail-template.directive.spec.ts
diff --git a/lib/process-services/task-list/components/no-task-detail-template.directive.ts b/lib/process-services/src/lib/task-list/components/no-task-detail-template.directive.ts
similarity index 100%
rename from lib/process-services/task-list/components/no-task-detail-template.directive.ts
rename to lib/process-services/src/lib/task-list/components/no-task-detail-template.directive.ts
diff --git a/lib/process-services/task-list/components/start-task.component.html b/lib/process-services/src/lib/task-list/components/start-task.component.html
similarity index 100%
rename from lib/process-services/task-list/components/start-task.component.html
rename to lib/process-services/src/lib/task-list/components/start-task.component.html
diff --git a/lib/process-services/task-list/components/start-task.component.scss b/lib/process-services/src/lib/task-list/components/start-task.component.scss
similarity index 100%
rename from lib/process-services/task-list/components/start-task.component.scss
rename to lib/process-services/src/lib/task-list/components/start-task.component.scss
diff --git a/lib/process-services/task-list/components/start-task.component.spec.ts b/lib/process-services/src/lib/task-list/components/start-task.component.spec.ts
similarity index 100%
rename from lib/process-services/task-list/components/start-task.component.spec.ts
rename to lib/process-services/src/lib/task-list/components/start-task.component.spec.ts
diff --git a/lib/process-services/task-list/components/start-task.component.ts b/lib/process-services/src/lib/task-list/components/start-task.component.ts
similarity index 100%
rename from lib/process-services/task-list/components/start-task.component.ts
rename to lib/process-services/src/lib/task-list/components/start-task.component.ts
diff --git a/lib/process-services/task-list/components/task-audit.directive.spec.ts b/lib/process-services/src/lib/task-list/components/task-audit.directive.spec.ts
similarity index 100%
rename from lib/process-services/task-list/components/task-audit.directive.spec.ts
rename to lib/process-services/src/lib/task-list/components/task-audit.directive.spec.ts
diff --git a/lib/process-services/task-list/components/task-audit.directive.ts b/lib/process-services/src/lib/task-list/components/task-audit.directive.ts
similarity index 100%
rename from lib/process-services/task-list/components/task-audit.directive.ts
rename to lib/process-services/src/lib/task-list/components/task-audit.directive.ts
diff --git a/lib/process-services/task-list/components/task-details.component.html b/lib/process-services/src/lib/task-list/components/task-details.component.html
similarity index 100%
rename from lib/process-services/task-list/components/task-details.component.html
rename to lib/process-services/src/lib/task-list/components/task-details.component.html
diff --git a/lib/process-services/task-list/components/task-details.component.scss b/lib/process-services/src/lib/task-list/components/task-details.component.scss
similarity index 100%
rename from lib/process-services/task-list/components/task-details.component.scss
rename to lib/process-services/src/lib/task-list/components/task-details.component.scss
diff --git a/lib/process-services/task-list/components/task-details.component.spec.ts b/lib/process-services/src/lib/task-list/components/task-details.component.spec.ts
similarity index 100%
rename from lib/process-services/task-list/components/task-details.component.spec.ts
rename to lib/process-services/src/lib/task-list/components/task-details.component.spec.ts
diff --git a/lib/process-services/task-list/components/task-details.component.ts b/lib/process-services/src/lib/task-list/components/task-details.component.ts
similarity index 100%
rename from lib/process-services/task-list/components/task-details.component.ts
rename to lib/process-services/src/lib/task-list/components/task-details.component.ts
diff --git a/lib/process-services/task-list/components/task-filters.component.html b/lib/process-services/src/lib/task-list/components/task-filters.component.html
similarity index 100%
rename from lib/process-services/task-list/components/task-filters.component.html
rename to lib/process-services/src/lib/task-list/components/task-filters.component.html
diff --git a/lib/process-services/task-list/components/task-filters.component.scss b/lib/process-services/src/lib/task-list/components/task-filters.component.scss
similarity index 100%
rename from lib/process-services/task-list/components/task-filters.component.scss
rename to lib/process-services/src/lib/task-list/components/task-filters.component.scss
diff --git a/lib/process-services/task-list/components/task-filters.component.spec.ts b/lib/process-services/src/lib/task-list/components/task-filters.component.spec.ts
similarity index 100%
rename from lib/process-services/task-list/components/task-filters.component.spec.ts
rename to lib/process-services/src/lib/task-list/components/task-filters.component.spec.ts
diff --git a/lib/process-services/task-list/components/task-filters.component.ts b/lib/process-services/src/lib/task-list/components/task-filters.component.ts
similarity index 100%
rename from lib/process-services/task-list/components/task-filters.component.ts
rename to lib/process-services/src/lib/task-list/components/task-filters.component.ts
diff --git a/lib/process-services/task-list/components/task-header.component.html b/lib/process-services/src/lib/task-list/components/task-header.component.html
similarity index 100%
rename from lib/process-services/task-list/components/task-header.component.html
rename to lib/process-services/src/lib/task-list/components/task-header.component.html
diff --git a/lib/process-services/task-list/components/task-header.component.scss b/lib/process-services/src/lib/task-list/components/task-header.component.scss
similarity index 100%
rename from lib/process-services/task-list/components/task-header.component.scss
rename to lib/process-services/src/lib/task-list/components/task-header.component.scss
diff --git a/lib/process-services/task-list/components/task-header.component.spec.ts b/lib/process-services/src/lib/task-list/components/task-header.component.spec.ts
similarity index 100%
rename from lib/process-services/task-list/components/task-header.component.spec.ts
rename to lib/process-services/src/lib/task-list/components/task-header.component.spec.ts
diff --git a/lib/process-services/task-list/components/task-header.component.ts b/lib/process-services/src/lib/task-list/components/task-header.component.ts
similarity index 100%
rename from lib/process-services/task-list/components/task-header.component.ts
rename to lib/process-services/src/lib/task-list/components/task-header.component.ts
diff --git a/lib/process-services/task-list/components/task-list.component.css b/lib/process-services/src/lib/task-list/components/task-list.component.css
similarity index 100%
rename from lib/process-services/task-list/components/task-list.component.css
rename to lib/process-services/src/lib/task-list/components/task-list.component.css
diff --git a/lib/process-services/task-list/components/task-list.component.html b/lib/process-services/src/lib/task-list/components/task-list.component.html
similarity index 100%
rename from lib/process-services/task-list/components/task-list.component.html
rename to lib/process-services/src/lib/task-list/components/task-list.component.html
diff --git a/lib/process-services/task-list/components/task-list.component.spec.ts b/lib/process-services/src/lib/task-list/components/task-list.component.spec.ts
similarity index 100%
rename from lib/process-services/task-list/components/task-list.component.spec.ts
rename to lib/process-services/src/lib/task-list/components/task-list.component.spec.ts
diff --git a/lib/process-services/task-list/components/task-list.component.ts b/lib/process-services/src/lib/task-list/components/task-list.component.ts
similarity index 100%
rename from lib/process-services/task-list/components/task-list.component.ts
rename to lib/process-services/src/lib/task-list/components/task-list.component.ts
diff --git a/lib/process-services/task-list/components/task-standalone.component.html b/lib/process-services/src/lib/task-list/components/task-standalone.component.html
similarity index 100%
rename from lib/process-services/task-list/components/task-standalone.component.html
rename to lib/process-services/src/lib/task-list/components/task-standalone.component.html
diff --git a/lib/process-services/task-list/components/task-standalone.component.scss b/lib/process-services/src/lib/task-list/components/task-standalone.component.scss
similarity index 100%
rename from lib/process-services/task-list/components/task-standalone.component.scss
rename to lib/process-services/src/lib/task-list/components/task-standalone.component.scss
diff --git a/lib/process-services/task-list/components/task-standalone.component.spec.ts b/lib/process-services/src/lib/task-list/components/task-standalone.component.spec.ts
similarity index 100%
rename from lib/process-services/task-list/components/task-standalone.component.spec.ts
rename to lib/process-services/src/lib/task-list/components/task-standalone.component.spec.ts
diff --git a/lib/process-services/task-list/components/task-standalone.component.ts b/lib/process-services/src/lib/task-list/components/task-standalone.component.ts
similarity index 100%
rename from lib/process-services/task-list/components/task-standalone.component.ts
rename to lib/process-services/src/lib/task-list/components/task-standalone.component.ts
diff --git a/lib/process-services/task-list/index.ts b/lib/process-services/src/lib/task-list/index.ts
similarity index 100%
rename from lib/process-services/task-list/index.ts
rename to lib/process-services/src/lib/task-list/index.ts
diff --git a/lib/process-services/task-list/models/filter.model.ts b/lib/process-services/src/lib/task-list/models/filter.model.ts
similarity index 100%
rename from lib/process-services/task-list/models/filter.model.ts
rename to lib/process-services/src/lib/task-list/models/filter.model.ts
diff --git a/lib/process-services/task-list/models/form.model.ts b/lib/process-services/src/lib/task-list/models/form.model.ts
similarity index 100%
rename from lib/process-services/task-list/models/form.model.ts
rename to lib/process-services/src/lib/task-list/models/form.model.ts
diff --git a/lib/process-services/task-list/models/start-task.model.ts b/lib/process-services/src/lib/task-list/models/start-task.model.ts
similarity index 100%
rename from lib/process-services/task-list/models/start-task.model.ts
rename to lib/process-services/src/lib/task-list/models/start-task.model.ts
diff --git a/lib/process-services/task-list/models/task-details.event.ts b/lib/process-services/src/lib/task-list/models/task-details.event.ts
similarity index 100%
rename from lib/process-services/task-list/models/task-details.event.ts
rename to lib/process-services/src/lib/task-list/models/task-details.event.ts
diff --git a/lib/process-services/task-list/models/task-details.model.ts b/lib/process-services/src/lib/task-list/models/task-details.model.ts
similarity index 100%
rename from lib/process-services/task-list/models/task-details.model.ts
rename to lib/process-services/src/lib/task-list/models/task-details.model.ts
diff --git a/lib/process-services/task-list/models/task-list.model.ts b/lib/process-services/src/lib/task-list/models/task-list.model.ts
similarity index 100%
rename from lib/process-services/task-list/models/task-list.model.ts
rename to lib/process-services/src/lib/task-list/models/task-list.model.ts
diff --git a/lib/process-services/task-list/models/task-preset.model.ts b/lib/process-services/src/lib/task-list/models/task-preset.model.ts
similarity index 100%
rename from lib/process-services/task-list/models/task-preset.model.ts
rename to lib/process-services/src/lib/task-list/models/task-preset.model.ts
diff --git a/lib/process-services/task-list/models/user-event.model.ts b/lib/process-services/src/lib/task-list/models/user-event.model.ts
similarity index 100%
rename from lib/process-services/task-list/models/user-event.model.ts
rename to lib/process-services/src/lib/task-list/models/user-event.model.ts
diff --git a/lib/process-services/task-list/models/user-group.model.ts b/lib/process-services/src/lib/task-list/models/user-group.model.ts
similarity index 100%
rename from lib/process-services/task-list/models/user-group.model.ts
rename to lib/process-services/src/lib/task-list/models/user-group.model.ts
diff --git a/lib/process-services/task-list/public-api.ts b/lib/process-services/src/lib/task-list/public-api.ts
similarity index 100%
rename from lib/process-services/task-list/public-api.ts
rename to lib/process-services/src/lib/task-list/public-api.ts
diff --git a/lib/process-services/task-list/services/process-upload.service.ts b/lib/process-services/src/lib/task-list/services/process-upload.service.ts
similarity index 100%
rename from lib/process-services/task-list/services/process-upload.service.ts
rename to lib/process-services/src/lib/task-list/services/process-upload.service.ts
diff --git a/lib/process-services/task-list/services/task-filter.service.spec.ts b/lib/process-services/src/lib/task-list/services/task-filter.service.spec.ts
similarity index 100%
rename from lib/process-services/task-list/services/task-filter.service.spec.ts
rename to lib/process-services/src/lib/task-list/services/task-filter.service.spec.ts
diff --git a/lib/process-services/task-list/services/task-filter.service.ts b/lib/process-services/src/lib/task-list/services/task-filter.service.ts
similarity index 100%
rename from lib/process-services/task-list/services/task-filter.service.ts
rename to lib/process-services/src/lib/task-list/services/task-filter.service.ts
diff --git a/lib/process-services/task-list/services/task-upload.service.ts b/lib/process-services/src/lib/task-list/services/task-upload.service.ts
similarity index 100%
rename from lib/process-services/task-list/services/task-upload.service.ts
rename to lib/process-services/src/lib/task-list/services/task-upload.service.ts
diff --git a/lib/process-services/task-list/services/tasklist.service.spec.ts b/lib/process-services/src/lib/task-list/services/tasklist.service.spec.ts
similarity index 100%
rename from lib/process-services/task-list/services/tasklist.service.spec.ts
rename to lib/process-services/src/lib/task-list/services/tasklist.service.spec.ts
diff --git a/lib/process-services/task-list/services/tasklist.service.ts b/lib/process-services/src/lib/task-list/services/tasklist.service.ts
similarity index 100%
rename from lib/process-services/task-list/services/tasklist.service.ts
rename to lib/process-services/src/lib/task-list/services/tasklist.service.ts
diff --git a/lib/process-services/task-list/task-list.module.ts b/lib/process-services/src/lib/task-list/task-list.module.ts
similarity index 98%
rename from lib/process-services/task-list/task-list.module.ts
rename to lib/process-services/src/lib/task-list/task-list.module.ts
index bb9f62f472..9d66ca47a4 100644
--- a/lib/process-services/task-list/task-list.module.ts
+++ b/lib/process-services/src/lib/task-list/task-list.module.ts
@@ -46,7 +46,7 @@ import { FormModule } from '../form/form.module';
         FormsModule,
         FormModule,
         ReactiveFormsModule,
-        CoreModule.forChild(),
+        CoreModule,
         PeopleModule,
         ProcessCommentsModule,
         ContentWidgetModule
diff --git a/lib/process-services/task-list/validators/task-description.validator.ts b/lib/process-services/src/lib/task-list/validators/task-description.validator.ts
similarity index 100%
rename from lib/process-services/task-list/validators/task-description.validator.ts
rename to lib/process-services/src/lib/task-list/validators/task-description.validator.ts
diff --git a/lib/process-services/testing/process.testing.module.ts b/lib/process-services/src/lib/testing/process.testing.module.ts
similarity index 100%
rename from lib/process-services/testing/process.testing.module.ts
rename to lib/process-services/src/lib/testing/process.testing.module.ts
diff --git a/lib/process-services/public-api.ts b/lib/process-services/src/public-api.ts
similarity index 63%
rename from lib/process-services/public-api.ts
rename to lib/process-services/src/public-api.ts
index afcc926ddc..840a4f8967 100644
--- a/lib/process-services/public-api.ts
+++ b/lib/process-services/src/public-api.ts
@@ -15,4 +15,13 @@
  * limitations under the License.
  */
 
-export * from './index';
+export * from './lib/process-list/index';
+export * from './lib/task-list/index';
+export * from './lib/app-list/index';
+export * from './lib/attachment/index';
+export * from './lib/process-comments/index';
+export * from './lib/people/index';
+export * from './lib/content-widget/index';
+export * from './lib/form/index';
+
+export * from './lib/process.module';
diff --git a/lib/process-services/test.ts b/lib/process-services/src/test.ts
similarity index 90%
rename from lib/process-services/test.ts
rename to lib/process-services/src/test.ts
index 3b3859502d..142682c08e 100644
--- a/lib/process-services/test.ts
+++ b/lib/process-services/src/test.ts
@@ -32,9 +32,6 @@ getTestBed().initTestEnvironment(
     platformBrowserDynamicTesting()
 );
 
-declare const pdfjsLib: any;
-pdfjsLib.GlobalWorkerOptions.workerSrc = 'node_modules/pdfjs-dist/build/pdf.worker.min.js';
-
 // Then we find all the tests.
 const context = require.context('./', true, /\.spec\.ts$/);
 // And load the modules.
diff --git a/lib/process-services/tsconfig.lib.json b/lib/process-services/tsconfig.lib.json
index acc2f6c692..841aa69e89 100644
--- a/lib/process-services/tsconfig.lib.json
+++ b/lib/process-services/tsconfig.lib.json
@@ -1,6 +1,7 @@
 {
   "extends": "../tsconfig.json",
   "compilerOptions": {
-    "outDir": "../dist/process-services/"
+    "outDir": "../dist/process-services/",
+    "baseUrl": "src"
   }
 }
diff --git a/lib/process-services/tsconfig.spec.json b/lib/process-services/tsconfig.spec.json
index ab9099eca3..ef8eb83f35 100644
--- a/lib/process-services/tsconfig.spec.json
+++ b/lib/process-services/tsconfig.spec.json
@@ -1,6 +1,6 @@
 {
   "extends": "../tsconfig.spec.json",
   "files": [
-    "test.ts"
+    "src/test.ts"
   ]
 }
diff --git a/lib/process-services/tslint.json b/lib/process-services/tslint.json
new file mode 100644
index 0000000000..cf71c45318
--- /dev/null
+++ b/lib/process-services/tslint.json
@@ -0,0 +1,17 @@
+{
+    "extends": "../tslint.json",
+    "rules": {
+        "directive-selector": [
+            true,
+            "attribute",
+            "adf",
+            "camelCase"
+        ],
+        "component-selector": [
+            true,
+            "element",
+            "adf",
+            "kebab-case"
+        ]
+    }
+}
diff --git a/scripts/build/build-process-services.sh b/scripts/build/build-process-services.sh
index fc82f2b9b7..e684d0c951 100755
--- a/scripts/build/build-process-services.sh
+++ b/scripts/build/build-process-services.sh
@@ -13,10 +13,10 @@ node ./lib/config/bundle-process-services-scss.js || exit 1
 
 echo "====== Copy i18n ======"
 mkdir -p ./lib/dist/process-services/bundles/assets/adf-process-services/i18n
-cp -R ./lib/process-services/i18n/* ./lib/dist/process-services/bundles/assets/adf-process-services/i18n
+cp -R ./lib/process-services/src/lib/i18n/* ./lib/dist/process-services/bundles/assets/adf-process-services/i18n
 
 echo "====== Copy assets ======"
-cp -R ./lib/process-services/assets/* ./lib/dist/process-services/bundles/assets
+cp -R ./lib/process-services/src/lib/assets/* ./lib/dist/process-services/bundles/assets
 
 echo "====== Move to node_modules ======"
 rm -rf ./node_modules/@alfresco/adf-process-services/ && \