diff --git a/pom.xml b/pom.xml
index fdf6c750..3c024daf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -81,41 +81,38 @@
     <version.thymeleaf-spring-data-dialect>3.5.0</version.thymeleaf-spring-data-dialect>
 
     <!-- Webjars -->
-    <webjars.jquery.version>3.6.0</webjars.jquery.version>
+    <webjars.jquery.version>3.6.1</webjars.jquery.version>
     <webjars.popper.js.version>2.9.3</webjars.popper.js.version>
     <webjars.bootstrap.version>5.2.0</webjars.bootstrap.version>
     <webjars.font-awesome.version>6.1.2</webjars.font-awesome.version>
-    <opencsv.version>5.3</opencsv.version>
+    <opencsv.version>5.7.0</opencsv.version>
 
     <!-- Unit and Integration Testing -->
     <skipTests>true</skipTests>
     <xmlunit.version>2.9.0</xmlunit.version>
-    <htmlunit.version>2.63.0</htmlunit.version>
-    <groovy-all.version>2.4.21</groovy-all.version>
+    <htmlunit.version>2.64.0</htmlunit.version>
+    <version.groovy-all>3.0.12</version.groovy-all>
     <hamcrest.version>2.2</hamcrest.version>
     <jsoup.version>1.15.3</jsoup.version>
-    <pmdVersion>6.46.0</pmdVersion>
+    <pmdVersion>6.49.0</pmdVersion>
 
-    <!-- SCM and Releasing -->
     <version.org.apache.maven.scm>1.13.0</version.org.apache.maven.scm>
-
-    <!-- Docker -->
-    <docker-compose-maven-plugin.version>4.0.0</docker-compose-maven-plugin.version>
-    <docker-compose-maven-plugin.verbose>true</docker-compose-maven-plugin.verbose>
-    <docker-compose-maven-plugin.removeImages>true</docker-compose-maven-plugin.removeImages>
-    <docker-compose-maven-plugin.removeVolumes>true</docker-compose-maven-plugin.removeVolumes>
-    <docker-compose-maven-plugin.ignorePullFailures>true</docker-compose-maven-plugin.ignorePullFailures>
-    <docker-compose-maven-plugin.detachedMode>true</docker-compose-maven-plugin.detachedMode>
-
-    <!-- Maven Plugins -->
-    <maven-release-plugin.version>3.0.0-M6</maven-release-plugin.version>
-
-    <!-- Maven Reports for Site -->
+    <version.maven-invoker-plugin>3.3.0</version.maven-invoker-plugin>
+    <version.maven-clean-plugin>3.2.0</version.maven-clean-plugin>
+    <version.maven-dependency-plugin>3.3.0</version.maven-dependency-plugin>
+    <version.maven-compiler-plugin>3.10.1</version.maven-compiler-plugin>
+    <version.maven-install-plugin>3.0.1</version.maven-install-plugin>
+    <version.maven-deploy-plugin>3.0.0</version.maven-deploy-plugin>
+    <version.maven-javadoc-plugin>3.4.1</version.maven-javadoc-plugin>
+    <version.maven-source-plugin>3.2.1</version.maven-source-plugin>
+    <version.maven-surefire-plugin>3.0.0-M7</version.maven-surefire-plugin>
+    <version.maven-failsafe-plugin>3.0.0-M7</version.maven-failsafe-plugin>
+    <version.maven-release-plugin>3.0.0-M6</version.maven-release-plugin>
     <version.maven-site-plugin>3.12.0</version.maven-site-plugin>
     <version.maven-project-info-reports-plugin>3.3.0</version.maven-project-info-reports-plugin>
     <version.maven-checkstyle-plugin>3.1.2</version.maven-checkstyle-plugin>
     <version.maven-jxr-plugin>3.2.0</version.maven-jxr-plugin>
-    <maven-pmd-plugin.version>3.17.0</maven-pmd-plugin.version>
+    <version.maven-pmd-plugin>3.17.0</version.maven-pmd-plugin>
     <version.spotbugs-maven-plugin>4.7.0.0</version.spotbugs-maven-plugin>
     <version.maven-surefire-report-plugin>3.0.0-M7</version.maven-surefire-report-plugin>
     <version.asciidoctor-maven-plugin>2.2.2</version.asciidoctor-maven-plugin>
@@ -123,6 +120,12 @@
     <version.maven-enforcer-plugin>3.1.0</version.maven-enforcer-plugin>
     <version.plantuml-maven-plugin>1.5.2</version.plantuml-maven-plugin>
     <version.net.sourceforge.plantuml>1.2022.6</version.net.sourceforge.plantuml>
+    <version.docker-compose-maven-plugin>4.0.0</version.docker-compose-maven-plugin>
+    <docker-compose-maven-plugin.verbose>true</docker-compose-maven-plugin.verbose>
+    <docker-compose-maven-plugin.removeImages>true</docker-compose-maven-plugin.removeImages>
+    <docker-compose-maven-plugin.removeVolumes>true</docker-compose-maven-plugin.removeVolumes>
+    <docker-compose-maven-plugin.ignorePullFailures>true</docker-compose-maven-plugin.ignorePullFailures>
+    <docker-compose-maven-plugin.detachedMode>true</docker-compose-maven-plugin.detachedMode>
   </properties>
 
   <repositories>
@@ -250,6 +253,7 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+      <!--
       <dependency>
         <groupId>org.springframework.integration</groupId>
         <artifactId>spring-integration-bom</artifactId>
@@ -262,6 +266,7 @@
         <artifactId>spring-integration-ws</artifactId>
         <version>${spring-integration.version}</version>
       </dependency>
+      -->
 
       <!-- webjars -->
       <dependency>
@@ -305,6 +310,8 @@
         <version>${lombok.version}</version>
         <optional>false</optional>
       </dependency>
+
+      <!--
       <dependency>
         <groupId>org.hamcrest</groupId>
         <artifactId>hamcrest</artifactId>
@@ -323,13 +330,19 @@
         <version>${hamcrest.version}</version>
         <scope>test</scope>
       </dependency>
-
       <dependency>
         <groupId>org.jsoup</groupId>
         <artifactId>jsoup</artifactId>
         <version>${jsoup.version}</version>
         <scope>test</scope>
       </dependency>
+      -->
+
+      <dependency>
+        <groupId>org.postgresql</groupId>
+        <artifactId>postgresql</artifactId>
+        <version>42.4.1</version>
+      </dependency>
 
       <!-- SCM -->
       <dependency>
@@ -392,7 +405,7 @@
       <dependency>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-invoker-plugin</artifactId>
-        <version>${maven-invoker-plugin.version}</version>
+        <version>${version.maven-invoker-plugin}</version>
         <type>maven-plugin</type>
         <scope>provided</scope>
         <exclusions>
@@ -405,21 +418,21 @@
       <dependency>
         <groupId>com.dkanejs.maven.plugins</groupId>
         <artifactId>docker-compose-maven-plugin</artifactId>
-        <version>${docker-compose-maven-plugin.version}</version>
+        <version>${version.docker-compose-maven-plugin}</version>
         <type>maven-plugin</type>
         <scope>provided</scope>
       </dependency>
       <dependency>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-clean-plugin</artifactId>
-        <version>${maven-clean-plugin.version}</version>
+        <version>${version.maven-clean-plugin}</version>
         <type>maven-plugin</type>
         <scope>provided</scope>
       </dependency>
       <dependency>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
