diff --git a/README.md b/README.md
index 1e52a51..19325b4 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ RxJava.
 To use Servant in your project, add the library as a dependency in your `build.gradle` file:
 ```groovy
 dependencies {
-    compile 'com.mtramin:servant:9.8.0.0'
+    compile 'com.mtramin.servant2:servant:9.8.0.0'
 }
 ```
 
@@ -67,7 +67,7 @@ Servant.completable(/* implement GoogleApiClientCompletable */)
 
 Servant brings the following dependencies:
 
-- RxJava (v1.x)
+- RxJava (v2.x)
 - Google Play Services (base) which provides GoogleApiClient
 
 Due to the Google Play Services dependency also the method count of the library seems quite high.
@@ -94,4 +94,4 @@ Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
-limitations under the License.
\ No newline at end of file
+limitations under the License.
diff --git a/sample/src/main/java/com/mtramin/servant_sample/MainActivity.java b/sample/src/main/java/com/mtramin/servant_sample/MainActivity.java
index 858af15..2285e05 100644
--- a/sample/src/main/java/com/mtramin/servant_sample/MainActivity.java
+++ b/sample/src/main/java/com/mtramin/servant_sample/MainActivity.java
@@ -25,9 +25,9 @@
 import com.google.android.gms.auth.api.signin.GoogleSignInOptions;
 import com.google.android.gms.common.api.GoogleApiClient;
 import com.google.android.gms.location.LocationServices;
-import com.mtramin.servant.GoogleApiClientCompletable;
-import com.mtramin.servant.GoogleApiClientSingle;
-import com.mtramin.servant.Servant;
+import com.mtramin.servant2.GoogleApiClientCompletable;
+import com.mtramin.servant2.GoogleApiClientSingle;
+import com.mtramin.servant2.Servant;
 import com.mtramin.servant_sampler.R;
 
 import io.reactivex.disposables.Disposable;
diff --git a/servant/build.gradle b/servant/build.gradle
index 9d405f0..ed7ad9a 100644
--- a/servant/build.gradle
+++ b/servant/build.gradle
@@ -17,7 +17,7 @@
 apply plugin: 'com.android.library'
 apply plugin: 'me.tatarka.retrolambda'
 
