diff --git a/java/lc-esp-eo-engine/src/main/java/lc/esp/eo/EODataSourceBinder.java b/java/lc-esp-eo-engine/src/main/java/lc/esp/eo/EODataSourceBinder.java
index ba1e491cbf42117123f16ef36de316ddda872f57..eb30dd94a59969024b8bf65e23d726d0aa6d3d74 100644
--- a/java/lc-esp-eo-engine/src/main/java/lc/esp/eo/EODataSourceBinder.java
+++ b/java/lc-esp-eo-engine/src/main/java/lc/esp/eo/EODataSourceBinder.java
@@ -22,7 +22,7 @@ import java.util.HashMap;
  * @since mk20
  */
 public class EODataSourceBinder {
-    private static final MechaLogger logger = MechaLoggerFactory.getLogger(EO.class);
+    private static final MechaLogger logger = MechaLoggerFactory.getLogger(EODataSourceBinder.class);
     private final HashMap<Integer, MariaDbDataSource> dataSources = new HashMap<>();
     private final long MAX_UINT32 = Integer.toUnsignedLong(-1);
     private final ShardMap shardMap = new ShardMap();
diff --git a/java/lc-esp-eo-engine/src/main/java/lc/esp/eo/util/EOFilteringIterator.java b/java/lc-esp-eo-sdk/src/main/java/lc/esp/eo/sdk/EOFilteringIterator.java
similarity index 97%
rename from java/lc-esp-eo-engine/src/main/java/lc/esp/eo/util/EOFilteringIterator.java
rename to java/lc-esp-eo-sdk/src/main/java/lc/esp/eo/sdk/EOFilteringIterator.java
index a3da84496fc9117be7c7dd1dbc085a29803fadd9..bc3c66552e2e5820d788df4e4604e96b498d0e04 100644
--- a/java/lc-esp-eo-engine/src/main/java/lc/esp/eo/util/EOFilteringIterator.java
+++ b/java/lc-esp-eo-sdk/src/main/java/lc/esp/eo/sdk/EOFilteringIterator.java
@@ -7,9 +7,8 @@
  * actual or intended publication of such source code.
  */
 
-package lc.esp.eo.util;
+package lc.esp.eo.sdk;
 
-import lc.esp.eo.EO;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/java/lc-esp-eo-engine/src/main/java/lc/esp/eo/EOLoop.java b/java/lc-esp-eo-sdk/src/main/java/lc/esp/eo/sdk/EOLoop.java
similarity index 99%
rename from java/lc-esp-eo-engine/src/main/java/lc/esp/eo/EOLoop.java
rename to java/lc-esp-eo-sdk/src/main/java/lc/esp/eo/sdk/EOLoop.java
index dfd01920f16fc5fb64e2ad60da12c8bfb405494c..d5deadeb5bfa7c38da79dd026668be45ba0db14e 100644
--- a/java/lc-esp-eo-engine/src/main/java/lc/esp/eo/EOLoop.java
+++ b/java/lc-esp-eo-sdk/src/main/java/lc/esp/eo/sdk/EOLoop.java
@@ -7,9 +7,8 @@
  * actual or intended publication of such source code.
  */
 
-package lc.esp.eo;
+package lc.esp.eo.sdk;
 
-import lc.esp.eo.util.EOFilteringIterator;
 import lc.mecha.log.MechaLogger;
 import lc.mecha.log.MechaLoggerFactory;
 
diff --git a/java/lc-ris-android/app/src/main/java/lc/ris/android/ItemFragment.java b/java/lc-ris-android/app/src/main/java/lc/ris/android/ItemFragment.java
index 88d79fbac84df0434b26ede2841dfd95f0cd7536..df639fa96122e674b2ab398ed1daa1e75b736041 100644
--- a/java/lc-ris-android/app/src/main/java/lc/ris/android/ItemFragment.java
+++ b/java/lc-ris-android/app/src/main/java/lc/ris/android/ItemFragment.java
@@ -6,7 +6,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.EditText;
 import androidx.fragment.app.Fragment;
-import lc.eo.EO;
+import lc.esp.eo.sdk.EO;
 import lc.ris.client.RapidInventoryClient;
 
 ;
diff --git a/java/lc-ris-client/src/main/java/lc/ris/client/InventoryStore.java b/java/lc-ris-client/src/main/java/lc/ris/client/InventoryStore.java
index 4d4d8e7a8119d95911b78d094f82753ab8df5665..07adbe4c91cf7c4a3b495f05a28b442fcf539c95 100644
--- a/java/lc-ris-client/src/main/java/lc/ris/client/InventoryStore.java
+++ b/java/lc-ris-client/src/main/java/lc/ris/client/InventoryStore.java
@@ -1,6 +1,6 @@
 package lc.ris.client;
 
-import lc.esp.eo.EO;
+import lc.esp.eo.sdk.EO;
 
 /**
  * Classes implementing this interface provide access to a store of inventory information within the
diff --git a/java/lc-ris-client/src/main/java/lc/ris/client/MockInventoryStore.java b/java/lc-ris-client/src/main/java/lc/ris/client/MockInventoryStore.java
index bae8acc37cb349d4572f649f4b1ca5899d839931..699f81c6e83e730dddb2e9e0703179757adc2e58 100644
--- a/java/lc-ris-client/src/main/java/lc/ris/client/MockInventoryStore.java
+++ b/java/lc-ris-client/src/main/java/lc/ris/client/MockInventoryStore.java
@@ -1,6 +1,7 @@
 package lc.ris.client;
 
-import lc.esp.eo.EO;
+
+import lc.esp.eo.sdk.EO;
 
 /**
  * This implementation of {@link InventoryStore} is mocked to appear to work, for the purposes of testing