diff --git a/AndroidManifest.xml b/AndroidManifest.xml
deleted file mode 100644
index cd6e1dd..0000000
--- a/AndroidManifest.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.larswerkman.holocolorpicker"
-    android:versionCode="15"
-    android:versionName="1.5" >
-
-    <uses-sdk
-        android:minSdkVersion="8"
-        android:targetSdkVersion="21" />
-
-</manifest>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index a52b86f..2eb8d24 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,3 +1,5 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
 buildscript {
     repositories {
         jcenter()
@@ -6,30 +8,12 @@ buildscript {
         classpath 'com.android.tools.build:gradle:1.1.0'
     }
 }
+
 allprojects {
     version = VERSION_NAME
     group = GROUP
 
     repositories {
-        mavenCentral()
-    }
-}
-apply plugin: 'com.android.library'
-
-android {
-    compileSdkVersion 21
-    buildToolsVersion '21.1.2'
-    sourceSets {
-        main {
-            manifest.srcFile 'AndroidManifest.xml'
-            java.srcDirs = ['src']
-            res.srcDirs = ['res']
-        }
-    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_6
-        targetCompatibility JavaVersion.VERSION_1_6
+        jcenter()
     }
 }
-
-apply from: 'https://raw.github.com/chrisbanes/gradle-mvn-push/master/gradle-mvn-push.gradle'
\ No newline at end of file
diff --git a/libary/build.gradle b/libary/build.gradle
new file mode 100644
index 0000000..a525479
--- /dev/null
+++ b/libary/build.gradle
@@ -0,0 +1,13 @@
+apply plugin: 'com.android.library'
+
+android {
+    compileSdkVersion 21
+    buildToolsVersion "21.1.2"
+
+    defaultConfig {
+        minSdkVersion 8
+        targetSdkVersion 21
+    }
+}
+
+apply from: 'https://raw.github.com/chrisbanes/gradle-mvn-push/master/gradle-mvn-push.gradle'
\ No newline at end of file
diff --git a/libary/src/main/AndroidManifest.xml b/libary/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..8dec378
--- /dev/null
+++ b/libary/src/main/AndroidManifest.xml
@@ -0,0 +1,4 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.larswerkman.holocolorpicker">
+
+</manifest>
diff --git a/src/com/larswerkman/holocolorpicker/ColorPicker.java b/libary/src/main/java/com/larswerkman/holocolorpicker/ColorPicker.java
similarity index 100%
rename from src/com/larswerkman/holocolorpicker/ColorPicker.java
rename to libary/src/main/java/com/larswerkman/holocolorpicker/ColorPicker.java
diff --git a/src/com/larswerkman/holocolorpicker/OpacityBar.java b/libary/src/main/java/com/larswerkman/holocolorpicker/OpacityBar.java
similarity index 99%
rename from src/com/larswerkman/holocolorpicker/OpacityBar.java
rename to libary/src/main/java/com/larswerkman/holocolorpicker/OpacityBar.java
index d14d859..52774e2 100644
--- a/src/com/larswerkman/holocolorpicker/OpacityBar.java
+++ b/libary/src/main/java/com/larswerkman/holocolorpicker/OpacityBar.java
@@ -507,7 +507,7 @@ public int getColor() {
 	 * WARNING: Don't change the color picker. it is done already when the bar
 	 * is added to the ColorPicker
 	 * 
-	 * @see ColorPicker#addSVBar(SVBar)
+	 * @see com.larswerkman.holocolorpicker.ColorPicker#addSVBar(SVBar)
 	 * @param picker
 	 */
 	public void setColorPicker(ColorPicker picker) {
diff --git a/src/com/larswerkman/holocolorpicker/SVBar.java b/libary/src/main/java/com/larswerkman/holocolorpicker/SVBar.java
similarity index 99%
rename from src/com/larswerkman/holocolorpicker/SVBar.java
rename to libary/src/main/java/com/larswerkman/holocolorpicker/SVBar.java
index 64fa038..4317877 100644
--- a/src/com/larswerkman/holocolorpicker/SVBar.java
+++ b/libary/src/main/java/com/larswerkman/holocolorpicker/SVBar.java
@@ -497,7 +497,7 @@ public int getColor() {
 	 * WARNING: Don't change the color picker. it is done already when the bar
 	 * is added to the ColorPicker
 	 * 
-	 * @see ColorPicker#addSVBar(com.larswerkman.holocolorpicker.SVBar)
+	 * @see com.larswerkman.holocolorpicker.ColorPicker#addSVBar(SVBar)
 	 * @param picker
 	 */
 	public void setColorPicker(ColorPicker picker) {
diff --git a/src/com/larswerkman/holocolorpicker/SaturationBar.java b/libary/src/main/java/com/larswerkman/holocolorpicker/SaturationBar.java
similarity index 99%
rename from src/com/larswerkman/holocolorpicker/SaturationBar.java
rename to libary/src/main/java/com/larswerkman/holocolorpicker/SaturationBar.java
index 38e924e..ac3b589 100644
--- a/src/com/larswerkman/holocolorpicker/SaturationBar.java
+++ b/libary/src/main/java/com/larswerkman/holocolorpicker/SaturationBar.java
@@ -495,7 +495,7 @@ public int getColor() {
 	 * WARNING: Don't change the color picker. it is done already when the bar
 	 * is added to the ColorPicker
 	 * 
-	 * @see ColorPicker#addSVBar(SVBar)
+	 * @see com.larswerkman.holocolorpicker.ColorPicker#addSVBar(SVBar)
 	 * @param picker
 	 */
 	public void setColorPicker(ColorPicker picker) {
diff --git a/src/com/larswerkman/holocolorpicker/ValueBar.java b/libary/src/main/java/com/larswerkman/holocolorpicker/ValueBar.java
similarity index 99%
rename from src/com/larswerkman/holocolorpicker/ValueBar.java
rename to libary/src/main/java/com/larswerkman/holocolorpicker/ValueBar.java
index 0437c9d..6859c97 100644
--- a/src/com/larswerkman/holocolorpicker/ValueBar.java
+++ b/libary/src/main/java/com/larswerkman/holocolorpicker/ValueBar.java
@@ -491,7 +491,7 @@ public int getColor() {
 	 * WARNING: Don't change the color picker. it is done already when the bar
 	 * is added to the ColorPicker
 	 * 
-	 * @see ColorPicker#addSVBar(SVBar)
+	 * @see com.larswerkman.holocolorpicker.ColorPicker#addSVBar(com.larswerkman.holocolorpicker.SVBar)
 	 * @param picker
 	 */
 	public void setColorPicker(ColorPicker picker) {
diff --git a/res/values/attrs.xml b/libary/src/main/res/values/attrs.xml
similarity index 100%
rename from res/values/attrs.xml
rename to libary/src/main/res/values/attrs.xml
diff --git a/res/values/dimens.xml b/libary/src/main/res/values/dimens.xml
similarity index 100%
rename from res/values/dimens.xml
rename to libary/src/main/res/values/dimens.xml
diff --git a/project.properties b/project.properties
deleted file mode 100644
index 93c8c3c..0000000
--- a/project.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system edit
-# "ant.properties", and override values to adapt the script to your
-# project structure.
-#
-# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
-#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
-
-# Project target.
-target=android-21
-android.library=true
diff --git a/settings.gradle b/settings.gradle
index 5e16880..87ed970 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,2 +1 @@
-rootProject.name = 'holocolorpicker'
-
+include ':libary'