diff --git a/client-java/constraint/src/main/java/org/evomaster/client/java/constraint/JpaConstraint.java b/client-java/constraint/src/main/java/org/evomaster/client/java/constraint/jpa/JpaConstraint.java
similarity index 99%
rename from client-java/constraint/src/main/java/org/evomaster/client/java/constraint/JpaConstraint.java
rename to client-java/constraint/src/main/java/org/evomaster/client/java/constraint/jpa/JpaConstraint.java
index 664583e867..08b8f6502a 100644
--- a/client-java/constraint/src/main/java/org/evomaster/client/java/constraint/JpaConstraint.java
+++ b/client-java/constraint/src/main/java/org/evomaster/client/java/constraint/jpa/JpaConstraint.java
@@ -1,4 +1,4 @@
-package org.evomaster.client.java.constraint;
+package org.evomaster.client.java.constraint.jpa;
 
 import java.io.Serializable;
 import java.util.List;
diff --git a/client-java/instrumentation/pom.xml b/client-java/instrumentation/pom.xml
index 322db7edb9..82ad13c7fb 100644
--- a/client-java/instrumentation/pom.xml
+++ b/client-java/instrumentation/pom.xml
@@ -164,6 +164,12 @@
             <version>2.0.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>org.evomaster</groupId>
+            <artifactId>evomaster-client-java-constraint</artifactId>
+            <version>2.0.1-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
 
     </dependencies>
 
diff --git a/client-java/instrumentation/src/main/java/org/evomaster/client/java/instrumentation/ClassAnalyzer.java b/client-java/instrumentation/src/main/java/org/evomaster/client/java/instrumentation/ClassAnalyzer.java
index b1bd7d00fc..d8454908ce 100644
--- a/client-java/instrumentation/src/main/java/org/evomaster/client/java/instrumentation/ClassAnalyzer.java
+++ b/client-java/instrumentation/src/main/java/org/evomaster/client/java/instrumentation/ClassAnalyzer.java
@@ -1,6 +1,6 @@
 package org.evomaster.client.java.instrumentation;
 
-import org.evomaster.client.java.constraint.JpaConstraint;
+import org.evomaster.client.java.constraint.jpa.JpaConstraint;
 import org.evomaster.client.java.instrumentation.staticstate.UnitsInfoRecorder;
 import org.evomaster.client.java.utils.SimpleLogger;
 
diff --git a/client-java/instrumentation/src/main/java/org/evomaster/client/java/instrumentation/staticstate/UnitsInfoRecorder.java b/client-java/instrumentation/src/main/java/org/evomaster/client/java/instrumentation/staticstate/UnitsInfoRecorder.java
index 24f771eb1b..f5fbedb4dc 100644
--- a/client-java/instrumentation/src/main/java/org/evomaster/client/java/instrumentation/staticstate/UnitsInfoRecorder.java
+++ b/client-java/instrumentation/src/main/java/org/evomaster/client/java/instrumentation/staticstate/UnitsInfoRecorder.java
@@ -1,7 +1,7 @@
 package org.evomaster.client.java.instrumentation.staticstate;
 
 import org.evomaster.client.java.instrumentation.ClassAnalyzer;
-import org.evomaster.client.java.constraint.JpaConstraint;
+import org.evomaster.client.java.constraint.jpa.JpaConstraint;
 
 import java.io.Serializable;
 import java.util.Collections;
diff --git a/client-java/instrumentation/src/test/java/org/evomaster/client/java/instrumentation/ClassAnalyzerTest.java b/client-java/instrumentation/src/test/java/org/evomaster/client/java/instrumentation/ClassAnalyzerTest.java
index 4be153bfdf..c89f874892 100644
--- a/client-java/instrumentation/src/test/java/org/evomaster/client/java/instrumentation/ClassAnalyzerTest.java
+++ b/client-java/instrumentation/src/test/java/org/evomaster/client/java/instrumentation/ClassAnalyzerTest.java
@@ -4,7 +4,7 @@
 import com.foo.somedifferentpackage.examples.entity.EntityX;
 import com.foo.somedifferentpackage.examples.entity.EntityY;
 import com.foo.somedifferentpackage.examples.entity.EntityZ;
-import org.evomaster.client.java.constraint.JpaConstraint;
+import org.evomaster.client.java.constraint.jpa.JpaConstraint;
 import org.evomaster.client.java.instrumentation.staticstate.UnitsInfoRecorder;
 import org.junit.jupiter.api.Test;