-        <version>${maven-dependency-plugin.version}</version>
+        <version>${version.maven-dependency-plugin}</version>
         <type>maven-plugin</type>
         <scope>provided</scope>
         <exclusions>
@@ -432,7 +445,7 @@
       <dependency>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>${maven-compiler-plugin.version}</version>
+        <version>${version.maven-compiler-plugin}</version>
         <type>maven-plugin</type>
         <scope>provided</scope>
       </dependency>
@@ -477,6 +490,7 @@
           </exclusion>
         </exclusions>
       </dependency>
+      <!--
       <dependency>
         <groupId>com.github.spotbugs</groupId>
         <artifactId>spotbugs-maven-plugin</artifactId>
@@ -484,10 +498,11 @@
         <type>maven-plugin</type>
         <scope>provided</scope>
       </dependency>
+      -->
       <dependency>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-pmd-plugin</artifactId>
-        <version>${maven-pmd-plugin.version}</version>
+        <version>${version.maven-pmd-plugin}</version>
         <type>maven-plugin</type>
         <scope>provided</scope>
         <exclusions>
@@ -521,7 +536,7 @@
       <dependency>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-release-plugin</artifactId>
-        <version>${maven-release-plugin.version}</version>
+        <version>${version.maven-release-plugin}</version>
         <type>maven-plugin</type>
         <scope>provided</scope>
         <exclusions>
@@ -534,39 +549,38 @@
       <dependency>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-deploy-plugin</artifactId>
-        <version>${maven-deploy-plugin.version}</version>
+        <version>${version.maven-deploy-plugin}</version>
         <type>maven-plugin</type>
         <scope>provided</scope>
       </dependency>
       <dependency>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-install-plugin</artifactId>
-        <version>${maven-install-plugin.version}</version>
+        <version>${version.maven-install-plugin}</version>
         <type>maven-plugin</type>
         <scope>provided</scope>
       </dependency>
       <dependency>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>${maven-javadoc-plugin.version}</version>
+        <version>${version.maven-javadoc-plugin}</version>
         <type>maven-plugin</type>
         <scope>provided</scope>
       </dependency>
       <dependency>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-source-plugin</artifactId>
-        <version>${maven-source-plugin.version}</version>
+        <version>${version.maven-source-plugin}</version>
         <type>maven-plugin</type>
         <scope>provided</scope>
       </dependency>
-
+      <!--
       <dependency>
         <groupId>org.apache.maven.doxia</groupId>
         <artifactId>doxia-module-markdown</artifactId>
         <version>${version.doxia-module-markdown}</version>
         <scope>provided</scope>
       </dependency>
-
       <dependency>
         <groupId>org.xmlunit</groupId>
         <artifactId>xmlunit-legacy</artifactId>
@@ -582,9 +596,10 @@
       <dependency>
         <groupId>org.codehaus.groovy</groupId>
         <artifactId>groovy-all</artifactId>
-        <version>${groovy-all.version}</version>
+        <version>${version.groovy-all}</version>
         <scope>test</scope>
       </dependency>
+      -->
     </dependencies>
   </dependencyManagement>
 
@@ -595,19 +610,20 @@
       <scope>provided</scope>
       <optional>false</optional>
     </dependency>
+    <!--
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-devtools</artifactId>
       <scope>provided</scope>
       <optional>true</optional>
     </dependency>
+    -->
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-configuration-processor</artifactId>
       <scope>provided</scope>
       <optional>true</optional>
     </dependency>
-    <!-- spring-boot-starter -->
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-actuator</artifactId>
@@ -681,7 +697,7 @@
       <artifactId>spring-boot-starter-cache</artifactId>
     </dependency>
     -->
-    <!-- org.springframework -->
+    <!--
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-core</artifactId>
@@ -731,12 +747,11 @@
       <groupId>org.springframework.security</groupId>
       <artifactId>spring-security-config</artifactId>
     </dependency>
-    <!--
     <dependency>
       <groupId>org.springframework.security</groupId>
       <artifactId>spring-security-remoting</artifactId>
     </dependency>
-    -->
+
     <dependency>
       <groupId>org.springframework.security</groupId>
       <artifactId>spring-security-web</artifactId>
@@ -757,6 +772,7 @@
       <groupId>org.springframework.data</groupId>
       <artifactId>spring-data-commons</artifactId>
     </dependency>
+    -->
 
     <dependency>
       <groupId>org.springframework.security</groupId>
@@ -764,7 +780,6 @@
       <scope>test</scope>
     </dependency>
 
-    <!-- Frontend Webjars -->
     <dependency>
       <groupId>org.webjars</groupId>
       <artifactId>jquery</artifactId>
@@ -781,16 +796,6 @@
       <groupId>org.webjars</groupId>
       <artifactId>font-awesome</artifactId>
     </dependency>
-
-    <dependency>
-      <groupId>org.postgresql</groupId>
-      <artifactId>postgresql</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.zaxxer</groupId>
-      <artifactId>HikariCP</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>org.thymeleaf</groupId>
       <artifactId>thymeleaf</artifactId>
@@ -824,19 +829,28 @@
     <dependency>
       <groupId>org.thymeleaf</groupId>
       <artifactId>thymeleaf-testing</artifactId>
-      <scope>provided</scope>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.postgresql</groupId>
+      <artifactId>postgresql</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.zaxxer</groupId>
+      <artifactId>HikariCP</artifactId>
     </dependency>
 
+    <!--
     <dependency>
       <groupId>org.hibernate</groupId>
       <artifactId>hibernate-core</artifactId>
     </dependency>
-
     <dependency>
       <groupId>org.jsoup</groupId>
       <artifactId>jsoup</artifactId>
       <scope>test</scope>
     </dependency>
+    -->
 
     <!-- scope test - without dependency-management in this pom.xml -->
     <dependency>
@@ -850,6 +864,7 @@
       <scope>test</scope>
     </dependency>
 
+    <!--
     <dependency>
       <groupId>org.hamcrest</groupId>
       <artifactId>hamcrest</artifactId>
@@ -875,6 +890,7 @@
       <artifactId>htmlunit</artifactId>
       <scope>test</scope>
     </dependency>
+    -->
 
     <!-- scm -->
     <dependency>
@@ -908,7 +924,6 @@
       <scope>provided</scope>
     </dependency>
 
-    <!-- maven plugins -->
     <dependency>
       <groupId>org.apache.maven.plugins</groupId>
       <artifactId>maven-enforcer-plugin</artifactId>
@@ -980,12 +995,14 @@
       <type>maven-plugin</type>
       <scope>provided</scope>
     </dependency>
+    <!--
     <dependency>
       <groupId>com.github.spotbugs</groupId>
       <artifactId>spotbugs-maven-plugin</artifactId>
       <type>maven-plugin</type>
       <scope>provided</scope>
     </dependency>
+    -->
     <dependency>
       <groupId>org.apache.maven.plugins</groupId>
       <artifactId>maven-pmd-plugin</artifactId>
@@ -1040,6 +1057,7 @@
       <type>maven-plugin</type>
       <scope>provided</scope>
     </dependency>
+    <!--
     <dependency>
       <groupId>org.apache.maven.doxia</groupId>
       <artifactId>doxia-module-markdown</artifactId>
