From 2a2b8e8e3723ae87973f066ff1edcad098593412 Mon Sep 17 00:00:00 2001
From: BerndBreier <33351391+BerndBreier@users.noreply.github.com>
Date: Fri, 17 Nov 2017 13:51:13 +0100
Subject: [PATCH] TSK-42 Refactor taskana.org to taskana.pro

---
 lib/pom.xml                                   |  2 +-
 lib/taskana-cdi-example/pom.xml               |  6 ++--
 .../taskana/ExampleBootstrap.java             |  8 ++---
 .../java/{org => pro}/taskana/TaskanaEjb.java |  2 +-
 lib/taskana-cdi/pom.xml                       |  4 +--
 .../taskana/TaskanaProducers.java             |  4 +--
 .../{org => pro}/taskana/RestApplication.java |  2 +-
 .../java/{org => pro}/taskana/TaskanaEjb.java |  6 ++--
 .../taskana/TaskanaProducersTest.java         |  6 ++--
 .../{org => pro}/taskana/TaskanaRestTest.java |  8 ++---
 lib/taskana-core/pom.xml                      |  2 +-
 .../taskana/ClassificationService.java        |  8 ++---
 .../{org => pro}/taskana/TaskService.java     | 18 +++++-----
 .../{org => pro}/taskana/TaskanaEngine.java   |  4 +--
 .../taskana/WorkbasketService.java            | 12 +++----
 .../taskana/configuration/DbScriptRunner.java |  2 +-
 .../TaskanaEngineConfiguration.java           |  6 ++--
 .../exceptions/NotAuthorizedException.java    |  2 +-
 .../taskana/exceptions/NotFoundException.java |  2 +-
 .../exceptions/TaskNotFoundException.java     |  2 +-
 .../WorkbasketNotFoundException.java          |  2 +-
 .../impl/ClassificationServiceImpl.java       | 18 +++++-----
 .../taskana/impl/TaskServiceImpl.java         | 34 +++++++++----------
 .../taskana/impl/TaskanaEngineImpl.java       | 32 +++++++++--------
 .../taskana/impl/WorkbasketServiceImpl.java   | 26 +++++++-------
 .../persistence/ClassificationQueryImpl.java  | 12 +++----
 .../impl/persistence/MapTypeHandler.java      |  2 +-
 .../persistence/ObjectReferenceQueryImpl.java | 12 +++----
 .../impl/persistence/TaskQueryImpl.java       | 22 ++++++------
 .../taskana/impl/util/IdGenerator.java        |  2 +-
 .../taskana/model/Classification.java         |  2 +-
 .../taskana/model/DueWorkbasketCounter.java   |  2 +-
 .../taskana/model/ObjectReference.java        |  2 +-
 .../java/{org => pro}/taskana/model/Task.java |  2 +-
 .../{org => pro}/taskana/model/TaskState.java |  2 +-
 .../taskana/model/TaskStateCounter.java       |  2 +-
 .../taskana/model/Workbasket.java             |  2 +-
 .../taskana/model/WorkbasketAccessItem.java   |  2 +-
 .../model/WorkbasketAuthorization.java        |  2 +-
 .../model/mappings/ClassificationMapper.java  |  4 +--
 .../mappings/DistributionTargetMapper.java    |  2 +-
 .../model/mappings/ObjectReferenceMapper.java |  4 +--
 .../taskana/model/mappings/QueryMapper.java   | 18 +++++-----
 .../taskana/model/mappings/TaskMapper.java    | 14 ++++----
 .../mappings/WorkbasketAccessMapper.java      |  4 +--
 .../model/mappings/WorkbasketMapper.java      |  6 ++--
 .../taskana/persistence/BaseQuery.java        |  4 +--
 .../persistence/ClassificationQuery.java      |  4 +--
 .../persistence/ObjectReferenceQuery.java     |  4 +--
 .../taskana/persistence/TaskQuery.java        |  8 ++---
 .../taskana/security/CurrentUserContext.java  |  2 +-
 .../impl/ClassificationServiceImplTest.java   | 10 +++---
 .../taskana/impl/TaskServiceImplTest.java     | 24 ++++++-------
 .../impl/WorkbasketServiceImplTest.java       | 22 ++++++------
 .../taskana/impl/configuration/DBCleaner.java |  4 +--
 .../TaskanaEngineConfigurationTest.java       |  6 ++--
 .../ClassificationServiceImplIntTest.java     | 18 +++++-----
 .../TaskServiceImplTransactionTest.java       | 32 ++++++++---------
 .../WorkbasketServiceImplIntTest.java         | 24 ++++++-------
 .../ClassificationQueryImplTest.java          |  8 ++---
 .../ObjectReferenceQueryImplTest.java         |  8 ++---
 .../impl/persistence/TaskQueryImplTest.java   | 10 +++---
 .../persistence/TestClassificationQuery.java  |  8 ++---
 lib/taskana-spring-example/pom.xml            |  6 ++--
 .../taskana/ExampleBootstrap.java             |  8 ++---
 .../taskana/SpringBootWebApplication.java     |  2 +-
 .../src/main/resources/application.properties |  2 +-
 .../src/main/resources/applicationContext.xml |  2 +-
 lib/taskana-spring/pom.xml                    |  4 +--
 .../taskana/SpringTaskanaEngineImpl.java      |  6 ++--
 .../SpringTaskanaEngineConfiguration.java     |  6 ++--
 .../taskana/TaskanaComponent.java             |  6 ++--
 .../{org => pro}/taskana/TransactionTest.java |  2 +-
 .../resources/test-applicationContext.xml     |  4 +--
 rest/pom.xml                                  |  4 +--
 .../rest/ClassificationController.java        |  6 ++--
 .../taskana/rest/MonitorController.java       | 18 +++++-----
 .../taskana/rest/RestApplication.java         | 18 +++++-----
 .../taskana/rest/TaskController.java          | 12 +++----
 .../taskana/rest/WorkbasketController.java    | 14 ++++----
 .../rest/model/WorkbasketCounterDataDto.java  |  2 +-
 .../rest/model/WorkbasketCounterDto.java      |  2 +-
 .../taskana/rest/query/TaskFilter.java        | 18 +++++-----
 .../security/CustomAutenticationProvider.java |  2 +-
 .../rest/security/RoleGranterFromMap.java     |  2 +-
 .../rest/security/SampleLoginModule.java      |  2 +-
 .../rest/security/WebSecurityConfig.java      |  2 +-
 .../DistributionTargetDeserializer.java       |  8 ++---
 .../DistributionTargetSerializer.java         |  4 +--
 .../rest/serialization/WorkbasketMixIn.java   |  4 +--
 .../sampledata/SampleDataGenerator.java       |  2 +-
 .../src/main/resources/application.properties |  2 +-
 rest/src/main/resources/pss_jaas.config       |  2 +-
 93 files changed, 354 insertions(+), 352 deletions(-)
 rename lib/taskana-cdi-example/src/main/java/{org => pro}/taskana/ExampleBootstrap.java (86%)
 rename lib/taskana-cdi-example/src/main/java/{org => pro}/taskana/TaskanaEjb.java (90%)
 rename lib/taskana-cdi/src/main/java/{org => pro}/taskana/TaskanaProducers.java (95%)
 rename lib/taskana-cdi/src/test/java/{org => pro}/taskana/RestApplication.java (88%)
 rename lib/taskana-cdi/src/test/java/{org => pro}/taskana/TaskanaEjb.java (79%)
 rename lib/taskana-cdi/src/test/java/{org => pro}/taskana/TaskanaProducersTest.java (95%)
 rename lib/taskana-cdi/src/test/java/{org => pro}/taskana/TaskanaRestTest.java (86%)
 rename lib/taskana-core/src/main/java/{org => pro}/taskana/ClassificationService.java (89%)
 rename lib/taskana-core/src/main/java/{org => pro}/taskana/TaskService.java (86%)
 rename lib/taskana-core/src/main/java/{org => pro}/taskana/TaskanaEngine.java (90%)
 rename lib/taskana-core/src/main/java/{org => pro}/taskana/WorkbasketService.java (92%)
 rename lib/taskana-core/src/main/java/{org => pro}/taskana/configuration/DbScriptRunner.java (98%)
 rename lib/taskana-core/src/main/java/{org => pro}/taskana/configuration/TaskanaEngineConfiguration.java (96%)
 rename lib/taskana-core/src/main/java/{org => pro}/taskana/exceptions/NotAuthorizedException.java (87%)
 rename lib/taskana-core/src/main/java/{org => pro}/taskana/exceptions/NotFoundException.java (88%)
 rename lib/taskana-core/src/main/java/{org => pro}/taskana/exceptions/TaskNotFoundException.java (89%)
 rename lib/taskana-core/src/main/java/{org => pro}/taskana/exceptions/WorkbasketNotFoundException.java (90%)
 rename lib/taskana-core/src/main/java/{org => pro}/taskana/impl/ClassificationServiceImpl.java (92%)
 rename lib/taskana-core/src/main/java/{org => pro}/taskana/impl/TaskServiceImpl.java (89%)
 rename lib/taskana-core/src/main/java/{org => pro}/taskana/impl/TaskanaEngineImpl.java (84%)
 rename lib/taskana-core/src/main/java/{org => pro}/taskana/impl/WorkbasketServiceImpl.java (91%)
 rename lib/taskana-core/src/main/java/{org => pro}/taskana/impl/persistence/ClassificationQueryImpl.java (95%)
 rename lib/taskana-core/src/main/java/{org => pro}/taskana/impl/persistence/MapTypeHandler.java (98%)
 rename lib/taskana-core/src/main/java/{org => pro}/taskana/impl/persistence/ObjectReferenceQueryImpl.java (91%)
 rename lib/taskana-core/src/main/java/{org => pro}/taskana/impl/persistence/TaskQueryImpl.java (92%)
 rename lib/taskana-core/src/main/java/{org => pro}/taskana/impl/util/IdGenerator.java (94%)
 rename lib/taskana-core/src/main/java/{org => pro}/taskana/model/Classification.java (99%)
 rename lib/taskana-core/src/main/java/{org => pro}/taskana/model/DueWorkbasketCounter.java (96%)
 rename lib/taskana-core/src/main/java/{org => pro}/taskana/model/ObjectReference.java (98%)
 rename lib/taskana-core/src/main/java/{org => pro}/taskana/model/Task.java (99%)
 rename lib/taskana-core/src/main/java/{org => pro}/taskana/model/TaskState.java (80%)
 rename lib/taskana-core/src/main/java/{org => pro}/taskana/model/TaskStateCounter.java (93%)
 rename lib/taskana-core/src/main/java/{org => pro}/taskana/model/Workbasket.java (98%)
 rename lib/taskana-core/src/main/java/{org => pro}/taskana/model/WorkbasketAccessItem.java (98%)
 rename lib/taskana-core/src/main/java/{org => pro}/taskana/model/WorkbasketAuthorization.java (85%)
 rename lib/taskana-core/src/main/java/{org => pro}/taskana/model/mappings/ClassificationMapper.java (98%)
 rename lib/taskana-core/src/main/java/{org => pro}/taskana/model/mappings/DistributionTargetMapper.java (97%)
 rename lib/taskana-core/src/main/java/{org => pro}/taskana/model/mappings/ObjectReferenceMapper.java (97%)
 rename lib/taskana-core/src/main/java/{org => pro}/taskana/model/mappings/QueryMapper.java (97%)
 rename lib/taskana-core/src/main/java/{org => pro}/taskana/model/mappings/TaskMapper.java (94%)
 rename lib/taskana-core/src/main/java/{org => pro}/taskana/model/mappings/WorkbasketAccessMapper.java (98%)
 rename lib/taskana-core/src/main/java/{org => pro}/taskana/model/mappings/WorkbasketMapper.java (97%)
 rename lib/taskana-core/src/main/java/{org => pro}/taskana/persistence/BaseQuery.java (90%)
 rename lib/taskana-core/src/main/java/{org => pro}/taskana/persistence/ClassificationQuery.java (97%)
 rename lib/taskana-core/src/main/java/{org => pro}/taskana/persistence/ObjectReferenceQuery.java (94%)
 rename lib/taskana-core/src/main/java/{org => pro}/taskana/persistence/TaskQuery.java (95%)
 rename lib/taskana-core/src/main/java/{org => pro}/taskana/security/CurrentUserContext.java (99%)
 rename lib/taskana-core/src/test/java/{org => pro}/taskana/impl/ClassificationServiceImplTest.java (95%)
 rename lib/taskana-core/src/test/java/{org => pro}/taskana/impl/TaskServiceImplTest.java (93%)
 rename lib/taskana-core/src/test/java/{org => pro}/taskana/impl/WorkbasketServiceImplTest.java (95%)
 rename lib/taskana-core/src/test/java/{org => pro}/taskana/impl/configuration/DBCleaner.java (94%)
 rename lib/taskana-core/src/test/java/{org => pro}/taskana/impl/configuration/TaskanaEngineConfigurationTest.java (97%)
 rename lib/taskana-core/src/test/java/{org => pro}/taskana/impl/integration/ClassificationServiceImplIntTest.java (96%)
 rename lib/taskana-core/src/test/java/{org => pro}/taskana/impl/integration/TaskServiceImplTransactionTest.java (86%)
 rename lib/taskana-core/src/test/java/{org => pro}/taskana/impl/integration/WorkbasketServiceImplIntTest.java (93%)
 rename lib/taskana-core/src/test/java/{org => pro}/taskana/impl/persistence/ClassificationQueryImplTest.java (92%)
 rename lib/taskana-core/src/test/java/{org => pro}/taskana/impl/persistence/ObjectReferenceQueryImplTest.java (92%)
 rename lib/taskana-core/src/test/java/{org => pro}/taskana/impl/persistence/TaskQueryImplTest.java (91%)
 rename lib/taskana-core/src/test/java/{org => pro}/taskana/impl/persistence/TestClassificationQuery.java (95%)
 rename lib/taskana-spring-example/src/main/java/{org => pro}/taskana/ExampleBootstrap.java (86%)
 rename lib/taskana-spring-example/src/main/java/{org => pro}/taskana/SpringBootWebApplication.java (97%)
 rename lib/taskana-spring/src/main/java/{org => pro}/taskana/SpringTaskanaEngineImpl.java (80%)
 rename lib/taskana-spring/src/main/java/{org => pro}/taskana/configuration/SpringTaskanaEngineConfiguration.java (89%)
 rename lib/taskana-spring/src/test/java/{org => pro}/taskana/TaskanaComponent.java (84%)
 rename lib/taskana-spring/src/test/java/{org => pro}/taskana/TransactionTest.java (99%)
 rename rest/src/main/java/{org => pro}/taskana/rest/ClassificationController.java (95%)
 rename rest/src/main/java/{org => pro}/taskana/rest/MonitorController.java (89%)
 rename rest/src/main/java/{org => pro}/taskana/rest/RestApplication.java (87%)
 rename rest/src/main/java/{org => pro}/taskana/rest/TaskController.java (94%)
 rename rest/src/main/java/{org => pro}/taskana/rest/WorkbasketController.java (93%)
 rename rest/src/main/java/{org => pro}/taskana/rest/model/WorkbasketCounterDataDto.java (92%)
 rename rest/src/main/java/{org => pro}/taskana/rest/model/WorkbasketCounterDto.java (93%)
 rename rest/src/main/java/{org => pro}/taskana/rest/query/TaskFilter.java (96%)
 rename rest/src/main/java/{org => pro}/taskana/rest/security/CustomAutenticationProvider.java (96%)
 rename rest/src/main/java/{org => pro}/taskana/rest/security/RoleGranterFromMap.java (93%)
 rename rest/src/main/java/{org => pro}/taskana/rest/security/SampleLoginModule.java (96%)
 rename rest/src/main/java/{org => pro}/taskana/rest/security/WebSecurityConfig.java (99%)
 rename rest/src/main/java/{org => pro}/taskana/rest/serialization/DistributionTargetDeserializer.java (90%)
 rename rest/src/main/java/{org => pro}/taskana/rest/serialization/DistributionTargetSerializer.java (92%)
 rename rest/src/main/java/{org => pro}/taskana/rest/serialization/WorkbasketMixIn.java (86%)
 rename rest/src/main/java/{org => pro}/taskana/sampledata/SampleDataGenerator.java (98%)

