diff --git a/java/lc-esp-eo/src/main/java/lc/eo/EO.java b/java/lc-esp-eo/src/main/java/lc/esp/eo/EO.java
similarity index 99%
rename from java/lc-esp-eo/src/main/java/lc/eo/EO.java
rename to java/lc-esp-eo/src/main/java/lc/esp/eo/EO.java
index 5a59e06377db08a4d2762f45fa99c554ebe70a54..63c2e09733328cc0c893d4cb20cd644670fe8d5b 100644
--- a/java/lc-esp-eo/src/main/java/lc/eo/EO.java
+++ b/java/lc-esp-eo/src/main/java/lc/esp/eo/EO.java
@@ -7,7 +7,7 @@
  * actual or intended publication of such source code.
  */
 
-package lc.eo;
+package lc.esp.eo;
 
 import lc.mecha.lang.NotImplementedException;
 import lc.mecha.log.MechaLogger;
diff --git a/java/lc-esp-eo/src/main/java/lc/eo/EODataType.java b/java/lc-esp-eo/src/main/java/lc/esp/eo/EODataType.java
similarity index 99%
rename from java/lc-esp-eo/src/main/java/lc/eo/EODataType.java
rename to java/lc-esp-eo/src/main/java/lc/esp/eo/EODataType.java
index 67e6393173e31cfa0dcdbd625ff85920523cdbb2..c3562d52b0b9fb61d4736fe3280125734989cae9 100644
--- a/java/lc-esp-eo/src/main/java/lc/eo/EODataType.java
+++ b/java/lc-esp-eo/src/main/java/lc/esp/eo/EODataType.java
@@ -7,7 +7,7 @@
  * actual or intended publication of such source code.
  */
 
-package lc.eo;
+package lc.esp.eo;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/java/lc-esp-eo/src/main/java/lc/eo/EOListener.java b/java/lc-esp-eo/src/main/java/lc/esp/eo/EOListener.java
similarity index 89%
rename from java/lc-esp-eo/src/main/java/lc/eo/EOListener.java
rename to java/lc-esp-eo/src/main/java/lc/esp/eo/EOListener.java
index c56d5648ec746f4533ded3c2eb1e89ce7ce8e0db..7488f2e8161230e25af85b242c9afac43e22abc4 100644
--- a/java/lc-esp-eo/src/main/java/lc/eo/EOListener.java
+++ b/java/lc-esp-eo/src/main/java/lc/esp/eo/EOListener.java
@@ -1,4 +1,4 @@
-package lc.eo;
+package lc.esp.eo;
 
 import java.io.Serializable;
 
diff --git a/java/lc-esp-eo/src/main/java/lc/eo/EOLoop.java b/java/lc-esp-eo/src/main/java/lc/esp/eo/EOLoop.java
similarity index 98%
rename from java/lc-esp-eo/src/main/java/lc/eo/EOLoop.java
rename to java/lc-esp-eo/src/main/java/lc/esp/eo/EOLoop.java
index ad9aab229d504d88175262a32b323e548c59f100..dfd01920f16fc5fb64e2ad60da12c8bfb405494c 100644
--- a/java/lc-esp-eo/src/main/java/lc/eo/EOLoop.java
+++ b/java/lc-esp-eo/src/main/java/lc/esp/eo/EOLoop.java
@@ -7,10 +7,9 @@
  * actual or intended publication of such source code.
  */
 
-package lc.eo;
+package lc.esp.eo;
 
-import lc.eo.util.EOFilteringIterator;
-import lc.mecha.lang.NotImplementedException;
+import lc.esp.eo.util.EOFilteringIterator;
 import lc.mecha.log.MechaLogger;
 import lc.mecha.log.MechaLoggerFactory;
 
diff --git a/java/lc-esp-eo/src/main/java/lc/eo/util/EOFilteringIterator.java b/java/lc-esp-eo/src/main/java/lc/esp/eo/util/EOFilteringIterator.java
similarity index 97%
rename from java/lc-esp-eo/src/main/java/lc/eo/util/EOFilteringIterator.java
rename to java/lc-esp-eo/src/main/java/lc/esp/eo/util/EOFilteringIterator.java
index a90fb2751ea6cbd1825b9ba0e1bb161ed1f86659..a3da84496fc9117be7c7dd1dbc085a29803fadd9 100644
--- a/java/lc-esp-eo/src/main/java/lc/eo/util/EOFilteringIterator.java
+++ b/java/lc-esp-eo/src/main/java/lc/esp/eo/util/EOFilteringIterator.java
@@ -7,9 +7,9 @@
  * actual or intended publication of such source code.
  */
 
-package lc.eo.util;
+package lc.esp.eo.util;
 
-import lc.eo.EO;
+import lc.esp.eo.EO;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
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 b487b1f1b69cad572ebcf11cf6b707d2531054ef..4d4d8e7a8119d95911b78d094f82753ab8df5665 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.eo.EO;
+import lc.esp.eo.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 38e22fa5edcf0ebb02dadddb53e41b4eba0fe63d..4393e9f8038d49d2148a491411f381338d085ccb 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,6 @@
 package lc.ris.client;
 
-import lc.eo.EO;
+import lc.esp.eo.EO;
 
 /**
  * This implementation of {@link InventoryStore} is mocked to appear to work, for the purposes of testing