diff --git a/app/app.iml b/app/app.iml
index c55f0e5..b6f1814 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -88,10 +88,10 @@
     </content>
     <orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="appcompat-v7-23.0.1" level="project" />
     <orderEntry type="library" exported="" name="picasso-2.5.2" level="project" />
     <orderEntry type="library" exported="" name="support-v4-23.0.1" level="project" />
+    <orderEntry type="library" exported="" name="appcompat-v7-23.0.1" level="project" />
     <orderEntry type="library" exported="" name="support-annotations-23.0.1" level="project" />
-    <orderEntry type="module" module-name="library" exported="" />
+    <orderEntry type="module" module-name="playerview" exported="" />
   </component>
 </module>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 8a516e9..8058003 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 apply plugin: 'checkstyle'
 
 dependencies {
-  compile project(':library')
+  compile project(':playerview')
   compile "com.android.support:appcompat-v7:23.0.1"
 }
 
diff --git a/app/res/layout/activity_main.xml b/app/res/layout/activity_main.xml
index 38d9c37..990a7f6 100644
--- a/app/res/layout/activity_main.xml
+++ b/app/res/layout/activity_main.xml
@@ -28,7 +28,7 @@
         android:layout_below="@+id/textViewSong"/>
 
 
-    <co.mobiwise.library.MusicPlayerView
+    <co.mobiwise.playerview.MusicPlayerView
         android:id="@+id/mpv"
         android:layout_width="250dp"
         android:layout_height="250dp"
diff --git a/app/src/main/java/co/mobiwise/musicplayerprogressview/MainActivity.java b/app/src/main/java/co/mobiwise/musicplayerprogressview/MainActivity.java
index 2bf614e..b0db687 100644
--- a/app/src/main/java/co/mobiwise/musicplayerprogressview/MainActivity.java
+++ b/app/src/main/java/co/mobiwise/musicplayerprogressview/MainActivity.java
@@ -2,11 +2,9 @@
 
 import android.app.Activity;
 import android.os.Bundle;
-import android.util.Log;
 import android.view.View;
-import android.widget.ImageView;
 
-import co.mobiwise.library.MusicPlayerView;
+import co.mobiwise.playerview.MusicPlayerView;
 
 public class MainActivity extends Activity {
 
diff --git a/library/AndroidManifest.xml b/library/AndroidManifest.xml
deleted file mode 100644
index 3e79eb7..0000000
--- a/library/AndroidManifest.xml
+++ /dev/null
@@ -1 +0,0 @@
-<manifest package="co.mobiwise.library"/>
diff --git a/library/library.iml b/library/library.iml
deleted file mode 100644
index e16b84a..0000000
--- a/library/library.iml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":library" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="MusicPlayerView" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="android-gradle" name="Android-Gradle">
-      <configuration>
-        <option name="GRADLE_PROJECT_PATH" value=":library" />
-      </configuration>
-    </facet>
-    <facet type="android" name="Android">
-      <configuration>
-        <option name="SELECTED_BUILD_VARIANT" value="debug" />
-        <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
-        <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
-        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
-        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
-        <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
-        <afterSyncTasks>
-          <task>generateDebugAndroidTestSources</task>
-          <task>generateDebugSources</task>
-        </afterSyncTasks>
-        <option name="ALLOW_USER_CONFIGURATION" value="false" />
-        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/res" />
-        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
-        <option name="LIBRARY_PROJECT" value="true" />
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
-    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
-      <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
-    </content>
-    <orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="picasso-2.5.2" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/playerview/AndroidManifest.xml b/playerview/AndroidManifest.xml
new file mode 100644
index 0000000..ee5f44e
--- /dev/null
+++ b/playerview/AndroidManifest.xml
@@ -0,0 +1 @@
+<manifest package="co.mobiwise.playerview"/>
diff --git a/library/build.gradle b/playerview/build.gradle
similarity index 100%
rename from library/build.gradle
rename to playerview/build.gradle
diff --git a/library/res/drawable/icon_pause.png b/playerview/res/drawable/icon_pause.png
similarity index 100%
rename from library/res/drawable/icon_pause.png
rename to playerview/res/drawable/icon_pause.png
diff --git a/library/res/drawable/icon_play.png b/playerview/res/drawable/icon_play.png
similarity index 100%
rename from library/res/drawable/icon_play.png
rename to playerview/res/drawable/icon_play.png
diff --git a/library/res/values/attrs.xml b/playerview/res/values/attrs.xml
similarity index 100%
rename from library/res/values/attrs.xml
rename to playerview/res/values/attrs.xml
diff --git a/library/res/values/dimens.xml b/playerview/res/values/dimens.xml
similarity index 100%
rename from library/res/values/dimens.xml
rename to playerview/res/values/dimens.xml
diff --git a/library/src/main/java/co/mobiwise/library/MusicPlayerView.java b/playerview/src/main/java/co/mobiwise/playerview/MusicPlayerView.java
similarity index 99%
rename from library/src/main/java/co/mobiwise/library/MusicPlayerView.java
rename to playerview/src/main/java/co/mobiwise/playerview/MusicPlayerView.java
index ffa3030..298bf4a 100644
--- a/library/src/main/java/co/mobiwise/library/MusicPlayerView.java
+++ b/playerview/src/main/java/co/mobiwise/playerview/MusicPlayerView.java
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package co.mobiwise.library;
+package co.mobiwise.playerview;
 
 import android.animation.Animator;
 import android.animation.AnimatorSet;
diff --git a/library/src/main/java/co/mobiwise/library/OnPlayPauseToggleListener.java b/playerview/src/main/java/co/mobiwise/playerview/OnPlayPauseToggleListener.java
similarity index 95%
rename from library/src/main/java/co/mobiwise/library/OnPlayPauseToggleListener.java
rename to playerview/src/main/java/co/mobiwise/playerview/OnPlayPauseToggleListener.java
index 10938c1..e5742d6 100644
--- a/library/src/main/java/co/mobiwise/library/OnPlayPauseToggleListener.java
+++ b/playerview/src/main/java/co/mobiwise/playerview/OnPlayPauseToggleListener.java
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package co.mobiwise.library;
+package co.mobiwise.playerview;
 
 public interface OnPlayPauseToggleListener {
     void onToggled();
diff --git a/library/src/main/java/co/mobiwise/library/PlayPauseDrawable.java b/playerview/src/main/java/co/mobiwise/playerview/PlayPauseDrawable.java
similarity index 99%
rename from library/src/main/java/co/mobiwise/library/PlayPauseDrawable.java
rename to playerview/src/main/java/co/mobiwise/playerview/PlayPauseDrawable.java
index b5712e6..42f6d92 100755
--- a/library/src/main/java/co/mobiwise/library/PlayPauseDrawable.java
+++ b/playerview/src/main/java/co/mobiwise/playerview/PlayPauseDrawable.java
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package co.mobiwise.library;
+package co.mobiwise.playerview;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
diff --git a/settings.gradle b/settings.gradle
index 3306997..3837fb1 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1 @@
-include ':app', ':library'
+include ':app', ':playerview'