diff --git a/.idea/assetWizardSettings.xml b/.idea/assetWizardSettings.xml
index 4d77fb9f..6b96cf0c 100644
--- a/.idea/assetWizardSettings.xml
+++ b/.idea/assetWizardSettings.xml
@@ -3,79 +3,9 @@
   <component name="WizardSettings">
     <option name="children">
       <map>
-        <entry key="imageWizard">
-          <value>
-            <PersistentState>
-              <option name="children">
-                <map>
-                  <entry key="imageAssetPanel">
-                    <value>
-                      <PersistentState>
-                        <option name="children">
-                          <map>
-                            <entry key="actionbar">
-                              <value>
-                                <PersistentState>
-                                  <option name="children">
-                                    <map>
-                                      <entry key="clipartAsset">
-                                        <value>
-                                          <PersistentState>
-                                            <option name="values">
-                                              <map>
-                                                <entry key="url" value="jar:file:/opt/android-studio/plugins/android/lib/android.jar!/images/material_design_icons/action/ic_shopping_cart_black_24dp.xml" />
-                                              </map>
-                                            </option>
-                                          </PersistentState>
-                                        </value>
-                                      </entry>
-                                    </map>
-                                  </option>
-                                  <option name="values">
-                                    <map>
-                                      <entry key="outputName" value="ic_cart" />
-                                      <entry key="theme" value="HOLO_DARK" />
-                                    </map>
-                                  </option>
-                                </PersistentState>
-                              </value>
-                            </entry>
-                          </map>
-                        </option>
-                        <option name="values">
-                          <map>
-                            <entry key="outputIconType" value="ACTIONBAR" />
-                          </map>
-                        </option>
-                      </PersistentState>
-                    </value>
-                  </entry>
-                </map>
-              </option>
-            </PersistentState>
-          </value>
-        </entry>
         <entry key="vectorWizard">
           <value>
-            <PersistentState>
-              <option name="children">
-                <map>
-                  <entry key="vectorAssetStep">
-                    <value>
-                      <PersistentState>
-                        <option name="values">
-                          <map>
-                            <entry key="assetSourceType" value="FILE" />
-                            <entry key="outputName" value="ic_rectangle_7svg" />
-                            <entry key="sourceFile" value="C:\Users\TAIYAB\Documents\GitHub\Project_Alcatraz\app\src\main\res\drawable\rectangle_7svg.svg" />
-                          </map>
-                        </option>
-                      </PersistentState>
-                    </value>
-                  </entry>
-                </map>
-              </option>
-            </PersistentState>
+            <PersistentState />
           </value>
         </entry>
       </map>
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 6d241e50..94bdc585 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -10,7 +10,6 @@
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/app" />
             <option value="$PROJECT_DIR$/library" />
-            <option value="$PROJECT_DIR$/library/MaterialChipView" />
             <option value="$PROJECT_DIR$/library/MaterialSearchView" />
             <option value="$PROJECT_DIR$/library/NiceSpinner" />
           </set>
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 87e24ca3..e64a9b22 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,10 +2,9 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/library/MaterialChipView/MaterialChipView.iml" filepath="$PROJECT_DIR$/library/MaterialChipView/MaterialChipView.iml" />
+      <module fileurl="file://$PROJECT_DIR$/Check-In.iml" filepath="$PROJECT_DIR$/Check-In.iml" />
       <module fileurl="file://$PROJECT_DIR$/library/MaterialSearchView/MaterialSearchView.iml" filepath="$PROJECT_DIR$/library/MaterialSearchView/MaterialSearchView.iml" />
       <module fileurl="file://$PROJECT_DIR$/library/NiceSpinner/NiceSpinner.iml" filepath="$PROJECT_DIR$/library/NiceSpinner/NiceSpinner.iml" />
-      <module fileurl="file://$PROJECT_DIR$/Project_Alcatraz.iml" filepath="$PROJECT_DIR$/Project_Alcatraz.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
       <module fileurl="file://$PROJECT_DIR$/library/library.iml" filepath="$PROJECT_DIR$/library/library.iml" />
     </modules>
diff --git a/app/build.gradle b/app/build.gradle
index 1474c1ab..b20bec16 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -4,7 +4,7 @@ apply plugin: 'io.objectbox'
 android {
     compileSdkVersion 27
     defaultConfig {
-        applicationId "com.alcatraz.admin.project_alcatraz"
+        applicationId "com.checkin.app.checkin"
         minSdkVersion 19
         targetSdkVersion 27
         versionCode 1
@@ -14,7 +14,7 @@ android {
         javaCompileOptions {
             annotationProcessorOptions {
                 arguments = [
-                        "objectbox.myObjectBoxPackage": "com.alcatraz.admin.project_alcatraz"
+                        "objectbox.myObjectBoxPackage": "com.checkin.app.checkin"
                 ]
             }
         }
@@ -37,6 +37,8 @@ dependencies {
     implementation 'com.android.support:appcompat-v7:27.1.1'
     implementation 'com.android.support.constraint:constraint-layout:1.1.2'
     implementation 'com.android.support:support-v4:27.1.1'
+    implementation 'com.google.firebase:firebase-core:16.0.1'
+    implementation 'com.google.firebase:firebase-messaging:17.3.0'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
@@ -55,12 +57,16 @@ dependencies {
     annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
     implementation 'com.yarolegovich:discrete-scrollview:1.4.7'
     implementation 'com.appyvet:materialrangebar:1.4.3'
+    implementation 'com.github.javiersantos:MaterialStyledDialogs:2.1'
 
     // Network libraries and JSON <-> POJO
-    implementation 'com.google.code.gson:gson:2.8.5'
+    implementation(
+            [group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: "$jackson_version"],
+            [group: 'com.fasterxml.jackson.core', name: 'jackson-annotations', version: "$jackson_version"],
+            [group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: "$jackson_version"]
+    )
     implementation 'com.squareup.retrofit2:retrofit:2.4.0'
-    implementation 'com.squareup.retrofit2:converter-gson:2.4.0'
-    implementation "com.hootsuite.android:nachos:1.1.1"
+    implementation 'com.squareup.retrofit2:converter-jackson:2.4.0'
     debugImplementation 'com.squareup.okhttp3:logging-interceptor:3.10.0'
 
     // ObjectBox components
@@ -78,7 +84,8 @@ dependencies {
     // Modified libraries
     implementation project(':library:MaterialSearchView')
     implementation project(':library:NiceSpinner')
-    implementation project(':library:MaterialChipView')
+
+    implementation "com.hootsuite.android:nachos:1.1.1"
 
     // Graphs
     implementation 'com.github.PhilJay:MPAndroidChart:v3.0.3'
@@ -89,3 +96,5 @@ dependencies {
     implementation "com.andkulikov:transitionseverywhere:1.8.0"
     implementation 'com.jsibbold:zoomage:1.1.0'
 }
+
+apply plugin: 'com.google.gms.google-services'
diff --git a/app/objectbox-models/default.json b/app/objectbox-models/default.json
index 56bb85e3..1fc6f273 100644
--- a/app/objectbox-models/default.json
+++ b/app/objectbox-models/default.json
@@ -80,7 +80,7 @@
     },
     {
       "id": "4:8792488809676470805",
-      "lastPropertyId": "5:2873565625349267435",
+      "lastPropertyId": "6:4140086161701088967",
       "name": "ItemCustomizationGroup",
       "properties": [
         {
@@ -100,16 +100,16 @@
           "name": "name"
         },
         {
-          "id": "5:2873565625349267435",
-          "indexId": "4:3035713941381745113",
-          "name": "menuItemId"
+          "id": "6:4140086161701088967",
+          "indexId": "7:7366426349237276981",
+          "name": "itemId"
         }
       ],
       "relations": []
     },
     {
       "id": "5:3615293227517264495",
-      "lastPropertyId": "11:6620884739598162003",
+      "lastPropertyId": "19:5448704526429864056",
       "name": "MenuItemModel",
       "properties": [
         {
@@ -128,14 +128,6 @@
           "id": "4:5935032680677761705",
           "name": "typeCost"
         },
-        {
-          "id": "5:3849345501825238335",
-          "name": "baseTypeIndex"
-        },
-        {
-          "id": "6:4296191239800169373",
-          "name": "unit"
-        },
         {
           "id": "7:3220715890339537694",
           "name": "description"
@@ -156,13 +148,45 @@
           "id": "11:6620884739598162003",
           "indexId": "5:69683604010069842",
           "name": "groupId"
+        },
+        {
+          "id": "12:8100373727744353980",
+          "name": "shop"
+        },
+        {
+          "id": "13:1807794737803967169",
+          "name": "available"
+        },
+        {
+          "id": "14:7472205444293814822",
+          "name": "image"
+        },
+        {
+          "id": "15:4366740687401342815",
+          "name": "video"
+        },
+        {
+          "id": "16:4929136922825449978",
+          "name": "availableMeals"
+        },
+        {
+          "id": "17:8292698264967788736",
+          "name": "recipe"
+        },
+        {
+          "id": "18:5838660730037572361",
+          "name": "ingredients"
+        },
+        {
+          "id": "19:5448704526429864056",
+          "name": "remarks"
         }
       ],
       "relations": []
     },
     {
       "id": "6:8773626543538239808",
-      "lastPropertyId": "6:1478788319118135673",
+      "lastPropertyId": "8:9134513983167030694",
       "name": "ItemCustomizationField",
       "properties": [
         {
@@ -178,24 +202,20 @@
           "name": "name"
         },
         {
-          "id": "4:4721447168274332179",
-          "name": "price"
-        },
-        {
-          "id": "5:6340519530372395296",
-          "name": "isSelected"
+          "id": "7:1387878133577339607",
+          "name": "cost"
         },
         {
-          "id": "6:1478788319118135673",
-          "indexId": "6:1418313063729064730",
-          "name": "customizationGroupId"
+          "id": "8:9134513983167030694",
+          "indexId": "8:8382399519732724393",
+          "name": "groupId"
         }
       ],
       "relations": []
     },
     {
       "id": "8:3006473999842963322",
-      "lastPropertyId": "3:1788703918471935416",
+      "lastPropertyId": "4:4976793404674944604",
       "name": "UserModel",
       "properties": [
         {
@@ -207,15 +227,15 @@
           "name": "username"
         },
         {
-          "id": "3:1788703918471935416",
-          "name": "imageUrl"
+          "id": "4:4976793404674944604",
+          "name": "profilePic"
         }
       ],
       "relations": []
     }
   ],
   "lastEntityId": "8:3006473999842963322",
-  "lastIndexId": "6:1418313063729064730",
+  "lastIndexId": "8:8382399519732724393",
   "lastRelationId": "0:0",
   "lastSequenceId": "0:0",
   "modelVersion": 4,
@@ -223,11 +243,21 @@
   "retiredEntityUids": [
     4431701432253560041
   ],
-  "retiredIndexUids": [],
+  "retiredIndexUids": [
+    3035713941381745113,
+    1418313063729064730
+  ],
   "retiredPropertyUids": [
     2380700835998941893,
     396444863511990148,
-    8121280058519918450
+    8121280058519918450,
+    2873565625349267435,
+    3849345501825238335,
+    4296191239800169373,
+    4721447168274332179,
+    6340519530372395296,
+    1478788319118135673,
+    1788703918471935416
   ],
   "retiredRelationUids": [],
   "version": 1
diff --git a/app/objectbox-models/default.json.bak b/app/objectbox-models/default.json.bak
index 47198f0d..9f8a20ff 100644
--- a/app/objectbox-models/default.json.bak
+++ b/app/objectbox-models/default.json.bak
@@ -80,7 +80,7 @@
     },
     {
       "id": "4:8792488809676470805",
-      "lastPropertyId": "5:2873565625349267435",
+      "lastPropertyId": "6:4140086161701088967",
       "name": "ItemCustomizationGroup",
       "properties": [
         {
@@ -100,16 +100,16 @@
           "name": "name"
         },
         {
-          "id": "5:2873565625349267435",
-          "indexId": "4:3035713941381745113",
-          "name": "menuItemId"
+          "id": "6:4140086161701088967",
+          "indexId": "7:7366426349237276981",
+          "name": "itemId"
         }
       ],
       "relations": []
     },
     {
       "id": "5:3615293227517264495",
-      "lastPropertyId": "11:6620884739598162003",
+      "lastPropertyId": "19:5448704526429864056",
       "name": "MenuItemModel",
       "properties": [
         {
@@ -128,14 +128,6 @@
           "id": "4:5935032680677761705",
           "name": "typeCost"
         },
-        {
-          "id": "5:3849345501825238335",
-          "name": "baseTypeIndex"
-        },
-        {
-          "id": "6:4296191239800169373",
-          "name": "unit"
-        },
         {
           "id": "7:3220715890339537694",
           "name": "description"
@@ -156,13 +148,45 @@
           "id": "11:6620884739598162003",
           "indexId": "5:69683604010069842",
           "name": "groupId"
+        },
+        {
+          "id": "12:8100373727744353980",
+          "name": "shop"
+        },
+        {
+          "id": "13:1807794737803967169",
+          "name": "available"
+        },
+        {
+          "id": "14:7472205444293814822",
+          "name": "image"
+        },
+        {
+          "id": "15:4366740687401342815",
+          "name": "video"
+        },
+        {
+          "id": "16:4929136922825449978",
+          "name": "availableMeals"
+        },
+        {
+          "id": "17:8292698264967788736",
+          "name": "recipe"
+        },
+        {
+          "id": "18:5838660730037572361",
+          "name": "ingredients"
+        },
+        {
+          "id": "19:5448704526429864056",
+          "name": "remarks"
         }
       ],
       "relations": []
     },
     {
       "id": "6:8773626543538239808",
-      "lastPropertyId": "6:1478788319118135673",
+      "lastPropertyId": "8:9134513983167030694",
       "name": "ItemCustomizationField",
       "properties": [
         {
@@ -178,51 +202,62 @@
           "name": "name"
         },
         {
-          "id": "4:4721447168274332179",
-          "name": "price"
+          "id": "7:1387878133577339607",
+          "name": "cost"
         },
         {
-          "id": "5:6340519530372395296",
-          "name": "isSelected"
-        },
-        {
-          "id": "6:1478788319118135673",
-          "indexId": "6:1418313063729064730",
-          "name": "customizationGroupId"
+          "id": "8:9134513983167030694",
+          "indexId": "8:8382399519732724393",
+          "name": "groupId"
         }
       ],
       "relations": []
     },
     {
-      "id": "7:4431701432253560041",
-      "lastPropertyId": "3:8121280058519918450",
-      "name": "User",
+      "id": "8:3006473999842963322",
+      "lastPropertyId": "3:1788703918471935416",
+      "name": "UserModel",
       "properties": [
         {
-          "id": "1:2380700835998941893",
+          "id": "1:1652938099697533970",
           "name": "id"
         },
         {
-          "id": "2:396444863511990148",
+          "id": "2:6242435107425559925",
           "name": "username"
         },
         {
-          "id": "3:8121280058519918450",
+          "id": "3:1788703918471935416",
           "name": "imageUrl"
         }
       ],
       "relations": []
     }
   ],
-  "lastEntityId": "7:4431701432253560041",
-  "lastIndexId": "6:1418313063729064730",
+  "lastEntityId": "8:3006473999842963322",
+  "lastIndexId": "8:8382399519732724393",
   "lastRelationId": "0:0",
   "lastSequenceId": "0:0",
   "modelVersion": 4,
   "modelVersionParserMinimum": 4,
-  "retiredEntityUids": [],
-  "retiredIndexUids": [],
-  "retiredPropertyUids": [],
+  "retiredEntityUids": [
+    4431701432253560041
+  ],
+  "retiredIndexUids": [
+    3035713941381745113,
+    1418313063729064730
+  ],
+  "retiredPropertyUids": [
+    2380700835998941893,
+    396444863511990148,
+    8121280058519918450,
+    2873565625349267435,
+    3849345501825238335,
+    4296191239800169373,
+    4721447168274332179,
+    6340519530372395296,
+    1478788319118135673
+  ],
   "retiredRelationUids": [],
   "version": 1
 }
\ No newline at end of file
diff --git a/app/src/androidTest/java/com/alcatraz/admin/project_alcatraz/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/checkin/app/checkin/ExampleInstrumentedTest.kt
similarity index 93%
rename from app/src/androidTest/java/com/alcatraz/admin/project_alcatraz/ExampleInstrumentedTest.kt
rename to app/src/androidTest/java/com/checkin/app/checkin/ExampleInstrumentedTest.kt
index 5dbe0486..a7eae58c 100644
--- a/app/src/androidTest/java/com/alcatraz/admin/project_alcatraz/ExampleInstrumentedTest.kt
+++ b/app/src/androidTest/java/com/checkin/app/checkin/ExampleInstrumentedTest.kt
@@ -1,4 +1,4 @@
-package com.alcatraz.admin.project_alcatraz
+package com.checkin.app.checkin
 
 import android.support.test.InstrumentationRegistry
 import android.support.test.runner.AndroidJUnit4
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 9a1217b1..517c45bb 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.alcatraz.admin.project_alcatraz">
+    package="com.checkin.app.checkin">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
@@ -16,20 +16,22 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
         tools:replace="android:theme">
-        <activity
-            android:name=".Home.LoginActivity"
-            android:theme="@style/Theme.AppCompat.Light.NoActionBar"
-            android:screenOrientation="portrait"/>
-        <activity
-            android:name=".Home.SignupActivity"
-            android:theme="@style/Theme.AppCompat.Light.NoActionBar"
-            android:screenOrientation="portrait">
+        <activity android:name=".Home.SplashActivity"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity
+            android:name=".Home.LoginActivity"
+            android:screenOrientation="portrait"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
+        <activity
+            android:name=".Home.SignupActivity"
+            android:screenOrientation="portrait"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar">
+        </activity>
         <activity
             android:name=".Home.HomeActivity"
             android:label="@string/title_activity_home"
@@ -51,9 +53,9 @@
         <activity
             android:name=".Session.SessionUserActivity"
             android:label="@string/title_activity_session_user"
+            android:screenOrientation="portrait"
             android:theme="@style/SessionTheme"
-            android:windowSoftInputMode="adjustPan"
-            android:screenOrientation="portrait"/>
+            android:windowSoftInputMode="adjustPan" />
         <activity
             android:name=".Social.ChatActivity"
             android:screenOrientation="portrait" />
@@ -65,7 +67,9 @@
         <activity android:name=".Home.ForgotPassword" />
         <activity android:name=".Home.FilterTransactions" />
         <activity android:name=".Home.FaqActivity" />
-        <activity android:name=".Session.ActiveSessionActivity" android:windowSoftInputMode="adjustNothing" />
+        <activity
+            android:name=".Session.ActiveSessionActivity"
+            android:windowSoftInputMode="adjustNothing" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Data/BaseRepository.java b/app/src/main/java/com/alcatraz/admin/project_alcatraz/Data/BaseRepository.java
deleted file mode 100644
index 7a83f004..00000000
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Data/BaseRepository.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.alcatraz.admin.project_alcatraz.Data;
-
-public abstract class BaseRepository {
-}
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Data/Converters.java b/app/src/main/java/com/alcatraz/admin/project_alcatraz/Data/Converters.java
deleted file mode 100644
index 94c9d874..00000000
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Data/Converters.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.alcatraz.admin.project_alcatraz.Data;
-
-import android.support.annotation.Nullable;
-import android.util.Log;
-
-import com.google.gson.Gson;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonSyntaxException;
-import com.google.gson.reflect.TypeToken;
-
-import java.lang.reflect.Type;
-import java.util.List;
-import java.util.Map;
-
-import io.objectbox.converter.PropertyConverter;
-
-public class Converters {
-    private static final String TAG = Converters.class.getSimpleName();
-    public static class MapConverter<X, Y> implements PropertyConverter<Map<X, Y>, String> {
-
-        @Override
-        public Map<X, Y> convertToEntityProperty(String databaseValue) {
-            Type type = new TypeToken<Map<X, Y>>() {}.getType();
-            return getObjectFromJson(databaseValue, type);
-        }
-
-        @Override
-        public String convertToDatabaseValue(Map<X, Y> entityProperty) {
-            return new Gson().toJson(entityProperty);
-        }
-    }
-
-    public static class ListConverter<T> implements PropertyConverter<List<T>, String> {
-
-        @Override
-        public List<T> convertToEntityProperty(String databaseValue) {
-            Type type = new TypeToken<List<T>>() {
-            }.getType();
-            return getObjectFromJson(databaseValue, type);
-        }
-
-        @Override
-        public String convertToDatabaseValue(List<T> entityProperty) {
-            return new Gson().toJson(entityProperty);
-        }
-    }
-
-    public static JsonObject getJsonObject(String json) {
-        return getObjectFromJson(json, JsonObject.class);
-    }
-
-    @Nullable
-    public static <T> T getObjectFromJson(String json, Type type) {
-        T res;
-        try {
-            res = new Gson().fromJson(json, type);
-        } catch (JsonSyntaxException | IllegalStateException exception) {
-            res = null;
-            Log.e(TAG, "JSON invalid! " + json);
-        }
-        return res;
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Data/WebApiService.java b/app/src/main/java/com/alcatraz/admin/project_alcatraz/Data/WebApiService.java
deleted file mode 100644
index 012da772..00000000
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Data/WebApiService.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.alcatraz.admin.project_alcatraz.Data;
-
-import com.alcatraz.admin.project_alcatraz.Session.ActiveSessionModel;
-import com.alcatraz.admin.project_alcatraz.Social.Message;
-
-import java.util.List;
-import java.util.Map;
-
-import retrofit2.Call;
-import retrofit2.http.Body;
-import retrofit2.http.GET;
-import retrofit2.http.POST;
-import retrofit2.http.Path;
-
-public interface WebApiService {
-    @GET("messages/{user_id}/")
-    Call<List<Message>> getMessages(@Path("user_id") int userId);
-
-    @POST("auth/login/")
-    Call<Map<String, String>> postLogin(@Body Map<String, String> credentials);
-
-    @GET("users/{user_id}/sessions/active/")
-    Call<ActiveSessionModel> getActiveSession(@Path("user_id") int userID);
-}
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Home/DialogAddFriend.java b/app/src/main/java/com/alcatraz/admin/project_alcatraz/Home/DialogAddFriend.java
deleted file mode 100644
index d55aef7b..00000000
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Home/DialogAddFriend.java
+++ /dev/null
@@ -1,160 +0,0 @@
-package com.alcatraz.admin.project_alcatraz.Home;
-
-import android.app.Dialog;
-import android.content.Context;
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.DialogFragment;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.app.AlertDialog;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.WindowManager;
-import android.view.inputmethod.InputMethodManager;
-import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
-import android.widget.AutoCompleteTextView;
-import android.widget.Button;
-import android.widget.MultiAutoCompleteTextView;
-import android.widget.TextView;
-
-import com.alcatraz.admin.project_alcatraz.R;
-import com.alcatraz.admin.project_alcatraz.Utility.CustomListViewAdapter;
-import com.alcatraz.admin.project_alcatraz.Utility.RowItem;
-import com.hootsuite.nachos.ChipConfiguration;
-import com.hootsuite.nachos.NachoTextView;
-import com.hootsuite.nachos.chip.ChipSpan;
-import com.hootsuite.nachos.chip.ChipSpanChipCreator;
-import com.hootsuite.nachos.tokenizer.SpanChipTokenizer;
-import com.pchmn.materialchips.ChipsInput;
-import com.pchmn.materialchips.model.Chip;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static android.support.constraint.Constraints.TAG;
-
-public class DialogAddFriend extends DialogFragment {
-
-    String[] fruits = {"Apple", "Banana", "Cherry", "Date", "Grape", "Kiwi", "Mango", "Pear"};
-    ArrayList<Chip> chips=new ArrayList<>();
-
-    static DialogAddFriend newInstance() {
-        DialogAddFriend f = new DialogAddFriend();
-
-        // Supply num input as an argument.
-        Bundle args = new Bundle();
-        f.setArguments(args);
-
-        return f;
-    }
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        View v = inflater.inflate(R.layout.dialog_addfriend, container, false);
-
-        for(int i=0;i<fruits.length;i++)
-            chips.add(new Chip(fruits[i],null));
-//        ChipsInput mInputFriends = v.findViewById(R.id.chipinputforfriend);
-//        mInputFriends.setChipDeletable(true);
-        ArrayAdapter<String> adapter = new ArrayAdapter<String>
-                (inflater.getContext(), R.layout.item_friend,R.id.namehere, fruits);
-//        //Getting the instance of AutoCompleteTextView
-        NachoTextView actv =  v.findViewById(R.id.auto);
-        actv.setThreshold(1);
-        //actv.setAdapter(adapter);//setting the adapter data into the AutoCompleteTextView
-        //actv.setChipTokenizer(new SpaceTokenizer());
-//        actv.setOnItemClickListener(new AdapterView.OnItemClickListener() {
-//            @Override
-//            public void onItemClick(AdapterView<?> adapterView, View view, int po, long l) {
-//                String f=actv.getAdapter().getItem(po).toString();
-//                int i=0;
-//                for(i=0;i<fruits.length;i++)
-//                    if(fruits[i].equals(f))
-//                        break;
-//                mInputFriends.addChip(chips.get(i) );
-//                Log.e(TAG, "onItemClick: "+i+" "+l );
-//                actv.setText("        ");
-//            }
-//        });
-//        mInputFriends.setFilterableList(chips);
-        ArrayList<RowItem> rowItems=new ArrayList<>();
-        for(int i=0;i<fruits.length;i++)
-        {
-         rowItems.add(new RowItem(R.drawable.water,fruits[i],""));
-        }
-        actv.setOnChipClickListener((chip, event) -> actv.getChipTokenizer().deleteChipAndPadding(chip, actv.getEditableText()));
-        actv.setChipTokenizer(new SpanChipTokenizer<>(inflater.getContext(), new ChipSpanChipCreator() {
-            @Override
-            public ChipSpan createChip(@NonNull Context context, @NonNull CharSequence text, Object data) {
-                return new ChipSpan(context, text, ContextCompat.getDrawable(inflater.getContext(), R.drawable.close), data);
-            }
-
-            @Override
-            public void configureChip(@NonNull ChipSpan chip, @NonNull ChipConfiguration chipConfiguration) {
-                super.configureChip(chip, chipConfiguration);
-                chip.setShowIconOnLeft(true);
-                chip.setIconBackgroundColor(0xffaf1014);
-            }
-        }, ChipSpan.class));
-
-        CustomListViewAdapter customListViewAdapter = new CustomListViewAdapter(inflater.getContext(),
-                R.layout.item_friend, rowItems);
-        actv.setAdapter(customListViewAdapter);
-
-
-
-
-
-        v.findViewById(R.id.confirm).setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                dismiss();
-                //add in adapter
-            }
-        });
-        getDialog().getWindow().setBackgroundDrawableResource(android.R.color.transparent);
-
-        return v;
-    }
-//    }
-//    @Override
-//    public Dialog onCreateDialog(Bundle savedInstanceState) {
-//        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
-//        // Get the layout inflater
-//
-//        ArrayList<Chip> friendsList = new ArrayList<>();
-//        friendsList.add(new Chip("Ram", null));
-//        friendsList.add(new Chip("Sam", null));
-//        friendsList.add(new Chip("Gyan", "wise guy."));
-//        friendsList.add(new Chip("Man", null));
-//        LayoutInflater inflater = getActivity().getLayoutInflater();
-//
-//        // Inflate and set the layout for the dialog
-//        // Pass null as the parent view because its going in the dialog layout
-//        View v=inflater.inflate(R.layout.dialog_addfriend, null);
-//        ChipsInput mInputFriends=v.findViewById(R.id.chipinputforfriend);
-//        mInputFriends.setFilterableList(friendsList);
-//        v.findViewById(R.id.confirm).setOnClickListener(new View.OnClickListener() {
-//            @Override
-//            public void onClick(View view) {
-//                dismiss();
-//                //add in adapter
-//            }
-//        });
-//        builder.setView(v);
-//        Dialog dialog= builder.create();
-//        dialog.getWindow().setBackgroundDrawableResource(android.R.color.transparent);
-//        return dialog;
-//
-//    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Home/SpaceTokenizer.java b/app/src/main/java/com/alcatraz/admin/project_alcatraz/Home/SpaceTokenizer.java
deleted file mode 100644
index 9a054d50..00000000
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Home/SpaceTokenizer.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.alcatraz.admin.project_alcatraz.Home;
-
-import android.text.SpannableString;
-import android.text.Spanned;
-import android.text.TextUtils;
-import android.widget.MultiAutoCompleteTextView;
-
-public class SpaceTokenizer implements MultiAutoCompleteTextView.Tokenizer {
-
-    public int findTokenStart(CharSequence text, int cursor) {
-        int i = cursor;
-
-        while (i > 0 && text.charAt(i - 1) != ' ') {
-            i--;
-        }
-        while (i < cursor && text.charAt(i) == ' ') {
-            i++;
-        }
-
-        return i;
-    }
-
-    public int findTokenEnd(CharSequence text, int cursor) {
-        int i = cursor;
-        int len = text.length();
-
-        while (i < len) {
-            if (text.charAt(i) == ' ') {
-                return i;
-            } else {
-                i++;
-            }
-        }
-
-        return len;
-    }
-
-    public CharSequence terminateToken(CharSequence text) {
-        int i = text.length();
-
-        while (i > 0 && text.charAt(i - 1) == ' ') {
-            i--;
-        }
-
-        if (i > 0 && text.charAt(i - 1) == ' ') {
-            return text;
-        } else {
-            if (text instanceof Spanned) {
-                SpannableString sp = new SpannableString(text + " ");
-                TextUtils.copySpansFrom((Spanned) text, 0, text.length(),
-                        Object.class, sp, 0);
-                return sp;
-            } else {
-                return text + " ";
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Session/ActiveSessionActivity.java b/app/src/main/java/com/alcatraz/admin/project_alcatraz/Session/ActiveSessionActivity.java
deleted file mode 100644
index ae2d0c18..00000000
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Session/ActiveSessionActivity.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.alcatraz.admin.project_alcatraz.Session;
-
-import android.arch.lifecycle.ViewModelProviders;
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.widget.Button;
-import android.widget.Toast;
-
-import com.alcatraz.admin.project_alcatraz.Data.Resource;
-import com.alcatraz.admin.project_alcatraz.R;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-
-public class ActiveSessionActivity extends AppCompatActivity{
-
-    private static final String TAG = ActiveSessionActivity.class.getSimpleName();
-    private ActiveSessionViewModel mActiveSessionViewModel;
-    ActiveSessionMemberAdapter activeSessionMemberAdapter;
-    @BindView(R.id.food_with) RecyclerView foodWith;
-    @BindView(R.id.button3) Button bill;
-
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_active_session);
-        ButterKnife.bind(this);
-
-        foodWith.setLayoutManager(new GridLayoutManager(ActiveSessionActivity.this,2));
-        activeSessionMemberAdapter = new ActiveSessionMemberAdapter(this,null);
-        foodWith.setAdapter(activeSessionMemberAdapter);
-
-        mActiveSessionViewModel = ViewModelProviders.of(this, new ActiveSessionViewModel.Factory(getApplication())).get(ActiveSessionViewModel.class);
-        mActiveSessionViewModel.getActiveSessionDetail().observe(this, activeSessionResource -> {
-            if (activeSessionResource == null) return;
-            if (activeSessionResource.status == Resource.Status.SUCCESS) {
-                activeSessionMemberAdapter.setUsers(activeSessionResource.data.getUsers());
-                bill.setText(String.valueOf(activeSessionResource.data.getBill()));
-                //TODO complete ordered items
-            } else if (activeSessionResource.status == Resource.Status.LOADING) {
-                // LOADING
-            } else{
-                Toast.makeText(ActiveSessionActivity.this, "Error fetching active session! Status: " +
-                        activeSessionResource.status.toString() + "\nDetails: " + activeSessionResource.message, Toast.LENGTH_LONG).show();
-            }
-        });
-    }
-}
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Session/ActiveSessionMemberAdapter.java b/app/src/main/java/com/alcatraz/admin/project_alcatraz/Session/ActiveSessionMemberAdapter.java
deleted file mode 100644
index 19634e8a..00000000
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Session/ActiveSessionMemberAdapter.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package com.alcatraz.admin.project_alcatraz.Session;
-
-import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-
-import com.alcatraz.admin.project_alcatraz.R;
-import com.alcatraz.admin.project_alcatraz.User.UserModel;
-import com.alcatraz.admin.project_alcatraz.Utility.HeaderFooterRecyclerViewAdapter;
-import com.bumptech.glide.Glide;
-
-import java.util.List;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import de.hdodenhof.circleimageview.CircleImageView;
-
-public class ActiveSessionMemberAdapter extends HeaderFooterRecyclerViewAdapter {
-
-    private List<UserModel> mUsers;
-    private Context mContext;
-
-    ActiveSessionMemberAdapter(Context context, List<UserModel> users){
-        this.mContext = context;
-        this.mUsers = users;
-    }
-
-    @NonNull
-    @Override
-    public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        View view=LayoutInflater.from(parent.getContext())
-                .inflate(viewType, parent, false);
-        return new ViewHolder(view);
-    }
-
-    @Override
-    public boolean useHeader() {
-        return true;
-    }
-
-    @Override
-    public void onBindHeaderView(RecyclerView.ViewHolder holder, int position) {
-
-    }
-
-    @Override
-    public boolean useFooter() {
-        return false;
-    }
-
-    @Override
-    public RecyclerView.ViewHolder onCreateBasicItemViewHolder(ViewGroup parent, int viewType) {
-        return null;
-    }
-
-    @Override
-    public void onBindBasicItemView(RecyclerView.ViewHolder holder, int position) {
-        if (mUsers != null){
-            ((ViewHolder) holder).bindData(mUsers.get(position));
-        }
-    }
-
-    @Override
-    public int getBasicItemCount() {
-        if (mUsers != null) return mUsers.size();
-        else return 0;
-    }
-
-    @Override
-    public int getBasicItemType(int position) {
-        return R.layout.session_user_layout;
-    }
-
-    public void setUsers(List<UserModel> users) {
-        this.mUsers = users;
-        notifyDataSetChanged();
-    }
-
-    class ViewHolder extends RecyclerView.ViewHolder {
-        @BindView(R.id.im_user)
-        CircleImageView imUser;
-        @BindView(R.id.tv_user) TextView tvUser;
-        public ViewHolder(View view){
-            super(view);
-            ButterKnife.bind(this, view);
-        }
-
-        void bindData(UserModel user) {
-            tvUser.setText(user.getUsername());
-            Glide.with(mContext.getApplicationContext()).load(user.getImageUrl()).into(imUser);
-        }
-    }
-
-}
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Session/ActiveSessionModel.java b/app/src/main/java/com/alcatraz/admin/project_alcatraz/Session/ActiveSessionModel.java
deleted file mode 100644
index c38f894b..00000000
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Session/ActiveSessionModel.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.alcatraz.admin.project_alcatraz.Session;
-
-import com.alcatraz.admin.project_alcatraz.User.UserModel;
-
-import java.util.List;
-
-/**
- * Created by Bhavik Patel on 04/08/2018.
- */
-
-public class ActiveSessionModel {
-    private int bill;
-    private List<OrderedItemModel> orderedItems;
-    private List<UserModel> users;
-
-    public ActiveSessionModel(int bill, List<OrderedItemModel> orderedItems, List<UserModel> users) {
-        this.bill = bill;
-        this.orderedItems = orderedItems;
-        this.users = users;
-    }
-
-    public int getBill() {
-        return bill;
-    }
-
-    public List<OrderedItemModel> getOrderedItems() {
-        return orderedItems;
-    }
-
-    public List<UserModel> getUsers() {
-        return users;
-    }
-}
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Session/ActiveSessionRepository.java b/app/src/main/java/com/alcatraz/admin/project_alcatraz/Session/ActiveSessionRepository.java
deleted file mode 100644
index 8fb8d06d..00000000
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Session/ActiveSessionRepository.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.alcatraz.admin.project_alcatraz.Session;
-
-import android.app.Application;
-import android.arch.lifecycle.LiveData;
-import android.content.Context;
-import android.support.annotation.NonNull;
-
-import com.alcatraz.admin.project_alcatraz.Data.ApiClient;
-import com.alcatraz.admin.project_alcatraz.Data.ApiResponse;
-import com.alcatraz.admin.project_alcatraz.Data.BaseRepository;
-import com.alcatraz.admin.project_alcatraz.Data.NetworkBoundResource;
-import com.alcatraz.admin.project_alcatraz.Data.Resource;
-import com.alcatraz.admin.project_alcatraz.Data.RetrofitLiveData;
-import com.alcatraz.admin.project_alcatraz.Data.WebApiService;
-
-import io.objectbox.Box;
-
-/**
- * Created by Bhavik Patel on 04/08/2018.
- */
-
-public class ActiveSessionRepository extends BaseRepository {
-
-    private final WebApiService mWebService;
-    private static ActiveSessionRepository INSTANCE;
-
-    private ActiveSessionRepository(Context context) {
-        mWebService = ApiClient.getApiService(context);
-    }
-
-    public static ActiveSessionRepository getInstance(Application application) {
-        if (INSTANCE == null) {
-            synchronized (ActiveSessionRepository.class) {
-                if (INSTANCE == null) {
-                    INSTANCE = new ActiveSessionRepository(application.getApplicationContext());
-                }
-            }
-        }
-        return INSTANCE;
-    }
-
-
-    public LiveData<Resource<ActiveSessionModel>> getActiveSessionDetail(int activeSessionId) {
-        return new NetworkBoundResource<ActiveSessionModel, ActiveSessionModel>() {
-
-            @Override
-            protected void saveCallResult(ActiveSessionModel data) {}
-
-            @Override
-            protected boolean shouldUseLocalDb() {return false;}
-
-            @NonNull
-            @Override
-            protected LiveData<ApiResponse<ActiveSessionModel>> createCall() {
-                return new RetrofitLiveData<>(mWebService.getActiveSession(activeSessionId));
-            }
-        }.getAsLiveData();
-    }
-}
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Session/ActiveSessionViewModel.java b/app/src/main/java/com/alcatraz/admin/project_alcatraz/Session/ActiveSessionViewModel.java
deleted file mode 100644
index e4e69215..00000000
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Session/ActiveSessionViewModel.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.alcatraz.admin.project_alcatraz.Session;
-
-import android.app.Application;
-import android.arch.lifecycle.AndroidViewModel;
-import android.arch.lifecycle.LiveData;
-import android.arch.lifecycle.ViewModel;
-import android.arch.lifecycle.ViewModelProvider;
-import android.content.SharedPreferences;
-import android.preference.PreferenceManager;
-import android.support.annotation.NonNull;
-
-import com.alcatraz.admin.project_alcatraz.Data.Resource;
-import com.alcatraz.admin.project_alcatraz.Utility.Constants;
-
-/**
- * Created by Bhavik Patel on 05/08/2018.
- */
-
-public class ActiveSessionViewModel extends AndroidViewModel {
-
-    private final ActiveSessionRepository mRepository;
-    private LiveData<Resource<ActiveSessionModel>> mData;
-    private SharedPreferences mPrefs;
-
-    public ActiveSessionViewModel(@NonNull Application application) {
-        super(application);
-        mRepository = ActiveSessionRepository.getInstance(application);
-        mPrefs = PreferenceManager.getDefaultSharedPreferences(application.getApplicationContext());
-    }
-
-    public LiveData<Resource<ActiveSessionModel>> getActiveSessionDetail() {
-        return mData = mRepository.getActiveSessionDetail(mPrefs.getInt(Constants.USER_ID,0));
-    }
-
-    public static class Factory extends ViewModelProvider.NewInstanceFactory {
-        @NonNull
-        private final Application mApplication;
-
-        public Factory(@NonNull Application application) {
-            mApplication = application;
-        }
-
-        @NonNull
-        @Override
-        public <T extends ViewModel> T create(@NonNull Class<T> modelClass) {
-            return (T) new ActiveSessionViewModel(mApplication);
-        }
-    }
-}
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Session/ItemCustomizationGroup.java b/app/src/main/java/com/alcatraz/admin/project_alcatraz/Session/ItemCustomizationGroup.java
deleted file mode 100644
index 83c10027..00000000
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Session/ItemCustomizationGroup.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package com.alcatraz.admin.project_alcatraz.Session;
-
-import java.util.List;
-
-import io.objectbox.annotation.Backlink;
-import io.objectbox.annotation.Entity;
-import io.objectbox.annotation.Id;
-import io.objectbox.relation.ToMany;
-import io.objectbox.relation.ToOne;
-
-/**
- * Created by Bhavik Patel on 11/08/2018.
- */
-
-
-@Entity
-public class ItemCustomizationGroup {
-
-    @Id private long id;
-    private int minSelection = 0;
-    private int maxSelection = 1;
-    private String name;
-
-    @Backlink (to = "customizationGroup")
-    private ToMany<ItemCustomizationField> itemCustomizationFieldList;
-    private ToOne<MenuItemModel> menuItem;
-
-    public ItemCustomizationGroup() {
-    }
-
-    public ItemCustomizationGroup(int minSelection, int maxSelection, String name, long menuId) {
-        this.minSelection = minSelection;
-        this.maxSelection = maxSelection;
-        this.name = name;
-        menuItem.setTargetId(menuId);
-    }
-
-    public int getMinSelection() {
-        return minSelection;
-    }
-
-    public void setMinSelection(int minSelection) {
-        this.minSelection = minSelection;
-    }
-
-    public int getMaxSelection() {
-        return maxSelection;
-    }
-
-    public void setMaxSelection(int maxSelection) {
-        this.maxSelection = maxSelection;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public ToMany<ItemCustomizationField> getItemCustomizationFieldList() {
-        return itemCustomizationFieldList;
-    }
-
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    /*public void setItemCustomizationFieldList(ToMany<ItemCustomizationField> itemCustomizationFieldList) {
-        this.itemCustomizationFieldList = itemCustomizationFieldList;
-    }*/
-
-    public long getMenuItemId() {
-        return menuItem.getTargetId();
-    }
-
-    public ToOne<MenuItemModel> getMenuItem() {
-        return menuItem;
-    }
-}
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Session/MenuItemCustomization.java b/app/src/main/java/com/alcatraz/admin/project_alcatraz/Session/MenuItemCustomization.java
deleted file mode 100644
index b3984b1b..00000000
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Session/MenuItemCustomization.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.alcatraz.admin.project_alcatraz.Session;
-
-public class MenuItemCustomization {
-}
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Session/OrderedItemModel.java b/app/src/main/java/com/alcatraz/admin/project_alcatraz/Session/OrderedItemModel.java
deleted file mode 100644
index 688686d7..00000000
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Session/OrderedItemModel.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.alcatraz.admin.project_alcatraz.Session;
-
-import java.util.List;
-
-public class OrderedItemModel {
-    private MenuItemModel item;
-    private int quantity;
-    private int remainingSeconds;
-    private int typeIndex;
-    private List<ItemCustomizationField> selectedFields;
-
-    OrderedItemModel(MenuItemModel menuItem, int quantity, int type) {
-        this.item = menuItem;
-        this.quantity = quantity;
-        this.typeIndex = type;
-    }
-
-    public void setRemainingSeconds(int remainingSeconds) {
-        this.remainingSeconds = remainingSeconds;
-    }
-
-    public int getRemainingSeconds() {
-        return remainingSeconds;
-    }
-
-    public double getPrice() {
-        double price = 0;
-        price = item.getTypeCost().get(typeIndex);
-        return price * quantity;
-    }
-
-    public int getTypeIndex() {
-        return typeIndex;
-    }
-
-    public int getCount() {
-        return quantity;
-    }
-
-    public MenuItemModel getItem() {
-        return item;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        return obj instanceof OrderedItemModel && ((OrderedItemModel) obj).getItem().getId() == this.getItem().getId();
-    }
-}
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/User/ImageAdapterProfile.java b/app/src/main/java/com/alcatraz/admin/project_alcatraz/User/ImageAdapterProfile.java
deleted file mode 100644
index 672cfb85..00000000
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/User/ImageAdapterProfile.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.alcatraz.admin.project_alcatraz.User;
-
-/**
- * Created by TAIYAB on 20-02-2018.
- */
-import android.content.Context;
-import android.support.v4.view.PagerAdapter;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-
-import com.alcatraz.admin.project_alcatraz.R;
-
-import java.util.ArrayList;
-
-public class ImageAdapterProfile extends PagerAdapter {
-
-    private ArrayList<Integer> images;
-    private LayoutInflater inflater;
-    private Context context;
-
-    public ImageAdapterProfile(Context context, ArrayList<Integer> images) {
-        this.context = context;
-        this.images=images;
-        inflater = LayoutInflater.from(context);
-    }
-
-    @Override
-    public void destroyItem(ViewGroup container, int position, Object object) {
-        container.removeView((View) object);
-    }
-
-    @Override
-    public int getCount() {
-        return images.size();
-    }
-
-    @Override
-    public Object instantiateItem(ViewGroup view, int position) {
-        View myImageLayout = inflater.inflate(R.layout.imagesnippetprofile, view, false);
-        ImageView myImage = (ImageView) myImageLayout
-                .findViewById(R.id.image);
-        myImage.setImageResource(images.get(position));
-        view.addView(myImageLayout, 0);
-        return myImageLayout;
-    }
-
-    @Override
-    public boolean isViewFromObject(View view, Object object) {
-        return view.equals(object);
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/User/UserModel.java b/app/src/main/java/com/alcatraz/admin/project_alcatraz/User/UserModel.java
deleted file mode 100644
index 003ebdef..00000000
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/User/UserModel.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.alcatraz.admin.project_alcatraz.User;
-
-import io.objectbox.annotation.Entity;
-import io.objectbox.annotation.Id;
-
-@Entity
-public class UserModel {
-    @Id private long id;
-    private String username;
-    private String imageUrl;
-
-    UserModel() {}
-
-    public UserModel(String username, String imageUrl) {
-        this.username = username;
-        this.imageUrl = imageUrl;
-    }
-
-    public UserModel(long id, String username, String imageUrl) {
-        this.id = id;
-        this.username = username;
-        this.imageUrl = imageUrl;
-    }
-
-    public long getId() {
-        return id;
-    }
-
-    void setId(long id) {
-        this.id = id;
-    }
-
-    public String getUsername() {
-        return username;
-    }
-
-    public String getImageUrl() {
-        return imageUrl;
-    }
-}
-
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Utility/CustomListViewAdapter.java b/app/src/main/java/com/alcatraz/admin/project_alcatraz/Utility/CustomListViewAdapter.java
deleted file mode 100644
index 839f97b4..00000000
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Utility/CustomListViewAdapter.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.alcatraz.admin.project_alcatraz.Utility;
-
-import android.app.Activity;
-import android.content.Context;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ArrayAdapter;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import com.alcatraz.admin.project_alcatraz.R;
-
-import java.util.List;
-
-public class CustomListViewAdapter extends ArrayAdapter<RowItem> {
-
-
-    Context context;
-
-    public CustomListViewAdapter(Context context, int resourceId, //resourceId=your layout
-                                 List<RowItem> items) {
-        super(context, resourceId, items);
-        this.context = context;
-    }
-
-    /*private view holder class*/
-    private class ViewHolder {
-        ImageView imageView;
-        TextView txtTitle;
-    }
-
-    public View getView(int position, View convertView, ViewGroup parent) {
-        ViewHolder holder = null;
-        RowItem rowItem = getItem(position);
-
-        LayoutInflater mInflater = (LayoutInflater) context
-                .getSystemService(Activity.LAYOUT_INFLATER_SERVICE);
-        if (convertView == null) {
-            convertView = mInflater.inflate(R.layout.item_friend, null);
-            holder = new ViewHolder();
-            holder.txtTitle = (TextView) convertView.findViewById(R.id.namehere);
-            holder.imageView = (ImageView) convertView.findViewById(R.id.cirimg);
-            convertView.setTag(holder);
-        } else
-            holder = (ViewHolder) convertView.getTag();
-
-        holder.txtTitle.setText(rowItem.getTitle());
-        holder.imageView.setImageResource(rowItem.getImageId());
-
-        return convertView;
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Utility/MaterialChip.java b/app/src/main/java/com/alcatraz/admin/project_alcatraz/Utility/MaterialChip.java
deleted file mode 100644
index 9d510a80..00000000
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Utility/MaterialChip.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package com.alcatraz.admin.project_alcatraz.Utility;
-
-import android.content.Context;
-import android.content.res.ColorStateList;
-import android.graphics.drawable.Drawable;
-import android.net.Uri;
-
-import com.pchmn.materialchips.model.ChipInterface;
-import com.pchmn.materialchips.views.DetailedChipView;
-
-public class MaterialChip implements ChipInterface {
-    protected String label;
-    protected String info;
-    protected Drawable avatarDrawable;
-    protected Object id;
-    protected Uri avatarUri;
-
-    protected ColorStateList detailedBackgroundColor;
-    protected ColorStateList detailedTextColor;
-    protected ColorStateList detailedDeleteIconColor;
-
-    @Override
-    public Object getId() {
-        return id;
-    }
-
-    @Override
-    public Uri getAvatarUri() {
-        return avatarUri;
-    }
-
-    @Override
-    public Drawable getAvatarDrawable() {
-        return avatarDrawable;
-    }
-
-    @Override
-    public String getLabel() {
-        return label;
-    }
-
-    @Override
-    public String getInfo() {
-        return info;
-    }
-
-    public static DetailedChipView getDetailedChipView(Context context, MaterialChip chip) {
-        return (new DetailedChipView.Builder(context))
-                .chip(chip)
-                .backgroundColor(chip.detailedBackgroundColor)
-                .textColor(chip.detailedTextColor)
-                .deleteIconColor(chip.detailedDeleteIconColor)
-                .build();
-    }
-}
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Utility/RowItem.java b/app/src/main/java/com/alcatraz/admin/project_alcatraz/Utility/RowItem.java
deleted file mode 100644
index 36ad6a3c..00000000
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Utility/RowItem.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.alcatraz.admin.project_alcatraz.Utility;
-public class RowItem {
-    private int imageId;
-    private String title;
-    private String desc;
-
-    public RowItem(int imageId, String title,String  desc) {
-        this.imageId = imageId;
-        this.title = title;
-        this.desc = desc;
-    }
-    public int getImageId() {
-        return imageId;
-    }
-    public void setImageId(int imageId) {
-        this.imageId = imageId;
-    }
-    public String getDesc() {
-        return desc;
-    }
-    public void setDesc(String desc) {
-        this.desc = desc;
-    }
-    public String getTitle() {
-        return title;
-    }
-    public void setTitle(String title) {
-        this.title = title;
-    }
-    @Override
-    public String toString() {
-        return title + "\n" + desc;
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Auth/AuthRepository.java b/app/src/main/java/com/checkin/app/checkin/Auth/AuthRepository.java
similarity index 58%
rename from app/src/main/java/com/alcatraz/admin/project_alcatraz/Auth/AuthRepository.java
rename to app/src/main/java/com/checkin/app/checkin/Auth/AuthRepository.java
index 66af14db..c7ed9cd5 100644
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Auth/AuthRepository.java
+++ b/app/src/main/java/com/checkin/app/checkin/Auth/AuthRepository.java
@@ -1,17 +1,18 @@
-package com.alcatraz.admin.project_alcatraz.Auth;
+package com.checkin.app.checkin.Auth;
 
 import android.app.Application;
 import android.arch.lifecycle.LiveData;
 import android.content.Context;
 import android.support.annotation.NonNull;
 
-import com.alcatraz.admin.project_alcatraz.Data.ApiClient;
-import com.alcatraz.admin.project_alcatraz.Data.ApiResponse;
-import com.alcatraz.admin.project_alcatraz.Data.BaseRepository;
-import com.alcatraz.admin.project_alcatraz.Data.NetworkBoundResource;
-import com.alcatraz.admin.project_alcatraz.Data.Resource;
-import com.alcatraz.admin.project_alcatraz.Data.RetrofitLiveData;
-import com.alcatraz.admin.project_alcatraz.Data.WebApiService;
+import com.checkin.app.checkin.Data.ApiClient;
+import com.checkin.app.checkin.Data.ApiResponse;
+import com.checkin.app.checkin.Data.BaseRepository;
+import com.checkin.app.checkin.Data.NetworkBoundResource;
+import com.checkin.app.checkin.Data.Resource;
+import com.checkin.app.checkin.Data.RetrofitLiveData;
+import com.checkin.app.checkin.Data.WebApiService;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 
 import java.util.Map;
 
@@ -26,8 +27,8 @@ private AuthRepository(Context context) {
         mWebService = ApiClient.getApiService(context);
     }
 
-    public LiveData<Resource<Map<String, String>>> login(final Map<String, String> credentials) {
-        return new NetworkBoundResource<Map<String, String>, Map<String, String>>() {
+    public LiveData<Resource<ObjectNode>> login(final ObjectNode credentials) {
+        return new NetworkBoundResource<ObjectNode, ObjectNode>() {
             @Override
             protected boolean shouldUseLocalDb() {
                 return false;
@@ -35,12 +36,12 @@ protected boolean shouldUseLocalDb() {
 
             @NonNull
             @Override
-            protected LiveData<ApiResponse<Map<String, String>>> createCall() {
+            protected LiveData<ApiResponse<ObjectNode>> createCall() {
                 return new RetrofitLiveData<>(mWebService.postLogin(credentials));
             }
 
             @Override
-            protected void saveCallResult(Map<String, String> data) {
+            protected void saveCallResult(ObjectNode data) {
             }
         } .getAsLiveData();
     }
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Auth/AuthViewModel.java b/app/src/main/java/com/checkin/app/checkin/Auth/AuthViewModel.java
similarity index 50%
rename from app/src/main/java/com/alcatraz/admin/project_alcatraz/Auth/AuthViewModel.java
rename to app/src/main/java/com/checkin/app/checkin/Auth/AuthViewModel.java
index e8bfacb9..ec65dc77 100644
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Auth/AuthViewModel.java
+++ b/app/src/main/java/com/checkin/app/checkin/Auth/AuthViewModel.java
@@ -1,37 +1,33 @@
-package com.alcatraz.admin.project_alcatraz.Auth;
+package com.checkin.app.checkin.Auth;
 
 import android.app.Application;
-import android.arch.lifecycle.AndroidViewModel;
-import android.arch.lifecycle.LiveData;
-import android.arch.lifecycle.MediatorLiveData;
 import android.arch.lifecycle.ViewModel;
 import android.arch.lifecycle.ViewModelProvider;
 import android.support.annotation.NonNull;
 
-import com.alcatraz.admin.project_alcatraz.Data.Resource;
+import com.checkin.app.checkin.Data.BaseViewModel;
+import com.checkin.app.checkin.Data.Converters;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 
-import java.util.HashMap;
-import java.util.Map;
 
-
-public class AuthViewModel extends AndroidViewModel{
+public class AuthViewModel extends BaseViewModel{
     private final AuthRepository mRepository;
-    private MediatorLiveData<Resource<Map<String, String>>> mData = new MediatorLiveData<>();
 
-    public AuthViewModel(@NonNull Application application) {
+    AuthViewModel(@NonNull Application application) {
         super(application);
         mRepository = AuthRepository.getInstance(application);
     }
 
-    public LiveData<Resource<Map<String, String>>> getObservableData() {
-        return mData;
+    @Override
+    public void updateResults() {
+
     }
 
     public void login(String username, String password) {
-        Map<String, String> input = new HashMap<>(2);
-        input.put("username", username);
-        input.put("password", password);
-        mData.addSource(mRepository.login(input), mData::setValue);
+        ObjectNode data = Converters.objectMapper.createObjectNode();
+        data.put("username", username);
+        data.put("password", password);
+        mData.addSource(mRepository.login(data), mData::setValue);
     }
 
     public static class Factory extends ViewModelProvider.NewInstanceFactory {
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Data/ApiClient.java b/app/src/main/java/com/checkin/app/checkin/Data/ApiClient.java
similarity index 72%
rename from app/src/main/java/com/alcatraz/admin/project_alcatraz/Data/ApiClient.java
rename to app/src/main/java/com/checkin/app/checkin/Data/ApiClient.java
index 3b4a1977..847ef26f 100644
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Data/ApiClient.java
+++ b/app/src/main/java/com/checkin/app/checkin/Data/ApiClient.java
@@ -1,4 +1,4 @@
-package com.alcatraz.admin.project_alcatraz.Data;
+package com.checkin.app.checkin.Data;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -8,9 +8,9 @@
 import android.support.annotation.NonNull;
 import android.util.Log;
 
-import com.alcatraz.admin.project_alcatraz.BuildConfig;
-import com.alcatraz.admin.project_alcatraz.Utility.Constants;
-import com.alcatraz.admin.project_alcatraz.Utility.NoConnectivityException;
+import com.checkin.app.checkin.BuildConfig;
+import com.checkin.app.checkin.Utility.Constants;
+import com.checkin.app.checkin.Utility.NoConnectivityException;
 
 import java.io.IOException;
 import java.util.concurrent.TimeUnit;
@@ -23,11 +23,10 @@
 import okhttp3.Response;
 import okhttp3.logging.HttpLoggingInterceptor;
 import retrofit2.Retrofit;
-import retrofit2.converter.gson.GsonConverterFactory;
+import retrofit2.converter.jackson.JacksonConverterFactory;
 
-import static com.alcatraz.admin.project_alcatraz.Utility.Constants.API_HOST;
-import static com.alcatraz.admin.project_alcatraz.Utility.Constants.API_PORT;
-import static com.alcatraz.admin.project_alcatraz.Utility.Constants.API_VERSION;
+import static com.checkin.app.checkin.Utility.Constants.API_HOST;
+import static com.checkin.app.checkin.Utility.Constants.API_PORT;
 
 @Module
 public class ApiClient {
@@ -39,18 +38,15 @@ public static String getBaseUrl() {
 
     private OkHttpClient provideClient(final Context context) {
         OkHttpClient.Builder httpClientBuilder = new OkHttpClient.Builder();
-        httpClientBuilder.addInterceptor(new Interceptor() {
-            @Override
-            public Response intercept(@NonNull Chain chain) throws IOException {
-                SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-                Request request = chain.request();
-                if (prefs.getBoolean(Constants.SP_LOGGED_IN, false)) {
-                    String authToken = "Token " + prefs.getString(Constants.SP_LOGIN_TOKEN, "");
-                    request.newBuilder()
-                            .addHeader("Authorization", authToken).build();
-                }
-                return chain.proceed(request);
+        httpClientBuilder.addInterceptor(chain -> {
+            SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+            Request request = chain.request();
+            if (prefs.getBoolean(Constants.SP_LOGGED_IN, false)) {
+                String authToken = "Token " + prefs.getString(Constants.SP_LOGIN_TOKEN, "");
+                request = request.newBuilder()
+                        .addHeader("Authorization", authToken).build();
             }
+            return chain.proceed(request);
         });
         httpClientBuilder
                 .connectTimeout(15, TimeUnit.SECONDS)
@@ -78,7 +74,7 @@ public void onInternetUnavailable() throws NoConnectivityException {
     private Retrofit provideRetrofit(@NonNull final Context context) {
         return new Retrofit.Builder()
                 .baseUrl(getBaseUrl())
-                .addConverterFactory(GsonConverterFactory.create())
+                .addConverterFactory(JacksonConverterFactory.create(Converters.objectMapper))
                 .client(provideClient(context))
                 .build();
     }
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Data/ApiResponse.java b/app/src/main/java/com/checkin/app/checkin/Data/ApiResponse.java
similarity index 74%
rename from app/src/main/java/com/alcatraz/admin/project_alcatraz/Data/ApiResponse.java
rename to app/src/main/java/com/checkin/app/checkin/Data/ApiResponse.java
index 81dc8ee5..146314c7 100644
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Data/ApiResponse.java
+++ b/app/src/main/java/com/checkin/app/checkin/Data/ApiResponse.java
@@ -1,13 +1,14 @@
-package com.alcatraz.admin.project_alcatraz.Data;
+package com.checkin.app.checkin.Data;
 
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.util.Log;
 
-import com.alcatraz.admin.project_alcatraz.Utility.Util;
-import com.google.gson.JsonObject;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 
 import java.io.IOException;
-import java.util.Map;
+import java.util.Objects;
 
 import retrofit2.Response;
 
@@ -58,13 +59,19 @@ public T getData() {
 
     @Nullable
     public String getErrorMessage() {
-        JsonObject data = Converters.getJsonObject(errorMessage);
+        JsonNode data = Converters.getJsonNode(errorMessage);
         if (data == null)
             return errorMessage;
-        if (data.has("detail"))
-            return data.get("detail").getAsString();
-        else if (data.has("errors"))
-            return data.get("errors").getAsString();
+        Log.e("APIResponse", "Error data: " + data.toString());
+
+        if (data.has("detail")) {
+            Log.e("APIResponse", "Detail");
+            return data.get("detail").asText();
+        }
+        else if (data.has("errors")) {
+            Log.e("APIResponse", "Errors");
+            return data.get("errors").get(0).asText();
+        }
         else
             return errorMessage;
     }
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Data/AppDatabase.java b/app/src/main/java/com/checkin/app/checkin/Data/AppDatabase.java
similarity index 72%
rename from app/src/main/java/com/alcatraz/admin/project_alcatraz/Data/AppDatabase.java
rename to app/src/main/java/com/checkin/app/checkin/Data/AppDatabase.java
index 6a3803bf..6a555dfa 100644
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Data/AppDatabase.java
+++ b/app/src/main/java/com/checkin/app/checkin/Data/AppDatabase.java
@@ -1,15 +1,16 @@
-package com.alcatraz.admin.project_alcatraz.Data;
+package com.checkin.app.checkin.Data;
 
 import android.content.Context;
 
 //import com.alcatraz.admin.project_alcatraz.MyObjectBox;
-import com.alcatraz.admin.project_alcatraz.Session.ItemCustomizationField;
-import com.alcatraz.admin.project_alcatraz.Session.ItemCustomizationGroup;
-import com.alcatraz.admin.project_alcatraz.Session.MenuGroupModel;
-import com.alcatraz.admin.project_alcatraz.Session.MenuItemModel;
-import com.alcatraz.admin.project_alcatraz.Social.Chat;
-import com.alcatraz.admin.project_alcatraz.Social.Message;
-import com.alcatraz.admin.project_alcatraz.User.UserModel;
+import com.checkin.app.checkin.MyObjectBox;
+import com.checkin.app.checkin.Session.ItemCustomizationField;
+import com.checkin.app.checkin.Session.ItemCustomizationGroup;
+import com.checkin.app.checkin.Session.MenuGroupModel;
+import com.checkin.app.checkin.Session.MenuItemModel;
+import com.checkin.app.checkin.Social.Chat;
+import com.checkin.app.checkin.Social.Message;
+import com.checkin.app.checkin.User.UserModel;
 
 import javax.inject.Singleton;
 
@@ -24,7 +25,7 @@ public static BoxStore getBoxStore(final Context context) {
         if (mBoxStore == null) {
             synchronized (AppDatabase.class) {
                 if (mBoxStore == null) {
-                    mBoxStore = null;//MyObjectBox.builder().androidContext(context).buildDefault();
+                    mBoxStore = MyObjectBox.builder().androidContext(context).buildDefault();
                 }
             }
         }
diff --git a/app/src/main/java/com/checkin/app/checkin/Data/BaseRepository.java b/app/src/main/java/com/checkin/app/checkin/Data/BaseRepository.java
new file mode 100644
index 00000000..c9bba013
--- /dev/null
+++ b/app/src/main/java/com/checkin/app/checkin/Data/BaseRepository.java
@@ -0,0 +1,4 @@
+package com.checkin.app.checkin.Data;
+
+public abstract class BaseRepository {
+}
diff --git a/app/src/main/java/com/checkin/app/checkin/Data/BaseViewModel.java b/app/src/main/java/com/checkin/app/checkin/Data/BaseViewModel.java
new file mode 100644
index 00000000..da88380d
--- /dev/null
+++ b/app/src/main/java/com/checkin/app/checkin/Data/BaseViewModel.java
@@ -0,0 +1,23 @@
+package com.checkin.app.checkin.Data;
+
+import android.app.Application;
+import android.arch.lifecycle.AndroidViewModel;
+import android.arch.lifecycle.LiveData;
+import android.arch.lifecycle.MediatorLiveData;
+import android.support.annotation.NonNull;
+
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
+public abstract class BaseViewModel extends AndroidViewModel{
+    protected MediatorLiveData<Resource<ObjectNode>> mData = new MediatorLiveData<>();
+
+    public BaseViewModel(@NonNull Application application) {
+        super(application);
+    }
+
+    public LiveData<Resource<ObjectNode>> getObservableData() {
+        return mData;
+    }
+
+    public abstract void updateResults();
+}
diff --git a/app/src/main/java/com/checkin/app/checkin/Data/Converters.java b/app/src/main/java/com/checkin/app/checkin/Data/Converters.java
new file mode 100644
index 00000000..29081fc9
--- /dev/null
+++ b/app/src/main/java/com/checkin/app/checkin/Data/Converters.java
@@ -0,0 +1,81 @@
+package com.checkin.app.checkin.Data;
+
+import android.support.annotation.Nullable;
+import android.util.Log;
+
+import com.fasterxml.jackson.core.JsonFactory;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+
+import io.objectbox.converter.PropertyConverter;
+
+public class Converters {
+    private static final String TAG = Converters.class.getSimpleName();
+    public static final ObjectMapper objectMapper = new ObjectMapper();
+    public static class MapConverter<X, Y> implements PropertyConverter<Map<X, Y>, String> {
+
+        @Override
+        public Map<X, Y> convertToEntityProperty(String databaseValue) {
+            TypeReference type = new TypeReference<Map<X, Y>>() {};
+            return getObjectFromJson(databaseValue, type);
+        }
+
+        @Override
+        public String convertToDatabaseValue(Map<X, Y> entityProperty) {
+            try {
+                return objectMapper.writeValueAsString(entityProperty);
+            } catch (JsonProcessingException e) {
+                e.printStackTrace();
+            }
+            return "";
+        }
+    }
+
+    public static class ListConverter<T> implements PropertyConverter<List<T>, String> {
+
+        @Override
+        public List<T> convertToEntityProperty(String databaseValue) {
+            TypeReference type = new TypeReference<List<T>>() {};
+            return getObjectFromJson(databaseValue, type);
+        }
+
+        @Override
+        public String convertToDatabaseValue(List<T> entityProperty) {
+            try {
+                return objectMapper.writeValueAsString(entityProperty);
+            } catch (JsonProcessingException e) {
+                e.printStackTrace();
+            }
+            return "";
+        }
+    }
+
+    public static JsonNode getJsonNode(String json) {
+        try {
+            return objectMapper.readTree(json);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    @Nullable
+    public static <T> T getObjectFromJson(String json, TypeReference typeReference) {
+        T res;
+        try {
+            res = objectMapper.readValue(json, typeReference);
+        } catch (IOException exception) {
+            res = null;
+            Log.e(TAG, "JSON invalid! " + json);
+        }
+        return res;
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Data/NetworkBoundResource.java b/app/src/main/java/com/checkin/app/checkin/Data/NetworkBoundResource.java
similarity index 98%
rename from app/src/main/java/com/alcatraz/admin/project_alcatraz/Data/NetworkBoundResource.java
rename to app/src/main/java/com/checkin/app/checkin/Data/NetworkBoundResource.java
index 47a08797..cd21f949 100644
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Data/NetworkBoundResource.java
+++ b/app/src/main/java/com/checkin/app/checkin/Data/NetworkBoundResource.java
@@ -1,4 +1,4 @@
-package com.alcatraz.admin.project_alcatraz.Data;
+package com.checkin.app.checkin.Data;
 
 import android.arch.lifecycle.LiveData;
 import android.arch.lifecycle.MediatorLiveData;
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Data/Resource.java b/app/src/main/java/com/checkin/app/checkin/Data/Resource.java
similarity index 96%
rename from app/src/main/java/com/alcatraz/admin/project_alcatraz/Data/Resource.java
rename to app/src/main/java/com/checkin/app/checkin/Data/Resource.java
index eb41eee1..9985b114 100644
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Data/Resource.java
+++ b/app/src/main/java/com/checkin/app/checkin/Data/Resource.java
@@ -1,10 +1,10 @@
-package com.alcatraz.admin.project_alcatraz.Data;
+package com.checkin.app.checkin.Data;
 
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.util.Log;
 
-import com.alcatraz.admin.project_alcatraz.Utility.NoConnectivityException;
+import com.checkin.app.checkin.Utility.NoConnectivityException;
 
 import static java.net.HttpURLConnection.HTTP_BAD_REQUEST;
 import static java.net.HttpURLConnection.HTTP_FORBIDDEN;
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Data/RetrofitLiveData.java b/app/src/main/java/com/checkin/app/checkin/Data/RetrofitLiveData.java
similarity index 96%
rename from app/src/main/java/com/alcatraz/admin/project_alcatraz/Data/RetrofitLiveData.java
rename to app/src/main/java/com/checkin/app/checkin/Data/RetrofitLiveData.java
index 53879f2a..9e434fcf 100644
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Data/RetrofitLiveData.java
+++ b/app/src/main/java/com/checkin/app/checkin/Data/RetrofitLiveData.java
@@ -1,4 +1,4 @@
-package com.alcatraz.admin.project_alcatraz.Data;
+package com.checkin.app.checkin.Data;
 
 import android.arch.lifecycle.LiveData;
 import android.support.annotation.NonNull;
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Data/TestDb.java b/app/src/main/java/com/checkin/app/checkin/Data/TestDb.java
similarity index 75%
rename from app/src/main/java/com/alcatraz/admin/project_alcatraz/Data/TestDb.java
rename to app/src/main/java/com/checkin/app/checkin/Data/TestDb.java
index 3e53f00f..408a0c06 100644
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Data/TestDb.java
+++ b/app/src/main/java/com/checkin/app/checkin/Data/TestDb.java
@@ -1,15 +1,16 @@
-package com.alcatraz.admin.project_alcatraz.Data;
+package com.checkin.app.checkin.Data;
 
 import android.content.Context;
 import android.util.Log;
 
-import com.alcatraz.admin.project_alcatraz.Session.ItemCustomizationField;
-import com.alcatraz.admin.project_alcatraz.Session.ItemCustomizationGroup;
-import com.alcatraz.admin.project_alcatraz.Session.MenuGroupModel;
-import com.alcatraz.admin.project_alcatraz.Session.MenuItemModel;
-import com.alcatraz.admin.project_alcatraz.User.UserModel;
+import com.checkin.app.checkin.Session.ItemCustomizationField;
+import com.checkin.app.checkin.Session.ItemCustomizationGroup;
+import com.checkin.app.checkin.Session.MenuGroupModel;
+import com.checkin.app.checkin.Session.MenuItemModel;
+import com.checkin.app.checkin.User.UserModel;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 import io.objectbox.Box;
@@ -58,11 +59,9 @@ private static void populateMenu(
                     typeCost.add(400.0);
                     typeName.add("Beer");
                     typeCost.add(750.0);
-                    baseType = 0;
                 } else {
                     typeName.add("Default");
                     typeCost.add(460.0);
-                    baseType = 0;
 
                     for (int k = 1; k < 6; k++) {
                         ItemCustomizationGroup itemCustomizationGroup = new ItemCustomizationGroup((k%2)*3,k+2,"Extra #" + k, c1);
@@ -74,9 +73,11 @@ private static void populateMenu(
                         }
                     }
                 }
-                MenuItemModel menuItem = new MenuItemModel("Carlsburg #" + j, typeName, typeCost, baseType, i, 1);
+                MenuItemModel menuItem = new MenuItemModel("Carlsburg #" + j, typeName, typeCost, i, 1);
                 menuItem.setDescription("\"It is a 5% abv pilsner beer with a global distribution to 140 mark" +
                         "ets. It was first brewed in 1904, and was created by Carl Jacobsen, son of Carlsberg's founder JC Jacobsen.");
+                menuItem.setAvailableMeals(Arrays.asList("brkfst", "lunch", "dinner"));
+                menuItem.setIngredients(Arrays.asList("onion", "bread"));
                 c1++;
 
                 if (i % 2 == 0)
@@ -91,13 +92,13 @@ private static void populateMenu(
     }
 
     private static void populateUsers(Box<UserModel> userModel) {
-        UserModel user1 = new UserModel("Alex", "");
-        UserModel user2 = new UserModel("Alice", "");
+        UserModel user1 = new UserModel("Alex", "https://78.media.tumblr.com/fc66ed1ceef891684aae8eb2acb152a3/tumblr_oyg8f1Qc1n1vy2tgqo1_400.jpg");
+        UserModel user2 = new UserModel("Alice", "https://vignette.wikia.nocookie.net/typemoon/images/c/c1/Archer_EMIYA.jpeg/revision/latest?cb=20150630040614");
 
         userModel.put(user1, user2);
 
-        UserModel user3 = new UserModel("Monica", "");
-        UserModel user4 = new UserModel("Jack", "");
+        UserModel user3 = new UserModel("Monica", "https://vignette.wikia.nocookie.net/typemoon/images/c/c1/Archer_EMIYA.jpeg/revision/latest?cb=20150630040614");
+        UserModel user4 = new UserModel("Jack", "https://78.media.tumblr.com/fc66ed1ceef891684aae8eb2acb152a3/tumblr_oyg8f1Qc1n1vy2tgqo1_400.jpg");
         userModel.put(user3, user4);
     }
 }
diff --git a/app/src/main/java/com/checkin/app/checkin/Data/WebApiService.java b/app/src/main/java/com/checkin/app/checkin/Data/WebApiService.java
new file mode 100644
index 00000000..2e3dcbaa
--- /dev/null
+++ b/app/src/main/java/com/checkin/app/checkin/Data/WebApiService.java
@@ -0,0 +1,31 @@
+package com.checkin.app.checkin.Data;
+
+import com.checkin.app.checkin.Session.ActiveSessionModel;
+import com.checkin.app.checkin.Social.Message;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
+import java.util.List;
+import java.util.Map;
+
+import retrofit2.Call;
+import retrofit2.http.Body;
+import retrofit2.http.GET;
+import retrofit2.http.POST;
+import retrofit2.http.Path;
+
+public interface WebApiService {
+    @GET("messages/{user_id}/")
+    Call<List<Message>> getMessages(@Path("user_id") String userId);
+
+    @POST("auth/login/")
+    Call<ObjectNode> postLogin(@Body ObjectNode credentials);
+
+    @GET("users/{user_id}/sessions/active/")
+    Call<ActiveSessionModel> getActiveSession(@Path("user_id") String userID);
+
+    @POST("sessions/{session_id}/orders/cancel/")
+    Call<ObjectNode> postCancelOrder(@Path("session_id") String sessionID, @Body ObjectNode data);
+
+    @POST("sessions/{session_id}/customers/add/")
+    Call<ObjectNode> postSessionAddMember(@Path("session_id") String sessionID, @Body ObjectNode data);
+}
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Home/FaqActivity.java b/app/src/main/java/com/checkin/app/checkin/Home/FaqActivity.java
similarity index 75%
rename from app/src/main/java/com/alcatraz/admin/project_alcatraz/Home/FaqActivity.java
rename to app/src/main/java/com/checkin/app/checkin/Home/FaqActivity.java
index 169078d4..db5d411f 100644
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Home/FaqActivity.java
+++ b/app/src/main/java/com/checkin/app/checkin/Home/FaqActivity.java
@@ -1,9 +1,9 @@
-package com.alcatraz.admin.project_alcatraz.Home;
+package com.checkin.app.checkin.Home;
 
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 
-import com.alcatraz.admin.project_alcatraz.R;
+import com.checkin.app.checkin.R;
 
 public class FaqActivity extends AppCompatActivity {
 
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Home/FilterTransactions.java b/app/src/main/java/com/checkin/app/checkin/Home/FilterTransactions.java
similarity index 93%
rename from app/src/main/java/com/alcatraz/admin/project_alcatraz/Home/FilterTransactions.java
rename to app/src/main/java/com/checkin/app/checkin/Home/FilterTransactions.java
index 73802a61..d645c72a 100644
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Home/FilterTransactions.java
+++ b/app/src/main/java/com/checkin/app/checkin/Home/FilterTransactions.java
@@ -1,4 +1,4 @@
-package com.alcatraz.admin.project_alcatraz.Home;
+package com.checkin.app.checkin.Home;
 
 import android.content.Intent;
 import android.support.annotation.NonNull;
@@ -13,11 +13,11 @@
 import android.widget.CalendarView;
 import android.widget.TextView;
 
-import com.alcatraz.admin.project_alcatraz.R;
-import com.alcatraz.admin.project_alcatraz.Social.ChatActivity;
-import com.alcatraz.admin.project_alcatraz.Utility.Constants;
-import com.alcatraz.admin.project_alcatraz.Utility.ItemClickSupport;
-import com.alcatraz.admin.project_alcatraz.Utility.WalletFilterAdapter;
+import com.checkin.app.checkin.R;
+import com.checkin.app.checkin.Social.ChatActivity;
+import com.checkin.app.checkin.Utility.Constants;
+import com.checkin.app.checkin.Utility.ItemClickSupport;
+import com.checkin.app.checkin.Utility.WalletFilterAdapter;
 
 import java.util.ArrayList;
 import java.util.Scanner;
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Home/ForgotPassword.java b/app/src/main/java/com/checkin/app/checkin/Home/ForgotPassword.java
similarity index 81%
rename from app/src/main/java/com/alcatraz/admin/project_alcatraz/Home/ForgotPassword.java
rename to app/src/main/java/com/checkin/app/checkin/Home/ForgotPassword.java
index a112e5d5..76fcbffc 100644
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Home/ForgotPassword.java
+++ b/app/src/main/java/com/checkin/app/checkin/Home/ForgotPassword.java
@@ -1,10 +1,10 @@
-package com.alcatraz.admin.project_alcatraz.Home;
+package com.checkin.app.checkin.Home;
 
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v7.app.AppCompatActivity;
 
-import com.alcatraz.admin.project_alcatraz.R;
+import com.checkin.app.checkin.R;
 
 /**
  * Created by TAIYAB on 05-07-2018.
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Home/HomeActivity.java b/app/src/main/java/com/checkin/app/checkin/Home/HomeActivity.java
similarity index 95%
rename from app/src/main/java/com/alcatraz/admin/project_alcatraz/Home/HomeActivity.java
rename to app/src/main/java/com/checkin/app/checkin/Home/HomeActivity.java
index e71f3b9b..74187874 100644
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Home/HomeActivity.java
+++ b/app/src/main/java/com/checkin/app/checkin/Home/HomeActivity.java
@@ -1,4 +1,4 @@
-package com.alcatraz.admin.project_alcatraz.Home;
+package com.checkin.app.checkin.Home;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -33,21 +33,21 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.alcatraz.admin.project_alcatraz.Profile.ShopProfile.ShopProfileActivity2;
-import com.alcatraz.admin.project_alcatraz.R;
-import com.alcatraz.admin.project_alcatraz.Session.ActiveSessionActivity;
-import com.alcatraz.admin.project_alcatraz.Session.SessionUserActivity;
-import com.alcatraz.admin.project_alcatraz.Shop.Shop;
-import com.alcatraz.admin.project_alcatraz.Social.ChatActivity;
-import com.alcatraz.admin.project_alcatraz.Social.ChatAdapter;
-import com.alcatraz.admin.project_alcatraz.Social.MessageViewModel;
-import com.alcatraz.admin.project_alcatraz.User.UserViewModel;
-import com.alcatraz.admin.project_alcatraz.Utility.ClipRevealFrame;
-import com.alcatraz.admin.project_alcatraz.Utility.Constants;
-import com.alcatraz.admin.project_alcatraz.Utility.DragTouchListener;
-import com.alcatraz.admin.project_alcatraz.Utility.EndDrawerToggle;
-import com.alcatraz.admin.project_alcatraz.Utility.ItemClickSupport;
-import com.alcatraz.admin.project_alcatraz.Utility.Util;
+import com.checkin.app.checkin.Profile.ShopProfile.ShopProfileActivity2;
+import com.checkin.app.checkin.R;
+import com.checkin.app.checkin.Session.ActiveSessionActivity;
+import com.checkin.app.checkin.Session.SessionUserActivity;
+import com.checkin.app.checkin.Shop.Shop;
+import com.checkin.app.checkin.Social.ChatActivity;
+import com.checkin.app.checkin.Social.ChatAdapter;
+import com.checkin.app.checkin.Social.MessageViewModel;
+import com.checkin.app.checkin.User.UserViewModel;
+import com.checkin.app.checkin.Utility.ClipRevealFrame;
+import com.checkin.app.checkin.Utility.Constants;
+import com.checkin.app.checkin.Utility.DragTouchListener;
+import com.checkin.app.checkin.Utility.EndDrawerToggle;
+import com.checkin.app.checkin.Utility.ItemClickSupport;
+import com.checkin.app.checkin.Utility.Util;
 import com.google.zxing.integration.android.IntentIntegrator;
 import com.google.zxing.integration.android.IntentResult;
 
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Home/LoginActivity.java b/app/src/main/java/com/checkin/app/checkin/Home/LoginActivity.java
similarity index 90%
rename from app/src/main/java/com/alcatraz/admin/project_alcatraz/Home/LoginActivity.java
rename to app/src/main/java/com/checkin/app/checkin/Home/LoginActivity.java
index 781b87d1..39dc5ab8 100644
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Home/LoginActivity.java
+++ b/app/src/main/java/com/checkin/app/checkin/Home/LoginActivity.java
@@ -1,4 +1,4 @@
-package com.alcatraz.admin.project_alcatraz.Home;
+package com.checkin.app.checkin.Home;
 
 import android.arch.lifecycle.ViewModelProviders;
 import android.content.Intent;
@@ -15,9 +15,6 @@
 import android.support.transition.Transition;
 import android.support.transition.TransitionListenerAdapter;
 import android.support.transition.TransitionManager;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
 import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 import android.util.TypedValue;
@@ -29,13 +26,13 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.alcatraz.admin.project_alcatraz.Auth.AuthViewModel;
-import com.alcatraz.admin.project_alcatraz.Data.Resource;
-import com.alcatraz.admin.project_alcatraz.Data.TestDb;
-import com.alcatraz.admin.project_alcatraz.R;
-import com.alcatraz.admin.project_alcatraz.Utility.Constants;
-import com.google.gson.Gson;
-import com.pchmn.materialchips.util.ViewUtil;
+import com.checkin.app.checkin.Auth.AuthViewModel;
+import com.checkin.app.checkin.Data.Resource;
+import com.checkin.app.checkin.Data.TestDb;
+import com.checkin.app.checkin.R;
+import com.checkin.app.checkin.Utility.Constants;
+import com.checkin.app.checkin.Utility.Util;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 
 import java.util.Map;
 
@@ -79,11 +76,6 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
         });
 
         mPrefs = PreferenceManager.getDefaultSharedPreferences(this);
-        if (mPrefs.getBoolean(Constants.SP_LOGGED_IN, false)) {
-            startActivity(new Intent(LoginActivity.this, HomeActivity.class));
-            //finish();
-            launchHomeActivity();
-        }
     }
 
     @Override
@@ -106,7 +98,7 @@ else if (password.isEmpty())
         }
     }
 
-    private void successLogin(Map<String, String> data) {
+    private void successLogin(ObjectNode data) {
         loginSuccess = true;
         onAnimationFinish();
 
@@ -116,9 +108,9 @@ private void successLogin(Map<String, String> data) {
                 TestDb.populateWithTestData(getApplicationContext());
             populated = true;
 
-            Log.e(TAG, new Gson().toJson(data));
             SharedPreferences.Editor editor = mPrefs.edit();
-            editor.putInt(Constants.SP_USER_ID, 0);
+            editor.putString(Constants.SP_USER_ID, data != null ? data.get("user_id").asText() : "0");
+            editor.putString(Constants.SP_LOGIN_TOKEN, data != null ? data.get("token").asText() : "false");
             editor.putBoolean(Constants.SP_LOGGED_IN, true);
             editor.apply();
         });
@@ -191,7 +183,7 @@ private void launchHomeActivity() {
         finish();
     }
 
-    private void login(Resource<Map<String, String>> result) {
+    private void login(Resource<ObjectNode> result) {
         switch (result.status) {
             case SUCCESS: {
                 successLogin(result.data);
@@ -208,6 +200,7 @@ private void login(Resource<Map<String, String>> result) {
             }
             default: {
                 // TODO: DEBUG mode
+//                successLogin(null);
                 failureLogin();
                 Toast.makeText(this, result.message, Toast.LENGTH_SHORT).show();
                 Log.e(result.status.name(), result.message == null ? "Null" : result.message);
@@ -245,7 +238,7 @@ private void onAnimationCancel() {
             tvSignIn.setTypeface(tvSignIn.getTypeface(), Typeface.NORMAL);
             tvSignIn.setTextSize(TypedValue.COMPLEX_UNIT_SP, 19);
             LinearLayout.LayoutParams params = ((LinearLayout.LayoutParams) btnSignIn.getLayoutParams());
-            params.width = ViewUtil.dpToPx(309);
+            params.width = Util.dpToPx(309);
             params.height = 0;
             btnSignIn.setLayoutParams(params);
             LinearLayout.LayoutParams belowParams = ((LinearLayout.LayoutParams) spaceBelow.getLayoutParams());
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Home/OtpVerificationFragment.java b/app/src/main/java/com/checkin/app/checkin/Home/OtpVerificationFragment.java
similarity index 94%
rename from app/src/main/java/com/alcatraz/admin/project_alcatraz/Home/OtpVerificationFragment.java
rename to app/src/main/java/com/checkin/app/checkin/Home/OtpVerificationFragment.java
index 24a1c9e0..5a8a7b46 100644
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Home/OtpVerificationFragment.java
+++ b/app/src/main/java/com/checkin/app/checkin/Home/OtpVerificationFragment.java
@@ -1,4 +1,4 @@
-package com.alcatraz.admin.project_alcatraz.Home;
+package com.checkin.app.checkin.Home;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -9,7 +9,7 @@
 import android.view.ViewGroup;
 import android.widget.EditText;
 
-import com.alcatraz.admin.project_alcatraz.R;
+import com.checkin.app.checkin.R;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Home/RecentCheckInFragment.java b/app/src/main/java/com/checkin/app/checkin/Home/RecentCheckInFragment.java
similarity index 93%
rename from app/src/main/java/com/alcatraz/admin/project_alcatraz/Home/RecentCheckInFragment.java
rename to app/src/main/java/com/checkin/app/checkin/Home/RecentCheckInFragment.java
index bb1a217a..7f06d3a8 100644
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Home/RecentCheckInFragment.java
+++ b/app/src/main/java/com/checkin/app/checkin/Home/RecentCheckInFragment.java
@@ -1,4 +1,4 @@
-package com.alcatraz.admin.project_alcatraz.Home;
+package com.checkin.app.checkin.Home;
 
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
@@ -10,7 +10,7 @@
 import android.view.ViewGroup;
 import android.view.animation.Animation;
 
-import com.alcatraz.admin.project_alcatraz.R;
+import com.checkin.app.checkin.R;
 
 import java.util.ArrayList;
 import java.util.Scanner;
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Home/RecentsAdapter.java b/app/src/main/java/com/checkin/app/checkin/Home/RecentsAdapter.java
similarity index 97%
rename from app/src/main/java/com/alcatraz/admin/project_alcatraz/Home/RecentsAdapter.java
rename to app/src/main/java/com/checkin/app/checkin/Home/RecentsAdapter.java
index 0a8e5a04..bac06ba3 100644
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Home/RecentsAdapter.java
+++ b/app/src/main/java/com/checkin/app/checkin/Home/RecentsAdapter.java
@@ -1,4 +1,4 @@
-package com.alcatraz.admin.project_alcatraz.Home;
+package com.checkin.app.checkin.Home;
 
 import android.support.annotation.NonNull;
 import android.support.v7.widget.RecyclerView;
@@ -8,7 +8,7 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.alcatraz.admin.project_alcatraz.R;
+import com.checkin.app.checkin.R;
 
 import java.util.List;
 
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Home/SignupActivity.java b/app/src/main/java/com/checkin/app/checkin/Home/SignupActivity.java
similarity index 94%
rename from app/src/main/java/com/alcatraz/admin/project_alcatraz/Home/SignupActivity.java
rename to app/src/main/java/com/checkin/app/checkin/Home/SignupActivity.java
index 2eb995e2..111da80c 100644
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Home/SignupActivity.java
+++ b/app/src/main/java/com/checkin/app/checkin/Home/SignupActivity.java
@@ -1,4 +1,4 @@
-package com.alcatraz.admin.project_alcatraz.Home;
+package com.checkin.app.checkin.Home;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -16,9 +16,9 @@
 import android.view.Gravity;
 import android.view.View;
 
-import com.alcatraz.admin.project_alcatraz.Home.SignupUserInfoFragment.GENDER;
-import com.alcatraz.admin.project_alcatraz.R;
-import com.alcatraz.admin.project_alcatraz.Utility.Constants;
+import com.checkin.app.checkin.Home.SignupUserInfoFragment.GENDER;
+import com.checkin.app.checkin.R;
+import com.checkin.app.checkin.Utility.Constants;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -39,7 +39,6 @@ protected void onCreate(Bundle savedInstanceState) {
         ButterKnife.bind(this);
         fragmentManager = getSupportFragmentManager();
         mPrefs = PreferenceManager.getDefaultSharedPreferences(this);
-
         if (savedInstanceState == null) {
             FragmentTransaction transaction = fragmentManager.beginTransaction();
             transaction.add(R.id.fragment_container, SignupPhoneFragment.newInstance(this));
@@ -93,7 +92,7 @@ public void onUserInfoProcess(String firstName, String lastName, String password
 
     @Override
     public void onSigninClicked() {
-        startActivityForResult(new Intent(this, LoginActivity.class),PHONE_LOGIN_REQUEST_CODE);
+        startActivityForResult(new Intent(this, LoginActivity.class), PHONE_LOGIN_REQUEST_CODE);
     }
 
     @Override
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Home/SignupFragmentInteraction.java b/app/src/main/java/com/checkin/app/checkin/Home/SignupFragmentInteraction.java
similarity index 67%
rename from app/src/main/java/com/alcatraz/admin/project_alcatraz/Home/SignupFragmentInteraction.java
rename to app/src/main/java/com/checkin/app/checkin/Home/SignupFragmentInteraction.java
index c700c03b..c3efeec2 100644
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Home/SignupFragmentInteraction.java
+++ b/app/src/main/java/com/checkin/app/checkin/Home/SignupFragmentInteraction.java
@@ -1,6 +1,6 @@
-package com.alcatraz.admin.project_alcatraz.Home;
+package com.checkin.app.checkin.Home;
 
-import com.alcatraz.admin.project_alcatraz.Home.SignupUserInfoFragment.GENDER;
+import com.checkin.app.checkin.Home.SignupUserInfoFragment.GENDER;
 
 public interface SignupFragmentInteraction {
     void onPhoneNumberProcess(String phoneNo);
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Home/SignupPhoneFragment.java b/app/src/main/java/com/checkin/app/checkin/Home/SignupPhoneFragment.java
similarity index 94%
rename from app/src/main/java/com/alcatraz/admin/project_alcatraz/Home/SignupPhoneFragment.java
rename to app/src/main/java/com/checkin/app/checkin/Home/SignupPhoneFragment.java
index 4561e28f..effbde2b 100644
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Home/SignupPhoneFragment.java
+++ b/app/src/main/java/com/checkin/app/checkin/Home/SignupPhoneFragment.java
@@ -1,4 +1,4 @@
-package com.alcatraz.admin.project_alcatraz.Home;
+package com.checkin.app.checkin.Home;
 
 import android.content.Intent;
 import android.os.Bundle;
@@ -8,7 +8,7 @@
 import android.view.ViewGroup;
 import android.widget.EditText;
 
-import com.alcatraz.admin.project_alcatraz.R;
+import com.checkin.app.checkin.R;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Home/SignupUserInfoFragment.java b/app/src/main/java/com/checkin/app/checkin/Home/SignupUserInfoFragment.java
similarity index 97%
rename from app/src/main/java/com/alcatraz/admin/project_alcatraz/Home/SignupUserInfoFragment.java
rename to app/src/main/java/com/checkin/app/checkin/Home/SignupUserInfoFragment.java
index ce4a642e..fea9548b 100644
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Home/SignupUserInfoFragment.java
+++ b/app/src/main/java/com/checkin/app/checkin/Home/SignupUserInfoFragment.java
@@ -1,4 +1,4 @@
-package com.alcatraz.admin.project_alcatraz.Home;
+package com.checkin.app.checkin.Home;
 
 import android.app.Activity;
 import android.os.Bundle;
@@ -13,7 +13,7 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.alcatraz.admin.project_alcatraz.R;
+import com.checkin.app.checkin.R;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
diff --git a/app/src/main/java/com/checkin/app/checkin/Home/SplashActivity.java b/app/src/main/java/com/checkin/app/checkin/Home/SplashActivity.java
new file mode 100644
index 00000000..6292f616
--- /dev/null
+++ b/app/src/main/java/com/checkin/app/checkin/Home/SplashActivity.java
@@ -0,0 +1,25 @@
+package com.checkin.app.checkin.Home;
+
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.preference.PreferenceManager;
+import android.support.v7.app.AppCompatActivity;
+
+import com.checkin.app.checkin.Utility.Constants;
+
+public class SplashActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
+        if (prefs.getBoolean(Constants.SP_LOGGED_IN, false)) {
+            startActivity(new Intent(this, HomeActivity.class));
+            finish();
+        } else {
+            startActivity(new Intent(this, SignupActivity.class));
+            finish();
+        }
+    }
+}
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Home/StoryActivity.java b/app/src/main/java/com/checkin/app/checkin/Home/StoryActivity.java
similarity index 98%
rename from app/src/main/java/com/alcatraz/admin/project_alcatraz/Home/StoryActivity.java
rename to app/src/main/java/com/checkin/app/checkin/Home/StoryActivity.java
index 2aa01a0d..908d56a5 100644
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Home/StoryActivity.java
+++ b/app/src/main/java/com/checkin/app/checkin/Home/StoryActivity.java
@@ -1,4 +1,4 @@
-package com.alcatraz.admin.project_alcatraz.Home;
+package com.checkin.app.checkin.Home;
 
 import android.animation.Animator;
 import android.animation.ValueAnimator;
@@ -13,7 +13,7 @@
 import android.view.ViewGroup;
 import android.widget.RelativeLayout;
 
-import com.alcatraz.admin.project_alcatraz.R;
+import com.checkin.app.checkin.R;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Home/StoryAdapter.java b/app/src/main/java/com/checkin/app/checkin/Home/StoryAdapter.java
similarity index 93%
rename from app/src/main/java/com/alcatraz/admin/project_alcatraz/Home/StoryAdapter.java
rename to app/src/main/java/com/checkin/app/checkin/Home/StoryAdapter.java
index ffdf7149..69fb1d8c 100644
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Home/StoryAdapter.java
+++ b/app/src/main/java/com/checkin/app/checkin/Home/StoryAdapter.java
@@ -1,4 +1,4 @@
-package com.alcatraz.admin.project_alcatraz.Home;
+package com.checkin.app.checkin.Home;
 
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
@@ -7,7 +7,7 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.alcatraz.admin.project_alcatraz.R;
+import com.checkin.app.checkin.R;
 
 import java.util.List;
 
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Home/Transaction.java b/app/src/main/java/com/checkin/app/checkin/Home/Transaction.java
similarity index 94%
rename from app/src/main/java/com/alcatraz/admin/project_alcatraz/Home/Transaction.java
rename to app/src/main/java/com/checkin/app/checkin/Home/Transaction.java
index 3b2741bd..49ed6440 100644
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Home/Transaction.java
+++ b/app/src/main/java/com/checkin/app/checkin/Home/Transaction.java
@@ -1,4 +1,4 @@
-package com.alcatraz.admin.project_alcatraz.Home;
+package com.checkin.app.checkin.Home;
 
 /**
  * Created by TAIYAB on 02-07-2018.
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Home/TransactionActivity.java b/app/src/main/java/com/checkin/app/checkin/Home/TransactionActivity.java
similarity index 98%
rename from app/src/main/java/com/alcatraz/admin/project_alcatraz/Home/TransactionActivity.java
rename to app/src/main/java/com/checkin/app/checkin/Home/TransactionActivity.java
index d83c71d1..dc7bdff9 100644
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Home/TransactionActivity.java
+++ b/app/src/main/java/com/checkin/app/checkin/Home/TransactionActivity.java
@@ -1,4 +1,4 @@
-package com.alcatraz.admin.project_alcatraz.Home;
+package com.checkin.app.checkin.Home;
 
 import android.content.Intent;
 import android.os.Bundle;
@@ -12,7 +12,7 @@
 import android.view.View;
 import android.widget.Toast;
 
-import com.alcatraz.admin.project_alcatraz.R;
+import com.checkin.app.checkin.R;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Home/TransactionAdapter.java b/app/src/main/java/com/checkin/app/checkin/Home/TransactionAdapter.java
similarity index 97%
rename from app/src/main/java/com/alcatraz/admin/project_alcatraz/Home/TransactionAdapter.java
rename to app/src/main/java/com/checkin/app/checkin/Home/TransactionAdapter.java
index 17bece47..92a71bfc 100644
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Home/TransactionAdapter.java
+++ b/app/src/main/java/com/checkin/app/checkin/Home/TransactionAdapter.java
@@ -1,4 +1,4 @@
-package com.alcatraz.admin.project_alcatraz.Home;
+package com.checkin.app.checkin.Home;
 
 import android.graphics.Color;
 import android.support.annotation.NonNull;
@@ -12,7 +12,7 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.alcatraz.admin.project_alcatraz.R;
+import com.checkin.app.checkin.R;
 
 import java.util.List;
 
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Home/TrendingShopAdapter.java b/app/src/main/java/com/checkin/app/checkin/Home/TrendingShopAdapter.java
similarity index 84%
rename from app/src/main/java/com/alcatraz/admin/project_alcatraz/Home/TrendingShopAdapter.java
rename to app/src/main/java/com/checkin/app/checkin/Home/TrendingShopAdapter.java
index 00638dc4..406bc53c 100644
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Home/TrendingShopAdapter.java
+++ b/app/src/main/java/com/checkin/app/checkin/Home/TrendingShopAdapter.java
@@ -1,4 +1,4 @@
-package com.alcatraz.admin.project_alcatraz.Home;
+package com.checkin.app.checkin.Home;
 
 import android.support.annotation.NonNull;
 import android.support.v7.widget.RecyclerView;
@@ -8,17 +8,14 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.alcatraz.admin.project_alcatraz.R;
-import com.alcatraz.admin.project_alcatraz.Shop.Shop;
 import com.bumptech.glide.Glide;
-import com.bumptech.glide.request.RequestOptions;
-import com.pchmn.materialchips.util.ViewUtil;
+import com.checkin.app.checkin.R;
+import com.checkin.app.checkin.Shop.Shop;
 
 import java.util.List;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import jp.wasabeef.glide.transformations.RoundedCornersTransformation;
 
 public class TrendingShopAdapter extends RecyclerView.Adapter<TrendingShopAdapter.ViewHolder> {
     List<Shop> mShops;
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Home/UserActivityAdapter.java b/app/src/main/java/com/checkin/app/checkin/Home/UserActivityAdapter.java
similarity index 88%
rename from app/src/main/java/com/alcatraz/admin/project_alcatraz/Home/UserActivityAdapter.java
rename to app/src/main/java/com/checkin/app/checkin/Home/UserActivityAdapter.java
index 37f59278..32ef39ae 100644
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Home/UserActivityAdapter.java
+++ b/app/src/main/java/com/checkin/app/checkin/Home/UserActivityAdapter.java
@@ -1,4 +1,4 @@
-package com.alcatraz.admin.project_alcatraz.Home;
+package com.checkin.app.checkin.Home;
 
 import android.content.Context;
 import android.support.annotation.NonNull;
@@ -9,8 +9,8 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.alcatraz.admin.project_alcatraz.R;
-import com.alcatraz.admin.project_alcatraz.User.UserModel;
+import com.checkin.app.checkin.R;
+import com.checkin.app.checkin.User.UserModel;
 import com.bumptech.glide.Glide;
 
 import java.util.List;
@@ -65,7 +65,7 @@ class ViewHolder extends RecyclerView.ViewHolder {
 
         void bindData(UserModel user) {
             vUserName.setText(user.getUsername());
-            Glide.with(vUserImage.getContext()).load(R.drawable.dummy_alex)
+            Glide.with(vUserImage.getContext()).load(user.getProfilePic())
                     .into(vUserImage);
         }
     }
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Home/UserProfileActivity.java b/app/src/main/java/com/checkin/app/checkin/Home/UserProfileActivity.java
similarity index 98%
rename from app/src/main/java/com/alcatraz/admin/project_alcatraz/Home/UserProfileActivity.java
rename to app/src/main/java/com/checkin/app/checkin/Home/UserProfileActivity.java
index 7d494f71..162855e6 100644
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Home/UserProfileActivity.java
+++ b/app/src/main/java/com/checkin/app/checkin/Home/UserProfileActivity.java
@@ -1,4 +1,4 @@
-package com.alcatraz.admin.project_alcatraz.Home;
+package com.checkin.app.checkin.Home;
 
 /**
  * Created by TAIYAB on 10-04-2018.
@@ -31,7 +31,7 @@
     import android.widget.LinearLayout;
     import android.widget.RelativeLayout;
 
-    import com.alcatraz.admin.project_alcatraz.R;
+    import com.checkin.app.checkin.R;
 
 public class UserProfileActivity extends AppCompatActivity {
     private static final String TAG = "UserProfileActivity";
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Profile/ShopProfile/FragmentShopDailyActivity.java b/app/src/main/java/com/checkin/app/checkin/Profile/ShopProfile/FragmentShopDailyActivity.java
similarity index 97%
rename from app/src/main/java/com/alcatraz/admin/project_alcatraz/Profile/ShopProfile/FragmentShopDailyActivity.java
rename to app/src/main/java/com/checkin/app/checkin/Profile/ShopProfile/FragmentShopDailyActivity.java
index b91dff85..b9a9a44e 100644
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Profile/ShopProfile/FragmentShopDailyActivity.java
+++ b/app/src/main/java/com/checkin/app/checkin/Profile/ShopProfile/FragmentShopDailyActivity.java
@@ -1,4 +1,4 @@
-package com.alcatraz.admin.project_alcatraz.Profile.ShopProfile;
+package com.checkin.app.checkin.Profile.ShopProfile;
 
 import android.content.Context;
 import android.net.Uri;
@@ -8,7 +8,7 @@
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.alcatraz.admin.project_alcatraz.R;
+import com.checkin.app.checkin.R;
 
 /**
  * A simple {@link Fragment} subclass.
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Profile/ShopProfile/FragmentShopInsights.java b/app/src/main/java/com/checkin/app/checkin/Profile/ShopProfile/FragmentShopInsights.java
similarity index 99%
rename from app/src/main/java/com/alcatraz/admin/project_alcatraz/Profile/ShopProfile/FragmentShopInsights.java
rename to app/src/main/java/com/checkin/app/checkin/Profile/ShopProfile/FragmentShopInsights.java
index 26a1f8b5..bd67aaf6 100644
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Profile/ShopProfile/FragmentShopInsights.java
+++ b/app/src/main/java/com/checkin/app/checkin/Profile/ShopProfile/FragmentShopInsights.java
@@ -1,4 +1,4 @@
-package com.alcatraz.admin.project_alcatraz.Profile.ShopProfile;
+package com.checkin.app.checkin.Profile.ShopProfile;
 
 import android.content.Context;
 import android.graphics.Color;
@@ -13,7 +13,7 @@
 import android.widget.ArrayAdapter;
 import android.widget.Button;
 
-import com.alcatraz.admin.project_alcatraz.R;
+import com.checkin.app.checkin.R;
 import com.github.mikephil.charting.charts.LineChart;
 import com.github.mikephil.charting.charts.PieChart;
 import com.github.mikephil.charting.components.Description;
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Profile/ShopProfile/FragmentShopMenu.java b/app/src/main/java/com/checkin/app/checkin/Profile/ShopProfile/FragmentShopMenu.java
similarity index 97%
rename from app/src/main/java/com/alcatraz/admin/project_alcatraz/Profile/ShopProfile/FragmentShopMenu.java
rename to app/src/main/java/com/checkin/app/checkin/Profile/ShopProfile/FragmentShopMenu.java
index 2ff71815..42d17675 100644
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Profile/ShopProfile/FragmentShopMenu.java
+++ b/app/src/main/java/com/checkin/app/checkin/Profile/ShopProfile/FragmentShopMenu.java
@@ -1,4 +1,4 @@
-package com.alcatraz.admin.project_alcatraz.Profile.ShopProfile;
+package com.checkin.app.checkin.Profile.ShopProfile;
 
 import android.content.Context;
 import android.net.Uri;
@@ -8,7 +8,7 @@
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.alcatraz.admin.project_alcatraz.R;
+import com.checkin.app.checkin.R;
 
 /**
  * A simple {@link Fragment} subclass.
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Profile/ShopProfile/FragmentShopProfile.java b/app/src/main/java/com/checkin/app/checkin/Profile/ShopProfile/FragmentShopProfile.java
similarity index 97%
rename from app/src/main/java/com/alcatraz/admin/project_alcatraz/Profile/ShopProfile/FragmentShopProfile.java
rename to app/src/main/java/com/checkin/app/checkin/Profile/ShopProfile/FragmentShopProfile.java
index 5a9cad70..67f0663b 100644
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Profile/ShopProfile/FragmentShopProfile.java
+++ b/app/src/main/java/com/checkin/app/checkin/Profile/ShopProfile/FragmentShopProfile.java
@@ -1,4 +1,4 @@
-package com.alcatraz.admin.project_alcatraz.Profile.ShopProfile;
+package com.checkin.app.checkin.Profile.ShopProfile;
 
 import android.content.Context;
 import android.net.Uri;
@@ -8,7 +8,7 @@
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.alcatraz.admin.project_alcatraz.R;
+import com.checkin.app.checkin.R;
 
 /**
  * A simple {@link Fragment} subclass.
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Profile/ShopProfile/ShopProfileActivity.java b/app/src/main/java/com/checkin/app/checkin/Profile/ShopProfile/ShopProfileActivity.java
similarity index 96%
rename from app/src/main/java/com/alcatraz/admin/project_alcatraz/Profile/ShopProfile/ShopProfileActivity.java
rename to app/src/main/java/com/checkin/app/checkin/Profile/ShopProfile/ShopProfileActivity.java
index bb8437b4..8384a170 100644
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Profile/ShopProfile/ShopProfileActivity.java
+++ b/app/src/main/java/com/checkin/app/checkin/Profile/ShopProfile/ShopProfileActivity.java
@@ -1,4 +1,4 @@
-package com.alcatraz.admin.project_alcatraz.Profile.ShopProfile;
+package com.checkin.app.checkin.Profile.ShopProfile;
 
 import android.app.Fragment;
 import android.os.Bundle;
@@ -11,8 +11,8 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.alcatraz.admin.project_alcatraz.R;
-import com.alcatraz.admin.project_alcatraz.R.id;
+import com.checkin.app.checkin.R;
+import com.checkin.app.checkin.R.id;
 
 import it.sephiroth.android.library.bottomnavigation.BottomNavigation;
 
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Profile/ShopProfile/ShopProfileActivity2.java b/app/src/main/java/com/checkin/app/checkin/Profile/ShopProfile/ShopProfileActivity2.java
similarity index 97%
rename from app/src/main/java/com/alcatraz/admin/project_alcatraz/Profile/ShopProfile/ShopProfileActivity2.java
rename to app/src/main/java/com/checkin/app/checkin/Profile/ShopProfile/ShopProfileActivity2.java
index 4a4fef2b..a26db3ba 100644
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Profile/ShopProfile/ShopProfileActivity2.java
+++ b/app/src/main/java/com/checkin/app/checkin/Profile/ShopProfile/ShopProfileActivity2.java
@@ -1,4 +1,4 @@
-package com.alcatraz.admin.project_alcatraz.Profile.ShopProfile;
+package com.checkin.app.checkin.Profile.ShopProfile;
 
 import android.os.Bundle;
 import android.support.v4.app.FragmentManager;
@@ -9,8 +9,8 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.alcatraz.admin.project_alcatraz.R;
-import com.alcatraz.admin.project_alcatraz.R.id;
+import com.checkin.app.checkin.R;
+import com.checkin.app.checkin.R.id;
 
 import it.sephiroth.android.library.bottomnavigation.BottomNavigation;
 
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Profile/ShopProfile/ViewPagerAdapter.java b/app/src/main/java/com/checkin/app/checkin/Profile/ShopProfile/ViewPagerAdapter.java
similarity index 96%
rename from app/src/main/java/com/alcatraz/admin/project_alcatraz/Profile/ShopProfile/ViewPagerAdapter.java
rename to app/src/main/java/com/checkin/app/checkin/Profile/ShopProfile/ViewPagerAdapter.java
index 8b0c4498..e0c969b8 100644
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Profile/ShopProfile/ViewPagerAdapter.java
+++ b/app/src/main/java/com/checkin/app/checkin/Profile/ShopProfile/ViewPagerAdapter.java
@@ -1,4 +1,4 @@
-package com.alcatraz.admin.project_alcatraz.Profile.ShopProfile;
+package com.checkin.app.checkin.Profile.ShopProfile;
 
 /**
  * Created by admin on 7/4/2018.
diff --git a/app/src/main/java/com/checkin/app/checkin/Session/ActiveSessionActivity.java b/app/src/main/java/com/checkin/app/checkin/Session/ActiveSessionActivity.java
new file mode 100644
index 00000000..0faf1e59
--- /dev/null
+++ b/app/src/main/java/com/checkin/app/checkin/Session/ActiveSessionActivity.java
@@ -0,0 +1,175 @@
+package com.checkin.app.checkin.Session;
+
+import android.arch.lifecycle.ViewModelProviders;
+import android.content.Context;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v4.app.FragmentTransaction;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.checkin.app.checkin.Data.Resource;
+import com.checkin.app.checkin.R;
+import com.checkin.app.checkin.User.UserModel;
+import com.checkin.app.checkin.User.UserViewModel;
+import com.checkin.app.checkin.Utility.SelectListItem;
+import com.checkin.app.checkin.Utility.SelectListViewAdapter;
+import com.github.javiersantos.materialstyleddialogs.MaterialStyledDialog;
+import com.github.javiersantos.materialstyleddialogs.enums.Style;
+import com.hootsuite.nachos.ChipConfiguration;
+import com.hootsuite.nachos.NachoTextView;
+import com.hootsuite.nachos.chip.Chip;
+import com.hootsuite.nachos.chip.ChipSpan;
+import com.hootsuite.nachos.chip.ChipSpanChipCreator;
+import com.hootsuite.nachos.tokenizer.SpanChipTokenizer;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+
+public class ActiveSessionActivity extends AppCompatActivity implements ActiveSessionMemberAdapter.SessionMemberInteraction {
+    private static final String TAG = ActiveSessionActivity.class.getSimpleName();
+    private ActiveSessionViewModel mActiveSessionViewModel;
+    private UserViewModel mUserViewModel;
+    private ActiveSessionMemberAdapter mSessionMembersAdapter;
+    @BindView(R.id.rv_session_members) RecyclerView rvMembers;
+    @BindView(R.id.tv_bill) TextView tvBill;
+
+    private MaterialStyledDialog mAddMemberDialog;
+    private MaterialStyledDialog mCheckoutDialog;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_active_session);
+        ButterKnife.bind(this);
+
+        rvMembers.setLayoutManager(new LinearLayoutManager(this, LinearLayoutManager.HORIZONTAL, false));
+        mSessionMembersAdapter = new ActiveSessionMemberAdapter(null, this);
+        rvMembers.setAdapter(mSessionMembersAdapter);
+
+        mUserViewModel = ViewModelProviders.of(this, new UserViewModel.Factory(getApplication())).get(UserViewModel.class);
+        mActiveSessionViewModel = ViewModelProviders.of(this, new ActiveSessionViewModel.Factory(getApplication())).get(ActiveSessionViewModel.class);
+        mActiveSessionViewModel.getActiveSessionDetail().observe(this, resource -> {
+            if (resource == null) return;
+            ActiveSessionModel data = resource.data;
+            switch (resource.status) {
+                case SUCCESS: {
+                    mSessionMembersAdapter.setUsers(data != null ? data.getMembers() : null);
+                    tvBill.setText(String.valueOf(data != null ? data.getBill() : 0));
+                }
+                case LOADING: {
+                    break;
+                }
+                default: {
+                    Log.e(resource.status.name(), resource.message == null ? "Null" : resource.message);
+                    Toast.makeText(ActiveSessionActivity.this, "Error fetching active session! Status: " +
+                            resource.status.toString() + "\nDetails: " + resource.message, Toast.LENGTH_LONG).show();
+                }
+            }
+        });
+        mActiveSessionViewModel.getObservableData().observe(this, resource -> {
+            switch (resource.status) {
+                case SUCCESS: {
+                    Toast.makeText(this, "Done!", Toast.LENGTH_SHORT).show();
+                    break;
+                }
+                default: {
+
+                }
+            }
+        });
+        setupAddMember();
+        setupCheckoutDialog();
+    }
+
+    private void setupCheckoutDialog() {
+        mCheckoutDialog = new MaterialStyledDialog.Builder(this)
+                .setStyle(Style.HEADER_WITH_TITLE)
+                .setTitle("Checkout Session")
+                .setDescription("Request for bill?")
+                .setPositiveText("Confirm")
+                .setNegativeText("Cancel")
+                .onPositive((dialog, which) -> {
+                    mActiveSessionViewModel.checkoutSession();
+                })
+                .build();
+    }
+
+    private void setupAddMember() {
+        final View view = LayoutInflater.from(this).inflate(R.layout.view_select_list_multiple, null);
+        final NachoTextView userSelect = view.findViewById(R.id.select_text_view);
+        userSelect.setThreshold(2);
+        userSelect.setChipTokenizer(new SpanChipTokenizer<>(this, new ChipSpanChipCreator() {
+            @Override
+            public ChipSpan createChip(@NonNull Context context, @NonNull CharSequence text, Object data) {
+                return new ChipSpan(ActiveSessionActivity.this, text, getResources().getDrawable(R.drawable.ic_close), data);
+            }
+
+            @Override
+            public void configureChip(@NonNull ChipSpan chip, @NonNull ChipConfiguration chipConfiguration) {
+                super.configureChip(chip, chipConfiguration);
+                chip.setShowIconOnLeft(false);
+                chip.setIconBackgroundColor(getResources().getColor(R.color.colorPrimaryRed));
+            }
+        }, ChipSpan.class));
+        userSelect.setOnChipClickListener((chip, event) -> {
+            Objects.requireNonNull(userSelect.getChipTokenizer()).deleteChipAndPadding(chip, userSelect.getEditableText());
+        });
+
+        List<SelectListItem> items = new ArrayList<>();
+        mUserViewModel.getAllUsers().observe(this, userModels -> {
+            if (userModels != null) {
+                for (UserModel user: userModels) {
+                    items.add(new SelectListItem(user.getProfilePic(), user.getUsername(), "", user.getId()));
+                }
+            }
+        });
+        SelectListViewAdapter adapter = new SelectListViewAdapter(this, items);
+        userSelect.setAdapter(adapter);
+
+        mAddMemberDialog = new MaterialStyledDialog.Builder(this)
+                .setStyle(Style.HEADER_WITH_TITLE)
+                .setTitle("Add Session member")
+                .setPositiveText("Confirm")
+                .setNegativeText("Cancel")
+                .setCustomView(view, 10, 10, 10, 10)
+                .onPositive((dialog, which) -> {
+                    List<Long> ids = new ArrayList<>();
+                    for (Chip chip: userSelect.getAllChips()) {
+                        ids.add(((Long) ((SelectListItem) Objects.requireNonNull(chip.getData())).getData()));
+                    }
+                    mActiveSessionViewModel.addMembers(ids);
+                })
+                .build();
+    }
+
+    @OnClick(R.id.btn_list_orders)
+    public void onListOrders() {
+        FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction();
+        fragmentTransaction.add(R.id.root_view, ActiveSessionOrdersFragment.newInstance(this));
+        fragmentTransaction.addToBackStack(null);
+        fragmentTransaction.commit();
+    }
+
+    @OnClick(R.id.btn_checkout)
+    public void onCheckout() {
+        mCheckoutDialog.show();
+    }
+
+    @Override
+    public void onAddMemberClicked() {
+        mAddMemberDialog.show();
+    }
+}
diff --git a/app/src/main/java/com/checkin/app/checkin/Session/ActiveSessionMemberAdapter.java b/app/src/main/java/com/checkin/app/checkin/Session/ActiveSessionMemberAdapter.java
new file mode 100644
index 00000000..0a3b211f
--- /dev/null
+++ b/app/src/main/java/com/checkin/app/checkin/Session/ActiveSessionMemberAdapter.java
@@ -0,0 +1,104 @@
+package com.checkin.app.checkin.Session;
+
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import com.checkin.app.checkin.R;
+import com.checkin.app.checkin.User.UserModel;
+import com.checkin.app.checkin.Utility.HeaderFooterRecyclerViewAdapter;
+import com.bumptech.glide.Glide;
+
+import java.util.List;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import de.hdodenhof.circleimageview.CircleImageView;
+
+public class ActiveSessionMemberAdapter extends HeaderFooterRecyclerViewAdapter {
+
+    private List<ActiveSessionMemberModel> mUsers;
+    private SessionMemberInteraction memberInterface;
+
+    ActiveSessionMemberAdapter(List<ActiveSessionMemberModel> users, SessionMemberInteraction memberInterface){
+        this.mUsers = users;
+        this.memberInterface = memberInterface;
+    }
+
+    @Override
+    public boolean useHeader() {
+        return true;
+    }
+
+    @Override
+    public void onBindHeaderView(RecyclerView.ViewHolder holder, int position) {
+
+    }
+
+    @Override
+    public RecyclerView.ViewHolder onCreateHeaderViewHolder(ViewGroup parent, int viewType) {
+        final View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_session_add_member, parent, false);
+        return new HeaderViewHolder(view);
+    }
+
+    @Override
+    public boolean useFooter() {
+        return false;
+    }
+
+    @Override
+    public RecyclerView.ViewHolder onCreateBasicItemViewHolder(ViewGroup parent, int viewType) {
+        final View view = LayoutInflater.from(parent.getContext()).inflate(viewType, parent, false);
+        return new ItemViewHolder(view);
+    }
+
+    @Override
+    public void onBindBasicItemView(RecyclerView.ViewHolder holder, int position) {
+        if (mUsers != null){
+            ((ItemViewHolder) holder).bindData(mUsers.get(position));
+        }
+    }
+
+    @Override
+    public int getBasicItemCount() {
+        return (mUsers != null) ? mUsers.size() : 0;
+    }
+
+    @Override
+    public int getBasicItemType(int position) {
+        return R.layout.item_session_member;
+    }
+
+    public void setUsers(List<ActiveSessionMemberModel> users) {
+        this.mUsers = users;
+        notifyDataSetChanged();
+    }
+
+    class ItemViewHolder extends RecyclerView.ViewHolder {
+        @BindView(R.id.im_user)
+        CircleImageView imUser;
+        @BindView(R.id.tv_user) TextView tvUser;
+        ItemViewHolder(View view){
+            super(view);
+            ButterKnife.bind(this, view);
+        }
+
+        void bindData(UserModel user) {
+            tvUser.setText(user.getUsername());
+            Glide.with(tvUser.getContext()).load(user.getProfilePic()).into(imUser);
+        }
+    }
+
+    class HeaderViewHolder extends RecyclerView.ViewHolder {
+        HeaderViewHolder(View view) {
+            super(view);
+            view.findViewById(R.id.im_add_member).setOnClickListener((v) -> memberInterface.onAddMemberClicked());
+        }
+    }
+
+    interface SessionMemberInteraction {
+        void onAddMemberClicked();
+    }
+}
diff --git a/app/src/main/java/com/checkin/app/checkin/Session/ActiveSessionMemberModel.java b/app/src/main/java/com/checkin/app/checkin/Session/ActiveSessionMemberModel.java
new file mode 100644
index 00000000..eba89166
--- /dev/null
+++ b/app/src/main/java/com/checkin/app/checkin/Session/ActiveSessionMemberModel.java
@@ -0,0 +1,17 @@
+package com.checkin.app.checkin.Session;
+
+import com.checkin.app.checkin.User.UserModel;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class ActiveSessionMemberModel extends UserModel {
+    private boolean isOwner;
+
+    @JsonProperty("is_owner")
+    public boolean isOwner() {
+        return isOwner;
+    }
+
+    public void setOwner(boolean owner) {
+        isOwner = owner;
+    }
+}
diff --git a/app/src/main/java/com/checkin/app/checkin/Session/ActiveSessionModel.java b/app/src/main/java/com/checkin/app/checkin/Session/ActiveSessionModel.java
new file mode 100644
index 00000000..d2fdcdab
--- /dev/null
+++ b/app/src/main/java/com/checkin/app/checkin/Session/ActiveSessionModel.java
@@ -0,0 +1,35 @@
+package com.checkin.app.checkin.Session;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.util.List;
+
+/**
+ * Created by Bhavik Patel on 04/08/2018.
+ */
+
+public class ActiveSessionModel {
+    private double bill;
+    @JsonProperty("orders") private List<OrderedItemModel> orderedItems;
+    @JsonProperty("customers") private List<ActiveSessionMemberModel> members;
+
+    public ActiveSessionModel() {}
+
+    public ActiveSessionModel(int bill, List<OrderedItemModel> orderedItems, List<ActiveSessionMemberModel> members) {
+        this.bill = bill;
+        this.orderedItems = orderedItems;
+        this.members = members;
+    }
+
+    public double getBill() {
+        return bill;
+    }
+
+    public List<OrderedItemModel> getOrderedItems() {
+        return orderedItems;
+    }
+
+    public List<ActiveSessionMemberModel> getMembers() {
+        return members;
+    }
+}
diff --git a/app/src/main/java/com/checkin/app/checkin/Session/ActiveSessionOrdersAdapter.java b/app/src/main/java/com/checkin/app/checkin/Session/ActiveSessionOrdersAdapter.java
new file mode 100644
index 00000000..ba900e78
--- /dev/null
+++ b/app/src/main/java/com/checkin/app/checkin/Session/ActiveSessionOrdersAdapter.java
@@ -0,0 +1,196 @@
+package com.checkin.app.checkin.Session;
+
+import android.os.CountDownTimer;
+import android.support.annotation.NonNull;
+import android.support.v7.widget.RecyclerView;
+import android.util.Log;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.TextView;
+
+import com.checkin.app.checkin.R;
+import com.transitionseverywhere.Slide;
+import com.transitionseverywhere.Transition;
+import com.transitionseverywhere.TransitionManager;
+
+import java.util.List;
+import java.util.Locale;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+
+public class ActiveSessionOrdersAdapter extends RecyclerView.Adapter<ActiveSessionOrdersAdapter.ViewHolder> {
+    private final static String TAG = ActiveSessionOrdersAdapter.class.getSimpleName();
+    private List<OrderedItemModel> orderedItems;
+    private SessionOrdersInteraction mOrdersInteractionListener;
+    private ViewHolder mPrevDetailedViewHolder;
+
+    ActiveSessionOrdersAdapter(SessionOrdersInteraction ordersInteraction) {
+        mOrdersInteractionListener = ordersInteraction;
+    }
+
+    @Override
+    public int getItemViewType(int position) {
+        return R.layout.item_session_order;
+    }
+
+    @NonNull
+    @Override
+    public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        final View view = LayoutInflater.from(parent.getContext()).inflate(viewType, parent, false);
+        final ViewHolder holder = new ViewHolder(view);
+        view.setOnClickListener(v -> toggleDetails(holder));
+        return holder;
+    }
+
+    private void toggleDetails(ViewHolder holder) {
+        if (holder.isDetailShown) {
+            hideDetails(holder);
+        } else {
+            hideDetails(mPrevDetailedViewHolder);
+            showDetails(holder);
+        }
+    }
+
+    private void hideDetails(ViewHolder holder) {
+        if (holder != null) {
+            mPrevDetailedViewHolder = null;
+            holder.hideDetails();
+        }
+    }
+
+    private void showDetails(ViewHolder holder) {
+        if (holder != null) {
+            mPrevDetailedViewHolder = holder;
+            holder.showDetails();
+        }
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
+        holder.bindData(orderedItems.get(position));
+    }
+
+    @Override
+    public int getItemCount() {
+        return orderedItems != null ? orderedItems.size() : 0;
+    }
+
+    public void setOrderedItems(List<OrderedItemModel> orderedItems) {
+        this.orderedItems = orderedItems;
+        notifyDataSetChanged();
+    }
+
+    class ViewHolder extends RecyclerView.ViewHolder {
+        @BindView(R.id.tv_name) TextView tvItemName;
+        @BindView(R.id.btn_cancel_order) Button btnCancel;
+        @BindView(R.id.tv_cancel_time) TextView tvCancelTime;
+        private OrderedItemModel mOrderedItem;
+
+        boolean isDetailShown = false;
+
+        public ViewHolder(View view) {
+            super(view);
+            ButterKnife.bind(this, view);
+        }
+
+        public void bindData(OrderedItemModel orderedItem) {
+            mOrderedItem = orderedItem;
+            tvItemName.setText(orderedItem.getItem().getName());
+        }
+
+        @OnClick(R.id.btn_cancel_order)
+        void onCancelOrder() {
+            mOrdersInteractionListener.onCancelOrder(orderedItems.get(getAdapterPosition()));
+            orderedItems.remove(mOrderedItem);
+            notifyItemRemoved(getAdapterPosition());
+        }
+
+        void showDetails() {
+            isDetailShown = true;
+            if (mOrderedItem.canCancel()) {
+                Log.e(TAG, "Can cancel " + mOrderedItem.getItem().getName());
+                new CountDownTimer(mOrderedItem.getRemainingCancelTime(), 1000) {
+                    @Override
+                    public void onTick(long millisUntilFinished) {
+                        long min = millisUntilFinished/1000/60;
+                        long sec = millisUntilFinished/1000-min*60;
+                        if (min == 0)
+                            tvCancelTime.setText(String.format(Locale.ENGLISH, "%02d seconds", sec));
+                        else
+                            tvCancelTime.setText(String.format(Locale.ENGLISH, "%02d:%02d minutes", min, sec));
+                    }
+
+                    @Override
+                    public void onFinish() {
+                        tvItemName.setVisibility(View.VISIBLE);
+                        tvItemName.setText(R.string.item_non_cancelable);
+                        tvCancelTime.setVisibility(View.GONE);
+                        btnCancel.setVisibility(View.GONE);
+                    }
+                }.start();
+            }
+            Transition slideStart = new Slide(Gravity.START);
+            slideStart.addListener(new Transition.TransitionListenerAdapter() {
+
+                @Override
+                public void onTransitionStart(@NonNull Transition transition) {
+                    tvItemName.setText(mOrderedItem.getItem().getName());
+                    tvCancelTime.setVisibility(View.GONE);
+                    btnCancel.setVisibility(View.GONE);
+                    itemView.setBackgroundColor(0x000000);
+                }
+
+                @Override
+                public void onTransitionEnd(@NonNull Transition transition) {
+                    tvItemName.setVisibility(View.GONE);
+                    if (mOrderedItem.canCancel()) {
+                        TransitionManager.beginDelayedTransition(((ViewGroup) itemView));
+                        btnCancel.setVisibility(View.VISIBLE);
+                        tvCancelTime.setVisibility(View.VISIBLE);
+                    } else {
+                        TransitionManager.beginDelayedTransition(((ViewGroup) itemView), new Slide(Gravity.END));
+                        tvItemName.setText(R.string.item_non_cancelable);
+                        tvItemName.setVisibility(View.VISIBLE);
+                    }
+                    itemView.setBackgroundColor(itemView.getContext().getResources().getColor(R.color.translucent_half_black));
+                    mPrevDetailedViewHolder = ViewHolder.this;
+                }
+            });
+            TransitionManager.beginDelayedTransition(((ViewGroup) itemView), slideStart);
+            tvItemName.setVisibility(View.INVISIBLE);
+        }
+
+        void hideDetails() {
+            isDetailShown = false;
+            Transition slideEnd = new Slide(Gravity.END);
+            slideEnd.addListener(new Transition.TransitionListenerAdapter() {
+
+                @Override
+                public void onTransitionStart(@NonNull Transition transition) {
+                    itemView.setBackgroundColor(itemView.getContext().getResources().getColor(R.color.translucent_half_black));
+                }
+
+                @Override
+                public void onTransitionEnd(@NonNull Transition transition) {
+                    tvCancelTime.setVisibility(View.GONE);
+                    tvItemName.setVisibility(View.VISIBLE);
+                    btnCancel.setVisibility(View.GONE);
+                    tvItemName.setText(mOrderedItem.getItem().getName());
+                    itemView.setBackgroundColor(0x000000);
+                    mPrevDetailedViewHolder = null;
+                }
+            });
+            TransitionManager.beginDelayedTransition(((ViewGroup) itemView), slideEnd);
+            tvItemName.setVisibility(View.INVISIBLE);
+        }
+    }
+
+    interface SessionOrdersInteraction {
+        void onCancelOrder(OrderedItemModel orderedItem);
+    }
+}
diff --git a/app/src/main/java/com/checkin/app/checkin/Session/ActiveSessionOrdersFragment.java b/app/src/main/java/com/checkin/app/checkin/Session/ActiveSessionOrdersFragment.java
new file mode 100644
index 00000000..3936e085
--- /dev/null
+++ b/app/src/main/java/com/checkin/app/checkin/Session/ActiveSessionOrdersFragment.java
@@ -0,0 +1,78 @@
+package com.checkin.app.checkin.Session;
+
+import android.arch.lifecycle.ViewModelProviders;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentActivity;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.checkin.app.checkin.R;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.Unbinder;
+
+/**
+ * Created by shivanshs9 on 16/8/18.
+ */
+
+public class ActiveSessionOrdersFragment extends Fragment implements ActiveSessionOrdersAdapter.SessionOrdersInteraction {
+    private final static String TAG = ActiveSessionOrdersFragment.class.getSimpleName();
+
+    @BindView(R.id.rv_session_orders) RecyclerView rvOrders;
+
+    private Unbinder unbinder;
+    private ActiveSessionOrdersAdapter mOrdersAdapter;
+    private ActiveSessionViewModel mActiveSessionViewModel;
+
+    public ActiveSessionOrdersFragment() {}
+
+    public static ActiveSessionOrdersFragment newInstance(FragmentActivity activity) {
+        ActiveSessionOrdersFragment fragment = new ActiveSessionOrdersFragment();
+        fragment.mActiveSessionViewModel = ViewModelProviders.of(activity, new ActiveSessionViewModel.Factory(activity.getApplication())).get(ActiveSessionViewModel.class);
+        return fragment;
+    }
+
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        View view = inflater.inflate(R.layout.fragment_active_session_orders, container, false);
+        unbinder = ButterKnife.bind(this, view);
+
+        view.setOnTouchListener((v, event) -> {
+            if (event.getAction() == MotionEvent.ACTION_DOWN) {
+                getActivity().getSupportFragmentManager().beginTransaction().remove(this).commit();
+            }
+            return true;
+        });
+
+        mOrdersAdapter = new ActiveSessionOrdersAdapter(this);
+        rvOrders.setAdapter(mOrdersAdapter);
+        rvOrders.setLayoutManager(new LinearLayoutManager(getContext(), LinearLayoutManager.VERTICAL, false));
+
+        if (getActivity() != null) {
+            ActiveSessionViewModel sessionViewModel = ViewModelProviders.of(getActivity(), new ActiveSessionViewModel.Factory(getActivity().getApplication())).get(ActiveSessionViewModel.class);
+            sessionViewModel.getOrderedItems().observe(this, data -> mOrdersAdapter.setOrderedItems(data));
+        }
+
+        return view;
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        unbinder.unbind();
+    }
+
+    @Override
+    public void onCancelOrder(OrderedItemModel orderedItem) {
+        mActiveSessionViewModel.cancelOrders(orderedItem.getId());
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/checkin/app/checkin/Session/ActiveSessionRepository.java b/app/src/main/java/com/checkin/app/checkin/Session/ActiveSessionRepository.java
new file mode 100644
index 00000000..3dc9d950
--- /dev/null
+++ b/app/src/main/java/com/checkin/app/checkin/Session/ActiveSessionRepository.java
@@ -0,0 +1,100 @@
+package com.checkin.app.checkin.Session;
+
+import android.app.Application;
+import android.arch.lifecycle.LiveData;
+import android.content.Context;
+import android.support.annotation.NonNull;
+
+import com.checkin.app.checkin.Data.ApiClient;
+import com.checkin.app.checkin.Data.ApiResponse;
+import com.checkin.app.checkin.Data.BaseRepository;
+import com.checkin.app.checkin.Data.NetworkBoundResource;
+import com.checkin.app.checkin.Data.Resource;
+import com.checkin.app.checkin.Data.RetrofitLiveData;
+import com.checkin.app.checkin.Data.WebApiService;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
+import io.objectbox.Box;
+
+/**
+ * Created by Bhavik Patel on 04/08/2018.
+ */
+
+public class ActiveSessionRepository extends BaseRepository {
+
+    private final WebApiService mWebService;
+    private static ActiveSessionRepository INSTANCE;
+
+    private ActiveSessionRepository(Context context) {
+        mWebService = ApiClient.getApiService(context);
+    }
+
+    public static ActiveSessionRepository getInstance(Application application) {
+        if (INSTANCE == null) {
+            synchronized (ActiveSessionRepository.class) {
+                if (INSTANCE == null) {
+                    INSTANCE = new ActiveSessionRepository(application.getApplicationContext());
+                }
+            }
+        }
+        return INSTANCE;
+    }
+
+
+    public LiveData<Resource<ActiveSessionModel>> getActiveSessionDetail(String userId) {
+        return new NetworkBoundResource<ActiveSessionModel, ActiveSessionModel>() {
+
+            @Override
+            protected void saveCallResult(ActiveSessionModel data) {}
+
+            @Override
+            protected boolean shouldUseLocalDb() {return false;}
+
+            @NonNull
+            @Override
+            protected LiveData<ApiResponse<ActiveSessionModel>> createCall() {
+                return new RetrofitLiveData<>(mWebService.getActiveSession(userId));
+            }
+        }.getAsLiveData();
+    }
+
+    public LiveData<Resource<ObjectNode>> postCancelOrders(String sessionId, ObjectNode data) {
+        return new NetworkBoundResource<ObjectNode, ObjectNode>() {
+            @Override
+            protected boolean shouldUseLocalDb() {
+                return false;
+            }
+
+            @NonNull
+            @Override
+            protected LiveData<ApiResponse<ObjectNode>> createCall() {
+                return new RetrofitLiveData<>(mWebService.postCancelOrder(sessionId, data));
+            }
+
+            @Override
+            protected void saveCallResult(ObjectNode data) {
+
+            }
+        }.getAsLiveData();
+    }
+
+    public LiveData<Resource<ObjectNode>> postAddMembers(String sessionId, ObjectNode data) {
+        return new NetworkBoundResource<ObjectNode, ObjectNode>() {
+            @Override
+            protected boolean shouldUseLocalDb() {
+                return false;
+            }
+
+            @NonNull
+            @Override
+            protected LiveData<ApiResponse<ObjectNode>> createCall() {
+                return new RetrofitLiveData<>(mWebService.postSessionAddMember(sessionId, data));
+            }
+
+            @Override
+            protected void saveCallResult(ObjectNode data) {
+
+            }
+        }.getAsLiveData();
+    }
+}
diff --git a/app/src/main/java/com/checkin/app/checkin/Session/ActiveSessionViewModel.java b/app/src/main/java/com/checkin/app/checkin/Session/ActiveSessionViewModel.java
new file mode 100644
index 00000000..de8f307f
--- /dev/null
+++ b/app/src/main/java/com/checkin/app/checkin/Session/ActiveSessionViewModel.java
@@ -0,0 +1,92 @@
+package com.checkin.app.checkin.Session;
+
+import android.app.Application;
+import android.arch.lifecycle.LiveData;
+import android.arch.lifecycle.MediatorLiveData;
+import android.arch.lifecycle.Transformations;
+import android.arch.lifecycle.ViewModel;
+import android.arch.lifecycle.ViewModelProvider;
+import android.content.SharedPreferences;
+import android.preference.PreferenceManager;
+import android.support.annotation.NonNull;
+import android.util.Log;
+
+import com.checkin.app.checkin.Data.BaseViewModel;
+import com.checkin.app.checkin.Data.Converters;
+import com.checkin.app.checkin.Data.Resource;
+import com.checkin.app.checkin.Utility.Constants;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
+import java.util.List;
+
+/**
+ * Created by Bhavik Patel on 05/08/2018.
+ */
+
+public class ActiveSessionViewModel extends BaseViewModel {
+    private static final String TAG = ActiveSessionViewModel.class.getSimpleName();
+    private final ActiveSessionRepository mRepository;
+    private MediatorLiveData<Resource<ActiveSessionModel>> mSessionData = new MediatorLiveData<>();
+    private SharedPreferences mPrefs;
+
+    ActiveSessionViewModel(@NonNull Application application) {
+        super(application);
+        mRepository = ActiveSessionRepository.getInstance(application);
+        mPrefs = PreferenceManager.getDefaultSharedPreferences(application.getApplicationContext());
+    }
+
+    @Override
+    public void updateResults() {
+        mSessionData.addSource(mRepository.getActiveSessionDetail(mPrefs.getString(Constants.USER_ID, "0")), mSessionData::setValue);
+    }
+
+    public LiveData<Resource<ActiveSessionModel>> getActiveSessionDetail() {
+        mSessionData.addSource(mRepository.getActiveSessionDetail(mPrefs.getString(Constants.USER_ID, "0")), mSessionData::setValue);
+        return mSessionData;
+    }
+
+    public LiveData<List<OrderedItemModel>> getOrderedItems() {
+        return Transformations.map(getActiveSessionDetail(), input -> {
+            List<OrderedItemModel> orderedItems = null;
+            if (input != null && input.data != null) {
+                orderedItems = input.data.getOrderedItems();
+            }
+            return orderedItems;
+        });
+    }
+
+    public void cancelOrders(long... ids) {
+        ArrayNode value = Converters.objectMapper.valueToTree(ids);
+        ObjectNode data = Converters.objectMapper.createObjectNode();
+        data.putArray("items").addAll(value);
+        Log.e(TAG, "Cancelled " + data.toString());
+        mData.addSource(mRepository.postCancelOrders("1", data), mData::setValue);
+    }
+
+    public void checkoutSession() {
+        Log.e("Session", "Checked out");
+    }
+
+    public void addMembers(List<Long> ids) {
+        ArrayNode value = Converters.objectMapper.valueToTree(ids);
+        ObjectNode data = Converters.objectMapper.createObjectNode();
+        data.putArray("users").addAll(value);
+        mData.addSource(mRepository.postAddMembers("1", data), mData::setValue);
+    }
+
+    public static class Factory extends ViewModelProvider.NewInstanceFactory {
+        @NonNull
+        private final Application mApplication;
+
+        public Factory(@NonNull Application application) {
+            mApplication = application;
+        }
+
+        @NonNull
+        @Override
+        public <T extends ViewModel> T create(@NonNull Class<T> modelClass) {
+            return (T) new ActiveSessionViewModel(mApplication);
+        }
+    }
+}
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Session/ItemCustomizationField.java b/app/src/main/java/com/checkin/app/checkin/Session/ItemCustomizationField.java
similarity index 54%
rename from app/src/main/java/com/alcatraz/admin/project_alcatraz/Session/ItemCustomizationField.java
rename to app/src/main/java/com/checkin/app/checkin/Session/ItemCustomizationField.java
index e85d66d0..bf3e6cf9 100644
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Session/ItemCustomizationField.java
+++ b/app/src/main/java/com/checkin/app/checkin/Session/ItemCustomizationField.java
@@ -1,7 +1,11 @@
-package com.alcatraz.admin.project_alcatraz.Session;
+package com.checkin.app.checkin.Session;
+
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 import io.objectbox.annotation.Entity;
 import io.objectbox.annotation.Id;
+import io.objectbox.annotation.Transient;
 import io.objectbox.relation.ToOne;
 
 /**
@@ -10,32 +14,33 @@
 
 
 @Entity
+@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY)
 public class ItemCustomizationField {
 
-    @Id private long id;
-    private boolean vegetarian;
+    @Id(assignable = true) private long id;
+    @JsonProperty("is_vegetarian") private boolean vegetarian;
     private String name;
-    private double price;
-    private boolean isSelected = false;
+    private double cost;
+    @Transient private boolean isSelected = false;
 
-    private ToOne<ItemCustomizationGroup> customizationGroup;
+    private ToOne<ItemCustomizationGroup> group;
 
     public ItemCustomizationField() {
     }
 
-    public ItemCustomizationField(boolean vegetarian, String name, double price, long custGroupId) {
+    public ItemCustomizationField(boolean vegetarian, String name, double cost, long custGroupId) {
         this.vegetarian = vegetarian;
         this.name = name;
-        this.price = price;
-        customizationGroup.setTargetId(custGroupId);
+        this.cost = cost;
+        group.setTargetId(custGroupId);
     }
 
-    public ToOne<ItemCustomizationGroup> getCustomizationGroup() {
-        return customizationGroup;
+    public ToOne<ItemCustomizationGroup> getGroup() {
+        return group;
     }
 
-    public long getCustomizationGroupId() {
-        return customizationGroup.getTargetId();
+    public long getGroupId() {
+        return group.getTargetId();
     }
 
     public String getName() {
@@ -46,12 +51,12 @@ public void setName(String name) {
         this.name = name;
     }
 
-    public double getPrice() {
-        return price;
+    public double getCost() {
+        return cost;
     }
 
-    public void setPrice(double price) {
-        this.price = price;
+    public void setCost(double cost) {
+        this.cost = cost;
     }
 
     public boolean isVegetarian() {
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Session/ItemCustomizationFieldHolder.java b/app/src/main/java/com/checkin/app/checkin/Session/ItemCustomizationFieldHolder.java
similarity index 94%
rename from app/src/main/java/com/alcatraz/admin/project_alcatraz/Session/ItemCustomizationFieldHolder.java
rename to app/src/main/java/com/checkin/app/checkin/Session/ItemCustomizationFieldHolder.java
index fe69a16b..549d95c7 100644
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Session/ItemCustomizationFieldHolder.java
+++ b/app/src/main/java/com/checkin/app/checkin/Session/ItemCustomizationFieldHolder.java
@@ -1,4 +1,4 @@
-package com.alcatraz.admin.project_alcatraz.Session;
+package com.checkin.app.checkin.Session;
 
 import android.view.View;
 import android.view.ViewGroup;
@@ -6,7 +6,7 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.alcatraz.admin.project_alcatraz.R;
+import com.checkin.app.checkin.R;
 
 
 /**
@@ -36,7 +36,7 @@ public ItemCustomizationFieldHolder(ItemCustFieldHolderCompat compat,View view,
             this.viewGroup = (ViewGroup) view;
             type = view.findViewById(R.id.type);
             name = view.findViewById(R.id.name);
-            price = view.findViewById(R.id.price);
+            price = view.findViewById(R.id.cost);
             checkbox = view.findViewById(R.id.checkbox);
             viewGroup.setOnClickListener(new View.OnClickListener() {
                 @Override
@@ -64,7 +64,7 @@ public void setExtra(ItemCustomizationField extra){
         this.extra = extra;
         type.setImageResource(extra.isVegetarian() == true ? TYPE_VEG : TYPE_NONVEG);
         name.setText(extra.getName());
-        price.setText(String.valueOf(extra.getPrice()));
+        price.setText(String.valueOf(extra.getCost()));
         checkbox.setChecked(extra.isSelected());
     }
     public void isSelected(boolean isSelected){
diff --git a/app/src/main/java/com/checkin/app/checkin/Session/ItemCustomizationGroup.java b/app/src/main/java/com/checkin/app/checkin/Session/ItemCustomizationGroup.java
new file mode 100644
index 00000000..5467f1f1
--- /dev/null
+++ b/app/src/main/java/com/checkin/app/checkin/Session/ItemCustomizationGroup.java
@@ -0,0 +1,99 @@
+package com.checkin.app.checkin.Session;
+
+import android.util.Log;
+
+import com.checkin.app.checkin.Data.AppDatabase;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.util.List;
+
+import io.objectbox.annotation.Backlink;
+import io.objectbox.annotation.Entity;
+import io.objectbox.annotation.Id;
+import io.objectbox.relation.ToMany;
+import io.objectbox.relation.ToOne;
+
+/**
+ * Created by Bhavik Patel on 11/08/2018.
+ */
+
+
+@Entity
+public class ItemCustomizationGroup {
+    private static final String TAG = ItemCustomizationGroup.class.getSimpleName();
+    @Id(assignable = true) @JsonProperty("id") private long id;
+    @JsonProperty("min_select") private int minSelection = 0;
+    @JsonProperty("max_select") private int maxSelection = 1;
+    @JsonProperty("title") private String name;
+
+    @Backlink (to = "group")
+    @JsonIgnore private ToMany<ItemCustomizationField> customizationFields;
+    @JsonIgnore private ToOne<MenuItemModel> item;
+
+    public ItemCustomizationGroup() {
+    }
+
+    public ItemCustomizationGroup(int minSelection, int maxSelection, String name, long menuId) {
+        this.minSelection = minSelection;
+        this.maxSelection = maxSelection;
+        this.name = name;
+        item.setTargetId(menuId);
+    }
+
+    public int getMinSelection() {
+        return minSelection;
+    }
+
+    public void setMinSelection(int minSelection) {
+        this.minSelection = minSelection;
+    }
+
+    public int getMaxSelection() {
+        return maxSelection;
+    }
+
+    public void setMaxSelection(int maxSelection) {
+        this.maxSelection = maxSelection;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public ToMany<ItemCustomizationField> getCustomizationFields() {
+        return customizationFields;
+    }
+
+    @JsonProperty("fields")
+    public void setCustomizationFields(List<ItemCustomizationField> customizationFields) {
+        AppDatabase.getItemCustomizationGroupModel(null).attach(this);
+        AppDatabase.getItemCustomizationFieldModel(null).put(customizationFields);
+        this.customizationFields.addAll(customizationFields);
+        AppDatabase.getItemCustomizationGroupModel(null).put(this);
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public long getMenuItemId() {
+        return item.getTargetId();
+    }
+
+    public ToOne<MenuItemModel> getItem() {
+        return item;
+    }
+
+    public void setItem(long itemId) {
+        this.item.setTargetId(itemId);
+    }
+}
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Session/ItemCustomizationGroupHolder.java b/app/src/main/java/com/checkin/app/checkin/Session/ItemCustomizationGroupHolder.java
similarity index 98%
rename from app/src/main/java/com/alcatraz/admin/project_alcatraz/Session/ItemCustomizationGroupHolder.java
rename to app/src/main/java/com/checkin/app/checkin/Session/ItemCustomizationGroupHolder.java
index 534989e4..0364fcc1 100644
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Session/ItemCustomizationGroupHolder.java
+++ b/app/src/main/java/com/checkin/app/checkin/Session/ItemCustomizationGroupHolder.java
@@ -1,4 +1,4 @@
-package com.alcatraz.admin.project_alcatraz.Session;
+package com.checkin.app.checkin.Session;
 
 import android.view.View;
 import android.view.ViewGroup;
@@ -6,7 +6,7 @@
 import android.widget.Toast;
 
 
-import com.alcatraz.admin.project_alcatraz.R;
+import com.checkin.app.checkin.R;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Session/MenuCartAdapter.java b/app/src/main/java/com/checkin/app/checkin/Session/MenuCartAdapter.java
similarity index 92%
rename from app/src/main/java/com/alcatraz/admin/project_alcatraz/Session/MenuCartAdapter.java
rename to app/src/main/java/com/checkin/app/checkin/Session/MenuCartAdapter.java
index 9042c98e..4098daaa 100644
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Session/MenuCartAdapter.java
+++ b/app/src/main/java/com/checkin/app/checkin/Session/MenuCartAdapter.java
@@ -1,4 +1,4 @@
-package com.alcatraz.admin.project_alcatraz.Session;
+package com.checkin.app.checkin.Session;
 
 import android.support.annotation.NonNull;
 import android.support.v7.widget.CardView;
@@ -9,8 +9,8 @@
 import android.widget.ImageButton;
 import android.widget.TextView;
 
-import com.alcatraz.admin.project_alcatraz.R;
-import com.alcatraz.admin.project_alcatraz.Utility.SwipeRevealLayout;
+import com.checkin.app.checkin.R;
+import com.checkin.app.checkin.Utility.SwipeRevealLayout;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -87,7 +87,7 @@ class ViewHolder extends RecyclerView.ViewHolder {
 
         void bindData(final OrderedItemModel item) {
             tvItemName.setText(item.getItem().getName() + " x" + item.getCount());
-            tvItemPrice.setText(String.valueOf(item.getPrice()));
+            tvItemPrice.setText(String.valueOf(item.getCost()));
             cardItem.setOnClickListener(v -> {
                 if (swipeRevealLayout.isOpened())
                     swipeRevealLayout.close(true);
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Session/MenuGroupAdapter.java b/app/src/main/java/com/checkin/app/checkin/Session/MenuGroupAdapter.java
similarity index 90%
rename from app/src/main/java/com/alcatraz/admin/project_alcatraz/Session/MenuGroupAdapter.java
rename to app/src/main/java/com/checkin/app/checkin/Session/MenuGroupAdapter.java
index 039ce0c8..c43a640d 100644
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Session/MenuGroupAdapter.java
+++ b/app/src/main/java/com/checkin/app/checkin/Session/MenuGroupAdapter.java
@@ -1,4 +1,4 @@
-package com.alcatraz.admin.project_alcatraz.Session;
+package com.checkin.app.checkin.Session;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -20,9 +20,9 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.alcatraz.admin.project_alcatraz.R;
-import com.alcatraz.admin.project_alcatraz.Utility.DynamicSwipableViewPager;
-import com.alcatraz.admin.project_alcatraz.Utility.Util;
+import com.checkin.app.checkin.R;
+import com.checkin.app.checkin.Utility.DynamicSwipableViewPager;
+import com.checkin.app.checkin.Utility.Util;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -58,14 +58,14 @@ public void setGroupList(List<MenuGroupModel> groupList) {
     public void onAttachedToRecyclerView(@NonNull RecyclerView recyclerView) {
         super.onAttachedToRecyclerView(recyclerView);
         mRecyclerView = recyclerView;
-        mRecyclerView.addOnScrollListener(new RecyclerView.OnScrollListener() {
+        /*mRecyclerView.addOnScrollListener(new RecyclerView.OnScrollListener() {
             @Override
             public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
                 super.onScrolled(recyclerView, dx, dy);
                 if (Math.abs(dy) > ViewConfiguration.get(mContext).getScaledTouchSlop())
                     contractView(mPrevExpandedViewHolder);
             }
-        });
+        });*/
     }
 
     @Override
@@ -84,24 +84,18 @@ public GroupViewHolder onCreateViewHolder(@NonNull final ViewGroup parent, final
         final View itemView = LayoutInflater.from(parent.getContext()).inflate(viewType, parent, false);
         final GroupViewHolder holder = new GroupViewHolder(itemView);
 
-        itemView.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                if (!holder.isExpanded) {
-                    contractView(mPrevExpandedViewHolder);
-                    expandView(holder);
-                }
+        itemView.setOnClickListener(view -> {
+            if (!holder.isExpanded) {
+                contractView(mPrevExpandedViewHolder);
+                expandView(holder);
             }
         });
-        holder.vTitle.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if (holder.isExpanded)
-                    contractView(holder);
-                else {
-                    contractView(mPrevExpandedViewHolder);
-                    expandView(holder);
-                }
+        holder.vTitle.setOnClickListener(v -> {
+            if (holder.isExpanded)
+                contractView(holder);
+            else {
+                contractView(mPrevExpandedViewHolder);
+                expandView(holder);
             }
         });
         return holder;
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Session/MenuGroupModel.java b/app/src/main/java/com/checkin/app/checkin/Session/MenuGroupModel.java
similarity index 78%
rename from app/src/main/java/com/alcatraz/admin/project_alcatraz/Session/MenuGroupModel.java
rename to app/src/main/java/com/checkin/app/checkin/Session/MenuGroupModel.java
index 36aaff57..25935c11 100644
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Session/MenuGroupModel.java
+++ b/app/src/main/java/com/checkin/app/checkin/Session/MenuGroupModel.java
@@ -1,9 +1,11 @@
-package com.alcatraz.admin.project_alcatraz.Session;
+package com.checkin.app.checkin.Session;
 
 import android.support.annotation.NonNull;
 
-import com.alcatraz.admin.project_alcatraz.Data.Converters;
-import com.google.gson.annotations.SerializedName;
+import com.checkin.app.checkin.Data.Converters;
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 import java.util.ArrayList;
 
@@ -19,16 +21,17 @@
  */
 
 @Entity
+@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY)
 public class MenuGroupModel {
-    @Id private long id;
+    @Id(assignable = true) private long id;
     private String name;
     @Convert(converter = Converters.ListConverter.class, dbType = String.class)
-    @SerializedName("sub_groups")
+    @JsonProperty("sub_groups")
     private ArrayList<String> subGroups;
     @Transient private String mImageUrl;
     private int menuId;
     @Backlink(to = "group")
-    private ToMany<MenuItemModel> items;
+    @JsonIgnore private ToMany<MenuItemModel> items;
 
     MenuGroupModel() {
         this.subGroups = new ArrayList<>(1);
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Session/MenuInfoFragment.java b/app/src/main/java/com/checkin/app/checkin/Session/MenuInfoFragment.java
similarity index 94%
rename from app/src/main/java/com/alcatraz/admin/project_alcatraz/Session/MenuInfoFragment.java
rename to app/src/main/java/com/checkin/app/checkin/Session/MenuInfoFragment.java
index 03339147..778704db 100644
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Session/MenuInfoFragment.java
+++ b/app/src/main/java/com/checkin/app/checkin/Session/MenuInfoFragment.java
@@ -1,4 +1,4 @@
-package com.alcatraz.admin.project_alcatraz.Session;
+package com.checkin.app.checkin.Session;
 
 import android.os.Bundle;
 import android.support.annotation.NonNull;
@@ -9,7 +9,7 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.alcatraz.admin.project_alcatraz.R;
+import com.checkin.app.checkin.R;
 //import com.alcatraz.admin.project_alcatraz.Utility.GlideApp;
 import com.bumptech.glide.Glide;
 
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Session/MenuItemAdapter.java b/app/src/main/java/com/checkin/app/checkin/Session/MenuItemAdapter.java
similarity index 96%
rename from app/src/main/java/com/alcatraz/admin/project_alcatraz/Session/MenuItemAdapter.java
rename to app/src/main/java/com/checkin/app/checkin/Session/MenuItemAdapter.java
index db630db2..638a0ce0 100644
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Session/MenuItemAdapter.java
+++ b/app/src/main/java/com/checkin/app/checkin/Session/MenuItemAdapter.java
@@ -1,4 +1,4 @@
-package com.alcatraz.admin.project_alcatraz.Session;
+package com.checkin.app.checkin.Session;
 
 import android.annotation.SuppressLint;
 import android.support.annotation.NonNull;
@@ -13,9 +13,9 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.alcatraz.admin.project_alcatraz.R;
-import com.alcatraz.admin.project_alcatraz.Utility.TextBaseAdapter;
-import com.alcatraz.admin.project_alcatraz.Utility.Util;
+import com.checkin.app.checkin.R;
+import com.checkin.app.checkin.Utility.TextBaseAdapter;
+import com.checkin.app.checkin.Utility.Util;
 import com.yarolegovich.discretescrollview.DiscreteScrollView;
 
 import java.util.List;
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Session/MenuItemCustomizationFragment.java b/app/src/main/java/com/checkin/app/checkin/Session/MenuItemCustomizationFragment.java
similarity index 91%
rename from app/src/main/java/com/alcatraz/admin/project_alcatraz/Session/MenuItemCustomizationFragment.java
rename to app/src/main/java/com/checkin/app/checkin/Session/MenuItemCustomizationFragment.java
index ac3ac238..0151a992 100644
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Session/MenuItemCustomizationFragment.java
+++ b/app/src/main/java/com/checkin/app/checkin/Session/MenuItemCustomizationFragment.java
@@ -1,16 +1,15 @@
-package com.alcatraz.admin.project_alcatraz.Session;
+package com.checkin.app.checkin.Session;
 
 import android.content.Context;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentTransaction;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
-import com.alcatraz.admin.project_alcatraz.R;
+import com.checkin.app.checkin.R;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -47,11 +46,6 @@ public static MenuItemCustomizationFragment newInstance(MenuItemModel item) {
         return fragment;
     }
 
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-    }
-
     @Override
     public void onAttach(Context context) {
         super.onAttach(context);
@@ -73,7 +67,7 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
         unbinder = ButterKnife.bind(this, rootView);
         if(item != null){
             MenuItemHolder menuItemHolder = new MenuItemHolder(this,customizationRoot,getFoodExtraHolderList(item.getCustomizationGroups()),item);
-            selectedType = item.getBaseTypeIndex();
+            selectedType = 0;
             item.getTypeCost().get(selectedType);
         }
         done.setOnClickListener(new View.OnClickListener() {
@@ -94,7 +88,7 @@ public List<ItemCustomizationGroupHolder> getFoodExtraHolderList(List<ItemCustom
             View view = LayoutInflater.from(getContext()).inflate(R.layout.item_customization_group,null,false);
             ItemCustomizationGroupHolder foodExtraHolder = new ItemCustomizationGroupHolder(view,null,foodExtra);
 
-            foodExtraHolder.setItemCustomizationFieldHolderList(getExtraHolder(foodExtra.getItemCustomizationFieldList(),foodExtraHolder));
+            foodExtraHolder.setItemCustomizationFieldHolderList(getExtraHolder(foodExtra.getCustomizationFields(),foodExtraHolder));
             foodExtraHolderList.add(foodExtraHolder);
         }
         return foodExtraHolderList;
@@ -144,7 +138,7 @@ private void setBill(){
         totalBill += selectedCost;
         if(selectedItemCustFieldList != null)
         for( ItemCustomizationField itemCustomizationField: selectedItemCustFieldList){
-            totalBill += itemCustomizationField.getPrice();
+            totalBill += itemCustomizationField.getCost();
         }
         bill.setText(String.valueOf(totalBill));
     }
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Session/MenuItemHolder.java b/app/src/main/java/com/checkin/app/checkin/Session/MenuItemHolder.java
similarity index 98%
rename from app/src/main/java/com/alcatraz/admin/project_alcatraz/Session/MenuItemHolder.java
rename to app/src/main/java/com/checkin/app/checkin/Session/MenuItemHolder.java
index 2dcad12f..235a6407 100644
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Session/MenuItemHolder.java
+++ b/app/src/main/java/com/checkin/app/checkin/Session/MenuItemHolder.java
@@ -1,4 +1,4 @@
-package com.alcatraz.admin.project_alcatraz.Session;
+package com.checkin.app.checkin.Session;
 
 import android.view.View;
 import android.view.ViewGroup;
@@ -7,7 +7,7 @@
 import android.widget.TextView;
 
 
-import com.alcatraz.admin.project_alcatraz.R;
+import com.checkin.app.checkin.R;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -95,7 +95,7 @@ public void setMenuItem(MenuItemModel menuItem){
         this.menuItem = menuItem;
         name.setText(menuItem.getName());
         setQuantities(menuItem.getTypeName());
-        selectQuantity(menuItem.getBaseTypeIndex());
+        selectQuantity(0);
 
         /*if(menuItem.getFoodExtraHolderList().size() == foodExtraHolderList.size()){
             for(int i = 0;i< foodExtraHolderList.size();i++){
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Session/MenuItemModel.java b/app/src/main/java/com/checkin/app/checkin/Session/MenuItemModel.java
similarity index 50%
rename from app/src/main/java/com/alcatraz/admin/project_alcatraz/Session/MenuItemModel.java
rename to app/src/main/java/com/checkin/app/checkin/Session/MenuItemModel.java
index 88538c7b..9a8090b2 100644
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Session/MenuItemModel.java
+++ b/app/src/main/java/com/checkin/app/checkin/Session/MenuItemModel.java
@@ -1,6 +1,10 @@
-package com.alcatraz.admin.project_alcatraz.Session;
+package com.checkin.app.checkin.Session;
 
-import com.alcatraz.admin.project_alcatraz.Data.Converters;
+import com.checkin.app.checkin.Data.AppDatabase;
+import com.checkin.app.checkin.Data.Converters;
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 import java.util.List;
 
@@ -16,32 +20,39 @@
  */
 
 @Entity
+@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY)
 public class MenuItemModel {
-    @Id private long id;
+    @Id(assignable = true) private long id;
     private String name;
+    private long shop;
     @Convert(converter = Converters.ListConverter.class, dbType = String.class)
-    private List<String> typeName;
+    @JsonProperty("types") private List<String> typeName;
     @Convert(converter = Converters.ListConverter.class, dbType = String.class)
-    private List<Double> typeCost;
-    private int baseTypeIndex;
-    private String unit;
+    @JsonProperty("costs") private List<Double> typeCost;
     private String description;
     private boolean vegetarian;
-    private ToOne<MenuGroupModel> group;
-    private int menuId;
-    private int subGroupIndex = 0;
-
-    @Backlink(to = "menuItem")
-    private ToMany<ItemCustomizationGroup> customizationGroups;
+    @JsonIgnore private ToOne<MenuGroupModel> group;
+    private boolean available;
+    @JsonProperty("menu_id") private int menuId;
+    @JsonProperty("sub_group_index") private int subGroupIndex = 0;
+    private String image;
+    private String video;
+    private String remarks;
+    @Convert(converter = Converters.ListConverter.class, dbType = String.class)
+    @JsonProperty("available_meals") private List<String> availableMeals;
+    private String recipe;
+    @Convert(converter = Converters.ListConverter.class, dbType = String.class)
+    private List<String> ingredients;
+    @Backlink(to = "item")
+    @JsonIgnore private ToMany<ItemCustomizationGroup> customizationGroups;
 
     MenuItemModel() {
     }
 
-    public MenuItemModel(String name, List<String> typeName,List<Double> typeCost, int baseType, long groupId, int menuId) {
+    public MenuItemModel(String name, List<String> typeName,List<Double> typeCost, long groupId, int menuId) {
         this.name = name;
         this.typeName = typeName;
         this.typeCost = typeCost;
-        this.baseTypeIndex = baseType;
         this.group.setTargetId(groupId);
         this.menuId = menuId;
     }
@@ -58,8 +69,6 @@ public MenuItemModel(MenuItemModel item) {
         this.name = item.getName();
         this.typeName = item.typeName;
         this.typeCost = item.typeCost;
-        this.baseTypeIndex = item.getBaseTypeIndex();
-        this.unit = item.getUnit();
         this.vegetarian = item.isVegetarian();
         this.menuId = item.getMenuId();
         this.subGroupIndex = item.getSubGroupIndex();
@@ -69,6 +78,14 @@ public ToMany<ItemCustomizationGroup> getCustomizationGroups() {
         return customizationGroups;
     }
 
+    @JsonProperty("customizations")
+    public void setCustomizationGroups(List<ItemCustomizationGroup> customizationGroups) {
+        AppDatabase.getMenuItemModel(null).attach(this);
+        AppDatabase.getItemCustomizationGroupModel(null).put(customizationGroups);
+        this.customizationGroups.addAll(customizationGroups);
+        AppDatabase.getMenuItemModel(null).put(this);
+    }
+
     public String getName() {
         return name;
     }
@@ -89,8 +106,9 @@ public ToOne<MenuGroupModel> getGroup() {
         return group;
     }
 
-    public String getUnit() {
-        return unit;
+    @JsonProperty("group")
+    public void setGroup(long groupId) {
+        group.setTargetId(groupId);
     }
 
     public boolean isVegetarian() {
@@ -125,12 +143,44 @@ public void setTypeCost(List<Double> typeCost) {
         this.typeCost = typeCost;
     }
 
-    public int getBaseTypeIndex() {
-        return baseTypeIndex;
+    public String getImage() {
+        return image;
+    }
+
+    public String getVideo() {
+        return video;
+    }
+
+    public List<String> getAvailableMeals() {
+        return availableMeals;
+    }
+
+    public List<String> getIngredients() {
+        return ingredients;
+    }
+
+    public boolean getAvailable() {
+        return available;
+    }
+
+    public long getShop() {
+        return shop;
+    }
+
+    public String getRecipe() {
+        return recipe;
+    }
+
+    public void setAvailableMeals(List<String> availableMeals) {
+        this.availableMeals = availableMeals;
+    }
+
+    public void setIngredients(List<String> ingredients) {
+        this.ingredients = ingredients;
     }
 
-    public void setBaseType(int baseType) {
-        this.baseTypeIndex = baseType;
+    public String getRemarks() {
+        return remarks;
     }
 
     public OrderedItemModel order(int quantity, int type) {
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Session/MenuRepository.java b/app/src/main/java/com/checkin/app/checkin/Session/MenuRepository.java
similarity index 88%
rename from app/src/main/java/com/alcatraz/admin/project_alcatraz/Session/MenuRepository.java
rename to app/src/main/java/com/checkin/app/checkin/Session/MenuRepository.java
index 599291dd..eef753ec 100644
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Session/MenuRepository.java
+++ b/app/src/main/java/com/checkin/app/checkin/Session/MenuRepository.java
@@ -1,4 +1,4 @@
-package com.alcatraz.admin.project_alcatraz.Session;
+package com.checkin.app.checkin.Session;
 
 import android.app.Application;
 import android.arch.lifecycle.LiveData;
@@ -6,12 +6,12 @@
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
-import com.alcatraz.admin.project_alcatraz.Data.ApiClient;
-import com.alcatraz.admin.project_alcatraz.Data.ApiResponse;
-import com.alcatraz.admin.project_alcatraz.Data.AppDatabase;
-import com.alcatraz.admin.project_alcatraz.Data.NetworkBoundResource;
-import com.alcatraz.admin.project_alcatraz.Data.Resource;
-import com.alcatraz.admin.project_alcatraz.Data.WebApiService;
+import com.checkin.app.checkin.Data.ApiClient;
+import com.checkin.app.checkin.Data.ApiResponse;
+import com.checkin.app.checkin.Data.AppDatabase;
+import com.checkin.app.checkin.Data.NetworkBoundResource;
+import com.checkin.app.checkin.Data.Resource;
+import com.checkin.app.checkin.Data.WebApiService;
 
 import java.util.List;
 
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Session/MenuSearchAdapter.java b/app/src/main/java/com/checkin/app/checkin/Session/MenuSearchAdapter.java
similarity index 94%
rename from app/src/main/java/com/alcatraz/admin/project_alcatraz/Session/MenuSearchAdapter.java
rename to app/src/main/java/com/checkin/app/checkin/Session/MenuSearchAdapter.java
index 544230a2..ac3447ae 100644
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Session/MenuSearchAdapter.java
+++ b/app/src/main/java/com/checkin/app/checkin/Session/MenuSearchAdapter.java
@@ -1,4 +1,4 @@
-package com.alcatraz.admin.project_alcatraz.Session;
+package com.checkin.app.checkin.Session;
 
 import android.content.Context;
 import android.support.annotation.NonNull;
@@ -8,7 +8,7 @@
 import android.view.ViewGroup;
 import android.widget.TextView;
 
-import com.alcatraz.admin.project_alcatraz.R;
+import com.checkin.app.checkin.R;
 
 import java.util.ArrayList;
 
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Session/MenuUserFragment.java b/app/src/main/java/com/checkin/app/checkin/Session/MenuUserFragment.java
similarity index 96%
rename from app/src/main/java/com/alcatraz/admin/project_alcatraz/Session/MenuUserFragment.java
rename to app/src/main/java/com/checkin/app/checkin/Session/MenuUserFragment.java
index 45fd1623..b0d9c1f1 100644
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Session/MenuUserFragment.java
+++ b/app/src/main/java/com/checkin/app/checkin/Session/MenuUserFragment.java
@@ -1,4 +1,4 @@
-package com.alcatraz.admin.project_alcatraz.Session;
+package com.checkin.app.checkin.Session;
 
 import android.arch.lifecycle.ViewModelProviders;
 import android.content.Context;
@@ -14,9 +14,9 @@
 import android.view.ViewGroup;
 import android.widget.Toast;
 
-import com.alcatraz.admin.project_alcatraz.Data.Resource;
-import com.alcatraz.admin.project_alcatraz.R;
-import com.alcatraz.admin.project_alcatraz.Utility.Constants;
+import com.checkin.app.checkin.Data.Resource;
+import com.checkin.app.checkin.R;
+import com.checkin.app.checkin.Utility.Constants;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Session/MenuViewModel.java b/app/src/main/java/com/checkin/app/checkin/Session/MenuViewModel.java
similarity index 97%
rename from app/src/main/java/com/alcatraz/admin/project_alcatraz/Session/MenuViewModel.java
rename to app/src/main/java/com/checkin/app/checkin/Session/MenuViewModel.java
index 9ed25653..1316efde 100644
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Session/MenuViewModel.java
+++ b/app/src/main/java/com/checkin/app/checkin/Session/MenuViewModel.java
@@ -1,4 +1,4 @@
-package com.alcatraz.admin.project_alcatraz.Session;
+package com.checkin.app.checkin.Session;
 
 import android.app.Application;
 import android.arch.lifecycle.AndroidViewModel;
@@ -11,7 +11,7 @@
 import android.util.Log;
 import android.util.LongSparseArray;
 
-import com.alcatraz.admin.project_alcatraz.Data.Resource;
+import com.checkin.app.checkin.Data.Resource;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/app/src/main/java/com/checkin/app/checkin/Session/OrderedItemModel.java b/app/src/main/java/com/checkin/app/checkin/Session/OrderedItemModel.java
new file mode 100644
index 00000000..72a3f20a
--- /dev/null
+++ b/app/src/main/java/com/checkin/app/checkin/Session/OrderedItemModel.java
@@ -0,0 +1,71 @@
+package com.checkin.app.checkin.Session;
+
+import com.checkin.app.checkin.Utility.Constants;
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.util.Date;
+import java.util.List;
+
+@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY)
+public class OrderedItemModel {
+    private long id;
+    private MenuItemModel item;
+    private Date ordered;
+    private int quantity;
+    @JsonProperty("type_index") private int typeIndex;
+    @JsonProperty("customizations") private List<ItemCustomizationField> selectedFields;
+    @JsonProperty("user_id") private int userId;
+    @JsonProperty("session_id") private int sessionId;
+    private double cost;
+    private String remarks;
+
+    OrderedItemModel() {}
+
+    OrderedItemModel(MenuItemModel menuItem, int quantity, int type) {
+        this.item = menuItem;
+        this.quantity = quantity;
+        this.typeIndex = type;
+    }
+
+    public double getCost() {
+        return cost;
+    }
+
+    public int getTypeIndex() {
+        return typeIndex;
+    }
+
+    public int getCount() {
+        return quantity;
+    }
+
+    public MenuItemModel getItem() {
+        return item;
+    }
+
+    public Date getOrdered() {
+        return ordered;
+    }
+
+    public boolean canCancel() {
+        return getRemainingCancelTime() >= 0;
+    }
+
+    public long getRemainingCancelTime() {
+        return Constants.DEFAULT_ORDER_CANCEL_DURATION - ((new Date()).getTime() - ordered.getTime());
+    }
+
+    public void setOrdered(Date ordered) {
+        this.ordered = ordered;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        return obj instanceof OrderedItemModel && ((OrderedItemModel) obj).getItem().getId() == this.getItem().getId();
+    }
+
+    public long getId() {
+        return id;
+    }
+}
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Session/PostSessionStartFragment.java b/app/src/main/java/com/checkin/app/checkin/Session/PostSessionStartFragment.java
similarity index 97%
rename from app/src/main/java/com/alcatraz/admin/project_alcatraz/Session/PostSessionStartFragment.java
rename to app/src/main/java/com/checkin/app/checkin/Session/PostSessionStartFragment.java
index 78297c53..f6050790 100644
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Session/PostSessionStartFragment.java
+++ b/app/src/main/java/com/checkin/app/checkin/Session/PostSessionStartFragment.java
@@ -1,4 +1,4 @@
-package com.alcatraz.admin.project_alcatraz.Session;
+package com.checkin.app.checkin.Session;
 
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
@@ -10,7 +10,7 @@
 import android.widget.ImageView;
 import android.widget.Toast;
 
-import com.alcatraz.admin.project_alcatraz.R;
+import com.checkin.app.checkin.R;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
diff --git a/app/src/main/java/com/checkin/app/checkin/Session/SessionAddMemberDialog.java b/app/src/main/java/com/checkin/app/checkin/Session/SessionAddMemberDialog.java
new file mode 100644
index 00000000..a00b162a
--- /dev/null
+++ b/app/src/main/java/com/checkin/app/checkin/Session/SessionAddMemberDialog.java
@@ -0,0 +1,67 @@
+package com.checkin.app.checkin.Session;
+
+import android.os.Bundle;
+import android.support.v4.app.DialogFragment;
+
+public class SessionAddMemberDialog extends DialogFragment {
+
+    String[] fruits = {"Apple", "Banana", "Cherry", "Date", "Grape", "Kiwi", "Mango", "Pear"};
+//    ArrayList<Chip> chips=new ArrayList<>();
+
+    static SessionAddMemberDialog newInstance() {
+        SessionAddMemberDialog f = new SessionAddMemberDialog();
+
+        // Supply num input as an argument.
+        Bundle args = new Bundle();
+        f.setArguments(args);
+
+        return f;
+    }
+
+    /*@Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        View v = inflater.inflate(R.layout.dialog_session_add_member, container, false);
+        for(int i=0;i<fruits.length;i++)
+            chips.add(new Chip(fruits[i],null));
+        ArrayAdapter<String> adapter = new ArrayAdapter<String>
+                (inflater.getContext(), R.layout.item_select_layout,R.id.tv_text, fruits);
+        NachoTextView actv =  v.findViewById(R.id.auto);
+        actv.setThreshold(1);
+        ArrayList<SelectListItem> rowItems=new ArrayList<>();
+        for(int i=0;i<fruits.length;i++)
+        {
+         rowItems.add(new SelectListItem(R.drawable.water,fruits[i],""));
+        }
+        actv.setOnChipClickListener((chip, event) -> actv.getChipTokenizer().deleteChipAndPadding(chip, actv.getEditableText()));
+        actv.setChipTokenizer(new SpanChipTokenizer<>(inflater.getContext(), new ChipSpanChipCreator() {
+            @Override
+            public ChipSpan createChip(@NonNull Context context, @NonNull CharSequence text, Object data) {
+                return new ChipSpan(context, text, ContextCompat.getDrawable(inflater.getContext(), R.drawable.ic_close), data);
+            }
+
+            @Override
+            public void configureChip(@NonNull ChipSpan chip, @NonNull ChipConfiguration chipConfiguration) {
+                super.configureChip(chip, chipConfiguration);
+                chip.setShowIconOnLeft(false);
+                chip.setIconBackgroundColor(getResources().getColor(R.color.colorPrimaryRed));
+            }
+        }, ChipSpan.class));
+
+        SelectListViewAdapter selectListViewAdapter = new SelectListViewAdapter(inflater.getContext(),
+                R.layout.item_select_layout, rowItems);
+        actv.setAdapter(selectListViewAdapter);
+
+
+        v.findViewById(R.id.confirm).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                dismiss();
+                //add in adapter
+            }
+        });
+        getDialog().getWindow().setBackgroundDrawableResource(android.R.color.transparent);
+
+        return v;
+    }*/
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Home/DialogCheckout.java b/app/src/main/java/com/checkin/app/checkin/Session/SessionCheckoutDialog.java
similarity index 77%
rename from app/src/main/java/com/alcatraz/admin/project_alcatraz/Home/DialogCheckout.java
rename to app/src/main/java/com/checkin/app/checkin/Session/SessionCheckoutDialog.java
index 1e099f29..68df26e9 100644
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Home/DialogCheckout.java
+++ b/app/src/main/java/com/checkin/app/checkin/Session/SessionCheckoutDialog.java
@@ -1,25 +1,22 @@
-package com.alcatraz.admin.project_alcatraz.Home;
+package com.checkin.app.checkin.Session;
 
 import android.app.Dialog;
-import android.content.DialogInterface;
 import android.os.Bundle;
 import android.support.v4.app.DialogFragment;
 import android.support.v7.app.AlertDialog;
 import android.view.LayoutInflater;
 import android.view.View;
 
-import com.alcatraz.admin.project_alcatraz.R;
+import com.checkin.app.checkin.R;
 
-public class DialogCheckout extends DialogFragment {
+public class SessionCheckoutDialog extends DialogFragment {
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
         // Get the layout inflater
         LayoutInflater inflater = getActivity().getLayoutInflater();
 
-        // Inflate and set the layout for the dialog
-        // Pass null as the parent view because its going in the dialog layout
-        View v=inflater.inflate(R.layout.dialog_checkout, null);
+        View v=inflater.inflate(R.layout.dialog_session_checkout, null);
         v.findViewById(R.id.cancel).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Session/SessionUserActivity.java b/app/src/main/java/com/checkin/app/checkin/Session/SessionUserActivity.java
similarity index 95%
rename from app/src/main/java/com/alcatraz/admin/project_alcatraz/Session/SessionUserActivity.java
rename to app/src/main/java/com/checkin/app/checkin/Session/SessionUserActivity.java
index 66cf7dd3..d55be5b3 100644
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Session/SessionUserActivity.java
+++ b/app/src/main/java/com/checkin/app/checkin/Session/SessionUserActivity.java
@@ -1,4 +1,4 @@
-package com.alcatraz.admin.project_alcatraz.Session;
+package com.checkin.app.checkin.Session;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -29,12 +29,12 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.alcatraz.admin.project_alcatraz.R;
-import com.alcatraz.admin.project_alcatraz.Session.MenuUserFragment.STATUS_VALUES;
-import com.alcatraz.admin.project_alcatraz.Utility.Constants;
-import com.alcatraz.admin.project_alcatraz.Utility.EndDrawerToggle;
+import com.checkin.app.checkin.R;
+import com.checkin.app.checkin.Session.MenuUserFragment.STATUS_VALUES;
+import com.checkin.app.checkin.Utility.Constants;
+import com.checkin.app.checkin.Utility.EndDrawerToggle;
+import com.checkin.app.checkin.Utility.Util;
 import com.miguelcatalan.materialsearchview.MaterialSearchView;
-import com.pchmn.materialchips.util.ViewUtil;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -43,7 +43,7 @@
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 
-import static com.alcatraz.admin.project_alcatraz.Session.MenuUserFragment.SESSION_STATUS;
+import static com.checkin.app.checkin.Session.MenuUserFragment.SESSION_STATUS;
 
 public class SessionUserActivity extends AppCompatActivity implements
         MenuUserFragment.OnMenuFragmentInteractionListener,
@@ -355,7 +355,7 @@ public void onItemOrderInteraction(MenuItemModel item, int count) {
                     .commit();
             showCustomization();
         }
-        else mMenuViewModel.orderItem(item, count, item.getBaseTypeIndex());
+        else mMenuViewModel.orderItem(item, count, 0);
     }
 
     @Override
@@ -381,14 +381,14 @@ public void onAnimationStart(Animator animation) {
                     }
                 });
         customizationRoot.animate()
-                .translationY(ViewUtil.dpToPx(0))
+                .translationY(Util.dpToPx(0))
                 .setDuration(400)
                 .alpha(1.0f)
                 .setListener(new AnimatorListenerAdapter() {
                     @Override
                     public void onAnimationStart(Animator animation) {
                         customizationRoot.setVisibility(View.VISIBLE);
-                        customizationRoot.setTranslationY(ViewUtil.dpToPx(400));
+                        customizationRoot.setTranslationY(Util.dpToPx(400));
                     }
                     @Override
                     public void onAnimationEnd(Animator animation) {
@@ -407,14 +407,14 @@ public void onAnimationEnd(Animator animation) {
                     }
                 });
         customizationRoot.animate()
-                .translationY(ViewUtil.dpToPx(400))
+                .translationY(Util.dpToPx(400))
                 .setDuration(400)
                 .alpha(0.0f)
                 .setListener(new AnimatorListenerAdapter() {
                     @Override
                     public void onAnimationEnd(Animator animation) {
                         customizationRoot.setVisibility(View.GONE);
-                        customizationRoot.setTranslationY(ViewUtil.dpToPx(400));
+                        customizationRoot.setTranslationY(Util.dpToPx(400));
                         getSupportFragmentManager().popBackStack();
                     }
                 });
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Shop/Shop.java b/app/src/main/java/com/checkin/app/checkin/Shop/Shop.java
similarity index 83%
rename from app/src/main/java/com/alcatraz/admin/project_alcatraz/Shop/Shop.java
rename to app/src/main/java/com/checkin/app/checkin/Shop/Shop.java
index ba1fb75c..991074d4 100644
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Shop/Shop.java
+++ b/app/src/main/java/com/checkin/app/checkin/Shop/Shop.java
@@ -1,7 +1,7 @@
-package com.alcatraz.admin.project_alcatraz.Shop;
+package com.checkin.app.checkin.Shop;
 
-import com.alcatraz.admin.project_alcatraz.Utility.Constants;
-import com.alcatraz.admin.project_alcatraz.Utility.NamedFormatter;
+import com.checkin.app.checkin.Utility.Constants;
+import com.checkin.app.checkin.Utility.NamedFormatter;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Social/Chat.java b/app/src/main/java/com/checkin/app/checkin/Social/Chat.java
similarity index 94%
rename from app/src/main/java/com/alcatraz/admin/project_alcatraz/Social/Chat.java
rename to app/src/main/java/com/checkin/app/checkin/Social/Chat.java
index dc0ed69e..f2fb1834 100644
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Social/Chat.java
+++ b/app/src/main/java/com/checkin/app/checkin/Social/Chat.java
@@ -1,4 +1,4 @@
-package com.alcatraz.admin.project_alcatraz.Social;
+package com.checkin.app.checkin.Social;
 
 import io.objectbox.annotation.Backlink;
 import io.objectbox.annotation.Entity;
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Social/ChatActivity.java b/app/src/main/java/com/checkin/app/checkin/Social/ChatActivity.java
similarity index 85%
rename from app/src/main/java/com/alcatraz/admin/project_alcatraz/Social/ChatActivity.java
rename to app/src/main/java/com/checkin/app/checkin/Social/ChatActivity.java
index 9cd31117..cbef404e 100644
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Social/ChatActivity.java
+++ b/app/src/main/java/com/checkin/app/checkin/Social/ChatActivity.java
@@ -1,4 +1,4 @@
-package com.alcatraz.admin.project_alcatraz.Social;
+package com.checkin.app.checkin.Social;
 
 import android.arch.lifecycle.Observer;
 import android.arch.lifecycle.ViewModelProviders;
@@ -12,10 +12,10 @@
 import android.widget.EditText;
 import android.widget.Toast;
 
-import com.alcatraz.admin.project_alcatraz.Data.Resource;
-import com.alcatraz.admin.project_alcatraz.R;
-import com.alcatraz.admin.project_alcatraz.Utility.Constants;
-import com.alcatraz.admin.project_alcatraz.Utility.NamedFormatter;
+import com.checkin.app.checkin.Data.Resource;
+import com.checkin.app.checkin.R;
+import com.checkin.app.checkin.Utility.Constants;
+import com.checkin.app.checkin.Utility.NamedFormatter;
 
 import java.util.Date;
 import java.util.HashMap;
@@ -32,7 +32,7 @@
 public class ChatActivity extends AppCompatActivity{
     private static final String TAG = ChatActivity.class.getSimpleName();
     private MessageViewModel mMessageViewModel;
-    private int mUserId;
+    private String mUserId;
     MessageAdapter messageAdapter;
     @BindView(R.id.edittext_chat) EditText edChatText;
     @BindView(R.id.recycler_chat) RecyclerView rvChatList;
@@ -43,11 +43,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         setContentView(R.layout.activity_chat);
         ButterKnife.bind(this);
 
-        mUserId = getIntent().getIntExtra(Constants.EXTRA_SELECTED_USER_ID, 0);
-        if (mUserId == 0) {
-            Log.e(TAG, "Invalid UserModel ID!");
-            finish();
-        }
+        mUserId = getIntent().getStringExtra(Constants.EXTRA_SELECTED_USER_ID);
         messageAdapter = new MessageAdapter(null);
         rvChatList.setLayoutManager(new LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false));
         rvChatList.setAdapter(messageAdapter);
@@ -73,7 +69,7 @@ public void onChanged(@Nullable Resource<List<Message>> messagesResource) {
     @OnClick(R.id.button_chat_send)
     public void send_message(View v)
     {
-        Message msg = new Message(edChatText.getText().toString(), new Date(), 0, mUserId);
+        Message msg = new Message(edChatText.getText().toString(), new Date(), 0, Integer.valueOf(mUserId));
         Map<String, String> values = new HashMap<>();
         values.put("sender", "" + msg.getSenderId());
         values.put("recipient", "" + msg.getRecipientId());
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Social/ChatAdapter.java b/app/src/main/java/com/checkin/app/checkin/Social/ChatAdapter.java
similarity index 96%
rename from app/src/main/java/com/alcatraz/admin/project_alcatraz/Social/ChatAdapter.java
rename to app/src/main/java/com/checkin/app/checkin/Social/ChatAdapter.java
index 061d86de..fde0d56d 100644
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Social/ChatAdapter.java
+++ b/app/src/main/java/com/checkin/app/checkin/Social/ChatAdapter.java
@@ -1,4 +1,4 @@
-package com.alcatraz.admin.project_alcatraz.Social;
+package com.checkin.app.checkin.Social;
 
 import android.support.annotation.NonNull;
 import android.support.v7.widget.RecyclerView;
@@ -9,7 +9,7 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.alcatraz.admin.project_alcatraz.R;
+import com.checkin.app.checkin.R;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
 import com.bumptech.glide.request.RequestOptions;
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Social/Message.java b/app/src/main/java/com/checkin/app/checkin/Social/Message.java
similarity index 77%
rename from app/src/main/java/com/alcatraz/admin/project_alcatraz/Social/Message.java
rename to app/src/main/java/com/checkin/app/checkin/Social/Message.java
index 341c4177..2c2a3c75 100644
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Social/Message.java
+++ b/app/src/main/java/com/checkin/app/checkin/Social/Message.java
@@ -1,9 +1,9 @@
-package com.alcatraz.admin.project_alcatraz.Social;
+package com.checkin.app.checkin.Social;
 
 import android.text.format.DateFormat;
 
-import com.alcatraz.admin.project_alcatraz.User.UserModel;
-import com.google.gson.annotations.SerializedName;
+import com.checkin.app.checkin.User.UserModel;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 import java.util.Date;
 
@@ -20,11 +20,11 @@
 public class Message {
 
     @Id private long id;
-    @SerializedName(value = "body") private String message;
-    @SerializedName(value = "sender") private ToOne<UserModel> sender;
-    @SerializedName(value = "recipient") private ToOne<UserModel> recipient;
-    @SerializedName(value = "read_at") private Date readAt;
-    @SerializedName(value = "sent_at") private Date sentAt;
+    @JsonProperty(value = "body") private String message;
+    @JsonProperty(value = "sender") private ToOne<UserModel> sender;
+    @JsonProperty(value = "recipient") private ToOne<UserModel> recipient;
+    @JsonProperty(value = "read_at") private Date readAt;
+    @JsonProperty(value = "sent_at") private Date sentAt;
     private ToOne<Chat> chat;
     @Transient private static final String timeFormat = "hh:mm a";
 
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Social/MessageAdapter.java b/app/src/main/java/com/checkin/app/checkin/Social/MessageAdapter.java
similarity index 96%
rename from app/src/main/java/com/alcatraz/admin/project_alcatraz/Social/MessageAdapter.java
rename to app/src/main/java/com/checkin/app/checkin/Social/MessageAdapter.java
index 3b336d9e..d0e4756a 100644
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Social/MessageAdapter.java
+++ b/app/src/main/java/com/checkin/app/checkin/Social/MessageAdapter.java
@@ -1,4 +1,4 @@
-package com.alcatraz.admin.project_alcatraz.Social;
+package com.checkin.app.checkin.Social;
 
 import android.support.annotation.NonNull;
 import android.support.v7.widget.RecyclerView;
@@ -7,7 +7,7 @@
 import android.view.ViewGroup;
 import android.widget.TextView;
 
-import com.alcatraz.admin.project_alcatraz.R;
+import com.checkin.app.checkin.R;
 
 import java.util.List;
 
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Social/MessageRepository.java b/app/src/main/java/com/checkin/app/checkin/Social/MessageRepository.java
similarity index 82%
rename from app/src/main/java/com/alcatraz/admin/project_alcatraz/Social/MessageRepository.java
rename to app/src/main/java/com/checkin/app/checkin/Social/MessageRepository.java
index 5da1cba8..1ce8f455 100644
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Social/MessageRepository.java
+++ b/app/src/main/java/com/checkin/app/checkin/Social/MessageRepository.java
@@ -1,4 +1,4 @@
-package com.alcatraz.admin.project_alcatraz.Social;
+package com.checkin.app.checkin.Social;
 
 import android.app.Application;
 import android.arch.lifecycle.LiveData;
@@ -6,14 +6,14 @@
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
-import com.alcatraz.admin.project_alcatraz.Data.ApiClient;
-import com.alcatraz.admin.project_alcatraz.Data.ApiResponse;
-import com.alcatraz.admin.project_alcatraz.Data.AppDatabase;
-import com.alcatraz.admin.project_alcatraz.Data.BaseRepository;
-import com.alcatraz.admin.project_alcatraz.Data.NetworkBoundResource;
-import com.alcatraz.admin.project_alcatraz.Data.Resource;
-import com.alcatraz.admin.project_alcatraz.Data.RetrofitLiveData;
-import com.alcatraz.admin.project_alcatraz.Data.WebApiService;
+import com.checkin.app.checkin.Data.ApiClient;
+import com.checkin.app.checkin.Data.ApiResponse;
+import com.checkin.app.checkin.Data.AppDatabase;
+import com.checkin.app.checkin.Data.BaseRepository;
+import com.checkin.app.checkin.Data.NetworkBoundResource;
+import com.checkin.app.checkin.Data.Resource;
+import com.checkin.app.checkin.Data.RetrofitLiveData;
+import com.checkin.app.checkin.Data.WebApiService;
 
 import java.util.List;
 
@@ -41,7 +41,7 @@ LiveData<List<Message>> getAllMessages() {
         return new ObjectBoxLiveData<>(mMessageModel.query().build());
     }
 
-    public LiveData<Resource<List<Message>>> getMessagesInConversation(int userId) {
+    public LiveData<Resource<List<Message>>> getMessagesInConversation(String userId) {
         return new NetworkBoundResource<List<Message>, List<Message>>() {
 
             @Override
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Social/MessageViewModel.java b/app/src/main/java/com/checkin/app/checkin/Social/MessageViewModel.java
similarity index 91%
rename from app/src/main/java/com/alcatraz/admin/project_alcatraz/Social/MessageViewModel.java
rename to app/src/main/java/com/checkin/app/checkin/Social/MessageViewModel.java
index d01ad472..7bda80da 100644
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Social/MessageViewModel.java
+++ b/app/src/main/java/com/checkin/app/checkin/Social/MessageViewModel.java
@@ -1,4 +1,4 @@
-package com.alcatraz.admin.project_alcatraz.Social;
+package com.checkin.app.checkin.Social;
 
 import android.app.Application;
 import android.arch.lifecycle.AndroidViewModel;
@@ -9,7 +9,7 @@
 import android.preference.PreferenceManager;
 import android.support.annotation.NonNull;
 
-import com.alcatraz.admin.project_alcatraz.Data.Resource;
+import com.checkin.app.checkin.Data.Resource;
 
 import java.util.List;
 
@@ -26,7 +26,7 @@ public MessageViewModel(@NonNull Application application) {
         mPrefs = PreferenceManager.getDefaultSharedPreferences(application.getApplicationContext());
     }
 
-    public LiveData<Resource<List<Message>>> getMessagesOfChat(int userId) {
+    public LiveData<Resource<List<Message>>> getMessagesOfChat(String userId) {
         if (mChatMessages == null)
             mChatMessages = mRepository.getMessagesInConversation(userId);
         return mChatMessages;
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/User/EditProfile.java b/app/src/main/java/com/checkin/app/checkin/User/EditProfile.java
similarity index 92%
rename from app/src/main/java/com/alcatraz/admin/project_alcatraz/User/EditProfile.java
rename to app/src/main/java/com/checkin/app/checkin/User/EditProfile.java
index 3dd3d4eb..8aac44dc 100644
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/User/EditProfile.java
+++ b/app/src/main/java/com/checkin/app/checkin/User/EditProfile.java
@@ -1,4 +1,4 @@
-package com.alcatraz.admin.project_alcatraz.User;
+package com.checkin.app.checkin.User;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
@@ -7,7 +7,7 @@
 import android.view.View;
 import android.widget.ImageView;
 
-import com.alcatraz.admin.project_alcatraz.R;
+import com.checkin.app.checkin.R;
 
 /**
  * Created by TAIYAB on 22-02-2018.
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/User/ShopProfileActivity.java b/app/src/main/java/com/checkin/app/checkin/User/ShopProfileActivity.java
similarity index 75%
rename from app/src/main/java/com/alcatraz/admin/project_alcatraz/User/ShopProfileActivity.java
rename to app/src/main/java/com/checkin/app/checkin/User/ShopProfileActivity.java
index 58559dd3..c1ae09e6 100644
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/User/ShopProfileActivity.java
+++ b/app/src/main/java/com/checkin/app/checkin/User/ShopProfileActivity.java
@@ -1,4 +1,4 @@
-package com.alcatraz.admin.project_alcatraz.User;
+package com.checkin.app.checkin.User;
 
 import android.support.v7.app.AppCompatActivity;
 
diff --git a/app/src/main/java/com/checkin/app/checkin/User/UserModel.java b/app/src/main/java/com/checkin/app/checkin/User/UserModel.java
new file mode 100644
index 00000000..24b8e330
--- /dev/null
+++ b/app/src/main/java/com/checkin/app/checkin/User/UserModel.java
@@ -0,0 +1,45 @@
+package com.checkin.app.checkin.User;
+
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import io.objectbox.annotation.Entity;
+import io.objectbox.annotation.Id;
+
+@Entity
+@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY)
+public class UserModel {
+    @Id private long id;
+    private String username;
+    @JsonProperty("profile_pic") private String profilePic;
+
+    public UserModel() {}
+
+    public UserModel(String username, String profilePic) {
+        this.username = username;
+        this.profilePic = profilePic;
+    }
+
+    public UserModel(long id, String username, String profilePic) {
+        this.id = id;
+        this.username = username;
+        this.profilePic = profilePic;
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    void setId(long id) {
+        this.id = id;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public String getProfilePic() {
+        return profilePic;
+    }
+}
+
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/User/UserRepository.java b/app/src/main/java/com/checkin/app/checkin/User/UserRepository.java
similarity index 77%
rename from app/src/main/java/com/alcatraz/admin/project_alcatraz/User/UserRepository.java
rename to app/src/main/java/com/checkin/app/checkin/User/UserRepository.java
index 9de56349..6f228923 100644
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/User/UserRepository.java
+++ b/app/src/main/java/com/checkin/app/checkin/User/UserRepository.java
@@ -1,13 +1,13 @@
-package com.alcatraz.admin.project_alcatraz.User;
+package com.checkin.app.checkin.User;
 
 import android.app.Application;
 import android.arch.lifecycle.LiveData;
 import android.content.Context;
 
-import com.alcatraz.admin.project_alcatraz.Data.ApiClient;
-import com.alcatraz.admin.project_alcatraz.Data.AppDatabase;
-import com.alcatraz.admin.project_alcatraz.Data.BaseRepository;
-import com.alcatraz.admin.project_alcatraz.Data.WebApiService;
+import com.checkin.app.checkin.Data.ApiClient;
+import com.checkin.app.checkin.Data.AppDatabase;
+import com.checkin.app.checkin.Data.BaseRepository;
+import com.checkin.app.checkin.Data.WebApiService;
 
 import java.util.List;
 
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/User/UserViewModel.java b/app/src/main/java/com/checkin/app/checkin/User/UserViewModel.java
similarity index 95%
rename from app/src/main/java/com/alcatraz/admin/project_alcatraz/User/UserViewModel.java
rename to app/src/main/java/com/checkin/app/checkin/User/UserViewModel.java
index 46cc554e..5fcaaac4 100644
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/User/UserViewModel.java
+++ b/app/src/main/java/com/checkin/app/checkin/User/UserViewModel.java
@@ -1,4 +1,4 @@
-package com.alcatraz.admin.project_alcatraz.User;
+package com.checkin.app.checkin.User;
 
 import android.app.Application;
 import android.arch.lifecycle.AndroidViewModel;
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Utility/ClipRevealFrame.java b/app/src/main/java/com/checkin/app/checkin/Utility/ClipRevealFrame.java
similarity index 96%
rename from app/src/main/java/com/alcatraz/admin/project_alcatraz/Utility/ClipRevealFrame.java
rename to app/src/main/java/com/checkin/app/checkin/Utility/ClipRevealFrame.java
index c66e0999..6264e12a 100644
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Utility/ClipRevealFrame.java
+++ b/app/src/main/java/com/checkin/app/checkin/Utility/ClipRevealFrame.java
@@ -1,4 +1,4 @@
-package com.alcatraz.admin.project_alcatraz.Utility;
+package com.checkin.app.checkin.Utility;
 
 import android.content.Context;
 import android.graphics.Canvas;
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Utility/Constants.java b/app/src/main/java/com/checkin/app/checkin/Utility/Constants.java
similarity index 80%
rename from app/src/main/java/com/alcatraz/admin/project_alcatraz/Utility/Constants.java
rename to app/src/main/java/com/checkin/app/checkin/Utility/Constants.java
index 176ac2fa..ea0db02f 100644
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Utility/Constants.java
+++ b/app/src/main/java/com/checkin/app/checkin/Utility/Constants.java
@@ -1,4 +1,7 @@
-package com.alcatraz.admin.project_alcatraz.Utility;
+package com.checkin.app.checkin.Utility;
+
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static java.util.concurrent.TimeUnit.MINUTES;
 
 public class Constants {
     public static final short API_VERSION = 1;
@@ -23,5 +26,7 @@ public class Constants {
     public static final String API_URL_SHOP_PROFILE_URL = "/shops/%(" + SHOP_ID + ")/";
     public static final String API_URL_USER_PROFILE_URL = "/users/%(" + USER_ID + ")/";
 
+    public static final long DEFAULT_ORDER_CANCEL_DURATION = MILLISECONDS.convert(3, MINUTES);
+
     private Constants() {}
 }
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Utility/CustomGlideModule.java b/app/src/main/java/com/checkin/app/checkin/Utility/CustomGlideModule.java
similarity index 76%
rename from app/src/main/java/com/alcatraz/admin/project_alcatraz/Utility/CustomGlideModule.java
rename to app/src/main/java/com/checkin/app/checkin/Utility/CustomGlideModule.java
index a8d153b6..abe18c7e 100644
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Utility/CustomGlideModule.java
+++ b/app/src/main/java/com/checkin/app/checkin/Utility/CustomGlideModule.java
@@ -1,4 +1,4 @@
-package com.alcatraz.admin.project_alcatraz.Utility;
+package com.checkin.app.checkin.Utility;
 
 import com.bumptech.glide.annotation.GlideModule;
 import com.bumptech.glide.module.AppGlideModule;
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Utility/DragTouchListener.java b/app/src/main/java/com/checkin/app/checkin/Utility/DragTouchListener.java
similarity index 98%
rename from app/src/main/java/com/alcatraz/admin/project_alcatraz/Utility/DragTouchListener.java
rename to app/src/main/java/com/checkin/app/checkin/Utility/DragTouchListener.java
index c7b3e716..801ca85d 100644
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Utility/DragTouchListener.java
+++ b/app/src/main/java/com/checkin/app/checkin/Utility/DragTouchListener.java
@@ -1,4 +1,4 @@
-package com.alcatraz.admin.project_alcatraz.Utility;
+package com.checkin.app.checkin.Utility;
 
 import android.util.Log;
 import android.view.MotionEvent;
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Utility/DynamicSwipableViewPager.java b/app/src/main/java/com/checkin/app/checkin/Utility/DynamicSwipableViewPager.java
similarity index 94%
rename from app/src/main/java/com/alcatraz/admin/project_alcatraz/Utility/DynamicSwipableViewPager.java
rename to app/src/main/java/com/checkin/app/checkin/Utility/DynamicSwipableViewPager.java
index 0231e358..45dfbea8 100644
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Utility/DynamicSwipableViewPager.java
+++ b/app/src/main/java/com/checkin/app/checkin/Utility/DynamicSwipableViewPager.java
@@ -1,4 +1,4 @@
-package com.alcatraz.admin.project_alcatraz.Utility;
+package com.checkin.app.checkin.Utility;
 
 import android.content.Context;
 import android.support.v4.view.ViewPager;
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Utility/EndDrawerToggle.java b/app/src/main/java/com/checkin/app/checkin/Utility/EndDrawerToggle.java
similarity index 96%
rename from app/src/main/java/com/alcatraz/admin/project_alcatraz/Utility/EndDrawerToggle.java
rename to app/src/main/java/com/checkin/app/checkin/Utility/EndDrawerToggle.java
index 4ecd6b75..7bc83c77 100644
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Utility/EndDrawerToggle.java
+++ b/app/src/main/java/com/checkin/app/checkin/Utility/EndDrawerToggle.java
@@ -1,4 +1,4 @@
-package com.alcatraz.admin.project_alcatraz.Utility;
+package com.checkin.app.checkin.Utility;
 
 /**
  * Created by TAIYAB on 05-02-2018.
@@ -15,7 +15,7 @@
 import android.view.View;
 import android.view.View.OnClickListener;
 
-import com.alcatraz.admin.project_alcatraz.R;
+import com.checkin.app.checkin.R;
 
 
 public class EndDrawerToggle implements DrawerLayout.DrawerListener {
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Utility/HeaderFooterRecyclerViewAdapter.java b/app/src/main/java/com/checkin/app/checkin/Utility/HeaderFooterRecyclerViewAdapter.java
similarity index 97%
rename from app/src/main/java/com/alcatraz/admin/project_alcatraz/Utility/HeaderFooterRecyclerViewAdapter.java
rename to app/src/main/java/com/checkin/app/checkin/Utility/HeaderFooterRecyclerViewAdapter.java
index 96ac28a1..9c94e986 100644
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Utility/HeaderFooterRecyclerViewAdapter.java
+++ b/app/src/main/java/com/checkin/app/checkin/Utility/HeaderFooterRecyclerViewAdapter.java
@@ -1,4 +1,4 @@
-package com.alcatraz.admin.project_alcatraz.Utility;
+package com.checkin.app.checkin.Utility;
 /*
  * Copyright (C) 2014 sebnapi
  *
@@ -23,7 +23,7 @@
  * Created by sebnapi on 08.11.14.
  * <p/>
  * If you extend this Adapter you are able to add a Header, a Footer or both
- * by a similar ViewHolder pattern as in RecyclerView.
+ * by a similar ItemViewHolder pattern as in RecyclerView.
  * <p/>
  * If you want to omit changes to your class hierarchy you can try the Plug-and-Play
  * approach HeaderRecyclerViewAdapterV1.
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Utility/ItemClickSupport.java b/app/src/main/java/com/checkin/app/checkin/Utility/ItemClickSupport.java
similarity index 97%
rename from app/src/main/java/com/alcatraz/admin/project_alcatraz/Utility/ItemClickSupport.java
rename to app/src/main/java/com/checkin/app/checkin/Utility/ItemClickSupport.java
index 1fe752bd..bc6c326e 100644
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Utility/ItemClickSupport.java
+++ b/app/src/main/java/com/checkin/app/checkin/Utility/ItemClickSupport.java
@@ -1,9 +1,9 @@
-package com.alcatraz.admin.project_alcatraz.Utility;
+package com.checkin.app.checkin.Utility;
 
 import android.support.v7.widget.RecyclerView;
 import android.view.View;
 
-import com.alcatraz.admin.project_alcatraz.R;
+import com.checkin.app.checkin.R;
 
 public class ItemClickSupport {
     private final RecyclerView mRecyclerView;
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Utility/NamedFormatter.java b/app/src/main/java/com/checkin/app/checkin/Utility/NamedFormatter.java
similarity index 86%
rename from app/src/main/java/com/alcatraz/admin/project_alcatraz/Utility/NamedFormatter.java
rename to app/src/main/java/com/checkin/app/checkin/Utility/NamedFormatter.java
index 776dea5c..55213376 100644
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Utility/NamedFormatter.java
+++ b/app/src/main/java/com/checkin/app/checkin/Utility/NamedFormatter.java
@@ -1,10 +1,10 @@
-package com.alcatraz.admin.project_alcatraz.Utility;
+package com.checkin.app.checkin.Utility;
 
 import java.util.Map;
 import java.util.regex.MatchResult;
 import java.util.regex.Pattern;
 
-import static com.alcatraz.admin.project_alcatraz.Utility.Util.replaceAll;
+import static com.checkin.app.checkin.Utility.Util.replaceAll;
 
 public class NamedFormatter {
     private static final Pattern RE = Pattern.compile(
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Utility/NoConnectivityException.java b/app/src/main/java/com/checkin/app/checkin/Utility/NoConnectivityException.java
similarity index 81%
rename from app/src/main/java/com/alcatraz/admin/project_alcatraz/Utility/NoConnectivityException.java
rename to app/src/main/java/com/checkin/app/checkin/Utility/NoConnectivityException.java
index eb6d8e0b..9749a143 100644
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Utility/NoConnectivityException.java
+++ b/app/src/main/java/com/checkin/app/checkin/Utility/NoConnectivityException.java
@@ -1,4 +1,4 @@
-package com.alcatraz.admin.project_alcatraz.Utility;
+package com.checkin.app.checkin.Utility;
 
 import java.io.IOException;
 
diff --git a/app/src/main/java/com/checkin/app/checkin/Utility/SelectListItem.java b/app/src/main/java/com/checkin/app/checkin/Utility/SelectListItem.java
new file mode 100644
index 00000000..def3d93a
--- /dev/null
+++ b/app/src/main/java/com/checkin/app/checkin/Utility/SelectListItem.java
@@ -0,0 +1,52 @@
+package com.checkin.app.checkin.Utility;
+
+public class SelectListItem {
+    private String imageUrl;
+    private String title;
+    private String desc;
+    private Object data;
+
+    public SelectListItem(String imageUrl, String title, String  desc, Object data) {
+        this.imageUrl = imageUrl;
+        this.title = title;
+        this.desc = desc;
+        this.data = data;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public void setDesc(String desc) {
+        this.desc = desc;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    @Override
+    public String toString() {
+        return title;
+    }
+
+    public String getImageUrl() {
+        return imageUrl;
+    }
+
+    public void setImageUrl(String imageUrl) {
+        this.imageUrl = imageUrl;
+    }
+
+    public Object getData() {
+        return data;
+    }
+
+    public void setData(Object data) {
+        this.data = data;
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/checkin/app/checkin/Utility/SelectListViewAdapter.java b/app/src/main/java/com/checkin/app/checkin/Utility/SelectListViewAdapter.java
new file mode 100644
index 00000000..dde1825f
--- /dev/null
+++ b/app/src/main/java/com/checkin/app/checkin/Utility/SelectListViewAdapter.java
@@ -0,0 +1,48 @@
+package com.checkin.app.checkin.Utility;
+
+import android.content.Context;
+import android.support.annotation.NonNull;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.checkin.app.checkin.R;
+
+import java.util.List;
+
+public class SelectListViewAdapter extends ArrayAdapter<SelectListItem> {
+
+    public SelectListViewAdapter(Context context, List<SelectListItem> items) {
+        super(context, R.layout.item_select_layout, items);
+    }
+
+    private static class ViewHolder {
+        ImageView imImage;
+        TextView tvText;
+    }
+
+    @NonNull
+    public View getView(int position, View convertView, @NonNull ViewGroup parent) {
+        ViewHolder holder;
+        SelectListItem item = getItem(position);
+
+        if (convertView == null) {
+            convertView = LayoutInflater.from(getContext()).inflate(R.layout.item_select_layout, parent, false);
+            holder = new ViewHolder();
+            holder.tvText = convertView.findViewById(R.id.tv_text);
+            holder.imImage= convertView.findViewById(R.id.im_image);
+            convertView.setTag(holder);
+        } else
+            holder = (ViewHolder) convertView.getTag();
+
+        if (item != null) {
+            holder.tvText.setText(item.toString());
+            GlideApp.with(getContext()).load(item.getImageUrl()).into(holder.imImage);
+        }
+
+        return convertView;
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Utility/SnapToBlock.java b/app/src/main/java/com/checkin/app/checkin/Utility/SnapToBlock.java
similarity index 97%
rename from app/src/main/java/com/alcatraz/admin/project_alcatraz/Utility/SnapToBlock.java
rename to app/src/main/java/com/checkin/app/checkin/Utility/SnapToBlock.java
index a0edd73c..2c22badc 100644
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Utility/SnapToBlock.java
+++ b/app/src/main/java/com/checkin/app/checkin/Utility/SnapToBlock.java
@@ -1,7 +1,7 @@
-package com.alcatraz.admin.project_alcatraz.Utility;
+package com.checkin.app.checkin.Utility;
 
 
-/*  The number of items in the RecyclerView should be a multiple of block size; otherwise, the
+/*  The number of ic_ordered_items in the RecyclerView should be a multiple of block size; otherwise, the
     extra item views will not be positioned on a block boundary when the end of the data is reached.
     Pad out with empty item views if needed.
 
@@ -28,7 +28,7 @@
 public class SnapToBlock extends SnapHelper {
     private RecyclerView mRecyclerView;
 
-    // Total number of items in a block of view in the RecyclerView
+    // Total number of ic_ordered_items in a block of view in the RecyclerView
     private int mBlockSize;
 
     // Maximum number of positions to move on a fling.
@@ -317,7 +317,7 @@ int[] calculateDistanceToScroll(LinearLayoutManager layoutManager, int targetPos
 
         /*
             Calculate the number of positions to move in the RecyclerView given a scroll amount
-            and the size of the items to be scrolled. Return integral multiple of mBlockSize not
+            and the size of the ic_ordered_items to be scrolled. Return integral multiple of mBlockSize not
             equal to zero.
          */
         int getPositionsToMove(LinearLayoutManager llm, int scroll, int itemSize) {
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Utility/SnapToNViews.java b/app/src/main/java/com/checkin/app/checkin/Utility/SnapToNViews.java
similarity index 97%
rename from app/src/main/java/com/alcatraz/admin/project_alcatraz/Utility/SnapToNViews.java
rename to app/src/main/java/com/checkin/app/checkin/Utility/SnapToNViews.java
index a0ca6e01..55e58786 100644
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Utility/SnapToNViews.java
+++ b/app/src/main/java/com/checkin/app/checkin/Utility/SnapToNViews.java
@@ -1,4 +1,4 @@
-package com.alcatraz.admin.project_alcatraz.Utility;
+package com.checkin.app.checkin.Utility;
 
 import android.support.annotation.NonNull;
 import android.support.v7.widget.LinearLayoutManager;
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Utility/StartSnapHelper.java b/app/src/main/java/com/checkin/app/checkin/Utility/StartSnapHelper.java
similarity index 98%
rename from app/src/main/java/com/alcatraz/admin/project_alcatraz/Utility/StartSnapHelper.java
rename to app/src/main/java/com/checkin/app/checkin/Utility/StartSnapHelper.java
index 94a4a5eb..254f8567 100644
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Utility/StartSnapHelper.java
+++ b/app/src/main/java/com/checkin/app/checkin/Utility/StartSnapHelper.java
@@ -1,4 +1,4 @@
-package com.alcatraz.admin.project_alcatraz.Utility;
+package com.checkin.app.checkin.Utility;
 
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Utility/SwipeRevealLayout.java b/app/src/main/java/com/checkin/app/checkin/Utility/SwipeRevealLayout.java
similarity index 99%
rename from app/src/main/java/com/alcatraz/admin/project_alcatraz/Utility/SwipeRevealLayout.java
rename to app/src/main/java/com/checkin/app/checkin/Utility/SwipeRevealLayout.java
index e44dafc0..3e58c3c1 100644
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Utility/SwipeRevealLayout.java
+++ b/app/src/main/java/com/checkin/app/checkin/Utility/SwipeRevealLayout.java
@@ -1,4 +1,4 @@
-package com.alcatraz.admin.project_alcatraz.Utility;
+package com.checkin.app.checkin.Utility;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
@@ -18,7 +18,7 @@
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.alcatraz.admin.project_alcatraz.R;
+import com.checkin.app.checkin.R;
 
 /**
  * Created by Mark O'Sullivan on 25th February 2018.
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Utility/SwipeTouchListener.java b/app/src/main/java/com/checkin/app/checkin/Utility/SwipeTouchListener.java
similarity index 97%
rename from app/src/main/java/com/alcatraz/admin/project_alcatraz/Utility/SwipeTouchListener.java
rename to app/src/main/java/com/checkin/app/checkin/Utility/SwipeTouchListener.java
index 81dfcfc8..9a93e4c7 100644
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Utility/SwipeTouchListener.java
+++ b/app/src/main/java/com/checkin/app/checkin/Utility/SwipeTouchListener.java
@@ -1,4 +1,4 @@
-package com.alcatraz.admin.project_alcatraz.Utility;
+package com.checkin.app.checkin.Utility;
 
 import android.content.Context;
 import android.support.v4.view.GestureDetectorCompat;
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Utility/TextBaseAdapter.java b/app/src/main/java/com/checkin/app/checkin/Utility/TextBaseAdapter.java
similarity index 96%
rename from app/src/main/java/com/alcatraz/admin/project_alcatraz/Utility/TextBaseAdapter.java
rename to app/src/main/java/com/checkin/app/checkin/Utility/TextBaseAdapter.java
index 444eff8b..4b8baef8 100644
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Utility/TextBaseAdapter.java
+++ b/app/src/main/java/com/checkin/app/checkin/Utility/TextBaseAdapter.java
@@ -1,4 +1,4 @@
-package com.alcatraz.admin.project_alcatraz.Utility;
+package com.checkin.app.checkin.Utility;
 
 import android.support.annotation.NonNull;
 import android.support.v4.graphics.ColorUtils;
@@ -8,7 +8,7 @@
 import android.view.ViewGroup;
 import android.widget.TextView;
 
-import com.alcatraz.admin.project_alcatraz.R;
+import com.checkin.app.checkin.R;
 import com.yarolegovich.discretescrollview.DiscreteScrollView;
 import com.yarolegovich.discretescrollview.transform.ScaleTransformer;
 
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Utility/Util.java b/app/src/main/java/com/checkin/app/checkin/Utility/Util.java
similarity index 97%
rename from app/src/main/java/com/alcatraz/admin/project_alcatraz/Utility/Util.java
rename to app/src/main/java/com/checkin/app/checkin/Utility/Util.java
index e02bb038..6b212f5b 100644
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Utility/Util.java
+++ b/app/src/main/java/com/checkin/app/checkin/Utility/Util.java
@@ -1,4 +1,4 @@
-package com.alcatraz.admin.project_alcatraz.Utility;
+package com.checkin.app.checkin.Utility;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -7,6 +7,7 @@
 import android.animation.ObjectAnimator;
 import android.animation.ValueAnimator;
 import android.content.res.ColorStateList;
+import android.content.res.Resources;
 import android.graphics.Typeface;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
@@ -42,6 +43,14 @@ public class Util {
     public static final int NO_CHANGE = -1;
     public static final long DEFAULT_DURATION = 300L;
 
+    public static int dpToPx(int dp) {
+        return (int) (dp * Resources.getSystem().getDisplayMetrics().density);
+    }
+
+    public static int pxToDp(int px) {
+        return (int) (px / Resources.getSystem().getDisplayMetrics().density);
+    }
+
     public static void setTabsFont(TabLayout tabLayout, Typeface tf) {
         ViewGroup vg = (ViewGroup) tabLayout.getChildAt(0);
         int tabsCount = vg.getChildCount();
diff --git a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Utility/WalletFilterAdapter.java b/app/src/main/java/com/checkin/app/checkin/Utility/WalletFilterAdapter.java
similarity index 82%
rename from app/src/main/java/com/alcatraz/admin/project_alcatraz/Utility/WalletFilterAdapter.java
rename to app/src/main/java/com/checkin/app/checkin/Utility/WalletFilterAdapter.java
index ef9ac38d..4423dbbf 100644
--- a/app/src/main/java/com/alcatraz/admin/project_alcatraz/Utility/WalletFilterAdapter.java
+++ b/app/src/main/java/com/checkin/app/checkin/Utility/WalletFilterAdapter.java
@@ -1,4 +1,4 @@
-package com.alcatraz.admin.project_alcatraz.Utility;
+package com.checkin.app.checkin.Utility;
 
 import android.support.annotation.NonNull;
 import android.support.v7.widget.RecyclerView;
@@ -8,7 +8,7 @@
 import android.widget.ListView;
 import android.widget.TextView;
 
-import com.alcatraz.admin.project_alcatraz.R;
+import com.checkin.app.checkin.R;
 
 import java.util.List;
 
@@ -35,19 +35,19 @@ public MyView(View view) {
      * Called when RecyclerView needs a new {@link ViewHolder} of the given type to represent
      * an item.
      * <p>
-     * This new ViewHolder should be constructed with a new View that can represent the items
+     * This new ItemViewHolder should be constructed with a new View that can represent the ic_ordered_items
      * of the given type. You can either create a new View manually or inflate it from an XML
      * layout file.
      * <p>
-     * The new ViewHolder will be used to display items of the adapter using
+     * The new ItemViewHolder will be used to display ic_ordered_items of the adapter using
      * {@link #onBindViewHolder(ViewHolder, int, List)}. Since it will be re-used to display
-     * different items in the data set, it is a good idea to cache references to sub views of
+     * different ic_ordered_items in the data set, it is a good idea to cache references to sub views of
      * the View to avoid unnecessary {@link View#findViewById(int)} calls.
      *
      * @param parent   The ViewGroup into which the new View will be added after it is bound to
      *                 an adapter position.
      * @param viewType The view type of the new View.
-     * @return A new ViewHolder that holds a View of the given view type.
+     * @return A new ItemViewHolder that holds a View of the given view type.
      * @see #getItemViewType(int)
      * @see #onBindViewHolder(ViewHolder, int)
      */
@@ -73,7 +73,7 @@ public MyView onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
      * Override {@link #onBindViewHolder(ViewHolder, int, List)} instead if Adapter can
      * handle efficient partial bind.
      *
-     * @param holder   The ViewHolder which should be updated to represent the contents of the
+     * @param holder   The ItemViewHolder which should be updated to represent the contents of the
      *                 item at the given position in the data set.
      * @param position The position of the item within the adapter's data set.
      */
@@ -89,9 +89,9 @@ public void onBindViewHolder(@NonNull MyView holder, int position) {
     }
 
     /**
-     * Returns the total number of items in the data set held by the adapter.
+     * Returns the total number of ic_ordered_items in the data set held by the adapter.
      *
-     * @return The total number of items in this adapter.
+     * @return The total number of ic_ordered_items in this adapter.
      */
     @Override
     public int getItemCount() {
diff --git a/app/src/main/res/drawable-hdpi/oval_3.png b/app/src/main/res/drawable-hdpi/background_session_orders.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/oval_3.png
rename to app/src/main/res/drawable-hdpi/background_session_orders.png
diff --git a/app/src/main/res/drawable-hdpi/call_waiter.jpg b/app/src/main/res/drawable-hdpi/btn_call_waiter.jpg
similarity index 100%
rename from app/src/main/res/drawable-hdpi/call_waiter.jpg
rename to app/src/main/res/drawable-hdpi/btn_call_waiter.jpg
diff --git a/app/src/main/res/drawable-hdpi/logout.png b/app/src/main/res/drawable-hdpi/btn_checkout.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/logout.png
rename to app/src/main/res/drawable-hdpi/btn_checkout.png
diff --git a/app/src/main/res/drawable-hdpi/menu.jpg b/app/src/main/res/drawable-hdpi/btn_menu.jpg
similarity index 100%
rename from app/src/main/res/drawable-hdpi/menu.jpg
rename to app/src/main/res/drawable-hdpi/btn_menu.jpg
diff --git a/app/src/main/res/drawable-hdpi/refill_glass.jpg b/app/src/main/res/drawable-hdpi/btn_refill_glass.jpg
similarity index 100%
rename from app/src/main/res/drawable-hdpi/refill_glass.jpg
rename to app/src/main/res/drawable-hdpi/btn_refill_glass.jpg
diff --git a/app/src/main/res/drawable-hdpi/noun_add_1876902.png b/app/src/main/res/drawable-hdpi/ic_member_add.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/noun_add_1876902.png
rename to app/src/main/res/drawable-hdpi/ic_member_add.png
diff --git a/app/src/main/res/drawable-hdpi/items.jpg b/app/src/main/res/drawable-hdpi/ic_ordered_items.jpg
similarity index 100%
rename from app/src/main/res/drawable-hdpi/items.jpg
rename to app/src/main/res/drawable-hdpi/ic_ordered_items.jpg
diff --git a/app/src/main/res/drawable-hdpi/noun_table_557866.jpg b/app/src/main/res/drawable-hdpi/ic_table_cleaning.jpg
similarity index 100%
rename from app/src/main/res/drawable-hdpi/noun_table_557866.jpg
rename to app/src/main/res/drawable-hdpi/ic_table_cleaning.jpg
diff --git a/app/src/main/res/drawable-hdpi/sign_in_button.png b/app/src/main/res/drawable-hdpi/sign_in_button.png
deleted file mode 100644
index f5a62220..00000000
Binary files a/app/src/main/res/drawable-hdpi/sign_in_button.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/sign_in_button1.png b/app/src/main/res/drawable-hdpi/sign_in_button1.png
deleted file mode 100644
index 7736954f..00000000
Binary files a/app/src/main/res/drawable-hdpi/sign_in_button1.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/what_would_you_have.png b/app/src/main/res/drawable-hdpi/what_would_you_have.png
deleted file mode 100644
index f79d2b95..00000000
Binary files a/app/src/main/res/drawable-hdpi/what_would_you_have.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/oval_3.png b/app/src/main/res/drawable-mdpi/background_session_orders.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/oval_3.png
rename to app/src/main/res/drawable-mdpi/background_session_orders.png
diff --git a/app/src/main/res/drawable-mdpi/call_waiter.jpg b/app/src/main/res/drawable-mdpi/btn_call_waiter.jpg
similarity index 100%
rename from app/src/main/res/drawable-mdpi/call_waiter.jpg
rename to app/src/main/res/drawable-mdpi/btn_call_waiter.jpg
diff --git a/app/src/main/res/drawable-mdpi/logout.png b/app/src/main/res/drawable-mdpi/btn_checkout.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/logout.png
rename to app/src/main/res/drawable-mdpi/btn_checkout.png
diff --git a/app/src/main/res/drawable-mdpi/menu.jpg b/app/src/main/res/drawable-mdpi/btn_menu.jpg
similarity index 100%
rename from app/src/main/res/drawable-mdpi/menu.jpg
rename to app/src/main/res/drawable-mdpi/btn_menu.jpg
diff --git a/app/src/main/res/drawable-mdpi/refill_glass.jpg b/app/src/main/res/drawable-mdpi/btn_refill_glass.jpg
similarity index 100%
rename from app/src/main/res/drawable-mdpi/refill_glass.jpg
rename to app/src/main/res/drawable-mdpi/btn_refill_glass.jpg
diff --git a/app/src/main/res/drawable-mdpi/noun_add_1876902.png b/app/src/main/res/drawable-mdpi/ic_member_add.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/noun_add_1876902.png
rename to app/src/main/res/drawable-mdpi/ic_member_add.png
diff --git a/app/src/main/res/drawable-mdpi/items.jpg b/app/src/main/res/drawable-mdpi/ic_ordered_items.jpg
similarity index 100%
rename from app/src/main/res/drawable-mdpi/items.jpg
rename to app/src/main/res/drawable-mdpi/ic_ordered_items.jpg
diff --git a/app/src/main/res/drawable-mdpi/noun_table_557866.jpg b/app/src/main/res/drawable-mdpi/ic_table_cleaning.jpg
similarity index 100%
rename from app/src/main/res/drawable-mdpi/noun_table_557866.jpg
rename to app/src/main/res/drawable-mdpi/ic_table_cleaning.jpg
diff --git a/app/src/main/res/drawable-mdpi/sign_in_button.png b/app/src/main/res/drawable-mdpi/sign_in_button.png
deleted file mode 100644
index 107148ee..00000000
Binary files a/app/src/main/res/drawable-mdpi/sign_in_button.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/sign_in_button1.png b/app/src/main/res/drawable-mdpi/sign_in_button1.png
deleted file mode 100644
index 28717047..00000000
Binary files a/app/src/main/res/drawable-mdpi/sign_in_button1.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/what_would_you_have.png b/app/src/main/res/drawable-mdpi/what_would_you_have.png
deleted file mode 100644
index 8aeb6743..00000000
Binary files a/app/src/main/res/drawable-mdpi/what_would_you_have.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/oval_3.png b/app/src/main/res/drawable-xhdpi/background_session_orders.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/oval_3.png
rename to app/src/main/res/drawable-xhdpi/background_session_orders.png
diff --git a/app/src/main/res/drawable-xhdpi/bkgrnd.png b/app/src/main/res/drawable-xhdpi/bkgrnd.png
deleted file mode 100644
index d6c49120..00000000
Binary files a/app/src/main/res/drawable-xhdpi/bkgrnd.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/call_waiter.jpg b/app/src/main/res/drawable-xhdpi/btn_call_waiter.jpg
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/call_waiter.jpg
rename to app/src/main/res/drawable-xhdpi/btn_call_waiter.jpg
diff --git a/app/src/main/res/drawable-xhdpi/logout.png b/app/src/main/res/drawable-xhdpi/btn_checkout.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/logout.png
rename to app/src/main/res/drawable-xhdpi/btn_checkout.png
diff --git a/app/src/main/res/drawable-xhdpi/menu.jpg b/app/src/main/res/drawable-xhdpi/btn_menu.jpg
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/menu.jpg
rename to app/src/main/res/drawable-xhdpi/btn_menu.jpg
diff --git a/app/src/main/res/drawable-xhdpi/refill_glass.jpg b/app/src/main/res/drawable-xhdpi/btn_refill_glass.jpg
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/refill_glass.jpg
rename to app/src/main/res/drawable-xhdpi/btn_refill_glass.jpg
diff --git a/app/src/main/res/drawable-xhdpi/noun_add_1876902.png b/app/src/main/res/drawable-xhdpi/ic_member_add.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/noun_add_1876902.png
rename to app/src/main/res/drawable-xhdpi/ic_member_add.png
diff --git a/app/src/main/res/drawable-xhdpi/items.jpg b/app/src/main/res/drawable-xhdpi/ic_ordered_items.jpg
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/items.jpg
rename to app/src/main/res/drawable-xhdpi/ic_ordered_items.jpg
diff --git a/app/src/main/res/drawable-xhdpi/noun_table_557866.jpg b/app/src/main/res/drawable-xhdpi/ic_table_cleaning.jpg
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/noun_table_557866.jpg
rename to app/src/main/res/drawable-xhdpi/ic_table_cleaning.jpg
diff --git a/app/src/main/res/drawable-xhdpi/menu1.png b/app/src/main/res/drawable-xhdpi/menu1.png
deleted file mode 100644
index 6b233f86..00000000
Binary files a/app/src/main/res/drawable-xhdpi/menu1.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/sign_in_button.png b/app/src/main/res/drawable-xhdpi/sign_in_button.png
deleted file mode 100644
index 52050441..00000000
Binary files a/app/src/main/res/drawable-xhdpi/sign_in_button.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/sign_in_button1.png b/app/src/main/res/drawable-xhdpi/sign_in_button1.png
deleted file mode 100644
index 5b027aef..00000000
Binary files a/app/src/main/res/drawable-xhdpi/sign_in_button1.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/what_would_you_have.png b/app/src/main/res/drawable-xhdpi/what_would_you_have.png
deleted file mode 100644
index c1181f46..00000000
Binary files a/app/src/main/res/drawable-xhdpi/what_would_you_have.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/oval_3.png b/app/src/main/res/drawable-xxhdpi/background_session_orders.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/oval_3.png
rename to app/src/main/res/drawable-xxhdpi/background_session_orders.png
diff --git a/app/src/main/res/drawable-xxhdpi/bkgrnd.png b/app/src/main/res/drawable-xxhdpi/bkgrnd.png
deleted file mode 100644
index cc04cf2f..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/bkgrnd.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/call_waiter.jpg b/app/src/main/res/drawable-xxhdpi/btn_call_waiter.jpg
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/call_waiter.jpg
rename to app/src/main/res/drawable-xxhdpi/btn_call_waiter.jpg
diff --git a/app/src/main/res/drawable-xxhdpi/logout.png b/app/src/main/res/drawable-xxhdpi/btn_checkout.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/logout.png
rename to app/src/main/res/drawable-xxhdpi/btn_checkout.png
diff --git a/app/src/main/res/drawable-xxhdpi/menu.jpg b/app/src/main/res/drawable-xxhdpi/btn_menu.jpg
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/menu.jpg
rename to app/src/main/res/drawable-xxhdpi/btn_menu.jpg
diff --git a/app/src/main/res/drawable-xxhdpi/refill_glass.jpg b/app/src/main/res/drawable-xxhdpi/btn_refill_glass.jpg
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/refill_glass.jpg
rename to app/src/main/res/drawable-xxhdpi/btn_refill_glass.jpg
diff --git a/app/src/main/res/drawable-xxhdpi/noun_add_1876902.png b/app/src/main/res/drawable-xxhdpi/ic_member_add.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/noun_add_1876902.png
rename to app/src/main/res/drawable-xxhdpi/ic_member_add.png
diff --git a/app/src/main/res/drawable-xxhdpi/items.jpg b/app/src/main/res/drawable-xxhdpi/ic_ordered_items.jpg
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/items.jpg
rename to app/src/main/res/drawable-xxhdpi/ic_ordered_items.jpg
diff --git a/app/src/main/res/drawable-xxhdpi/noun_table_557866.jpg b/app/src/main/res/drawable-xxhdpi/ic_table_cleaning.jpg
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/noun_table_557866.jpg
rename to app/src/main/res/drawable-xxhdpi/ic_table_cleaning.jpg
diff --git a/app/src/main/res/drawable-xxhdpi/sign_in_button.png b/app/src/main/res/drawable-xxhdpi/sign_in_button.png
deleted file mode 100644
index 76e37f30..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/sign_in_button.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/sign_in_button1.png b/app/src/main/res/drawable-xxhdpi/sign_in_button1.png
deleted file mode 100644
index 86a19308..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/sign_in_button1.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/what_would_you_have.png b/app/src/main/res/drawable-xxhdpi/what_would_you_have.png
deleted file mode 100644
index 7eca3a37..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/what_would_you_have.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/oval_3.png b/app/src/main/res/drawable-xxxhdpi/background_session_orders.png
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/oval_3.png
rename to app/src/main/res/drawable-xxxhdpi/background_session_orders.png
diff --git a/app/src/main/res/drawable-xxxhdpi/call_waiter.jpg b/app/src/main/res/drawable-xxxhdpi/btn_call_waiter.jpg
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/call_waiter.jpg
rename to app/src/main/res/drawable-xxxhdpi/btn_call_waiter.jpg
diff --git a/app/src/main/res/drawable-xxxhdpi/logout.png b/app/src/main/res/drawable-xxxhdpi/btn_checkout.png
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/logout.png
rename to app/src/main/res/drawable-xxxhdpi/btn_checkout.png
diff --git a/app/src/main/res/drawable-xxxhdpi/menu.jpg b/app/src/main/res/drawable-xxxhdpi/btn_menu.jpg
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/menu.jpg
rename to app/src/main/res/drawable-xxxhdpi/btn_menu.jpg
diff --git a/app/src/main/res/drawable-xxxhdpi/refill_glass.jpg b/app/src/main/res/drawable-xxxhdpi/btn_refill_glass.jpg
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/refill_glass.jpg
rename to app/src/main/res/drawable-xxxhdpi/btn_refill_glass.jpg
diff --git a/app/src/main/res/drawable-xxxhdpi/noun_add_1876902.png b/app/src/main/res/drawable-xxxhdpi/ic_member_add.png
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/noun_add_1876902.png
rename to app/src/main/res/drawable-xxxhdpi/ic_member_add.png
diff --git a/app/src/main/res/drawable-xxxhdpi/items.jpg b/app/src/main/res/drawable-xxxhdpi/ic_ordered_items.jpg
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/items.jpg
rename to app/src/main/res/drawable-xxxhdpi/ic_ordered_items.jpg
diff --git a/app/src/main/res/drawable-xxxhdpi/noun_table_557866.jpg b/app/src/main/res/drawable-xxxhdpi/ic_table_cleaning.jpg
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/noun_table_557866.jpg
rename to app/src/main/res/drawable-xxxhdpi/ic_table_cleaning.jpg
diff --git a/app/src/main/res/drawable-xxxhdpi/sign_in_button.png b/app/src/main/res/drawable-xxxhdpi/sign_in_button.png
deleted file mode 100644
index ea4846d5..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/sign_in_button.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/sign_in_button1.png b/app/src/main/res/drawable-xxxhdpi/sign_in_button1.png
deleted file mode 100644
index 3a1fe29c..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/sign_in_button1.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/what_would_you_have.png b/app/src/main/res/drawable-xxxhdpi/what_would_you_have.png
deleted file mode 100644
index 41cbdaba..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/what_would_you_have.png and /dev/null differ
diff --git a/app/src/main/res/drawable/addred.png b/app/src/main/res/drawable/addred.png
deleted file mode 100644
index e4213493..00000000
Binary files a/app/src/main/res/drawable/addred.png and /dev/null differ
diff --git a/app/src/main/res/drawable/background_card_white_inner_shadow.xml b/app/src/main/res/drawable/background_card_white_inner_shadow.xml
new file mode 100644
index 00000000..ff1c1e9c
--- /dev/null
+++ b/app/src/main/res/drawable/background_card_white_inner_shadow.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="@color/white" />
+        </shape>
+    </item>
+    <item
+        android:gravity="top"
+        android:drawable="@drawable/gradient_top_strip" />
+    <item
+        android:gravity="bottom"
+        android:drawable="@drawable/gradient_bottom_strip" />
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/login_textbox.xml b/app/src/main/res/drawable/background_textbox.xml
similarity index 100%
rename from app/src/main/res/drawable/login_textbox.xml
rename to app/src/main/res/drawable/background_textbox.xml
diff --git a/app/src/main/res/drawable/gradient_bottom_strip.xml b/app/src/main/res/drawable/gradient_bottom_strip.xml
new file mode 100644
index 00000000..9d616002
--- /dev/null
+++ b/app/src/main/res/drawable/gradient_bottom_strip.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <gradient android:startColor="@color/shadow_gradient" android:angle="90" />
+    <size android:height="@dimen/spacing_small" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/gradient_top_strip.xml b/app/src/main/res/drawable/gradient_top_strip.xml
new file mode 100644
index 00000000..d2270abf
--- /dev/null
+++ b/app/src/main/res/drawable/gradient_top_strip.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <gradient android:startColor="@color/shadow_gradient" android:angle="-90" />
+    <size android:height="@dimen/spacing_small" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_close.xml b/app/src/main/res/drawable/ic_close.xml
new file mode 100644
index 00000000..2ca1e408
--- /dev/null
+++ b/app/src/main/res/drawable/ic_close.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="100.0"
+    android:viewportHeight="100.0">
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M57.624,50.993l26.688-26.69c1.967-1.97,1.967-5.16,0-7.13c-1.973-1.97-5.165-1.97-7.132,0L50.492,43.861L23.804,17.173  c-1.972-1.97-5.159-1.97-7.132,0c-1.967,1.97-1.967,5.16,0,7.13l26.688,26.69L16.672,77.682c-1.967,1.967-1.967,5.159,0,7.132  c0.989,0.983,2.277,1.476,3.566,1.476c1.293,0,2.582-0.492,3.565-1.476l26.688-26.688l26.688,26.688  c0.983,0.983,2.277,1.476,3.565,1.476c1.289,0,2.577-0.492,3.566-1.476c1.967-1.973,1.967-5.165,0-7.132L57.624,50.993z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/innershadow.png b/app/src/main/res/drawable/innershadow.png
deleted file mode 100644
index 165200ff..00000000
Binary files a/app/src/main/res/drawable/innershadow.png and /dev/null differ
diff --git a/app/src/main/res/drawable/innershadow1.jpg b/app/src/main/res/drawable/innershadow1.jpg
deleted file mode 100644
index 06c78f9c..00000000
Binary files a/app/src/main/res/drawable/innershadow1.jpg and /dev/null differ
diff --git a/app/src/main/res/drawable/inshadow.png b/app/src/main/res/drawable/inshadow.png
deleted file mode 100644
index 5f4cbf6c..00000000
Binary files a/app/src/main/res/drawable/inshadow.png and /dev/null differ
diff --git a/app/src/main/res/drawable/ninepatch.xml b/app/src/main/res/drawable/ninepatch.xml
deleted file mode 100644
index 0c44f7ae..00000000
--- a/app/src/main/res/drawable/ninepatch.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<nine-patch
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@color/white"
-
-    android:dither="true" />
\ No newline at end of file
diff --git a/app/src/main/res/drawable/oval.png b/app/src/main/res/drawable/oval.png
deleted file mode 100644
index da8f2561..00000000
Binary files a/app/src/main/res/drawable/oval.png and /dev/null differ
diff --git a/app/src/main/res/drawable/rupee.png b/app/src/main/res/drawable/rupee.png
deleted file mode 100644
index 6397f562..00000000
Binary files a/app/src/main/res/drawable/rupee.png and /dev/null differ
diff --git a/app/src/main/res/drawable/some.xml b/app/src/main/res/drawable/some.xml
deleted file mode 100644
index 1f42a443..00000000
--- a/app/src/main/res/drawable/some.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/colorAccent"/>
-    <corners android:radius="10dp"/>
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/tab_selector.xml b/app/src/main/res/drawable/tab_selector.xml
index a60453ba..58c88f9d 100644
--- a/app/src/main/res/drawable/tab_selector.xml
+++ b/app/src/main/res/drawable/tab_selector.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:drawable="@drawable/tab_selected" android:state_selected="true"/>
-    <item android:drawable="@color/white_transparency"/>
+    <item android:drawable="@color/transparent"/>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_active_session.xml b/app/src/main/res/layout/activity_active_session.xml
index 926aafe0..45e64b5b 100644
--- a/app/src/main/res/layout/activity_active_session.xml
+++ b/app/src/main/res/layout/activity_active_session.xml
@@ -1,68 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/fullactivesession"
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:background="@color/white"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/root_view"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     android:animateLayoutChanges="true"
-    xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <TextView
-        android:id="@+id/timer"
-        android:visibility="gone"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:text="Time left-: 10 mins"
-
-        android:textSize="18sp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/button3"
-        />
-    <LinearLayout
-        android:focusable="true"
-        android:focusableInTouchMode="true"
-        android:layout_width="0dp"
-        android:layout_height="0dp"/>
-    <EditText
-        android:inputType="text"
-        android:maxEms="28"
-        android:lines="1"
-        android:maxLines="1"
-        android:layout_marginStart="16dp"
-        android:layout_marginEnd="16dp"
-        android:layout_marginTop="16dp"
-        android:id="@+id/tv1"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layout_constraintTop_toBottomOf="@id/timer"
-        android:background="@drawable/what_would_you_have"
-        android:paddingTop="4dp"
-        android:paddingBottom="6dp"
-
-        android:hint="How may we assist you?"
-        android:textSize="18sp"
-        android:gravity="center_horizontal|bottom"
-        android:textColorHint="#bebebe"
-        />
+    android:background="@color/white"
+    android:focusableInTouchMode="true"
+    android:focusable="true">
 
-    <android.support.v7.widget.RecyclerView
-        android:id="@+id/food_with"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:maxHeight="200dp"
-        android:minHeight="100dp"
-        android:layout_marginBottom="16dp"
-        android:paddingRight="4dp"
-        android:paddingLeft="4dp"
-        android:background="@drawable/inshadow"
-        app:layout_constraintBottom_toTopOf="@id/refill"
-        app:layout_constraintTop_toBottomOf="@id/clear"
-        app:layout_constraintLeft_toLeftOf="parent" />
     <android.support.design.widget.AppBarLayout
-        android:id="@+id/appBarLayout"
+        android:id="@+id/appbar_active_session"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:theme="@style/appbar_main"
@@ -70,12 +19,10 @@
         app:layout_constraintTop_toTopOf="parent">
 
         <android.support.v7.widget.Toolbar
-            android:id="@+id/toolbar_home"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="top"
             android:background="@color/colorPrimaryRed"
-            app:layout_scrollFlags="scroll|enterAlways"
             app:popupTheme="@style/PopupOverlay">
 
             <TextView
@@ -88,147 +35,130 @@
                 android:textAlignment="center"
                 android:textColor="@color/white"
                 android:textSize="@dimen/font_largest" />
-
         </android.support.v7.widget.Toolbar>
     </android.support.design.widget.AppBarLayout>
 
+    <FrameLayout
+        android:id="@+id/bill_container"
+        android:layout_width="wrap_content"
+        android:layout_height="40dp"
+        android:layout_marginStart="@dimen/spacing_small"
+        android:layout_marginTop="@dimen/spacing_normal"
+        android:background="@drawable/menu_item_price"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/appbar_active_session">
+
+        <TextView
+            android:id="@+id/tv_bill"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginBottom="@dimen/spacing_tiny"
+            android:layout_marginStart="@dimen/spacing_tiny"
+            android:textColor="@color/colorPrimaryRed"
+            android:textSize="@dimen/font_normal"
+            tools:text="4200" />
+    </FrameLayout>
+
     <ImageButton
+        android:id="@+id/btn_checkout"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="16dp"
-        android:layout_marginTop="16dp"
-        android:src="@drawable/logout"
+        android:layout_marginEnd="@dimen/spacing_small"
+        android:layout_marginTop="@dimen/spacing_small"
         android:background="@color/white"
+        android:src="@drawable/btn_checkout"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/appBarLayout"/>
+        app:layout_constraintTop_toBottomOf="@+id/appbar_active_session" />
 
-    <ImageButton
+    <EditText
+        android:id="@+id/ed_ask_help"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="@dimen/spacing_small"
+        android:layout_marginStart="@dimen/spacing_small"
+        android:layout_marginTop="@dimen/spacing_small"
+        android:background="@drawable/background_textbox"
+        android:gravity="center_horizontal|bottom"
+        android:hint="How may we assist you?"
+        android:inputType="text"
+        android:paddingBottom="6dp"
+        android:paddingTop="4dp"
+        android:textColorHint="@color/pinkish_grey"
+        android:textSize="18sp"
+        app:layout_constraintTop_toBottomOf="@id/btn_checkout" />
 
-        android:id="@+id/button3"
+    <TextView
+        android:id="@+id/btn_table_cleaning"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="16dp"
-        android:background="@drawable/pricer_card"
+        android:layout_marginStart="@dimen/spacing_small"
+        android:layout_marginTop="@dimen/spacing_small"
+        android:drawableTop="@drawable/ic_table_cleaning"
+        android:text="Clean Table"
+        android:textAlignment="center"
+        android:textSize="@dimen/font_normal"
+        app:layout_constraintEnd_toStartOf="@+id/btn_list_orders"
+        app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/appBarLayout" />
+        app:layout_constraintTop_toBottomOf="@+id/ed_ask_help" />
 
     <TextView
+        android:id="@+id/btn_list_orders"
         android:layout_width="wrap_content"
-        android:layout_height="0dp"
-        android:layout_marginBottom="10dp"
-        android:layout_marginRight="10dp"
-        android:text="4200"
-        android:textAlignment="textEnd"
-        android:textColor="@color/colorPrimaryRed"
-        android:textSize="18sp"
-        app:layout_constraintBottom_toBottomOf="@id/button3"
-        app:layout_constraintRight_toRightOf="@id/button3"
-
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="@dimen/spacing_small"
+        android:layout_marginTop="@dimen/spacing_small"
+        android:drawableTop="@drawable/ic_ordered_items"
+        android:text="Orders"
+        android:textAlignment="center"
+        android:textSize="@dimen/font_normal"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toEndOf="@+id/btn_table_cleaning"
+        app:layout_constraintTop_toBottomOf="@id/ed_ask_help" />
 
-        />
+    <android.support.v7.widget.RecyclerView
+        android:id="@+id/rv_session_members"
+        android:layout_width="match_parent"
+        android:layout_height="150dp"
+        android:layout_marginTop="@dimen/spacing_small"
+        android:background="@drawable/background_card_white_inner_shadow"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/btn_table_cleaning" />
 
     <ImageButton
-        android:id="@+id/imageView7"
+        android:id="@+id/btn_call_waiter"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="8dp"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="16dp"
+        android:layout_marginBottom="@dimen/spacing_small"
+        android:layout_marginStart="@dimen/spacing_small"
         android:background="@color/white"
         android:contentDescription="Call the Waiter"
-        android:scaleType="fitXY"
-        android:src="@drawable/call_waiter"
+        android:src="@drawable/btn_call_waiter"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/food_with"
-        app:layout_constraintVertical_bias="1.0" />
+        app:layout_constraintStart_toStartOf="parent" />
 
     <ImageButton
-        android:id="@+id/refill"
+        android:id="@+id/btn_menu"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="8dp"
-        android:layout_marginEnd="16dp"
+        android:layout_marginBottom="@dimen/spacing_large"
         android:background="@color/white"
-        android:src="@drawable/refill_glass"
+        android:src="@drawable/btn_menu"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent" />
+        app:layout_constraintEnd_toStartOf="@+id/btn_refill_glass"
+        app:layout_constraintStart_toEndOf="@+id/btn_call_waiter" />
 
     <ImageButton
-        android:id="@+id/show_meeenu"
+        android:id="@+id/btn_refill_glass"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="8dp"
-        android:layout_marginTop="8dp"
+        android:layout_marginBottom="@dimen/spacing_small"
+        android:layout_marginEnd="@dimen/spacing_small"
         android:background="@color/white"
-        android:src="@drawable/menu"
-        app:layout_constraintBottom_toBottomOf="@id/refill"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/imageView7" />
-
-
-    <ImageView
-        android:id="@+id/imageView12"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="8dp"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="8dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.24"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/tv1"
-        android:src="@drawable/noun_table_557866" />
-    <TextView
-        android:id="@+id/clear"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:text="Table Cleaning"
-        android:textSize="12sp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.24"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/imageView12"
-        />
-    <ImageView
-        android:id="@+id/imageView13"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="8dp"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="8dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.76"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/tv1"
-        android:src="@drawable/items" />
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:text="Orders"
-        android:textSize="12sp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.76"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/imageView12"
-        />
-
-    <!--<TextView
-            android:layout_width="0dp"
-            android:layout_height="80dp"
-            app:layout_constraintEnd_toEndOf="@id/show_meeenu"
-            app:layout_constraintStart_toStartOf="@id/show_meeenu"
-            app:layout_constraintTop_toTopOf="@id/imageView7"
-
-            android:background="@drawable/bkgrnd"
-            android:text="Clean the\n Table"
-            android:textAllCaps="false"
-            android:textColor="@color/brownish_grey"
-            android:textSize="14sp" />-->
-
+        android:src="@drawable/btn_refill_glass"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent" />
 
 </android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml
index 3c10ec61..39cfa5d9 100644
--- a/app/src/main/res/layout/activity_home.xml
+++ b/app/src/main/res/layout/activity_home.xml
@@ -220,7 +220,7 @@
 
         </LinearLayout>
 
-        <com.alcatraz.admin.project_alcatraz.Utility.ClipRevealFrame
+        <com.checkin.app.checkin.Utility.ClipRevealFrame
             android:id="@+id/dark_back_reveal"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -269,7 +269,7 @@
 
             </FrameLayout>
 
-        </com.alcatraz.admin.project_alcatraz.Utility.ClipRevealFrame>
+        </com.checkin.app.checkin.Utility.ClipRevealFrame>
 
         <ImageView
             android:id="@+id/fab_home_add"
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index c7dcf2f2..a87ca716 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -21,7 +21,7 @@
         android:id="@+id/login_username"
         android:layout_weight=".09"
         android:layout_gravity="center_horizontal"
-        android:background="@drawable/login_textbox"
+        android:background="@drawable/background_textbox"
         android:gravity="center"
         android:hint="Username"
         android:inputType="text"/>
@@ -36,7 +36,7 @@
         android:layout_height="0dp"
         android:layout_weight=".09"
         android:layout_gravity="center_horizontal"
-        android:background="@drawable/login_textbox"
+        android:background="@drawable/background_textbox"
         android:id="@+id/login_password"
         android:gravity="center"
         android:hint="Password"
diff --git a/app/src/main/res/layout/activity_session_user.xml b/app/src/main/res/layout/activity_session_user.xml
index 4282d507..510ff9a4 100644
--- a/app/src/main/res/layout/activity_session_user.xml
+++ b/app/src/main/res/layout/activity_session_user.xml
@@ -59,12 +59,12 @@
 
             <fragment
                 android:id="@+id/fragment_menu"
-                android:name="com.alcatraz.admin.project_alcatraz.Session.MenuUserFragment"
+                android:name="com.checkin.app.checkin.Session.MenuUserFragment"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent" />
         </LinearLayout>
 
-        <com.alcatraz.admin.project_alcatraz.Utility.ClipRevealFrame
+        <com.checkin.app.checkin.Utility.ClipRevealFrame
             android:id="@+id/dark_back"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/activity_signup.xml b/app/src/main/res/layout/activity_signup.xml
index 1feea198..d96d6e7d 100644
--- a/app/src/main/res/layout/activity_signup.xml
+++ b/app/src/main/res/layout/activity_signup.xml
@@ -113,7 +113,7 @@
         </android.support.constraint.ConstraintLayout>
     </LinearLayout>
 
-    <com.alcatraz.admin.project_alcatraz.Utility.ClipRevealFrame
+    <com.checkin.app.checkin.Utility.ClipRevealFrame
         android:id="@+id/dark_back"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/dialog_adduser.xml b/app/src/main/res/layout/dialog_adduser.xml
deleted file mode 100644
index c3b36d57..00000000
--- a/app/src/main/res/layout/dialog_adduser.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content">
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="64dp"
-        android:scaleType="center"
-        android:background="@color/colorPrimaryRed"
-        android:text="Add User"
-        android:textSize="18sp"
-        android:gravity="center"
-        android:contentDescription="@string/app_name" />
-    <EditText
-        android:id="@+id/username"
-        android:inputType="textEmailAddress"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        android:layout_marginLeft="4dp"
-        android:layout_marginRight="4dp"
-        android:layout_marginBottom="4dp"
-        android:hint="Enter Name" />
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_addfriend.xml b/app/src/main/res/layout/dialog_session_add_member.xml
similarity index 96%
rename from app/src/main/res/layout/dialog_addfriend.xml
rename to app/src/main/res/layout/dialog_session_add_member.xml
index 705cf352..dc97d585 100644
--- a/app/src/main/res/layout/dialog_addfriend.xml
+++ b/app/src/main/res/layout/dialog_session_add_member.xml
@@ -25,7 +25,7 @@
         >
     <com.hootsuite.nachos.NachoTextView
         android:paddingLeft="8dp"
-        android:background="@drawable/what_would_you_have"
+        android:background="@drawable/background_textbox"
         android:id="@+id/auto"
         android:layout_width="226dp"
         android:layout_height="wrap_content"/>
diff --git a/app/src/main/res/layout/dialog_checkout.xml b/app/src/main/res/layout/dialog_session_checkout.xml
similarity index 100%
rename from app/src/main/res/layout/dialog_checkout.xml
rename to app/src/main/res/layout/dialog_session_checkout.xml
diff --git a/app/src/main/res/layout/fragment_active_session_orders.xml b/app/src/main/res/layout/fragment_active_session_orders.xml
new file mode 100644
index 00000000..91314130
--- /dev/null
+++ b/app/src/main/res/layout/fragment_active_session_orders.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/translucent_black">
+
+    <android.support.constraint.Guideline
+        android:id="@+id/guideline_above"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        app:layout_constraintGuide_percent="0.15"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:background="@drawable/background_session_orders"
+        app:layout_constraintBottom_toTopOf="@id/guideline_below"
+        app:layout_constraintTop_toTopOf="@+id/guideline_above">
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical"
+            android:layout_marginTop="@dimen/spacing_very_huge"
+            android:layout_marginBottom="@dimen/spacing_very_huge">
+            <android.support.v7.widget.RecyclerView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:id="@+id/rv_session_orders"
+                android:layout_gravity="center" />
+        </LinearLayout>
+    </FrameLayout>
+
+    <android.support.constraint.Guideline
+        android:id="@+id/guideline_below"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintGuide_percent="0.85" />
+
+</android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_activesession_order.xml b/app/src/main/res/layout/fragment_activesession_order.xml
deleted file mode 100644
index 565206d5..00000000
--- a/app/src/main/res/layout/fragment_activesession_order.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:background="#80000000"
-    android:tag="Fragment"
-    android:onClick="closefragment"
-    android:elevation="10dp"
-    android:layout_height="match_parent">
-    <View
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias=".2"
-        android:id="@+id/v1"
-        android:layout_width="match_parent"
-        android:layout_height="1dp"/>
-    <View
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias=".8"
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:id="@+id/v2"/>
-    <android.support.constraint.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:alpha="1"
-        android:background="@drawable/oval_3"
-        app:layout_constraintTop_toBottomOf="@id/v1"
-        app:layout_constraintBottom_toTopOf="@id/v2"
-        >
-
-
-        <ListView
-
-            android:id="@+id/list"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"/>
-
-    </android.support.constraint.ConstraintLayout>
-
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_otp_verification.xml b/app/src/main/res/layout/fragment_otp_verification.xml
index 2bd6d7d8..807f7684 100644
--- a/app/src/main/res/layout/fragment_otp_verification.xml
+++ b/app/src/main/res/layout/fragment_otp_verification.xml
@@ -13,7 +13,7 @@
         android:layout_marginEnd="@dimen/spacing_normal"
         android:layout_marginStart="@dimen/spacing_normal"
         android:layout_marginTop="@dimen/spacing_extra_large"
-        android:background="@drawable/login_textbox"
+        android:background="@drawable/background_textbox"
         android:hint="Enter OTP"
         android:textAlignment="center"
         android:paddingRight="@dimen/spacing_normal"
diff --git a/app/src/main/res/layout/fragment_post_scan.xml b/app/src/main/res/layout/fragment_post_scan.xml
index d161bd9c..2d1c657a 100644
--- a/app/src/main/res/layout/fragment_post_scan.xml
+++ b/app/src/main/res/layout/fragment_post_scan.xml
@@ -64,7 +64,7 @@
             android:layout_marginEnd="8dp"
             android:layout_marginStart="8dp"
             android:layout_marginTop="75dp"
-            android:background="@drawable/login_textbox"
+            android:background="@drawable/background_textbox"
             android:textAlignment="center"
             android:paddingRight="@dimen/spacing_large"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/fragment_shop_daily.xml b/app/src/main/res/layout/fragment_shop_daily.xml
index 702effed..e29e4220 100644
--- a/app/src/main/res/layout/fragment_shop_daily.xml
+++ b/app/src/main/res/layout/fragment_shop_daily.xml
@@ -3,7 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:id="@+id/fragment_shopdaily"
-    tools:context="com.alcatraz.admin.project_alcatraz.Profile.ShopProfile.FragmentShopDailyActivity">
+    tools:context="com.checkin.app.checkin.Profile.ShopProfile.FragmentShopDailyActivity">
 
     <!-- TODO: Update blank fragment layout -->
     <TextView
diff --git a/app/src/main/res/layout/fragment_shop_insights.xml b/app/src/main/res/layout/fragment_shop_insights.xml
index 670cf55e..9ae8bbe5 100644
--- a/app/src/main/res/layout/fragment_shop_insights.xml
+++ b/app/src/main/res/layout/fragment_shop_insights.xml
@@ -3,7 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:id="@+id/fragment_shop_insights"
-    tools:context="com.alcatraz.admin.project_alcatraz.Profile.ShopProfile.FragmentShopInsights">
+    tools:context="com.checkin.app.checkin.Profile.ShopProfile.FragmentShopInsights">
 
     <!--&lt;!&ndash; TODO: Update blank fragment layout &ndash;&gt;-->
     <ScrollView
diff --git a/app/src/main/res/layout/fragment_shop_menu.xml b/app/src/main/res/layout/fragment_shop_menu.xml
index 12e775ff..501975ba 100644
--- a/app/src/main/res/layout/fragment_shop_menu.xml
+++ b/app/src/main/res/layout/fragment_shop_menu.xml
@@ -3,7 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:id="@+id/fregment_shopmenu"
-    tools:context="com.alcatraz.admin.project_alcatraz.Profile.ShopProfile.FragmentShopMenu">
+    tools:context="com.checkin.app.checkin.Profile.ShopProfile.FragmentShopMenu">
 
     <!-- TODO: Update blank fragment layout -->
     <TextView
diff --git a/app/src/main/res/layout/fragment_shop_profile.xml b/app/src/main/res/layout/fragment_shop_profile.xml
index a5ae6360..a20a8d25 100644
--- a/app/src/main/res/layout/fragment_shop_profile.xml
+++ b/app/src/main/res/layout/fragment_shop_profile.xml
@@ -3,7 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:id="@+id/fragment_shop_profile"
-    tools:context="com.alcatraz.admin.project_alcatraz.Profile.ShopProfile.FragmentShopProfile">
+    tools:context="com.checkin.app.checkin.Profile.ShopProfile.FragmentShopProfile">
 
     <!-- TODO: Update blank fragment layout -->
     <TextView
diff --git a/app/src/main/res/layout/fragment_signup_phone.xml b/app/src/main/res/layout/fragment_signup_phone.xml
index 7f697104..803b8fa2 100644
--- a/app/src/main/res/layout/fragment_signup_phone.xml
+++ b/app/src/main/res/layout/fragment_signup_phone.xml
@@ -21,7 +21,7 @@
         android:textColor="#aaaaaa"
         android:textAlignment="center"
         android:textSize="@dimen/font_normal"
-        android:background="@drawable/login_textbox"
+        android:background="@drawable/background_textbox"
         android:paddingRight="@dimen/spacing_normal"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/fragment_signup_user_info.xml b/app/src/main/res/layout/fragment_signup_user_info.xml
index aa3548e5..9b0bf7ab 100644
--- a/app/src/main/res/layout/fragment_signup_user_info.xml
+++ b/app/src/main/res/layout/fragment_signup_user_info.xml
@@ -13,7 +13,7 @@
         android:layout_height="40dp"
         android:layout_marginStart="@dimen/spacing_normal"
         android:layout_marginTop="@dimen/spacing_extra_large"
-        android:background="@drawable/login_textbox"
+        android:background="@drawable/background_textbox"
         android:hint="First Name"
         android:inputType="textPersonName"
         android:textAlignment="center"
@@ -32,7 +32,7 @@
         android:layout_height="40dp"
         android:layout_marginEnd="@dimen/spacing_normal"
         android:layout_marginTop="@dimen/spacing_extra_large"
-        android:background="@drawable/login_textbox"
+        android:background="@drawable/background_textbox"
         android:hint="Last Name"
         android:inputType="textPersonName"
         android:textAlignment="center"
@@ -52,7 +52,7 @@
         android:layout_marginEnd="8dp"
         android:layout_marginStart="8dp"
         android:layout_marginTop="@dimen/spacing_small"
-        android:background="@drawable/login_textbox"
+        android:background="@drawable/background_textbox"
         android:hint="Password"
         android:inputType="textPassword"
         android:textAlignment="center"
diff --git a/app/src/main/res/layout/item_customization_field.xml b/app/src/main/res/layout/item_customization_field.xml
index af80b854..8ae279b8 100644
--- a/app/src/main/res/layout/item_customization_field.xml
+++ b/app/src/main/res/layout/item_customization_field.xml
@@ -26,7 +26,7 @@
         android:textSize="@dimen/itemCustomizationFieldText" />
 
     <TextView
-        android:id="@+id/price"
+        android:id="@+id/cost"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginLeft="8dp"
diff --git a/app/src/main/res/layout/item_food_add.xml b/app/src/main/res/layout/item_food_add.xml
deleted file mode 100644
index 06065a59..00000000
--- a/app/src/main/res/layout/item_food_add.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="130dp"
-    android:layout_height="130dp"
-    android:background="?android:attr/selectableItemBackground"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <de.hdodenhof.circleimageview.CircleImageView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:scaleType="centerCrop"
-        android:id="@+id/addition"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        android:paddingTop="16dp"
-        android:paddingLeft="8dp"
-        android:paddingRight="8dp"
-        android:src="@drawable/noun_add_1876902"/>
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_friend.xml b/app/src/main/res/layout/item_friend.xml
deleted file mode 100644
index e33daa35..00000000
--- a/app/src/main/res/layout/item_friend.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-    <de.hdodenhof.circleimageview.CircleImageView
-        android:id="@+id/cirimg"
-        android:layout_width="60dp"
-        android:layout_height="60dp"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        android:layout_marginTop="8dp"
-        android:layout_marginBottom="8dp"
-        android:layout_marginStart="16dp"
-        app:layout_constraintLeft_toLeftOf="parent"
-        tools:src="@drawable/water"/>
-<TextView
-    android:id="@+id/namehere"
-    app:layout_constraintTop_toTopOf="parent"
-    app:layout_constraintBottom_toBottomOf="parent"
-    app:layout_constraintLeft_toRightOf="@id/cirimg"
-    app:layout_constraintRight_toRightOf="parent"
-    android:layout_marginTop="8dp"
-    android:layout_marginBottom="8dp"
-    android:layout_marginLeft="8dp"
-    android:layout_width="0dp"
-    android:layout_height="60dp"
-    android:textAppearance="?android:attr/textAppearanceListItemSmall"
-    android:gravity="center_vertical"
-    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-    android:minHeight="?android:attr/listPreferredItemHeightSmall" />
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_select_layout.xml b/app/src/main/res/layout/item_select_layout.xml
new file mode 100644
index 00000000..d989218a
--- /dev/null
+++ b/app/src/main/res/layout/item_select_layout.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <de.hdodenhof.circleimageview.CircleImageView
+        android:id="@+id/im_image"
+        android:layout_width="60dp"
+        android:layout_height="60dp"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:layout_marginStart="@dimen/spacing_normal"
+        app:layout_constraintLeft_toLeftOf="parent"
+        tools:src="@drawable/water"/>
+    <TextView
+        android:id="@+id/tv_text"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toRightOf="@id/im_image"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        tools:text="Item#1"
+        android:textAlignment="center"
+        android:textAppearance="?android:attr/textAppearanceListItemSmall"
+        android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" />
+</android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_session_add_member.xml b/app/src/main/res/layout/item_session_add_member.xml
new file mode 100644
index 00000000..bf01262a
--- /dev/null
+++ b/app/src/main/res/layout/item_session_add_member.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="150dp"
+    android:foreground="?android:attr/selectableItemBackground"
+    android:padding="@dimen/spacing_normal">
+
+    <ImageView
+        android:id="@+id/im_add_member"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/ic_member_add"
+        android:layout_gravity="center"/>
+</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/session_user_layout.xml b/app/src/main/res/layout/item_session_member.xml
similarity index 62%
rename from app/src/main/res/layout/session_user_layout.xml
rename to app/src/main/res/layout/item_session_member.xml
index 5e1ec48d..2144960f 100644
--- a/app/src/main/res/layout/session_user_layout.xml
+++ b/app/src/main/res/layout/item_session_member.xml
@@ -1,19 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
+    android:layout_width="150dp"
+    android:layout_height="150dp"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <de.hdodenhof.circleimageview.CircleImageView
-        android:layout_width="150dp"
-        android:layout_height="150dp"
+        android:layout_width="wrap_content"
+        android:layout_height="130dp"
         android:scaleType="centerCrop"
         android:id="@+id/im_user"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
-        android:paddingLeft="8dp"
-        android:paddingRight="8dp"
+        android:padding="@dimen/spacing_small"
         android:src="@drawable/flier"/>
 
 
@@ -21,13 +20,11 @@
         android:id="@+id/tv_user"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        tools:text="Laura"
-        android:textSize="18.5sp"
         android:textColor="@color/brownish_grey"
-        app:layout_constraintStart_toStartOf="@id/im_user"
+        android:textSize="@dimen/font_normal"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/im_user"
-        app:layout_constraintEnd_toEndOf="@id/im_user"
-        tools:layout_editor_absoluteX="149dp"
-        tools:layout_editor_absoluteY="426dp" />
+        tools:text="Laura" />
 
 </android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_session_order.xml b/app/src/main/res/layout/item_session_order.xml
new file mode 100644
index 00000000..24cd8a22
--- /dev/null
+++ b/app/src/main/res/layout/item_session_order.xml
@@ -0,0 +1,63 @@
+<android.support.constraint.ConstraintLayout android:id="@+id/item_container"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_gravity="center"
+    android:layout_width="match_parent"
+    android:layout_height="35dp">
+
+    <TextView
+        android:id="@+id/tv_name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:layout_marginBottom="8dp"
+        android:layout_marginTop="8dp"
+        android:shadowColor="#80ffffff"
+        android:shadowRadius="6"
+        android:textColor="@color/white"
+        android:textSize="@dimen/font_large"
+        app:layout_constraintBottom_toTopOf="@+id/view"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="BLA" />
+
+    <TextView
+        android:id="@+id/tv_cancel_time"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/spacing_normal"
+        android:textColor="@color/white"
+        android:textSize="@dimen/font_normal"
+        android:visibility="gone"
+        app:layout_constraintBottom_toTopOf="@id/view"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="1:00" />
+
+    <Button
+        android:id="@+id/btn_cancel_order"
+        android:layout_width="wrap_content"
+        android:layout_height="30dp"
+        android:layout_marginEnd="@dimen/spacing_normal"
+        android:background="@drawable/rounded_rectangle_rogue"
+        android:shadowColor="@color/white"
+        android:shadowRadius="6"
+        android:text="@string/btn_cancel"
+        android:textColor="@color/white"
+        android:textSize="@dimen/font_normal"
+        android:visibility="gone"
+        app:layout_constraintBottom_toTopOf="@+id/view"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <View
+        android:id="@+id/view"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="@color/pinkish_grey"
+        android:alpha="0.5"
+        app:layout_constraintBottom_toBottomOf="parent" />
+
+</android.support.constraint.ConstraintLayout>
diff --git a/app/src/main/res/layout/layout_item_customization.xml b/app/src/main/res/layout/layout_item_customization.xml
index 9d7755e3..5c249172 100644
--- a/app/src/main/res/layout/layout_item_customization.xml
+++ b/app/src/main/res/layout/layout_item_customization.xml
@@ -3,207 +3,191 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
+    android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:background="@color/translucent_pinkish_grey"
-        android:clickable="true"
-        android:focusableInTouchMode="true"
-        android:visibility="gone" />
-
     <LinearLayout
-        android:id="@+id/customizationRoot"
         android:layout_width="match_parent"
-        android:layout_height="400dp"
-        android:orientation="vertical">
+        android:layout_height="wrap_content"
+        android:background="@drawable/bg_rounded_corner"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
 
-        <LinearLayout
-            android:layout_width="match_parent"
+        <TextView
+            android:id="@+id/name"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="8dp"
+            android:layout_weight="1"
+            android:text="Pizza"
+            android:textColor="@color/menuItemText"
+            android:textSize="@dimen/menuItemText"
+            android:textStyle="bold" />
+
+        <RadioGroup
+            android:id="@+id/rg"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:background="@drawable/bg_rounded_corner"
-            android:gravity="center_vertical"
             android:orientation="horizontal">
 
-            <TextView
-                android:id="@+id/name"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="8dp"
-                android:layout_weight="1"
-                android:text="Pizza"
-                android:textColor="@color/menuItemText"
-                android:textSize="@dimen/menuItemText"
-                android:textStyle="bold" />
-
-            <RadioGroup
-                android:id="@+id/rg"
+            <android.support.constraint.ConstraintLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:orientation="horizontal">
-
-                <android.support.constraint.ConstraintLayout
+                tools:layout_editor_absoluteY="81dp">
+
+                <View
+                    android:id="@+id/l1"
+                    android:layout_width="0dp"
+                    android:layout_height="2dp"
+                    android:layout_marginBottom="8dp"
+                    android:layout_marginTop="8dp"
+                    android:background="#ccc"
+                    app:layout_constraintBottom_toBottomOf="@+id/rb3"
+                    app:layout_constraintEnd_toEndOf="@+id/rb3"
+                    app:layout_constraintStart_toStartOf="@+id/rb1"
+                    app:layout_constraintTop_toTopOf="@+id/rb3" />
+
+                <RadioButton
+                    android:id="@+id/rb3"
+                    android:layout_width="30dp"
+                    android:layout_height="30dp"
+                    android:layout_marginBottom="8dp"
+                    android:layout_marginTop="8dp"
+                    android:background="@drawable/radio_button"
+                    android:button="@null"
+                    app:layout_constraintBottom_toTopOf="@+id/rt3"
+                    app:layout_constraintEnd_toEndOf="@+id/rt3"
+                    app:layout_constraintStart_toStartOf="@+id/rt3"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <RadioButton
+                    android:id="@+id/rb2"
+                    android:layout_width="30dp"
+                    android:layout_height="30dp"
+                    android:layout_marginBottom="8dp"
+                    android:layout_marginEnd="8dp"
+                    android:layout_marginStart="8dp"
+                    android:background="@drawable/radio_button"
+                    android:button="@null"
+                    app:layout_constraintBottom_toTopOf="@+id/rt2"
+                    app:layout_constraintEnd_toEndOf="@+id/rt2"
+                    app:layout_constraintStart_toStartOf="@+id/rt2" />
+
+                <RadioButton
+                    android:id="@+id/rb1"
+                    android:layout_width="30dp"
+                    android:layout_height="30dp"
+                    android:layout_marginBottom="8dp"
+                    android:background="@drawable/radio_button"
+                    android:button="@null"
+                    app:layout_constraintBottom_toTopOf="@+id/rt1"
+                    app:layout_constraintEnd_toEndOf="@+id/rt1"
+                    app:layout_constraintStart_toStartOf="@+id/rt1" />
+
+                <TextView
+                    android:id="@+id/rt3"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    tools:layout_editor_absoluteY="81dp">
-
-                    <View
-                        android:id="@+id/l1"
-                        android:layout_width="0dp"
-                        android:layout_height="2dp"
-                        android:layout_marginBottom="8dp"
-                        android:layout_marginTop="8dp"
-                        android:background="#ccc"
-                        app:layout_constraintBottom_toBottomOf="@+id/rb3"
-                        app:layout_constraintEnd_toEndOf="@+id/rb3"
-                        app:layout_constraintStart_toStartOf="@+id/rb1"
-                        app:layout_constraintTop_toTopOf="@+id/rb3" />
-
-                    <RadioButton
-                        android:id="@+id/rb3"
-                        android:layout_width="30dp"
-                        android:layout_height="30dp"
-                        android:layout_marginBottom="8dp"
-                        android:layout_marginTop="8dp"
-                        android:background="@drawable/radio_button"
-                        android:button="@null"
-                        app:layout_constraintBottom_toTopOf="@+id/rt3"
-                        app:layout_constraintEnd_toEndOf="@+id/rt3"
-                        app:layout_constraintStart_toStartOf="@+id/rt3"
-                        app:layout_constraintTop_toTopOf="parent" />
-
-                    <RadioButton
-                        android:id="@+id/rb2"
-                        android:layout_width="30dp"
-                        android:layout_height="30dp"
-                        android:layout_marginBottom="8dp"
-                        android:layout_marginEnd="8dp"
-                        android:layout_marginStart="8dp"
-                        android:background="@drawable/radio_button"
-                        android:button="@null"
-                        app:layout_constraintBottom_toTopOf="@+id/rt2"
-                        app:layout_constraintEnd_toEndOf="@+id/rt2"
-                        app:layout_constraintStart_toStartOf="@+id/rt2" />
-
-                    <RadioButton
-                        android:id="@+id/rb1"
-                        android:layout_width="30dp"
-                        android:layout_height="30dp"
-                        android:layout_marginBottom="8dp"
-                        android:background="@drawable/radio_button"
-                        android:button="@null"
-                        app:layout_constraintBottom_toTopOf="@+id/rt1"
-                        app:layout_constraintEnd_toEndOf="@+id/rt1"
-                        app:layout_constraintStart_toStartOf="@+id/rt1" />
-
-                    <TextView
-                        android:id="@+id/rt3"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginEnd="8dp"
-                        android:minWidth="40dp"
-                        android:text="Large"
-                        android:textAlignment="center"
-                        android:textColor="#000"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintHorizontal_bias="0.5"
-                        app:layout_constraintStart_toEndOf="@+id/rt2" />
-
-                    <TextView
-                        android:id="@+id/rt2"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginEnd="8dp"
-                        android:minWidth="40dp"
-                        android:text="Medium"
-                        android:textAlignment="center"
-                        android:textColor="#000"
-                        app:layout_constraintBaseline_toBaselineOf="@+id/rt3"
-                        app:layout_constraintEnd_toStartOf="@+id/rt3"
-                        app:layout_constraintHorizontal_bias="0.5"
-                        app:layout_constraintStart_toEndOf="@+id/rt1" />
-
-                    <TextView
-                        android:id="@+id/rt1"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginEnd="8dp"
-                        android:layout_marginStart="8dp"
-                        android:minWidth="40dp"
-                        android:text="Small"
-                        android:textAlignment="center"
-                        android:textColor="#000"
-                        app:layout_constraintBaseline_toBaselineOf="@+id/rt3"
-                        app:layout_constraintEnd_toStartOf="@+id/rt2"
-                        app:layout_constraintHorizontal_bias="0.5"
-                        app:layout_constraintHorizontal_chainStyle="spread_inside"
-                        app:layout_constraintStart_toStartOf="parent" />
-
-
-                </android.support.constraint.ConstraintLayout>
-
-            </RadioGroup>
-
-        </LinearLayout>
-
-        <ScrollView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:background="@drawable/menu_item_customization_background"
-            android:clipToPadding="false"
-            android:fillViewport="true">
+                    android:layout_marginEnd="8dp"
+                    android:minWidth="40dp"
+                    android:text="Large"
+                    android:textAlignment="center"
+                    android:textColor="#000"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintHorizontal_bias="0.5"
+                    app:layout_constraintStart_toEndOf="@+id/rt2" />
+
+                <TextView
+                    android:id="@+id/rt2"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="8dp"
+                    android:minWidth="40dp"
+                    android:text="Medium"
+                    android:textAlignment="center"
+                    android:textColor="#000"
+                    app:layout_constraintBaseline_toBaselineOf="@+id/rt3"
+                    app:layout_constraintEnd_toStartOf="@+id/rt3"
+                    app:layout_constraintHorizontal_bias="0.5"
+                    app:layout_constraintStart_toEndOf="@+id/rt1" />
+
+                <TextView
+                    android:id="@+id/rt1"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="8dp"
+                    android:layout_marginStart="8dp"
+                    android:minWidth="40dp"
+                    android:text="Small"
+                    android:textAlignment="center"
+                    android:textColor="#000"
+                    app:layout_constraintBaseline_toBaselineOf="@+id/rt3"
+                    app:layout_constraintEnd_toStartOf="@+id/rt2"
+                    app:layout_constraintHorizontal_bias="0.5"
+                    app:layout_constraintHorizontal_chainStyle="spread_inside"
+                    app:layout_constraintStart_toStartOf="parent" />
 
-            <LinearLayout
-                android:id="@+id/foodExtrasLL"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical" />
 
-        </ScrollView>
+            </android.support.constraint.ConstraintLayout>
+
+        </RadioGroup>
 
-        <android.support.constraint.ConstraintLayout
+    </LinearLayout>
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:background="@drawable/menu_item_customization_background"
+        android:clipToPadding="false"
+        android:fillViewport="true">
+
+        <LinearLayout
+            android:id="@+id/foodExtrasLL"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@drawable/customization_done_background"
-            android:gravity="center_vertical">
+            android:orientation="vertical" />
 
+    </ScrollView>
 
-            <Button
-                android:id="@+id/done"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="32dp"
-                android:background="@null"
-                android:text="DONE"
-                android:textColor="#fff"
-                android:textSize="18sp"
-                android:textStyle="bold"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-
-            <TextView
-                android:id="@+id/bill"
-                android:layout_width="wrap_content"
-                android:layout_height="0dp"
-                android:layout_marginBottom="8dp"
-                android:layout_marginStart="32dp"
-                android:layout_marginTop="8dp"
-                android:background="@drawable/menu_item_price"
-                android:paddingRight="8dp"
-                android:text="0"
-                android:textAlignment="textEnd"
-                android:textColor="#fff"
-                android:textSize="18sp"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-        </android.support.constraint.ConstraintLayout>
+    <android.support.constraint.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/customization_done_background"
+        android:gravity="center_vertical">
+
+
+        <Button
+            android:id="@+id/done"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="32dp"
+            android:background="@null"
+            android:text="DONE"
+            android:textColor="#fff"
+            android:textSize="18sp"
+            android:textStyle="bold"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/bill"
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:layout_marginBottom="8dp"
+            android:layout_marginStart="32dp"
+            android:layout_marginTop="8dp"
+            android:background="@drawable/menu_item_price"
+            android:paddingRight="8dp"
+            android:text="0"
+            android:textAlignment="textEnd"
+            android:textColor="#fff"
+            android:textSize="18sp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+    </android.support.constraint.ConstraintLayout>
 
-    </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/layout_shop_profile.xml b/app/src/main/res/layout/layout_shop_profile.xml
index 0b0a8c8e..0ebb6d2d 100644
--- a/app/src/main/res/layout/layout_shop_profile.xml
+++ b/app/src/main/res/layout/layout_shop_profile.xml
@@ -6,7 +6,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    tools:context="com.alcatraz.admin.project_alcatraz.Profile.ShopProfile.ShopProfileActivity">
+    tools:context="com.checkin.app.checkin.Profile.ShopProfile.ShopProfileActivity">
 
     <android.support.v4.view.ViewPager
         android:id="@+id/shop_acivity_viewpager"
@@ -37,7 +37,7 @@
         <!--app:layout_constraintBottom_toBottomOf="parent"-->
         <!--app:layout_constraintLeft_toLeftOf="parent"-->
         <!--app:layout_constraintRight_toRightOf="parent"-->
-        <!--app:menu="@menu/navigation" />-->
+        <!--app:btn_menu="@btn_menu/navigation" />-->
 
     <android.support.v7.widget.CardView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/menu_cart_item_layout.xml b/app/src/main/res/layout/menu_cart_item_layout.xml
index 7b64dd2d..0dff48c8 100644
--- a/app/src/main/res/layout/menu_cart_item_layout.xml
+++ b/app/src/main/res/layout/menu_cart_item_layout.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<com.alcatraz.admin.project_alcatraz.Utility.SwipeRevealLayout
+<com.checkin.app.checkin.Utility.SwipeRevealLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -83,4 +83,4 @@
 
     </FrameLayout>
 
-</com.alcatraz.admin.project_alcatraz.Utility.SwipeRevealLayout>
\ No newline at end of file
+</com.checkin.app.checkin.Utility.SwipeRevealLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/menu_chip_layout.xml b/app/src/main/res/layout/menu_chip_layout.xml
deleted file mode 100644
index f873a048..00000000
--- a/app/src/main/res/layout/menu_chip_layout.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/chip_layout"
-    android:background="@color/white">
-
-    <com.pchmn.materialchips.ChipView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:id="@+id/chip_view"
-        android:layout_marginEnd="5dp"
-        android:layout_marginRight="5dp"
-        app:label="DUMMY"
-        app:deleteIconColor="@color/colorPrimaryRed"
-        app:deletable="true"
-        app:backgroundColor="#bebebe"/>
-
-</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/menu_group_card_layout.xml b/app/src/main/res/layout/menu_group_card_layout.xml
index 3bdc9889..1cef8c24 100644
--- a/app/src/main/res/layout/menu_group_card_layout.xml
+++ b/app/src/main/res/layout/menu_group_card_layout.xml
@@ -65,7 +65,7 @@
 
             </android.support.design.widget.TabLayout>
 
-            <com.alcatraz.admin.project_alcatraz.Utility.DynamicSwipableViewPager
+            <com.checkin.app.checkin.Utility.DynamicSwipableViewPager
                 android:id="@+id/sub_group_container"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/simple_text.xml b/app/src/main/res/layout/simple_text.xml
deleted file mode 100644
index a7296a6c..00000000
--- a/app/src/main/res/layout/simple_text.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<android.support.constraint.ConstraintLayout
-    android:id="@+id/containerconstraint"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <TextView
-        android:id="@+id/text1"
-        app:layout_constraintHorizontal_bias=".5"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:gravity="center|center_horizontal"
-        android:minHeight="?android:attr/listPreferredItemHeightSmall"
-        android:shadowColor="#80ffffff"
-        android:shadowRadius="6"
-        android:text="BLA"
-        android:textAppearance="?android:attr/textAppearanceListItemSmall"
-        android:textColor="@color/white"
-        android:textSize="20sp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
-
-    <View
-        android:id="@+id/up1"
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.1" />
-
-    <View
-        android:id="@+id/down1"
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.9" />
-
-    <Button
-        android:focusable="false"
-        android:layout_marginEnd="16dp"
-        android:id="@+id/cancel_button"
-        android:visibility="gone"
-        app:layout_constraintBottom_toTopOf="@id/down1"
-        app:layout_constraintTop_toBottomOf="@id/up1"
-        android:layout_width="wrap_content"
-        android:layout_height="0dp"
-        android:background="@drawable/rounded_rectangle_rogue"
-        android:text="Cancel"
-        android:textColor="@color/white"
-        android:textSize="16sp"
-        android:shadowColor="@color/white"
-        android:shadowRadius="6"
-        android:paddingLeft="8dp"
-        android:paddingRight="8dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="1"
-        app:layout_constraintStart_toEndOf="@id/text1" />
-
-</android.support.constraint.ConstraintLayout>
diff --git a/app/src/main/res/layout/view_select_list_multiple.xml b/app/src/main/res/layout/view_select_list_multiple.xml
new file mode 100644
index 00000000..6d1b3815
--- /dev/null
+++ b/app/src/main/res/layout/view_select_list_multiple.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/container">
+
+    <com.hootsuite.nachos.NachoTextView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:paddingStart="@dimen/spacing_extra_small"
+        android:paddingEnd="@dimen/spacing_extra_small"
+        android:background="@drawable/background_textbox"
+        android:id="@+id/select_text_view"
+        app:chipBackground="@color/pinkish_grey"/>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 7df79516..ccc8e092 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -36,6 +36,8 @@
     <color name="translucent_pinkish_grey">#5ebebebe</color>
     <color name="translucent_black">#aa000000</color>
     <color name="dark_back_filter">#ab000000</color>
+    <color name="shadow_gradient">#20000000</color>
+    <color name="translucent_half_black">#80000000</color>
 
     <array name="array_dot_active">
         <item>@color/dot_light_screen1</item>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 8f9218a4..261c719d 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -8,6 +8,7 @@
     <dimen name="font_small">12sp</dimen>
 
     <!-- typical spacing between two views -->
+    <dimen name="spacing_very_huge">50dp</dimen>
     <dimen name="spacing_huge">40dp</dimen>
     <dimen name="spacing_extra_large">32dp</dimen>
     <dimen name="spacing_large">24dp</dimen>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b60b2b37..935d6405 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -12,9 +12,9 @@
     <string name="title_activity_shop">shop</string>
     <string name="menu_layout_title">Menu</string>
     <string name="menu_layout_items_count">Number of items:</string>
-    <string name="menu_layout_total_price">Total price:</string>
+    <string name="menu_layout_total_price">Total cost:</string>
     <string name="layout_button_done">Finish</string>
-    <string name="username" ><font color="#af1014">Enter Username</font></string>
+    <string name="username"><font color="#af1014">Enter Username</font></string>
 
     <string name="hello_blank_fragment">Hello blank fragment</string>
     <string name="title_activity_session_user">SessionUserActivity</string>
@@ -32,10 +32,10 @@
 
     <!--for bottomnav bar-->
 
-    <!-- value for the phone mode menu -->
+    <!-- value for the phone mode btn_menu -->
     <string name="bbn_phone_view_behavior" translatable="false" tools:ignore="UnusedResources">it.sephiroth.android.library.bottomnavigation.BottomBehavior</string>
 
-    <!-- behavior for the tablet mode menu -->
+    <!-- behavior for the tablet mode btn_menu -->
     <string name="bbn_tablet_view_behavior" translatable="false" tools:ignore="UnusedResources">it.sephiroth.android.library.bottomnavigation.TabletBehavior</string>
 
     <!-- this is the default value -->
@@ -65,4 +65,6 @@
     <string name="menu_drawer_close">Close Menu Cart drawer</string>
     <string name="active_session">Active Session</string>
     <string name="title_activity_signup">SignupActivity</string>
+    <string name="btn_cancel">Cancel</string>
+    <string name="item_non_cancelable">Non-Cancelable</string>
 </resources>
diff --git a/app/src/test/java/com/alcatraz/admin/project_alcatraz/ExampleUnitTest.kt b/app/src/test/java/com/checkin/app/checkin/ExampleUnitTest.kt
similarity index 87%
rename from app/src/test/java/com/alcatraz/admin/project_alcatraz/ExampleUnitTest.kt
rename to app/src/test/java/com/checkin/app/checkin/ExampleUnitTest.kt
index 7d3af863..e91485cf 100644
--- a/app/src/test/java/com/alcatraz/admin/project_alcatraz/ExampleUnitTest.kt
+++ b/app/src/test/java/com/checkin/app/checkin/ExampleUnitTest.kt
@@ -1,4 +1,4 @@
-package com.alcatraz.admin.project_alcatraz
+package com.checkin.app.checkin
 
 import org.junit.Test
 
diff --git a/build.gradle b/build.gradle
index 82024df3..13751cbf 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,17 +1,20 @@
  // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.objectbox_version = '2.0.0'
+    ext.objectbox_version = '2.1.0'
+    ext.jackson_version = '2.9.6'
+
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.3'
+        classpath 'com.android.tools.build:gradle:3.1.4'
         classpath "io.objectbox:objectbox-gradle-plugin:$objectbox_version"
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
+        classpath 'com.google.gms:google-services:4.0.1'
     }
 }
 
diff --git a/library/MaterialChipView/build.gradle b/library/MaterialChipView/build.gradle
deleted file mode 100644
index 1281dba0..00000000
--- a/library/MaterialChipView/build.gradle
+++ /dev/null
@@ -1,42 +0,0 @@
-apply plugin: 'com.android.library'
-
-android {
-    compileSdkVersion 27
-    buildToolsVersion '27.0.3'
-
-    defaultConfig {
-        minSdkVersion 15
-        targetSdkVersion 27
-        versionCode 170615
-        versionName "2.0.6"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-        multiDexEnabled true
-
-    }
-    buildTypes {
-        debug{
-            debuggable true
-            minifyEnabled false
-        }
-
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-    }
-}
-
-dependencies {
-    implementation fileTree(include: ['*.jar'], dir: 'libs')
-    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
-        exclude group: 'com.android.support', module: 'support-annotations'
-    })
-    implementation 'com.android.support:appcompat-v7:27.1.1'
-    testImplementation 'junit:junit:4.12'
-    // recycler
-    implementation 'com.android.support:recyclerview-v7:27.1.1'
-    implementation 'com.beloo.widget:ChipsLayoutManager:0.3.7@aar'
-    // circle image view
-    implementation 'de.hdodenhof:circleimageview:2.2.0'
-}
-
diff --git a/library/MaterialChipView/proguard-rules.pro b/library/MaterialChipView/proguard-rules.pro
deleted file mode 100644
index 0ae68584..00000000
--- a/library/MaterialChipView/proguard-rules.pro
+++ /dev/null
@@ -1,25 +0,0 @@
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in /Users/couleurwhatever/Library/Android/sdk/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the proguardFiles
-# directive in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
diff --git a/library/MaterialChipView/src/androidTest/java/com/pchmn/materialchips/ExampleInstrumentedTest.java b/library/MaterialChipView/src/androidTest/java/com/pchmn/materialchips/ExampleInstrumentedTest.java
deleted file mode 100644
index a28c3f32..00000000
--- a/library/MaterialChipView/src/androidTest/java/com/pchmn/materialchips/ExampleInstrumentedTest.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.pchmn.materialchips;
-
-import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.junit.Assert.*;
-
-/**
- * Instrumentation test, which will execute on an Android device.
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-@RunWith(AndroidJUnit4.class)
-public class ExampleInstrumentedTest {
-    @Test
-    public void useAppContext() throws Exception {
-        // Context of the app under test.
-        Context appContext = InstrumentationRegistry.getTargetContext();
-
-        assertEquals("com.pchmn.library.test", appContext.getPackageName());
-    }
-}
diff --git a/library/MaterialChipView/src/main/AndroidManifest.xml b/library/MaterialChipView/src/main/AndroidManifest.xml
deleted file mode 100644
index 633e89cb..00000000
--- a/library/MaterialChipView/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-
-    package="com.pchmn.materialchips">
-
-    <application android:allowBackup="true" android:label="@string/app_name"
-        android:supportsRtl="true">
-
-    </application>
-
-</manifest>
diff --git a/library/MaterialChipView/src/main/java/com/pchmn/materialchips/ChipView.java b/library/MaterialChipView/src/main/java/com/pchmn/materialchips/ChipView.java
deleted file mode 100755
index 0cc6757d..00000000
--- a/library/MaterialChipView/src/main/java/com/pchmn/materialchips/ChipView.java
+++ /dev/null
@@ -1,479 +0,0 @@
-package com.pchmn.materialchips;
-
-
-import android.content.Context;
-import android.content.res.ColorStateList;
-import android.content.res.TypedArray;
-import android.graphics.PorterDuff;
-import android.graphics.drawable.Drawable;
-import android.net.Uri;
-import android.support.annotation.ColorInt;
-import android.support.v4.content.ContextCompat;
-import android.util.AttributeSet;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.FrameLayout;
-import android.widget.ImageButton;
-import android.widget.LinearLayout;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
-
-import com.pchmn.materialchips.model.ChipInterface;
-import com.pchmn.materialchips.util.LetterTileProvider;
-import com.pchmn.materialchips.util.ViewUtil;
-
-import de.hdodenhof.circleimageview.CircleImageView;
-
-public class ChipView extends RelativeLayout {
-
-    private static final String TAG = ChipView.class.toString();
-    // attributes
-    private static final int NONE = -1;
-    // xml elements
-    LinearLayout mContentLayout;
-    CircleImageView mAvatarIconImageView;
-    TextView mLabelTextView;
-    ImageButton mDeleteButton;
-    // context
-    private Context mContext;
-    private String mLabel;
-    private ColorStateList mLabelColor;
-    private boolean mHasAvatarIcon = false;
-    private Drawable mAvatarIconDrawable;
-    private Uri mAvatarIconUri;
-    private boolean mDeletable = false;
-    private Drawable mDeleteIcon;
-    private ColorStateList mDeleteIconColor;
-    private ColorStateList mBackgroundColor;
-    private boolean mWidthMatchParrent = false;
-    // letter tile provider
-    private LetterTileProvider mLetterTileProvider;
-    // chip
-    private ChipInterface mChip;
-
-    public ChipView(Context context, boolean widthMatchParent)
-    {
-        super(context);
-        mContext = context;
-        mWidthMatchParrent = widthMatchParent;
-        init(null);
-    }
-
-    public ChipView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        mContext = context;
-        init(attrs);
-    }
-
-    private static ChipView newInstance(Builder builder) {
-        ChipView chipView = new ChipView(builder.context, builder.widthMatchParent);
-        chipView.mLabel = builder.label;
-        chipView.mLabelColor = builder.labelColor;
-        chipView.mHasAvatarIcon = builder.hasAvatarIcon;
-        chipView.mAvatarIconUri = builder.avatarIconUri;
-        chipView.mAvatarIconDrawable = builder.avatarIconDrawable;
-        chipView.mDeletable = builder.deletable;
-        chipView.mDeleteIcon = builder.deleteIcon;
-        chipView.mDeleteIconColor = builder.deleteIconColor;
-        chipView.mBackgroundColor = builder.backgroundColor;
-        chipView.mChip = builder.chip;
-        chipView.inflateWithAttributes();
-
-        return chipView;
-    }
-
-    /**
-     * Inflate the view according to attributes
-     *
-     * @param attrs the attributes
-     */
-    private void init(AttributeSet attrs) {
-        // inflate layout
-	    int layout = R.layout.chip_view;
-	    if(mWidthMatchParrent)
-	    {
-	    	layout = R.layout.chip_view_wide;
-	    }
-        View rootView = inflate(getContext(), layout, this);
-
-        // butter knife
-        mContentLayout = rootView.findViewById(R.id.content);
-        mAvatarIconImageView = rootView.findViewById(R.id.icon);
-        mLabelTextView = rootView.findViewById(R.id.label);
-        mDeleteButton = rootView.findViewById(R.id.delete_button);
-        // letter tile provider
-        mLetterTileProvider = new LetterTileProvider(mContext);
-
-        // attributes
-        if(attrs != null) {
-            TypedArray a = mContext.getTheme().obtainStyledAttributes(
-                    attrs,
-                    R.styleable.ChipView,
-                    0, 0);
-
-            try {
-                // label
-                mLabel = a.getString(R.styleable.ChipView_label);
-                mLabelColor = a.getColorStateList(R.styleable.ChipView_labelColor);
-                // avatar icon
-                mHasAvatarIcon = a.getBoolean(R.styleable.ChipView_hasAvatarIcon, false);
-                int avatarIconId = a.getResourceId(R.styleable.ChipView_avatarIcon, NONE);
-                if(avatarIconId != NONE) mAvatarIconDrawable = ContextCompat.getDrawable(mContext, avatarIconId);
-                if(mAvatarIconDrawable != null) mHasAvatarIcon = true;
-                // delete icon
-                mDeletable = a.getBoolean(R.styleable.ChipView_deletable, false);
-                mDeleteIconColor = a.getColorStateList(R.styleable.ChipView_deleteIconColor);
-                int deleteIconId = a.getResourceId(R.styleable.ChipView_deleteIcon, NONE);
-                if(deleteIconId != NONE) mDeleteIcon = ContextCompat.getDrawable(mContext, deleteIconId);
-                // background color
-                mBackgroundColor = a.getColorStateList(R.styleable.ChipView_backgroundColor);
-            }
-            finally {
-                a.recycle();
-            }
-        }
-
-        // inflate
-        inflateWithAttributes();
-    }
-
-    /**
-     * Inflate the view
-     */
-    private void inflateWithAttributes() {
-        // label
-        setLabel(mLabel);
-        if(mLabelColor != null)
-            setLabelColor(mLabelColor);
-
-        // avatar
-        setHasAvatarIcon(mHasAvatarIcon);
-
-        // delete button
-        setDeletable(mDeletable);
-
-        // background color
-        if(mBackgroundColor != null)
-            setChipBackgroundColor(mBackgroundColor);
-
-    }
-
-    public void inflate(ChipInterface chip) {
-        mChip = chip;
-        // label
-        mLabel = mChip.getLabel();
-        // icon
-        mAvatarIconUri = mChip.getAvatarUri();
-        mAvatarIconDrawable = mChip.getAvatarDrawable();
-
-        // inflate
-        inflateWithAttributes();
-    }
-
-	/**
-     * Get label
-     *
-     * @return the label
-     */
-    public String getLabel() {
-        return mLabel;
-    }
-
-    /**
-     * Set label
-     *
-     * @param label the label to set
-     */
-    public void setLabel(String label) {
-        mLabel = label;
-        mLabelTextView.setText(label);
-    }
-
-    /**
-     * Set label color
-     *
-     * @param color the color to set
-     */
-    public void setLabelColor(ColorStateList color) {
-        mLabelColor = color;
-        mLabelTextView.setTextColor(color);
-    }
-
-    /**
-     * Set label color
-     *
-     * @param color the color to set
-     */
-    public void setLabelColor(@ColorInt int color) {
-        mLabelColor = ColorStateList.valueOf(color);
-        mLabelTextView.setTextColor(color);
-    }
-
-    /**
-     * Show or hide avatar icon
-     *
-     * @param hasAvatarIcon true to show, false to hide
-     */
-    public void setHasAvatarIcon(boolean hasAvatarIcon) {
-        mHasAvatarIcon = hasAvatarIcon;
-
-        if(!mHasAvatarIcon) {
-            // hide icon
-            mAvatarIconImageView.setVisibility(GONE);
-            // adjust padding
-            if(mDeleteButton.getVisibility() == VISIBLE)
-                mLabelTextView.setPadding(ViewUtil.dpToPx(12), 0, 0, 0);
-            else
-                mLabelTextView.setPadding(ViewUtil.dpToPx(12), 0, ViewUtil.dpToPx(12), 0);
-
-        }
-        else {
-            // adjust padding
-            if(mDeleteButton.getVisibility() == VISIBLE)
-                mLabelTextView.setPadding(ViewUtil.dpToPx(8), 0, 0, 0);
-            else
-                mLabelTextView.setPadding(ViewUtil.dpToPx(8), 0, ViewUtil.dpToPx(12), 0);
-
-            if(mLabelColor == null)
-            {
-                setLabelColor(ContextCompat.getColor(mContext, android.R.color.black));
-            }
-
-            if(mAvatarIconUri != null) {
-                if(mAvatarIconUri.equals(Uri.EMPTY)) {
-                    mAvatarIconImageView.setVisibility(GONE);
-                    setLabelColor(ContextCompat.getColor(mContext, android.R.color.holo_red_dark));
-                } else {
-                    mAvatarIconImageView.setVisibility(VISIBLE);
-                    mAvatarIconImageView.setImageURI(mAvatarIconUri);
-                }
-            } else if(mAvatarIconDrawable != null) {
-                mAvatarIconImageView.setVisibility(VISIBLE);
-                mAvatarIconImageView.setImageDrawable(mAvatarIconDrawable);
-            } else {
-                mAvatarIconImageView.setVisibility(VISIBLE);
-                mAvatarIconImageView.setImageBitmap(mLetterTileProvider.getLetterTile(getLabel()));
-            }
-        }
-    }
-
-    /**
-     * Set avatar icon
-     *
-     * @param avatarIcon the icon to set
-     */
-    public void setAvatarIcon(Drawable avatarIcon) {
-        mAvatarIconDrawable = avatarIcon;
-        mHasAvatarIcon = true;
-        inflateWithAttributes();
-    }
-
-    /**
-     * Set avatar icon
-     *
-     * @param avatarUri the uri of the icon to set
-     */
-    public void setAvatarIcon(Uri avatarUri) {
-        mAvatarIconUri = avatarUri;
-        mHasAvatarIcon = true;
-        inflateWithAttributes();
-    }
-
-    /**
-     * Show or hide delte button
-     *
-     * @param deletable true to show, false to hide
-     */
-    public void setDeletable(boolean deletable) {
-        mDeletable = deletable;
-        if(!mDeletable) {
-            // hide delete icon
-            mDeleteButton.setVisibility(GONE);
-            // adjust padding
-            if(mAvatarIconImageView.getVisibility() == VISIBLE)
-                mLabelTextView.setPadding(ViewUtil.dpToPx(8), 0, ViewUtil.dpToPx(12), 0);
-            else
-                mLabelTextView.setPadding(ViewUtil.dpToPx(12), 0, ViewUtil.dpToPx(12), 0);
-        }
-        else {
-            // show icon
-            mDeleteButton.setVisibility(VISIBLE);
-            // adjust padding
-            if(mAvatarIconImageView.getVisibility() == VISIBLE)
-                mLabelTextView.setPadding(ViewUtil.dpToPx(8), 0, 0, 0);
-            else
-                mLabelTextView.setPadding(ViewUtil.dpToPx(12), 0, 0, 0);
-
-            // set icon
-            if(mDeleteIcon != null)
-                mDeleteButton.setImageDrawable(mDeleteIcon);
-            if(mDeleteIconColor != null)
-                mDeleteButton.getDrawable().mutate().setColorFilter(mDeleteIconColor.getDefaultColor(), PorterDuff.Mode.SRC_ATOP);
-        }
-    }
-
-    /**
-     * Set delete icon color
-     *
-     * @param color the color to set
-     */
-    public void setDeleteIconColor(ColorStateList color) {
-        mDeleteIconColor = color;
-        mDeletable = true;
-        inflateWithAttributes();
-    }
-
-    /**
-     * Set delete icon color
-     *
-     * @param color the color to set
-     */
-    public void setDeleteIconColor(@ColorInt int color) {
-        mDeleteIconColor = ColorStateList.valueOf(color);
-        mDeletable = true;
-        inflateWithAttributes();
-    }
-
-    /**
-     * Set delete icon
-     *
-     * @param deleteIcon the icon to set
-     */
-    public void setDeleteIcon(Drawable deleteIcon) {
-        mDeleteIcon = deleteIcon;
-        mDeletable = true;
-        inflateWithAttributes();
-    }
-
-    /**
-     * Set background color
-     *
-     * @param color the color to set
-     */
-    public void setChipBackgroundColor(ColorStateList color) {
-        mBackgroundColor = color;
-        setChipBackgroundColor(color.getDefaultColor());
-    }
-
-    /**
-     * Set background color
-     *
-     * @param color the color to set
-     */
-    public void setChipBackgroundColor(@ColorInt int color) {
-        mBackgroundColor = ColorStateList.valueOf(color);
-        mContentLayout.getBackground().setColorFilter(color, PorterDuff.Mode.SRC_ATOP);
-    }
-
-    /**
-     * Set the chip object
-     *
-     * @param chip the chip
-     */
-    public void setChip(ChipInterface chip) {
-        mChip = chip;
-    }
-
-    /**
-     * Set OnClickListener on the delete button
-     *
-     * @param onClickListener the OnClickListener
-     */
-    public void setOnDeleteClicked(OnClickListener onClickListener) {
-        mDeleteButton.setOnClickListener(onClickListener);
-    }
-
-    /**
-     * Set OnclickListener on the entire chip
-     *
-     * @param onClickListener the OnClickListener
-     */
-    public void setOnChipClicked(OnClickListener onClickListener) {
-        mContentLayout.setOnClickListener(onClickListener);
-    }
-
-    /**
-     * Builder class
-     */
-    public static class Builder {
-        private Context context;
-        private String label;
-        private ColorStateList labelColor;
-        private boolean hasAvatarIcon = false;
-        private Uri avatarIconUri;
-        private Drawable avatarIconDrawable;
-        private boolean deletable = false;
-        private Drawable deleteIcon;
-        private ColorStateList deleteIconColor;
-        private ColorStateList backgroundColor;
-        private boolean widthMatchParent = false;
-        private ChipInterface chip;
-
-        public Builder(Context context) {
-            this.context = context;
-        }
-
-        public Builder label(String label) {
-            this.label = label;
-            return this;
-        }
-
-        public Builder labelColor(ColorStateList labelColor) {
-            this.labelColor = labelColor;
-            return this;
-        }
-
-        public Builder hasAvatarIcon(boolean hasAvatarIcon) {
-            this.hasAvatarIcon = hasAvatarIcon;
-            return this;
-        }
-
-        public Builder avatarIcon(Uri avatarUri) {
-            this.avatarIconUri = avatarUri;
-            return this;
-        }
-
-        public Builder avatarIcon(Drawable avatarIcon) {
-            this.avatarIconDrawable = avatarIcon;
-            return this;
-        }
-
-        public Builder deletable(boolean deletable) {
-            this.deletable = deletable;
-            return this;
-        }
-
-        public Builder deleteIcon(Drawable deleteIcon) {
-            this.deleteIcon = deleteIcon;
-            return this;
-        }
-
-        public Builder deleteIconColor(ColorStateList deleteIconColor) {
-            this.deleteIconColor = deleteIconColor;
-            return this;
-        }
-
-        public Builder backgroundColor(ColorStateList backgroundColor) {
-            this.backgroundColor = backgroundColor;
-            return this;
-        }
-
-        public Builder widthMatchParent(boolean widthMatchParent)
-        {
-        	this.widthMatchParent = widthMatchParent;
-        	return this;
-        }
-
-        public Builder chip(ChipInterface chip) {
-            this.chip = chip;
-            this.label = chip.getLabel();
-            this.avatarIconDrawable = chip.getAvatarDrawable();
-            this.avatarIconUri = chip.getAvatarUri();
-            return this;
-        }
-
-        public ChipView build() {
-            return newInstance(this);
-        }
-    }
-}
diff --git a/library/MaterialChipView/src/main/java/com/pchmn/materialchips/ChipsInput.java b/library/MaterialChipView/src/main/java/com/pchmn/materialchips/ChipsInput.java
deleted file mode 100755
index 2d41bec1..00000000
--- a/library/MaterialChipView/src/main/java/com/pchmn/materialchips/ChipsInput.java
+++ /dev/null
@@ -1,626 +0,0 @@
-package com.pchmn.materialchips;
-
-
-import android.annotation.SuppressLint;
-import android.app.Activity;
-import android.content.Context;
-import android.content.res.ColorStateList;
-import android.content.res.Resources;
-import android.content.res.TypedArray;
-import android.graphics.Rect;
-import android.graphics.drawable.Drawable;
-import android.net.Uri;
-import android.os.Handler;
-import android.support.annotation.NonNull;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.text.TextUtils;
-import android.util.AttributeSet;
-import android.util.TypedValue;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.ViewTreeObserver;
-
-import com.beloo.widget.chipslayoutmanager.ChipsLayoutManager;
-import com.pchmn.materialchips.adapter.ChipsAdapter;
-import com.pchmn.materialchips.model.Chip;
-import com.pchmn.materialchips.model.ChipInterface;
-import com.pchmn.materialchips.util.ActivityUtil;
-import com.pchmn.materialchips.util.MyWindowCallback;
-import com.pchmn.materialchips.util.ViewUtil;
-import com.pchmn.materialchips.views.ChipsInputEditText;
-import com.pchmn.materialchips.views.DetailedChipView;
-import com.pchmn.materialchips.views.FilterableListView;
-import com.pchmn.materialchips.views.ScrollViewMaxHeight;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-public class ChipsInput extends ScrollViewMaxHeight
-{
-
-	private static final String TAG  = ChipsInput.class.toString();
-	// attributes
-	private static final int    NONE = -1;
-	// xml element
-	RecyclerView mRecyclerView;
-	// context
-	private Context        mContext;
-	// adapter
-	private ChipsAdapter   mChipsAdapter;
-	private String         mHint;
-	private ColorStateList mHintColor;
-	private ColorStateList mTextColor;
-	private int mMaxRows = 2;
-	private ColorStateList mChipLabelColor;
-	private boolean mChipHasAvatarIcon = true;
-	private boolean mChipDeletable     = false;
-	private Drawable       mChipDeleteIcon;
-	private ColorStateList mChipDeleteIconColor;
-	private ColorStateList mChipBackgroundColor;
-	private boolean mChipWidthMatchParent = false;
-	private boolean mShowChipDetailed     = true;
-	private boolean mAllowNewChips        = false;
-	private boolean mChipClickNotify      = false;
-	private int     mMaxViewsInRow        = -1;
-	private ColorStateList mChipDetailedTextColor;
-	private ColorStateList mChipDetailedDeleteIconColor;
-	private ColorStateList mChipDetailedBackgroundColor;
-	private ColorStateList mFilterableListBackgroundColor;
-	private ColorStateList mFilterableListTextColor;
-	private boolean        mFilterableUseLetterTile;
-	private boolean        mFilterableListAlwaysShow;
-	ChipsLayoutManager mChipsLayoutManager;
-	// chips listener
-	private List<ChipsListener> mChipsListenerList = new ArrayList<>();
-	private ChipsListener                 mChipsListener;
-	// chip list
-	private List<? extends ChipInterface> mChipList;
-	private FilterableListView            mFilterableListView;
-	// chip validator
-	private ChipValidator                 mChipValidator;
-	private List<Character> mValidChipSeparators = new ArrayList<>(Arrays.asList(' ', ',', ';'));
-
-	public ChipsInput(Context context)
-	{
-		super(context);
-		mContext = context;
-		init(null);
-	}
-
-	public ChipsInput(Context context, AttributeSet attrs)
-	{
-		super(context, attrs);
-		mContext = context;
-		init(attrs);
-	}
-
-	/**
-	 * Inflate the view according to attributes
-	 *
-	 * @param attrs the attributes
-	 */
-	@SuppressLint("ClickableViewAccessibility")
-	private void init(AttributeSet attrs)
-	{
-		// inflate layout
-		View rootView = inflate(getContext(), R.layout.chips_input, this);
-
-		mRecyclerView = rootView.findViewById(R.id.chips_recycler);
-		// attributes
-		if(attrs != null)
-		{
-			TypedArray a = mContext.getTheme().obtainStyledAttributes(attrs, R.styleable.ChipsInput, 0, 0);
-
-			try
-			{
-				// hint
-				mHint = a.getString(R.styleable.ChipsInput_hint);
-				mHintColor = a.getColorStateList(R.styleable.ChipsInput_hintColor);
-				mTextColor = a.getColorStateList(R.styleable.ChipsInput_textColor);
-				mMaxRows = a.getInteger(R.styleable.ChipsInput_maxRows, 2);
-				setMaxHeight(ViewUtil.dpToPx((40 * mMaxRows) + 8));
-				//setVerticalScrollBarEnabled(true);
-				// chip label color
-				mChipLabelColor = a.getColorStateList(R.styleable.ChipsInput_chip_labelColor);
-				// chip avatar icon
-				mChipHasAvatarIcon = a.getBoolean(R.styleable.ChipsInput_chip_hasAvatarIcon, true);
-				// chip delete icon
-				mChipDeletable = a.getBoolean(R.styleable.ChipsInput_chip_deletable, false);
-				mChipDeleteIconColor = a.getColorStateList(R.styleable.ChipsInput_chip_deleteIconColor);
-				int deleteIconId = a.getResourceId(R.styleable.ChipsInput_chip_deleteIcon, NONE);
-				if(deleteIconId != NONE)
-				{
-					mChipDeleteIcon = ContextCompat.getDrawable(mContext, deleteIconId);
-				}
-				// chip background color
-				mChipBackgroundColor = a.getColorStateList(R.styleable.ChipsInput_chip_backgroundColor);
-				mChipWidthMatchParent = a.getBoolean(R.styleable.ChipsInput_chip_width_match_parent, false);
-
-				// show chip detailed
-				mShowChipDetailed = a.getBoolean(R.styleable.ChipsInput_showChipDetailed, true);
-				// chip detailed text color
-				mChipDetailedTextColor = a.getColorStateList(R.styleable.ChipsInput_chip_detailed_textColor);
-				mChipDetailedBackgroundColor = a.getColorStateList(R.styleable.ChipsInput_chip_detailed_backgroundColor);
-				mChipDetailedDeleteIconColor = a.getColorStateList(R.styleable.ChipsInput_chip_detailed_deleteIconColor);
-				// filterable list
-				mFilterableListBackgroundColor = a.getColorStateList(R.styleable.ChipsInput_filterable_list_backgroundColor);
-				mFilterableListTextColor = a.getColorStateList(R.styleable.ChipsInput_filterable_list_textColor);
-				mFilterableUseLetterTile = a.getBoolean(R.styleable.ChipsInput_filterable_list_useLetterTile, false);
-				mFilterableListAlwaysShow = a.getBoolean(R.styleable.ChipsInput_filterable_list_alwaysVisible, false);
-
-				mAllowNewChips = a.getBoolean(R.styleable.ChipsInput_allowNewChips, false);
-				mChipClickNotify = a.getBoolean(R.styleable.ChipsInput_chip_clickNotify, false);
-				mMaxViewsInRow = a.getInt(R.styleable.ChipsInput_maxViewsInRow, -1);
-			}
-			finally
-			{
-				a.recycle();
-			}
-		}
-
-		// adapter
-		mChipsAdapter = new ChipsAdapter(mContext, this, mRecyclerView);
-		mChipsAdapter.getEditText().setOnTouchListener(new OnTouchListener()
-		{
-			@Override
-			public boolean onTouch(View v, final MotionEvent event)
-			{
-				Handler handler = new Handler();
-				handler.postDelayed(new Runnable()
-				{
-					@Override
-					public void run()
-					{
-						if(event.getActionMasked() == MotionEvent.ACTION_UP)
-						{
-							if(mFilterableListAlwaysShow)
-							{
-								mFilterableListView.fadeIn();
-							}
-						}
-						else if(event.getActionMasked() == MotionEvent.ACTION_CANCEL)
-						{
-							mFilterableListView.fadeOut();
-						}
-					}
-				}, 500);
-				return false;
-			}
-		});
-
-		mChipsLayoutManager = ChipsLayoutManager.newBuilder(mContext).setOrientation(ChipsLayoutManager.HORIZONTAL).build();
-		if(mMaxViewsInRow > 0)
-		{
-			mChipsLayoutManager.setMaxViewsInRow(mMaxViewsInRow);
-		}
-		mRecyclerView.setLayoutManager(mChipsLayoutManager);
-		mRecyclerView.setNestedScrollingEnabled(false);
-		mRecyclerView.setAdapter(mChipsAdapter);
-
-		// set window callback
-		// will hide DetailedOpenView and hide keyboard on touch outside
-		if(!this.isInEditMode())
-		{
-			Activity activity = ActivityUtil.scanForActivity(mContext);
-			if(activity == null)
-			{
-				throw new ClassCastException("android.view.Context cannot be cast to android.app.Activity");
-			}
-
-			android.view.Window.Callback mCallBack = (activity).getWindow().getCallback();
-			activity.getWindow().setCallback(new MyWindowCallback(mCallBack, activity));
-		}
-	}
-
-	public void addChip(final ChipInterface chip)
-	{
-		mChipsAdapter.addChip(chip);
-		if(mFilterableListView != null && !mFilterableListAlwaysShow)
-		{
-			mFilterableListView.fadeOut();
-		}
-	}
-
-	public void addChips(List<ChipInterface> chips)
-	{
-		for(ChipInterface chip : chips)
-		{
-			addChip(chip);
-		}
-	}
-
-	public void addChip(Object id, Drawable icon, String label, String info)
-	{
-		Chip chip = new Chip(id, icon, label, info);
-		mChipsAdapter.addChip(chip);
-	}
-
-	public void addChip(Drawable icon, String label, String info)
-	{
-		Chip chip = new Chip(icon, label, info);
-		mChipsAdapter.addChip(chip);
-	}
-
-	public void addChip(Object id, Uri iconUri, String label, String info)
-	{
-		Chip chip = new Chip(id, iconUri, label, info);
-		mChipsAdapter.addChip(chip);
-	}
-
-	public void addChip(Uri iconUri, String label, String info)
-	{
-		Chip chip = new Chip(iconUri, label, info);
-		mChipsAdapter.addChip(chip);
-	}
-
-	public void addChip(String label, String info)
-	{
-		ChipInterface chip = new Chip(label, info);
-		mChipsAdapter.addChip(chip);
-	}
-
-	public void removeChip(ChipInterface chip)
-	{
-		mChipsAdapter.removeChip(chip);
-	}
-
-	public void removeChipById(Object id)
-	{
-		mChipsAdapter.removeChipById(id);
-	}
-
-	public void removeChipByLabel(String label)
-	{
-		mChipsAdapter.removeChipByLabel(label);
-	}
-
-	public void removeChipByInfo(String info)
-	{
-		mChipsAdapter.removeChipByInfo(info);
-	}
-
-	public void removeAllChips()
-	{
-		mChipsAdapter.removeAllChips();
-	}
-
-	public ChipView getChipView()
-	{
-		int padding = ViewUtil.dpToPx(4);
-		ChipView chipView = new ChipView.Builder(mContext).labelColor(mChipLabelColor).hasAvatarIcon(mChipHasAvatarIcon).deletable(mChipDeletable).deleteIcon(mChipDeleteIcon).deleteIconColor(
-				mChipDeleteIconColor).backgroundColor(mChipBackgroundColor).widthMatchParent(mChipWidthMatchParent).build();
-
-		chipView.setPadding(padding, padding, padding, padding);
-		return chipView;
-	}
-
-	public List<ChipInterface> getChips()
-	{
-		return mChipsAdapter.getChipList();
-	}
-
-	public ChipsInputEditText generateEditText()
-	{
-		ChipsInputEditText editText = new ChipsInputEditText(mContext);
-		if(mHintColor != null)
-		{
-			editText.setHintTextColor(mHintColor);
-		}
-		if(mTextColor != null)
-		{
-			editText.setTextColor(mTextColor);
-		}
-		return editText;
-	}
-
-	public ChipsInputEditText getEditText()
-	{
-		return mChipsAdapter.getEditText();
-	}
-
-	public void setText(CharSequence text)
-	{
-		mChipsAdapter.setText(text);
-	}
-
-	public String getText()
-	{
-		return mChipsAdapter.getText();
-	}
-
-	public DetailedChipView getDetailedChipView(ChipInterface chip)
-	{
-		return new DetailedChipView.Builder(mContext).chip(chip).textColor(mChipDetailedTextColor).backgroundColor(mChipDetailedBackgroundColor).deleteIconColor(mChipDetailedDeleteIconColor).build();
-	}
-
-	public void addChipsListener(ChipsListener chipsListener)
-	{
-		//Don't add a listener more than once
-		for(int i = 0; i < mChipsListenerList.size(); i++)
-		{
-			if(mChipsListenerList.get(i) == chipsListener)
-			{
-				return;
-			}
-		}
-		mChipsListenerList.add(chipsListener);
-		mChipsListener = chipsListener;
-	}
-
-	public void onChipAdded(ChipInterface chip, int size)
-	{
-		for(int i = 0; i < mChipsListenerList.size(); i++)
-		{
-			mChipsListenerList.get(i).onChipAdded(chip, size);
-		}
-	}
-
-	public void onChipRemoved(ChipInterface chip, int size)
-	{
-		for(int i = 0; i < mChipsListenerList.size(); i++)
-		{
-			mChipsListenerList.get(i).onChipRemoved(chip, size);
-		}
-	}
-
-	public void onTextChanged(CharSequence text)
-	{
-		if(mChipsListener != null)
-		{
-			for(int i = 0; i < mChipsListenerList.size(); i++)
-			{
-				mChipsListenerList.get(i).onTextChanged(text);
-			}
-			// show filterable list
-			if(mFilterableListView != null)
-			{
-				mFilterableListView.filterList(text);
-				if(!mFilterableListAlwaysShow && TextUtils.isEmpty(text))
-				{
-					mFilterableListView.fadeOut();
-				}
-				else
-				{
-					mFilterableListView.fadeIn();
-				}
-			}
-		}
-	}
-
-	public void onAddNewChip(CharSequence text)
-	{
-		if(mChipsListener != null)
-		{
-			for(int i = 0; i < mChipsListenerList.size(); i++)
-			{
-				mChipsListenerList.get(i).onNewChip(text);
-			}
-		}
-	}
-
-	public void onChipClicked(ChipInterface chip)
-	{
-		if(mChipsListener != null)
-		{
-			for(int i = 0; i < mChipsListenerList.size(); i++)
-			{
-				mChipsListenerList.get(i).onChipClicked(chip);
-			}
-		}
-	}
-
-	@Override
-	public void clearFocus()
-	{
-		super.clearFocus();
-		if(mFilterableListView != null)
-		{
-			mFilterableListView.fadeOut();
-		}
-		mChipsAdapter.getEditText().clearFocus();
-	}
-
-	@Override
-	public boolean requestFocus(int direction, Rect previouslyFocusedRect)
-	{
-		return mChipsAdapter.getEditText().requestFocus(direction, previouslyFocusedRect);
-	}
-
-	public List<? extends ChipInterface> getSelectedChipList()
-	{
-		return mChipsAdapter.getChipList();
-	}
-
-	public String getHint()
-	{
-		return mHint;
-	}
-
-	public void setHint(String mHint)
-	{
-		this.mHint = mHint;
-	}
-
-	public void setHintColor(ColorStateList mHintColor)
-	{
-		this.mHintColor = mHintColor;
-	}
-
-	public void setTextColor(ColorStateList mTextColor)
-	{
-		this.mTextColor = mTextColor;
-	}
-
-	public ChipsInput setMaxRows(int mMaxRows)
-	{
-		this.mMaxRows = mMaxRows;
-		return this;
-	}
-
-	public void setChipLabelColor(ColorStateList mLabelColor)
-	{
-		this.mChipLabelColor = mLabelColor;
-	}
-
-	public void setChipHasAvatarIcon(boolean mHasAvatarIcon)
-	{
-		this.mChipHasAvatarIcon = mHasAvatarIcon;
-	}
-
-	public boolean chipHasAvatarIcon()
-	{
-		return mChipHasAvatarIcon;
-	}
-
-	public void setChipDeletable(boolean mDeletable)
-	{
-		this.mChipDeletable = mDeletable;
-	}
-
-	public void setChipAllowNew(boolean allowNew)
-	{
-		mAllowNewChips = allowNew;
-	}
-
-	public boolean getChipAllowNew()
-	{
-		return mAllowNewChips;
-	}
-
-	public void setChipDeleteIcon(Drawable mDeleteIcon)
-	{
-		this.mChipDeleteIcon = mDeleteIcon;
-	}
-
-	public void setChipDeleteIconColor(ColorStateList mDeleteIconColor)
-	{
-		this.mChipDeleteIconColor = mDeleteIconColor;
-	}
-
-	public void setChipBackgroundColor(ColorStateList mBackgroundColor)
-	{
-		this.mChipBackgroundColor = mBackgroundColor;
-	}
-
-	public boolean isShowChipDetailed()
-	{
-		return mShowChipDetailed;
-	}
-
-	public ChipsInput setShowChipDetailed(boolean mShowChipDetailed)
-	{
-		this.mShowChipDetailed = mShowChipDetailed;
-		return this;
-	}
-
-	public boolean shouldChipClickNotify()
-	{
-		return mChipClickNotify;
-	}
-
-	public ChipsInput setChipClickNotify(boolean chipClickNotify)
-	{
-		mChipClickNotify = chipClickNotify;
-		return this;
-	}
-
-	public int getmMaxViewsInRow()
-	{
-		return mMaxViewsInRow;
-	}
-
-	public void setMaxViewsInRow(int maxViewsInRow)
-	{
-		mMaxViewsInRow = maxViewsInRow;
-		if(mMaxViewsInRow > 0)
-		{
-			mChipsLayoutManager.setMaxViewsInRow(mMaxViewsInRow);
-		}
-	}
-
-	public void setChipDetailedTextColor(ColorStateList mChipDetailedTextColor)
-	{
-		this.mChipDetailedTextColor = mChipDetailedTextColor;
-	}
-
-	public void setChipDetailedDeleteIconColor(ColorStateList mChipDetailedDeleteIconColor)
-	{
-		this.mChipDetailedDeleteIconColor = mChipDetailedDeleteIconColor;
-	}
-
-	public void setChipDetailedBackgroundColor(ColorStateList mChipDetailedBackgroundColor)
-	{
-		this.mChipDetailedBackgroundColor = mChipDetailedBackgroundColor;
-	}
-
-	public List<? extends ChipInterface> getFilterableList()
-	{
-		return mChipList;
-	}
-
-	public void setFilterableList(List<? extends ChipInterface> list)
-	{
-		mChipList = list;
-		if(mFilterableListView == null)
-		{
-			mFilterableListView = new FilterableListView(mContext);
-			mFilterableListView.build(mChipList, this, mFilterableListBackgroundColor, mFilterableListTextColor, mFilterableUseLetterTile, getValidChipSeparators());
-			mChipsAdapter.setFilterableListView(mFilterableListView);
-		}
-		else
-		{
-			mFilterableListView.setFilterableList(list);
-		}
-	}
-
-	public ChipValidator getChipValidator()
-	{
-		return mChipValidator;
-	}
-
-	public void setChipValidator(ChipValidator mChipValidator)
-	{
-		this.mChipValidator = mChipValidator;
-	}
-
-	public List<Character> getValidChipSeparators()
-	{
-		return mValidChipSeparators;
-	}
-
-	public void setValidChipSeparators(List<Character> validChipSeparators)
-	{
-		mValidChipSeparators = validChipSeparators;
-	}
-
-	public FilterableListView getFilterableListView()
-	{
-		return mFilterableListView;
-	}
-
-	public RecyclerView getRecyclerView()
-	{
-		return mRecyclerView;
-	}
-
-	public interface ChipsListener
-	{
-		void onChipAdded(ChipInterface chip, int newSize);
-
-		void onChipRemoved(ChipInterface chip, int newSize);
-
-		void onTextChanged(CharSequence text);
-
-		void onNewChip(CharSequence text);
-
-		void onChipClicked(ChipInterface chip);
-	}
-
-	public interface ChipValidator
-	{
-		boolean areEquals(ChipInterface chip1, ChipInterface chip2);
-	}
-}
diff --git a/library/MaterialChipView/src/main/java/com/pchmn/materialchips/adapter/ChipsAdapter.java b/library/MaterialChipView/src/main/java/com/pchmn/materialchips/adapter/ChipsAdapter.java
deleted file mode 100755
index 236decd9..00000000
--- a/library/MaterialChipView/src/main/java/com/pchmn/materialchips/adapter/ChipsAdapter.java
+++ /dev/null
@@ -1,573 +0,0 @@
-package com.pchmn.materialchips.adapter;
-
-import android.content.Context;
-import android.os.Build;
-import android.support.v7.widget.RecyclerView;
-import android.text.Editable;
-import android.text.InputType;
-import android.text.TextWatcher;
-import android.view.KeyEvent;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.ViewTreeObserver;
-import android.view.inputmethod.EditorInfo;
-import android.widget.EditText;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
-
-import com.pchmn.materialchips.ChipView;
-import com.pchmn.materialchips.ChipsInput;
-import com.pchmn.materialchips.model.ChipInterface;
-import com.pchmn.materialchips.util.ViewUtil;
-import com.pchmn.materialchips.views.ChipsInputEditText;
-import com.pchmn.materialchips.views.DetailedChipView;
-import com.pchmn.materialchips.views.FilterableListView;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-
-public class ChipsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
-{
-
-	private static final String TAG            = ChipsAdapter.class.toString();
-	private static final int    TYPE_EDIT_TEXT = 0;
-	private static final int    TYPE_ITEM      = 1;
-	private Context    mContext;
-	private ChipsInput mChipsInput;
-	private List<ChipInterface> mChipList = new ArrayList<>();
-	private String             mHintLabel;
-	private ChipsInputEditText mEditText;
-	private EditTextViewHolder m_editTextViewHolder;
-	private RecyclerView       mRecycler;
-
-	public ChipsAdapter(Context context, ChipsInput chipsInput, RecyclerView recycler)
-	{
-		mContext = context;
-		mChipsInput = chipsInput;
-		mRecycler = recycler;
-		mHintLabel = mChipsInput.getHint();
-		mEditText = mChipsInput.generateEditText();
-		initEditText();
-	}
-
-	private class ItemViewHolder extends RecyclerView.ViewHolder
-	{
-
-		private final ChipView chipView;
-
-		ItemViewHolder(View view)
-		{
-			super(view);
-			chipView = (ChipView) view;
-		}
-	}
-
-	private class EditTextViewHolder extends RecyclerView.ViewHolder
-	{
-
-		private final EditText editText;
-
-		EditTextViewHolder(View view)
-		{
-			super(view);
-			editText = (EditText) view;
-		}
-	}
-
-	@Override
-	public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType)
-	{
-		if(viewType == TYPE_EDIT_TEXT)
-		{
-			if(m_editTextViewHolder == null)
-			{
-				m_editTextViewHolder = new EditTextViewHolder(mEditText);
-			}
-
-			if(mEditText.getParent() != null)
-			{
-				((ViewGroup) mEditText.getParent()).removeView(mEditText);
-			}
-			return m_editTextViewHolder;
-		}
-		else
-		{
-			return new ItemViewHolder(mChipsInput.getChipView());
-		}
-
-	}
-
-	@Override
-	public void onBindViewHolder(final RecyclerView.ViewHolder holder, int position)
-	{
-		// edit text
-		if(position == mChipList.size())
-		{
-			if(mChipList.size() == 0)
-			{
-				mEditText.setHint(mHintLabel);
-			}
-
-			// auto fit edit text
-			autofitEditText();
-		}
-		// chip
-		else if(getItemCount() > 1)
-		{
-			ItemViewHolder itemViewHolder = (ItemViewHolder) holder;
-			itemViewHolder.chipView.inflate(getItem(position));
-			// handle click
-			handleClickOnEditText(itemViewHolder.chipView, position);
-		}
-	}
-
-	@Override
-	public int getItemCount()
-	{
-		return mChipList.size() + 1;
-	}
-
-	private ChipInterface getItem(int position)
-	{
-		return mChipList.get(position);
-	}
-
-	@Override
-	public int getItemViewType(int position)
-	{
-		if(position == mChipList.size())
-		{
-			return TYPE_EDIT_TEXT;
-		}
-
-		return TYPE_ITEM;
-	}
-
-	@Override
-	public long getItemId(int position)
-	{
-		return mChipList.get(position).hashCode();
-	}
-
-	private void initEditText()
-	{
-		mEditText.setLayoutParams(new RelativeLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT));
-		mEditText.setHint(mHintLabel);
-		mEditText.setBackgroundResource(android.R.color.transparent);
-		// prevent fullscreen on landscape
-		mEditText.setImeOptions(EditorInfo.IME_FLAG_NO_EXTRACT_UI);
-		mEditText.setPrivateImeOptions("nm");
-		// no suggestion
-		mEditText.setInputType(InputType.TYPE_TEXT_VARIATION_PASSWORD);
-
-		// handle back space
-		mEditText.setOnKeyListener(new View.OnKeyListener()
-		{
-			@Override
-			public boolean onKey(View v, int keyCode, KeyEvent event)
-			{
-				// backspace
-				if(event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_DEL)
-				{
-					// remove last chip
-					if(mChipList.size() > 0 && mEditText.getText().toString().length() == 0)
-					{
-						removeChip(mChipList.size() - 1);
-					}
-				}
-				else if(event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)
-				{
-					if(mChipsInput.getChipAllowNew())
-					{
-						mChipsInput.onAddNewChip(mEditText.getText());
-						mEditText.setText("");
-					}
-				}
-				return false;
-			}
-		});
-
-		//Handle return key
-		mEditText.setOnEditorActionListener(new TextView.OnEditorActionListener()
-		{
-			@Override
-			public boolean onEditorAction(TextView v, int actionId, KeyEvent event)
-			{
-				if(actionId != EditorInfo.IME_NULL)
-				{
-					//They want to add a new tag
-					if(mChipsInput.getChipAllowNew())
-					{
-						mChipsInput.onAddNewChip(mEditText.getText());
-						mEditText.setText("");
-					}
-				}
-				return false;
-			}
-		});
-
-		// text changed
-		mEditText.addTextChangedListener(new TextWatcher()
-		{
-			@Override
-			public void beforeTextChanged(CharSequence s, int start, int count, int after)
-			{
-
-			}
-
-			@Override
-			public void onTextChanged(CharSequence s, int start, int before, int count)
-			{
-				mChipsInput.onTextChanged(s);
-			}
-
-			@Override
-			public void afterTextChanged(Editable s)
-			{
-
-			}
-		});
-	}
-
-	private void autofitEditText()
-	{
-		// min width of edit text = 50 dp
-		ViewGroup.LayoutParams params = mEditText.getLayoutParams();
-		params.width = ViewUtil.dpToPx(50);
-		mEditText.setLayoutParams(params);
-
-		// listen to change in the tree
-		mEditText.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener()
-		{
-
-			@Override
-			public void onGlobalLayout()
-			{
-				// get right of recycler and left of edit text
-				int right = mRecycler.getRight();
-				int left  = mEditText.getLeft();
-
-				// edit text will fill the space
-				ViewGroup.LayoutParams params = mEditText.getLayoutParams();
-				params.width = right - left - ViewUtil.dpToPx(8);
-				mEditText.setLayoutParams(params);
-
-				// request focus
-				mEditText.requestFocus();
-
-				// remove the listener:
-				if(Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN)
-				{
-					mEditText.getViewTreeObserver().removeGlobalOnLayoutListener(this);
-				}
-				else
-				{
-					mEditText.getViewTreeObserver().removeOnGlobalLayoutListener(this);
-				}
-			}
-
-		});
-	}
-
-	private void handleClickOnEditText(ChipView chipView, final int position)
-	{
-		// delete chip
-		chipView.setOnDeleteClicked(new View.OnClickListener()
-		{
-			@Override
-			public void onClick(View v)
-			{
-				removeChip(position);
-			}
-		});
-
-		// show detailed chip
-		if(mChipsInput.isShowChipDetailed())
-		{
-			chipView.setOnChipClicked(new View.OnClickListener()
-			{
-				@Override
-				public void onClick(View v)
-				{
-					// get chip position
-					int[] coord = new int[2];
-					v.getLocationInWindow(coord);
-
-					final DetailedChipView detailedChipView = mChipsInput.getDetailedChipView(getItem(position));
-					setDetailedChipViewPosition(detailedChipView, coord);
-
-					// delete button
-					detailedChipView.setOnDeleteClicked(new View.OnClickListener()
-					{
-						@Override
-						public void onClick(View v)
-						{
-							removeChip(position);
-							detailedChipView.fadeOut();
-						}
-					});
-
-					if(mChipsInput.shouldChipClickNotify())
-					{
-						mChipsInput.onChipClicked(getItem(position));
-					}
-				}
-			});
-		}
-		else if(mChipsInput.shouldChipClickNotify())
-		{
-			chipView.setOnChipClicked(new View.OnClickListener()
-			{
-				@Override
-				public void onClick(View v)
-				{
-					mChipsInput.onChipClicked(getItem(position));
-				}
-			});
-		}
-	}
-
-	private void setDetailedChipViewPosition(DetailedChipView detailedChipView, int[] coord)
-	{
-		// window width
-		ViewGroup rootView    = (ViewGroup) mRecycler.getRootView();
-		int       windowWidth = ViewUtil.getWindowWidth(mContext);
-
-		// chip size
-		RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(ViewUtil.dpToPx(300), ViewUtil.dpToPx(100));
-
-		layoutParams.addRule(RelativeLayout.ALIGN_PARENT_TOP);
-		layoutParams.addRule(RelativeLayout.ALIGN_PARENT_LEFT);
-
-		// align left window
-		if(coord[0] <= 0)
-		{
-			layoutParams.leftMargin = 0;
-			layoutParams.topMargin = coord[1] - ViewUtil.dpToPx(13);
-			detailedChipView.alignLeft();
-		}
-		// align right
-		else if(coord[0] + ViewUtil.dpToPx(300) > windowWidth + ViewUtil.dpToPx(13))
-		{
-			layoutParams.leftMargin = windowWidth - ViewUtil.dpToPx(300);
-			layoutParams.topMargin = coord[1] - ViewUtil.dpToPx(13);
-			detailedChipView.alignRight();
-		}
-		// same position as chip
-		else
-		{
-			layoutParams.leftMargin = coord[0] - ViewUtil.dpToPx(13);
-			layoutParams.topMargin = coord[1] - ViewUtil.dpToPx(13);
-		}
-
-		// show view
-		rootView.addView(detailedChipView, layoutParams);
-		detailedChipView.fadeIn();
-	}
-
-	public void setFilterableListView(FilterableListView filterableListView)
-	{
-		if(mEditText != null)
-		{
-			mEditText.setFilterableListView(filterableListView);
-		}
-	}
-
-	public void addChipsProgrammatically(List<ChipInterface> chipList)
-	{
-		if(chipList != null)
-		{
-			if(chipList.size() > 0)
-			{
-				int chipsBeforeAdding = getItemCount();
-				for(ChipInterface chip : chipList)
-				{
-					mChipList.add(chip);
-					mChipsInput.onChipAdded(chip, getItemCount());
-				}
-
-				// hide hint
-				mEditText.setHint(null);
-				// reset text
-				mEditText.setText(null);
-
-				notifyItemRangeChanged(chipsBeforeAdding, chipList.size());
-			}
-		}
-	}
-
-	public void addChip(ChipInterface chip)
-	{
-		if(!listContains(mChipList, chip))
-		{
-			mChipList.add(chip);
-			// notify listener
-			mChipsInput.onChipAdded(chip, mChipList.size());
-			// hide hint
-			mEditText.setHint(null);
-			// reset text
-			mEditText.setText(null);
-			// refresh data
-			notifyItemInserted(mChipList.size());
-		}
-	}
-
-	public void removeChip(ChipInterface chip)
-	{
-		int position = mChipList.indexOf(chip);
-		mChipList.remove(position);
-		// notify listener
-		//		notifyItemRangeChanged(position, getItemCount());
-		notifyItemRemoved(position);
-		// if 0 chip
-		if(mChipList.size() == 0)
-		{
-			mEditText.setHint(mHintLabel);
-		}
-		// refresh data
-		//		notifyDataSetChanged();
-	}
-
-	public void removeChip(int position)
-	{
-		ChipInterface chip = mChipList.get(position);
-		// remove contact
-		mChipList.remove(position);
-		// notify listener
-		mChipsInput.onChipRemoved(chip, mChipList.size());
-		// if 0 chip
-		if(mChipList.size() == 0)
-		{
-			mEditText.setHint(mHintLabel);
-		}
-		// refresh data
-		notifyDataSetChanged();
-	}
-
-	public void removeChipById(Object id)
-	{
-		for(Iterator<ChipInterface> iter = mChipList.listIterator(); iter.hasNext(); )
-		{
-			ChipInterface chip = iter.next();
-			if(chip.getId() != null && chip.getId().equals(id))
-			{
-				// remove chip
-				iter.remove();
-				// notify listener
-				mChipsInput.onChipRemoved(chip, mChipList.size());
-			}
-		}
-		// if 0 chip
-		if(mChipList.size() == 0)
-		{
-			mEditText.setHint(mHintLabel);
-		}
-		// refresh data
-		notifyDataSetChanged();
-	}
-
-	public void removeChipByLabel(String label)
-	{
-		for(Iterator<ChipInterface> iter = mChipList.listIterator(); iter.hasNext(); )
-		{
-			ChipInterface chip = iter.next();
-			if(chip.getLabel().equals(label))
-			{
-				// remove chip
-				iter.remove();
-				// notify listener
-				mChipsInput.onChipRemoved(chip, mChipList.size());
-			}
-		}
-		// if 0 chip
-		if(mChipList.size() == 0)
-		{
-			mEditText.setHint(mHintLabel);
-		}
-		// refresh data
-		notifyDataSetChanged();
-	}
-
-	public void removeChipByInfo(String info)
-	{
-		for(Iterator<ChipInterface> iter = mChipList.listIterator(); iter.hasNext(); )
-		{
-			ChipInterface chip = iter.next();
-			if(chip.getInfo() != null && chip.getInfo().equals(info))
-			{
-				// remove chip
-				iter.remove();
-				// notify listener
-				mChipsInput.onChipRemoved(chip, mChipList.size());
-			}
-		}
-		// if 0 chip
-		if(mChipList.size() == 0)
-		{
-			mEditText.setHint(mHintLabel);
-		}
-		// refresh data
-		notifyDataSetChanged();
-	}
-
-	public void removeAllChips()
-	{
-		for(int i = mChipList.size() - 1; i > -1; i--)
-		{
-			removeChip(i);
-		}
-	}
-
-	public List<ChipInterface> getChipList()
-	{
-		return mChipList;
-	}
-
-	private boolean listContains(List<ChipInterface> contactList, ChipInterface chip)
-	{
-
-		if(mChipsInput.getChipValidator() != null)
-		{
-			for(ChipInterface item : contactList)
-			{
-				if(mChipsInput.getChipValidator().areEquals(item, chip))
-				{
-					return true;
-				}
-			}
-		}
-		else
-		{
-			for(ChipInterface item : contactList)
-			{
-				if(chip.getId() != null && chip.getId().equals(item.getId()))
-				{
-					return true;
-				}
-				if(chip.getLabel().equals(item.getLabel()))
-				{
-					return true;
-				}
-			}
-		}
-
-		return false;
-	}
-
-	public ChipsInputEditText getEditText()
-	{
-		return mEditText;
-	}
-
-	public void setText(CharSequence text)
-	{
-		mEditText.setText(text);
-	}
-
-	public String getText()
-	{
-		return mEditText.getText().toString();
-	}
-}
diff --git a/library/MaterialChipView/src/main/java/com/pchmn/materialchips/adapter/FilterableAdapter.java b/library/MaterialChipView/src/main/java/com/pchmn/materialchips/adapter/FilterableAdapter.java
deleted file mode 100755
index 6591959a..00000000
--- a/library/MaterialChipView/src/main/java/com/pchmn/materialchips/adapter/FilterableAdapter.java
+++ /dev/null
@@ -1,364 +0,0 @@
-package com.pchmn.materialchips.adapter;
-
-
-import android.content.Context;
-import android.content.res.ColorStateList;
-import android.graphics.PorterDuff;
-import android.support.v7.widget.RecyclerView;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Filter;
-import android.widget.Filterable;
-import android.widget.TextView;
-
-import com.pchmn.materialchips.ChipsInput;
-import com.pchmn.materialchips.R;
-import com.pchmn.materialchips.model.ChipInterface;
-import com.pchmn.materialchips.util.ColorUtil;
-import com.pchmn.materialchips.util.LetterTileProvider;
-
-import java.text.Collator;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
-
-import de.hdodenhof.circleimageview.CircleImageView;
-
-import static android.view.View.GONE;
-
-public class FilterableAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> implements Filterable
-{
-
-	private static final String TAG = FilterableAdapter.class.toString();
-	// context
-	private Context mContext;
-	// list
-	private List<ChipInterface> mOriginalList = new ArrayList<>();
-	private List<ChipInterface> mChipList     = new ArrayList<>();
-	private List<ChipInterface> mFilteredList = new ArrayList<>();
-	private ChipFilter                mFilter;
-	private ChipsInput                mChipsInput;
-	private LetterTileProvider        mLetterTileProvider;
-	private ColorStateList            mBackgroundColor;
-	private ColorStateList            mTextColor;
-	private boolean                   mUseLetterTile;
-	// recycler
-	private RecyclerView              mRecyclerView;
-	// sort
-	private Comparator<ChipInterface> mComparator;
-	private Collator                  mCollator;
-
-
-	public FilterableAdapter(Context context, RecyclerView recyclerView, List<? extends ChipInterface> chipList, ChipsInput chipsInput, ColorStateList backgroundColor, ColorStateList textColor,
-	                         boolean useLetterTile)
-	{
-		mContext = context;
-		mRecyclerView = recyclerView;
-		mCollator = Collator.getInstance(Locale.getDefault());
-		mCollator.setStrength(Collator.PRIMARY);
-		mComparator = new Comparator<ChipInterface>()
-		{
-			@Override
-			public int compare(ChipInterface o1, ChipInterface o2)
-			{
-				return mCollator.compare(o1.getLabel(), o2.getLabel());
-			}
-		};
-
-		setChipList(chipList);
-		mLetterTileProvider = new LetterTileProvider(mContext);
-		mBackgroundColor = backgroundColor;
-		mTextColor = textColor;
-		mUseLetterTile = useLetterTile;
-		mChipsInput = chipsInput;
-
-		mChipsInput.addChipsListener(new ChipsInput.ChipsListener()
-		{
-			@Override
-			public void onChipAdded(ChipInterface chip, int newSize)
-			{
-				removeChip(chip);
-			}
-
-			@Override
-			public void onChipRemoved(ChipInterface chip, int newSize)
-			{
-				addChip(chip);
-			}
-
-			@Override
-			public void onTextChanged(CharSequence text)
-			{
-				mRecyclerView.scrollToPosition(0);
-			}
-
-			@Override
-			public void onNewChip(CharSequence text)
-			{
-				//Not used
-			}
-
-			@Override
-			public void onChipClicked(ChipInterface chip)
-			{
-				//Not used
-			}
-		});
-	}
-
-
-	/**
-	 * @param chipList The new list of suggestions
-	 * @return True if the list was modified, false if it wasn't
-	 */
-	public boolean setChipList(List<? extends ChipInterface> chipList)
-	{
-		// remove chips that do not have label
-		Iterator<? extends ChipInterface> iterator = chipList.iterator();
-		while(iterator.hasNext())
-		{
-			if(iterator.next().getLabel() == null)
-			{
-				iterator.remove();
-			}
-		}
-		sortList(chipList);
-		if(!mOriginalList.equals(chipList))
-		{
-			mOriginalList.clear();
-			mOriginalList.addAll(chipList);
-			mChipList.clear();
-			mChipList.addAll(chipList);
-			mFilteredList.clear();
-			mFilteredList.addAll(chipList);
-			return true;
-		}
-		return false;
-	}
-
-	private class ItemViewHolder extends RecyclerView.ViewHolder
-	{
-
-		private CircleImageView mAvatar;
-		private TextView        mLabel;
-		private TextView        mInfo;
-
-		ItemViewHolder(View view)
-		{
-			super(view);
-			mAvatar = (CircleImageView) view.findViewById(R.id.avatar);
-			mLabel = (TextView) view.findViewById(R.id.label);
-			mInfo = (TextView) view.findViewById(R.id.info);
-		}
-	}
-
-	@Override
-	public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType)
-	{
-		View view = LayoutInflater.from(mContext).inflate(R.layout.item_list_filterable, parent, false);
-		return new ItemViewHolder(view);
-	}
-
-	@Override
-	public void onBindViewHolder(RecyclerView.ViewHolder holder, int position)
-	{
-		ItemViewHolder      itemViewHolder = (ItemViewHolder) holder;
-		final ChipInterface chip           = getItem(position);
-
-		// avatar
-		if(mChipsInput.chipHasAvatarIcon() && !mUseLetterTile && chip.getAvatarUri() != null)
-		{
-			itemViewHolder.mAvatar.setVisibility(View.VISIBLE);
-			itemViewHolder.mAvatar.setImageURI(chip.getAvatarUri());
-		}
-		else if(mChipsInput.chipHasAvatarIcon() && !mUseLetterTile && chip.getAvatarDrawable() != null)
-		{
-			itemViewHolder.mAvatar.setVisibility(View.VISIBLE);
-			itemViewHolder.mAvatar.setImageDrawable(chip.getAvatarDrawable());
-		}
-		else if(mChipsInput.chipHasAvatarIcon() || mUseLetterTile)
-		{
-			itemViewHolder.mAvatar.setVisibility(View.VISIBLE);
-			itemViewHolder.mAvatar.setImageBitmap(mLetterTileProvider.getLetterTile(chip.getLabel()));
-		}
-		else
-		{
-			itemViewHolder.mAvatar.setVisibility(GONE);
-		}
-
-		// label
-		itemViewHolder.mLabel.setText(chip.getLabel());
-
-		// info
-		if(chip.getInfo() != null)
-		{
-			itemViewHolder.mInfo.setVisibility(View.VISIBLE);
-			itemViewHolder.mInfo.setText(chip.getInfo());
-		}
-		else
-		{
-			itemViewHolder.mInfo.setVisibility(GONE);
-		}
-
-		// colors
-		if(mBackgroundColor != null)
-		{
-			itemViewHolder.itemView.getBackground().setColorFilter(mBackgroundColor.getDefaultColor(), PorterDuff.Mode.SRC_ATOP);
-		}
-
-		if(mTextColor != null)
-		{
-			itemViewHolder.mLabel.setTextColor(mTextColor);
-			itemViewHolder.mInfo.setTextColor(ColorUtil.alpha(mTextColor.getDefaultColor(), 150));
-		}
-
-		// onclick
-		itemViewHolder.itemView.setOnClickListener(new View.OnClickListener()
-		{
-			@Override
-			public void onClick(View v)
-			{
-				if(mChipsInput != null)
-				{
-					mChipsInput.addChip(chip);
-				}
-			}
-		});
-	}
-
-	@Override
-	public int getItemCount()
-	{
-		return mFilteredList.size();
-	}
-
-	private ChipInterface getItem(int position)
-	{
-		return mFilteredList.get(position);
-	}
-
-	@Override
-	public Filter getFilter()
-	{
-		if(mFilter == null)
-		{
-			mFilter = new ChipFilter(this, mChipList);
-		}
-		return mFilter;
-	}
-
-	private class ChipFilter extends Filter
-	{
-
-		private FilterableAdapter   adapter;
-		private List<ChipInterface> originalList;
-		private List<ChipInterface> filteredList;
-
-		public ChipFilter(FilterableAdapter adapter, List<ChipInterface> originalList)
-		{
-			super();
-			this.adapter = adapter;
-			this.originalList = originalList;
-			this.filteredList = new ArrayList<>();
-		}
-
-		@Override
-		protected FilterResults performFiltering(CharSequence constraint)
-		{
-			filteredList.clear();
-			FilterResults results = new FilterResults();
-			if(constraint.length() == 0)
-			{
-				filteredList.addAll(originalList);
-			}
-			else
-			{
-				final String filterPattern = constraint.toString().toLowerCase().trim();
-				for(ChipInterface chip : originalList)
-				{
-					if(chip.getLabel().toLowerCase().contains(filterPattern))
-					{
-						filteredList.add(chip);
-					}
-					else if(chip.getInfo() != null && chip.getInfo().toLowerCase().replaceAll("\\s", "").contains(filterPattern))
-					{
-						filteredList.add(chip);
-					}
-				}
-			}
-
-			results.values = filteredList;
-			results.count = filteredList.size();
-			return results;
-		}
-
-		@Override
-		protected void publishResults(CharSequence constraint, FilterResults results)
-		{
-			mFilteredList.clear();
-			if(results != null && results.values != null)
-			{
-				mFilteredList.addAll((ArrayList<ChipInterface>) results.values);
-				notifyDataSetChanged();
-			}
-		}
-	}
-
-	private void removeChip(ChipInterface chip)
-	{
-		int position = mFilteredList.indexOf(chip);
-		if(position >= 0)
-		{
-			mFilteredList.remove(position);
-		}
-
-		position = mChipList.indexOf(chip);
-		if(position >= 0)
-		{
-			mChipList.remove(position);
-		}
-
-		notifyDataSetChanged();
-	}
-
-	private void addChip(ChipInterface chip)
-	{
-		if(contains(chip))
-		{
-			mChipList.add(chip);
-			mFilteredList.add(chip);
-			// sort original list
-			sortList(mChipList);
-			// sort filtered list
-			sortList(mFilteredList);
-
-			notifyDataSetChanged();
-		}
-	}
-
-	private boolean contains(ChipInterface chip)
-	{
-		for(ChipInterface item : mOriginalList)
-		{
-			if(item.equals(chip))
-			{
-				return true;
-			}
-		}
-		return false;
-	}
-
-	private void sortList(List<? extends ChipInterface> list)
-	{
-		Collections.sort(list, mComparator);
-	}
-
-	public List<ChipInterface> getFilteredList()
-	{
-		return mFilteredList;
-	}
-}
diff --git a/library/MaterialChipView/src/main/java/com/pchmn/materialchips/model/Chip.java b/library/MaterialChipView/src/main/java/com/pchmn/materialchips/model/Chip.java
deleted file mode 100755
index 90a9fecd..00000000
--- a/library/MaterialChipView/src/main/java/com/pchmn/materialchips/model/Chip.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package com.pchmn.materialchips.model;
-
-
-import android.graphics.drawable.Drawable;
-import android.net.Uri;
-import android.os.Parcel;
-import android.os.Parcelable;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-
-public class Chip implements ChipInterface, Comparable<Chip>
-{
-
-    private Object id;
-    private Uri avatarUri;
-    private Drawable avatarDrawable;
-    private String label;
-    private String info;
-
-    public Chip(@NonNull Object id, @Nullable Uri avatarUri, @NonNull String label, @Nullable String info) {
-        this.id = id;
-        this.avatarUri = avatarUri;
-        this.label = label;
-        this.info = info;
-    }
-
-    public Chip(@NonNull Object id, @Nullable Drawable avatarDrawable, @NonNull String label, @Nullable String info) {
-        this.id = id;
-        this.avatarDrawable = avatarDrawable;
-        this.label = label;
-        this.info = info;
-    }
-
-    public Chip(@Nullable Uri avatarUri, @NonNull String label, @Nullable String info) {
-        this.avatarUri = avatarUri;
-        this.label = label;
-        this.info = info;
-    }
-
-    public Chip(@Nullable Drawable avatarDrawable, @NonNull String label, @Nullable String info) {
-        this.avatarDrawable = avatarDrawable;
-        this.label = label;
-        this.info = info;
-    }
-
-    public Chip(@NonNull Object id, @NonNull String label, @Nullable String info) {
-        this.id = id;
-        this.label = label;
-        this.info = info;
-    }
-
-    public Chip(@NonNull String label, @Nullable String info) {
-        this.label = label;
-        this.info = info;
-    }
-
-    @Override
-    public Object getId() {
-        return id;
-    }
-
-    @Override
-    public Uri getAvatarUri() {
-        return avatarUri;
-    }
-
-    @Override
-    public Drawable getAvatarDrawable() {
-        return avatarDrawable;
-    }
-
-    @Override
-    public String getLabel() {
-        return label;
-    }
-
-    @Override
-    public String getInfo() {
-        return info;
-    }
-
-    @Override
-    public int compareTo(@NonNull Chip o)
-    {
-        if(this.getId().equals(o.getId()))
-            return 0;
-
-        return this.getLabel().compareTo(o.getLabel());
-    }
-
-    @Override
-    public int hashCode()
-    {
-        return this.getId().hashCode();
-    }
-
-    @Override
-    public boolean equals(Object obj)
-    {
-        if(obj == null || !(obj instanceof Chip))
-            return false;
-
-        if(this.getId() == null || ((Chip) obj).getId() == null)
-        	return super.equals(obj);
-
-        return this.getId().equals(((Chip)obj).getId());
-    }
-}
diff --git a/library/MaterialChipView/src/main/java/com/pchmn/materialchips/model/ChipInterface.java b/library/MaterialChipView/src/main/java/com/pchmn/materialchips/model/ChipInterface.java
deleted file mode 100755
index 1328b99a..00000000
--- a/library/MaterialChipView/src/main/java/com/pchmn/materialchips/model/ChipInterface.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.pchmn.materialchips.model;
-
-
-import android.graphics.drawable.Drawable;
-import android.net.Uri;
-
-public interface ChipInterface
-{
-
-    Object getId();
-    Uri getAvatarUri();
-    Drawable getAvatarDrawable();
-    String getLabel();
-    String getInfo();
-}
diff --git a/library/MaterialChipView/src/main/java/com/pchmn/materialchips/util/ActivityUtil.java b/library/MaterialChipView/src/main/java/com/pchmn/materialchips/util/ActivityUtil.java
deleted file mode 100755
index c119fad0..00000000
--- a/library/MaterialChipView/src/main/java/com/pchmn/materialchips/util/ActivityUtil.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.pchmn.materialchips.util;
-
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.ContextWrapper;
-
-public class ActivityUtil {
-
-    public static Activity scanForActivity(Context context) {
-        if (context == null)
-            return null;
-        else if (context instanceof Activity)
-            return (Activity)context;
-        else if (context instanceof ContextWrapper)
-            return scanForActivity(((ContextWrapper)context).getBaseContext());
-
-        return null;
-    }
-}
diff --git a/library/MaterialChipView/src/main/java/com/pchmn/materialchips/util/ColorUtil.java b/library/MaterialChipView/src/main/java/com/pchmn/materialchips/util/ColorUtil.java
deleted file mode 100755
index c1b118c1..00000000
--- a/library/MaterialChipView/src/main/java/com/pchmn/materialchips/util/ColorUtil.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.pchmn.materialchips.util;
-
-
-import android.content.Context;
-import android.content.res.ColorStateList;
-import android.graphics.Color;
-import android.util.TypedValue;
-
-import com.pchmn.materialchips.R;
-
-public class ColorUtil {
-
-    public static int lighter(int color, float factor) {
-        int red = (int) ((Color.red(color) * (1 - factor) / 255 + factor) * 255);
-        int green = (int) ((Color.green(color) * (1 - factor) / 255 + factor) * 255);
-        int blue = (int) ((Color.blue(color) * (1 - factor) / 255 + factor) * 255);
-        return Color.argb(Color.alpha(color), red, green, blue);
-    }
-
-    public static int lighter(ColorStateList color, float factor) {
-        return lighter(color.getDefaultColor(), factor);
-    }
-
-    public static int alpha(int color, int alpha) {
-        return Color.argb(alpha, Color.red(color), Color.green(color), Color.blue(color));
-    }
-
-    public static boolean isColorDark(int color){
-        double darkness = 1 - (0.2126*Color.red(color) + 0.7152*Color.green(color) + 0.0722*Color.blue(color))/255;
-        return darkness >= 0.5;
-    }
-
-    public static int getThemeAccentColor (final Context context) {
-        final TypedValue value = new TypedValue ();
-        context.getTheme ().resolveAttribute (R.attr.colorAccent, value, true);
-        return value.data;
-    }
-}
diff --git a/library/MaterialChipView/src/main/java/com/pchmn/materialchips/util/LetterTileProvider.java b/library/MaterialChipView/src/main/java/com/pchmn/materialchips/util/LetterTileProvider.java
deleted file mode 100755
index c7f886ed..00000000
--- a/library/MaterialChipView/src/main/java/com/pchmn/materialchips/util/LetterTileProvider.java
+++ /dev/null
@@ -1,220 +0,0 @@
-package com.pchmn.materialchips.util;
-
-import android.content.Context;
-import android.content.res.Resources;
-import android.content.res.TypedArray;
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Paint;
-import android.graphics.PorterDuff;
-import android.graphics.PorterDuffXfermode;
-import android.graphics.Rect;
-import android.graphics.Typeface;
-import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.Drawable;
-import android.support.v4.content.ContextCompat;
-import android.text.TextPaint;
-
-import com.pchmn.materialchips.R;
-
-
-/**
- * Used to create a {@link Bitmap} that contains a letter used in the English
- * alphabet or digit, if there is no letter or digit available, a default image
- * is shown instead
- */
-public class LetterTileProvider {
-
-    /** The number of available tile colors (see R.array.letter_tile_colors) */
-    private static final int NUM_OF_TILE_COLORS = 8;
-
-    /** The {@link TextPaint} used to draw the letter onto the tile */
-    private final TextPaint mPaint = new TextPaint();
-    /** The bounds that enclose the letter */
-    private final Rect mBounds = new Rect();
-    /** The {@link Canvas} to draw on */
-    private final Canvas mCanvas = new Canvas();
-    /** The first char of the name being displayed */
-    private final char[] mFirstChar = new char[1];
-
-    /** The background colors of the tile */
-    private final TypedArray mColors;
-    /** The font size used to display the letter */
-    private final int mTileLetterFontSize;
-    /** The default image to display */
-    private final Bitmap mDefaultBitmap;
-
-    /** Width */
-    private final int mWidth;
-    /** Height */
-    private final int mHeight;
-
-    /**
-     * Constructor for <code>LetterTileProvider</code>
-     *
-     * @param context The {@link Context} to use
-     */
-    public LetterTileProvider(Context context) {
-        final Resources res = context.getResources();
-
-        mPaint.setTypeface(Typeface.create("sans-serif-light", Typeface.NORMAL));
-        mPaint.setColor(Color.WHITE);
-        mPaint.setTextAlign(Paint.Align.CENTER);
-        mPaint.setAntiAlias(true);
-
-        mColors = res.obtainTypedArray(R.array.letter_tile_colors);
-        mTileLetterFontSize = res.getDimensionPixelSize(R.dimen.tile_letter_font_size);
-
-        //mDefaultBitmap = BitmapFactory.decodeResource(res, android.R.drawable.);
-        mDefaultBitmap = drawableToBitmap(ContextCompat.getDrawable(context, R.drawable.ic_person_white_24dp));
-        mWidth = res.getDimensionPixelSize(R.dimen.letter_tile_size);
-        mHeight = res.getDimensionPixelSize(R.dimen.letter_tile_size);
-    }
-
-    /**
-     * @param displayName The name used to create the letter for the tile
-     * @return A {@link Bitmap} that contains a letter used in the English
-     *         alphabet or digit, if there is no letter or digit available, a
-     *         default image is shown instead
-     */
-    public Bitmap getLetterTile(String displayName) {
-        // workaround
-        if(displayName == null || displayName.length() == 0)
-            return null;
-
-        final Bitmap bitmap = Bitmap.createBitmap(mWidth, mHeight, Bitmap.Config.ARGB_8888);
-
-        final char firstChar = displayName.charAt(0);
-
-        final Canvas c = mCanvas;
-        c.setBitmap(bitmap);
-        c.drawColor(pickColor(displayName));
-
-        if (isLetterOrDigit(firstChar)) {
-            mFirstChar[0] = Character.toUpperCase(firstChar);
-            mPaint.setTextSize(mTileLetterFontSize);
-            mPaint.getTextBounds(mFirstChar, 0, 1, mBounds);
-            c.drawText(mFirstChar, 0, 1, mWidth / 2, mHeight / 2
-                    + (mBounds.bottom - mBounds.top) / 2, mPaint);
-        }
-        else {
-            // (32 - 24) / 2 = 4
-            c.drawBitmap(mDefaultBitmap, ViewUtil.dpToPx(4), ViewUtil.dpToPx(4), null);
-        }
-        return bitmap;
-    }
-
-    /**
-     * @param displayName The name used to create the letter for the tile
-     * @return A circular {@link Bitmap} that contains a letter used in the English
-     *         alphabet or digit, if there is no letter or digit available, a
-     *         default image is shown instead
-     */
-    public Bitmap getCircularLetterTile(String displayName) {
-        // workaround
-        if(displayName == null || displayName.length() == 0)
-            displayName = ".";
-
-        final Bitmap bitmap = Bitmap.createBitmap(mWidth, mHeight, Bitmap.Config.ARGB_8888);
-        final char firstChar = displayName.charAt(0);
-
-        final Canvas c = mCanvas;
-        c.setBitmap(bitmap);
-        c.drawColor(pickColor(displayName));
-
-        if (isLetterOrDigit(firstChar)) {
-            mFirstChar[0] = Character.toUpperCase(firstChar);
-            mPaint.setTextSize(mTileLetterFontSize);
-            mPaint.getTextBounds(mFirstChar, 0, 1, mBounds);
-            c.drawText(mFirstChar, 0, 1, mWidth / 2, mHeight / 2
-                    + (mBounds.bottom - mBounds.top) / 2, mPaint);
-        } else {
-            // (32 - 24) / 2 = 4
-            c.drawBitmap(mDefaultBitmap, ViewUtil.dpToPx(4), ViewUtil.dpToPx(4), null);
-        }
-        return getCircularBitmap(bitmap);
-    }
-
-    /**
-     * @param c The char to check
-     * @return True if <code>c</code> is in the English alphabet or is a digit,
-     *         false otherwise
-     */
-    private static boolean isLetterOrDigit(char c) {
-        //return 'A' <= c && c <= 'Z' || 'a' <= c && c <= 'z' || '0' <= c && c <= '9';
-        return Character.isLetterOrDigit(c);
-    }
-
-    /**
-     * @param key The key used to generate the tile color
-     * @return A new or previously chosen color for <code>key</code> used as the
-     *         tile background color
-     */
-    private int pickColor(String key) {
-        // String.hashCode() is not supposed to change across java versions, so
-        // this should guarantee the same key always maps to the same color
-        final int color = Math.abs(key.hashCode()) % NUM_OF_TILE_COLORS;
-        try {
-            return mColors.getColor(color, Color.BLACK);
-        } finally {
-            // bug with recycler view
-            //mColors.recycle();
-        }
-    }
-
-    private Bitmap getCircularBitmap(Bitmap bitmap) {
-        Bitmap output;
-
-        if (bitmap.getWidth() > bitmap.getHeight()) {
-            output = Bitmap.createBitmap(bitmap.getHeight(), bitmap.getHeight(), Bitmap.Config.ARGB_8888);
-        } else {
-            output = Bitmap.createBitmap(bitmap.getWidth(), bitmap.getWidth(), Bitmap.Config.ARGB_8888);
-        }
-
-        Canvas canvas = new Canvas(output);
-
-        final int color = 0xff424242;
-        final Paint paint = new Paint();
-        final Rect rect = new Rect(0, 0, bitmap.getWidth(), bitmap.getHeight());
-
-        float r = 0;
-
-        if (bitmap.getWidth() > bitmap.getHeight()) {
-            r = bitmap.getHeight() / 2;
-        } else {
-            r = bitmap.getWidth() / 2;
-        }
-
-        paint.setAntiAlias(true);
-        canvas.drawARGB(0, 0, 0, 0);
-        paint.setColor(color);
-        canvas.drawCircle(r, r, r, paint);
-        paint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.SRC_IN));
-        canvas.drawBitmap(bitmap, rect, rect, paint);
-        return output;
-    }
-
-    public static Bitmap drawableToBitmap (Drawable drawable) {
-        Bitmap bitmap = null;
-
-        if (drawable instanceof BitmapDrawable) {
-            BitmapDrawable bitmapDrawable = (BitmapDrawable) drawable;
-            if(bitmapDrawable.getBitmap() != null) {
-                return bitmapDrawable.getBitmap();
-            }
-        }
-
-        if(drawable.getIntrinsicWidth() <= 0 || drawable.getIntrinsicHeight() <= 0) {
-            bitmap = Bitmap.createBitmap(1, 1, Bitmap.Config.ARGB_8888); // Single color bitmap will be created of 1x1 pixel
-        } else {
-            bitmap = Bitmap.createBitmap(drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight(), Bitmap.Config.ARGB_8888);
-        }
-
-        Canvas canvas = new Canvas(bitmap);
-        drawable.setBounds(0, 0, canvas.getWidth(), canvas.getHeight());
-        drawable.draw(canvas);
-        return bitmap;
-    }
-
-}
diff --git a/library/MaterialChipView/src/main/java/com/pchmn/materialchips/util/MyWindowCallback.java b/library/MaterialChipView/src/main/java/com/pchmn/materialchips/util/MyWindowCallback.java
deleted file mode 100755
index fc420c49..00000000
--- a/library/MaterialChipView/src/main/java/com/pchmn/materialchips/util/MyWindowCallback.java
+++ /dev/null
@@ -1,172 +0,0 @@
-package com.pchmn.materialchips.util;
-
-import android.app.Activity;
-import android.content.Context;
-import android.graphics.Rect;
-import android.os.Build;
-import android.support.annotation.Nullable;
-import android.support.annotation.RequiresApi;
-import android.view.ActionMode;
-import android.view.KeyEvent;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.MotionEvent;
-import android.view.SearchEvent;
-import android.view.View;
-import android.view.Window;
-import android.view.WindowManager;
-import android.view.accessibility.AccessibilityEvent;
-import android.view.inputmethod.InputMethodManager;
-
-import com.pchmn.materialchips.views.ChipsInputEditText;
-import com.pchmn.materialchips.views.DetailedChipView;
-
-public class MyWindowCallback implements Window.Callback {
-
-    private Window.Callback mLocalCallback;
-    private Activity mActivity;
-
-    public MyWindowCallback(Window.Callback localCallback, Activity activity) {
-        mLocalCallback = localCallback;
-        mActivity = activity;
-    }
-
-    @Override
-    public boolean dispatchKeyEvent(KeyEvent keyEvent) {
-        return mLocalCallback.dispatchKeyEvent(keyEvent);
-    }
-
-    @Override
-    public boolean dispatchKeyShortcutEvent(KeyEvent keyEvent) {
-        return mLocalCallback.dispatchKeyShortcutEvent(keyEvent);
-    }
-
-    @Override
-    public boolean dispatchTouchEvent(MotionEvent motionEvent) {
-        if (motionEvent.getAction() == MotionEvent.ACTION_DOWN) {
-            View v = mActivity.getCurrentFocus();
-            if(v instanceof DetailedChipView) {
-                Rect outRect = new Rect();
-                v.getGlobalVisibleRect(outRect);
-                if (!outRect.contains((int) motionEvent.getRawX(), (int) motionEvent.getRawY())) {
-                    ((DetailedChipView) v).fadeOut();
-                }
-            }
-            if (v instanceof ChipsInputEditText) {
-                Rect outRect = new Rect();
-                v.getGlobalVisibleRect(outRect);
-                if (!outRect.contains((int) motionEvent.getRawX(), (int) motionEvent.getRawY())
-                        && !((ChipsInputEditText) v).isFilterableListVisible()) {
-                    InputMethodManager imm = (InputMethodManager) mActivity.getSystemService(Context.INPUT_METHOD_SERVICE);
-                    imm.hideSoftInputFromWindow(v.getWindowToken(), 0);
-                }
-            }
-        }
-        return mLocalCallback.dispatchTouchEvent(motionEvent);
-    }
-
-    @Override
-    public boolean dispatchTrackballEvent(MotionEvent motionEvent) {
-        return mLocalCallback.dispatchTrackballEvent(motionEvent);
-    }
-
-    @Override
-    public boolean dispatchGenericMotionEvent(MotionEvent motionEvent) {
-        return mLocalCallback.dispatchGenericMotionEvent(motionEvent);
-    }
-
-    @Override
-    public boolean dispatchPopulateAccessibilityEvent(AccessibilityEvent accessibilityEvent) {
-        return mLocalCallback.dispatchPopulateAccessibilityEvent(accessibilityEvent);
-    }
-
-    @Nullable
-    @Override
-    public View onCreatePanelView(int i) {
-        return mLocalCallback.onCreatePanelView(i);
-    }
-
-    @Override
-    public boolean onCreatePanelMenu(int i, Menu menu) {
-        return mLocalCallback.onCreatePanelMenu(i, menu);
-    }
-
-    @Override
-    public boolean onPreparePanel(int i, View view, Menu menu) {
-        return mLocalCallback.onPreparePanel(i, view, menu);
-    }
-
-    @Override
-    public boolean onMenuOpened(int i, Menu menu) {
-        return mLocalCallback.onMenuOpened(i, menu);
-    }
-
-    @Override
-    public boolean onMenuItemSelected(int i, MenuItem menuItem) {
-        return mLocalCallback.onMenuItemSelected(i, menuItem);
-    }
-
-    @Override
-    public void onWindowAttributesChanged(WindowManager.LayoutParams layoutParams) {
-        mLocalCallback.onWindowAttributesChanged(layoutParams);
-    }
-
-    @Override
-    public void onContentChanged() {
-        mLocalCallback.onContentChanged();
-    }
-
-    @Override
-    public void onWindowFocusChanged(boolean b) {
-        mLocalCallback.onWindowFocusChanged(b);
-    }
-
-    @Override
-    public void onAttachedToWindow() {
-        mLocalCallback.onAttachedToWindow();
-    }
-
-    @Override
-    public void onDetachedFromWindow() {
-        mLocalCallback.onDetachedFromWindow();
-    }
-
-    @Override
-    public void onPanelClosed(int i, Menu menu) {
-        mLocalCallback.onPanelClosed(i, menu);
-    }
-
-    @Override
-    public boolean onSearchRequested() {
-        return mLocalCallback.onSearchRequested();
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.M)
-    @Override
-    public boolean onSearchRequested(SearchEvent searchEvent) {
-        return mLocalCallback.onSearchRequested(searchEvent);
-    }
-
-    @Nullable
-    @Override
-    public ActionMode onWindowStartingActionMode(ActionMode.Callback callback) {
-        return mLocalCallback.onWindowStartingActionMode(callback);
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.M)
-    @Nullable
-    @Override
-    public ActionMode onWindowStartingActionMode(ActionMode.Callback callback, int i) {
-        return mLocalCallback.onWindowStartingActionMode(callback, i);
-    }
-
-    @Override
-    public void onActionModeStarted(ActionMode actionMode) {
-        mLocalCallback.onActionModeStarted(actionMode);
-    }
-
-    @Override
-    public void onActionModeFinished(ActionMode actionMode) {
-        mLocalCallback.onActionModeFinished(actionMode);
-    }
-}
diff --git a/library/MaterialChipView/src/main/java/com/pchmn/materialchips/util/ViewUtil.java b/library/MaterialChipView/src/main/java/com/pchmn/materialchips/util/ViewUtil.java
deleted file mode 100755
index 28a78994..00000000
--- a/library/MaterialChipView/src/main/java/com/pchmn/materialchips/util/ViewUtil.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package com.pchmn.materialchips.util;
-
-import android.content.Context;
-import android.content.res.Configuration;
-import android.content.res.Resources;
-import android.util.DisplayMetrics;
-import android.view.KeyCharacterMap;
-import android.view.KeyEvent;
-import android.view.ViewConfiguration;
-
-public class ViewUtil {
-
-    private static int windowWidthPortrait = 0;
-    private static int windowWidthLandscape = 0;
-
-    public static int dpToPx(int dp) {
-        return (int) (dp * Resources.getSystem().getDisplayMetrics().density);
-    }
-
-    public static int pxToDp(int px) {
-        return (int) (px / Resources.getSystem().getDisplayMetrics().density);
-    }
-
-    public static int getWindowWidth(Context context) {
-        if (context.getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT) {
-            return getWindowWidthPortrait(context);
-        } else {
-            return getWindowWidthLandscape(context) - ViewUtil.getNavBarHeight(context);
-        }
-    }
-
-    private static int getWindowWidthPortrait(Context context) {
-        if (windowWidthPortrait == 0) {
-            DisplayMetrics metrics = context.getResources().getDisplayMetrics();
-            windowWidthPortrait = metrics.widthPixels;
-        }
-
-        return windowWidthPortrait;
-    }
-
-    private static int getWindowWidthLandscape(Context context) {
-        if (windowWidthLandscape == 0) {
-            DisplayMetrics metrics = context.getResources().getDisplayMetrics();
-            windowWidthLandscape = metrics.widthPixels;
-        }
-        return windowWidthLandscape;
-    }
-
-    public static int getNavBarHeight(Context context) {
-        int result = 0;
-        boolean hasMenuKey = ViewConfiguration.get(context).hasPermanentMenuKey();
-        boolean hasBackKey = KeyCharacterMap.deviceHasKey(KeyEvent.KEYCODE_BACK);
-
-        if (!hasMenuKey && !hasBackKey) {
-            //The device has a navigation bar
-            Resources resources = context.getResources();
-
-            int orientation = context.getResources().getConfiguration().orientation;
-            int resourceId;
-            if (isTablet(context)) {
-                resourceId = resources.getIdentifier(orientation == Configuration.ORIENTATION_PORTRAIT ? "navigation_bar_height" : "navigation_bar_height_landscape", "dimen", "android");
-            } else {
-                resourceId = resources.getIdentifier(orientation == Configuration.ORIENTATION_PORTRAIT ? "navigation_bar_height" : "navigation_bar_width", "dimen", "android");
-            }
-
-            if (resourceId > 0) {
-                return context.getResources().getDimensionPixelSize(resourceId);
-            }
-        }
-        return result;
-    }
-
-    private static boolean isTablet(Context context) {
-        return (context.getResources().getConfiguration().screenLayout
-                & Configuration.SCREENLAYOUT_SIZE_MASK)
-                >= Configuration.SCREENLAYOUT_SIZE_LARGE;
-    }
-}
diff --git a/library/MaterialChipView/src/main/java/com/pchmn/materialchips/views/ChipsInputEditText.java b/library/MaterialChipView/src/main/java/com/pchmn/materialchips/views/ChipsInputEditText.java
deleted file mode 100755
index e0a101bd..00000000
--- a/library/MaterialChipView/src/main/java/com/pchmn/materialchips/views/ChipsInputEditText.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.pchmn.materialchips.views;
-
-
-import android.content.Context;
-import android.text.InputType;
-import android.util.AttributeSet;
-
-public class ChipsInputEditText extends android.support.v7.widget.AppCompatEditText {
-
-    private FilterableListView filterableListView;
-
-    public ChipsInputEditText(Context context) {
-        super(context);
-    }
-
-    public ChipsInputEditText(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    public boolean isFilterableListVisible() {
-        return filterableListView != null && filterableListView.getVisibility() == VISIBLE;
-    }
-
-    public FilterableListView getFilterableListView() {
-        return filterableListView;
-    }
-
-    public void setFilterableListView(FilterableListView filterableListView) {
-        this.filterableListView = filterableListView;
-    }
-}
diff --git a/library/MaterialChipView/src/main/java/com/pchmn/materialchips/views/DetailedChipView.java b/library/MaterialChipView/src/main/java/com/pchmn/materialchips/views/DetailedChipView.java
deleted file mode 100755
index 93a35ad3..00000000
--- a/library/MaterialChipView/src/main/java/com/pchmn/materialchips/views/DetailedChipView.java
+++ /dev/null
@@ -1,267 +0,0 @@
-package com.pchmn.materialchips.views;
-
-import android.content.Context;
-import android.content.res.ColorStateList;
-import android.graphics.Bitmap;
-import android.graphics.Color;
-import android.graphics.PorterDuff;
-import android.graphics.drawable.Drawable;
-import android.net.Uri;
-import android.support.v4.content.ContextCompat;
-import android.util.AttributeSet;
-import android.view.View;
-import android.view.animation.AlphaAnimation;
-import android.widget.ImageButton;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
-
-import com.pchmn.materialchips.R;
-import com.pchmn.materialchips.model.ChipInterface;
-import com.pchmn.materialchips.util.ColorUtil;
-import com.pchmn.materialchips.util.LetterTileProvider;
-
-import de.hdodenhof.circleimageview.CircleImageView;
-
-
-public class DetailedChipView extends RelativeLayout {
-
-    private static final String TAG = DetailedChipView.class.toString();
-    // letter tile provider
-    private static LetterTileProvider mLetterTileProvider;
-    // xml elements
-    RelativeLayout mContentLayout;
-    CircleImageView mAvatarIconImageView;
-    TextView mNameTextView;
-    TextView mInfoTextView;
-    ImageButton mDeleteButton;
-    // context
-    private Context mContext;
-    // attributes
-    private ColorStateList mBackgroundColor;
-
-    public DetailedChipView(Context context) {
-        super(context);
-        mContext = context;
-        init(null);
-    }
-
-    public DetailedChipView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        mContext = context;
-        init(attrs);
-    }
-
-    private static DetailedChipView newInstance(Builder builder) {
-        DetailedChipView detailedChipView = new DetailedChipView(builder.context);
-        // avatar
-        if (builder.avatarUri != null)
-            detailedChipView.setAvatarIcon(builder.avatarUri);
-        else if (builder.avatarDrawable != null)
-            detailedChipView.setAvatarIcon(builder.avatarDrawable);
-        else
-            detailedChipView.setAvatarIcon(mLetterTileProvider.getLetterTile(builder.name));
-
-        // background color
-        if (builder.backgroundColor != null)
-            detailedChipView.setBackgroundColor(builder.backgroundColor);
-
-        // text color
-        if (builder.textColor != null)
-            detailedChipView.setTextColor(builder.textColor);
-        else if (ColorUtil.isColorDark(detailedChipView.getBackgroundColor()))
-            detailedChipView.setTextColor(ColorStateList.valueOf(Color.WHITE));
-        else
-            detailedChipView.setTextColor(ColorStateList.valueOf(Color.BLACK));
-
-        // delete icon color
-        if (builder.deleteIconColor != null)
-            detailedChipView.setDeleteIconColor(builder.deleteIconColor);
-        else if (ColorUtil.isColorDark(detailedChipView.getBackgroundColor()))
-            detailedChipView.setDeleteIconColor(ColorStateList.valueOf(Color.WHITE));
-        else
-            detailedChipView.setDeleteIconColor(ColorStateList.valueOf(Color.BLACK));
-
-        detailedChipView.setName(builder.name);
-        detailedChipView.setInfo(builder.info);
-        return detailedChipView;
-    }
-
-    /**
-     * Inflate the view according to attributes
-     *
-     * @param attrs the attributes
-     */
-    private void init(AttributeSet attrs) {
-        // inflate layout
-        View rootView = inflate(getContext(), R.layout.detailed_chip_view, this);
-        // butter knife
-        mContentLayout = (RelativeLayout) rootView.findViewById(R.id.content);
-        mAvatarIconImageView = (CircleImageView) rootView.findViewById(R.id.avatar_icon);
-        mNameTextView = (TextView) rootView.findViewById(R.id.name);
-        mInfoTextView = (TextView) rootView.findViewById(R.id.info);
-        mDeleteButton = (ImageButton) rootView.findViewById(R.id.delete_button);
-        // letter tile provider
-        mLetterTileProvider = new LetterTileProvider(mContext);
-
-        // hide on first
-        setVisibility(GONE);
-        // hide on touch outside
-        hideOnTouchOutside();
-    }
-
-    /**
-     * Hide the view on touch outside of it
-     */
-    private void hideOnTouchOutside() {
-        // set focusable
-        setFocusable(true);
-        setFocusableInTouchMode(true);
-        setClickable(true);
-    }
-
-    /**
-     * Fade in
-     */
-    public void fadeIn() {
-        AlphaAnimation anim = new AlphaAnimation(0.0f, 1.0f);
-        anim.setDuration(200);
-        startAnimation(anim);
-        setVisibility(VISIBLE);
-        // focus on the view
-        requestFocus();
-    }
-
-    /**
-     * Fade out
-     */
-    public void fadeOut() {
-        AlphaAnimation anim = new AlphaAnimation(1.0f, 0.0f);
-        anim.setDuration(200);
-        startAnimation(anim);
-        setVisibility(GONE);
-        // fix onclick issue
-        clearFocus();
-        setClickable(false);
-    }
-
-    public void setAvatarIcon(Drawable icon) {
-        mAvatarIconImageView.setImageDrawable(icon);
-    }
-
-    public void setAvatarIcon(Bitmap icon) {
-        mAvatarIconImageView.setImageBitmap(icon);
-    }
-
-    public void setAvatarIcon(Uri icon) {
-        mAvatarIconImageView.setImageURI(icon);
-    }
-
-    public void setName(String name) {
-        mNameTextView.setText(name);
-    }
-
-    public void setInfo(String info) {
-        if (info != null) {
-            mInfoTextView.setVisibility(VISIBLE);
-            mInfoTextView.setText(info);
-        } else {
-            mInfoTextView.setVisibility(GONE);
-        }
-    }
-
-    public void setTextColor(ColorStateList color) {
-        mNameTextView.setTextColor(color);
-        mInfoTextView.setTextColor(ColorUtil.alpha(color.getDefaultColor(), 150));
-    }
-
-    public void setBackgroundColor(ColorStateList color) {
-        mBackgroundColor = color;
-        mContentLayout.getBackground().setColorFilter(color.getDefaultColor(), PorterDuff.Mode.SRC_ATOP);
-    }
-
-    public int getBackgroundColor() {
-        return mBackgroundColor == null ? ContextCompat.getColor(mContext, R.color.colorAccent) : mBackgroundColor.getDefaultColor();
-    }
-
-    public void setDeleteIconColor(ColorStateList color) {
-        mDeleteButton.getDrawable().mutate().setColorFilter(color.getDefaultColor(), PorterDuff.Mode.SRC_ATOP);
-    }
-
-    public void setOnDeleteClicked(OnClickListener onClickListener) {
-        mDeleteButton.setOnClickListener(onClickListener);
-    }
-
-    public void alignLeft() {
-        RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams) mContentLayout.getLayoutParams();
-        params.leftMargin = 0;
-        mContentLayout.setLayoutParams(params);
-    }
-
-    public void alignRight() {
-        RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams) mContentLayout.getLayoutParams();
-        params.rightMargin = 0;
-        mContentLayout.setLayoutParams(params);
-    }
-
-    public static class Builder {
-        private Context context;
-        private Uri avatarUri;
-        private Drawable avatarDrawable;
-        private String name;
-        private String info;
-        private ColorStateList textColor;
-        private ColorStateList backgroundColor;
-        private ColorStateList deleteIconColor;
-
-        public Builder(Context context) {
-            this.context = context;
-        }
-
-        public Builder avatar(Uri avatarUri) {
-            this.avatarUri = avatarUri;
-            return this;
-        }
-
-        public Builder avatar(Drawable avatarDrawable) {
-            this.avatarDrawable = avatarDrawable;
-            return this;
-        }
-
-        public Builder name(String name) {
-            this.name = name;
-            return this;
-        }
-
-        public Builder info(String info) {
-            this.info = info;
-            return this;
-        }
-
-        public Builder chip(ChipInterface chip) {
-            this.avatarUri = chip.getAvatarUri();
-            this.avatarDrawable = chip.getAvatarDrawable();
-            this.name = chip.getLabel();
-            this.info = chip.getInfo();
-            return this;
-        }
-
-        public Builder textColor(ColorStateList textColor) {
-            this.textColor = textColor;
-            return this;
-        }
-
-        public Builder backgroundColor(ColorStateList backgroundColor) {
-            this.backgroundColor = backgroundColor;
-            return this;
-        }
-
-        public Builder deleteIconColor(ColorStateList deleteIconColor) {
-            this.deleteIconColor = deleteIconColor;
-            return this;
-        }
-
-        public DetailedChipView build() {
-            return DetailedChipView.newInstance(this);
-        }
-    }
-}
diff --git a/library/MaterialChipView/src/main/java/com/pchmn/materialchips/views/FilterableListView.java b/library/MaterialChipView/src/main/java/com/pchmn/materialchips/views/FilterableListView.java
deleted file mode 100755
index 61a4e87f..00000000
--- a/library/MaterialChipView/src/main/java/com/pchmn/materialchips/views/FilterableListView.java
+++ /dev/null
@@ -1,256 +0,0 @@
-package com.pchmn.materialchips.views;
-
-
-import android.content.Context;
-import android.content.res.ColorStateList;
-import android.content.res.Configuration;
-import android.content.res.Resources;
-import android.graphics.Rect;
-import android.os.Handler;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.util.TypedValue;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.ViewTreeObserver;
-import android.view.animation.AlphaAnimation;
-import android.widget.Filter;
-import android.widget.RelativeLayout;
-
-import com.pchmn.materialchips.ChipsInput;
-import com.pchmn.materialchips.R;
-import com.pchmn.materialchips.adapter.FilterableAdapter;
-import com.pchmn.materialchips.model.ChipInterface;
-import com.pchmn.materialchips.util.ViewUtil;
-
-import java.util.List;
-
-public class FilterableListView extends RelativeLayout
-{
-
-	private static final String TAG = FilterableListView.class.toString();
-	// list
-	RecyclerView mRecyclerView;
-	private Context           mContext;
-	private FilterableAdapter mAdapter;
-	private CharSequence mLastFilter = "";
-	// others
-	private ChipsInput      mChipsInput;
-	private List<Character> mValidChipsSeparators;
-
-	public FilterableListView(Context context)
-	{
-		super(context);
-		mContext = context;
-		init();
-	}
-
-	private void init()
-	{
-		// inflate layout
-		View view = inflate(getContext(), R.layout.list_filterable_view, this);
-
-		mRecyclerView = view.findViewById(R.id.recycler_view);
-
-		// recycler
-		mRecyclerView.setLayoutManager(new LinearLayoutManager(mContext, LinearLayoutManager.VERTICAL, false));
-
-		// hide on first
-		setVisibility(GONE);
-	}
-
-
-	public void build(List<? extends ChipInterface> filterableList, ChipsInput chipsInput, ColorStateList backgroundColor, ColorStateList textColor, boolean useLetterTile,
-	                  List<Character> validChipsSeparators)
-	{
-		mChipsInput = chipsInput;
-		mValidChipsSeparators = validChipsSeparators;
-		// adapter
-		mAdapter = new FilterableAdapter(mContext, mRecyclerView, filterableList, chipsInput, backgroundColor, textColor, useLetterTile);
-		mRecyclerView.setAdapter(mAdapter);
-		if(backgroundColor != null)
-		{
-			//			mRecyclerView.getBackground().setColorFilter(backgroundColor.getDefaultColor(), PorterDuff.Mode.SRC_ATOP);
-			mRecyclerView.setBackgroundColor(backgroundColor.getDefaultColor());
-		}
-
-		// listen to change in the tree
-		mChipsInput.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener()
-		{
-			private int previousHeightDiff = -1;
-
-			@Override
-			public void onGlobalLayout()
-			{
-				ViewGroup rootView = (ViewGroup) mChipsInput.getRootView();
-				if(getParent() == null)
-				{
-					// size
-					RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(ViewUtil.getWindowWidth(mContext), ViewGroup.LayoutParams.MATCH_PARENT);
-
-					layoutParams.addRule(RelativeLayout.ALIGN_PARENT_TOP);
-					layoutParams.addRule(RelativeLayout.ALIGN_PARENT_LEFT);
-
-					if(mContext.getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT)
-					{
-						//						layoutParams.bottomMargin = ViewUtil.getNavBarHeight(mContext);
-					}
-					else
-					{
-						layoutParams.leftMargin = ViewUtil.getNavBarHeight(mContext);
-						layoutParams.rightMargin = ViewUtil.getNavBarHeight(mContext);
-					}
-
-					// add view
-					rootView.addView(FilterableListView.this, layoutParams);
-				}
-				else
-				{
-					Handler handler = new Handler();
-					handler.postDelayed(new Runnable()
-					{
-						@Override
-						public void run()
-						{
-							int  y = (int) getY();
-							if(y > 0)
-							{
-								Rect r = new Rect();
-								//r will be populated with the coordinates of your view that area still visible.
-								mChipsInput.getWindowVisibleDisplayFrame(r);
-								int rootViewHeight = mChipsInput.getRootView().getHeight();
-								int heightDiff     = rootViewHeight - (r.bottom - r.top);
-								if(heightDiff != previousHeightDiff)
-								{
-									int[] absPosition = new int[2];
-									mChipsInput.getLocationInWindow(absPosition);
-									int chipsInputHeight = mChipsInput.getHeight();
-									previousHeightDiff = heightDiff;
-									ViewGroup.LayoutParams layoutParams = getLayoutParams();
-									int                    newHeight    = rootViewHeight - heightDiff - y + r.top;
-									layoutParams.height = newHeight;
-									requestLayout();
-								}
-							}
-						}
-					}, 500);
-				}
-
-				// remove the listener:
-				//				if(Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN)
-				//				{
-				//					mChipsInput.getViewTreeObserver().removeGlobalOnLayoutListener(this);
-				//				}
-				//				else
-				//				{
-				//					mChipsInput.getViewTreeObserver().removeOnGlobalLayoutListener(this);
-				//				}
-			}
-
-		});
-
-		mChipsInput.addOnLayoutChangeListener(new OnLayoutChangeListener()
-		{
-			@Override
-			public void onLayoutChange(View v, int left, int top, int right, int bottom, int oldLeft, int oldTop, int oldRight, int oldBottom)
-			{
-				if(getVisibility() == GONE)
-				{
-					return;
-				}
-
-				int[] coord = new int[2];
-				mChipsInput.getLocationInWindow(coord);
-				MarginLayoutParams layoutParams = (MarginLayoutParams) getLayoutParams();
-				layoutParams.topMargin = coord[1] + mChipsInput.getHeight();
-				setLayoutParams(layoutParams);
-			}
-		});
-	}
-
-	private int dp2pixels(@NonNull Context context, float dp)
-	{
-		Resources r  = context.getResources();
-		float     px = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp, r.getDisplayMetrics());
-		return (int) px;
-	}
-
-	public void setFilterableList(List<? extends ChipInterface> filterableList)
-	{
-		if(mAdapter.setChipList(filterableList))
-		{
-			filterList(mLastFilter);
-		}
-	}
-
-	public void filterList(CharSequence text)
-	{
-		mLastFilter = text;
-		//		if(TextUtils.isEmpty(text) || mValidChipsSeparators.contains(text.toString().charAt(text.length() - 1)))
-		//		{
-		//			fadeOut();
-		//			return;
-		//		}
-		mAdapter.getFilter().filter(text, new Filter.FilterListener()
-		{
-			@Override
-			public void onFilterComplete(int count)
-			{
-				// show if there are results
-//				if(mAdapter.getItemCount() > 0)
-//				{
-//					fadeIn();
-//				}
-				//				else
-				//				{
-				//					fadeOut();
-				//				}
-			}
-		});
-	}
-
-	/**
-	 * Fade in
-	 */
-	public void fadeIn()
-	{
-		if(getVisibility() == VISIBLE)
-		{
-			return;
-		}
-
-		int[] coord = new int[2];
-		mChipsInput.getLocationInWindow(coord);
-		MarginLayoutParams layoutParams = (MarginLayoutParams) getLayoutParams();
-		layoutParams.topMargin = coord[1] + mChipsInput.getHeight();
-		setLayoutParams(layoutParams);
-
-		AlphaAnimation anim = new AlphaAnimation(0.0f, 1.0f);
-		anim.setDuration(200);
-		startAnimation(anim);
-		setVisibility(VISIBLE);
-	}
-
-	/**
-	 * Fade out
-	 */
-	public void fadeOut()
-	{
-		mLastFilter = "";
-		if(getVisibility() == GONE)
-		{
-			return;
-		}
-
-		AlphaAnimation anim = new AlphaAnimation(1.0f, 0.0f);
-		anim.setDuration(200);
-		startAnimation(anim);
-		setVisibility(GONE);
-	}
-
-	public FilterableAdapter getFilterableAdapter()
-	{
-		return mAdapter;
-	}
-}
diff --git a/library/MaterialChipView/src/main/java/com/pchmn/materialchips/views/ScrollViewMaxHeight.java b/library/MaterialChipView/src/main/java/com/pchmn/materialchips/views/ScrollViewMaxHeight.java
deleted file mode 100755
index db212ff6..00000000
--- a/library/MaterialChipView/src/main/java/com/pchmn/materialchips/views/ScrollViewMaxHeight.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.pchmn.materialchips.views;
-
-
-import android.content.Context;
-import android.content.res.TypedArray;
-import android.support.v4.widget.NestedScrollView;
-import android.util.AttributeSet;
-
-import com.pchmn.materialchips.R;
-import com.pchmn.materialchips.util.ViewUtil;
-
-public class ScrollViewMaxHeight extends NestedScrollView {
-
-    private int mMaxHeight;
-    private int mWidthMeasureSpec;
-
-    public ScrollViewMaxHeight(Context context) {
-        super(context);
-    }
-
-    public ScrollViewMaxHeight(Context context, AttributeSet attrs) {
-        super(context, attrs);
-
-        TypedArray a = context.getTheme().obtainStyledAttributes(
-                attrs,
-                R.styleable.ScrollViewMaxHeight,
-                0, 0);
-
-        try {
-            mMaxHeight = a.getDimensionPixelSize(R.styleable.ScrollViewMaxHeight_maxHeight, ViewUtil.dpToPx(300));
-        }
-        finally {
-            a.recycle();
-        }
-    }
-
-    public void setMaxHeight(int height) {
-        mMaxHeight = height;
-        int heightMeasureSpec = MeasureSpec.makeMeasureSpec(mMaxHeight, MeasureSpec.AT_MOST);
-        measure(mWidthMeasureSpec, heightMeasureSpec);
-    }
-
-    @Override
-    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-        mWidthMeasureSpec = widthMeasureSpec;
-        heightMeasureSpec = MeasureSpec.makeMeasureSpec(mMaxHeight, MeasureSpec.AT_MOST);
-        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
-    }
-}
diff --git a/library/MaterialChipView/src/main/res/drawable-v21/ripple_chip_view.xml b/library/MaterialChipView/src/main/res/drawable-v21/ripple_chip_view.xml
deleted file mode 100644
index aea2c3a4..00000000
--- a/library/MaterialChipView/src/main/res/drawable-v21/ripple_chip_view.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="?android:attr/colorControlHighlight">
-    <item>
-        <shape android:shape="rectangle">
-            <solid android:color="@color/white_transparency" />
-            <corners android:radius="16dp" />
-        </shape>
-    </item>
-    <item android:drawable="@drawable/bg_chip_view" />
-</ripple>
\ No newline at end of file
diff --git a/library/MaterialChipView/src/main/res/drawable/bg_chip_view.xml b/library/MaterialChipView/src/main/res/drawable/bg_chip_view.xml
deleted file mode 100644
index 58b375ec..00000000
--- a/library/MaterialChipView/src/main/res/drawable/bg_chip_view.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape
-            android:shape="rectangle">
-            <solid android:color="@color/colorChipViewBackground"/>
-            <corners android:radius="16dp"/>
-        </shape>
-    </item>
-</layer-list>
\ No newline at end of file
diff --git a/library/MaterialChipView/src/main/res/drawable/bg_chip_view_opened.xml b/library/MaterialChipView/src/main/res/drawable/bg_chip_view_opened.xml
deleted file mode 100644
index 69dbc5bd..00000000
--- a/library/MaterialChipView/src/main/res/drawable/bg_chip_view_opened.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape
-            android:shape="rectangle">
-            <solid android:color="@color/colorAccent"/>
-            <corners android:radius="2dp"/>
-        </shape>
-    </item>
-</layer-list>
\ No newline at end of file
diff --git a/library/MaterialChipView/src/main/res/drawable/ic_cancel_grey_24dp.xml b/library/MaterialChipView/src/main/res/drawable/ic_cancel_grey_24dp.xml
deleted file mode 100644
index f9b26632..00000000
--- a/library/MaterialChipView/src/main/res/drawable/ic_cancel_grey_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="20dp"
-        android:height="20dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#A6A6A6"
-        android:pathData="M12,2C6.47,2 2,6.47 2,12s4.47,10 10,10 10,-4.47 10,-10S17.53,2 12,2zM17,15.59L15.59,17 12,13.41 8.41,17 7,15.59 10.59,12 7,8.41 8.41,7 12,10.59 15.59,7 17,8.41 13.41,12 17,15.59z"/>
-</vector>
diff --git a/library/MaterialChipView/src/main/res/drawable/ic_cancel_white_24dp.xml b/library/MaterialChipView/src/main/res/drawable/ic_cancel_white_24dp.xml
deleted file mode 100644
index e6545bf8..00000000
--- a/library/MaterialChipView/src/main/res/drawable/ic_cancel_white_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#fff"
-        android:pathData="M12,2C6.47,2 2,6.47 2,12s4.47,10 10,10 10,-4.47 10,-10S17.53,2 12,2zM17,15.59L15.59,17 12,13.41 8.41,17 7,15.59 10.59,12 7,8.41 8.41,7 12,10.59 15.59,7 17,8.41 13.41,12 17,15.59z"/>
-</vector>
diff --git a/library/MaterialChipView/src/main/res/drawable/ic_person_outline_white_24dp.xml b/library/MaterialChipView/src/main/res/drawable/ic_person_outline_white_24dp.xml
deleted file mode 100644
index 69453b4e..00000000
--- a/library/MaterialChipView/src/main/res/drawable/ic_person_outline_white_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#fff"
-        android:pathData="M12,5.9c1.16,0 2.1,0.94 2.1,2.1s-0.94,2.1 -2.1,2.1S9.9,9.16 9.9,8s0.94,-2.1 2.1,-2.1m0,9c2.97,0 6.1,1.46 6.1,2.1v1.1L5.9,18.1L5.9,17c0,-0.64 3.13,-2.1 6.1,-2.1M12,4C9.79,4 8,5.79 8,8s1.79,4 4,4 4,-1.79 4,-4 -1.79,-4 -4,-4zM12,13c-2.67,0 -8,1.34 -8,4v3h16v-3c0,-2.66 -5.33,-4 -8,-4z"/>
-</vector>
diff --git a/library/MaterialChipView/src/main/res/drawable/ic_person_white_24dp.xml b/library/MaterialChipView/src/main/res/drawable/ic_person_white_24dp.xml
deleted file mode 100644
index 22ca1566..00000000
--- a/library/MaterialChipView/src/main/res/drawable/ic_person_white_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#aaffffff"
-        android:pathData="M12,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM12,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z"/>
-</vector>
diff --git a/library/MaterialChipView/src/main/res/drawable/ripple_chip_view.xml b/library/MaterialChipView/src/main/res/drawable/ripple_chip_view.xml
deleted file mode 100644
index 58b375ec..00000000
--- a/library/MaterialChipView/src/main/res/drawable/ripple_chip_view.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape
-            android:shape="rectangle">
-            <solid android:color="@color/colorChipViewBackground"/>
-            <corners android:radius="16dp"/>
-        </shape>
-    </item>
-</layer-list>
\ No newline at end of file
diff --git a/library/MaterialChipView/src/main/res/layout/chip_view.xml b/library/MaterialChipView/src/main/res/layout/chip_view.xml
deleted file mode 100644
index ca159166..00000000
--- a/library/MaterialChipView/src/main/res/layout/chip_view.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/container"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:background="@drawable/bg_chip_view">
-
-    <!-- content -->
-    <LinearLayout
-        android:id="@+id/content"
-        android:layout_width="wrap_content"
-        android:layout_height="32dp"
-        android:background="@drawable/ripple_chip_view"
-        android:clickable="true"
-        android:focusable="true"
-        android:orientation="horizontal">
-
-        <!-- avatar -->
-        <de.hdodenhof.circleimageview.CircleImageView
-            android:id="@+id/icon"
-            android:layout_width="32dp"
-            android:layout_height="32dp"
-            android:visibility="gone"
-            tools:src="@tools:sample/avatars"
-            tools:visibility="visible" />
-
-        <!-- label -->
-        <TextView
-            android:id="@+id/label"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:layout_weight="1"
-            android:ellipsize="marquee"
-            android:paddingEnd="8dp"
-            android:paddingLeft="8dp"
-            android:paddingRight="8dp"
-            android:paddingStart="8dp"
-            android:singleLine="true"
-            android:textSize="14sp"
-            tools:text="@tools:sample/lorem/random" />
-
-        <!-- remove button -->
-        <ImageButton
-            android:id="@+id/delete_button"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
-            android:layout_gravity="center_vertical"
-            android:layout_marginLeft="4dp"
-            android:layout_marginRight="4dp"
-            android:background="?attr/selectableItemBackgroundBorderless"
-            android:contentDescription="@android:string/cancel"
-            android:src="@drawable/ic_cancel_grey_24dp" />
-
-    </LinearLayout>
-
-</RelativeLayout>
diff --git a/library/MaterialChipView/src/main/res/layout/chip_view_wide.xml b/library/MaterialChipView/src/main/res/layout/chip_view_wide.xml
deleted file mode 100644
index 2f033218..00000000
--- a/library/MaterialChipView/src/main/res/layout/chip_view_wide.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                xmlns:tools="http://schemas.android.com/tools"
-                android:id="@+id/container"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@drawable/bg_chip_view">
-
-    <!-- content -->
-    <LinearLayout
-        android:id="@+id/content"
-        android:layout_width="match_parent"
-        android:layout_height="32dp"
-        android:background="@drawable/ripple_chip_view"
-        android:clickable="true"
-        android:focusable="true"
-        android:orientation="horizontal">
-
-        <!-- avatar -->
-        <de.hdodenhof.circleimageview.CircleImageView
-            android:id="@+id/icon"
-            android:layout_width="32dp"
-            android:layout_height="32dp"
-            android:visibility="gone"
-            tools:src="@tools:sample/avatars"
-            tools:visibility="visible" />
-
-        <!-- label -->
-        <TextView
-            android:id="@+id/label"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:layout_weight="1"
-            android:ellipsize="marquee"
-            android:paddingEnd="8dp"
-            android:paddingLeft="8dp"
-            android:paddingRight="8dp"
-            android:paddingStart="8dp"
-            android:singleLine="true"
-            android:textSize="14sp"
-            tools:text="@tools:sample/lorem/random" />
-
-        <!-- remove button -->
-        <ImageButton
-            android:id="@+id/delete_button"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
-            android:layout_gravity="center_vertical"
-            android:layout_marginLeft="4dp"
-            android:layout_marginRight="4dp"
-            android:background="?attr/selectableItemBackgroundBorderless"
-            android:contentDescription="@android:string/cancel"
-            android:src="@drawable/ic_cancel_grey_24dp" />
-
-    </LinearLayout>
-
-</RelativeLayout>
diff --git a/library/MaterialChipView/src/main/res/layout/chips_input.xml b/library/MaterialChipView/src/main/res/layout/chips_input.xml
deleted file mode 100644
index 87c9f25b..00000000
--- a/library/MaterialChipView/src/main/res/layout/chips_input.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/container"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:scrollbars="vertical">
-
-    <android.support.v7.widget.RecyclerView
-        android:id="@+id/chips_recycler"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:paddingBottom="8dp"
-        android:paddingTop="8dp" />
-
-</android.support.v4.widget.NestedScrollView>
\ No newline at end of file
diff --git a/library/MaterialChipView/src/main/res/layout/detailed_chip_view.xml b/library/MaterialChipView/src/main/res/layout/detailed_chip_view.xml
deleted file mode 100644
index b6edb9d7..00000000
--- a/library/MaterialChipView/src/main/res/layout/detailed_chip_view.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/container"
-    android:layout_width="300dp"
-    android:layout_height="100dp"
-    android:clickable="true"
-    android:focusable="true"
-    android:focusableInTouchMode="true">
-
-    <!-- content -->
-    <RelativeLayout
-        android:id="@+id/content"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginBottom="12dp"
-        android:layout_marginLeft="12dp"
-        android:layout_marginRight="12dp"
-        android:layout_marginTop="12dp"
-        android:background="@drawable/bg_chip_view_opened"
-        android:clickable="true"
-        android:elevation="6dp"
-        android:focusable="true">
-
-        <!-- avatar icon -->
-        <de.hdodenhof.circleimageview.CircleImageView
-            android:id="@+id/avatar_icon"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:layout_centerVertical="true"
-            android:layout_marginLeft="12dp"
-            android:layout_marginRight="12dp"
-            tools:src="@tools:sample/avatars" />
-
-        <!-- info -->
-        <LinearLayout
-            android:id="@+id/info_layout"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_toEndOf="@+id/avatar_icon"
-            android:layout_toLeftOf="@+id/delete_button"
-            android:layout_toRightOf="@+id/avatar_icon"
-            android:layout_toStartOf="@+id/delete_button"
-            android:orientation="vertical"
-            android:paddingBottom="16dp"
-            android:paddingTop="16dp">
-
-            <!-- name -->
-            <TextView
-                android:id="@+id/name"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:ellipsize="end"
-                android:maxLines="1"
-                android:scrollHorizontally="true"
-                android:textSize="16sp"
-                tools:text="@tools:sample/full_names" />
-
-            <!-- info -->
-            <TextView
-                android:id="@+id/info"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="2dp"
-                android:ellipsize="end"
-                android:maxLines="2"
-                android:scrollHorizontally="true"
-                android:textSize="14sp"
-                tools:text="@tools:sample/lorem" />
-
-        </LinearLayout>
-
-        <!-- delete button -->
-        <ImageButton
-            android:id="@+id/delete_button"
-            android:layout_width="30dp"
-            android:layout_height="30dp"
-            android:layout_alignParentEnd="true"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
-            android:layout_marginEnd="10dp"
-            android:layout_marginRight="10dp"
-            android:background="?attr/selectableItemBackgroundBorderless"
-            android:contentDescription="@android:string/cancel"
-            android:src="@drawable/ic_cancel_white_24dp" />
-
-    </RelativeLayout>
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/library/MaterialChipView/src/main/res/layout/item_list_filterable.xml b/library/MaterialChipView/src/main/res/layout/item_list_filterable.xml
deleted file mode 100644
index cb5fc9e5..00000000
--- a/library/MaterialChipView/src/main/res/layout/item_list_filterable.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="@android:color/white"
-    android:clickable="true"
-    android:focusable="true"
-    android:foreground="?attr/selectableItemBackground"
-    android:orientation="horizontal">
-
-    <!-- avatar -->
-    <de.hdodenhof.circleimageview.CircleImageView
-        android:id="@+id/avatar"
-        android:layout_width="40dp"
-        android:layout_height="40dp"
-        android:layout_gravity="center_vertical"
-        android:layout_marginLeft="16dp"
-        android:layout_marginStart="16dp"
-        tools:src="@tools:sample/avatars" />
-
-    <!-- info -->
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:layout_marginBottom="15dp"
-        android:layout_marginEnd="16dp"
-        android:layout_marginLeft="18dp"
-        android:layout_marginRight="16dp"
-        android:layout_marginStart="18dp"
-        android:layout_marginTop="15dp"
-        android:gravity="center_vertical"
-        android:orientation="vertical">
-
-        <!-- name -->
-        <TextView
-            android:id="@+id/label"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:maxLines="2"
-            android:textColor="@android:color/black"
-            android:textSize="14sp"
-            tools:text="@tools:sample/lorem/random" />
-
-        <TextView
-            android:id="@+id/info"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingTop="2dp"
-            android:textSize="13sp"
-            tools:text="@tools:sample/lorem" />
-
-    </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/library/MaterialChipView/src/main/res/layout/list_filterable_view.xml b/library/MaterialChipView/src/main/res/layout/list_filterable_view.xml
deleted file mode 100644
index 485647e8..00000000
--- a/library/MaterialChipView/src/main/res/layout/list_filterable_view.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/recycler_view"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_gravity="center_horizontal"
-    android:scrollbars="vertical" />
\ No newline at end of file
diff --git a/library/MaterialChipView/src/main/res/values/attrs.xml b/library/MaterialChipView/src/main/res/values/attrs.xml
deleted file mode 100644
index 6fcd789c..00000000
--- a/library/MaterialChipView/src/main/res/values/attrs.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <declare-styleable name="ChipView">
-        <attr name="label" format="string" />
-        <attr name="labelColor" format="color" />
-        <attr name="hasAvatarIcon" format="boolean" />
-        <attr name="avatarIcon" format="reference" />
-        <attr name="deletable" format="boolean" />
-        <attr name="deleteIcon" format="reference" />
-        <attr name="deleteIconColor" format="color" />
-        <attr name="backgroundColor" format="color" />
-    </declare-styleable>
-
-    <declare-styleable name="ChipsInput">
-        <attr name="hint" format="string" />
-        <attr name="hintColor" format="color" />
-        <attr name="textColor" format="color" />
-        <attr name="maxRows" format="integer" />
-        <attr name="chip_labelColor" format="color" />
-        <attr name="chip_hasAvatarIcon" format="boolean" />
-        <attr name="chip_deletable" format="boolean" />
-        <attr name="chip_deleteIcon" format="reference" />
-        <attr name="chip_deleteIconColor" format="color" />
-        <attr name="chip_backgroundColor" format="color" />
-        <attr name="chip_width_match_parent" format="boolean"/>
-        <attr name="showChipDetailed" format="boolean" />
-        <attr name="chip_detailed_textColor" format="color" />
-        <attr name="chip_detailed_backgroundColor" format="color" />
-        <attr name="chip_detailed_deleteIconColor" format="color" />
-        <attr name="filterable_list_backgroundColor" format="color" />
-        <attr name="filterable_list_textColor" format="color" />
-        <attr name="filterable_list_useLetterTile" format="boolean" />
-        <attr name="filterable_list_alwaysVisible" format="boolean" />
-        <attr name="allowNewChips" format="boolean"/>
-        <attr name="chip_clickNotify" format="boolean"/>
-        <attr name="maxViewsInRow" format="integer"/>
-    </declare-styleable>
-
-    <declare-styleable name="ScrollViewMaxHeight">
-        <attr name="maxHeight" format="dimension" />
-    </declare-styleable>
-</resources>
diff --git a/library/MaterialChipView/src/main/res/values/colors.xml b/library/MaterialChipView/src/main/res/values/colors.xml
deleted file mode 100644
index 9f540beb..00000000
--- a/library/MaterialChipView/src/main/res/values/colors.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <color name="colorChipViewBackground">#E0E0E0</color>
-    <color name="chips_opened_bg">#009688</color>
-    <color name="colorCloseChip">#ababab</color>
-    <color name="white_transparency">#b9ffffff</color>
-    <color name="colorAccent">?attr/colorAccent</color>
-
-</resources>
\ No newline at end of file
diff --git a/library/MaterialChipView/src/main/res/values/strings.xml b/library/MaterialChipView/src/main/res/values/strings.xml
deleted file mode 100644
index 1a143039..00000000
--- a/library/MaterialChipView/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<resources>
-    <string name="app_name">MaterialChipsInput</string>
-
-    <!-- LetterTileProvider -->
-    <!-- All of the possible tile background colors -->
-    <array name="letter_tile_colors">
-        <item>#f16364</item>
-        <item>#f58559</item>
-        <item>#f9a43e</item>
-        <item>#e4c62e</item>
-        <item>#67bf74</item>
-        <item>#59a2be</item>
-        <item>#2093cd</item>
-        <item>#ad62a7</item>
-    </array>
-
-    <!-- The default letter tile text size -->
-    <dimen name="tile_letter_font_size">17sp</dimen>
-    <!-- The deafult tile size -->
-    <dimen name="letter_tile_size">32dp</dimen>
-    <!-- /LetterTileProvider -->
-</resources>
diff --git a/library/MaterialChipView/src/test/java/com/pchmn/materialchips/ExampleUnitTest.java b/library/MaterialChipView/src/test/java/com/pchmn/materialchips/ExampleUnitTest.java
deleted file mode 100644
index b68d9790..00000000
--- a/library/MaterialChipView/src/test/java/com/pchmn/materialchips/ExampleUnitTest.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.pchmn.materialchips;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-public class ExampleUnitTest {
-    @Test
-    public void addition_isCorrect() throws Exception {
-        assertEquals(4, 2 + 2);
-    }
-}
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index 090eb2d5..fdccb2fe 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1 @@
-include ':app', ':library:MaterialSearchView', ':library:NiceSpinner', ':library:MaterialChipView'
+include ':app', ':library:MaterialSearchView', ':library:NiceSpinner'