diff --git a/lib/taskana-core/src/main/java/pro/taskana/persistence/BaseQuery.java b/lib/taskana-core/src/main/java/pro/taskana/BaseQuery.java
similarity index 96%
rename from lib/taskana-core/src/main/java/pro/taskana/persistence/BaseQuery.java
rename to lib/taskana-core/src/main/java/pro/taskana/BaseQuery.java
index 8cd404fc0..4b7f70be9 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/persistence/BaseQuery.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/BaseQuery.java
@@ -1,4 +1,4 @@
-package pro.taskana.persistence;
+package pro.taskana;
 
 import java.util.List;
 
diff --git a/lib/taskana-core/src/main/java/pro/taskana/persistence/ClassificationQuery.java b/lib/taskana-core/src/main/java/pro/taskana/ClassificationQuery.java
similarity index 98%
rename from lib/taskana-core/src/main/java/pro/taskana/persistence/ClassificationQuery.java
rename to lib/taskana-core/src/main/java/pro/taskana/ClassificationQuery.java
index 9cba69624..cad92b77d 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/persistence/ClassificationQuery.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/ClassificationQuery.java
@@ -1,4 +1,4 @@
-package pro.taskana.persistence;
+package pro.taskana;
 
 import pro.taskana.model.Classification;
 
diff --git a/lib/taskana-core/src/main/java/pro/taskana/ClassificationService.java b/lib/taskana-core/src/main/java/pro/taskana/ClassificationService.java
index e3a05c7fa..da3e49c86 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/ClassificationService.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/ClassificationService.java
@@ -2,7 +2,6 @@ package pro.taskana;
 
 import pro.taskana.exceptions.NotAuthorizedException;
 import pro.taskana.model.Classification;
-import pro.taskana.persistence.ClassificationQuery;
 
 import java.util.List;
 
diff --git a/lib/taskana-core/src/main/java/pro/taskana/persistence/ObjectReferenceQuery.java b/lib/taskana-core/src/main/java/pro/taskana/ObjectReferenceQuery.java
similarity index 97%
rename from lib/taskana-core/src/main/java/pro/taskana/persistence/ObjectReferenceQuery.java
rename to lib/taskana-core/src/main/java/pro/taskana/ObjectReferenceQuery.java
index a0190e7d3..d5ea95a0f 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/persistence/ObjectReferenceQuery.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/ObjectReferenceQuery.java
@@ -1,4 +1,4 @@
-package pro.taskana.persistence;
+package pro.taskana;
 
 import pro.taskana.model.ObjectReference;
 
diff --git a/lib/taskana-core/src/main/java/pro/taskana/persistence/TaskQuery.java b/lib/taskana-core/src/main/java/pro/taskana/TaskQuery.java
similarity index 98%
rename from lib/taskana-core/src/main/java/pro/taskana/persistence/TaskQuery.java
rename to lib/taskana-core/src/main/java/pro/taskana/TaskQuery.java
index 32579dcfa..0873ee681 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/persistence/TaskQuery.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/TaskQuery.java
@@ -1,4 +1,4 @@
-package pro.taskana.persistence;
+package pro.taskana;
 
 import pro.taskana.exceptions.NotAuthorizedException;
 import pro.taskana.model.Task;
diff --git a/lib/taskana-core/src/main/java/pro/taskana/TaskService.java b/lib/taskana-core/src/main/java/pro/taskana/TaskService.java
index cb12f5e58..469b583d4 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/TaskService.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/TaskService.java
@@ -9,7 +9,6 @@ import pro.taskana.model.DueWorkbasketCounter;
 import pro.taskana.model.Task;
 import pro.taskana.model.TaskState;
 import pro.taskana.model.TaskStateCounter;
