diff --git a/README.md b/README.md
index dddf74d..a55bad4 100644
--- a/README.md
+++ b/README.md
@@ -23,13 +23,17 @@ You just have to add the namespace to be able to use custom attributes, and conf
 
 Just add the following dependency to your project
 
-```xml
-<dependency>
-    <groupId>fr.dvilleneuve.android</groupId>
-    <artifactId>enhanced-edittext</artifactId>
-    <version>1.2</version>
-    <type>apklib</type>
-</dependency>
+```
+	repositories {
+        // ...
+        maven { url "https://jitpack.io" }
+    }
+```
+
+```
+	dependencies {
+	        compile 'com.github.DayS:EnhancedEditText:-SNAPSHOT'
+	}
 ```
 
 # License
diff --git a/enhanced-edittext/build.gradle b/enhanced-edittext/build.gradle
index 6523caf..cb30ecc 100644
--- a/enhanced-edittext/build.gradle
+++ b/enhanced-edittext/build.gradle
@@ -2,12 +2,12 @@ apply plugin: 'com.android.library'
 apply plugin: 'release'
 
 dependencies {
-    compile 'com.joanzapata.iconify:android-iconify:2.0.6'
+    compile 'com.joanzapata.iconify:android-iconify:2.1.0'
 }
 
 android {
-    compileSdkVersion 19
-    buildToolsVersion '19.1.0'
+    compileSdkVersion 21
+    buildToolsVersion "23.0.2"
 
     sourceSets {
         main {
diff --git a/enhanced-edittext/gradle/wrapper/gradle-wrapper.jar b/enhanced-edittext/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..05ef575
Binary files /dev/null and b/enhanced-edittext/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/enhanced-edittext/gradle/wrapper/gradle-wrapper.properties b/enhanced-edittext/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..f23df6e
--- /dev/null
+++ b/enhanced-edittext/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Wed Oct 21 11:34:03 PDT 2015
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-all.zip
diff --git a/enhanced-edittext/gradlew b/enhanced-edittext/gradlew
new file mode 100644
index 0000000..9d82f78
--- /dev/null
+++ b/enhanced-edittext/gradlew
@@ -0,0 +1,160 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+esac
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/enhanced-edittext/gradlew.bat b/enhanced-edittext/gradlew.bat
new file mode 100644
index 0000000..8a0b282
--- /dev/null
+++ b/enhanced-edittext/gradlew.bat
@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/enhanced-edittext/src/main/java/android/widget/EnhancedButton.java b/enhanced-edittext/src/main/java/fr/dvilleneuve/android/widget/EnhancedButton.java
similarity index 98%
rename from enhanced-edittext/src/main/java/android/widget/EnhancedButton.java
rename to enhanced-edittext/src/main/java/fr/dvilleneuve/android/widget/EnhancedButton.java
index 8cd24fe..3164d72 100644
--- a/enhanced-edittext/src/main/java/android/widget/EnhancedButton.java
+++ b/enhanced-edittext/src/main/java/fr/dvilleneuve/android/widget/EnhancedButton.java
@@ -16,12 +16,14 @@
  * It uses Iconify by Joan Zapata, licensed under Apache License version 2, which is compatible
  * with this library's license.
  */
-package android.widget;
+package fr.dvilleneuve.android.widget;
 
 import android.content.Context;
 import android.content.res.ColorStateList;
 import android.graphics.drawable.Drawable;
 import android.util.AttributeSet;
+import android.widget.Button;
+
 import com.joanzapata.iconify.Icon;
 import fr.dvilleneuve.android.EnhancedText;
 import fr.dvilleneuve.android.OnClickDrawableListener;
diff --git a/enhanced-edittext/src/main/java/android/widget/EnhancedEditText.java b/enhanced-edittext/src/main/java/fr/dvilleneuve/android/widget/EnhancedEditText.java
similarity index 98%
rename from enhanced-edittext/src/main/java/android/widget/EnhancedEditText.java
rename to enhanced-edittext/src/main/java/fr/dvilleneuve/android/widget/EnhancedEditText.java
index 9de3831..9b017f0 100644
--- a/enhanced-edittext/src/main/java/android/widget/EnhancedEditText.java
+++ b/enhanced-edittext/src/main/java/fr/dvilleneuve/android/widget/EnhancedEditText.java
@@ -16,12 +16,14 @@
  * It uses Iconify by Joan Zapata, licensed under Apache License version 2, which is compatible
  * with this library's license.
  */
-package android.widget;
+package fr.dvilleneuve.android.widget;
 
 import android.content.Context;
 import android.content.res.ColorStateList;
 import android.graphics.drawable.Drawable;
 import android.util.AttributeSet;
+import android.widget.EditText;
+
 import com.joanzapata.iconify.Icon;
 import fr.dvilleneuve.android.EnhancedText;
 import fr.dvilleneuve.android.OnClickDrawableListener;
diff --git a/enhanced-edittext/src/main/java/android/widget/EnhancedTextDelegate.java b/enhanced-edittext/src/main/java/fr/dvilleneuve/android/widget/EnhancedTextDelegate.java
similarity index 99%
rename from enhanced-edittext/src/main/java/android/widget/EnhancedTextDelegate.java
rename to enhanced-edittext/src/main/java/fr/dvilleneuve/android/widget/EnhancedTextDelegate.java
index c520650..8d1e2fd 100644
--- a/enhanced-edittext/src/main/java/android/widget/EnhancedTextDelegate.java
+++ b/enhanced-edittext/src/main/java/fr/dvilleneuve/android/widget/EnhancedTextDelegate.java
@@ -16,7 +16,7 @@
  * It uses Iconify by Joan Zapata, licensed under Apache License version 2, which is compatible
  * with this library's license.
  */
-package android.widget;
+package fr.dvilleneuve.android.widget;
 
 import android.content.Context;
 import android.content.res.ColorStateList;
@@ -26,6 +26,8 @@
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.View;
+import android.widget.TextView;
+
 import com.joanzapata.iconify.IconDrawable;
 import com.joanzapata.iconify.Icon;
 import fr.dvilleneuve.android.DrawablePosition;
diff --git a/enhanced-edittext/src/main/java/android/widget/EnhancedTextView.java b/enhanced-edittext/src/main/java/fr/dvilleneuve/android/widget/EnhancedTextView.java
similarity index 98%
rename from enhanced-edittext/src/main/java/android/widget/EnhancedTextView.java
rename to enhanced-edittext/src/main/java/fr/dvilleneuve/android/widget/EnhancedTextView.java
index 8df1ec6..c24682b 100644
--- a/enhanced-edittext/src/main/java/android/widget/EnhancedTextView.java
+++ b/enhanced-edittext/src/main/java/fr/dvilleneuve/android/widget/EnhancedTextView.java
@@ -16,12 +16,14 @@
  * It uses Iconify by Joan Zapata, licensed under Apache License version 2, which is compatible
  * with this library's license.
  */
-package android.widget;
+package fr.dvilleneuve.android.widget;
 
 import android.content.Context;
 import android.content.res.ColorStateList;
 import android.graphics.drawable.Drawable;
 import android.util.AttributeSet;
+import android.widget.TextView;
+
 import com.joanzapata.iconify.Icon;
 import fr.dvilleneuve.android.EnhancedText;
 import fr.dvilleneuve.android.OnClickDrawableListener;
diff --git a/sample/res/layout/activity_main.xml b/sample/res/layout/activity_main.xml
index 0c32ceb..c4ea362 100644
--- a/sample/res/layout/activity_main.xml
+++ b/sample/res/layout/activity_main.xml
@@ -26,7 +26,7 @@
 			  android:orientation="vertical"
 			  android:padding="10dp">
 
-	<android.widget.EnhancedEditText
+	<fr.dvilleneuve.android.widget.EnhancedEditText
 		android:hint="90"
 		android:id="@+id/edittext1"
 		android:layout_height="wrap_content"
@@ -34,7 +34,7 @@
 		enhancededittext:prefixIcon="fa-tachometer"
 		enhancededittext:suffixText="@string/activity_main_edittext1_suffix" />
 
-	<android.widget.EnhancedEditText
+	<fr.dvilleneuve.android.widget.EnhancedEditText
 		android:hint="90"
 		android:id="@+id/edittext2"
 		android:layout_height="wrap_content"
@@ -43,12 +43,12 @@
 		enhancededittext:prefixText="@string/activity_main_edittext2_prefix"
 		enhancededittext:suffixText="@string/activity_main_edittext2_suffix" />
 
-	<android.widget.EnhancedEditText
+	<fr.dvilleneuve.android.widget.EnhancedEditText
 		android:id="@+id/edittext3"
 		android:layout_height="wrap_content"
 		android:layout_width="match_parent" />
 
-	<android.widget.EnhancedTextView
+	<fr.dvilleneuve.android.widget.EnhancedTextView
 		android:id="@+id/textview1"
 		android:layout_height="wrap_content"
 		android:layout_width="match_parent"
@@ -56,7 +56,7 @@
 		android:text="Simple enhanced Textview"
 		tools:ignore="HardcodedText" />
 
-	<android.widget.EnhancedTextView
+	<fr.dvilleneuve.android.widget.EnhancedTextView
 		android:id="@+id/textview2"
 		android:layout_height="wrap_content"
 		android:layout_width="match_parent"
@@ -66,7 +66,7 @@
 		enhancededittext:suffixText="@string/activity_main_edittext2_suffix"
 		tools:ignore="HardcodedText" />
 
-	<android.widget.EnhancedButton
+	<fr.dvilleneuve.android.widget.EnhancedButton
 		android:id="@+id/buttonToggleDrawables"
 		android:layout_height="wrap_content"
 		android:layout_width="wrap_content"
@@ -76,7 +76,7 @@
 		enhancededittext:prefixColor="@color/text_color_red"
 		enhancededittext:prefixIcon="fa-picture-o" />
 
-	<android.widget.EnhancedButton
+	<fr.dvilleneuve.android.widget.EnhancedButton
 		android:id="@+id/buttonToggleEnable"
 		android:layout_height="wrap_content"
 		android:layout_width="wrap_content"
diff --git a/sample/src/main/java/fr/dvilleneuve/android/sample/MainActivity.java b/sample/src/main/java/fr/dvilleneuve/android/sample/MainActivity.java
index 52c5776..301e32a 100644
--- a/sample/src/main/java/fr/dvilleneuve/android/sample/MainActivity.java
+++ b/sample/src/main/java/fr/dvilleneuve/android/sample/MainActivity.java
@@ -21,7 +21,7 @@
 import android.app.Activity;
 import android.graphics.Color;
 import android.graphics.drawable.Drawable;
-import android.widget.EnhancedEditText;
+import fr.dvilleneuve.android.widget.EnhancedEditText;
 import android.widget.Toast;
 import com.joanzapata.iconify.fonts.FontAwesomeIcons;
 import fr.dvilleneuve.android.DrawablePosition;