@@ -1050,11 +1068,12 @@
       <artifactId>groovy-all</artifactId>
       <scope>test</scope>
     </dependency>
+    -->
   </dependencies>
 
   <build>
     <finalName>${project.artifactId}</finalName>
-    <defaultGoal>clean package spring-boot:run</defaultGoal>
+    <defaultGoal>clean install spring-boot:run</defaultGoal>
     <pluginManagement>
       <plugins>
         <plugin>
@@ -1065,27 +1084,27 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-invoker-plugin</artifactId>
-          <version>${maven-invoker-plugin.version}</version>
+          <version>${version.maven-invoker-plugin}</version>
         </plugin>
         <plugin>
           <groupId>com.dkanejs.maven.plugins</groupId>
           <artifactId>docker-compose-maven-plugin</artifactId>
-          <version>${docker-compose-maven-plugin.version}</version>
+          <version>${version.docker-compose-maven-plugin}</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-clean-plugin</artifactId>
-          <version>${maven-clean-plugin.version}</version>
+          <version>${version.maven-clean-plugin}</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-dependency-plugin</artifactId>
-          <version>${maven-dependency-plugin.version}</version>
+          <version>${version.maven-dependency-plugin}</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>${maven-compiler-plugin.version}</version>
+          <version>${version.maven-compiler-plugin}</version>
         </plugin>
         <plugin>
           <groupId>org.springframework.boot</groupId>
@@ -1095,7 +1114,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-install-plugin</artifactId>
-          <version>${maven-install-plugin.version}</version>
+          <version>${version.maven-install-plugin}</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -1120,7 +1139,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>${maven-surefire-plugin.version}</version>
+          <version>${version.maven-surefire-plugin}</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -1130,7 +1149,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-release-plugin</artifactId>
-          <version>${maven-release-plugin.version}</version>
+          <version>${version.maven-release-plugin}</version>
         </plugin>
         <plugin>
           <groupId>org.asciidoctor</groupId>
@@ -1140,12 +1159,12 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-javadoc-plugin</artifactId>
-          <version>${maven-javadoc-plugin.version}</version>
+          <version>${version.maven-javadoc-plugin}</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-pmd-plugin</artifactId>
-          <version>${maven-pmd-plugin.version}</version>
+          <version>${version.maven-pmd-plugin}</version>
           <dependencies>
             <dependency>
               <groupId>net.sourceforge.pmd</groupId>
@@ -1176,7 +1195,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-source-plugin</artifactId>
-          <version>${maven-source-plugin.version}</version>
+          <version>${version.maven-source-plugin}</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -1186,12 +1205,12 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-deploy-plugin</artifactId>
-          <version>${maven-deploy-plugin.version}</version>
+          <version>${version.maven-deploy-plugin}</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-failsafe-plugin</artifactId>
-          <version>${maven-failsafe-plugin.version}</version>
+          <version>${version.maven-failsafe-plugin}</version>
         </plugin>
       </plugins>
     </pluginManagement>
@@ -1278,13 +1297,38 @@
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-maven-plugin</artifactId>
         <configuration>
+          <layout>JAR</layout>
           <executable>true</executable>
           <addResources>true</addResources>
+          <excludeGroupIds>org.eclipse.aether,org.beanshell,org.apache.maven.plugins,org.apache.maven.scm,org.jruby,com.vladsch.flexmark,org.apache.maven.doxia,org.codehaus.plexus,org.apache.maven.scm,io.netty,org.apache.groovy,org.eclipse.jetty,org.mockito,org.asciidoctor,com.github.jnr,org.apache.maven.surefire,org.apache.maven,net.sourceforge.saxon,net.sf.saxon,com.github.spotbugs,org.eclipse.jgit,org.apache.ant,org.apache.velocity,org.junit.jupiter,org.junit.platform,junit,org.mockito,net.sourceforge.pmd,org.eclipse.sisu,org.ow2.asmcom.fasterxml.jackson.module</excludeGroupIds>
           <excludes>
             <exclude>
               <groupId>org.springframework.boot</groupId>
               <artifactId>spring-boot-configuration-processor</artifactId>
             </exclude>
+            <!--
+            <exclude>
+              <groupId>org.springframework.boot</groupId>
+              <artifactId>spring-boot-configuration-processor</artifactId>
+            </exclude>
+            <excludeArtifactIds>
+            jboss-transaction-api_1.2_spec,
+            byte-buddy-agent,byte-buddy,
+            backport9,backport-util-concurrent,
+            spring-boot-configuration-processor,
+            spring-boot-devtools,
+            ganymed-ssh2,maven-toolchain,
+            weld-probe-core,antlr,
+            bsh,velocity-tools,
+            liquibase-core,
+            jruby-complete,
+            cdi-api,
+            lombok,
+            jcommander,
+            checkstyle,
+            plexus-build-api
+            </excludeArtifactIds>
+            -->
           </excludes>
         </configuration>
         <executions>
@@ -1327,6 +1371,13 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
+        <configuration>
+          <includeScope>compile</includeScope>
+          <excludeTypes>maven-plugin</excludeTypes>
+          <excludeScope>test,provided</excludeScope>
+          <excludeGroupIds>org.eclipse.aether,antlr,org.beanshell,org.apache.maven.plugins,org.apache.maven.scm,org.jruby,com.vladsch.flexmark,org.apache.maven.doxia,org.codehaus.plexus,org.apache.maven.scm,io.netty,org.apache.groovy,org.eclipse.jetty,org.mockito,org.asciidoctor,com.github.jnr,org.apache.maven.surefire,org.apache.maven,net.sourceforge.saxon,net.sf.saxon,com.github.spotbugs,org.eclipse.jgit,org.apache.ant,org.apache.velocity,org.junit.jupiter,org.junit.platform,junit,org.mockito,net.sourceforge.pmd,org.eclipse.sisu,org.ow2.asmcom.fasterxml.jackson.module,  </excludeGroupIds>
+          <excludeArtifactIds>jboss-transaction-api_1.2_spec,byte-buddy-agent,byte-buddy,backport9,backport-util-concurrent,spring-boot-configuration-processor,spring-boot-devtools,ganymed-ssh2,maven-toolchain,weld-probe-core,antlr,bsh,velocity-tools,liquibase-core,jruby-complete,cdi-api,lombok,jcommander,checkstyle,plexus-build-api</excludeArtifactIds>
+        </configuration>
         <executions>
           <execution>
             <id>copy-dependencies</id>
@@ -1334,13 +1385,6 @@
             <goals>
               <goal>copy-dependencies</goal>
             </goals>
-            <configuration>
-              <includeScope>compile</includeScope>
-              <excludeTypes>maven-plugin</excludeTypes>
-              <excludeScope>test,provided</excludeScope>
-              <excludeGroupIds>org.eclipse.aether,antlr,org.beanshell,org.apache.maven.plugins,org.apache.maven.scm,org.jruby,com.vladsch.flexmark,org.apache.maven.doxia,org.codehaus.plexus,org.apache.maven.scm,io.netty,org.apache.groovy,org.eclipse.jetty,org.mockito,org.asciidoctor,com.github.jnr,org.apache.maven.surefire,org.apache.maven,net.sourceforge.saxon,net.sf.saxon,com.github.spotbugs,org.eclipse.jgit,org.apache.ant,org.apache.velocity,org.junit.jupiter,org.junit.platform,junit,org.mockito,net.sourceforge.pmd,org.eclipse.sisu,org.ow2.asmcom.fasterxml.jackson.module,  </excludeGroupIds>
-              <excludeArtifactIds>jboss-transaction-api_1.2_spec,byte-buddy-agent,byte-buddy,backport9,backport-util-concurrent,spring-boot-configuration-processor,spring-boot-devtools,ganymed-ssh2,maven-toolchain,weld-probe-core,antlr,bsh,velocity-tools,liquibase-core,jruby-complete,cdi-api,lombok,jcommander,checkstyle,plexus-build-api</excludeArtifactIds>
-            </configuration>
           </execution>
         </executions>
       </plugin>
