diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
index 1e0ec0bb2..606409061 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -12,7 +12,6 @@ import io.ebean.bean.BeanCollection;
 import io.ebean.bean.EntityBean;
 import io.ebean.bean.EntityBeanIntercept;
 import io.ebean.bean.PersistenceContext;
-import io.ebean.bean.PersistenceContextUtil;
 import io.ebean.config.EncryptKey;
 import io.ebean.config.ServerConfig;
 import io.ebean.config.dbplatform.IdType;
diff --git a/src/main/java/io/ebean/bean/PersistenceContextUtil.java b/src/main/java/io/ebeaninternal/server/deploy/PersistenceContextUtil.java
similarity index 92%
rename from src/main/java/io/ebean/bean/PersistenceContextUtil.java
rename to src/main/java/io/ebeaninternal/server/deploy/PersistenceContextUtil.java
index ef168afe1..69ad243e8 100644
--- a/src/main/java/io/ebean/bean/PersistenceContextUtil.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/PersistenceContextUtil.java
@@ -1,4 +1,4 @@
-package io.ebean.bean;
+package io.ebeaninternal.server.deploy;
 
 import javax.persistence.Entity;
 
diff --git a/src/test/java/io/ebeaninternal/server/transaction/DefaultPersistenceContextTest.java b/src/test/java/io/ebeaninternal/server/transaction/DefaultPersistenceContextTest.java
index 0e450a846..f7504e493 100644
--- a/src/test/java/io/ebeaninternal/server/transaction/DefaultPersistenceContextTest.java
+++ b/src/test/java/io/ebeaninternal/server/transaction/DefaultPersistenceContextTest.java
@@ -1,7 +1,7 @@
 package io.ebeaninternal.server.transaction;
 
 import io.ebean.bean.PersistenceContext;
-import io.ebean.bean.PersistenceContextUtil;
+import io.ebeaninternal.server.deploy.PersistenceContextUtil;
 import org.tests.model.basic.Car;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.Vehicle;