diff --git a/ng2-components/ng2-activiti-processlist/demo/src/main.ts b/ng2-components/ng2-activiti-processlist/demo/src/main.ts
index cfd9e4f569..7d8847e756 100644
--- a/ng2-components/ng2-activiti-processlist/demo/src/main.ts
+++ b/ng2-components/ng2-activiti-processlist/demo/src/main.ts
@@ -1,33 +1,40 @@
-/*!
- * @license
- * Copyright 2016 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.
- */
-import { Component } from '@angular/core';
-import { bootstrap } from '@angular/platform-browser-dynamic';
-import { Ng2ActivitiProcesslistComponent } from 'ng2-activiti-processlist/dist/ng2-activiti-processlist';
-
-@Component({
-  selector: 'my-app',
-  template: `<ng2-activiti-processlist></ng2-activiti-processlist>`,
-  directives: [Ng2ActivitiProcesslistComponent]
-})
-class MyDemoApp {
-  constructor() {
-    console.log('constructor');
-  }
-}
-bootstrap(MyDemoApp, [
-  Ng2ActivitiProcesslistComponent
-]);
+/*!
+ * @license
+ * Copyright 2016 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.
+ */
+import { Component } from '@angular/core';
+import { bootstrap } from '@angular/platform-browser-dynamic';
+import {
+    ACTIVITI_PROCESSLIST_PROVIDERS,
+    ACTIVITI_PROCESSLIST_DIRECTIVES
+} from 'ng2-activiti-processlist/dist/ng2-activiti-processlist';
+import { ALFRESCO_CORE_PROVIDERS } from 'ng2-alfresco-core';
+import { HTTP_PROVIDERS } from '@angular/http';
+
+@Component({
+  selector: 'my-app',
+  template: `<activiti-processlist></activiti-processlist>`,
+  providers: [ACTIVITI_PROCESSLIST_PROVIDERS],
+  directives: [ACTIVITI_PROCESSLIST_DIRECTIVES]
+})
+class MyDemoApp {
+  constructor() {
+    console.log('constructor');
+  }
+}
+bootstrap(MyDemoApp, [
+    ALFRESCO_CORE_PROVIDERS,
+    HTTP_PROVIDERS
+]);
diff --git a/ng2-components/ng2-activiti-processlist/demo/systemjs.config.js b/ng2-components/ng2-activiti-processlist/demo/systemjs.config.js
index a1e79283ef..fff26fd053 100644
--- a/ng2-components/ng2-activiti-processlist/demo/systemjs.config.js
+++ b/ng2-components/ng2-activiti-processlist/demo/systemjs.config.js
@@ -19,11 +19,13 @@
 
   // map tells the System loader where to look for things
   var map = {
-    'ng2-activiti-processlist': 'node_modules/ng2-activiti-processlist',
+    'app': 'dist',
     '@angular': 'node_modules/@angular',
     'angular2-in-memory-web-api': 'node_modules/angular2-in-memory-web-api',
     'rxjs': 'node_modules/rxjs',
-    'app': 'dist/'
+    'ng2-translate': 'node_modules/ng2-translate',
+    'ng2-activiti-processlist': 'node_modules/ng2-activiti-processlist',
+    'ng2-alfresco-core': 'node_modules/ng2-alfresco-core/dist'
   };
 
   // packages tells the System loader how to load when no filename and/or no extension
@@ -31,7 +33,9 @@
     'app': { main: 'main.js',  defaultExtension: 'js' },
     'rxjs': { defaultExtension: 'js' },
     'angular2-in-memory-web-api': { main: 'index.js', defaultExtension: 'js' },
-    'ng2-activiti-processlist': { main: 'index.js', defaultExtension: 'js' }
+    'ng2-translate': { defaultExtension: 'js' },
+    'ng2-activiti-processlist': { main: 'index.js', defaultExtension: 'js' },
+    'ng2-alfresco-core': { main: 'index.js', defaultExtension: 'js' }
   };
 
   var ngPackageNames = [
diff --git a/ng2-components/ng2-activiti-processlist/src/i18n/en.json b/ng2-components/ng2-activiti-processlist/i18n/en.json
similarity index 100%
rename from ng2-components/ng2-activiti-processlist/src/i18n/en.json
rename to ng2-components/ng2-activiti-processlist/i18n/en.json
diff --git a/ng2-components/ng2-activiti-processlist/ng2-activiti-processlist.ts b/ng2-components/ng2-activiti-processlist/ng2-activiti-processlist.ts
index 2c524e7062..364a5c8638 100644
--- a/ng2-components/ng2-activiti-processlist/ng2-activiti-processlist.ts
+++ b/ng2-components/ng2-activiti-processlist/ng2-activiti-processlist.ts
@@ -15,4 +15,19 @@
  * limitations under the License.
  */
 
+import { Ng2ActivitiProcesslistComponent } from './src/components/ng2-activiti-processlist.component';
+import { ActivitiProcessService } from './src/services/activiti-process-service.service';
+
+// components
 export * from './src/components/ng2-activiti-processlist.component';
+
+// services
+export * from './src/services/activiti-process-service.service';
+
+export const ACTIVITI_PROCESSLIST_DIRECTIVES: [any] = [
+    Ng2ActivitiProcesslistComponent
+];
+
+export const ACTIVITI_PROCESSLIST_PROVIDERS: [any] = [
+    ActivitiProcessService
+];
diff --git a/ng2-components/ng2-activiti-processlist/src/components/ng2-activiti-processlist.component.ts b/ng2-components/ng2-activiti-processlist/src/components/ng2-activiti-processlist.component.ts
index 7b514af4e7..db2a29d1df 100644
--- a/ng2-components/ng2-activiti-processlist/src/components/ng2-activiti-processlist.component.ts
+++ b/ng2-components/ng2-activiti-processlist/src/components/ng2-activiti-processlist.component.ts
@@ -27,7 +27,7 @@ declare let __moduleName: string;
 
 @Component({
     moduleId: __moduleName,
-    selector: 'ng2-activiti-processlist',
+    selector: 'activiti-processlist',
     styles: [
       `
               :host h1 {
diff --git a/ng2-components/ng2-alfresco-datatable/demo/package.json b/ng2-components/ng2-alfresco-datatable/demo/package.json
index 5396ef02ef..00bbf0a050 100644
--- a/ng2-components/ng2-alfresco-datatable/demo/package.json
+++ b/ng2-components/ng2-alfresco-datatable/demo/package.json
@@ -42,10 +42,7 @@
 
     "material-design-icons": "2.2.3",
     "material-design-lite": "1.1.3",
-    "ng2-translate": "2.2.2",
-
-    "ng2-alfresco-datatable": "^0.1.12",
-    "ng2-alfresco-core": "^0.1.36"
+    "ng2-activiti-processlist": "^0.1.0"
   },
   "devDependencies": {
     "browser-sync": "2.10.0",