diff --git a/lib/pom.xml b/lib/pom.xml
index 53f93e7ba..6cf26896f 100644
--- a/lib/pom.xml
+++ b/lib/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.taskana</groupId>
+	<groupId>pro.taskana</groupId>
 	<artifactId>taskana-parent</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<packaging>pom</packaging>
diff --git a/lib/taskana-cdi-example/pom.xml b/lib/taskana-cdi-example/pom.xml
index 2603667fe..d803bd3e8 100644
--- a/lib/taskana-cdi-example/pom.xml
+++ b/lib/taskana-cdi-example/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.taskana</groupId>
+	<groupId>pro.taskana</groupId>
 	<artifactId>taskana-cdi-example</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<packaging>war</packaging>
@@ -21,13 +21,13 @@
 		</dependency>
 
 		<dependency>
-			<groupId>org.taskana</groupId>
+			<groupId>pro.taskana</groupId>
 			<artifactId>taskana-core</artifactId>
 			<version>0.0.1-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
-			<groupId>org.taskana</groupId>
+			<groupId>pro.taskana</groupId>
 			<artifactId>taskana-cdi</artifactId>
 			<version>0.0.1-SNAPSHOT</version>
 		</dependency>
diff --git a/lib/taskana-cdi-example/src/main/java/org/taskana/ExampleBootstrap.java b/lib/taskana-cdi-example/src/main/java/pro/taskana/ExampleBootstrap.java
similarity index 86%
rename from lib/taskana-cdi-example/src/main/java/org/taskana/ExampleBootstrap.java
rename to lib/taskana-cdi-example/src/main/java/pro/taskana/ExampleBootstrap.java
index 7ab382a02..31a288f6d 100644
--- a/lib/taskana-cdi-example/src/main/java/org/taskana/ExampleBootstrap.java
+++ b/lib/taskana-cdi-example/src/main/java/pro/taskana/ExampleBootstrap.java
@@ -1,4 +1,4 @@
-package org.taskana;
+package pro.taskana;
 
 import javax.annotation.PostConstruct;
 import javax.ejb.EJB;
@@ -6,9 +6,9 @@ import javax.enterprise.context.ApplicationScoped;
 import javax.enterprise.context.Initialized;
 import javax.enterprise.event.Observes;
 
