From 7236209fba8c28a9c2abca136c7cf19aa9981442 Mon Sep 17 00:00:00 2001
From: tledkov <tledkov@gridgain.com>
Date: Thu, 6 Oct 2022 23:56:12 +0300
Subject: [PATCH 1/3] JVD-1 Rename packages, update version

---
 .idea/codeStyles/Project.xml                  |  6 ++-
 README.md                                     |  9 ++--
 build.gradle                                  |  5 +-
 .../jopenlibs}/vault/EnvironmentLoader.java   |  2 +-
 .../github/jopenlibs}/vault/SslConfig.java    |  7 +--
 .../github/jopenlibs}/vault/Vault.java        | 30 +++++------
 .../github/jopenlibs}/vault/VaultConfig.java  |  3 +-
 .../jopenlibs}/vault/VaultException.java      |  2 +-
 .../github/jopenlibs}/vault/api/Auth.java     | 24 ++++-----
 .../github/jopenlibs}/vault/api/Debug.java    | 14 ++---
 .../github/jopenlibs}/vault/api/Leases.java   | 14 ++---
 .../github/jopenlibs}/vault/api/Logical.java  | 36 ++++++-------
 .../vault/api/LogicalUtilities.java           |  4 +-
 .../github/jopenlibs}/vault/api/Seal.java     | 14 ++---
 .../vault/api/database/Database.java          | 16 +++---
 .../api/database/DatabaseCredential.java      |  2 +-
 .../api/database/DatabaseRoleOptions.java     |  2 +-
 .../jopenlibs}/vault/api/mounts/Mount.java    |  2 +-
 .../vault/api/mounts/MountConfig.java         |  2 +-
 .../vault/api/mounts/MountPayload.java        |  6 +--
 .../vault/api/mounts/MountType.java           |  2 +-
 .../jopenlibs}/vault/api/mounts/Mounts.java   | 12 ++---
 .../vault/api/mounts/TimeToLive.java          |  2 +-
 .../jopenlibs}/vault/api/package-info.java    |  4 +-
 .../jopenlibs}/vault/api/pki/Credential.java  |  2 +-
 .../vault/api/pki/CredentialFormat.java       |  2 +-
 .../github/jopenlibs}/vault/api/pki/Pki.java  | 16 +++---
 .../jopenlibs}/vault/api/pki/RoleOptions.java |  2 +-
 .../github/jopenlibs}/vault/json/Json.java    |  2 +-
 .../jopenlibs}/vault/json/JsonArray.java      |  2 +-
 .../jopenlibs}/vault/json/JsonLiteral.java    |  2 +-
 .../jopenlibs}/vault/json/JsonNumber.java     |  2 +-
 .../jopenlibs}/vault/json/JsonObject.java     |  4 +-
 .../jopenlibs}/vault/json/JsonParser.java     |  2 +-
 .../jopenlibs}/vault/json/JsonString.java     |  2 +-
 .../jopenlibs}/vault/json/JsonValue.java      |  2 +-
 .../jopenlibs}/vault/json/JsonWriter.java     |  2 +-
 .../jopenlibs}/vault/json/ParseException.java |  2 +-
 .../jopenlibs}/vault/json/PrettyPrint.java    |  2 +-
 .../jopenlibs}/vault/json/WriterConfig.java   |  2 +-
 .../jopenlibs}/vault/json/WritingBuffer.java  |  2 +-
 .../jopenlibs}/vault/json/package-info.java   |  2 +-
 .../github/jopenlibs}/vault/package-info.java |  2 +-
 .../vault/response/AuthResponse.java          | 16 +++---
 .../vault/response/DatabaseResponse.java      | 16 +++---
 .../vault/response/HealthResponse.java        | 13 ++---
 .../vault/response/LogicalResponse.java       | 14 ++---
 .../vault/response/LookupResponse.java        | 16 +++---
 .../vault/response/MountResponse.java         | 20 +++----
 .../vault/response/PkiResponse.java           | 10 ++--
 .../vault/response/SealResponse.java          | 10 ++--
 .../vault/response/VaultResponse.java         |  4 +-
 .../vault/response/package-info.java          |  2 +-
 .../github/jopenlibs}/vault/rest/Rest.java    |  9 ++--
 .../jopenlibs}/vault/rest/RestException.java  |  2 +-
 .../jopenlibs}/vault/rest/RestResponse.java   |  2 +-
 .../jopenlibs}/vault/rest/package-info.java   |  2 +-
 src/main/java/module-info.java                | 10 ++--
 .../vault/api/AuthBackendAppIdTests.java      |  8 +--
 .../vault/api/AuthBackendAppRoleTests.java    | 12 ++---
 .../vault/api/AuthBackendCertTests.java       | 18 +++----
 .../vault/api/AuthBackendDatabaseTests.java   | 31 +++++------
 .../vault/api/AuthBackendPkiTests.java        | 53 ++++++++++---------
 .../vault/api/AuthBackendTokenTests.java      | 17 +++---
 .../vault/api/AuthBackendUserPassTests.java   | 10 ++--
 .../jopenlibs}/vault/api/DebugTests.java      | 17 +++---
 .../jopenlibs}/vault/api/LeasesTests.java     | 10 ++--
 .../jopenlibs}/vault/api/LogicalTests.java    | 27 +++++-----
 .../jopenlibs}/vault/api/MountsTests.java     | 31 +++++------
 .../jopenlibs}/vault/api/SealTests.java       |  8 +--
 .../jopenlibs}/vault/api/VaultAgentTests.java | 14 ++---
 .../jopenlibs}/vault/util/DbContainer.java    |  2 +-
 .../jopenlibs}/vault/util/SSLUtils.java       |  5 +-
 .../jopenlibs}/vault/util/TestConstants.java  |  2 +-
 .../vault/util/VaultAgentContainer.java       |  8 +--
 .../jopenlibs}/vault/util/VaultContainer.java | 16 +++---
 .../vault/LogicalUtilitiesTests.java          |  8 +--
 .../github/jopenlibs}/vault/RetryTests.java   |  8 +--
 .../github/jopenlibs}/vault/SSLTests.java     |  8 +--
 .../github/jopenlibs}/vault/TimeoutTests.java | 10 ++--
 .../jopenlibs}/vault/VaultConfigTests.java    |  4 +-
 .../jopenlibs}/vault/VaultExceptionTests.java |  2 +-
 .../github/jopenlibs}/vault/VaultTests.java   |  8 +--
 .../vault/api/pki/CredentialFormatTests.java  |  2 +-
 .../vault/api/pki/CredentialTests.java        |  2 +-
 .../vault/api/pki/RoleOptionsTests.java       |  2 +-
 .../jopenlibs}/vault/json/JsonArray_Test.java |  5 +-
 .../vault/json/JsonLiteral_Test.java          | 10 ++--
 .../vault/json/JsonNumber_Test.java           |  5 +-
 .../vault/json/JsonObject_Test.java           |  6 +--
 .../vault/json/JsonParser_Test.java           |  4 +-
 .../vault/json/JsonString_Test.java           |  5 +-
 .../jopenlibs}/vault/json/JsonValue_Test.java |  2 +-
 .../vault/json/JsonWriter_Test.java           |  2 +-
 .../jopenlibs}/vault/json/Json_Test.java      | 14 ++---
 .../vault/json/ParseException_Test.java       |  2 +-
 .../vault/json/PrettyPrint_Test.java          |  8 +--
 .../jopenlibs}/vault/json/TestUtil.java       |  2 +-
 .../vault/json/WritingBuffer_Test.java        |  2 +-
 .../vault/json/test/mocking/Mocking_Test.java | 10 ++--
 .../jopenlibs}/vault/rest/DeleteTests.java    | 10 ++--
 .../jopenlibs}/vault/rest/GetTests.java       |  6 +--
 .../jopenlibs}/vault/rest/PostTests.java      |  6 +--
 .../jopenlibs}/vault/rest/PutTests.java       |  6 +--
 .../vault/vault/VaultTestUtils.java           | 11 ++--
 .../vault/vault/api/AuthBackendAwsTests.java  | 25 +++++----
 .../vault/vault/api/AuthLookupTest.java       | 18 +++----
 .../vault/vault/api/AuthLookupWrapTest.java   | 16 +++---
 .../vault/vault/api/AuthUnwrapTest.java       | 18 +++----
 .../vault/vault/api/TransitApiTest.java       | 19 ++++---
 .../mock/AuthRequestValidatingMockVault.java  |  2 +-
 .../vault/vault/mock/EchoInputMockVault.java  |  6 +--
 .../vault/vault/mock/MockVault.java           |  8 +--
 .../vault/mock/OpenTimeoutsMockVault.java     |  2 +-
 .../vault/mock/ReadTimeoutsMockVault.java     |  2 +-
 .../vault/vault/mock/RetriesMockVault.java    |  2 +-
 116 files changed, 500 insertions(+), 497 deletions(-)
 rename src/main/java/{com/bettercloud => io/github/jopenlibs}/vault/EnvironmentLoader.java (97%)
 rename src/main/java/{com/bettercloud => io/github/jopenlibs}/vault/SslConfig.java (99%)
 rename src/main/java/{com/bettercloud => io/github/jopenlibs}/vault/Vault.java (94%)
 rename src/main/java/{com/bettercloud => io/github/jopenlibs}/vault/VaultConfig.java (99%)
 rename src/main/java/{com/bettercloud => io/github/jopenlibs}/vault/VaultException.java (98%)
 rename src/main/java/{com/bettercloud => io/github/jopenlibs}/vault/api/Auth.java (99%)
 rename src/main/java/{com/bettercloud => io/github/jopenlibs}/vault/api/Debug.java (95%)
 rename src/main/java/{com/bettercloud => io/github/jopenlibs}/vault/api/Leases.java (97%)
 rename src/main/java/{com/bettercloud => io/github/jopenlibs}/vault/api/Logical.java (96%)
 rename src/main/java/{com/bettercloud => io/github/jopenlibs}/vault/api/LogicalUtilities.java (99%)
 rename src/main/java/{com/bettercloud => io/github/jopenlibs}/vault/api/Seal.java (96%)
 rename src/main/java/{com/bettercloud => io/github/jopenlibs}/vault/api/database/Database.java (97%)
 rename src/main/java/{com/bettercloud => io/github/jopenlibs}/vault/api/database/DatabaseCredential.java (93%)
 rename src/main/java/{com/bettercloud => io/github/jopenlibs}/vault/api/database/DatabaseRoleOptions.java (99%)
 rename src/main/java/{com/bettercloud => io/github/jopenlibs}/vault/api/mounts/Mount.java (97%)
 rename src/main/java/{com/bettercloud => io/github/jopenlibs}/vault/api/mounts/MountConfig.java (98%)
 rename src/main/java/{com/bettercloud => io/github/jopenlibs}/vault/api/mounts/MountPayload.java (97%)
 rename src/main/java/{com/bettercloud => io/github/jopenlibs}/vault/api/mounts/MountType.java (96%)
 rename src/main/java/{com/bettercloud => io/github/jopenlibs}/vault/api/mounts/Mounts.java (98%)
 rename src/main/java/{com/bettercloud => io/github/jopenlibs}/vault/api/mounts/TimeToLive.java (97%)
 rename src/main/java/{com/bettercloud => io/github/jopenlibs}/vault/api/package-info.java (56%)
 rename src/main/java/{com/bettercloud => io/github/jopenlibs}/vault/api/pki/Credential.java (98%)
 rename src/main/java/{com/bettercloud => io/github/jopenlibs}/vault/api/pki/CredentialFormat.java (94%)
 rename src/main/java/{com/bettercloud => io/github/jopenlibs}/vault/api/pki/Pki.java (98%)
 rename src/main/java/{com/bettercloud => io/github/jopenlibs}/vault/api/pki/RoleOptions.java (99%)
 rename src/main/java/{com/bettercloud => io/github/jopenlibs}/vault/json/Json.java (99%)
 rename src/main/java/{com/bettercloud => io/github/jopenlibs}/vault/json/JsonArray.java (99%)
 rename src/main/java/{com/bettercloud => io/github/jopenlibs}/vault/json/JsonLiteral.java (98%)
 rename src/main/java/{com/bettercloud => io/github/jopenlibs}/vault/json/JsonNumber.java (98%)
 rename src/main/java/{com/bettercloud => io/github/jopenlibs}/vault/json/JsonObject.java (99%)
 rename src/main/java/{com/bettercloud => io/github/jopenlibs}/vault/json/JsonParser.java (99%)
 rename src/main/java/{com/bettercloud => io/github/jopenlibs}/vault/json/JsonString.java (98%)
 rename src/main/java/{com/bettercloud => io/github/jopenlibs}/vault/json/JsonValue.java (99%)
 rename src/main/java/{com/bettercloud => io/github/jopenlibs}/vault/json/JsonWriter.java (99%)
 rename src/main/java/{com/bettercloud => io/github/jopenlibs}/vault/json/ParseException.java (98%)
 rename src/main/java/{com/bettercloud => io/github/jopenlibs}/vault/json/PrettyPrint.java (99%)
 rename src/main/java/{com/bettercloud => io/github/jopenlibs}/vault/json/WriterConfig.java (98%)
 rename src/main/java/{com/bettercloud => io/github/jopenlibs}/vault/json/WritingBuffer.java (98%)
 rename src/main/java/{com/bettercloud => io/github/jopenlibs}/vault/json/package-info.java (92%)
 rename src/main/java/{com/bettercloud => io/github/jopenlibs}/vault/package-info.java (72%)
 rename src/main/java/{com/bettercloud => io/github/jopenlibs}/vault/response/AuthResponse.java (90%)
 rename src/main/java/{com/bettercloud => io/github/jopenlibs}/vault/response/DatabaseResponse.java (89%)
 rename src/main/java/{com/bettercloud => io/github/jopenlibs}/vault/response/HealthResponse.java (91%)
 rename src/main/java/{com/bettercloud => io/github/jopenlibs}/vault/response/LogicalResponse.java (91%)
 rename src/main/java/{com/bettercloud => io/github/jopenlibs}/vault/response/LookupResponse.java (91%)
 rename src/main/java/{com/bettercloud => io/github/jopenlibs}/vault/response/MountResponse.java (88%)
 rename src/main/java/{com/bettercloud => io/github/jopenlibs}/vault/response/PkiResponse.java (96%)
 rename src/main/java/{com/bettercloud => io/github/jopenlibs}/vault/response/SealResponse.java (85%)
 rename src/main/java/{com/bettercloud => io/github/jopenlibs}/vault/response/VaultResponse.java (91%)
 rename src/main/java/{com/bettercloud => io/github/jopenlibs}/vault/response/package-info.java (63%)
 rename src/main/java/{com/bettercloud => io/github/jopenlibs}/vault/rest/Rest.java (98%)
 rename src/main/java/{com/bettercloud => io/github/jopenlibs}/vault/rest/RestException.java (82%)
 rename src/main/java/{com/bettercloud => io/github/jopenlibs}/vault/rest/RestResponse.java (97%)
 rename src/main/java/{com/bettercloud => io/github/jopenlibs}/vault/rest/package-info.java (83%)
 rename src/test-integration/java/{com/bettercloud => io/github/jopenlibs}/vault/api/AuthBackendAppIdTests.java (85%)
 rename src/test-integration/java/{com/bettercloud => io/github/jopenlibs}/vault/api/AuthBackendAppRoleTests.java (84%)
 rename src/test-integration/java/{com/bettercloud => io/github/jopenlibs}/vault/api/AuthBackendCertTests.java (87%)
 rename src/test-integration/java/{com/bettercloud => io/github/jopenlibs}/vault/api/AuthBackendDatabaseTests.java (80%)
 rename src/test-integration/java/{com/bettercloud => io/github/jopenlibs}/vault/api/AuthBackendPkiTests.java (81%)
 rename src/test-integration/java/{com/bettercloud => io/github/jopenlibs}/vault/api/AuthBackendTokenTests.java (93%)
 rename src/test-integration/java/{com/bettercloud => io/github/jopenlibs}/vault/api/AuthBackendUserPassTests.java (81%)
 rename src/test-integration/java/{com/bettercloud => io/github/jopenlibs}/vault/api/DebugTests.java (82%)
 rename src/test-integration/java/{com/bettercloud => io/github/jopenlibs}/vault/api/LeasesTests.java (90%)
 rename src/test-integration/java/{com/bettercloud => io/github/jopenlibs}/vault/api/LogicalTests.java (95%)
 rename src/test-integration/java/{com/bettercloud => io/github/jopenlibs}/vault/api/MountsTests.java (88%)
 rename src/test-integration/java/{com/bettercloud => io/github/jopenlibs}/vault/api/SealTests.java (90%)
 rename src/test-integration/java/{com/bettercloud => io/github/jopenlibs}/vault/api/VaultAgentTests.java (87%)
 rename src/test-integration/java/{com/bettercloud => io/github/jopenlibs}/vault/util/DbContainer.java (96%)
 rename src/test-integration/java/{com/bettercloud => io/github/jopenlibs}/vault/util/SSLUtils.java (99%)
 rename src/test-integration/java/{com/bettercloud => io/github/jopenlibs}/vault/util/TestConstants.java (97%)
 rename src/test-integration/java/{com/bettercloud => io/github/jopenlibs}/vault/util/VaultAgentContainer.java (94%)
 rename src/test-integration/java/{com/bettercloud => io/github/jopenlibs}/vault/util/VaultContainer.java (98%)
 rename src/test/java/{com/bettercloud => io/github/jopenlibs}/vault/LogicalUtilitiesTests.java (96%)
 rename src/test/java/{com/bettercloud => io/github/jopenlibs}/vault/RetryTests.java (90%)
 rename src/test/java/{com/bettercloud => io/github/jopenlibs}/vault/SSLTests.java (98%)
 rename src/test/java/{com/bettercloud => io/github/jopenlibs}/vault/TimeoutTests.java (93%)
 rename src/test/java/{com/bettercloud => io/github/jopenlibs}/vault/VaultConfigTests.java (98%)
 rename src/test/java/{com/bettercloud => io/github/jopenlibs}/vault/VaultExceptionTests.java (97%)
 rename src/test/java/{com/bettercloud => io/github/jopenlibs}/vault/VaultTests.java (95%)
 rename src/test/java/{com/bettercloud => io/github/jopenlibs}/vault/api/pki/CredentialFormatTests.java (94%)
 rename src/test/java/{com/bettercloud => io/github/jopenlibs}/vault/api/pki/CredentialTests.java (95%)
 rename src/test/java/{com/bettercloud => io/github/jopenlibs}/vault/api/pki/RoleOptionsTests.java (98%)
 rename src/test/java/{com/bettercloud => io/github/jopenlibs}/vault/json/JsonArray_Test.java (99%)
 rename src/test/java/{com/bettercloud => io/github/jopenlibs}/vault/json/JsonLiteral_Test.java (95%)
 rename src/test/java/{com/bettercloud => io/github/jopenlibs}/vault/json/JsonNumber_Test.java (97%)
 rename src/test/java/{com/bettercloud => io/github/jopenlibs}/vault/json/JsonObject_Test.java (99%)
 rename src/test/java/{com/bettercloud => io/github/jopenlibs}/vault/json/JsonParser_Test.java (99%)
 rename src/test/java/{com/bettercloud => io/github/jopenlibs}/vault/json/JsonString_Test.java (96%)
 rename src/test/java/{com/bettercloud => io/github/jopenlibs}/vault/json/JsonValue_Test.java (99%)
 rename src/test/java/{com/bettercloud => io/github/jopenlibs}/vault/json/JsonWriter_Test.java (99%)
 rename src/test/java/{com/bettercloud => io/github/jopenlibs}/vault/json/Json_Test.java (92%)
 rename src/test/java/{com/bettercloud => io/github/jopenlibs}/vault/json/ParseException_Test.java (97%)
 rename src/test/java/{com/bettercloud => io/github/jopenlibs}/vault/json/PrettyPrint_Test.java (95%)
 rename src/test/java/{com/bettercloud => io/github/jopenlibs}/vault/json/TestUtil.java (99%)
 rename src/test/java/{com/bettercloud => io/github/jopenlibs}/vault/json/WritingBuffer_Test.java (99%)
 rename src/test/java/{com/bettercloud => io/github/jopenlibs}/vault/json/test/mocking/Mocking_Test.java (88%)
 rename src/test/java/{com/bettercloud => io/github/jopenlibs}/vault/rest/DeleteTests.java (94%)
 rename src/test/java/{com/bettercloud => io/github/jopenlibs}/vault/rest/GetTests.java (98%)
 rename src/test/java/{com/bettercloud => io/github/jopenlibs}/vault/rest/PostTests.java (98%)
 rename src/test/java/{com/bettercloud => io/github/jopenlibs}/vault/rest/PutTests.java (98%)
 rename src/test/java/{com/bettercloud => io/github/jopenlibs}/vault/vault/VaultTestUtils.java (90%)
 rename src/test/java/{com/bettercloud => io/github/jopenlibs}/vault/vault/api/AuthBackendAwsTests.java (87%)
 rename src/test/java/{com/bettercloud => io/github/jopenlibs}/vault/vault/api/AuthLookupTest.java (86%)
 rename src/test/java/{com/bettercloud => io/github/jopenlibs}/vault/vault/api/AuthLookupWrapTest.java (82%)
 rename src/test/java/{com/bettercloud => io/github/jopenlibs}/vault/vault/api/AuthUnwrapTest.java (86%)
 rename src/test/java/{com/bettercloud => io/github/jopenlibs}/vault/vault/api/TransitApiTest.java (93%)
 rename src/test/java/{com/bettercloud => io/github/jopenlibs}/vault/vault/mock/AuthRequestValidatingMockVault.java (97%)
 rename src/test/java/{com/bettercloud => io/github/jopenlibs}/vault/vault/mock/EchoInputMockVault.java (95%)
 rename src/test/java/{com/bettercloud => io/github/jopenlibs}/vault/vault/mock/MockVault.java (91%)
 rename src/test/java/{com/bettercloud => io/github/jopenlibs}/vault/vault/mock/OpenTimeoutsMockVault.java (98%)
 rename src/test/java/{com/bettercloud => io/github/jopenlibs}/vault/vault/mock/ReadTimeoutsMockVault.java (98%)
 rename src/test/java/{com/bettercloud => io/github/jopenlibs}/vault/vault/mock/RetriesMockVault.java (98%)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 8c7b0846..83636120 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -44,9 +44,11 @@
       <option name="JD_KEEP_EMPTY_EXCEPTION" value="false" />
       <option name="JD_KEEP_EMPTY_RETURN" value="false" />
     </JavaCodeStyleSettings>
