diff --git a/base-android-library/build.gradle b/base-android-library/build.gradle
index da87585..b24394f 100644
--- a/base-android-library/build.gradle
+++ b/base-android-library/build.gradle
@@ -121,8 +121,8 @@ publishing {
 }
 
 bintray {
-    user = System.getenv('BINTRAY_USER')
-    key = System.getenv('BINTRAY_KEY')
+    user = System.getenv('MAVEN_USER')
+    key = System.getenv('MAVEN_KEY')
     dryRun = false
     override = false
     publish = true
diff --git a/base-android-library/src/main/kotlin/network/xyo/helpers/Helpers.kt b/base-android-library/src/main/kotlin/network/xyo/base/Helpers.kt
similarity index 100%
rename from base-android-library/src/main/kotlin/network/xyo/helpers/Helpers.kt
rename to base-android-library/src/main/kotlin/network/xyo/base/Helpers.kt
diff --git a/base-android-library/src/main/kotlin/network/xyo/base/XYBase.kt b/base-android-library/src/main/kotlin/network/xyo/base/XYBase.kt
index dc2606f..a1031d1 100644
--- a/base-android-library/src/main/kotlin/network/xyo/base/XYBase.kt
+++ b/base-android-library/src/main/kotlin/network/xyo/base/XYBase.kt
@@ -3,10 +3,7 @@ package network.xyo.base
 import android.app.Activity
 import android.content.Context
 import android.content.ContextWrapper
-import android.os.Debug
-import com.jaredrummler.android.device.DeviceName
 import network.xyo.helpers.classNameFromObject
-import network.xyo.logging.XYLogging
 
 open class XYBase {
 
diff --git a/base-android-library/src/main/kotlin/network/xyo/logging/XYLogging.kt b/base-android-library/src/main/kotlin/network/xyo/base/XYLogging.kt
similarity index 98%
rename from base-android-library/src/main/kotlin/network/xyo/logging/XYLogging.kt
rename to base-android-library/src/main/kotlin/network/xyo/base/XYLogging.kt
index b7116df..abc21b0 100644
--- a/base-android-library/src/main/kotlin/network/xyo/logging/XYLogging.kt
+++ b/base-android-library/src/main/kotlin/network/xyo/base/XYLogging.kt
@@ -1,4 +1,4 @@
-package network.xyo.logging
+package network.xyo.base
 
 import android.util.Log
 import network.xyo.helpers.classNameFromObject
diff --git a/base-android-library/src/main/kotlin/network/xyo/random/XYRandom.kt b/base-android-library/src/main/kotlin/network/xyo/base/XYRandom.kt
similarity index 91%
rename from base-android-library/src/main/kotlin/network/xyo/random/XYRandom.kt
rename to base-android-library/src/main/kotlin/network/xyo/base/XYRandom.kt
index 9d5f2ef..8524047 100644
--- a/base-android-library/src/main/kotlin/network/xyo/random/XYRandom.kt
+++ b/base-android-library/src/main/kotlin/network/xyo/base/XYRandom.kt
@@ -1,6 +1,5 @@
-package network.xyo.random
+package network.xyo.base
 
-import network.xyo.base.XYBase
 import java.util.*
 
 class XYRandom : XYBase() {
diff --git a/base-android-library/version.properties b/base-android-library/version.properties
index 75a3ca2..e3783fa 100644
--- a/base-android-library/version.properties
+++ b/base-android-library/version.properties
@@ -1,2 +1,2 @@
-#Wed Feb 03 19:27:56 UTC 2021
-VERSION_PATCH=11
+#Wed Feb 03 20:59:18 UTC 2021
+VERSION_PATCH=12