diff --git a/ng2-components/ng2-activiti-analytics/src/components/raphael/icons/index.ts b/ng2-components/ng2-activiti-analytics/src/components/raphael/icons/index.ts
new file mode 100644
index 0000000000..932543567b
--- /dev/null
+++ b/ng2-components/ng2-activiti-analytics/src/components/raphael/icons/index.ts
@@ -0,0 +1,49 @@
+/*!
+ * @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 { RaphaelIconServiceDirective } from './raphael-icon-service.component';
+import { RaphaelIconSendDirective } from './raphael-icon-send.component';
+import { RaphaelIconUserDirective } from './raphael-icon-user.component';
+import { RaphaelIconManualDirective } from './raphael-icon-manual.component';
+import { RaphaelIconCamelDirective } from './raphael-icon-camel.component';
+import { RaphaelIconMuleDirective } from './raphael-icon-mule.component';
+import { RaphaelIconAlfrescoPublishDirective } from './raphael-icon-alfresco-publish.component';
+import { RaphaelIconRestCallDirective } from './raphael-icon-rest-call.component';
+import { RaphaelIconGoogleDrivePublishDirective } from './raphael-icon-google-drive-publish.component';
+
+// primitives
+export * from './raphael-icon-service.component';
+export * from './raphael-icon-send.component';
+export * from './raphael-icon-user.component';
+export * from './raphael-icon-manual.component';
+export * from './raphael-icon-camel.component';
+export * from './raphael-icon-mule.component';
+export * from './raphael-icon-alfresco-publish.component';
+export * from './raphael-icon-rest-call.component';
+export * from './raphael-icon-google-drive-publish.component';
+
+export const RAPHAEL_ICONS_DIRECTIVES: any[] = [
+    RaphaelIconServiceDirective,
+    RaphaelIconSendDirective,
+    RaphaelIconUserDirective,
+    RaphaelIconManualDirective,
+    RaphaelIconCamelDirective,
+    RaphaelIconMuleDirective,
+    RaphaelIconAlfrescoPublishDirective,
+    RaphaelIconRestCallDirective,
+    RaphaelIconGoogleDrivePublishDirective
+];
diff --git a/ng2-components/ng2-activiti-analytics/src/components/raphael/raphael-icon-alfresco-publish.component.ts b/ng2-components/ng2-activiti-analytics/src/components/raphael/icons/raphael-icon-alfresco-publish.component.ts
similarity index 98%
rename from ng2-components/ng2-activiti-analytics/src/components/raphael/raphael-icon-alfresco-publish.component.ts
rename to ng2-components/ng2-activiti-analytics/src/components/raphael/icons/raphael-icon-alfresco-publish.component.ts
index a013b1f9bb..878b094511 100644
--- a/ng2-components/ng2-activiti-analytics/src/components/raphael/raphael-icon-alfresco-publish.component.ts
+++ b/ng2-components/ng2-activiti-analytics/src/components/raphael/icons/raphael-icon-alfresco-publish.component.ts
@@ -16,9 +16,9 @@
  */
 
 import { Directive, OnInit, ElementRef, Input, Output, EventEmitter } from '@angular/core';