-group 'com.mtramin'
+group 'com.mtramin.servant2'
 version versions.name
 
 android {
diff --git a/servant/src/main/AndroidManifest.xml b/servant/src/main/AndroidManifest.xml
index 4f1293b..10cea03 100644
--- a/servant/src/main/AndroidManifest.xml
+++ b/servant/src/main/AndroidManifest.xml
@@ -14,4 +14,4 @@
   ~ limitations under the License.
   -->
 
-<manifest package="com.mtramin.servant" />
\ No newline at end of file
+<manifest package="com.mtramin.servant2" />
diff --git a/servant/src/main/java/com/mtramin/servant/ApiDefinition.java b/servant/src/main/java/com/mtramin/servant2/ApiDefinition.java
similarity index 95%
rename from servant/src/main/java/com/mtramin/servant/ApiDefinition.java
rename to servant/src/main/java/com/mtramin/servant2/ApiDefinition.java
index cefc6ae..00d5e2e 100644
--- a/servant/src/main/java/com/mtramin/servant/ApiDefinition.java
+++ b/servant/src/main/java/com/mtramin/servant2/ApiDefinition.java
@@ -1,4 +1,4 @@
-package com.mtramin.servant;
+package com.mtramin.servant2;
 
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
diff --git a/servant/src/main/java/com/mtramin/servant/ApiWithOptions.java b/servant/src/main/java/com/mtramin/servant2/ApiWithOptions.java
similarity index 95%
rename from servant/src/main/java/com/mtramin/servant/ApiWithOptions.java
rename to servant/src/main/java/com/mtramin/servant2/ApiWithOptions.java
index 16c54b8..8b9522b 100644
--- a/servant/src/main/java/com/mtramin/servant/ApiWithOptions.java
+++ b/servant/src/main/java/com/mtramin/servant2/ApiWithOptions.java
@@ -1,4 +1,4 @@
-package com.mtramin.servant;
+package com.mtramin.servant2;
 
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
diff --git a/servant/src/main/java/com/mtramin/servant/BaseClient.java b/servant/src/main/java/com/mtramin/servant2/BaseClient.java
similarity index 98%
rename from servant/src/main/java/com/mtramin/servant/BaseClient.java
rename to servant/src/main/java/com/mtramin/servant2/BaseClient.java
index ffb64c2..5911723 100644
--- a/servant/src/main/java/com/mtramin/servant/BaseClient.java
+++ b/servant/src/main/java/com/mtramin/servant2/BaseClient.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.mtramin.servant;
+package com.mtramin.servant2;
 
 import android.content.Context;
 import android.os.Bundle;
diff --git a/servant/src/main/java/com/mtramin/servant/ClientException.java b/servant/src/main/java/com/mtramin/servant2/ClientException.java
similarity index 96%
rename from servant/src/main/java/com/mtramin/servant/ClientException.java
rename to servant/src/main/java/com/mtramin/servant2/ClientException.java
index 637b4fe..54e6b49 100644
--- a/servant/src/main/java/com/mtramin/servant/ClientException.java
+++ b/servant/src/main/java/com/mtramin/servant2/ClientException.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.mtramin.servant;
+package com.mtramin.servant2;
 
 /**
  * Exception that is thrown upon errors with the {@link com.google.android.gms.common.api.GoogleApiClient}
diff --git a/servant/src/main/java/com/mtramin/servant/GoogleApi.java b/servant/src/main/java/com/mtramin/servant2/GoogleApi.java
similarity index 93%
rename from servant/src/main/java/com/mtramin/servant/GoogleApi.java
rename to servant/src/main/java/com/mtramin/servant2/GoogleApi.java
index 7111760..0c1835e 100644
--- a/servant/src/main/java/com/mtramin/servant/GoogleApi.java
+++ b/servant/src/main/java/com/mtramin/servant2/GoogleApi.java
@@ -1,4 +1,4 @@
-package com.mtramin.servant;
+package com.mtramin.servant2;
 
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
diff --git a/servant/src/main/java/com/mtramin/servant/GoogleApiClientActions.java b/servant/src/main/java/com/mtramin/servant2/GoogleApiClientActions.java
similarity index 98%
rename from servant/src/main/java/com/mtramin/servant/GoogleApiClientActions.java
rename to servant/src/main/java/com/mtramin/servant2/GoogleApiClientActions.java
index c4b502f..eabba92 100644
--- a/servant/src/main/java/com/mtramin/servant/GoogleApiClientActions.java
+++ b/servant/src/main/java/com/mtramin/servant2/GoogleApiClientActions.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.mtramin.servant;
+package com.mtramin.servant2;
 
 import android.content.Context;
 
diff --git a/servant/src/main/java/com/mtramin/servant/GoogleApiClientCompletable.java b/servant/src/main/java/com/mtramin/servant2/GoogleApiClientCompletable.java
similarity index 98%
rename from servant/src/main/java/com/mtramin/servant/GoogleApiClientCompletable.java
rename to servant/src/main/java/com/mtramin/servant2/GoogleApiClientCompletable.java
index 4020872..51e2b14 100644
--- a/servant/src/main/java/com/mtramin/servant/GoogleApiClientCompletable.java
+++ b/servant/src/main/java/com/mtramin/servant2/GoogleApiClientCompletable.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.mtramin.servant;
+package com.mtramin.servant2;
 
 import android.content.Context;
 
diff --git a/servant/src/main/java/com/mtramin/servant/GoogleApiClientObservable.java b/servant/src/main/java/com/mtramin/servant2/GoogleApiClientObservable.java
similarity index 98%
rename from servant/src/main/java/com/mtramin/servant/GoogleApiClientObservable.java
rename to servant/src/main/java/com/mtramin/servant2/GoogleApiClientObservable.java
index 8b45735..d871c88 100644
--- a/servant/src/main/java/com/mtramin/servant/GoogleApiClientObservable.java
+++ b/servant/src/main/java/com/mtramin/servant2/GoogleApiClientObservable.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.mtramin.servant;
+package com.mtramin.servant2;
 
 import android.content.Context;
 
diff --git a/servant/src/main/java/com/mtramin/servant/GoogleApiClientRequestSingle.java b/servant/src/main/java/com/mtramin/servant2/GoogleApiClientRequestSingle.java
similarity index 99%
rename from servant/src/main/java/com/mtramin/servant/GoogleApiClientRequestSingle.java
rename to servant/src/main/java/com/mtramin/servant2/GoogleApiClientRequestSingle.java
index 3ca357c..7fdb93f 100644
--- a/servant/src/main/java/com/mtramin/servant/GoogleApiClientRequestSingle.java
+++ b/servant/src/main/java/com/mtramin/servant2/GoogleApiClientRequestSingle.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.mtramin.servant;
+package com.mtramin.servant2;
 
 import android.content.Context;
 
diff --git a/servant/src/main/java/com/mtramin/servant/GoogleApiClientSingle.java b/servant/src/main/java/com/mtramin/servant2/GoogleApiClientSingle.java
similarity index 98%
rename from servant/src/main/java/com/mtramin/servant/GoogleApiClientSingle.java
rename to servant/src/main/java/com/mtramin/servant2/GoogleApiClientSingle.java
index 98619d0..e1436cb 100644
--- a/servant/src/main/java/com/mtramin/servant/GoogleApiClientSingle.java
+++ b/servant/src/main/java/com/mtramin/servant2/GoogleApiClientSingle.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.mtramin.servant;
+package com.mtramin.servant2;
 
 import android.content.Context;
 
diff --git a/servant/src/main/java/com/mtramin/servant/Servant.java b/servant/src/main/java/com/mtramin/servant2/Servant.java
similarity index 99%
rename from servant/src/main/java/com/mtramin/servant/Servant.java
rename to servant/src/main/java/com/mtramin/servant2/Servant.java
index 6f58be3..63115f3 100644
--- a/servant/src/main/java/com/mtramin/servant/Servant.java
+++ b/servant/src/main/java/com/mtramin/servant2/Servant.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.mtramin.servant;
+package com.mtramin.servant2;
 
 import android.content.Context;