@@ -1486,15 +1530,6 @@
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-maven-plugin</artifactId>
         <inherited>true</inherited>
-        <configuration>
-          <addResources>true</addResources>
-          <excludes>
-            <exclude>
-              <groupId>org.springframework.boot</groupId>
-              <artifactId>spring-boot-configuration-processor</artifactId>
-            </exclude>
-          </excludes>
-        </configuration>
       </plugin>
       <plugin>
         <groupId>com.dkanejs.maven.plugins</groupId>
@@ -1506,8 +1541,7 @@
           <removeImages>${docker-compose-maven-plugin.removeImages}</removeImages>
           <removeVolumes>true</removeVolumes>
           <ignorePullFailures>true</ignorePullFailures>
-          <detachedMode>true</detachedMode>
-        </configuration>
+          <detachedMode>true</detachedMode>  </configuration>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/db/ProjectIdController.java b/src/main/java/org/woehlke/java/simpleworklist/domain/db/ProjectIdController.java
index 3229e7c6..81c7292f 100644
--- a/src/main/java/org/woehlke/java/simpleworklist/domain/db/ProjectIdController.java
+++ b/src/main/java/org/woehlke/java/simpleworklist/domain/db/ProjectIdController.java
@@ -20,6 +20,7 @@
 import org.woehlke.java.simpleworklist.domain.db.data.task.TaskEnergy;
 import org.woehlke.java.simpleworklist.domain.db.data.task.TaskService;
 import org.woehlke.java.simpleworklist.domain.db.data.task.TaskTime;
+import org.woehlke.java.simpleworklist.domain.meso.move.MoveTaskService;
 import org.woehlke.java.simpleworklist.domain.meso.taskworkflow.TaskState;
 import org.woehlke.java.simpleworklist.domain.meso.taskworkflow.TransformTaskIntoProjektService;
 import org.woehlke.java.simpleworklist.domain.db.user.UserAccount;
