diff --git a/packaging/pom.xml b/packaging/pom.xml
index 9304d42..acc3888 100644
--- a/packaging/pom.xml
+++ b/packaging/pom.xml
@@ -2,24 +2,30 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>@@@groupId@@@</groupId>
-    <artifactId>@@@artifactId@@@</artifactId>
+    <groupId>org.exoplatform.addons.training</groupId>
+    <artifactId>training-exercices-parent</artifactId>
     <version>1.0.x-SNAPSHOT</version>
   </parent>
-  <artifactId>@@@artifactId@@@-packaging</artifactId>
+  <artifactId>training-exercices-packaging</artifactId>
   <packaging>pom</packaging>
-  <name>@@@name@@@ - Packaging</name>
+  <name>Training Exercises - Packaging</name>
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>@@@artifactId@@@-war</artifactId>
-      <version>1.0.x-SNAPSHOT</version>
+      <artifactId>training-exercises-webapp</artifactId>
+      <version>${project.version}</version>
       <type>war</type>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>training-exercises-services</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
   </dependencies>
   <build>
-    <finalName>@@@artifactId@@@</finalName>
+    <finalName>training-exercises-packaging</finalName>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -32,7 +38,7 @@
               <goal>single</goal>
             </goals>
             <configuration>
-              <finalName>@@@artifactId@@@</finalName>
+              <finalName>training-exercises-packaging</finalName>
               <appendAssemblyId>false</appendAssemblyId>
               <descriptors>
                 <descriptor>src/main/assemblies/packaging.xml</descriptor>
diff --git a/packaging/src/main/assemblies/packaging.xml b/packaging/src/main/assemblies/packaging.xml
index 314b6b0..806b599 100644
--- a/packaging/src/main/assemblies/packaging.xml
+++ b/packaging/src/main/assemblies/packaging.xml
@@ -1,7 +1,7 @@
 <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
-  <id>@@@artifactId@@@-addon</id>
+  <id>training-exercises-addon</id>
   <formats>
     <format>zip</format>
   </formats>
@@ -12,17 +12,17 @@
       <useProjectArtifact>false</useProjectArtifact>
       <outputDirectory></outputDirectory>
       <includes>
-        <include>${project.groupId}:@@@artifactId@@@-war:war</include>
+        <include>${project.groupId}:training-exercises-webapp:war</include>
       </includes>
       <scope>provided</scope>
-      <outputFileNameMapping>@@@artifactId@@@.war</outputFileNameMapping>
+      <outputFileNameMapping>training-exercises-webapp.war</outputFileNameMapping>
     </dependencySet>
     <!-- Libraries -->
     <dependencySet>
       <useProjectArtifact>false</useProjectArtifact>
       <outputDirectory></outputDirectory>
       <includes>
-        <include>${project.groupId}:@@@artifactId@@@-*:jar</include>
+        <include>${project.groupId}:training-exercises-services:jar</include>
       </includes>
       <scope>provided</scope>
       <outputFileNameMapping>${artifact.artifactId}-${artifact.baseVersion}.${artifact.extension}
diff --git a/pom.xml b/pom.xml
index d2731d7..278c0b3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,24 +26,19 @@
     <groupId>org.exoplatform.addons</groupId>
     <version>6</version>
   </parent>
-  <groupId>@@@groupId@@@</groupId>
-  <artifactId>@@@artifactId@@@</artifactId>
+  <groupId>org.exoplatform.addons.training</groupId>
+  <artifactId>training-exercices-parent</artifactId>
   <version>1.0.x-SNAPSHOT</version>
   <packaging>pom</packaging>
-  <name>@@@name@@@</name>
-  <description>@@@description@@@</description>
+  <name>Training addon - Parent</name>
+  <description>Parent for training addon</description>
   <modules>
+    <module>services</module>
     <module>war</module>
     <module>packaging</module>
   </modules>
-  <scm>
-    <connection>scm:git:git://github.com/exo-addons/@@@git_project@@@.git</connection>
-    <developerConnection>scm:git:git@github.com:exo-addons/@@@git_project@@@.git</developerConnection>
-    <tag>HEAD</tag>
-    <url>https://github.com/exo-addons/@@@git_project@@@</url>
-  </scm>
   <properties>
-    <platform.version>@@@platform_version@@@</platform.version>
+    <platform.version>5.0.1</platform.version>
   </properties>
   <dependencyManagement>
     <dependencies>
