diff --git a/android/CouchbaseLite/src/ce/java/com/couchbase/lite/ReplicatorConfiguration.java b/android/CouchbaseLite/src/ce/java/com/couchbase/lite/ReplicatorConfiguration.java
index 2d96ca70f..8f56cc0de 100644
--- a/android/CouchbaseLite/src/ce/java/com/couchbase/lite/ReplicatorConfiguration.java
+++ b/android/CouchbaseLite/src/ce/java/com/couchbase/lite/ReplicatorConfiguration.java
@@ -26,8 +26,6 @@
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
-import com.couchbase.lite.core.CBLVersion;
-
 
 /**
  * Replicator configuration.
diff --git a/android/CouchbaseLite/src/main/java/com/couchbase/lite/core/CBLVersion.java b/android/CouchbaseLite/src/main/java/com/couchbase/lite/CBLVersion.java
similarity index 96%
rename from android/CouchbaseLite/src/main/java/com/couchbase/lite/core/CBLVersion.java
rename to android/CouchbaseLite/src/main/java/com/couchbase/lite/CBLVersion.java
index d5056643a..2e58e6f70 100644
--- a/android/CouchbaseLite/src/main/java/com/couchbase/lite/core/CBLVersion.java
+++ b/android/CouchbaseLite/src/main/java/com/couchbase/lite/CBLVersion.java
@@ -15,13 +15,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-package com.couchbase.lite.core;
+package com.couchbase.lite;
 
 import android.os.Build;
 
 import java.util.Locale;
 
-import com.couchbase.lite.BuildConfig;
 import com.couchbase.lite.internal.core.C4;
 
 
diff --git a/shared/src/main/java/com/couchbase/lite/AbstractDatabase.java b/shared/src/main/java/com/couchbase/lite/AbstractDatabase.java
index 0ca940ed3..aad77eeba 100644
--- a/shared/src/main/java/com/couchbase/lite/AbstractDatabase.java
+++ b/shared/src/main/java/com/couchbase/lite/AbstractDatabase.java
@@ -40,7 +40,6 @@
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import org.json.JSONException;
 
-import com.couchbase.lite.core.CBLVersion;
 import com.couchbase.lite.internal.core.C4BlobStore;
 import com.couchbase.lite.internal.core.C4Constants;
 import com.couchbase.lite.internal.core.C4Constants.C4DatabaseFlags;
diff --git a/shared/src/main/java/com/couchbase/lite/FileLogger.java b/shared/src/main/java/com/couchbase/lite/FileLogger.java
index b32608af1..d8ba1c70d 100644
--- a/shared/src/main/java/com/couchbase/lite/FileLogger.java
+++ b/shared/src/main/java/com/couchbase/lite/FileLogger.java
@@ -25,7 +25,6 @@
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
-import com.couchbase.lite.core.CBLVersion;
 import com.couchbase.lite.internal.core.C4Constants;
 import com.couchbase.lite.internal.core.C4Log;
 import com.couchbase.lite.internal.support.Log;