-import { Point } from './models/point';
-import { RaphaelBase } from './raphael-base';
-import { RaphaelService } from './raphael.service';
+import { Point } from './../models/point';
+import { RaphaelBase } from './../raphael-base';
+import { RaphaelService } from './../raphael.service';
 
 @Directive({selector: 'raphael-icon-alfresco-publish'})
 export class RaphaelIconAlfrescoPublishDirective extends RaphaelBase implements OnInit {
diff --git a/ng2-components/ng2-activiti-analytics/src/components/raphael/raphael-icon-camel.component.ts b/ng2-components/ng2-activiti-analytics/src/components/raphael/icons/raphael-icon-camel.component.ts
similarity index 96%
rename from ng2-components/ng2-activiti-analytics/src/components/raphael/raphael-icon-camel.component.ts
rename to ng2-components/ng2-activiti-analytics/src/components/raphael/icons/raphael-icon-camel.component.ts
index c737c4e092..81339c4abb 100644
--- a/ng2-components/ng2-activiti-analytics/src/components/raphael/raphael-icon-camel.component.ts
+++ b/ng2-components/ng2-activiti-analytics/src/components/raphael/icons/raphael-icon-camel.component.ts
@@ -16,9 +16,9 @@
  */
 
 import { Directive, OnInit, ElementRef, Input, Output, EventEmitter } from '@angular/core';
-import { Point } from './models/point';
-import { RaphaelBase } from './raphael-base';
-import { RaphaelService } from './raphael.service';
+import { Point } from './../models/point';
+import { RaphaelBase } from './../raphael-base';
+import { RaphaelService } from './../raphael.service';
 
 @Directive({selector: 'raphael-icon-camel'})
 export class RaphaelIconCamelDirective extends RaphaelBase implements OnInit {
diff --git a/ng2-components/ng2-activiti-analytics/src/components/raphael/raphael-icon-google-drive-publish.component.ts b/ng2-components/ng2-activiti-analytics/src/components/raphael/icons/raphael-icon-google-drive-publish.component.ts
similarity index 94%
rename from ng2-components/ng2-activiti-analytics/src/components/raphael/raphael-icon-google-drive-publish.component.ts
rename to ng2-components/ng2-activiti-analytics/src/components/raphael/icons/raphael-icon-google-drive-publish.component.ts
index ae9998e22e..065cf35235 100644
--- a/ng2-components/ng2-activiti-analytics/src/components/raphael/raphael-icon-google-drive-publish.component.ts
+++ b/ng2-components/ng2-activiti-analytics/src/components/raphael/icons/raphael-icon-google-drive-publish.component.ts
@@ -16,9 +16,9 @@
  */
 
 import { Directive, OnInit, ElementRef, Input, Output, EventEmitter } from '@angular/core';
-import { Point } from './models/point';
-import { RaphaelBase } from './raphael-base';
-import { RaphaelService } from './raphael.service';
+import { Point } from './../models/point';
+import { RaphaelBase } from './../raphael-base';
+import { RaphaelService } from './../raphael.service';
 
 @Directive({selector: 'raphael-icon-google-drive-publish'})
 export class RaphaelIconGoogleDrivePublishDirective extends RaphaelBase implements OnInit {
diff --git a/ng2-components/ng2-activiti-analytics/src/components/raphael/raphael-icon-manual.component.ts b/ng2-components/ng2-activiti-analytics/src/components/raphael/icons/raphael-icon-manual.component.ts
similarity index 95%
rename from ng2-components/ng2-activiti-analytics/src/components/raphael/raphael-icon-manual.component.ts
rename to ng2-components/ng2-activiti-analytics/src/components/raphael/icons/raphael-icon-manual.component.ts
index 4e4bc311a2..9f073711f6 100644
--- a/ng2-components/ng2-activiti-analytics/src/components/raphael/raphael-icon-manual.component.ts
+++ b/ng2-components/ng2-activiti-analytics/src/components/raphael/icons/raphael-icon-manual.component.ts
@@ -16,9 +16,9 @@
  */
 
 import { Directive, OnInit, ElementRef, Input, Output, EventEmitter } from '@angular/core';
-import { Point } from './models/point';
-import { RaphaelBase } from './raphael-base';
-import { RaphaelService } from './raphael.service';
+import { Point } from './../models/point';
+import { RaphaelBase } from './../raphael-base';
+import { RaphaelService } from './../raphael.service';
 
 @Directive({selector: 'raphael-icon-manual'})
 export class RaphaelIconManualDirective extends RaphaelBase implements OnInit {
diff --git a/ng2-components/ng2-activiti-analytics/src/components/raphael/raphael-icon-mule.component.ts b/ng2-components/ng2-activiti-analytics/src/components/raphael/icons/raphael-icon-mule.component.ts
similarity index 94%
rename from ng2-components/ng2-activiti-analytics/src/components/raphael/raphael-icon-mule.component.ts
rename to ng2-components/ng2-activiti-analytics/src/components/raphael/icons/raphael-icon-mule.component.ts
index ebdaa63f22..3bf4e42147 100644
--- a/ng2-components/ng2-activiti-analytics/src/components/raphael/raphael-icon-mule.component.ts
+++ b/ng2-components/ng2-activiti-analytics/src/components/raphael/icons/raphael-icon-mule.component.ts
@@ -16,9 +16,9 @@
  */
 
 import { Directive, OnInit, ElementRef, Input, Output, EventEmitter } from '@angular/core';
-import { Point } from './models/point';
-import { RaphaelBase } from './raphael-base';
-import { RaphaelService } from './raphael.service';
+import { Point } from './../models/point';
+import { RaphaelBase } from './../raphael-base';
+import { RaphaelService } from './../raphael.service';
 
 @Directive({selector: 'raphael-icon-mule'})
 export class RaphaelIconMuleDirective extends RaphaelBase implements OnInit {
diff --git a/ng2-components/ng2-activiti-analytics/src/components/raphael/raphael-icon-rest-call.component.ts b/ng2-components/ng2-activiti-analytics/src/components/raphael/icons/raphael-icon-rest-call.component.ts
similarity index 95%
rename from ng2-components/ng2-activiti-analytics/src/components/raphael/raphael-icon-rest-call.component.ts
rename to ng2-components/ng2-activiti-analytics/src/components/raphael/icons/raphael-icon-rest-call.component.ts
index 8a53130abd..a46e83d67d 100644
--- a/ng2-components/ng2-activiti-analytics/src/components/raphael/raphael-icon-rest-call.component.ts
+++ b/ng2-components/ng2-activiti-analytics/src/components/raphael/icons/raphael-icon-rest-call.component.ts
@@ -16,9 +16,9 @@
  */
 
 import { Directive, OnInit, ElementRef, Input, Output, EventEmitter } from '@angular/core';
-import { Point } from './models/point';
-import { RaphaelBase } from './raphael-base';
-import { RaphaelService } from './raphael.service';
+import { Point } from './../models/point';
+import { RaphaelBase } from './../raphael-base';
+import { RaphaelService } from './../raphael.service';
 
 @Directive({selector: 'raphael-icon-rest-call'})
 export class RaphaelIconRestCallDirective extends RaphaelBase implements OnInit {
diff --git a/ng2-components/ng2-activiti-analytics/src/components/raphael/raphael-icon-send.component.ts b/ng2-components/ng2-activiti-analytics/src/components/raphael/icons/raphael-icon-send.component.ts
similarity index 92%
rename from ng2-components/ng2-activiti-analytics/src/components/raphael/raphael-icon-send.component.ts
rename to ng2-components/ng2-activiti-analytics/src/components/raphael/icons/raphael-icon-send.component.ts
index b90240fa48..cd2adc4004 100644
--- a/ng2-components/ng2-activiti-analytics/src/components/raphael/raphael-icon-send.component.ts
+++ b/ng2-components/ng2-activiti-analytics/src/components/raphael/icons/raphael-icon-send.component.ts
@@ -16,9 +16,9 @@
  */
 
 import { Directive, OnInit, ElementRef, Input, Output, EventEmitter } from '@angular/core';
-import { Point } from './models/point';
-import { RaphaelBase } from './raphael-base';
-import { RaphaelService } from './raphael.service';
+import { Point } from './../models/point';
+import { RaphaelBase } from './../raphael-base';
+import { RaphaelService } from './../raphael.service';
 
 @Directive({selector: 'raphael-icon-send'})
 export class RaphaelIconSendDirective extends RaphaelBase implements OnInit {
diff --git a/ng2-components/ng2-activiti-analytics/src/components/raphael/raphael-icon-service.component.ts b/ng2-components/ng2-activiti-analytics/src/components/raphael/icons/raphael-icon-service.component.ts
similarity index 96%
rename from ng2-components/ng2-activiti-analytics/src/components/raphael/raphael-icon-service.component.ts
rename to ng2-components/ng2-activiti-analytics/src/components/raphael/icons/raphael-icon-service.component.ts
index 8706ffc313..c5db7a5601 100644
--- a/ng2-components/ng2-activiti-analytics/src/components/raphael/raphael-icon-service.component.ts
+++ b/ng2-components/ng2-activiti-analytics/src/components/raphael/icons/raphael-icon-service.component.ts
@@ -16,9 +16,9 @@
  */
 
 import { Directive, OnInit, ElementRef, Input, Output, EventEmitter } from '@angular/core';
-import { Point } from './models/point';
-import { RaphaelBase } from './raphael-base';
-import { RaphaelService } from './raphael.service';
+import { Point } from './../models/point';
+import { RaphaelBase } from './../raphael-base';
+import { RaphaelService } from './../raphael.service';
 
 @Directive({selector: 'raphael-icon-service'})
 export class RaphaelIconServiceDirective extends RaphaelBase implements OnInit {
diff --git a/ng2-components/ng2-activiti-analytics/src/components/raphael/raphael-icon-user.component.ts b/ng2-components/ng2-activiti-analytics/src/components/raphael/icons/raphael-icon-user.component.ts
similarity index 92%
rename from ng2-components/ng2-activiti-analytics/src/components/raphael/raphael-icon-user.component.ts
rename to ng2-components/ng2-activiti-analytics/src/components/raphael/icons/raphael-icon-user.component.ts
index d1b91833f2..b0ee5a149e 100644
--- a/ng2-components/ng2-activiti-analytics/src/components/raphael/raphael-icon-user.component.ts
+++ b/ng2-components/ng2-activiti-analytics/src/components/raphael/icons/raphael-icon-user.component.ts
@@ -16,9 +16,9 @@
  */
 
 import { Directive, OnInit, ElementRef, Input, Output, EventEmitter } from '@angular/core';
-import { Point } from './models/point';
-import { RaphaelBase } from './raphael-base';
-import { RaphaelService } from './raphael.service';
+import { Point } from './../models/point';
+import { RaphaelBase } from './../raphael-base';
+import { RaphaelService } from './../raphael.service';
 
 @Directive({selector: 'raphael-icon-user'})
 export class RaphaelIconUserDirective extends RaphaelBase implements OnInit {
diff --git a/ng2-components/ng2-activiti-analytics/src/components/raphael/index.ts b/ng2-components/ng2-activiti-analytics/src/components/raphael/index.ts
index f61ba9bcfc..38d5586956 100644
--- a/ng2-components/ng2-activiti-analytics/src/components/raphael/index.ts
+++ b/ng2-components/ng2-activiti-analytics/src/components/raphael/index.ts
@@ -25,15 +25,7 @@ import { RaphaelRhombusDirective } from './raphael-rhombus.component';
 import { RaphaelPentagonDirective } from './raphael-pentagon.component';
 
 // icons
-import { RaphaelIconServiceDirective } from './raphael-icon-service.component';
-import { RaphaelIconSendDirective } from './raphael-icon-send.component';
-import { RaphaelIconUserDirective } from './raphael-icon-user.component';
-import { RaphaelIconManualDirective } from './raphael-icon-manual.component';
-import { RaphaelIconCamelDirective } from './raphael-icon-camel.component';
-import { RaphaelIconMuleDirective } from './raphael-icon-mule.component';
-import { RaphaelIconAlfrescoPublishDirective } from './raphael-icon-alfresco-publish.component';
-import { RaphaelIconRestCallDirective } from './raphael-icon-rest-call.component';
-import { RaphaelIconGoogleDrivePublishDirective } from './raphael-icon-google-drive-publish.component';
+import { RAPHAEL_ICONS_DIRECTIVES } from './icons/index';
 
 // primitives
 export * from './raphael-circle.component';
@@ -44,16 +36,7 @@ export * from './raphael-cross.component';
 export * from './raphael-plus.component';
 export * from './raphael-rhombus.component';
 export * from './raphael-pentagon.component';
-
-export * from './raphael-icon-service.component';
-export * from './raphael-icon-send.component';
-export * from './raphael-icon-user.component';
-export * from './raphael-icon-manual.component';
-export * from './raphael-icon-camel.component';
-export * from './raphael-icon-mule.component';
-export * from './raphael-icon-alfresco-publish.component';
-export * from './raphael-icon-rest-call.component';
-export * from './raphael-icon-google-drive-publish.component';
+export * from './icons/index';
 
 export const RAPHAEL_DIRECTIVES: any[] = [
     RaphaelCircleDirective,
@@ -64,13 +47,5 @@ export const RAPHAEL_DIRECTIVES: any[] = [
     RaphaelPlusDirective,
     RaphaelRhombusDirective,
     RaphaelPentagonDirective,
-    RaphaelIconServiceDirective,
-    RaphaelIconSendDirective,
-    RaphaelIconUserDirective,
-    RaphaelIconManualDirective,
-    RaphaelIconCamelDirective,
-    RaphaelIconMuleDirective,
-    RaphaelIconAlfrescoPublishDirective,
-    RaphaelIconRestCallDirective,
-    RaphaelIconGoogleDrivePublishDirective
+    RAPHAEL_ICONS_DIRECTIVES
 ];