diff --git a/rxandroid/build.gradle b/library/build.gradle
similarity index 100%
rename from rxandroid/build.gradle
rename to library/build.gradle
diff --git a/rxandroid/src/main/java/rx/android/concurrency/AndroidSchedulers.java b/library/src/main/java/rx/android/concurrency/AndroidSchedulers.java
similarity index 100%
rename from rxandroid/src/main/java/rx/android/concurrency/AndroidSchedulers.java
rename to library/src/main/java/rx/android/concurrency/AndroidSchedulers.java
diff --git a/rxandroid/src/main/java/rx/android/concurrency/HandlerThreadScheduler.java b/library/src/main/java/rx/android/concurrency/HandlerThreadScheduler.java
similarity index 100%
rename from rxandroid/src/main/java/rx/android/concurrency/HandlerThreadScheduler.java
rename to library/src/main/java/rx/android/concurrency/HandlerThreadScheduler.java
diff --git a/rxandroid/src/main/java/rx/android/events/OnCheckedChangeEvent.java b/library/src/main/java/rx/android/events/OnCheckedChangeEvent.java
similarity index 100%
rename from rxandroid/src/main/java/rx/android/events/OnCheckedChangeEvent.java
rename to library/src/main/java/rx/android/events/OnCheckedChangeEvent.java
diff --git a/rxandroid/src/main/java/rx/android/events/OnClickEvent.java b/library/src/main/java/rx/android/events/OnClickEvent.java
similarity index 100%
rename from rxandroid/src/main/java/rx/android/events/OnClickEvent.java
rename to library/src/main/java/rx/android/events/OnClickEvent.java
diff --git a/rxandroid/src/main/java/rx/android/events/OnItemClickEvent.java b/library/src/main/java/rx/android/events/OnItemClickEvent.java
similarity index 100%
rename from rxandroid/src/main/java/rx/android/events/OnItemClickEvent.java
rename to library/src/main/java/rx/android/events/OnItemClickEvent.java
diff --git a/rxandroid/src/main/java/rx/android/events/OnTextChangeEvent.java b/library/src/main/java/rx/android/events/OnTextChangeEvent.java
similarity index 100%
rename from rxandroid/src/main/java/rx/android/events/OnTextChangeEvent.java
rename to library/src/main/java/rx/android/events/OnTextChangeEvent.java
diff --git a/rxandroid/src/main/java/rx/android/functions/ViewAction1.java b/library/src/main/java/rx/android/functions/ViewAction1.java
similarity index 100%
rename from rxandroid/src/main/java/rx/android/functions/ViewAction1.java
rename to library/src/main/java/rx/android/functions/ViewAction1.java
diff --git a/rxandroid/src/main/java/rx/android/functions/ViewActionSetActivated.java b/library/src/main/java/rx/android/functions/ViewActionSetActivated.java
similarity index 100%
rename from rxandroid/src/main/java/rx/android/functions/ViewActionSetActivated.java
rename to library/src/main/java/rx/android/functions/ViewActionSetActivated.java
diff --git a/rxandroid/src/main/java/rx/android/functions/ViewActionSetClickable.java b/library/src/main/java/rx/android/functions/ViewActionSetClickable.java
similarity index 100%
rename from rxandroid/src/main/java/rx/android/functions/ViewActionSetClickable.java
rename to library/src/main/java/rx/android/functions/ViewActionSetClickable.java
diff --git a/rxandroid/src/main/java/rx/android/functions/ViewActionSetEnabled.java b/library/src/main/java/rx/android/functions/ViewActionSetEnabled.java
similarity index 100%
rename from rxandroid/src/main/java/rx/android/functions/ViewActionSetEnabled.java
rename to library/src/main/java/rx/android/functions/ViewActionSetEnabled.java
diff --git a/rxandroid/src/main/java/rx/android/functions/ViewActionSetFocusable.java b/library/src/main/java/rx/android/functions/ViewActionSetFocusable.java
similarity index 100%
rename from rxandroid/src/main/java/rx/android/functions/ViewActionSetFocusable.java
rename to library/src/main/java/rx/android/functions/ViewActionSetFocusable.java
diff --git a/rxandroid/src/main/java/rx/android/functions/ViewActionSetSelected.java b/library/src/main/java/rx/android/functions/ViewActionSetSelected.java
similarity index 100%
rename from rxandroid/src/main/java/rx/android/functions/ViewActionSetSelected.java
rename to library/src/main/java/rx/android/functions/ViewActionSetSelected.java
diff --git a/rxandroid/src/main/java/rx/android/functions/ViewActionSetVisibility.java b/library/src/main/java/rx/android/functions/ViewActionSetVisibility.java
similarity index 100%
rename from rxandroid/src/main/java/rx/android/functions/ViewActionSetVisibility.java
rename to library/src/main/java/rx/android/functions/ViewActionSetVisibility.java
diff --git a/rxandroid/src/main/java/rx/android/functions/ViewActions.java b/library/src/main/java/rx/android/functions/ViewActions.java
similarity index 100%
rename from rxandroid/src/main/java/rx/android/functions/ViewActions.java
rename to library/src/main/java/rx/android/functions/ViewActions.java
diff --git a/rxandroid/src/main/java/rx/android/observables/AndroidObservable.java b/library/src/main/java/rx/android/observables/AndroidObservable.java
similarity index 100%
rename from rxandroid/src/main/java/rx/android/observables/AndroidObservable.java
rename to library/src/main/java/rx/android/observables/AndroidObservable.java
diff --git a/rxandroid/src/main/java/rx/android/observables/Assertions.java b/library/src/main/java/rx/android/observables/Assertions.java
similarity index 100%
rename from rxandroid/src/main/java/rx/android/observables/Assertions.java
rename to library/src/main/java/rx/android/observables/Assertions.java
diff --git a/rxandroid/src/main/java/rx/android/observables/ViewObservable.java b/library/src/main/java/rx/android/observables/ViewObservable.java
similarity index 100%
rename from rxandroid/src/main/java/rx/android/observables/ViewObservable.java
rename to library/src/main/java/rx/android/observables/ViewObservable.java
diff --git a/rxandroid/src/main/java/rx/android/operators/OperatorAdapterViewOnItemClick.java b/library/src/main/java/rx/android/operators/OperatorAdapterViewOnItemClick.java
similarity index 100%
rename from rxandroid/src/main/java/rx/android/operators/OperatorAdapterViewOnItemClick.java
rename to library/src/main/java/rx/android/operators/OperatorAdapterViewOnItemClick.java
diff --git a/rxandroid/src/main/java/rx/android/operators/OperatorBroadcastRegister.java b/library/src/main/java/rx/android/operators/OperatorBroadcastRegister.java
similarity index 100%
rename from rxandroid/src/main/java/rx/android/operators/OperatorBroadcastRegister.java
rename to library/src/main/java/rx/android/operators/OperatorBroadcastRegister.java
diff --git a/rxandroid/src/main/java/rx/android/operators/OperatorCompoundButtonInput.java b/library/src/main/java/rx/android/operators/OperatorCompoundButtonInput.java
similarity index 100%
rename from rxandroid/src/main/java/rx/android/operators/OperatorCompoundButtonInput.java
rename to library/src/main/java/rx/android/operators/OperatorCompoundButtonInput.java
diff --git a/rxandroid/src/main/java/rx/android/operators/OperatorConditionalBinding.java b/library/src/main/java/rx/android/operators/OperatorConditionalBinding.java
similarity index 100%
rename from rxandroid/src/main/java/rx/android/operators/OperatorConditionalBinding.java
rename to library/src/main/java/rx/android/operators/OperatorConditionalBinding.java
diff --git a/rxandroid/src/main/java/rx/android/operators/OperatorLocalBroadcastRegister.java b/library/src/main/java/rx/android/operators/OperatorLocalBroadcastRegister.java
similarity index 100%
rename from rxandroid/src/main/java/rx/android/operators/OperatorLocalBroadcastRegister.java
rename to library/src/main/java/rx/android/operators/OperatorLocalBroadcastRegister.java
diff --git a/rxandroid/src/main/java/rx/android/operators/OperatorSharedPreferenceChange.java b/library/src/main/java/rx/android/operators/OperatorSharedPreferenceChange.java
similarity index 100%
rename from rxandroid/src/main/java/rx/android/operators/OperatorSharedPreferenceChange.java
rename to library/src/main/java/rx/android/operators/OperatorSharedPreferenceChange.java
diff --git a/rxandroid/src/main/java/rx/android/operators/OperatorTextViewInput.java b/library/src/main/java/rx/android/operators/OperatorTextViewInput.java
similarity index 100%
rename from rxandroid/src/main/java/rx/android/operators/OperatorTextViewInput.java
rename to library/src/main/java/rx/android/operators/OperatorTextViewInput.java
diff --git a/rxandroid/src/main/java/rx/android/operators/OperatorViewClick.java b/library/src/main/java/rx/android/operators/OperatorViewClick.java
similarity index 100%
rename from rxandroid/src/main/java/rx/android/operators/OperatorViewClick.java
rename to library/src/main/java/rx/android/operators/OperatorViewClick.java
diff --git a/rxandroid/src/main/java/rx/android/schedulers/AndroidSchedulers.java b/library/src/main/java/rx/android/schedulers/AndroidSchedulers.java
similarity index 100%
rename from rxandroid/src/main/java/rx/android/schedulers/AndroidSchedulers.java
rename to library/src/main/java/rx/android/schedulers/AndroidSchedulers.java
diff --git a/rxandroid/src/main/java/rx/android/schedulers/HandlerThreadScheduler.java b/library/src/main/java/rx/android/schedulers/HandlerThreadScheduler.java
similarity index 100%
rename from rxandroid/src/main/java/rx/android/schedulers/HandlerThreadScheduler.java
rename to library/src/main/java/rx/android/schedulers/HandlerThreadScheduler.java
diff --git a/rxandroid/src/main/java/rx/android/subscriptions/AndroidSubscriptions.java b/library/src/main/java/rx/android/subscriptions/AndroidSubscriptions.java
similarity index 100%
rename from rxandroid/src/main/java/rx/android/subscriptions/AndroidSubscriptions.java
rename to library/src/main/java/rx/android/subscriptions/AndroidSubscriptions.java
diff --git a/rxandroid/src/test/java/rx/android/TestUtil.java b/library/src/test/java/rx/android/TestUtil.java
similarity index 100%
rename from rxandroid/src/test/java/rx/android/TestUtil.java
rename to library/src/test/java/rx/android/TestUtil.java
diff --git a/rxandroid/src/test/java/rx/android/functions/ViewAction1Test.java b/library/src/test/java/rx/android/functions/ViewAction1Test.java
similarity index 100%
rename from rxandroid/src/test/java/rx/android/functions/ViewAction1Test.java
rename to library/src/test/java/rx/android/functions/ViewAction1Test.java
diff --git a/rxandroid/src/test/java/rx/android/functions/ViewActionSetActivatedTest.java b/library/src/test/java/rx/android/functions/ViewActionSetActivatedTest.java
similarity index 100%
rename from rxandroid/src/test/java/rx/android/functions/ViewActionSetActivatedTest.java
rename to library/src/test/java/rx/android/functions/ViewActionSetActivatedTest.java
diff --git a/rxandroid/src/test/java/rx/android/functions/ViewActionSetClickableTest.java b/library/src/test/java/rx/android/functions/ViewActionSetClickableTest.java
similarity index 100%
rename from rxandroid/src/test/java/rx/android/functions/ViewActionSetClickableTest.java
rename to library/src/test/java/rx/android/functions/ViewActionSetClickableTest.java
diff --git a/rxandroid/src/test/java/rx/android/functions/ViewActionSetEnabledTest.java b/library/src/test/java/rx/android/functions/ViewActionSetEnabledTest.java
similarity index 100%
rename from rxandroid/src/test/java/rx/android/functions/ViewActionSetEnabledTest.java
rename to library/src/test/java/rx/android/functions/ViewActionSetEnabledTest.java
diff --git a/rxandroid/src/test/java/rx/android/functions/ViewActionSetFocusableTest.java b/library/src/test/java/rx/android/functions/ViewActionSetFocusableTest.java
similarity index 100%
rename from rxandroid/src/test/java/rx/android/functions/ViewActionSetFocusableTest.java
rename to library/src/test/java/rx/android/functions/ViewActionSetFocusableTest.java
diff --git a/rxandroid/src/test/java/rx/android/functions/ViewActionSetSelectedTest.java b/library/src/test/java/rx/android/functions/ViewActionSetSelectedTest.java
similarity index 100%
rename from rxandroid/src/test/java/rx/android/functions/ViewActionSetSelectedTest.java
rename to library/src/test/java/rx/android/functions/ViewActionSetSelectedTest.java
diff --git a/rxandroid/src/test/java/rx/android/functions/ViewActionSetVisibilityTest.java b/library/src/test/java/rx/android/functions/ViewActionSetVisibilityTest.java
similarity index 100%
rename from rxandroid/src/test/java/rx/android/functions/ViewActionSetVisibilityTest.java
rename to library/src/test/java/rx/android/functions/ViewActionSetVisibilityTest.java
diff --git a/rxandroid/src/test/java/rx/android/observables/AndroidObservableTest.java b/library/src/test/java/rx/android/observables/AndroidObservableTest.java
similarity index 100%
rename from rxandroid/src/test/java/rx/android/observables/AndroidObservableTest.java
rename to library/src/test/java/rx/android/observables/AndroidObservableTest.java
diff --git a/rxandroid/src/test/java/rx/android/operators/OperatorAdapterViewOnItemClickTest.java b/library/src/test/java/rx/android/operators/OperatorAdapterViewOnItemClickTest.java
similarity index 100%
rename from rxandroid/src/test/java/rx/android/operators/OperatorAdapterViewOnItemClickTest.java
rename to library/src/test/java/rx/android/operators/OperatorAdapterViewOnItemClickTest.java
diff --git a/rxandroid/src/test/java/rx/android/operators/OperatorBroadcastRegisterTest.java b/library/src/test/java/rx/android/operators/OperatorBroadcastRegisterTest.java
similarity index 100%
rename from rxandroid/src/test/java/rx/android/operators/OperatorBroadcastRegisterTest.java
rename to library/src/test/java/rx/android/operators/OperatorBroadcastRegisterTest.java
diff --git a/rxandroid/src/test/java/rx/android/operators/OperatorCompoundButtonInputTest.java b/library/src/test/java/rx/android/operators/OperatorCompoundButtonInputTest.java
similarity index 100%
rename from rxandroid/src/test/java/rx/android/operators/OperatorCompoundButtonInputTest.java
rename to library/src/test/java/rx/android/operators/OperatorCompoundButtonInputTest.java
diff --git a/rxandroid/src/test/java/rx/android/operators/OperatorConditionalBindingTest.java b/library/src/test/java/rx/android/operators/OperatorConditionalBindingTest.java
similarity index 100%
rename from rxandroid/src/test/java/rx/android/operators/OperatorConditionalBindingTest.java
rename to library/src/test/java/rx/android/operators/OperatorConditionalBindingTest.java
diff --git a/rxandroid/src/test/java/rx/android/operators/OperatorLocalBroadcastRegisterTest.java b/library/src/test/java/rx/android/operators/OperatorLocalBroadcastRegisterTest.java
similarity index 100%
rename from rxandroid/src/test/java/rx/android/operators/OperatorLocalBroadcastRegisterTest.java
rename to library/src/test/java/rx/android/operators/OperatorLocalBroadcastRegisterTest.java
diff --git a/rxandroid/src/test/java/rx/android/operators/OperatorSharedPreferencesChangeTest.java b/library/src/test/java/rx/android/operators/OperatorSharedPreferencesChangeTest.java
similarity index 100%
rename from rxandroid/src/test/java/rx/android/operators/OperatorSharedPreferencesChangeTest.java
rename to library/src/test/java/rx/android/operators/OperatorSharedPreferencesChangeTest.java
diff --git a/rxandroid/src/test/java/rx/android/operators/OperatorTextViewInputTest.java b/library/src/test/java/rx/android/operators/OperatorTextViewInputTest.java
similarity index 100%
rename from rxandroid/src/test/java/rx/android/operators/OperatorTextViewInputTest.java
rename to library/src/test/java/rx/android/operators/OperatorTextViewInputTest.java
diff --git a/rxandroid/src/test/java/rx/android/operators/OperatorViewClickTest.java b/library/src/test/java/rx/android/operators/OperatorViewClickTest.java
similarity index 100%
rename from rxandroid/src/test/java/rx/android/operators/OperatorViewClickTest.java
rename to library/src/test/java/rx/android/operators/OperatorViewClickTest.java
diff --git a/rxandroid/src/test/java/rx/android/schedulers/HandlerThreadSchedulerTest.java b/library/src/test/java/rx/android/schedulers/HandlerThreadSchedulerTest.java
similarity index 100%
rename from rxandroid/src/test/java/rx/android/schedulers/HandlerThreadSchedulerTest.java
rename to library/src/test/java/rx/android/schedulers/HandlerThreadSchedulerTest.java
diff --git a/samples-build-wrapper/build.gradle b/samples-build-wrapper/build.gradle
index 56879f62..1e0885f6 100644
--- a/samples-build-wrapper/build.gradle
+++ b/samples-build-wrapper/build.gradle
@@ -1,7 +1,6 @@
 apply plugin: 'java'
-apply plugin: 'maven'
 
-tasks.install.doLast {
+tasks.assemble.doLast {
     def androidHome = System.getenv("ANDROID_HOME")
     if (androidHome) {
         println "Found ANDROID_HOME at $androidHome"
diff --git a/settings.gradle b/settings.gradle
index 4111f7ef..320d449c 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,2 +1,2 @@
-rootProject.name='rxandroid-project'
-include 'rxandroid', 'samples-build-wrapper'
+rootProject.name='rxandroid'
+include 'library', 'samples-build-wrapper'