+    <ScalaCodeStyleSettings>
+      <option name="MULTILINE_STRING_CLOSING_QUOTES_ON_NEW_LINE" value="true" />
+    </ScalaCodeStyleSettings>
     <XML>
       <option name="XML_ALIGN_ATTRIBUTES" value="false" />
-      <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
     </XML>
     <codeStyleSettings language="CSS">
       <indentOptions>
@@ -122,4 +124,4 @@
       </indentOptions>
     </codeStyleSettings>
   </code_scheme>
-</component>
+</component>
\ No newline at end of file
diff --git a/README.md b/README.md
index 4a157cef..1e5ee5b9 100644
--- a/README.md
+++ b/README.md
@@ -37,22 +37,22 @@ The driver is available from Maven Central, for all modern Java build systems.
 Gradle:
 ```
 dependencies {
-    implementation 'com.bettercloud:vault-java-driver:5.1.0'
+    implementation 'io.github.jopenlibs:vault-java-driver:6.0.0'
 }
 ```
 
 Maven:
 ```
 <dependency>
-    <groupId>com.bettercloud</groupId>
+    <groupId>io.github.jopenlibs</groupId>
     <artifactId>vault-java-driver</artifactId>
-    <version>5.1.0</version>
+    <version>6.0.0</version>
 </dependency>
 ```
 
 Initializing a Driver Instance
 ------------------------------
