diff --git a/app/build.gradle b/app/build.gradle
index 252991f..9f95a7b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -5,12 +5,13 @@ android {
     buildToolsVersion "21.1.2"
 
     defaultConfig {
-        applicationId "com.weiwangcn.betterspinner"
+        applicationId "com.weiwangcn.betterspinner.sample"
         minSdkVersion 15
         targetSdkVersion 22
-        versionCode 1
-        versionName "1.0"
+        versionCode 100
+        versionName "1.0.0"
     }
+
     buildTypes {
         release {
             minifyEnabled false
@@ -24,4 +25,5 @@ dependencies {
     compile 'com.android.support:appcompat-v7:22.0.0'
     compile 'com.jakewharton:butterknife:6.1.0'
     compile project(':library')
+    compile project(':library-material')
 }
diff --git a/app/src/androidTest/java/com/weiwangcn/betterspinner/ApplicationTest.java b/app/src/androidTest/java/com/weiwangcn/betterspinner/sample/ApplicationTest.java
similarity index 87%
rename from app/src/androidTest/java/com/weiwangcn/betterspinner/ApplicationTest.java
rename to app/src/androidTest/java/com/weiwangcn/betterspinner/sample/ApplicationTest.java
index d639e12..403fee4 100644
--- a/app/src/androidTest/java/com/weiwangcn/betterspinner/ApplicationTest.java
+++ b/app/src/androidTest/java/com/weiwangcn/betterspinner/sample/ApplicationTest.java
@@ -1,4 +1,4 @@
-package com.weiwangcn.betterspinner;
+package com.weiwangcn.betterspinner.sample;
 
 import android.app.Application;
 import android.test.ApplicationTestCase;
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 33a4300..800b19a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -8,7 +8,7 @@
         android:label="@string/app_name"
         android:theme="@style/AppTheme.MyTheme">
     <activity
-            android:name=".MainActivity"
+            android:name=".sample.MainActivity"
             android:label="@string/app_name" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/app/src/main/java/com/weiwangcn/betterspinner/MainActivity.java b/app/src/main/java/com/weiwangcn/betterspinner/sample/MainActivity.java
similarity index 86%
rename from app/src/main/java/com/weiwangcn/betterspinner/MainActivity.java
rename to app/src/main/java/com/weiwangcn/betterspinner/sample/MainActivity.java
index 9e2d700..a2b1433 100644
--- a/app/src/main/java/com/weiwangcn/betterspinner/MainActivity.java
+++ b/app/src/main/java/com/weiwangcn/betterspinner/sample/MainActivity.java
@@ -1,4 +1,4 @@
-package com.weiwangcn.betterspinner;
+package com.weiwangcn.betterspinner.sample;
 
 import android.content.Intent;
 import android.net.Uri;
@@ -8,6 +8,10 @@
 import android.view.MenuItem;
 import android.widget.ArrayAdapter;
 
+import com.weiwang.betterspinner.library.material.MaterialBetterSpinner;
+import com.weiwangcn.betterspinner.R;
+import com.weiwangcn.betterspinner.library.BetterSpinner;
+
 import butterknife.ButterKnife;
 import butterknife.InjectView;
 
@@ -26,7 +30,7 @@ protected void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.activity_main);
         ButterKnife.inject(this);
 
-        String[] list = getResources().getStringArray(R.array.age);
+        String[] list = getResources().getStringArray(R.array.month);
 
         ArrayAdapter<String> adapter = new ArrayAdapter<String>(this,
                 android.R.layout.simple_dropdown_item_1line, list);
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 2c8d443..80634c2 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -13,7 +13,7 @@
     android:background="@color/white"
     tools:context=".MainActivity">
 
-    <com.weiwangcn.betterspinner.BetterSpinner
+    <com.weiwangcn.betterspinner.library.BetterSpinner
         android:id="@+id/spinner1"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -26,7 +26,7 @@
         android:layout_marginBottom="@dimen/activity_vertical_margin"
         android:hint="Text Field" />
 
-    <com.weiwangcn.betterspinner.MaterialBetterSpinner
+    <com.weiwang.betterspinner.library.material.MaterialBetterSpinner
         android:id="@+id/spinner2"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
index bd2c879..e9c81b3 100644
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
index 53dd966..b22c61a 100644
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
index 8d11aeb..1e0b091 100644
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
index e03658a..65efa1f 100644
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 0000000..f04eb0b
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index dbc8ae2..cac8995 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -1,22 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string-array name="age">
-        <item>a</item>
-        <item>b</item>
-        <item>c</item>
-        <item>d</item>
-        <item>e</item>
-        <item>f</item>
-        <item>g</item>
-        <item>h</item>
-        <item>i</item>
-        <item>j</item>
-        <item>k</item>
-        <item>l</item>
-        <item>m</item>
-        <item>n</item>
-        <item>o</item>
-        <item>p</item>
-        <item>q</item>
+    <string-array name="month">
+        <item>January</item>
+        <item>February</item>
+        <item>March</item>
+        <item>April</item>
+        <item>May</item>
+        <item>June</item>
+        <item>July</item>
+        <item>August</item>
+        <item>September</item>
+        <item>October</item>
+        <item>November</item>
+        <item>December</item>
     </string-array>
 </resources>
\ No newline at end of file
diff --git a/library-material/.gitignore b/library-material/.gitignore
new file mode 100644
index 0000000..796b96d
--- /dev/null
+++ b/library-material/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/library-material/build.gradle b/library-material/build.gradle
new file mode 100644
index 0000000..c17bc75
--- /dev/null
+++ b/library-material/build.gradle
@@ -0,0 +1,25 @@
+apply plugin: 'com.android.library'
+
+android {
+    compileSdkVersion 22
+    buildToolsVersion "22.0.0"
+
+    defaultConfig {
+        minSdkVersion 15
+        targetSdkVersion 22
+        versionCode 1
+        versionName "1.0"
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    compile fileTree(dir: 'libs', include: ['*.jar'])
+    compile 'com.android.support:appcompat-v7:22.0.0'
+    compile 'com.rengwuxian.materialedittext:library:1.8.3'
+}
diff --git a/library-material/proguard-rules.pro b/library-material/proguard-rules.pro
new file mode 100644
index 0000000..2a41785
--- /dev/null
+++ b/library-material/proguard-rules.pro
@@ -0,0 +1,17 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in /Users/weiwang/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 *;
+#}
diff --git a/library-material/src/androidTest/java/com/weiwang/betterspinner/library/material/ApplicationTest.java b/library-material/src/androidTest/java/com/weiwang/betterspinner/library/material/ApplicationTest.java
new file mode 100644
index 0000000..5c50f8a
--- /dev/null
+++ b/library-material/src/androidTest/java/com/weiwang/betterspinner/library/material/ApplicationTest.java
@@ -0,0 +1,13 @@
+package com.weiwang.betterspinner.library.material;
+
+import android.app.Application;
+import android.test.ApplicationTestCase;
+
+/**
+ * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
+ */
+public class ApplicationTest extends ApplicationTestCase<Application> {
+    public ApplicationTest() {
+        super(Application.class);
+    }
+}
\ No newline at end of file
diff --git a/library-material/src/main/AndroidManifest.xml b/library-material/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..a34b1d2
--- /dev/null
+++ b/library-material/src/main/AndroidManifest.xml
@@ -0,0 +1,8 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.weiwang.betterspinner.library.material">
+
+    <application android:allowBackup="true" android:label="@string/app_name">
+
+    </application>
+
+</manifest>
diff --git a/library/src/main/java/com/weiwangcn/betterspinner/MaterialBetterSpinner.java b/library-material/src/main/java/com/weiwang/betterspinner/library/material/MaterialBetterSpinner.java
similarity index 97%
rename from library/src/main/java/com/weiwangcn/betterspinner/MaterialBetterSpinner.java
rename to library-material/src/main/java/com/weiwang/betterspinner/library/material/MaterialBetterSpinner.java
index 269dbc9..43c3355 100644
--- a/library/src/main/java/com/weiwangcn/betterspinner/MaterialBetterSpinner.java
+++ b/library-material/src/main/java/com/weiwang/betterspinner/library/material/MaterialBetterSpinner.java
@@ -1,4 +1,4 @@
-package com.weiwangcn.betterspinner;
+package com.weiwang.betterspinner.library.material;
 
 import android.content.Context;
 import android.graphics.Rect;
diff --git a/library-material/src/main/res/values/strings.xml b/library-material/src/main/res/values/strings.xml
new file mode 100644
index 0000000..a1aa0d5
--- /dev/null
+++ b/library-material/src/main/res/values/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">BetterSpinner</string>
+</resources>
diff --git a/library/build.gradle b/library/build.gradle
index 4e40837..a8d32d6 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -21,5 +21,4 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile 'com.android.support:appcompat-v7:22.0.0'
-    compile 'com.rengwuxian.materialedittext:library:1.8.3'
 }
diff --git a/library/src/androidTest/java/com/weiwangcn/betterspinner/ApplicationTest.java b/library/src/androidTest/java/com/weiwangcn/betterspinner/library/ApplicationTest.java
similarity index 87%
rename from library/src/androidTest/java/com/weiwangcn/betterspinner/ApplicationTest.java
rename to library/src/androidTest/java/com/weiwangcn/betterspinner/library/ApplicationTest.java
index d639e12..b34f645 100644
--- a/library/src/androidTest/java/com/weiwangcn/betterspinner/ApplicationTest.java
+++ b/library/src/androidTest/java/com/weiwangcn/betterspinner/library/ApplicationTest.java
@@ -1,4 +1,4 @@
-package com.weiwangcn.betterspinner;
+package com.weiwangcn.betterspinner.library;
 
 import android.app.Application;
 import android.test.ApplicationTestCase;
diff --git a/library/src/main/java/com/weiwangcn/betterspinner/BetterSpinner.java b/library/src/main/java/com/weiwangcn/betterspinner/library/BetterSpinner.java
similarity index 97%
rename from library/src/main/java/com/weiwangcn/betterspinner/BetterSpinner.java
rename to library/src/main/java/com/weiwangcn/betterspinner/library/BetterSpinner.java
index b0d6c5f..600a830 100644
--- a/library/src/main/java/com/weiwangcn/betterspinner/BetterSpinner.java
+++ b/library/src/main/java/com/weiwangcn/betterspinner/library/BetterSpinner.java
@@ -1,4 +1,4 @@
-package com.weiwangcn.betterspinner;
+package com.weiwangcn.betterspinner.library;
 
 import android.content.Context;
 import android.graphics.Rect;
diff --git a/screenshot/screenshot.gif b/screenshot/screenshot.gif
new file mode 100644
index 0000000..caf8d73
Binary files /dev/null and b/screenshot/screenshot.gif differ
diff --git a/settings.gradle b/settings.gradle
index 3306997..e880feb 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1 @@
-include ':app', ':library'
+include ':app', ':library', ':library-material'