-import org.taskana.exceptions.NotAuthorizedException;
-import org.taskana.exceptions.TaskNotFoundException;
-import org.taskana.model.Task;
+import pro.taskana.exceptions.NotAuthorizedException;
+import pro.taskana.exceptions.TaskNotFoundException;
+import pro.taskana.model.Task;
 
 @ApplicationScoped
 public class ExampleBootstrap {
diff --git a/lib/taskana-cdi-example/src/main/java/org/taskana/TaskanaEjb.java b/lib/taskana-cdi-example/src/main/java/pro/taskana/TaskanaEjb.java
similarity index 90%
rename from lib/taskana-cdi-example/src/main/java/org/taskana/TaskanaEjb.java
rename to lib/taskana-cdi-example/src/main/java/pro/taskana/TaskanaEjb.java
index 01c0b9ffb..58c73a594 100644
--- a/lib/taskana-cdi-example/src/main/java/org/taskana/TaskanaEjb.java
+++ b/lib/taskana-cdi-example/src/main/java/pro/taskana/TaskanaEjb.java
@@ -1,4 +1,4 @@
-package org.taskana;
+package pro.taskana;
 
 import javax.ejb.Stateless;
 import javax.inject.Inject;
diff --git a/lib/taskana-cdi/pom.xml b/lib/taskana-cdi/pom.xml
index 3e6262bee..c23f36f21 100644
--- a/lib/taskana-cdi/pom.xml
+++ b/lib/taskana-cdi/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.taskana</groupId>
+	<groupId>pro.taskana</groupId>
 	<artifactId>taskana-cdi</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 
@@ -46,7 +46,7 @@
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.taskana</groupId>
+			<groupId>pro.taskana</groupId>
 			<artifactId>taskana-core</artifactId>
 			<version>0.0.1-SNAPSHOT</version>
 			<scope>provided</scope>
diff --git a/lib/taskana-cdi/src/main/java/org/taskana/TaskanaProducers.java b/lib/taskana-cdi/src/main/java/pro/taskana/TaskanaProducers.java
similarity index 95%
rename from lib/taskana-cdi/src/main/java/org/taskana/TaskanaProducers.java
rename to lib/taskana-cdi/src/main/java/pro/taskana/TaskanaProducers.java
index 278a3d5ff..4b33a890c 100644
--- a/lib/taskana-cdi/src/main/java/org/taskana/TaskanaProducers.java
+++ b/lib/taskana-cdi/src/main/java/pro/taskana/TaskanaProducers.java
@@ -1,4 +1,4 @@
-package org.taskana;
+package pro.taskana;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -16,7 +16,7 @@ import javax.sql.DataSource;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.taskana.configuration.TaskanaEngineConfiguration;
+import pro.taskana.configuration.TaskanaEngineConfiguration;
 
 @ApplicationScoped
 public class TaskanaProducers {
diff --git a/lib/taskana-cdi/src/test/java/org/taskana/RestApplication.java b/lib/taskana-cdi/src/test/java/pro/taskana/RestApplication.java
similarity index 88%
rename from lib/taskana-cdi/src/test/java/org/taskana/RestApplication.java
rename to lib/taskana-cdi/src/test/java/pro/taskana/RestApplication.java
index 8593197d5..3a1e6d4dc 100644
--- a/lib/taskana-cdi/src/test/java/org/taskana/RestApplication.java
+++ b/lib/taskana-cdi/src/test/java/pro/taskana/RestApplication.java
@@ -1,4 +1,4 @@
-package org.taskana;
+package pro.taskana;
 
 import javax.ws.rs.ApplicationPath;
 import javax.ws.rs.core.Application;
diff --git a/lib/taskana-cdi/src/test/java/org/taskana/TaskanaEjb.java b/lib/taskana-cdi/src/test/java/pro/taskana/TaskanaEjb.java
similarity index 79%
rename from lib/taskana-cdi/src/test/java/org/taskana/TaskanaEjb.java
rename to lib/taskana-cdi/src/test/java/pro/taskana/TaskanaEjb.java
index 5faa68d19..c89c70bbb 100644
--- a/lib/taskana-cdi/src/test/java/org/taskana/TaskanaEjb.java
+++ b/lib/taskana-cdi/src/test/java/pro/taskana/TaskanaEjb.java
@@ -1,10 +1,10 @@
-package org.taskana;
+package pro.taskana;
 
 import javax.ejb.Stateless;
 import javax.inject.Inject;
 
-import org.taskana.exceptions.NotAuthorizedException;
-import org.taskana.model.Task;
+import pro.taskana.exceptions.NotAuthorizedException;
+import pro.taskana.model.Task;
 
 @Stateless
 public class TaskanaEjb {
diff --git a/lib/taskana-cdi/src/test/java/org/taskana/TaskanaProducersTest.java b/lib/taskana-cdi/src/test/java/pro/taskana/TaskanaProducersTest.java
similarity index 95%
rename from lib/taskana-cdi/src/test/java/org/taskana/TaskanaProducersTest.java
rename to lib/taskana-cdi/src/test/java/pro/taskana/TaskanaProducersTest.java
index 47e1755e6..926d447be 100644
--- a/lib/taskana-cdi/src/test/java/org/taskana/TaskanaProducersTest.java
+++ b/lib/taskana-cdi/src/test/java/pro/taskana/TaskanaProducersTest.java
@@ -1,4 +1,4 @@
-package org.taskana;
+package pro.taskana;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
@@ -27,12 +27,12 @@ public class TaskanaProducersTest {
 	@Deployment(testable = false)
 	public static Archive<?> createDeployment() throws Exception {
 		WARArchive deployment = ShrinkWrap.create(WARArchive.class);
-		deployment.addPackage("org.taskana");
+		deployment.addPackage("pro.taskana");
 		deployment.addClass(TaskanaProducers.class);
 		deployment.addAllDependencies();
 		deployment.addDependency("org.mybatis:mybatis:3.4.2");
 		deployment.addDependency("org.mybatis:mybatis-cdi:1.0.0");
-		deployment.addDependency("org.taskana:taskana-core:0.0.1-SNAPSHOT");
+		deployment.addDependency("pro.taskana:taskana-core:0.0.1-SNAPSHOT");
 		deployment.addAsResource("META-INF/beans.xml");
 		deployment.addAsResource("taskana.properties");
 		deployment.addAsResource("project-defaults.yml");
diff --git a/lib/taskana-cdi/src/test/java/org/taskana/TaskanaRestTest.java b/lib/taskana-cdi/src/test/java/pro/taskana/TaskanaRestTest.java
similarity index 86%
rename from lib/taskana-cdi/src/test/java/org/taskana/TaskanaRestTest.java
rename to lib/taskana-cdi/src/test/java/pro/taskana/TaskanaRestTest.java
index 09aa52fab..842b9b7a0 100644
--- a/lib/taskana-cdi/src/test/java/org/taskana/TaskanaRestTest.java
+++ b/lib/taskana-cdi/src/test/java/pro/taskana/TaskanaRestTest.java
@@ -1,4 +1,4 @@
-package org.taskana;
+package pro.taskana;
 
 import javax.ejb.EJB;
 import javax.ws.rs.DELETE;
@@ -10,9 +10,9 @@ import javax.ws.rs.core.Response;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.taskana.exceptions.NotAuthorizedException;
-import org.taskana.exceptions.TaskNotFoundException;
-import org.taskana.model.Task;
+import pro.taskana.exceptions.NotAuthorizedException;
+import pro.taskana.exceptions.TaskNotFoundException;
+import pro.taskana.model.Task;
 
 @Path("/test")
 public class TaskanaRestTest {
diff --git a/lib/taskana-core/pom.xml b/lib/taskana-core/pom.xml
index d5840c690..986471038 100644
--- a/lib/taskana-core/pom.xml
+++ b/lib/taskana-core/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.taskana</groupId>
+	<groupId>pro.taskana</groupId>
 	<artifactId>taskana-core</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 
diff --git a/lib/taskana-core/src/main/java/org/taskana/ClassificationService.java b/lib/taskana-core/src/main/java/pro/taskana/ClassificationService.java
similarity index 89%
rename from lib/taskana-core/src/main/java/org/taskana/ClassificationService.java
rename to lib/taskana-core/src/main/java/pro/taskana/ClassificationService.java
index 6e726f516..e3a05c7fa 100644
--- a/lib/taskana-core/src/main/java/org/taskana/ClassificationService.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/ClassificationService.java
@@ -1,8 +1,8 @@
-package org.taskana;
+package pro.taskana;
 
-import org.taskana.exceptions.NotAuthorizedException;
-import org.taskana.model.Classification;
-import org.taskana.persistence.ClassificationQuery;
+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/org/taskana/TaskService.java b/lib/taskana-core/src/main/java/pro/taskana/TaskService.java
similarity index 86%
rename from lib/taskana-core/src/main/java/org/taskana/TaskService.java
rename to lib/taskana-core/src/main/java/pro/taskana/TaskService.java
index 0cb2541ac..cb12f5e58 100644
--- a/lib/taskana-core/src/main/java/org/taskana/TaskService.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/TaskService.java
@@ -1,15 +1,15 @@
-package org.taskana;
+package pro.taskana;
 
 import java.util.List;
 
-import org.taskana.exceptions.NotAuthorizedException;
-import org.taskana.exceptions.TaskNotFoundException;
-import org.taskana.exceptions.WorkbasketNotFoundException;
-import org.taskana.model.DueWorkbasketCounter;
-import org.taskana.model.Task;
-import org.taskana.model.TaskState;
-import org.taskana.model.TaskStateCounter;
-import org.taskana.persistence.TaskQuery;
+import pro.taskana.exceptions.NotAuthorizedException;
+import pro.taskana.exceptions.TaskNotFoundException;
+import pro.taskana.exceptions.WorkbasketNotFoundException;
+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/org/taskana/TaskanaEngine.java b/lib/taskana-core/src/main/java/pro/taskana/TaskanaEngine.java
similarity index 90%
rename from lib/taskana-core/src/main/java/org/taskana/TaskanaEngine.java
rename to lib/taskana-core/src/main/java/pro/taskana/TaskanaEngine.java
index a53b99528..c2fabae30 100644
--- a/lib/taskana-core/src/main/java/org/taskana/TaskanaEngine.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/TaskanaEngine.java
@@ -1,6 +1,6 @@
-package org.taskana;
+package pro.taskana;
 
-import org.taskana.configuration.TaskanaEngineConfiguration;
+import pro.taskana.configuration.TaskanaEngineConfiguration;
 
 /**
  * The TaskanaEngine represents an overall set of all needed services.
diff --git a/lib/taskana-core/src/main/java/org/taskana/WorkbasketService.java b/lib/taskana-core/src/main/java/pro/taskana/WorkbasketService.java
similarity index 92%
rename from lib/taskana-core/src/main/java/org/taskana/WorkbasketService.java
rename to lib/taskana-core/src/main/java/pro/taskana/WorkbasketService.java
index e6beabaa3..936012076 100644
--- a/lib/taskana-core/src/main/java/org/taskana/WorkbasketService.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/WorkbasketService.java
@@ -1,12 +1,12 @@
-package org.taskana;
+package pro.taskana;
 
 import java.util.List;
 
-import org.taskana.exceptions.NotAuthorizedException;
-import org.taskana.exceptions.WorkbasketNotFoundException;
-import org.taskana.model.Workbasket;
-import org.taskana.model.WorkbasketAccessItem;
-import org.taskana.model.WorkbasketAuthorization;
+import pro.taskana.exceptions.NotAuthorizedException;
+import pro.taskana.exceptions.WorkbasketNotFoundException;
+import pro.taskana.model.Workbasket;
+import pro.taskana.model.WorkbasketAccessItem;
+import pro.taskana.model.WorkbasketAuthorization;
 
 /**
  * This service manages the Workbaskets.
diff --git a/lib/taskana-core/src/main/java/org/taskana/configuration/DbScriptRunner.java b/lib/taskana-core/src/main/java/pro/taskana/configuration/DbScriptRunner.java
similarity index 98%
rename from lib/taskana-core/src/main/java/org/taskana/configuration/DbScriptRunner.java
rename to lib/taskana-core/src/main/java/pro/taskana/configuration/DbScriptRunner.java
index ac32342dc..8820e6e02 100644
--- a/lib/taskana-core/src/main/java/org/taskana/configuration/DbScriptRunner.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/configuration/DbScriptRunner.java
@@ -1,4 +1,4 @@
-package org.taskana.configuration;
+package pro.taskana.configuration;
 
 import java.io.InputStreamReader;
 import java.io.PrintWriter;
diff --git a/lib/taskana-core/src/main/java/org/taskana/configuration/TaskanaEngineConfiguration.java b/lib/taskana-core/src/main/java/pro/taskana/configuration/TaskanaEngineConfiguration.java
similarity index 96%
rename from lib/taskana-core/src/main/java/org/taskana/configuration/TaskanaEngineConfiguration.java
rename to lib/taskana-core/src/main/java/pro/taskana/configuration/TaskanaEngineConfiguration.java
index 8d538f634..d9fb30821 100644
--- a/lib/taskana-core/src/main/java/org/taskana/configuration/TaskanaEngineConfiguration.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/configuration/TaskanaEngineConfiguration.java
@@ -1,4 +1,4 @@
-package org.taskana.configuration;
+package pro.taskana.configuration;
 
 import java.sql.SQLException;
 
@@ -7,8 +7,8 @@ import javax.sql.DataSource;
 import org.apache.ibatis.datasource.pooled.PooledDataSource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.taskana.TaskanaEngine;
-import org.taskana.impl.TaskanaEngineImpl;
+import pro.taskana.TaskanaEngine;
+import pro.taskana.impl.TaskanaEngineImpl;
 
 /**
  * This central class creates the TaskanaEngine and needs all the information
diff --git a/lib/taskana-core/src/main/java/org/taskana/exceptions/NotAuthorizedException.java b/lib/taskana-core/src/main/java/pro/taskana/exceptions/NotAuthorizedException.java
similarity index 87%
rename from lib/taskana-core/src/main/java/org/taskana/exceptions/NotAuthorizedException.java
rename to lib/taskana-core/src/main/java/pro/taskana/exceptions/NotAuthorizedException.java
index 2064668b0..5a20accbe 100644
--- a/lib/taskana-core/src/main/java/org/taskana/exceptions/NotAuthorizedException.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/exceptions/NotAuthorizedException.java
@@ -1,4 +1,4 @@
-package org.taskana.exceptions;
+package pro.taskana.exceptions;
 
 /**
  * This exception is used to communicate a not authorized user.
diff --git a/lib/taskana-core/src/main/java/org/taskana/exceptions/NotFoundException.java b/lib/taskana-core/src/main/java/pro/taskana/exceptions/NotFoundException.java
similarity index 88%
rename from lib/taskana-core/src/main/java/org/taskana/exceptions/NotFoundException.java
rename to lib/taskana-core/src/main/java/pro/taskana/exceptions/NotFoundException.java
index 5cd8ff161..8a2456b7e 100644
--- a/lib/taskana-core/src/main/java/org/taskana/exceptions/NotFoundException.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/exceptions/NotFoundException.java
@@ -1,4 +1,4 @@
-package org.taskana.exceptions;
+package pro.taskana.exceptions;
 
 /**
  * This exception will be thrown if a specific object is not in the database.
diff --git a/lib/taskana-core/src/main/java/org/taskana/exceptions/TaskNotFoundException.java b/lib/taskana-core/src/main/java/pro/taskana/exceptions/TaskNotFoundException.java
similarity index 89%
rename from lib/taskana-core/src/main/java/org/taskana/exceptions/TaskNotFoundException.java
rename to lib/taskana-core/src/main/java/pro/taskana/exceptions/TaskNotFoundException.java
index 372d48ec7..954b01808 100644
--- a/lib/taskana-core/src/main/java/org/taskana/exceptions/TaskNotFoundException.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/exceptions/TaskNotFoundException.java
@@ -1,4 +1,4 @@
-package org.taskana.exceptions;
+package pro.taskana.exceptions;
 
 /**
  * This exception will be thrown if a specific task is not in the database.
diff --git a/lib/taskana-core/src/main/java/org/taskana/exceptions/WorkbasketNotFoundException.java b/lib/taskana-core/src/main/java/pro/taskana/exceptions/WorkbasketNotFoundException.java
similarity index 90%
rename from lib/taskana-core/src/main/java/org/taskana/exceptions/WorkbasketNotFoundException.java
rename to lib/taskana-core/src/main/java/pro/taskana/exceptions/WorkbasketNotFoundException.java
index 7ced17d93..d43c17659 100644
--- a/lib/taskana-core/src/main/java/org/taskana/exceptions/WorkbasketNotFoundException.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/exceptions/WorkbasketNotFoundException.java
@@ -1,4 +1,4 @@
-package org.taskana.exceptions;
+package pro.taskana.exceptions;
 
 /**
  * This exception will be thrown if a specific workbasket is not in the database.
diff --git a/lib/taskana-core/src/main/java/org/taskana/impl/ClassificationServiceImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/ClassificationServiceImpl.java
similarity index 92%
rename from lib/taskana-core/src/main/java/org/taskana/impl/ClassificationServiceImpl.java
rename to lib/taskana-core/src/main/java/pro/taskana/impl/ClassificationServiceImpl.java
index 599ea2b13..ef1d55a1c 100644
--- a/lib/taskana-core/src/main/java/org/taskana/impl/ClassificationServiceImpl.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/impl/ClassificationServiceImpl.java
@@ -1,13 +1,13 @@
-package org.taskana.impl;
+package pro.taskana.impl;
 
-import org.taskana.ClassificationService;
-import org.taskana.TaskanaEngine;
-import org.taskana.exceptions.NotAuthorizedException;
-import org.taskana.impl.persistence.ClassificationQueryImpl;
-import org.taskana.impl.util.IdGenerator;
-import org.taskana.model.Classification;
-import org.taskana.model.mappings.ClassificationMapper;
-import org.taskana.persistence.ClassificationQuery;
+import pro.taskana.ClassificationService;
+import pro.taskana.TaskanaEngine;
+import pro.taskana.exceptions.NotAuthorizedException;
+import pro.taskana.impl.persistence.ClassificationQueryImpl;
+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/org/taskana/impl/TaskServiceImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/TaskServiceImpl.java
similarity index 89%
rename from lib/taskana-core/src/main/java/org/taskana/impl/TaskServiceImpl.java
rename to lib/taskana-core/src/main/java/pro/taskana/impl/TaskServiceImpl.java
index 7c6643d53..874ed85bb 100644
--- a/lib/taskana-core/src/main/java/org/taskana/impl/TaskServiceImpl.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/impl/TaskServiceImpl.java
@@ -1,4 +1,4 @@
-package org.taskana.impl;
+package pro.taskana.impl;
 
 import java.sql.Date;
 import java.sql.Timestamp;
@@ -8,22 +8,22 @@ import java.util.List;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.taskana.TaskService;
-import org.taskana.TaskanaEngine;
-import org.taskana.exceptions.NotAuthorizedException;
-import org.taskana.exceptions.TaskNotFoundException;
-import org.taskana.exceptions.WorkbasketNotFoundException;
-import org.taskana.impl.persistence.TaskQueryImpl;
-import org.taskana.impl.util.IdGenerator;
-import org.taskana.model.DueWorkbasketCounter;
-import org.taskana.model.ObjectReference;
-import org.taskana.model.Task;
-import org.taskana.model.TaskState;
-import org.taskana.model.TaskStateCounter;
-import org.taskana.model.WorkbasketAuthorization;
-import org.taskana.model.mappings.ObjectReferenceMapper;
-import org.taskana.model.mappings.TaskMapper;
-import org.taskana.persistence.TaskQuery;
+import pro.taskana.TaskService;
+import pro.taskana.TaskanaEngine;
+import pro.taskana.exceptions.NotAuthorizedException;
+import pro.taskana.exceptions.TaskNotFoundException;
+import pro.taskana.exceptions.WorkbasketNotFoundException;
+import pro.taskana.impl.persistence.TaskQueryImpl;
+import pro.taskana.impl.util.IdGenerator;
+import pro.taskana.model.DueWorkbasketCounter;
+import pro.taskana.model.ObjectReference;
+import pro.taskana.model.Task;
+import pro.taskana.model.TaskState;
+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/main/java/org/taskana/impl/TaskanaEngineImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/TaskanaEngineImpl.java
similarity index 84%
rename from lib/taskana-core/src/main/java/org/taskana/impl/TaskanaEngineImpl.java
rename to lib/taskana-core/src/main/java/pro/taskana/impl/TaskanaEngineImpl.java
index 45a8bf664..55e8368fe 100644
--- a/lib/taskana-core/src/main/java/org/taskana/impl/TaskanaEngineImpl.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/impl/TaskanaEngineImpl.java
@@ -1,4 +1,4 @@
-package org.taskana.impl;
+package pro.taskana.impl;
 
 import org.apache.ibatis.mapping.Environment;
 import org.apache.ibatis.session.Configuration;
@@ -8,19 +8,19 @@ import org.apache.ibatis.session.SqlSessionFactoryBuilder;
 import org.apache.ibatis.transaction.TransactionFactory;
 import org.apache.ibatis.transaction.jdbc.JdbcTransactionFactory;
 import org.apache.ibatis.transaction.managed.ManagedTransactionFactory;
-import org.taskana.ClassificationService;
-import org.taskana.TaskService;
-import org.taskana.TaskanaEngine;
-import org.taskana.WorkbasketService;
-import org.taskana.configuration.TaskanaEngineConfiguration;
-import org.taskana.impl.persistence.MapTypeHandler;
-import org.taskana.model.mappings.ClassificationMapper;
-import org.taskana.model.mappings.DistributionTargetMapper;
-import org.taskana.model.mappings.ObjectReferenceMapper;
-import org.taskana.model.mappings.QueryMapper;
-import org.taskana.model.mappings.TaskMapper;
-import org.taskana.model.mappings.WorkbasketAccessMapper;
-import org.taskana.model.mappings.WorkbasketMapper;
+import pro.taskana.ClassificationService;
+import pro.taskana.TaskService;
+import pro.taskana.TaskanaEngine;
+import pro.taskana.WorkbasketService;
+import pro.taskana.configuration.TaskanaEngineConfiguration;
+import pro.taskana.impl.persistence.MapTypeHandler;
+import pro.taskana.model.mappings.ClassificationMapper;
+import pro.taskana.model.mappings.DistributionTargetMapper;
+import pro.taskana.model.mappings.ObjectReferenceMapper;
+import pro.taskana.model.mappings.QueryMapper;
+import pro.taskana.model.mappings.TaskMapper;
+import pro.taskana.model.mappings.WorkbasketAccessMapper;
+import pro.taskana.model.mappings.WorkbasketMapper;
 
 /**
  * This is the implementation of TaskanaEngine.
@@ -32,6 +32,7 @@ public class TaskanaEngineImpl implements TaskanaEngine {
     protected TaskanaEngineConfiguration taskanaEngineConfiguration;
     protected SqlSession session;
     protected TransactionFactory transactionFactory;
+    protected SqlSessionFactory sessionFactory;
 
     private TaskMapper taskMapper;
     private WorkbasketMapper workbasketMapper;
@@ -107,7 +108,8 @@ public class TaskanaEngineImpl implements TaskanaEngine {
         configuration.addMapper(ObjectReferenceMapper.class);
         configuration.addMapper(QueryMapper.class);
         configuration.getTypeHandlerRegistry().register(MapTypeHandler.class);
-        return new SqlSessionFactoryBuilder().build(configuration);
+        sessionFactory = new SqlSessionFactoryBuilder().build(configuration);
+        return sessionFactory;
     }
 
     private void createTransactionFactory(boolean useContainerManagedTransactions) {
diff --git a/lib/taskana-core/src/main/java/org/taskana/impl/WorkbasketServiceImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketServiceImpl.java
similarity index 91%
rename from lib/taskana-core/src/main/java/org/taskana/impl/WorkbasketServiceImpl.java
rename to lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketServiceImpl.java
index 5edcb7026..5b621d553 100644
--- a/lib/taskana-core/src/main/java/org/taskana/impl/WorkbasketServiceImpl.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketServiceImpl.java
@@ -1,22 +1,22 @@
-package org.taskana.impl;
+package pro.taskana.impl;
 
 import java.sql.Timestamp;
 import java.util.List;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.taskana.TaskanaEngine;
-import org.taskana.WorkbasketService;
-import org.taskana.exceptions.NotAuthorizedException;
-import org.taskana.exceptions.WorkbasketNotFoundException;
-import org.taskana.impl.util.IdGenerator;
-import org.taskana.model.Workbasket;
-import org.taskana.model.WorkbasketAccessItem;
-import org.taskana.model.WorkbasketAuthorization;
-import org.taskana.model.mappings.DistributionTargetMapper;
-import org.taskana.model.mappings.WorkbasketAccessMapper;
-import org.taskana.model.mappings.WorkbasketMapper;
-import org.taskana.security.CurrentUserContext;
+import pro.taskana.TaskanaEngine;
+import pro.taskana.WorkbasketService;
+import pro.taskana.exceptions.NotAuthorizedException;
+import pro.taskana.exceptions.WorkbasketNotFoundException;
+import pro.taskana.impl.util.IdGenerator;
+import pro.taskana.model.Workbasket;
+import pro.taskana.model.WorkbasketAccessItem;
+import pro.taskana.model.WorkbasketAuthorization;
+import pro.taskana.model.mappings.DistributionTargetMapper;
+import pro.taskana.model.mappings.WorkbasketAccessMapper;
+import pro.taskana.model.mappings.WorkbasketMapper;
+import pro.taskana.security.CurrentUserContext;
 /**
  * This is the implementation of WorkbasketService.
  */
diff --git a/lib/taskana-core/src/main/java/org/taskana/impl/persistence/ClassificationQueryImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/persistence/ClassificationQueryImpl.java
similarity index 95%
rename from lib/taskana-core/src/main/java/org/taskana/impl/persistence/ClassificationQueryImpl.java
rename to lib/taskana-core/src/main/java/pro/taskana/impl/persistence/ClassificationQueryImpl.java
index bcd7cf006..9c9247d81 100644
--- a/lib/taskana-core/src/main/java/org/taskana/impl/persistence/ClassificationQueryImpl.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/impl/persistence/ClassificationQueryImpl.java
@@ -1,10 +1,10 @@
-package org.taskana.impl.persistence;
+package pro.taskana.impl.persistence;
 
 import org.apache.ibatis.session.RowBounds;
-import org.taskana.TaskanaEngine;
-import org.taskana.impl.TaskanaEngineImpl;
-import org.taskana.model.Classification;
-import org.taskana.persistence.ClassificationQuery;
+import pro.taskana.TaskanaEngine;
+import pro.taskana.impl.TaskanaEngineImpl;
+import pro.taskana.model.Classification;
+import pro.taskana.persistence.ClassificationQuery;
 
 import java.util.Date;
 import java.util.List;
@@ -15,7 +15,7 @@ import java.util.List;
  */
 public class ClassificationQueryImpl implements ClassificationQuery {
 
-    private static final String LINK_TO_MAPPER = "org.taskana.model.mappings.QueryMapper.queryClassification";
+    private static final String LINK_TO_MAPPER = "pro.taskana.model.mappings.QueryMapper.queryClassification";
     private TaskanaEngineImpl taskanaEngine;
     private String[] parentClassificationId;
     private String[] category;
diff --git a/lib/taskana-core/src/main/java/org/taskana/impl/persistence/MapTypeHandler.java b/lib/taskana-core/src/main/java/pro/taskana/impl/persistence/MapTypeHandler.java
similarity index 98%
rename from lib/taskana-core/src/main/java/org/taskana/impl/persistence/MapTypeHandler.java
rename to lib/taskana-core/src/main/java/pro/taskana/impl/persistence/MapTypeHandler.java
index e3670d9dd..06e3744a9 100644
--- a/lib/taskana-core/src/main/java/org/taskana/impl/persistence/MapTypeHandler.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/impl/persistence/MapTypeHandler.java
@@ -1,4 +1,4 @@
-package org.taskana.impl.persistence;
+package pro.taskana.impl.persistence;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
diff --git a/lib/taskana-core/src/main/java/org/taskana/impl/persistence/ObjectReferenceQueryImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/persistence/ObjectReferenceQueryImpl.java
similarity index 91%
rename from lib/taskana-core/src/main/java/org/taskana/impl/persistence/ObjectReferenceQueryImpl.java
rename to lib/taskana-core/src/main/java/pro/taskana/impl/persistence/ObjectReferenceQueryImpl.java
index 8bedc4ef6..0e55d6b55 100644
--- a/lib/taskana-core/src/main/java/org/taskana/impl/persistence/ObjectReferenceQueryImpl.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/impl/persistence/ObjectReferenceQueryImpl.java
@@ -1,12 +1,12 @@
-package org.taskana.impl.persistence;
+package pro.taskana.impl.persistence;
 
 import java.util.List;
 
 import org.apache.ibatis.session.RowBounds;
-import org.taskana.TaskanaEngine;
-import org.taskana.impl.TaskanaEngineImpl;
-import org.taskana.model.ObjectReference;
-import org.taskana.persistence.ObjectReferenceQuery;
+import pro.taskana.TaskanaEngine;
+import pro.taskana.impl.TaskanaEngineImpl;
+import pro.taskana.model.ObjectReference;
+import pro.taskana.persistence.ObjectReferenceQuery;
 
 /**
  * Implementation of ObjectReferenceQuery interface.
@@ -14,7 +14,7 @@ import org.taskana.persistence.ObjectReferenceQuery;
  */
 public class ObjectReferenceQueryImpl implements ObjectReferenceQuery {
 
-    private static final String LINK_TO_MAPPER = "org.taskana.model.mappings.QueryMapper.queryObjectReference";
+    private static final String LINK_TO_MAPPER = "pro.taskana.model.mappings.QueryMapper.queryObjectReference";
 
     private TaskanaEngineImpl taskanaEngine;
     private String tenantId;
diff --git a/lib/taskana-core/src/main/java/org/taskana/impl/persistence/TaskQueryImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/persistence/TaskQueryImpl.java
similarity index 92%
rename from lib/taskana-core/src/main/java/org/taskana/impl/persistence/TaskQueryImpl.java
rename to lib/taskana-core/src/main/java/pro/taskana/impl/persistence/TaskQueryImpl.java
index bf0972e91..2431bbcec 100644
--- a/lib/taskana-core/src/main/java/org/taskana/impl/persistence/TaskQueryImpl.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/impl/persistence/TaskQueryImpl.java
@@ -1,24 +1,24 @@
-package org.taskana.impl.persistence;
+package pro.taskana.impl.persistence;
 
 import java.util.List;
 
 import org.apache.ibatis.session.RowBounds;
-import org.taskana.TaskanaEngine;
-import org.taskana.exceptions.NotAuthorizedException;
-import org.taskana.impl.TaskanaEngineImpl;
-import org.taskana.model.Task;
-import org.taskana.model.TaskState;
-import org.taskana.model.WorkbasketAuthorization;
-import org.taskana.persistence.ClassificationQuery;
-import org.taskana.persistence.ObjectReferenceQuery;
-import org.taskana.persistence.TaskQuery;
+import pro.taskana.TaskanaEngine;
+import pro.taskana.exceptions.NotAuthorizedException;
+import pro.taskana.impl.TaskanaEngineImpl;
+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.
  */
 public class TaskQueryImpl implements TaskQuery {
 
-    private static final String LINK_TO_MAPPER = "org.taskana.model.mappings.QueryMapper.queryTasks";
+    private static final String LINK_TO_MAPPER = "pro.taskana.model.mappings.QueryMapper.queryTasks";
 
     private TaskanaEngineImpl taskanaEngine;
 
diff --git a/lib/taskana-core/src/main/java/org/taskana/impl/util/IdGenerator.java b/lib/taskana-core/src/main/java/pro/taskana/impl/util/IdGenerator.java
similarity index 94%
rename from lib/taskana-core/src/main/java/org/taskana/impl/util/IdGenerator.java
rename to lib/taskana-core/src/main/java/pro/taskana/impl/util/IdGenerator.java
index fce393c78..5e8a8aeb2 100644
--- a/lib/taskana-core/src/main/java/org/taskana/impl/util/IdGenerator.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/impl/util/IdGenerator.java
@@ -1,4 +1,4 @@
-package org.taskana.impl.util;
+package pro.taskana.impl.util;
 
 import java.util.UUID;
 
diff --git a/lib/taskana-core/src/main/java/org/taskana/model/Classification.java b/lib/taskana-core/src/main/java/pro/taskana/model/Classification.java
similarity index 99%
rename from lib/taskana-core/src/main/java/org/taskana/model/Classification.java
rename to lib/taskana-core/src/main/java/pro/taskana/model/Classification.java
index e7414af2f..9e976101e 100644
--- a/lib/taskana-core/src/main/java/org/taskana/model/Classification.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/model/Classification.java
@@ -1,4 +1,4 @@
-package org.taskana.model;
+package pro.taskana.model;
 
 import java.sql.Date;
 
diff --git a/lib/taskana-core/src/main/java/org/taskana/model/DueWorkbasketCounter.java b/lib/taskana-core/src/main/java/pro/taskana/model/DueWorkbasketCounter.java
similarity index 96%
rename from lib/taskana-core/src/main/java/org/taskana/model/DueWorkbasketCounter.java
rename to lib/taskana-core/src/main/java/pro/taskana/model/DueWorkbasketCounter.java
index b4dfee7b7..2e12ed9ef 100644
--- a/lib/taskana-core/src/main/java/org/taskana/model/DueWorkbasketCounter.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/model/DueWorkbasketCounter.java
@@ -1,4 +1,4 @@
-package org.taskana.model;
+package pro.taskana.model;
 
 import java.sql.Date;
 
diff --git a/lib/taskana-core/src/main/java/org/taskana/model/ObjectReference.java b/lib/taskana-core/src/main/java/pro/taskana/model/ObjectReference.java
similarity index 98%
rename from lib/taskana-core/src/main/java/org/taskana/model/ObjectReference.java
rename to lib/taskana-core/src/main/java/pro/taskana/model/ObjectReference.java
index 5b2d8984e..53da57435 100644
--- a/lib/taskana-core/src/main/java/org/taskana/model/ObjectReference.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/model/ObjectReference.java
@@ -1,4 +1,4 @@
-package org.taskana.model;
+package pro.taskana.model;
 
 /**
  * ObjectReference entity.
diff --git a/lib/taskana-core/src/main/java/org/taskana/model/Task.java b/lib/taskana-core/src/main/java/pro/taskana/model/Task.java
similarity index 99%
rename from lib/taskana-core/src/main/java/org/taskana/model/Task.java
rename to lib/taskana-core/src/main/java/pro/taskana/model/Task.java
index 1873eddd4..3f950151a 100644
--- a/lib/taskana-core/src/main/java/org/taskana/model/Task.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/model/Task.java
@@ -1,4 +1,4 @@
-package org.taskana.model;
+package pro.taskana.model;
 
 import java.sql.Timestamp;
 import java.util.Collections;
diff --git a/lib/taskana-core/src/main/java/org/taskana/model/TaskState.java b/lib/taskana-core/src/main/java/pro/taskana/model/TaskState.java
similarity index 80%
rename from lib/taskana-core/src/main/java/org/taskana/model/TaskState.java
rename to lib/taskana-core/src/main/java/pro/taskana/model/TaskState.java
index 7699e0652..3138d1575 100644
--- a/lib/taskana-core/src/main/java/org/taskana/model/TaskState.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/model/TaskState.java
@@ -1,4 +1,4 @@
-package org.taskana.model;
+package pro.taskana.model;
 
 /**
  * This enum contains all status of the tasks.
diff --git a/lib/taskana-core/src/main/java/org/taskana/model/TaskStateCounter.java b/lib/taskana-core/src/main/java/pro/taskana/model/TaskStateCounter.java
similarity index 93%
rename from lib/taskana-core/src/main/java/org/taskana/model/TaskStateCounter.java
rename to lib/taskana-core/src/main/java/pro/taskana/model/TaskStateCounter.java
index 36da12665..f047988dd 100644
--- a/lib/taskana-core/src/main/java/org/taskana/model/TaskStateCounter.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/model/TaskStateCounter.java
@@ -1,4 +1,4 @@
-package org.taskana.model;
+package pro.taskana.model;
 
 /**
  * TaskStateCounter entity.
diff --git a/lib/taskana-core/src/main/java/org/taskana/model/Workbasket.java b/lib/taskana-core/src/main/java/pro/taskana/model/Workbasket.java
similarity index 98%
rename from lib/taskana-core/src/main/java/org/taskana/model/Workbasket.java
rename to lib/taskana-core/src/main/java/pro/taskana/model/Workbasket.java
index 7af1e8784..782f61053 100644
--- a/lib/taskana-core/src/main/java/org/taskana/model/Workbasket.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/model/Workbasket.java
@@ -1,4 +1,4 @@
-package org.taskana.model;
+package pro.taskana.model;
 
 import java.sql.Timestamp;
 import java.util.ArrayList;
diff --git a/lib/taskana-core/src/main/java/org/taskana/model/WorkbasketAccessItem.java b/lib/taskana-core/src/main/java/pro/taskana/model/WorkbasketAccessItem.java
similarity index 98%
rename from lib/taskana-core/src/main/java/org/taskana/model/WorkbasketAccessItem.java
rename to lib/taskana-core/src/main/java/pro/taskana/model/WorkbasketAccessItem.java
index 610c40053..61ee36bf6 100644
--- a/lib/taskana-core/src/main/java/org/taskana/model/WorkbasketAccessItem.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/model/WorkbasketAccessItem.java
@@ -1,4 +1,4 @@
-package org.taskana.model;
+package pro.taskana.model;
 
 /**
  * WorkbasketAccessItem entity.
diff --git a/lib/taskana-core/src/main/java/org/taskana/model/WorkbasketAuthorization.java b/lib/taskana-core/src/main/java/pro/taskana/model/WorkbasketAuthorization.java
similarity index 85%
rename from lib/taskana-core/src/main/java/org/taskana/model/WorkbasketAuthorization.java
rename to lib/taskana-core/src/main/java/pro/taskana/model/WorkbasketAuthorization.java
index 82876ed16..75b45b4af 100644
--- a/lib/taskana-core/src/main/java/org/taskana/model/WorkbasketAuthorization.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/model/WorkbasketAuthorization.java
@@ -1,4 +1,4 @@
-package org.taskana.model;
+package pro.taskana.model;
 
 /**
  * This enum contains all permission values for the workbaskets.
diff --git a/lib/taskana-core/src/main/java/org/taskana/model/mappings/ClassificationMapper.java b/lib/taskana-core/src/main/java/pro/taskana/model/mappings/ClassificationMapper.java
similarity index 98%
rename from lib/taskana-core/src/main/java/org/taskana/model/mappings/ClassificationMapper.java
rename to lib/taskana-core/src/main/java/pro/taskana/model/mappings/ClassificationMapper.java
index 80cad5a3d..cd29af8e6 100644
--- a/lib/taskana-core/src/main/java/org/taskana/model/mappings/ClassificationMapper.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/model/mappings/ClassificationMapper.java
@@ -1,7 +1,7 @@
-package org.taskana.model.mappings;
+package pro.taskana.model.mappings;
 
 import org.apache.ibatis.annotations.*;
-import org.taskana.model.Classification;
+import pro.taskana.model.Classification;
 
 import java.sql.Date;
 import java.util.List;
diff --git a/lib/taskana-core/src/main/java/org/taskana/model/mappings/DistributionTargetMapper.java b/lib/taskana-core/src/main/java/pro/taskana/model/mappings/DistributionTargetMapper.java
similarity index 97%
rename from lib/taskana-core/src/main/java/org/taskana/model/mappings/DistributionTargetMapper.java
rename to lib/taskana-core/src/main/java/pro/taskana/model/mappings/DistributionTargetMapper.java
index 56f4bc197..2fedf6f1b 100644
--- a/lib/taskana-core/src/main/java/org/taskana/model/mappings/DistributionTargetMapper.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/model/mappings/DistributionTargetMapper.java
@@ -1,4 +1,4 @@
-package org.taskana.model.mappings;
+package pro.taskana.model.mappings;
 
 import java.util.List;
 
diff --git a/lib/taskana-core/src/main/java/org/taskana/model/mappings/ObjectReferenceMapper.java b/lib/taskana-core/src/main/java/pro/taskana/model/mappings/ObjectReferenceMapper.java
similarity index 97%
rename from lib/taskana-core/src/main/java/org/taskana/model/mappings/ObjectReferenceMapper.java
rename to lib/taskana-core/src/main/java/pro/taskana/model/mappings/ObjectReferenceMapper.java
index 4e6a2aaf3..8afdfb961 100644
--- a/lib/taskana-core/src/main/java/org/taskana/model/mappings/ObjectReferenceMapper.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/model/mappings/ObjectReferenceMapper.java
@@ -1,4 +1,4 @@
-package org.taskana.model.mappings;
+package pro.taskana.model.mappings;
 
 import java.util.List;
 
@@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Result;
 import org.apache.ibatis.annotations.Results;
 import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
-import org.taskana.model.ObjectReference;
+import pro.taskana.model.ObjectReference;
 /**
  * This class is the mybatis mapping of ObjectReference.
  */
diff --git a/lib/taskana-core/src/main/java/org/taskana/model/mappings/QueryMapper.java b/lib/taskana-core/src/main/java/pro/taskana/model/mappings/QueryMapper.java
similarity index 97%
rename from lib/taskana-core/src/main/java/org/taskana/model/mappings/QueryMapper.java
rename to lib/taskana-core/src/main/java/pro/taskana/model/mappings/QueryMapper.java
index e4991cc3a..41d966c06 100644
--- a/lib/taskana-core/src/main/java/org/taskana/model/mappings/QueryMapper.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/model/mappings/QueryMapper.java
@@ -1,15 +1,15 @@
-package org.taskana.model.mappings;
+package pro.taskana.model.mappings;
 
 import org.apache.ibatis.annotations.One;
 import org.apache.ibatis.annotations.Result;
 import org.apache.ibatis.annotations.Results;
 import org.apache.ibatis.annotations.Select;
-import org.taskana.impl.persistence.ClassificationQueryImpl;
-import org.taskana.impl.persistence.ObjectReferenceQueryImpl;
-import org.taskana.impl.persistence.TaskQueryImpl;
-import org.taskana.model.Classification;
-import org.taskana.model.ObjectReference;
-import org.taskana.model.Task;
+import pro.taskana.impl.persistence.ClassificationQueryImpl;
+import pro.taskana.impl.persistence.ObjectReferenceQueryImpl;
+import pro.taskana.impl.persistence.TaskQueryImpl;
+import pro.taskana.model.Classification;
+import pro.taskana.model.ObjectReference;
+import pro.taskana.model.Task;
 
 import java.util.List;
 
@@ -18,8 +18,8 @@ import java.util.List;
  */
 public interface QueryMapper {
 
-    String OBJECTREFERENCEMAPPER_FINDBYID = "org.taskana.model.mappings.ObjectReferenceMapper.findById";
-    String CLASSIFICATION_FINDBYID = "org.taskana.model.mappings.ClassificationMapper.findByIdAndDomain";
+    String OBJECTREFERENCEMAPPER_FINDBYID = "pro.taskana.model.mappings.ObjectReferenceMapper.findById";
+    String CLASSIFICATION_FINDBYID = "pro.taskana.model.mappings.ClassificationMapper.findByIdAndDomain";
 
     @Select("<script>SELECT t.ID, t.TENANT_ID, t.CREATED, t.CLAIMED, t.COMPLETED, t.MODIFIED, t.PLANNED, t.DUE, t.NAME, t.DESCRIPTION, t.PRIORITY, t.STATE, t.CLASSIFICATION_ID, t.WORKBASKETID, t.OWNER, t.PRIMARY_OBJ_REF_ID, t.IS_READ, t.IS_TRANSFERRED, t.CUSTOM_1, t.CUSTOM_2, t.CUSTOM_3, t.CUSTOM_4, t.CUSTOM_5, t.CUSTOM_6, t.CUSTOM_7, t.CUSTOM_8, t.CUSTOM_9, t.CUSTOM_10 "
             + "FROM TASK t "
diff --git a/lib/taskana-core/src/main/java/org/taskana/model/mappings/TaskMapper.java b/lib/taskana-core/src/main/java/pro/taskana/model/mappings/TaskMapper.java
similarity index 94%
rename from lib/taskana-core/src/main/java/org/taskana/model/mappings/TaskMapper.java
rename to lib/taskana-core/src/main/java/pro/taskana/model/mappings/TaskMapper.java
index 500fcc52b..5ac4eed0e 100644
--- a/lib/taskana-core/src/main/java/org/taskana/model/mappings/TaskMapper.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/model/mappings/TaskMapper.java
@@ -1,9 +1,9 @@
-package org.taskana.model.mappings;
+package pro.taskana.model.mappings;
 
 import org.apache.ibatis.annotations.*;
 import org.apache.ibatis.type.JdbcType;
-import org.taskana.impl.persistence.MapTypeHandler;
-import org.taskana.model.*;
+import pro.taskana.impl.persistence.MapTypeHandler;
+import pro.taskana.model.*;
 
 import java.sql.Date;
 import java.util.List;
@@ -14,8 +14,8 @@ import java.util.Map;
  */
 public interface TaskMapper {
 
-    String OBJECTREFERENCEMAPPER_FINDBYID = "org.taskana.model.mappings.ObjectReferenceMapper.findById";
-    String CLASSIFICATION_FINDBYID = "org.taskana.model.mappings.ClassificationMapper.findByIdAndDomain";
+    String OBJECTREFERENCEMAPPER_FINDBYID = "pro.taskana.model.mappings.ObjectReferenceMapper.findById";
+    String CLASSIFICATION_FINDBYID = "pro.taskana.model.mappings.ClassificationMapper.findByIdAndDomain";
 
     @Select("SELECT ID, TENANT_ID, CREATED, CLAIMED, COMPLETED, MODIFIED, PLANNED, DUE, NAME, DESCRIPTION, PRIORITY, STATE, CLASSIFICATION_ID, WORKBASKETID, OWNER, PRIMARY_OBJ_REF_ID, IS_READ, IS_TRANSFERRED, CUSTOM_ATTRIBUTES, CUSTOM_1, CUSTOM_2, CUSTOM_3, CUSTOM_4, CUSTOM_5, CUSTOM_6, CUSTOM_7, CUSTOM_8, CUSTOM_9, CUSTOM_10 "
             + "FROM TASK "
@@ -84,11 +84,11 @@ public interface TaskMapper {
     List<DueWorkbasketCounter> getTaskCountByWorkbasketIdAndDaysInPastAndState(@Param("fromDate") Date fromDate, @Param("status") List<TaskState> states);
 
     @Insert("INSERT INTO TASK(ID, TENANT_ID, CREATED, CLAIMED, COMPLETED, MODIFIED, PLANNED, DUE, NAME, DESCRIPTION, PRIORITY, STATE, CLASSIFICATION_ID, WORKBASKETID, OWNER, PRIMARY_OBJ_REF_ID, IS_READ, IS_TRANSFERRED, CUSTOM_ATTRIBUTES, CUSTOM_1, CUSTOM_2, CUSTOM_3, CUSTOM_4, CUSTOM_5, CUSTOM_6, CUSTOM_7, CUSTOM_8, CUSTOM_9, CUSTOM_10) "
-            + "VALUES(#{id}, #{tenantId}, #{created}, #{claimed}, #{completed}, #{modified}, #{planned}, #{due}, #{name}, #{description}, #{priority}, #{state}, #{classification.id}, #{workbasketId}, #{owner}, #{primaryObjRef.id}, #{isRead}, #{isTransferred}, #{customAttributes,jdbcType=BLOB,javaType=java.util.Map,typeHandler=org.taskana.impl.persistence.MapTypeHandler}, #{custom1}, #{custom2}, #{custom3}, #{custom4}, #{custom5}, #{custom6}, #{custom7}, #{custom8}, #{custom9}, #{custom10})")
+            + "VALUES(#{id}, #{tenantId}, #{created}, #{claimed}, #{completed}, #{modified}, #{planned}, #{due}, #{name}, #{description}, #{priority}, #{state}, #{classification.id}, #{workbasketId}, #{owner}, #{primaryObjRef.id}, #{isRead}, #{isTransferred}, #{customAttributes,jdbcType=BLOB,javaType=java.util.Map,typeHandler=pro.taskana.impl.persistence.MapTypeHandler}, #{custom1}, #{custom2}, #{custom3}, #{custom4}, #{custom5}, #{custom6}, #{custom7}, #{custom8}, #{custom9}, #{custom10})")
     @Options(keyProperty = "id", keyColumn = "ID")
     void insert(Task task);
 
-    @Update("UPDATE TASK SET TENANT_ID = #{tenantId}, CLAIMED = #{claimed}, COMPLETED = #{completed}, MODIFIED = #{modified}, PLANNED = #{planned}, DUE = #{due}, NAME = #{name}, DESCRIPTION = #{description}, PRIORITY = #{priority}, STATE = #{state}, CLASSIFICATION_ID = #{classification.id}, WORKBASKETID = #{workbasketId}, OWNER = #{owner}, PRIMARY_OBJ_REF_ID = #{primaryObjRef.id}, IS_READ = #{isRead}, IS_TRANSFERRED = #{isTransferred}, CUSTOM_ATTRIBUTES = #{customAttributes,jdbcType=BLOB,javaType=java.util.Map,typeHandler=org.taskana.impl.persistence.MapTypeHandler}, CUSTOM_1 = #{custom1}, CUSTOM_2 = #{custom2}, CUSTOM_3 = #{custom3}, CUSTOM_4 = #{custom4}, CUSTOM_5 = #{custom5}, CUSTOM_6 = #{custom6}, CUSTOM_7 = #{custom7}, CUSTOM_8 = #{custom8}, CUSTOM_9 = #{custom9}, CUSTOM_10 = #{custom10} "
+    @Update("UPDATE TASK SET TENANT_ID = #{tenantId}, CLAIMED = #{claimed}, COMPLETED = #{completed}, MODIFIED = #{modified}, PLANNED = #{planned}, DUE = #{due}, NAME = #{name}, DESCRIPTION = #{description}, PRIORITY = #{priority}, STATE = #{state}, CLASSIFICATION_ID = #{classification.id}, WORKBASKETID = #{workbasketId}, OWNER = #{owner}, PRIMARY_OBJ_REF_ID = #{primaryObjRef.id}, IS_READ = #{isRead}, IS_TRANSFERRED = #{isTransferred}, CUSTOM_ATTRIBUTES = #{customAttributes,jdbcType=BLOB,javaType=java.util.Map,typeHandler=pro.taskana.impl.persistence.MapTypeHandler}, CUSTOM_1 = #{custom1}, CUSTOM_2 = #{custom2}, CUSTOM_3 = #{custom3}, CUSTOM_4 = #{custom4}, CUSTOM_5 = #{custom5}, CUSTOM_6 = #{custom6}, CUSTOM_7 = #{custom7}, CUSTOM_8 = #{custom8}, CUSTOM_9 = #{custom9}, CUSTOM_10 = #{custom10} "
             + "WHERE ID = #{id}")
     void update(Task task);
 
diff --git a/lib/taskana-core/src/main/java/org/taskana/model/mappings/WorkbasketAccessMapper.java b/lib/taskana-core/src/main/java/pro/taskana/model/mappings/WorkbasketAccessMapper.java
similarity index 98%
rename from lib/taskana-core/src/main/java/org/taskana/model/mappings/WorkbasketAccessMapper.java
rename to lib/taskana-core/src/main/java/pro/taskana/model/mappings/WorkbasketAccessMapper.java
index 598501fee..6c396eba2 100644
--- a/lib/taskana-core/src/main/java/org/taskana/model/mappings/WorkbasketAccessMapper.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/model/mappings/WorkbasketAccessMapper.java
@@ -1,4 +1,4 @@
-package org.taskana.model.mappings;
+package pro.taskana.model.mappings;
 
 import java.util.List;
 
@@ -10,7 +10,7 @@ import org.apache.ibatis.annotations.Result;
 import org.apache.ibatis.annotations.Results;
 import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
-import org.taskana.model.WorkbasketAccessItem;
+import pro.taskana.model.WorkbasketAccessItem;
 /**
  * This class is the mybatis mapping of workbasket access items.
  */
diff --git a/lib/taskana-core/src/main/java/org/taskana/model/mappings/WorkbasketMapper.java b/lib/taskana-core/src/main/java/pro/taskana/model/mappings/WorkbasketMapper.java
similarity index 97%
rename from lib/taskana-core/src/main/java/org/taskana/model/mappings/WorkbasketMapper.java
rename to lib/taskana-core/src/main/java/pro/taskana/model/mappings/WorkbasketMapper.java
index 891082c17..6f2f12277 100644
--- a/lib/taskana-core/src/main/java/org/taskana/model/mappings/WorkbasketMapper.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/model/mappings/WorkbasketMapper.java
@@ -1,4 +1,4 @@
-package org.taskana.model.mappings;
+package pro.taskana.model.mappings;
 
 import java.util.List;
 
@@ -12,8 +12,8 @@ import org.apache.ibatis.annotations.Results;
 import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
 import org.apache.ibatis.mapping.FetchType;
-import org.taskana.model.Workbasket;
-import org.taskana.model.WorkbasketAuthorization;
+import pro.taskana.model.Workbasket;
+import pro.taskana.model.WorkbasketAuthorization;
 /**
  * This class is the mybatis mapping of workbaskets.
  */
diff --git a/lib/taskana-core/src/main/java/org/taskana/persistence/BaseQuery.java b/lib/taskana-core/src/main/java/pro/taskana/persistence/BaseQuery.java
similarity index 90%
rename from lib/taskana-core/src/main/java/org/taskana/persistence/BaseQuery.java
rename to lib/taskana-core/src/main/java/pro/taskana/persistence/BaseQuery.java
index 1a121b1e5..8cd404fc0 100644
--- a/lib/taskana-core/src/main/java/org/taskana/persistence/BaseQuery.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/persistence/BaseQuery.java
@@ -1,8 +1,8 @@
-package org.taskana.persistence;
+package pro.taskana.persistence;
 
 import java.util.List;
 
-import org.taskana.exceptions.NotAuthorizedException;
+import pro.taskana.exceptions.NotAuthorizedException;
 
 /**
  * Main query interface.
diff --git a/lib/taskana-core/src/main/java/org/taskana/persistence/ClassificationQuery.java b/lib/taskana-core/src/main/java/pro/taskana/persistence/ClassificationQuery.java
similarity index 97%
rename from lib/taskana-core/src/main/java/org/taskana/persistence/ClassificationQuery.java
rename to lib/taskana-core/src/main/java/pro/taskana/persistence/ClassificationQuery.java
index 76f7bf388..9cba69624 100644
--- a/lib/taskana-core/src/main/java/org/taskana/persistence/ClassificationQuery.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/persistence/ClassificationQuery.java
@@ -1,6 +1,6 @@
-package org.taskana.persistence;
+package pro.taskana.persistence;
 
-import org.taskana.model.Classification;
+import pro.taskana.model.Classification;
 
 import java.util.Date;
 
diff --git a/lib/taskana-core/src/main/java/org/taskana/persistence/ObjectReferenceQuery.java b/lib/taskana-core/src/main/java/pro/taskana/persistence/ObjectReferenceQuery.java
similarity index 94%
rename from lib/taskana-core/src/main/java/org/taskana/persistence/ObjectReferenceQuery.java
rename to lib/taskana-core/src/main/java/pro/taskana/persistence/ObjectReferenceQuery.java
index e22c94e98..358f96240 100644
--- a/lib/taskana-core/src/main/java/org/taskana/persistence/ObjectReferenceQuery.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/persistence/ObjectReferenceQuery.java
@@ -1,6 +1,6 @@
-package org.taskana.persistence;
+package pro.taskana.persistence;
 
-import org.taskana.model.ObjectReference;
+import pro.taskana.model.ObjectReference;
 
 /**
  * ObjectReferenceQuery for generating dynamic sql.
diff --git a/lib/taskana-core/src/main/java/org/taskana/persistence/TaskQuery.java b/lib/taskana-core/src/main/java/pro/taskana/persistence/TaskQuery.java
similarity index 95%
rename from lib/taskana-core/src/main/java/org/taskana/persistence/TaskQuery.java
rename to lib/taskana-core/src/main/java/pro/taskana/persistence/TaskQuery.java
index a2a0ce551..5ed891e3e 100644
--- a/lib/taskana-core/src/main/java/org/taskana/persistence/TaskQuery.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/persistence/TaskQuery.java
@@ -1,8 +1,8 @@
-package org.taskana.persistence;
+package pro.taskana.persistence;
 
-import org.taskana.exceptions.NotAuthorizedException;
-import org.taskana.model.Task;
-import org.taskana.model.TaskState;
+import pro.taskana.exceptions.NotAuthorizedException;
+import pro.taskana.model.Task;
+import pro.taskana.model.TaskState;
 
 /**
  * TaskQuery for generating dynamic sql.
diff --git a/lib/taskana-core/src/main/java/org/taskana/security/CurrentUserContext.java b/lib/taskana-core/src/main/java/pro/taskana/security/CurrentUserContext.java
similarity index 99%
rename from lib/taskana-core/src/main/java/org/taskana/security/CurrentUserContext.java
rename to lib/taskana-core/src/main/java/pro/taskana/security/CurrentUserContext.java
index 61d8c7c9f..f2833c94a 100644
--- a/lib/taskana-core/src/main/java/org/taskana/security/CurrentUserContext.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/security/CurrentUserContext.java
@@ -1,4 +1,4 @@
-package org.taskana.security;
+package pro.taskana.security;
 
 import java.lang.reflect.Method;
 import java.security.AccessController;
diff --git a/lib/taskana-core/src/test/java/org/taskana/impl/ClassificationServiceImplTest.java b/lib/taskana-core/src/test/java/pro/taskana/impl/ClassificationServiceImplTest.java
similarity index 95%
rename from lib/taskana-core/src/test/java/org/taskana/impl/ClassificationServiceImplTest.java
rename to lib/taskana-core/src/test/java/pro/taskana/impl/ClassificationServiceImplTest.java
index 4df8f9f27..c025994e7 100644
--- a/lib/taskana-core/src/test/java/org/taskana/impl/ClassificationServiceImplTest.java
+++ b/lib/taskana-core/src/test/java/pro/taskana/impl/ClassificationServiceImplTest.java
@@ -1,4 +1,4 @@
-package org.taskana.impl;
+package pro.taskana.impl;
 
 import org.junit.Assert;
 import org.junit.Test;
@@ -7,10 +7,10 @@ import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.Spy;
 import org.mockito.junit.MockitoJUnitRunner;
-import org.taskana.exceptions.NotAuthorizedException;
-import org.taskana.impl.persistence.TestClassificationQuery;
-import org.taskana.model.Classification;
-import org.taskana.model.mappings.ClassificationMapper;
+import pro.taskana.exceptions.NotAuthorizedException;
+import pro.taskana.impl.persistence.TestClassificationQuery;
+import pro.taskana.model.Classification;
+import pro.taskana.model.mappings.ClassificationMapper;
 
 import java.sql.Date;
 import java.time.LocalDate;
diff --git a/lib/taskana-core/src/test/java/org/taskana/impl/TaskServiceImplTest.java b/lib/taskana-core/src/test/java/pro/taskana/impl/TaskServiceImplTest.java
similarity index 93%
rename from lib/taskana-core/src/test/java/org/taskana/impl/TaskServiceImplTest.java
rename to lib/taskana-core/src/test/java/pro/taskana/impl/TaskServiceImplTest.java
index 72328a3bc..d341a6cbd 100644
--- a/lib/taskana-core/src/test/java/org/taskana/impl/TaskServiceImplTest.java
+++ b/lib/taskana-core/src/test/java/pro/taskana/impl/TaskServiceImplTest.java
@@ -1,4 +1,4 @@
-package org.taskana.impl;
+package pro.taskana.impl;
 
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
@@ -12,17 +12,17 @@ import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.junit.MockitoJUnitRunner;
-import org.taskana.TaskanaEngine;
-import org.taskana.configuration.TaskanaEngineConfiguration;
-import org.taskana.exceptions.NotAuthorizedException;
-import org.taskana.exceptions.TaskNotFoundException;
-import org.taskana.exceptions.WorkbasketNotFoundException;
-import org.taskana.model.ObjectReference;
-import org.taskana.model.Task;
-import org.taskana.model.TaskState;
-import org.taskana.model.Workbasket;
-import org.taskana.model.mappings.ObjectReferenceMapper;
-import org.taskana.model.mappings.TaskMapper;
+import pro.taskana.TaskanaEngine;
+import pro.taskana.configuration.TaskanaEngineConfiguration;
+import pro.taskana.exceptions.NotAuthorizedException;
+import pro.taskana.exceptions.TaskNotFoundException;
+import pro.taskana.exceptions.WorkbasketNotFoundException;
+import pro.taskana.model.ObjectReference;
+import pro.taskana.model.Task;
+import pro.taskana.model.TaskState;
+import pro.taskana.model.Workbasket;
+import pro.taskana.model.mappings.ObjectReferenceMapper;
+import pro.taskana.model.mappings.TaskMapper;
 
 /**
  * Unit Test for TaskServiceImpl.
diff --git a/lib/taskana-core/src/test/java/org/taskana/impl/WorkbasketServiceImplTest.java b/lib/taskana-core/src/test/java/pro/taskana/impl/WorkbasketServiceImplTest.java
similarity index 95%
rename from lib/taskana-core/src/test/java/org/taskana/impl/WorkbasketServiceImplTest.java
rename to lib/taskana-core/src/test/java/pro/taskana/impl/WorkbasketServiceImplTest.java
index 55c64fbf1..84408a31e 100644
--- a/lib/taskana-core/src/test/java/org/taskana/impl/WorkbasketServiceImplTest.java
+++ b/lib/taskana-core/src/test/java/pro/taskana/impl/WorkbasketServiceImplTest.java
@@ -1,4 +1,4 @@
-package org.taskana.impl;
+package pro.taskana.impl;
 
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.times;
@@ -15,16 +15,16 @@ import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
-import org.taskana.TaskanaEngine;
-import org.taskana.configuration.TaskanaEngineConfiguration;
-import org.taskana.exceptions.NotAuthorizedException;
-import org.taskana.exceptions.WorkbasketNotFoundException;
-import org.taskana.model.Workbasket;
-import org.taskana.model.WorkbasketAccessItem;
-import org.taskana.model.WorkbasketAuthorization;
-import org.taskana.model.mappings.DistributionTargetMapper;
-import org.taskana.model.mappings.WorkbasketAccessMapper;
-import org.taskana.model.mappings.WorkbasketMapper;
+import pro.taskana.TaskanaEngine;
+import pro.taskana.configuration.TaskanaEngineConfiguration;
+import pro.taskana.exceptions.NotAuthorizedException;
+import pro.taskana.exceptions.WorkbasketNotFoundException;
+import pro.taskana.model.Workbasket;
+import pro.taskana.model.WorkbasketAccessItem;
+import pro.taskana.model.WorkbasketAuthorization;
+import pro.taskana.model.mappings.DistributionTargetMapper;
+import pro.taskana.model.mappings.WorkbasketAccessMapper;
+import pro.taskana.model.mappings.WorkbasketMapper;
 
 /**
  * Unit Test for workbasketServiceImpl.
diff --git a/lib/taskana-core/src/test/java/org/taskana/impl/configuration/DBCleaner.java b/lib/taskana-core/src/test/java/pro/taskana/impl/configuration/DBCleaner.java
similarity index 94%
rename from lib/taskana-core/src/test/java/org/taskana/impl/configuration/DBCleaner.java
rename to lib/taskana-core/src/test/java/pro/taskana/impl/configuration/DBCleaner.java
index ed1c6c38b..ed40376c2 100644
--- a/lib/taskana-core/src/test/java/org/taskana/impl/configuration/DBCleaner.java
+++ b/lib/taskana-core/src/test/java/pro/taskana/impl/configuration/DBCleaner.java
@@ -1,4 +1,4 @@
-package org.taskana.impl.configuration;
+package pro.taskana.impl.configuration;
 
 import java.io.InputStreamReader;
 import java.io.PrintWriter;
@@ -10,7 +10,7 @@ import javax.sql.DataSource;
 import org.apache.ibatis.jdbc.ScriptRunner;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.taskana.configuration.DbScriptRunner;
+import pro.taskana.configuration.DbScriptRunner;
 
 /**
  * This class cleans the complete database. Only to be used in Unittest
diff --git a/lib/taskana-core/src/test/java/org/taskana/impl/configuration/TaskanaEngineConfigurationTest.java b/lib/taskana-core/src/test/java/pro/taskana/impl/configuration/TaskanaEngineConfigurationTest.java
similarity index 97%
rename from lib/taskana-core/src/test/java/org/taskana/impl/configuration/TaskanaEngineConfigurationTest.java
rename to lib/taskana-core/src/test/java/pro/taskana/impl/configuration/TaskanaEngineConfigurationTest.java
index c652921bb..e8f8a0c22 100644
--- a/lib/taskana-core/src/test/java/org/taskana/impl/configuration/TaskanaEngineConfigurationTest.java
+++ b/lib/taskana-core/src/test/java/pro/taskana/impl/configuration/TaskanaEngineConfigurationTest.java
@@ -1,4 +1,4 @@
-package org.taskana.impl.configuration;
+package pro.taskana.impl.configuration;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -17,8 +17,8 @@ import org.junit.Assert;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.taskana.TaskanaEngine;
-import org.taskana.configuration.TaskanaEngineConfiguration;
+import pro.taskana.TaskanaEngine;
+import pro.taskana.configuration.TaskanaEngineConfiguration;
 /**
  * Integration Test for TaskanaEngineConfiguration.
  * @author EH
diff --git a/lib/taskana-core/src/test/java/org/taskana/impl/integration/ClassificationServiceImplIntTest.java b/lib/taskana-core/src/test/java/pro/taskana/impl/integration/ClassificationServiceImplIntTest.java
similarity index 96%
rename from lib/taskana-core/src/test/java/org/taskana/impl/integration/ClassificationServiceImplIntTest.java
rename to lib/taskana-core/src/test/java/pro/taskana/impl/integration/ClassificationServiceImplIntTest.java
index 7f738477d..27562ce5e 100644
--- a/lib/taskana-core/src/test/java/org/taskana/impl/integration/ClassificationServiceImplIntTest.java
+++ b/lib/taskana-core/src/test/java/pro/taskana/impl/integration/ClassificationServiceImplIntTest.java
@@ -1,4 +1,4 @@
-package org.taskana.impl.integration;
+package pro.taskana.impl.integration;
 
 import java.io.FileNotFoundException;
 import java.sql.Date;
@@ -15,14 +15,14 @@ import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
-import org.taskana.ClassificationService;
-import org.taskana.TaskanaEngine;
-import org.taskana.configuration.TaskanaEngineConfiguration;
-import org.taskana.exceptions.NotAuthorizedException;
-import org.taskana.impl.TaskanaEngineImpl;
-import org.taskana.impl.configuration.DBCleaner;
-import org.taskana.impl.configuration.TaskanaEngineConfigurationTest;
-import org.taskana.model.Classification;
+import pro.taskana.ClassificationService;
+import pro.taskana.TaskanaEngine;
+import pro.taskana.configuration.TaskanaEngineConfiguration;
+import pro.taskana.exceptions.NotAuthorizedException;
+import pro.taskana.impl.TaskanaEngineImpl;
+import pro.taskana.impl.configuration.DBCleaner;
+import pro.taskana.impl.configuration.TaskanaEngineConfigurationTest;
+import pro.taskana.model.Classification;
 
 /**
  * Integration Test for ClassificationServiceImpl.
diff --git a/lib/taskana-core/src/test/java/org/taskana/impl/integration/TaskServiceImplTransactionTest.java b/lib/taskana-core/src/test/java/pro/taskana/impl/integration/TaskServiceImplTransactionTest.java
similarity index 86%
rename from lib/taskana-core/src/test/java/org/taskana/impl/integration/TaskServiceImplTransactionTest.java
rename to lib/taskana-core/src/test/java/pro/taskana/impl/integration/TaskServiceImplTransactionTest.java
index 2e9791d1f..42f1f38a2 100644
--- a/lib/taskana-core/src/test/java/org/taskana/impl/integration/TaskServiceImplTransactionTest.java
+++ b/lib/taskana-core/src/test/java/pro/taskana/impl/integration/TaskServiceImplTransactionTest.java
@@ -1,22 +1,22 @@
-package org.taskana.impl.integration;
+package pro.taskana.impl.integration;
 
 import org.h2.store.fs.FileUtils;
 import org.junit.*;
-import org.taskana.TaskanaEngine;
-import org.taskana.configuration.TaskanaEngineConfiguration;
-import org.taskana.exceptions.NotAuthorizedException;
-import org.taskana.exceptions.TaskNotFoundException;
-import org.taskana.impl.TaskServiceImpl;
-import org.taskana.impl.TaskanaEngineImpl;
-import org.taskana.impl.configuration.DBCleaner;
-import org.taskana.impl.configuration.TaskanaEngineConfigurationTest;
-import org.taskana.impl.persistence.ClassificationQueryImpl;
-import org.taskana.impl.persistence.ObjectReferenceQueryImpl;
-import org.taskana.impl.util.IdGenerator;
-import org.taskana.model.Task;
-import org.taskana.model.TaskState;
-import org.taskana.persistence.ClassificationQuery;
-import org.taskana.persistence.ObjectReferenceQuery;
+import pro.taskana.TaskanaEngine;
+import pro.taskana.configuration.TaskanaEngineConfiguration;
+import pro.taskana.exceptions.NotAuthorizedException;
+import pro.taskana.exceptions.TaskNotFoundException;
+import pro.taskana.impl.TaskServiceImpl;
+import pro.taskana.impl.TaskanaEngineImpl;
+import pro.taskana.impl.configuration.DBCleaner;
+import pro.taskana.impl.configuration.TaskanaEngineConfigurationTest;
+import pro.taskana.impl.persistence.ClassificationQueryImpl;
+import pro.taskana.impl.persistence.ObjectReferenceQueryImpl;
+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;
 
 import javax.security.auth.login.LoginException;
 import javax.sql.DataSource;
diff --git a/lib/taskana-core/src/test/java/org/taskana/impl/integration/WorkbasketServiceImplIntTest.java b/lib/taskana-core/src/test/java/pro/taskana/impl/integration/WorkbasketServiceImplIntTest.java
similarity index 93%
rename from lib/taskana-core/src/test/java/org/taskana/impl/integration/WorkbasketServiceImplIntTest.java
rename to lib/taskana-core/src/test/java/pro/taskana/impl/integration/WorkbasketServiceImplIntTest.java
index 55e673e94..e390887e7 100644
--- a/lib/taskana-core/src/test/java/org/taskana/impl/integration/WorkbasketServiceImplIntTest.java
+++ b/lib/taskana-core/src/test/java/pro/taskana/impl/integration/WorkbasketServiceImplIntTest.java
@@ -1,4 +1,4 @@
-package org.taskana.impl.integration;
+package pro.taskana.impl.integration;
 
 import java.io.FileNotFoundException;
 import java.sql.SQLException;
@@ -14,17 +14,17 @@ import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
-import org.taskana.TaskanaEngine;
-import org.taskana.WorkbasketService;
-import org.taskana.configuration.TaskanaEngineConfiguration;
-import org.taskana.exceptions.NotAuthorizedException;
-import org.taskana.exceptions.WorkbasketNotFoundException;
-import org.taskana.impl.TaskanaEngineImpl;
-import org.taskana.impl.configuration.DBCleaner;
-import org.taskana.impl.configuration.TaskanaEngineConfigurationTest;
-import org.taskana.impl.util.IdGenerator;
-import org.taskana.model.Workbasket;
-import org.taskana.model.WorkbasketAccessItem;
+import pro.taskana.TaskanaEngine;
+import pro.taskana.WorkbasketService;
+import pro.taskana.configuration.TaskanaEngineConfiguration;
+import pro.taskana.exceptions.NotAuthorizedException;
+import pro.taskana.exceptions.WorkbasketNotFoundException;
+import pro.taskana.impl.TaskanaEngineImpl;
+import pro.taskana.impl.configuration.DBCleaner;
+import pro.taskana.impl.configuration.TaskanaEngineConfigurationTest;
+import pro.taskana.impl.util.IdGenerator;
+import pro.taskana.model.Workbasket;
+import pro.taskana.model.WorkbasketAccessItem;
 
 
 /**
diff --git a/lib/taskana-core/src/test/java/org/taskana/impl/persistence/ClassificationQueryImplTest.java b/lib/taskana-core/src/test/java/pro/taskana/impl/persistence/ClassificationQueryImplTest.java
similarity index 92%
rename from lib/taskana-core/src/test/java/org/taskana/impl/persistence/ClassificationQueryImplTest.java
rename to lib/taskana-core/src/test/java/pro/taskana/impl/persistence/ClassificationQueryImplTest.java
index 0c50fbc5b..5319e42e2 100644
--- a/lib/taskana-core/src/test/java/org/taskana/impl/persistence/ClassificationQueryImplTest.java
+++ b/lib/taskana-core/src/test/java/pro/taskana/impl/persistence/ClassificationQueryImplTest.java
@@ -1,4 +1,4 @@
-package org.taskana.impl.persistence;
+package pro.taskana.impl.persistence;
 
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;
@@ -13,9 +13,9 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
-import org.taskana.exceptions.NotAuthorizedException;
-import org.taskana.impl.TaskanaEngineImpl;
-import org.taskana.model.Classification;
+import pro.taskana.exceptions.NotAuthorizedException;
+import pro.taskana.impl.TaskanaEngineImpl;
+import pro.taskana.model.Classification;
 
 /**
  * Test for ClassificationQueryImpl.
diff --git a/lib/taskana-core/src/test/java/org/taskana/impl/persistence/ObjectReferenceQueryImplTest.java b/lib/taskana-core/src/test/java/pro/taskana/impl/persistence/ObjectReferenceQueryImplTest.java
similarity index 92%
rename from lib/taskana-core/src/test/java/org/taskana/impl/persistence/ObjectReferenceQueryImplTest.java
rename to lib/taskana-core/src/test/java/pro/taskana/impl/persistence/ObjectReferenceQueryImplTest.java
index e06c7906c..d535df54c 100644
--- a/lib/taskana-core/src/test/java/org/taskana/impl/persistence/ObjectReferenceQueryImplTest.java
+++ b/lib/taskana-core/src/test/java/pro/taskana/impl/persistence/ObjectReferenceQueryImplTest.java
@@ -1,4 +1,4 @@
-package org.taskana.impl.persistence;
+package pro.taskana.impl.persistence;
 
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;
@@ -13,9 +13,9 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
-import org.taskana.exceptions.NotAuthorizedException;
-import org.taskana.impl.TaskanaEngineImpl;
-import org.taskana.model.ObjectReference;
+import pro.taskana.exceptions.NotAuthorizedException;
+import pro.taskana.impl.TaskanaEngineImpl;
+import pro.taskana.model.ObjectReference;
 
 /**
  * Test for ObjectReferenceQueryImpl.
diff --git a/lib/taskana-core/src/test/java/org/taskana/impl/persistence/TaskQueryImplTest.java b/lib/taskana-core/src/test/java/pro/taskana/impl/persistence/TaskQueryImplTest.java
similarity index 91%
rename from lib/taskana-core/src/test/java/org/taskana/impl/persistence/TaskQueryImplTest.java
rename to lib/taskana-core/src/test/java/pro/taskana/impl/persistence/TaskQueryImplTest.java
index e98ca019d..9ae0913f7 100644
--- a/lib/taskana-core/src/test/java/org/taskana/impl/persistence/TaskQueryImplTest.java
+++ b/lib/taskana-core/src/test/java/pro/taskana/impl/persistence/TaskQueryImplTest.java
@@ -1,4 +1,4 @@
-package org.taskana.impl.persistence;
+package pro.taskana.impl.persistence;
 
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;
@@ -13,10 +13,10 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
-import org.taskana.exceptions.NotAuthorizedException;
-import org.taskana.impl.TaskanaEngineImpl;
-import org.taskana.model.Task;
-import org.taskana.model.TaskState;
+import pro.taskana.exceptions.NotAuthorizedException;
+import pro.taskana.impl.TaskanaEngineImpl;
+import pro.taskana.model.Task;
+import pro.taskana.model.TaskState;
 
 /**
  * Test for TaskQueryImpl.
diff --git a/lib/taskana-core/src/test/java/org/taskana/impl/persistence/TestClassificationQuery.java b/lib/taskana-core/src/test/java/pro/taskana/impl/persistence/TestClassificationQuery.java
similarity index 95%
rename from lib/taskana-core/src/test/java/org/taskana/impl/persistence/TestClassificationQuery.java
rename to lib/taskana-core/src/test/java/pro/taskana/impl/persistence/TestClassificationQuery.java
index 5b448aa34..3fc0e49b8 100644
--- a/lib/taskana-core/src/test/java/org/taskana/impl/persistence/TestClassificationQuery.java
+++ b/lib/taskana-core/src/test/java/pro/taskana/impl/persistence/TestClassificationQuery.java
@@ -1,8 +1,8 @@
-package org.taskana.impl.persistence;
+package pro.taskana.impl.persistence;
 
-import org.taskana.exceptions.NotAuthorizedException;
-import org.taskana.model.Classification;
-import org.taskana.persistence.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-spring-example/pom.xml b/lib/taskana-spring-example/pom.xml
index ddb85326c..cef6cc329 100644
--- a/lib/taskana-spring-example/pom.xml
+++ b/lib/taskana-spring-example/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.taskana</groupId>
+	<groupId>pro.taskana</groupId>
 	<artifactId>taskana-spring-example</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<parent>
@@ -40,12 +40,12 @@
 		</dependency>
 		
 		<dependency>
-			<groupId>org.taskana</groupId>
+			<groupId>pro.taskana</groupId>
 			<artifactId>taskana-core</artifactId>
 			<version>0.0.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
-			<groupId>org.taskana</groupId>
+			<groupId>pro.taskana</groupId>
 			<artifactId>taskana-spring</artifactId>
 			<version>0.0.1-SNAPSHOT</version>
 		</dependency>
diff --git a/lib/taskana-spring-example/src/main/java/org/taskana/ExampleBootstrap.java b/lib/taskana-spring-example/src/main/java/pro/taskana/ExampleBootstrap.java
similarity index 86%
rename from lib/taskana-spring-example/src/main/java/org/taskana/ExampleBootstrap.java
rename to lib/taskana-spring-example/src/main/java/pro/taskana/ExampleBootstrap.java
index 6f94d4ccd..69441a333 100644
--- a/lib/taskana-spring-example/src/main/java/org/taskana/ExampleBootstrap.java
+++ b/lib/taskana-spring-example/src/main/java/pro/taskana/ExampleBootstrap.java
@@ -1,13 +1,13 @@
-package org.taskana;
+package pro.taskana;
 
 import javax.annotation.PostConstruct;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
-import org.taskana.exceptions.NotAuthorizedException;
-import org.taskana.exceptions.TaskNotFoundException;
-import org.taskana.model.Task;
+import pro.taskana.exceptions.NotAuthorizedException;
+import pro.taskana.exceptions.TaskNotFoundException;
+import pro.taskana.model.Task;
 
 @Component
 @Transactional
diff --git a/lib/taskana-spring-example/src/main/java/org/taskana/SpringBootWebApplication.java b/lib/taskana-spring-example/src/main/java/pro/taskana/SpringBootWebApplication.java
similarity index 97%
rename from lib/taskana-spring-example/src/main/java/org/taskana/SpringBootWebApplication.java
rename to lib/taskana-spring-example/src/main/java/pro/taskana/SpringBootWebApplication.java
index c79af108d..fb4549a38 100644
--- a/lib/taskana-spring-example/src/main/java/org/taskana/SpringBootWebApplication.java
+++ b/lib/taskana-spring-example/src/main/java/pro/taskana/SpringBootWebApplication.java
@@ -1,4 +1,4 @@
-package org.taskana;
+package pro.taskana;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/lib/taskana-spring-example/src/main/resources/application.properties b/lib/taskana-spring-example/src/main/resources/application.properties
index ed9c0ff88..3171d4f00 100644
--- a/lib/taskana-spring-example/src/main/resources/application.properties
+++ b/lib/taskana-spring-example/src/main/resources/application.properties
@@ -1 +1 @@
-logging.level.org.taskana=DEBUG
+logging.level.pro.taskana=DEBUG
diff --git a/lib/taskana-spring-example/src/main/resources/applicationContext.xml b/lib/taskana-spring-example/src/main/resources/applicationContext.xml
index d619bd682..671d1df50 100644
--- a/lib/taskana-spring-example/src/main/resources/applicationContext.xml
+++ b/lib/taskana-spring-example/src/main/resources/applicationContext.xml
@@ -21,7 +21,7 @@
 		<property name="dataSource" ref="dataSource" />
 	</bean>
 
-	<bean id="taskanaEngineConfiguration" class="org.taskana.configuration.SpringTaskanaEngineConfiguration">
+	<bean id="taskanaEngineConfiguration" class="pro.taskana.configuration.SpringTaskanaEngineConfiguration">
 		<property name="dataSource" ref="dataSource" />
 	</bean>
 
diff --git a/lib/taskana-spring/pom.xml b/lib/taskana-spring/pom.xml
index aab2e7e1b..e9dc4a82a 100644
--- a/lib/taskana-spring/pom.xml
+++ b/lib/taskana-spring/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.taskana</groupId>
+	<groupId>pro.taskana</groupId>
 	<artifactId>taskana-spring</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 
@@ -20,7 +20,7 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>org.taskana</groupId>
+			<groupId>pro.taskana</groupId>
 			<artifactId>taskana-core</artifactId>
 			<version>0.0.1-SNAPSHOT</version>
 		</dependency>
diff --git a/lib/taskana-spring/src/main/java/org/taskana/SpringTaskanaEngineImpl.java b/lib/taskana-spring/src/main/java/pro/taskana/SpringTaskanaEngineImpl.java
similarity index 80%
rename from lib/taskana-spring/src/main/java/org/taskana/SpringTaskanaEngineImpl.java
rename to lib/taskana-spring/src/main/java/pro/taskana/SpringTaskanaEngineImpl.java
index 9c1c0bdbd..848f801c8 100644
--- a/lib/taskana-spring/src/main/java/org/taskana/SpringTaskanaEngineImpl.java
+++ b/lib/taskana-spring/src/main/java/pro/taskana/SpringTaskanaEngineImpl.java
@@ -1,12 +1,12 @@
-package org.taskana;
+package pro.taskana;
 
 import java.sql.SQLException;
 
 import javax.annotation.PostConstruct;
 
 import org.apache.ibatis.transaction.managed.ManagedTransactionFactory;
-import org.taskana.configuration.SpringTaskanaEngineConfiguration;
-import org.taskana.impl.TaskanaEngineImpl;
+import pro.taskana.configuration.SpringTaskanaEngineConfiguration;
+import pro.taskana.impl.TaskanaEngineImpl;
 
 /**
  * This class configures the TaskanaEngine for spring
diff --git a/lib/taskana-spring/src/main/java/org/taskana/configuration/SpringTaskanaEngineConfiguration.java b/lib/taskana-spring/src/main/java/pro/taskana/configuration/SpringTaskanaEngineConfiguration.java
similarity index 89%
rename from lib/taskana-spring/src/main/java/org/taskana/configuration/SpringTaskanaEngineConfiguration.java
rename to lib/taskana-spring/src/main/java/pro/taskana/configuration/SpringTaskanaEngineConfiguration.java
index 03ee319e9..1a3c25a91 100644
--- a/lib/taskana-spring/src/main/java/org/taskana/configuration/SpringTaskanaEngineConfiguration.java
+++ b/lib/taskana-spring/src/main/java/pro/taskana/configuration/SpringTaskanaEngineConfiguration.java
@@ -1,4 +1,4 @@
-package org.taskana.configuration;
+package pro.taskana.configuration;
 
 import java.sql.SQLException;
 
@@ -6,8 +6,8 @@ import javax.sql.DataSource;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.taskana.SpringTaskanaEngineImpl;
-import org.taskana.TaskanaEngine;
+import pro.taskana.SpringTaskanaEngineImpl;
+import pro.taskana.TaskanaEngine;
 
 /**
  * This class configures the TaskanaEngineConfiguration for spring
diff --git a/lib/taskana-spring/src/test/java/org/taskana/TaskanaComponent.java b/lib/taskana-spring/src/test/java/pro/taskana/TaskanaComponent.java
similarity index 84%
rename from lib/taskana-spring/src/test/java/org/taskana/TaskanaComponent.java
rename to lib/taskana-spring/src/test/java/pro/taskana/TaskanaComponent.java
index 975f538c8..da52b6251 100644
--- a/lib/taskana-spring/src/test/java/org/taskana/TaskanaComponent.java
+++ b/lib/taskana-spring/src/test/java/pro/taskana/TaskanaComponent.java
@@ -1,10 +1,10 @@
-package org.taskana;
+package pro.taskana;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
-import org.taskana.exceptions.NotAuthorizedException;
-import org.taskana.model.Task;
+import pro.taskana.exceptions.NotAuthorizedException;
+import pro.taskana.model.Task;
 
 @Component
 @Transactional
diff --git a/lib/taskana-spring/src/test/java/org/taskana/TransactionTest.java b/lib/taskana-spring/src/test/java/pro/taskana/TransactionTest.java
similarity index 99%
rename from lib/taskana-spring/src/test/java/org/taskana/TransactionTest.java
rename to lib/taskana-spring/src/test/java/pro/taskana/TransactionTest.java
index c82cda210..b7ab5038e 100644
--- a/lib/taskana-spring/src/test/java/org/taskana/TransactionTest.java
+++ b/lib/taskana-spring/src/test/java/pro/taskana/TransactionTest.java
@@ -1,4 +1,4 @@
-package org.taskana;
+package pro.taskana;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
diff --git a/lib/taskana-spring/src/test/resources/test-applicationContext.xml b/lib/taskana-spring/src/test/resources/test-applicationContext.xml
index 0372ed5c6..81720d0ff 100644
--- a/lib/taskana-spring/src/test/resources/test-applicationContext.xml
+++ b/lib/taskana-spring/src/test/resources/test-applicationContext.xml
@@ -23,7 +23,7 @@
 		<property name="dataSource" ref="dataSource" />
 	</bean>
 
-	<bean id="taskEngineConfiguration" class="org.taskana.SpringTaskEngineConfiguration">
+	<bean id="taskEngineConfiguration" class="pro.taskana.SpringTaskEngineConfiguration">
 		<property name="dataSource" ref="dataSource" />
 		<property name="transactionManager" ref="transactionManager" />
 	</bean>
@@ -31,5 +31,5 @@
 	<bean id="taskEngine" factory-bean="taskEngineConfiguration" factory-method="createTaskEngineConfiguration" />
 	<bean id="taskService" factory-bean="taskEngine" factory-method="getTaskService" />
 
-	<bean class="org.taskana.TaskanaComponent" />
+	<bean class="pro.taskana.TaskanaComponent" />
 </beans>
\ No newline at end of file
diff --git a/rest/pom.xml b/rest/pom.xml
index bf4f14243..22dbe9e79 100644
--- a/rest/pom.xml
+++ b/rest/pom.xml
@@ -3,7 +3,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
-	<groupId>org.taskana</groupId>
+	<groupId>pro.taskana</groupId>
 	<artifactId>rest</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<packaging>jar</packaging>
@@ -35,7 +35,7 @@
 		</dependency>
 
 		<dependency>
-			<groupId>org.taskana</groupId>
+			<groupId>pro.taskana</groupId>
 			<artifactId>taskana-core</artifactId>
 			<version>0.0.1-SNAPSHOT</version>
 		</dependency>
diff --git a/rest/src/main/java/org/taskana/rest/ClassificationController.java b/rest/src/main/java/pro/taskana/rest/ClassificationController.java
similarity index 95%
rename from rest/src/main/java/org/taskana/rest/ClassificationController.java
rename to rest/src/main/java/pro/taskana/rest/ClassificationController.java
index 7794d0132..04a9f2f31 100644
--- a/rest/src/main/java/org/taskana/rest/ClassificationController.java
+++ b/rest/src/main/java/pro/taskana/rest/ClassificationController.java
@@ -1,15 +1,15 @@
 /**
  * 
  */
-package org.taskana.rest;
+package pro.taskana.rest;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
-import org.taskana.ClassificationService;
-import org.taskana.model.Classification;
+import pro.taskana.ClassificationService;
+import pro.taskana.model.Classification;
 
 import java.util.List;
 
diff --git a/rest/src/main/java/org/taskana/rest/MonitorController.java b/rest/src/main/java/pro/taskana/rest/MonitorController.java
similarity index 89%
rename from rest/src/main/java/org/taskana/rest/MonitorController.java
rename to rest/src/main/java/pro/taskana/rest/MonitorController.java
index 11935feec..e8831ea58 100644
--- a/rest/src/main/java/org/taskana/rest/MonitorController.java
+++ b/rest/src/main/java/pro/taskana/rest/MonitorController.java
@@ -1,4 +1,4 @@
-package org.taskana.rest;
+package pro.taskana.rest;
 
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatterBuilder;
@@ -12,14 +12,14 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
-import org.taskana.TaskService;
-import org.taskana.WorkbasketService;
-import org.taskana.model.DueWorkbasketCounter;
-import org.taskana.model.TaskState;
-import org.taskana.model.TaskStateCounter;
-import org.taskana.model.Workbasket;
-import org.taskana.rest.model.WorkbasketCounterDataDto;
-import org.taskana.rest.model.WorkbasketCounterDto;
+import pro.taskana.TaskService;
+import pro.taskana.WorkbasketService;
+import pro.taskana.model.DueWorkbasketCounter;
+import pro.taskana.model.TaskState;
+import pro.taskana.model.TaskStateCounter;
+import pro.taskana.model.Workbasket;
+import pro.taskana.rest.model.WorkbasketCounterDataDto;
+import pro.taskana.rest.model.WorkbasketCounterDto;
 
 @RestController
 @RequestMapping(path = "/v1/monitor", produces = { MediaType.APPLICATION_JSON_VALUE })
diff --git a/rest/src/main/java/org/taskana/rest/RestApplication.java b/rest/src/main/java/pro/taskana/rest/RestApplication.java
similarity index 87%
rename from rest/src/main/java/org/taskana/rest/RestApplication.java
rename to rest/src/main/java/pro/taskana/rest/RestApplication.java
index 1ef661b07..72082f85f 100644
--- a/rest/src/main/java/org/taskana/rest/RestApplication.java
+++ b/rest/src/main/java/pro/taskana/rest/RestApplication.java
@@ -1,4 +1,4 @@
-package org.taskana.rest;
+package pro.taskana.rest;
 
 import com.fasterxml.jackson.databind.cfg.HandlerInstantiator;
 import org.slf4j.Logger;
@@ -11,14 +11,14 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Scope;
 import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
 import org.springframework.http.converter.json.SpringHandlerInstantiator;
-import org.taskana.ClassificationService;
-import org.taskana.TaskService;
-import org.taskana.TaskanaEngine;
-import org.taskana.WorkbasketService;
-import org.taskana.configuration.TaskanaEngineConfiguration;
-import org.taskana.model.Workbasket;
-import org.taskana.rest.serialization.WorkbasketMixIn;
-import org.taskana.sampledata.SampleDataGenerator;
+import pro.taskana.ClassificationService;
+import pro.taskana.TaskService;
+import pro.taskana.TaskanaEngine;
+import pro.taskana.WorkbasketService;
+import pro.taskana.configuration.TaskanaEngineConfiguration;
+import pro.taskana.model.Workbasket;
+import pro.taskana.rest.serialization.WorkbasketMixIn;
+import pro.taskana.sampledata.SampleDataGenerator;
 
 import javax.annotation.PostConstruct;
 import java.sql.SQLException;
diff --git a/rest/src/main/java/org/taskana/rest/TaskController.java b/rest/src/main/java/pro/taskana/rest/TaskController.java
similarity index 94%
rename from rest/src/main/java/org/taskana/rest/TaskController.java
rename to rest/src/main/java/pro/taskana/rest/TaskController.java
index ed34d3c67..25b4ac49c 100644
--- a/rest/src/main/java/org/taskana/rest/TaskController.java
+++ b/rest/src/main/java/pro/taskana/rest/TaskController.java
@@ -1,4 +1,4 @@
-package org.taskana.rest;
+package pro.taskana.rest;
 
 import java.util.List;
 
@@ -17,11 +17,11 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
-import org.taskana.TaskService;
-import org.taskana.exceptions.NotAuthorizedException;
-import org.taskana.exceptions.TaskNotFoundException;
-import org.taskana.model.Task;
-import org.taskana.rest.query.TaskFilter;
+import pro.taskana.TaskService;
+import pro.taskana.exceptions.NotAuthorizedException;
+import pro.taskana.exceptions.TaskNotFoundException;
+import pro.taskana.model.Task;
+import pro.taskana.rest.query.TaskFilter;
 
 @RestController
 @RequestMapping(path = "/v1/tasks", produces = { MediaType.APPLICATION_JSON_VALUE })
diff --git a/rest/src/main/java/org/taskana/rest/WorkbasketController.java b/rest/src/main/java/pro/taskana/rest/WorkbasketController.java
similarity index 93%
rename from rest/src/main/java/org/taskana/rest/WorkbasketController.java
rename to rest/src/main/java/pro/taskana/rest/WorkbasketController.java
index 40a1d3489..17e30af83 100644
--- a/rest/src/main/java/org/taskana/rest/WorkbasketController.java
+++ b/rest/src/main/java/pro/taskana/rest/WorkbasketController.java
@@ -1,4 +1,4 @@
-package org.taskana.rest;
+package pro.taskana.rest;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -16,12 +16,12 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
-import org.taskana.WorkbasketService;
-import org.taskana.exceptions.NotAuthorizedException;
-import org.taskana.exceptions.WorkbasketNotFoundException;
-import org.taskana.model.Workbasket;
-import org.taskana.model.WorkbasketAccessItem;
-import org.taskana.model.WorkbasketAuthorization;
+import pro.taskana.WorkbasketService;
+import pro.taskana.exceptions.NotAuthorizedException;
+import pro.taskana.exceptions.WorkbasketNotFoundException;
+import pro.taskana.model.Workbasket;
+import pro.taskana.model.WorkbasketAccessItem;
+import pro.taskana.model.WorkbasketAuthorization;
 
 @RestController
 @RequestMapping(path = "/v1/workbaskets", produces = { MediaType.APPLICATION_JSON_VALUE })
diff --git a/rest/src/main/java/org/taskana/rest/model/WorkbasketCounterDataDto.java b/rest/src/main/java/pro/taskana/rest/model/WorkbasketCounterDataDto.java
similarity index 92%
rename from rest/src/main/java/org/taskana/rest/model/WorkbasketCounterDataDto.java
rename to rest/src/main/java/pro/taskana/rest/model/WorkbasketCounterDataDto.java
index 1859fdd74..2affececf 100644
--- a/rest/src/main/java/org/taskana/rest/model/WorkbasketCounterDataDto.java
+++ b/rest/src/main/java/pro/taskana/rest/model/WorkbasketCounterDataDto.java
@@ -1,4 +1,4 @@
-package org.taskana.rest.model;
+package pro.taskana.rest.model;
 
 import java.util.List;
 
diff --git a/rest/src/main/java/org/taskana/rest/model/WorkbasketCounterDto.java b/rest/src/main/java/pro/taskana/rest/model/WorkbasketCounterDto.java
similarity index 93%
rename from rest/src/main/java/org/taskana/rest/model/WorkbasketCounterDto.java
rename to rest/src/main/java/pro/taskana/rest/model/WorkbasketCounterDto.java
index 03d6acec6..61e1c9695 100644
--- a/rest/src/main/java/org/taskana/rest/model/WorkbasketCounterDto.java
+++ b/rest/src/main/java/pro/taskana/rest/model/WorkbasketCounterDto.java
@@ -1,4 +1,4 @@
-package org.taskana.rest.model;
+package pro.taskana.rest.model;
 
 import java.util.List;
 
diff --git a/rest/src/main/java/org/taskana/rest/query/TaskFilter.java b/rest/src/main/java/pro/taskana/rest/query/TaskFilter.java
similarity index 96%
rename from rest/src/main/java/org/taskana/rest/query/TaskFilter.java
rename to rest/src/main/java/pro/taskana/rest/query/TaskFilter.java
index f38bf8fc5..d40e0050f 100644
--- a/rest/src/main/java/org/taskana/rest/query/TaskFilter.java
+++ b/rest/src/main/java/pro/taskana/rest/query/TaskFilter.java
@@ -1,4 +1,4 @@
-package org.taskana.rest.query;
+package pro.taskana.rest.query;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -7,14 +7,14 @@ import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.util.MultiValueMap;
-import org.taskana.ClassificationService;
-import org.taskana.TaskService;
-import org.taskana.exceptions.NotAuthorizedException;
-import org.taskana.model.Task;
-import org.taskana.model.TaskState;
-import org.taskana.persistence.ClassificationQuery;
-import org.taskana.persistence.ObjectReferenceQuery;
-import org.taskana.persistence.TaskQuery;
+import pro.taskana.ClassificationService;
+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 {
diff --git a/rest/src/main/java/org/taskana/rest/security/CustomAutenticationProvider.java b/rest/src/main/java/pro/taskana/rest/security/CustomAutenticationProvider.java
similarity index 96%
rename from rest/src/main/java/org/taskana/rest/security/CustomAutenticationProvider.java
rename to rest/src/main/java/pro/taskana/rest/security/CustomAutenticationProvider.java
index 3fd8323ab..ebf17af44 100644
--- a/rest/src/main/java/org/taskana/rest/security/CustomAutenticationProvider.java
+++ b/rest/src/main/java/pro/taskana/rest/security/CustomAutenticationProvider.java
@@ -1,4 +1,4 @@
-package org.taskana.rest.security;
+package pro.taskana.rest.security;
 
 import org.springframework.security.authentication.AuthenticationProvider;
 import org.springframework.security.authentication.jaas.JaasAuthenticationToken;
diff --git a/rest/src/main/java/org/taskana/rest/security/RoleGranterFromMap.java b/rest/src/main/java/pro/taskana/rest/security/RoleGranterFromMap.java
similarity index 93%
rename from rest/src/main/java/org/taskana/rest/security/RoleGranterFromMap.java
rename to rest/src/main/java/pro/taskana/rest/security/RoleGranterFromMap.java
index d74da875a..f65b3e56b 100644
--- a/rest/src/main/java/org/taskana/rest/security/RoleGranterFromMap.java
+++ b/rest/src/main/java/pro/taskana/rest/security/RoleGranterFromMap.java
@@ -1,4 +1,4 @@
-package org.taskana.rest.security;
+package pro.taskana.rest.security;
 
 import java.security.Principal;
 import java.util.Collections;
diff --git a/rest/src/main/java/org/taskana/rest/security/SampleLoginModule.java b/rest/src/main/java/pro/taskana/rest/security/SampleLoginModule.java
similarity index 96%
rename from rest/src/main/java/org/taskana/rest/security/SampleLoginModule.java
rename to rest/src/main/java/pro/taskana/rest/security/SampleLoginModule.java
index 44e6fc041..e71d6dd0c 100644
--- a/rest/src/main/java/org/taskana/rest/security/SampleLoginModule.java
+++ b/rest/src/main/java/pro/taskana/rest/security/SampleLoginModule.java
@@ -1,4 +1,4 @@
-package org.taskana.rest.security;
+package pro.taskana.rest.security;
 
 import java.util.Map;
 
diff --git a/rest/src/main/java/org/taskana/rest/security/WebSecurityConfig.java b/rest/src/main/java/pro/taskana/rest/security/WebSecurityConfig.java
similarity index 99%
rename from rest/src/main/java/org/taskana/rest/security/WebSecurityConfig.java
rename to rest/src/main/java/pro/taskana/rest/security/WebSecurityConfig.java
index 1ab79c971..745fcf9da 100644
--- a/rest/src/main/java/org/taskana/rest/security/WebSecurityConfig.java
+++ b/rest/src/main/java/pro/taskana/rest/security/WebSecurityConfig.java
@@ -1,4 +1,4 @@
-package org.taskana.rest.security;
+package pro.taskana.rest.security;
 
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;
diff --git a/rest/src/main/java/org/taskana/rest/serialization/DistributionTargetDeserializer.java b/rest/src/main/java/pro/taskana/rest/serialization/DistributionTargetDeserializer.java
similarity index 90%
rename from rest/src/main/java/org/taskana/rest/serialization/DistributionTargetDeserializer.java
rename to rest/src/main/java/pro/taskana/rest/serialization/DistributionTargetDeserializer.java
index c093e43ed..e012be538 100644
--- a/rest/src/main/java/org/taskana/rest/serialization/DistributionTargetDeserializer.java
+++ b/rest/src/main/java/pro/taskana/rest/serialization/DistributionTargetDeserializer.java
@@ -1,4 +1,4 @@
-package org.taskana.rest.serialization;
+package pro.taskana.rest.serialization;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -8,9 +8,9 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.context.support.SpringBeanAutowiringSupport;
-import org.taskana.WorkbasketService;
-import org.taskana.exceptions.WorkbasketNotFoundException;
-import org.taskana.model.Workbasket;
+import pro.taskana.WorkbasketService;
+import pro.taskana.exceptions.WorkbasketNotFoundException;
+import pro.taskana.model.Workbasket;
 
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonProcessingException;
diff --git a/rest/src/main/java/org/taskana/rest/serialization/DistributionTargetSerializer.java b/rest/src/main/java/pro/taskana/rest/serialization/DistributionTargetSerializer.java
similarity index 92%
rename from rest/src/main/java/org/taskana/rest/serialization/DistributionTargetSerializer.java
rename to rest/src/main/java/pro/taskana/rest/serialization/DistributionTargetSerializer.java
index 5bea3ad08..777741b2b 100644
--- a/rest/src/main/java/org/taskana/rest/serialization/DistributionTargetSerializer.java
+++ b/rest/src/main/java/pro/taskana/rest/serialization/DistributionTargetSerializer.java
@@ -1,10 +1,10 @@
-package org.taskana.rest.serialization;
+package pro.taskana.rest.serialization;
 
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.taskana.model.Workbasket;
+import pro.taskana.model.Workbasket;
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.SerializerProvider;
diff --git a/rest/src/main/java/org/taskana/rest/serialization/WorkbasketMixIn.java b/rest/src/main/java/pro/taskana/rest/serialization/WorkbasketMixIn.java
similarity index 86%
rename from rest/src/main/java/org/taskana/rest/serialization/WorkbasketMixIn.java
rename to rest/src/main/java/pro/taskana/rest/serialization/WorkbasketMixIn.java
index dad1b7daf..6d40ed6c3 100644
--- a/rest/src/main/java/org/taskana/rest/serialization/WorkbasketMixIn.java
+++ b/rest/src/main/java/pro/taskana/rest/serialization/WorkbasketMixIn.java
@@ -1,8 +1,8 @@
-package org.taskana.rest.serialization;
+package pro.taskana.rest.serialization;
 
 import java.util.List;
 
-import org.taskana.model.Workbasket;
+import pro.taskana.model.Workbasket;
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
diff --git a/rest/src/main/java/org/taskana/sampledata/SampleDataGenerator.java b/rest/src/main/java/pro/taskana/sampledata/SampleDataGenerator.java
similarity index 98%
rename from rest/src/main/java/org/taskana/sampledata/SampleDataGenerator.java
rename to rest/src/main/java/pro/taskana/sampledata/SampleDataGenerator.java
index d81ca5ef3..500baac05 100644
--- a/rest/src/main/java/org/taskana/sampledata/SampleDataGenerator.java
+++ b/rest/src/main/java/pro/taskana/sampledata/SampleDataGenerator.java
@@ -1,4 +1,4 @@
-package org.taskana.sampledata;
+package pro.taskana.sampledata;
 
 import org.apache.ibatis.jdbc.ScriptRunner;
 import org.slf4j.Logger;
diff --git a/rest/src/main/resources/application.properties b/rest/src/main/resources/application.properties
index ed9c0ff88..3171d4f00 100644
--- a/rest/src/main/resources/application.properties
+++ b/rest/src/main/resources/application.properties
@@ -1 +1 @@
-logging.level.org.taskana=DEBUG
+logging.level.pro.taskana=DEBUG
diff --git a/rest/src/main/resources/pss_jaas.config b/rest/src/main/resources/pss_jaas.config
index 40f3bcfec..a901b917a 100644
--- a/rest/src/main/resources/pss_jaas.config
+++ b/rest/src/main/resources/pss_jaas.config
@@ -1,3 +1,3 @@
 taskana {
-  org.taskana.rest.security.SampleLoginModule required;
+  pro.taskana.rest.security.SampleLoginModule required;
 };