-The `com.bettercloud.vault.VaultConfig` class is used to initialize a driver instance with desired settings.
+The `io.github.jopenlibs.vault.VaultConfig` class is used to initialize a driver instance with desired settings.
 In the most basic use cases, where you are only supplying a Vault server address and perhaps a root token, there
 are convenience constructor methods available:
 ```
@@ -436,4 +436,3 @@ This client driver adapts JSON parsing code from Ralf Sternberg's excellent
 [minimal-json](https://github.com/ralfstx/minimal-json) library, likewise available under the MIT License.  Package
 names have all been changed, to prevent any conflicts should you happen to be using a different version of that
 library elsewhere in your project dependencies.
-
diff --git a/build.gradle b/build.gradle
index 2dc5c64f..a27040bb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,9 +3,10 @@ apply plugin: 'maven'
 apply plugin: 'signing'
 apply plugin: 'checkstyle'
 
-group 'com.bettercloud'
+group 'io.github.jopenlibs'
 archivesBaseName = 'vault-java-driver'
-version '5.1.0'
+version '6.0.0-SNAPSHOT'
+
 ext.isReleaseVersion = !version.endsWith('SNAPSHOT')
 
 // This project is actually limited to Java 8 compatibility.  See below.
diff --git a/src/main/java/com/bettercloud/vault/EnvironmentLoader.java b/src/main/java/io/github/jopenlibs/vault/EnvironmentLoader.java
similarity index 97%
rename from src/main/java/com/bettercloud/vault/EnvironmentLoader.java
rename to src/main/java/io/github/jopenlibs/vault/EnvironmentLoader.java
index 0beb1d27..6c551375 100644
--- a/src/main/java/com/bettercloud/vault/EnvironmentLoader.java
+++ b/src/main/java/io/github/jopenlibs/vault/EnvironmentLoader.java
@@ -1,4 +1,4 @@
-package com.bettercloud.vault;
+package io.github.jopenlibs.vault;
 
 import java.io.IOException;
 import java.io.Serializable;
diff --git a/src/main/java/com/bettercloud/vault/SslConfig.java b/src/main/java/io/github/jopenlibs/vault/SslConfig.java
similarity index 99%
rename from src/main/java/com/bettercloud/vault/SslConfig.java
rename to src/main/java/io/github/jopenlibs/vault/SslConfig.java
index 21179b14..4b2056f7 100644
--- a/src/main/java/com/bettercloud/vault/SslConfig.java
+++ b/src/main/java/io/github/jopenlibs/vault/SslConfig.java
@@ -1,6 +1,7 @@
-package com.bettercloud.vault;
+package io.github.jopenlibs.vault;
 
-import com.bettercloud.vault.api.Auth;
+import io.github.jopenlibs.vault.api.Auth;
+import io.github.jopenlibs.vault.rest.Rest;
 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
 import java.io.File;
@@ -479,7 +480,7 @@ protected String getPemUTF8() {
      * occur both at build time, and when an <code>SslConfig</code> instance is deserialized (see
      * {@link this#readObject(ObjectInputStream)}.</p>
      *
-     * <p>This SSLContext object will be passed to the {@link com.bettercloud.vault.rest.Rest} layer,
+     * <p>This SSLContext object will be passed to the {@link Rest} layer,
      * where it will be used when establishing an HTTPS connection to provide access to trusted server X509
      * certificates (as well as client certificates and private keys when TLS client auth is used).</p>
      *
diff --git a/src/main/java/com/bettercloud/vault/Vault.java b/src/main/java/io/github/jopenlibs/vault/Vault.java
similarity index 94%
rename from src/main/java/com/bettercloud/vault/Vault.java
rename to src/main/java/io/github/jopenlibs/vault/Vault.java
index 479bb09a..b8fb0599 100644
--- a/src/main/java/com/bettercloud/vault/Vault.java
+++ b/src/main/java/io/github/jopenlibs/vault/Vault.java
@@ -1,19 +1,19 @@
-package com.bettercloud.vault;
+package io.github.jopenlibs.vault;
 
-import com.bettercloud.vault.api.Auth;
-import com.bettercloud.vault.api.Debug;
-import com.bettercloud.vault.api.Leases;
-import com.bettercloud.vault.api.Logical;
-import com.bettercloud.vault.api.Seal;
-import com.bettercloud.vault.api.database.Database;
-import com.bettercloud.vault.api.mounts.Mounts;
-import com.bettercloud.vault.api.pki.Pki;
-import com.bettercloud.vault.json.Json;
-import com.bettercloud.vault.json.JsonObject;
-import com.bettercloud.vault.json.JsonValue;
-import com.bettercloud.vault.rest.Rest;
-import com.bettercloud.vault.rest.RestException;
-import com.bettercloud.vault.rest.RestResponse;
+import io.github.jopenlibs.vault.api.Auth;
+import io.github.jopenlibs.vault.api.Debug;
+import io.github.jopenlibs.vault.api.Leases;
+import io.github.jopenlibs.vault.api.Logical;
+import io.github.jopenlibs.vault.api.Seal;
+import io.github.jopenlibs.vault.api.database.Database;
+import io.github.jopenlibs.vault.api.mounts.Mounts;
+import io.github.jopenlibs.vault.api.pki.Pki;
+import io.github.jopenlibs.vault.json.Json;
+import io.github.jopenlibs.vault.json.JsonObject;
+import io.github.jopenlibs.vault.json.JsonValue;
+import io.github.jopenlibs.vault.rest.Rest;
+import io.github.jopenlibs.vault.rest.RestException;
+import io.github.jopenlibs.vault.rest.RestResponse;
 import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.Map;
diff --git a/src/main/java/com/bettercloud/vault/VaultConfig.java b/src/main/java/io/github/jopenlibs/vault/VaultConfig.java
similarity index 99%
rename from src/main/java/com/bettercloud/vault/VaultConfig.java
rename to src/main/java/io/github/jopenlibs/vault/VaultConfig.java
index 7d4545fd..4ed48c28 100644
--- a/src/main/java/com/bettercloud/vault/VaultConfig.java
+++ b/src/main/java/io/github/jopenlibs/vault/VaultConfig.java
@@ -1,4 +1,4 @@
-package com.bettercloud.vault;
+package io.github.jopenlibs.vault;
 
 import java.io.Serializable;
 import java.util.Map;
@@ -389,4 +389,3 @@ public int getPrefixPathDepth() {
        return prefixPathDepth;
     }
 }
-
diff --git a/src/main/java/com/bettercloud/vault/VaultException.java b/src/main/java/io/github/jopenlibs/vault/VaultException.java
similarity index 98%
rename from src/main/java/com/bettercloud/vault/VaultException.java
rename to src/main/java/io/github/jopenlibs/vault/VaultException.java
index 1a228081..302b2b43 100644
--- a/src/main/java/com/bettercloud/vault/VaultException.java
+++ b/src/main/java/io/github/jopenlibs/vault/VaultException.java
@@ -1,4 +1,4 @@
-package com.bettercloud.vault;
+package io.github.jopenlibs.vault;
 
 public class VaultException extends Exception {
 
diff --git a/src/main/java/com/bettercloud/vault/api/Auth.java b/src/main/java/io/github/jopenlibs/vault/api/Auth.java
similarity index 99%
rename from src/main/java/com/bettercloud/vault/api/Auth.java
rename to src/main/java/io/github/jopenlibs/vault/api/Auth.java
index 4907e571..9637b7e6 100644
--- a/src/main/java/com/bettercloud/vault/api/Auth.java
+++ b/src/main/java/io/github/jopenlibs/vault/api/Auth.java
@@ -1,15 +1,15 @@
-package com.bettercloud.vault.api;
-
-import com.bettercloud.vault.Vault;
-import com.bettercloud.vault.VaultConfig;
-import com.bettercloud.vault.VaultException;
-import com.bettercloud.vault.json.Json;
-import com.bettercloud.vault.json.JsonObject;
-import com.bettercloud.vault.response.AuthResponse;
-import com.bettercloud.vault.response.LogicalResponse;
-import com.bettercloud.vault.response.LookupResponse;
-import com.bettercloud.vault.rest.Rest;
-import com.bettercloud.vault.rest.RestResponse;
+package io.github.jopenlibs.vault.api;
+
+import io.github.jopenlibs.vault.Vault;
+import io.github.jopenlibs.vault.VaultConfig;
+import io.github.jopenlibs.vault.VaultException;
+import io.github.jopenlibs.vault.json.Json;
+import io.github.jopenlibs.vault.json.JsonObject;
+import io.github.jopenlibs.vault.response.AuthResponse;
+import io.github.jopenlibs.vault.response.LogicalResponse;
+import io.github.jopenlibs.vault.response.LookupResponse;
+import io.github.jopenlibs.vault.rest.Rest;
+import io.github.jopenlibs.vault.rest.RestResponse;
 import java.io.Serializable;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
diff --git a/src/main/java/com/bettercloud/vault/api/Debug.java b/src/main/java/io/github/jopenlibs/vault/api/Debug.java
similarity index 95%
rename from src/main/java/com/bettercloud/vault/api/Debug.java
rename to src/main/java/io/github/jopenlibs/vault/api/Debug.java
index c0bab26c..48b8b8b1 100644
--- a/src/main/java/com/bettercloud/vault/api/Debug.java
+++ b/src/main/java/io/github/jopenlibs/vault/api/Debug.java
@@ -1,11 +1,11 @@
-package com.bettercloud.vault.api;
+package io.github.jopenlibs.vault.api;
 
-import com.bettercloud.vault.VaultConfig;
-import com.bettercloud.vault.VaultException;
-import com.bettercloud.vault.response.HealthResponse;
-import com.bettercloud.vault.rest.Rest;
-import com.bettercloud.vault.rest.RestException;
-import com.bettercloud.vault.rest.RestResponse;
+import io.github.jopenlibs.vault.VaultConfig;
+import io.github.jopenlibs.vault.VaultException;
+import io.github.jopenlibs.vault.response.HealthResponse;
+import io.github.jopenlibs.vault.rest.Rest;
+import io.github.jopenlibs.vault.rest.RestException;
+import io.github.jopenlibs.vault.rest.RestResponse;
 import java.util.HashSet;
 import java.util.Set;
 
diff --git a/src/main/java/com/bettercloud/vault/api/Leases.java b/src/main/java/io/github/jopenlibs/vault/api/Leases.java
similarity index 97%
rename from src/main/java/com/bettercloud/vault/api/Leases.java
rename to src/main/java/io/github/jopenlibs/vault/api/Leases.java
index bf1c8cae..61760487 100644
--- a/src/main/java/com/bettercloud/vault/api/Leases.java
+++ b/src/main/java/io/github/jopenlibs/vault/api/Leases.java
@@ -1,11 +1,11 @@
-package com.bettercloud.vault.api;
+package io.github.jopenlibs.vault.api;
 
-import com.bettercloud.vault.VaultConfig;
-import com.bettercloud.vault.VaultException;
-import com.bettercloud.vault.json.Json;
-import com.bettercloud.vault.response.VaultResponse;
-import com.bettercloud.vault.rest.Rest;
-import com.bettercloud.vault.rest.RestResponse;
+import io.github.jopenlibs.vault.VaultConfig;
+import io.github.jopenlibs.vault.VaultException;
+import io.github.jopenlibs.vault.json.Json;
+import io.github.jopenlibs.vault.response.VaultResponse;
+import io.github.jopenlibs.vault.rest.Rest;
+import io.github.jopenlibs.vault.rest.RestResponse;
 import java.nio.charset.StandardCharsets;
 
 
diff --git a/src/main/java/com/bettercloud/vault/api/Logical.java b/src/main/java/io/github/jopenlibs/vault/api/Logical.java
similarity index 96%
rename from src/main/java/com/bettercloud/vault/api/Logical.java
rename to src/main/java/io/github/jopenlibs/vault/api/Logical.java
index e52bbf07..d45d3855 100644
--- a/src/main/java/com/bettercloud/vault/api/Logical.java
+++ b/src/main/java/io/github/jopenlibs/vault/api/Logical.java
@@ -1,25 +1,25 @@
-package com.bettercloud.vault.api;
-
-import com.bettercloud.vault.VaultConfig;
-import com.bettercloud.vault.VaultException;
-import com.bettercloud.vault.json.Json;
-import com.bettercloud.vault.json.JsonObject;
-import com.bettercloud.vault.json.JsonValue;
-import com.bettercloud.vault.response.LogicalResponse;
-import com.bettercloud.vault.rest.Rest;
-import com.bettercloud.vault.rest.RestException;
-import com.bettercloud.vault.rest.RestResponse;
+package io.github.jopenlibs.vault.api;
+
+import io.github.jopenlibs.vault.VaultConfig;
+import io.github.jopenlibs.vault.VaultException;
+import io.github.jopenlibs.vault.json.Json;
+import io.github.jopenlibs.vault.json.JsonObject;
+import io.github.jopenlibs.vault.json.JsonValue;
+import io.github.jopenlibs.vault.response.LogicalResponse;
+import io.github.jopenlibs.vault.rest.Rest;
+import io.github.jopenlibs.vault.rest.RestException;
+import io.github.jopenlibs.vault.rest.RestResponse;
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.Map;
 
-import static com.bettercloud.vault.api.LogicalUtilities.adjustPathForDelete;
-import static com.bettercloud.vault.api.LogicalUtilities.adjustPathForList;
-import static com.bettercloud.vault.api.LogicalUtilities.adjustPathForReadOrWrite;
-import static com.bettercloud.vault.api.LogicalUtilities.adjustPathForVersionDelete;
-import static com.bettercloud.vault.api.LogicalUtilities.adjustPathForVersionDestroy;
-import static com.bettercloud.vault.api.LogicalUtilities.adjustPathForVersionUnDelete;
-import static com.bettercloud.vault.api.LogicalUtilities.jsonObjectToWriteFromEngineVersion;
+import static io.github.jopenlibs.vault.api.LogicalUtilities.adjustPathForDelete;
+import static io.github.jopenlibs.vault.api.LogicalUtilities.adjustPathForList;
+import static io.github.jopenlibs.vault.api.LogicalUtilities.adjustPathForReadOrWrite;
+import static io.github.jopenlibs.vault.api.LogicalUtilities.adjustPathForVersionDelete;
+import static io.github.jopenlibs.vault.api.LogicalUtilities.adjustPathForVersionDestroy;
+import static io.github.jopenlibs.vault.api.LogicalUtilities.adjustPathForVersionUnDelete;
+import static io.github.jopenlibs.vault.api.LogicalUtilities.jsonObjectToWriteFromEngineVersion;
 
 /**
  * <p>The implementing class for Vault's core/logical operations (e.g. read, write).</p>
diff --git a/src/main/java/com/bettercloud/vault/api/LogicalUtilities.java b/src/main/java/io/github/jopenlibs/vault/api/LogicalUtilities.java
similarity index 99%
rename from src/main/java/com/bettercloud/vault/api/LogicalUtilities.java
rename to src/main/java/io/github/jopenlibs/vault/api/LogicalUtilities.java
index 1fbd7126..50a81f42 100644
--- a/src/main/java/com/bettercloud/vault/api/LogicalUtilities.java
+++ b/src/main/java/io/github/jopenlibs/vault/api/LogicalUtilities.java
@@ -1,6 +1,6 @@
-package com.bettercloud.vault.api;
+package io.github.jopenlibs.vault.api;
 
-import com.bettercloud.vault.json.JsonObject;
+import io.github.jopenlibs.vault.json.JsonObject;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.StringTokenizer;
diff --git a/src/main/java/com/bettercloud/vault/api/Seal.java b/src/main/java/io/github/jopenlibs/vault/api/Seal.java
similarity index 96%
rename from src/main/java/com/bettercloud/vault/api/Seal.java
rename to src/main/java/io/github/jopenlibs/vault/api/Seal.java
index da1d19d8..22485a84 100644
--- a/src/main/java/com/bettercloud/vault/api/Seal.java
+++ b/src/main/java/io/github/jopenlibs/vault/api/Seal.java
@@ -1,11 +1,11 @@
-package com.bettercloud.vault.api;
+package io.github.jopenlibs.vault.api;
 
-import com.bettercloud.vault.VaultConfig;
-import com.bettercloud.vault.VaultException;
-import com.bettercloud.vault.json.Json;
-import com.bettercloud.vault.response.SealResponse;
-import com.bettercloud.vault.rest.Rest;
-import com.bettercloud.vault.rest.RestResponse;
+import io.github.jopenlibs.vault.VaultConfig;
+import io.github.jopenlibs.vault.VaultException;
+import io.github.jopenlibs.vault.json.Json;
+import io.github.jopenlibs.vault.response.SealResponse;
+import io.github.jopenlibs.vault.rest.Rest;
+import io.github.jopenlibs.vault.rest.RestResponse;
 import java.nio.charset.StandardCharsets;
 
 /**
diff --git a/src/main/java/com/bettercloud/vault/api/database/Database.java b/src/main/java/io/github/jopenlibs/vault/api/database/Database.java
similarity index 97%
rename from src/main/java/com/bettercloud/vault/api/database/Database.java
rename to src/main/java/io/github/jopenlibs/vault/api/database/Database.java
index cf842ca2..7f3b2b48 100644
--- a/src/main/java/com/bettercloud/vault/api/database/Database.java
+++ b/src/main/java/io/github/jopenlibs/vault/api/database/Database.java
@@ -1,12 +1,12 @@
-package com.bettercloud.vault.api.database;
+package io.github.jopenlibs.vault.api.database;
 
-import com.bettercloud.vault.VaultConfig;
-import com.bettercloud.vault.VaultException;
-import com.bettercloud.vault.json.Json;
-import com.bettercloud.vault.json.JsonObject;
-import com.bettercloud.vault.response.DatabaseResponse;
-import com.bettercloud.vault.rest.Rest;
-import com.bettercloud.vault.rest.RestResponse;
+import io.github.jopenlibs.vault.VaultConfig;
+import io.github.jopenlibs.vault.VaultException;
+import io.github.jopenlibs.vault.json.Json;
+import io.github.jopenlibs.vault.json.JsonObject;
+import io.github.jopenlibs.vault.response.DatabaseResponse;
+import io.github.jopenlibs.vault.rest.Rest;
+import io.github.jopenlibs.vault.rest.RestResponse;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
 
diff --git a/src/main/java/com/bettercloud/vault/api/database/DatabaseCredential.java b/src/main/java/io/github/jopenlibs/vault/api/database/DatabaseCredential.java
similarity index 93%
rename from src/main/java/com/bettercloud/vault/api/database/DatabaseCredential.java
rename to src/main/java/io/github/jopenlibs/vault/api/database/DatabaseCredential.java
index 93fe667e..a344f1a5 100644
--- a/src/main/java/com/bettercloud/vault/api/database/DatabaseCredential.java
+++ b/src/main/java/io/github/jopenlibs/vault/api/database/DatabaseCredential.java
@@ -1,4 +1,4 @@
-package com.bettercloud.vault.api.database;
+package io.github.jopenlibs.vault.api.database;
 
 public class DatabaseCredential {
 
diff --git a/src/main/java/com/bettercloud/vault/api/database/DatabaseRoleOptions.java b/src/main/java/io/github/jopenlibs/vault/api/database/DatabaseRoleOptions.java
similarity index 99%
rename from src/main/java/com/bettercloud/vault/api/database/DatabaseRoleOptions.java
rename to src/main/java/io/github/jopenlibs/vault/api/database/DatabaseRoleOptions.java
index 86320d0d..337f7bf5 100644
--- a/src/main/java/com/bettercloud/vault/api/database/DatabaseRoleOptions.java
+++ b/src/main/java/io/github/jopenlibs/vault/api/database/DatabaseRoleOptions.java
@@ -1,4 +1,4 @@
-package com.bettercloud.vault.api.database;
+package io.github.jopenlibs.vault.api.database;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/com/bettercloud/vault/api/mounts/Mount.java b/src/main/java/io/github/jopenlibs/vault/api/mounts/Mount.java
similarity index 97%
rename from src/main/java/com/bettercloud/vault/api/mounts/Mount.java
rename to src/main/java/io/github/jopenlibs/vault/api/mounts/Mount.java
index 2c6c7c1e..0a0cdf41 100644
--- a/src/main/java/com/bettercloud/vault/api/mounts/Mount.java
+++ b/src/main/java/io/github/jopenlibs/vault/api/mounts/Mount.java
@@ -1,4 +1,4 @@
-package com.bettercloud.vault.api.mounts;
+package io.github.jopenlibs.vault.api.mounts;
 
 import java.io.Serializable;
 
diff --git a/src/main/java/com/bettercloud/vault/api/mounts/MountConfig.java b/src/main/java/io/github/jopenlibs/vault/api/mounts/MountConfig.java
similarity index 98%
rename from src/main/java/com/bettercloud/vault/api/mounts/MountConfig.java
rename to src/main/java/io/github/jopenlibs/vault/api/mounts/MountConfig.java
index 4715dd95..6b9e331e 100644
--- a/src/main/java/com/bettercloud/vault/api/mounts/MountConfig.java
+++ b/src/main/java/io/github/jopenlibs/vault/api/mounts/MountConfig.java
@@ -1,4 +1,4 @@
-package com.bettercloud.vault.api.mounts;
+package io.github.jopenlibs.vault.api.mounts;
 
 import java.io.Serializable;
 import java.util.ArrayList;
diff --git a/src/main/java/com/bettercloud/vault/api/mounts/MountPayload.java b/src/main/java/io/github/jopenlibs/vault/api/mounts/MountPayload.java
similarity index 97%
rename from src/main/java/com/bettercloud/vault/api/mounts/MountPayload.java
rename to src/main/java/io/github/jopenlibs/vault/api/mounts/MountPayload.java
index 96782fd0..5acfc284 100644
--- a/src/main/java/com/bettercloud/vault/api/mounts/MountPayload.java
+++ b/src/main/java/io/github/jopenlibs/vault/api/mounts/MountPayload.java
@@ -1,7 +1,7 @@
-package com.bettercloud.vault.api.mounts;
+package io.github.jopenlibs.vault.api.mounts;
 
-import com.bettercloud.vault.json.Json;
-import com.bettercloud.vault.json.JsonObject;
+import io.github.jopenlibs.vault.json.Json;
+import io.github.jopenlibs.vault.json.JsonObject;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/com/bettercloud/vault/api/mounts/MountType.java b/src/main/java/io/github/jopenlibs/vault/api/mounts/MountType.java
similarity index 96%
rename from src/main/java/com/bettercloud/vault/api/mounts/MountType.java
rename to src/main/java/io/github/jopenlibs/vault/api/mounts/MountType.java
index 6e434bb3..b111524a 100644
--- a/src/main/java/com/bettercloud/vault/api/mounts/MountType.java
+++ b/src/main/java/io/github/jopenlibs/vault/api/mounts/MountType.java
@@ -1,4 +1,4 @@
-package com.bettercloud.vault.api.mounts;
+package io.github.jopenlibs.vault.api.mounts;
 
 import java.util.Arrays;
 
diff --git a/src/main/java/com/bettercloud/vault/api/mounts/Mounts.java b/src/main/java/io/github/jopenlibs/vault/api/mounts/Mounts.java
similarity index 98%
rename from src/main/java/com/bettercloud/vault/api/mounts/Mounts.java
rename to src/main/java/io/github/jopenlibs/vault/api/mounts/Mounts.java
index 902f894b..9f94c323 100644
--- a/src/main/java/com/bettercloud/vault/api/mounts/Mounts.java
+++ b/src/main/java/io/github/jopenlibs/vault/api/mounts/Mounts.java
@@ -1,10 +1,10 @@
-package com.bettercloud.vault.api.mounts;
+package io.github.jopenlibs.vault.api.mounts;
 
-import com.bettercloud.vault.VaultConfig;
-import com.bettercloud.vault.VaultException;
-import com.bettercloud.vault.response.MountResponse;
-import com.bettercloud.vault.rest.Rest;
-import com.bettercloud.vault.rest.RestResponse;
+import io.github.jopenlibs.vault.VaultConfig;
+import io.github.jopenlibs.vault.VaultException;
+import io.github.jopenlibs.vault.response.MountResponse;
+import io.github.jopenlibs.vault.rest.Rest;
+import io.github.jopenlibs.vault.rest.RestResponse;
 import java.nio.charset.StandardCharsets;
 
 /**
diff --git a/src/main/java/com/bettercloud/vault/api/mounts/TimeToLive.java b/src/main/java/io/github/jopenlibs/vault/api/mounts/TimeToLive.java
similarity index 97%
rename from src/main/java/com/bettercloud/vault/api/mounts/TimeToLive.java
rename to src/main/java/io/github/jopenlibs/vault/api/mounts/TimeToLive.java
index 83f94914..9198babf 100644
--- a/src/main/java/com/bettercloud/vault/api/mounts/TimeToLive.java
+++ b/src/main/java/io/github/jopenlibs/vault/api/mounts/TimeToLive.java
@@ -1,4 +1,4 @@
-package com.bettercloud.vault.api.mounts;
+package io.github.jopenlibs.vault.api.mounts;
 
 import java.util.concurrent.TimeUnit;
 
diff --git a/src/main/java/com/bettercloud/vault/api/package-info.java b/src/main/java/io/github/jopenlibs/vault/api/package-info.java
similarity index 56%
rename from src/main/java/com/bettercloud/vault/api/package-info.java
rename to src/main/java/io/github/jopenlibs/vault/api/package-info.java
index 3606861f..d9c31f07 100644
--- a/src/main/java/com/bettercloud/vault/api/package-info.java
+++ b/src/main/java/io/github/jopenlibs/vault/api/package-info.java
@@ -2,6 +2,6 @@
  * <p>Classes implementing the various endpoints of the Vault HTTP API.</p>
  *
  * <p>The classes in this package are not meant to be instantiated directly.  Rather, they should be used by way
- * of the <code>com.bettercloud.vault.Vault</code> driver class, in a DSL-style builder pattern approach.</p>
+ * of the <code>io.github.jopenlibs.vault.Vault</code> driver class, in a DSL-style builder pattern approach.</p>
  */
-package com.bettercloud.vault.api;
+package io.github.jopenlibs.vault.api;
diff --git a/src/main/java/com/bettercloud/vault/api/pki/Credential.java b/src/main/java/io/github/jopenlibs/vault/api/pki/Credential.java
similarity index 98%
rename from src/main/java/com/bettercloud/vault/api/pki/Credential.java
rename to src/main/java/io/github/jopenlibs/vault/api/pki/Credential.java
index d661e9eb..c3223345 100644
--- a/src/main/java/com/bettercloud/vault/api/pki/Credential.java
+++ b/src/main/java/io/github/jopenlibs/vault/api/pki/Credential.java
@@ -1,4 +1,4 @@
-package com.bettercloud.vault.api.pki;
+package io.github.jopenlibs.vault.api.pki;
 
 import java.io.Serializable;
 import java.util.List;
diff --git a/src/main/java/com/bettercloud/vault/api/pki/CredentialFormat.java b/src/main/java/io/github/jopenlibs/vault/api/pki/CredentialFormat.java
similarity index 94%
rename from src/main/java/com/bettercloud/vault/api/pki/CredentialFormat.java
rename to src/main/java/io/github/jopenlibs/vault/api/pki/CredentialFormat.java
index ff18a064..a146e07c 100644
--- a/src/main/java/com/bettercloud/vault/api/pki/CredentialFormat.java
+++ b/src/main/java/io/github/jopenlibs/vault/api/pki/CredentialFormat.java
@@ -1,4 +1,4 @@
-package com.bettercloud.vault.api.pki;
+package io.github.jopenlibs.vault.api.pki;
 
 import java.util.List;
 
diff --git a/src/main/java/com/bettercloud/vault/api/pki/Pki.java b/src/main/java/io/github/jopenlibs/vault/api/pki/Pki.java
similarity index 98%
rename from src/main/java/com/bettercloud/vault/api/pki/Pki.java
rename to src/main/java/io/github/jopenlibs/vault/api/pki/Pki.java
index 1074c2be..0cd32fab 100644
--- a/src/main/java/com/bettercloud/vault/api/pki/Pki.java
+++ b/src/main/java/io/github/jopenlibs/vault/api/pki/Pki.java
@@ -1,12 +1,12 @@
-package com.bettercloud.vault.api.pki;
+package io.github.jopenlibs.vault.api.pki;
 
-import com.bettercloud.vault.VaultConfig;
-import com.bettercloud.vault.VaultException;
-import com.bettercloud.vault.json.Json;
-import com.bettercloud.vault.json.JsonObject;
-import com.bettercloud.vault.response.PkiResponse;
-import com.bettercloud.vault.rest.Rest;
-import com.bettercloud.vault.rest.RestResponse;
+import io.github.jopenlibs.vault.VaultConfig;
+import io.github.jopenlibs.vault.VaultException;
+import io.github.jopenlibs.vault.json.Json;
+import io.github.jopenlibs.vault.json.JsonObject;
+import io.github.jopenlibs.vault.response.PkiResponse;
+import io.github.jopenlibs.vault.rest.Rest;
+import io.github.jopenlibs.vault.rest.RestResponse;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
 
diff --git a/src/main/java/com/bettercloud/vault/api/pki/RoleOptions.java b/src/main/java/io/github/jopenlibs/vault/api/pki/RoleOptions.java
similarity index 99%
rename from src/main/java/com/bettercloud/vault/api/pki/RoleOptions.java
rename to src/main/java/io/github/jopenlibs/vault/api/pki/RoleOptions.java
index 1a731d1f..f5a4a21d 100644
--- a/src/main/java/com/bettercloud/vault/api/pki/RoleOptions.java
+++ b/src/main/java/io/github/jopenlibs/vault/api/pki/RoleOptions.java
@@ -1,4 +1,4 @@
-package com.bettercloud.vault.api.pki;
+package io.github.jopenlibs.vault.api.pki;
 
 import java.io.Serializable;
 import java.util.ArrayList;
diff --git a/src/main/java/com/bettercloud/vault/json/Json.java b/src/main/java/io/github/jopenlibs/vault/json/Json.java
similarity index 99%
rename from src/main/java/com/bettercloud/vault/json/Json.java
rename to src/main/java/io/github/jopenlibs/vault/json/Json.java
index 2c9720ab..d21a03de 100644
--- a/src/main/java/com/bettercloud/vault/json/Json.java
+++ b/src/main/java/io/github/jopenlibs/vault/json/Json.java
@@ -19,7 +19,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ******************************************************************************/
-package com.bettercloud.vault.json;
+package io.github.jopenlibs.vault.json;
 
 import java.io.IOException;
 import java.io.Reader;
diff --git a/src/main/java/com/bettercloud/vault/json/JsonArray.java b/src/main/java/io/github/jopenlibs/vault/json/JsonArray.java
similarity index 99%
rename from src/main/java/com/bettercloud/vault/json/JsonArray.java
rename to src/main/java/io/github/jopenlibs/vault/json/JsonArray.java
index d018b7da..613b3ef5 100644
--- a/src/main/java/com/bettercloud/vault/json/JsonArray.java
+++ b/src/main/java/io/github/jopenlibs/vault/json/JsonArray.java
@@ -19,7 +19,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ******************************************************************************/
-package com.bettercloud.vault.json;
+package io.github.jopenlibs.vault.json;
 
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/src/main/java/com/bettercloud/vault/json/JsonLiteral.java b/src/main/java/io/github/jopenlibs/vault/json/JsonLiteral.java
similarity index 98%
rename from src/main/java/com/bettercloud/vault/json/JsonLiteral.java
rename to src/main/java/io/github/jopenlibs/vault/json/JsonLiteral.java
index 5ce80b79..8de445bb 100644
--- a/src/main/java/com/bettercloud/vault/json/JsonLiteral.java
+++ b/src/main/java/io/github/jopenlibs/vault/json/JsonLiteral.java
@@ -19,7 +19,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ******************************************************************************/
-package com.bettercloud.vault.json;
+package io.github.jopenlibs.vault.json;
 
 import java.io.IOException;
 
diff --git a/src/main/java/com/bettercloud/vault/json/JsonNumber.java b/src/main/java/io/github/jopenlibs/vault/json/JsonNumber.java
similarity index 98%
rename from src/main/java/com/bettercloud/vault/json/JsonNumber.java
rename to src/main/java/io/github/jopenlibs/vault/json/JsonNumber.java
index ca6f7a5c..04da1caa 100644
--- a/src/main/java/com/bettercloud/vault/json/JsonNumber.java
+++ b/src/main/java/io/github/jopenlibs/vault/json/JsonNumber.java
@@ -19,7 +19,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ******************************************************************************/
-package com.bettercloud.vault.json;
+package io.github.jopenlibs.vault.json;
 
 import java.io.IOException;
 
diff --git a/src/main/java/com/bettercloud/vault/json/JsonObject.java b/src/main/java/io/github/jopenlibs/vault/json/JsonObject.java
similarity index 99%
rename from src/main/java/com/bettercloud/vault/json/JsonObject.java
rename to src/main/java/io/github/jopenlibs/vault/json/JsonObject.java
index b38af9b8..b7444240 100644
--- a/src/main/java/com/bettercloud/vault/json/JsonObject.java
+++ b/src/main/java/io/github/jopenlibs/vault/json/JsonObject.java
@@ -19,9 +19,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ******************************************************************************/
-package com.bettercloud.vault.json;
+package io.github.jopenlibs.vault.json;
 
-import com.bettercloud.vault.json.JsonObject.Member;
+import io.github.jopenlibs.vault.json.JsonObject.Member;
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.util.ArrayList;
diff --git a/src/main/java/com/bettercloud/vault/json/JsonParser.java b/src/main/java/io/github/jopenlibs/vault/json/JsonParser.java
similarity index 99%
rename from src/main/java/com/bettercloud/vault/json/JsonParser.java
rename to src/main/java/io/github/jopenlibs/vault/json/JsonParser.java
index fd04beaf..d2bc14f3 100644
--- a/src/main/java/com/bettercloud/vault/json/JsonParser.java
+++ b/src/main/java/io/github/jopenlibs/vault/json/JsonParser.java
@@ -19,7 +19,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ******************************************************************************/
-package com.bettercloud.vault.json;
+package io.github.jopenlibs.vault.json;
 
 import java.io.IOException;
 import java.io.Reader;
diff --git a/src/main/java/com/bettercloud/vault/json/JsonString.java b/src/main/java/io/github/jopenlibs/vault/json/JsonString.java
similarity index 98%
rename from src/main/java/com/bettercloud/vault/json/JsonString.java
rename to src/main/java/io/github/jopenlibs/vault/json/JsonString.java
index 8c639493..414e13e8 100644
--- a/src/main/java/com/bettercloud/vault/json/JsonString.java
+++ b/src/main/java/io/github/jopenlibs/vault/json/JsonString.java
@@ -19,7 +19,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ******************************************************************************/
-package com.bettercloud.vault.json;
+package io.github.jopenlibs.vault.json;
 
 import java.io.IOException;
 
diff --git a/src/main/java/com/bettercloud/vault/json/JsonValue.java b/src/main/java/io/github/jopenlibs/vault/json/JsonValue.java
similarity index 99%
rename from src/main/java/com/bettercloud/vault/json/JsonValue.java
rename to src/main/java/io/github/jopenlibs/vault/json/JsonValue.java
index 0d8855fc..4b1a0d39 100644
--- a/src/main/java/com/bettercloud/vault/json/JsonValue.java
+++ b/src/main/java/io/github/jopenlibs/vault/json/JsonValue.java
@@ -19,7 +19,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ******************************************************************************/
-package com.bettercloud.vault.json;
+package io.github.jopenlibs.vault.json;
 
 import java.io.IOException;
 import java.io.Serializable;
diff --git a/src/main/java/com/bettercloud/vault/json/JsonWriter.java b/src/main/java/io/github/jopenlibs/vault/json/JsonWriter.java
similarity index 99%
rename from src/main/java/com/bettercloud/vault/json/JsonWriter.java
rename to src/main/java/io/github/jopenlibs/vault/json/JsonWriter.java
index 2d17387e..40f6dd9b 100644
--- a/src/main/java/com/bettercloud/vault/json/JsonWriter.java
+++ b/src/main/java/io/github/jopenlibs/vault/json/JsonWriter.java
@@ -19,7 +19,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ******************************************************************************/
-package com.bettercloud.vault.json;
+package io.github.jopenlibs.vault.json;
 
 import java.io.IOException;
 import java.io.Writer;
diff --git a/src/main/java/com/bettercloud/vault/json/ParseException.java b/src/main/java/io/github/jopenlibs/vault/json/ParseException.java
similarity index 98%
rename from src/main/java/com/bettercloud/vault/json/ParseException.java
rename to src/main/java/io/github/jopenlibs/vault/json/ParseException.java
index 189f420c..aece2437 100644
--- a/src/main/java/com/bettercloud/vault/json/ParseException.java
+++ b/src/main/java/io/github/jopenlibs/vault/json/ParseException.java
@@ -19,7 +19,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ******************************************************************************/
-package com.bettercloud.vault.json;
+package io.github.jopenlibs.vault.json;
 
 /**
  * An unchecked exception to indicate that an input does not qualify as valid JSON.
diff --git a/src/main/java/com/bettercloud/vault/json/PrettyPrint.java b/src/main/java/io/github/jopenlibs/vault/json/PrettyPrint.java
similarity index 99%
rename from src/main/java/com/bettercloud/vault/json/PrettyPrint.java
rename to src/main/java/io/github/jopenlibs/vault/json/PrettyPrint.java
index 65b6622a..cea66575 100644
--- a/src/main/java/com/bettercloud/vault/json/PrettyPrint.java
+++ b/src/main/java/io/github/jopenlibs/vault/json/PrettyPrint.java
@@ -19,7 +19,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ******************************************************************************/
-package com.bettercloud.vault.json;
+package io.github.jopenlibs.vault.json;
 
 import java.io.IOException;
 import java.io.Writer;
diff --git a/src/main/java/com/bettercloud/vault/json/WriterConfig.java b/src/main/java/io/github/jopenlibs/vault/json/WriterConfig.java
similarity index 98%
rename from src/main/java/com/bettercloud/vault/json/WriterConfig.java
rename to src/main/java/io/github/jopenlibs/vault/json/WriterConfig.java
index 84fdc105..a9d32b25 100644
--- a/src/main/java/com/bettercloud/vault/json/WriterConfig.java
+++ b/src/main/java/io/github/jopenlibs/vault/json/WriterConfig.java
@@ -19,7 +19,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ******************************************************************************/
-package com.bettercloud.vault.json;
+package io.github.jopenlibs.vault.json;
 
 import java.io.Writer;
 
diff --git a/src/main/java/com/bettercloud/vault/json/WritingBuffer.java b/src/main/java/io/github/jopenlibs/vault/json/WritingBuffer.java
similarity index 98%
rename from src/main/java/com/bettercloud/vault/json/WritingBuffer.java
rename to src/main/java/io/github/jopenlibs/vault/json/WritingBuffer.java
index f8207735..64d7d052 100644
--- a/src/main/java/com/bettercloud/vault/json/WritingBuffer.java
+++ b/src/main/java/io/github/jopenlibs/vault/json/WritingBuffer.java
@@ -19,7 +19,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ******************************************************************************/
-package com.bettercloud.vault.json;
+package io.github.jopenlibs.vault.json;
 
 import java.io.IOException;
 import java.io.Writer;
diff --git a/src/main/java/com/bettercloud/vault/json/package-info.java b/src/main/java/io/github/jopenlibs/vault/json/package-info.java
similarity index 92%
rename from src/main/java/com/bettercloud/vault/json/package-info.java
rename to src/main/java/io/github/jopenlibs/vault/json/package-info.java
index 533c235e..c8b1a055 100644
--- a/src/main/java/com/bettercloud/vault/json/package-info.java
+++ b/src/main/java/io/github/jopenlibs/vault/json/package-info.java
@@ -6,4 +6,4 @@
  * The package names have all been changed, to prevent any conflicts should you happen to be using a different
  * version of this library elsewhere in your project dependencies.</p>
  */
-package com.bettercloud.vault.json;
+package io.github.jopenlibs.vault.json;
diff --git a/src/main/java/com/bettercloud/vault/package-info.java b/src/main/java/io/github/jopenlibs/vault/package-info.java
similarity index 72%
rename from src/main/java/com/bettercloud/vault/package-info.java
rename to src/main/java/io/github/jopenlibs/vault/package-info.java
index 3e445f88..bd3a5c18 100644
--- a/src/main/java/com/bettercloud/vault/package-info.java
+++ b/src/main/java/io/github/jopenlibs/vault/package-info.java
@@ -1,4 +1,4 @@
 /**
  * <p>The root package containing the primary <code>Vault</code> driver class.</p>
  */
-package com.bettercloud.vault;
+package io.github.jopenlibs.vault;
diff --git a/src/main/java/com/bettercloud/vault/response/AuthResponse.java b/src/main/java/io/github/jopenlibs/vault/response/AuthResponse.java
similarity index 90%
rename from src/main/java/com/bettercloud/vault/response/AuthResponse.java
rename to src/main/java/io/github/jopenlibs/vault/response/AuthResponse.java
index 09f1e00f..2c9ef5dd 100644
--- a/src/main/java/com/bettercloud/vault/response/AuthResponse.java
+++ b/src/main/java/io/github/jopenlibs/vault/response/AuthResponse.java
@@ -1,11 +1,11 @@
-package com.bettercloud.vault.response;
-
-import com.bettercloud.vault.json.Json;
-import com.bettercloud.vault.json.JsonArray;
-import com.bettercloud.vault.json.JsonObject;
-import com.bettercloud.vault.json.JsonValue;
-import com.bettercloud.vault.json.ParseException;
-import com.bettercloud.vault.rest.RestResponse;
+package io.github.jopenlibs.vault.response;
+
+import io.github.jopenlibs.vault.json.Json;
+import io.github.jopenlibs.vault.json.JsonArray;
+import io.github.jopenlibs.vault.json.JsonObject;
+import io.github.jopenlibs.vault.json.JsonValue;
+import io.github.jopenlibs.vault.json.ParseException;
+import io.github.jopenlibs.vault.rest.RestResponse;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/com/bettercloud/vault/response/DatabaseResponse.java b/src/main/java/io/github/jopenlibs/vault/response/DatabaseResponse.java
similarity index 89%
rename from src/main/java/com/bettercloud/vault/response/DatabaseResponse.java
rename to src/main/java/io/github/jopenlibs/vault/response/DatabaseResponse.java
index d099ceb7..a6c4c748 100644
--- a/src/main/java/com/bettercloud/vault/response/DatabaseResponse.java
+++ b/src/main/java/io/github/jopenlibs/vault/response/DatabaseResponse.java
@@ -1,11 +1,11 @@
-package com.bettercloud.vault.response;
-
-import com.bettercloud.vault.api.Logical;
-import com.bettercloud.vault.api.database.DatabaseCredential;
-import com.bettercloud.vault.api.database.DatabaseRoleOptions;
-import com.bettercloud.vault.json.JsonArray;
-import com.bettercloud.vault.json.JsonObject;
-import com.bettercloud.vault.rest.RestResponse;
+package io.github.jopenlibs.vault.response;
+
+import io.github.jopenlibs.vault.api.Logical;
+import io.github.jopenlibs.vault.api.database.DatabaseCredential;
+import io.github.jopenlibs.vault.api.database.DatabaseRoleOptions;
+import io.github.jopenlibs.vault.json.JsonArray;
+import io.github.jopenlibs.vault.json.JsonObject;
+import io.github.jopenlibs.vault.rest.RestResponse;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
diff --git a/src/main/java/com/bettercloud/vault/response/HealthResponse.java b/src/main/java/io/github/jopenlibs/vault/response/HealthResponse.java
similarity index 91%
rename from src/main/java/com/bettercloud/vault/response/HealthResponse.java
rename to src/main/java/io/github/jopenlibs/vault/response/HealthResponse.java
index 6e96514a..d6f3c167 100644
--- a/src/main/java/com/bettercloud/vault/response/HealthResponse.java
+++ b/src/main/java/io/github/jopenlibs/vault/response/HealthResponse.java
@@ -1,9 +1,10 @@
-package com.bettercloud.vault.response;
+package io.github.jopenlibs.vault.response;
 
-import com.bettercloud.vault.VaultException;
-import com.bettercloud.vault.json.Json;
-import com.bettercloud.vault.json.JsonObject;
-import com.bettercloud.vault.rest.RestResponse;
+import io.github.jopenlibs.vault.VaultException;
+import io.github.jopenlibs.vault.api.Debug;
+import io.github.jopenlibs.vault.json.Json;
+import io.github.jopenlibs.vault.json.JsonObject;
+import io.github.jopenlibs.vault.rest.RestResponse;
 import java.io.Serializable;
 import java.nio.charset.StandardCharsets;
 
@@ -30,7 +31,7 @@ public class HealthResponse implements Serializable {
      * <code>standby</code>, and <code>serverTimeUTC</code> set to <code>null</code>.  This
      * typically happens when you use optional parameters in the health call, to designate
      * non-standard HTTP status codes.  See docs for
-     * {@link com.bettercloud.vault.api.Debug#health(Boolean, Integer, Integer, Integer)}.</p>
+     * {@link Debug#health(Boolean, Integer, Integer, Integer)}.</p>
      *
      * @param restResponse The raw HTTP response from Vault
      * @param retries The number of retry attempts that occurred during the API call (can be zero)
diff --git a/src/main/java/com/bettercloud/vault/response/LogicalResponse.java b/src/main/java/io/github/jopenlibs/vault/response/LogicalResponse.java
similarity index 91%
rename from src/main/java/com/bettercloud/vault/response/LogicalResponse.java
rename to src/main/java/io/github/jopenlibs/vault/response/LogicalResponse.java
index 93f3fb8d..0e28b449 100644
--- a/src/main/java/com/bettercloud/vault/response/LogicalResponse.java
+++ b/src/main/java/io/github/jopenlibs/vault/response/LogicalResponse.java
@@ -1,11 +1,11 @@
-package com.bettercloud.vault.response;
+package io.github.jopenlibs.vault.response;
 
-import com.bettercloud.vault.api.Logical;
-import com.bettercloud.vault.json.Json;
-import com.bettercloud.vault.json.JsonArray;
-import com.bettercloud.vault.json.JsonObject;
-import com.bettercloud.vault.json.JsonValue;
-import com.bettercloud.vault.rest.RestResponse;
+import io.github.jopenlibs.vault.api.Logical;
+import io.github.jopenlibs.vault.json.Json;
+import io.github.jopenlibs.vault.json.JsonArray;
+import io.github.jopenlibs.vault.json.JsonObject;
+import io.github.jopenlibs.vault.json.JsonValue;
+import io.github.jopenlibs.vault.rest.RestResponse;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/src/main/java/com/bettercloud/vault/response/LookupResponse.java b/src/main/java/io/github/jopenlibs/vault/response/LookupResponse.java
similarity index 91%
rename from src/main/java/com/bettercloud/vault/response/LookupResponse.java
rename to src/main/java/io/github/jopenlibs/vault/response/LookupResponse.java
index a8fc8eda..4f60a906 100644
--- a/src/main/java/com/bettercloud/vault/response/LookupResponse.java
+++ b/src/main/java/io/github/jopenlibs/vault/response/LookupResponse.java
@@ -1,11 +1,11 @@
-package com.bettercloud.vault.response;
-
-import com.bettercloud.vault.json.Json;
-import com.bettercloud.vault.json.JsonArray;
-import com.bettercloud.vault.json.JsonObject;
-import com.bettercloud.vault.json.JsonValue;
-import com.bettercloud.vault.json.ParseException;
-import com.bettercloud.vault.rest.RestResponse;
+package io.github.jopenlibs.vault.response;
+
+import io.github.jopenlibs.vault.json.Json;
+import io.github.jopenlibs.vault.json.JsonArray;
+import io.github.jopenlibs.vault.json.JsonObject;
+import io.github.jopenlibs.vault.json.JsonValue;
+import io.github.jopenlibs.vault.json.ParseException;
+import io.github.jopenlibs.vault.rest.RestResponse;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/com/bettercloud/vault/response/MountResponse.java b/src/main/java/io/github/jopenlibs/vault/response/MountResponse.java
similarity index 88%
rename from src/main/java/com/bettercloud/vault/response/MountResponse.java
rename to src/main/java/io/github/jopenlibs/vault/response/MountResponse.java
index f2ec0a1e..dc2c9e50 100644
--- a/src/main/java/com/bettercloud/vault/response/MountResponse.java
+++ b/src/main/java/io/github/jopenlibs/vault/response/MountResponse.java
@@ -1,13 +1,13 @@
-package com.bettercloud.vault.response;
-
-import com.bettercloud.vault.api.Logical;
-import com.bettercloud.vault.api.mounts.Mount;
-import com.bettercloud.vault.api.mounts.MountConfig;
-import com.bettercloud.vault.api.mounts.MountType;
-import com.bettercloud.vault.json.JsonObject;
-import com.bettercloud.vault.json.JsonObject.Member;
-import com.bettercloud.vault.json.JsonValue;
-import com.bettercloud.vault.rest.RestResponse;
+package io.github.jopenlibs.vault.response;
+
+import io.github.jopenlibs.vault.api.Logical;
+import io.github.jopenlibs.vault.api.mounts.Mount;
+import io.github.jopenlibs.vault.api.mounts.MountConfig;
+import io.github.jopenlibs.vault.api.mounts.MountType;
+import io.github.jopenlibs.vault.json.JsonObject;
+import io.github.jopenlibs.vault.json.JsonObject.Member;
+import io.github.jopenlibs.vault.json.JsonValue;
+import io.github.jopenlibs.vault.rest.RestResponse;
 import java.util.Collections;
 import java.util.Map;
 import java.util.stream.Collectors;
diff --git a/src/main/java/com/bettercloud/vault/response/PkiResponse.java b/src/main/java/io/github/jopenlibs/vault/response/PkiResponse.java
similarity index 96%
rename from src/main/java/com/bettercloud/vault/response/PkiResponse.java
rename to src/main/java/io/github/jopenlibs/vault/response/PkiResponse.java
index 6e692249..4141ee50 100644
--- a/src/main/java/com/bettercloud/vault/response/PkiResponse.java
+++ b/src/main/java/io/github/jopenlibs/vault/response/PkiResponse.java
@@ -1,9 +1,9 @@
-package com.bettercloud.vault.response;
+package io.github.jopenlibs.vault.response;
 
-import com.bettercloud.vault.api.Logical;
-import com.bettercloud.vault.api.pki.Credential;
-import com.bettercloud.vault.api.pki.RoleOptions;
-import com.bettercloud.vault.rest.RestResponse;
+import io.github.jopenlibs.vault.api.Logical;
+import io.github.jopenlibs.vault.api.pki.Credential;
+import io.github.jopenlibs.vault.api.pki.RoleOptions;
+import io.github.jopenlibs.vault.rest.RestResponse;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
diff --git a/src/main/java/com/bettercloud/vault/response/SealResponse.java b/src/main/java/io/github/jopenlibs/vault/response/SealResponse.java
similarity index 85%
rename from src/main/java/com/bettercloud/vault/response/SealResponse.java
rename to src/main/java/io/github/jopenlibs/vault/response/SealResponse.java
index 3322b073..ecd88cae 100644
--- a/src/main/java/com/bettercloud/vault/response/SealResponse.java
+++ b/src/main/java/io/github/jopenlibs/vault/response/SealResponse.java
@@ -1,9 +1,9 @@
-package com.bettercloud.vault.response;
+package io.github.jopenlibs.vault.response;
 
-import com.bettercloud.vault.json.Json;
-import com.bettercloud.vault.json.JsonObject;
-import com.bettercloud.vault.json.ParseException;
-import com.bettercloud.vault.rest.RestResponse;
+import io.github.jopenlibs.vault.json.Json;
+import io.github.jopenlibs.vault.json.JsonObject;
+import io.github.jopenlibs.vault.json.ParseException;
+import io.github.jopenlibs.vault.rest.RestResponse;
 import java.nio.charset.StandardCharsets;
 
 /**
diff --git a/src/main/java/com/bettercloud/vault/response/VaultResponse.java b/src/main/java/io/github/jopenlibs/vault/response/VaultResponse.java
similarity index 91%
rename from src/main/java/com/bettercloud/vault/response/VaultResponse.java
rename to src/main/java/io/github/jopenlibs/vault/response/VaultResponse.java
index 6082d113..2ae0b347 100644
--- a/src/main/java/com/bettercloud/vault/response/VaultResponse.java
+++ b/src/main/java/io/github/jopenlibs/vault/response/VaultResponse.java
@@ -1,6 +1,6 @@
-package com.bettercloud.vault.response;
+package io.github.jopenlibs.vault.response;
 
-import com.bettercloud.vault.rest.RestResponse;
+import io.github.jopenlibs.vault.rest.RestResponse;
 import java.io.Serializable;
 
 /**
diff --git a/src/main/java/com/bettercloud/vault/response/package-info.java b/src/main/java/io/github/jopenlibs/vault/response/package-info.java
similarity index 63%
rename from src/main/java/com/bettercloud/vault/response/package-info.java
rename to src/main/java/io/github/jopenlibs/vault/response/package-info.java
index 5bf144f7..eb32825e 100644
--- a/src/main/java/com/bettercloud/vault/response/package-info.java
+++ b/src/main/java/io/github/jopenlibs/vault/response/package-info.java
@@ -1,4 +1,4 @@
 /**
  * <p>Containers of data returned by the various Vault API calls.</p>
  */
-package com.bettercloud.vault.response;
+package io.github.jopenlibs.vault.response;
diff --git a/src/main/java/com/bettercloud/vault/rest/Rest.java b/src/main/java/io/github/jopenlibs/vault/rest/Rest.java
similarity index 98%
rename from src/main/java/com/bettercloud/vault/rest/Rest.java
rename to src/main/java/io/github/jopenlibs/vault/rest/Rest.java
index 3d528d13..c2beb0e6 100644
--- a/src/main/java/com/bettercloud/vault/rest/Rest.java
+++ b/src/main/java/io/github/jopenlibs/vault/rest/Rest.java
@@ -1,5 +1,7 @@
-package com.bettercloud.vault.rest;
+package io.github.jopenlibs.vault.rest;
 
+import io.github.jopenlibs.vault.SslConfig;
+import io.github.jopenlibs.vault.VaultConfig;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -235,8 +237,8 @@ public Rest sslVerification(final Boolean sslVerification) {
     }
 
     /**
-     * <p>An {@link SSLContext}, as constructed by {@link com.bettercloud.vault.SslConfig} within a
-     * {@link com.bettercloud.vault.VaultConfig} object.  Used when establishing an HTTPS connection, and provides
+     * <p>An {@link SSLContext}, as constructed by {@link SslConfig} within a
+     * {@link VaultConfig} object.  Used when establishing an HTTPS connection, and provides
      * access to trusted server X509 certificates (as well as client certificates and private keys when TLS
      * client auth is used).</p>
      *
@@ -557,4 +559,3 @@ private int connectionStatus(final URLConnection connection) throws IOException,
     }
 
 }
-
diff --git a/src/main/java/com/bettercloud/vault/rest/RestException.java b/src/main/java/io/github/jopenlibs/vault/rest/RestException.java
similarity index 82%
rename from src/main/java/com/bettercloud/vault/rest/RestException.java
rename to src/main/java/io/github/jopenlibs/vault/rest/RestException.java
index 2a7e5e60..b96c8652 100644
--- a/src/main/java/com/bettercloud/vault/rest/RestException.java
+++ b/src/main/java/io/github/jopenlibs/vault/rest/RestException.java
@@ -1,4 +1,4 @@
-package com.bettercloud.vault.rest;
+package io.github.jopenlibs.vault.rest;
 
 public class RestException extends Exception {
 
diff --git a/src/main/java/com/bettercloud/vault/rest/RestResponse.java b/src/main/java/io/github/jopenlibs/vault/rest/RestResponse.java
similarity index 97%
rename from src/main/java/com/bettercloud/vault/rest/RestResponse.java
rename to src/main/java/io/github/jopenlibs/vault/rest/RestResponse.java
index 15727183..b327889e 100644
--- a/src/main/java/com/bettercloud/vault/rest/RestResponse.java
+++ b/src/main/java/io/github/jopenlibs/vault/rest/RestResponse.java
@@ -1,4 +1,4 @@
-package com.bettercloud.vault.rest;
+package io.github.jopenlibs.vault.rest;
 
 import java.io.Serializable;
 import java.util.Arrays;
diff --git a/src/main/java/com/bettercloud/vault/rest/package-info.java b/src/main/java/io/github/jopenlibs/vault/rest/package-info.java
similarity index 83%
rename from src/main/java/com/bettercloud/vault/rest/package-info.java
rename to src/main/java/io/github/jopenlibs/vault/rest/package-info.java
index 952eebde..3121f664 100644
--- a/src/main/java/com/bettercloud/vault/rest/package-info.java
+++ b/src/main/java/io/github/jopenlibs/vault/rest/package-info.java
@@ -3,4 +3,4 @@
  *
  * <p>Functionality for making REST calls, with no dependencies beyond the Java standard library.</p>
  */
-package com.bettercloud.vault.rest;
+package io.github.jopenlibs.vault.rest;
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
index 5c93ea9e..e2d5ebaa 100644
--- a/src/main/java/module-info.java
+++ b/src/main/java/module-info.java
@@ -1,8 +1,8 @@
 module vault.java.driver {
     requires java.logging;
-    exports com.bettercloud.vault;
-    exports com.bettercloud.vault.api;
-    exports com.bettercloud.vault.json;
-    exports com.bettercloud.vault.response;
-    exports com.bettercloud.vault.rest;
+    exports io.github.jopenlibs.vault;
+    exports io.github.jopenlibs.vault.api;
+    exports io.github.jopenlibs.vault.json;
+    exports io.github.jopenlibs.vault.response;
+    exports io.github.jopenlibs.vault.rest;
 }
diff --git a/src/test-integration/java/com/bettercloud/vault/api/AuthBackendAppIdTests.java b/src/test-integration/java/io/github/jopenlibs/vault/api/AuthBackendAppIdTests.java
similarity index 85%
rename from src/test-integration/java/com/bettercloud/vault/api/AuthBackendAppIdTests.java
rename to src/test-integration/java/io/github/jopenlibs/vault/api/AuthBackendAppIdTests.java
index 24ec60b0..8bdea405 100644
--- a/src/test-integration/java/com/bettercloud/vault/api/AuthBackendAppIdTests.java
+++ b/src/test-integration/java/io/github/jopenlibs/vault/api/AuthBackendAppIdTests.java
@@ -1,8 +1,8 @@
-package com.bettercloud.vault.api;
+package io.github.jopenlibs.vault.api;
 
-import com.bettercloud.vault.Vault;
-import com.bettercloud.vault.VaultException;
-import com.bettercloud.vault.util.VaultContainer;
+import io.github.jopenlibs.vault.Vault;
+import io.github.jopenlibs.vault.VaultException;
+import io.github.jopenlibs.vault.util.VaultContainer;
 import java.io.IOException;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
diff --git a/src/test-integration/java/com/bettercloud/vault/api/AuthBackendAppRoleTests.java b/src/test-integration/java/io/github/jopenlibs/vault/api/AuthBackendAppRoleTests.java
similarity index 84%
rename from src/test-integration/java/com/bettercloud/vault/api/AuthBackendAppRoleTests.java
rename to src/test-integration/java/io/github/jopenlibs/vault/api/AuthBackendAppRoleTests.java
index e1ade502..4a9ca17a 100644
--- a/src/test-integration/java/com/bettercloud/vault/api/AuthBackendAppRoleTests.java
+++ b/src/test-integration/java/io/github/jopenlibs/vault/api/AuthBackendAppRoleTests.java
@@ -1,10 +1,10 @@
-package com.bettercloud.vault.api;
+package io.github.jopenlibs.vault.api;
 
-import com.bettercloud.vault.Vault;
-import com.bettercloud.vault.VaultConfig;
-import com.bettercloud.vault.VaultException;
-import com.bettercloud.vault.response.LogicalResponse;
-import com.bettercloud.vault.util.VaultContainer;
+import io.github.jopenlibs.vault.Vault;
+import io.github.jopenlibs.vault.VaultConfig;
+import io.github.jopenlibs.vault.VaultException;
+import io.github.jopenlibs.vault.response.LogicalResponse;
+import io.github.jopenlibs.vault.util.VaultContainer;
 import java.io.IOException;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
diff --git a/src/test-integration/java/com/bettercloud/vault/api/AuthBackendCertTests.java b/src/test-integration/java/io/github/jopenlibs/vault/api/AuthBackendCertTests.java
similarity index 87%
rename from src/test-integration/java/com/bettercloud/vault/api/AuthBackendCertTests.java
rename to src/test-integration/java/io/github/jopenlibs/vault/api/AuthBackendCertTests.java
index 1eb1a9c9..ff2073f7 100644
--- a/src/test-integration/java/com/bettercloud/vault/api/AuthBackendCertTests.java
+++ b/src/test-integration/java/io/github/jopenlibs/vault/api/AuthBackendCertTests.java
@@ -1,11 +1,12 @@
-package com.bettercloud.vault.api;
+package io.github.jopenlibs.vault.api;
 
-import com.bettercloud.vault.SslConfig;
-import com.bettercloud.vault.Vault;
-import com.bettercloud.vault.VaultConfig;
-import com.bettercloud.vault.VaultException;
-import com.bettercloud.vault.util.SSLUtils;
-import com.bettercloud.vault.util.VaultContainer;
+import io.github.jopenlibs.vault.SslConfig;
+import io.github.jopenlibs.vault.Vault;
+import io.github.jopenlibs.vault.VaultConfig;
+import io.github.jopenlibs.vault.VaultException;
+import io.github.jopenlibs.vault.util.SSLUtils;
+import io.github.jopenlibs.vault.util.VaultContainer;
+import io.github.jopenlibs.vault.util.TestConstants;
 import java.io.File;
 import java.io.IOException;
 import java.security.KeyStore;
@@ -14,7 +15,6 @@
 import org.junit.ClassRule;
 import org.junit.Test;
 
-import static com.bettercloud.vault.util.TestConstants.PASSWORD;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNotSame;
 
@@ -49,7 +49,7 @@ public void testLoginByCert_usingJksConfig() throws VaultException {
                         .readTimeout(30)
                         .sslConfig(
                                 new SslConfig()
-                                        .keyStore((KeyStore) clientCertAndKey.get("clientKeystore"), PASSWORD)
+                                        .keyStore((KeyStore) clientCertAndKey.get("clientKeystore"), TestConstants.PASSWORD)
                                         .trustStore((KeyStore) clientCertAndKey.get("clientTrustStore"))
                                         .build()
                         )
diff --git a/src/test-integration/java/com/bettercloud/vault/api/AuthBackendDatabaseTests.java b/src/test-integration/java/io/github/jopenlibs/vault/api/AuthBackendDatabaseTests.java
similarity index 80%
rename from src/test-integration/java/com/bettercloud/vault/api/AuthBackendDatabaseTests.java
rename to src/test-integration/java/io/github/jopenlibs/vault/api/AuthBackendDatabaseTests.java
index d9d41c60..d5a34123 100644
--- a/src/test-integration/java/com/bettercloud/vault/api/AuthBackendDatabaseTests.java
+++ b/src/test-integration/java/io/github/jopenlibs/vault/api/AuthBackendDatabaseTests.java
@@ -1,14 +1,15 @@
-package com.bettercloud.vault.api;
-
-import com.bettercloud.vault.Vault;
-import com.bettercloud.vault.VaultException;
-import com.bettercloud.vault.api.database.DatabaseRoleOptions;
-import com.bettercloud.vault.response.DatabaseResponse;
-import com.bettercloud.vault.util.DbContainer;
-import com.bettercloud.vault.util.VaultContainer;
+package io.github.jopenlibs.vault.api;
+
+import io.github.jopenlibs.vault.Vault;
+import io.github.jopenlibs.vault.VaultException;
+import io.github.jopenlibs.vault.api.database.DatabaseRoleOptions;
+import io.github.jopenlibs.vault.response.DatabaseResponse;
+import io.github.jopenlibs.vault.util.DbContainer;
+import io.github.jopenlibs.vault.util.VaultContainer;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
+import junit.framework.TestCase;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.Test;
@@ -40,10 +41,10 @@ public void testRoleCreation() throws VaultException {
         DatabaseRoleOptions roleToCreate = new DatabaseRoleOptions().dbName("postgres").creationStatements(creationStatements);
 
         DatabaseResponse response = vault.database().createOrUpdateRole("test-role", roleToCreate);
-        assertEquals(204, response.getRestResponse().getStatus());
+        TestCase.assertEquals(204, response.getRestResponse().getStatus());
 
         DatabaseResponse role = vault.database().getRole("test-role");
-        assertEquals(200, role.getRestResponse().getStatus());
+        TestCase.assertEquals(200, role.getRestResponse().getStatus());
 
         assertTrue(compareRoleOptions(role.getRoleOptions(), roleToCreate));
     }
@@ -58,10 +59,10 @@ public void testDeleteRole() throws VaultException {
         DatabaseRoleOptions roleToCreate = new DatabaseRoleOptions().dbName("postgres").creationStatements(creationStatements);
 
         DatabaseResponse response = vault.database().createOrUpdateRole("delete-role", roleToCreate);
-        assertEquals(204, response.getRestResponse().getStatus());
+        TestCase.assertEquals(204, response.getRestResponse().getStatus());
 
         DatabaseResponse deletedRole = vault.database().deleteRole("delete-role");
-        assertEquals(204, deletedRole.getRestResponse().getStatus());
+        TestCase.assertEquals(204, deletedRole.getRestResponse().getStatus());
 
         try {
             DatabaseResponse role = vault.database().getRole("delete-role");
@@ -89,12 +90,12 @@ public void testGetCredentials() throws VaultException {
         creationStatements.add("CREATE USER \"{{name}}\" WITH PASSWORD '{{password}}'; GRANT ALL PRIVILEGES ON DATABASE \"postgres\" to \"{{name}}\";");
 
         DatabaseResponse response = vault.database().createOrUpdateRole("new-role", new DatabaseRoleOptions().dbName("postgres").creationStatements(creationStatements));
-        assertEquals(204, response.getRestResponse().getStatus());
+        TestCase.assertEquals(204, response.getRestResponse().getStatus());
 
         DatabaseResponse credsResponse = vault.database().creds("new-role");
-        assertEquals(200, credsResponse.getRestResponse().getStatus());
+        TestCase.assertEquals(200, credsResponse.getRestResponse().getStatus());
 
-        assertTrue(credsResponse.getCredential().getUsername().contains("new-role"));
+        TestCase.assertTrue(credsResponse.getCredential().getUsername().contains("new-role"));
     }
 
     private boolean compareRoleOptions(DatabaseRoleOptions expected, DatabaseRoleOptions actual) {
diff --git a/src/test-integration/java/com/bettercloud/vault/api/AuthBackendPkiTests.java b/src/test-integration/java/io/github/jopenlibs/vault/api/AuthBackendPkiTests.java
similarity index 81%
rename from src/test-integration/java/com/bettercloud/vault/api/AuthBackendPkiTests.java
rename to src/test-integration/java/io/github/jopenlibs/vault/api/AuthBackendPkiTests.java
index 43bdecb2..56d345f8 100644
--- a/src/test-integration/java/com/bettercloud/vault/api/AuthBackendPkiTests.java
+++ b/src/test-integration/java/io/github/jopenlibs/vault/api/AuthBackendPkiTests.java
@@ -1,12 +1,13 @@
-package com.bettercloud.vault.api;
-
-import com.bettercloud.vault.Vault;
-import com.bettercloud.vault.VaultException;
-import com.bettercloud.vault.api.pki.CredentialFormat;
-import com.bettercloud.vault.api.pki.RoleOptions;
-import com.bettercloud.vault.response.PkiResponse;
-import com.bettercloud.vault.rest.RestResponse;
-import com.bettercloud.vault.util.VaultContainer;
+package io.github.jopenlibs.vault.api;
+
+import io.github.jopenlibs.vault.Vault;
+import io.github.jopenlibs.vault.VaultException;
+import io.github.jopenlibs.vault.api.pki.CredentialFormat;
+import io.github.jopenlibs.vault.api.pki.RoleOptions;
+import io.github.jopenlibs.vault.response.PkiResponse;
+import io.github.jopenlibs.vault.rest.RestResponse;
+import io.github.jopenlibs.vault.util.VaultContainer;
+import io.github.jopenlibs.vault.util.SSLUtils;
 import java.io.IOException;
 import java.security.KeyPair;
 import java.security.KeyPairGenerator;
@@ -14,12 +15,12 @@
 import java.security.PrivateKey;
 import java.security.PublicKey;
 import java.util.ArrayList;
+import junit.framework.TestCase;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.Test;
 
-import static com.bettercloud.vault.util.SSLUtils.generatePKCS10;
 import static junit.framework.TestCase.assertEquals;
 import static junit.framework.TestCase.assertNotNull;
 import static junit.framework.TestCase.assertNull;
@@ -77,9 +78,9 @@ public void testDeleteRole() throws VaultException {
 
         testCreateRole_Defaults();
         final PkiResponse deleteResponse = vault.pki().deleteRole("testRole");
-        assertEquals(204, deleteResponse.getRestResponse().getStatus());
+        TestCase.assertEquals(204, deleteResponse.getRestResponse().getStatus());
         final PkiResponse getResponse = vault.pki().getRole("testRole");
-        assertEquals(404, getResponse.getRestResponse().getStatus());
+        TestCase.assertEquals(404, getResponse.getRestResponse().getStatus());
     }
 
     @Test
@@ -95,16 +96,16 @@ public void testIssueCredential() throws VaultException, InterruptedException {
                         .allowSubdomains(true)
                         .maxTtl("9h")
         );
-        assertEquals(204, createRoleResponse.getRestResponse().getStatus());
+        TestCase.assertEquals(204, createRoleResponse.getRestResponse().getStatus());
         Thread.sleep(3000);
 
         // Issue cert
         final PkiResponse issueResponse = vault.pki().issue("testRole", "test.myvault.com", null, null, "1h", CredentialFormat.PEM);
-        assertNotNull(issueResponse.getCredential().getCertificate());
-        assertNotNull(issueResponse.getCredential().getPrivateKey());
-        assertNotNull(issueResponse.getCredential().getSerialNumber());
-        assertEquals("rsa", issueResponse.getCredential().getPrivateKeyType());
-        assertNotNull(issueResponse.getCredential().getIssuingCa());
+        TestCase.assertNotNull(issueResponse.getCredential().getCertificate());
+        TestCase.assertNotNull(issueResponse.getCredential().getPrivateKey());
+        TestCase.assertNotNull(issueResponse.getCredential().getSerialNumber());
+        TestCase.assertEquals("rsa", issueResponse.getCredential().getPrivateKeyType());
+        TestCase.assertNotNull(issueResponse.getCredential().getIssuingCa());
     }
 
     @Test
@@ -117,7 +118,7 @@ public void testIssueCredentialWithCsr() throws VaultException, InterruptedExcep
         PrivateKey pvt = kp.getPrivate();
         String csr = null;
         try {
-            csr = generatePKCS10(kp, "", "", "", "", "", "");
+            csr = SSLUtils.generatePKCS10(kp, "", "", "", "", "", "");
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -132,15 +133,15 @@ public void testIssueCredentialWithCsr() throws VaultException, InterruptedExcep
                         .allowSubdomains(true)
                         .maxTtl("9h")
         );
-        assertEquals(204, createRoleResponse.getRestResponse().getStatus());
+        TestCase.assertEquals(204, createRoleResponse.getRestResponse().getStatus());
         Thread.sleep(3000);
 
         // Issue cert
         final PkiResponse issueResponse = vault.pki().issue("testRole", "test.myvault.com", null, null, "1h", CredentialFormat.PEM, csr);
-        assertNotNull(issueResponse.getCredential().getCertificate());
-        assertNull(issueResponse.getCredential().getPrivateKey());
-        assertNotNull(issueResponse.getCredential().getSerialNumber());
-        assertNotNull(issueResponse.getCredential().getIssuingCa());
+        TestCase.assertNotNull(issueResponse.getCredential().getCertificate());
+        TestCase.assertNull(issueResponse.getCredential().getPrivateKey());
+        TestCase.assertNotNull(issueResponse.getCredential().getSerialNumber());
+        TestCase.assertNotNull(issueResponse.getCredential().getIssuingCa());
     }
 
     @Test
@@ -156,11 +157,11 @@ public void testRevocation() throws VaultException, InterruptedException, NoSuch
                         .allowSubdomains(true)
                         .maxTtl("9h")
         );
-        assertEquals(204, createRoleResponse.getRestResponse().getStatus());
+        TestCase.assertEquals(204, createRoleResponse.getRestResponse().getStatus());
         Thread.sleep(3000);
         // Issue cert
         final PkiResponse issueResponse = vault.pki().issue("testRole", "test.myvault.com", null, null, "1h", CredentialFormat.PEM);
-        assertNotNull(issueResponse.getCredential().getSerialNumber());
+        TestCase.assertNotNull(issueResponse.getCredential().getSerialNumber());
         vault.pki().revoke(issueResponse.getCredential().getSerialNumber());
     }
 
diff --git a/src/test-integration/java/com/bettercloud/vault/api/AuthBackendTokenTests.java b/src/test-integration/java/io/github/jopenlibs/vault/api/AuthBackendTokenTests.java
similarity index 93%
rename from src/test-integration/java/com/bettercloud/vault/api/AuthBackendTokenTests.java
rename to src/test-integration/java/io/github/jopenlibs/vault/api/AuthBackendTokenTests.java
index a5f9e337..454343f6 100644
--- a/src/test-integration/java/com/bettercloud/vault/api/AuthBackendTokenTests.java
+++ b/src/test-integration/java/io/github/jopenlibs/vault/api/AuthBackendTokenTests.java
@@ -1,15 +1,14 @@
-package com.bettercloud.vault.api;
-
-import com.bettercloud.vault.Vault;
-import com.bettercloud.vault.VaultException;
-import com.bettercloud.vault.json.Json;
-import com.bettercloud.vault.response.AuthResponse;
-import com.bettercloud.vault.response.LookupResponse;
-import com.bettercloud.vault.util.VaultContainer;
+package io.github.jopenlibs.vault.api;
+
+import io.github.jopenlibs.vault.Vault;
+import io.github.jopenlibs.vault.VaultException;
+import io.github.jopenlibs.vault.json.Json;
+import io.github.jopenlibs.vault.response.AuthResponse;
+import io.github.jopenlibs.vault.response.LookupResponse;
+import io.github.jopenlibs.vault.util.VaultContainer;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
-import java.util.List;
 import java.util.UUID;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
diff --git a/src/test-integration/java/com/bettercloud/vault/api/AuthBackendUserPassTests.java b/src/test-integration/java/io/github/jopenlibs/vault/api/AuthBackendUserPassTests.java
similarity index 81%
rename from src/test-integration/java/com/bettercloud/vault/api/AuthBackendUserPassTests.java
rename to src/test-integration/java/io/github/jopenlibs/vault/api/AuthBackendUserPassTests.java
index 2ac3086f..69c86ed7 100644
--- a/src/test-integration/java/com/bettercloud/vault/api/AuthBackendUserPassTests.java
+++ b/src/test-integration/java/io/github/jopenlibs/vault/api/AuthBackendUserPassTests.java
@@ -1,9 +1,9 @@
-package com.bettercloud.vault.api;
+package io.github.jopenlibs.vault.api;
 
-import com.bettercloud.vault.Vault;
-import com.bettercloud.vault.VaultException;
-import com.bettercloud.vault.response.AuthResponse;
-import com.bettercloud.vault.util.VaultContainer;
+import io.github.jopenlibs.vault.Vault;
+import io.github.jopenlibs.vault.VaultException;
+import io.github.jopenlibs.vault.response.AuthResponse;
+import io.github.jopenlibs.vault.util.VaultContainer;
 import java.io.IOException;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
diff --git a/src/test-integration/java/com/bettercloud/vault/api/DebugTests.java b/src/test-integration/java/io/github/jopenlibs/vault/api/DebugTests.java
similarity index 82%
rename from src/test-integration/java/com/bettercloud/vault/api/DebugTests.java
rename to src/test-integration/java/io/github/jopenlibs/vault/api/DebugTests.java
index 26223730..ad9b062d 100644
--- a/src/test-integration/java/com/bettercloud/vault/api/DebugTests.java
+++ b/src/test-integration/java/io/github/jopenlibs/vault/api/DebugTests.java
@@ -1,10 +1,11 @@
-package com.bettercloud.vault.api;
+package io.github.jopenlibs.vault.api;
 
-import com.bettercloud.vault.Vault;
-import com.bettercloud.vault.VaultException;
-import com.bettercloud.vault.response.HealthResponse;
-import com.bettercloud.vault.util.VaultContainer;
+import io.github.jopenlibs.vault.Vault;
+import io.github.jopenlibs.vault.VaultException;
+import io.github.jopenlibs.vault.response.HealthResponse;
+import io.github.jopenlibs.vault.util.VaultContainer;
 import java.io.IOException;
+import junit.framework.TestCase;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
@@ -44,7 +45,7 @@ public void testHealth_Plain() throws VaultException {
         assertFalse(response.getSealed());
         assertFalse(response.getStandby());
         assertNotNull(response.getServerTimeUTC());
-        assertEquals(200, response.getRestResponse().getStatus());
+        TestCase.assertEquals(200, response.getRestResponse().getStatus());
     }
 
     @Test
@@ -54,7 +55,7 @@ public void testHealth_WithParams() throws VaultException {
         assertFalse(response.getSealed());
         assertFalse(response.getStandby());
         assertNotNull(response.getServerTimeUTC());
-        assertEquals(212, response.getRestResponse().getStatus());
+        TestCase.assertEquals(212, response.getRestResponse().getStatus());
     }
 
     /**
@@ -74,6 +75,6 @@ public void testHealth_WonkyActiveCode() throws VaultException {
         assertNull(response.getSealed());
         assertNull(response.getStandby());
         assertNull(response.getServerTimeUTC());
-        assertEquals(204, response.getRestResponse().getStatus());
+        TestCase.assertEquals(204, response.getRestResponse().getStatus());
     }
 }
diff --git a/src/test-integration/java/com/bettercloud/vault/api/LeasesTests.java b/src/test-integration/java/io/github/jopenlibs/vault/api/LeasesTests.java
similarity index 90%
rename from src/test-integration/java/com/bettercloud/vault/api/LeasesTests.java
rename to src/test-integration/java/io/github/jopenlibs/vault/api/LeasesTests.java
index f753f189..81a0962c 100644
--- a/src/test-integration/java/com/bettercloud/vault/api/LeasesTests.java
+++ b/src/test-integration/java/io/github/jopenlibs/vault/api/LeasesTests.java
@@ -1,9 +1,9 @@
-package com.bettercloud.vault.api;
+package io.github.jopenlibs.vault.api;
 
-import com.bettercloud.vault.Vault;
-import com.bettercloud.vault.VaultException;
-import com.bettercloud.vault.response.VaultResponse;
-import com.bettercloud.vault.util.VaultContainer;
+import io.github.jopenlibs.vault.Vault;
+import io.github.jopenlibs.vault.VaultException;
+import io.github.jopenlibs.vault.response.VaultResponse;
+import io.github.jopenlibs.vault.util.VaultContainer;
 import java.io.IOException;
 import org.junit.Before;
 import org.junit.BeforeClass;
diff --git a/src/test-integration/java/com/bettercloud/vault/api/LogicalTests.java b/src/test-integration/java/io/github/jopenlibs/vault/api/LogicalTests.java
similarity index 95%
rename from src/test-integration/java/com/bettercloud/vault/api/LogicalTests.java
rename to src/test-integration/java/io/github/jopenlibs/vault/api/LogicalTests.java
index a5a7d473..a94e5e06 100644
--- a/src/test-integration/java/com/bettercloud/vault/api/LogicalTests.java
+++ b/src/test-integration/java/io/github/jopenlibs/vault/api/LogicalTests.java
@@ -1,16 +1,17 @@
-package com.bettercloud.vault.api;
-
-import com.bettercloud.vault.Vault;
-import com.bettercloud.vault.VaultConfig;
-import com.bettercloud.vault.VaultException;
-import com.bettercloud.vault.response.AuthResponse;
-import com.bettercloud.vault.response.LogicalResponse;
-import com.bettercloud.vault.util.VaultContainer;
+package io.github.jopenlibs.vault.api;
+
+import io.github.jopenlibs.vault.Vault;
+import io.github.jopenlibs.vault.VaultConfig;
+import io.github.jopenlibs.vault.VaultException;
+import io.github.jopenlibs.vault.response.AuthResponse;
+import io.github.jopenlibs.vault.response.LogicalResponse;
+import io.github.jopenlibs.vault.util.VaultContainer;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
+import junit.framework.TestCase;
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
@@ -255,7 +256,7 @@ public void testDestroy() throws VaultException {
     public void testReadPermissionDeniedReturnedByVault() throws VaultException {
         final Vault vault = container.getVault(NONROOT_TOKEN);
         LogicalResponse read = vault.logical().read("secret/null");
-        assertEquals(403, read.getRestResponse().getStatus());
+        TestCase.assertEquals(403, read.getRestResponse().getStatus());
     }
 
     /**
@@ -269,7 +270,7 @@ public void testWritePermissionDeniedReturnedByVault() throws VaultException {
         final Map<String, Object> testMap = new HashMap<>();
         testMap.put("value", null);
         LogicalResponse write = vault.logical().write("secret/null", testMap);
-        assertEquals(403, write.getRestResponse().getStatus());
+        TestCase.assertEquals(403, write.getRestResponse().getStatus());
     }
 
     /**
@@ -284,7 +285,7 @@ public void testDeleteExceptionMessageIncludesErrorsReturnedByVault() throws Vau
 
         final Vault vault = container.getVault(NONROOT_TOKEN);
         LogicalResponse delete = vault.logical().delete("secret/null");
-        assertEquals(403, delete.getRestResponse().getStatus());
+        TestCase.assertEquals(403, delete.getRestResponse().getStatus());
     }
 
     /**
@@ -296,7 +297,7 @@ public void testDeleteExceptionMessageIncludesErrorsReturnedByVault() throws Vau
     public void testListPermissionDeniedReturnedByVault() throws VaultException {
         final Vault vault = container.getVault(NONROOT_TOKEN);
         LogicalResponse response = vault.logical().list("secret/null");
-        assertEquals(403, response.getRestResponse().getStatus());
+        TestCase.assertEquals(403, response.getRestResponse().getStatus());
     }
 
     /**
@@ -309,7 +310,7 @@ public void testReadReturnedByVaultOn404() throws VaultException {
         final Vault vault = container.getRootVault();
         final String path = "secret/" + UUID.randomUUID().toString();
         LogicalResponse read = vault.logical().read(path);
-        assertEquals(404, read.getRestResponse().getStatus());
+        TestCase.assertEquals(404, read.getRestResponse().getStatus());
     }
 
     /**
diff --git a/src/test-integration/java/com/bettercloud/vault/api/MountsTests.java b/src/test-integration/java/io/github/jopenlibs/vault/api/MountsTests.java
similarity index 88%
rename from src/test-integration/java/com/bettercloud/vault/api/MountsTests.java
rename to src/test-integration/java/io/github/jopenlibs/vault/api/MountsTests.java
index e973e80d..10d6f1fb 100644
--- a/src/test-integration/java/com/bettercloud/vault/api/MountsTests.java
+++ b/src/test-integration/java/io/github/jopenlibs/vault/api/MountsTests.java
@@ -1,17 +1,18 @@
-package com.bettercloud.vault.api;
-
-import com.bettercloud.vault.Vault;
-import com.bettercloud.vault.VaultException;
-import com.bettercloud.vault.api.mounts.Mount;
-import com.bettercloud.vault.api.mounts.MountConfig;
-import com.bettercloud.vault.api.mounts.MountPayload;
-import com.bettercloud.vault.api.mounts.MountType;
-import com.bettercloud.vault.api.mounts.TimeToLive;
-import com.bettercloud.vault.response.MountResponse;
-import com.bettercloud.vault.util.VaultContainer;
+package io.github.jopenlibs.vault.api;
+
+import io.github.jopenlibs.vault.Vault;
+import io.github.jopenlibs.vault.VaultException;
+import io.github.jopenlibs.vault.api.mounts.Mount;
+import io.github.jopenlibs.vault.api.mounts.MountConfig;
+import io.github.jopenlibs.vault.api.mounts.MountPayload;
+import io.github.jopenlibs.vault.api.mounts.MountType;
+import io.github.jopenlibs.vault.api.mounts.TimeToLive;
+import io.github.jopenlibs.vault.response.MountResponse;
+import io.github.jopenlibs.vault.util.VaultContainer;
 import java.io.IOException;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
+import junit.framework.TestCase;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.Rule;
@@ -59,7 +60,7 @@ public void testEnable() throws VaultException {
 
         final MountResponse response = vault.mounts().enable("pki-itest-path-1", MountType.PKI, payload);
 
-        assertEquals(204, response.getRestResponse().getStatus());
+        TestCase.assertEquals(204, response.getRestResponse().getStatus());
     }
 
     @Test
@@ -123,7 +124,7 @@ public void testDisable() throws VaultException {
 
         final MountResponse response = vault.mounts().disable("pki-custom-path-3");
 
-        assertEquals(204, response.getRestResponse().getStatus());
+        TestCase.assertEquals(204, response.getRestResponse().getStatus());
     }
 
     @Test
@@ -140,7 +141,7 @@ public void testRead() throws VaultException {
         final Mount mount = response.getMount();
         final MountConfig config = mount.getConfig();
 
-        assertEquals(200, response.getRestResponse().getStatus());
+        TestCase.assertEquals(200, response.getRestResponse().getStatus());
 
         assertEquals(Integer.valueOf(21600), config.getDefaultLeaseTtl());
         assertEquals(Integer.valueOf(21600), config.getMaxLeaseTtl());
@@ -172,7 +173,7 @@ public void testTune() throws VaultException {
 
         final MountResponse tuneResponse = vault.mounts().tune("pki-predefined-path-2", tunePayload);
 
-        assertEquals(204, tuneResponse.getRestResponse().getStatus());
+        TestCase.assertEquals(204, tuneResponse.getRestResponse().getStatus());
 
         final MountResponse response = vault.mounts().read("pki-predefined-path-2");
         final Mount mount = response.getMount();
diff --git a/src/test-integration/java/com/bettercloud/vault/api/SealTests.java b/src/test-integration/java/io/github/jopenlibs/vault/api/SealTests.java
similarity index 90%
rename from src/test-integration/java/com/bettercloud/vault/api/SealTests.java
rename to src/test-integration/java/io/github/jopenlibs/vault/api/SealTests.java
index b1d45b3c..dd30172a 100644
--- a/src/test-integration/java/com/bettercloud/vault/api/SealTests.java
+++ b/src/test-integration/java/io/github/jopenlibs/vault/api/SealTests.java
@@ -1,8 +1,8 @@
-package com.bettercloud.vault.api;
+package io.github.jopenlibs.vault.api;
 
-import com.bettercloud.vault.VaultException;
-import com.bettercloud.vault.response.SealResponse;
-import com.bettercloud.vault.util.VaultContainer;
+import io.github.jopenlibs.vault.VaultException;
+import io.github.jopenlibs.vault.response.SealResponse;
+import io.github.jopenlibs.vault.util.VaultContainer;
 import java.io.IOException;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
diff --git a/src/test-integration/java/com/bettercloud/vault/api/VaultAgentTests.java b/src/test-integration/java/io/github/jopenlibs/vault/api/VaultAgentTests.java
similarity index 87%
rename from src/test-integration/java/com/bettercloud/vault/api/VaultAgentTests.java
rename to src/test-integration/java/io/github/jopenlibs/vault/api/VaultAgentTests.java
index 34777e89..0f013a15 100644
--- a/src/test-integration/java/com/bettercloud/vault/api/VaultAgentTests.java
+++ b/src/test-integration/java/io/github/jopenlibs/vault/api/VaultAgentTests.java
@@ -1,11 +1,11 @@
-package com.bettercloud.vault.api;
+package io.github.jopenlibs.vault.api;
 
-import com.bettercloud.vault.Vault;
-import com.bettercloud.vault.VaultConfig;
-import com.bettercloud.vault.VaultException;
-import com.bettercloud.vault.response.LogicalResponse;
-import com.bettercloud.vault.util.VaultAgentContainer;
-import com.bettercloud.vault.util.VaultContainer;
+import io.github.jopenlibs.vault.Vault;
+import io.github.jopenlibs.vault.VaultConfig;
+import io.github.jopenlibs.vault.VaultException;
+import io.github.jopenlibs.vault.response.LogicalResponse;
+import io.github.jopenlibs.vault.util.VaultAgentContainer;
+import io.github.jopenlibs.vault.util.VaultContainer;
 import java.io.File;
 import java.io.IOException;
 import java.util.HashMap;
diff --git a/src/test-integration/java/com/bettercloud/vault/util/DbContainer.java b/src/test-integration/java/io/github/jopenlibs/vault/util/DbContainer.java
similarity index 96%
rename from src/test-integration/java/com/bettercloud/vault/util/DbContainer.java
rename to src/test-integration/java/io/github/jopenlibs/vault/util/DbContainer.java
index 365c6293..5f5f12c1 100644
--- a/src/test-integration/java/com/bettercloud/vault/util/DbContainer.java
+++ b/src/test-integration/java/io/github/jopenlibs/vault/util/DbContainer.java
@@ -1,4 +1,4 @@
-package com.bettercloud.vault.util;
+package io.github.jopenlibs.vault.util;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/src/test-integration/java/com/bettercloud/vault/util/SSLUtils.java b/src/test-integration/java/io/github/jopenlibs/vault/util/SSLUtils.java
similarity index 99%
rename from src/test-integration/java/com/bettercloud/vault/util/SSLUtils.java
rename to src/test-integration/java/io/github/jopenlibs/vault/util/SSLUtils.java
index 332c92cd..431ad762 100644
--- a/src/test-integration/java/com/bettercloud/vault/util/SSLUtils.java
+++ b/src/test-integration/java/io/github/jopenlibs/vault/util/SSLUtils.java
@@ -1,5 +1,6 @@
-package com.bettercloud.vault.util;
+package io.github.jopenlibs.vault.util;
 
+import io.github.jopenlibs.vault.api.AuthBackendCertTests;
 import java.io.ByteArrayOutputStream;
 import java.io.FileReader;
 import java.io.IOException;
@@ -52,7 +53,7 @@
 
 /**
  * Static utility methods for generating client-side SSL certs and keys, for tests that use Vault's TLS Certificate
- * auth backend.  Right now, all such code is isolated to {@link com.bettercloud.vault.api.AuthBackendCertTests}.
+ * auth backend.  Right now, all such code is isolated to {@link AuthBackendCertTests}.
  */
 public class SSLUtils implements TestConstants {
 
diff --git a/src/test-integration/java/com/bettercloud/vault/util/TestConstants.java b/src/test-integration/java/io/github/jopenlibs/vault/util/TestConstants.java
similarity index 97%
rename from src/test-integration/java/com/bettercloud/vault/util/TestConstants.java
rename to src/test-integration/java/io/github/jopenlibs/vault/util/TestConstants.java
index a9c2042d..bb4c8fce 100644
--- a/src/test-integration/java/com/bettercloud/vault/util/TestConstants.java
+++ b/src/test-integration/java/io/github/jopenlibs/vault/util/TestConstants.java
@@ -1,4 +1,4 @@
-package com.bettercloud.vault.util;
+package io.github.jopenlibs.vault.util;
 
 import java.io.File;
 import org.testcontainers.containers.Network;
diff --git a/src/test-integration/java/com/bettercloud/vault/util/VaultAgentContainer.java b/src/test-integration/java/io/github/jopenlibs/vault/util/VaultAgentContainer.java
similarity index 94%
rename from src/test-integration/java/com/bettercloud/vault/util/VaultAgentContainer.java
rename to src/test-integration/java/io/github/jopenlibs/vault/util/VaultAgentContainer.java
index 35e9688b..1a12cd0b 100644
--- a/src/test-integration/java/com/bettercloud/vault/util/VaultAgentContainer.java
+++ b/src/test-integration/java/io/github/jopenlibs/vault/util/VaultAgentContainer.java
@@ -1,8 +1,8 @@
-package com.bettercloud.vault.util;
+package io.github.jopenlibs.vault.util;
 
-import com.bettercloud.vault.Vault;
-import com.bettercloud.vault.VaultConfig;
-import com.bettercloud.vault.VaultException;
+import io.github.jopenlibs.vault.Vault;
+import io.github.jopenlibs.vault.VaultConfig;
+import io.github.jopenlibs.vault.VaultException;
 import com.github.dockerjava.api.model.Capability;
 import java.nio.file.Path;
 import org.slf4j.Logger;
diff --git a/src/test-integration/java/com/bettercloud/vault/util/VaultContainer.java b/src/test-integration/java/io/github/jopenlibs/vault/util/VaultContainer.java
similarity index 98%
rename from src/test-integration/java/com/bettercloud/vault/util/VaultContainer.java
rename to src/test-integration/java/io/github/jopenlibs/vault/util/VaultContainer.java
index 6602e881..12d5d242 100644
--- a/src/test-integration/java/com/bettercloud/vault/util/VaultContainer.java
+++ b/src/test-integration/java/io/github/jopenlibs/vault/util/VaultContainer.java
@@ -1,11 +1,11 @@
-package com.bettercloud.vault.util;
-
-import com.bettercloud.vault.SslConfig;
-import com.bettercloud.vault.Vault;
-import com.bettercloud.vault.VaultConfig;
-import com.bettercloud.vault.VaultException;
-import com.bettercloud.vault.json.Json;
-import com.bettercloud.vault.json.JsonObject;
+package io.github.jopenlibs.vault.util;
+
+import io.github.jopenlibs.vault.SslConfig;
+import io.github.jopenlibs.vault.Vault;
+import io.github.jopenlibs.vault.VaultConfig;
+import io.github.jopenlibs.vault.VaultException;
+import io.github.jopenlibs.vault.json.Json;
+import io.github.jopenlibs.vault.json.JsonObject;
 import com.github.dockerjava.api.model.Capability;
 import java.io.File;
 import java.io.IOException;
diff --git a/src/test/java/com/bettercloud/vault/LogicalUtilitiesTests.java b/src/test/java/io/github/jopenlibs/vault/LogicalUtilitiesTests.java
similarity index 96%
rename from src/test/java/com/bettercloud/vault/LogicalUtilitiesTests.java
rename to src/test/java/io/github/jopenlibs/vault/LogicalUtilitiesTests.java
index 00e5b110..dc0d0efb 100644
--- a/src/test/java/com/bettercloud/vault/LogicalUtilitiesTests.java
+++ b/src/test/java/io/github/jopenlibs/vault/LogicalUtilitiesTests.java
@@ -1,8 +1,8 @@
-package com.bettercloud.vault;
+package io.github.jopenlibs.vault;
 
-import com.bettercloud.vault.api.Logical;
-import com.bettercloud.vault.api.LogicalUtilities;
-import com.bettercloud.vault.json.JsonObject;
+import io.github.jopenlibs.vault.api.Logical;
+import io.github.jopenlibs.vault.api.LogicalUtilities;
+import io.github.jopenlibs.vault.json.JsonObject;
 import java.util.ArrayList;
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/src/test/java/com/bettercloud/vault/RetryTests.java b/src/test/java/io/github/jopenlibs/vault/RetryTests.java
similarity index 90%
rename from src/test/java/com/bettercloud/vault/RetryTests.java
rename to src/test/java/io/github/jopenlibs/vault/RetryTests.java
index a51237f2..0093efdc 100644
--- a/src/test/java/com/bettercloud/vault/RetryTests.java
+++ b/src/test/java/io/github/jopenlibs/vault/RetryTests.java
@@ -1,8 +1,8 @@
-package com.bettercloud.vault;
+package io.github.jopenlibs.vault;
 
-import com.bettercloud.vault.response.LogicalResponse;
-import com.bettercloud.vault.vault.VaultTestUtils;
-import com.bettercloud.vault.vault.mock.RetriesMockVault;
+import io.github.jopenlibs.vault.response.LogicalResponse;
+import io.github.jopenlibs.vault.vault.VaultTestUtils;
+import io.github.jopenlibs.vault.vault.mock.RetriesMockVault;
 import java.util.HashMap;
 import org.eclipse.jetty.server.Server;
 import org.junit.Test;
diff --git a/src/test/java/com/bettercloud/vault/SSLTests.java b/src/test/java/io/github/jopenlibs/vault/SSLTests.java
similarity index 98%
rename from src/test/java/com/bettercloud/vault/SSLTests.java
rename to src/test/java/io/github/jopenlibs/vault/SSLTests.java
index 5f64073f..3b0b18b8 100644
--- a/src/test/java/com/bettercloud/vault/SSLTests.java
+++ b/src/test/java/io/github/jopenlibs/vault/SSLTests.java
@@ -1,8 +1,8 @@
-package com.bettercloud.vault;
+package io.github.jopenlibs.vault;
 
-import com.bettercloud.vault.response.LogicalResponse;
-import com.bettercloud.vault.vault.VaultTestUtils;
-import com.bettercloud.vault.vault.mock.MockVault;
+import io.github.jopenlibs.vault.response.LogicalResponse;
+import io.github.jopenlibs.vault.vault.VaultTestUtils;
+import io.github.jopenlibs.vault.vault.mock.MockVault;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileOutputStream;
diff --git a/src/test/java/com/bettercloud/vault/TimeoutTests.java b/src/test/java/io/github/jopenlibs/vault/TimeoutTests.java
similarity index 93%
rename from src/test/java/com/bettercloud/vault/TimeoutTests.java
rename to src/test/java/io/github/jopenlibs/vault/TimeoutTests.java
index 5bdb4445..597b72cd 100644
--- a/src/test/java/com/bettercloud/vault/TimeoutTests.java
+++ b/src/test/java/io/github/jopenlibs/vault/TimeoutTests.java
@@ -1,9 +1,9 @@
-package com.bettercloud.vault;
+package io.github.jopenlibs.vault;
 
-import com.bettercloud.vault.response.LogicalResponse;
-import com.bettercloud.vault.vault.VaultTestUtils;
-import com.bettercloud.vault.vault.mock.OpenTimeoutsMockVault;
-import com.bettercloud.vault.vault.mock.ReadTimeoutsMockVault;
+import io.github.jopenlibs.vault.response.LogicalResponse;
+import io.github.jopenlibs.vault.vault.VaultTestUtils;
+import io.github.jopenlibs.vault.vault.mock.OpenTimeoutsMockVault;
+import io.github.jopenlibs.vault.vault.mock.ReadTimeoutsMockVault;
 import org.eclipse.jetty.server.Server;
 import org.junit.Test;
 
diff --git a/src/test/java/com/bettercloud/vault/VaultConfigTests.java b/src/test/java/io/github/jopenlibs/vault/VaultConfigTests.java
similarity index 98%
rename from src/test/java/com/bettercloud/vault/VaultConfigTests.java
rename to src/test/java/io/github/jopenlibs/vault/VaultConfigTests.java
index 3a49a45b..f7c48f4a 100644
--- a/src/test/java/com/bettercloud/vault/VaultConfigTests.java
+++ b/src/test/java/io/github/jopenlibs/vault/VaultConfigTests.java
@@ -1,4 +1,4 @@
-package com.bettercloud.vault;
+package io.github.jopenlibs.vault;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -30,7 +30,7 @@ public class VaultConfigTests {
      * that should be returned for a given environment variable name.  The actual environment is never used.</p>
      *
      * <p>The <code>VAULT_TOKEN</code> variable gets special treatment.  If a value cannot be found in the environment,
-     * then {@link com.bettercloud.vault.EnvironmentLoader} looks for a <code>.vault-token</code> file in
+     * then {@link EnvironmentLoader} looks for a <code>.vault-token</code> file in
      * the user's home directory.  So this mock has a second constructor which allows you to pass a directory path,
      * to serve as a mock "home directory" for testing.</p>
      */
diff --git a/src/test/java/com/bettercloud/vault/VaultExceptionTests.java b/src/test/java/io/github/jopenlibs/vault/VaultExceptionTests.java
similarity index 97%
rename from src/test/java/com/bettercloud/vault/VaultExceptionTests.java
rename to src/test/java/io/github/jopenlibs/vault/VaultExceptionTests.java
index d15bda99..00896edb 100644
--- a/src/test/java/com/bettercloud/vault/VaultExceptionTests.java
+++ b/src/test/java/io/github/jopenlibs/vault/VaultExceptionTests.java
@@ -1,4 +1,4 @@
-package com.bettercloud.vault;
+package io.github.jopenlibs.vault;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/src/test/java/com/bettercloud/vault/VaultTests.java b/src/test/java/io/github/jopenlibs/vault/VaultTests.java
similarity index 95%
rename from src/test/java/com/bettercloud/vault/VaultTests.java
rename to src/test/java/io/github/jopenlibs/vault/VaultTests.java
index ad52f4bf..7efe960e 100644
--- a/src/test/java/com/bettercloud/vault/VaultTests.java
+++ b/src/test/java/io/github/jopenlibs/vault/VaultTests.java
@@ -1,8 +1,8 @@
-package com.bettercloud.vault;
+package io.github.jopenlibs.vault;
 
-import com.bettercloud.vault.response.LogicalResponse;
-import com.bettercloud.vault.vault.VaultTestUtils;
-import com.bettercloud.vault.vault.mock.MockVault;
+import io.github.jopenlibs.vault.response.LogicalResponse;
+import io.github.jopenlibs.vault.vault.VaultTestUtils;
+import io.github.jopenlibs.vault.vault.mock.MockVault;
 import java.util.HashMap;
 import java.util.Map;
 import org.eclipse.jetty.server.Server;
diff --git a/src/test/java/com/bettercloud/vault/api/pki/CredentialFormatTests.java b/src/test/java/io/github/jopenlibs/vault/api/pki/CredentialFormatTests.java
similarity index 94%
rename from src/test/java/com/bettercloud/vault/api/pki/CredentialFormatTests.java
rename to src/test/java/io/github/jopenlibs/vault/api/pki/CredentialFormatTests.java
index fae5bf90..3ca143b5 100644
--- a/src/test/java/com/bettercloud/vault/api/pki/CredentialFormatTests.java
+++ b/src/test/java/io/github/jopenlibs/vault/api/pki/CredentialFormatTests.java
@@ -1,4 +1,4 @@
-package com.bettercloud.vault.api.pki;
+package io.github.jopenlibs.vault.api.pki;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/src/test/java/com/bettercloud/vault/api/pki/CredentialTests.java b/src/test/java/io/github/jopenlibs/vault/api/pki/CredentialTests.java
similarity index 95%
rename from src/test/java/com/bettercloud/vault/api/pki/CredentialTests.java
rename to src/test/java/io/github/jopenlibs/vault/api/pki/CredentialTests.java
index 4b947c36..762fd288 100644
--- a/src/test/java/com/bettercloud/vault/api/pki/CredentialTests.java
+++ b/src/test/java/io/github/jopenlibs/vault/api/pki/CredentialTests.java
@@ -1,4 +1,4 @@
-package com.bettercloud.vault.api.pki;
+package io.github.jopenlibs.vault.api.pki;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/src/test/java/com/bettercloud/vault/api/pki/RoleOptionsTests.java b/src/test/java/io/github/jopenlibs/vault/api/pki/RoleOptionsTests.java
similarity index 98%
rename from src/test/java/com/bettercloud/vault/api/pki/RoleOptionsTests.java
rename to src/test/java/io/github/jopenlibs/vault/api/pki/RoleOptionsTests.java
index 57361f3c..266fd4e6 100644
--- a/src/test/java/com/bettercloud/vault/api/pki/RoleOptionsTests.java
+++ b/src/test/java/io/github/jopenlibs/vault/api/pki/RoleOptionsTests.java
@@ -1,4 +1,4 @@
-package com.bettercloud.vault.api.pki;
+package io.github.jopenlibs.vault.api.pki;
 
 import java.util.ArrayList;
 import org.junit.Assert;
diff --git a/src/test/java/com/bettercloud/vault/json/JsonArray_Test.java b/src/test/java/io/github/jopenlibs/vault/json/JsonArray_Test.java
similarity index 99%
rename from src/test/java/com/bettercloud/vault/json/JsonArray_Test.java
rename to src/test/java/io/github/jopenlibs/vault/json/JsonArray_Test.java
index 1a20e1a1..bcef8082 100644
--- a/src/test/java/com/bettercloud/vault/json/JsonArray_Test.java
+++ b/src/test/java/io/github/jopenlibs/vault/json/JsonArray_Test.java
@@ -19,13 +19,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ******************************************************************************/
-package com.bettercloud.vault.json;
+package io.github.jopenlibs.vault.json;
 
 import java.io.IOException;
 import java.util.ConcurrentModificationException;
 import java.util.Iterator;
 import java.util.List;
-import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.InOrder;
@@ -610,7 +609,7 @@ public void hashCode_differsForDifferentArrays() {
     public void canBeSerializedAndDeserialized() throws Exception {
         array.add(true).add(3.14d).add(23).add("foo").add(new JsonArray().add(false));
 
-        Assert.assertEquals(array, TestUtil.serializeAndDeserialize(array));
+        assertEquals(array, TestUtil.serializeAndDeserialize(array));
     }
 
     @Test
diff --git a/src/test/java/com/bettercloud/vault/json/JsonLiteral_Test.java b/src/test/java/io/github/jopenlibs/vault/json/JsonLiteral_Test.java
similarity index 95%
rename from src/test/java/com/bettercloud/vault/json/JsonLiteral_Test.java
rename to src/test/java/io/github/jopenlibs/vault/json/JsonLiteral_Test.java
index a2677722..ea791a9a 100644
--- a/src/test/java/com/bettercloud/vault/json/JsonLiteral_Test.java
+++ b/src/test/java/io/github/jopenlibs/vault/json/JsonLiteral_Test.java
@@ -19,15 +19,15 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ******************************************************************************/
-package com.bettercloud.vault.json;
+package io.github.jopenlibs.vault.json;
 
 import java.io.IOException;
 import org.junit.Test;
 
-import static com.bettercloud.vault.json.Json.FALSE;
-import static com.bettercloud.vault.json.Json.NULL;
-import static com.bettercloud.vault.json.Json.TRUE;
-import static com.bettercloud.vault.json.Json.value;
+import static io.github.jopenlibs.vault.json.Json.FALSE;
+import static io.github.jopenlibs.vault.json.Json.NULL;
+import static io.github.jopenlibs.vault.json.Json.TRUE;
+import static io.github.jopenlibs.vault.json.Json.value;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotEquals;
diff --git a/src/test/java/com/bettercloud/vault/json/JsonNumber_Test.java b/src/test/java/io/github/jopenlibs/vault/json/JsonNumber_Test.java
similarity index 97%
rename from src/test/java/com/bettercloud/vault/json/JsonNumber_Test.java
rename to src/test/java/io/github/jopenlibs/vault/json/JsonNumber_Test.java
index 21923cf4..01a899e9 100644
--- a/src/test/java/com/bettercloud/vault/json/JsonNumber_Test.java
+++ b/src/test/java/io/github/jopenlibs/vault/json/JsonNumber_Test.java
@@ -19,11 +19,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ******************************************************************************/
-package com.bettercloud.vault.json;
+package io.github.jopenlibs.vault.json;
 
 import java.io.IOException;
 import java.io.StringWriter;
-import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -173,7 +172,7 @@ public void hashCode_differsForDifferentStrings() {
     public void canBeSerializedAndDeserialized() throws Exception {
         JsonNumber number = new JsonNumber("3.14");
 
-        Assert.assertEquals(number, TestUtil.serializeAndDeserialize(number));
+        assertEquals(number, TestUtil.serializeAndDeserialize(number));
     }
 
 }
diff --git a/src/test/java/com/bettercloud/vault/json/JsonObject_Test.java b/src/test/java/io/github/jopenlibs/vault/json/JsonObject_Test.java
similarity index 99%
rename from src/test/java/com/bettercloud/vault/json/JsonObject_Test.java
rename to src/test/java/io/github/jopenlibs/vault/json/JsonObject_Test.java
index a0018f16..2ab6ac0c 100644
--- a/src/test/java/com/bettercloud/vault/json/JsonObject_Test.java
+++ b/src/test/java/io/github/jopenlibs/vault/json/JsonObject_Test.java
@@ -19,10 +19,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ******************************************************************************/
-package com.bettercloud.vault.json;
+package io.github.jopenlibs.vault.json;
 
-import com.bettercloud.vault.json.JsonObject.HashIndexTable;
-import com.bettercloud.vault.json.JsonObject.Member;
+import io.github.jopenlibs.vault.json.JsonObject.HashIndexTable;
+import io.github.jopenlibs.vault.json.JsonObject.Member;
 import java.io.IOException;
 import java.util.ConcurrentModificationException;
 import java.util.Iterator;
diff --git a/src/test/java/com/bettercloud/vault/json/JsonParser_Test.java b/src/test/java/io/github/jopenlibs/vault/json/JsonParser_Test.java
similarity index 99%
rename from src/test/java/com/bettercloud/vault/json/JsonParser_Test.java
rename to src/test/java/io/github/jopenlibs/vault/json/JsonParser_Test.java
index a9514bdc..46960226 100644
--- a/src/test/java/com/bettercloud/vault/json/JsonParser_Test.java
+++ b/src/test/java/io/github/jopenlibs/vault/json/JsonParser_Test.java
@@ -19,14 +19,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ******************************************************************************/
-package com.bettercloud.vault.json;
+package io.github.jopenlibs.vault.json;
 
 import java.io.IOException;
 import java.io.StringReader;
 import org.hamcrest.core.StringStartsWith;
 import org.junit.Test;
 
-import static com.bettercloud.vault.json.TestUtil.assertException;
+import static io.github.jopenlibs.vault.json.TestUtil.assertException;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertThat;
diff --git a/src/test/java/com/bettercloud/vault/json/JsonString_Test.java b/src/test/java/io/github/jopenlibs/vault/json/JsonString_Test.java
similarity index 96%
rename from src/test/java/com/bettercloud/vault/json/JsonString_Test.java
rename to src/test/java/io/github/jopenlibs/vault/json/JsonString_Test.java
index a6b49f4f..df3c02ac 100644
--- a/src/test/java/com/bettercloud/vault/json/JsonString_Test.java
+++ b/src/test/java/io/github/jopenlibs/vault/json/JsonString_Test.java
@@ -19,11 +19,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ******************************************************************************/
-package com.bettercloud.vault.json;
+package io.github.jopenlibs.vault.json;
 
 import java.io.IOException;
 import java.io.StringWriter;
-import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -117,7 +116,7 @@ public void hashCode_differsForDifferentStrings() {
     public void canBeSerializedAndDeserialized() throws Exception {
         JsonString string = new JsonString("foo");
 
-        Assert.assertEquals(string, TestUtil.serializeAndDeserialize(string));
+        assertEquals(string, TestUtil.serializeAndDeserialize(string));
     }
 
 }
diff --git a/src/test/java/com/bettercloud/vault/json/JsonValue_Test.java b/src/test/java/io/github/jopenlibs/vault/json/JsonValue_Test.java
similarity index 99%
rename from src/test/java/com/bettercloud/vault/json/JsonValue_Test.java
rename to src/test/java/io/github/jopenlibs/vault/json/JsonValue_Test.java
index 9fb8eb8a..8b2e8b7a 100644
--- a/src/test/java/com/bettercloud/vault/json/JsonValue_Test.java
+++ b/src/test/java/io/github/jopenlibs/vault/json/JsonValue_Test.java
@@ -19,7 +19,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ******************************************************************************/
-package com.bettercloud.vault.json;
+package io.github.jopenlibs.vault.json;
 
 import java.io.IOException;
 import java.io.StringWriter;
diff --git a/src/test/java/com/bettercloud/vault/json/JsonWriter_Test.java b/src/test/java/io/github/jopenlibs/vault/json/JsonWriter_Test.java
similarity index 99%
rename from src/test/java/com/bettercloud/vault/json/JsonWriter_Test.java
rename to src/test/java/io/github/jopenlibs/vault/json/JsonWriter_Test.java
index 7c6bc43d..b7fbe3e2 100644
--- a/src/test/java/com/bettercloud/vault/json/JsonWriter_Test.java
+++ b/src/test/java/io/github/jopenlibs/vault/json/JsonWriter_Test.java
@@ -19,7 +19,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ******************************************************************************/
-package com.bettercloud.vault.json;
+package io.github.jopenlibs.vault.json;
 
 import java.io.IOException;
 import java.io.StringWriter;
diff --git a/src/test/java/com/bettercloud/vault/json/Json_Test.java b/src/test/java/io/github/jopenlibs/vault/json/Json_Test.java
similarity index 92%
rename from src/test/java/com/bettercloud/vault/json/Json_Test.java
rename to src/test/java/io/github/jopenlibs/vault/json/Json_Test.java
index 2390945f..0d28a030 100644
--- a/src/test/java/com/bettercloud/vault/json/Json_Test.java
+++ b/src/test/java/io/github/jopenlibs/vault/json/Json_Test.java
@@ -19,15 +19,15 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ******************************************************************************/
-package com.bettercloud.vault.json;
+package io.github.jopenlibs.vault.json;
 
-import com.bettercloud.vault.json.TestUtil.RunnableEx;
+import io.github.jopenlibs.vault.json.TestUtil.RunnableEx;
 import java.io.IOException;
 import java.io.Reader;
 import java.io.StringReader;
 import org.junit.Test;
 
-import static com.bettercloud.vault.json.TestUtil.assertException;
+import static io.github.jopenlibs.vault.json.TestUtil.assertException;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
@@ -77,13 +77,13 @@ public void value_float_cutsOffPointZero() {
     @Test
     public void value_float_failsWithInfinity() {
         String message = "Infinite and NaN values not permitted in JSON";
-        assertException(IllegalArgumentException.class, message, (Runnable) () -> Json.value(Float.POSITIVE_INFINITY));
+        TestUtil.assertException(IllegalArgumentException.class, message, (Runnable) () -> Json.value(Float.POSITIVE_INFINITY));
     }
 
     @Test
     public void value_float_failsWithNaN() {
         String message = "Infinite and NaN values not permitted in JSON";
-        assertException(IllegalArgumentException.class, message, (Runnable) () -> Json.value(Float.NaN));
+        TestUtil.assertException(IllegalArgumentException.class, message, (Runnable) () -> Json.value(Float.NaN));
     }
 
     @Test
@@ -104,13 +104,13 @@ public void value_double_cutsOffPointZero() {
     @Test
     public void value_double_failsWithInfinity() {
         String message = "Infinite and NaN values not permitted in JSON";
-        assertException(IllegalArgumentException.class, message, (Runnable) () -> Json.value(Double.POSITIVE_INFINITY));
+        TestUtil.assertException(IllegalArgumentException.class, message, (Runnable) () -> Json.value(Double.POSITIVE_INFINITY));
     }
 
     @Test
     public void value_double_failsWithNaN() {
         String message = "Infinite and NaN values not permitted in JSON";
-        assertException(IllegalArgumentException.class, message, (Runnable) () -> Json.value(Double.NaN));
+        TestUtil.assertException(IllegalArgumentException.class, message, (Runnable) () -> Json.value(Double.NaN));
     }
 
     @Test
diff --git a/src/test/java/com/bettercloud/vault/json/ParseException_Test.java b/src/test/java/io/github/jopenlibs/vault/json/ParseException_Test.java
similarity index 97%
rename from src/test/java/com/bettercloud/vault/json/ParseException_Test.java
rename to src/test/java/io/github/jopenlibs/vault/json/ParseException_Test.java
index e4730a4b..4afd1f7f 100644
--- a/src/test/java/com/bettercloud/vault/json/ParseException_Test.java
+++ b/src/test/java/io/github/jopenlibs/vault/json/ParseException_Test.java
@@ -19,7 +19,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ******************************************************************************/
-package com.bettercloud.vault.json;
+package io.github.jopenlibs.vault.json;
 
 import org.junit.Test;
 
diff --git a/src/test/java/com/bettercloud/vault/json/PrettyPrint_Test.java b/src/test/java/io/github/jopenlibs/vault/json/PrettyPrint_Test.java
similarity index 95%
rename from src/test/java/com/bettercloud/vault/json/PrettyPrint_Test.java
rename to src/test/java/io/github/jopenlibs/vault/json/PrettyPrint_Test.java
index 310793d2..0d132ba2 100644
--- a/src/test/java/com/bettercloud/vault/json/PrettyPrint_Test.java
+++ b/src/test/java/io/github/jopenlibs/vault/json/PrettyPrint_Test.java
@@ -19,7 +19,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ******************************************************************************/
-package com.bettercloud.vault.json;
+package io.github.jopenlibs.vault.json;
 
 import java.io.IOException;
 import java.io.StringWriter;
@@ -27,9 +27,9 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import static com.bettercloud.vault.json.PrettyPrint.indentWithSpaces;
-import static com.bettercloud.vault.json.PrettyPrint.indentWithTabs;
-import static com.bettercloud.vault.json.PrettyPrint.singleLine;
+import static io.github.jopenlibs.vault.json.PrettyPrint.indentWithSpaces;
+import static io.github.jopenlibs.vault.json.PrettyPrint.indentWithTabs;
+import static io.github.jopenlibs.vault.json.PrettyPrint.singleLine;
 import static java.util.Locale.US;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotSame;
diff --git a/src/test/java/com/bettercloud/vault/json/TestUtil.java b/src/test/java/io/github/jopenlibs/vault/json/TestUtil.java
similarity index 99%
rename from src/test/java/com/bettercloud/vault/json/TestUtil.java
rename to src/test/java/io/github/jopenlibs/vault/json/TestUtil.java
index a13e9b5c..ece44922 100644
--- a/src/test/java/com/bettercloud/vault/json/TestUtil.java
+++ b/src/test/java/io/github/jopenlibs/vault/json/TestUtil.java
@@ -19,7 +19,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ******************************************************************************/
-package com.bettercloud.vault.json;
+package io.github.jopenlibs.vault.json;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
diff --git a/src/test/java/com/bettercloud/vault/json/WritingBuffer_Test.java b/src/test/java/io/github/jopenlibs/vault/json/WritingBuffer_Test.java
similarity index 99%
rename from src/test/java/com/bettercloud/vault/json/WritingBuffer_Test.java
rename to src/test/java/io/github/jopenlibs/vault/json/WritingBuffer_Test.java
index f9fd5403..764348ba 100644
--- a/src/test/java/com/bettercloud/vault/json/WritingBuffer_Test.java
+++ b/src/test/java/io/github/jopenlibs/vault/json/WritingBuffer_Test.java
@@ -19,7 +19,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ******************************************************************************/
-package com.bettercloud.vault.json;
+package io.github.jopenlibs.vault.json;
 
 import java.io.IOException;
 import java.io.StringWriter;
diff --git a/src/test/java/com/bettercloud/vault/json/test/mocking/Mocking_Test.java b/src/test/java/io/github/jopenlibs/vault/json/test/mocking/Mocking_Test.java
similarity index 88%
rename from src/test/java/com/bettercloud/vault/json/test/mocking/Mocking_Test.java
rename to src/test/java/io/github/jopenlibs/vault/json/test/mocking/Mocking_Test.java
index 9a6862c6..739acf4f 100644
--- a/src/test/java/com/bettercloud/vault/json/test/mocking/Mocking_Test.java
+++ b/src/test/java/io/github/jopenlibs/vault/json/test/mocking/Mocking_Test.java
@@ -19,12 +19,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ******************************************************************************/
-package com.bettercloud.vault.json.test.mocking;
+package io.github.jopenlibs.vault.json.test.mocking;
 
-import com.bettercloud.vault.json.JsonArray;
-import com.bettercloud.vault.json.JsonObject;
-import com.bettercloud.vault.json.JsonValue;
-import com.bettercloud.vault.json.ParseException;
+import io.github.jopenlibs.vault.json.JsonArray;
+import io.github.jopenlibs.vault.json.JsonObject;
+import io.github.jopenlibs.vault.json.JsonValue;
+import io.github.jopenlibs.vault.json.ParseException;
 import org.junit.Test;
 import org.mockito.Mockito;
 
diff --git a/src/test/java/com/bettercloud/vault/rest/DeleteTests.java b/src/test/java/io/github/jopenlibs/vault/rest/DeleteTests.java
similarity index 94%
rename from src/test/java/com/bettercloud/vault/rest/DeleteTests.java
rename to src/test/java/io/github/jopenlibs/vault/rest/DeleteTests.java
index 0c44ec1f..c5950e4e 100644
--- a/src/test/java/com/bettercloud/vault/rest/DeleteTests.java
+++ b/src/test/java/io/github/jopenlibs/vault/rest/DeleteTests.java
@@ -1,9 +1,9 @@
-package com.bettercloud.vault.rest;
+package io.github.jopenlibs.vault.rest;
 
-import com.bettercloud.vault.json.Json;
-import com.bettercloud.vault.json.JsonObject;
-import com.bettercloud.vault.vault.VaultTestUtils;
-import com.bettercloud.vault.vault.mock.EchoInputMockVault;
+import io.github.jopenlibs.vault.json.Json;
+import io.github.jopenlibs.vault.json.JsonObject;
+import io.github.jopenlibs.vault.vault.VaultTestUtils;
+import io.github.jopenlibs.vault.vault.mock.EchoInputMockVault;
 import java.io.UnsupportedEncodingException;
 import org.eclipse.jetty.server.Server;
 import org.junit.Test;
diff --git a/src/test/java/com/bettercloud/vault/rest/GetTests.java b/src/test/java/io/github/jopenlibs/vault/rest/GetTests.java
similarity index 98%
rename from src/test/java/com/bettercloud/vault/rest/GetTests.java
rename to src/test/java/io/github/jopenlibs/vault/rest/GetTests.java
index e54edb99..a6fb0a2e 100644
--- a/src/test/java/com/bettercloud/vault/rest/GetTests.java
+++ b/src/test/java/io/github/jopenlibs/vault/rest/GetTests.java
@@ -1,7 +1,7 @@
-package com.bettercloud.vault.rest;
+package io.github.jopenlibs.vault.rest;
 
-import com.bettercloud.vault.json.Json;
-import com.bettercloud.vault.json.JsonObject;
+import io.github.jopenlibs.vault.json.Json;
+import io.github.jopenlibs.vault.json.JsonObject;
 import java.nio.charset.StandardCharsets;
 import org.junit.Test;
 
diff --git a/src/test/java/com/bettercloud/vault/rest/PostTests.java b/src/test/java/io/github/jopenlibs/vault/rest/PostTests.java
similarity index 98%
rename from src/test/java/com/bettercloud/vault/rest/PostTests.java
rename to src/test/java/io/github/jopenlibs/vault/rest/PostTests.java
index e50b0a56..b6bc0277 100644
--- a/src/test/java/com/bettercloud/vault/rest/PostTests.java
+++ b/src/test/java/io/github/jopenlibs/vault/rest/PostTests.java
@@ -1,7 +1,7 @@
-package com.bettercloud.vault.rest;
+package io.github.jopenlibs.vault.rest;
 
-import com.bettercloud.vault.json.Json;
-import com.bettercloud.vault.json.JsonObject;
+import io.github.jopenlibs.vault.json.Json;
+import io.github.jopenlibs.vault.json.JsonObject;
 import java.nio.charset.StandardCharsets;
 import org.junit.Test;
 
diff --git a/src/test/java/com/bettercloud/vault/rest/PutTests.java b/src/test/java/io/github/jopenlibs/vault/rest/PutTests.java
similarity index 98%
rename from src/test/java/com/bettercloud/vault/rest/PutTests.java
rename to src/test/java/io/github/jopenlibs/vault/rest/PutTests.java
index 169a9af3..4688e950 100644
--- a/src/test/java/com/bettercloud/vault/rest/PutTests.java
+++ b/src/test/java/io/github/jopenlibs/vault/rest/PutTests.java
@@ -1,7 +1,7 @@
-package com.bettercloud.vault.rest;
+package io.github.jopenlibs.vault.rest;
 
-import com.bettercloud.vault.json.Json;
-import com.bettercloud.vault.json.JsonObject;
+import io.github.jopenlibs.vault.json.Json;
+import io.github.jopenlibs.vault.json.JsonObject;
 import java.nio.charset.StandardCharsets;
 import org.junit.Test;
 
diff --git a/src/test/java/com/bettercloud/vault/vault/VaultTestUtils.java b/src/test/java/io/github/jopenlibs/vault/vault/VaultTestUtils.java
similarity index 90%
rename from src/test/java/com/bettercloud/vault/vault/VaultTestUtils.java
rename to src/test/java/io/github/jopenlibs/vault/vault/VaultTestUtils.java
index 066b721b..6d7f656f 100644
--- a/src/test/java/com/bettercloud/vault/vault/VaultTestUtils.java
+++ b/src/test/java/io/github/jopenlibs/vault/vault/VaultTestUtils.java
@@ -1,8 +1,8 @@
-package com.bettercloud.vault.vault;
+package io.github.jopenlibs.vault.vault;
 
-import com.bettercloud.vault.json.Json;
-import com.bettercloud.vault.json.JsonObject;
-import com.bettercloud.vault.vault.mock.MockVault;
+import io.github.jopenlibs.vault.json.Json;
+import io.github.jopenlibs.vault.json.JsonObject;
+import io.github.jopenlibs.vault.vault.mock.MockVault;
 import java.io.IOException;
 import java.util.Collections;
 import java.util.Map;
@@ -23,7 +23,7 @@
 
 /**
  * <p>Utilities used by all of the Vault-related unit test classes under
- * <code>src/test/java/com/bettercloud/vault</code>, to setup and shutdown mock Vault server implementations.</p>
+ * <code>src/test/java/io/github/jopenlibs/vault</code>, to setup and shutdown mock Vault server implementations.</p>
  */
 public class VaultTestUtils {
 
@@ -82,4 +82,3 @@ public static Map<String, String> readRequestHeaders(HttpServletRequest request)
     }
 
 }
-
diff --git a/src/test/java/com/bettercloud/vault/vault/api/AuthBackendAwsTests.java b/src/test/java/io/github/jopenlibs/vault/vault/api/AuthBackendAwsTests.java
similarity index 87%
rename from src/test/java/com/bettercloud/vault/vault/api/AuthBackendAwsTests.java
rename to src/test/java/io/github/jopenlibs/vault/vault/api/AuthBackendAwsTests.java
index 431f055b..5e576730 100644
--- a/src/test/java/com/bettercloud/vault/vault/api/AuthBackendAwsTests.java
+++ b/src/test/java/io/github/jopenlibs/vault/vault/api/AuthBackendAwsTests.java
@@ -1,18 +1,17 @@
-package com.bettercloud.vault.vault.api;
-
-import com.bettercloud.vault.Vault;
-import com.bettercloud.vault.VaultConfig;
-import com.bettercloud.vault.VaultException;
-import com.bettercloud.vault.json.JsonObject;
-import com.bettercloud.vault.response.AuthResponse;
-import com.bettercloud.vault.vault.VaultTestUtils;
-import com.bettercloud.vault.vault.mock.AuthRequestValidatingMockVault;
+package io.github.jopenlibs.vault.vault.api;
+
+import io.github.jopenlibs.vault.Vault;
+import io.github.jopenlibs.vault.VaultConfig;
+import io.github.jopenlibs.vault.VaultException;
+import io.github.jopenlibs.vault.json.JsonObject;
+import io.github.jopenlibs.vault.response.AuthResponse;
+import io.github.jopenlibs.vault.vault.VaultTestUtils;
+import io.github.jopenlibs.vault.vault.mock.AuthRequestValidatingMockVault;
 import java.util.function.Predicate;
 import javax.servlet.http.HttpServletRequest;
 import org.eclipse.jetty.server.Server;
 import org.junit.Test;
 
-import static com.bettercloud.vault.vault.VaultTestUtils.readRequestBody;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
@@ -22,7 +21,7 @@ public class AuthBackendAwsTests {
     public void testLoginByAwsEc2Id() throws Exception {
         final Predicate<HttpServletRequest> isValidEc2IdRequest = (request) -> {
             try {
-                JsonObject requestBody = readRequestBody(request).orElse(null);
+                JsonObject requestBody = VaultTestUtils.readRequestBody(request).orElse(null);
                 return requestBody != null && request.getRequestURI().endsWith("/auth/aws/login") &&
                         requestBody.getString("identity", "").equals("identity") &&
                         requestBody.getString("signature", "").equals("signature");
@@ -63,7 +62,7 @@ public void testLoginByAwsEc2Id() throws Exception {
     public void testLoginByAwsEc2Pkcs7() throws Exception {
         final Predicate<HttpServletRequest> isValidEc2pkcs7Request = (request) -> {
             try {
-                JsonObject requestBody = readRequestBody(request).orElse(null);
+                JsonObject requestBody = VaultTestUtils.readRequestBody(request).orElse(null);
                 return requestBody != null && request.getRequestURI().endsWith("/auth/aws/login") &&
                         requestBody.getString("pkcs7", "").equals("pkcs7");
             } catch (Exception e) {
@@ -103,7 +102,7 @@ public void testLoginByAwsEc2Pkcs7() throws Exception {
     @Test
     public void testLoginByAwsIam() throws Exception {
         final Predicate<HttpServletRequest> isValidEc2IamRequest = (request) -> {
-            JsonObject requestBody = readRequestBody(request).orElse(null);
+            JsonObject requestBody = VaultTestUtils.readRequestBody(request).orElse(null);
             return requestBody != null && request.getRequestURI().endsWith("/auth/aws/login") &&
                     requestBody.getString("iam_http_request_method", "").equals("POST") &&
                     requestBody.getString("iam_request_url", "").equals("url") &&
diff --git a/src/test/java/com/bettercloud/vault/vault/api/AuthLookupTest.java b/src/test/java/io/github/jopenlibs/vault/vault/api/AuthLookupTest.java
similarity index 86%
rename from src/test/java/com/bettercloud/vault/vault/api/AuthLookupTest.java
rename to src/test/java/io/github/jopenlibs/vault/vault/api/AuthLookupTest.java
index 3a9385ce..dbe85cc6 100644
--- a/src/test/java/com/bettercloud/vault/vault/api/AuthLookupTest.java
+++ b/src/test/java/io/github/jopenlibs/vault/vault/api/AuthLookupTest.java
@@ -1,12 +1,12 @@
-package com.bettercloud.vault.vault.api;
-
-import com.bettercloud.vault.Vault;
-import com.bettercloud.vault.VaultConfig;
-import com.bettercloud.vault.json.JsonArray;
-import com.bettercloud.vault.json.JsonObject;
-import com.bettercloud.vault.response.LookupResponse;
-import com.bettercloud.vault.vault.VaultTestUtils;
-import com.bettercloud.vault.vault.mock.MockVault;
+package io.github.jopenlibs.vault.vault.api;
+
+import io.github.jopenlibs.vault.Vault;
+import io.github.jopenlibs.vault.VaultConfig;
+import io.github.jopenlibs.vault.json.JsonArray;
+import io.github.jopenlibs.vault.json.JsonObject;
+import io.github.jopenlibs.vault.response.LookupResponse;
+import io.github.jopenlibs.vault.vault.VaultTestUtils;
+import io.github.jopenlibs.vault.vault.mock.MockVault;
 import java.util.Optional;
 import org.eclipse.jetty.server.Server;
 import org.junit.After;
diff --git a/src/test/java/com/bettercloud/vault/vault/api/AuthLookupWrapTest.java b/src/test/java/io/github/jopenlibs/vault/vault/api/AuthLookupWrapTest.java
similarity index 82%
rename from src/test/java/com/bettercloud/vault/vault/api/AuthLookupWrapTest.java
rename to src/test/java/io/github/jopenlibs/vault/vault/api/AuthLookupWrapTest.java
index 868c30f5..25bb7c7d 100644
--- a/src/test/java/com/bettercloud/vault/vault/api/AuthLookupWrapTest.java
+++ b/src/test/java/io/github/jopenlibs/vault/vault/api/AuthLookupWrapTest.java
@@ -1,11 +1,11 @@
-package com.bettercloud.vault.vault.api;
-
-import com.bettercloud.vault.Vault;
-import com.bettercloud.vault.VaultConfig;
-import com.bettercloud.vault.json.JsonObject;
-import com.bettercloud.vault.response.LogicalResponse;
-import com.bettercloud.vault.vault.VaultTestUtils;
-import com.bettercloud.vault.vault.mock.MockVault;
+package io.github.jopenlibs.vault.vault.api;
+
+import io.github.jopenlibs.vault.Vault;
+import io.github.jopenlibs.vault.VaultConfig;
+import io.github.jopenlibs.vault.json.JsonObject;
+import io.github.jopenlibs.vault.response.LogicalResponse;
+import io.github.jopenlibs.vault.vault.VaultTestUtils;
+import io.github.jopenlibs.vault.vault.mock.MockVault;
 import java.util.Optional;
 import org.eclipse.jetty.server.Server;
 import org.junit.After;
diff --git a/src/test/java/com/bettercloud/vault/vault/api/AuthUnwrapTest.java b/src/test/java/io/github/jopenlibs/vault/vault/api/AuthUnwrapTest.java
similarity index 86%
rename from src/test/java/com/bettercloud/vault/vault/api/AuthUnwrapTest.java
rename to src/test/java/io/github/jopenlibs/vault/vault/api/AuthUnwrapTest.java
index 11b2f739..71b2e802 100644
--- a/src/test/java/com/bettercloud/vault/vault/api/AuthUnwrapTest.java
+++ b/src/test/java/io/github/jopenlibs/vault/vault/api/AuthUnwrapTest.java
@@ -1,12 +1,12 @@
-package com.bettercloud.vault.vault.api;
-
-import com.bettercloud.vault.Vault;
-import com.bettercloud.vault.VaultConfig;
-import com.bettercloud.vault.json.JsonArray;
-import com.bettercloud.vault.json.JsonObject;
-import com.bettercloud.vault.response.AuthResponse;
-import com.bettercloud.vault.vault.VaultTestUtils;
-import com.bettercloud.vault.vault.mock.MockVault;
+package io.github.jopenlibs.vault.vault.api;
+
+import io.github.jopenlibs.vault.Vault;
+import io.github.jopenlibs.vault.VaultConfig;
+import io.github.jopenlibs.vault.json.JsonArray;
+import io.github.jopenlibs.vault.json.JsonObject;
+import io.github.jopenlibs.vault.response.AuthResponse;
+import io.github.jopenlibs.vault.vault.VaultTestUtils;
+import io.github.jopenlibs.vault.vault.mock.MockVault;
 import org.eclipse.jetty.server.Server;
 import org.junit.After;
 import org.junit.Before;
diff --git a/src/test/java/com/bettercloud/vault/vault/api/TransitApiTest.java b/src/test/java/io/github/jopenlibs/vault/vault/api/TransitApiTest.java
similarity index 93%
rename from src/test/java/com/bettercloud/vault/vault/api/TransitApiTest.java
rename to src/test/java/io/github/jopenlibs/vault/vault/api/TransitApiTest.java
index 5f215dfb..629ce00d 100644
--- a/src/test/java/com/bettercloud/vault/vault/api/TransitApiTest.java
+++ b/src/test/java/io/github/jopenlibs/vault/vault/api/TransitApiTest.java
@@ -1,15 +1,14 @@
-package com.bettercloud.vault.vault.api;
-
-import com.bettercloud.vault.Vault;
-import com.bettercloud.vault.VaultConfig;
-import com.bettercloud.vault.json.JsonArray;
-import com.bettercloud.vault.json.JsonObject;
-import com.bettercloud.vault.response.LogicalResponse;
-import com.bettercloud.vault.vault.VaultTestUtils;
-import com.bettercloud.vault.vault.mock.MockVault;
+package io.github.jopenlibs.vault.vault.api;
+
+import io.github.jopenlibs.vault.Vault;
+import io.github.jopenlibs.vault.VaultConfig;
+import io.github.jopenlibs.vault.json.JsonArray;
+import io.github.jopenlibs.vault.json.JsonObject;
+import io.github.jopenlibs.vault.response.LogicalResponse;
+import io.github.jopenlibs.vault.vault.VaultTestUtils;
+import io.github.jopenlibs.vault.vault.mock.MockVault;
 import org.eclipse.jetty.server.Server;
 import org.junit.After;
-import org.junit.Before;
 import org.junit.Test;
 
 import java.util.Collections;
diff --git a/src/test/java/com/bettercloud/vault/vault/mock/AuthRequestValidatingMockVault.java b/src/test/java/io/github/jopenlibs/vault/vault/mock/AuthRequestValidatingMockVault.java
similarity index 97%
rename from src/test/java/com/bettercloud/vault/vault/mock/AuthRequestValidatingMockVault.java
rename to src/test/java/io/github/jopenlibs/vault/vault/mock/AuthRequestValidatingMockVault.java
index e1599a8f..32acbf9a 100644
--- a/src/test/java/com/bettercloud/vault/vault/mock/AuthRequestValidatingMockVault.java
+++ b/src/test/java/io/github/jopenlibs/vault/vault/mock/AuthRequestValidatingMockVault.java
@@ -1,4 +1,4 @@
-package com.bettercloud.vault.vault.mock;
+package io.github.jopenlibs.vault.vault.mock;
 
 import java.io.IOException;
 import java.util.function.Predicate;
diff --git a/src/test/java/com/bettercloud/vault/vault/mock/EchoInputMockVault.java b/src/test/java/io/github/jopenlibs/vault/vault/mock/EchoInputMockVault.java
similarity index 95%
rename from src/test/java/com/bettercloud/vault/vault/mock/EchoInputMockVault.java
rename to src/test/java/io/github/jopenlibs/vault/vault/mock/EchoInputMockVault.java
index c8aef6af..2e3ce031 100644
--- a/src/test/java/com/bettercloud/vault/vault/mock/EchoInputMockVault.java
+++ b/src/test/java/io/github/jopenlibs/vault/vault/mock/EchoInputMockVault.java
@@ -1,7 +1,7 @@
-package com.bettercloud.vault.vault.mock;
+package io.github.jopenlibs.vault.vault.mock;
 
-import com.bettercloud.vault.json.Json;
-import com.bettercloud.vault.json.JsonObject;
+import io.github.jopenlibs.vault.json.Json;
+import io.github.jopenlibs.vault.json.JsonObject;
 import java.io.IOException;
 import java.util.Enumeration;
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/test/java/com/bettercloud/vault/vault/mock/MockVault.java b/src/test/java/io/github/jopenlibs/vault/vault/mock/MockVault.java
similarity index 91%
rename from src/test/java/com/bettercloud/vault/vault/mock/MockVault.java
rename to src/test/java/io/github/jopenlibs/vault/vault/mock/MockVault.java
index ea395137..1678b66b 100644
--- a/src/test/java/com/bettercloud/vault/vault/mock/MockVault.java
+++ b/src/test/java/io/github/jopenlibs/vault/vault/mock/MockVault.java
@@ -1,6 +1,6 @@
-package com.bettercloud.vault.vault.mock;
+package io.github.jopenlibs.vault.vault.mock;
 
-import com.bettercloud.vault.json.JsonObject;
+import io.github.jopenlibs.vault.json.JsonObject;
 import java.io.IOException;
 import java.util.Map;
 import java.util.Optional;
@@ -10,8 +10,8 @@
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.server.handler.AbstractHandler;
 
-import static com.bettercloud.vault.vault.VaultTestUtils.readRequestBody;
-import static com.bettercloud.vault.vault.VaultTestUtils.readRequestHeaders;
+import static io.github.jopenlibs.vault.vault.VaultTestUtils.readRequestBody;
+import static io.github.jopenlibs.vault.vault.VaultTestUtils.readRequestHeaders;
 
 /**
  * <p>This class is used to mock out a Vault server in unit tests involving retry logic. As it extends Jetty's
diff --git a/src/test/java/com/bettercloud/vault/vault/mock/OpenTimeoutsMockVault.java b/src/test/java/io/github/jopenlibs/vault/vault/mock/OpenTimeoutsMockVault.java
similarity index 98%
rename from src/test/java/com/bettercloud/vault/vault/mock/OpenTimeoutsMockVault.java
rename to src/test/java/io/github/jopenlibs/vault/vault/mock/OpenTimeoutsMockVault.java
index 8b9e0f19..36b2153b 100644
--- a/src/test/java/com/bettercloud/vault/vault/mock/OpenTimeoutsMockVault.java
+++ b/src/test/java/io/github/jopenlibs/vault/vault/mock/OpenTimeoutsMockVault.java
@@ -1,4 +1,4 @@
-package com.bettercloud.vault.vault.mock;
+package io.github.jopenlibs.vault.vault.mock;
 
 import java.io.IOException;
 import javax.servlet.ServletException;
diff --git a/src/test/java/com/bettercloud/vault/vault/mock/ReadTimeoutsMockVault.java b/src/test/java/io/github/jopenlibs/vault/vault/mock/ReadTimeoutsMockVault.java
similarity index 98%
rename from src/test/java/com/bettercloud/vault/vault/mock/ReadTimeoutsMockVault.java
rename to src/test/java/io/github/jopenlibs/vault/vault/mock/ReadTimeoutsMockVault.java
index 2da9f3d0..8002f259 100644
--- a/src/test/java/com/bettercloud/vault/vault/mock/ReadTimeoutsMockVault.java
+++ b/src/test/java/io/github/jopenlibs/vault/vault/mock/ReadTimeoutsMockVault.java
@@ -1,4 +1,4 @@
-package com.bettercloud.vault.vault.mock;
+package io.github.jopenlibs.vault.vault.mock;
 
 import java.io.IOException;
 import javax.servlet.ServletException;
diff --git a/src/test/java/com/bettercloud/vault/vault/mock/RetriesMockVault.java b/src/test/java/io/github/jopenlibs/vault/vault/mock/RetriesMockVault.java
similarity index 98%
rename from src/test/java/com/bettercloud/vault/vault/mock/RetriesMockVault.java
rename to src/test/java/io/github/jopenlibs/vault/vault/mock/RetriesMockVault.java
index 356116ec..3401f259 100644
--- a/src/test/java/com/bettercloud/vault/vault/mock/RetriesMockVault.java
+++ b/src/test/java/io/github/jopenlibs/vault/vault/mock/RetriesMockVault.java
@@ -1,4 +1,4 @@
-package com.bettercloud.vault.vault.mock;
+package io.github.jopenlibs.vault.vault.mock;
 
 import java.io.IOException;
 import javax.servlet.http.HttpServletRequest;

From 4624d70d4a14b9127e6a78ffa1df304cb76696d6 Mon Sep 17 00:00:00 2001
From: tledkov <tledkov@gridgain.com>
Date: Fri, 7 Oct 2022 00:10:33 +0300
Subject: [PATCH 2/3] JVD-1 fix style

---
 .../io/github/jopenlibs/vault/api/AuthBackendCertTests.java   | 2 +-
 .../io/github/jopenlibs/vault/api/AuthBackendPkiTests.java    | 4 +---
 .../java/io/github/jopenlibs/vault/api/DebugTests.java        | 1 -
 .../io/github/jopenlibs/vault/util/VaultAgentContainer.java   | 2 +-
 .../java/io/github/jopenlibs/vault/util/VaultContainer.java   | 2 +-
 5 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/test-integration/java/io/github/jopenlibs/vault/api/AuthBackendCertTests.java b/src/test-integration/java/io/github/jopenlibs/vault/api/AuthBackendCertTests.java
index ff2073f7..5a037f38 100644
--- a/src/test-integration/java/io/github/jopenlibs/vault/api/AuthBackendCertTests.java
+++ b/src/test-integration/java/io/github/jopenlibs/vault/api/AuthBackendCertTests.java
@@ -5,8 +5,8 @@
 import io.github.jopenlibs.vault.VaultConfig;
 import io.github.jopenlibs.vault.VaultException;
 import io.github.jopenlibs.vault.util.SSLUtils;
-import io.github.jopenlibs.vault.util.VaultContainer;
 import io.github.jopenlibs.vault.util.TestConstants;
+import io.github.jopenlibs.vault.util.VaultContainer;
 import java.io.File;
 import java.io.IOException;
 import java.security.KeyStore;
diff --git a/src/test-integration/java/io/github/jopenlibs/vault/api/AuthBackendPkiTests.java b/src/test-integration/java/io/github/jopenlibs/vault/api/AuthBackendPkiTests.java
index 56d345f8..ac5492de 100644
--- a/src/test-integration/java/io/github/jopenlibs/vault/api/AuthBackendPkiTests.java
+++ b/src/test-integration/java/io/github/jopenlibs/vault/api/AuthBackendPkiTests.java
@@ -6,8 +6,8 @@
 import io.github.jopenlibs.vault.api.pki.RoleOptions;
 import io.github.jopenlibs.vault.response.PkiResponse;
 import io.github.jopenlibs.vault.rest.RestResponse;
-import io.github.jopenlibs.vault.util.VaultContainer;
 import io.github.jopenlibs.vault.util.SSLUtils;
+import io.github.jopenlibs.vault.util.VaultContainer;
 import java.io.IOException;
 import java.security.KeyPair;
 import java.security.KeyPairGenerator;
@@ -22,8 +22,6 @@
 import org.junit.Test;
 
 import static junit.framework.TestCase.assertEquals;
-import static junit.framework.TestCase.assertNotNull;
-import static junit.framework.TestCase.assertNull;
 import static junit.framework.TestCase.assertTrue;
 
 /**
diff --git a/src/test-integration/java/io/github/jopenlibs/vault/api/DebugTests.java b/src/test-integration/java/io/github/jopenlibs/vault/api/DebugTests.java
index ad9b062d..32e3edca 100644
--- a/src/test-integration/java/io/github/jopenlibs/vault/api/DebugTests.java
+++ b/src/test-integration/java/io/github/jopenlibs/vault/api/DebugTests.java
@@ -11,7 +11,6 @@
 import org.junit.ClassRule;
 import org.junit.Test;
 
-import static junit.framework.TestCase.assertEquals;
 import static junit.framework.TestCase.assertFalse;
 import static junit.framework.TestCase.assertNotNull;
 import static junit.framework.TestCase.assertNull;
diff --git a/src/test-integration/java/io/github/jopenlibs/vault/util/VaultAgentContainer.java b/src/test-integration/java/io/github/jopenlibs/vault/util/VaultAgentContainer.java
index 1a12cd0b..faf40f5e 100644
--- a/src/test-integration/java/io/github/jopenlibs/vault/util/VaultAgentContainer.java
+++ b/src/test-integration/java/io/github/jopenlibs/vault/util/VaultAgentContainer.java
@@ -1,9 +1,9 @@
 package io.github.jopenlibs.vault.util;
 
+import com.github.dockerjava.api.model.Capability;
 import io.github.jopenlibs.vault.Vault;
 import io.github.jopenlibs.vault.VaultConfig;
 import io.github.jopenlibs.vault.VaultException;
-import com.github.dockerjava.api.model.Capability;
 import java.nio.file.Path;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/src/test-integration/java/io/github/jopenlibs/vault/util/VaultContainer.java b/src/test-integration/java/io/github/jopenlibs/vault/util/VaultContainer.java
index 12d5d242..5469ae68 100644
--- a/src/test-integration/java/io/github/jopenlibs/vault/util/VaultContainer.java
+++ b/src/test-integration/java/io/github/jopenlibs/vault/util/VaultContainer.java
@@ -1,12 +1,12 @@
 package io.github.jopenlibs.vault.util;
 
+import com.github.dockerjava.api.model.Capability;
 import io.github.jopenlibs.vault.SslConfig;
 import io.github.jopenlibs.vault.Vault;
 import io.github.jopenlibs.vault.VaultConfig;
 import io.github.jopenlibs.vault.VaultException;
 import io.github.jopenlibs.vault.json.Json;
 import io.github.jopenlibs.vault.json.JsonObject;
-import com.github.dockerjava.api.model.Capability;
 import java.io.File;
 import java.io.IOException;
 import java.net.HttpURLConnection;

From 1140e8a78d2e4dfbe984579cc48a45cb637516e6 Mon Sep 17 00:00:00 2001
From: tledkov <tledkov@gridgain.com>
Date: Fri, 7 Oct 2022 00:15:56 +0300
Subject: [PATCH 3/3] JVD-1 fix style #2

---
 src/test/java/io/github/jopenlibs/vault/json/Json_Test.java  | 1 -
 .../io/github/jopenlibs/vault/vault/api/TransitApiTest.java  | 5 ++---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/test/java/io/github/jopenlibs/vault/json/Json_Test.java b/src/test/java/io/github/jopenlibs/vault/json/Json_Test.java
index 0d28a030..40f8d62f 100644
--- a/src/test/java/io/github/jopenlibs/vault/json/Json_Test.java
+++ b/src/test/java/io/github/jopenlibs/vault/json/Json_Test.java
@@ -27,7 +27,6 @@
 import java.io.StringReader;
 import org.junit.Test;
 
-import static io.github.jopenlibs.vault.json.TestUtil.assertException;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
diff --git a/src/test/java/io/github/jopenlibs/vault/vault/api/TransitApiTest.java b/src/test/java/io/github/jopenlibs/vault/vault/api/TransitApiTest.java
index 629ce00d..13278f73 100644
--- a/src/test/java/io/github/jopenlibs/vault/vault/api/TransitApiTest.java
+++ b/src/test/java/io/github/jopenlibs/vault/vault/api/TransitApiTest.java
@@ -7,13 +7,12 @@
 import io.github.jopenlibs.vault.response.LogicalResponse;
 import io.github.jopenlibs.vault.vault.VaultTestUtils;
 import io.github.jopenlibs.vault.vault.mock.MockVault;
+import java.util.Collections;
+import java.util.Optional;
 import org.eclipse.jetty.server.Server;
 import org.junit.After;
 import org.junit.Test;
 
-import java.util.Collections;
-import java.util.Optional;
-
 import static org.junit.Assert.assertEquals;
 
 public class TransitApiTest {