@@ -42,16 +43,18 @@
 public class ProjectIdController extends AbstractController {
 
     private final ProjectControllerService projectControllerService;
+    private final MoveTaskService moveTaskService;
     private final TaskService taskService;
     private final TransformTaskIntoProjektService transformTaskIntoProjektService;
 
     @Autowired
     public ProjectIdController(
-        ProjectControllerService projectControllerService,
-        TaskService taskService,
-        TransformTaskIntoProjektService transformTaskIntoProjektService
+      ProjectControllerService projectControllerService,
+      MoveTaskService moveTaskService, TaskService taskService,
+      TransformTaskIntoProjektService transformTaskIntoProjektService
     ) {
         this.projectControllerService = projectControllerService;
+        this.moveTaskService = moveTaskService;
         this.taskService = taskService;
         this.transformTaskIntoProjektService = transformTaskIntoProjektService;
     }
@@ -384,7 +387,7 @@ public final String moveAllCompletedToTrash(
     ) {
         userSession.setLastProjectId(thisProject.getId());
         Context context = super.getContext(userSession);
-        taskService.moveAllCompletedToTrash(context);
+      moveTaskService.moveAllCompletedToTrash(context);
         model.addAttribute("userSession", userSession);
         model.addAttribute("taskstateType",PROJECTS.getType());
         model.addAttribute("dataPage", true);
@@ -399,7 +402,7 @@ public final String emptyTrash(
     ) {
         userSession.setLastProjectId(thisProject.getId());
         Context context = super.getContext(userSession);
-        taskService.emptyTrash(context);
+      moveTaskService.emptyTrash(context);
         model.addAttribute("userSession", userSession);
         model.addAttribute("taskstateType",PROJECTS.getType());
         model.addAttribute("dataPage", true);
@@ -564,7 +567,7 @@ public final String moveTaskToAnotherProject(
         @ModelAttribute("userSession") UserSessionBean userSession,
         Model model
     ) {
-        task = taskService.moveTaskToRootProject(task);
+        task = moveTaskService.moveTaskToRootProject(task);
         model.addAttribute("userSession", userSession);
         model.addAttribute("taskstateType",PROJECTS.getType());
         model.addAttribute("dataPage", true);
@@ -579,7 +582,7 @@ public final String moveTaskToAnotherProject(
         @ModelAttribute("userSession") UserSessionBean userSession,
         Model model
     ) {
-        task = taskService.moveTaskToAnotherProject(task,otherProject);
+        task = moveTaskService.moveTaskToAnotherProject(task,otherProject);
         model.addAttribute("userSession", userSession);
         model.addAttribute("taskstateType",PROJECTS.getType());
         model.addAttribute("dataPage", true);
diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/db/ProjectRootController.java b/src/main/java/org/woehlke/java/simpleworklist/domain/db/ProjectRootController.java
index 6d692e75..7f4ce3a2 100644
--- a/src/main/java/org/woehlke/java/simpleworklist/domain/db/ProjectRootController.java
+++ b/src/main/java/org/woehlke/java/simpleworklist/domain/db/ProjectRootController.java
@@ -21,6 +21,7 @@
 import org.woehlke.java.simpleworklist.domain.db.data.task.TaskEnergy;
 import org.woehlke.java.simpleworklist.domain.db.data.task.TaskService;
 import org.woehlke.java.simpleworklist.domain.db.data.task.TaskTime;
+import org.woehlke.java.simpleworklist.domain.meso.move.MoveTaskService;
 import org.woehlke.java.simpleworklist.domain.meso.taskworkflow.TaskState;
 import org.woehlke.java.simpleworklist.domain.meso.taskworkflow.TransformTaskIntoProjektService;
 import org.woehlke.java.simpleworklist.domain.db.user.UserAccount;
@@ -41,12 +42,14 @@ public class ProjectRootController extends AbstractController {
     public final static String rootProjectUrl = "redirect:/project/root";
 
     private final ProjectControllerService projectControllerService;
+    private final MoveTaskService moveTaskService;
     private final TaskService taskService;
     private final TransformTaskIntoProjektService transformTaskIntoProjektService;
 
     @Autowired
-    public ProjectRootController(ProjectControllerService projectControllerService, TaskService taskService, TransformTaskIntoProjektService transformTaskIntoProjektService) {
+    public ProjectRootController(ProjectControllerService projectControllerService, MoveTaskService moveTaskService, TaskService taskService, TransformTaskIntoProjektService transformTaskIntoProjektService) {
         this.projectControllerService = projectControllerService;
+        this.moveTaskService = moveTaskService;
         this.taskService = taskService;
         this.transformTaskIntoProjektService = transformTaskIntoProjektService;
     }
@@ -301,7 +304,7 @@ public final String moveTaskToProjectRoot(
         @ModelAttribute("userSession") UserSessionBean userSession,
         Model model
     ) {
-        task = taskService.moveTaskToRootProject(task);
+        task = moveTaskService.moveTaskToRootProject(task);
         userSession.setLastProjectId(Project.rootProjectId);
         userSession.setLastTaskState(task.getTaskState());
         userSession.setLastTaskId(task.getId());
@@ -318,7 +321,7 @@ public final String moveTaskToProject(
         @ModelAttribute("userSession") UserSessionBean userSession,
         Model model
     ) {
-        task = taskService.moveTaskToAnotherProject(task,targetProject);
+        task = moveTaskService.moveTaskToAnotherProject(task,targetProject);
         userSession.setLastProjectId(targetProject.getId());
         userSession.setLastTaskState(task.getTaskState());
         userSession.setLastTaskId(task.getId());
@@ -478,7 +481,7 @@ public final String moveAllCompletedToTrash(
         Model model
     ) {
         Context context = super.getContext(userSession);
-        taskService.moveAllCompletedToTrash(context);
+        moveTaskService.moveAllCompletedToTrash(context);
         userSession.setLastContextId(context.getId());
         userSession.setLastProjectId(Project.rootProjectId);
         model.addAttribute("userSession", userSession);
@@ -493,7 +496,7 @@ public final String emptyTrash(
         Model model
     ) {
         Context context = super.getContext(userSession);
-        taskService.emptyTrash(context);
+        moveTaskService.emptyTrash(context);
         userSession.setLastContextId(context.getId());
         userSession.setLastProjectId(Project.rootProjectId);
         model.addAttribute("userSession", userSession);
diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/db/data/task/TaskService.java b/src/main/java/org/woehlke/java/simpleworklist/domain/db/data/task/TaskService.java
index 37a145fd..32252cc4 100644
--- a/src/main/java/org/woehlke/java/simpleworklist/domain/db/data/task/TaskService.java
+++ b/src/main/java/org/woehlke/java/simpleworklist/domain/db/data/task/TaskService.java
@@ -7,22 +7,15 @@
 import org.woehlke.java.simpleworklist.domain.db.data.Task;
 import org.woehlke.java.simpleworklist.domain.meso.taskworkflow.TaskState;
 
-public interface TaskService {
+import java.util.List;
 
-    Task moveTaskToInbox(Task task);
-    Task moveTaskToToday(Task task);
-    Task moveTaskToNext(Task task);
-    Task moveTaskToWaiting(Task task);
-    Task moveTaskToSomeday(Task task);
-    Task moveTaskToFocus(Task task);
-    Task moveTaskToCompleted(Task task);
-    Task moveTaskToTrash(Task task);
+public interface TaskService {
 
-    void moveAllCompletedToTrash(Context context);
-    void emptyTrash(Context context);
+//    void moveAllCompletedToTrash(Context context);
+//    void emptyTrash(Context context);
 
-    Task moveTaskToRootProject(Task task);
-    Task moveTaskToAnotherProject(Task task, Project project);
+//    Task moveTaskToRootProject(Task task);
+//    Task moveTaskToAnotherProject(Task task, Project project);
 
     Task addToInbox(Task task);
     Task addToProject(Task task);
@@ -68,4 +61,15 @@ public interface TaskService {
 
     void moveTasksUpByProject(Task sourceTask, Task destinationTask);
     void moveTasksDownByProject(Task sourceTask, Task destinationTask);
+
+    Task saveAndFlush(Task task);
+
+    void deleteAll(List<Task> taskListDeleted);
+
+    void saveAll(List<Task> taskListChanged);
+
+    List<Task> findByTaskStateAndContextOrderByOrderIdTaskStateAsc(TaskState completed, Context context);
+
+    List<Task> findByTaskStateAndContext(TaskState trash, Context context);
+
 }
diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/db/data/task/TaskServiceImpl.java b/src/main/java/org/woehlke/java/simpleworklist/domain/db/data/task/TaskServiceImpl.java
index de99f87a..4495691d 100644
--- a/src/main/java/org/woehlke/java/simpleworklist/domain/db/data/task/TaskServiceImpl.java
+++ b/src/main/java/org/woehlke/java/simpleworklist/domain/db/data/task/TaskServiceImpl.java
@@ -92,12 +92,12 @@ public Task findOne(@Min(1L) long taskId) {
     public Task updatedViaTaskstate(Task task) {
         log.info("updatedViaTaskstate");
         if(task.getProject() != null){
-          Long projectId = task.getProject().getId();
+          long projectId = task.getProject().getId();
           Project project = projectRepository.getReferenceById(projectId);
           task.setProject(project);
         }
         if(task.getLastProject()!=null){
-          Long projectId = task.getLastProject().getId();
+          long projectId = task.getLastProject().getId();
           Project project = projectRepository.getReferenceById(projectId);
           task.setLastProject(project);
         }
@@ -108,8 +108,18 @@ public Task updatedViaTaskstate(Task task) {
 
     @Override
     @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
-    public Task updatedViaProject( @Valid Task task) {
+    public Task updatedViaProject(Task task) {
         log.info("updatedViaProject");
+        if(task.getProject() != null){
+          long projectId = task.getProject().getId();
+          Project project = projectRepository.getReferenceById(projectId);
+          task.setProject(project);
+        }
+        if(task.getLastProject()!=null){
+          long projectId = task.getLastProject().getId();
+          Project project = projectRepository.getReferenceById(projectId);
+          task.setLastProject(project);
+        }
         task = taskRepository.saveAndFlush(task);
         log.info("persisted Task: " + task.outProject());
         return task;
@@ -119,12 +129,22 @@ public Task updatedViaProject( @Valid Task task) {
     @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
     public Task updatedViaProjectRoot( @Valid Task task) {
         log.info("updatedViaProject");
+        if(task.getProject() != null){
+          long projectId = task.getProject().getId();
+          Project project = projectRepository.getReferenceById(projectId);
+          task.setProject(project);
+        }
+        if(task.getLastProject()!=null){
+          long projectId = task.getLastProject().getId();
+          Project project = projectRepository.getReferenceById(projectId);
+          task.setLastProject(project);
+        }
         task = taskRepository.saveAndFlush(task);
         log.info("persisted Task: " + task.outProject());
         return task;
     }
 
-    @Override
+  @Override
     @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
     public Task addToInbox( @Valid Task task) {
         log.info("addToInbox");
@@ -174,70 +194,7 @@ public Task addToRootProject( @Valid Task task) {
         return task;
     }
 
-    @Override
-    @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
-    public Task moveTaskToRootProject( @Valid Task task) {
-        task.moveTaskToRootProject();
-        long maxOrderIdProject = this.getMaxOrderIdProjectRoot(task.getContext());
-        task.setOrderIdProject(++maxOrderIdProject);
-        return taskRepository.saveAndFlush(task);
-    }
-
-    @Override
-    @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
-    public Task moveTaskToAnotherProject( @Valid Task task,@Valid Project project) {
-        boolean okContext = task.hasSameContextAs(project);
-        if(okContext) {
-            task.moveTaskToAnotherProject(project);
-            long maxOrderIdProject = this.getMaxOrderIdProject(
-                task.getProject(),
-                task.getContext()
-            );
-            task.setOrderIdProject(++maxOrderIdProject);
-            taskRepository.saveAndFlush(task);
-        }
-        return task;
-    }
-
-    @Override
-    @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
-    public void moveAllCompletedToTrash( Context context) {
-        long maxOrderIdTaskState = this.getMaxOrderIdTaskState(
-            TaskState.TRASH,
-            context
-        );
-        long newOrderIdTaskState = maxOrderIdTaskState;
-        List<Task> taskListCompleted = taskRepository.findByTaskStateAndContextOrderByOrderIdTaskStateAsc(
-            TaskState.COMPLETED,
-            context
-        );
-        for (Task task : taskListCompleted) {
-            newOrderIdTaskState++;
-            task.setOrderIdTaskState(newOrderIdTaskState);
-            task.moveToTrash();
-        }
-        taskRepository.saveAll(taskListCompleted);
-    }
 
-    @Override
-    @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
-    public void emptyTrash( Context context) {
-        List<Task> taskList = taskRepository.findByTaskStateAndContext(
-            TaskState.TRASH,
-            context
-        );
-        List<Task> taskListChanged = new ArrayList<>(taskList.size());
-        for(Task task: taskList){
-            task.emptyTrash();
-            taskListChanged.add(task);
-        }
-        taskRepository.saveAll(taskListChanged);
-        List<Task> taskListDeleted = taskRepository.findByTaskStateAndContext(
-          TaskState.DELETED,
-          context
-        );
-        taskRepository.deleteAll(taskListDeleted);
-    }
 
     @Override
     @Transactional(propagation = Propagation.REQUIRED, readOnly = true)
@@ -457,116 +414,29 @@ public void moveTasksDownByProject(Task sourceTask, Task destinationTask) {
         log.info("-------------------------------------------------------------------------------");
     }
 
-    @Override
-    @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
-    public Task moveTaskToInbox(Task task) {
-        long newOrderIdTaskState = this.getMaxOrderIdTaskState(
-            TaskState.INBOX,
-            task.getContext()
-        );
-        task.moveToInbox();
-        task.setOrderIdTaskState(++newOrderIdTaskState);
-        task = taskRepository.saveAndFlush(task);
-        log.info("moved to inbox: " + task.outTaskstate());
-        return task;
-    }
+  @Override
+  public Task saveAndFlush(Task task) {
+    return taskRepository.saveAndFlush(task);
+  }
 
-    @Override
-    @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
-    public Task moveTaskToToday(Task task) {
-        Date now = new Date();
-        long newOrderIdTaskState = this.getMaxOrderIdTaskState(
-            TaskState.TODAY,
-            task.getContext()
-        );
-        task.moveToToday();
-        task.setOrderIdTaskState(++newOrderIdTaskState);
-        task = taskRepository.saveAndFlush(task);
-        log.info("moved to today: " + task.outTaskstate());
-        return task;
-    }
+  @Override
+  public void deleteAll(List<Task> taskListDeleted) {
+    taskRepository.deleteAll(taskListDeleted);
+  }
 
-    @Override
-    @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
-    public Task moveTaskToNext(Task task) {
-        long newOrderIdTaskState = this.getMaxOrderIdTaskState(
-            TaskState.NEXT,
-            task.getContext()
-        );
-        task.moveToNext();
-        task.setOrderIdTaskState(++newOrderIdTaskState);
-        task = taskRepository.saveAndFlush(task);
-        log.info("moved to next: " + task.outTaskstate());
-        return task;
-    }
+  @Override
+  public void saveAll(List<Task> taskListChanged) {
+    taskRepository.saveAll(taskListChanged);
+  }
 
-    @Override
-    @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
-    public Task moveTaskToWaiting(Task task) {
-        long newOrderIdTaskState = this.getMaxOrderIdTaskState(
-            TaskState.WAITING,
-            task.getContext()
-        );
-        task.moveToWaiting();
-        task.setOrderIdTaskState(++newOrderIdTaskState);
-        task = taskRepository.saveAndFlush(task);
-        log.info("moved to next: " + task.outTaskstate());
-        return task;
-    }
+  @Override
+  public List<Task> findByTaskStateAndContextOrderByOrderIdTaskStateAsc(TaskState completed, Context context) {
+    return taskRepository.findByTaskStateAndContextOrderByOrderIdTaskStateAsc(completed, context);
+  }
 
-    @Override
-    @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
-    public Task moveTaskToSomeday(Task task) {
-        long newOrderIdTaskState = this.getMaxOrderIdTaskState(
-            TaskState.SOMEDAY,
-            task.getContext()
-        );
-        task.moveToSomeday();
-        task.setOrderIdTaskState(++newOrderIdTaskState);
-        task = taskRepository.saveAndFlush(task);
-        log.info("moved to someday: " + task.outTaskstate());
-        return task;
-    }
-
-    @Override
-    @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
-    public Task moveTaskToFocus(Task task) {
-        long newOrderIdTaskState = this.getMaxOrderIdTaskState(
-            TaskState.FOCUS,
-            task.getContext()
-        );
-        task.moveToFocus();
-        task.setOrderIdTaskState(++newOrderIdTaskState);
-        task = taskRepository.saveAndFlush(task);
-        log.info("moved to focus: " + task.outTaskstate());
-        return task;
-    }
+  @Override
+  public List<Task> findByTaskStateAndContext(TaskState trash, Context context) {
+    return taskRepository.findByTaskStateAndContext(trash,context);
+  }
 
-    @Override
-    @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
-    public Task moveTaskToCompleted(Task task) {
-        long newOrderIdTaskState = this.getMaxOrderIdTaskState(
-            TaskState.COMPLETED,
-            task.getContext()
-        );
-        task.moveToCompletedTasks();
-        task.setOrderIdTaskState(++newOrderIdTaskState);
-        task = taskRepository.saveAndFlush(task);
-        log.info("moved to completed: " + task.outTaskstate());
-        return task;
-    }
-
-    @Override
-    @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
-    public Task moveTaskToTrash(Task task) {
-        long newOrderIdTaskState = this.getMaxOrderIdTaskState(
-            TaskState.TRASH,
-            task.getContext()
-        );
-        task.moveToTrash();
-        task.setOrderIdTaskState(++newOrderIdTaskState);
-        task = taskRepository.saveAndFlush(task);
-        log.info("moved to trash: " + task.outTaskstate());
-        return task;
-    }
 }
diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/meso/TaskStateTaskController.java b/src/main/java/org/woehlke/java/simpleworklist/domain/meso/TaskStateTaskController.java
index aebb322a..00ec3db9 100644
--- a/src/main/java/org/woehlke/java/simpleworklist/domain/meso/TaskStateTaskController.java
+++ b/src/main/java/org/woehlke/java/simpleworklist/domain/meso/TaskStateTaskController.java
@@ -15,6 +15,7 @@
 import org.woehlke.java.simpleworklist.domain.db.data.task.TaskEnergy;
 import org.woehlke.java.simpleworklist.domain.db.data.task.TaskService;
 import org.woehlke.java.simpleworklist.domain.db.data.task.TaskTime;
+import org.woehlke.java.simpleworklist.domain.meso.move.MoveTaskService;
 import org.woehlke.java.simpleworklist.domain.meso.taskworkflow.MoveTaskToTaskInTaskstateService;
 import org.woehlke.java.simpleworklist.domain.meso.taskworkflow.TaskState;
 import org.woehlke.java.simpleworklist.domain.meso.taskworkflow.TransformTaskIntoProjektService;
@@ -39,15 +40,17 @@
 public class TaskStateTaskController extends AbstractController {
 
     private final MoveTaskToTaskInTaskstateService moveTaskToTaskInTaskstateService;
+    private final MoveTaskService moveTaskService;
     private final TaskService taskService;
     private final TransformTaskIntoProjektService transformTaskIntoProjektService;
 
     @Autowired
     public TaskStateTaskController(
-        MoveTaskToTaskInTaskstateService moveTaskToTaskInTaskstateService, TaskService taskService,
-        TransformTaskIntoProjektService transformTaskIntoProjektService) {
+      MoveTaskToTaskInTaskstateService moveTaskToTaskInTaskstateService, MoveTaskService moveTaskService, TaskService taskService,
+      TransformTaskIntoProjektService transformTaskIntoProjektService) {
         this.moveTaskToTaskInTaskstateService = moveTaskToTaskInTaskstateService;
-        this.taskService = taskService;
+      this.moveTaskService = moveTaskService;
+      this.taskService = taskService;
         this.transformTaskIntoProjektService = transformTaskIntoProjektService;
     }
 
@@ -211,7 +214,7 @@ public final String moveTaskToAnotherProject(
         @NotNull @ModelAttribute("userSession") UserSessionBean userSession,
         Model model
     ) {
-        task = taskService.moveTaskToAnotherProject(task,project);
+        task = moveTaskService.moveTaskToAnotherProject(task,project);
         userSession.setLastProjectId(project.getId());
         model.addAttribute("userSession",userSession);
         model.addAttribute("dataPage", true);
@@ -224,7 +227,7 @@ public final String moveTaskToRootProject(
       @NotNull @ModelAttribute("userSession") UserSessionBean userSession,
       Model model
     ) {
-      task = taskService.moveTaskToRootProject(task);
+      task = moveTaskService.moveTaskToRootProject(task);
       userSession.setLastProjectId(0L);
       model.addAttribute("userSession",userSession);
       model.addAttribute("dataPage", true);
@@ -238,7 +241,7 @@ public final String moveTaskToInbox(
         Model model
     ) {
         log.info("dragged and dropped "+task.getId()+" to inbox");
-        task = taskService.moveTaskToInbox(task);
+        task = moveTaskService.moveTaskToInbox(task);
         model.addAttribute("userSession", userSession);
         model.addAttribute("dataPage", true);
         return task.getTaskState().getUrl();
@@ -251,7 +254,7 @@ public final String moveTaskToToday(
         Model model
     ) {
         log.info("dragged and dropped "+task.getId()+" to today");
-        task = taskService.moveTaskToToday(task);
+        task = moveTaskService.moveTaskToToday(task);
         model.addAttribute("userSession", userSession);
         model.addAttribute("dataPage", true);
         return task.getTaskState().getUrl();
@@ -264,7 +267,7 @@ public final String moveTaskToNext(
         Model model
     ) {
         log.info("dragged and dropped "+task.getId()+" to next");
-        task = taskService.moveTaskToNext(task);
+        task = moveTaskService.moveTaskToNext(task);
         model.addAttribute("userSession", userSession);
         model.addAttribute("dataPage", true);
         return task.getTaskState().getUrl();
@@ -277,7 +280,7 @@ public final String moveTaskToWaiting(
         Model model
     ) {
         log.info("dragged and dropped "+task.getId()+" to waiting");
-        task = taskService.moveTaskToWaiting(task);
+        task = moveTaskService.moveTaskToWaiting(task);
         model.addAttribute("userSession", userSession);
         model.addAttribute("dataPage", true);
         return task.getTaskState().getUrl();
@@ -290,7 +293,7 @@ public final String moveTaskToSomeday(
         Model model
     ) {
         log.info("dragged and dropped "+task.getId()+" to someday");
-        task = taskService.moveTaskToSomeday(task);
+        task = moveTaskService.moveTaskToSomeday(task);
         model.addAttribute("userSession", userSession);
         model.addAttribute("dataPage", true);
         return task.getTaskState().getUrl();
@@ -303,7 +306,7 @@ public final String moveTaskToFocus(
         Model model
     ) {
         log.info("dragged and dropped "+task.getId()+" to focus");
-        task = taskService.moveTaskToFocus(task);
+        task = moveTaskService.moveTaskToFocus(task);
         model.addAttribute("userSession", userSession);
         model.addAttribute("dataPage", true);
         return task.getTaskState().getUrl();
@@ -316,7 +319,7 @@ public final String moveTaskToCompleted(
         Model model
     ) {
         log.info("dragged and dropped "+task.getId()+" to completed");
-        task = taskService.moveTaskToCompleted(task);
+        task = moveTaskService.moveTaskToCompleted(task);
         model.addAttribute("userSession", userSession);
         model.addAttribute("dataPage", true);
         return task.getTaskState().getUrl();
@@ -329,7 +332,7 @@ public final String moveTaskToTrash(
         Model model
     ) {
         log.info("dragged and dropped "+task.getId()+" to trash");
-        task = taskService.moveTaskToTrash(task);
+        task = moveTaskService.moveTaskToTrash(task);
         model.addAttribute("userSession", userSession);
         model.addAttribute("dataPage", true);
         return task.getTaskState().getUrl();
@@ -341,7 +344,7 @@ public final String moveAllCompletedToTrash(
         Model model
     ) {
         Context context = super.getContext(userSession);
-        taskService.moveAllCompletedToTrash(context);
+        moveTaskService.moveAllCompletedToTrash(context);
         model.addAttribute("userSession", userSession);
         model.addAttribute("dataPage", true);
         return "redirect:/taskstate/trash";
@@ -353,7 +356,7 @@ public final String emptyTrash(
         Model model
     ) {
         Context context = super.getContext(userSession);
-        taskService.emptyTrash(context);
+        moveTaskService.emptyTrash(context);
         model.addAttribute("userSession", userSession);
         model.addAttribute("dataPage", true);
         return "redirect:/taskstate/trash";
diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/meso/move/MoveTaskService.java b/src/main/java/org/woehlke/java/simpleworklist/domain/meso/move/MoveTaskService.java
new file mode 100644
index 00000000..8b710e8b
--- /dev/null
+++ b/src/main/java/org/woehlke/java/simpleworklist/domain/meso/move/MoveTaskService.java
@@ -0,0 +1,33 @@
+package org.woehlke.java.simpleworklist.domain.meso.move;
+
+import org.woehlke.java.simpleworklist.domain.db.data.Context;
+import org.woehlke.java.simpleworklist.domain.db.data.Project;
+import org.woehlke.java.simpleworklist.domain.db.data.Task;
+
+public interface MoveTaskService {
+
+  Task moveTaskToAnotherProject(Task task, Project project);
+
+  Task moveTaskToRootProject(Task task);
+
+  Task moveTaskToInbox(Task task);
+
+  Task moveTaskToToday(Task task);
+
+  Task moveTaskToNext(Task task);
+
+  Task moveTaskToWaiting(Task task);
+
+  Task moveTaskToSomeday(Task task);
+
+  Task moveTaskToFocus(Task task);
+
+  Task moveTaskToCompleted(Task task);
+
+  Task moveTaskToTrash(Task task);
+
+  void moveAllCompletedToTrash(Context context);
+
+  void emptyTrash(Context context);
+
+}
diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/meso/move/MoveTaskServiceImpl.java b/src/main/java/org/woehlke/java/simpleworklist/domain/meso/move/MoveTaskServiceImpl.java
new file mode 100644
index 00000000..cc658bc1
--- /dev/null
+++ b/src/main/java/org/woehlke/java/simpleworklist/domain/meso/move/MoveTaskServiceImpl.java
@@ -0,0 +1,209 @@
+package org.woehlke.java.simpleworklist.domain.meso.move;
+
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+import org.woehlke.java.simpleworklist.domain.db.data.Context;
+import org.woehlke.java.simpleworklist.domain.db.data.Project;
+import org.woehlke.java.simpleworklist.domain.db.data.Task;
+import org.woehlke.java.simpleworklist.domain.db.data.task.TaskService;
+import org.woehlke.java.simpleworklist.domain.meso.taskworkflow.TaskState;
+
+import javax.validation.Valid;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+@Slf4j
+@Service
+public class MoveTaskServiceImpl implements MoveTaskService {
+
+  private final TaskService taskService;
+
+  @Autowired
+  public MoveTaskServiceImpl(TaskService taskService) {
+    this.taskService = taskService;
+  }
+
+  @Override
+  @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
+  public Task moveTaskToRootProject(@Valid Task task) {
+    task.moveTaskToRootProject();
+    long maxOrderIdProject = taskService.getMaxOrderIdProjectRoot(task.getContext());
+    task.setOrderIdProject(++maxOrderIdProject);
+    return taskService.saveAndFlush(task);
+  }
+
+  @Override
+  @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
+  public Task moveTaskToAnotherProject( @Valid Task task,@Valid Project project) {
+    boolean okContext = task.hasSameContextAs(project);
+    if(okContext) {
+      task.moveTaskToAnotherProject(project);
+      long maxOrderIdProject = taskService.getMaxOrderIdProject(
+        task.getProject(),
+        task.getContext()
+      );
+      task.setOrderIdProject(++maxOrderIdProject);
+      taskService.saveAndFlush(task);
+    }
+    return task;
+  }
+
+
+  @Override
+  @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
+  public Task moveTaskToInbox(Task task) {
+    long newOrderIdTaskState = taskService.getMaxOrderIdTaskState(
+      TaskState.INBOX,
+      task.getContext()
+    );
+    task.moveToInbox();
+    task.setOrderIdTaskState(++newOrderIdTaskState);
+    task = taskService.saveAndFlush(task);
+    log.info("moved to inbox: " + task.outTaskstate());
+    return task;
+  }
+
+  @Override
+  @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
+  public Task moveTaskToToday(Task task) {
+    Date now = new Date();
+    long newOrderIdTaskState = taskService.getMaxOrderIdTaskState(
+      TaskState.TODAY,
+      task.getContext()
+    );
+    task.moveToToday();
+    task.setOrderIdTaskState(++newOrderIdTaskState);
+    task = taskService.saveAndFlush(task);
+    log.info("moved to today: " + task.outTaskstate());
+    return task;
+  }
+
+  @Override
+  @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
+  public Task moveTaskToNext(Task task) {
+    long newOrderIdTaskState = taskService.getMaxOrderIdTaskState(
+      TaskState.NEXT,
+      task.getContext()
+    );
+    task.moveToNext();
+    task.setOrderIdTaskState(++newOrderIdTaskState);
+    task = taskService.saveAndFlush(task);
+    log.info("moved to next: " + task.outTaskstate());
+    return task;
+  }
+
+  @Override
+  @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
+  public Task moveTaskToWaiting(Task task) {
+    long newOrderIdTaskState = taskService.getMaxOrderIdTaskState(
+      TaskState.WAITING,
+      task.getContext()
+    );
+    task.moveToWaiting();
+    task.setOrderIdTaskState(++newOrderIdTaskState);
+    task = taskService.saveAndFlush(task);
+    log.info("moved to next: " + task.outTaskstate());
+    return task;
+  }
+
+  @Override
+  @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
+  public Task moveTaskToSomeday(Task task) {
+    long newOrderIdTaskState = taskService.getMaxOrderIdTaskState(
+      TaskState.SOMEDAY,
+      task.getContext()
+    );
+    task.moveToSomeday();
+    task.setOrderIdTaskState(++newOrderIdTaskState);
+    task = taskService.saveAndFlush(task);
+    log.info("moved to someday: " + task.outTaskstate());
+    return task;
+  }
+
+  @Override
+  @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
+  public Task moveTaskToFocus(Task task) {
+    long newOrderIdTaskState = taskService.getMaxOrderIdTaskState(
+      TaskState.FOCUS,
+      task.getContext()
+    );
+    task.moveToFocus();
+    task.setOrderIdTaskState(++newOrderIdTaskState);
+    task = taskService.saveAndFlush(task);
+    log.info("moved to focus: " + task.outTaskstate());
+    return task;
+  }
+
+  @Override
+  @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
+  public Task moveTaskToCompleted(Task task) {
+    long newOrderIdTaskState = taskService.getMaxOrderIdTaskState(
+      TaskState.COMPLETED,
+      task.getContext()
+    );
+    task.moveToCompletedTasks();
+    task.setOrderIdTaskState(++newOrderIdTaskState);
+    task = taskService.saveAndFlush(task);
+    log.info("moved to completed: " + task.outTaskstate());
+    return task;
+  }
+
+  @Override
+  @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
+  public Task moveTaskToTrash(Task task) {
+    long newOrderIdTaskState = taskService.getMaxOrderIdTaskState(
+      TaskState.TRASH,
+      task.getContext()
+    );
+    task.moveToTrash();
+    task.setOrderIdTaskState(++newOrderIdTaskState);
+    task = taskService.saveAndFlush(task);
+    log.info("moved to trash: " + task.outTaskstate());
+    return task;
+  }
+
+  @Override
+  @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
+  public void moveAllCompletedToTrash( Context context) {
+    long maxOrderIdTaskState = taskService.getMaxOrderIdTaskState(
+      TaskState.TRASH,
+      context
+    );
+    long newOrderIdTaskState = maxOrderIdTaskState;
+    List<Task> taskListCompleted = taskService.findByTaskStateAndContextOrderByOrderIdTaskStateAsc(
+      TaskState.COMPLETED,
+      context
+    );
+    for (Task task : taskListCompleted) {
+      newOrderIdTaskState++;
+      task.setOrderIdTaskState(newOrderIdTaskState);
+      task.moveToTrash();
+    }
+    taskService.saveAll(taskListCompleted);
+  }
+
+  @Override
+  @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
+  public void emptyTrash( Context context) {
+    List<Task> taskList = taskService.findByTaskStateAndContext(
+      TaskState.TRASH,
+      context
+    );
+    List<Task> taskListChanged = new ArrayList<>(taskList.size());
+    for(Task task: taskList){
+      task.emptyTrash();
+      taskListChanged.add(task);
+    }
+    taskService.saveAll(taskListChanged);
+    List<Task> taskListDeleted = taskService.findByTaskStateAndContext(
+      TaskState.DELETED,
+      context
+    );
+    taskService.deleteAll(taskListDeleted);
+  }
+}