diff --git a/build.gradle b/build.gradle
index 5608ef8..9b3a973 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,10 +2,13 @@
 
 buildscript {
     repositories {
+        mavenCentral()
         jcenter()
+        google()
+
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.0'
+        classpath 'com.android.tools.build:gradle:3.2.1'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.2'
         classpath "com.github.dcendents:android-maven-gradle-plugin:1.3"
         // NOTE: Do not place your application dependencies here; they belong
@@ -15,7 +18,9 @@ buildscript {
 
 allprojects {
     repositories {
+        mavenCentral()
         jcenter()
+        google()
     }
 
 }
diff --git a/example/build.gradle b/example/build.gradle
index e19cef2..e734180 100644
--- a/example/build.gradle
+++ b/example/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion '25.0.2'
+    compileSdkVersion 28
+    buildToolsVersion "28.0.3"
 
     defaultConfig {
         applicationId "momanii.hani.supernova_emoji"
-        minSdkVersion 9
-        targetSdkVersion 25
+        minSdkVersion 14
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
     }
@@ -19,6 +19,6 @@ android {
 }
 
 dependencies {
-    compile project(':supernova-emoji-library')
-    //compile 'com.android.support:appcompat-v7:25.3.1'
+    implementation project(':supernova-emoji-library')
+    implementation 'com.android.support:appcompat-v7:28.0.0'
 }
diff --git a/example/src/main/java/momanii/hani/supernova_emoji/MainActivity.java b/example/src/main/java/momanii/hani/supernova_emoji/MainActivity.java
index d9a5fdb..c16fa38 100644
--- a/example/src/main/java/momanii/hani/supernova_emoji/MainActivity.java
+++ b/example/src/main/java/momanii/hani/supernova_emoji/MainActivity.java
@@ -8,9 +8,9 @@
 import android.widget.CompoundButton;
 import android.widget.ImageView;
 
-import hani.momanii.supernova_emoji_library.Actions.EmojIconActions;
-import hani.momanii.supernova_emoji_library.Helper.EmojiconEditText;
-import hani.momanii.supernova_emoji_library.Helper.EmojiconTextView;
+import hani.momanii.supernova_emoji_library.actions.EmojIconActions;
+import hani.momanii.supernova_emoji_library.helper.EmojiconEditText;
+import hani.momanii.supernova_emoji_library.helper.EmojiconTextView;
 
 public class MainActivity extends AppCompatActivity {
 
diff --git a/example/src/main/res/layout/activity_main.xml b/example/src/main/res/layout/activity_main.xml
index ed956de..babab68 100644
--- a/example/src/main/res/layout/activity_main.xml
+++ b/example/src/main/res/layout/activity_main.xml
@@ -29,7 +29,7 @@
         android:src="@android:drawable/ic_menu_send"
         />
 
-    <hani.momanii.supernova_emoji_library.Helper.EmojiconEditText
+    <hani.momanii.supernova_emoji_library.helper.EmojiconEditText
         android:id="@+id/emojicon_edit_text"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -41,7 +41,7 @@
         emojicon:emojiconSize="28sp"/>
 
 
-    <hani.momanii.supernova_emoji_library.Helper.EmojiconEditText
+    <hani.momanii.supernova_emoji_library.helper.EmojiconEditText
         android:id="@+id/emojicon_edit_text2"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -60,7 +60,7 @@
         android:checked="false"
         android:text="Use System Default?"/>
 
-    <hani.momanii.supernova_emoji_library.Helper.EmojiconTextView
+    <hani.momanii.supernova_emoji_library.helper.EmojiconTextView
         android:id="@+id/textView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index d66e0a1..7e38cc6 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+distributionUrl=http\://nexus/repository/gradle/gradle-4.6-all.zip
diff --git a/supernova-emoji-library/build.gradle b/supernova-emoji-library/build.gradle
index 25461dd..65bd7de 100644
--- a/supernova-emoji-library/build.gradle
+++ b/supernova-emoji-library/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion '25.0.2'
+    compileSdkVersion 28
+    buildToolsVersion "28.0.3"
 
     defaultConfig {
-        minSdkVersion 9
-        targetSdkVersion 25
+        minSdkVersion 14
+        targetSdkVersion 28
     }
     lintOptions {
         abortOnError false
@@ -14,8 +14,8 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:recyclerview-v7:25.3.1'
-    compile 'com.android.support:appcompat-v7:25.3.1'
+    implementation 'com.android.support:recyclerview-v7:28.0.0'
+    implementation 'com.android.support:appcompat-v7:28.0.0'
 }
 
 
diff --git a/supernova-emoji-library/src/main/java/hani/momanii/supernova_emoji_library/Actions/EmojIconActions.java b/supernova-emoji-library/src/main/java/hani/momanii/supernova_emoji_library/actions/EmojIconActions.java
similarity index 97%
rename from supernova-emoji-library/src/main/java/hani/momanii/supernova_emoji_library/Actions/EmojIconActions.java
rename to supernova-emoji-library/src/main/java/hani/momanii/supernova_emoji_library/actions/EmojIconActions.java
index 905240b..cbca88f 100644
--- a/supernova-emoji-library/src/main/java/hani/momanii/supernova_emoji_library/Actions/EmojIconActions.java
+++ b/supernova-emoji-library/src/main/java/hani/momanii/supernova_emoji_library/actions/EmojIconActions.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package hani.momanii.supernova_emoji_library.Actions;
+package hani.momanii.supernova_emoji_library.actions;
 
 import android.content.Context;
 import android.view.KeyEvent;
@@ -26,9 +26,9 @@
 import java.util.Collections;
 import java.util.List;
 
-import hani.momanii.supernova_emoji_library.Helper.EmojiconEditText;
-import hani.momanii.supernova_emoji_library.Helper.EmojiconGridView;
-import hani.momanii.supernova_emoji_library.Helper.EmojiconsPopup;
+import hani.momanii.supernova_emoji_library.helper.EmojiconEditText;
+import hani.momanii.supernova_emoji_library.helper.EmojiconGridView;
+import hani.momanii.supernova_emoji_library.helper.EmojiconsPopup;
 import hani.momanii.supernova_emoji_library.R;
 import hani.momanii.supernova_emoji_library.emoji.Emojicon;
 
diff --git a/supernova-emoji-library/src/main/java/hani/momanii/supernova_emoji_library/Helper/EmojiAdapter.java b/supernova-emoji-library/src/main/java/hani/momanii/supernova_emoji_library/helper/EmojiAdapter.java
similarity index 98%
rename from supernova-emoji-library/src/main/java/hani/momanii/supernova_emoji_library/Helper/EmojiAdapter.java
rename to supernova-emoji-library/src/main/java/hani/momanii/supernova_emoji_library/helper/EmojiAdapter.java
index 101f748..47502e6 100755
--- a/supernova-emoji-library/src/main/java/hani/momanii/supernova_emoji_library/Helper/EmojiAdapter.java
+++ b/supernova-emoji-library/src/main/java/hani/momanii/supernova_emoji_library/helper/EmojiAdapter.java
@@ -16,7 +16,7 @@
 
 
 
-package hani.momanii.supernova_emoji_library.Helper;
+package hani.momanii.supernova_emoji_library.helper;
 
 import android.content.Context;
 import android.view.View;
diff --git a/supernova-emoji-library/src/main/java/hani/momanii/supernova_emoji_library/Helper/EmojiconEditText.java b/supernova-emoji-library/src/main/java/hani/momanii/supernova_emoji_library/helper/EmojiconEditText.java
similarity index 98%
rename from supernova-emoji-library/src/main/java/hani/momanii/supernova_emoji_library/Helper/EmojiconEditText.java
rename to supernova-emoji-library/src/main/java/hani/momanii/supernova_emoji_library/helper/EmojiconEditText.java
index bb3fe88..b579508 100755
--- a/supernova-emoji-library/src/main/java/hani/momanii/supernova_emoji_library/Helper/EmojiconEditText.java
+++ b/supernova-emoji-library/src/main/java/hani/momanii/supernova_emoji_library/helper/EmojiconEditText.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package hani.momanii.supernova_emoji_library.Helper;
+package hani.momanii.supernova_emoji_library.helper;
 
 import android.content.Context;
 import android.content.res.TypedArray;
diff --git a/supernova-emoji-library/src/main/java/hani/momanii/supernova_emoji_library/Helper/EmojiconGridView.java b/supernova-emoji-library/src/main/java/hani/momanii/supernova_emoji_library/helper/EmojiconGridView.java
similarity index 98%
rename from supernova-emoji-library/src/main/java/hani/momanii/supernova_emoji_library/Helper/EmojiconGridView.java
rename to supernova-emoji-library/src/main/java/hani/momanii/supernova_emoji_library/helper/EmojiconGridView.java
index 33495cc..06ff462 100755
--- a/supernova-emoji-library/src/main/java/hani/momanii/supernova_emoji_library/Helper/EmojiconGridView.java
+++ b/supernova-emoji-library/src/main/java/hani/momanii/supernova_emoji_library/helper/EmojiconGridView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package hani.momanii.supernova_emoji_library.Helper;
+package hani.momanii.supernova_emoji_library.helper;
 
 import android.app.Activity;
 import android.content.Context;
diff --git a/supernova-emoji-library/src/main/java/hani/momanii/supernova_emoji_library/Helper/EmojiconHandler.java b/supernova-emoji-library/src/main/java/hani/momanii/supernova_emoji_library/helper/EmojiconHandler.java
similarity index 99%
rename from supernova-emoji-library/src/main/java/hani/momanii/supernova_emoji_library/Helper/EmojiconHandler.java
rename to supernova-emoji-library/src/main/java/hani/momanii/supernova_emoji_library/helper/EmojiconHandler.java
index e52b63b..5b1c57a 100755
--- a/supernova-emoji-library/src/main/java/hani/momanii/supernova_emoji_library/Helper/EmojiconHandler.java
+++ b/supernova-emoji-library/src/main/java/hani/momanii/supernova_emoji_library/helper/EmojiconHandler.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package hani.momanii.supernova_emoji_library.Helper;
+package hani.momanii.supernova_emoji_library.helper;
 
 import android.content.Context;
 import android.text.Spannable;
diff --git a/supernova-emoji-library/src/main/java/hani/momanii/supernova_emoji_library/Helper/EmojiconMultiAutoCompleteTextView.java b/supernova-emoji-library/src/main/java/hani/momanii/supernova_emoji_library/helper/EmojiconMultiAutoCompleteTextView.java
similarity index 98%
rename from supernova-emoji-library/src/main/java/hani/momanii/supernova_emoji_library/Helper/EmojiconMultiAutoCompleteTextView.java
rename to supernova-emoji-library/src/main/java/hani/momanii/supernova_emoji_library/helper/EmojiconMultiAutoCompleteTextView.java
index 7d59b0c..8fb45ff 100755
--- a/supernova-emoji-library/src/main/java/hani/momanii/supernova_emoji_library/Helper/EmojiconMultiAutoCompleteTextView.java
+++ b/supernova-emoji-library/src/main/java/hani/momanii/supernova_emoji_library/helper/EmojiconMultiAutoCompleteTextView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package hani.momanii.supernova_emoji_library.Helper;
+package hani.momanii.supernova_emoji_library.helper;
 
 import android.content.Context;
 import android.content.res.TypedArray;
diff --git a/supernova-emoji-library/src/main/java/hani/momanii/supernova_emoji_library/Helper/EmojiconRecents.java b/supernova-emoji-library/src/main/java/hani/momanii/supernova_emoji_library/helper/EmojiconRecents.java
similarity index 93%
rename from supernova-emoji-library/src/main/java/hani/momanii/supernova_emoji_library/Helper/EmojiconRecents.java
rename to supernova-emoji-library/src/main/java/hani/momanii/supernova_emoji_library/helper/EmojiconRecents.java
index 47a41c5..9b11fd6 100755
--- a/supernova-emoji-library/src/main/java/hani/momanii/supernova_emoji_library/Helper/EmojiconRecents.java
+++ b/supernova-emoji-library/src/main/java/hani/momanii/supernova_emoji_library/helper/EmojiconRecents.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package hani.momanii.supernova_emoji_library.Helper;
+package hani.momanii.supernova_emoji_library.helper;
 
 import android.content.Context;
 
diff --git a/supernova-emoji-library/src/main/java/hani/momanii/supernova_emoji_library/Helper/EmojiconRecentsGridView.java b/supernova-emoji-library/src/main/java/hani/momanii/supernova_emoji_library/helper/EmojiconRecentsGridView.java
similarity index 97%
rename from supernova-emoji-library/src/main/java/hani/momanii/supernova_emoji_library/Helper/EmojiconRecentsGridView.java
rename to supernova-emoji-library/src/main/java/hani/momanii/supernova_emoji_library/helper/EmojiconRecentsGridView.java
index 2866135..e78fbc2 100755
--- a/supernova-emoji-library/src/main/java/hani/momanii/supernova_emoji_library/Helper/EmojiconRecentsGridView.java
+++ b/supernova-emoji-library/src/main/java/hani/momanii/supernova_emoji_library/helper/EmojiconRecentsGridView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package hani.momanii.supernova_emoji_library.Helper;
+package hani.momanii.supernova_emoji_library.helper;
 
 import android.content.Context;
 import android.widget.GridView;
diff --git a/supernova-emoji-library/src/main/java/hani/momanii/supernova_emoji_library/Helper/EmojiconRecentsManager.java b/supernova-emoji-library/src/main/java/hani/momanii/supernova_emoji_library/helper/EmojiconRecentsManager.java
similarity index 98%
rename from supernova-emoji-library/src/main/java/hani/momanii/supernova_emoji_library/Helper/EmojiconRecentsManager.java
rename to supernova-emoji-library/src/main/java/hani/momanii/supernova_emoji_library/helper/EmojiconRecentsManager.java
index 7fd34a0..7203147 100755
--- a/supernova-emoji-library/src/main/java/hani/momanii/supernova_emoji_library/Helper/EmojiconRecentsManager.java
+++ b/supernova-emoji-library/src/main/java/hani/momanii/supernova_emoji_library/helper/EmojiconRecentsManager.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package hani.momanii.supernova_emoji_library.Helper;
+package hani.momanii.supernova_emoji_library.helper;
 import android.content.Context;
 import android.content.SharedPreferences;
 import java.util.ArrayList;
diff --git a/supernova-emoji-library/src/main/java/hani/momanii/supernova_emoji_library/Helper/EmojiconSpan.java b/supernova-emoji-library/src/main/java/hani/momanii/supernova_emoji_library/helper/EmojiconSpan.java
similarity index 98%
rename from supernova-emoji-library/src/main/java/hani/momanii/supernova_emoji_library/Helper/EmojiconSpan.java
rename to supernova-emoji-library/src/main/java/hani/momanii/supernova_emoji_library/helper/EmojiconSpan.java
index 074423b..a71c29a 100755
--- a/supernova-emoji-library/src/main/java/hani/momanii/supernova_emoji_library/Helper/EmojiconSpan.java
+++ b/supernova-emoji-library/src/main/java/hani/momanii/supernova_emoji_library/helper/EmojiconSpan.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package hani.momanii.supernova_emoji_library.Helper;
+package hani.momanii.supernova_emoji_library.helper;
 
 import android.content.Context;
 import android.graphics.Canvas;
diff --git a/supernova-emoji-library/src/main/java/hani/momanii/supernova_emoji_library/Helper/EmojiconTextView.java b/supernova-emoji-library/src/main/java/hani/momanii/supernova_emoji_library/helper/EmojiconTextView.java
similarity index 98%
rename from supernova-emoji-library/src/main/java/hani/momanii/supernova_emoji_library/Helper/EmojiconTextView.java
rename to supernova-emoji-library/src/main/java/hani/momanii/supernova_emoji_library/helper/EmojiconTextView.java
index 78c1080..c0af71c 100755
--- a/supernova-emoji-library/src/main/java/hani/momanii/supernova_emoji_library/Helper/EmojiconTextView.java
+++ b/supernova-emoji-library/src/main/java/hani/momanii/supernova_emoji_library/helper/EmojiconTextView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package hani.momanii.supernova_emoji_library.Helper;
+package hani.momanii.supernova_emoji_library.helper;
 
 import android.content.Context;
 import android.content.res.TypedArray;
diff --git a/supernova-emoji-library/src/main/java/hani/momanii/supernova_emoji_library/Helper/EmojiconsPopup.java b/supernova-emoji-library/src/main/java/hani/momanii/supernova_emoji_library/helper/EmojiconsPopup.java
similarity index 99%
rename from supernova-emoji-library/src/main/java/hani/momanii/supernova_emoji_library/Helper/EmojiconsPopup.java
rename to supernova-emoji-library/src/main/java/hani/momanii/supernova_emoji_library/helper/EmojiconsPopup.java
index 522d250..2fdd1ab 100644
--- a/supernova-emoji-library/src/main/java/hani/momanii/supernova_emoji_library/Helper/EmojiconsPopup.java
+++ b/supernova-emoji-library/src/main/java/hani/momanii/supernova_emoji_library/helper/EmojiconsPopup.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package hani.momanii.supernova_emoji_library.Helper;
+package hani.momanii.supernova_emoji_library.helper;
 
 import android.app.Activity;
 import android.content.Context;
@@ -26,7 +26,6 @@
 import android.support.v4.view.PagerAdapter;
 import android.support.v4.view.ViewPager;
 import android.util.DisplayMetrics;
-import android.util.Log;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
diff --git a/supernova-emoji-library/src/main/res/layout/emojicon_item.xml b/supernova-emoji-library/src/main/res/layout/emojicon_item.xml
index 5e54d64..fe5805c 100755
--- a/supernova-emoji-library/src/main/res/layout/emojicon_item.xml
+++ b/supernova-emoji-library/src/main/res/layout/emojicon_item.xml
@@ -19,7 +19,7 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content">
 
-    <hani.momanii.supernova_emoji_library.Helper.EmojiconTextView
+    <hani.momanii.supernova_emoji_library.helper.EmojiconTextView
         android:layout_gravity="center"
         android:id="@+id/emojicon_icon"
         android:layout_width="36dip"