@@ -55,6 +50,11 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+      <dependency>
+        <groupId>org.exoplatform.kernel</groupId>
+        <artifactId>exo.kernel.commons</artifactId>
+        <version>${platform.version}</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 </project>
diff --git a/services/pom.xml b/services/pom.xml
new file mode 100644
index 0000000..ac4546e
--- /dev/null
+++ b/services/pom.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <parent>
+    <groupId>org.exoplatform.addons.training</groupId>
+    <artifactId>training-exercices-parent</artifactId>
+    <version>1.0.x-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>training-exercises-services</artifactId>
+  <version>1.0.x-SNAPSHOT</version>
+  <dependencies>
+    <dependency>
+      <groupId>picocontainer</groupId>
+      <artifactId>picocontainer</artifactId>
+      <version>1.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.exoplatform.kernel</groupId>
+      <artifactId>exo.kernel.commons</artifactId>
+      <version>${platform.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.exoplatform.kernel</groupId>
+      <artifactId>exo.kernel.container</artifactId>
+      <version>${platform.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.exoplatform.commons</groupId>
+      <artifactId>commons-api</artifactId>
+      <version>${platform.version}</version>
+    </dependency>
+      <dependency>
+          <groupId>org.exoplatform.social</groupId>
+          <artifactId>social-component-core-jpa</artifactId>
+          <version>5.0.0-RC13</version>
+      </dependency>
+      <dependency>
+          <groupId>org.exoplatform.social</groupId>
+          <artifactId>social-component-core-jpa</artifactId>
+          <version>5.0.0-RC13</version>
+      </dependency>
+  </dependencies>
+  <name>Training Exercise - Services</name>
+  <build>
+    <finalName>training-exercises-services</finalName>
+  </build>
+</project>
\ No newline at end of file
diff --git a/services/src/main/java/org/exoplatform/addons/entity/FavouriteActivity.java b/services/src/main/java/org/exoplatform/addons/entity/FavouriteActivity.java
new file mode 100644
index 0000000..b7a76f8
--- /dev/null
+++ b/services/src/main/java/org/exoplatform/addons/entity/FavouriteActivity.java
@@ -0,0 +1,60 @@
+package org.exoplatform.addons.entity;
+
+import javax.persistence.*;
+
+import org.exoplatform.commons.api.persistence.ExoEntity;
+import org.exoplatform.social.core.jpa.storage.entity.ActivityEntity;
+import org.exoplatform.social.core.jpa.storage.entity.IdentityEntity;
+
+import java.util.Calendar;
+
+@Entity
+@ExoEntity
+@Table(name = "ADDON_FAVOURITE_ACTIVITY")
+public class FavouriteActivity {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    @Column(name = "ID")
+    private Long id;
+    @ManyToOne
+    private IdentityEntity favouriteBy;
+    @ManyToOne
+    private ActivityEntity activity;
+
+    @Temporal(value = TemporalType.TIMESTAMP)
+    @Column(name = "FAVOURITE_DATE")
+    private Calendar favouriteDate;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public IdentityEntity getFavouriteBy() {
+        return favouriteBy;
+    }
+
+    public void setFavouriteBy(IdentityEntity favouriteBy) {
+        this.favouriteBy = favouriteBy;
+    }
+
+    public ActivityEntity getActivity() {
+        return activity;
+    }
+
+    public void setActivity(ActivityEntity activity) {
+        this.activity = activity;
+    }
+
+    public Calendar getFavouriteDate() {
+        return favouriteDate;
+    }
+
+    public void setFavouriteDate(Calendar favouriteDate) {
+        this.favouriteDate = favouriteDate;
+    }
+}
diff --git a/services/src/main/java/org/exoplatform/addons/services/MyService.java b/services/src/main/java/org/exoplatform/addons/services/MyService.java
new file mode 100644
index 0000000..37f01d9
--- /dev/null
+++ b/services/src/main/java/org/exoplatform/addons/services/MyService.java
@@ -0,0 +1,29 @@
+package org.exoplatform.addons.services;
+
+import org.exoplatform.services.log.ExoLogger;
+import org.exoplatform.services.log.Log;
+
+/**
+ * Created by eXo Platform SAS.
+ *
+ * @author Ali Hamdi <ahamdi@exoplatform.com>
+ * @since 13/09/18 15:12
+ */
+
+public class MyService {
+  /**
+   * The logger.
+   */
+  private static final Log LOG = ExoLogger.getExoLogger(MyService.class);
+  private String message="alioua";
+  public MyService() {
+  }
+
+  public String getMessage() {
+
+
+    return message;
+  }
+
+
+}
diff --git a/services/src/main/java/org/exoplatform/addons/services/MyStartableService.java b/services/src/main/java/org/exoplatform/addons/services/MyStartableService.java
new file mode 100644
index 0000000..8c9a21d
--- /dev/null
+++ b/services/src/main/java/org/exoplatform/addons/services/MyStartableService.java
@@ -0,0 +1,33 @@
+package org.exoplatform.addons.services;
+
+import org.exoplatform.container.ExoContainerContext;
+import org.exoplatform.container.PortalContainer;
+import org.picocontainer.Startable;
+import org.exoplatform.services.log.*;
+
+/**
+ * Created by eXo Platform SAS.
+ *
+ */
+
+public class MyStartableService implements Startable {
+  /**
+   * The logger.
+   */
+  private static final Log LOG = ExoLogger.getExoLogger(MyStartableService.class);
+
+  public MyStartableService() {
+
+  }
+
+  @Override
+  public void start() {
+    LOG.info("&&&&&&&&&&&& My Startable service started !");
+
+  }
+
+  @Override
+  public void stop() {
+    LOG.info("&&&&&&&&&&&& My Startable service stopped !");
+  }
+}
diff --git a/services/src/main/resources/conf/configuration.xml b/services/src/main/resources/conf/configuration.xml
new file mode 100644
index 0000000..61106db
--- /dev/null
+++ b/services/src/main/resources/conf/configuration.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (C) 2003-2014 eXo Platform SAS.
+
+    This is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Lesser General Public License as
+    published by the Free Software Foundation; either version 2.1 of
+    the License, or (at your option) any later version.
+
+    This software is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this software; if not, write to the Free
+    Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+    02110-1301 USA, or see the FSF site: http://www.fsf.org.
+
+-->
+<configuration
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd http://www.exoplatform.org/xml/ns/kernel_1_2.xsd"
+        xmlns="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd">
+
+    <external-component-plugins>
+        <target-component>org.exoplatform.commons.api.persistence.DataInitializer</target-component>
+        <component-plugin>
+            <name>SocialRDBMSChangeLogsPlugin</name>
+            <set-method>addChangeLogsPlugin</set-method>
+            <type>org.exoplatform.commons.persistence.impl.ChangeLogsPlugin</type>
+            <init-params>
+                <values-param>
+                    <name>changelogs</name>
+                    <description>Change logs of Social RDBMS</description>
+                    <value>db/changelog/addon-training-rdbms.db.changelog-1.0.0.xml</value>
+                </values-param>
+            </init-params>
+        </component-plugin>
+    </external-component-plugins>
+</configuration>
\ No newline at end of file
diff --git a/services/src/main/resources/conf/portal/configuration.xml b/services/src/main/resources/conf/portal/configuration.xml
new file mode 100644
index 0000000..374f96a
--- /dev/null
+++ b/services/src/main/resources/conf/portal/configuration.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+
+    Copyright (C) 2009 eXo Platform SAS.
+    
+    This is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Lesser General Public License as
+    published by the Free Software Foundation; either version 2.1 of
+    the License, or (at your option) any later version.
+    
+    This software is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+    Lesser General Public License for more details.
+    
+    You should have received a copy of the GNU Lesser General Public
+    License along with this software; if not, write to the Free
+    Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+    02110-1301 USA, or see the FSF site: http://www.fsf.org.
+
+-->
+
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd http://www.exoplatform.org/xml/ns/kernel_1_2.xsd"
+               xmlns="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd">
+    <component>
+        <type>org.exoplatform.commons.persistence.impl.EntityManagerService</type>
+    </component>
+    <component>
+        <type>org.exoplatform.addons.services.MyService</type>
+    </component>
+    <component>
+        <type>org.exoplatform.addons.services.MyStartableService</type>
+    </component>
+    <component>
+        <type>org.exoplatform.addons.test.MyStartableServiceTest</type>
+    </component>
+</configuration>
\ No newline at end of file
diff --git a/services/src/main/resources/db/changelog/addon-training-rdbms.db.changelog-1.0.0.xml b/services/src/main/resources/db/changelog/addon-training-rdbms.db.changelog-1.0.0.xml
new file mode 100644
index 0000000..5407070
--- /dev/null
+++ b/services/src/main/resources/db/changelog/addon-training-rdbms.db.changelog-1.0.0.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (C) 2003-2016 eXo Platform SAS.
+
+    This is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Lesser General Public License as
+    published by the Free Software Foundation; either version 2.1 of
+    the License, or (at your option) any later version.
+
+    This software is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this software; if not, write to the Free
+    Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+    02110-1301 USA, or see the FSF site: http://www.fsf.org.
+
+-->
+<databaseChangeLog
+        xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
+                      http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.4.xsd">
+
+    <!-- Managing both DB that use sequences and db that use auto increment -->
+    <property name="autoIncrement" value="true" dbms="mysql,mssql,h2,sybase,db2,hsqldb"/>
+    <property name="autoIncrement" value="false" dbms="oracle,postgresql"/>
+
+    <!-- Managing auto generation of timestamp by Database -->
+    <property name="now" value="now()" dbms="mysql,hsqldb,postgresql,h2"/>
+    <property name="now" value="sysdate" dbms="oracle"/>
+    <property name="now" value="CURRENT_TIMESTAMP" dbms="mssql"/>
+
+    <changeSet author="addon-training" id="1.0.0-1">
+        <createTable tableName="ADDON_FAVOURITE_ACTIVITY">
+            <column name="ID" type="BIGINT" autoIncrement="${autoIncrement}" startWith="1">
+                <constraints nullable="false" primaryKey="true" primaryKeyName="PK_FAVOURITE_ACTIVITY"></constraints>
+            </column>
+            <column name="FAVOURITE_DATE" type="TIMESTAMP">
+                <constraints nullable="false"/>
+            </column>
+            <column name="FAVOURITE_BY_ID" type="BIGINT">
+                <constraints nullable="false"/>
+            </column>
+            <column name="ACTIVITY_ID" type="BIGINT">
+                <constraints nullable="true"/>
+            </column>
+        </createTable>
+        <modifySql dbms="mysql">
+            <append value=" ENGINE=INNODB CHARSET=UTF8 COLLATE utf8_general_ci"/>
+        </modifySql>
+    </changeSet>
+</databaseChangeLog>
diff --git a/services/src/test/org/exoplatform/addons/services/MyServiceTest.java b/services/src/test/org/exoplatform/addons/services/MyServiceTest.java
new file mode 100644
index 0000000..e1f1825
--- /dev/null
+++ b/services/src/test/org/exoplatform/addons/services/MyServiceTest.java
@@ -0,0 +1,16 @@
+package org.exoplatform.addons.services;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class MyServiceTest {
+
+    @Test
+    void getMessage() {
+        MyService my=new MyService();
+
+        assertNotNull(my.getMessage());
+        assertEquals("alioua", my.getMessage());
+    }
+}
\ No newline at end of file
diff --git a/war/pom.xml b/war/pom.xml
index 8597b1b..40f4851 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -22,14 +22,14 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>@@@groupId@@@</groupId>
-    <artifactId>@@@artifactId@@@</artifactId>
+    <groupId>org.exoplatform.addons.training</groupId>
+    <artifactId>training-exercices-parent</artifactId>
    <version>1.0.x-SNAPSHOT</version>
   </parent>
-  <artifactId>@@@artifactId@@@-war</artifactId>
+  <artifactId>training-exercises-webapp</artifactId>
   <packaging>war</packaging>
-  <name>@@@name@@@ - Webapp</name>
+  <name>Training Exercises - Webapp</name>
   <build>
-    <finalName>@@@artifactId@@@-extension</finalName>
+    <finalName>training-exercises-extension</finalName>
   </build>
 </project>
diff --git a/war/src/main/webapp/META-INF/exo-conf/configuration.xml b/war/src/main/webapp/META-INF/exo-conf/configuration.xml
index 8758580..4743ac8 100644
--- a/war/src/main/webapp/META-INF/exo-conf/configuration.xml
+++ b/war/src/main/webapp/META-INF/exo-conf/configuration.xml
@@ -46,7 +46,7 @@
           <field name="dependencies">
             <collection type="java.util.ArrayList">
               <value>
-                <string>@@@artifactId@@@</string>
+                <string>training-exercises-extension</string>
               </value>
             </collection>
           </field>
diff --git a/war/src/main/webapp/WEB-INF/conf/configuration.xml b/war/src/main/webapp/WEB-INF/conf/configuration.xml
index 3ac88a4..00b465e 100644
--- a/war/src/main/webapp/WEB-INF/conf/configuration.xml
+++ b/war/src/main/webapp/WEB-INF/conf/configuration.xml
@@ -22,5 +22,12 @@
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd http://www.exoplatform.org/xml/ns/kernel_1_2.xsd"
 	xmlns="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd">
-
+	<component>
+		<key>org.exoplatform.addons.services.MyStartableService</key>
+		<type>org.exoplatform.addons.services.MyStartableService</type>
+	</component>
+	<component>
+		<key>org.exoplatform.addons.services.MyService</key>
+		<type>org.exoplatform.addons.services.MyService</type>
+	</component>
 </configuration>
diff --git a/war/src/main/webapp/WEB-INF/web.xml b/war/src/main/webapp/WEB-INF/web.xml
index 4971888..c15ecc3 100644
--- a/war/src/main/webapp/WEB-INF/web.xml
+++ b/war/src/main/webapp/WEB-INF/web.xml
@@ -24,7 +24,7 @@
 <!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
                  "http://java.sun.com/dtd/web-app_2_3.dtd">
 <web-app>
-	<display-name>@@@artifactId@@@</display-name>
+	<display-name>training-exercises-extension</display-name>
 
 	<!-- ================================================================== -->
 	<!--           LISTENER                                                 -->