diff --git a/.travis.yml b/.travis.yml
index f2e89c7..63c140b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,5 +15,5 @@ android:
     - extra-android-m2repository
 
 notifications:
-#  slack: literacyapp:HLjtHJdZ7DYJV2DlnDLrG6Gl
+  slack: elimu-ai:5hNcmHPFkAETjJZjrkBlNTxr
   email: false
\ No newline at end of file
diff --git a/README.md b/README.md
index f998d7a..cf95ef1 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# literacyapp-start-guide
+# start-guide
 Android application teaching basic tablet UI navigation
 
 ![screenshot_20170605-194552](https://cloud.githubusercontent.com/assets/15718174/26795982/fee64200-4a27-11e7-9c2a-e000efefda3a.png)
diff --git a/app/build.gradle b/app/build.gradle
index a94efe2..d552f7c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -4,11 +4,11 @@ android {
     compileSdkVersion 23
     buildToolsVersion "23.0.1"
     defaultConfig {
-        applicationId "org.literacyapp.startguide"
+        applicationId "ai.elimu.startguide"
         minSdkVersion 21
         targetSdkVersion 23
-        versionCode 1000004
-        versionName "1.0.4"
+        versionCode 2000000
+        versionName "2.0.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
diff --git a/app/src/androidTest/java/org/literacyapp/startguide/ExampleInstrumentedTest.java b/app/src/androidTest/java/ai/elimu/startguide/ExampleInstrumentedTest.java
similarity index 81%
rename from app/src/androidTest/java/org/literacyapp/startguide/ExampleInstrumentedTest.java
rename to app/src/androidTest/java/ai/elimu/startguide/ExampleInstrumentedTest.java
index f156100..6ac0b28 100644
--- a/app/src/androidTest/java/org/literacyapp/startguide/ExampleInstrumentedTest.java
+++ b/app/src/androidTest/java/ai/elimu/startguide/ExampleInstrumentedTest.java
@@ -1,4 +1,4 @@
-package org.literacyapp.startguide;
+package ai.elimu.startguide;
 
 import android.content.Context;
 import android.support.test.InstrumentationRegistry;
@@ -21,6 +21,6 @@ public void useAppContext() throws Exception {
         // Context of the app under test.
         Context appContext = InstrumentationRegistry.getTargetContext();
 
-        assertEquals("org.literacyapp.startguide", appContext.getPackageName());
+        assertEquals("ai.elimu.startguide", appContext.getPackageName());
     }
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ff9bdf1..e1b8509 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="org.literacyapp.startguide">
+          package="ai.elimu.startguide">
 
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
 
@@ -11,7 +11,7 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <activity
-            android:name=".content.swipe.SwipeUpDownActivity"
+            android:name="ai.elimu.startguide.content.swipe.SwipeUpDownActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:noHistory="true">
             <intent-filter>
@@ -21,15 +21,15 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".content.swipe.SwipeRightLeftActivity"
+            android:name="ai.elimu.startguide.content.swipe.SwipeRightLeftActivity"
             android:noHistory="true"/>
         <activity
-            android:name=".content.ExitFullScreenActivity"
+            android:name="ai.elimu.startguide.content.ExitFullScreenActivity"
             android:configChanges="orientation|screenSize"/>
         <activity
-            android:name=".content.FinalActivity"
+            android:name="ai.elimu.startguide.content.FinalActivity"
             android:noHistory="true"/>
-        <activity android:name=".TestGestureActivity">
+        <activity android:name="ai.elimu.startguide.TestGestureActivity">
             <!--<intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
 
@@ -37,7 +37,7 @@
             </intent-filter>-->
         </activity>
 
-        <receiver android:name=".receiver.BootReceiver">
+        <receiver android:name="ai.elimu.startguide.receiver.BootReceiver">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED"/>
             </intent-filter>
diff --git a/app/src/main/java/org/literacyapp/startguide/TestGestureActivity.java b/app/src/main/java/ai/elimu/startguide/TestGestureActivity.java
similarity index 71%
rename from app/src/main/java/org/literacyapp/startguide/TestGestureActivity.java
rename to app/src/main/java/ai/elimu/startguide/TestGestureActivity.java
index 46db49e..272bb00 100644
--- a/app/src/main/java/org/literacyapp/startguide/TestGestureActivity.java
+++ b/app/src/main/java/ai/elimu/startguide/TestGestureActivity.java
@@ -1,13 +1,14 @@
-package org.literacyapp.startguide;
+package ai.elimu.startguide;
 
 import android.app.Activity;
 import android.os.Bundle;
 
-import org.literacyapp.handgesture.HandView;
+import ai.elimu.handgesture.HandView;
+import ai.elimu.startguide.R;
 
-import static org.literacyapp.handgesture.Gestures.DOUBLE_TAP;
-import static org.literacyapp.handgesture.Gestures.PRESS_AND_HOLD;
-import static org.literacyapp.handgesture.Gestures.SINGLE_TAP;
+import static ai.elimu.handgesture.Gestures.DOUBLE_TAP;
+import static ai.elimu.handgesture.Gestures.PRESS_AND_HOLD;
+import static ai.elimu.handgesture.Gestures.SINGLE_TAP;
 
 public class TestGestureActivity extends Activity {
 
diff --git a/app/src/main/java/org/literacyapp/startguide/content/ExitFullScreenActivity.java b/app/src/main/java/ai/elimu/startguide/content/ExitFullScreenActivity.java
similarity index 93%
rename from app/src/main/java/org/literacyapp/startguide/content/ExitFullScreenActivity.java
rename to app/src/main/java/ai/elimu/startguide/content/ExitFullScreenActivity.java
index 39e274b..a780d72 100644
--- a/app/src/main/java/org/literacyapp/startguide/content/ExitFullScreenActivity.java
+++ b/app/src/main/java/ai/elimu/startguide/content/ExitFullScreenActivity.java
@@ -1,4 +1,4 @@
-package org.literacyapp.startguide.content;
+package ai.elimu.startguide.content;
 
 import android.app.Activity;
 import android.content.Intent;
@@ -7,10 +7,10 @@
 import android.view.MotionEvent;
 import android.view.View;
 
-import org.literacyapp.handgesture.HandView;
-import org.literacyapp.handgesture.HandViewListener;
-import org.literacyapp.startguide.R;
-import org.literacyapp.startguide.util.MediaPlayerHelper;
+import ai.elimu.handgesture.HandView;
+import ai.elimu.handgesture.HandViewListener;
+import ai.elimu.startguide.R;
+import ai.elimu.startguide.util.MediaPlayerHelper;
 
 public class ExitFullScreenActivity extends Activity {
 
diff --git a/app/src/main/java/org/literacyapp/startguide/content/FinalActivity.java b/app/src/main/java/ai/elimu/startguide/content/FinalActivity.java
similarity index 84%
rename from app/src/main/java/org/literacyapp/startguide/content/FinalActivity.java
rename to app/src/main/java/ai/elimu/startguide/content/FinalActivity.java
index 4fd97e0..0f97cea 100644
--- a/app/src/main/java/org/literacyapp/startguide/content/FinalActivity.java
+++ b/app/src/main/java/ai/elimu/startguide/content/FinalActivity.java
@@ -1,4 +1,4 @@
-package org.literacyapp.startguide.content;
+package ai.elimu.startguide.content;
 
 import android.graphics.drawable.Animatable;
 import android.graphics.drawable.Drawable;
@@ -8,10 +8,10 @@
 import android.view.View;
 import android.widget.ImageView;
 
-import org.literacyapp.startguide.R;
-import org.literacyapp.startguide.util.MediaPlayerHelper;
+import ai.elimu.startguide.R;
+import ai.elimu.startguide.util.MediaPlayerHelper;
 
-import static org.literacyapp.startguide.util.MediaPlayerHelper.DEFAULT_PLAYER_DELAY;
+import static ai.elimu.startguide.util.MediaPlayerHelper.DEFAULT_PLAYER_DELAY;
 
 
 public class FinalActivity extends AppCompatActivity {
diff --git a/app/src/main/java/org/literacyapp/startguide/content/swipe/SwipeRightLeftActivity.java b/app/src/main/java/ai/elimu/startguide/content/swipe/SwipeRightLeftActivity.java
similarity index 93%
rename from app/src/main/java/org/literacyapp/startguide/content/swipe/SwipeRightLeftActivity.java
rename to app/src/main/java/ai/elimu/startguide/content/swipe/SwipeRightLeftActivity.java
index db2a2b8..1ee7e9e 100644
--- a/app/src/main/java/org/literacyapp/startguide/content/swipe/SwipeRightLeftActivity.java
+++ b/app/src/main/java/ai/elimu/startguide/content/swipe/SwipeRightLeftActivity.java
@@ -1,4 +1,4 @@
-package org.literacyapp.startguide.content.swipe;
+package ai.elimu.startguide.content.swipe;
 
 import android.content.Intent;
 import android.content.res.TypedArray;
@@ -13,11 +13,11 @@
 import android.view.ViewGroup;
 import android.widget.ImageView;
 
-import org.literacyapp.handgesture.HandView;
-import org.literacyapp.handgesture.HandViewListener;
-import org.literacyapp.startguide.R;
-import org.literacyapp.startguide.content.ExitFullScreenActivity;
-import org.literacyapp.startguide.util.MediaPlayerHelper;
+import ai.elimu.handgesture.HandView;
+import ai.elimu.handgesture.HandViewListener;
+import ai.elimu.startguide.R;
+import ai.elimu.startguide.content.ExitFullScreenActivity;
+import ai.elimu.startguide.util.MediaPlayerHelper;
 
 /**
  * Activity that explain swipe right and left
diff --git a/app/src/main/java/org/literacyapp/startguide/content/swipe/SwipeUpDownActivity.java b/app/src/main/java/ai/elimu/startguide/content/swipe/SwipeUpDownActivity.java
similarity index 89%
rename from app/src/main/java/org/literacyapp/startguide/content/swipe/SwipeUpDownActivity.java
rename to app/src/main/java/ai/elimu/startguide/content/swipe/SwipeUpDownActivity.java
index a48c853..10a53ac 100644
--- a/app/src/main/java/org/literacyapp/startguide/content/swipe/SwipeUpDownActivity.java
+++ b/app/src/main/java/ai/elimu/startguide/content/swipe/SwipeUpDownActivity.java
@@ -1,4 +1,4 @@
-package org.literacyapp.startguide.content.swipe;
+package ai.elimu.startguide.content.swipe;
 
 import android.content.Intent;
 import android.content.res.TypedArray;
@@ -9,11 +9,11 @@
 import android.view.View;
 import android.widget.RelativeLayout;
 
-import org.literacyapp.handgesture.Gestures;
-import org.literacyapp.handgesture.HandView;
-import org.literacyapp.handgesture.HandViewListener;
-import org.literacyapp.startguide.R;
-import org.literacyapp.startguide.util.MediaPlayerHelper;
+import ai.elimu.handgesture.Gestures;
+import ai.elimu.handgesture.HandView;
+import ai.elimu.handgesture.HandViewListener;
+import ai.elimu.startguide.R;
+import ai.elimu.startguide.util.MediaPlayerHelper;
 
 
 /**
diff --git a/app/src/main/java/org/literacyapp/startguide/content/swipe/SwipeUpDownAdapter.java b/app/src/main/java/ai/elimu/startguide/content/swipe/SwipeUpDownAdapter.java
similarity index 94%
rename from app/src/main/java/org/literacyapp/startguide/content/swipe/SwipeUpDownAdapter.java
rename to app/src/main/java/ai/elimu/startguide/content/swipe/SwipeUpDownAdapter.java
index b17bd01..a240267 100644
--- a/app/src/main/java/org/literacyapp/startguide/content/swipe/SwipeUpDownAdapter.java
+++ b/app/src/main/java/ai/elimu/startguide/content/swipe/SwipeUpDownAdapter.java
@@ -1,4 +1,4 @@
-package org.literacyapp.startguide.content.swipe;
+package ai.elimu.startguide.content.swipe;
 
 import android.content.res.TypedArray;
 import android.support.v7.widget.RecyclerView;
@@ -8,7 +8,7 @@
 import android.view.ViewGroup;
 import android.widget.ImageView;
 
-import org.literacyapp.startguide.R;
+import ai.elimu.startguide.R;
 
 /**
  * Created by GSC on 30/01/2017.
diff --git a/app/src/main/java/org/literacyapp/startguide/receiver/BootReceiver.java b/app/src/main/java/ai/elimu/startguide/receiver/BootReceiver.java
similarity index 74%
rename from app/src/main/java/org/literacyapp/startguide/receiver/BootReceiver.java
rename to app/src/main/java/ai/elimu/startguide/receiver/BootReceiver.java
index 7fd23df..8b91ae5 100644
--- a/app/src/main/java/org/literacyapp/startguide/receiver/BootReceiver.java
+++ b/app/src/main/java/ai/elimu/startguide/receiver/BootReceiver.java
@@ -1,12 +1,9 @@
-package org.literacyapp.startguide.receiver;
+package ai.elimu.startguide.receiver;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 
-import org.literacyapp.startguide.content.swipe.SwipeUpDownActivity;
-import org.literacyapp.startguide.util.StartPrefsHelper;
-
 
 public class BootReceiver extends BroadcastReceiver {
 
diff --git a/app/src/main/java/org/literacyapp/startguide/util/MediaPlayerHelper.java b/app/src/main/java/ai/elimu/startguide/util/MediaPlayerHelper.java
similarity index 97%
rename from app/src/main/java/org/literacyapp/startguide/util/MediaPlayerHelper.java
rename to app/src/main/java/ai/elimu/startguide/util/MediaPlayerHelper.java
index 9b3cd16..9595244 100644
--- a/app/src/main/java/org/literacyapp/startguide/util/MediaPlayerHelper.java
+++ b/app/src/main/java/ai/elimu/startguide/util/MediaPlayerHelper.java
@@ -1,4 +1,4 @@
-package org.literacyapp.startguide.util;
+package ai.elimu.startguide.util;
 
 import android.content.Context;
 import android.media.MediaPlayer;
diff --git a/app/src/main/java/org/literacyapp/startguide/util/StartPrefsHelper.java b/app/src/main/java/ai/elimu/startguide/util/StartPrefsHelper.java
similarity index 95%
rename from app/src/main/java/org/literacyapp/startguide/util/StartPrefsHelper.java
rename to app/src/main/java/ai/elimu/startguide/util/StartPrefsHelper.java
index 54af995..032b861 100644
--- a/app/src/main/java/org/literacyapp/startguide/util/StartPrefsHelper.java
+++ b/app/src/main/java/ai/elimu/startguide/util/StartPrefsHelper.java
@@ -1,4 +1,4 @@
-package org.literacyapp.startguide.util;
+package ai.elimu.startguide.util;
 
 import android.content.Context;
 import android.content.SharedPreferences;
diff --git a/app/src/main/res/layout/activity_exit_full_screen.xml b/app/src/main/res/layout/activity_exit_full_screen.xml
index 29ab588..18f4d91 100644
--- a/app/src/main/res/layout/activity_exit_full_screen.xml
+++ b/app/src/main/res/layout/activity_exit_full_screen.xml
@@ -6,7 +6,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/light_blue"
-    tools:context="org.literacyapp.startguide.content.ExitFullScreenActivity">
+    tools:context="ai.elimu.startguide.content.ExitFullScreenActivity">
 
     <ImageView
         android:layout_width="match_parent"
@@ -14,7 +14,7 @@
         android:src="@drawable/landscape"
         android:scaleType="centerCrop"/>
 
-    <org.literacyapp.handgesture.HandView
+    <ai.elimu.handgesture.HandView
         android:id="@+id/hand_view"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -53,7 +53,7 @@
             android:src="@drawable/ic_recents"/>
     </RelativeLayout>
 
-    <org.literacyapp.handgesture.HandView
+    <ai.elimu.handgesture.HandView
         android:id="@+id/hand_view_bottom"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/activity_final.xml b/app/src/main/res/layout/activity_final.xml
index ceefb84..ab9c80c 100644
--- a/app/src/main/res/layout/activity_final.xml
+++ b/app/src/main/res/layout/activity_final.xml
@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@android:color/white"
-    tools:context="org.literacyapp.startguide.content.FinalActivity">
+    tools:context="ai.elimu.startguide.content.FinalActivity">
 
     <ImageView
         android:id="@+id/final_checkmark"
diff --git a/app/src/main/res/layout/activity_swipe_right_left.xml b/app/src/main/res/layout/activity_swipe_right_left.xml
index 472fc16..6b5b373 100644
--- a/app/src/main/res/layout/activity_swipe_right_left.xml
+++ b/app/src/main/res/layout/activity_swipe_right_left.xml
@@ -7,7 +7,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fitsSystemWindows="true"
-    tools:context="org.literacyapp.startguide.content.swipe.SwipeRightLeftActivity">
+    tools:context="ai.elimu.startguide.content.swipe.SwipeRightLeftActivity">
 
     <android.support.v4.view.ViewPager
         android:id="@+id/container"
@@ -15,7 +15,7 @@
         android:layout_height="match_parent"
         app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
 
-    <org.literacyapp.handgesture.HandView
+    <ai.elimu.handgesture.HandView
         android:id="@+id/right_hand"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -26,7 +26,7 @@
         app:animationType="moveLeft"
         app:hideOnTouch="false"/>
 
-    <org.literacyapp.handgesture.HandView
+    <ai.elimu.handgesture.HandView
         android:id="@+id/left_hand"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/activity_swipe_up_down.xml b/app/src/main/res/layout/activity_swipe_up_down.xml
index 6db5dea..30647ea 100644
--- a/app/src/main/res/layout/activity_swipe_up_down.xml
+++ b/app/src/main/res/layout/activity_swipe_up_down.xml
@@ -7,7 +7,7 @@
     android:paddingBottom="@dimen/activity_vertical_margin"
     android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
-    tools:context="org.literacyapp.startguide.content.swipe.SwipeUpDownActivity" >
+    tools:context="ai.elimu.startguide.content.swipe.SwipeUpDownActivity" >
 
     <android.support.v7.widget.RecyclerView
         android:id="@+id/recyclerView"
@@ -15,7 +15,7 @@
         android:layout_height="wrap_content"
         tools:listitem="@layout/item_main"/>
 
-    <org.literacyapp.handgesture.HandView
+    <ai.elimu.handgesture.HandView
         android:id="@+id/hand"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/activity_test_gesture.xml b/app/src/main/res/layout/activity_test_gesture.xml
index 7e83263..b0475d4 100644
--- a/app/src/main/res/layout/activity_test_gesture.xml
+++ b/app/src/main/res/layout/activity_test_gesture.xml
@@ -5,29 +5,29 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="org.literacyapp.startguide.TestGestureActivity" >
+    tools:context="ai.elimu.startguide.TestGestureActivity" >
 
-    <org.literacyapp.handgesture.HandView
+    <ai.elimu.handgesture.HandView
         android:id="@+id/single_tap"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_margin="30dp" />
 
-    <org.literacyapp.handgesture.HandView
+    <ai.elimu.handgesture.HandView
         android:id="@+id/double_tap"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_margin="30dp"
         android:layout_alignParentRight="true"/>
 
-    <org.literacyapp.handgesture.HandView
+    <ai.elimu.handgesture.HandView
         android:id="@+id/press_and_hold"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_margin="30dp"
         android:layout_below="@id/single_tap" />
 
-    <org.literacyapp.handgesture.HandView
+    <ai.elimu.handgesture.HandView
         android:id="@+id/translation"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_swipe_right_left.xml b/app/src/main/res/layout/fragment_swipe_right_left.xml
index 2336fa8..bc3ba8b 100644
--- a/app/src/main/res/layout/fragment_swipe_right_left.xml
+++ b/app/src/main/res/layout/fragment_swipe_right_left.xml
@@ -4,7 +4,7 @@
     android:id="@+id/pager_container"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="org.literacyapp.startguide.content.swipe.SwipeRightLeftActivity$PlaceholderFragment">
+    tools:context="ai.elimu.startguide.content.swipe.SwipeRightLeftActivity$PlaceholderFragment">
 
     <ImageView
         android:id="@+id/left_image"
diff --git a/app/src/test/java/org/literacyapp/startguide/ExampleUnitTest.java b/app/src/test/java/ai/elimu/startguide/ExampleUnitTest.java
similarity index 87%
rename from app/src/test/java/org/literacyapp/startguide/ExampleUnitTest.java
rename to app/src/test/java/ai/elimu/startguide/ExampleUnitTest.java
index 766c802..9ebf015 100644
--- a/app/src/test/java/org/literacyapp/startguide/ExampleUnitTest.java
+++ b/app/src/test/java/ai/elimu/startguide/ExampleUnitTest.java
@@ -1,4 +1,4 @@
-package org.literacyapp.startguide;
+package ai.elimu.startguide;
 
 import org.junit.Test;
 
diff --git a/handgesture/README.md b/handgesture/README.md
index 2ccda5b..5b0e6a6 100644
--- a/handgesture/README.md
+++ b/handgesture/README.md
@@ -8,7 +8,7 @@ To import the library, you first need to add our repository in app/build.gradle:
 repositories {
     mavenLocal()
     maven {
-        url "http://archiva.educativo.eu:8081/repository/internal/"
+        url "https://dl.bintray.com/elimu-ai/maven/"
     }
 }
 ```
@@ -18,7 +18,7 @@ Then, add the following dependency:
 ```
 dependencies {
    ...
-   compile 'org.literacyapp.startguide:1.0.0'
+   compile 'ai.elimu.startguide:2.0.0'
 }
 ``` 
 
@@ -30,7 +30,7 @@ You can add the HandView to the Layout
     xmlns:app="http://schemas.android.com/apk/res-auto"
     ... >
  
-    <org.literacyapp.handgesture.HandView
+    <ai.elimu.handgesture.HandView
         android:id="@+id/hand_view"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -54,7 +54,7 @@ or
 ###### Custom translation
 
 ```
-<org.literacyapp.handgesture.HandView
+<ai.elimu.handgesture.HandView
     android:id="@+id/hand_view"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
diff --git a/handgesture/src/androidTest/java/org/literacyapp/handgesture/ExampleInstrumentedTest.java b/handgesture/src/androidTest/java/ai/elimu/handgesture/ExampleInstrumentedTest.java
similarity index 80%
rename from handgesture/src/androidTest/java/org/literacyapp/handgesture/ExampleInstrumentedTest.java
rename to handgesture/src/androidTest/java/ai/elimu/handgesture/ExampleInstrumentedTest.java
index 6e59c2a..91ec3a3 100644
--- a/handgesture/src/androidTest/java/org/literacyapp/handgesture/ExampleInstrumentedTest.java
+++ b/handgesture/src/androidTest/java/ai/elimu/handgesture/ExampleInstrumentedTest.java
@@ -1,4 +1,4 @@
-package org.literacyapp.handgesture;
+package ai.elimu.handgesture;
 
 import android.content.Context;
 import android.support.test.InstrumentationRegistry;
@@ -21,6 +21,6 @@ public void useAppContext() throws Exception {
         // Context of the app under test.
         Context appContext = InstrumentationRegistry.getTargetContext();
 
-        assertEquals("org.literacyapp.handgesture.test", appContext.getPackageName());
+        assertEquals("ai.elimu.handgesture.test", appContext.getPackageName());
     }
 }
diff --git a/handgesture/src/main/AndroidManifest.xml b/handgesture/src/main/AndroidManifest.xml
index a847f6f..2b1657d 100644
--- a/handgesture/src/main/AndroidManifest.xml
+++ b/handgesture/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="org.literacyapp.handgesture">
+          package="ai.elimu.handgesture">
 
     <application android:allowBackup="true"
                  android:label="@string/app_name"
diff --git a/handgesture/src/main/java/org/literacyapp/handgesture/AnimationHelper.java b/handgesture/src/main/java/ai/elimu/handgesture/AnimationHelper.java
similarity index 80%
rename from handgesture/src/main/java/org/literacyapp/handgesture/AnimationHelper.java
rename to handgesture/src/main/java/ai/elimu/handgesture/AnimationHelper.java
index cab8d66..f25511f 100644
--- a/handgesture/src/main/java/org/literacyapp/handgesture/AnimationHelper.java
+++ b/handgesture/src/main/java/ai/elimu/handgesture/AnimationHelper.java
@@ -1,4 +1,4 @@
-package org.literacyapp.handgesture;
+package ai.elimu.handgesture;
 
 import android.content.Context;
 import android.view.View;
@@ -7,11 +7,6 @@
 import android.view.animation.ScaleAnimation;
 import android.view.animation.TranslateAnimation;
 
-import static org.literacyapp.handgesture.Constants.DEFAULT_ANIMATION_DELAY;
-import static org.literacyapp.handgesture.Constants.MILLISECONDS;
-import static org.literacyapp.handgesture.Constants.SCALE_DURATION;
-import static org.literacyapp.handgesture.Constants.SCALE_FACTOR;
-
 /**
  * Created by GSC on 04/02/2017.
  */
@@ -33,7 +28,7 @@ public AnimationHelper(Context context, int idAnim, HandGestureListener handGest
 
     public AnimationHelper(int translateX, int translateY, float duration, HandGestureListener handGestureListener) {
         mAnimation = new TranslateAnimation(0, translateX, 0, translateY);
-        mAnimation.setDuration((long) (duration * MILLISECONDS));
+        mAnimation.setDuration((long) (duration * Constants.MILLISECONDS));
 
         initAnimationListeners(handGestureListener);
     }
@@ -47,8 +42,8 @@ private void initAnimationListeners(HandGestureListener handGestureListener) {
             public void onMakeSmallerEnd() {
                 mView.setPivotX(.5f);
                 mView.setPivotY(.5f);
-                mView.setScaleX(SCALE_FACTOR);
-                mView.setScaleY(SCALE_FACTOR);
+                mView.setScaleX(Constants.SCALE_FACTOR);
+                mView.setScaleY(Constants.SCALE_FACTOR);
                 mView.startAnimation(mAnimation);
             }
         };
@@ -59,7 +54,7 @@ public void setRepeatMode(boolean repeat) {
     }
 
     public void animateView(View view) {
-        animateView(view, DEFAULT_ANIMATION_DELAY);
+        animateView(view, Constants.DEFAULT_ANIMATION_DELAY);
     }
 
     public void animateView(View view, long delay) {
@@ -70,7 +65,7 @@ public void run() {
                 mView.startAnimation(makeSmallerImage());
                 mHandGestureListener.onAnimationStarted();
             }
-        }, delay * MILLISECONDS);
+        }, delay * Constants.MILLISECONDS);
     }
 
     public void stopAnimation() {
@@ -105,11 +100,11 @@ public void onAnimationRepeat(Animation animation) {
     //endregion
 
     public ScaleAnimation makeSmallerImage() {
-        return makeSmallerImage(SCALE_DURATION);
+        return makeSmallerImage(Constants.SCALE_DURATION);
     }
 
     public ScaleAnimation makeSmallerImage(long duration) {
-        ScaleAnimation scale = new ScaleAnimation(1f, SCALE_FACTOR, 1f, SCALE_FACTOR);
+        ScaleAnimation scale = new ScaleAnimation(1f, Constants.SCALE_FACTOR, 1f, Constants.SCALE_FACTOR);
 
         scale.setFillEnabled(true);
         scale.setFillAfter(true);
diff --git a/handgesture/src/main/java/org/literacyapp/handgesture/Constants.java b/handgesture/src/main/java/ai/elimu/handgesture/Constants.java
similarity index 84%
rename from handgesture/src/main/java/org/literacyapp/handgesture/Constants.java
rename to handgesture/src/main/java/ai/elimu/handgesture/Constants.java
index d31c65e..bfcccee 100644
--- a/handgesture/src/main/java/org/literacyapp/handgesture/Constants.java
+++ b/handgesture/src/main/java/ai/elimu/handgesture/Constants.java
@@ -1,4 +1,4 @@
-package org.literacyapp.handgesture;
+package ai.elimu.handgesture;
 
 /**
  */
diff --git a/handgesture/src/main/java/org/literacyapp/handgesture/GestureHelper.java b/handgesture/src/main/java/ai/elimu/handgesture/GestureHelper.java
similarity index 79%
rename from handgesture/src/main/java/org/literacyapp/handgesture/GestureHelper.java
rename to handgesture/src/main/java/ai/elimu/handgesture/GestureHelper.java
index fe55752..6e8345c 100644
--- a/handgesture/src/main/java/org/literacyapp/handgesture/GestureHelper.java
+++ b/handgesture/src/main/java/ai/elimu/handgesture/GestureHelper.java
@@ -1,4 +1,4 @@
-package org.literacyapp.handgesture;
+package ai.elimu.handgesture;
 
 import android.os.Handler;
 import android.view.View;
@@ -6,11 +6,6 @@
 import android.view.animation.AnimationSet;
 import android.view.animation.ScaleAnimation;
 
-import static org.literacyapp.handgesture.Constants.DEFAULT_ANIMATION_DELAY;
-import static org.literacyapp.handgesture.Constants.MILLISECONDS;
-import static org.literacyapp.handgesture.Constants.SCALE_DURATION;
-import static org.literacyapp.handgesture.Constants.SCALE_FACTOR;
-
 
 /**
  */
@@ -52,7 +47,7 @@ private void startTouchAnimation(int animationDelay, long touchTime) {
     }
 
     private void startTouchAnimation(int animationDelay, final long touchTime, long secondTouchOffset) {
-        long startOffset = (animationDelay > 0) ? animationDelay * MILLISECONDS : DEFAULT_ANIMATION_DELAY * MILLISECONDS ;
+        long startOffset = (animationDelay > 0) ? animationDelay * Constants.MILLISECONDS : Constants.DEFAULT_ANIMATION_DELAY * Constants.MILLISECONDS ;
 
         if (isSecondTouchOfDoubleTouchGesture(secondTouchOffset)) {
             startOffset = secondTouchOffset;
@@ -72,9 +67,9 @@ private boolean isSecondTouchOfDoubleTouchGesture(long secondTouchOffset) {
     }
 
     private ScaleAnimation getZoomOutAnimation(long startOffset, final long touchTime) {
-        ScaleAnimation zoomOut = new ScaleAnimation(1f, SCALE_FACTOR, 1f, SCALE_FACTOR);
+        ScaleAnimation zoomOut = new ScaleAnimation(1f, Constants.SCALE_FACTOR, 1f, Constants.SCALE_FACTOR);
         zoomOut.setStartOffset(startOffset);
-        zoomOut.setDuration(SCALE_DURATION);
+        zoomOut.setDuration(Constants.SCALE_DURATION);
         zoomOut.setFillAfter(true);
         zoomOut.setAnimationListener(new Animation.AnimationListener() {
             @Override
@@ -99,9 +94,9 @@ public void onAnimationRepeat(Animation animation) {}
     }
 
     private ScaleAnimation getZoomInAnimation(long startOffset, long touchTime) {
-        ScaleAnimation zoomIn = new ScaleAnimation(SCALE_FACTOR, 1f, SCALE_FACTOR, 1f);
-        zoomIn.setStartOffset(startOffset+SCALE_DURATION+touchTime);
-        zoomIn.setDuration(SCALE_DURATION);
+        ScaleAnimation zoomIn = new ScaleAnimation(Constants.SCALE_FACTOR, 1f, Constants.SCALE_FACTOR, 1f);
+        zoomIn.setStartOffset(startOffset+ Constants.SCALE_DURATION+touchTime);
+        zoomIn.setDuration(Constants.SCALE_DURATION);
         zoomIn.setFillAfter(true);
         return zoomIn;
     }
diff --git a/handgesture/src/main/java/org/literacyapp/handgesture/Gestures.java b/handgesture/src/main/java/ai/elimu/handgesture/Gestures.java
similarity index 94%
rename from handgesture/src/main/java/org/literacyapp/handgesture/Gestures.java
rename to handgesture/src/main/java/ai/elimu/handgesture/Gestures.java
index 240346c..04d4e97 100644
--- a/handgesture/src/main/java/org/literacyapp/handgesture/Gestures.java
+++ b/handgesture/src/main/java/ai/elimu/handgesture/Gestures.java
@@ -1,4 +1,4 @@
-package org.literacyapp.handgesture;
+package ai.elimu.handgesture;
 
 /**
  */
diff --git a/handgesture/src/main/java/org/literacyapp/handgesture/HandGestureListener.java b/handgesture/src/main/java/ai/elimu/handgesture/HandGestureListener.java
similarity index 75%
rename from handgesture/src/main/java/org/literacyapp/handgesture/HandGestureListener.java
rename to handgesture/src/main/java/ai/elimu/handgesture/HandGestureListener.java
index 04f35a7..17a22dd 100644
--- a/handgesture/src/main/java/org/literacyapp/handgesture/HandGestureListener.java
+++ b/handgesture/src/main/java/ai/elimu/handgesture/HandGestureListener.java
@@ -1,4 +1,4 @@
-package org.literacyapp.handgesture;
+package ai.elimu.handgesture;
 
 /**
  */
diff --git a/handgesture/src/main/java/org/literacyapp/handgesture/HandView.java b/handgesture/src/main/java/ai/elimu/handgesture/HandView.java
similarity index 87%
rename from handgesture/src/main/java/org/literacyapp/handgesture/HandView.java
rename to handgesture/src/main/java/ai/elimu/handgesture/HandView.java
index 05caffb..6b91523 100644
--- a/handgesture/src/main/java/org/literacyapp/handgesture/HandView.java
+++ b/handgesture/src/main/java/ai/elimu/handgesture/HandView.java
@@ -1,4 +1,4 @@
-package org.literacyapp.handgesture;
+package ai.elimu.handgesture;
 
 import android.content.Context;
 import android.content.res.TypedArray;
@@ -11,12 +11,6 @@
 import android.widget.ImageView;
 import android.widget.RelativeLayout;
 
-import org.literacyapp.handgesture.Gestures.HandGesture;
-
-import static org.literacyapp.handgesture.Gestures.DOUBLE_TAP;
-import static org.literacyapp.handgesture.Gestures.PRESS_AND_HOLD;
-import static org.literacyapp.handgesture.Gestures.SINGLE_TAP;
-
 /**
  */
 public class HandView extends RelativeLayout implements HandGestureListener {
@@ -25,7 +19,7 @@ public class HandView extends RelativeLayout implements HandGestureListener {
     private ImageView mHandView;
 
     private AnimationHelper mAnimationHelper;
-    private HandGesture handGesture;
+    private Gestures.HandGesture handGesture;
     private HandViewListener mHandViewListener;
 
     private int mAnimationType;
@@ -102,7 +96,7 @@ public boolean onTouchEvent(MotionEvent event) {
 
     public void startAnimation() {
         if (mAnimationType >= 0) {
-            HandGesture gesture = Gestures.getHandGesture(mAnimationType);
+            Gestures.HandGesture gesture = Gestures.getHandGesture(mAnimationType);
 
             if (!gesture.isTranslation()) {
                 startGesture(gesture);
@@ -116,7 +110,7 @@ public void startAnimation() {
         }
     }
 
-    public void startAnimation(HandGesture handAnimation) {
+    public void startAnimation(Gestures.HandGesture handAnimation) {
         if (!handAnimation.isTranslation()) {
             startGesture(handAnimation);
         } else if (handAnimation.isCustomTranslation()) {
@@ -145,14 +139,14 @@ public void stopAnimation() {
         onTouchEvent(null);
     }
 
-    private void startGesture(HandGesture handGesture) {
+    private void startGesture(Gestures.HandGesture handGesture) {
         mDetectTouchEvent = false;
         this.handGesture = handGesture;
-        if (handGesture.equals(SINGLE_TAP)) {
+        if (handGesture.equals(Gestures.SINGLE_TAP)) {
             new GestureHelper(this, this).startOneTouchAnimation(mAnimationDelay);
-        } else if (handGesture.equals(DOUBLE_TAP)) {
+        } else if (handGesture.equals(Gestures.DOUBLE_TAP)) {
             firstTouch = new GestureHelper(this, this).startDoubleTouchAnimation(mAnimationDelay, firstTouch);
-        } else if (handGesture.equals(PRESS_AND_HOLD)) {
+        } else if (handGesture.equals(Gestures.PRESS_AND_HOLD)) {
             new GestureHelper(this, this).startTouchAndHoldAnimation(mAnimationDelay);
         }
     }
diff --git a/handgesture/src/main/java/org/literacyapp/handgesture/HandViewListener.java b/handgesture/src/main/java/ai/elimu/handgesture/HandViewListener.java
similarity index 62%
rename from handgesture/src/main/java/org/literacyapp/handgesture/HandViewListener.java
rename to handgesture/src/main/java/ai/elimu/handgesture/HandViewListener.java
index de627a2..7e7f444 100644
--- a/handgesture/src/main/java/org/literacyapp/handgesture/HandViewListener.java
+++ b/handgesture/src/main/java/ai/elimu/handgesture/HandViewListener.java
@@ -1,4 +1,4 @@
-package org.literacyapp.handgesture;
+package ai.elimu.handgesture;
 
 public interface HandViewListener {
 
diff --git a/handgesture/src/test/java/org/literacyapp/handgesture/ExampleUnitTest.java b/handgesture/src/test/java/ai/elimu/handgesture/ExampleUnitTest.java
similarity index 87%
rename from handgesture/src/test/java/org/literacyapp/handgesture/ExampleUnitTest.java
rename to handgesture/src/test/java/ai/elimu/handgesture/ExampleUnitTest.java
index 37e8ec9..a011072 100644
--- a/handgesture/src/test/java/org/literacyapp/handgesture/ExampleUnitTest.java
+++ b/handgesture/src/test/java/ai/elimu/handgesture/ExampleUnitTest.java
@@ -1,4 +1,4 @@
-package org.literacyapp.handgesture;
+package ai.elimu.handgesture;
 
 import org.junit.Test;