-import pro.taskana.persistence.TaskQuery;
 
 /**
  * The Task Service manages all operations on tasks.
diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/ClassificationQueryImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/ClassificationQueryImpl.java
index 5b1bf1016..78824c613 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/impl/ClassificationQueryImpl.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/impl/ClassificationQueryImpl.java
@@ -1,9 +1,10 @@
 package pro.taskana.impl;
 
 import org.apache.ibatis.session.RowBounds;
+
+import pro.taskana.ClassificationQuery;
 import pro.taskana.TaskanaEngine;
 import pro.taskana.model.Classification;
-import pro.taskana.persistence.ClassificationQuery;
 
 import java.util.Date;
 import java.util.List;
diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/ClassificationServiceImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/ClassificationServiceImpl.java
index ffaff45e2..8259bb282 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/impl/ClassificationServiceImpl.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/impl/ClassificationServiceImpl.java
@@ -1,12 +1,12 @@
 package pro.taskana.impl;
 
+import pro.taskana.ClassificationQuery;
 import pro.taskana.ClassificationService;
 import pro.taskana.TaskanaEngine;
 import pro.taskana.exceptions.NotAuthorizedException;
 import pro.taskana.impl.util.IdGenerator;
 import pro.taskana.model.Classification;
 import pro.taskana.model.mappings.ClassificationMapper;
-import pro.taskana.persistence.ClassificationQuery;
 
 import java.sql.Date;
 import java.time.Duration;
diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/ObjectReferenceQueryImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/ObjectReferenceQueryImpl.java
index f7886acda..e777b2495 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/impl/ObjectReferenceQueryImpl.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/impl/ObjectReferenceQueryImpl.java
@@ -3,9 +3,10 @@ package pro.taskana.impl;
 import java.util.List;
 
 import org.apache.ibatis.session.RowBounds;
+
+import pro.taskana.ObjectReferenceQuery;
 import pro.taskana.TaskanaEngine;
 import pro.taskana.model.ObjectReference;
-import pro.taskana.persistence.ObjectReferenceQuery;
 
 /**
  * Implementation of ObjectReferenceQuery interface.
diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/TaskQueryImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/TaskQueryImpl.java
index 5bf5d075f..3feff4f3c 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/impl/TaskQueryImpl.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/impl/TaskQueryImpl.java
@@ -3,14 +3,15 @@ package pro.taskana.impl;
 import java.util.List;
 
 import org.apache.ibatis.session.RowBounds;
+
+import pro.taskana.ClassificationQuery;
+import pro.taskana.ObjectReferenceQuery;
+import pro.taskana.TaskQuery;
 import pro.taskana.TaskanaEngine;
 import pro.taskana.exceptions.NotAuthorizedException;
 import pro.taskana.model.Task;
 import pro.taskana.model.TaskState;
 import pro.taskana.model.WorkbasketAuthorization;
-import pro.taskana.persistence.ClassificationQuery;
-import pro.taskana.persistence.ObjectReferenceQuery;
-import pro.taskana.persistence.TaskQuery;
 
 /**
  * TaskQuery for generating dynamic sql.
diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/TaskServiceImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/TaskServiceImpl.java
index 790d169cb..91f53451d 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/impl/TaskServiceImpl.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/impl/TaskServiceImpl.java
@@ -9,6 +9,7 @@ import java.util.List;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import pro.taskana.TaskQuery;
 import pro.taskana.TaskService;
 import pro.taskana.TaskanaEngine;
 import pro.taskana.exceptions.NotAuthorizedException;
@@ -23,7 +24,6 @@ import pro.taskana.model.TaskStateCounter;
 import pro.taskana.model.WorkbasketAuthorization;
 import pro.taskana.model.mappings.ObjectReferenceMapper;
 import pro.taskana.model.mappings.TaskMapper;
-import pro.taskana.persistence.TaskQuery;
 
 /**
  * This is the implementation of TaskService.
diff --git a/lib/taskana-core/src/test/java/pro/taskana/impl/TestClassificationQuery.java b/lib/taskana-core/src/test/java/pro/taskana/impl/TestClassificationQuery.java
index d589f3104..85c6a8985 100644
--- a/lib/taskana-core/src/test/java/pro/taskana/impl/TestClassificationQuery.java
+++ b/lib/taskana-core/src/test/java/pro/taskana/impl/TestClassificationQuery.java
@@ -1,8 +1,8 @@
 package pro.taskana.impl;
 
+import pro.taskana.ClassificationQuery;
 import pro.taskana.exceptions.NotAuthorizedException;
 import pro.taskana.model.Classification;
-import pro.taskana.persistence.ClassificationQuery;
 
 import java.util.ArrayList;
 import java.util.Date;
diff --git a/lib/taskana-core/src/test/java/pro/taskana/impl/integration/TaskServiceImplIntAutocommitTest.java b/lib/taskana-core/src/test/java/pro/taskana/impl/integration/TaskServiceImplIntAutocommitTest.java
index 915b04bb5..2e7e816b3 100644
--- a/lib/taskana-core/src/test/java/pro/taskana/impl/integration/TaskServiceImplIntAutocommitTest.java
+++ b/lib/taskana-core/src/test/java/pro/taskana/impl/integration/TaskServiceImplIntAutocommitTest.java
@@ -14,6 +14,8 @@ import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
+import pro.taskana.ClassificationQuery;
+import pro.taskana.ObjectReferenceQuery;
 import pro.taskana.TaskanaEngine;
 import pro.taskana.TaskanaEngine.ConnectionManagementMode;
 import pro.taskana.configuration.TaskanaEngineConfiguration;
@@ -28,8 +30,6 @@ import pro.taskana.impl.configuration.TaskanaEngineConfigurationTest;
 import pro.taskana.impl.util.IdGenerator;
 import pro.taskana.model.Task;
 import pro.taskana.model.TaskState;
-import pro.taskana.persistence.ClassificationQuery;
-import pro.taskana.persistence.ObjectReferenceQuery;
 
 /**
  * Integration Test for TaskServiceImpl transactions with connection management mode AUTOCOMMIT.
diff --git a/lib/taskana-core/src/test/java/pro/taskana/impl/integration/TaskServiceImplIntExplicitTest.java b/lib/taskana-core/src/test/java/pro/taskana/impl/integration/TaskServiceImplIntExplicitTest.java
index c18c802c9..536354c16 100644
--- a/lib/taskana-core/src/test/java/pro/taskana/impl/integration/TaskServiceImplIntExplicitTest.java
+++ b/lib/taskana-core/src/test/java/pro/taskana/impl/integration/TaskServiceImplIntExplicitTest.java
@@ -16,6 +16,8 @@ import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
+import pro.taskana.ClassificationQuery;
+import pro.taskana.ObjectReferenceQuery;
 import pro.taskana.TaskanaEngine;
 import pro.taskana.TaskanaEngine.ConnectionManagementMode;
 import pro.taskana.configuration.TaskanaEngineConfiguration;
@@ -30,8 +32,6 @@ import pro.taskana.impl.configuration.TaskanaEngineConfigurationTest;
 import pro.taskana.impl.util.IdGenerator;
 import pro.taskana.model.Task;
 import pro.taskana.model.TaskState;
-import pro.taskana.persistence.ClassificationQuery;
-import pro.taskana.persistence.ObjectReferenceQuery;
 
 /**
  * Integration Test for TaskServiceImpl transactions with connection management mode EXPLICIT.
diff --git a/rest/src/main/java/pro/taskana/rest/query/TaskFilter.java b/rest/src/main/java/pro/taskana/rest/query/TaskFilter.java
index 115cbb92f..94803f58b 100644
--- a/rest/src/main/java/pro/taskana/rest/query/TaskFilter.java
+++ b/rest/src/main/java/pro/taskana/rest/query/TaskFilter.java
@@ -7,14 +7,15 @@ import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.util.MultiValueMap;
+
+import pro.taskana.ClassificationQuery;
 import pro.taskana.ClassificationService;
+import pro.taskana.ObjectReferenceQuery;
+import pro.taskana.TaskQuery;
 import pro.taskana.TaskService;
 import pro.taskana.exceptions.NotAuthorizedException;
 import pro.taskana.model.Task;
 import pro.taskana.model.TaskState;
-import pro.taskana.persistence.ClassificationQuery;
-import pro.taskana.persistence.ObjectReferenceQuery;
-import pro.taskana.persistence.TaskQuery;
 
 @Component
 public class TaskFilter {