diff --git a/app/build.gradle b/app/build.gradle
index 9ad087b..b9ccd49 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -5,7 +5,6 @@ android {
 	buildToolsVersion "22.0.1"
 
 	defaultConfig {
-		applicationId "cz.kinst.jakub.statefulviewsample"
 		minSdkVersion 16
 		targetSdkVersion 22
 		versionCode 1
diff --git a/app/src/androidTest/java/cz/kinst/jakub/statefulviewsample/ApplicationTest.java b/app/src/androidTest/java/cz/kinst/jakub/statefulviewsample/ApplicationTest.java
deleted file mode 100644
index 2aef048..0000000
--- a/app/src/androidTest/java/cz/kinst/jakub/statefulviewsample/ApplicationTest.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package cz.kinst.jakub.statefulviewsample;
-
-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/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0e8a52f..a089593 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-		  package="cz.kinst.jakub.statefulviewsample">
+		  package="com.strv.sample.statefulview">
 
 	<application
 		android:allowBackup="true"
diff --git a/app/src/main/java/cz/kinst/jakub/statefulviewsample/MainActivity.java b/app/src/main/java/com/strv/sample/statefulview/MainActivity.java
similarity index 90%
rename from app/src/main/java/cz/kinst/jakub/statefulviewsample/MainActivity.java
rename to app/src/main/java/com/strv/sample/statefulview/MainActivity.java
index a871420..66e4df5 100644
--- a/app/src/main/java/cz/kinst/jakub/statefulviewsample/MainActivity.java
+++ b/app/src/main/java/com/strv/sample/statefulview/MainActivity.java
@@ -1,10 +1,10 @@
-package cz.kinst.jakub.statefulviewsample;
+package com.strv.sample.statefulview;
 
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 
-import com.strv.StatefulView;
+import com.strv.view.StatefulView;
 
 
 public class MainActivity extends AppCompatActivity
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 35e2424..ad9272e 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -47,7 +47,7 @@
 			android:text="EMPTY"/>
 	</LinearLayout>
 
-	<com.strv.StatefulView
+	<com.strv.view.StatefulView
 		android:id="@+id/stateful"
 		android:layout_width="match_parent"
 		android:layout_height="0dp"
@@ -60,5 +60,5 @@
 			android:layout_height="wrap_content"
 			android:layout_gravity="center"
 			android:text="Content"/>
-	</com.strv.StatefulView>
+	</com.strv.view.StatefulView>
 </LinearLayout>
diff --git a/library/src/androidTest/java/com/example/statefulview/ApplicationTest.java b/library/src/androidTest/java/com/example/statefulview/ApplicationTest.java
deleted file mode 100644
index f274cbf..0000000
--- a/library/src/androidTest/java/com/example/statefulview/ApplicationTest.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.example.statefulview;
-
-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/src/main/AndroidManifest.xml b/library/src/main/AndroidManifest.xml
index 732944c..087b46e 100644
--- a/library/src/main/AndroidManifest.xml
+++ b/library/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-		  package="com.strv">
+		  package="com.strv.view">
 
 	<application
 		android:allowBackup="true">
diff --git a/library/src/main/java/com/strv/StatefulView.java b/library/src/main/java/com/strv/view/StatefulView.java
similarity index 99%
rename from library/src/main/java/com/strv/StatefulView.java
rename to library/src/main/java/com/strv/view/StatefulView.java
index 2053c44..8756fc8 100644
--- a/library/src/main/java/com/strv/StatefulView.java
+++ b/library/src/main/java/com/strv/view/StatefulView.java
@@ -1,4 +1,4 @@
-package com.strv;
+package com.strv.view;
 
 import android.content.Context;
 import android.content.res.TypedArray;
diff --git a/library/src/main/java/com/strv/ViewState.java b/library/src/main/java/com/strv/view/ViewState.java
similarity index 73%
rename from library/src/main/java/com/strv/ViewState.java
rename to library/src/main/java/com/strv/view/ViewState.java
index e1c9543..2ba35af 100644
--- a/library/src/main/java/com/strv/ViewState.java
+++ b/library/src/main/java/com/strv/view/ViewState.java
@@ -1,4 +1,4 @@
-package com.strv;
+package com.strv.view;
 
 
 public enum ViewState