diff --git a/.github/workflows/maven-build-test.yml b/.github/workflows/maven-build-test.yml
index 995bc4b748..338be07030 100644
--- a/.github/workflows/maven-build-test.yml
+++ b/.github/workflows/maven-build-test.yml
@@ -19,297 +19,166 @@ on:
       - '**.asciidoc'
 
 env:
-  MVN_BATCH_MODE: '-Djansi.force=true -Djansi.passthrough=true -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
+  # if continuously builds exiting randomly, possibly add again -Djansi.force=true -Djansi.passthrough=true
+  MVN_BATCH_MODE: '-B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
   # fixing random connection reset of maven downloads as proposed here: https://github.com/actions/virtual-environments/issues/2715#issuecomment-797388909
   MVN_HTTP_OPTIMIZATION: '-Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=120'
-  MVN_TEST_COVERAGE: '-Dskip.code.coverage=false'
+  REPOSITORY_PATH: repo
 
 jobs:
   cache-dependencies:
     runs-on: ubuntu-latest
-    steps:      
+    steps:
+      - name: Enable git support for long paths on Windows
+        if: ${{ runner.os == 'Windows' }}
+        shell: cmd
+        run: git config --system core.longpaths true
+
       - name: Clone Repository
         uses: actions/checkout@v3
-
-      - uses: devonfw-actions/java-maven-setup@main
         with:
-          maven-cache-key: cobigen-dep-${{ hashFiles('**/pom.xml') }}
-          clone: false
-      
-      - name: Resolve non-cobigen dependencies
-        run: mvn org.apache.maven.plugins:maven-dependency-plugin:3.1.2:resolve -DexcludeGroupIds=com.devonfw.cobigen -T1C -P!p2-build ${{ env.MVN_BATCH_MODE }} ${{ env.MVN_HTTP_OPTIMIZATION }} || true # never fail
-    
-  build-and-test-core:
-    needs: cache-dependencies
-    strategy:
-      fail-fast: false
-      matrix:
-        javaVersion: [8, 11]
-        os: [windows-latest, ubuntu-latest]
-    runs-on: ${{ matrix.os }}
+          path: ${{ env.REPOSITORY_PATH }}
 
-    steps:
-      - uses: devonfw-actions/java-maven-setup@main
+      - name: Checkout & Prepare
+        uses: devonfw-actions/java-maven-setup@main
         with:
-          maven-cache-key: ${{ runner.os }}-${{ matrix.javaVersion }}-maven-${{ github.sha }} # new key will cache
-          maven-cache-restore-key: cobigen-dep-${{ hashFiles('**/pom.xml') }}
-          java-version: ${{ matrix.javaVersion }}
-          jacoco-cache-key: ${{ runner.os }}-${{ matrix.javaVersion }}-jacoco-${{ github.sha }}-core-test # new key will cache
+          maven-cache-path: ./.m2/repository
+          maven-cache-key: cobigen-dep-${{ hashFiles(format('{0}/**/pom.xml', env.REPOSITORY_PATH)) }}
+          clone: false # checkout in a separate / earlier step to allow eager evaluation of parameter expression like workspace or hashFiles
 
-      - name: Build & Test Core
+      - name: Overwrite maven settings
         shell: bash
-        run: mvn install -f cobigen --projects !cobigen-core-systemtest ${{ env.MVN_BATCH_MODE }} ${{ env.MVN_HTTP_OPTIMIZATION }} ${{ env.MVN_TEST_COVERAGE }}
+        run: |
+          mkdir -p ~/.m2
+          cp -rf ${{ env.REPOSITORY_PATH }}/.mvn/ci-settings.xml ~/.m2/settings.xml
 
-  build-and-test-plugins:
-    needs: build-and-test-core
-    strategy:
-      fail-fast: false
-      matrix:
-        javaVersion: [8, 11]
-        os: [windows-latest, ubuntu-latest]
-    runs-on: ${{ matrix.os }}
+      - name: Resolve non-cobigen dependencies
+        shell: bash
+        run: |
+          cd ${{ env.REPOSITORY_PATH }}
+          mvn org.apache.maven.plugins:maven-dependency-plugin:3.1.2:resolve -pl !com.devonfw.cobigen:com.devonfw.cobigen.eclipse.test -DexcludeGroupIds=com.devonfw.cobigen -T1C -Pp2-build ${{ env.MVN_BATCH_MODE }} ${{ env.MVN_HTTP_OPTIMIZATION }} || true # never fail
+          mvn org.apache.maven.plugins:maven-dependency-plugin:3.1.2:resolve-plugins -pl !com.devonfw.cobigen:com.devonfw.cobigen.eclipse.test -DexcludeGroupIds=com.devonfw.cobigen -T1C -Pp2-build ${{ env.MVN_BATCH_MODE }} ${{ env.MVN_HTTP_OPTIMIZATION }} || true # never fail
 
+  build:
+    needs: cache-dependencies
+    runs-on: ubuntu-latest
     steps:
-      - uses: devonfw-actions/java-maven-setup@main
+      - name: Enable git support for long paths on Windows
+        if: ${{ runner.os == 'Windows' }}
+        shell: cmd
+        run: git config --system core.longpaths true
+        
+      - name: Clone Repository
+        uses: actions/checkout@v3
         with:
-          maven-cache-key: ${{ runner.os }}-${{ matrix.javaVersion }}-maven-${{ github.sha }}-plugins # new key will cache
-          maven-cache-restore-key: ${{ runner.os }}-${{ matrix.javaVersion }}-maven-${{ github.sha }}
-          java-version: ${{ matrix.javaVersion }}
-          jacoco-cache-key: ${{ runner.os }}-${{ matrix.javaVersion }}-jacoco-${{ github.sha }}-plugins # new key will cache
-          jacoco-cache-restore-key: ${{ runner.os }}-${{ matrix.javaVersion }}-jacoco-${{ github.sha }}-core-test # hit - restore
-
-      - name: Build & Test Plugins
-        shell: bash
-        run: mvn install -f cobigen-plugins ${{ env.MVN_BATCH_MODE }} ${{ env.MVN_HTTP_OPTIMIZATION }} ${{ env.MVN_TEST_COVERAGE }}
+          path: ${{ env.REPOSITORY_PATH }}
 
-  build-plugins-p2:
-    needs: build-and-test-plugins
-    strategy:
-      fail-fast: false
-      matrix:
-        javaVersion: [8]
-        os: [ubuntu-latest]
-    runs-on: ${{ matrix.os }}
-
-    steps:
-      - uses: devonfw-actions/java-maven-setup@main
+      - name: Checkout & Prepare
+        uses: devonfw-actions/java-maven-setup@main
         with:
-          maven-cache-key: ${{ runner.os }}-${{ matrix.javaVersion }}-maven-${{ github.sha }}-plugins # key hit will not update cache
-          java-version: ${{ matrix.javaVersion }}
+          maven-cache-path: ./.m2/repository
+          maven-cache-key: maven-${{ github.sha }}-${{ github.run_number }} # new key will cache
+          maven-cache-restore-key: cobigen-dep-${{ hashFiles(format('{0}/**/pom.xml', env.REPOSITORY_PATH)) }}
+          java-version: 11
+          clone: false # checkout in a separate / earlier step to allow eager evaluation of parameter expression like workspace or hashFiles
 
-      - name: Cache p2 plugin repositories
+      - name: Cache built P2 repositories
         uses: actions/cache@v3
         with:
-          path: ./**/target/repository/
-          key: p2-plugins-${{ github.sha }} # new key will cache
-
-      - name: Build Plugins UpdateSite
+          path: ./${{ env.REPOSITORY_PATH }}/**/target/repository/
+          key: p2-${{ github.sha }}-${{ github.run_number }} # new key will cache
+          enableCrossOsArchive: true
+      
+      - name: Build all artifacts
         shell: bash
         run: |
-          mvn package -DskipTests -f cobigen-plugins bundle:bundle -Pp2-bundle --projects !cobigen-javaplugin-parent/cobigen-javaplugin-model,!cobigen-openapiplugin-parent/cobigen-openapiplugin-model,!:plugins-parent,!cobigen-javaplugin-parent,!cobigen-openapiplugin-parent,!cobigen-templateengines ${{ env.MVN_BATCH_MODE }} ${{ env.MVN_HTTP_OPTIMIZATION }}
-          mvn install -DskipTests -f cobigen-plugins bundle:bundle -Pp2-bundle p2:site --projects !cobigen-javaplugin-parent/cobigen-javaplugin-model,!cobigen-openapiplugin-parent/cobigen-openapiplugin-model,!:plugins-parent,!cobigen-javaplugin-parent,!cobigen-openapiplugin-parent,!cobigen-templateengines ${{ env.MVN_BATCH_MODE }} ${{ env.MVN_HTTP_OPTIMIZATION }}
-
-  run-core-systemtest:
-    needs: build-and-test-plugins
+          cd ${{ env.REPOSITORY_PATH }}
+          ./build.sh -spb
+    
+  test:
+    needs: build
     strategy:
       fail-fast: false
       matrix:
-        javaVersion: [8, 11]
+        component: [core, plugins, templates, maven, eclipse, cli]
+        javaVersion: [11]
         os: [windows-latest, ubuntu-latest]
     runs-on: ${{ matrix.os }}
-
     steps:
-      - uses: devonfw-actions/java-maven-setup@main
+      - name: Enable git support for long paths on Windows
+        if: ${{ runner.os == 'Windows' }}
+        shell: cmd
+        run: git config --system core.longpaths true
+        
+      - name: Clone Repository
+        uses: actions/checkout@v3
         with:
-          maven-cache-key: ${{ runner.os }}-${{ matrix.javaVersion }}-maven-${{ github.sha }}-plugins # key hit will not update cache
-          java-version: ${{ matrix.javaVersion }}
-          jacoco-cache-key: ${{ runner.os }}-${{ matrix.javaVersion }}-jacoco-${{ github.sha }}-core-systemtest # new key will cache
+          path: ${{ env.REPOSITORY_PATH }}
 
-      - name: Run Core Systemtest
-        shell: bash
-        run: mvn install -f cobigen/cobigen-core-systemtest ${{ env.MVN_BATCH_MODE }} ${{ env.MVN_HTTP_OPTIMIZATION }} ${{ env.MVN_TEST_COVERAGE }}
-
-  build-and-test-eclipse-plugin:
-    needs: build-plugins-p2
-    strategy:
-      fail-fast: false
-      matrix:
-        javaVersion: [8, 11]
-        os: [windows-latest, ubuntu-latest]
-    runs-on: ${{ matrix.os }}
-
-    steps:
       - uses: devonfw-actions/java-maven-setup@main
         with:
-          maven-cache-key: ${{ runner.os }}-${{ matrix.javaVersion }}-maven-${{ github.sha }}-plugins # key hit will not update cache
+          maven-cache-path: ./.m2/repository
+          maven-cache-key: maven-${{ github.sha }}-${{ github.run_number }} # match, restore only
           java-version: ${{ matrix.javaVersion }}
-          jacoco-cache-key: ${{ runner.os }}-${{ matrix.javaVersion }}-jacoco-${{ github.sha }}-eclipse # new key will cache
-        
-      - name: Cache Eclipse repository
-        uses: actions/cache@v3
-        with:
-          path: ./**/eclipse/target/repository/
-          key: p2-eclipse-${{ github.sha }} # new key will cache
+          jacoco-cache-key: jacoco-${{ github.sha }}-${{ matrix.component }} # new key will cache
+          clone: false # checkout in a separate / earlier step to allow eager evaluation of parameter expression like workspace or hashFiles
       
-      # After checkout we need to restore the built repositories
-      - name: Restore P2 plugins repositories
+      - name: Restore built P2 repositories
         uses: actions/cache@v3
         with:
-          path: ./**/target/repository/
-          key: p2-plugins-${{ github.sha }} # key hit will not update cache
-
-      # There is no retry for jobs, just for steps, so doing the retry by hand
-      - name: Build Plugins
-        uses: GabrielBB/xvfb-action@v1.5
-        with:
-          run: mvn install -f cobigen-eclipse -Pp2-build ${{ env.MVN_BATCH_MODE }} ${{ env.MVN_HTTP_OPTIMIZATION }} ${{ env.MVN_TEST_COVERAGE }}
-
-  build-and-test-maven-plugin:
-    needs: build-and-test-plugins
-    strategy:
-      fail-fast: false
-      matrix:
-        javaVersion: [8, 11]
-        os: [windows-latest, ubuntu-latest]
-    runs-on: ${{ matrix.os }}
-
-    steps:
-      - uses: devonfw-actions/java-maven-setup@main
-        with:
-          maven-cache-key: ${{ runner.os }}-${{ matrix.javaVersion }}-maven-${{ github.sha }}-maven # new key will cache
-          maven-cache-restore-key: ${{ runner.os }}-${{ matrix.javaVersion }}-maven-${{ github.sha }}-plugins
-          java-version: ${{ matrix.javaVersion }}
-          jacoco-cache-key: ${{ runner.os }}-${{ matrix.javaVersion }}-jacoco-${{ github.sha }}-maven # new key will cache
-
-      - name: Build & Test Maven Plugin
-        shell: bash
-        run: |
-          mvn install -f cobigen-maven ${{ env.MVN_BATCH_MODE }} ${{ env.MVN_HTTP_OPTIMIZATION }} ${{ env.MVN_TEST_COVERAGE }}
-
-  build-and-test-cli:
-    needs: build-and-test-templates
-    strategy:
-      fail-fast: false
-      matrix:
-        javaVersion: [11] # CLI does not support jdk 8 anymore
-        os: [windows-latest, ubuntu-latest]
-    runs-on: ${{ matrix.os }}
-
-    steps:
-      - uses: devonfw-actions/java-maven-setup@main
-        with:
-          maven-cache-key: ${{ runner.os }}-${{ matrix.javaVersion }}-maven-${{ github.sha }}-cli # new key will cache
-          maven-cache-restore-key: ${{ runner.os }}-${{ matrix.javaVersion }}-maven-${{ github.sha }}-templates
-          java-version: ${{ matrix.javaVersion }}
-          jacoco-cache-key: ${{ runner.os }}-${{ matrix.javaVersion }}-jacoco-${{ github.sha }}-cli # new key will cache
-
-      - name: Build & Test CLI
+          path: ./${{ env.REPOSITORY_PATH }}/**/target/repository/
+          key: p2-${{ github.sha }}-${{ github.run_number }} # match, restore only
+          enableCrossOsArchive: true
+      
+      # need to overwrite global settings file to cath all mvn executions properly in tests
+      - name: Overwrite maven settings
         shell: bash
         run: |
-          mvn install -f cobigen-cli ${{ env.MVN_BATCH_MODE }} ${{ env.MVN_HTTP_OPTIMIZATION }} ${{ env.MVN_TEST_COVERAGE }}
-
-  build-and-test-templates:
-    needs: build-and-test-maven-plugin
-    strategy:
-      fail-fast: false
-      matrix:
-        javaVersion: [8, 11]
-        os: [windows-latest, ubuntu-latest]
-    runs-on: ${{ matrix.os }}
-
-    steps:
-      - uses: devonfw-actions/java-maven-setup@main
-        with:
-          maven-cache-key: ${{ runner.os }}-${{ matrix.javaVersion }}-maven-${{ github.sha }}-templates # new key will cache
-          maven-cache-restore-key: ${{ runner.os }}-${{ matrix.javaVersion }}-maven-${{ github.sha }}-maven
-          java-version: ${{ matrix.javaVersion }}
-          jacoco-cache-key: ${{ runner.os }}-${{ matrix.javaVersion }}-jacoco-${{ github.sha }}-templates # new key will cache
+          mkdir -p ~/.m2
+          cp -rf ${{ env.REPOSITORY_PATH }}/.mvn/ci-settings.xml ~/.m2/settings.xml
 
-      - name: Build & Test Templates
+      - name: Test
         shell: bash
+        env:
+          M2_REPO: ${{ github.workspace }}/.m2/repository # fix for https://github.com/m-m-m/code/issues/43
         run: |
-          mvn install -f cobigen-templates ${{ env.MVN_BATCH_MODE }} ${{ env.MVN_HTTP_OPTIMIZATION }} ${{ env.MVN_TEST_COVERAGE }}
-
-  sonar-analysis:
-    needs: [build-and-test-maven-plugin, build-and-test-templates, run-core-systemtest, build-and-test-eclipse-plugin, build-and-test-cli]
+          cd ${{ env.REPOSITORY_PATH }}
+          if [[ "${{ matrix.component }}" == "eclipse" && "${{ matrix.os }}" == "ubuntu-latest" ]]
+          then
+            xvfb-run -a ./build.sh -sdtcb --components ${{ matrix.component }}
+          else
+            ./build.sh -sdtcb --components ${{ matrix.component }}
+          fi
+
+  # Sonar Analysis is done in separate workflow (https://github.com/devonfw/cobigen/blob/master/.github/workflows/sonar-analysis.yml)
+  # as of a workaround of potential secret leaking on PRs (https://securitylab.github.com/research/github-actions-preventing-pwn-requests/)
+  sonar-analysis-preparation:
+    needs: [test]
     runs-on: ubuntu-latest
     steps:
-      - name: Cache SonarCloud packages
-        uses: actions/cache@v3
-        with:
-          path: ~/.sonar/cache
-          key: ${{ runner.os }}-sonar
-
-      - uses: devonfw-actions/java-maven-setup@main
-        with:
-          maven-cache-key: cobigen-dep-${{ hashFiles('**/pom.xml') }}
-          jacoco-cache-key: Linux-11-jacoco-${{ github.sha }}-cli # hit - restore
-
-      # Restore other parallel results as well - seems that for any reason I could not reuse caches incrementally... need to restore all caches
-      - name: Restore eclipse test results
-        uses: actions/cache@v3
-        with:
-          path: |
-            **/*.exec
-            **/failsafe-reports/**/*
-            **/surefire-reports/**/*
-          key: Linux-11-jacoco-${{ github.sha }}-eclipse # hit - restore
-
-      - name: Restore core systemtest results
-        uses: actions/cache@v3
-        with:
-          path: |
-            **/*.exec
-            **/failsafe-reports/**/*
-            **/surefire-reports/**/*
-          key: Linux-11-jacoco-${{ github.sha }}-core-systemtest # hit - restore
-      
-      - name: Restore core template test results
-        uses: actions/cache@v3
-        with:
-          path: |
-            **/*.exec
-            **/failsafe-reports/**/*
-            **/surefire-reports/**/*
-          key: Linux-11-jacoco-${{ github.sha }}-templates # hit - restore
-
-      - name: Restore core maven results
-        uses: actions/cache@v3
-        with:
-          path: |
-            **/*.exec
-            **/failsafe-reports/**/*
-            **/surefire-reports/**/*
-          key: Linux-11-jacoco-${{ github.sha }}-maven # hit - restore
-
-      - name: Restore core plugin test results
-        uses: actions/cache@v3
-        with:
-          path: |
-            **/*.exec
-            **/failsafe-reports/**/*
-            **/surefire-reports/**/*
-          key: Linux-11-jacoco-${{ github.sha }}-plugins # hit - restore
-
-      - name: Restore core cli test results
-        uses: actions/cache@v3
-        with:
-          path: |
-            **/*.exec
-            **/failsafe-reports/**/*
-            **/surefire-reports/**/*
-          key: Linux-11-jacoco-${{ github.sha }}-cli # hit - restore
-      
-      - name: SonarCloud Analysis
+      - name: 'Prepare workflow context for transfer'
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+          # As a precaution, reference this value by an interpolated ENV var;
+          # instead of interpolating user controllable input directly in the shell script.
+          PR_TITLE: ${{ github.event.pull_request.title }}
         run: |
-          git fetch --unshallow
-          mvn verify sonar:sonar -DskipTests ${{ env.MVN_BATCH_MODE }} ${{ env.MVN_HTTP_OPTIMIZATION }} ${{ env.MVN_TEST_COVERAGE }}
+          # Save ENV for transfer
+          {
+            echo "PR_HEADSHA=${{ github.event.pull_request.head.sha }}"
+            echo "PR_NUMBER=${{ github.event.pull_request.number }}"
+            echo "PR_TITLE=${PR_TITLE}"
+          } >> workflow.env
+          tar --zstd -cf workflow.tar.zst workflow.env
+      
+      - name: 'Upload workflow context artifact'
+        uses: actions/upload-artifact@v3
+        with:
+          name: maven-build-test-workflow-context
+          path: workflow.tar.zst
+          retention-days: 1
   
   release:
-    needs: [build-and-test-maven-plugin, build-and-test-templates, run-core-systemtest, build-and-test-eclipse-plugin, build-and-test-cli]
+    needs: [test]
     runs-on: ubuntu-latest
     if: ${{ startsWith(github.repository, 'devonfw/') && github.ref == 'refs/heads/master' }}
     continue-on-error: true
@@ -318,14 +187,21 @@ jobs:
     outputs:
       release_tag: ${{ steps.get_tag.outputs.tag }}
     steps:
+      - name: Clone Repository
+        uses: actions/checkout@v3
+        with:
+          path: ${{ env.REPOSITORY_PATH }}
+
       - uses: devonfw-actions/java-maven-setup@main
         with:
-          maven-cache-key: cobigen-dep-${{ hashFiles('**/pom.xml') }}
+          maven-cache-path: ./.m2/repository
+          maven-cache-key: cobigen-dep-${{ hashFiles(format('{0}/**/pom.xml', env.REPOSITORY_PATH)) }}
           GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
           GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
           BUILD_USER: ${{ secrets.BUILD_USER }}
           BUILD_USER_PASSWD: ${{ secrets.BUILD_USER_PASSWD }}
           BUILD_USER_EMAIL: ${{ secrets.BUILD_USER_EMAIL }}
+          clone: false # checkout in a separate / earlier step to allow eager evaluation of parameter expression like workspace or hashFiles
 
       - name: Release
         id: release
@@ -338,7 +214,9 @@ jobs:
           BUILD_USER: ${{ secrets.BUILD_USER }}
           BUILD_USER_PASSWD: ${{ secrets.BUILD_USER_PASSWD }}
           BUILD_USER_EMAIL: ${{ secrets.BUILD_USER_EMAIL }}
-        run: ./release.sh silent skip-qa repo-mvn-settings
+        run: |
+          cd ${{ env.REPOSITORY_PATH }}
+          ./release.sh -syb skip-qa
           
       - name: 'Get release tag'
         id: get_tag
diff --git a/.gitignore b/.gitignore
index 6e1889c17b..978e10ba4f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,4 +33,19 @@ objectdb
 
 #Intellij
 .idea
-*.iml
\ No newline at end of file
+*.iml
+/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/valid_template_sets_downloaded/template-sets/downloaded/crud-java-server-app-test.jar
+/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/valid_template_sets/template-sets/downloaded/crud-java-server-app-test.jar
+/cobigen-cli/cli-systemtest/src/test/resources/testdata/templatesproject/template-sets/downloaded/crud-java-server-app-test.jar
+/cobigen/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTestTemplateSetsXml/template-sets/downloaded/downloaded-template-set1-test-test.jar
+/cobigen/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTestTemplateSetsXml/template-sets/downloaded/downloaded-template-set2-test-test.jar
+cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTestTemplateSetsXml/template-sets/downloaded/downloaded-template-set2-test-test.jar
+cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTestTemplateSetsXml/template-sets/downloaded/downloaded-template-set1-test-test.jar
+cobigen-cli/cli-systemtest/src/test/resources/testdata/AdaptTemplatesCommandIT/template-sets/downloaded/crud-java-server-app-1.0.0.jar
+cobigen-cli/cli-systemtest/src/test/resources/testdata/AdaptTemplatesCommandIT/template-sets/downloaded/crud-java-server-app-1.0.0-sources.jar
+cobigen-cli/cli-systemtest/src/test/resources/testdata/AdaptTemplatesCommandIT/template-sets/downloaded/crud-java-server-app-complex-1.0.0.jar
+cobigen-cli/cli-systemtest/src/test/resources/testdata/AdaptTemplatesCommandIT/template-sets/downloaded/crud-java-server-app-complex-1.0.0-sources.jar
+cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/TemplateProcessingTest/template-sets/downloaded/crud-java-server-app-1.0.0.jar
+cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/TemplateProcessingTest/template-sets/downloaded/crud-java-server-app-1.0.0-sources.jar
+cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/TemplateProcessingTest/template-sets/downloaded/crud-java-server-app-complex-1.0.0.jar
+cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/TemplateProcessingTest/template-sets/downloaded/crud-java-server-app-complex-1.0.0-sources.jar
diff --git a/.mvn/settings.xml b/.mvn/ci-settings.xml
similarity index 88%
rename from .mvn/settings.xml
rename to .mvn/ci-settings.xml
index f979f4ceef..2fa62a2620 100644
--- a/.mvn/settings.xml
+++ b/.mvn/ci-settings.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <settings>
+  <localRepository>${GITHUB_WORKSPACE}/.m2/repository</localRepository>
   <servers>
     <server>
       <id>sonartype.releases</id>
diff --git a/README.asciidoc b/README.asciidoc
index ab439dcfed..190b8a8158 100644
--- a/README.asciidoc
+++ b/README.asciidoc
@@ -43,7 +43,7 @@ The CobiGen repository is organized in a one-branch-per-plugin schema. By that,
 
 == Build
 
-`bash build.sh` (on windows use git bash)
+`./build.sh -h` (on windows use git bash)
 
 == Deploy
 
diff --git a/build.sh b/build.sh
index 4fc99d6232..d11bfb4998 100755
--- a/build.sh
+++ b/build.sh
@@ -7,28 +7,42 @@ echo ""
 
 if [[ "$NO_CLEAN" = false ]]
 then
-log_step "Cleanup Projects"
-doRunCommand "mvn clean $MVN_SETTINGS $PARALLELIZED $BATCH_MODE $DEBUG"
+  log_step "Cleanup Projects"
+  doRunCommand "mvn clean $MVN_SETTINGS $PARALLELIZED $BATCH_MODE $DEBUG"
 fi
 
-log_step "Build & Test Core"
-doRunCommand "mvn install $MVN_SETTINGS -f cobigen --projects !cobigen-core-systemtest $COVERAGE $ENABLED_TEST $DEBUG $PARALLELIZED $BATCH_MODE"
+if [[ " ${COMPONENTS_TO_BUILD[*]} " =~ " core " ]]; then
+  log_step "Build & Test Core"
+  doRunCommand "mvn install $MVN_SETTINGS -f cobigen --projects !cobigen-core-systemtest $COVERAGE $ENABLED_TEST $DEBUG $PARALLELIZED $BATCH_MODE"
+fi
 
-log_step "Build & Test Core Plugins"
-doRunCommand "mvn install $MVN_SETTINGS -f cobigen-plugins $COVERAGE $ENABLED_TEST $DEBUG $PARALLELIZED $BATCH_MODE"
+if [[ " ${COMPONENTS_TO_BUILD[*]} " =~ " plugins " ]]; then
+  log_step "Build & Test Core Plugins"
+  doRunCommand "mvn install $MVN_SETTINGS -f cobigen-plugins $COVERAGE $ENABLED_TEST $DEBUG $PARALLELIZED $BATCH_MODE"
 
-log_step "Build Core Plugins - P2 Update Sites"
-doRunCommand "mvn package $MVN_SETTINGS bundle:bundle -Pp2-build,p2-bundle -DskipTests -f cobigen-plugins --projects !cobigen-javaplugin-parent/cobigen-javaplugin-model,!cobigen-openapiplugin-parent/cobigen-openapiplugin-model,!:plugins-parent,!cobigen-javaplugin-parent,!cobigen-openapiplugin-parent,!cobigen-templateengines $DEBUG $PARALLELIZED $BATCH_MODE -Dupdatesite.repository=$DEPLOY_UPDATESITE"
-doRunCommand "mvn install $MVN_SETTINGS bundle:bundle -Pp2-build,p2-bundle -DskipTests p2:site -f cobigen-plugins --projects !cobigen-javaplugin-parent/cobigen-javaplugin-model,!cobigen-openapiplugin-parent/cobigen-openapiplugin-model,!:plugins-parent,!cobigen-javaplugin-parent,!cobigen-openapiplugin-parent,!cobigen-templateengines $DEBUG $PARALLELIZED $BATCH_MODE -Dupdatesite.repository=$DEPLOY_UPDATESITE"
+  log_step "Build Core Plugins - P2 Update Sites"
+  doRunCommand "mvn package $MVN_SETTINGS bundle:bundle -Pp2-build,p2-bundle -DskipTests -f cobigen-plugins --projects !cobigen-javaplugin-parent/cobigen-javaplugin-model,!cobigen-openapiplugin-parent/cobigen-openapiplugin-model,!:plugins-parent,!cobigen-javaplugin-parent,!cobigen-openapiplugin-parent,!cobigen-templateengines $DEBUG $PARALLELIZED $BATCH_MODE -Dupdatesite.repository=$DEPLOY_UPDATESITE"
+  doRunCommand "mvn install $MVN_SETTINGS bundle:bundle -Pp2-build,p2-bundle -DskipTests p2:site -f cobigen-plugins --projects !cobigen-javaplugin-parent/cobigen-javaplugin-model,!cobigen-openapiplugin-parent/cobigen-openapiplugin-model,!:plugins-parent,!cobigen-javaplugin-parent,!cobigen-openapiplugin-parent,!cobigen-templateengines $DEBUG $PARALLELIZED $BATCH_MODE -Dupdatesite.repository=$DEPLOY_UPDATESITE"
+fi
 
 log_step "Package & Run E2E Tests"
-doRunCommand "mvn integration-test $MVN_SETTINGS -f cobigen/cobigen-core-systemtest $COVERAGE $ENABLED_TEST $DEBUG $BATCH_MODE"
-doRunCommand "mvn install $MVN_SETTINGS -f cobigen-cli $COVERAGE $ENABLED_TEST $DEBUG $BATCH_MODE"
-doRunCommand "mvn install $MVN_SETTINGS -f cobigen-maven $COVERAGE $ENABLED_TEST $DEBUG $BATCH_MODE"
-doRunCommand "mvn install $MVN_SETTINGS -f cobigen-templates $COVERAGE $ENABLED_TEST $DEBUG $BATCH_MODE"
-doRunCommand "mvn install $MVN_SETTINGS -f cobigen-eclipse -Pp2-build $COVERAGE $ENABLED_TEST $DEBUG $BATCH_MODE"
+if [[ " ${COMPONENTS_TO_BUILD[*]} " =~ " core " ]]; then
+  doRunCommand "mvn integration-test $MVN_SETTINGS -f cobigen/cobigen-core-systemtest $COVERAGE $ENABLED_TEST $DEBUG $BATCH_MODE"
+fi
+if [[ " ${COMPONENTS_TO_BUILD[*]} " =~ " cli " ]]; then
+  doRunCommand "mvn install $MVN_SETTINGS -f cobigen-cli $COVERAGE $ENABLED_TEST $DEBUG $BATCH_MODE"
+fi
+if [[ " ${COMPONENTS_TO_BUILD[*]} " =~ " maven " ]]; then
+  doRunCommand "mvn install $MVN_SETTINGS -f cobigen-maven $COVERAGE $ENABLED_TEST $DEBUG $BATCH_MODE"
+fi
+if [[ " ${COMPONENTS_TO_BUILD[*]} " =~ " templates " ]]; then
+  doRunCommand "mvn install $MVN_SETTINGS -f cobigen-templates $COVERAGE $ENABLED_TEST $DEBUG $BATCH_MODE"
+fi
+if [[ " ${COMPONENTS_TO_BUILD[*]} " =~ " eclipse " ]]; then
+  doRunCommand "mvn install $MVN_SETTINGS -f cobigen-eclipse -Pp2-build $COVERAGE $ENABLED_TEST $DEBUG $BATCH_MODE"
+fi
 
-if [[ -n "$COVERAGE" ]]
+if [[ "$COV_REPORT" = true ]]
 then
   doRunCommand "mvn -DskipTests verify $COVERAGE $DEBUG $PARALLELIZED $BATCH_MODE"
 fi
diff --git a/cobigen-cli/cli-systemtest/pom.xml b/cobigen-cli/cli-systemtest/pom.xml
index 0bb50b98ad..d1d14b8730 100644
--- a/cobigen-cli/cli-systemtest/pom.xml
+++ b/cobigen-cli/cli-systemtest/pom.xml
@@ -12,6 +12,9 @@
   <properties>
     <maven.test.path>src\test\resources\testdata\localmavenproject\maven.project</maven.test.path>
     <maven.test.templates.path>src\test\resources\testdata\templatesproject\templates-devon4j</maven.test.templates.path>
+    <maven.test.templateset.downloaded.path>src\test\resources\testdata\templatesproject\template-sets\downloaded\crud-java-server-app</maven.test.templateset.downloaded.path>
+    <maven.test.AdaptTemplatesCommandIT.downloaded.path1>src\test\resources\testdata\AdaptTemplatesCommandIT\template-sets\adapted\crud-java-server-app</maven.test.AdaptTemplatesCommandIT.downloaded.path1>
+    <maven.test.AdaptTemplatesCommandIT.downloaded.path2>src\test\resources\testdata\AdaptTemplatesCommandIT\template-sets\adapted\crud-java-server-app-complex</maven.test.AdaptTemplatesCommandIT.downloaded.path2>
   </properties>
 
   <dependencies>
@@ -111,6 +114,63 @@
               </arguments>
             </configuration>
           </execution>
+          <execution>
+            <id>Install test template set downloaded project</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>exec</goal>
+            </goals>
+            <configuration>
+              <executable>mvn</executable>
+              <workingDirectory>${maven.test.templateset.downloaded.path}</workingDirectory>
+              <arguments>
+                <argument>install</argument>
+                <!-- https://stackoverflow.com/a/66801171 -->
+                <argument>-Djansi.force=true</argument>
+                <argument>-Djansi.passthrough=true</argument>
+                <argument>-B</argument>
+                <argument>-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn</argument>
+              </arguments>
+            </configuration>
+          </execution>
+          <execution>
+            <id>Install AdaptTemplatesCommandIT downloaded project1</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>exec</goal>
+            </goals>
+            <configuration>
+              <executable>mvn</executable>
+              <workingDirectory>${maven.test.AdaptTemplatesCommandIT.downloaded.path1}</workingDirectory>
+              <arguments>
+                <argument>install</argument>
+                <!-- https://stackoverflow.com/a/66801171 -->
+                <argument>-Djansi.force=true</argument>
+                <argument>-Djansi.passthrough=true</argument>
+                <argument>-B</argument>
+                <argument>-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn</argument>
+              </arguments>
+            </configuration>
+          </execution>
+          <execution>
+            <id>Install AdaptTemplatesCommandIT downloaded project2</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>exec</goal>
+            </goals>
+            <configuration>
+              <executable>mvn</executable>
+              <workingDirectory>${maven.test.AdaptTemplatesCommandIT.downloaded.path2}</workingDirectory>
+              <arguments>
+                <argument>install</argument>
+                <!-- https://stackoverflow.com/a/66801171 -->
+                <argument>-Djansi.force=true</argument>
+                <argument>-Djansi.passthrough=true</argument>
+                <argument>-B</argument>
+                <argument>-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn</argument>
+              </arguments>
+            </configuration>
+          </execution>
         </executions>
       </plugin>
     </plugins>
diff --git a/cobigen-cli/cli-systemtest/src/test/java/com/devonfw/cobigen/cli/systemtest/AbstractCliTest.java b/cobigen-cli/cli-systemtest/src/test/java/com/devonfw/cobigen/cli/systemtest/AbstractCliTest.java
index 0b0798d0f5..c49917f5b3 100644
--- a/cobigen-cli/cli-systemtest/src/test/java/com/devonfw/cobigen/cli/systemtest/AbstractCliTest.java
+++ b/cobigen-cli/cli-systemtest/src/test/java/com/devonfw/cobigen/cli/systemtest/AbstractCliTest.java
@@ -7,16 +7,22 @@
 import java.net.URISyntaxException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Stream;
 
+import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.codehaus.plexus.archiver.tar.TarGZipUnArchiver;
 import org.codehaus.plexus.logging.console.ConsoleLoggerManager;
 import org.codehaus.plexus.util.Os;
 import org.junit.Before;
 import org.junit.BeforeClass;
+import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.rules.TemporaryFolder;
+import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.zeroturnaround.exec.ProcessExecutor;
 import org.zeroturnaround.exec.ProcessResult;
@@ -30,6 +36,9 @@
 /** Common test implementation for CLI tests */
 public class AbstractCliTest {
 
+  /** Logger instance. */
+  private static final Logger LOG = LoggerFactory.getLogger(AbstractCliTest.class);
+
   /** Java tool options */
   private static final String JAVA_TOOL_OPTIONS = "CGCLI_JAVA_OPTIONS";
 
@@ -37,23 +46,87 @@ public class AbstractCliTest {
   @Rule
   public TemporaryFolder tempFolder = new TemporaryFolder();
 
+  /** Temporary directory for the templates project */
+  @ClassRule
+  public static TemporaryFolder tempFolderTemplates = new TemporaryFolder();
+
   /** Current home directory */
   protected Path currentHome;
 
-  /** The devon4j-templates development folder */
+  /** The templates development folder */
   protected static Path devTemplatesPath;
 
+  /** A temp directory containing the templates development folder */
+  protected static Path devTemplatesPathTemp;
+
   /**
-   * Determine the devon4j-templates development folder
+   * Determine the templates development folder and create a copy of it in the temp directory
+   *
+   * TODO: Replace with reduced template set projects in test resources, see:
+   * https://github.com/devonfw/cobigen/issues/1659
    *
    * @throws URISyntaxException if the path could not be created properly
+   * @throws IOException if accessing a template directory directory fails
    */
   @BeforeClass
-  public static void determineDevTemplatesPath() throws URISyntaxException {
+  public static void determineDevTemplatesPath() throws URISyntaxException, IOException {
 
     devTemplatesPath = new File(AbstractCliTest.class.getProtectionDomain().getCodeSource().getLocation().toURI())
+        .getParentFile().getParentFile().getParentFile().getParentFile().toPath().resolve("cobigen-templates");
+
+    Path utilsPom = new File(AbstractCliTest.class.getProtectionDomain().getCodeSource().getLocation().toURI())
         .getParentFile().getParentFile().getParentFile().getParentFile().toPath().resolve("cobigen-templates")
-        .resolve("templates-devon4j");
+        .resolve("templates-devon4j-tests/src/test/resources/utils/pom.xml");
+
+    // create a temporary directory cobigen-templates/template-sets/adapted containing the template sets
+    Path tempFolderPath = tempFolderTemplates.getRoot().toPath();
+    Path cobigenTemplatePath = tempFolderPath.resolve("cobigen-templates");
+    if (!Files.exists(cobigenTemplatePath)) {
+      Files.createDirectory(cobigenTemplatePath);
+
+      devTemplatesPathTemp = cobigenTemplatePath.resolve(ConfigurationConstants.TEMPLATE_SETS_FOLDER);
+      Path templateSetsAdaptedFolder = devTemplatesPathTemp.resolve(ConfigurationConstants.ADAPTED_FOLDER);
+      Files.createDirectory(devTemplatesPathTemp);
+      Files.createDirectory(templateSetsAdaptedFolder);
+
+      FileUtils.copyDirectory(devTemplatesPath.toFile(), templateSetsAdaptedFolder.toFile());
+
+      List<Path> devTemplateSets = new ArrayList<>();
+      try (Stream<Path> files = Files.list(templateSetsAdaptedFolder)) {
+        files.forEach(path -> {
+          devTemplateSets.add(path);
+        });
+      }
+
+      for (Path path : devTemplateSets) {
+        if (Files.isDirectory(path)) {
+          Path resourcesFolder = path.resolve("src/main/resources");
+          Path templatesFolder = path.resolve(ConfigurationConstants.MAVEN_CONFIGURATION_RESOURCE_FOLDER);
+          if (Files.exists(resourcesFolder) && !Files.exists(templatesFolder)) {
+            try {
+              Files.move(resourcesFolder, templatesFolder);
+            } catch (IOException e) {
+              throw new IOException("Error moving directory " + resourcesFolder, e);
+            }
+          }
+
+          // Replace the pom.xml in the template sets. Needed so that the project in the temp directory is build
+          // properly
+          if (Files.exists(path.resolve("pom.xml"))) {
+            try {
+              Files.delete(path.resolve("pom.xml"));
+            } catch (IOException e) {
+              throw new IOException("Error deleting file " + path.resolve("pom.xml"), e);
+            }
+            try {
+              Files.copy(utilsPom, path.resolve("pom.xml"));
+            } catch (IOException e) {
+              throw new IOException("Error copying file " + utilsPom, e);
+            }
+          }
+        }
+      }
+    }
   }
 
   /**
@@ -76,7 +149,7 @@ public void runWithLatestTemplates() throws IOException {
 
     Path configFile = this.currentHome.resolve(ConfigurationConstants.COBIGEN_CONFIG_FILE);
     Files.write(configFile,
-        (ConfigurationConstants.CONFIG_PROPERTY_TEMPLATES_PATH + "=" + devTemplatesPath.toString()).getBytes());
+        (ConfigurationConstants.CONFIG_PROPERTY_TEMPLATES_PATH + "=" + devTemplatesPathTemp.toString()).getBytes());
   }
 
   /**
@@ -88,15 +161,27 @@ protected void execute(String[] args, boolean useDevTemplates) throws Exception
     execute(args, useDevTemplates, false);
   }
 
+  /**
+   * @see #execute(String[], boolean, boolean)
+   */
+  @SuppressWarnings("javadoc")
+  protected void execute(String[] args, boolean useDevTemplates, boolean assureFailure) throws Exception {
+
+    execute(args, useDevTemplates, assureFailure, false);
+  }
+
   /**
    * This method check the return code from picocli
    *
    * @param args execution arguments
    * @param useDevTemplates use development devon4j-templates
    * @param assureFailure assure failure instead of success of the command execution
+   * @param allowMonolithicConfiguration ignores deprecated monolithic template folder structure and if found does not
+   *        throw a DeprecatedMonolithicConfigurationException
    * @throws Exception error
    */
-  protected void execute(String[] args, boolean useDevTemplates, boolean assureFailure) throws Exception {
+  protected void execute(String[] args, boolean useDevTemplates, boolean assureFailure,
+      boolean allowMonolithicConfiguration) throws Exception {
 
     if (useDevTemplates) {
       runWithLatestTemplates();
@@ -130,11 +215,21 @@ protected void execute(String[] args, boolean useDevTemplates, boolean assureFai
       i++;
     }
 
-    if (useDevTemplates) {
+    if (useDevTemplates && !allowMonolithicConfiguration) {
       debugArgs = Arrays.copyOf(debugArgs, debugArgs.length + 3);
       debugArgs[debugArgs.length - 3] = "-v";
       debugArgs[debugArgs.length - 2] = "-tp";
-      debugArgs[debugArgs.length - 1] = devTemplatesPath.toString();
+      debugArgs[debugArgs.length - 1] = devTemplatesPathTemp.toString();
+    } else if (useDevTemplates && allowMonolithicConfiguration) {
+      debugArgs = Arrays.copyOf(debugArgs, debugArgs.length + 4);
+      debugArgs[debugArgs.length - 4] = "--force-mc";
+      debugArgs[debugArgs.length - 3] = "-v";
+      debugArgs[debugArgs.length - 2] = "-tp";
+      debugArgs[debugArgs.length - 1] = devTemplatesPathTemp.toString();
+    } else if (allowMonolithicConfiguration) {
+      debugArgs = Arrays.copyOf(debugArgs, debugArgs.length + 2);
+      debugArgs[debugArgs.length - 2] = "--force-mc";
+      debugArgs[debugArgs.length - 1] = "-v";
     } else {
       debugArgs = Arrays.copyOf(debugArgs, debugArgs.length + 1);
       debugArgs[debugArgs.length - 1] = "-v";
@@ -147,11 +242,15 @@ protected void execute(String[] args, boolean useDevTemplates, boolean assureFai
         .redirectOutput(Slf4jStream.of(LoggerFactory.getLogger(getClass().getName() + ".cliprocess")).asInfo());
 
     // enable jacoco coverage monitoring for external processes (especially for CI/CD)
-    if (!StringUtils.isEmpty(MavenMetadata.JACOCO_AGENT_ARGS)) {
+    if (!StringUtils.isEmpty(MavenMetadata.JACOCO_AGENT_ARGS)
+        && !StringUtils.startsWith(MavenMetadata.JACOCO_AGENT_ARGS, "$")) {
       pe.environment(JAVA_TOOL_OPTIONS, MavenMetadata.JACOCO_AGENT_ARGS
+
           // .replaceFirst("destfile=[^,]+(,)?", "")
           // + ",output=tcpclient,sessionid=test,inclnolocationclasses=true,inclbootstrapclasses=true "
           + "" + (System.getenv(JAVA_TOOL_OPTIONS) == null ? "" : " " + System.getenv(JAVA_TOOL_OPTIONS)));
+    } else {
+      LOG.warn("No value for JACOCO is set!");
     }
 
     new SystemExit().execute(() -> {
diff --git a/cobigen-cli/cli-systemtest/src/test/java/com/devonfw/cobigen/cli/systemtest/AdaptTemplatesCommandIT.java b/cobigen-cli/cli-systemtest/src/test/java/com/devonfw/cobigen/cli/systemtest/AdaptTemplatesCommandIT.java
index a47d183749..3edff96f91 100644
--- a/cobigen-cli/cli-systemtest/src/test/java/com/devonfw/cobigen/cli/systemtest/AdaptTemplatesCommandIT.java
+++ b/cobigen-cli/cli-systemtest/src/test/java/com/devonfw/cobigen/cli/systemtest/AdaptTemplatesCommandIT.java
@@ -3,44 +3,136 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.io.File;
+import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 
+import org.apache.commons.io.FileUtils;
 import org.junit.Test;
 
 import com.devonfw.cobigen.api.constants.ConfigurationConstants;
+import com.devonfw.cobigen.api.util.TemplatesJarUtil;
 
 /**
  * Tests the usage of the adapt-templates command.
  */
 public class AdaptTemplatesCommandIT extends AbstractCliTest {
 
+  /** Test resources root path */
+  private static String testFileRootPath = "src/test/resources/testdata/AdaptTemplatesCommandIT/template-sets/downloaded";
+
   /**
-   * Checks if adapt-templates command successfully created cobigen templates folder and its sub folders
+   * Checks if adapt-templates command successfully created adapted folder and its sub folders
    *
    * @throws Exception test fails
    */
   @Test
-  public void adaptTemplatesTest() throws Exception {
+  public void adaptTemplateSetTest() throws Exception {
 
-    String args[] = new String[1];
+    Path downloadedTemplateSetsPath = this.currentHome.resolve(ConfigurationConstants.TEMPLATE_SETS_FOLDER)
+        .resolve(ConfigurationConstants.DOWNLOADED_FOLDER);
+    if (!Files.exists(downloadedTemplateSetsPath)) {
+      Files.createDirectories(downloadedTemplateSetsPath);
+    }
+    FileUtils.copyDirectory(new File(testFileRootPath), downloadedTemplateSetsPath.toFile());
+    String args[] = new String[2];
     args[0] = "adapt-templates";
+    args[1] = "--all";
 
     execute(args, false);
 
-    Path cobigenTemplatesFolderPath = this.currentHome.resolve(ConfigurationConstants.TEMPLATES_FOLDER)
-        .resolve(ConfigurationConstants.COBIGEN_TEMPLATES);
-    assertThat(cobigenTemplatesFolderPath).exists();
-    // check if templates exist
-    assertThat(Paths
-        .get(cobigenTemplatesFolderPath.toString() + File.separator + ConfigurationConstants.TEMPLATE_RESOURCE_FOLDER))
+    Path cobigenTemplateSetsFolderPath = this.currentHome.resolve(ConfigurationConstants.TEMPLATE_SETS_FOLDER);
+    Path downloadedTemplateSetsFolderPath = cobigenTemplateSetsFolderPath
+        .resolve(ConfigurationConstants.DOWNLOADED_FOLDER);
+    Path adaptedTemplateSetsFolderPath = cobigenTemplateSetsFolderPath.resolve(ConfigurationConstants.ADAPTED_FOLDER);
+
+    assertThat(cobigenTemplateSetsFolderPath).exists();
+    assertThat(downloadedTemplateSetsFolderPath).exists();
+    assertThat(adaptedTemplateSetsFolderPath).exists();
+
+    Path templateSetSimple = adaptedTemplateSetsFolderPath.resolve("crud-java-server-app-1.0.0");
+    Path templateSetComplex = adaptedTemplateSetsFolderPath.resolve("crud-java-server-app-complex-1.0.0");
+
+    // check if adapted template set exists
+    assertThat(templateSetSimple).exists();
+    assertThat(templateSetComplex).exists();
+
+    Path templateSetResourcesPath = templateSetSimple
+        .resolve(ConfigurationConstants.MAVEN_CONFIGURATION_RESOURCE_FOLDER);
+    Path templateSetResourcesPathComplex = templateSetComplex
+        .resolve(ConfigurationConstants.MAVEN_CONFIGURATION_RESOURCE_FOLDER);
+
+    // check if templates folder exists
+    assertThat(templateSetSimple.resolve(templateSetResourcesPath).resolve(ConfigurationConstants.TEMPLATES_FOLDER))
+        .exists();
+    assertThat(
+        templateSetComplex.resolve(templateSetResourcesPathComplex).resolve(ConfigurationConstants.TEMPLATES_FOLDER))
             .exists();
+
+    // check if template-set.xml exists
+    assertThat(templateSetSimple.resolve(templateSetResourcesPath)
+        .resolve(ConfigurationConstants.TEMPLATE_SET_CONFIG_FILENAME)).exists();
+    assertThat(templateSetComplex.resolve(templateSetResourcesPathComplex)
+        .resolve(ConfigurationConstants.TEMPLATE_SET_CONFIG_FILENAME)).exists();
+
+    // validate correct folder structure
+    assertThat(templateSetSimple.resolve(templateSetResourcesPath)
+        .resolve(ConfigurationConstants.TEMPLATE_SET_FREEMARKER_FUNCTIONS_FILE_NAME)).exists();
+    assertThat(templateSetComplex.resolve(templateSetResourcesPathComplex)
+        .resolve(ConfigurationConstants.TEMPLATE_SET_FREEMARKER_FUNCTIONS_FILE_NAME)).exists();
+
+    // check if template set utility resource folder exists
+    assertThat(templateSetSimple.resolve(ConfigurationConstants.UTIL_RESOURCE_FOLDER)).exists();
+    assertThat(templateSetComplex.resolve(ConfigurationConstants.UTIL_RESOURCE_FOLDER)).exists();
+
+    // validate maven specific contents
+    assertThat(templateSetSimple.resolve("pom.xml")).exists();
+    assertThat(templateSetComplex.resolve("pom.xml")).exists();
+
+    // check if META-INF was deleted
+    assertThat(templateSetResourcesPath.resolve("META-INF")).doesNotExist();
+    assertThat(templateSetResourcesPathComplex.resolve("META-INF")).doesNotExist();
+
+  }
+
+  /**
+   * Checks if adapt-templates command successfully created cobigen templates folder and its sub folders
+   *
+   * @throws Exception test fails
+   */
+  @Test
+  public void adaptTemplatesTest() throws Exception {
+
+    Path templatesPath = this.currentHome.resolve(ConfigurationConstants.TEMPLATES_FOLDER);
+    Path CobigenTemplatesPath = templatesPath.resolve(ConfigurationConstants.COBIGEN_TEMPLATES);
+    if (!Files.exists(templatesPath)) {
+      Files.createDirectories(templatesPath);
+    }
+
+    // TODO: Replace with downloadJarFromURL method and get rid of downloadJar, see:
+    // https://github.com/devonfw/cobigen/issues/1685
+    TemplatesJarUtil.downloadJar("com.devonfw.cobigen", "templates-devon4j", "3.0.0", false, templatesPath.toFile());
+    TemplatesJarUtil.downloadJar("com.devonfw.cobigen", "templates-devon4j", "3.0.0", true, templatesPath.toFile());
+
+    String args[] = new String[2];
+    args[0] = "adapt-templates";
+    args[1] = "--all";
+
+    execute(args, false, false, true);
+
+    assertThat(CobigenTemplatesPath).exists();
+
+    Path templateRoot = CobigenTemplatesPath.resolve(ConfigurationConstants.TEMPLATE_RESOURCE_FOLDER);
+
     // check if context configuration exists
-    assertThat(Paths
-        .get(cobigenTemplatesFolderPath.toString() + File.separator + ConfigurationConstants.TEMPLATE_RESOURCE_FOLDER
-            + File.separator + ConfigurationConstants.CONTEXT_CONFIG_FILENAME)).exists();
-    // check if sources of utility classes exist
-    assertThat(Paths.get(cobigenTemplatesFolderPath.toString() + File.separator + "src" + File.separator + "main"
-        + File.separator + "java")).exists();
+    assertThat(templateRoot.resolve(ConfigurationConstants.CONTEXT_CONFIG_FILENAME)).exists();
+
+    Path template = templateRoot.resolve("crud_java_server_app");
+    Path templateComplex = templateRoot.resolve("crud_java_server_app_complex");
+    // check if templates exists
+    assertThat(template).exists();
+    assertThat(templateComplex).exists();
+    // check if template.xml exists
+    assertThat(template.resolve(ConfigurationConstants.TEMPLATES_CONFIG_FILENAME)).exists();
+    assertThat(templateComplex.resolve(ConfigurationConstants.TEMPLATES_CONFIG_FILENAME)).exists();
   }
 }
diff --git a/cobigen-cli/cli-systemtest/src/test/java/com/devonfw/cobigen/cli/systemtest/GenerateCommandIT.java b/cobigen-cli/cli-systemtest/src/test/java/com/devonfw/cobigen/cli/systemtest/GenerateCommandIT.java
index 4d4a45505f..3d632b8f68 100644
--- a/cobigen-cli/cli-systemtest/src/test/java/com/devonfw/cobigen/cli/systemtest/GenerateCommandIT.java
+++ b/cobigen-cli/cli-systemtest/src/test/java/com/devonfw/cobigen/cli/systemtest/GenerateCommandIT.java
@@ -9,8 +9,11 @@
 
 import org.apache.commons.io.FileUtils;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 
+import com.devonfw.cobigen.api.constants.ConfigurationConstants;
+
 /**
  * Tests the usage of the generate command.
  */
@@ -65,6 +68,70 @@ public void generateFromEntityTest() throws Exception {
         .exists();
   }
 
+  /**
+   *
+   * Test the upgrade process from templates in a given path and generates from the new template-sets structure
+   *
+   * @throws Exception test fails
+   */
+  @Test
+  @Ignore // TODO: re-enable when upgrade process is implemented, see: https://github.com/devonfw/cobigen/issues/1595
+  public void upgradeAndGenerateFromEntityTest() throws Exception {
+
+    FileUtils.copyDirectory(new File(testFileRootPath + "templatesproject"), this.tmpProject.toFile());
+    this.tmpProject.resolve("templates-devon4j").toFile()
+        .renameTo(this.tmpProject.resolve(ConfigurationConstants.COBIGEN_TEMPLATES).toFile());
+    File baseProject = this.tmpProject.resolve("maven.project/core/").toFile();
+    File monolithicConfiguration = this.tmpProject.toFile();
+    String args[] = new String[7];
+    args[0] = "generate";
+    args[1] = this.entityInputFile.getAbsolutePath();
+    args[2] = "--increments";
+    args[3] = "0";
+    args[4] = "--upgrade-configuration";
+    args[5] = "-tp";
+    args[6] = monolithicConfiguration.getAbsolutePath();
+
+    execute(args, false);
+
+    assertThat(this.currentHome.resolve(ConfigurationConstants.CONFIG_PROPERTY_TEMPLATE_SETS_PATH)).exists();
+
+    assertThat(baseProject.toPath().resolve("src/main/java/com/maven/project/sampledatamanagement/logic/api/to"))
+        .exists();
+  }
+
+  /**
+   *
+   * Integration test of the generation of template sets from a Java Entity. It does not specify the project to generate
+   * the folders to.
+   *
+   * @throws Exception test fails
+   */
+  @Test
+  @Ignore // TODO: re-enable/fix when CLI tests were re-factored, see: https://github.com/devonfw/cobigen/issues/1659
+  public void generateFromEntityWithTemplateSetTest() throws Exception {
+
+    File baseProject = this.tmpProject.resolve("maven.project/core/").toFile();
+    File templateSetsConfig = this.tmpProject.resolve(ConfigurationConstants.TEMPLATE_SETS_FOLDER).toFile();
+    String args[] = new String[6];
+    args[0] = "generate";
+    args[1] = this.entityInputFile.getAbsolutePath();
+    args[2] = "--increments";
+    args[3] = "0";
+    args[4] = "-tp";
+    args[5] = templateSetsConfig.getAbsolutePath();
+
+    execute(args, false);
+
+    assertThat(this.currentHome.resolve(ConfigurationConstants.CONFIG_PROPERTY_TEMPLATE_SETS_PATH)).exists();
+
+    assertThat(baseProject.toPath().resolve("src/main/java/com/maven/project/sampledatamanagement/logic/api/to"))
+        .exists();
+  }
+
+  // TODO: Add similar test with a template-set jar file in downloaded folder, see:
+  // https://github.com/devonfw/cobigen/issues/1661
+
   /**
    * Integration test of the generation from a templates jar using a utility class with an extra dependency. See:
    * https://github.com/devonfw/cobigen/issues/1450
@@ -74,10 +141,10 @@ public void generateFromEntityTest() throws Exception {
   @Test
   public void generateFromTemplatesJarWithUtilClassDependencyTest() throws Exception {
 
-    FileUtils.copyDirectory(new File(testFileRootPath + "templatesproject"), this.tmpProject.toFile());
+    FileUtils.copyDirectory(new File(testFileRootPath + "templatesproject/templates-devon4j"),
+        this.tmpProject.toFile());
     File baseProject = this.tmpProject.resolve("maven.project/core/").toFile();
-    File templatesProject = this.tmpProject.resolve("templates-devon4j/target/templates-devon4j-dev-SNAPSHOT.jar")
-        .toFile();
+    File templatesProject = this.tmpProject.resolve("target/templates-devon4j-dev-SNAPSHOT.jar").toFile();
 
     String args[] = new String[6];
     args[0] = "generate";
@@ -87,7 +154,7 @@ public void generateFromTemplatesJarWithUtilClassDependencyTest() throws Excepti
     args[4] = "-tp";
     args[5] = templatesProject.getAbsolutePath();
 
-    execute(args, false);
+    execute(args, false, false, true);
 
     assertThat(baseProject.toPath().resolve("src/main/java/com/maven/project/sampledatamanagement/logic/api/to"))
         .exists();
@@ -231,7 +298,6 @@ public void generateFromMultipleTypeInputTest() throws Exception {
     String args[] = new String[6];
     args[0] = "generate";
     args[1] = openApiFile.getAbsolutePath() + "," + this.entityInputFile.getAbsolutePath();
-
     args[2] = "--out";
     args[3] = outputRootFile.getAbsolutePath();
     args[4] = "--increments";
@@ -361,4 +427,4 @@ public void generateFromEntityTwiceToTestCache() throws Exception {
     execute(args, true);
   }
 
-}
+}
\ No newline at end of file
diff --git a/cobigen-cli/cli-systemtest/src/test/resources/testdata/AdaptTemplatesCommandIT/template-sets/adapted/crud-java-server-app-complex/pom.xml b/cobigen-cli/cli-systemtest/src/test/resources/testdata/AdaptTemplatesCommandIT/template-sets/adapted/crud-java-server-app-complex/pom.xml
new file mode 100644
index 0000000000..3c69a2539d
--- /dev/null
+++ b/cobigen-cli/cli-systemtest/src/test/resources/testdata/AdaptTemplatesCommandIT/template-sets/adapted/crud-java-server-app-complex/pom.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+  xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.devonfw.test</groupId>
+  <artifactId>crud-java-server-app-complex</artifactId>
+  <version>1.0.0</version>
+  <packaging>jar</packaging>
+  <properties>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
+  </properties>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>2.3.1</version>
+        <configuration>
+          <outputDirectory>../../downloaded</outputDirectory>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-source-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>attach-sources</id>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <skipSource>${skip.deployment}</skipSource>
+          <outputDirectory>../../downloaded</outputDirectory>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-resources-plugin</artifactId>
+        <version>2.7</version>
+        <configuration>
+          <encoding>UTF-8</encoding>
+        </configuration>
+      </plugin>
+      <!-- Inject Maven Properties in java-templates source folder -->
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>templating-maven-plugin</artifactId>
+        <version>1.0.0</version>
+        <executions>
+          <execution>
+            <id>generate-maven-properties-class</id>
+            <goals>
+              <goal>filter-sources</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>prepare-package</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <tasks>
+                <echo>Integrate POM manually</echo>
+                <copy file="pom.xml" tofile="${project.build.outputDirectory}/pom.xml"/>
+              </tasks>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>
\ No newline at end of file
diff --git a/cobigen-cli/cli-systemtest/src/test/resources/testdata/AdaptTemplatesCommandIT/template-sets/adapted/crud-java-server-app-complex/src/main/java/com/test.java b/cobigen-cli/cli-systemtest/src/test/resources/testdata/AdaptTemplatesCommandIT/template-sets/adapted/crud-java-server-app-complex/src/main/java/com/test.java
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/cobigen-cli/cli-systemtest/src/test/resources/testdata/AdaptTemplatesCommandIT/template-sets/adapted/crud-java-server-app-complex/src/main/resources/functions.ftl b/cobigen-cli/cli-systemtest/src/test/resources/testdata/AdaptTemplatesCommandIT/template-sets/adapted/crud-java-server-app-complex/src/main/resources/functions.ftl
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/cobigen-cli/cli-systemtest/src/test/resources/testdata/AdaptTemplatesCommandIT/template-sets/adapted/crud-java-server-app-complex/src/main/resources/template-set.xml b/cobigen-cli/cli-systemtest/src/test/resources/testdata/AdaptTemplatesCommandIT/template-sets/adapted/crud-java-server-app-complex/src/main/resources/template-set.xml
new file mode 100644
index 0000000000..5cfe219789
--- /dev/null
+++ b/cobigen-cli/cli-systemtest/src/test/resources/testdata/AdaptTemplatesCommandIT/template-sets/adapted/crud-java-server-app-complex/src/main/resources/template-set.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:templateSetConfiguration version="6.0" xmlns:tns="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration" xmlns:cc="http://capgemini.com/devonfw/cobigen/ContextConfiguration" xmlns:tc="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration templateSetConfiguration.xsd ">
+<cc:contextConfiguration version="3.0">
+  <cc:trigger id="crud_java_server_app_complex" type="java">
+    <cc:containerMatcher type="package" value="((.+\.)?([^\.]+))\.([^\.]+)\.dataaccess\.api" retrieveObjectsRecursively="false" />
+    <cc:matcher type="fqn" value="((.+\.)?([^\.]+))\.([^\.]+)\.dataaccess\.api\.([^\.]+)Entity">
+      <cc:variableAssignment type="regex" key="rootPackage" value="1" />
+      <cc:variableAssignment type="regex" key="domain" value="3" />
+      <cc:variableAssignment type="regex" key="component" value="4" />
+      <cc:variableAssignment type="regex" key="entityName" value="5" />
+    </cc:matcher>
+  </cc:trigger>
+  <cc:tags>
+    <cc:tag name="Java"></cc:tag>
+    <cc:tag name="CRUD"></cc:tag>
+    <cc:tag name="Server"></cc:tag>
+    <cc:tag name="App"></cc:tag>
+  </cc:tags>
+  <cc:links>
+    <cc:link url="https://docs.spring.io/spring-data/data-commons/docs/1.6.1.RELEASE/reference/html/repositories.html"></cc:link>
+  </cc:links>
+</cc:contextConfiguration>
+
+<tc:templatesConfiguration version="5.0">
+
+  <tc:templates>
+    <tc:templateExtension ref="${variables.entityName}Eto.java" mergeStrategy="javamerge"/>
+  </tc:templates>
+
+  <tc:templateScans>
+    <tc:templateScan name="ts_scan" templatePath="templates" destinationPath="" />
+  </tc:templateScans>
+
+  <tc:increments>
+    <tc:increment name="tos" description="TO's">
+      <tc:templateRef ref="${variables.entityName}Eto.java"/>
+    </tc:increment>
+  </tc:increments>
+</tc:templatesConfiguration>
+</tns:templateSetConfiguration>
\ No newline at end of file
diff --git a/cobigen-cli/cli-systemtest/src/test/resources/testdata/AdaptTemplatesCommandIT/template-sets/adapted/crud-java-server-app-complex/src/main/resources/templates/java/${variables.rootPackage}/${variables.component}/logic/api/to/${variables.entityName}Eto.java.ftl b/cobigen-cli/cli-systemtest/src/test/resources/testdata/AdaptTemplatesCommandIT/template-sets/adapted/crud-java-server-app-complex/src/main/resources/templates/java/${variables.rootPackage}/${variables.component}/logic/api/to/${variables.entityName}Eto.java.ftl
new file mode 100644
index 0000000000..0c233890ea
--- /dev/null
+++ b/cobigen-cli/cli-systemtest/src/test/resources/testdata/AdaptTemplatesCommandIT/template-sets/adapted/crud-java-server-app-complex/src/main/resources/templates/java/${variables.rootPackage}/${variables.component}/logic/api/to/${variables.entityName}Eto.java.ftl
@@ -0,0 +1 @@
+package test;
\ No newline at end of file
diff --git a/cobigen-cli/cli-systemtest/src/test/resources/testdata/AdaptTemplatesCommandIT/template-sets/adapted/crud-java-server-app/pom.xml b/cobigen-cli/cli-systemtest/src/test/resources/testdata/AdaptTemplatesCommandIT/template-sets/adapted/crud-java-server-app/pom.xml
new file mode 100644
index 0000000000..3558920d14
--- /dev/null
+++ b/cobigen-cli/cli-systemtest/src/test/resources/testdata/AdaptTemplatesCommandIT/template-sets/adapted/crud-java-server-app/pom.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+  xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.devonfw.test</groupId>
+  <artifactId>crud-java-server-app</artifactId>
+  <version>1.0.0</version>
+  <packaging>jar</packaging>
+  <properties>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
+  </properties>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>2.3.1</version>
+        <configuration>
+          <outputDirectory>../../downloaded</outputDirectory>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-source-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>attach-sources</id>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <skipSource>${skip.deployment}</skipSource>
+          <outputDirectory>../../downloaded</outputDirectory>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-resources-plugin</artifactId>
+        <version>2.7</version>
+        <configuration>
+          <encoding>UTF-8</encoding>
+        </configuration>
+      </plugin>
+      <!-- Inject Maven Properties in java-templates source folder -->
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>templating-maven-plugin</artifactId>
+        <version>1.0.0</version>
+        <executions>
+          <execution>
+            <id>generate-maven-properties-class</id>
+            <goals>
+              <goal>filter-sources</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>prepare-package</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <tasks>
+                <echo>Integrate POM manually</echo>
+                <copy file="pom.xml" tofile="${project.build.outputDirectory}/pom.xml"/>
+              </tasks>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>
\ No newline at end of file
diff --git a/cobigen-cli/cli-systemtest/src/test/resources/testdata/AdaptTemplatesCommandIT/template-sets/adapted/crud-java-server-app/src/main/java/com/test.java b/cobigen-cli/cli-systemtest/src/test/resources/testdata/AdaptTemplatesCommandIT/template-sets/adapted/crud-java-server-app/src/main/java/com/test.java
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/cobigen-cli/cli-systemtest/src/test/resources/testdata/AdaptTemplatesCommandIT/template-sets/adapted/crud-java-server-app/src/main/resources/functions.ftl b/cobigen-cli/cli-systemtest/src/test/resources/testdata/AdaptTemplatesCommandIT/template-sets/adapted/crud-java-server-app/src/main/resources/functions.ftl
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/cobigen-cli/cli-systemtest/src/test/resources/testdata/AdaptTemplatesCommandIT/template-sets/adapted/crud-java-server-app/src/main/resources/template-set.xml b/cobigen-cli/cli-systemtest/src/test/resources/testdata/AdaptTemplatesCommandIT/template-sets/adapted/crud-java-server-app/src/main/resources/template-set.xml
new file mode 100644
index 0000000000..4515b452ec
--- /dev/null
+++ b/cobigen-cli/cli-systemtest/src/test/resources/testdata/AdaptTemplatesCommandIT/template-sets/adapted/crud-java-server-app/src/main/resources/template-set.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:templateSetConfiguration version="6.0" xmlns:tns="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration" xmlns:cc="http://capgemini.com/devonfw/cobigen/ContextConfiguration" xmlns:tc="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration templateSetConfiguration.xsd ">
+<cc:contextConfiguration version="3.0">
+  <cc:trigger id="crud_java_server_app" type="java">
+    <cc:containerMatcher type="package" value="((.+\.)?([^\.]+))\.([^\.]+)\.dataaccess\.api" retrieveObjectsRecursively="false" />
+    <cc:matcher type="fqn" value="((.+\.)?([^\.]+))\.([^\.]+)\.dataaccess\.api\.([^\.]+)Entity">
+      <cc:variableAssignment type="regex" key="rootPackage" value="1" />
+      <cc:variableAssignment type="regex" key="domain" value="3" />
+      <cc:variableAssignment type="regex" key="component" value="4" />
+      <cc:variableAssignment type="regex" key="entityName" value="5" />
+    </cc:matcher>
+  </cc:trigger>
+  <cc:tags>
+    <cc:tag name="Java"></cc:tag>
+    <cc:tag name="CRUD"></cc:tag>
+    <cc:tag name="Server"></cc:tag>
+    <cc:tag name="App"></cc:tag>
+  </cc:tags>
+  <cc:links>
+    <cc:link url="https://docs.spring.io/spring-data/data-commons/docs/1.6.1.RELEASE/reference/html/repositories.html"></cc:link>
+  </cc:links>
+</cc:contextConfiguration>
+
+<tc:templatesConfiguration version="5.0">
+
+  <tc:templates>
+    <tc:templateExtension ref="${variables.entityName}Eto.java" mergeStrategy="javamerge"/>
+  </tc:templates>
+
+  <tc:templateScans>
+    <tc:templateScan name="ts_scan" templatePath="templates" destinationPath="" />
+  </tc:templateScans>
+
+  <tc:increments>
+    <tc:increment name="tos" description="TO's">
+      <tc:templateRef ref="${variables.entityName}Eto.java"/>
+    </tc:increment>
+  </tc:increments>
+</tc:templatesConfiguration>
+</tns:templateSetConfiguration>
\ No newline at end of file
diff --git a/cobigen-cli/cli-systemtest/src/test/resources/testdata/AdaptTemplatesCommandIT/template-sets/adapted/crud-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component}/logic/api/to/${variables.entityName}Eto.java.ftl b/cobigen-cli/cli-systemtest/src/test/resources/testdata/AdaptTemplatesCommandIT/template-sets/adapted/crud-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component}/logic/api/to/${variables.entityName}Eto.java.ftl
new file mode 100644
index 0000000000..0c233890ea
--- /dev/null
+++ b/cobigen-cli/cli-systemtest/src/test/resources/testdata/AdaptTemplatesCommandIT/template-sets/adapted/crud-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component}/logic/api/to/${variables.entityName}Eto.java.ftl
@@ -0,0 +1 @@
+package test;
\ No newline at end of file
diff --git a/cobigen-cli/cli-systemtest/src/test/resources/testdata/templatesproject/template-sets/adapted/crud-java-server-app/pom.xml b/cobigen-cli/cli-systemtest/src/test/resources/testdata/templatesproject/template-sets/adapted/crud-java-server-app/pom.xml
new file mode 100644
index 0000000000..79e6e7b9c3
--- /dev/null
+++ b/cobigen-cli/cli-systemtest/src/test/resources/testdata/templatesproject/template-sets/adapted/crud-java-server-app/pom.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+  xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.devonfw.test</groupId>
+  <artifactId>templates-devon4j</artifactId>
+  <version>dev-SNAPSHOT</version>
+  <packaging>jar</packaging>
+  <properties>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-math3</artifactId>
+      <version>3.6.1</version>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <resources>
+      <resource>
+        <directory>src/main/templates</directory>
+        <targetPath>src/main/templates</targetPath>
+      </resource>
+    </resources>
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>flatten-maven-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>prepare-package</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <tasks>
+                <echo>Integrate POM manually</echo>
+                <copy file="pom.xml" tofile="${project.build.outputDirectory}/pom.xml"/>
+              </tasks>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>
\ No newline at end of file
diff --git a/cobigen-cli/cli-systemtest/src/test/resources/testdata/templatesproject/template-sets/adapted/crud-java-server-app/src/main/java/utils/MathUtils.java b/cobigen-cli/cli-systemtest/src/test/resources/testdata/templatesproject/template-sets/adapted/crud-java-server-app/src/main/java/utils/MathUtils.java
new file mode 100644
index 0000000000..79bf32afde
--- /dev/null
+++ b/cobigen-cli/cli-systemtest/src/test/resources/testdata/templatesproject/template-sets/adapted/crud-java-server-app/src/main/java/utils/MathUtils.java
@@ -0,0 +1,12 @@
+package utils;
+
+import org.apache.commons.math3.distribution.NormalDistribution;
+
+public class MathUtils {
+
+    public double getNormalDistribution() {
+      NormalDistribution normalDistribution = new NormalDistribution(10, 3);
+      double randomValue = normalDistribution.sample();
+      return randomValue;
+    }
+}
diff --git a/cobigen-cli/cli-systemtest/src/test/resources/testdata/templatesproject/template-sets/adapted/crud-java-server-app/src/main/resources/template-set.xml b/cobigen-cli/cli-systemtest/src/test/resources/testdata/templatesproject/template-sets/adapted/crud-java-server-app/src/main/resources/template-set.xml
new file mode 100644
index 0000000000..aecd8ff6ca
--- /dev/null
+++ b/cobigen-cli/cli-systemtest/src/test/resources/testdata/templatesproject/template-sets/adapted/crud-java-server-app/src/main/resources/template-set.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:templateSetConfiguration version="6.0" xmlns:tns="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration" xmlns:cc="http://capgemini.com/devonfw/cobigen/ContextConfiguration" xmlns:tc="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration templateSetConfiguration.xsd ">
+<cc:contextConfiguration version="3.0">
+  <cc:trigger id="crud_java_server_app" type="java">
+    <cc:containerMatcher type="package" value="((.+\.)?([^\.]+))\.([^\.]+)\.dataaccess\.api" retrieveObjectsRecursively="false" />
+    <cc:matcher type="fqn" value="((.+\.)?([^\.]+))\.([^\.]+)\.dataaccess\.api\.([^\.]+)Entity">
+      <cc:variableAssignment type="regex" key="rootPackage" value="1" />
+      <cc:variableAssignment type="regex" key="domain" value="3" />
+      <cc:variableAssignment type="regex" key="component" value="4" />
+      <cc:variableAssignment type="regex" key="entityName" value="5" />
+    </cc:matcher>
+  </cc:trigger>
+  <cc:tags>
+    <cc:tag name="Java"></cc:tag>
+    <cc:tag name="CRUD"></cc:tag>
+    <cc:tag name="Server"></cc:tag>
+    <cc:tag name="App"></cc:tag>
+  </cc:tags>
+  <cc:links>
+    <cc:link url="https://docs.spring.io/spring-data/data-commons/docs/1.6.1.RELEASE/reference/html/repositories.html"></cc:link>
+  </cc:links>
+</cc:contextConfiguration>
+
+<tc:templatesConfiguration version="5.0">
+
+  <tc:templates>
+    <tc:templateExtension ref="${variables.entityName}Eto.java" mergeStrategy="javamerge"/>
+  </tc:templates>
+
+  <tc:templateScans>
+    <tc:templateScan templatePath="templates" destinationPath="src/main"/>
+  </tc:templateScans>
+
+  <tc:increments>
+    <tc:increment name="tos" description="TO's">
+      <tc:templateRef ref="${variables.entityName}Eto.java"/>
+    </tc:increment>
+  </tc:increments>
+</tc:templatesConfiguration>
+</tns:templateSetConfiguration>
\ No newline at end of file
diff --git a/cobigen-cli/cli-systemtest/src/test/resources/testdata/templatesproject/template-sets/adapted/crud-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component}/logic/api/to/${variables.entityName}Eto.java.ftl b/cobigen-cli/cli-systemtest/src/test/resources/testdata/templatesproject/template-sets/adapted/crud-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component}/logic/api/to/${variables.entityName}Eto.java.ftl
new file mode 100644
index 0000000000..dbf053f736
--- /dev/null
+++ b/cobigen-cli/cli-systemtest/src/test/resources/testdata/templatesproject/template-sets/adapted/crud-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component}/logic/api/to/${variables.entityName}Eto.java.ftl
@@ -0,0 +1,5 @@
+package test;
+
+class Test{
+  private final double myVar = ${MathUtils.getNormalDistribution()};
+}
\ No newline at end of file
diff --git a/cobigen-cli/cli-systemtest/src/test/resources/testdata/templatesproject/template-sets/downloaded/crud-java-server-app/pom.xml b/cobigen-cli/cli-systemtest/src/test/resources/testdata/templatesproject/template-sets/downloaded/crud-java-server-app/pom.xml
new file mode 100644
index 0000000000..338fee4ab5
--- /dev/null
+++ b/cobigen-cli/cli-systemtest/src/test/resources/testdata/templatesproject/template-sets/downloaded/crud-java-server-app/pom.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+  xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.devonfw.test</groupId>
+  <artifactId>crud-java-server-app</artifactId>
+  <version>test</version>
+  <packaging>jar</packaging>
+  <properties>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
+  </properties>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>2.3.1</version>
+        <configuration>
+          <outputDirectory>../../downloaded</outputDirectory>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>
\ No newline at end of file
diff --git a/cobigen-cli/cli-systemtest/src/test/resources/testdata/templatesproject/template-sets/downloaded/crud-java-server-app/src/main/resources/template-set.xml b/cobigen-cli/cli-systemtest/src/test/resources/testdata/templatesproject/template-sets/downloaded/crud-java-server-app/src/main/resources/template-set.xml
new file mode 100644
index 0000000000..4515b452ec
--- /dev/null
+++ b/cobigen-cli/cli-systemtest/src/test/resources/testdata/templatesproject/template-sets/downloaded/crud-java-server-app/src/main/resources/template-set.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:templateSetConfiguration version="6.0" xmlns:tns="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration" xmlns:cc="http://capgemini.com/devonfw/cobigen/ContextConfiguration" xmlns:tc="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration templateSetConfiguration.xsd ">
+<cc:contextConfiguration version="3.0">
+  <cc:trigger id="crud_java_server_app" type="java">
+    <cc:containerMatcher type="package" value="((.+\.)?([^\.]+))\.([^\.]+)\.dataaccess\.api" retrieveObjectsRecursively="false" />
+    <cc:matcher type="fqn" value="((.+\.)?([^\.]+))\.([^\.]+)\.dataaccess\.api\.([^\.]+)Entity">
+      <cc:variableAssignment type="regex" key="rootPackage" value="1" />
+      <cc:variableAssignment type="regex" key="domain" value="3" />
+      <cc:variableAssignment type="regex" key="component" value="4" />
+      <cc:variableAssignment type="regex" key="entityName" value="5" />
+    </cc:matcher>
+  </cc:trigger>
+  <cc:tags>
+    <cc:tag name="Java"></cc:tag>
+    <cc:tag name="CRUD"></cc:tag>
+    <cc:tag name="Server"></cc:tag>
+    <cc:tag name="App"></cc:tag>
+  </cc:tags>
+  <cc:links>
+    <cc:link url="https://docs.spring.io/spring-data/data-commons/docs/1.6.1.RELEASE/reference/html/repositories.html"></cc:link>
+  </cc:links>
+</cc:contextConfiguration>
+
+<tc:templatesConfiguration version="5.0">
+
+  <tc:templates>
+    <tc:templateExtension ref="${variables.entityName}Eto.java" mergeStrategy="javamerge"/>
+  </tc:templates>
+
+  <tc:templateScans>
+    <tc:templateScan name="ts_scan" templatePath="templates" destinationPath="" />
+  </tc:templateScans>
+
+  <tc:increments>
+    <tc:increment name="tos" description="TO's">
+      <tc:templateRef ref="${variables.entityName}Eto.java"/>
+    </tc:increment>
+  </tc:increments>
+</tc:templatesConfiguration>
+</tns:templateSetConfiguration>
\ No newline at end of file
diff --git a/cobigen-cli/cli-systemtest/src/test/resources/testdata/templatesproject/template-sets/downloaded/crud-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component}/logic/api/to/${variables.entityName}Eto.java.ftl b/cobigen-cli/cli-systemtest/src/test/resources/testdata/templatesproject/template-sets/downloaded/crud-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component}/logic/api/to/${variables.entityName}Eto.java.ftl
new file mode 100644
index 0000000000..0c233890ea
--- /dev/null
+++ b/cobigen-cli/cli-systemtest/src/test/resources/testdata/templatesproject/template-sets/downloaded/crud-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component}/logic/api/to/${variables.entityName}Eto.java.ftl
@@ -0,0 +1 @@
+package test;
\ No newline at end of file
diff --git a/cobigen-cli/cli/src/main/java/com/devonfw/cobigen/cli/commands/AdaptTemplatesCommand.java b/cobigen-cli/cli/src/main/java/com/devonfw/cobigen/cli/commands/AdaptTemplatesCommand.java
index 19f3439a5b..7ceceef9d1 100644
--- a/cobigen-cli/cli/src/main/java/com/devonfw/cobigen/cli/commands/AdaptTemplatesCommand.java
+++ b/cobigen-cli/cli/src/main/java/com/devonfw/cobigen/cli/commands/AdaptTemplatesCommand.java
@@ -1,9 +1,22 @@
 package com.devonfw.cobigen.cli.commands;
 
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.devonfw.cobigen.api.TemplateAdapter;
+import com.devonfw.cobigen.api.exception.TemplateSelectionForAdaptionException;
+import com.devonfw.cobigen.api.exception.UpgradeTemplatesNotificationException;
+import com.devonfw.cobigen.cli.CobiGenCLI;
 import com.devonfw.cobigen.cli.constants.MessagesConstants;
-import com.devonfw.cobigen.impl.CobiGenFactory;
+import com.devonfw.cobigen.cli.utils.ValidationUtils;
+import com.devonfw.cobigen.impl.adapter.TemplateAdapterImpl;
 
 import picocli.CommandLine.Command;
+import picocli.CommandLine.Option;
 
 /**
  * This class handles the user defined template directory e.g. determining and obtaining the latest templates jar,
@@ -12,11 +25,107 @@
 @Command(description = MessagesConstants.ADAPT_TEMPLATES_DESCRIPTION, name = "adapt-templates", aliases = {
 "a" }, mixinStandardHelpOptions = true)
 public class AdaptTemplatesCommand extends CommandCommons {
+  /**
+   * Logger to output useful information to the user
+   */
+  private static Logger LOG = LoggerFactory.getLogger(CobiGenCLI.class);
+
+  /**
+   * If this options is enabled, all templates are extracted.
+   */
+  @Option(names = { "--all" }, description = MessagesConstants.ADAPT_ALL_DESCRIPTION)
+  boolean adaptAll;
+
+  /**
+   * Allows usage of the old monolithic template structure instead of the new template sets structure.
+   */
+  @Option(names = { "--force-monolithic-configuration",
+  "--force-mc" }, description = MessagesConstants.FORCE_MONOLITHIC_CONFIGURATION)
+  boolean forceMonolithicConfiguration;
 
   @Override
   public Integer doAction() throws Exception {
 
-    CobiGenFactory.extractTemplates();
+    TemplateAdapter templateAdapter = new TemplateAdapterImpl(this.templatesProject);
+    try {
+      templateAdapter.adaptTemplates();
+    } catch (UpgradeTemplatesNotificationException e) {
+      if (!this.forceMonolithicConfiguration && askUserToContinueWithUpgrade(e)) {
+        templateAdapter.upgradeMonolithicTemplates(this.templatesProject);
+      }
+    } catch (TemplateSelectionForAdaptionException e) {
+      List<Path> templateJars = e.getTemplateSets();
+      if (!templateJars.isEmpty()) {
+        List<Path> templateJarsToAdapt = getJarsToAdapt(templateAdapter, templateJars);
+        if (!templateJarsToAdapt.isEmpty()) {
+          templateAdapter.adaptTemplateSets(templateJarsToAdapt, false);
+        }
+      } else {
+        LOG.info("No template set jars found to extract.");
+      }
+    }
     return 0;
   }
-}
+
+  /**
+   * Gives the user a selection of available template set jars to adapt.
+   *
+   * @param templateJars A {@link List} with all available template set jars.
+   * @return A {@link List} with the template set jars selected by the user to adapt.
+   */
+  private List<Path> getJarsToAdapt(TemplateAdapter templateAdapter, List<Path> templateJars) {
+
+    List<Path> jarsToAdapt = new ArrayList<>();
+    if (templateJars != null && templateJars.size() > 0) {
+      printJarsForSelection(templateAdapter, templateJars);
+      List<String> userSelection = new ArrayList<>();
+      if (this.adaptAll) {
+        userSelection.add("0");
+      } else {
+        for (String templateSelection : ValidationUtils.getUserInput().split(",")) {
+          userSelection.add(templateSelection);
+        }
+      }
+      if (userSelection.contains("0")) {
+        jarsToAdapt = templateJars;
+      } else {
+        for (String jarSelected : userSelection) {
+          jarsToAdapt.add(templateJars.get(Integer.parseInt(jarSelected) - 1));
+        }
+      }
+    }
+    return jarsToAdapt;
+  }
+
+  /**
+   * Prints the available template set jars
+   *
+   * @param templateSetJarPaths List of {@link Path} to available template jar files
+   */
+  private void printJarsForSelection(TemplateAdapter templateAdapter, List<Path> templateSetJarPaths) {
+
+    LOG.info("(0) " + "All");
+    for (Path templateSetJarPath : templateSetJarPaths) {
+      LOG.info("(" + (templateSetJarPaths.indexOf(templateSetJarPath) + 1) + ") "
+          + templateSetJarPath.getFileName().toString().replace(".jar", "")
+          + (templateAdapter.isTemplateSetAlreadyAdapted(templateSetJarPath) ? " (already adapted)" : ""));
+    }
+    LOG.info("Please enter the number(s) of jar(s) that you want to adapt separated by comma.");
+  }
+
+  /**
+   * Ask the user to continue with the upgrade of the templates.
+   *
+   * @return Returns {@code true} if the user want to continue with the uprade of the templates.
+   */
+  private boolean askUserToContinueWithUpgrade(UpgradeTemplatesNotificationException e) {
+
+    LOG.info(e.getMessage());
+    LOG.info("Type 'y' or 'yes' to upgrade the configuration?");
+    String userInput = ValidationUtils.getUserInput();
+    if (userInput != null && (userInput.toLowerCase().equals("y") || userInput.toLowerCase().equals("yes"))) {
+      return true;
+    }
+    return false;
+  }
+}
\ No newline at end of file
diff --git a/cobigen-cli/cli/src/main/java/com/devonfw/cobigen/cli/commands/CommandCommons.java b/cobigen-cli/cli/src/main/java/com/devonfw/cobigen/cli/commands/CommandCommons.java
index ad9ddba393..1d34aca581 100644
--- a/cobigen-cli/cli/src/main/java/com/devonfw/cobigen/cli/commands/CommandCommons.java
+++ b/cobigen-cli/cli/src/main/java/com/devonfw/cobigen/cli/commands/CommandCommons.java
@@ -26,6 +26,12 @@ public abstract class CommandCommons implements Callable<Integer> {
   @Option(names = { "--templates-project", "-tp" }, description = MessagesConstants.TEMPLATE_PATH_DESCRIPTION)
   Path templatesProject;
 
+  /**
+   * If this option is enabled, the old monolithic templates will be upgraded to the new template-set structure.
+   */
+  @Option(names = { "--upgrade-configuration" }, description = MessagesConstants.UPGRADE_CONFIGURATION_OPTION)
+  boolean upgradeConfiguration;
+
   @Override
   public Integer call() throws Exception {
 
diff --git a/cobigen-cli/cli/src/main/java/com/devonfw/cobigen/cli/commands/GenerateCommand.java b/cobigen-cli/cli/src/main/java/com/devonfw/cobigen/cli/commands/GenerateCommand.java
index 33f0570b0d..1642945634 100644
--- a/cobigen-cli/cli/src/main/java/com/devonfw/cobigen/cli/commands/GenerateCommand.java
+++ b/cobigen-cli/cli/src/main/java/com/devonfw/cobigen/cli/commands/GenerateCommand.java
@@ -23,6 +23,7 @@
 import org.slf4j.LoggerFactory;
 
 import com.devonfw.cobigen.api.CobiGen;
+import com.devonfw.cobigen.api.exception.DeprecatedMonolithicConfigurationException;
 import com.devonfw.cobigen.api.exception.InputReaderException;
 import com.devonfw.cobigen.api.to.GenerableArtifact;
 import com.devonfw.cobigen.api.to.GenerationReportTo;
@@ -36,8 +37,11 @@
 import com.devonfw.cobigen.cli.utils.CobiGenUtils;
 import com.devonfw.cobigen.cli.utils.ParsingUtils;
 import com.devonfw.cobigen.cli.utils.ValidationUtils;
+import com.devonfw.cobigen.impl.CobiGenFactory;
+import com.devonfw.cobigen.impl.config.constant.WikiConstants;
 import com.devonfw.cobigen.impl.util.ConfigurationFinder;
 import com.devonfw.cobigen.impl.util.FileSystemUtil;
+import com.devonfw.cobigen.impl.util.PostponeUtil;
 import com.google.googlejavaformat.java.FormatterException;
 
 import picocli.CommandLine.Command;
@@ -80,6 +84,15 @@ public class GenerateCommand extends CommandCommons {
   @Option(names = { "--templates", "-t" }, split = ",", description = MessagesConstants.TEMPLATES_OPTION_DESCRIPTION)
   List<String> templates = null;
 
+  /**
+   * allows usage of the old monolithic template structure instead of the new template sets structure.
+   *
+   * TODO: Check if still needed, see: https://github.com/devonfw/cobigen/issues/1683
+   */
+  @Option(names = { "--force-monolithic-configuration",
+  "--force-mc" }, description = MessagesConstants.FORCE_MONOLITHIC_CONFIGURATION)
+  boolean forceMonolithicConfiguration;
+
   /**
    * Logger to output useful information to the user
    */
@@ -101,7 +114,11 @@ public Integer doAction() throws Exception {
     }
 
     LOG.debug("Input files and output root path confirmed to be valid.");
-    CobiGen cg = CobiGenUtils.initializeCobiGen(this.templatesProject);
+
+    if ((PostponeUtil.isTimePassed()) && (!this.forceMonolithicConfiguration))
+      checkMonolithicConfigurationException();
+
+    CobiGen cg = CobiGenUtils.initializeCobiGen(this.templatesProject, true);
 
     resolveTemplateDependencies();
 
@@ -118,7 +135,9 @@ public Integer doAction() throws Exception {
             MavenUtil.getProjectRoot(this.inputFiles.get(i), false), inputsAndArtifacts.getB(), cg, IncrementTo.class);
       }
     }
+
     return 0;
+
   }
 
   /**
@@ -177,7 +196,7 @@ private <T extends GenerableArtifact> Tuple<List<Object>, List<T>> preprocess(Co
             "Did not detect the input as part of a maven project, the root directory of the maven project was not found.");
 
         LOG.info("Would you like to take '{}' as a root directory for output generation? \n"
-            + "type yes/y to continue or no/n to cancel (or hit return for yes).", System.getProperty("user.dir"));
+            + MessagesConstants.YES_NO_ANSWER_DESCRIPTION, System.getProperty("user.dir"));
 
         setRootOutputDirectoryWithPrompt();
 
@@ -243,6 +262,73 @@ private void setRootOutputDirectoryWithPrompt() {
 
   }
 
+  /**
+   * Uses default initialization, checks if monolithic templates exist, handles the exception and lets the user decide
+   * if the templates should be upgraded.
+   */
+  private void checkMonolithicConfigurationException() {
+
+    try {
+      CobiGenUtils.initializeCobiGen(this.templatesProject, false);
+    } catch (DeprecatedMonolithicConfigurationException e) {
+      LOG.warn("Found monolithic configuration at: {} {}",
+          DeprecatedMonolithicConfigurationException.getMonolithicConfiguration(), e.getMessage());
+
+      if (this.upgradeConfiguration || askUserToUpgradeTemplates()) {
+        startTemplatesUpgrader();
+      } else {
+        askUserToPostponeUpgrade();
+      }
+    }
+
+  }
+
+  /**
+   * Opens a looping prompt with a yes/no question and upgrades the templates to the newest version.
+   *
+   */
+  private boolean askUserToUpgradeTemplates() {
+
+    LOG.info(
+        "Would you like to upgrade your templates to the newest version? \n"
+            + MessagesConstants.YES_NO_ANSWER_DESCRIPTION + "For more Informations, please visit: ",
+        WikiConstants.WIKI_UPGRADE_MONOLITHIC_CONFIGURATION, System.getProperty("user.dir"));
+
+    return ValidationUtils.yesNoPrompt("Upgrading templates configuration...: ",
+        MessagesConstants.INVALID_YES_NO_ANSWER_DESCRIPTION, "Continue generation with monolithic templates...");
+  }
+
+  /**
+   * Upgrades the given template configuration and sets the new template-set as the templatesProject after the upgrade
+   */
+  private void startTemplatesUpgrader() {
+
+    try {
+      this.templatesProject = CobiGenFactory.startTemplatesUpgrader(this.templatesProject);
+    } catch (Throwable e) {
+      LOG.error("An error occurred while upgrading the templates.");
+      throw e;
+    }
+  }
+
+  /**
+   * Asks the user if he wants to postpone the upgrade message for 30 days.
+   */
+  private void askUserToPostponeUpgrade() {
+
+    LOG.info("Would you like to postpone the upgrade warning message for 30 days?"
+        + MessagesConstants.YES_NO_ANSWER_DESCRIPTION, System.getProperty("user.dir"));
+    // TODO: Check if this message and behavior is still valid, see: https://github.com/devonfw/cobigen/issues/1674
+    boolean setToUserDir = ValidationUtils.yesNoPrompt("A timer is set for 30 days...: ",
+        MessagesConstants.INVALID_YES_NO_ANSWER_DESCRIPTION, "Allright...");
+
+    if (setToUserDir) {
+      PostponeUtil.addATimestampForOneMonth();
+    } else {
+      // Do nothing, the user will be asked again.
+    }
+  }
+
   /**
    * Casting class, from List<subclasses of GenerableArtifact> to List<IncrementTo>
    *
diff --git a/cobigen-cli/cli/src/main/java/com/devonfw/cobigen/cli/constants/MessagesConstants.java b/cobigen-cli/cli/src/main/java/com/devonfw/cobigen/cli/constants/MessagesConstants.java
index 9c63da3f73..9da407a824 100644
--- a/cobigen-cli/cli/src/main/java/com/devonfw/cobigen/cli/constants/MessagesConstants.java
+++ b/cobigen-cli/cli/src/main/java/com/devonfw/cobigen/cli/constants/MessagesConstants.java
@@ -1,5 +1,7 @@
 package com.devonfw.cobigen.cli.constants;
 
+import com.devonfw.cobigen.impl.config.constant.WikiConstants;
+
 /**
  * Messages constants printed to the user
  */
@@ -72,8 +74,35 @@ public class MessagesConstants {
    */
   public static final String ADAPT_TEMPLATES_DESCRIPTION = "Generates a new templates folder next to the cobigen cli";
 
+  /**
+   * Message constant: description of the adapt-templates --all command
+   */
+  public static final String ADAPT_ALL_DESCRIPTION = "If this option is enabled, all templates will get adapted.";
+
   /**
    * Message constant: description of the custom-location option
    */
   public static final String CUSTOM_LOCATION_OPTION_DESCRIPTION = "Custom location where the unpacked templates will be stored.";
+
+  /**
+   * Message constant: description of the --upgrade option
+   */
+  public static final String UPGRADE_CONFIGURATION_OPTION = "Will upgrade the monolithc templates automatically, if enabled.";
+
+  /**
+   * Message constant: description of the generate command with --force-monolithic-templates option
+   */
+  public static final String FORCE_MONOLITHIC_CONFIGURATION = "If this option is enabled, the old monolithic template structure will be used instead of the new template sets structure..Further Information can be found at: "
+      + WikiConstants.WIKI_UPGRADE_MONOLITHIC_CONFIGURATION;
+
+  /**
+   * Message constant: description of the CLI Yes or No answer
+   */
+  public static final String YES_NO_ANSWER_DESCRIPTION = "Type yes/y to continue or no/n to cancel (or hit return for yes). ";
+
+  /**
+   * Message constant: description of the CLI Invalid Yes or No answer
+   */
+  public static final String INVALID_YES_NO_ANSWER_DESCRIPTION = "Invalid input. Please answer yes/n or no/n (or hit return for yes).";
+
 }
diff --git a/cobigen-cli/cli/src/main/java/com/devonfw/cobigen/cli/utils/CobiGenUtils.java b/cobigen-cli/cli/src/main/java/com/devonfw/cobigen/cli/utils/CobiGenUtils.java
index d62b624f88..c4abaf657e 100644
--- a/cobigen-cli/cli/src/main/java/com/devonfw/cobigen/cli/utils/CobiGenUtils.java
+++ b/cobigen-cli/cli/src/main/java/com/devonfw/cobigen/cli/utils/CobiGenUtils.java
@@ -48,18 +48,18 @@ public class CobiGenUtils {
    * Registers CobiGen plug-ins and instantiates CobiGen
    *
    * @param templatesProject the templates project or jar
+   * @param allowMonolithicConfiguration ignores deprecated monolithic template folder structure and if found does not
+   *        throw a DeprecatedMonolithicConfigurationException
    * @return object of CobiGen
    */
-  public static CobiGen initializeCobiGen(Path templatesProject) {
+  public static CobiGen initializeCobiGen(Path templatesProject, boolean allowMonolithicConfiguration) {
 
     registerPlugins();
-    CobiGen cg;
     if (templatesProject != null) {
-      cg = CobiGenFactory.create(templatesProject.toUri());
+      return CobiGenFactory.create(templatesProject.toUri(), allowMonolithicConfiguration);
     } else {
-      cg = CobiGenFactory.create();
+      return CobiGenFactory.create(allowMonolithicConfiguration);
     }
-    return cg;
   }
 
   /**
diff --git a/cobigen-cli/cli/src/main/resources/pom.xml b/cobigen-cli/cli/src/main/resources/pom.xml
index 302f03cac8..bbbefc623e 100644
--- a/cobigen-cli/cli/src/main/resources/pom.xml
+++ b/cobigen-cli/cli/src/main/resources/pom.xml
@@ -56,11 +56,6 @@
       <artifactId>jsonplugin</artifactId>
       <version>${revision}</version>
     </dependency>
-    <dependency>
-      <groupId>com.devonfw.cobigen</groupId>
-      <artifactId>templates-devon4j</artifactId>
-      <version>${revision}</version>
-    </dependency>
   </dependencies>
 
 </project>
\ No newline at end of file
diff --git a/cobigen-cli/pom.xml b/cobigen-cli/pom.xml
index 963f3b1811..422161cea6 100644
--- a/cobigen-cli/pom.xml
+++ b/cobigen-cli/pom.xml
@@ -12,10 +12,6 @@
     <version>${revision}</version>
   </parent>
 
-  <properties>
-    <java.version>11</java.version>
-  </properties>
-
   <modules>
     <module>cli</module>
     <module>cli-systemtest</module>
diff --git a/cobigen-eclipse/cobigen-eclipse-feature/.project b/cobigen-eclipse/cobigen-eclipse-feature/.project
deleted file mode 100644
index 7a6654cc23..0000000000
--- a/cobigen-eclipse/cobigen-eclipse-feature/.project
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>cobigen-eclipse-feature</name>
-	<comment></comment>
-	<projects>
-		<project>cobigen-eclipse</project>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-	<filteredResources>
-		<filter>
-			<id>1664574669497</id>
-			<name></name>
-			<type>30</type>
-			<matcher>
-				<id>org.eclipse.core.resources.regexFilterMatcher</id>
-				<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
-			</matcher>
-		</filter>
-	</filteredResources>
-</projectDescription>
diff --git a/cobigen-eclipse/cobigen-eclipse-test/.project b/cobigen-eclipse/cobigen-eclipse-test/.project
deleted file mode 100644
index 7c40ecd24c..0000000000
--- a/cobigen-eclipse/cobigen-eclipse-test/.project
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>cobigen-eclipse-test</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-	<filteredResources>
-		<filter>
-			<id>1664574669506</id>
-			<name></name>
-			<type>30</type>
-			<matcher>
-				<id>org.eclipse.core.resources.regexFilterMatcher</id>
-				<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
-			</matcher>
-		</filter>
-	</filteredResources>
-</projectDescription>
diff --git a/cobigen-eclipse/cobigen-eclipse-test/META-INF/MANIFEST.MF b/cobigen-eclipse/cobigen-eclipse-test/META-INF/MANIFEST.MF
index ec983cf6f9..8fb8869f36 100644
--- a/cobigen-eclipse/cobigen-eclipse-test/META-INF/MANIFEST.MF
+++ b/cobigen-eclipse/cobigen-eclipse-test/META-INF/MANIFEST.MF
@@ -4,34 +4,77 @@ Bundle-Name: CobiGen Eclipse Plug-In Tests
 Bundle-SymbolicName: com.devonfw.cobigen.eclipse.test;singleton:=true
 Bundle-Version: 2021.12.007.qualifier
 Bundle-Vendor: devonfw
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .,
+ lib/annotations.jar,
+ lib/ant.jar,
+ lib/ant-nodeps.jar,
  lib/assertj-core.jar,
+ lib/awaitility.jar,
+ lib/byte-buddy.jar,
+ lib/byte-buddy-agent.jar,
  lib/checker-qual.jar,
+ lib/com.devonfw.cobigen.eclipse.feature.jar,
+ lib/com.devonfw.cobigen.eclipse.jar,
+ lib/commons-compiler.jar,
+ lib/commons-compress.jar,
+ lib/commons-io.jar,
+ lib/commons-jxpath.jar,
  lib/commons-lang3.jar,
+ lib/core.jar,
  lib/core-api.jar,
+ lib/core-externalprocess-api.jar,
  lib/core-test.jar,
  lib/error_prone_annotations.jar,
  lib/failureaccess.jar,
+ lib/gson.jar,
  lib/guava.jar,
+ lib/hamcrest.jar,
  lib/hamcrest-core.jar,
+ lib/istack-commons-runtime.jar,
  lib/j2objc-annotations.jar,
+ lib/jackson-annotations.jar,
+ lib/jackson-core.jar,
+ lib/jackson-databind.jar,
+ lib/jakarta.activation.jar,
+ lib/jakarta.xml.bind-api.jar,
+ lib/janino.jar,
+ lib/javaplugin-model.jar,
+ lib/java-sizeof.jar,
+ lib/javassist.jar,
+ lib/javax.inject.jar,
+ lib/jaxb-core.jar,
+ lib/jaxb-impl.jar,
+ lib/jaxen.jar,
  lib/jcl-over-slf4j.jar,
  lib/jsr305.jar,
  lib/junit.jar,
+ lib/kotlin-stdlib.jar,
+ lib/kotlin-stdlib-common.jar,
+ lib/kotlin-stdlib-jdk7.jar,
+ lib/kotlin-stdlib-jdk8.jar,
  lib/listenablefuture.jar,
  lib/log4j-over-slf4j.jar,
  lib/logback-classic.jar,
  lib/logback-core.jar,
+ lib/maven-model.jar,
+ lib/mmm-base.jar,
  lib/mockito-core.jar,
  lib/objenesis.jar,
+ lib/okhttp.jar,
+ lib/okio.jar,
+ lib/okio-jvm.jar,
+ lib/orika-core.jar,
+ lib/paranamer.jar,
+ lib/plexus-cipher.jar,
+ lib/plexus-sec-dispatcher.jar,
+ lib/plexus-utils.jar,
  lib/slf4j-api.jar,
  lib/system-lambda.jar,
+ lib/txw2.jar,
  lib/xmlunit.jar,
- lib/zt-exec.jar,
- lib/awaitility.jar,
- lib/hamcrest.jar
+ lib/zt-exec.jar
 Require-Bundle: org.eclipse.swtbot.junit4_x;bundle-version="2.4.0",
  org.junit;bundle-version="4.12.0",
  org.eclipse.ui,
@@ -47,4 +90,5 @@ Require-Bundle: org.eclipse.swtbot.junit4_x;bundle-version="2.4.0",
  org.apache.commons.io;bundle-version="2.2.0",
  org.eclipse.m2e.core.ui;bundle-version="1.6.0",
  org.eclipse.m2e.core;bundle-version="1.6.0",
- com.devonfw.cobigen.eclipse
+ com.devonfw.cobigen.eclipse,
+ org.eclipse.swtbot.swt.finder
diff --git a/cobigen-eclipse/cobigen-eclipse-test/build.properties b/cobigen-eclipse/cobigen-eclipse-test/build.properties
index 1943f55c16..fdd1aba796 100644
--- a/cobigen-eclipse/cobigen-eclipse-test/build.properties
+++ b/cobigen-eclipse/cobigen-eclipse-test/build.properties
@@ -3,28 +3,71 @@ source.. = src/main/java/
 bin.includes = .,\
                META-INF/,\
                plugin.xml,\
+               lib/annotations.jar,\
+               lib/ant.jar,\
+               lib/ant-nodeps.jar,\
                lib/assertj-core.jar,\
+               lib/awaitility.jar,\
+               lib/byte-buddy.jar,\
+               lib/byte-buddy-agent.jar,\
                lib/checker-qual.jar,\
+               lib/com.devonfw.cobigen.eclipse.feature.jar,\
+               lib/com.devonfw.cobigen.eclipse.jar,\
+               lib/commons-compiler.jar,\
+               lib/commons-compress.jar,\
+               lib/commons-io.jar,\
+               lib/commons-jxpath.jar,\
                lib/commons-lang3.jar,\
+               lib/core.jar,\
                lib/core-api.jar,\
+               lib/core-externalprocess-api.jar,\
                lib/core-test.jar,\
                lib/error_prone_annotations.jar,\
                lib/failureaccess.jar,\
+               lib/gson.jar,\
                lib/guava.jar,\
+               lib/hamcrest.jar,\
                lib/hamcrest-core.jar,\
+               lib/istack-commons-runtime.jar,\
                lib/j2objc-annotations.jar,\
+               lib/jackson-annotations.jar,\
+               lib/jackson-core.jar,\
+               lib/jackson-databind.jar,\
+               lib/jakarta.activation.jar,\
+               lib/jakarta.xml.bind-api.jar,\
+               lib/janino.jar,\
+               lib/javaplugin-model.jar,\
+               lib/java-sizeof.jar,\
+               lib/javassist.jar,\
+               lib/javax.inject.jar,\
+               lib/jaxb-core.jar,\
+               lib/jaxb-impl.jar,\
+               lib/jaxen.jar,\
                lib/jcl-over-slf4j.jar,\
                lib/jsr305.jar,\
                lib/junit.jar,\
+               lib/kotlin-stdlib.jar,\
+               lib/kotlin-stdlib-common.jar,\
+               lib/kotlin-stdlib-jdk7.jar,\
+               lib/kotlin-stdlib-jdk8.jar,\
                lib/listenablefuture.jar,\
                lib/log4j-over-slf4j.jar,\
                lib/logback-classic.jar,\
                lib/logback-core.jar,\
+               lib/maven-model.jar,\
+               lib/mmm-base.jar,\
                lib/mockito-core.jar,\
                lib/objenesis.jar,\
+               lib/okhttp.jar,\
+               lib/okio.jar,\
+               lib/okio-jvm.jar,\
+               lib/orika-core.jar,\
+               lib/paranamer.jar,\
+               lib/plexus-cipher.jar,\
+               lib/plexus-sec-dispatcher.jar,\
+               lib/plexus-utils.jar,\
                lib/slf4j-api.jar,\
                lib/system-lambda.jar,\
+               lib/txw2.jar,\
                lib/xmlunit.jar,\
-               lib/zt-exec.jar,\
-               lib/awaitility.jar,\
-               lib/hamcrest.jar
+               lib/zt-exec.jar
diff --git a/cobigen-eclipse/cobigen-eclipse-test/pom.xml b/cobigen-eclipse/cobigen-eclipse-test/pom.xml
index 7b1ac73625..8fc4f9cf42 100644
--- a/cobigen-eclipse/cobigen-eclipse-test/pom.xml
+++ b/cobigen-eclipse/cobigen-eclipse-test/pom.xml
@@ -188,15 +188,54 @@
           <url>http://download.eclipse.org/technology/swtbot/releases/latest/</url>
           <layout>p2</layout>
         </repository>
-      </repositories>
-    </profile>
-    <!-- see http://download.eclipse.org/tools/orbit/downloads/ for upgrades -->
-    <profile>
-      <id>p2-build-photon</id>
-      <repositories>
         <repository>
-          <id>eclipse-photon-sr2-test</id>
-          <url>http://download.eclipse.org/tools/orbit/downloads/drops/R20180606145124/repository/</url>
+          <id>htmlplugin</id>
+          <url>file:///${maven.multiModuleProjectDirectory}/cobigen-plugins/cobigen-htmlplugin/target/repository</url>
+          <layout>p2</layout>
+        </repository>
+        <repository>
+          <id>javaplugin</id>
+          <url>file:///${maven.multiModuleProjectDirectory}/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/target/repository</url>
+          <layout>p2</layout>
+        </repository>
+        <repository>
+          <id>jsonplugin</id>
+          <url>file:///${maven.multiModuleProjectDirectory}/cobigen-plugins/cobigen-jsonplugin/target/repository</url>
+          <layout>p2</layout>
+        </repository>
+        <repository>
+          <id>openapiplugin</id>
+          <url>file:///${maven.multiModuleProjectDirectory}/cobigen-plugins/cobigen-openapiplugin-parent/cobigen-openapiplugin/target/repository</url>
+          <layout>p2</layout>
+        </repository>
+        <repository>
+          <id>propertyplugin</id>
+          <url>file:///${maven.multiModuleProjectDirectory}/cobigen-plugins/cobigen-propertyplugin/target/repository</url>
+          <layout>p2</layout>
+        </repository>
+        <repository>
+          <id>freemarker</id>
+          <url>file:///${maven.multiModuleProjectDirectory}/cobigen-plugins/cobigen-templateengines/cobigen-tempeng-freemarker/target/repository</url>
+          <layout>p2</layout>
+        </repository>
+        <repository>
+          <id>velocity</id>
+          <url>file:///${maven.multiModuleProjectDirectory}/cobigen-plugins/cobigen-templateengines/cobigen-tempeng-velocity/target/repository</url>
+          <layout>p2</layout>
+        </repository>
+        <repository>
+          <id>textmerger</id>
+          <url>file:///${maven.multiModuleProjectDirectory}/cobigen-plugins/cobigen-textmerger/target/repository</url>
+          <layout>p2</layout>
+        </repository>
+        <repository>
+          <id>tsplugin</id>
+          <url>file:///${maven.multiModuleProjectDirectory}/cobigen-plugins/cobigen-tsplugin/target/repository</url>
+          <layout>p2</layout>
+        </repository>
+        <repository>
+          <id>xmlplugin</id>
+          <url>file:///${maven.multiModuleProjectDirectory}/cobigen-plugins/cobigen-xmlplugin/target/repository</url>
           <layout>p2</layout>
         </repository>
       </repositories>
diff --git a/cobigen-eclipse/cobigen-eclipse-test/src/main/java/com/devonfw/cobigen/eclipse/test/AdaptTemplatesTest.java b/cobigen-eclipse/cobigen-eclipse-test/src/main/java/com/devonfw/cobigen/eclipse/test/AdaptTemplatesTest.java
index 92a0ace483..7536ade8d6 100644
--- a/cobigen-eclipse/cobigen-eclipse-test/src/main/java/com/devonfw/cobigen/eclipse/test/AdaptTemplatesTest.java
+++ b/cobigen-eclipse/cobigen-eclipse-test/src/main/java/com/devonfw/cobigen/eclipse/test/AdaptTemplatesTest.java
@@ -20,6 +20,8 @@
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 
+import com.devonfw.cobigen.api.util.CobiGenPaths;
+import com.devonfw.cobigen.api.util.TemplatesJarUtil;
 import com.devonfw.cobigen.eclipse.common.constants.external.ResourceConstants;
 import com.devonfw.cobigen.eclipse.test.common.SystemTest;
 import com.devonfw.cobigen.eclipse.test.common.swtbot.AllJobsAreFinished;
@@ -68,7 +70,17 @@ public void testBasicOpenAPIGenerationWithAdaptTemplates() throws Exception {
     project.getProject().refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
     this.tmpMavenProjectRule.updateProject();
 
-    EclipseCobiGenUtils.runAndCaptureUpdateTemplates(bot);
+    // retrieve CobiGen home directory (overwritten through environment variables)
+    File templatesDirectory = CobiGenPaths.getTemplatesFolderPath().toFile();
+
+    // create templates directory as this should be present in this scenario
+    this.tempFolder.newFolder("playground", "project", "templates");
+
+    // download latest monolithic templates to simulate existing template jars
+    TemplatesJarUtil.downloadLatestDevon4jTemplates(true, templatesDirectory);
+    TemplatesJarUtil.downloadLatestDevon4jTemplates(false, templatesDirectory);
+
+    // adapt template jars into CobiGen_Templates project
     EclipseCobiGenUtils.runAndCaptureAdaptTemplates(bot);
     EclipseUtils.updateMavenProject(bot, ResourceConstants.CONFIG_PROJECT_NAME);
 
@@ -80,7 +92,8 @@ public void testBasicOpenAPIGenerationWithAdaptTemplates() throws Exception {
     javaClassItem.select();
 
     // execute CobiGen
-    EclipseCobiGenUtils.processCobiGen(bot, javaClassItem, 25000, "CRUD devon4j Server>CRUD REST services");
+    EclipseCobiGenUtils.processCobiGenAndPostponeUpgrade(bot, javaClassItem, "CRUD devon4j Server>CRUD REST services");
+
     bot.waitUntil(new AllJobsAreFinished(), 10000);
     // increase timeout as the openAPI parser is slow on initialization
     EclipseCobiGenUtils.confirmSuccessfullGeneration(bot, 40000);
@@ -91,6 +104,7 @@ public void testBasicOpenAPIGenerationWithAdaptTemplates() throws Exception {
         "src/main/java/com/devonfw/test/sampledatamanagement/service/impl/rest/SampledatamanagementRestServiceImpl.java");
 
     assertThat(generationResult.exists()).isTrue();
+
   }
 
   /**
diff --git a/cobigen-eclipse/cobigen-eclipse-test/src/main/java/com/devonfw/cobigen/eclipse/test/ClassPathLoadingTest.java b/cobigen-eclipse/cobigen-eclipse-test/src/main/java/com/devonfw/cobigen/eclipse/test/ClassPathLoadingTest.java
index 8de12cedb7..a4e0e9408b 100644
--- a/cobigen-eclipse/cobigen-eclipse-test/src/main/java/com/devonfw/cobigen/eclipse/test/ClassPathLoadingTest.java
+++ b/cobigen-eclipse/cobigen-eclipse-test/src/main/java/com/devonfw/cobigen/eclipse/test/ClassPathLoadingTest.java
@@ -81,7 +81,7 @@ public void testPreventClassPathShading() throws Exception {
     javaClassItem.select();
 
     // execute CobiGen
-    EclipseCobiGenUtils.processCobiGen(bot, javaClassItem, "increment1");
+    EclipseCobiGenUtils.processCobiGenAndPostponeUpgrade(bot, javaClassItem, "increment1");
     EclipseCobiGenUtils.confirmSuccessfullGeneration(bot);
 
     // check assertions
@@ -129,7 +129,7 @@ public void testClassPathResolutionOnInput_dependsOnMavenDependency() throws Exc
     javaClassItem.select();
 
     // execute CobiGen
-    EclipseCobiGenUtils.processCobiGen(bot, javaClassItem, "increment1");
+    EclipseCobiGenUtils.processCobiGenAndPostponeUpgrade(bot, javaClassItem, "increment1");
     EclipseCobiGenUtils.confirmSuccessfullGeneration(bot);
 
     // check assertions
@@ -173,7 +173,7 @@ public void testClassPathResolutionOnInput_dependsOnMavenProject() throws Except
     javaClassItem.select();
 
     // execute CobiGen
-    EclipseCobiGenUtils.processCobiGen(bot, javaClassItem, "increment1");
+    EclipseCobiGenUtils.processCobiGenAndPostponeUpgrade(bot, javaClassItem, "increment1");
     EclipseCobiGenUtils.confirmSuccessfullGeneration(bot);
 
     // check assertions
@@ -205,7 +205,7 @@ public void testClassloadingOfTemplateDependencies() throws Exception {
     javaClassItem.select();
 
     // execute CobiGen
-    EclipseCobiGenUtils.processCobiGen(bot, javaClassItem, "increment2");
+    EclipseCobiGenUtils.processCobiGenAndPostponeUpgrade(bot, javaClassItem, "increment2");
     EclipseCobiGenUtils.confirmSuccessfullGeneration(bot);
 
     // check assertions
@@ -246,7 +246,7 @@ public void testDotPathAcception() throws Exception {
     javaClassItem.select();
 
     // execute CobiGen
-    EclipseCobiGenUtils.processCobiGen(bot, javaClassItem, "increment3");
+    EclipseCobiGenUtils.processCobiGenAndPostponeUpgrade(bot, javaClassItem, "increment3");
     EclipseCobiGenUtils.confirmSuccessfullGeneration(bot);
 
     // check assertions
diff --git a/cobigen-eclipse/cobigen-eclipse-test/src/main/java/com/devonfw/cobigen/eclipse/test/CobigenJavaWrapperTest.java b/cobigen-eclipse/cobigen-eclipse-test/src/main/java/com/devonfw/cobigen/eclipse/test/CobigenJavaWrapperTest.java
index a07008e8e4..84e97bbc1b 100644
--- a/cobigen-eclipse/cobigen-eclipse-test/src/main/java/com/devonfw/cobigen/eclipse/test/CobigenJavaWrapperTest.java
+++ b/cobigen-eclipse/cobigen-eclipse-test/src/main/java/com/devonfw/cobigen/eclipse/test/CobigenJavaWrapperTest.java
@@ -67,7 +67,7 @@ public void testWorkspaceExternalProjectAsInput() throws Exception {
     javaClassItem.select();
 
     // execute CobiGen
-    EclipseCobiGenUtils.processCobiGen(bot, javaClassItem, "increment2");
+    EclipseCobiGenUtils.processCobiGenAndPostponeUpgrade(bot, javaClassItem, "increment2");
     EclipseCobiGenUtils.confirmSuccessfullGeneration(bot);
 
     // check assertions
@@ -100,7 +100,7 @@ public void testPathInvariants() throws Exception {
     javaClassItem.select();
 
     // execute CobiGen
-    EclipseCobiGenUtils.processCobiGen(bot, javaClassItem, "increment3");
+    EclipseCobiGenUtils.processCobiGenAndPostponeUpgrade(bot, javaClassItem, "increment3");
     EclipseCobiGenUtils.confirmSuccessfullGeneration(bot);
 
     // check assertions
@@ -132,7 +132,7 @@ public void testPackageAsInputForGeneration() throws Exception {
     javaClassItem.select();
 
     // execute CobiGen
-    EclipseCobiGenUtils.processCobiGen(bot, javaClassItem, "increment1");
+    EclipseCobiGenUtils.processCobiGenAndPostponeUpgrade(bot, javaClassItem, "increment1");
     EclipseCobiGenUtils.confirmSuccessfullGeneration(bot);
 
     // check assertions
diff --git a/cobigen-eclipse/cobigen-eclipse-test/src/main/java/com/devonfw/cobigen/eclipse/test/HealthCheckTest.java b/cobigen-eclipse/cobigen-eclipse-test/src/main/java/com/devonfw/cobigen/eclipse/test/HealthCheckTest.java
index a116c5f471..f885d282ff 100644
--- a/cobigen-eclipse/cobigen-eclipse-test/src/main/java/com/devonfw/cobigen/eclipse/test/HealthCheckTest.java
+++ b/cobigen-eclipse/cobigen-eclipse-test/src/main/java/com/devonfw/cobigen/eclipse/test/HealthCheckTest.java
@@ -46,6 +46,8 @@ public void testHealthCheckIfTemplateProjecNotCopiedIntoWS() throws Exception {
     EclipseUtils.importExistingGeneralProject(bot, tmpFolder.getAbsolutePath(), false);
     EclipseUtils.updateMavenProject(bot, ResourceConstants.CONFIG_PROJECT_NAME);
 
-    EclipseCobiGenUtils.runAndCaptureHealthCheck(bot);
+    EclipseCobiGenUtils.runAndCaptureHealthCheckWithMonolithicConfiguration(bot);
   }
+
+  // TODO: Add a health check test for new template sets, see: https://github.com/devonfw/cobigen/issues/1648
 }
diff --git a/cobigen-eclipse/cobigen-eclipse-test/src/main/java/com/devonfw/cobigen/eclipse/test/MultipleMatchingTriggerTest.java b/cobigen-eclipse/cobigen-eclipse-test/src/main/java/com/devonfw/cobigen/eclipse/test/MultipleMatchingTriggerTest.java
index 37c06e06d8..0a5a24576c 100644
--- a/cobigen-eclipse/cobigen-eclipse-test/src/main/java/com/devonfw/cobigen/eclipse/test/MultipleMatchingTriggerTest.java
+++ b/cobigen-eclipse/cobigen-eclipse-test/src/main/java/com/devonfw/cobigen/eclipse/test/MultipleMatchingTriggerTest.java
@@ -67,7 +67,7 @@ public void testMutlipleTemplates_differentTrigger_samePath() throws Exception {
     javaClassItem.select();
 
     // execute CobiGen
-    EclipseCobiGenUtils.processCobiGen(bot, javaClassItem, "increment1", "increment2");
+    EclipseCobiGenUtils.processCobiGenAndPostponeUpgrade(bot, javaClassItem, "increment1", "increment2");
     EclipseCobiGenUtils.confirmSuccessfullGeneration(bot);
 
     // check assertions
diff --git a/cobigen-eclipse/cobigen-eclipse-test/src/main/java/com/devonfw/cobigen/eclipse/test/OpenAPITest.java b/cobigen-eclipse/cobigen-eclipse-test/src/main/java/com/devonfw/cobigen/eclipse/test/OpenAPITest.java
index fd594e1d15..777640ef6c 100644
--- a/cobigen-eclipse/cobigen-eclipse-test/src/main/java/com/devonfw/cobigen/eclipse/test/OpenAPITest.java
+++ b/cobigen-eclipse/cobigen-eclipse-test/src/main/java/com/devonfw/cobigen/eclipse/test/OpenAPITest.java
@@ -29,6 +29,8 @@
 
 /**
  * General Eclipse Plug-in Tests.
+ *
+ * TODO: Create a copy of this test class for template sets using a regular generate (without upgrade or postpone)
  */
 @RunWith(SWTBotJunit4ClassRunner.class)
 public class OpenAPITest extends SystemTest {
@@ -69,7 +71,7 @@ public void testBasicOpenAPIGeneration() throws Exception {
     project.getProject().refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
     this.tmpMavenProjectRule.updateProject();
 
-    EclipseCobiGenUtils.runAndCaptureHealthCheck(bot);
+    EclipseCobiGenUtils.runAndCaptureHealthCheckWithMonolithicConfiguration(bot);
     EclipseUtils.openErrorsTreeInProblemsView(bot);
 
     // expand the new file in the package explorer
@@ -78,9 +80,9 @@ public void testBasicOpenAPIGeneration() throws Exception {
     javaClassItem.select();
 
     // execute CobiGen
-    EclipseCobiGenUtils.processCobiGen(bot, javaClassItem, "CRUD REST services");
+    EclipseCobiGenUtils.processCobiGenAndPostponeUpgrade(bot, javaClassItem, "CRUD REST services");
     // increase timeout as the openAPI parser is slow on initialization
-    EclipseCobiGenUtils.confirmSuccessfullGeneration(bot, 40000);
+    EclipseCobiGenUtils.confirmSuccessfullGeneration(bot, 120000);
 
     // check assertions
     bot.waitUntil(new AllJobsAreFinished(), 10000);
@@ -149,7 +151,7 @@ public void testServiceBasedOpenAPIGeneration() throws Exception {
     project.getProject().refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
     this.tmpMavenProjectRule.updateProject();
 
-    EclipseCobiGenUtils.runAndCaptureHealthCheck(bot);
+    EclipseCobiGenUtils.runAndCaptureHealthCheckWithMonolithicConfiguration(bot);
     EclipseUtils.openErrorsTreeInProblemsView(bot);
 
     // expand the new file in the package explorer
@@ -158,7 +160,7 @@ public void testServiceBasedOpenAPIGeneration() throws Exception {
     javaClassItem.select();
 
     // execute CobiGen
-    EclipseCobiGenUtils.processCobiGen(bot, javaClassItem, "View Component");
+    EclipseCobiGenUtils.processCobiGenAndPostponeUpgrade(bot, javaClassItem, "View Component");
     // increase timeout as the openAPI parser is slow on initialization
     EclipseCobiGenUtils.confirmSuccessfullGeneration(bot, 40000);
 
@@ -218,7 +220,7 @@ public void testRegexBasedOpenAPIGeneration() throws Exception {
     project.getProject().refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
     this.tmpMavenProjectRule.updateProject();
 
-    EclipseCobiGenUtils.runAndCaptureHealthCheck(bot);
+    EclipseCobiGenUtils.runAndCaptureHealthCheckWithMonolithicConfiguration(bot);
     EclipseUtils.openErrorsTreeInProblemsView(bot);
     // expand the new file in the package explorer
     SWTBotView view = bot.viewById(JavaUI.ID_PACKAGES);
@@ -226,7 +228,7 @@ public void testRegexBasedOpenAPIGeneration() throws Exception {
     javaClassItem.select();
 
     // execute CobiGen
-    EclipseCobiGenUtils.processCobiGen(bot, javaClassItem, "generate a file for every Entity");
+    EclipseCobiGenUtils.processCobiGenAndPostponeUpgrade(bot, javaClassItem, "generate a file for every Entity");
     // increase timeout as the openAPI parser is slow on initialization
     EclipseCobiGenUtils.confirmSuccessfullGeneration(bot, 40000);
 
diff --git a/cobigen-eclipse/cobigen-eclipse-test/src/main/java/com/devonfw/cobigen/eclipse/test/UpgradeMonolithicTemplatesTest.java b/cobigen-eclipse/cobigen-eclipse-test/src/main/java/com/devonfw/cobigen/eclipse/test/UpgradeMonolithicTemplatesTest.java
new file mode 100644
index 0000000000..255b93282d
--- /dev/null
+++ b/cobigen-eclipse/cobigen-eclipse-test/src/main/java/com/devonfw/cobigen/eclipse/test/UpgradeMonolithicTemplatesTest.java
@@ -0,0 +1,103 @@
+package com.devonfw.cobigen.eclipse.test;
+
+import static com.github.stefanbirkner.systemlambda.SystemLambda.withEnvironmentVariable;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.File;
+import java.nio.file.Path;
+
+import org.apache.commons.io.FileUtils;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.ui.JavaUI;
+import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotView;
+import org.eclipse.swtbot.swt.finder.junit.SWTBotJunit4ClassRunner;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
+import org.junit.BeforeClass;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import com.devonfw.cobigen.api.constants.ConfigurationConstants;
+import com.devonfw.cobigen.eclipse.common.constants.external.ResourceConstants;
+import com.devonfw.cobigen.eclipse.common.tools.ResourcesPluginUtil;
+import com.devonfw.cobigen.eclipse.test.common.SystemTest;
+import com.devonfw.cobigen.eclipse.test.common.swtbot.AllJobsAreFinished;
+import com.devonfw.cobigen.eclipse.test.common.utils.EclipseCobiGenUtils;
+import com.devonfw.cobigen.eclipse.test.common.utils.EclipseUtils;
+
+/**
+ * Test the upgrader in core and generates from the new template-set
+ *
+ */
+@Ignore // TODO: re-enable when upgrader was implemented, see: https://github.com/devonfw/cobigen/issues/1595
+@RunWith(SWTBotJunit4ClassRunner.class)
+public class UpgradeMonolithicTemplatesTest extends SystemTest {
+
+  /** Root path of the Test Resources */
+  private static final String resourcesRootPath = "src/main/resources/UpgradeMonolithicTemplatesTest/";
+
+  /** Current home directory */
+  protected Path currentHome;
+
+  /**
+   * Setup workbench appropriately for tests
+   *
+   * @throws Exception test fails
+   */
+  @BeforeClass
+  public static void setupClass() throws Exception {
+
+    EclipseUtils.cleanWorkspace(bot, true);
+    // import the configuration project for this test
+    EclipseUtils.importExistingGeneralProject(bot,
+        new File(resourcesRootPath + "templates/CobiGen_Templates").getAbsolutePath());
+    EclipseUtils.updateMavenProject(bot, ResourceConstants.CONFIG_PROJECT_NAME);
+
+  }
+
+  /**
+   * Tests if the Upgrader will work properly and generate after that
+   *
+   * Setup home path for cobigen to isolate the test (withEnvironmentVariable)
+   *
+   * @throws Exception Test fails
+   */
+  @Test
+  public void testUpgradeAndGenerateFromTemplateSet() throws Exception {
+
+    this.currentHome = this.tmpFolderRule.newFolder("cobigen-test-home").toPath();
+    withEnvironmentVariable(ConfigurationConstants.CONFIG_ENV_HOME, this.currentHome.toString()).execute(() -> {
+
+      // create a new temporary java project and copy java class used as an input for CobiGen
+      String testProjectName = "TestInputProj";
+      IJavaProject project = this.tmpMavenProjectRule.createProject(testProjectName);
+      FileUtils.copyFile(new File(resourcesRootPath + "input/test.yml"),
+          project.getUnderlyingResource().getLocation().append("src/main/java/main/test.yml").toFile());
+      project.getProject().refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
+      this.tmpMavenProjectRule.updateProject();
+
+      // expand the new file in the package explorer
+      SWTBotView view = bot.viewById(JavaUI.ID_PACKAGES);
+      SWTBotTreeItem javaClassItem = view.bot().tree().expandNode(testProjectName, "src/main/java", "main", "test.yml");
+      javaClassItem.select();
+
+      // execute CobiGen
+      EclipseCobiGenUtils.processCobiGenAndUpgrade(bot, javaClassItem, "All");
+
+      EclipseCobiGenUtils.confirmSuccessfullGeneration(bot, 40000);
+
+      // check assertions
+      bot.waitUntil(new AllJobsAreFinished(), 10000);
+
+      IFile generationResult = project.getProject().getFile("src/environments/environment.ts");
+      assertThat(generationResult.exists()).isTrue();
+    });
+    FileUtils.deleteDirectory(this.currentHome.toFile());
+    // Set to null to to run all eclipse tests after the upgrade
+    ResourcesPluginUtil.setTemplateSetPathAfterUpgrade(null);
+
+  }
+}
diff --git a/cobigen-eclipse/cobigen-eclipse-test/src/main/java/com/devonfw/cobigen/eclipse/test/VelocityGenerationTest.java b/cobigen-eclipse/cobigen-eclipse-test/src/main/java/com/devonfw/cobigen/eclipse/test/VelocityGenerationTest.java
index 9918b61c47..15c065c1dc 100644
--- a/cobigen-eclipse/cobigen-eclipse-test/src/main/java/com/devonfw/cobigen/eclipse/test/VelocityGenerationTest.java
+++ b/cobigen-eclipse/cobigen-eclipse-test/src/main/java/com/devonfw/cobigen/eclipse/test/VelocityGenerationTest.java
@@ -45,6 +45,8 @@ public static void setupClass() throws Exception {
   /**
    * Tests a simple generation using velocity template engine.
    *
+   * TODO: add same test for template sets using regular generate
+   *
    * @throws Exception test fails
    */
   @Test
@@ -63,7 +65,7 @@ public void simpleVelocityBasedGeneration() throws Exception {
     javaClassItem.select();
 
     // execute CobiGen
-    EclipseCobiGenUtils.processCobiGen(bot, javaClassItem, "Velocity Test");
+    EclipseCobiGenUtils.processCobiGenAndPostponeUpgrade(bot, javaClassItem, "Velocity Test");
     EclipseCobiGenUtils.confirmSuccessfullGeneration(bot);
 
     // check assertions
diff --git a/cobigen-eclipse/cobigen-eclipse-test/src/main/java/com/devonfw/cobigen/eclipse/test/common/SystemTest.java b/cobigen-eclipse/cobigen-eclipse-test/src/main/java/com/devonfw/cobigen/eclipse/test/common/SystemTest.java
index dd5cd84027..bc131f67a5 100644
--- a/cobigen-eclipse/cobigen-eclipse-test/src/main/java/com/devonfw/cobigen/eclipse/test/common/SystemTest.java
+++ b/cobigen-eclipse/cobigen-eclipse-test/src/main/java/com/devonfw/cobigen/eclipse/test/common/SystemTest.java
@@ -19,7 +19,6 @@
 import org.slf4j.LoggerFactory;
 
 import com.devonfw.cobigen.eclipse.test.common.junit.TmpMavenProjectRule;
-import com.devonfw.cobigen.eclipse.test.common.swtbot.AllJobsAreFinished;
 import com.devonfw.cobigen.eclipse.test.common.utils.EclipseCobiGenUtils;
 import com.devonfw.cobigen.eclipse.test.common.utils.EclipseUtils;
 
@@ -74,7 +73,6 @@ protected void finished(Description description) {
   public static void setupTest() throws Exception {
 
     bot.resetWorkbench();
-    bot.waitUntil(new AllJobsAreFinished());
 
     // this flag is set to be true and will suppress ErrorDialogs,
     // which is completely strange, so we enable them again.
diff --git a/cobigen-eclipse/cobigen-eclipse-test/src/main/java/com/devonfw/cobigen/eclipse/test/common/junit/TmpMavenProjectRule.java b/cobigen-eclipse/cobigen-eclipse-test/src/main/java/com/devonfw/cobigen/eclipse/test/common/junit/TmpMavenProjectRule.java
index 976e111a46..bb71e3b78e 100644
--- a/cobigen-eclipse/cobigen-eclipse-test/src/main/java/com/devonfw/cobigen/eclipse/test/common/junit/TmpMavenProjectRule.java
+++ b/cobigen-eclipse/cobigen-eclipse-test/src/main/java/com/devonfw/cobigen/eclipse/test/common/junit/TmpMavenProjectRule.java
@@ -2,6 +2,10 @@
 
 import java.io.ByteArrayInputStream;
 import java.io.File;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.util.Arrays;
+import java.util.Collection;
 import java.util.Random;
 
 import org.eclipse.core.resources.IFile;
@@ -20,6 +24,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.devonfw.cobigen.api.exception.CobiGenRuntimeException;
+
 /**
  * JUnit Rule for a temporary {@link IJavaProject}. Should be created in each test method by createProject when it
  * should be used.
@@ -35,7 +41,9 @@ public class TmpMavenProjectRule extends ExternalResource {
    */
   private IJavaProject javaProject;
 
-  /** Maven Project specification containing group id, artifact id, and version as a pom xml description */
+  /**
+   * Maven Project specification containing group id, artifact id, and version as a pom xml description
+   */
   private String mvnProjectSpecification;
 
   @Override
@@ -113,8 +121,29 @@ public void updateProject() throws CoreException {
     // make sure the contents are synchronized
     this.javaProject.getProject().refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
     // update maven project to implicitly set classpath and so on.
-    new UpdateMavenProjectJob(new IProject[] { this.javaProject.getProject() })
-        .runInWorkspace(new NullProgressMonitor());
+
+    // Need to access internal (fragile) API of M2E as command
+    // "org.eclipse.m2e.core.ui.command.updateProject" does not allow execution, but
+    // spawns dialog popup
+    Constructor<UpdateMavenProjectJob> constructor;
+    UpdateMavenProjectJob updateMavenJob;
+    try {
+      // M2E < v2
+      constructor = UpdateMavenProjectJob.class.getConstructor(IProject[].class);
+      updateMavenJob = constructor.newInstance((Object) new IProject[] { this.javaProject.getProject() });
+    } catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException | InstantiationException e) {
+      LOG.debug("Assumptions for M2E < 2 did not match, trying to connect to M2E v2 API", e);
+      try {
+        // M2E >= 2
+        constructor = UpdateMavenProjectJob.class.getConstructor(Collection.class);
+        updateMavenJob = constructor.newInstance(Arrays.asList(this.javaProject.getProject()));
+      } catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException | InstantiationException e1) {
+        throw new CobiGenRuntimeException(
+            "There might be an incompatibility with the current version of M2E installed. Please state a bug report on github including the M2E version installed in your eclipse.",
+            e1);
+      }
+    }
+    updateMavenJob.runInWorkspace(new NullProgressMonitor());
 
   }
 
diff --git a/cobigen-eclipse/cobigen-eclipse-test/src/main/java/com/devonfw/cobigen/eclipse/test/common/utils/EclipseCobiGenUtils.java b/cobigen-eclipse/cobigen-eclipse-test/src/main/java/com/devonfw/cobigen/eclipse/test/common/utils/EclipseCobiGenUtils.java
index 1ea0de1e42..992b7cbb56 100644
--- a/cobigen-eclipse/cobigen-eclipse-test/src/main/java/com/devonfw/cobigen/eclipse/test/common/utils/EclipseCobiGenUtils.java
+++ b/cobigen-eclipse/cobigen-eclipse-test/src/main/java/com/devonfw/cobigen/eclipse/test/common/utils/EclipseCobiGenUtils.java
@@ -5,6 +5,7 @@
 
 import org.eclipse.core.resources.IncrementalProjectBuilder;
 import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.jdt.ui.JavaUI;
 import org.eclipse.jface.dialogs.IDialogConstants;
@@ -35,7 +36,7 @@ public class EclipseCobiGenUtils {
   public static final int DEFAULT_TIMEOUT = 15000;
 
   /**
-   * Selects the the increment with the given name and generates it.
+   * Selects the increment with the given name and generates it.
    *
    * @param bot the {@link SWTWorkbenchBot} of the test
    * @param input input of CobiGen to be selected
@@ -47,6 +48,34 @@ public static void processCobiGen(SWTWorkbenchBot bot, SWTBotTreeItem input, Str
     processCobiGen(bot, input, DEFAULT_TIMEOUT, increments);
   }
 
+  /**
+   * Selects the increment with the given name and generates it, even if monolithic templates found
+   *
+   * @param bot the {@link SWTWorkbenchBot} of the test
+   * @param input input of CobiGen to be selected
+   * @param increments increments to be generated.
+   * @throws Exception test fails
+   */
+  public static void processCobiGenAndPostponeUpgrade(SWTWorkbenchBot bot, SWTBotTreeItem input, String... increments)
+      throws Exception {
+
+    processCobiGenAndPostponeUpgrade(bot, input, DEFAULT_TIMEOUT, increments);
+  }
+
+  /**
+   * Selects the increment with the given name, upgrades the monolithic templates and generates.
+   *
+   * @param bot the {@link SWTWorkbenchBot} of the test
+   * @param input input of CobiGen to be selected
+   * @param increments increments to be generated.
+   * @throws Exception test fails
+   */
+  public static void processCobiGenAndUpgrade(SWTWorkbenchBot bot, SWTBotTreeItem input, String... increments)
+      throws Exception {
+
+    processCobiGenAndUpgrade(bot, input, DEFAULT_TIMEOUT, increments);
+  }
+
   /**
    * Tries a Generate process with an expected error title.
    *
@@ -101,7 +130,7 @@ private static SWTBotTreeItem expandNodes(SWTWorkbenchBot bot, String increment)
   }
 
   /**
-   * Selects the the increment with the given name and generates it.
+   * Selects the increment with the given name and generates it.
    *
    * @param bot the {@link SWTWorkbenchBot} of the test
    * @param input input of CobiGen to be selected
@@ -135,7 +164,8 @@ public static void processCobiGenWithTextInput(SWTWorkbenchBot bot, SWTBotEclips
     ResourcesPlugin.getWorkspace().build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor());
     bot.waitUntil(new AllJobsAreFinished(), defaultTimeout); // build might take some time
     input.contextMenu("CobiGen").menu("Generate...").click();
-    generateWithSelectedIncrements(bot, defaultTimeout, increments);
+    postponeUpgradeAndContinue(bot);
+    generateWithSelectedIncrements(bot, 120000, increments);
   }
 
   /**
@@ -169,6 +199,47 @@ private static void generateWithSelectedIncrements(SWTWorkbenchBot bot, int defa
     finishButton.click();
   }
 
+  /**
+   * Selects the increment with the given name and generates it, even if monolithic templates found
+   *
+   * @param bot the {@link SWTWorkbenchBot} of the test
+   * @param input input of CobiGen to be selected
+   * @param increments increments to be generated.
+   * @throws CoreException
+   * @throws Exception test fails
+   */
+  private static void processCobiGenAndPostponeUpgrade(SWTWorkbenchBot bot, SWTBotTreeItem input, int defaultTimeout,
+      String[] increments) throws Exception {
+
+    // Open generation wizard with new file as Input
+    ResourcesPlugin.getWorkspace().build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor());
+    bot.waitUntil(new AllJobsAreFinished(), defaultTimeout); // build might take some time
+    input.contextMenu("CobiGen").menu("Generate...").click();
+    postponeUpgradeAndContinue(bot);
+    generateWithSelectedIncrements(bot, 120000, increments);
+  }
+
+  /**
+   * Selects the increment with the given name and generates it, upgrade if monolithic templates found
+   *
+   * @param bot the {@link SWTWorkbenchBot} of the test
+   * @param input input of CobiGen to be selected
+   * @param increments increments to be generated.
+   * @throws CoreException
+   * @throws Exception test fails
+   */
+  private static void processCobiGenAndUpgrade(SWTWorkbenchBot bot, SWTBotTreeItem input, int defaultTimeout,
+      String[] increments) throws Exception {
+
+    // Open generation wizard with new file as Input
+    ResourcesPlugin.getWorkspace().build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor());
+    bot.waitUntil(new AllJobsAreFinished(), defaultTimeout); // build might take some time
+    input.contextMenu("CobiGen").menu("Generate...").click();
+    upgradeAndContinue(bot, defaultTimeout);
+
+    generateWithSelectedIncrements(bot, defaultTimeout, increments);
+  }
+
   /**
    * Tries a Generate process with an expected error title.
    *
@@ -185,6 +256,7 @@ public static void processCobiGenWithExpectedError(SWTWorkbenchBot bot, SWTBotTr
     ResourcesPlugin.getWorkspace().build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor());
     bot.waitUntil(new AllJobsAreFinished(), defaultTimeout); // build might take some time
     input.contextMenu("CobiGen").menu("Generate...").click();
+    postponeUpgradeAndContinue(bot);
     bot.waitUntil(new AnyShellIsActive(expectedErrorTitle), defaultTimeout);
 
     takeScreenshot(bot, "InvalidConfigurationDialog");
@@ -194,6 +266,38 @@ public static void processCobiGenWithExpectedError(SWTWorkbenchBot bot, SWTBotTr
     finishButton.click();
   }
 
+  /**
+   * Skips the Upgrade Warning message with the "Postpone" button
+   *
+   * @param bot the {@link SWTWorkbenchBot} of the test
+   *
+   */
+  private static void postponeUpgradeAndContinue(SWTWorkbenchBot bot) {
+
+    takeScreenshot(bot, "Warning!");
+    SWTBotShell finishDialog = bot.shell("Warning!");
+    finishDialog.bot().button("Postpone").click();
+  }
+
+  /**
+   * Starts the upgrade process with the "Upgrade" button
+   *
+   * @param bot the {@link SWTWorkbenchBot} of the test
+   * @param defaultTimeout
+   *
+   */
+  private static void upgradeAndContinue(SWTWorkbenchBot bot, int defaultTimeout) {
+
+    takeScreenshot(bot, "Warning!");
+    SWTBotShell finishDialog = bot.shell("Warning!");
+    finishDialog.bot().button("Upgrade").click();
+    bot.waitUntil(new AllJobsAreFinished(), defaultTimeout);
+    takeScreenshot(bot, "Success!");
+    SWTBotShell successDialog = bot.shell("Success!");
+    successDialog.bot().button("Ok").click();
+
+  }
+
   /**
    * Checks the CobiGen HealthCheck and takes screenshots of it.
    *
@@ -207,6 +311,35 @@ public static void runAndCaptureHealthCheck(SWTWorkbenchBot bot) throws Exceptio
 
     SWTBotView view = bot.viewById(JavaUI.ID_PACKAGES);
     view.bot().tree().expandNode("CobiGen_Templates").select().contextMenu("CobiGen").menu("Health Check...").click();
+    // TODO: replace with health check reaction, see: https://github.com/devonfw/cobigen/issues/1686
+    captureAdvancedHealthCheck(bot);
+  }
+
+  /**
+   * Checks the CobiGen HealthCheck and takes screenshots of it, even if monolithic templates found.
+   *
+   * @param bot to process the health check
+   * @throws Exception test fails
+   */
+  public static void runAndCaptureHealthCheckWithMonolithicConfiguration(SWTWorkbenchBot bot) throws Exception {
+
+    ResourcesPlugin.getWorkspace().build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor());
+    bot.waitUntil(new AllJobsAreFinished(), DEFAULT_TIMEOUT); // build might take some time
+
+    SWTBotView view = bot.viewById(JavaUI.ID_PACKAGES);
+    view.bot().tree().expandNode("CobiGen_Templates").select().contextMenu("CobiGen").menu("Health Check...").click();
+    postponeUpgradeAndContinue(bot);
+    captureAdvancedHealthCheck(bot);
+  }
+
+  /**
+   * Checks the CobiGen HealthCheck and takes screenshots of it. TODO: Split into captureHealthCheck and
+   * captureAdvancedHealthCheck, see: https://github.com/devonfw/cobigen/issues/1686
+   *
+   * @param bot to process the health check
+   */
+  private static void captureAdvancedHealthCheck(SWTWorkbenchBot bot) {
+
     bot.waitUntil(new AnyShellIsActive(CobiGenDialogConstants.HealthCheckDialogs.DIALOG_TITLE), DEFAULT_TIMEOUT);
 
     takeScreenshot(bot, "healthCheck");
@@ -261,8 +394,8 @@ public static void runAndCaptureAdaptTemplates(SWTWorkbenchBot bot) throws Excep
 
     takeScreenshot(bot, "Adapt Templates Warning!");
     SWTBotShell warningDialog = bot.shell("Warning!");
-
     warningDialog.bot().button("Ok").click();
+
     SWTBotShell informationDialog = bot.shell("Information");
     bot.waitUntil(new AnyShellIsActive("Information"), DEFAULT_TIMEOUT);
     takeScreenshot(bot, "Adapt Templates Information");
diff --git a/cobigen-eclipse/cobigen-eclipse-test/src/main/java/com/devonfw/cobigen/eclipse/test/common/utils/EclipseUtils.java b/cobigen-eclipse/cobigen-eclipse-test/src/main/java/com/devonfw/cobigen/eclipse/test/common/utils/EclipseUtils.java
index 26edf4f958..87b3a7d348 100644
--- a/cobigen-eclipse/cobigen-eclipse-test/src/main/java/com/devonfw/cobigen/eclipse/test/common/utils/EclipseUtils.java
+++ b/cobigen-eclipse/cobigen-eclipse-test/src/main/java/com/devonfw/cobigen/eclipse/test/common/utils/EclipseUtils.java
@@ -24,6 +24,7 @@
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.JavaCore;
 import org.eclipse.jdt.ui.JavaUI;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot;
@@ -40,6 +41,7 @@
 
 import com.devonfw.cobigen.eclipse.common.constants.external.ResourceConstants;
 import com.devonfw.cobigen.eclipse.test.common.swtbot.AllJobsAreFinished;
+import com.devonfw.cobigen.eclipse.test.common.swtbot.HasBeenBuilt;
 import com.devonfw.cobigen.eclipse.test.common.utils.swtbot.SwtBotProjectActions;
 
 /**
@@ -103,7 +105,12 @@ public static void importExistingGeneralProject(SWTWorkbenchBot bot, String proj
     bot.waitUntil(shellCloses(popup));
     ResourcesPlugin.getWorkspace().getRoot().refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
     ResourcesPlugin.getWorkspace().build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor());
-    bot.waitUntil(new AllJobsAreFinished());
+    for (IProject p : ResourcesPlugin.getWorkspace().getRoot().getProjects()) {
+      IJavaProject jp = JavaCore.create(p);
+      if (jp != null) {
+        bot.waitUntil(new HasBeenBuilt(jp));
+      }
+    }
   }
 
   /**
diff --git a/cobigen-eclipse/cobigen-eclipse-test/src/main/java/com/devonfw/cobigen/eclipse/test/common/utils/swtbot/SwtBotTestingUtilities.java b/cobigen-eclipse/cobigen-eclipse-test/src/main/java/com/devonfw/cobigen/eclipse/test/common/utils/swtbot/SwtBotTestingUtilities.java
index d583203ab8..2d3a98b78f 100644
--- a/cobigen-eclipse/cobigen-eclipse-test/src/main/java/com/devonfw/cobigen/eclipse/test/common/utils/swtbot/SwtBotTestingUtilities.java
+++ b/cobigen-eclipse/cobigen-eclipse-test/src/main/java/com/devonfw/cobigen/eclipse/test/common/utils/swtbot/SwtBotTestingUtilities.java
@@ -34,8 +34,6 @@
 import org.eclipse.swtbot.swt.finder.widgets.SWTBotTable;
 import org.hamcrest.Matcher;
 
-import com.google.common.collect.Iterables;
-
 /**
  * Provides helper methods to aid in SWTBot testing.
  */
@@ -227,7 +225,7 @@ public static void waitUntilMenuHasItem(SWTBot bot, Supplier<SWTBotMenu> menuSup
       @Override
       public boolean test() throws Exception {
 
-        return Iterables.any(menuSupplier.get().menuItems(), matcher::matches);
+        return menuSupplier.get().menuItems().stream().anyMatch(matcher::matches);
       }
 
       @Override
diff --git a/cobigen-eclipse/cobigen-eclipse-test/src/main/java/com/devonfw/cobigen/eclipse/test/common/utils/swtbot/SwtBotTimeoutManager.java b/cobigen-eclipse/cobigen-eclipse-test/src/main/java/com/devonfw/cobigen/eclipse/test/common/utils/swtbot/SwtBotTimeoutManager.java
index 2d06234f94..291925fd89 100644
--- a/cobigen-eclipse/cobigen-eclipse-test/src/main/java/com/devonfw/cobigen/eclipse/test/common/utils/swtbot/SwtBotTimeoutManager.java
+++ b/cobigen-eclipse/cobigen-eclipse-test/src/main/java/com/devonfw/cobigen/eclipse/test/common/utils/swtbot/SwtBotTimeoutManager.java
@@ -20,10 +20,9 @@
 
 package com.devonfw.cobigen.eclipse.test.common.utils.swtbot;
 
+import org.assertj.core.api.Assertions;
 import org.eclipse.swtbot.swt.finder.utils.SWTBotPreferences;
 
-import com.google.common.base.Preconditions;
-
 /**
  * Used to set the general SWTBot timeout. This class was originally to be thrown away, except that SWTBot doesn't
  * support a nice mechanism for temporarily changing the timeout.
@@ -65,7 +64,7 @@ public static void setTimeout() {
    */
   public static void setTimeout(long timeout) {
 
-    Preconditions.checkArgument(timeout > 0);
+    Assertions.assertThat(timeout).isGreaterThan(0);
     oldTimeoutSwtPrefs = getSwtBotPrefsTimeoutFieldValue();
     setSwtBotPrefsTimeoutFieldValue(timeout);
   }
diff --git a/cobigen-eclipse/cobigen-eclipse-test/src/main/java/com/devonfw/cobigen/eclipse/test/common/utils/swtbot/SwtBotTreeUtilities.java b/cobigen-eclipse/cobigen-eclipse-test/src/main/java/com/devonfw/cobigen/eclipse/test/common/utils/swtbot/SwtBotTreeUtilities.java
index aa66497c84..89c8c723f6 100644
--- a/cobigen-eclipse/cobigen-eclipse-test/src/main/java/com/devonfw/cobigen/eclipse/test/common/utils/swtbot/SwtBotTreeUtilities.java
+++ b/cobigen-eclipse/cobigen-eclipse-test/src/main/java/com/devonfw/cobigen/eclipse/test/common/utils/swtbot/SwtBotTreeUtilities.java
@@ -27,6 +27,7 @@
 import java.util.Collections;
 import java.util.LinkedList;
 
+import org.assertj.core.api.Assertions;
 import org.eclipse.swt.widgets.TreeItem;
 import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot;
 import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
@@ -40,9 +41,6 @@
 import org.hamcrest.Matcher;
 import org.hamcrest.StringDescription;
 
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Iterables;
-
 /** Utilities for manipulating trees. */
 public class SwtBotTreeUtilities {
 
@@ -126,7 +124,7 @@ public boolean test() throws Exception {
           parentItem.expand();
           children = parentItem.getItems();
         }
-        return Iterables.any(parentItem.getNodes(), childMatcher::matches);
+        return parentItem.getNodes().stream().anyMatch(childMatcher::matches);
       }
     });
     for (SWTBotTreeItem child : parentItem.getItems()) {
@@ -215,7 +213,7 @@ public String getFailureMessage() {
    */
   public static SWTBotTreeItem select(SWTWorkbenchBot bot, SWTBotTree tree, String... nodeNames) {
 
-    Preconditions.checkArgument(nodeNames.length > 0, "no children to navigate");
+    Assertions.assertThat(nodeNames.length).isGreaterThan(0);
     int leafIndex = nodeNames.length - 1;
     waitUntilTreeHasItems(bot, tree);
 
diff --git a/cobigen-eclipse/cobigen-eclipse-test/src/main/resources/GenerateFromTextInputTest/templates/src/main/templates/template1/context.xml b/cobigen-eclipse/cobigen-eclipse-test/src/main/resources/GenerateFromTextInputTest/templates/src/main/templates/context.xml
similarity index 80%
rename from cobigen-eclipse/cobigen-eclipse-test/src/main/resources/GenerateFromTextInputTest/templates/src/main/templates/template1/context.xml
rename to cobigen-eclipse/cobigen-eclipse-test/src/main/resources/GenerateFromTextInputTest/templates/src/main/templates/context.xml
index b5774d7a5d..caa323e573 100644
--- a/cobigen-eclipse/cobigen-eclipse-test/src/main/resources/GenerateFromTextInputTest/templates/src/main/templates/template1/context.xml
+++ b/cobigen-eclipse/cobigen-eclipse-test/src/main/resources/GenerateFromTextInputTest/templates/src/main/templates/context.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="2.2">
-    <trigger id="test" type="java">
+    <trigger id="test" type="java" templateFolder="template1">
         <matcher type="fqn" value=".*">
         </matcher>
     </trigger>
diff --git a/cobigen-eclipse/cobigen-eclipse-test/src/main/resources/UpgradeMonolithicTemplatesTest/input/test.yml b/cobigen-eclipse/cobigen-eclipse-test/src/main/resources/UpgradeMonolithicTemplatesTest/input/test.yml
new file mode 100644
index 0000000000..199c29deb3
--- /dev/null
+++ b/cobigen-eclipse/cobigen-eclipse-test/src/main/resources/UpgradeMonolithicTemplatesTest/input/test.yml
@@ -0,0 +1,23 @@
+openapi: 3.0.0
+servers:
+  - url: 'https://localhost:8081/server/services/rest'
+    description: Just some data
+info:
+  title: Devon Example
+  description: Example of a API definition
+  version: 1.0.0
+  x-rootpackage: com.devonfw.angular.test
+paths:
+  /shopmanagement/v1/shop/{shopId}:
+    x-component: shopmanagement
+    get:
+      operationId: findShop
+      parameters:
+        - name: shopId
+          in: path
+          required: true
+          schema:
+            type: integer
+            format: int64
+            minimum: 0
+            maximum: 50
diff --git a/cobigen-templates/templates-devon4j/.project b/cobigen-eclipse/cobigen-eclipse-test/src/main/resources/UpgradeMonolithicTemplatesTest/templates/CobiGen_Templates/.project
similarity index 93%
rename from cobigen-templates/templates-devon4j/.project
rename to cobigen-eclipse/cobigen-eclipse-test/src/main/resources/UpgradeMonolithicTemplatesTest/templates/CobiGen_Templates/.project
index fccd2e4b05..b01e903d25 100644
--- a/cobigen-templates/templates-devon4j/.project
+++ b/cobigen-eclipse/cobigen-eclipse-test/src/main/resources/UpgradeMonolithicTemplatesTest/templates/CobiGen_Templates/.project
@@ -17,9 +17,8 @@
 		</buildCommand>
 	</buildSpec>
 	<natures>
-		<nature>org.sonar.ide.eclipse.core.sonarNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
 	<filteredResources>
 		<filter>
diff --git a/cobigen-eclipse/cobigen-eclipse-test/src/main/resources/UpgradeMonolithicTemplatesTest/templates/CobiGen_Templates/pom.xml b/cobigen-eclipse/cobigen-eclipse-test/src/main/resources/UpgradeMonolithicTemplatesTest/templates/CobiGen_Templates/pom.xml
new file mode 100644
index 0000000000..5ebbd8cfe2
--- /dev/null
+++ b/cobigen-eclipse/cobigen-eclipse-test/src/main/resources/UpgradeMonolithicTemplatesTest/templates/CobiGen_Templates/pom.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.devonfw.cobigen</groupId>
+  <artifactId>templates-devon4j</artifactId>
+  <version>2021.12.006</version>
+  <name>CobiGen - devon4j Templates</name>
+  <description>A Code-based incremental Generator</description>
+  <url>https://github.com/devonfw/cobigen/templates-parent/templates-devon4j</url>
+  <properties>
+   <maven.compiler.source>1.8</maven.compiler.source>
+   <maven.compiler.target>1.8</maven.compiler.target>
+  </properties>
+  <build>
+   <resources>
+     <resource>
+       <directory>src/main/templates</directory>
+       <targetPath>src/main/templates</targetPath>
+     </resource>
+   </resources>
+  </build>
+</project>
\ No newline at end of file
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_angular_service_based_app/context.xml b/cobigen-eclipse/cobigen-eclipse-test/src/main/resources/UpgradeMonolithicTemplatesTest/templates/CobiGen_Templates/src/main/templates/context.xml
similarity index 84%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_angular_service_based_app/context.xml
rename to cobigen-eclipse/cobigen-eclipse-test/src/main/resources/UpgradeMonolithicTemplatesTest/templates/CobiGen_Templates/src/main/templates/context.xml
index 5e1c199c2b..fc1c9df45f 100644
--- a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_angular_service_based_app/context.xml
+++ b/cobigen-eclipse/cobigen-eclipse-test/src/main/resources/UpgradeMonolithicTemplatesTest/templates/CobiGen_Templates/src/main/templates/context.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="2.2">
-
-
-  <trigger id="crud_openapi_angular_service_based_app" type="openapi">
+<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="2.1">
+  <trigger id="crud_openapi_angular_service_based_app" type="openapi" templateFolder="crud_openapi_angular_service_based_app">
     <containerMatcher type="element" value="openAPIFile"/>
     <matcher type="element" value="ComponentDef">
       <variableAssignment type="constant" key="domain" value="demo"/>
@@ -10,5 +8,4 @@
       <variableAssignment type="property" key="etoName" value="name"/>
     </matcher>
   </trigger>
-
 </contextConfiguration>
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/kafka_documentation/templates.xml b/cobigen-eclipse/cobigen-eclipse-test/src/main/resources/UpgradeMonolithicTemplatesTest/templates/CobiGen_Templates/src/main/templates/crud_openapi_angular_service_based_app/templates.xml
similarity index 56%
rename from cobigen-templates/templates-devon4j/src/main/templates/kafka_documentation/templates.xml
rename to cobigen-eclipse/cobigen-eclipse-test/src/main/resources/UpgradeMonolithicTemplatesTest/templates/CobiGen_Templates/src/main/templates/crud_openapi_angular_service_based_app/templates.xml
index 82e273ff39..484a768358 100644
--- a/cobigen-templates/templates-devon4j/src/main/templates/kafka_documentation/templates.xml
+++ b/cobigen-eclipse/cobigen-eclipse-test/src/main/resources/UpgradeMonolithicTemplatesTest/templates/CobiGen_Templates/src/main/templates/crud_openapi_angular_service_based_app/templates.xml
@@ -3,16 +3,16 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.1">
 
   <templates>
-    <templateExtension ref="Documentation.adoc" mergeStrategy="textmerge_append"/>
+    <templateExtension ref="environment.ts" mergeStrategy="tsmerge_override"/>
   </templates>
 
   <templateScans>
-    <templateScan templatePath="templates" destinationPath=""/>
+    <templateScan name="ts_scan" templatePath="templates" destinationPath=""/>
   </templateScans>
 
   <increments>
-    <increment name="Kafka_Docs" description="Documentation">
-      <templateRef ref="Documentation.adoc"/>
+    <increment name="app_angular_env" description="Server URL Registration">
+      <templateRef ref="environment.ts"/>
     </increment>
   </increments>
 </templatesConfiguration>
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_angular_service_based_app/templates/src/environments/environment.ts.ftl b/cobigen-eclipse/cobigen-eclipse-test/src/main/resources/UpgradeMonolithicTemplatesTest/templates/CobiGen_Templates/src/main/templates/crud_openapi_angular_service_based_app/templates/src/environments/environment.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_angular_service_based_app/templates/src/environments/environment.ts.ftl
rename to cobigen-eclipse/cobigen-eclipse-test/src/main/resources/UpgradeMonolithicTemplatesTest/templates/CobiGen_Templates/src/main/templates/crud_openapi_angular_service_based_app/templates/src/environments/environment.ts.ftl
diff --git a/cobigen-eclipse/cobigen-eclipse-test/targlets/2018-12.target b/cobigen-eclipse/cobigen-eclipse-test/targlets/2018-12.target
new file mode 100644
index 0000000000..f720b3a330
--- /dev/null
+++ b/cobigen-eclipse/cobigen-eclipse-test/targlets/2018-12.target
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?>
+<target name="Eclipse 2018-12" sequenceNumber="51">
+<locations>
+  <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
+    <repository location="http://download.eclipse.org/technology/swtbot/releases/latest/"/>
+    <unit id="org.eclipse.swtbot.eclipse.test.junit.feature.group" version="4.0.0.202206011610"/>
+    <unit id="org.eclipse.swtbot.feature.group" version="4.0.0.202206011610"/>
+    <unit id="org.eclipse.swtbot.eclipse.feature.group" version="4.0.0.202206011610"/>
+  </location>
+  <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
+    <repository location="https://download.eclipse.org/releases/2018-12/"/>
+    <unit id="org.eclipse.sdk.ide" version="0.0.0"/>
+    <unit id="org.eclipse.equinox.sdk.feature.group" version="0.0.0"/>
+    <unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
+    <unit id="org.eclipse.m2e.feature.feature.group" version="0.0.0"/>
+  </location>
+</locations>
+</target>
\ No newline at end of file
diff --git a/cobigen-eclipse/cobigen-eclipse-updatesite/.project b/cobigen-eclipse/cobigen-eclipse-updatesite/.project
deleted file mode 100644
index 631967f7bd..0000000000
--- a/cobigen-eclipse/cobigen-eclipse-updatesite/.project
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>cobigen-eclipse-updatesite</name>
-	<comment></comment>
-	<projects>
-		<project>cobigen-eclipse</project>
-		<project>cobigen-eclipse-feature</project>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-	<filteredResources>
-		<filter>
-			<id>1664574669516</id>
-			<name></name>
-			<type>30</type>
-			<matcher>
-				<id>org.eclipse.core.resources.regexFilterMatcher</id>
-				<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
-			</matcher>
-		</filter>
-	</filteredResources>
-</projectDescription>
diff --git a/cobigen-eclipse/cobigen-eclipse/.project b/cobigen-eclipse/cobigen-eclipse/.project
deleted file mode 100644
index 533bae1e4d..0000000000
--- a/cobigen-eclipse/cobigen-eclipse/.project
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>cobigen-eclipse</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-	<filteredResources>
-		<filter>
-			<id>1664574669486</id>
-			<name></name>
-			<type>30</type>
-			<matcher>
-				<id>org.eclipse.core.resources.regexFilterMatcher</id>
-				<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
-			</matcher>
-		</filter>
-	</filteredResources>
-</projectDescription>
diff --git a/cobigen-eclipse/cobigen-eclipse/META-INF/MANIFEST.MF b/cobigen-eclipse/cobigen-eclipse/META-INF/MANIFEST.MF
index 224cc066c7..22fe3f42c9 100644
--- a/cobigen-eclipse/cobigen-eclipse/META-INF/MANIFEST.MF
+++ b/cobigen-eclipse/cobigen-eclipse/META-INF/MANIFEST.MF
@@ -17,7 +17,7 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.104.0",
  org.eclipse.ui.navigator.resources;bundle-version="3.4.400",
  org.eclipse.m2e.core.ui;bundle-version="1.6.0",
  org.eclipse.core.filesystem;bundle-version="1.5.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .,
  lib/annotations.jar,
@@ -57,14 +57,19 @@ Bundle-ClassPath: .,
  lib/kotlin-stdlib-common.jar,
  lib/listenablefuture.jar,
  lib/log4j-over-slf4j.jar,
+ lib/maven-model.jar,
+ lib/mmm-base.jar,
+ lib/okhttp.jar,
+ lib/orika-core.jar,
+ lib/zt-exec.jar,
  lib/logback-classic.jar,
  lib/logback-core.jar,
- lib/mmm-util-core.jar,
- lib/okhttp.jar,
  lib/okio.jar,
- lib/orika-core.jar,
  lib/paranamer.jar,
+ lib/plexus-cipher.jar,
+ lib/plexus-sec-dispatcher.jar,
+ lib/plexus-utils.jar,
  lib/slf4j-api.jar,
- lib/txw2.jar,
- lib/zt-exec.jar
-Export-Package: com.devonfw.cobigen.eclipse.common.constants.external
+ lib/txw2.jar
+Export-Package: com.devonfw.cobigen.eclipse.common.constants.external,
+ com.devonfw.cobigen.eclipse.common.tools
diff --git a/cobigen-eclipse/cobigen-eclipse/build.properties b/cobigen-eclipse/cobigen-eclipse/build.properties
index 64d6a6e2a5..4415ea671c 100644
--- a/cobigen-eclipse/cobigen-eclipse/build.properties
+++ b/cobigen-eclipse/cobigen-eclipse/build.properties
@@ -42,11 +42,15 @@ bin.includes = .,\
                lib/log4j-over-slf4j.jar,\
                lib/logback-classic.jar,\
                lib/logback-core.jar,\
-               lib/mmm-util-core.jar,\
+               lib/maven-model.jar,\
+               lib/mmm-base.jar,\
                lib/okhttp.jar,\
                lib/okio.jar,\
                lib/orika-core.jar,\
                lib/paranamer.jar,\
+               lib/plexus-cipher.jar,\
+               lib/plexus-sec-dispatcher.jar,\
+               lib/plexus-utils.jar,\
                lib/slf4j-api.jar,\
                lib/txw2.jar,\
                lib/zt-exec.jar
diff --git a/cobigen-eclipse/cobigen-eclipse/src/com/devonfw/cobigen/eclipse/common/constants/InfrastructureConstants.java b/cobigen-eclipse/cobigen-eclipse/src/com/devonfw/cobigen/eclipse/common/constants/InfrastructureConstants.java
index 2ea80b33ea..bbaa521e2c 100644
--- a/cobigen-eclipse/cobigen-eclipse/src/com/devonfw/cobigen/eclipse/common/constants/InfrastructureConstants.java
+++ b/cobigen-eclipse/cobigen-eclipse/src/com/devonfw/cobigen/eclipse/common/constants/InfrastructureConstants.java
@@ -2,8 +2,6 @@
 
 /**
  * Constants, which are needed for technical infrastructure.
- *
- * @author mbrunnli (Jun 17, 2015)
  */
 public class InfrastructureConstants {
 
diff --git a/cobigen-eclipse/cobigen-eclipse/src/com/devonfw/cobigen/eclipse/common/tools/ExceptionHandler.java b/cobigen-eclipse/cobigen-eclipse/src/com/devonfw/cobigen/eclipse/common/tools/ExceptionHandler.java
index 139cef1e69..1916b7994c 100644
--- a/cobigen-eclipse/cobigen-eclipse/src/com/devonfw/cobigen/eclipse/common/tools/ExceptionHandler.java
+++ b/cobigen-eclipse/cobigen-eclipse/src/com/devonfw/cobigen/eclipse/common/tools/ExceptionHandler.java
@@ -9,12 +9,15 @@
 
 import com.devonfw.cobigen.api.exception.CobiGenRuntimeException;
 import com.devonfw.cobigen.api.exception.ConfigurationConflictException;
+import com.devonfw.cobigen.api.exception.DeprecatedMonolithicConfigurationException;
 import com.devonfw.cobigen.api.exception.InvalidConfigurationException;
 import com.devonfw.cobigen.eclipse.common.constants.external.ResourceConstants;
 import com.devonfw.cobigen.eclipse.common.exceptions.GeneratorCreationException;
 import com.devonfw.cobigen.eclipse.common.exceptions.GeneratorProjectNotExistentException;
 import com.devonfw.cobigen.eclipse.common.exceptions.InvalidInputException;
 import com.devonfw.cobigen.eclipse.healthcheck.HealthCheckDialog;
+import com.devonfw.cobigen.impl.config.constant.WikiConstants;
+import com.devonfw.cobigen.impl.util.PostponeUtil;
 
 /**
  * Util class to handle exceptions
@@ -39,6 +42,9 @@ public static void handle(Throwable e, Shell activeShell) {
       openInvalidConfigurationErrorDialog((InvalidConfigurationException) e);
     } else if (ConfigurationConflictException.class.isAssignableFrom(e.getClass())) {
       openInvalidConfigurationErrorDialog((ConfigurationConflictException) e);
+    } else if (DeprecatedMonolithicConfigurationException.class.isAssignableFrom(e.getClass())) {
+      LOG.warn("Monolithic Templates found.", e);
+      openMonolithicConfigurationErrorDialog((DeprecatedMonolithicConfigurationException) e);
     } else if (GeneratorProjectNotExistentException.class.isAssignableFrom(e.getClass())) {
       LOG.error(
           "The project '{}' containing the configuration and templates is currently not existent. Please create one or check it out from SVN as stated in the user documentation.",
@@ -95,4 +101,44 @@ private static void openInvalidConfigurationErrorDialog(InvalidConfigurationExce
     });
   }
 
+  /**
+   * Opens up a message dialog for displaying further guidance on upgrading old templates.
+   *
+   * @param e {@link DeprecatedMonolithicConfigurationException} occurred
+   */
+  private static void openMonolithicConfigurationErrorDialog(DeprecatedMonolithicConfigurationException e) {
+
+    PlatformUIUtil.getWorkbench().getDisplay().syncExec(() -> {
+      MessageDialog dialog = new MessageDialog(Display.getDefault().getActiveShell(), "Warning!", null,
+          e.getMessage() + " Further Information can be found at:"
+              + WikiConstants.WIKI_UPGRADE_MONOLITHIC_CONFIGURATION,
+          MessageDialog.WARNING, new String[] { "Upgrade", "Postpone", "Postpone for 30 days" }, 2);
+
+      MessageDialog successUpgrade = new MessageDialog(Display.getDefault().getActiveShell(), "Success!", null,
+          "Templates were successfully upgraded. ", MessageDialog.INFORMATION, new String[] { "Ok" }, 1);
+
+      dialog.setBlockOnOpen(true);
+      successUpgrade.setBlockOnOpen(true);
+      int result = dialog.open();
+      if (result == 0) {
+        try {
+          ResourcesPluginUtil
+              .startTemplatesUpgrader(DeprecatedMonolithicConfigurationException.getMonolithicConfiguration());
+          successUpgrade.open();
+        } catch (Throwable a) {
+          String upgradeErrorMessage = "An error has occurred while upgrading the templates!";
+          LOG.error(upgradeErrorMessage, a);
+          PlatformUIUtil.openErrorDialog(upgradeErrorMessage + " " + a.getMessage(), a);
+        }
+      }
+      if (result == 1) {
+        // Do nothing (Postpone and Continue)
+      }
+      if (result == 2) {
+        PostponeUtil.addATimestampForOneMonth();
+
+      }
+    });
+  }
+
 }
diff --git a/cobigen-eclipse/cobigen-eclipse/src/com/devonfw/cobigen/eclipse/common/tools/PlatformUIUtil.java b/cobigen-eclipse/cobigen-eclipse/src/com/devonfw/cobigen/eclipse/common/tools/PlatformUIUtil.java
index 1106de09ce..79e6080a1e 100644
--- a/cobigen-eclipse/cobigen-eclipse/src/com/devonfw/cobigen/eclipse/common/tools/PlatformUIUtil.java
+++ b/cobigen-eclipse/cobigen-eclipse/src/com/devonfw/cobigen/eclipse/common/tools/PlatformUIUtil.java
@@ -21,8 +21,6 @@
 
 /**
  * This class provides some helper functions in order to minimize code overhead
- *
- * @author Malte Brunnlieb (06.12.2012)
  */
 public class PlatformUIUtil {
 
diff --git a/cobigen-eclipse/cobigen-eclipse/src/com/devonfw/cobigen/eclipse/common/tools/ResourcesPluginUtil.java b/cobigen-eclipse/cobigen-eclipse/src/com/devonfw/cobigen/eclipse/common/tools/ResourcesPluginUtil.java
index f7d1451db6..0b842712b7 100644
--- a/cobigen-eclipse/cobigen-eclipse/src/com/devonfw/cobigen/eclipse/common/tools/ResourcesPluginUtil.java
+++ b/cobigen-eclipse/cobigen-eclipse/src/com/devonfw/cobigen/eclipse/common/tools/ResourcesPluginUtil.java
@@ -5,6 +5,7 @@
 import java.net.MalformedURLException;
 import java.nio.file.FileSystem;
 import java.nio.file.FileSystems;
+import java.nio.file.Files;
 import java.nio.file.Path;
 
 import org.apache.commons.lang3.StringUtils;
@@ -20,13 +21,15 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.devonfw.cobigen.api.TemplateAdapter;
 import com.devonfw.cobigen.api.constants.ConfigurationConstants;
 import com.devonfw.cobigen.api.util.CobiGenPaths;
 import com.devonfw.cobigen.api.util.TemplatesJarUtil;
 import com.devonfw.cobigen.eclipse.common.constants.external.ResourceConstants;
 import com.devonfw.cobigen.eclipse.common.exceptions.GeneratorProjectNotExistentException;
 import com.devonfw.cobigen.eclipse.updatetemplates.UpdateTemplatesDialog;
-import com.devonfw.cobigen.impl.util.ExtractTemplatesUtil;
+import com.devonfw.cobigen.impl.CobiGenFactory;
+import com.devonfw.cobigen.impl.adapter.TemplateAdapterImpl;
 
 /** Util for NPE save access of {@link ResourcesPlugin} utils */
 public class ResourcesPluginUtil {
@@ -51,6 +54,27 @@ public class ResourcesPluginUtil {
    */
   static boolean userWantsToDownloadTemplates = true;
 
+  /**
+   * This variable is the path to the templateSet folder, when the ugrader is finished
+   */
+  static Path templateSetPathAfterUpgrade;
+
+  /**
+   * @return afterUpgradetemplateSetPath
+   */
+  public static Path getTemplateSetPathAfterUpgrade() {
+
+    return templateSetPathAfterUpgrade;
+  }
+
+  /**
+   * @param afterUpgradetemplateSetPath new value of {@link #getafterUpgradetemplateSetPath}.
+   */
+  public static void setTemplateSetPathAfterUpgrade(Path afterUpgradetemplateSetPath) {
+
+    ResourcesPluginUtil.templateSetPathAfterUpgrade = afterUpgradetemplateSetPath;
+  }
+
   /**
    * Refreshes the configuration project from the file system.
    */
@@ -88,9 +112,9 @@ public static IProject getGeneratorConfigurationProject() throws GeneratorProjec
     if (!generatorProj.exists()) {
       if (!isUpdateDialogShown) {
         if (templatesDirectory.exists()) {
-          File jarFile = TemplatesJarUtil.getJarFile(false, templatesDirectory);
+          Path jarFilePath = TemplatesJarUtil.getJarFile(false, templatesDirectory.toPath());
           // If we don't find at least one jar, then we do need to download new templates
-          if (jarFile == null) {
+          if (jarFilePath == null || !Files.exists(jarFilePath)) {
             int result = createUpdateTemplatesDialog();
             isUpdateDialogShown = true;
             if (result == 1) {
@@ -113,7 +137,6 @@ public static IProject getGeneratorConfigurationProject() throws GeneratorProjec
         }
       }
     }
-
     if (userWantsToDownloadTemplates) {
       return generatorProj;
     } else {
@@ -168,26 +191,35 @@ public static String getJarPath(boolean isSource) {
 
     File templatesDirectory = getTemplatesDirectory();
 
-    File jarFile = TemplatesJarUtil.getJarFile(isSource, templatesDirectory);
+    Path jarFilePath = TemplatesJarUtil.getJarFile(isSource, templatesDirectory.toPath());
 
-    if (jarFile == null) {
+    if (jarFilePath == null || !Files.exists(jarFilePath)) {
       return "";
     }
 
-    String fileName = jarFile.getPath().substring(jarFile.getPath().lastIndexOf(File.separator) + 1);
-
+    String fileName = jarFilePath.toFile().getPath()
+        .substring(jarFilePath.toFile().getPath().lastIndexOf(File.separator) + 1);
     return fileName;
   }
 
   /**
-   * Gets or creates a new templates directory
+   * Gets or creates a new templates directory from the monolithic structure
    *
    * @return the templateDirectory
    */
   private static File getTemplatesDirectory() {
 
-    File templatesDirectory = CobiGenPaths.getTemplatesFolderPath().toFile();
-    return templatesDirectory;
+    return CobiGenPaths.getTemplatesFolderPath().toFile();
+  }
+
+  /**
+   * Gets or creates a new templates directory from the template-set structure
+   *
+   * @return the templateDirectory
+   */
+  private static File getTemplateSetDirectory() {
+
+    return CobiGenPaths.getTemplateSetsFolderPath().toFile();
   }
 
   /**
@@ -227,7 +259,9 @@ public static void processJar(String fileName) throws MalformedURLException, IOE
     }
 
     try {
-      ExtractTemplatesUtil.extractTemplates(cobigenFolderPath.resolve(ConfigurationConstants.COBIGEN_TEMPLATES), false);
+      TemplateAdapter templateAdapter = new TemplateAdapterImpl(null);
+      templateAdapter.adaptMonolithicTemplates(cobigenFolderPath.resolve(ConfigurationConstants.COBIGEN_TEMPLATES),
+          false);
     } catch (Exception e) {
       LOG.error("An exception occurred while processing Jar files to create CobiGen_Templates folder", e);
       PlatformUIUtil
@@ -240,8 +274,7 @@ public static void processJar(String fileName) throws MalformedURLException, IOE
    */
   public static IPath getWorkspaceLocation() {
 
-    IPath ws = ResourcesPlugin.getWorkspace().getRoot().getLocation();
-    return ws;
+    return ResourcesPlugin.getWorkspace().getRoot().getLocation();
   }
 
   /**
@@ -254,4 +287,16 @@ public static void setUserWantsToDownloadTemplates(boolean userWantsToDownloadTe
     ResourcesPluginUtil.userWantsToDownloadTemplates = userWantsToDownloadTemplates;
   }
 
+  /**
+   * Upgrades the given template configuration.
+   *
+   * @param configurationPath path to the templates Configuration
+   */
+  public static void startTemplatesUpgrader(Path configurationPath) {
+
+    setTemplateSetPathAfterUpgrade(CobiGenFactory.startTemplatesUpgrader(configurationPath));
+
+    // FIXME after the upgrade adapt the new template-set folder. should be done in #1587
+  }
+
 }
diff --git a/cobigen-eclipse/cobigen-eclipse/src/com/devonfw/cobigen/eclipse/generator/GeneratorWrapperFactory.java b/cobigen-eclipse/cobigen-eclipse/src/com/devonfw/cobigen/eclipse/generator/GeneratorWrapperFactory.java
index 0a6cb781d7..be0e80590e 100644
--- a/cobigen-eclipse/cobigen-eclipse/src/com/devonfw/cobigen/eclipse/generator/GeneratorWrapperFactory.java
+++ b/cobigen-eclipse/cobigen-eclipse/src/com/devonfw/cobigen/eclipse/generator/GeneratorWrapperFactory.java
@@ -1,6 +1,8 @@
 package com.devonfw.cobigen.eclipse.generator;
 
-import java.io.File;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.Iterator;
 import java.util.List;
 
@@ -11,7 +13,6 @@
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jdt.core.ICompilationUnit;
 import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
 import org.eclipse.jdt.core.IPackageFragment;
 import org.eclipse.jdt.core.JavaCore;
 import org.eclipse.jface.dialogs.MessageDialog;
@@ -25,6 +26,8 @@
 import org.slf4j.LoggerFactory;
 
 import com.devonfw.cobigen.api.CobiGen;
+import com.devonfw.cobigen.api.constants.ConfigurationConstants;
+import com.devonfw.cobigen.api.exception.DeprecatedMonolithicConfigurationException;
 import com.devonfw.cobigen.api.exception.InvalidConfigurationException;
 import com.devonfw.cobigen.api.util.CobiGenPaths;
 import com.devonfw.cobigen.api.util.TemplatesJarUtil;
@@ -43,33 +46,35 @@
 /**
  * Generator creation factory, which creates a specific generator instance dependent on the current selection within the
  * eclipse IDE
- *
- * @author mbrunnli (03.12.2014)
  */
 public class GeneratorWrapperFactory {
 
   /** Logger instance. */
   private static final Logger LOG = LoggerFactory.getLogger(GeneratorWrapperFactory.class);
 
+  private static IProject generatorProj = null;
+
   /**
    * Creates a generator dependent on the input of the selection
    *
    * @param selection current {@link IStructuredSelection} treated as input for generation
    * @param monitor tracking progress
+   * @param allowMonolithicConfiguration ignores deprecated monolithic template folder structure and if found does not
+   *        throw a DeprecatedMonolithicConfigurationException
    * @return a specific {@link CobiGenWrapper} instance
    * @throws GeneratorCreationException if any exception occurred during converting the inputs or creating the generator
    * @throws GeneratorProjectNotExistentException if the generator configuration project does not exist
    * @throws InvalidInputException if the selection includes non supported input types or is composed in a non supported
    *         combination of inputs.
    */
-  public static CobiGenWrapper createGenerator(ISelection selection, IProgressMonitor monitor)
+  public static CobiGenWrapper createGenerator(ISelection selection, IProgressMonitor monitor,
+      boolean allowMonolithicConfiguration)
       throws GeneratorCreationException, GeneratorProjectNotExistentException, InvalidInputException {
 
     List<Object> extractedInputs = extractValidEclipseInputs(selection);
-
     if (extractedInputs.size() > 0) {
       monitor.subTask("Initialize CobiGen instance");
-      CobiGen cobigen = initializeGenerator();
+      CobiGen cobigen = initializeGenerator(allowMonolithicConfiguration);
 
       monitor.subTask("Reading inputs...");
       monitor.worked(10);
@@ -207,40 +212,76 @@ else if (selection instanceof IStructuredSelection) {
    * @throws InvalidConfigurationException if the context configuration is not valid
    * @throws GeneratorCreationException if the generator configuration project does not exist
    */
-  private static CobiGen initializeGenerator() throws InvalidConfigurationException, GeneratorCreationException {
+  private static CobiGen initializeGenerator(boolean allowMonolithicConfiguration)
+      throws InvalidConfigurationException, GeneratorCreationException {
 
     try {
       ResourcesPluginUtil.refreshConfigurationProject();
-      IProject generatorProj = ResourcesPluginUtil.getGeneratorConfigurationProject();
+      generatorProj = ResourcesPluginUtil.getGeneratorConfigurationProject();
 
-      if (generatorProj == null) {
-        throw new GeneratorCreationException(
-            "Configuration source could not be read. Have you downloaded the templates?");
+      return initializeCobiGen(generatorProj, allowMonolithicConfiguration);
+    } catch (CoreException e) {
+      throw new GeneratorCreationException("An eclipse internal exception occurred", e);
+    } catch (DeprecatedMonolithicConfigurationException e) {
+      if (null == generatorProj.getLocationURI())
+        throw e;
+      else {
+        throw new DeprecatedMonolithicConfigurationException(Paths.get(generatorProj.getLocationURI()));
       }
+    } catch (Throwable e) {
+      throw new GeneratorCreationException(
+          "Configuration source could not be read.\nIf you were updating templates, it may mean"
+              + " that you have no internet connection,",
+          e);
+    }
+  }
+
+  /**
+   * Initializes the {@link CobiGen} with the correct configuration, checks if template-sets exists, if not the Jar or
+   * generatorProj will be used.
+   *
+   * @param generatorProj the templates project
+   * @param allowMonolithicConfiguration ignores deprecated monolithic template folder structure and if found does not
+   *        throw a DeprecatedMonolithicConfigurationException
+   * @return the configured{@link CobiGen}
+   * @throws if the generator configuration project does not exist
+   *
+   */
+  private static CobiGen initializeCobiGen(IProject generatorProj, boolean allowMonolithicConfiguration)
+      throws GeneratorCreationException {
 
-      // We need to check whether it is a valid Java Project
-      IJavaProject configJavaProject = JavaCore.create(generatorProj);
+    Path templatesDirectoryPath = CobiGenPaths.getTemplateSetsFolderPath();
+    Path templateSetsAdaptedFolderPath = templatesDirectoryPath.resolve(ConfigurationConstants.ADAPTED_FOLDER);
+    Path templateSetsDownloadedFolderPath = templatesDirectoryPath.resolve(ConfigurationConstants.DOWNLOADED_FOLDER);
 
-      // If it is not valid, we should use the jar
-      if (null == generatorProj.getLocationURI() || !configJavaProject.exists()) {
-        File templatesDirectory = CobiGenPaths.getTemplatesFolderPath().toFile();
-        File jarPath = TemplatesJarUtil.getJarFile(false, templatesDirectory);
-        boolean fileExists = jarPath.exists();
+    if (ResourcesPluginUtil.getTemplateSetPathAfterUpgrade() != null) {
+      return CobiGenFactory.create(ResourcesPluginUtil.getTemplateSetPathAfterUpgrade().toUri(),
+          allowMonolithicConfiguration);
+    }
+    if (generatorProj == null) {
+
+      // check adapted and downloaded folder
+      if (Files.exists(templateSetsAdaptedFolderPath) || Files.exists(templateSetsDownloadedFolderPath)) {
+        return CobiGenFactory.create(templatesDirectoryPath.toUri(), allowMonolithicConfiguration);
+      }
+      templatesDirectoryPath = CobiGenPaths.getTemplatesFolderPath();
+      if (Files.exists(templatesDirectoryPath)) {
+        // If it is not valid, we should use the jar
+        Path jarPath = TemplatesJarUtil.getJarFile(false, templatesDirectoryPath);
+        boolean fileExists = (jarPath != null && Files.exists(jarPath));
         if (!fileExists) {
           MessageDialog.openWarning(Display.getDefault().getActiveShell(), "Warning",
               "Not Downloaded the CobiGen Template Jar");
         }
-        return CobiGenFactory.create(jarPath.toURI());
-      } else {
-        return CobiGenFactory.create(generatorProj.getLocationURI());
+        return CobiGenFactory.create(jarPath.toUri(), allowMonolithicConfiguration);
       }
-    } catch (CoreException e) {
-      throw new GeneratorCreationException("An eclipse internal exception occurred", e);
-    } catch (Throwable e) {
+    }
+    if (generatorProj.getLocationURI() == null) {
       throw new GeneratorCreationException(
-          "Configuration source could not be read.\nIf you were updating templates, it may mean"
-              + " that you have no internet connection.",
-          e);
+          "Configuration source could not be read. Have you downloaded the templates?");
+    } else {
+      return CobiGenFactory.create(generatorProj.getLocationURI(), allowMonolithicConfiguration);
     }
   }
+
 }
diff --git a/cobigen-eclipse/cobigen-eclipse/src/com/devonfw/cobigen/eclipse/generator/generic/FileInputConverter.java b/cobigen-eclipse/cobigen-eclipse/src/com/devonfw/cobigen/eclipse/generator/generic/FileInputConverter.java
index e06e33fb5b..306b30d8c3 100644
--- a/cobigen-eclipse/cobigen-eclipse/src/com/devonfw/cobigen/eclipse/generator/generic/FileInputConverter.java
+++ b/cobigen-eclipse/cobigen-eclipse/src/com/devonfw/cobigen/eclipse/generator/generic/FileInputConverter.java
@@ -20,8 +20,6 @@
 
 /**
  * Converts IDE selection objects to valid CobiGen inputs
- *
- * @author mbrunnli (06.12.2014)
  */
 public class FileInputConverter {
 
diff --git a/cobigen-eclipse/cobigen-eclipse/src/com/devonfw/cobigen/eclipse/healthcheck/HealthCheckDialog.java b/cobigen-eclipse/cobigen-eclipse/src/com/devonfw/cobigen/eclipse/healthcheck/HealthCheckDialog.java
index 146dac88bb..8e3466dabb 100644
--- a/cobigen-eclipse/cobigen-eclipse/src/com/devonfw/cobigen/eclipse/healthcheck/HealthCheckDialog.java
+++ b/cobigen-eclipse/cobigen-eclipse/src/com/devonfw/cobigen/eclipse/healthcheck/HealthCheckDialog.java
@@ -1,6 +1,6 @@
 package com.devonfw.cobigen.eclipse.healthcheck;
 
-import java.io.File;
+import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
@@ -16,6 +16,7 @@
 import com.devonfw.cobigen.api.constants.BackupPolicy;
 import com.devonfw.cobigen.api.constants.ConfigurationConstants;
 import com.devonfw.cobigen.api.exception.ConfigurationConflictException;
+import com.devonfw.cobigen.api.exception.DeprecatedMonolithicConfigurationException;
 import com.devonfw.cobigen.api.exception.InvalidConfigurationException;
 import com.devonfw.cobigen.api.to.HealthCheckReport;
 import com.devonfw.cobigen.api.util.CobiGenPaths;
@@ -54,11 +55,23 @@ public HealthCheckDialog() {
     this.healthCheck = CobiGenFactory.createHealthCheck();
   }
 
+  /**
+   * @see #execute(boolean)
+   */
+  @SuppressWarnings("javadoc")
+  public void execute() {
+
+    execute(false);
+  }
+
   /**
    * Executes the simple health check, checking configuration project existence, validity of context configuration, as
    * well as validity of the current workbench selection as generation input.
+   *
+   * @param allowMonolithicConfiguration ignores deprecated monolithic template folder structure and if found does not
+   *        throw a DeprecatedMonolithicConfigurationException
    */
-  public void execute() {
+  public void execute(boolean allowMonolithicConfiguration) {
 
     String firstStep = "1. CobiGen configuration project '" + ResourceConstants.CONFIG_PROJECT_NAME + "'... ";
     String secondStep = "\n2. CobiGen context configuration '" + ConfigurationConstants.CONTEXT_CONFIG_FILENAME
@@ -78,11 +91,13 @@ public void execute() {
       this.report = performHealthCheckReport();
 
       if (generatorConfProj != null && generatorConfProj.getLocationURI() != null) {
-        CobiGenFactory.create(generatorConfProj.getLocationURI());
+
+        CobiGenFactory.create(generatorConfProj.getLocationURI(), allowMonolithicConfiguration);
+
       } else {
-        File templatesDirectory = CobiGenPaths.getTemplatesFolderPath().toFile();
-        File jarPath = TemplatesJarUtil.getJarFile(false, templatesDirectory);
-        boolean fileExists = jarPath.exists();
+        Path templatesDirectoryPath = CobiGenPaths.getTemplatesFolderPath();
+        Path jarPath = TemplatesJarUtil.getJarFile(false, templatesDirectoryPath);
+        boolean fileExists = (jarPath != null && Files.exists(jarPath));
         if (!fileExists) {
           MessageDialog.openWarning(Display.getDefault().getActiveShell(), "Warning",
               "Not Downloaded the CobiGen Template Jar");
@@ -133,7 +148,7 @@ public void execute() {
               @Override
               public void run() {
 
-                execute();
+                execute(allowMonolithicConfiguration);
               }
             });
           }
@@ -149,6 +164,9 @@ public void run() {
         PlatformUIUtil.openErrorDialog(healthyCheckMessage, null);
       }
       LOG.warn(healthyCheckMessage, e);
+    } catch (DeprecatedMonolithicConfigurationException e) {
+      // TODO: Check what to do here, see: https://github.com/devonfw/cobigen/issues/1675
+      throw e;
     } catch (Throwable e) {
       healthyCheckMessage = "An unexpected error occurred! Templates were not found.";
       if (this.report != null && healthyCheckMessage != null) {
diff --git a/cobigen-eclipse/cobigen-eclipse/src/com/devonfw/cobigen/eclipse/wizard/common/model/JavaClasspathUtil.java b/cobigen-eclipse/cobigen-eclipse/src/com/devonfw/cobigen/eclipse/wizard/common/model/JavaClasspathUtil.java
index 77d3b10dc2..70118ec430 100644
--- a/cobigen-eclipse/cobigen-eclipse/src/com/devonfw/cobigen/eclipse/wizard/common/model/JavaClasspathUtil.java
+++ b/cobigen-eclipse/cobigen-eclipse/src/com/devonfw/cobigen/eclipse/wizard/common/model/JavaClasspathUtil.java
@@ -13,7 +13,6 @@
 /**
  * This util provides JDT classpath operations
  *
- * @author <a href="m_brunnl@cs.uni-kl.de">Malte Brunnlieb</a>
  * @version $Revision$
  */
 public class JavaClasspathUtil {
diff --git a/cobigen-eclipse/cobigen-eclipse/src/com/devonfw/cobigen/eclipse/wizard/common/model/stubs/ICompilationUnitStub.java b/cobigen-eclipse/cobigen-eclipse/src/com/devonfw/cobigen/eclipse/wizard/common/model/stubs/ICompilationUnitStub.java
index d4238e271b..a17e589955 100644
--- a/cobigen-eclipse/cobigen-eclipse/src/com/devonfw/cobigen/eclipse/wizard/common/model/stubs/ICompilationUnitStub.java
+++ b/cobigen-eclipse/cobigen-eclipse/src/com/devonfw/cobigen/eclipse/wizard/common/model/stubs/ICompilationUnitStub.java
@@ -24,8 +24,6 @@
 
 /**
  * Stub for {@link ICompilationUnit} in order to simulate resources in the generate wizard
- *
- * @author mbrunnli (05.04.2014)
  */
 @SuppressWarnings("deprecation")
 public class ICompilationUnitStub extends IJavaElementStub implements ICompilationUnit {
diff --git a/cobigen-eclipse/cobigen-eclipse/src/com/devonfw/cobigen/eclipse/wizard/common/model/stubs/IFileStub.java b/cobigen-eclipse/cobigen-eclipse/src/com/devonfw/cobigen/eclipse/wizard/common/model/stubs/IFileStub.java
index 6f881fcf39..3409528fc1 100644
--- a/cobigen-eclipse/cobigen-eclipse/src/com/devonfw/cobigen/eclipse/wizard/common/model/stubs/IFileStub.java
+++ b/cobigen-eclipse/cobigen-eclipse/src/com/devonfw/cobigen/eclipse/wizard/common/model/stubs/IFileStub.java
@@ -13,8 +13,6 @@
 
 /**
  * Stub for {@link IFile} in order to simulate resources in the generate wizard
- *
- * @author mbrunnli (06.04.2014)
  */
 public class IFileStub extends IResourceStub implements IFile {
 
diff --git a/cobigen-eclipse/cobigen-eclipse/src/com/devonfw/cobigen/eclipse/wizard/common/model/stubs/IFolderStub.java b/cobigen-eclipse/cobigen-eclipse/src/com/devonfw/cobigen/eclipse/wizard/common/model/stubs/IFolderStub.java
index a15dc3957c..a3261e7cde 100644
--- a/cobigen-eclipse/cobigen-eclipse/src/com/devonfw/cobigen/eclipse/wizard/common/model/stubs/IFolderStub.java
+++ b/cobigen-eclipse/cobigen-eclipse/src/com/devonfw/cobigen/eclipse/wizard/common/model/stubs/IFolderStub.java
@@ -13,8 +13,6 @@
 
 /**
  * Stub for {@link IFolder} in order to simulate resources in the generate wizard
- *
- * @author mbrunnli (06.04.2014)
  */
 public class IFolderStub extends IResourceStub implements IFolder {
 
diff --git a/cobigen-eclipse/cobigen-eclipse/src/com/devonfw/cobigen/eclipse/wizard/common/model/stubs/IPackageFragmentRootStub.java b/cobigen-eclipse/cobigen-eclipse/src/com/devonfw/cobigen/eclipse/wizard/common/model/stubs/IPackageFragmentRootStub.java
index e76de82661..fc1883d882 100644
--- a/cobigen-eclipse/cobigen-eclipse/src/com/devonfw/cobigen/eclipse/wizard/common/model/stubs/IPackageFragmentRootStub.java
+++ b/cobigen-eclipse/cobigen-eclipse/src/com/devonfw/cobigen/eclipse/wizard/common/model/stubs/IPackageFragmentRootStub.java
@@ -17,8 +17,6 @@
 
 /**
  * Stub for {@link IPackageFragmentRoot} in order to simulate resources in the generate wizard
- *
- * @author mbrunnli (05.04.2014)
  */
 public class IPackageFragmentRootStub implements IPackageFragmentRoot {
 
diff --git a/cobigen-eclipse/cobigen-eclipse/src/com/devonfw/cobigen/eclipse/wizard/common/widget/SimulatedCheckboxTreeViewer.java b/cobigen-eclipse/cobigen-eclipse/src/com/devonfw/cobigen/eclipse/wizard/common/widget/SimulatedCheckboxTreeViewer.java
index 0fd77362a1..ead67fa160 100644
--- a/cobigen-eclipse/cobigen-eclipse/src/com/devonfw/cobigen/eclipse/wizard/common/widget/SimulatedCheckboxTreeViewer.java
+++ b/cobigen-eclipse/cobigen-eclipse/src/com/devonfw/cobigen/eclipse/wizard/common/widget/SimulatedCheckboxTreeViewer.java
@@ -67,7 +67,6 @@ public boolean setChecked(Object element, boolean state) {
    * @param element to be checked
    * @return <code>true</code> if the element is currently visible<br>
    *         <code>false</code> otherwise
-   * @author mbrunnli (12.03.2013)
    */
   private boolean isVisible(Object element) {
 
diff --git a/cobigen-eclipse/cobigen-eclipse/src/com/devonfw/cobigen/eclipse/workbenchcontrol/ConfigurationProjectListener.java b/cobigen-eclipse/cobigen-eclipse/src/com/devonfw/cobigen/eclipse/workbenchcontrol/ConfigurationProjectListener.java
index 8e7bacc804..6e310e1bdd 100644
--- a/cobigen-eclipse/cobigen-eclipse/src/com/devonfw/cobigen/eclipse/workbenchcontrol/ConfigurationProjectListener.java
+++ b/cobigen-eclipse/cobigen-eclipse/src/com/devonfw/cobigen/eclipse/workbenchcontrol/ConfigurationProjectListener.java
@@ -18,8 +18,6 @@
  * {@link ConfigurationProjectListener} for starting / stopping the {@link LogbackConfigChangeListener}. This class is
  * an abstract, due to the potential need of having multiple nested {@link IResourceChangeListener} for the CobiGen
  * configuration.
- *
- * @author mbrunnli (08.04.2013)
  */
 public class ConfigurationProjectListener implements IResourceChangeListener {
 
diff --git a/cobigen-eclipse/cobigen-eclipse/src/com/devonfw/cobigen/eclipse/workbenchcontrol/handler/GenerateHandler.java b/cobigen-eclipse/cobigen-eclipse/src/com/devonfw/cobigen/eclipse/workbenchcontrol/handler/GenerateHandler.java
index 938eec18bc..48132bd0b6 100644
--- a/cobigen-eclipse/cobigen-eclipse/src/com/devonfw/cobigen/eclipse/workbenchcontrol/handler/GenerateHandler.java
+++ b/cobigen-eclipse/cobigen-eclipse/src/com/devonfw/cobigen/eclipse/workbenchcontrol/handler/GenerateHandler.java
@@ -18,8 +18,6 @@
 
 /**
  * Handler for the Package-Explorer Event
- *
- * @author mbrunnli (13.02.2013)
  */
 public class GenerateHandler extends AbstractHandler {
 
diff --git a/cobigen-eclipse/cobigen-eclipse/src/com/devonfw/cobigen/eclipse/workbenchcontrol/handler/GenerateJob.java b/cobigen-eclipse/cobigen-eclipse/src/com/devonfw/cobigen/eclipse/workbenchcontrol/handler/GenerateJob.java
index 9ae3340701..9695cd5414 100644
--- a/cobigen-eclipse/cobigen-eclipse/src/com/devonfw/cobigen/eclipse/workbenchcontrol/handler/GenerateJob.java
+++ b/cobigen-eclipse/cobigen-eclipse/src/com/devonfw/cobigen/eclipse/workbenchcontrol/handler/GenerateJob.java
@@ -22,6 +22,7 @@
 import com.devonfw.cobigen.eclipse.generator.GeneratorWrapperFactory;
 import com.devonfw.cobigen.eclipse.wizard.generate.GenerateBatchWizard;
 import com.devonfw.cobigen.eclipse.wizard.generate.GenerateWizard;
+import com.devonfw.cobigen.impl.util.PostponeUtil;
 
 /**
  *
@@ -59,13 +60,16 @@ public void run(IProgressMonitor monitor) throws InvocationTargetException, Inte
 
     MDC.put(InfrastructureConstants.CORRELATION_ID, this.correlationId);
 
-    // when this handler is executed, we should we should be sure, that the selection is currently
-    // supported by the following implementation
+    // when this handler is executed, we should be sure, that the selection is currently supported by the following
+    // implementation
 
     try {
       LOG.info("Initiating CobiGen...");
       monitor.beginTask("Initiating CobiGen...", 1);
-      CobiGenWrapper generator = GeneratorWrapperFactory.createGenerator(this.selection, monitor);
+      // TODO: Check this, see: https://github.com/devonfw/cobigen/issues/1679
+      if (PostponeUtil.isTimePassed())
+        checkMonolithicConfigurationException(monitor);
+      CobiGenWrapper generator = GeneratorWrapperFactory.createGenerator(this.selection, monitor, true);
       monitor.worked(1);
       if (generator == null) {
         LOG.error("Invalid selection. No CobiGen instance created. Exiting generate command.");
@@ -109,4 +113,20 @@ public void run(IProgressMonitor monitor) throws InvocationTargetException, Inte
     MDC.remove(InfrastructureConstants.CORRELATION_ID);
   }
 
+  /**
+   * Checks if monolithic configuration exists, handles the exception and lets the user decide if the templates should
+   * be upgraded.
+   *
+   * @param monitor of run method
+   */
+  private void checkMonolithicConfigurationException(IProgressMonitor monitor) {
+
+    try {
+      GeneratorWrapperFactory.createGenerator(this.selection, monitor, false);
+    } catch (Throwable e) {
+      ExceptionHandler.handle(e, HandlerUtil.getActiveShell(this.event));
+    }
+
+  }
+
 }
diff --git a/cobigen-eclipse/cobigen-eclipse/src/com/devonfw/cobigen/eclipse/workbenchcontrol/handler/HealthCheckHandler.java b/cobigen-eclipse/cobigen-eclipse/src/com/devonfw/cobigen/eclipse/workbenchcontrol/handler/HealthCheckHandler.java
index 8218348617..0aba16dbc9 100644
--- a/cobigen-eclipse/cobigen-eclipse/src/com/devonfw/cobigen/eclipse/workbenchcontrol/handler/HealthCheckHandler.java
+++ b/cobigen-eclipse/cobigen-eclipse/src/com/devonfw/cobigen/eclipse/workbenchcontrol/handler/HealthCheckHandler.java
@@ -28,13 +28,30 @@ public Object execute(final ExecutionEvent event) throws ExecutionException {
 
     MDC.put(InfrastructureConstants.CORRELATION_ID, UUID.randomUUID().toString());
 
+    checkMonolithicConfigurationException(event);
     try {
-      new HealthCheckDialog().execute();
+      new HealthCheckDialog().execute(true);
     } catch (Throwable e) {
       ExceptionHandler.handle(e, HandlerUtil.getActiveShell(event));
     }
-
     MDC.remove(InfrastructureConstants.CORRELATION_ID);
     return null;
   }
+
+  /**
+   * checks if monolithic configuration exist, handles the exception and lets the user decide if the templates should be
+   * upgraded.
+   *
+   * @param event handler event executing this job.
+   *
+   */
+  private void checkMonolithicConfigurationException(ExecutionEvent event) {
+
+    try {
+      new HealthCheckDialog().execute();
+    } catch (Throwable e) {
+      ExceptionHandler.handle(e, HandlerUtil.getActiveShell(event));
+    }
+
+  }
 }
diff --git a/cobigen-eclipse/pom.xml b/cobigen-eclipse/pom.xml
index 2ec7ef8031..843c8c5424 100644
--- a/cobigen-eclipse/pom.xml
+++ b/cobigen-eclipse/pom.xml
@@ -5,25 +5,22 @@
   <artifactId>eclipse-parent</artifactId>
   <name>CobiGen - Eclipse Plug-In Parent</name>
   <packaging>pom</packaging>
-
   <parent>
     <groupId>com.devonfw.cobigen</groupId>
     <artifactId>master-parent</artifactId>
     <version>${revision}</version>
   </parent>
-
   <properties>
     <tycho-repo.url>https://oss.sonatype.org/content/groups/public/</tycho-repo.url>
-    <eclipse-repository>https://download.eclipse.org/releases/photon</eclipse-repository>
+    <!-- 2018-12 - first IDE version with java 11 support -->
+    <eclipse-repository>https://download.eclipse.org/releases/2018-12/</eclipse-repository>
   </properties>
-
   <modules>
     <module>cobigen-eclipse</module>
     <module>cobigen-eclipse-test</module>
     <module>cobigen-eclipse-feature</module>
     <module>cobigen-eclipse-updatesite</module>
   </modules>
-
   <build>
     <plugins>
       <!-- tycho-versions-plugin:set-version does not work properly as it always rewrites the pom.xml files, but we want
@@ -38,32 +35,29 @@
             <configuration>
               <target>
                 <taskdef resource="net/sf/antcontrib/antcontrib.properties"
-                  classpathref="maven.plugin.classpath"/>
-
+                  classpathref="maven.plugin.classpath" />
                 <propertyregex property="revision.p2" input="${revision}" regexp="-SNAPSHOT"
-                  replace=".qualifier" global="true" defaultValue="${revision}"/>
-
+                  replace=".qualifier" global="true" defaultValue="${revision}" />
                 <if>
-                  <available property="file.exists" file="./META-INF/MANIFEST.MF"/>
+                  <available property="file.exists" file="./META-INF/MANIFEST.MF" />
                   <then>
                     <replaceregexp file="./META-INF/MANIFEST.MF" match="(Bundle-Version:\s*)2[0-9a-z\.]+"
-                      replace="\1${revision.p2}" byline="true"/>
-                    <echo level="info" message="Set ./META-INF/MANIFEST.MF Bundle-Version to ${revision.p2}"/>
+                      replace="\1${revision.p2}" byline="true" />
+                    <echo level="info" message="Set ./META-INF/MANIFEST.MF Bundle-Version to ${revision.p2}" />
                   </then>
                   <else>
-                    <echo level="info" message="./META-INF/MANIFEST.MF does not exist"/>
+                    <echo level="info" message="./META-INF/MANIFEST.MF does not exist" />
                   </else>
                 </if>
-
                 <if>
-                  <available property="file.exists" file="./feature.xml"/>
+                  <available property="file.exists" file="./feature.xml" />
                   <then>
                     <replaceregexp file="./feature.xml" match="(version=&quot;)2[0-9a-z\.]+&quot;"
-                      replace="\1${revision.p2}&quot;" byline="true"/>
-                    <echo level="info" message="Set ./feature.xml version to ${revision.p2}"/>
+                      replace="\1${revision.p2}&quot;" byline="true" />
+                    <echo level="info" message="Set ./feature.xml version to ${revision.p2}" />
                   </then>
                   <else>
-                    <echo level="info" message="./feature.xml does not exist"/>
+                    <echo level="info" message="./feature.xml does not exist" />
                   </else>
                 </if>
               </target>
@@ -146,8 +140,8 @@
         <configuration>
           <useProjectSettings>true</useProjectSettings>
           <compilerArguments>
-            <inlineJSR/>
-            <enableJavadoc/>
+            <inlineJSR />
+            <enableJavadoc />
             <encoding>${project.build.sourceEncoding}</encoding>
           </compilerArguments>
         </configuration>
@@ -157,7 +151,7 @@
         <artifactId>target-platform-configuration</artifactId>
         <version>${tycho.version}</version>
         <configuration>
-          <executionEnvironment>JavaSE-1.8</executionEnvironment>
+          <executionEnvironment>JavaSE-11</executionEnvironment>
           <environments>
             <environment>
               <os>linux</os>
@@ -232,65 +226,6 @@
       </plugins>
     </pluginManagement>
   </build>
-
-  <profiles>
-    <profile>
-      <id>p2-build</id>
-      <repositories>
-        <repository>
-          <id>htmlplugin</id>
-          <url>file:///${maven.multiModuleProjectDirectory}/cobigen-plugins/cobigen-htmlplugin/target/repository</url>
-          <layout>p2</layout>
-        </repository>
-        <repository>
-          <id>javaplugin</id>
-          <url>file:///${maven.multiModuleProjectDirectory}/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/target/repository</url>
-          <layout>p2</layout>
-        </repository>
-        <repository>
-          <id>jsonplugin</id>
-          <url>file:///${maven.multiModuleProjectDirectory}/cobigen-plugins/cobigen-jsonplugin/target/repository</url>
-          <layout>p2</layout>
-        </repository>
-        <repository>
-          <id>openapiplugin</id>
-          <url>file:///${maven.multiModuleProjectDirectory}/cobigen-plugins/cobigen-openapiplugin-parent/cobigen-openapiplugin/target/repository</url>
-          <layout>p2</layout>
-        </repository>
-        <repository>
-          <id>propertyplugin</id>
-          <url>file:///${maven.multiModuleProjectDirectory}/cobigen-plugins/cobigen-propertyplugin/target/repository</url>
-          <layout>p2</layout>
-        </repository>
-        <repository>
-          <id>freemarker</id>
-          <url>file:///${maven.multiModuleProjectDirectory}/cobigen-plugins/cobigen-templateengines/cobigen-tempeng-freemarker/target/repository</url>
-          <layout>p2</layout>
-        </repository>
-        <repository>
-          <id>velocity</id>
-          <url>file:///${maven.multiModuleProjectDirectory}/cobigen-plugins/cobigen-templateengines/cobigen-tempeng-velocity/target/repository</url>
-          <layout>p2</layout>
-        </repository>
-        <repository>
-          <id>textmerger</id>
-          <url>file:///${maven.multiModuleProjectDirectory}/cobigen-plugins/cobigen-textmerger/target/repository</url>
-          <layout>p2</layout>
-        </repository>
-        <repository>
-          <id>tsplugin</id>
-          <url>file:///${maven.multiModuleProjectDirectory}/cobigen-plugins/cobigen-tsplugin/target/repository</url>
-          <layout>p2</layout>
-        </repository>
-        <repository>
-          <id>xmlplugin</id>
-          <url>file:///${maven.multiModuleProjectDirectory}/cobigen-plugins/cobigen-xmlplugin/target/repository</url>
-          <layout>p2</layout>
-        </repository>
-      </repositories>
-    </profile>
-  </profiles>
-
   <repositories>
     <repository>
       <id>eclipse-repository</id>
@@ -298,7 +233,6 @@
       <layout>p2</layout>
     </repository>
   </repositories>
-
   <pluginRepositories>
     <pluginRepository>
       <id>tycho</id>
diff --git a/cobigen-maven/cobigen-maven-plugin/src/main/java/com/devonfw/cobigen/maven/GenerateMojo.java b/cobigen-maven/cobigen-maven-plugin/src/main/java/com/devonfw/cobigen/maven/GenerateMojo.java
index 21a6d1db0e..b902dd8fc8 100644
--- a/cobigen-maven/cobigen-maven-plugin/src/main/java/com/devonfw/cobigen/maven/GenerateMojo.java
+++ b/cobigen-maven/cobigen-maven-plugin/src/main/java/com/devonfw/cobigen/maven/GenerateMojo.java
@@ -158,13 +158,13 @@ private CobiGen createCobiGenInstance() {
 
     if (this.configurationFolder != null) {
       getLog().debug("ConfigurationFolder configured as " + this.configurationFolder.toURI().toString());
-      cobiGen = CobiGenFactory.create(this.configurationFolder.toURI());
+      cobiGen = CobiGenFactory.create(this.configurationFolder.toURI(), true);
     } else {
       final ClassRealm classRealm = this.pluginDescriptor.getClassRealm();
       URL contextConfigurationLocation = ConfigurationClassLoaderUtil.getContextConfiguration(classRealm);
       URI configFile = URI.create(contextConfigurationLocation.getFile().toString().split("!")[0]);
       getLog().debug("Reading configuration from file " + configFile.toString());
-      cobiGen = CobiGenFactory.create(configFile);
+      cobiGen = CobiGenFactory.create(configFile, true);
     }
     return cobiGen;
   }
diff --git a/cobigen-maven/cobigen-maven-plugin/src/main/java/com/devonfw/cobigen/maven/utils/XmlUtil.java b/cobigen-maven/cobigen-maven-plugin/src/main/java/com/devonfw/cobigen/maven/utils/XmlUtil.java
index 72c426887f..f90becebaf 100644
--- a/cobigen-maven/cobigen-maven-plugin/src/main/java/com/devonfw/cobigen/maven/utils/XmlUtil.java
+++ b/cobigen-maven/cobigen-maven-plugin/src/main/java/com/devonfw/cobigen/maven/utils/XmlUtil.java
@@ -11,10 +11,6 @@
 import org.w3c.dom.Document;
 import org.xml.sax.SAXException;
 
-/**
- *
- * @author fkreis (28.11.2014)
- */
 public class XmlUtil {
 
   /**
@@ -22,7 +18,6 @@ public class XmlUtil {
    *
    * @param file the file (xml) to parse
    * @return a DOM {@link Document} according to the
-   * @author fkreis (28.11.2014)
    * @throws IOException thrown if input File cannot be found
    * @throws SAXException thrown if input file is not a valid xml document
    * @throws ParserConfigurationException thrown if document builder is configured wrong
@@ -41,7 +36,6 @@ public static Document parseXmlFileToDom(File file) throws SAXException, IOExcep
    *
    * @param stream the inputstream (xml) to parse
    * @return a DOM {@link Document} according to the
-   * @author fkreis (28.11.2014)
    * @throws IOException thrown if input File cannot be found
    * @throws SAXException thrown if input file is not a valid xml document
    * @throws ParserConfigurationException thrown if document builder is configured wrong
diff --git a/cobigen-maven/cobigen-maven-plugin/src/main/java/com/devonfw/cobigen/maven/validation/InputValidator.java b/cobigen-maven/cobigen-maven-plugin/src/main/java/com/devonfw/cobigen/maven/validation/InputValidator.java
index 5255518c57..09d1937af1 100644
--- a/cobigen-maven/cobigen-maven-plugin/src/main/java/com/devonfw/cobigen/maven/validation/InputValidator.java
+++ b/cobigen-maven/cobigen-maven-plugin/src/main/java/com/devonfw/cobigen/maven/validation/InputValidator.java
@@ -10,8 +10,6 @@
 
 /**
  * Input validator, which validates the increment and template declarations within the maven plugin configuration
- *
- * @author mbrunnli (09.02.2015)
  */
 public class InputValidator {
 
@@ -21,7 +19,6 @@ public class InputValidator {
    * @param templates available templates in the configuration
    * @param templateIdsToBeGenerated requested templates
    * @throws MojoExecutionException if one of the requested templates could not be found in configuration
-   * @author mbrunnli (11.02.2015)
    */
   public static void validateTemplateInputs(List<TemplateTo> templates, List<String> templateIdsToBeGenerated)
       throws MojoExecutionException {
@@ -43,7 +40,6 @@ public static void validateTemplateInputs(List<TemplateTo> templates, List<Strin
    * @param increments available increments in the configuration
    * @param templateIdsToBeGenerated requested increments
    * @throws MojoExecutionException if one of the requested increments could not be found in the configuration
-   * @author mbrunnli (11.02.2015)
    */
   public static void validateIncrementInputs(List<IncrementTo> increments, List<String> templateIdsToBeGenerated)
       throws MojoExecutionException {
diff --git a/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Devon4JTemplateTest/templates-classloading-testclasses/context.xml b/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Devon4JTemplateTest/templates-classloading-testclasses/context.xml
index 3a6bf7b89e..49e1f25a05 100644
--- a/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Devon4JTemplateTest/templates-classloading-testclasses/context.xml
+++ b/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Devon4JTemplateTest/templates-classloading-testclasses/context.xml
@@ -5,5 +5,5 @@
         <matcher type="fqn" value=".*">
         </matcher>
     </trigger>
-    
+
 </contextConfiguration>
diff --git a/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Devon4JTemplateTest/templates-devon4j/pom.xml b/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Devon4JTemplateTest/templates-devon4j/pom.xml
index 1c77f00222..fee60abc66 100644
--- a/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Devon4JTemplateTest/templates-devon4j/pom.xml
+++ b/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Devon4JTemplateTest/templates-devon4j/pom.xml
@@ -41,7 +41,7 @@
     <dependency>
       <groupId>org.springframework.data</groupId>
       <artifactId>spring-data-rest-webmvc</artifactId>
-      <version>3.0.9.RELEASE</version>
+      <version>3.7.10</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
diff --git a/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Oasp4JTemplateTest/templates-classloading-testclasses/context.xml b/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Oasp4JTemplateTest/templates-classloading-testclasses/context.xml
index 3a6bf7b89e..49e1f25a05 100644
--- a/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Oasp4JTemplateTest/templates-classloading-testclasses/context.xml
+++ b/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Oasp4JTemplateTest/templates-classloading-testclasses/context.xml
@@ -5,5 +5,5 @@
         <matcher type="fqn" value=".*">
         </matcher>
     </trigger>
-    
+
 </contextConfiguration>
diff --git a/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Oasp4JTemplateTest/templates-oasp4j/context.xml b/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Oasp4JTemplateTest/templates-oasp4j/context.xml
index 535a10ebe0..dc1baefced 100644
--- a/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Oasp4JTemplateTest/templates-oasp4j/context.xml
+++ b/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Oasp4JTemplateTest/templates-oasp4j/context.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="2.1">
+<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="3.0">
 
     <trigger id="crud_java_server_app" type="java" templateFolder="crud_java_server_app">
         <containerMatcher type="package" value="((.+\.)?([^\.]+))\.([^\.]+)\.dataaccess\.api" retrieveObjectsRecursively="false"/>
@@ -10,4 +10,7 @@
             <variableAssignment type="regex" key="entityName" value="5"/>
         </matcher>
     </trigger>
+  <tags>
+    <tag name="bla" />
+  </tags>
 </contextConfiguration>
diff --git a/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Oasp4JTemplateTest/templates-oasp4j/src/main/java/constants/pojo/Field.java b/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Oasp4JTemplateTest/templates-oasp4j/src/main/java/constants/pojo/Field.java
index 19349c5758..43b315091c 100644
--- a/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Oasp4JTemplateTest/templates-oasp4j/src/main/java/constants/pojo/Field.java
+++ b/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Oasp4JTemplateTest/templates-oasp4j/src/main/java/constants/pojo/Field.java
@@ -2,8 +2,6 @@
 
 /**
  * Contains the used keys for the pojo field Map&lt;String, Object>
- *
- * @author sholzer
  */
 public enum Field {
 
diff --git a/cobigen-maven/cobigen-maven-test/src/main/java/com/devonfw/cobigen/maven/test/AbstractMavenTest.java b/cobigen-maven/cobigen-maven-test/src/main/java/com/devonfw/cobigen/maven/test/AbstractMavenTest.java
index b03e54e7b3..1bad7aa54c 100644
--- a/cobigen-maven/cobigen-maven-test/src/main/java/com/devonfw/cobigen/maven/test/AbstractMavenTest.java
+++ b/cobigen-maven/cobigen-maven-test/src/main/java/com/devonfw/cobigen/maven/test/AbstractMavenTest.java
@@ -10,6 +10,7 @@
 
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.maven.shared.invoker.DefaultInvocationRequest;
 import org.apache.maven.shared.invoker.DefaultInvoker;
 import org.apache.maven.shared.invoker.InvocationRequest;
@@ -60,7 +61,7 @@ public void getSettingsFile() throws IOException {
     this.mvnSettingsFile = this.tmpFolder.newFile();
     Files.write(this.mvnSettingsFile.toPath(),
         IOUtils.toByteArray(AbstractMavenTest.class.getResourceAsStream("/test-maven-settings.xml")));
-    LOG.info("Temporary settings file created in " + this.mvnSettingsFile.getAbsolutePath());
+    LOG.info("Temporary settings file created in {}", this.mvnSettingsFile.getAbsolutePath());
   }
 
   /**
@@ -138,9 +139,14 @@ protected File runMavenInvoker(File testProject, File templatesProject, String l
     request.setUserSettingsFile(this.mvnSettingsFile);
     request.setBatchMode(true);
     // https://stackoverflow.com/a/66801171
-    request.setMavenOpts(
-        "-Xmx4096m -Djansi.force=true -Djansi.passthrough=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn "
-            + MavenMetadata.JACOCO_AGENT_ARGS);
+    if (!StringUtils.startsWith(MavenMetadata.JACOCO_AGENT_ARGS, "$")) {
+      request.setMavenOpts(
+          "-Xmx4096m -Djansi.force=true -Djansi.passthrough=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn "
+              + MavenMetadata.JACOCO_AGENT_ARGS);
+    } else {
+      request.setMavenOpts(
+          "-Xmx4096m -Djansi.force=true -Djansi.passthrough=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn");
+    }
 
     Invoker invoker = new DefaultInvoker();
     LOG.info("Executing maven invoker for unit test ...");
diff --git a/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin-model/src/main/java/com/devonfw/cobigen/javaplugin/model/JavaModelUtil.java b/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin-model/src/main/java/com/devonfw/cobigen/javaplugin/model/JavaModelUtil.java
index 5a6cf69dd0..d50908af28 100644
--- a/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin-model/src/main/java/com/devonfw/cobigen/javaplugin/model/JavaModelUtil.java
+++ b/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin-model/src/main/java/com/devonfw/cobigen/javaplugin/model/JavaModelUtil.java
@@ -4,9 +4,7 @@
 import java.util.Map;
 
 /**
- * * The {@link JavaModelUtil} class provides helper functions to access the given model.
- *
- * @author fkreis (25.09.2014)
+ *  The {@link JavaModelUtil} class provides helper functions to access the given model.
  */
 public class JavaModelUtil {
 
@@ -73,7 +71,6 @@ public static Map<String, Object> getField(Map<String, Object> model, String fie
    *
    * @param model raw model
    * @return the list of all field models
-   * @author mbrunnli (17.11.2014)
    */
   public static List<Map<String, Object>> getMethodAccessibleFields(Map<String, Object> model) {
 
@@ -89,7 +86,6 @@ public static List<Map<String, Object>> getMethodAccessibleFields(Map<String, Ob
    * @param model raw model
    * @param fieldName field name to be retrieved
    * @return the field model for the given field name if such a field exists, otherwise null.
-   * @author mbrunnli (17.11.2014)
    */
   public static Map<String, Object> getMethodAccessibleField(Map<String, Object> model, String fieldName) {
 
@@ -169,7 +165,6 @@ public static List<Map<String, Object>> getMethods(Map<String, Object> model) {
    * @param methodName method name to search for
    * @return method model for the method with the given name or <code>null</code> if no method with the given name
    *         found.
-   * @author mbrunnli (30.01.2015)
    */
   public static Map<String, Object> getMethod(Map<String, Object> model, String methodName) {
 
@@ -211,7 +206,6 @@ public static String getCanonicalName(Map<String, Object> model) {
    *
    * @param documentedElementModel element model, from which the javaDoc model should be retrieved.
    * @return the JavaDoc model or <code>null</code> if not available.
-   * @author mbrunnli (30.01.2015)
    */
   public static Map<String, Object> getJavaDocModel(Map<String, Object> documentedElementModel) {
 
diff --git a/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin-model/src/main/java/com/devonfw/cobigen/javaplugin/model/ModelConstant.java b/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin-model/src/main/java/com/devonfw/cobigen/javaplugin/model/ModelConstant.java
index 623b029ea4..e8c12ef276 100644
--- a/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin-model/src/main/java/com/devonfw/cobigen/javaplugin/model/ModelConstant.java
+++ b/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin-model/src/main/java/com/devonfw/cobigen/javaplugin/model/ModelConstant.java
@@ -5,9 +5,6 @@
 
 /**
  * String constants of the java object model for generation. Outcome of the JavaInputReader.
- *
- * @author <a href="m_brunnl@cs.uni-kl.de">Malte Brunnlieb</a>
- * @version $Revision$
  */
 public class ModelConstant {
 
diff --git a/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/pom.xml b/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/pom.xml
index 9af6e682ca..96b8330e91 100644
--- a/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/pom.xml
+++ b/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/pom.xml
@@ -56,9 +56,21 @@
     </dependency>
 
     <dependency>
-      <groupId>net.sf.m-m-m</groupId>
+      <groupId>io.github.m-m-m</groupId>
       <artifactId>mmm-code-java-impl</artifactId>
-      <version>1.0.0-beta7</version>
+      <version>0.9.1</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.maven</groupId>
+          <artifactId>maven-core</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+
+    <dependency>
+      <groupId>net.sf.m-m-m</groupId>
+      <artifactId>mmm-util-pojo</artifactId>
+      <version>8.7.0</version>
       <exclusions>
         <exclusion>
           <groupId>org.apache.maven</groupId>
diff --git a/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/main/java/com/devonfw/cobigen/javaplugin/inputreader/JavaInputReader.java b/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/main/java/com/devonfw/cobigen/javaplugin/inputreader/JavaInputReader.java
index 991e359711..d6c5274fd5 100644
--- a/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/main/java/com/devonfw/cobigen/javaplugin/inputreader/JavaInputReader.java
+++ b/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/main/java/com/devonfw/cobigen/javaplugin/inputreader/JavaInputReader.java
@@ -187,7 +187,6 @@ public List<Object> getInputObjects(Object input, Charset inputCharset, boolean
    * @param packageFolder the package's folder
    * @param recursively states whether the java source files should be retrieved recursively
    * @return the list of files contained in the package's folder
-   * @author mbrunnli (03.06.2014)
    */
   private List<File> retrieveAllJavaSourceFiles(File packageFolder, boolean recursively) {
 
diff --git a/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/main/java/com/devonfw/cobigen/javaplugin/inputreader/JavaParserUtil.java b/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/main/java/com/devonfw/cobigen/javaplugin/inputreader/JavaParserUtil.java
index 984ad133a5..382efa2ba0 100644
--- a/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/main/java/com/devonfw/cobigen/javaplugin/inputreader/JavaParserUtil.java
+++ b/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/main/java/com/devonfw/cobigen/javaplugin/inputreader/JavaParserUtil.java
@@ -8,11 +8,6 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
-import net.sf.mmm.code.impl.java.JavaContext;
-import net.sf.mmm.code.impl.java.source.maven.JavaSourceProviderUsingMaven;
-import net.sf.mmm.code.impl.java.source.maven.MavenDependencyCollector;
-import net.sf.mmm.code.java.maven.impl.MavenBridgeImpl;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -24,7 +19,14 @@
 import com.thoughtworks.qdox.model.JavaClass;
 import com.thoughtworks.qdox.model.JavaSource;
 
-/** The {@link JavaParserUtil} class provides helper functions for generating parsed inputs */
+import io.github.mmm.code.impl.java.JavaContext;
+import io.github.mmm.code.impl.java.source.maven.JavaSourceProviderUsingMaven;
+import io.github.mmm.code.impl.java.source.maven.MavenDependencyCollector;
+import io.github.mmm.code.java.maven.impl.MavenBridgeImpl;
+
+/**
+ * The {@link JavaParserUtil} class provides helper functions for generating parsed inputs
+ */
 public class JavaParserUtil {
 
   /** Logger instance. */
diff --git a/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/main/java/com/devonfw/cobigen/javaplugin/inputreader/ReflectedJavaModelBuilder.java b/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/main/java/com/devonfw/cobigen/javaplugin/inputreader/ReflectedJavaModelBuilder.java
index 609fcf0911..c4fbf3cbca 100644
--- a/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/main/java/com/devonfw/cobigen/javaplugin/inputreader/ReflectedJavaModelBuilder.java
+++ b/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/main/java/com/devonfw/cobigen/javaplugin/inputreader/ReflectedJavaModelBuilder.java
@@ -179,7 +179,8 @@ private Map<String, Object> extractFieldProperties(Field field) {
 
     Map<String, Object> fieldValues = new HashMap<>();
     fieldValues.put(ModelConstant.NAME, field.getName());
-    // build type name with type parameters (parameter types cannot be retrieved, so use generic
+    // build type name with type parameters (parameter types cannot be retrieved, so
+    // use generic
     // parameter '?'
     String type = field.getType().getSimpleName();
     if (field.getType().getTypeParameters().length > 0) {
diff --git a/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/main/java/com/devonfw/cobigen/javaplugin/matcher/JavaMatcher.java b/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/main/java/com/devonfw/cobigen/javaplugin/matcher/JavaMatcher.java
index ba3df62ae6..6d0c11d33e 100644
--- a/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/main/java/com/devonfw/cobigen/javaplugin/matcher/JavaMatcher.java
+++ b/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/main/java/com/devonfw/cobigen/javaplugin/matcher/JavaMatcher.java
@@ -135,7 +135,6 @@ private String getFqn(MatcherTo matcher) {
    * @param variableAssignments variable assigments to be resolved
    * @return a {@link Map} from variable name to the resolved value
    * @throws InvalidConfigurationException if some of the matcher type and variable type combinations are not supported
-   * @author mbrunnli (15.04.2013)
    */
   public Map<String, String> getResolvedVariables(MatcherType matcherType, String matcherValue, String stringToMatch,
       List<VariableAssignmentTo> variableAssignments) throws InvalidConfigurationException {
@@ -165,7 +164,6 @@ public Map<String, String> getResolvedVariables(MatcherType matcherType, String
    * @param va {@link VariableAssignmentTo} to be resolved
    * @return the resolved variable
    * @throws InvalidConfigurationException thrown if the matcher type and matcher value does not work in combination
-   * @author mbrunnli (08.04.2014)
    */
   private String resolveRegexValue(MatcherType matcherType, String matcherValue, String stringToMatch,
       VariableAssignmentTo va) throws InvalidConfigurationException {
diff --git a/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/main/java/com/devonfw/cobigen/javaplugin/matcher/resolver/TriggerExpressionResolver.java b/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/main/java/com/devonfw/cobigen/javaplugin/matcher/resolver/TriggerExpressionResolver.java
index 6b2e56335f..31393409b0 100644
--- a/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/main/java/com/devonfw/cobigen/javaplugin/matcher/resolver/TriggerExpressionResolver.java
+++ b/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/main/java/com/devonfw/cobigen/javaplugin/matcher/resolver/TriggerExpressionResolver.java
@@ -39,7 +39,6 @@ public class TriggerExpressionResolver {
    * Creates a new {@link TriggerExpressionResolver} for the given pojo with its {@link ClassLoader}
    *
    * @param reflectionClass current triggered POJO {@link Class}
-   * @author mbrunnli (15.04.2013)
    */
   public TriggerExpressionResolver(Class<?> reflectionClass) {
 
@@ -50,7 +49,6 @@ public TriggerExpressionResolver(Class<?> reflectionClass) {
    * Creates a new {@link TriggerExpressionResolver} for the given parsed {@link JavaClass}
    *
    * @param parsedClass parsed {@link JavaClass}
-   * @author mbrunnli (24.02.2015)
    */
   public TriggerExpressionResolver(JavaClass parsedClass) {
 
diff --git a/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/main/java/com/devonfw/cobigen/javaplugin/merger/JavaMerger.java b/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/main/java/com/devonfw/cobigen/javaplugin/merger/JavaMerger.java
index 19dbcae867..30b0594e82 100644
--- a/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/main/java/com/devonfw/cobigen/javaplugin/merger/JavaMerger.java
+++ b/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/main/java/com/devonfw/cobigen/javaplugin/merger/JavaMerger.java
@@ -33,8 +33,6 @@
 /**
  * The {@link JavaMerger} merges a patch and the base file of the same class. This merge is a structural merge
  * considering code blocks of fields, methods and inner classes. There will be no merging on statement level
- *
- * @author mbrunnli (19.03.2013)
  */
 public class JavaMerger implements Merger {
 
@@ -54,7 +52,6 @@ public class JavaMerger implements Merger {
    * @param type merger type
    * @param patchOverrides if <code>true</code>, conflicts will be resolved by using the patch contents<br>
    *        if <code>false</code>, conflicts will be resolved by using the base contents
-   * @author mbrunnli (19.03.2013)
    */
   public JavaMerger(String type, boolean patchOverrides) {
 
@@ -114,7 +111,6 @@ public String merge(File base, String patch, String targetCharset) throws MergeE
    * @return the merged {@link JavaClass}
    * @param baseClass {@link JavaClass}
    * @param patchClass {@link JavaClass}
-   * @author mbrunnli (19.03.2013)
    */
   private ModifyableJavaClass merge(ModifyableJavaClass baseClass, ModifyableJavaClass patchClass) {
 
@@ -150,7 +146,6 @@ private List<JavaAnnotation> mergeAnnotation(List<JavaAnnotation> baseAnnotation
    *
    * @param baseClass {@link JavaClass}
    * @param patchClass {@link JavaClass}
-   * @author mbrunnli (03.06.2013)
    */
   private void mergeSupertypes(ModifyableJavaClass baseClass, ModifyableJavaClass patchClass) {
 
@@ -181,7 +176,6 @@ private void mergeSupertypes(ModifyableJavaClass baseClass, ModifyableJavaClass
    *
    * @param baseClass {@link JavaClass}
    * @param patchClass {@link JavaClass}
-   * @author mbrunnli (05.04.2013)
    */
   private void mergeImports(ModifyableJavaClass baseClass, ModifyableJavaClass patchClass) {
 
@@ -210,7 +204,6 @@ private void mergeImports(ModifyableJavaClass baseClass, ModifyableJavaClass pat
    *
    * @param canonicalName to be shortend
    * @return the Type name
-   * @author mbrunnli
    */
   private String getShortTypeName(String canonicalName) {
 
@@ -226,7 +219,6 @@ private String getShortTypeName(String canonicalName) {
    *
    * @param baseClass {@link JavaClass}
    * @param patchClass {@link JavaClass}
-   * @author mbrunnli (19.03.2013)
    */
   private void mergeInnerClasses(ModifyableJavaClass baseClass, ModifyableJavaClass patchClass) {
 
@@ -247,7 +239,6 @@ private void mergeInnerClasses(ModifyableJavaClass baseClass, ModifyableJavaClas
    *
    * @param baseClass {@link JavaClass}
    * @param patchClass {@link JavaClass}
-   * @author mbrunnli (19.03.2013)
    */
   private void mergeFields(ModifyableJavaClass baseClass, ModifyableJavaClass patchClass) {
 
@@ -270,7 +261,6 @@ private void mergeFields(ModifyableJavaClass baseClass, ModifyableJavaClass patc
    *
    * @param baseClass {@link JavaClass}
    * @param patchClass {@link JavaClass}
-   * @author mbrunnli (19.03.2013)
    */
   private void mergeMethods(ModifyableJavaClass baseClass, ModifyableJavaClass patchClass) {
 
diff --git a/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/main/java/com/devonfw/cobigen/javaplugin/merger/libextension/CustomModelWriterFactory.java b/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/main/java/com/devonfw/cobigen/javaplugin/merger/libextension/CustomModelWriterFactory.java
index 850b5cfe86..5b9834ddf9 100644
--- a/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/main/java/com/devonfw/cobigen/javaplugin/merger/libextension/CustomModelWriterFactory.java
+++ b/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/main/java/com/devonfw/cobigen/javaplugin/merger/libextension/CustomModelWriterFactory.java
@@ -5,8 +5,6 @@
 
 /**
  * The {@link ModelWriterFactory} returning new instances of {@link CustomModelWriter}
- *
- * @author mbrunnli (04.04.2013)
  */
 public class CustomModelWriterFactory implements ModelWriterFactory {
 
diff --git a/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/main/java/com/devonfw/cobigen/javaplugin/merger/libextension/ExtendedJavaParameter.java b/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/main/java/com/devonfw/cobigen/javaplugin/merger/libextension/ExtendedJavaParameter.java
index bdb7c76ecd..24266450ff 100644
--- a/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/main/java/com/devonfw/cobigen/javaplugin/merger/libextension/ExtendedJavaParameter.java
+++ b/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/main/java/com/devonfw/cobigen/javaplugin/merger/libextension/ExtendedJavaParameter.java
@@ -10,8 +10,6 @@
 
 /**
  * Extension of the {@link JavaParameter} implementation in order to support modifiers
- *
- * @author mbrunnli (10.04.2014)
  */
 public class ExtendedJavaParameter extends DefaultJavaParameter {
 
@@ -32,7 +30,6 @@ public class ExtendedJavaParameter extends DefaultJavaParameter {
    * @param name of the parameter
    * @param modifiers list of modifiers of the parameter
    * @param varArgs of the parameter (??? see QDox)
-   * @author mbrunnli (10.04.2014)
    */
   public ExtendedJavaParameter(JavaClass type, String name, Set<String> modifiers, boolean varArgs) {
 
@@ -44,7 +41,6 @@ public ExtendedJavaParameter(JavaClass type, String name, Set<String> modifiers,
    * Returns all modifiers of the parameter
    *
    * @return all modifiers of the parameter
-   * @author mbrunnli (10.04.2014)
    */
   public List<String> getModifiers() {
 
diff --git a/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/main/java/com/devonfw/cobigen/javaplugin/merger/libextension/ModifyableClassLibraryBuilder.java b/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/main/java/com/devonfw/cobigen/javaplugin/merger/libextension/ModifyableClassLibraryBuilder.java
index 0b603d036b..35f4a41cba 100644
--- a/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/main/java/com/devonfw/cobigen/javaplugin/merger/libextension/ModifyableClassLibraryBuilder.java
+++ b/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/main/java/com/devonfw/cobigen/javaplugin/merger/libextension/ModifyableClassLibraryBuilder.java
@@ -14,8 +14,6 @@
 
 /**
  * {@link ClassLibraryBuilder} forwarding {@link #addSource(File)} to {@link ModifyableSourceLibrary#addSource(File)}
- *
- * @author mbrunnli (04.04.2013)
  */
 public class ModifyableClassLibraryBuilder extends OrderedClassLibraryBuilder {
 
diff --git a/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/main/java/com/devonfw/cobigen/javaplugin/merger/libextension/ModifyableJavaClass.java b/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/main/java/com/devonfw/cobigen/javaplugin/merger/libextension/ModifyableJavaClass.java
index 24c95f9ec7..c64f1e9dcd 100644
--- a/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/main/java/com/devonfw/cobigen/javaplugin/merger/libextension/ModifyableJavaClass.java
+++ b/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/main/java/com/devonfw/cobigen/javaplugin/merger/libextension/ModifyableJavaClass.java
@@ -764,7 +764,6 @@ public ClassLibrary getJavaClassLibrary() {
    *
    * @param baseField to be replaced
    * @param patchField to replace the baseField
-   * @author Malte Brunnlieb
    */
   public void replace(JavaField baseField, JavaField patchField) {
 
@@ -781,7 +780,6 @@ public void replace(JavaField baseField, JavaField patchField) {
    *
    * @param baseMethod to be replaced
    * @param patchMethod to replace the baseMethod
-   * @author Malte Brunnlieb
    */
   public void replace(JavaMethod baseMethod, JavaMethod patchMethod) {
 
@@ -798,7 +796,6 @@ public void replace(JavaMethod baseMethod, JavaMethod patchMethod) {
    *
    * @param baseConstructor to be replaced
    * @param patchConstructor to replace the baseMethod
-   * @author Malte Brunnlieb
    */
   public void replace(JavaConstructor baseConstructor, JavaConstructor patchConstructor) {
 
diff --git a/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/main/java/com/devonfw/cobigen/javaplugin/merger/libextension/ModifyableJavaType.java b/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/main/java/com/devonfw/cobigen/javaplugin/merger/libextension/ModifyableJavaType.java
index 56426b510b..7a5a1ba73e 100644
--- a/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/main/java/com/devonfw/cobigen/javaplugin/merger/libextension/ModifyableJavaType.java
+++ b/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/main/java/com/devonfw/cobigen/javaplugin/merger/libextension/ModifyableJavaType.java
@@ -26,9 +26,6 @@
 
 /**
  * The default implementation for {@link JavaType}
- *
- * @author Robert Scholte
- * @since 2.0
  */
 public class ModifyableJavaType implements JavaClass, JavaType, Serializable {
 
@@ -314,19 +311,19 @@ public boolean isVoid() {
    *   private T value;
    *
    *   public AbstractClass(T value) {
-   * 
+   *
    *     this.value = value;
    *   }
    *
    *   public T getValue() {
-   * 
+   *
    *     return value;
    *   }
    * }
    *
    * public class ConcreteClass extends AbstractClass&lt;String&gt; {
    *   public ConcreteClass(String s) {
-   * 
+   *
    *     super(s);
    *   }
    * }
diff --git a/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/main/java/com/devonfw/cobigen/javaplugin/merger/libextension/ModifyableSourceLibrary.java b/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/main/java/com/devonfw/cobigen/javaplugin/merger/libextension/ModifyableSourceLibrary.java
index c7133527c2..5af3d8fb37 100644
--- a/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/main/java/com/devonfw/cobigen/javaplugin/merger/libextension/ModifyableSourceLibrary.java
+++ b/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/main/java/com/devonfw/cobigen/javaplugin/merger/libextension/ModifyableSourceLibrary.java
@@ -48,7 +48,6 @@ public class ModifyableSourceLibrary extends SourceLibrary {
    * Creates a new {@link ModifyableJavaClass}
    *
    * @param parent {@link ClassLibrary}
-   * @author mbrunnli (04.04.2013)
    */
   public ModifyableSourceLibrary(AbstractClassLibrary parent) {
 
@@ -62,7 +61,6 @@ public ModifyableSourceLibrary(AbstractClassLibrary parent) {
    * @return the created {@link JavaSource}
    * @throws ParseException if the given source could not be parsed
    * @throws IOException if the given source was a file which could not be accessed
-   * @author mbrunnli (04.04.2013)
    */
   public JavaSource addSource(Object source) throws ParseException, IOException {
 
@@ -85,7 +83,6 @@ public JavaSource addSource(Object source) throws ParseException, IOException {
    *         while constructing the URL
    * @throws UnsupportedEncodingException If the named charset is not supported
    * @throws IOException if any exception occurred while accessing the source
-   * @author mbrunnli (04.04.2013)
    */
   private JavaSource parseSource(Builder modelBuilder, Object source)
       throws FileNotFoundException, MalformedURLException, UnsupportedEncodingException, IOException {
@@ -114,7 +111,6 @@ private JavaSource parseSource(Builder modelBuilder, Object source)
    * @param modelBuilder used to construct the model
    * @return the created {@link JavaSource}
    * @throws ParseException if any exception occurs while parsing
-   * @author mbrunnli (04.04.2013)
    */
   protected JavaSource parse(InputStream stream, URL url, Builder modelBuilder) throws ParseException {
 
@@ -137,7 +133,6 @@ protected JavaSource parse(InputStream stream, URL url, Builder modelBuilder) th
    * @param modelBuilder used to construct the model
    * @return the created {@link JavaSource}
    * @throws ParseException if any exception occurs while parsing
-   * @author mbrunnli (04.04.2013)
    */
   protected JavaSource parse(Reader reader, URL url, Builder modelBuilder) throws ParseException {
 
@@ -160,7 +155,6 @@ protected JavaSource parse(Reader reader, URL url, Builder modelBuilder) throws
    * @param builder used to construct the model
    * @return the created {@link JavaSource}
    * @throws ParseException if any exception occurs while parsing
-   * @author mbrunnli (04.04.2013)
    */
   private JavaSource parse(JavaLexer lexer, URL url, Builder builder) throws ParseException {
 
@@ -176,13 +170,10 @@ private JavaSource parse(JavaLexer lexer, URL url, Builder builder) throws Parse
     } catch (ParseException pe) {
       if (url != null) {
         pe.setSourceInfo(url.toExternalForm());
-        LOG.info("{}{}", "source info set", "url not null", url.toExternalForm());
       }
       if (getErrorHandler() != null) {
-        LOG.info("error handler not null");
         getErrorHandler().handle(pe);
       } else {
-        LOG.error("{}", "ParseException", pe);
         throw pe;
       }
     }
diff --git a/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/java/com/devonfw/cobigen/javaplugin/integrationtest/AnnotationQueryingTest.java b/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/java/com/devonfw/cobigen/javaplugin/integrationtest/AnnotationQueryingTest.java
index 489b45a89f..fceb695871 100644
--- a/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/java/com/devonfw/cobigen/javaplugin/integrationtest/AnnotationQueryingTest.java
+++ b/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/java/com/devonfw/cobigen/javaplugin/integrationtest/AnnotationQueryingTest.java
@@ -32,7 +32,7 @@ public class AnnotationQueryingTest extends AbstractIntegrationTest {
   @Test
   public void testAnnotationWithObjectArraysAsValues() throws Exception {
 
-    CobiGen cobiGen = CobiGenFactory.create(this.cobigenConfigFolder.toURI());
+    CobiGen cobiGen = CobiGenFactory.create(this.cobigenConfigFolder.toURI(), true);
     File tmpFolderCobiGen = this.tmpFolder.newFolder("cobigen_output");
 
     Object input = cobiGen.read(
diff --git a/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/java/com/devonfw/cobigen/javaplugin/integrationtest/ModelCreationTest.java b/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/java/com/devonfw/cobigen/javaplugin/integrationtest/ModelCreationTest.java
index 754e102012..92893357ed 100644
--- a/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/java/com/devonfw/cobigen/javaplugin/integrationtest/ModelCreationTest.java
+++ b/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/java/com/devonfw/cobigen/javaplugin/integrationtest/ModelCreationTest.java
@@ -24,8 +24,6 @@
 /**
  * This test suite includes all tests, which focus on the correct model creation including correct extraction of Java
  * inheritance, generic type resolving etc.
- *
- * @author mbrunnli (22.01.2015)
  */
 public class ModelCreationTest extends AbstractIntegrationTest {
 
@@ -43,7 +41,7 @@ public class ModelCreationTest extends AbstractIntegrationTest {
   @Test
   public void testCorrectGenericTypeExtraction() throws Exception {
 
-    CobiGen cobiGen = CobiGenFactory.create(this.cobigenConfigFolder.toURI());
+    CobiGen cobiGen = CobiGenFactory.create(this.cobigenConfigFolder.toURI(), true);
     File tmpFolderCobiGen = this.tmpFolder.newFolder("cobigen_output");
 
     Object input = cobiGen.read(
@@ -83,7 +81,7 @@ public void testCorrectGenericTypeExtraction() throws Exception {
   public void testResolveDependencyManagementVersionFromParent() throws Exception {
 
     // given
-    CobiGen cobiGen = CobiGenFactory.create(this.cobigenConfigFolder.toURI());
+    CobiGen cobiGen = CobiGenFactory.create(this.cobigenConfigFolder.toURI(), true);
 
     // when
     Object input = cobiGen.read(new File(
@@ -104,7 +102,7 @@ public void testResolveDependencyManagementVersionFromParent() throws Exception
   @Test
   public void testCorrectAnnotationValueExtraction() throws Exception {
 
-    CobiGen cobiGen = CobiGenFactory.create(this.cobigenConfigFolder.toURI());
+    CobiGen cobiGen = CobiGenFactory.create(this.cobigenConfigFolder.toURI(), true);
     File tmpFolderCobiGen = this.tmpFolder.newFolder("cobigen_output");
 
     Object input = cobiGen.read(
diff --git a/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/java/com/devonfw/cobigen/javaplugin/integrationtest/VariablesResolutionTest.java b/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/java/com/devonfw/cobigen/javaplugin/integrationtest/VariablesResolutionTest.java
index ea6199d1e2..6471b67bba 100644
--- a/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/java/com/devonfw/cobigen/javaplugin/integrationtest/VariablesResolutionTest.java
+++ b/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/java/com/devonfw/cobigen/javaplugin/integrationtest/VariablesResolutionTest.java
@@ -34,7 +34,7 @@ public class VariablesResolutionTest extends AbstractIntegrationTest {
   @Test
   public void testSuccessfulPathResolution_variableEqNull() throws Exception {
 
-    CobiGen cobiGen = CobiGenFactory.create(this.cobigenConfigFolder.toURI());
+    CobiGen cobiGen = CobiGenFactory.create(this.cobigenConfigFolder.toURI(), true);
     File tmpFolderCobiGen = this.tmpFolder.newFolder("cobigen_output");
 
     Object input = cobiGen.read(
diff --git a/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/java/com/devonfw/cobigen/javaplugin/unittest/inputreader/ParsedJavaModelBuilderTest.java b/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/java/com/devonfw/cobigen/javaplugin/unittest/inputreader/ParsedJavaModelBuilderTest.java
index cbe88d291c..4bf3c0762e 100644
--- a/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/java/com/devonfw/cobigen/javaplugin/unittest/inputreader/ParsedJavaModelBuilderTest.java
+++ b/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/java/com/devonfw/cobigen/javaplugin/unittest/inputreader/ParsedJavaModelBuilderTest.java
@@ -373,7 +373,6 @@ public void testExtractionOfMethodAccessibleFields_inheritedInherited() throws E
       Map<String, Object> model = javaModelBuilder.createModel(JavaParserUtil.getFirstJavaClass(fileReader));
 
       // test inherited field of direct superclass named "id"
-      System.out.println(model);
       Map<String, Object> inheritedField = JavaModelUtil.getMethodAccessibleField(model, "superSuperString");
       assertThat(inheritedField).isNotNull();
       assertThat(inheritedField.get(ModelConstant.NAME)).isEqualTo("superSuperString");
@@ -411,7 +410,6 @@ public void testExtractionOfMethodAccessibleFields_inheritedInherited() throws E
    * Tests whether the input type's extracted fields are complete (including annotations and javaDoc)
    *
    * @throws Exception test fails
-   * @author fkreis (08.05.2015)
    */
   @Test
   public void testExtractionOfMethodAccessibleFields_local() throws Exception {
diff --git a/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/java/com/devonfw/cobigen/javaplugin/unittest/inputreader/testdata/RootClass.java b/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/java/com/devonfw/cobigen/javaplugin/unittest/inputreader/testdata/RootClass.java
index 0d968f4c40..196821808b 100644
--- a/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/java/com/devonfw/cobigen/javaplugin/unittest/inputreader/testdata/RootClass.java
+++ b/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/java/com/devonfw/cobigen/javaplugin/unittest/inputreader/testdata/RootClass.java
@@ -1,9 +1,5 @@
 package com.devonfw.cobigen.javaplugin.unittest.inputreader.testdata;
 
-/**
- *
- * @author mbrunnli (14.11.2014)
- */
 public class RootClass extends SuperClass1 {
 
   private int integer;
@@ -14,7 +10,6 @@ public class RootClass extends SuperClass1 {
    * Returns the field 'value'
    *
    * @return value of value
-   * @author mbrunnli (14.11.2014)
    */
   public String getValue() {
 
@@ -25,7 +20,6 @@ public String getValue() {
    * Sets the field 'value'.
    *
    * @param value new value of value
-   * @author mbrunnli (14.11.2014)
    */
   public void setValue(String value) {
 
diff --git a/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/java/com/devonfw/cobigen/javaplugin/unittest/inputreader/testdata/SuperClass1.java b/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/java/com/devonfw/cobigen/javaplugin/unittest/inputreader/testdata/SuperClass1.java
index b3d4c17f17..59186f06ed 100644
--- a/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/java/com/devonfw/cobigen/javaplugin/unittest/inputreader/testdata/SuperClass1.java
+++ b/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/java/com/devonfw/cobigen/javaplugin/unittest/inputreader/testdata/SuperClass1.java
@@ -2,10 +2,6 @@
 
 import com.devonfw.cobigen.javaplugin.unittest.inputreader.testdata.subpackage.SuperClass2;
 
-/**
- *
- * @author mbrunnli (14.11.2014)
- */
 public abstract class SuperClass1 extends SuperClass2 {
 
   private String superClass1Field;
@@ -18,7 +14,6 @@ public abstract class SuperClass1 extends SuperClass2 {
    * Returns the field 'setterVisibleByte'
    *
    * @return value of setterVisibleByte
-   * @author mbrunnli (14.11.2014)
    */
   public byte getSetterVisibleByte() {
 
@@ -29,7 +24,6 @@ public byte getSetterVisibleByte() {
    * Sets the field 'setterVisibleByte'.
    *
    * @param setterVisibleByte new value of setterVisibleByte
-   * @author mbrunnli (14.11.2014)
    */
   public void setSetterVisibleByte(byte setterVisibleByte) {
 
@@ -40,10 +34,6 @@ public void setNoProperty(String noProperty) {
 
   }
 
-  /**
-   *
-   * @author mbrunnli (17.11.2014)
-   */
   private String getNoProperty() {
 
     return null;
diff --git a/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/java/com/devonfw/cobigen/javaplugin/unittest/inputreader/testdata/TestClass.java b/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/java/com/devonfw/cobigen/javaplugin/unittest/inputreader/testdata/TestClass.java
index 80320f7a19..a0e281739f 100644
--- a/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/java/com/devonfw/cobigen/javaplugin/unittest/inputreader/testdata/TestClass.java
+++ b/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/java/com/devonfw/cobigen/javaplugin/unittest/inputreader/testdata/TestClass.java
@@ -30,11 +30,6 @@ public void setCustomList(List<String> customList) {
     this.customList = customList;
   }
 
-  /**
-   * {@inheritDoc}
-   *
-   * @author fkreis (25.09.2014)
-   */
   @Override
   public void interface1Method() {
 
diff --git a/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/java/com/devonfw/cobigen/javaplugin/unittest/inputreader/testdata/TestClassWithAnnotations.java b/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/java/com/devonfw/cobigen/javaplugin/unittest/inputreader/testdata/TestClassWithAnnotations.java
index 5b9c0699cd..febc9cacfc 100644
--- a/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/java/com/devonfw/cobigen/javaplugin/unittest/inputreader/testdata/TestClassWithAnnotations.java
+++ b/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/java/com/devonfw/cobigen/javaplugin/unittest/inputreader/testdata/TestClassWithAnnotations.java
@@ -19,7 +19,6 @@ public boolean isBoolvalue() {
    * Sets the field 'boolvalue'.
    *
    * @param boolvalue new value of boolvalue
-   * @author mbrunnli (05.12.2014)
    */
   public void setBoolvalue(boolean boolvalue) {
 
diff --git a/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/java/com/devonfw/cobigen/javaplugin/unittest/inputreader/testdata/TestClassWithAnnotationsContainingObjectArrays.java b/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/java/com/devonfw/cobigen/javaplugin/unittest/inputreader/testdata/TestClassWithAnnotationsContainingObjectArrays.java
index 88fa78b6c2..24ead91306 100644
--- a/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/java/com/devonfw/cobigen/javaplugin/unittest/inputreader/testdata/TestClassWithAnnotationsContainingObjectArrays.java
+++ b/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/java/com/devonfw/cobigen/javaplugin/unittest/inputreader/testdata/TestClassWithAnnotationsContainingObjectArrays.java
@@ -10,7 +10,6 @@ public class TestClassWithAnnotationsContainingObjectArrays {
    * Returns the field 'boolvalue'
    *
    * @return value of boolvalue
-   * @author mbrunnli (05.12.2014)
    */
   @Category({ TestClassWithAnnotationsContainingObjectArrays.class, TestClassWithAnnotations.class })
   public boolean isBoolvalue() {
@@ -22,7 +21,6 @@ public boolean isBoolvalue() {
    * Sets the field 'boolvalue'.
    *
    * @param boolvalue new value of boolvalue
-   * @author mbrunnli (05.12.2014)
    */
   public void setBoolvalue(boolean boolvalue) {
 
diff --git a/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/java/com/devonfw/cobigen/javaplugin/unittest/inputreader/testdata/TestInterface1.java b/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/java/com/devonfw/cobigen/javaplugin/unittest/inputreader/testdata/TestInterface1.java
index 51e0f58718..2b46a8b68e 100644
--- a/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/java/com/devonfw/cobigen/javaplugin/unittest/inputreader/testdata/TestInterface1.java
+++ b/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/java/com/devonfw/cobigen/javaplugin/unittest/inputreader/testdata/TestInterface1.java
@@ -6,15 +6,11 @@
 /**
  * Interface without semantics for testcases in {@link ReflectedJavaModelBuilderTest} and
  * {@link ParsedJavaModelBuilderTest}
- *
- * @author fkreis (25.09.2014)
  */
 public interface TestInterface1 {
   /**
    * method without semantics for testcases in {@link ReflectedJavaModelBuilderTest} and
    * {@link ParsedJavaModelBuilderTest}
-   *
-   * @author fkreis (25.09.2014)
    */
   public void interface1Method();
 }
diff --git a/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/java/com/devonfw/cobigen/javaplugin/unittest/inputreader/testdata/TestInterface2.java b/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/java/com/devonfw/cobigen/javaplugin/unittest/inputreader/testdata/TestInterface2.java
index aee3edafe7..6a5d4c670c 100644
--- a/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/java/com/devonfw/cobigen/javaplugin/unittest/inputreader/testdata/TestInterface2.java
+++ b/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/java/com/devonfw/cobigen/javaplugin/unittest/inputreader/testdata/TestInterface2.java
@@ -6,8 +6,6 @@
 /**
  * Interface without semantics for testcases in {@link ReflectedJavaModelBuilderTest} and
  * {@link ParsedJavaModelBuilderTest}
- *
- * @author fkreis (25.09.2014)
  */
 public interface TestInterface2 {
 
diff --git a/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/java/com/devonfw/cobigen/javaplugin/unittest/inputreader/testdata/subpackage/SuperClass2.java b/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/java/com/devonfw/cobigen/javaplugin/unittest/inputreader/testdata/subpackage/SuperClass2.java
index d83063777c..fc79f73e92 100644
--- a/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/java/com/devonfw/cobigen/javaplugin/unittest/inputreader/testdata/subpackage/SuperClass2.java
+++ b/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/java/com/devonfw/cobigen/javaplugin/unittest/inputreader/testdata/subpackage/SuperClass2.java
@@ -4,10 +4,6 @@
 
 import com.devonfw.cobigen.javaplugin.unittest.inputreader.testdata.RootClass;
 
-/**
- *
- * @author mbrunnli (25.01.2015)
- */
 public class SuperClass2 {
 
   private List<RootClass> genericAccessible;
@@ -16,7 +12,6 @@ public class SuperClass2 {
    * Returns the field 'genericAccessible'
    *
    * @return value of genericAccessible
-   * @author mbrunnli (25.01.2015)
    */
   public List<RootClass> getGenericAccessible() {
 
@@ -27,7 +22,6 @@ public List<RootClass> getGenericAccessible() {
    * Sets the field 'genericAccessible'.
    *
    * @param genericAccessible new value of genericAccessible
-   * @author mbrunnli (25.01.2015)
    */
   public void setGenericAccessible(List<RootClass> genericAccessible) {
 
diff --git a/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/java/com/devonfw/cobigen/javaplugin/unittest/merger/JavaMergerTest.java b/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/java/com/devonfw/cobigen/javaplugin/unittest/merger/JavaMergerTest.java
index e7081800b8..e8382cd0af 100644
--- a/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/java/com/devonfw/cobigen/javaplugin/unittest/merger/JavaMergerTest.java
+++ b/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/java/com/devonfw/cobigen/javaplugin/unittest/merger/JavaMergerTest.java
@@ -28,8 +28,6 @@
 
 /**
  * TestCase testing {@link JavaMerger}
- *
- * @author mbrunnli (04.04.2013)
  */
 public class JavaMergerTest {
 
@@ -42,7 +40,6 @@ public class JavaMergerTest {
    * Test of {@link JavaMerger} merging imports
    *
    * @throws Exception test fails
-   * @author mbrunnli (04.04.2013)
    */
   @Test
   public void testMergeImport_defaultNonOverride() throws Exception {
@@ -61,7 +58,6 @@ public void testMergeImport_defaultNonOverride() throws Exception {
    * Test of {@link JavaMerger} merging fields
    *
    * @throws Exception test fails
-   * @author mbrunnli (04.04.2013)
    */
   @Test
   public void testMergeProperty_defaultNonOverride() throws Exception {
@@ -87,7 +83,6 @@ public void testMergeProperty_defaultNonOverride() throws Exception {
    * Test of {@link JavaMerger} merging methods
    *
    * @throws Exception test fails
-   * @author mbrunnli (04.04.2013)
    */
   @Test
   public void testMergeMethod_defaultNonOverride() throws Exception {
@@ -118,7 +113,6 @@ public void testMergeMethod_defaultNonOverride() throws Exception {
    * Test of {@link JavaMerger} merging classes recursively
    *
    * @throws Exception test fails
-   * @author mbrunnli (04.04.2013)
    */
   @Test
   public void testMergeInnerClasses_defaultNonOverride() throws Exception {
@@ -163,7 +157,6 @@ public void testMergeInnerClasses_defaultNonOverride() throws Exception {
    * Test of {@link JavaMerger} merging imports
    *
    * @throws Exception test fails
-   * @author mbrunnli (04.04.2013)
    */
   @Test
   public void testMergeImport_Override() throws Exception {
@@ -182,7 +175,6 @@ public void testMergeImport_Override() throws Exception {
    * Test of {@link JavaMerger} merging fields
    *
    * @throws Exception test fails
-   * @author mbrunnli (04.04.2013)
    */
   @Test
   public void testMergeProperty_Override() throws Exception {
@@ -208,7 +200,6 @@ public void testMergeProperty_Override() throws Exception {
    * Test of {@link JavaMerger} merging methods
    *
    * @throws Exception test fails
-   * @author mbrunnli (04.04.2013)
    */
   @Test
   public void testMergeMethod_Override() throws Exception {
@@ -239,7 +230,6 @@ public void testMergeMethod_Override() throws Exception {
    * Test of {@link JavaMerger} merging classes recursively
    *
    * @throws Exception test fails
-   * @author mbrunnli (04.04.2013)
    */
   @Test
   public void testMergeInnerClasses_Override() throws Exception {
@@ -285,7 +275,6 @@ public void testMergeInnerClasses_Override() throws Exception {
    *
    * @throws IOException test fails
    * @throws MergeException test fails
-   * @author mbrunnli (12.04.2013)
    */
   @Test
   public void testReadingEncoding() throws IOException, MergeException {
@@ -314,7 +303,6 @@ public void testReadingEncoding() throws IOException, MergeException {
    *
    * @throws IOException test fails
    * @throws MergeException test fails
-   * @author mbrunnli (04.06.2013)
    */
   @Test
   public void testConsistentLineEndings() throws IOException, MergeException {
@@ -354,7 +342,6 @@ public void testBaseLineEndings() throws IOException, MergeException {
    *
    * @throws IOException test fails
    * @throws MergeException test fails
-   * @author mbrunnli (17.06.2013)
    */
   @Test
   public void testMergeWithGenerics() throws IOException, MergeException {
@@ -410,7 +397,6 @@ public void testMergeMethodsWithoutExtendingMethodBodyWithWhitespaces() throws I
    *
    * @throws IOException test fails
    * @throws MergeException test fails
-   * @author mbrunnli (29.09.2014)
    */
   @Test
   public void testMergeInheritanceRelation() throws IOException, MergeException {
@@ -453,7 +439,6 @@ public void testMergeExpizitAndImplizitParameterTypes() throws IOException, Merg
     JavaSource mergedSource = getMergedSource(base, patch, true);
     assertThat(mergedSource.getClasses().isEmpty()).isFalse();
     JavaClass mergedClass = mergedSource.getClasses().get(0);
-    // System.out.print(mergedSource.toString());
     assertThat(mergedClass.getFields()).as("Too much fields").hasSize(1);
     assertThat(mergedClass.getMethods().size()).as("Too much methods:\n" + mergedClass.getMethods().toString())
         .isEqualTo(1);
diff --git a/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/resources/testdata/integrationtest/javaSources/ModelCreationTest.java b/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/resources/testdata/integrationtest/javaSources/ModelCreationTest.java
index 339c2d0590..06c0ca13ed 100644
--- a/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/resources/testdata/integrationtest/javaSources/ModelCreationTest.java
+++ b/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/resources/testdata/integrationtest/javaSources/ModelCreationTest.java
@@ -5,10 +5,6 @@
 import javax.ws.rs.PathParam;
 import javax.ws.rs.Path;
 
-/**
- *
- * @author mbrunnli (22.01.2015)
- */
 public class ModelCreationTest extends AbstractIntegrationTest {
 
     private List<String> testField;
diff --git a/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/resources/testdata/integrationtest/templates/context.xml b/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/resources/testdata/integrationtest/templates/context.xml
index 6c0765e66a..2bd6cdcf75 100644
--- a/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/resources/testdata/integrationtest/templates/context.xml
+++ b/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/resources/testdata/integrationtest/templates/context.xml
@@ -1,20 +1,23 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="2.1">
+<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="3.0">
   <trigger id="testTemplates" type="java" templateFolder="testTemplates">
     <matcher type="fqn" value=".*">
-      <variableAssignment type="constant" key="abstractCollection" value="java.util.AbstractCollection"/>
-      <variableAssignment type="constant" key="stringFqn" value="java.lang.String"/>
-      <variableAssignment type="constant" key="objectFqn" value="java.lang.Object"/>
-      <variableAssignment type="constant" key="javaLang" value="java.lang"/>
+      <variableAssignment type="constant" key="abstractCollection" value="java.util.AbstractCollection" />
+      <variableAssignment type="constant" key="stringFqn" value="java.lang.String" />
+      <variableAssignment type="constant" key="objectFqn" value="java.lang.Object" />
+      <variableAssignment type="constant" key="javaLang" value="java.lang" />
     </matcher>
   </trigger>
   <trigger id="variable_resolution" type="java" templateFolder="variable_resolution">
     <matcher type="fqn" value="((.+\.)?([^\.]+))\.([^\.]+)\.dataaccess\.api\.([^\.]+\.)*([^\.]+)Entity">
-      <variableAssignment type="regex" key="rootPackage" value="1"/>
-      <variableAssignment type="regex" key="domain" value="3"/>
-      <variableAssignment type="regex" key="component" value="4"/>
-      <variableAssignment type="regex" key="detail" value="5"/>
-      <variableAssignment type="regex" key="entityName" value="6"/>
+      <variableAssignment type="regex" key="rootPackage" value="1" />
+      <variableAssignment type="regex" key="domain" value="3" />
+      <variableAssignment type="regex" key="component" value="4" />
+      <variableAssignment type="regex" key="detail" value="5" />
+      <variableAssignment type="regex" key="entityName" value="6" />
     </matcher>
   </trigger>
-</contextConfiguration>
+  <tags>
+    <tag name="bla" />
+  </tags>
+</contextConfiguration>
\ No newline at end of file
diff --git a/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/resources/testdata/unittest/inputreader/TestClass.java b/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/resources/testdata/unittest/inputreader/TestClass.java
index a1db0bbefc..5366ad52ce 100644
--- a/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/resources/testdata/unittest/inputreader/TestClass.java
+++ b/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/resources/testdata/unittest/inputreader/TestClass.java
@@ -30,10 +30,6 @@ public void setCustomList(List<String> customList) {
         this.customList = customList;
     }
 
-    /**
-     * {@inheritDoc}
-     * @author fkreis (25.09.2014)
-     */
     @Override
     public void interface1Method() {
         return;
diff --git a/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/resources/testdata/unittest/inputreader/TestClassWithAnnotations.java b/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/resources/testdata/unittest/inputreader/TestClassWithAnnotations.java
index d0bbc19ca7..2de55f06a2 100644
--- a/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/resources/testdata/unittest/inputreader/TestClassWithAnnotations.java
+++ b/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/resources/testdata/unittest/inputreader/TestClassWithAnnotations.java
@@ -9,7 +9,6 @@ public class TestClassWithAnnotations {
     /**
      * Returns the field 'boolvalue'
      * @return value of boolvalue
-     * @author mbrunnli (05.12.2014)
      */
     @XmlAnyElement(lax = true)
     public boolean isBoolvalue() {
@@ -20,7 +19,6 @@ public boolean isBoolvalue() {
      * Sets the field 'boolvalue'.
      * @param boolvalue
      *            new value of boolvalue
-     * @author mbrunnli (05.12.2014)
      */
     public void setBoolvalue(boolean boolvalue) {
         this.boolvalue = boolvalue;
diff --git a/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/resources/testdata/unittest/inputreader/TestClassWithAnnotationsContainingObjectArrays.java b/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/resources/testdata/unittest/inputreader/TestClassWithAnnotationsContainingObjectArrays.java
index 4e7f9c046f..66c058a3e5 100644
--- a/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/resources/testdata/unittest/inputreader/TestClassWithAnnotationsContainingObjectArrays.java
+++ b/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/resources/testdata/unittest/inputreader/TestClassWithAnnotationsContainingObjectArrays.java
@@ -9,7 +9,6 @@ public class TestClassWithAnnotationsContainingObjectArrays {
     /**
      * Returns the field 'boolvalue'
      * @return value of boolvalue
-     * @author mbrunnli (05.12.2014)
      */
     @Category({ TestClassWithAnnotationsContainingObjectArrays.class, TestClassWithAnnotations.class })
     public boolean isBoolvalue() {
@@ -20,7 +19,6 @@ public boolean isBoolvalue() {
      * Sets the field 'boolvalue'.
      * @param boolvalue
      *            new value of boolvalue
-     * @author mbrunnli (05.12.2014)
      */
     public void setBoolvalue(boolean boolvalue) {
         this.boolvalue = boolvalue;
diff --git a/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/resources/testdata/unittest/inputreader/TestClassWithRecursiveAnnotations.java b/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/resources/testdata/unittest/inputreader/TestClassWithRecursiveAnnotations.java
index de0121a7af..6ee2405d19 100644
--- a/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/resources/testdata/unittest/inputreader/TestClassWithRecursiveAnnotations.java
+++ b/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/resources/testdata/unittest/inputreader/TestClassWithRecursiveAnnotations.java
@@ -10,7 +10,6 @@ public class TestClassWithRecursiveAnnotations {
     /**
      * Returns the field 'boolvalue'
      * @return value of boolvalue
-     * @author mbrunnli (05.12.2014)
      */
     @Action(fault = { @FaultAction(className = NullPointerException.class),
         @FaultAction(className = IndexOutOfBoundsException.class) })
@@ -22,7 +21,6 @@ public boolean isBoolvalue() {
      * Sets the field 'boolvalue'.
      * @param boolvalue
      *            new value of boolvalue
-     * @author mbrunnli (05.12.2014)
      */
     @Action(fault =  @FaultAction(className = NullPointerException.class))
     public void setBoolvalue(boolean boolvalue) {
diff --git a/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/resources/testdata/unittest/inputreader/TestInterface1.java b/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/resources/testdata/unittest/inputreader/TestInterface1.java
index d5c1e14af9..11e42d459f 100644
--- a/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/resources/testdata/unittest/inputreader/TestInterface1.java
+++ b/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/resources/testdata/unittest/inputreader/TestInterface1.java
@@ -6,14 +6,11 @@
 /**
  * Interface without semantics for testcases in {@link ReflectedJavaModelBuilderTest} and
  * {@link ParsedJavaModelBuilderTest}
- *
- * @author fkreis (25.09.2014)
  */
 public interface TestInterface1 {
     /**
      * method without semantics for testcases in {@link ReflectedJavaModelBuilderTest} and
      * {@link ParsedJavaModelBuilderTest}
-     * @author fkreis (25.09.2014)
      */
     public void interface1Method();
 }
diff --git a/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/resources/testdata/unittest/inputreader/TestInterface2.java b/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/resources/testdata/unittest/inputreader/TestInterface2.java
index aee3edafe7..6a5d4c670c 100644
--- a/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/resources/testdata/unittest/inputreader/TestInterface2.java
+++ b/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/resources/testdata/unittest/inputreader/TestInterface2.java
@@ -6,8 +6,6 @@
 /**
  * Interface without semantics for testcases in {@link ReflectedJavaModelBuilderTest} and
  * {@link ParsedJavaModelBuilderTest}
- *
- * @author fkreis (25.09.2014)
  */
 public interface TestInterface2 {
 
diff --git a/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/resources/testdata/unittest/inputreader/packageFolder/RootClass.java b/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/resources/testdata/unittest/inputreader/packageFolder/RootClass.java
index b98c2b6a3b..001c488426 100644
--- a/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/resources/testdata/unittest/inputreader/packageFolder/RootClass.java
+++ b/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/resources/testdata/unittest/inputreader/packageFolder/RootClass.java
@@ -1,9 +1,5 @@
 package com.devonfw.cobigen.javaplugin.unittest.inputreader.testdata;
 
-/**
- *
- * @author mbrunnli (14.11.2014)
- */
 public class RootClass extends SuperClass1 {
 
     private int integer;
@@ -13,7 +9,6 @@ public class RootClass extends SuperClass1 {
     /**
      * Returns the field 'value'
      * @return value of value
-     * @author mbrunnli (14.11.2014)
      */
     public String getValue() {
         return value;
@@ -23,7 +18,6 @@ public String getValue() {
      * Sets the field 'value'.
      * @param value
      *            new value of value
-     * @author mbrunnli (14.11.2014)
      */
     public void setValue(String value) {
         this.value = value;
diff --git a/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/resources/testdata/unittest/inputreader/packageFolder/SuperClass1.java b/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/resources/testdata/unittest/inputreader/packageFolder/SuperClass1.java
index 111c5541aa..929ec6a998 100644
--- a/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/resources/testdata/unittest/inputreader/packageFolder/SuperClass1.java
+++ b/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/resources/testdata/unittest/inputreader/packageFolder/SuperClass1.java
@@ -1,9 +1,5 @@
 package com.devonfw.cobigen.javaplugin.unittest.inputreader.testdata;
 
-/**
- *
- * @author mbrunnli (14.11.2014)
- */
 public abstract class SuperClass1 extends SuperClass2 {
 
     private String superClass1Field;
@@ -15,7 +11,6 @@ public abstract class SuperClass1 extends SuperClass2 {
     /**
      * Returns the field 'setterVisibleByte'
      * @return value of setterVisibleByte
-     * @author mbrunnli (14.11.2014)
      */
     public byte getSetterVisibleByte() {
         return setterVisibleByte;
@@ -25,7 +20,6 @@ public byte getSetterVisibleByte() {
      * Sets the field 'setterVisibleByte'.
      * @param setterVisibleByte
      *            new value of setterVisibleByte
-     * @author mbrunnli (14.11.2014)
      */
     public void setSetterVisibleByte(byte setterVisibleByte) {
         this.setterVisibleByte = setterVisibleByte;
@@ -35,10 +29,6 @@ public void setNoProperty(String noProperty) {
 
     }
 
-    /**
-     *
-     * @author mbrunnli (17.11.2014)
-     */
     private String getNoProperty() {
         return null;
     }
diff --git a/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/resources/testdata/unittest/inputreader/packageFolder/subpackage/SuperClass2.java b/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/resources/testdata/unittest/inputreader/packageFolder/subpackage/SuperClass2.java
index 78bd1d3323..e24b86ec6d 100644
--- a/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/resources/testdata/unittest/inputreader/packageFolder/subpackage/SuperClass2.java
+++ b/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/resources/testdata/unittest/inputreader/packageFolder/subpackage/SuperClass2.java
@@ -4,10 +4,6 @@
 
 import com.devonfw.cobigen.javaplugin.unittest.inputreader.testdata.RootClass;
 
-/**
- *
- * @author mbrunnli (25.01.2015)
- */
 public class SuperClass2 {
 
     private List<RootClass> genericAccessible;
@@ -15,7 +11,6 @@ public class SuperClass2 {
     /**
      * Returns the field 'genericAccessible'
      * @return value of genericAccessible
-     * @author mbrunnli (25.01.2015)
      */
     public List<RootClass> getGenericAccessible() {
         return genericAccessible;
@@ -25,7 +20,6 @@ public List<RootClass> getGenericAccessible() {
      * Sets the field 'genericAccessible'.
      * @param genericAccessible
      *            new value of genericAccessible
-     * @author mbrunnli (25.01.2015)
      */
     public void setGenericAccessible(List<RootClass> genericAccessible) {
         this.genericAccessible = genericAccessible;
diff --git a/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/resources/testdata/unittest/merger/BaseFile_encoding_ISO-8859-1.java b/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/resources/testdata/unittest/merger/BaseFile_encoding_ISO-8859-1.java
index 91808c9c50..cc760b7c0f 100644
--- a/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/resources/testdata/unittest/merger/BaseFile_encoding_ISO-8859-1.java
+++ b/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/resources/testdata/unittest/merger/BaseFile_encoding_ISO-8859-1.java
@@ -1,11 +1,9 @@
 package com.devonfw;
 
 /**
- * JavaDoc enthält ä
- * 
- * @author mbrunnli (15.04.2013)
+ * JavaDoc enthält Ä
  */
 public class FooBar {
-    
+
 
 }
diff --git a/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/resources/testdata/unittest/merger/BaseFile_encoding_UTF-8.java b/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/resources/testdata/unittest/merger/BaseFile_encoding_UTF-8.java
index 72571b097f..7b1e9cce26 100644
--- a/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/resources/testdata/unittest/merger/BaseFile_encoding_UTF-8.java
+++ b/cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/resources/testdata/unittest/merger/BaseFile_encoding_UTF-8.java
@@ -2,8 +2,6 @@
 
 /**
  * JavaDoc enthält Ä
- *
- * @author mbrunnli (15.04.2013)
  */
 public class FooBar {
 
diff --git a/cobigen-plugins/cobigen-openapiplugin-parent/cobigen-openapiplugin/src/main/java/com/devonfw/cobigen/openapiplugin/inputreader/ModelConstant.java b/cobigen-plugins/cobigen-openapiplugin-parent/cobigen-openapiplugin/src/main/java/com/devonfw/cobigen/openapiplugin/inputreader/ModelConstant.java
index c00fd80076..b4a265bb66 100644
--- a/cobigen-plugins/cobigen-openapiplugin-parent/cobigen-openapiplugin/src/main/java/com/devonfw/cobigen/openapiplugin/inputreader/ModelConstant.java
+++ b/cobigen-plugins/cobigen-openapiplugin-parent/cobigen-openapiplugin/src/main/java/com/devonfw/cobigen/openapiplugin/inputreader/ModelConstant.java
@@ -3,7 +3,6 @@
 /**
  * String constants of the java object model for generation. Outcome of the JavaInputReader.
  *
- * @author <a href="m_brunnl@cs.uni-kl.de">Malte Brunnlieb</a>
  * @version $Revision$
  */
 public class ModelConstant {
diff --git a/cobigen-plugins/cobigen-openapiplugin-parent/cobigen-openapiplugin/src/test/java/com/devonfw/cobigen/openapiplugin/integrationtest/InputReaderMatcherTest.java b/cobigen-plugins/cobigen-openapiplugin-parent/cobigen-openapiplugin/src/test/java/com/devonfw/cobigen/openapiplugin/integrationtest/InputReaderMatcherTest.java
index f4575b2b3d..66f8e65994 100644
--- a/cobigen-plugins/cobigen-openapiplugin-parent/cobigen-openapiplugin/src/test/java/com/devonfw/cobigen/openapiplugin/integrationtest/InputReaderMatcherTest.java
+++ b/cobigen-plugins/cobigen-openapiplugin-parent/cobigen-openapiplugin/src/test/java/com/devonfw/cobigen/openapiplugin/integrationtest/InputReaderMatcherTest.java
@@ -42,7 +42,7 @@ public class InputReaderMatcherTest {
   @Test
   public void testBasicElementMatcher_oneComponent() throws Exception {
 
-    CobiGen cobigen = CobiGenFactory.create(Paths.get(testdataRoot, "templates").toUri());
+    CobiGen cobigen = CobiGenFactory.create(Paths.get(testdataRoot, "templates").toUri(), true);
 
     Object openApiFile = cobigen.read(Paths.get(testdataRoot, "one-component.yaml"), TestConstants.UTF_8);
     assertThat(openApiFile).isNotNull();
@@ -59,7 +59,7 @@ public void testBasicElementMatcher_oneComponent() throws Exception {
   @Test
   public void testBasicElementMatcher_twoComponents() throws Exception {
 
-    CobiGen cobigen = CobiGenFactory.create(Paths.get(testdataRoot, "templates").toUri());
+    CobiGen cobigen = CobiGenFactory.create(Paths.get(testdataRoot, "templates").toUri(), true);
 
     Object openApiFile = cobigen.read(Paths.get(testdataRoot, "two-components.yaml"), TestConstants.UTF_8);
     assertThat(openApiFile).isNotNull();
@@ -76,7 +76,7 @@ public void testBasicElementMatcher_twoComponents() throws Exception {
   @Test
   public void testBasicElementMatcher_twoComponents_matchRegex() throws Exception {
 
-    CobiGen cobigen = CobiGenFactory.create(Paths.get(testdataRoot, "templates-regex").toUri());
+    CobiGen cobigen = CobiGenFactory.create(Paths.get(testdataRoot, "templates-regex").toUri(), true);
 
     Object openApiFile = cobigen.read(Paths.get(testdataRoot, "two-components.yaml"), TestConstants.UTF_8);
     assertThat(openApiFile).isNotNull();
@@ -94,7 +94,7 @@ public void testBasicElementMatcher_twoComponents_matchRegex() throws Exception
   @Test
   public void testBasicElementMatcher_oneComponent_matchRegex() throws Exception {
 
-    CobiGen cobigen = CobiGenFactory.create(Paths.get(testdataRoot, "templates-regex").toUri());
+    CobiGen cobigen = CobiGenFactory.create(Paths.get(testdataRoot, "templates-regex").toUri(), true);
 
     Object openApiFile = cobigen.read(Paths.get(testdataRoot, "one-component.yaml"), TestConstants.UTF_8);
     assertThat(openApiFile).isNotNull();
@@ -117,7 +117,7 @@ public void testBasicElementMatcher_oneComponent_matchRegex() throws Exception {
   @Test
   public void testVariableAssignment_propertyName() throws Exception {
 
-    CobiGen cobigen = CobiGenFactory.create(Paths.get(testdataRoot, "templates").toUri());
+    CobiGen cobigen = CobiGenFactory.create(Paths.get(testdataRoot, "templates").toUri(), true);
 
     Object openApiFile = cobigen.read(Paths.get(testdataRoot, "one-component.yaml"), TestConstants.UTF_8);
     List<Object> inputObjects = cobigen.resolveContainers(openApiFile);
@@ -142,7 +142,7 @@ public void testVariableAssignment_propertyName() throws Exception {
   @Test
   public void testVariableAssignment_rootPackage() throws Exception {
 
-    CobiGen cobigen = CobiGenFactory.create(Paths.get(testdataRoot, "templates").toUri());
+    CobiGen cobigen = CobiGenFactory.create(Paths.get(testdataRoot, "templates").toUri(), true);
 
     Object openApiFile = cobigen.read(Paths.get(testdataRoot, "root-package.yaml"), TestConstants.UTF_8);
 
@@ -170,7 +170,7 @@ public void testVariableAssignment_rootPackage() throws Exception {
   @Test
   public void testVariableAssignment_rootComponent() throws Exception {
 
-    CobiGen cobigen = CobiGenFactory.create(Paths.get(testdataRoot, "templates").toUri());
+    CobiGen cobigen = CobiGenFactory.create(Paths.get(testdataRoot, "templates").toUri(), true);
 
     Object openApiFile = cobigen.read(Paths.get(testdataRoot, "root-package.yaml"), TestConstants.UTF_8);
 
@@ -201,7 +201,7 @@ public void testVariableAssignment_rootComponent() throws Exception {
   @Test
   public void testVariableAssignment_attribute() throws Exception {
 
-    CobiGen cobigen = CobiGenFactory.create(Paths.get(testdataRoot, "templates").toUri());
+    CobiGen cobigen = CobiGenFactory.create(Paths.get(testdataRoot, "templates").toUri(), true);
 
     Object openApiFile = cobigen.read(Paths.get(testdataRoot, "two-components.yaml"), TestConstants.UTF_8);
 
@@ -240,7 +240,7 @@ public void testVariableAssignment_attribute() throws Exception {
   @Test
   public void testVariableAssignment_noAttributeFound() throws Exception {
 
-    CobiGen cobigen = CobiGenFactory.create(Paths.get(testdataRoot, "templates").toUri());
+    CobiGen cobigen = CobiGenFactory.create(Paths.get(testdataRoot, "templates").toUri(), true);
 
     Object openApiFile = cobigen.read(Paths.get(testdataRoot, "two-components-no-attribute.yaml"), TestConstants.UTF_8);
 
diff --git a/cobigen-plugins/cobigen-openapiplugin-parent/cobigen-openapiplugin/src/test/resources/testdata/integrationtest/InputReaderMatcherTest/templates-regex/context.xml b/cobigen-plugins/cobigen-openapiplugin-parent/cobigen-openapiplugin/src/test/resources/testdata/integrationtest/InputReaderMatcherTest/templates-regex/context.xml
index f356d799cb..9acb2f1519 100644
--- a/cobigen-plugins/cobigen-openapiplugin-parent/cobigen-openapiplugin/src/test/resources/testdata/integrationtest/InputReaderMatcherTest/templates-regex/context.xml
+++ b/cobigen-plugins/cobigen-openapiplugin-parent/cobigen-openapiplugin/src/test/resources/testdata/integrationtest/InputReaderMatcherTest/templates-regex/context.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration"
-  version="2.1">
+  version="3.0">
 
   <trigger id="sales_only" type="openapi" templateFolder="salesTemplates">
     <containerMatcher type="element" value="OpenAPIFile"/>
@@ -12,4 +12,7 @@
     <matcher type="EntityNameRegex" value="Ta.*">
     </matcher>
   </trigger>
+  <tags>
+    <tag name="bla" />
+  </tags>
 </contextConfiguration>
diff --git a/cobigen-plugins/cobigen-openapiplugin-parent/cobigen-openapiplugin/src/test/resources/testdata/integrationtest/InputReaderMatcherTest/templates/context.xml b/cobigen-plugins/cobigen-openapiplugin-parent/cobigen-openapiplugin/src/test/resources/testdata/integrationtest/InputReaderMatcherTest/templates/context.xml
index 86fd5c9af1..8e9b56a086 100644
--- a/cobigen-plugins/cobigen-openapiplugin-parent/cobigen-openapiplugin/src/test/resources/testdata/integrationtest/InputReaderMatcherTest/templates/context.xml
+++ b/cobigen-plugins/cobigen-openapiplugin-parent/cobigen-openapiplugin/src/test/resources/testdata/integrationtest/InputReaderMatcherTest/templates/context.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="2.1">
+<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="3.0">
 
   <trigger id="testTemplates" type="openapi" templateFolder="testTemplates">
     <containerMatcher type="element" value="OpenAPIFile"/>
@@ -10,4 +10,7 @@
       <variableAssignment type="extension" key="globalVariable" value="x-global"/>
     </matcher>
   </trigger>
+  <tags>
+    <tag name="bla" />
+  </tags>
 </contextConfiguration>
diff --git a/cobigen-plugins/cobigen-propertyplugin/src/main/java/com/devonfw/cobigen/propertyplugin/PropertyMerger.java b/cobigen-plugins/cobigen-propertyplugin/src/main/java/com/devonfw/cobigen/propertyplugin/PropertyMerger.java
index 13981fb57e..bc45db1bda 100644
--- a/cobigen-plugins/cobigen-propertyplugin/src/main/java/com/devonfw/cobigen/propertyplugin/PropertyMerger.java
+++ b/cobigen-plugins/cobigen-propertyplugin/src/main/java/com/devonfw/cobigen/propertyplugin/PropertyMerger.java
@@ -92,7 +92,6 @@ public String merge(File base, String patch, String targetCharset) throws MergeE
    * @param lineSeparator the line Separator to use for the file
    * @return merged file contents
    * @throws IOException if the base file could not be read oder accessed
-   * @author mbrunnli (11.03.2013)
    */
   private String concatContents(Set<Object> conflicts, BufferedReader baseFileReader, String patch,
       String lineSeparator) throws IOException {
diff --git a/cobigen-plugins/cobigen-templateengines/cobigen-tempeng-velocity/src/test/java/com/devonfw/cobigen/tempeng/velocity/systemtest/VelocityTemplateEngineIntegrationTest.java b/cobigen-plugins/cobigen-templateengines/cobigen-tempeng-velocity/src/test/java/com/devonfw/cobigen/tempeng/velocity/systemtest/VelocityTemplateEngineIntegrationTest.java
index 9971965dc1..7ec1d56742 100644
--- a/cobigen-plugins/cobigen-templateengines/cobigen-tempeng-velocity/src/test/java/com/devonfw/cobigen/tempeng/velocity/systemtest/VelocityTemplateEngineIntegrationTest.java
+++ b/cobigen-plugins/cobigen-templateengines/cobigen-tempeng-velocity/src/test/java/com/devonfw/cobigen/tempeng/velocity/systemtest/VelocityTemplateEngineIntegrationTest.java
@@ -32,7 +32,7 @@ public class VelocityTemplateEngineIntegrationTest {
   @Test
   public void testBasicGeneration() throws Exception {
 
-    CobiGen cobigen = CobiGenFactory.create(new File("src/test/resources/systemtest").toURI());
+    CobiGen cobigen = CobiGenFactory.create(new File("src/test/resources/systemtest").toURI(), true);
     Object input = cobigen.read(
         new File("src/test/java/com/devonfw/cobigen/tempeng/velocity/systemtest/testobjects/Input.java").toPath(),
         Charset.forName("UTF-8"), getClass().getClassLoader());
diff --git a/cobigen-plugins/cobigen-templateengines/cobigen-tempeng-velocity/src/test/resources/systemtest/context.xml b/cobigen-plugins/cobigen-templateengines/cobigen-tempeng-velocity/src/test/resources/systemtest/context.xml
index 1e0fb87326..c3978176f7 100644
--- a/cobigen-plugins/cobigen-templateengines/cobigen-tempeng-velocity/src/test/resources/systemtest/context.xml
+++ b/cobigen-plugins/cobigen-templateengines/cobigen-tempeng-velocity/src/test/resources/systemtest/context.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="2.1">
+<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="3.0">
 
   <trigger id="testBasicGeneration" type="java" templateFolder="testBasicGeneration">
     <matcher type="fqn" value="(.+)\.Input">
       <variableAssignment type="regex" key="package" value="1"/>
     </matcher>
   </trigger>
+  <tags>
+    <tag name="bla" />
+  </tags>
 </contextConfiguration>
diff --git a/cobigen-plugins/cobigen-textmerger/src/main/java/com/devonfw/cobigen/textmerger/TextAppender.java b/cobigen-plugins/cobigen-textmerger/src/main/java/com/devonfw/cobigen/textmerger/TextAppender.java
index d2cbcbe90f..c7d520d7f5 100644
--- a/cobigen-plugins/cobigen-textmerger/src/main/java/com/devonfw/cobigen/textmerger/TextAppender.java
+++ b/cobigen-plugins/cobigen-textmerger/src/main/java/com/devonfw/cobigen/textmerger/TextAppender.java
@@ -21,8 +21,6 @@
 
 /**
  * The {@link TextAppender} allows appending the patch to the base file
- *
- * @author mbrunnli (03.06.2014)
  */
 public class TextAppender implements Merger {
 
@@ -49,7 +47,6 @@ public class TextAppender implements Merger {
    * @param withNewLineBeforehand if <code>true</code> a new line will be inserted before each appended text if the
    *        appended text is not empty<br>
    *        <code>false</code>, otherwise.
-   * @author mbrunnli (03.06.2014)
    */
   public TextAppender(String type, boolean withNewLineBeforehand) {
 
diff --git a/cobigen-plugins/cobigen-textmerger/src/test/java/com/devonfw/cobigen/textmerger/TextAppenderTest.java b/cobigen-plugins/cobigen-textmerger/src/test/java/com/devonfw/cobigen/textmerger/TextAppenderTest.java
index ab81f355ad..de72d1d6af 100644
--- a/cobigen-plugins/cobigen-textmerger/src/test/java/com/devonfw/cobigen/textmerger/TextAppenderTest.java
+++ b/cobigen-plugins/cobigen-textmerger/src/test/java/com/devonfw/cobigen/textmerger/TextAppenderTest.java
@@ -10,10 +10,6 @@
 
 import com.devonfw.cobigen.api.exception.MergeException;
 
-/**
- *
- * @author mbrunnli (03.06.2014)
- */
 public class TextAppenderTest {
 
   /**
@@ -25,7 +21,6 @@ public class TextAppenderTest {
    * Tests a merge without adding a new line before appending the patch
    *
    * @throws Exception if errors occur while merging
-   * @author mbrunnli (03.06.2014)
    */
   @Test
   public void testMerge_appendWithoutNewLineNoAnchors() throws Exception {
@@ -39,7 +34,6 @@ public void testMerge_appendWithoutNewLineNoAnchors() throws Exception {
    * Tests a merge with adding a new line before appending the patch
    *
    * @throws Exception if errors occur while merging
-   * @author mbrunnli (03.06.2014)
    */
   @Test
   public void testMerge_appendWithNewLineNoAnchors() throws Exception {
@@ -54,7 +48,6 @@ public void testMerge_appendWithNewLineNoAnchors() throws Exception {
    * Tests a merge with adding a new line before appending the patch
    *
    * @throws Exception if errors occur while merging
-   * @author mbrunnli (03.06.2014)
    */
   @Test
   public void testMerge_appendWithNewLineNoAnchors_onlyIfPathIsNotEmpty() throws Exception {
@@ -68,7 +61,6 @@ public void testMerge_appendWithNewLineNoAnchors_onlyIfPathIsNotEmpty() throws E
    * Tests a merge with adding a new line before appending the patch
    *
    * @throws Exception if errors occur while merging
-   * @author mbrunnli (03.06.2014)
    */
   @Test
   public void testMerge_override() throws Exception {
diff --git a/cobigen-plugins/cobigen-tsplugin/src/main/java/com/devonfw/cobigen/tsplugin/matcher/TypeScriptMatcher.java b/cobigen-plugins/cobigen-tsplugin/src/main/java/com/devonfw/cobigen/tsplugin/matcher/TypeScriptMatcher.java
index f13a2381e1..ca320b1756 100644
--- a/cobigen-plugins/cobigen-tsplugin/src/main/java/com/devonfw/cobigen/tsplugin/matcher/TypeScriptMatcher.java
+++ b/cobigen-plugins/cobigen-tsplugin/src/main/java/com/devonfw/cobigen/tsplugin/matcher/TypeScriptMatcher.java
@@ -104,7 +104,6 @@ public Map<String, String> resolveVariables(MatcherTo matcher, List<VariableAssi
    * @param variableAssignments variable assigments to be resolved
    * @return a {@link Map} from variable name to the resolved value
    * @throws InvalidConfigurationException if some of the matcher type and variable type combinations are not supported
-   * @author mbrunnli (15.04.2013)
    */
   public Map<String, String> getResolvedVariables(MatcherType matcherType, String matcherValue, String stringToMatch,
       List<VariableAssignmentTo> variableAssignments) throws InvalidConfigurationException {
@@ -134,7 +133,6 @@ public Map<String, String> getResolvedVariables(MatcherType matcherType, String
    * @param va {@link VariableAssignmentTo} to be resolved
    * @return the resolved variable
    * @throws InvalidConfigurationException thrown if the matcher type and matcher value does not work in combination
-   * @author mbrunnli (08.04.2014)
    */
   private String resolveRegexValue(MatcherType matcherType, String matcherValue, String stringToMatch,
       VariableAssignmentTo va) throws InvalidConfigurationException {
diff --git a/cobigen-plugins/cobigen-xmlplugin/pom.xml b/cobigen-plugins/cobigen-xmlplugin/pom.xml
index 28b157ebea..40b526d87a 100644
--- a/cobigen-plugins/cobigen-xmlplugin/pom.xml
+++ b/cobigen-plugins/cobigen-xmlplugin/pom.xml
@@ -30,7 +30,7 @@
     <dependency>
       <groupId>com.github.maybeec</groupId>
       <artifactId>lexeme</artifactId>
-      <version>2.0.0</version>
+      <version>3.0.0</version>
     </dependency>
 
     <dependency>
diff --git a/cobigen-plugins/cobigen-xmlplugin/src/main/java/com/devonfw/cobigen/xmlplugin/XmlTriggerInterpreter.java b/cobigen-plugins/cobigen-xmlplugin/src/main/java/com/devonfw/cobigen/xmlplugin/XmlTriggerInterpreter.java
index 8ea9e8ae53..89688c0d09 100644
--- a/cobigen-plugins/cobigen-xmlplugin/src/main/java/com/devonfw/cobigen/xmlplugin/XmlTriggerInterpreter.java
+++ b/cobigen-plugins/cobigen-xmlplugin/src/main/java/com/devonfw/cobigen/xmlplugin/XmlTriggerInterpreter.java
@@ -23,7 +23,6 @@ public class XmlTriggerInterpreter implements TriggerInterpreter {
    * creates a new {@link XmlTriggerInterpreter}
    *
    * @param type to be registered
-   * @author fkreis (18.11.2014)
    */
   public XmlTriggerInterpreter(String type) {
 
diff --git a/cobigen-plugins/cobigen-xmlplugin/src/main/java/com/devonfw/cobigen/xmlplugin/inputreader/ModelConstant.java b/cobigen-plugins/cobigen-xmlplugin/src/main/java/com/devonfw/cobigen/xmlplugin/inputreader/ModelConstant.java
index a842e4f1e4..3d7588ceee 100644
--- a/cobigen-plugins/cobigen-xmlplugin/src/main/java/com/devonfw/cobigen/xmlplugin/inputreader/ModelConstant.java
+++ b/cobigen-plugins/cobigen-xmlplugin/src/main/java/com/devonfw/cobigen/xmlplugin/inputreader/ModelConstant.java
@@ -5,8 +5,6 @@
 
 /**
  * String constants of the xml object model for generation.
- *
- * @author fkreis (10.11.2014)
  */
 public class ModelConstant {
 
diff --git a/cobigen-plugins/cobigen-xmlplugin/src/main/java/com/devonfw/cobigen/xmlplugin/merger/delegates/MergeType.java b/cobigen-plugins/cobigen-xmlplugin/src/main/java/com/devonfw/cobigen/xmlplugin/merger/delegates/MergeType.java
index 29553ecb1f..6e1bbb5b71 100644
--- a/cobigen-plugins/cobigen-xmlplugin/src/main/java/com/devonfw/cobigen/xmlplugin/merger/delegates/MergeType.java
+++ b/cobigen-plugins/cobigen-xmlplugin/src/main/java/com/devonfw/cobigen/xmlplugin/merger/delegates/MergeType.java
@@ -4,8 +4,6 @@
 
 /**
  * Maps the ConflictHandlingTypes and the already used merge types
- *
- * @author sholzer (Dec 22, 2015)
  */
 public enum MergeType {
 
@@ -59,7 +57,6 @@ public enum MergeType {
    *
    * @param value the name of the merge mode
    * @param type the ConflictHandlingType
-   * @author sholzer (Dec 22, 2015)
    */
   private MergeType(String value, ConflictHandlingType type) {
 
@@ -71,7 +68,6 @@ private MergeType(String value, ConflictHandlingType type) {
    * Returns the field 'type'
    *
    * @return value of type
-   * @author sholzer (Dec 22, 2015)
    */
   public ConflictHandlingType getType() {
 
@@ -82,7 +78,6 @@ public ConflictHandlingType getType() {
    * Returns the field 'value'
    *
    * @return value of value
-   * @author sholzer (Dec 22, 2015)
    */
   public String getValue() {
 
diff --git a/cobigen-plugins/cobigen-xmlplugin/src/main/java/com/devonfw/cobigen/xmlplugin/merger/delegates/XmlMergerDelegate.java b/cobigen-plugins/cobigen-xmlplugin/src/main/java/com/devonfw/cobigen/xmlplugin/merger/delegates/XmlMergerDelegate.java
index 337e8447f8..964c898bd7 100644
--- a/cobigen-plugins/cobigen-xmlplugin/src/main/java/com/devonfw/cobigen/xmlplugin/merger/delegates/XmlMergerDelegate.java
+++ b/cobigen-plugins/cobigen-xmlplugin/src/main/java/com/devonfw/cobigen/xmlplugin/merger/delegates/XmlMergerDelegate.java
@@ -42,7 +42,6 @@ public class XmlMergerDelegate implements Merger {
    * @param mergeSchemaLocation String of a path to the folder containing the merge schemas to be used
    * @param mergeType the way how conflicts will be handled
    * @param validate use validator
-   * @author sholzer (Aug 27, 2015)
    */
   public XmlMergerDelegate(String mergeSchemaLocation, MergeType mergeType, Boolean validate) {
 
@@ -58,7 +57,6 @@ public XmlMergerDelegate(String mergeSchemaLocation, MergeType mergeType, Boolea
    * @param mergeSchemaLocation Path to the folder containing the merge schemas to be used
    * @param mergeType the way how conflicts will be handled
    * @param validate use validator
-   * @author sholzer (Aug 27, 2015)
    */
   public XmlMergerDelegate(Path mergeSchemaLocation, MergeType mergeType, Boolean validate) {
 
@@ -110,7 +108,6 @@ public String merge(File base, String patch, String targetCharset) throws MergeE
    * Sets the validation flag
    *
    * @param validation true if a validation is desired. false otherwise. Default is false
-   * @author sholzer (Sep 1, 2015)
    */
   public void setValidation(boolean validation) {
 
diff --git a/cobigen-plugins/cobigen-xmlplugin/src/test/java/com/devonfw/cobigen/xmlplugin/integrationtest/XPathGenerationTest.java b/cobigen-plugins/cobigen-xmlplugin/src/test/java/com/devonfw/cobigen/xmlplugin/integrationtest/XPathGenerationTest.java
index 2fddf7b9ac..1b259f3ad7 100644
--- a/cobigen-plugins/cobigen-xmlplugin/src/test/java/com/devonfw/cobigen/xmlplugin/integrationtest/XPathGenerationTest.java
+++ b/cobigen-plugins/cobigen-xmlplugin/src/test/java/com/devonfw/cobigen/xmlplugin/integrationtest/XPathGenerationTest.java
@@ -37,7 +37,7 @@ public void testXpathAccess() throws Exception {
     Path cobigenConfigFolder = new File("src/test/resources/testdata/integrationtest/uml-basic-test").toPath();
     Path input = cobigenConfigFolder.resolve("uml.xml");
 
-    CobiGen cobigen = CobiGenFactory.create(cobigenConfigFolder.toUri());
+    CobiGen cobigen = CobiGenFactory.create(cobigenConfigFolder.toUri(), true);
     Object compliantInput = cobigen.read(input, Charset.forName("UTF-8"));
     List<TemplateTo> matchingTemplates = cobigen.getMatchingTemplates(compliantInput);
     assertThat(matchingTemplates).isNotNull().hasSize(1);
diff --git a/cobigen-plugins/cobigen-xmlplugin/src/test/java/com/devonfw/cobigen/xmlplugin/integrationtest/XmlPluginIntegrationTest.java b/cobigen-plugins/cobigen-xmlplugin/src/test/java/com/devonfw/cobigen/xmlplugin/integrationtest/XmlPluginIntegrationTest.java
index 96403026a0..69671a11fc 100644
--- a/cobigen-plugins/cobigen-xmlplugin/src/test/java/com/devonfw/cobigen/xmlplugin/integrationtest/XmlPluginIntegrationTest.java
+++ b/cobigen-plugins/cobigen-xmlplugin/src/test/java/com/devonfw/cobigen/xmlplugin/integrationtest/XmlPluginIntegrationTest.java
@@ -56,7 +56,7 @@ public void testSimpleUmlEntityExtraction() throws Exception {
     // arrange
     Path configFolder = new File(testFileRootPath + "uml-classdiag").toPath();
     File xmlFile = configFolder.resolve("completeUmlXmi.xml").toFile();
-    CobiGen cobigen = CobiGenFactory.create(configFolder.toUri());
+    CobiGen cobigen = CobiGenFactory.create(configFolder.toUri(), true);
     Object doc = cobigen.read(xmlFile.toPath(), UTF_8);
     File targetFolder = this.tmpFolder.newFolder("testSimpleUmlEntityExtraction");
 
@@ -95,7 +95,7 @@ public void testUmlMethodAttributeExtraction() throws Exception {
     // arrange
     Path configFolder = new File(testFileRootPath + "uml-classdiag").toPath();
     File xmlFile = configFolder.resolve("completeUmlXmi.xml").toFile();
-    CobiGen cobigen = CobiGenFactory.create(configFolder.toUri());
+    CobiGen cobigen = CobiGenFactory.create(configFolder.toUri(), true);
     Object doc = cobigen.read(xmlFile.toPath(), UTF_8);
     File targetFolder = this.tmpFolder.newFolder("testSimpleUmlEntityExtraction");
 
@@ -136,7 +136,7 @@ public void testUmlEntityExtraction() throws Exception {
     // arrange
     Path configFolder = new File(testFileRootPath + "uml-classdiag").toPath();
     File xmlFile = configFolder.resolve("nullMultiplicity.xml").toFile();
-    CobiGen cobigen = CobiGenFactory.create(configFolder.toUri());
+    CobiGen cobigen = CobiGenFactory.create(configFolder.toUri(), true);
     Object doc = cobigen.read(xmlFile.toPath(), UTF_8);
     File targetFolder = this.tmpFolder.newFolder("testSimpleUmlEntityExtraction");
 
@@ -406,7 +406,7 @@ public void testMergeStrategyDefined_xmlmerge_override_validate() throws Excepti
   private GenerationReportToAssert generateTemplateAndTestOutput(String templateId, String outputFileName,
       String expectedFileContents) throws Exception {
 
-    CobiGen cobiGen = CobiGenFactory.create(this.cobigenConfigFolder.toURI());
+    CobiGen cobiGen = CobiGenFactory.create(this.cobigenConfigFolder.toURI(), true);
 
     // wenn der temporäre Output Ordner breits existiert, dann wird dieser wiederverwendet.
     File tmpFolderCobiGen = new File(this.tmpFolder.getRoot().getAbsolutePath() + File.separator + "cobigen_output");
diff --git a/cobigen-plugins/cobigen-xmlplugin/src/test/java/com/devonfw/cobigen/xmlplugin/integrationtest/merger/XmlPluginMergerIntegrationTest.java b/cobigen-plugins/cobigen-xmlplugin/src/test/java/com/devonfw/cobigen/xmlplugin/integrationtest/merger/XmlPluginMergerIntegrationTest.java
index b7cf4bd44f..99edc98fa9 100644
--- a/cobigen-plugins/cobigen-xmlplugin/src/test/java/com/devonfw/cobigen/xmlplugin/integrationtest/merger/XmlPluginMergerIntegrationTest.java
+++ b/cobigen-plugins/cobigen-xmlplugin/src/test/java/com/devonfw/cobigen/xmlplugin/integrationtest/merger/XmlPluginMergerIntegrationTest.java
@@ -122,7 +122,6 @@ public void testNoDuplicateNamespacesMerged() throws Exception {
   /**
    * Merges two Spring web flow documents.
    *
-   * @author sholzer (Aug 27, 2015)
    * @throws Exception hopefully never
    */
   @Test
@@ -153,7 +152,6 @@ public void webFlowTest() throws Exception {
    * Merges two xhtml documents
    *
    * @throws Exception test fails
-   * @author sholzer (Aug 28, 2015)
    */
   @Test
   public void xhtmlTest() throws Exception {
@@ -183,7 +181,6 @@ public void xhtmlTest() throws Exception {
 
   /**
    * @throws Exception test fails
-   * @author sholzer (Aug 28, 2015)
    */
   @Test
   public void queryTest() throws Exception {
diff --git a/cobigen-plugins/cobigen-xmlplugin/src/test/resources/testdata/integrationtest/templates/context.xml b/cobigen-plugins/cobigen-xmlplugin/src/test/resources/testdata/integrationtest/templates/context.xml
index 2bc6c04b37..a5440eb759 100644
--- a/cobigen-plugins/cobigen-xmlplugin/src/test/resources/testdata/integrationtest/templates/context.xml
+++ b/cobigen-plugins/cobigen-xmlplugin/src/test/resources/testdata/integrationtest/templates/context.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="2.1">
+<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="3.0">
     <trigger id="testTemplates" type="xml" templateFolder="testTemplates">
         <matcher type="nodename" value="root">
             <variableAssignment type="constant" key="testConstantKey" value="testConstantValue"/>
         </matcher>
     </trigger>
+  <tags>
+    <tag name="bla" />
+  </tags>
 </contextConfiguration>
diff --git a/cobigen-plugins/cobigen-xmlplugin/src/test/resources/testdata/integrationtest/uml-basic-test/context.xml b/cobigen-plugins/cobigen-xmlplugin/src/test/resources/testdata/integrationtest/uml-basic-test/context.xml
index 0addf55ed3..092752b613 100644
--- a/cobigen-plugins/cobigen-xmlplugin/src/test/resources/testdata/integrationtest/uml-basic-test/context.xml
+++ b/cobigen-plugins/cobigen-xmlplugin/src/test/resources/testdata/integrationtest/uml-basic-test/context.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="2.1">
+<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="3.0">
   <trigger id="uml_test" type="xml" templateFolder="uml_test">
     <matcher type="nodename" value="xmi:XMI">
       <variableAssignment type="constant" key="className" value="Bill"/>
     </matcher>
   </trigger>
+  <tags>
+    <tag name="bla" />
+  </tags>
 </contextConfiguration>
diff --git a/cobigen-plugins/cobigen-xmlplugin/src/test/resources/testdata/integrationtest/uml-classdiag/context.xml b/cobigen-plugins/cobigen-xmlplugin/src/test/resources/testdata/integrationtest/uml-classdiag/context.xml
index b85d94c4be..e768b6fcfd 100644
--- a/cobigen-plugins/cobigen-xmlplugin/src/test/resources/testdata/integrationtest/uml-classdiag/context.xml
+++ b/cobigen-plugins/cobigen-xmlplugin/src/test/resources/testdata/integrationtest/uml-classdiag/context.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="2.1">
+<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="3.0">
   <trigger id="uml_classdiag_test" type="xml" templateFolder="uml_test">
     <containerMatcher type="xpath" value="/xmi:XMI//packagedElement[@xmi:type='uml:Class']" />
     <matcher type="xpath" value="self::node()[@xmi:type='uml:Class']">
       <variableAssignment type="xpath" key="className" value="@name"/>
     </matcher>
   </trigger>
+  <tags>
+    <tag name="bla" />
+  </tags>
 </contextConfiguration>
diff --git a/cobigen-templates/crud-angular-client-app/pom.xml b/cobigen-templates/crud-angular-client-app/pom.xml
new file mode 100644
index 0000000000..8cc9ddbf25
--- /dev/null
+++ b/cobigen-templates/crud-angular-client-app/pom.xml
@@ -0,0 +1,21 @@
+<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>crud-angular-client-app</artifactId>
+  <name>CRUD Angular Client App template</name>
+
+  <parent>
+    <groupId>com.devonfw.cobigen.templates</groupId>
+    <artifactId>templates-parent</artifactId>
+    <version>${revision}</version>
+  </parent>
+
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+    </dependency>
+  </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/cobigen-templates/templates-devon4j/src/main/java-templates/com/devonfw/cobigen/templates/devon4j/config/constant/MavenMetadata.java b/cobigen-templates/crud-angular-client-app/src/main/java-templates/com/devonfw/cobigen/templates/devon4j/config/constant/MavenMetadata.java
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/java-templates/com/devonfw/cobigen/templates/devon4j/config/constant/MavenMetadata.java
rename to cobigen-templates/crud-angular-client-app/src/main/java-templates/com/devonfw/cobigen/templates/devon4j/config/constant/MavenMetadata.java
diff --git a/cobigen-templates/templates-devon4j/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/JavaUtil.java b/cobigen-templates/crud-angular-client-app/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/JavaUtil.java
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/JavaUtil.java
rename to cobigen-templates/crud-angular-client-app/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/JavaUtil.java
diff --git a/cobigen-templates/crud-angular-client-app/src/main/resources/template-set.xml b/cobigen-templates/crud-angular-client-app/src/main/resources/template-set.xml
new file mode 100644
index 0000000000..3b7e837efa
--- /dev/null
+++ b/cobigen-templates/crud-angular-client-app/src/main/resources/template-set.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:templateSetConfiguration version="6.0" xmlns:tns="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration" xmlns:cc="http://capgemini.com/devonfw/cobigen/ContextConfiguration" xmlns:tc="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration templateSetConfiguration.xsd ">
+ <cc:contextConfiguration version="3.0">
+  <cc:trigger id="crud_angular_client_app" type="java">
+    <cc:matcher type="fqn" value="((.+\.)?([^\.]+))\.([^\.]+)\.logic\.api\.to\.([^\.]+)Eto">
+      <cc:variableAssignment type="regex" key="rootPackage" value="1" />
+      <cc:variableAssignment type="regex" key="domain" value="3" />
+      <cc:variableAssignment type="regex" key="component" value="4" />
+      <cc:variableAssignment type="regex" key="etoName" value="5" />
+    </cc:matcher>
+  </cc:trigger>
+  <cc:tags>
+    <cc:tag name="Angular"></cc:tag>
+    <cc:tag name="CRUD"></cc:tag>
+    <cc:tag name="Client"></cc:tag>
+    <cc:tag name="App"></cc:tag>
+  </cc:tags>
+  <cc:links>
+    <cc:link url="https://github.com/devonfw/cobigen/wiki/howto_angular-client-generation"></cc:link>
+  </cc:links>
+   </cc:contextConfiguration >
+
+<tc:templatesConfiguration version="5.0">
+  <tc:templates>
+    <tc:templateExtension ref="${variables.etoName#lower_case}-dialog.component.ts" mergeStrategy="tsmerge" />
+    <tc:templateExtension ref="${variables.etoName#lower_case}-grid.component.ts" mergeStrategy="tsmerge" />
+    <tc:templateExtension ref="${variables.etoName#lower_case}-alert.component.ts" mergeStrategy="tsmerge" />
+    <tc:templateExtension ref="${variables.etoName#lower_case}.service.ts" mergeStrategy="tsmerge" />
+    <tc:templateExtension ref="app.module.ts" mergeStrategy="tsmerge" />
+    <tc:templateExtension ref="es.json" mergeStrategy="jsonmerge" />
+    <tc:templateExtension ref="en.json" mergeStrategy="jsonmerge" />
+    <tc:templateExtension ref="app-routing.module.ts" mergeStrategy="tsmerge_override" />
+    <tc:templateExtension ref="nav-bar.component.html" mergeStrategy="html-ng*" />
+  </tc:templates>
+  <tc:templateScans>
+    <tc:templateScan name="ts_scan" templatePath="templates" destinationPath="" />
+  </tc:templateScans>
+  <tc:increments>
+    <tc:increment name="devon4ng-app" description="CRUD devon4ng Angular App" explanation="Creates Angular stack CRUD service.">
+      <tc:incrementRef ref="app_angular_i18n" />
+      <tc:incrementRef ref="app_angular_devon4ng_component" />
+    </tc:increment>
+    <tc:increment name="app_angular_i18n" description="Angular i18n">
+      <tc:templateRef ref="es.json" />
+      <tc:templateRef ref="en.json" />
+    </tc:increment>
+    <tc:increment name="app_angular_devon4ng_component" description="Angular devon4ng Component">
+      <tc:templateRef ref="${variables.etoName#lower_case}-dialog.component.html" />
+      <tc:templateRef ref="${variables.etoName#lower_case}-dialog.component.ts" />
+      <tc:templateRef ref="${variables.etoName#lower_case}-dialog.component.spec.ts" />
+      <tc:templateRef ref="${variables.etoName#lower_case}-grid.component.html" />
+      <tc:templateRef ref="${variables.etoName#lower_case}-grid.component.scss" />
+      <tc:templateRef ref="${variables.etoName#lower_case}-grid.component.ts" />
+      <tc:templateRef ref="${variables.etoName#lower_case}-grid.component.spec.ts" />
+      <tc:templateRef ref="${variables.etoName#lower_case}-alert.component.html" />
+      <tc:templateRef ref="${variables.etoName#lower_case}-alert.component.scss" />
+      <tc:templateRef ref="${variables.etoName#lower_case}-alert.component.ts" />
+      <tc:templateRef ref="${variables.etoName#lower_case}-alert.component.spec.ts" />
+      <tc:templateRef ref="${variables.etoName#lower_case}.service.ts" />
+      <tc:templateRef ref="${variables.etoName#lower_case}.service.spec.ts" />
+      <tc:templateRef ref="${variables.etoName#lower_case}-routing.module.ts" />
+      <tc:templateRef ref="${variables.etoName#lower_case}.module.ts" />
+      <tc:templateRef ref="app.module.ts" />
+      <tc:templateRef ref="app-routing.module.ts" />
+      <tc:templateRef ref="nav-bar.component.html" />
+    </tc:increment>
+  </tc:increments>
+</tc:templatesConfiguration>
+</tns:templateSetConfiguration>
\ No newline at end of file
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_angular_client_app/templates/cobigen.properties b/cobigen-templates/crud-angular-client-app/src/main/resources/templates/cobigen.properties
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_angular_client_app/templates/cobigen.properties
rename to cobigen-templates/crud-angular-client-app/src/main/resources/templates/cobigen.properties
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_angular_client_app/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-alert/${variables.etoName#lower_case}-alert.component.html.ftl b/cobigen-templates/crud-angular-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-alert/${variables.etoName#lower_case}-alert.component.html.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_angular_client_app/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-alert/${variables.etoName#lower_case}-alert.component.html.ftl
rename to cobigen-templates/crud-angular-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-alert/${variables.etoName#lower_case}-alert.component.html.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_angular_client_app/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-alert/${variables.etoName#lower_case}-alert.component.scss b/cobigen-templates/crud-angular-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-alert/${variables.etoName#lower_case}-alert.component.scss
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_angular_client_app/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-alert/${variables.etoName#lower_case}-alert.component.scss
rename to cobigen-templates/crud-angular-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-alert/${variables.etoName#lower_case}-alert.component.scss
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_angular_client_app/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-alert/${variables.etoName#lower_case}-alert.component.spec.ts.ftl b/cobigen-templates/crud-angular-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-alert/${variables.etoName#lower_case}-alert.component.spec.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_angular_client_app/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-alert/${variables.etoName#lower_case}-alert.component.spec.ts.ftl
rename to cobigen-templates/crud-angular-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-alert/${variables.etoName#lower_case}-alert.component.spec.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_angular_client_app/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-alert/${variables.etoName#lower_case}-alert.component.ts.ftl b/cobigen-templates/crud-angular-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-alert/${variables.etoName#lower_case}-alert.component.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_angular_client_app/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-alert/${variables.etoName#lower_case}-alert.component.ts.ftl
rename to cobigen-templates/crud-angular-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-alert/${variables.etoName#lower_case}-alert.component.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_angular_client_app/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-dialog/${variables.etoName#lower_case}-dialog.component.html.ftl b/cobigen-templates/crud-angular-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-dialog/${variables.etoName#lower_case}-dialog.component.html.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_angular_client_app/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-dialog/${variables.etoName#lower_case}-dialog.component.html.ftl
rename to cobigen-templates/crud-angular-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-dialog/${variables.etoName#lower_case}-dialog.component.html.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_angular_client_app/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-dialog/${variables.etoName#lower_case}-dialog.component.spec.ts.ftl b/cobigen-templates/crud-angular-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-dialog/${variables.etoName#lower_case}-dialog.component.spec.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_angular_client_app/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-dialog/${variables.etoName#lower_case}-dialog.component.spec.ts.ftl
rename to cobigen-templates/crud-angular-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-dialog/${variables.etoName#lower_case}-dialog.component.spec.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_angular_client_app/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-dialog/${variables.etoName#lower_case}-dialog.component.ts.ftl b/cobigen-templates/crud-angular-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-dialog/${variables.etoName#lower_case}-dialog.component.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_angular_client_app/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-dialog/${variables.etoName#lower_case}-dialog.component.ts.ftl
rename to cobigen-templates/crud-angular-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-dialog/${variables.etoName#lower_case}-dialog.component.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_angular_client_app/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-grid/${variables.etoName#lower_case}-grid.component.html.ftl b/cobigen-templates/crud-angular-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-grid/${variables.etoName#lower_case}-grid.component.html.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_angular_client_app/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-grid/${variables.etoName#lower_case}-grid.component.html.ftl
rename to cobigen-templates/crud-angular-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-grid/${variables.etoName#lower_case}-grid.component.html.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_angular_client_app/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-grid/${variables.etoName#lower_case}-grid.component.scss b/cobigen-templates/crud-angular-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-grid/${variables.etoName#lower_case}-grid.component.scss
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_angular_client_app/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-grid/${variables.etoName#lower_case}-grid.component.scss
rename to cobigen-templates/crud-angular-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-grid/${variables.etoName#lower_case}-grid.component.scss
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_angular_client_app/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-grid/${variables.etoName#lower_case}-grid.component.spec.ts.ftl b/cobigen-templates/crud-angular-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-grid/${variables.etoName#lower_case}-grid.component.spec.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_angular_client_app/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-grid/${variables.etoName#lower_case}-grid.component.spec.ts.ftl
rename to cobigen-templates/crud-angular-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-grid/${variables.etoName#lower_case}-grid.component.spec.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_angular_client_app/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-grid/${variables.etoName#lower_case}-grid.component.ts.ftl b/cobigen-templates/crud-angular-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-grid/${variables.etoName#lower_case}-grid.component.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_angular_client_app/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-grid/${variables.etoName#lower_case}-grid.component.ts.ftl
rename to cobigen-templates/crud-angular-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-grid/${variables.etoName#lower_case}-grid.component.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_angular_client_app/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-routing.module.ts.ftl b/cobigen-templates/crud-angular-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-routing.module.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_angular_client_app/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-routing.module.ts.ftl
rename to cobigen-templates/crud-angular-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-routing.module.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_angular_client_app/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}.module.ts.ftl b/cobigen-templates/crud-angular-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}.module.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_angular_client_app/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}.module.ts.ftl
rename to cobigen-templates/crud-angular-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}.module.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_angular_client_app/templates/src/app/${variables.etoName#lower_case}/services/${variables.etoName#lower_case}.service.spec.ts.ftl b/cobigen-templates/crud-angular-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/services/${variables.etoName#lower_case}.service.spec.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_angular_client_app/templates/src/app/${variables.etoName#lower_case}/services/${variables.etoName#lower_case}.service.spec.ts.ftl
rename to cobigen-templates/crud-angular-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/services/${variables.etoName#lower_case}.service.spec.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_angular_client_app/templates/src/app/${variables.etoName#lower_case}/services/${variables.etoName#lower_case}.service.ts.ftl b/cobigen-templates/crud-angular-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/services/${variables.etoName#lower_case}.service.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_angular_client_app/templates/src/app/${variables.etoName#lower_case}/services/${variables.etoName#lower_case}.service.ts.ftl
rename to cobigen-templates/crud-angular-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/services/${variables.etoName#lower_case}.service.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_angular_client_app/templates/src/app/app-routing.module.ts.ftl b/cobigen-templates/crud-angular-client-app/src/main/resources/templates/src/app/app-routing.module.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_angular_client_app/templates/src/app/app-routing.module.ts.ftl
rename to cobigen-templates/crud-angular-client-app/src/main/resources/templates/src/app/app-routing.module.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_angular_client_app/templates/src/app/app.module.ts.ftl b/cobigen-templates/crud-angular-client-app/src/main/resources/templates/src/app/app.module.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_angular_client_app/templates/src/app/app.module.ts.ftl
rename to cobigen-templates/crud-angular-client-app/src/main/resources/templates/src/app/app.module.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_angular_client_app/templates/src/app/layout/nav-bar/nav-bar.component.html.ftl b/cobigen-templates/crud-angular-client-app/src/main/resources/templates/src/app/layout/nav-bar/nav-bar.component.html.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_angular_client_app/templates/src/app/layout/nav-bar/nav-bar.component.html.ftl
rename to cobigen-templates/crud-angular-client-app/src/main/resources/templates/src/app/layout/nav-bar/nav-bar.component.html.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_angular_client_app/templates/src/assets/i18n/en.json.ftl b/cobigen-templates/crud-angular-client-app/src/main/resources/templates/src/assets/i18n/en.json.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_angular_client_app/templates/src/assets/i18n/en.json.ftl
rename to cobigen-templates/crud-angular-client-app/src/main/resources/templates/src/assets/i18n/en.json.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_angular_client_app/templates/src/assets/i18n/es.json.ftl b/cobigen-templates/crud-angular-client-app/src/main/resources/templates/src/assets/i18n/es.json.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_angular_client_app/templates/src/assets/i18n/es.json.ftl
rename to cobigen-templates/crud-angular-client-app/src/main/resources/templates/src/assets/i18n/es.json.ftl
diff --git a/cobigen-templates/crud-angular-client-app/src/test/java/com/devonfw/cobigen/templates/devon4j/test/templates/CrudAngularClientAppGenerationTest.java b/cobigen-templates/crud-angular-client-app/src/test/java/com/devonfw/cobigen/templates/devon4j/test/templates/CrudAngularClientAppGenerationTest.java
new file mode 100644
index 0000000000..0fc7666a51
--- /dev/null
+++ b/cobigen-templates/crud-angular-client-app/src/test/java/com/devonfw/cobigen/templates/devon4j/test/templates/CrudAngularClientAppGenerationTest.java
@@ -0,0 +1,100 @@
+package com.devonfw.cobigen.templates.devon4j.test.templates;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+import org.apache.commons.io.FileUtils;
+import org.junit.BeforeClass;
+import org.junit.ClassRule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+
+import com.devonfw.cobigen.api.constants.ConfigurationConstants;
+import com.devonfw.cobigen.maven.test.AbstractMavenTest;
+import com.devonfw.cobigen.templates.devon4j.config.constant.MavenMetadata;
+
+/**
+ * Smoke tests of all templates.
+ */
+public class CrudAngularClientAppGenerationTest extends AbstractMavenTest {
+
+  /** Root of all test resources of this test suite */
+  public static final String TEST_RESOURCES_ROOT = "src/test/resources/testdata/templatetest/";
+
+  /** Temporary files rule to create temporary folders */
+  @ClassRule
+  public static TemporaryFolder tempFolder = new TemporaryFolder();
+
+  /** The templates development folder */
+  protected static Path templatesProject;
+
+  /** The templates development folder */
+  protected static Path templatesProjectTemporary;
+
+  /**
+   * Creates a copy of the templates project in the temp directory
+   *
+   * @throws URISyntaxException if the path could not be created properly
+   * @throws IOException if accessing a directory or file fails
+   */
+  @BeforeClass
+  public static void setupDevTemplates() throws URISyntaxException, IOException {
+
+    templatesProject = new File(
+        CrudAngularClientAppGenerationTest.class.getProtectionDomain().getCodeSource().getLocation().toURI())
+            .getParentFile().getParentFile().toPath();
+
+    Path utilsPom = new File(
+        CrudAngularClientAppGenerationTest.class.getProtectionDomain().getCodeSource().getLocation().toURI())
+            .getParentFile().getParentFile().toPath().resolve("src/test/resources/utils/pom.xml");
+
+    // create a temporary directory cobigen-templates/template-sets/adapted containing the template sets
+    Path tempFolderPath = tempFolder.getRoot().toPath();
+    Path cobigenTemplatePath = tempFolderPath.resolve("cobigen-templates");
+    if (!Files.exists(cobigenTemplatePath)) {
+      Files.createDirectory(cobigenTemplatePath);
+
+      templatesProjectTemporary = cobigenTemplatePath.resolve(ConfigurationConstants.TEMPLATE_SETS_FOLDER);
+      Path templateSetsAdaptedFolder = templatesProjectTemporary.resolve(ConfigurationConstants.ADAPTED_FOLDER);
+      Files.createDirectory(templatesProjectTemporary);
+      Files.createDirectory(templateSetsAdaptedFolder);
+
+      Path templateSetPath = templateSetsAdaptedFolder.resolve("template-set");
+      FileUtils.copyDirectory(templatesProject.toFile(), templateSetPath.toFile());
+
+      if (Files.isDirectory(templateSetPath)) {
+
+        // Replace the pom.xml in the template sets. Needed so that the project in the temp directory is build
+        // properly
+        if (Files.exists(templateSetPath.resolve("pom.xml"))) {
+          try {
+            Files.delete(templateSetPath.resolve("pom.xml"));
+          } catch (IOException e) {
+            throw new IOException("Error deleting file " + templateSetPath.resolve("pom.xml"), e);
+          }
+          try {
+            Files.copy(utilsPom, templateSetPath.resolve("pom.xml"));
+          } catch (IOException e) {
+            throw new IOException("Error copying file " + utilsPom, e);
+          }
+        }
+      }
+    }
+  }
+
+  /**
+   * Test successful generation of all templates based on an ETO
+   *
+   * @throws Exception test fails
+   */
+  @Test
+  public void testAllTemplatesGeneration_EtoInput() throws Exception {
+
+    File testProject = new File(TEST_RESOURCES_ROOT + "TestAllTemplatesEtoInput/");
+    runMavenInvoker(testProject, templatesProjectTemporary.toFile(), MavenMetadata.LOCAL_REPO);
+  }
+
+}
diff --git a/cobigen-templates/templates-devon4j/src/test/resources/logback.xml b/cobigen-templates/crud-angular-client-app/src/test/resources/testdata/templatetest/TestAllTemplatesEtoInput/logback.xml
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/test/resources/logback.xml
rename to cobigen-templates/crud-angular-client-app/src/test/resources/testdata/templatetest/TestAllTemplatesEtoInput/logback.xml
diff --git a/cobigen-templates/templates-devon4j/src/test/resources/testdata/templatetest/TestAllTemplatesEtoInput/pom.xml b/cobigen-templates/crud-angular-client-app/src/test/resources/testdata/templatetest/TestAllTemplatesEtoInput/pom.xml
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/test/resources/testdata/templatetest/TestAllTemplatesEtoInput/pom.xml
rename to cobigen-templates/crud-angular-client-app/src/test/resources/testdata/templatetest/TestAllTemplatesEtoInput/pom.xml
diff --git a/cobigen-templates/templates-devon4j/src/test/resources/testdata/templatetest/TestAllTemplatesEtoInput/src/main/java/io/github/devonfw/cobigen/generator/logic/api/to/InputEto.java b/cobigen-templates/crud-angular-client-app/src/test/resources/testdata/templatetest/TestAllTemplatesEtoInput/src/main/java/io/github/devonfw/cobigen/generator/logic/api/to/InputEto.java
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/test/resources/testdata/templatetest/TestAllTemplatesEtoInput/src/main/java/io/github/devonfw/cobigen/generator/logic/api/to/InputEto.java
rename to cobigen-templates/crud-angular-client-app/src/test/resources/testdata/templatetest/TestAllTemplatesEtoInput/src/main/java/io/github/devonfw/cobigen/generator/logic/api/to/InputEto.java
diff --git a/cobigen-templates/crud-angular-client-app/src/test/resources/utils/pom.xml b/cobigen-templates/crud-angular-client-app/src/test/resources/utils/pom.xml
new file mode 100644
index 0000000000..05c62afd9d
--- /dev/null
+++ b/cobigen-templates/crud-angular-client-app/src/test/resources/utils/pom.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.devonfw.cobigen.templates</groupId>
+  <artifactId>crud-openapi-java-server-app</artifactId>
+  <version>2021.12.007-SNAPSHOT</version>
+  <name>CRUD Angular Client App</name>
+  <description>A Code-based incremental Generator</description>
+  <licenses>
+    <license>
+      <name>Apache Software License 2.0</name>
+      <url>https://raw.githubusercontent.com/devonfw/.github/master/LICENSE</url>
+      <distribution>repo</distribution>
+      <comments></comments>
+    </license>
+  </licenses>
+  <dependencies>
+    <dependency>
+      <groupId>javax.ws.rs</groupId>
+      <artifactId>javax.ws.rs-api</artifactId>
+      <version>2.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.data</groupId>
+      <artifactId>spring-data-rest-webmvc</artifactId>
+      <version>3.7.10</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+      <version>3.12.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+      <version>2.10.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>xerces</groupId>
+      <artifactId>xercesImpl</artifactId>
+      <version>2.12.2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.persistence</groupId>
+      <artifactId>javax.persistence-api</artifactId>
+      <version>2.2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>1.7.30</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <version>1.7.30</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>log4j-over-slf4j</artifactId>
+      <version>1.7.30</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+  <repositories>
+    <repository>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+      <id>ossrh</id>
+      <name>OSSRH Snapshots</name>
+      <url>https://s01.oss.sonatype.org/content/repositories/snapshots/</url>
+    </repository>
+  </repositories>
+
+  <properties>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
+  </properties>
+
+  <build>
+    <resources>
+      <resource>
+        <directory>src/main/java</directory>
+      </resource>
+    </resources>
+  </build>
+</project>
\ No newline at end of file
diff --git a/cobigen-templates/crud-ionic-client-app/java/com/devonfw/cobigen/templates/devon4j/test/templates/CrudIonicClientAppTest.java b/cobigen-templates/crud-ionic-client-app/java/com/devonfw/cobigen/templates/devon4j/test/templates/CrudIonicClientAppTest.java
new file mode 100644
index 0000000000..da4376dee7
--- /dev/null
+++ b/cobigen-templates/crud-ionic-client-app/java/com/devonfw/cobigen/templates/devon4j/test/templates/CrudIonicClientAppTest.java
@@ -0,0 +1,100 @@
+package com.devonfw.cobigen.templates.devon4j.test.templates;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+import org.apache.commons.io.FileUtils;
+import org.junit.BeforeClass;
+import org.junit.ClassRule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+
+import com.devonfw.cobigen.api.constants.ConfigurationConstants;
+import com.devonfw.cobigen.templates.devon4j.config.constant.MavenMetadata;
+import com.devonfw.cobigen.maven.test.AbstractMavenTest;
+
+/**
+ * Smoke tests of all templates.
+ */
+public class CrudIonicClientAppTest extends AbstractMavenTest {
+
+  /** Root of all test resources of this test suite */
+  public static final String TEST_RESOURCES_ROOT = "src/test/resources/testdata/templatetest/";
+
+  /** Temporary files rule to create temporary folders */
+  @ClassRule
+  public static TemporaryFolder tempFolder = new TemporaryFolder();
+
+  /** The templates development folder */
+  protected static Path templatesProject;
+
+  /** The templates development folder */
+  protected static Path templatesProjectTemporary;
+
+  /**
+   * Creates a copy of the templates project in the temp directory
+   *
+   * @throws URISyntaxException if the path could not be created properly
+   * @throws IOException if accessing a directory or file fails
+   */
+  @BeforeClass
+  public static void setupDevTemplates() throws URISyntaxException, IOException {
+
+    templatesProject = new File(
+        CrudIonicClientAppTest.class.getProtectionDomain().getCodeSource().getLocation().toURI()).getParentFile()
+            .getParentFile().toPath();
+
+    Path utilsPom = new File(
+        CrudIonicClientAppTest.class.getProtectionDomain().getCodeSource().getLocation().toURI()).getParentFile()
+            .getParentFile().toPath().resolve("src/test/resources/utils/pom.xml");
+
+    // create a temporary directory cobigen-templates/template-sets/adapted containing the template sets
+    Path tempFolderPath = tempFolder.getRoot().toPath();
+    Path cobigenTemplatePath = tempFolderPath.resolve("cobigen-templates");
+    if (!Files.exists(cobigenTemplatePath)) {
+      Files.createDirectory(cobigenTemplatePath);
+
+      templatesProjectTemporary = cobigenTemplatePath.resolve(ConfigurationConstants.TEMPLATE_SETS_FOLDER);
+      Path templateSetsAdaptedFolder = templatesProjectTemporary.resolve(ConfigurationConstants.ADAPTED_FOLDER);
+      Files.createDirectory(templatesProjectTemporary);
+      Files.createDirectory(templateSetsAdaptedFolder);
+
+      Path templateSetPath = templateSetsAdaptedFolder.resolve("template-set");
+      FileUtils.copyDirectory(templatesProject.toFile(), templateSetPath.toFile());
+
+      if (Files.isDirectory(templateSetPath)) {
+
+        // Replace the pom.xml in the template sets. Needed so that the project in the temp directory is build
+        // properly
+        if (Files.exists(templateSetPath.resolve("pom.xml"))) {
+          try {
+            Files.delete(templateSetPath.resolve("pom.xml"));
+          } catch (IOException e) {
+            throw new IOException("Error deleting file " + templateSetPath.resolve("pom.xml"), e);
+          }
+          try {
+            Files.copy(utilsPom, templateSetPath.resolve("pom.xml"));
+          } catch (IOException e) {
+            throw new IOException("Error copying file " + utilsPom, e);
+          }
+        }
+      }
+    }
+  }
+
+  /**
+   * Test successful generation of all templates based on an ETO
+   *
+   * @throws Exception test fails
+   */
+  @Test
+  public void testAllTemplatesGeneration_OpenApiInput() throws Exception {
+
+    File testProject = new File(TEST_RESOURCES_ROOT + "TestAllTemplatesOpenApiInput/");
+    runMavenInvoker(testProject, templatesProjectTemporary.toFile(), MavenMetadata.LOCAL_REPO);
+  }
+
+}
diff --git a/cobigen-templates/crud-ionic-client-app/pom.xml b/cobigen-templates/crud-ionic-client-app/pom.xml
new file mode 100644
index 0000000000..3a42d2a3e1
--- /dev/null
+++ b/cobigen-templates/crud-ionic-client-app/pom.xml
@@ -0,0 +1,20 @@
+<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>crud-ionic-client-app</artifactId>
+  <name>CRUD Ionic Client App template</name>
+
+  <parent>
+    <groupId>com.devonfw.cobigen.templates</groupId>
+    <artifactId>templates-parent</artifactId>
+    <version>${revision}</version>
+  </parent>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+    </dependency>
+  </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/cobigen-templates/crud-ionic-client-app/src/main/java-templates/com/devonfw/cobigen/templates/devon4j/config/constant/MavenMetadata.java b/cobigen-templates/crud-ionic-client-app/src/main/java-templates/com/devonfw/cobigen/templates/devon4j/config/constant/MavenMetadata.java
new file mode 100644
index 0000000000..395d46154d
--- /dev/null
+++ b/cobigen-templates/crud-ionic-client-app/src/main/java-templates/com/devonfw/cobigen/templates/devon4j/config/constant/MavenMetadata.java
@@ -0,0 +1,12 @@
+package com.devonfw.cobigen.templates.devon4j.config.constant;
+
+/**
+ * Constants extracted from the maven pom by templating-maven-plugin.
+ * 
+ * @see "edit template in src/main/java-templates"
+ */
+public class MavenMetadata {
+
+    /** Local repository path */
+    public static final String LOCAL_REPO = "${settings.localRepository}";
+}
diff --git a/cobigen-templates/crud-ionic-client-app/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/JavaUtil.java b/cobigen-templates/crud-ionic-client-app/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/JavaUtil.java
new file mode 100644
index 0000000000..2d4025071d
--- /dev/null
+++ b/cobigen-templates/crud-ionic-client-app/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/JavaUtil.java
@@ -0,0 +1,464 @@
+package com.devonfw.cobigen.templates.devon4j.utils;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.Collection;
+import java.util.Map;
+
+import org.apache.commons.lang3.ClassUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Provides type operations, mainly checks and casts for Java Primitives, to be used in the templates
+ *
+ */
+public class JavaUtil {
+
+  /**
+   * Logger for this class
+   */
+  private static final Logger LOG = LoggerFactory.getLogger(JavaUtil.class);
+
+  /**
+   * The constructor.
+   */
+  public JavaUtil() {
+
+    // Empty for CobiGen to automatically instantiate it
+  }
+
+  /**
+   * Returns the Object version of a Java primitive or the input if the input isn't a java primitive
+   *
+   * @param simpleType String
+   * @return the corresponding object wrapper type simple name of the input if the input is the name of a primitive java
+   *         type. The input itself if not. (e.g. "int" results in "Integer")
+   * @throws ClassNotFoundException should not occur.
+   */
+  public String boxJavaPrimitives(String simpleType) throws ClassNotFoundException {
+
+    if (equalsJavaPrimitive(simpleType)) {
+      return ClassUtils.primitiveToWrapper(ClassUtils.getClass(simpleType)).getSimpleName();
+    } else {
+      return simpleType;
+    }
+
+  }
+
+  /**
+   * Returns the simple name of the type of a field in the pojoClass. If the type is a java primitive the name of the
+   * wrapper class is returned
+   *
+   * @param pojoClass {@link Class} the class object of the pojo
+   * @param fieldName {@link String} the name of the field
+   * @return String. The simple name of the field's type. The simple name of the wrapper class in case of java
+   *         primitives
+   * @throws NoSuchFieldException indicating something awefully wrong in the used model
+   * @throws SecurityException if the field cannot be accessed.
+   */
+  public String boxJavaPrimitives(Class<?> pojoClass, String fieldName) throws NoSuchFieldException, SecurityException {
+
+    if (pojoClass == null) {
+      throw new IllegalAccessError(
+          "Class object is null. Cannot generate template as it might obviously depend on reflection.");
+    }
+
+    if (equalsJavaPrimitive(pojoClass, fieldName)) {
+      return ClassUtils.primitiveToWrapper(pojoClass.getDeclaredField(fieldName).getType()).getSimpleName();
+    } else {
+      Field field = pojoClass.getDeclaredField(fieldName);
+      if (field == null) {
+        field = pojoClass.getField(fieldName);
+      }
+      if (field == null) {
+        throw new IllegalAccessError("Could not find field " + fieldName + " in class " + pojoClass);
+      } else {
+        return field.getType().getSimpleName();
+      }
+    }
+  }
+
+  /**
+   * Checks if the given type is a Java primitive
+   *
+   * @param simpleType the type to be checked
+   * @return true iff simpleType is a Java primitive
+   */
+  public boolean equalsJavaPrimitive(String simpleType) {
+
+    try {
+      return ClassUtils.getClass(simpleType).isPrimitive();
+    } catch (ClassNotFoundException e) {
+      LOG.warn("{}: Could not find {}", e.getMessage(), simpleType);
+      return false;
+    }
+  }
+
+  /**
+   * Checks if the given type is a Java primitive or wrapper
+   *
+   * @param simpleType the type to be checked
+   * @return true iff simpleType is a Java primitive or wrapper
+   */
+  public boolean equalsJavaPrimitiveOrWrapper(String simpleType) {
+
+    try {
+      return ClassUtils.isPrimitiveOrWrapper(ClassUtils.getClass(simpleType));
+    } catch (ClassNotFoundException e) {
+      LOG.warn("{}: Could not find {}", e.getMessage(), simpleType);
+      return false;
+    }
+  }
+
+  /**
+   * Checks if the type of the field in the pojo's class is a java primitive
+   *
+   * @param pojoClass the {@link Class} object of the pojo
+   * @param fieldName the name of the field to be checked
+   * @return true iff the field is a java primitive
+   * @throws NoSuchFieldException indicating something awefully wrong in the used model
+   * @throws SecurityException if the field cannot be accessed.
+   */
+  public boolean equalsJavaPrimitive(Class<?> pojoClass, String fieldName)
+      throws NoSuchFieldException, SecurityException {
+
+    if (pojoClass == null) {
+      return false;
+    }
+
+    Field field = pojoClass.getDeclaredField(fieldName);
+    if (field == null) {
+      field = pojoClass.getField(fieldName);
+    }
+    if (field == null) {
+      return false;
+    } else {
+      return field.getType().isPrimitive();
+    }
+  }
+
+  /**
+   * Checks if the given type is a Java primitive or a Java primitive array
+   *
+   * @param simpleType the Type name to be checked
+   * @return true iff {@link #equalsJavaPrimitive(String)} is true or if simpleType is an array with a primitive
+   *         component
+   */
+  public boolean equalsJavaPrimitiveIncludingArrays(String simpleType) {
+
+    Class<?> klasse;
+
+    try {
+      klasse = ClassUtils.getClass(simpleType).getComponentType();
+    } catch (ClassNotFoundException e) {
+      LOG.warn("{}: Could not find {}", e.getMessage(), simpleType);
+      return false;
+    }
+    return equalsJavaPrimitive(simpleType) || (klasse != null && klasse.isPrimitive());
+  }
+
+  /**
+   * Checks if the given field in the pojo class is a java primitive or an array of java primitives
+   *
+   * @param pojoClass the class object of the pojo
+   * @param fieldName the name of the field to be checked
+   * @return true iff {@link #equalsJavaPrimitive(Class, String)} is true or the field is an array of primitives
+   * @throws NoSuchFieldException indicating something awfully wrong in the used model
+   * @throws SecurityException if the field cannot be accessed.
+   */
+  public boolean equalsJavaPrimitiveIncludingArrays(Class<?> pojoClass, String fieldName)
+      throws NoSuchFieldException, SecurityException {
+
+    return equalsJavaPrimitive(pojoClass, fieldName) || (pojoClass.getDeclaredField(fieldName).getType().isArray()
+        && pojoClass.getDeclaredField(fieldName).getType().getComponentType().isPrimitive());
+  }
+
+  /**
+   * Returns a cast statement for a given (java primitive, variable name) pair or nothing if the type isn't a java
+   * primitive
+   *
+   * @param simpleType Java Type
+   * @param varName Variable name
+   * @return String either of the form '((Java Primitive Object Type)varName)' if simpleType is a primitive or the empty
+   *         String otherwise
+   * @throws ClassNotFoundException should not occur
+   */
+  public String castJavaPrimitives(String simpleType, String varName) throws ClassNotFoundException {
+
+    if (equalsJavaPrimitive(simpleType)) {
+      return String.format("((%1$s)%2$s)", boxJavaPrimitives(simpleType), varName);
+    } else {
+      return "";
+    }
+  }
+
+  /**
+   * Returns a cast statement for a given (java primitive, variable name) pair or nothing if the type isn't a java
+   * primitive
+   *
+   * @param pojoClass the class object of the pojo
+   * @param fieldName the name of the field to be casted
+   * @return if fieldName points to a primitive field then a casted statement (e.g. for an int field:
+   *         '((Integer)field)') or an empty String otherwise
+   * @throws NoSuchFieldException indicating something awefully wrong in the used model
+   * @throws SecurityException if the field cannot be accessed.
+   */
+  public String castJavaPrimitives(Class<?> pojoClass, String fieldName)
+      throws NoSuchFieldException, SecurityException {
+
+    if (equalsJavaPrimitive(pojoClass, fieldName)) {
+      return String.format("((%1$s)%2$s)", boxJavaPrimitives(pojoClass, fieldName), fieldName);
+    } else {
+      return "";
+    }
+  }
+
+  /**
+   * @param pojoClass {@link Class} the class object of the pojo
+   * @param fieldName {@link String} the name of the field
+   * @return true if the field is an instance of java.utils.Collections
+   * @throws NoSuchFieldException indicating something awefully wrong in the used model
+   * @throws SecurityException if the field cannot be accessed.
+   */
+  public boolean isCollection(Class<?> pojoClass, String fieldName) throws NoSuchFieldException, SecurityException {
+
+    if (pojoClass == null) {
+      return false;
+    }
+
+    Field field = pojoClass.getDeclaredField(fieldName);
+    if (field == null) {
+      field = pojoClass.getField(fieldName);
+    }
+    if (field == null) {
+      return false;
+    } else {
+      return Collection.class.isAssignableFrom(field.getType());
+    }
+
+  }
+
+  /**
+   * Returns the Ext Type to a given java type
+   *
+   * @param simpleType any java type's simple name
+   * @return corresponding Ext type
+   */
+  public String getExtType(String simpleType) {
+
+    switch (simpleType) {
+      case "short":
+      case "Short":
+      case "int":
+      case "Integer":
+      case "long":
+      case "Long":
+        return "Integer";
+      case "float":
+      case "Float":
+      case "double":
+      case "Double":
+        return "Number";
+      case "boolean":
+      case "Boolean":
+        return "Boolean";
+      case "char":
+      case "Character":
+      case "String":
+        return "String";
+      case "Date":
+        return "Date";
+      default:
+        return "Field";
+    }
+  }
+
+  /**
+   * returns the Angular5 type associated with a Java primitive
+   *
+   * @param simpleType :{@link String} the type to be parsed
+   * @return the corresponding Angular type or 'any' otherwise
+   */
+  public String getAngularType(String simpleType) {
+
+    switch (simpleType) {
+      case "boolean":
+        return "boolean";
+      case "Boolean":
+        return "boolean";
+      case "short":
+        return "number";
+      case "Short":
+        return "number";
+      case "int":
+        return "number";
+      case "Integer":
+        return "number";
+      case "long":
+        return "number";
+      case "Long":
+        return "number";
+      case "float":
+        return "number";
+      case "Float":
+        return "number";
+      case "double":
+        return "number";
+      case "Double":
+        return "number";
+      case "char":
+        return "string";
+      case "Character":
+        return "string";
+      case "String":
+        return "string";
+      case "byte":
+        return "number";
+      default:
+        return "any";
+    }
+  }
+
+  /**
+   * returns the class name of the return type of a specific method.
+   *
+   * @param pojoClass {@link Class}&lt;?&gt; the class object of the pojo
+   * @param methodName {@link String} the name of the method
+   * @return the class name of the return type of the specified method
+   * @throws SecurityException If no method of the given name can be found
+   * @throws NoSuchMethodException If no method of the given name can be found
+   */
+  public String getReturnType(Class<?> pojoClass, String methodName) throws NoSuchMethodException, SecurityException {
+
+    if (pojoClass == null) {
+      throw new IllegalAccessError(
+          "Class object is null. Cannot generate template as it might obviously depend on reflection.");
+    }
+    String s = "-";
+    Method method = findMethod(pojoClass, methodName);
+    if (method != null && !method.getReturnType().equals(Void.TYPE)) {
+      s = method.getReturnType().toString();
+      s = s.substring(s.lastIndexOf('.') + 1, s.length());
+    }
+    return s;
+  }
+
+  /**
+   *
+   * This methods returns the return type of the method in the given pojoClass which are annotated with the parameter
+   * annotatedClass
+   *
+   * @param pojoClass - The class in which to find if it has methods with annotatedClass
+   * @param annotatedClassName - The annotation which needs to be found
+   * @return Return type of the method annotated with the given annotation, else "null"
+   * @throws ClassNotFoundException if the annotated class name could not be found in the class path
+   */
+  @SuppressWarnings("unchecked")
+  public String getReturnTypeOfMethodAnnotatedWith(Class<?> pojoClass, String annotatedClassName)
+      throws ClassNotFoundException {
+
+    if (pojoClass == null) {
+      throw new IllegalAccessError(
+          "Class object is null. Cannot generate template as it might obviously depend on reflection.");
+    }
+
+    Method[] methods = pojoClass.getDeclaredMethods();
+    for (Method method : methods) {
+      if (!method.getName().startsWith("get")) {
+        continue;
+      }
+      for (Annotation a : method.getAnnotations()) {
+        // better if (method.isAnnotationPresent(classObj)) {, but postponed as of different class
+        // loaders of a.getClass() and pojoClass.getClass()
+        if (a.getClass().getCanonicalName().equals(annotatedClassName)) {
+          return method.getReturnType().getSimpleName();
+        }
+      }
+    }
+    return "null";
+  }
+
+  /**
+   * returns the HTTP request type corresponding to an annotation type
+   *
+   * @param annotations The annotation to get the type name of
+   * @return the HTTP request type name of the selected annotation
+   */
+  public String getRequestType(Map<String, Object> annotations) {
+
+    if (annotations.containsKey("javax_ws_rs_GET")) {
+      return "GET";
+    } else if (annotations.containsKey("javax_ws_rs_PUT")) {
+      return "PUT";
+    } else if (annotations.containsKey("javax_ws_rs_POST")) {
+      return "POST";
+    } else if (annotations.containsKey("javax_ws_rs_DELETE")) {
+      return "DELETE";
+    } else if (annotations.containsKey("javax_ws_rs_PATCH")) {
+      return "PATCH";
+    } else {
+      return "-";
+    }
+  }
+
+  /**
+   * Helper method to find a class's specific method
+   *
+   * @param pojoClass {@link Class}&lt;?&gt; the class object of the pojo
+   * @param methodName The name of the method to be found
+   * @return The method object of the method to be found, null if it wasn't found
+   */
+  private Method findMethod(Class<?> pojoClass, String methodName) {
+
+    if (pojoClass == null) {
+      throw new IllegalAccessError(
+          "Class object is null. Cannot generate template as it might obviously depend on reflection.");
+    }
+    for (Method m : pojoClass.getMethods()) {
+      if (m.getName().equals(methodName)) {
+        return m;
+      }
+    }
+    return null;
+  }
+
+  /**
+   * Checks whether the class given by the full qualified name is an enum
+   *
+   * @param className full qualified class name
+   * @return <code>true</code> if the class is an enum, <code>false</code> otherwise
+   */
+  public boolean isEnum(String className) {
+
+    try {
+      return ClassUtils.getClass(className).isEnum();
+    } catch (ClassNotFoundException e) {
+      LOG.warn("{}: Could not find {}", e.getMessage(), className);
+      return false;
+    }
+  }
+
+  /**
+   * Returns the first enum value of an enum class
+   *
+   * @param className full qualified class name
+   * @return the first enum value name found in order
+   */
+  public String getFirstEnumValue(String className) {
+
+    try {
+      Class<?> enumClass = ClassUtils.getClass(className);
+      Field[] declaredFields = enumClass.getDeclaredFields();
+      if (declaredFields.length > 0) {
+        return declaredFields[0].getName();
+      } else {
+        return null;
+      }
+    } catch (ClassNotFoundException e) {
+      LOG.warn("{}: Could not find {}", e.getMessage(), className);
+      return null;
+    }
+  }
+}
diff --git a/cobigen-templates/crud-ionic-client-app/src/main/resources/template-set.xml b/cobigen-templates/crud-ionic-client-app/src/main/resources/template-set.xml
new file mode 100644
index 0000000000..5de918ab8a
--- /dev/null
+++ b/cobigen-templates/crud-ionic-client-app/src/main/resources/template-set.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:templateSetConfiguration version="6.0" xmlns:tns="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration" xmlns:cc="http://capgemini.com/devonfw/cobigen/ContextConfiguration" xmlns:tc="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration templateSetConfiguration.xsd ">
+
+<cc:contextConfiguration version="3.0">
+  <cc:trigger id="crud_ionic_client_app" type="java">
+    <cc:matcher type="fqn" value="((.+\.)?([^\.]+))\.([^\.]+)\.logic\.api\.to\.([^\.]+)Eto">
+      <cc:variableAssignment type="regex" key="rootPackage" value="1" />
+      <cc:variableAssignment type="regex" key="domain" value="3" />
+      <cc:variableAssignment type="regex" key="component" value="4" />
+      <cc:variableAssignment type="regex" key="etoName" value="5" />
+    </cc:matcher>
+  </cc:trigger>
+  <cc:tags>
+    <cc:tag name="Ionic"></cc:tag>
+    <cc:tag name="CRUD"></cc:tag>
+    <cc:tag name="Client"></cc:tag>
+    <cc:tag name="App"></cc:tag>
+  </cc:tags>
+  <cc:links>
+    <cc:link url="https://github.com/devonfw/cobigen/wiki/howto_ionic-client-generation"></cc:link>
+  </cc:links>
+</cc:contextConfiguration>
+<tc:templatesConfiguration version="5.0">
+  <tc:templates>
+    <tc:templateExtension ref="${variables.etoName#lower_case}-detail.page.ts" mergeStrategy="tsmerge" />
+    <tc:templateExtension ref="${variables.etoName#lower_case}-list.page.ts" mergeStrategy="tsmerge_override" />
+    <tc:templateExtension ref="app.component.ts" mergeStrategy="tsmerge_override" />
+    <tc:templateExtension ref="app.module.ts" mergeStrategy="tsmerge_override" />
+    <tc:templateExtension ref="${variables.etoName#lower_case}-rest.service.ts" mergeStrategy="tsmerge_override" />
+    <tc:templateExtension ref="${variables.etoName#lower_case}.ts" />
+    <tc:templateExtension ref="${variables.etoName#lower_case}-search-criteria.ts" />
+    <tc:templateExtension ref="paginated-list-to.ts" />
+    <tc:templateExtension ref="pageable.ts" />
+    <tc:templateExtension ref="sort.ts" />
+    <tc:templateExtension ref="environment.android.ts" mergeStrategy="tsmerge_override" />
+    <tc:templateExtension ref="environment.prod.ts" mergeStrategy="tsmerge_override" />
+    <tc:templateExtension ref="environment.ts" mergeStrategy="tsmerge_override" />
+    <tc:templateExtension ref="app-routing.module.ts" mergeStrategy="tsmerge_override" />
+    <tc:templateExtension ref="${variables.etoName#lower_case}-detail.page.html" mergeStrategy="html-ng*" />
+    <tc:templateExtension ref="${variables.etoName#lower_case}-list.page.html" mergeStrategy="html-ng*" />
+    <tc:templateExtension ref="es.json" mergeStrategy="jsonmerge_override" />
+    <tc:templateExtension ref="en.json" mergeStrategy="jsonmerge_override" />
+    <tc:templateExtension ref="business-operator.service.ts" mergeStrategy="tsmerge_override" />
+  </tc:templates>
+  <tc:templateScans>
+    <tc:templateScan templatePath="templates" destinationPath="src/main/java" />
+  </tc:templateScans>
+  <tc:increments>
+    <tc:increment name="devon4ng-app" description="CRUD devon4ng Ionic App" explanation="Creates Ionic stack CRUD service.">
+      <tc:incrementRef ref="app_ionic_structure" />
+      <tc:incrementRef ref="ionic_routing" />
+      <tc:incrementRef ref="ionic_i18n" />
+      <tc:incrementRef ref="ionic_component" />
+      <tc:incrementRef ref="ionic_theme" />
+    </tc:increment>
+    <tc:increment name="app_ionic_structure" description="Ionic devon4ng environments">
+      <tc:templateRef ref="environment.android.ts" />
+      <tc:templateRef ref="environment.prod.ts" />
+      <tc:templateRef ref="environment.ts" />
+    </tc:increment>
+    <tc:increment name="ionic_routing" description="Ionic routing">
+      <tc:templateRef ref="app-routing.module.ts" />
+    </tc:increment>
+    <tc:increment name="ionic_i18n" description="Ionic i18n">
+      <tc:templateRef ref="es.json" />
+      <tc:templateRef ref="en.json" />
+    </tc:increment>
+    <tc:increment name="ionic_component" description="Ionic List">
+      <tc:templateRef ref="${variables.etoName#lower_case}.ts" />
+      <tc:templateRef ref="${variables.etoName#lower_case}-search-criteria.ts" />
+      <tc:templateRef ref="paginated-list-to.ts" />
+      <tc:templateRef ref="app.component.ts" />
+      <tc:templateRef ref="app.module.ts" />
+      <tc:templateRef ref="pageable.ts" />
+      <tc:templateRef ref="sort.ts" />
+      <tc:templateRef ref="${variables.etoName#lower_case}-rest.service.ts" />
+      <tc:templateRef ref="${variables.etoName#lower_case}-list.page.ts" />
+      <tc:templateRef ref="${variables.etoName#lower_case}-list.page.html" />
+      <tc:templateRef ref="${variables.etoName#lower_case}-list.page.scss" />
+      <tc:templateRef ref="${variables.etoName#lower_case}-detail.page.ts" />
+      <tc:templateRef ref="${variables.etoName#lower_case}-detail.page.html" />
+      <tc:templateRef ref="${variables.etoName#lower_case}-detail.page.scss" />
+      <tc:templateRef ref="business-operator.service.ts" />
+    </tc:increment>
+    <tc:increment name="ionic_theme" description="Ionic theme">
+      <tc:templateRef ref="variables.scss" />
+    </tc:increment>
+  </tc:increments>
+</tc:templatesConfiguration>
+</tns:templateSetConfiguration>
\ No newline at end of file
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_ionic_client_app/templates/cobigen.properties b/cobigen-templates/crud-ionic-client-app/src/main/resources/templates/cobigen.properties
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_ionic_client_app/templates/cobigen.properties
rename to cobigen-templates/crud-ionic-client-app/src/main/resources/templates/cobigen.properties
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_ionic_client_app/templates/src/app/app-routing.module.ts.ftl b/cobigen-templates/crud-ionic-client-app/src/main/resources/templates/src/app/app-routing.module.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_ionic_client_app/templates/src/app/app-routing.module.ts.ftl
rename to cobigen-templates/crud-ionic-client-app/src/main/resources/templates/src/app/app-routing.module.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_ionic_client_app/templates/src/app/app.component.ts.ftl b/cobigen-templates/crud-ionic-client-app/src/main/resources/templates/src/app/app.component.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_ionic_client_app/templates/src/app/app.component.ts.ftl
rename to cobigen-templates/crud-ionic-client-app/src/main/resources/templates/src/app/app.component.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_ionic_client_app/templates/src/app/app.module.ts.ftl b/cobigen-templates/crud-ionic-client-app/src/main/resources/templates/src/app/app.module.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_ionic_client_app/templates/src/app/app.module.ts.ftl
rename to cobigen-templates/crud-ionic-client-app/src/main/resources/templates/src/app/app.module.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_ionic_client_app/templates/src/app/pages/${variables.etoName#lower_case}-detail/${variables.etoName#lower_case}-detail.page.html.ftl b/cobigen-templates/crud-ionic-client-app/src/main/resources/templates/src/app/pages/${variables.etoName#lower_case}-detail/${variables.etoName#lower_case}-detail.page.html.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_ionic_client_app/templates/src/app/pages/${variables.etoName#lower_case}-detail/${variables.etoName#lower_case}-detail.page.html.ftl
rename to cobigen-templates/crud-ionic-client-app/src/main/resources/templates/src/app/pages/${variables.etoName#lower_case}-detail/${variables.etoName#lower_case}-detail.page.html.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_ionic_client_app/templates/src/app/pages/${variables.etoName#lower_case}-detail/${variables.etoName#lower_case}-detail.page.scss.ftl b/cobigen-templates/crud-ionic-client-app/src/main/resources/templates/src/app/pages/${variables.etoName#lower_case}-detail/${variables.etoName#lower_case}-detail.page.scss.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_ionic_client_app/templates/src/app/pages/${variables.etoName#lower_case}-detail/${variables.etoName#lower_case}-detail.page.scss.ftl
rename to cobigen-templates/crud-ionic-client-app/src/main/resources/templates/src/app/pages/${variables.etoName#lower_case}-detail/${variables.etoName#lower_case}-detail.page.scss.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_ionic_client_app/templates/src/app/pages/${variables.etoName#lower_case}-detail/${variables.etoName#lower_case}-detail.page.ts.ftl b/cobigen-templates/crud-ionic-client-app/src/main/resources/templates/src/app/pages/${variables.etoName#lower_case}-detail/${variables.etoName#lower_case}-detail.page.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_ionic_client_app/templates/src/app/pages/${variables.etoName#lower_case}-detail/${variables.etoName#lower_case}-detail.page.ts.ftl
rename to cobigen-templates/crud-ionic-client-app/src/main/resources/templates/src/app/pages/${variables.etoName#lower_case}-detail/${variables.etoName#lower_case}-detail.page.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_ionic_client_app/templates/src/app/pages/${variables.etoName#lower_case}-list/${variables.etoName#lower_case}-list.page.html.ftl b/cobigen-templates/crud-ionic-client-app/src/main/resources/templates/src/app/pages/${variables.etoName#lower_case}-list/${variables.etoName#lower_case}-list.page.html.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_ionic_client_app/templates/src/app/pages/${variables.etoName#lower_case}-list/${variables.etoName#lower_case}-list.page.html.ftl
rename to cobigen-templates/crud-ionic-client-app/src/main/resources/templates/src/app/pages/${variables.etoName#lower_case}-list/${variables.etoName#lower_case}-list.page.html.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_ionic_client_app/templates/src/app/pages/${variables.etoName#lower_case}-list/${variables.etoName#lower_case}-list.page.scss.ftl b/cobigen-templates/crud-ionic-client-app/src/main/resources/templates/src/app/pages/${variables.etoName#lower_case}-list/${variables.etoName#lower_case}-list.page.scss.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_ionic_client_app/templates/src/app/pages/${variables.etoName#lower_case}-list/${variables.etoName#lower_case}-list.page.scss.ftl
rename to cobigen-templates/crud-ionic-client-app/src/main/resources/templates/src/app/pages/${variables.etoName#lower_case}-list/${variables.etoName#lower_case}-list.page.scss.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_ionic_client_app/templates/src/app/pages/${variables.etoName#lower_case}-list/${variables.etoName#lower_case}-list.page.ts.ftl b/cobigen-templates/crud-ionic-client-app/src/main/resources/templates/src/app/pages/${variables.etoName#lower_case}-list/${variables.etoName#lower_case}-list.page.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_ionic_client_app/templates/src/app/pages/${variables.etoName#lower_case}-list/${variables.etoName#lower_case}-list.page.ts.ftl
rename to cobigen-templates/crud-ionic-client-app/src/main/resources/templates/src/app/pages/${variables.etoName#lower_case}-list/${variables.etoName#lower_case}-list.page.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_ionic_client_app/templates/src/app/services/${variables.etoName#lower_case}-rest.service.ts.ftl b/cobigen-templates/crud-ionic-client-app/src/main/resources/templates/src/app/services/${variables.etoName#lower_case}-rest.service.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_ionic_client_app/templates/src/app/services/${variables.etoName#lower_case}-rest.service.ts.ftl
rename to cobigen-templates/crud-ionic-client-app/src/main/resources/templates/src/app/services/${variables.etoName#lower_case}-rest.service.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_ionic_client_app/templates/src/app/services/interfaces/${variables.etoName#lower_case}-search-criteria.ts.ftl b/cobigen-templates/crud-ionic-client-app/src/main/resources/templates/src/app/services/interfaces/${variables.etoName#lower_case}-search-criteria.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_ionic_client_app/templates/src/app/services/interfaces/${variables.etoName#lower_case}-search-criteria.ts.ftl
rename to cobigen-templates/crud-ionic-client-app/src/main/resources/templates/src/app/services/interfaces/${variables.etoName#lower_case}-search-criteria.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_ionic_client_app/templates/src/app/services/interfaces/${variables.etoName#lower_case}.ts.ftl b/cobigen-templates/crud-ionic-client-app/src/main/resources/templates/src/app/services/interfaces/${variables.etoName#lower_case}.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_ionic_client_app/templates/src/app/services/interfaces/${variables.etoName#lower_case}.ts.ftl
rename to cobigen-templates/crud-ionic-client-app/src/main/resources/templates/src/app/services/interfaces/${variables.etoName#lower_case}.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_ionic_client_app/templates/src/app/services/interfaces/pageable.ts.ftl b/cobigen-templates/crud-ionic-client-app/src/main/resources/templates/src/app/services/interfaces/pageable.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_ionic_client_app/templates/src/app/services/interfaces/pageable.ts.ftl
rename to cobigen-templates/crud-ionic-client-app/src/main/resources/templates/src/app/services/interfaces/pageable.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_ionic_client_app/templates/src/app/services/interfaces/paginated-list-to.ts.ftl b/cobigen-templates/crud-ionic-client-app/src/main/resources/templates/src/app/services/interfaces/paginated-list-to.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_ionic_client_app/templates/src/app/services/interfaces/paginated-list-to.ts.ftl
rename to cobigen-templates/crud-ionic-client-app/src/main/resources/templates/src/app/services/interfaces/paginated-list-to.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_ionic_client_app/templates/src/app/services/interfaces/sort.ts.ftl b/cobigen-templates/crud-ionic-client-app/src/main/resources/templates/src/app/services/interfaces/sort.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_ionic_client_app/templates/src/app/services/interfaces/sort.ts.ftl
rename to cobigen-templates/crud-ionic-client-app/src/main/resources/templates/src/app/services/interfaces/sort.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_ionic_client_app/templates/src/app/services/shared/business-operator.service.ts.ftl b/cobigen-templates/crud-ionic-client-app/src/main/resources/templates/src/app/services/shared/business-operator.service.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_ionic_client_app/templates/src/app/services/shared/business-operator.service.ts.ftl
rename to cobigen-templates/crud-ionic-client-app/src/main/resources/templates/src/app/services/shared/business-operator.service.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_ionic_client_app/templates/src/assets/i18n/en.json.ftl b/cobigen-templates/crud-ionic-client-app/src/main/resources/templates/src/assets/i18n/en.json.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_ionic_client_app/templates/src/assets/i18n/en.json.ftl
rename to cobigen-templates/crud-ionic-client-app/src/main/resources/templates/src/assets/i18n/en.json.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_ionic_client_app/templates/src/assets/i18n/es.json.ftl b/cobigen-templates/crud-ionic-client-app/src/main/resources/templates/src/assets/i18n/es.json.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_ionic_client_app/templates/src/assets/i18n/es.json.ftl
rename to cobigen-templates/crud-ionic-client-app/src/main/resources/templates/src/assets/i18n/es.json.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_ionic_client_app/templates/src/environments/environment.android.ts.ftl b/cobigen-templates/crud-ionic-client-app/src/main/resources/templates/src/environments/environment.android.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_ionic_client_app/templates/src/environments/environment.android.ts.ftl
rename to cobigen-templates/crud-ionic-client-app/src/main/resources/templates/src/environments/environment.android.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_ionic_client_app/templates/src/environments/environment.prod.ts.ftl b/cobigen-templates/crud-ionic-client-app/src/main/resources/templates/src/environments/environment.prod.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_ionic_client_app/templates/src/environments/environment.prod.ts.ftl
rename to cobigen-templates/crud-ionic-client-app/src/main/resources/templates/src/environments/environment.prod.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_ionic_client_app/templates/src/environments/environment.ts.ftl b/cobigen-templates/crud-ionic-client-app/src/main/resources/templates/src/environments/environment.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_ionic_client_app/templates/src/environments/environment.ts.ftl
rename to cobigen-templates/crud-ionic-client-app/src/main/resources/templates/src/environments/environment.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_ionic_client_app/templates/src/theme/variables.scss.ftl b/cobigen-templates/crud-ionic-client-app/src/main/resources/templates/src/theme/variables.scss.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_ionic_client_app/templates/src/theme/variables.scss.ftl
rename to cobigen-templates/crud-ionic-client-app/src/main/resources/templates/src/theme/variables.scss.ftl
diff --git a/cobigen-templates/crud-ionic-client-app/src/test/java/com/devonfw/cobigen/templates/devon4j/test/templates/CrudIonicClientAppTest.java b/cobigen-templates/crud-ionic-client-app/src/test/java/com/devonfw/cobigen/templates/devon4j/test/templates/CrudIonicClientAppTest.java
new file mode 100644
index 0000000000..867907a9ce
--- /dev/null
+++ b/cobigen-templates/crud-ionic-client-app/src/test/java/com/devonfw/cobigen/templates/devon4j/test/templates/CrudIonicClientAppTest.java
@@ -0,0 +1,99 @@
+package com.devonfw.cobigen.templates.devon4j.test.templates;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+import org.apache.commons.io.FileUtils;
+import org.junit.BeforeClass;
+import org.junit.ClassRule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+
+import com.devonfw.cobigen.api.constants.ConfigurationConstants;
+import com.devonfw.cobigen.maven.test.AbstractMavenTest;
+import com.devonfw.cobigen.templates.devon4j.config.constant.MavenMetadata;
+
+/**
+ * Smoke tests of all templates.
+ */
+public class CrudIonicClientAppTest extends AbstractMavenTest {
+
+  /** Root of all test resources of this test suite */
+  public static final String TEST_RESOURCES_ROOT = "src/test/resources/testdata/templatetest/";
+
+  /** Temporary files rule to create temporary folders */
+  @ClassRule
+  public static TemporaryFolder tempFolder = new TemporaryFolder();
+
+  /** The templates development folder */
+  protected static Path templatesProject;
+
+  /** The templates development folder */
+  protected static Path templatesProjectTemporary;
+
+  /**
+   * Creates a copy of the templates project in the temp directory
+   *
+   * @throws URISyntaxException if the path could not be created properly
+   * @throws IOException if accessing a directory or file fails
+   */
+  @BeforeClass
+  public static void setupDevTemplates() throws URISyntaxException, IOException {
+
+    templatesProject = new File(
+        CrudIonicClientAppTest.class.getProtectionDomain().getCodeSource().getLocation().toURI()).getParentFile()
+            .getParentFile().toPath();
+
+    Path utilsPom = new File(CrudIonicClientAppTest.class.getProtectionDomain().getCodeSource().getLocation().toURI())
+        .getParentFile().getParentFile().toPath().resolve("src/test/resources/utils/pom.xml");
+
+    // create a temporary directory cobigen-templates/template-sets/adapted containing the template sets
+    Path tempFolderPath = tempFolder.getRoot().toPath();
+    Path cobigenTemplatePath = tempFolderPath.resolve("cobigen-templates");
+    if (!Files.exists(cobigenTemplatePath)) {
+      Files.createDirectory(cobigenTemplatePath);
+
+      templatesProjectTemporary = cobigenTemplatePath.resolve(ConfigurationConstants.TEMPLATE_SETS_FOLDER);
+      Path templateSetsAdaptedFolder = templatesProjectTemporary.resolve(ConfigurationConstants.ADAPTED_FOLDER);
+      Files.createDirectory(templatesProjectTemporary);
+      Files.createDirectory(templateSetsAdaptedFolder);
+
+      Path templateSetPath = templateSetsAdaptedFolder.resolve("template-set");
+      FileUtils.copyDirectory(templatesProject.toFile(), templateSetPath.toFile());
+
+      if (Files.isDirectory(templateSetPath)) {
+
+        // Replace the pom.xml in the template sets. Needed so that the project in the temp directory is build
+        // properly
+        if (Files.exists(templateSetPath.resolve("pom.xml"))) {
+          try {
+            Files.delete(templateSetPath.resolve("pom.xml"));
+          } catch (IOException e) {
+            throw new IOException("Error deleting file " + templateSetPath.resolve("pom.xml"), e);
+          }
+          try {
+            Files.copy(utilsPom, templateSetPath.resolve("pom.xml"));
+          } catch (IOException e) {
+            throw new IOException("Error copying file " + utilsPom, e);
+          }
+        }
+      }
+    }
+  }
+
+  /**
+   * Test successful generation of all templates based on an ETO
+   *
+   * @throws Exception test fails
+   */
+  @Test
+  public void testAllTemplatesGeneration_EtoInput() throws Exception {
+
+    File testProject = new File(TEST_RESOURCES_ROOT + "TestAllTemplatesEtoInput/");
+    runMavenInvoker(testProject, templatesProjectTemporary.toFile(), MavenMetadata.LOCAL_REPO);
+  }
+
+}
diff --git a/cobigen-templates/templates-devon4j/src/test/resources/application.properties b/cobigen-templates/crud-ionic-client-app/src/test/resources/application.properties
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/test/resources/application.properties
rename to cobigen-templates/crud-ionic-client-app/src/test/resources/application.properties
diff --git a/cobigen-templates/templates-devon4j/src/test/resources/testdata/templatetest/TestAllTemplatesEntityInput/logback.xml b/cobigen-templates/crud-ionic-client-app/src/test/resources/logback.xml
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/test/resources/testdata/templatetest/TestAllTemplatesEntityInput/logback.xml
rename to cobigen-templates/crud-ionic-client-app/src/test/resources/logback.xml
diff --git a/cobigen-templates/templates-devon4j/src/test/resources/testdata/templatetest/TestAllTemplatesEtoInput/logback.xml b/cobigen-templates/crud-ionic-client-app/src/test/resources/testdata/templatetest/TestAllTemplatesEtoInput/logback.xml
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/test/resources/testdata/templatetest/TestAllTemplatesEtoInput/logback.xml
rename to cobigen-templates/crud-ionic-client-app/src/test/resources/testdata/templatetest/TestAllTemplatesEtoInput/logback.xml
diff --git a/cobigen-templates/crud-ionic-client-app/src/test/resources/testdata/templatetest/TestAllTemplatesEtoInput/pom.xml b/cobigen-templates/crud-ionic-client-app/src/test/resources/testdata/templatetest/TestAllTemplatesEtoInput/pom.xml
new file mode 100644
index 0000000000..68371aa12b
--- /dev/null
+++ b/cobigen-templates/crud-ionic-client-app/src/test/resources/testdata/templatetest/TestAllTemplatesEtoInput/pom.xml
@@ -0,0 +1,79 @@
+<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>com.devonfw.cobigen</groupId>
+  <artifactId>devon4jTemplateTest-TestAllTemplatesEtoInput</artifactId>
+  <version>dev-SNAPSHOT</version>
+
+  <properties>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
+  </properties>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>com.devonfw.cobigen</groupId>
+        <artifactId>cobigen-maven-plugin</artifactId>
+        <version>${pluginVersion}</version>
+        <executions>
+          <execution>
+            <id>generate</id>
+            <phase>package</phase>
+            <goals>
+              <goal>generate</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <configurationFolder>${templatesProject}</configurationFolder>
+          <inputFiles>
+            <inputFile>src/main/java/io/github/devonfw/cobigen/generator/logic/api/to/InputEto.java</inputFile>
+          </inputFiles>
+          <templates>
+            <template>ALL</template>
+          </templates>
+          <failOnNothingGenerated>true</failOnNothingGenerated>
+        </configuration>
+        <dependencies>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>tempeng-freemarker</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>javaplugin</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>xmlplugin</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>htmlplugin</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>tsplugin</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>jsonplugin</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>openapiplugin</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+        </dependencies>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>
diff --git a/cobigen-templates/crud-ionic-client-app/src/test/resources/testdata/templatetest/TestAllTemplatesEtoInput/src/main/java/io/github/devonfw/cobigen/generator/logic/api/to/InputEto.java b/cobigen-templates/crud-ionic-client-app/src/test/resources/testdata/templatetest/TestAllTemplatesEtoInput/src/main/java/io/github/devonfw/cobigen/generator/logic/api/to/InputEto.java
new file mode 100644
index 0000000000..21ad4eeba9
--- /dev/null
+++ b/cobigen-templates/crud-ionic-client-app/src/test/resources/testdata/templatetest/TestAllTemplatesEtoInput/src/main/java/io/github/devonfw/cobigen/generator/logic/api/to/InputEto.java
@@ -0,0 +1,25 @@
+package io.github.devonfw.cobigen.generator.logic.api.to;
+
+public class InputEto {
+    
+    private String input;
+    
+    private int complexity;
+    
+    public String getInput() {
+        return input;
+    }
+    
+    public void setInput(String input) {
+        this.input = input;
+    }
+    
+    public int getComplexity() {
+        return complexity;
+    }
+    
+    public void setComplexity(int complexity) {
+        this.complexity = complexity;
+    }
+    
+}
diff --git a/cobigen-templates/crud-ionic-client-app/src/test/resources/utils/pom.xml b/cobigen-templates/crud-ionic-client-app/src/test/resources/utils/pom.xml
new file mode 100644
index 0000000000..b7fbfe64c2
--- /dev/null
+++ b/cobigen-templates/crud-ionic-client-app/src/test/resources/utils/pom.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.devonfw.cobigen.templates</groupId>
+  <artifactId>crud-ionic-client-app</artifactId>
+  <version>2021.12.007-SNAPSHOT</version>
+  <name>Crud Ionic Client App</name>
+  <description>A Code-based incremental Generator</description>
+  <url>https://github.com/devonfw/cobigen/templates-parent/templates-devon4j-utils</url>
+  <licenses>
+    <license>
+      <name>Apache Software License 2.0</name>
+      <url>https://raw.githubusercontent.com/devonfw/.github/master/LICENSE</url>
+      <distribution>repo</distribution>
+      <comments></comments>
+    </license>
+  </licenses>
+  <dependencies>
+    <dependency>
+      <groupId>javax.ws.rs</groupId>
+      <artifactId>javax.ws.rs-api</artifactId>
+      <version>2.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.data</groupId>
+      <artifactId>spring-data-rest-webmvc</artifactId>
+      <version>3.7.10</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+      <version>3.12.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+      <version>2.10.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>xerces</groupId>
+      <artifactId>xercesImpl</artifactId>
+      <version>2.12.2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.persistence</groupId>
+      <artifactId>javax.persistence-api</artifactId>
+      <version>2.2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>1.7.30</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <version>1.7.30</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>log4j-over-slf4j</artifactId>
+      <version>1.7.30</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+  <repositories>
+    <repository>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+      <id>ossrh</id>
+      <name>OSSRH Snapshots</name>
+      <url>https://s01.oss.sonatype.org/content/repositories/snapshots/</url>
+    </repository>
+  </repositories>
+
+  <properties>
+   <maven.compiler.source>1.8</maven.compiler.source>
+   <maven.compiler.target>1.8</maven.compiler.target>
+  </properties>
+
+  <build>
+   <resources>
+     <resource>
+       <directory>src/main/java</directory>
+     </resource>
+   </resources>
+  </build></project>
\ No newline at end of file
diff --git a/cobigen-templates/crud-java-ea-uml/pom.xml b/cobigen-templates/crud-java-ea-uml/pom.xml
new file mode 100644
index 0000000000..69799afa8e
--- /dev/null
+++ b/cobigen-templates/crud-java-ea-uml/pom.xml
@@ -0,0 +1,19 @@
+<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>crud-java-ea-uml</artifactId>
+  <name>CRUD Java EA UML template</name>
+
+  <parent>
+    <groupId>com.devonfw.cobigen.templates</groupId>
+    <artifactId>templates-parent</artifactId>
+    <version>${revision}</version>
+  </parent>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+    </dependency>
+  </dependencies>
+</project>
\ No newline at end of file
diff --git a/cobigen-templates/crud-java-ea-uml/src/main/java-templates/com/devonfw/cobigen/templates/devon4j/config/constant/MavenMetadata.java b/cobigen-templates/crud-java-ea-uml/src/main/java-templates/com/devonfw/cobigen/templates/devon4j/config/constant/MavenMetadata.java
new file mode 100644
index 0000000000..395d46154d
--- /dev/null
+++ b/cobigen-templates/crud-java-ea-uml/src/main/java-templates/com/devonfw/cobigen/templates/devon4j/config/constant/MavenMetadata.java
@@ -0,0 +1,12 @@
+package com.devonfw.cobigen.templates.devon4j.config.constant;
+
+/**
+ * Constants extracted from the maven pom by templating-maven-plugin.
+ * 
+ * @see "edit template in src/main/java-templates"
+ */
+public class MavenMetadata {
+
+    /** Local repository path */
+    public static final String LOCAL_REPO = "${settings.localRepository}";
+}
diff --git a/cobigen-templates/templates-devon4j/src/main/java/com/devonfw/cobigen/templates/devon4j/constants/Field.java b/cobigen-templates/crud-java-ea-uml/src/main/java/com/devonfw/cobigen/templates/devon4j/constants/Field.java
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/java/com/devonfw/cobigen/templates/devon4j/constants/Field.java
rename to cobigen-templates/crud-java-ea-uml/src/main/java/com/devonfw/cobigen/templates/devon4j/constants/Field.java
diff --git a/cobigen-templates/crud-java-ea-uml/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/DevonfwUtil.java b/cobigen-templates/crud-java-ea-uml/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/DevonfwUtil.java
new file mode 100644
index 0000000000..4de413b930
--- /dev/null
+++ b/cobigen-templates/crud-java-ea-uml/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/DevonfwUtil.java
@@ -0,0 +1,449 @@
+package com.devonfw.cobigen.templates.devon4j.utils;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.w3c.dom.Attr;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+import com.devonfw.cobigen.templates.devon4j.constants.Field;
+
+/**
+ * A class for shared devon4j specific functions in the templates
+ *
+ */
+@SuppressWarnings("restriction")
+public class DevonfwUtil {
+
+  /**
+   * Check whether the given 'canonicalType' is a devon4j Entity, which is declared in the given 'component'
+   *
+   * @param canonicalType the type name
+   * @param component the component name
+   * @return true iff the canonicalType is a devon Entity
+   */
+  public boolean isEntityInComponent(String canonicalType, String component) {
+
+    return canonicalType.matches(String.format(".+%1$s\\.dataaccess\\.api\\.[A-Za-z0-9]+Entity(<.*)?", component));
+  }
+
+  /**
+   * Check whether the given 'canonicalType' is declared in the given 'component'
+   *
+   * @param canonicalType the type name
+   * @param component the component name
+   * @return true iff the canonicalType is inside the given component
+   */
+  public boolean isTypeInComponent(String canonicalType, String component) {
+
+    return canonicalType.matches(String.format("%1$s.[A-Za-z0-9]+(<.*)?", component));
+  }
+
+  /**
+   * Determines the ID getter for a given 'field' dependent on whether the getter should access the ID via an object
+   * reference or a direct ID getter
+   *
+   * @param field the field
+   * @param byObjectReference boolean
+   * @param component the devon4j component name
+   * @return 'get' + {@link #resolveIdVariableNameOrSetterGetterSuffix(Map, boolean, boolean, String)} + '()' with
+   *         capitalize=true
+   */
+  public String resolveIdGetter(Map<String, Object> field, boolean byObjectReference, String component) {
+
+    // If field comes from an UML file
+    if (field.getClass().toGenericString().contains("freemarker.ext.beans.HashAdapter")) {
+      return resolveIdGetter(field, byObjectReference, component);
+    }
+    return "get" + resolveIdVariableNameOrSetterGetterSuffix(field, byObjectReference, true, component) + "()";
+  }
+
+  /**
+   * Determines the ID getter for a given 'field' dependent on whether the getter should access the ID via an object
+   * reference or a direct ID getter
+   *
+   * This method is used when the field parameter comes from an UML file. The name and type of the attributes must be
+   * pre-processed for later inserting them inside the HashMap.
+   *
+   * @param field the field
+   * @param byObjectReference boolean
+   * @param component the devon4j component name
+   * @return 'get' + {@link #resolveIdVariableNameOrSetterGetterSuffix(Map, boolean, boolean, String)} + '()' with
+   *         capitalize=true
+   */
+  public String resolveIdGetter(Node field, boolean byObjectReference, String component) {
+
+    HashMap<String, Object> nodeHash = new HashMap<>();
+
+    // Putting the name of the attribute to the hash
+    nodeHash.put(Field.NAME.toString(), field.getAttributes().getNamedItem("name"));
+
+    // Putting the type of the attribute to the hash
+    NodeList childs = field.getChildNodes();
+    for (int i = 0; i < childs.getLength(); i++) {
+      // Retrieve "type" tag
+      if (childs.item(i).getNodeName().equals("type")) {
+        NamedNodeMap attrs = childs.item(i).getAttributes();
+        for (int j = 0; j < attrs.getLength(); j++) {
+          Attr attribute = (Attr) attrs.item(j);
+          // Try to find the attribute that contains the type
+          if (attribute.getName().equals("xmi:idref")) {
+            nodeHash.put(Field.TYPE.toString(), attribute.getName().replace("EAJava_", ""));
+          }
+        }
+      }
+    }
+    return "get" + resolveIdVariableNameOrSetterGetterSuffix(nodeHash, byObjectReference, true, component) + "()";
+
+  }
+
+  /**
+   * Determines the ID getter for a given 'field' dependent on whether the getter should access the ID via an object
+   * reference or a direct ID getter
+   *
+   * @param pojoClass the class object of the pojo
+   * @param fieldMap the field mapping
+   * @param byObjectReference boolean
+   * @param component the devon4j component name
+   * @return 'get' + {@link #resolveIdVariableNameOrSetterGetterSuffix(Map, boolean, boolean, String)} + '()' with
+   *         capitalize=true
+   * @throws NoSuchFieldException indicating a severe problem in the used model
+   * @throws SecurityException if the field cannot be accessed for any reason
+   */
+  public String resolveIdGetter(Class<?> pojoClass, Map<String, Object> fieldMap, boolean byObjectReference,
+      String component) throws NoSuchFieldException, SecurityException {
+
+    return "get" + resolveIdVariableNameOrSetterGetterSuffix(pojoClass, fieldMap, byObjectReference, true, component)
+        + "()";
+  }
+
+  /**
+   * same as {@link #resolveIdGetter(Map, boolean, String)} but with byObjectReference=false and component=""
+   *
+   * @param field the field
+   * @return 'get' + {@link #resolveIdVariableNameOrSetterGetterSuffix(Map,boolean,boolean,String)} + '()' with
+   *         capitalize=true
+   */
+  public String resolveIdGetter(Map<String, Object> field) {
+
+    return this.resolveIdGetter(field, false, "");
+  }
+
+  /**
+   * same as {@link #resolveIdGetter(Class,Map,boolean,String)} but with byObjectReference=false and component=""
+   *
+   * @param pojoClass the class object of the pojo
+   * @param fieldMap the field mapping
+   * @return 'get' + {@link #resolveIdVariableNameOrSetterGetterSuffix(Map,boolean,boolean,String)} + '()' with
+   *         capitalize=true
+   * @throws NoSuchFieldException indicating a severe problem in the used model
+   * @throws SecurityException if the field cannot be accessed for any reason
+   */
+  public String resolveIdGetter(Class<?> pojoClass, Map<String, Object> fieldMap)
+      throws NoSuchFieldException, SecurityException {
+
+    return resolveIdGetter(pojoClass, fieldMap, false, "");
+  }
+
+  /**
+   * Determines the ID setter for a given 'field' dependent on whether the setter should access the ID via an object
+   * reference or a direct ID setter. In contrast to resolveIdGetter, this function does not generate the function
+   * parenthesis to enable parameter declaration.
+   *
+   * @param field the field
+   * @param byObjectReference boolean
+   * @param component the devon4j component name
+   * @return 'set' + {@link #resolveIdVariableNameOrSetterGetterSuffix(Map, boolean, boolean, String)} with
+   *         capitalize=true
+   */
+  public String resolveIdSetter(Map<String, Object> field, boolean byObjectReference, String component) {
+
+    return "set" + resolveIdVariableNameOrSetterGetterSuffix(field, byObjectReference, true, component);
+  }
+
+  /**
+   * same as {@link #resolveIdSetter(Map, boolean, String)} but with byObjectReference=false and component=""
+   *
+   * @param field the field
+   * @return 'set' + {@link #resolveIdVariableNameOrSetterGetterSuffix(Map, boolean, boolean, String)} with
+   *         capitalize=true
+   */
+  public String resolveIdSetter(Map<String, Object> field) {
+
+    return this.resolveIdSetter(field, false, "");
+  }
+
+  /**
+   * Determines the ID setter for a given 'field' dependent on whether the setter should access the ID via an object
+   * reference or a direct ID setter. In contrast to resolveIdGetter, this function does not generate the function
+   * parenthesis to enable parameter declaration.
+   *
+   * @param pojoClass the class object of the pojo
+   * @param fieldMap the field mapping
+   * @param byObjectReference boolean
+   * @param component the devon4j component name
+   * @return 'set'+ {@link #resolveIdVariableNameOrSetterGetterSuffix(Map,boolean,boolean,String)} with capitalize=true
+   * @throws NoSuchFieldException indicating a severe problem in the used model
+   * @throws SecurityException if the field cannot be accessed for any reason
+   */
+  public String resolveIdSetter(Class<?> pojoClass, Map<String, Object> fieldMap, boolean byObjectReference,
+      String component) throws NoSuchFieldException, SecurityException {
+
+    return "set" + resolveIdVariableNameOrSetterGetterSuffix(pojoClass, fieldMap, byObjectReference, true, component);
+  }
+
+  /**
+   * same as {@link #resolveIdSetter(Class,Map,boolean,String)} but with byObjectReference=false and component=""
+   *
+   * @param pojoClass the class object of the pojo
+   * @param fieldMap the field mapping
+   * @return 'set' + {@link #resolveIdVariableNameOrSetterGetterSuffix(Map,boolean,boolean,String)} with capitalize=true
+   * @throws NoSuchFieldException indicating a severe problem in the used model
+   * @throws SecurityException if the field cannot be accessed for any reason
+   */
+  public String resolveIdSetter(Class<?> pojoClass, Map<String, Object> fieldMap)
+      throws NoSuchFieldException, SecurityException {
+
+    return resolveIdSetter(pojoClass, fieldMap, false, "");
+  }
+
+  /**
+   * Determines the variable name for the id value of the 'field'
+   *
+   * @param field the field
+   * @return {@link #resolveIdVariableNameOrSetterGetterSuffix(Map, boolean, boolean, String)}) with
+   *         byObjectReference=false, capitalize=false and component=""
+   */
+  public String resolveIdVariableName(Map<String, Object> field) {
+
+    // the component is passed down as an empty string since byObjectReference is false and therefore the
+    // component is
+    // never touched
+    return resolveIdVariableNameOrSetterGetterSuffix(field, false, false, "");
+  }
+
+  /**
+   * Determines the variable name for the id value of the specified field in the pojo
+   *
+   * @param pojoClass the class object of the pojo
+   * @param fieldMap the field mapping
+   * @return {@link #resolveIdVariableNameOrSetterGetterSuffix(Class, Map, boolean, boolean, String)}) with
+   *         byObjectReference=false, capitalize=false and component=""
+   * @throws NoSuchFieldException indicating a severe problem in the used model
+   * @throws SecurityException if the field cannot be accessed for any reason
+   */
+  public String resolveIdVariableName(Class<?> pojoClass, Map<String, Object> fieldMap)
+      throws NoSuchFieldException, SecurityException {
+
+    // the component is passed down as an empty string since byObjectReference is false and therefore the
+    // component is
+    // never touched
+    return resolveIdVariableNameOrSetterGetterSuffix(pojoClass, fieldMap, false, false, "");
+  }
+
+  /**
+   * Determines the ID setter/getter suffix for a given 'field' dependent on whether the setter/getter should access the
+   * ID via an object reference or a direct ID setter/getter
+   *
+   * @param field the field
+   * @param byObjectReference boolean
+   * @param capitalize if the field name should be capitalized
+   * @param component the devon4j component. Only needed if $byObjectReference is true
+   * @return idVariable name or getter/setter suffix
+   */
+  public String resolveIdVariableNameOrSetterGetterSuffix(Map<String, Object> field, boolean byObjectReference,
+      boolean capitalize, String component) {
+
+    String fieldName = (String) field.get(Field.NAME.toString());
+    if (capitalize) {
+      fieldName = fieldName.substring(0, 1).toUpperCase() + fieldName.substring(1);
+    }
+    String suffix = "";
+
+    String fieldType = (String) field.get(Field.TYPE.toString());
+    String fieldCType = (String) field.get(Field.CANONICAL_TYPE.toString());
+    if (fieldType.contains("Entity")) {
+      if (fieldCType.startsWith("java.util.List") || fieldCType.startsWith("java.util.Set")) {
+        suffix = "Ids";
+        if (fieldName.endsWith("s")) {
+          // Assume trailing 's' as indicator for a plural
+          fieldName = fieldName.substring(0, fieldName.length() - 1);
+        }
+      } else {
+        suffix = "Id";
+      }
+      if (byObjectReference && isTypeInComponent(fieldCType, component)) {
+        // direct references for Entities in same component, so get id of the object reference
+        suffix = "().getId";
+      }
+    }
+
+    return fieldName + suffix;
+
+  }
+
+  /**
+   * Determines the ID setter/getter suffix for a given 'field' dependent on whether the setter/getter should access the
+   * ID via an object reference or a direct ID setter/getter
+   *
+   * @param pojoClass the {@link Class} object of the pojo
+   * @param fieldMap the field mapping
+   * @param byObjectReference boolean
+   * @param capitalize if the field name should be capitalized
+   * @param component the devon4j component. Only needed if byObjectReference is true
+   * @return idVariable name or getter/setter suffix
+   * @throws NoSuchFieldException indicating a severe problem in the used model
+   * @throws SecurityException if the field cannot be accessed for any reason
+   */
+  public String resolveIdVariableNameOrSetterGetterSuffix(Class<?> pojoClass, Map<String, Object> fieldMap,
+      boolean byObjectReference, boolean capitalize, String component) throws NoSuchFieldException, SecurityException {
+
+    String resultName = (String) fieldMap.get(Field.NAME.toString());
+    if (capitalize) {
+      resultName = resultName.substring(0, 1).toUpperCase() + resultName.substring(1);
+    }
+    String suffix = "";
+    String fieldType = (String) fieldMap.get(Field.TYPE.toString());
+    String fieldName = (String) fieldMap.get(Field.NAME.toString());
+    if (fieldType.contains("Entity")) {
+      if (Collection.class.isAssignableFrom(pojoClass.getDeclaredField(fieldName).getType())) {
+        suffix = "Ids";
+        if (resultName.endsWith("s")) {
+          // Assume trailing 's' as indicator for a plural
+          resultName = resultName.substring(0, resultName.length() - 1);
+        }
+      } else {
+        suffix = "Id";
+      }
+      if (byObjectReference
+          && isEntityInComponent(pojoClass.getDeclaredField(fieldName).getType().getName(), component)) {
+        // direct references for Entities in same component, so get id of the object reference
+        suffix = "().getId";
+      }
+    }
+
+    return resultName + suffix;
+
+  }
+
+  /**
+   * Returns the argument type of the list or set from a field. If the string contains "Entity" it will remove that
+   * part. For example, if we have a List &lt;SampleEntity&gt; it will return "Sample"
+   *
+   * @param field the field
+   * @param pojoClass the object class of the Entity that contains the field
+   * @return fieldType argument of the list
+   * @throws SecurityException if field type could not accessed
+   * @throws NoSuchFieldException if field could not be found
+   */
+  public String getListArgumentType(Map<String, Object> field, Class<?> pojoClass)
+      throws NoSuchFieldException, SecurityException {
+
+    JavaUtil javaUtil = new JavaUtil();
+
+    String fieldType = (String) field.get(Field.TYPE.toString());
+    String fieldName = (String) field.get(Field.NAME.toString());
+
+    if (fieldType.contains("Entity")) {
+      if (javaUtil.isCollection(pojoClass, fieldName)) {
+
+        fieldType = fieldType.replace("Entity", "");
+        // Regex: Extracts the argument type of the list 'List<type>' => type
+        String regex = "(?<=\\<).+?(?=\\>)";
+        Pattern pattern = Pattern.compile(regex);
+        Matcher regexMatcher = pattern.matcher(fieldType);
+
+        if (regexMatcher.find()) {
+          fieldType = regexMatcher.group(0);
+        }
+      }
+    }
+    return fieldType;
+
+  }
+
+  /**
+   * Converts all occurrences of devon4j Entity types in the given 'field' simple type (possibly generic) to Longs
+   *
+   * @param field the field
+   * @return the field type as String. If field type contains 'Entity' the result is Long
+   */
+  public String getSimpleEntityTypeAsLongReference(Map<String, Object> field) {
+
+    String fieldType = (String) field.get(Field.TYPE.toString());
+    if (fieldType.endsWith("Entity")) {
+      fieldType = fieldType.replaceAll("[^<>]+Entity", "Long");
+    }
+    return fieldType;
+  }
+
+  /**
+   * If the string last character is an 's', then it gets removed
+   *
+   * @param targetClassName string to remove plural
+   * @return string without 's'
+   */
+  public String removePlural(String targetClassName) {
+
+    if (targetClassName.charAt(targetClassName.length() - 1) == 's') {
+      targetClassName = targetClassName.substring(0, targetClassName.length() - 1);
+    }
+    return targetClassName;
+  }
+
+  /**
+   * Checks whether the operation with the given ID corresponds to any standard CRUD method name.
+   *
+   * @param operationId operation ID interpreted as method name
+   * @param entityName entity name to check standard CRUD methods for
+   * @return <code>true</code> if the operation ID maps any standard CRUD method name, <code>false</code> otherwise
+   */
+  public boolean isCrudOperation(String operationId, String entityName) {
+
+    if (operationId == null) {
+      return false;
+    }
+    String opIdLowerCase = operationId.toLowerCase();
+    String entityNameLowerCase = entityName.toLowerCase();
+    if (opIdLowerCase.contains(entityNameLowerCase)) {
+      return opIdLowerCase.equals("find" + entityNameLowerCase)
+          || opIdLowerCase.equals("find" + entityNameLowerCase + "Etos")
+          || opIdLowerCase.equals("delete" + entityNameLowerCase) || opIdLowerCase.equals("save" + entityNameLowerCase);
+    } else {
+      return false;
+    }
+  }
+
+  /**
+   * Converts the given media type to the spring Java enum value
+   *
+   * @param mediaType to be converted
+   * @return the spring enum value representing the given media type
+   */
+  public String getSpringMediaType(String mediaType) {
+
+    switch (mediaType) {
+      case "application/xml":
+        return "APPLICATION_XML_VALUE";
+      case "application / x-www-form-urlencoded":
+        return "APPLICATION_FORM_URLENCODED_VALUE";
+      case "multipart/form-data":
+        return "MULTIPART_FORM_DATA_VALUE";
+      case "text/plain":
+        return "TEXT_PLAIN_VALUE";
+      case "text/html":
+        return "TEXT_HTML_VALUE";
+      case "application/pdf":
+        return "APPLICATION_PDF_VALUE";
+      case "image/png":
+        return "IMAGE_PNG_VALUE";
+      default:
+        return "APPLICATION_JSON_VALUE";
+    }
+  }
+}
\ No newline at end of file
diff --git a/cobigen-templates/crud-java-ea-uml/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/JavaUtil.java b/cobigen-templates/crud-java-ea-uml/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/JavaUtil.java
new file mode 100644
index 0000000000..ced2f5fde2
--- /dev/null
+++ b/cobigen-templates/crud-java-ea-uml/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/JavaUtil.java
@@ -0,0 +1,464 @@
+package com.devonfw.cobigen.templates.devon4j.utils;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.Collection;
+import java.util.Map;
+
+import org.apache.commons.lang3.ClassUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Provides type operations, mainly checks and casts for Java Primitives, to be used in the templates
+ *
+ */
+public class JavaUtil {
+
+  /**
+   * Logger for this class
+   */
+  private static final Logger LOG = LoggerFactory.getLogger(JavaUtil.class);
+
+  /**
+   * The constructor.
+   */
+  public JavaUtil() {
+
+    // Empty for CobiGen to automatically instantiate it
+  }
+
+  /**
+   * Returns the Object version of a Java primitive or the input if the input isn't a java primitive
+   * 
+   * @param simpleType String
+   * @return the corresponding object wrapper type simple name of the input if the input is the name of a primitive java
+   *         type. The input itself if not. (e.g. "int" results in "Integer")
+   * @throws ClassNotFoundException should not occur.
+   */
+  public String boxJavaPrimitives(String simpleType) throws ClassNotFoundException {
+
+    if (equalsJavaPrimitive(simpleType)) {
+      return ClassUtils.primitiveToWrapper(ClassUtils.getClass(simpleType)).getSimpleName();
+    } else {
+      return simpleType;
+    }
+
+  }
+
+  /**
+   * Returns the simple name of the type of a field in the pojoClass. If the type is a java primitive the name of the
+   * wrapper class is returned
+   *
+   * @param pojoClass {@link Class} the class object of the pojo
+   * @param fieldName {@link String} the name of the field
+   * @return String. The simple name of the field's type. The simple name of the wrapper class in case of java
+   *         primitives
+   * @throws NoSuchFieldException indicating something awefully wrong in the used model
+   * @throws SecurityException if the field cannot be accessed.
+   */
+  public String boxJavaPrimitives(Class<?> pojoClass, String fieldName) throws NoSuchFieldException, SecurityException {
+
+    if (pojoClass == null) {
+      throw new IllegalAccessError(
+          "Class object is null. Cannot generate template as it might obviously depend on reflection.");
+    }
+
+    if (equalsJavaPrimitive(pojoClass, fieldName)) {
+      return ClassUtils.primitiveToWrapper(pojoClass.getDeclaredField(fieldName).getType()).getSimpleName();
+    } else {
+      Field field = pojoClass.getDeclaredField(fieldName);
+      if (field == null) {
+        field = pojoClass.getField(fieldName);
+      }
+      if (field == null) {
+        throw new IllegalAccessError("Could not find field " + fieldName + " in class " + pojoClass);
+      } else {
+        return field.getType().getSimpleName();
+      }
+    }
+  }
+
+  /**
+   * Checks if the given type is a Java primitive
+   *
+   * @param simpleType the type to be checked
+   * @return true iff simpleType is a Java primitive
+   */
+  public boolean equalsJavaPrimitive(String simpleType) {
+
+    try {
+      return ClassUtils.getClass(simpleType).isPrimitive();
+    } catch (ClassNotFoundException e) {
+      LOG.warn("{}: Could not find {}", e.getMessage(), simpleType);
+      return false;
+    }
+  }
+
+  /**
+   * Checks if the given type is a Java primitive or wrapper
+   *
+   * @param simpleType the type to be checked
+   * @return true iff simpleType is a Java primitive or wrapper
+   */
+  public boolean equalsJavaPrimitiveOrWrapper(String simpleType) {
+
+    try {
+      return ClassUtils.isPrimitiveOrWrapper(ClassUtils.getClass(simpleType));
+    } catch (ClassNotFoundException e) {
+      LOG.warn("{}: Could not find {}", e.getMessage(), simpleType);
+      return false;
+    }
+  }
+
+  /**
+   * Checks if the type of the field in the pojo's class is a java primitive
+   *
+   * @param pojoClass the {@link Class} object of the pojo
+   * @param fieldName the name of the field to be checked
+   * @return true iff the field is a java primitive
+   * @throws NoSuchFieldException indicating something awefully wrong in the used model
+   * @throws SecurityException if the field cannot be accessed.
+   */
+  public boolean equalsJavaPrimitive(Class<?> pojoClass, String fieldName)
+      throws NoSuchFieldException, SecurityException {
+
+    if (pojoClass == null) {
+      return false;
+    }
+
+    Field field = pojoClass.getDeclaredField(fieldName);
+    if (field == null) {
+      field = pojoClass.getField(fieldName);
+    }
+    if (field == null) {
+      return false;
+    } else {
+      return field.getType().isPrimitive();
+    }
+  }
+
+  /**
+   * Checks if the given type is a Java primitive or a Java primitive array
+   *
+   * @param simpleType the Type name to be checked
+   * @return true iff {@link #equalsJavaPrimitive(String)} is true or if simpleType is an array with a primitive
+   *         component
+   */
+  public boolean equalsJavaPrimitiveIncludingArrays(String simpleType) {
+
+    Class<?> klasse;
+
+    try {
+      klasse = ClassUtils.getClass(simpleType).getComponentType();
+    } catch (ClassNotFoundException e) {
+      LOG.warn("{}: Could not find {}", e.getMessage(), simpleType);
+      return false;
+    }
+    return equalsJavaPrimitive(simpleType) || (klasse != null && klasse.isPrimitive());
+  }
+
+  /**
+   * Checks if the given field in the pojo class is a java primitive or an array of java primitives
+   *
+   * @param pojoClass the class object of the pojo
+   * @param fieldName the name of the field to be checked
+   * @return true iff {@link #equalsJavaPrimitive(Class, String)} is true or the field is an array of primitives
+   * @throws NoSuchFieldException indicating something awfully wrong in the used model
+   * @throws SecurityException if the field cannot be accessed.
+   */
+  public boolean equalsJavaPrimitiveIncludingArrays(Class<?> pojoClass, String fieldName)
+      throws NoSuchFieldException, SecurityException {
+
+    return equalsJavaPrimitive(pojoClass, fieldName) || (pojoClass.getDeclaredField(fieldName).getType().isArray()
+        && pojoClass.getDeclaredField(fieldName).getType().getComponentType().isPrimitive());
+  }
+
+  /**
+   * Returns a cast statement for a given (java primitive, variable name) pair or nothing if the type isn't a java
+   * primitive
+   *
+   * @param simpleType Java Type
+   * @param varName Variable name
+   * @return String either of the form '((Java Primitive Object Type)varName)' if simpleType is a primitive or the empty
+   *         String otherwise
+   * @throws ClassNotFoundException should not occur
+   */
+  public String castJavaPrimitives(String simpleType, String varName) throws ClassNotFoundException {
+
+    if (equalsJavaPrimitive(simpleType)) {
+      return String.format("((%1$s)%2$s)", boxJavaPrimitives(simpleType), varName);
+    } else {
+      return "";
+    }
+  }
+
+  /**
+   * Returns a cast statement for a given (java primitive, variable name) pair or nothing if the type isn't a java
+   * primitive
+   *
+   * @param pojoClass the class object of the pojo
+   * @param fieldName the name of the field to be casted
+   * @return if fieldName points to a primitive field then a casted statement (e.g. for an int field:
+   *         '((Integer)field)') or an empty String otherwise
+   * @throws NoSuchFieldException indicating something awefully wrong in the used model
+   * @throws SecurityException if the field cannot be accessed.
+   */
+  public String castJavaPrimitives(Class<?> pojoClass, String fieldName)
+      throws NoSuchFieldException, SecurityException {
+
+    if (equalsJavaPrimitive(pojoClass, fieldName)) {
+      return String.format("((%1$s)%2$s)", boxJavaPrimitives(pojoClass, fieldName), fieldName);
+    } else {
+      return "";
+    }
+  }
+
+  /**
+   * @param pojoClass {@link Class} the class object of the pojo
+   * @param fieldName {@link String} the name of the field
+   * @return true if the field is an instance of java.utils.Collections
+   * @throws NoSuchFieldException indicating something awefully wrong in the used model
+   * @throws SecurityException if the field cannot be accessed.
+   */
+  public boolean isCollection(Class<?> pojoClass, String fieldName) throws NoSuchFieldException, SecurityException {
+
+    if (pojoClass == null) {
+      return false;
+    }
+
+    Field field = pojoClass.getDeclaredField(fieldName);
+    if (field == null) {
+      field = pojoClass.getField(fieldName);
+    }
+    if (field == null) {
+      return false;
+    } else {
+      return Collection.class.isAssignableFrom(field.getType());
+    }
+
+  }
+
+  /**
+   * Returns the Ext Type to a given java type
+   *
+   * @param simpleType any java type's simple name
+   * @return corresponding Ext type
+   */
+  public String getExtType(String simpleType) {
+
+    switch (simpleType) {
+      case "short":
+      case "Short":
+      case "int":
+      case "Integer":
+      case "long":
+      case "Long":
+        return "Integer";
+      case "float":
+      case "Float":
+      case "double":
+      case "Double":
+        return "Number";
+      case "boolean":
+      case "Boolean":
+        return "Boolean";
+      case "char":
+      case "Character":
+      case "String":
+        return "String";
+      case "Date":
+        return "Date";
+      default:
+        return "Field";
+    }
+  }
+
+  /**
+   * returns the Angular5 type associated with a Java primitive
+   *
+   * @param simpleType :{@link String} the type to be parsed
+   * @return the corresponding Angular type or 'any' otherwise
+   */
+  public String getAngularType(String simpleType) {
+
+    switch (simpleType) {
+      case "boolean":
+        return "boolean";
+      case "Boolean":
+        return "boolean";
+      case "short":
+        return "number";
+      case "Short":
+        return "number";
+      case "int":
+        return "number";
+      case "Integer":
+        return "number";
+      case "long":
+        return "number";
+      case "Long":
+        return "number";
+      case "float":
+        return "number";
+      case "Float":
+        return "number";
+      case "double":
+        return "number";
+      case "Double":
+        return "number";
+      case "char":
+        return "string";
+      case "Character":
+        return "string";
+      case "String":
+        return "string";
+      case "byte":
+        return "number";
+      default:
+        return "any";
+    }
+  }
+
+  /**
+   * returns the class name of the return type of a specific method.
+   *
+   * @param pojoClass {@link Class}&lt;?&gt; the class object of the pojo
+   * @param methodName {@link String} the name of the method
+   * @return the class name of the return type of the specified method
+   * @throws SecurityException If no method of the given name can be found
+   * @throws NoSuchMethodException If no method of the given name can be found
+   */
+  public String getReturnType(Class<?> pojoClass, String methodName) throws NoSuchMethodException, SecurityException {
+
+    if (pojoClass == null) {
+      throw new IllegalAccessError(
+          "Class object is null. Cannot generate template as it might obviously depend on reflection.");
+    }
+    String s = "-";
+    Method method = findMethod(pojoClass, methodName);
+    if (method != null && !method.getReturnType().equals(Void.TYPE)) {
+      s = method.getReturnType().toString();
+      s = s.substring(s.lastIndexOf('.') + 1, s.length());
+    }
+    return s;
+  }
+
+  /**
+   *
+   * This methods returns the return type of the method in the given pojoClass which are annotated with the parameter
+   * annotatedClass
+   *
+   * @param pojoClass - The class in which to find if it has methods with annotatedClass
+   * @param annotatedClassName - The annotation which needs to be found
+   * @return Return type of the method annotated with the given annotation, else "null"
+   * @throws ClassNotFoundException if the annotated class name could not be found in the class path
+   */
+  @SuppressWarnings("unchecked")
+  public String getReturnTypeOfMethodAnnotatedWith(Class<?> pojoClass, String annotatedClassName)
+      throws ClassNotFoundException {
+
+    if (pojoClass == null) {
+      throw new IllegalAccessError(
+          "Class object is null. Cannot generate template as it might obviously depend on reflection.");
+    }
+
+    Method[] methods = pojoClass.getDeclaredMethods();
+    for (Method method : methods) {
+      if (!method.getName().startsWith("get")) {
+        continue;
+      }
+      for (Annotation a : method.getAnnotations()) {
+        // better if (method.isAnnotationPresent(classObj)) {, but postponed as of different class
+        // loaders of a.getClass() and pojoClass.getClass()
+        if (a.getClass().getCanonicalName().equals(annotatedClassName)) {
+          return method.getReturnType().getSimpleName();
+        }
+      }
+    }
+    return "null";
+  }
+
+  /**
+   * returns the HTTP request type corresponding to an annotation type
+   *
+   * @param annotations The annotation to get the type name of
+   * @return the HTTP request type name of the selected annotation
+   */
+  public String getRequestType(Map<String, Object> annotations) {
+
+    if (annotations.containsKey("javax_ws_rs_GET")) {
+      return "GET";
+    } else if (annotations.containsKey("javax_ws_rs_PUT")) {
+      return "PUT";
+    } else if (annotations.containsKey("javax_ws_rs_POST")) {
+      return "POST";
+    } else if (annotations.containsKey("javax_ws_rs_DELETE")) {
+      return "DELETE";
+    } else if (annotations.containsKey("javax_ws_rs_PATCH")) {
+      return "PATCH";
+    } else {
+      return "-";
+    }
+  }
+
+  /**
+   * Helper method to find a class's specific method
+   *
+   * @param pojoClass {@link Class}&lt;?&gt; the class object of the pojo
+   * @param methodName The name of the method to be found
+   * @return The method object of the method to be found, null if it wasn't found
+   */
+  private Method findMethod(Class<?> pojoClass, String methodName) {
+
+    if (pojoClass == null) {
+      throw new IllegalAccessError(
+          "Class object is null. Cannot generate template as it might obviously depend on reflection.");
+    }
+    for (Method m : pojoClass.getMethods()) {
+      if (m.getName().equals(methodName)) {
+        return m;
+      }
+    }
+    return null;
+  }
+
+  /**
+   * Checks whether the class given by the full qualified name is an enum
+   *
+   * @param className full qualified class name
+   * @return <code>true</code> if the class is an enum, <code>false</code> otherwise
+   */
+  public boolean isEnum(String className) {
+
+    try {
+      return ClassUtils.getClass(className).isEnum();
+    } catch (ClassNotFoundException e) {
+      LOG.warn("{}: Could not find {}", e.getMessage(), className);
+      return false;
+    }
+  }
+
+  /**
+   * Returns the first enum value of an enum class
+   *
+   * @param className full qualified class name
+   * @return the first enum value name found in order
+   */
+  public String getFirstEnumValue(String className) {
+
+    try {
+      Class<?> enumClass = ClassUtils.getClass(className);
+      Field[] declaredFields = enumClass.getDeclaredFields();
+      if (declaredFields.length > 0) {
+        return declaredFields[0].getName();
+      } else {
+        return null;
+      }
+    } catch (ClassNotFoundException e) {
+      LOG.warn("{}: Could not find {}", e.getMessage(), className);
+      return null;
+    }
+  }
+}
diff --git a/cobigen-templates/templates-devon4j/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/uml/Connector.java b/cobigen-templates/crud-java-ea-uml/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/uml/Connector.java
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/uml/Connector.java
rename to cobigen-templates/crud-java-ea-uml/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/uml/Connector.java
diff --git a/cobigen-templates/crud-java-ea-uml/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/uml/UmlUtil.java b/cobigen-templates/crud-java-ea-uml/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/uml/UmlUtil.java
new file mode 100644
index 0000000000..f830019ddc
--- /dev/null
+++ b/cobigen-templates/crud-java-ea-uml/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/uml/UmlUtil.java
@@ -0,0 +1,343 @@
+package com.devonfw.cobigen.templates.devon4j.utils.uml;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+import org.apache.commons.lang3.text.WordUtils;
+import org.w3c.dom.Attr;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+import com.devonfw.cobigen.templates.devon4j.utils.DevonfwUtil;
+
+/**
+ * Provides utilities for UML generation
+ */
+public class UmlUtil {
+
+  /**
+   * List of connectors
+   */
+  private List<Connector> connectors = new ArrayList<>();
+
+  /**
+   * For generating the variables and methods (Getters and Setters) of all the connected classes to this class
+   *
+   * @param isImpl Boolean: Is implementation tag needed
+   * @param isOverride Boolean: Is override tag needed
+   * @return String: Contains all the generated text
+   */
+  public String generateConnectorsVariablesMethodsText(boolean isImpl, boolean isOverride) {
+
+    String textContent = generateText(isImpl, isOverride);
+
+    this.connectors = new ArrayList<>();
+
+    return textContent;
+  }
+
+  /**
+   * Stores connector's source and target in HashMaps for further generation
+   *
+   * @param source source object
+   * @param target target object
+   * @param className name of the class
+   */
+  public void resolveConnectorsContent(Object source, Object target, String className) {
+
+    Node sourceNode = (Node) source;
+    Node targetNode = (Node) target;
+
+    HashMap<String, Node> sourceHash = new HashMap<>();
+    NodeList childs = sourceNode.getChildNodes();
+    for (int i = 0; i < childs.getLength(); i++) {
+      sourceHash.put(childs.item(i).getNodeName(), childs.item(i));
+    }
+
+    HashMap<String, Node> targetHash = new HashMap<>();
+    childs = targetNode.getChildNodes();
+    for (int i = 0; i < childs.getLength(); i++) {
+      targetHash.put(childs.item(i).getNodeName(), childs.item(i));
+    }
+
+    setConnectorsContent(sourceHash, targetHash, className);
+  }
+
+  /**
+   * Sets to the Connectors class the information retrieved from source and target tags. Only sets the classes that are
+   * connected to our class
+   *
+   * @param sourceHash Source hash
+   * @param targetHash Target hash
+   * @param className name of the class
+   */
+  public void setConnectorsContent(HashMap<?, ?> sourceHash, HashMap<?, ?> targetHash, String className) {
+
+    Connector sourceConnector = null;
+    Connector targetConnector = null;
+    boolean isTarget = false;
+    boolean isSource = false;
+
+    String sourceName = getClassName(sourceHash);
+    String sourceMultiplicity = getMultiplicity(sourceHash);
+    if (sourceName.equals(className)) {
+      isSource = true;
+    }
+
+    String targetName = getClassName(targetHash);
+    String targetMultiplicity = getMultiplicity(targetHash);
+    if (sourceName.equals(className)) {
+      isTarget = true;
+    }
+
+    if (isSource) {
+      sourceConnector = getConnector(sourceHash, true, targetMultiplicity, targetName);
+      this.connectors.add(sourceConnector);
+    } else if (isTarget) {
+      targetConnector = getConnector(targetHash, false, sourceMultiplicity, sourceName);
+      this.connectors.add(targetConnector);
+    }
+  }
+
+  /**
+   * Creates a Connector. The connector class is contains the information retrieved to the classes that are connected to
+   * our class
+   *
+   * @param nodeHash contains the node
+   * @param isSource true if I am source
+   * @param counterpartMultiplicity multiplicity of the counter part
+   * @param counterpartName Name of the counter part
+   * @return A newly created Connector
+   */
+  private Connector getConnector(HashMap<?, ?> nodeHash, boolean isSource, String counterpartMultiplicity,
+      String counterpartName) {
+
+    Connector connector = new Connector(getClassName(nodeHash), getMultiplicity(nodeHash), isSource);
+    connector.setCounterpartMultiplicity(counterpartMultiplicity);
+    connector.setCounterpartName(counterpartName);
+
+    return connector;
+  }
+
+  /**
+   * Extracts the multiplicity of a Connector from a Node
+   *
+   * @param nodeHash The node to get the multiplicity of
+   * @return The multiplicity of the connector
+   */
+  private String getMultiplicity(HashMap<?, ?> nodeHash) {
+
+    if (nodeHash.containsKey("type")) {
+      Node node = (Node) nodeHash.get("type");
+      NamedNodeMap attrs = node.getAttributes();
+      for (int j = 0; j < attrs.getLength(); j++) {
+        Attr attribute = (Attr) attrs.item(j);
+        if (attribute.getName().equals("multiplicity")) {
+          return attribute.getValue();
+        }
+      }
+    }
+    return "1";
+  }
+
+  /**
+   * Extracts the name of a Connector from a Node
+   *
+   * @param nodeHash The node to get the name of
+   * @return The name of the connector
+   */
+  private String getClassName(HashMap<?, ?> nodeHash) {
+
+    if (nodeHash.containsKey("model")) {
+      Node node = (Node) nodeHash.get("model");
+      NamedNodeMap attrs = node.getAttributes();
+      for (int j = 0; j < attrs.getLength(); j++) {
+        Attr attribute = (Attr) attrs.item(j);
+        if (attribute.getName().equals("name")) {
+          return attribute.getValue();
+        }
+      }
+    }
+    return "ErrorClassName";
+  }
+
+  /**
+   * @param isImpl true if this is called from an Implementation template
+   * @param isOverride true if this is called from an Entity template
+   * @return Generated text
+   */
+  public String generateText(boolean isImpl, boolean isOverride) {
+
+    String content = "";
+    if (isImpl) {
+      for (Connector connector : this.connectors) {
+        String connectedClassName = connector.getCounterpartName();
+        String multiplicity = connector.getCounterpartMultiplicity();
+        if (multiplicity == null || multiplicity.equals("1")) {
+          content += "\n\n\tprivate " + connectedClassName + "Entity " + connectedClassName.toLowerCase() + ";";
+        } else if (multiplicity != null && multiplicity.equals("*")) {
+          content += "\n\n\tprivate List<" + connectedClassName + "Entity> "
+              + new DevonfwUtil().removePlural(connectedClassName.toLowerCase()) + "s;";
+        }
+      }
+    }
+
+    for (Connector connector : this.connectors) {
+      String connectedClassName = connector.getCounterpartName();
+      String multiplicity = connector.getCounterpartMultiplicity();
+      if (multiplicity == null || multiplicity.equals("1")) {
+
+        content += "\n\n\t";
+        if (isOverride) {
+          content += "@Override\n\t";
+        }
+        if (isImpl) {
+          content += getRelationshipAnnotations(connector) + "\n\t";
+          content += "public " + connectedClassName + "Entity get" + connectedClassName + "()";
+        } else {
+          content += "public Long get" + connectedClassName + "Id()";
+        }
+        if (isImpl) {
+          content += "{" + "\n\t\treturn this." + connectedClassName.toLowerCase() + ";" + "\n\t}";
+        } else {
+          content += ";";
+        }
+
+        content += "\n\n\t";
+        if (isOverride) {
+          content += "@Override\n\t";
+        }
+        if (isImpl) {
+          content += "public void set" + connectedClassName + "(" + connectedClassName + "Entity "
+              + connectedClassName.toLowerCase() + ")";
+        } else {
+          content += "public void set" + connectedClassName + "Id(Long " + connectedClassName.toLowerCase() + "Id)";
+        }
+        if (isImpl) {
+          content += "{" + "\n\t\tthis." + connectedClassName.toLowerCase() + " = " + connectedClassName.toLowerCase()
+              + ";" + "\n\t}";
+        } else {
+          content += ";";
+        }
+        // Now w generate the get and set IDs methods for the implementation
+        if (isImpl) {
+          // getter
+          content += "\n\n\t";
+          content += "@Override\n\t";
+          content += "public Long get" + connectedClassName + "Id()";
+          content += "{" + "\n\t\tif(this." + connectedClassName.toLowerCase() + " == null){";
+          content += "\n\t\treturn null;\n\t}";
+          content += "\n\t\treturn this." + connectedClassName.toLowerCase() + ".getId();" + "\n\t}";
+          // setter
+          content += "\n\n\t";
+          content += "@Override\n\t";
+          content += "public void set" + connectedClassName + "Id(Long " + connectedClassName.toLowerCase() + "Id)";
+          content += "{" + "\n\t\tif(" + connectedClassName.toLowerCase() + "Id == null){";
+          content += "\n\t\tthis." + connectedClassName.toLowerCase() + " = null;\n\t}";
+          content += "else {\n\t";
+          content += connectedClassName + "Entity " + connectedClassName.toLowerCase() + "Entity = new "
+              + connectedClassName + "Entity();\n\n\t";
+          content += connectedClassName.toLowerCase() + ".setId(" + connectedClassName.toLowerCase() + "Id);\n\n\t";
+          content += "this." + connectedClassName.toLowerCase() + " " + "= " + connectedClassName.toLowerCase()
+              + "Entity;\n\n\t}";
+          content += "\n\n\t}";
+        }
+
+      } else if (multiplicity != null && multiplicity.equals("*") && isImpl) {
+
+        content += "\n\n\t";
+        if (isOverride) {
+          content += "@Override\n\t";
+        }
+        content += getRelationshipAnnotations(connector) + "\n\t";
+        content += "public List<" + connectedClassName + "Entity> get"
+            + new DevonfwUtil().removePlural(connectedClassName) + "s()";
+        content += "{" + "\n\t\treturn this." + new DevonfwUtil().removePlural(connectedClassName.toLowerCase()) + "s;"
+            + "\n\t}";
+        content += "\n\n\t";
+        if (isOverride) {
+          content += "@Override\n\t";
+        }
+        content += "public void set" + new DevonfwUtil().removePlural(connectedClassName) + "s(List<"
+            + connectedClassName + "Entity> " + new DevonfwUtil().removePlural(connectedClassName.toLowerCase()) + "s)";
+        content += "{" + "\n\t\tthis." + new DevonfwUtil().removePlural(connectedClassName.toLowerCase()) + "s = "
+            + new DevonfwUtil().removePlural(connectedClassName.toLowerCase()) + "s;" + "\n\t}";
+      }
+    }
+    return content;
+  }
+
+  /**
+   * Generates the annotations of all the connected classes
+   *
+   * @param source The source connector that is used to generate relationship annotations
+   * @return relationship string with all the annotations for the connected classes
+   */
+  private String getRelationshipAnnotations(Connector source) {
+
+    String relationship = "";
+    if (source.ISSOURCE) {
+      if (source.getMultiplicity() == null || source.getMultiplicity().equals("1")) {
+        if (source.getCounterpartMultiplicity() == null || source.getCounterpartMultiplicity().equals("1")) {
+          relationship = "@OneToOne()" + "\n\t@JoinColumn(name = \"" + source.getCounterpartName() + "Id\")";
+        } else if (source.getCounterpartMultiplicity().equals("*")) {
+          relationship = "@OneToMany(fetch = FetchType.LAZY)\n\t@JoinColumn(name = \""
+              + WordUtils.capitalize(source.getCounterpartName()) + "id\")";
+        }
+      } else if (source.getMultiplicity().equals("*")) {
+        if (source.getCounterpartMultiplicity().equals("*")) {
+          relationship += "@ManyToMany()";
+          relationship += "\n\t@JoinTable(name = \"" + WordUtils.capitalize(source.getCounterpartName())
+              + WordUtils.capitalize(source.getClassName()) + "\", joinColumns = @JoinColumn(name = \""
+              + source.getClassName() + "Id\"), inverseJoinColumns = @JoinColumn(name = \""
+              + source.getCounterpartName() + "Id\"))";
+        } else if (source.getCounterpartMultiplicity().equals("1")) {
+          relationship += "@ManyToOne(fetch = FetchType.LAZY)\n\t@JoinColumn(name = \"" + source.getCounterpartName()
+              + "Id\")";
+        }
+      }
+    } else if (source.ISTARGET) {
+      if (source.getCounterpartMultiplicity() == null || source.getCounterpartMultiplicity().equals("1")) {
+        if (source.getMultiplicity() == null || source.getMultiplicity().equals("1")) {
+          relationship = "@OneToOne()" + "\n\t"//
+              + "@JoinColumn(name = \"" + source.getCounterpartName() + "Id\")";
+        } else if (source.getMultiplicity().equals("*")) {
+          relationship += "@ManyToOne(fetch = FetchType.LAZY)\n\t"//
+              + "@JoinColumn(name = \"" + source.getCounterpartName() + "Id\")";
+        }
+      } else if (source.getCounterpartMultiplicity().equals("*")) {
+        if (source.getMultiplicity().equals("*")) {
+          relationship += "@ManyToMany(mappedBy = \""
+              + new DevonfwUtil().removePlural(source.getClassName()).toLowerCase() + "s\")";
+        } else if (source.getMultiplicity().equals("1")) {
+          relationship = "@OneToMany(fetch = FetchType.LAZY, mappedBy = \"" + source.getCounterpartName().toLowerCase()
+              + "\")";
+        }
+      }
+    }
+    return relationship;
+  }
+
+  /**
+   * Returns connectors
+   *
+   * @return connectors
+   */
+  public List<Connector> getConnectors() {
+
+    return this.connectors;
+  }
+
+  /**
+   * Sets a new connector list
+   *
+   * @param connectors The new list of connectors
+   */
+  public void setConnectors(List<Connector> connectors) {
+
+    this.connectors = connectors;
+  }
+
+}
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_java_ea_uml/functions.ftl b/cobigen-templates/crud-java-ea-uml/src/main/resources/functions.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_java_ea_uml/functions.ftl
rename to cobigen-templates/crud-java-ea-uml/src/main/resources/functions.ftl
diff --git a/cobigen-templates/crud-java-ea-uml/src/main/resources/template-set.xml b/cobigen-templates/crud-java-ea-uml/src/main/resources/template-set.xml
new file mode 100644
index 0000000000..109400f6e3
--- /dev/null
+++ b/cobigen-templates/crud-java-ea-uml/src/main/resources/template-set.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:templateSetConfiguration version="6.0" xmlns:tns="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration" xmlns:cc="http://capgemini.com/devonfw/cobigen/ContextConfiguration" xmlns:tc="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration templateSetConfiguration.xsd ">
+<cc:contextConfiguration version="3.0">
+  <cc:trigger id="crud_java_ea_uml" type="xml">
+    <cc:containerMatcher type="xpath" value="./uml:Model//packagedElement[@xmi:type='uml:Class']" />
+    <cc:matcher type="xpath" value="self::node()[@xmi:type='uml:Class']/ancestor::uml:Model">
+      <cc:variableAssignment type="xpath" key="rootPackage" value="self::node()/ancestor::packagedElement/packagedElement/@name" />
+      <cc:variableAssignment type="xpath" key="component" value="self::node()/ancestor::packagedElement/packagedElement/packagedElement/@name" />
+      <cc:variableAssignment type="xpath" key="className" value="self::node()/@name" />
+    </cc:matcher>
+  </cc:trigger>
+  <cc:tags>
+    <cc:tag name="EA"></cc:tag>
+    <cc:tag name="CRUD"></cc:tag>
+    <cc:tag name="Client"></cc:tag>
+    <cc:tag name="UML"></cc:tag>
+  </cc:tags>
+</cc:contextConfiguration>
+<tc:templatesConfiguration version="5.0">
+  <tc:templates>
+    <tc:templateExtension ref="${variables.className}Entity.java" mergeStrategy="javamerge" />
+  </tc:templates>
+  <tc:templateScans>
+    <tc:templateScan templatePath="templates" destinationPath="src/main" />
+  </tc:templateScans>
+  <tc:increments>
+    <tc:increment name="xml_uml_entity" description="Entity infrastructure" explanation="Creates Entity java classes to CRUD from schema.">
+      <tc:templateRef ref="${variables.className}Entity.java" />
+      <tc:templateRef ref="${variables.className}.java" />
+      <tc:templateRef ref="ApplicationEntity.java" />
+      <tc:templateRef ref="ApplicationPersistenceEntity.java" />
+    </tc:increment>
+  </tc:increments>
+</tc:templatesConfiguration>
+</tns:templateSetConfiguration>
\ No newline at end of file
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_java_ea_uml/templates/java/${variables.rootPackage}/${variables.component}/common/api/${variables.className}.java.ftl b/cobigen-templates/crud-java-ea-uml/src/main/resources/templates/java/${variables.rootPackage}/${variables.component}/common/api/${variables.className}.java.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_java_ea_uml/templates/java/${variables.rootPackage}/${variables.component}/common/api/${variables.className}.java.ftl
rename to cobigen-templates/crud-java-ea-uml/src/main/resources/templates/java/${variables.rootPackage}/${variables.component}/common/api/${variables.className}.java.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_java_ea_uml/templates/java/${variables.rootPackage}/${variables.component}/dataaccess/api/${variables.className}Entity.java.ftl b/cobigen-templates/crud-java-ea-uml/src/main/resources/templates/java/${variables.rootPackage}/${variables.component}/dataaccess/api/${variables.className}Entity.java.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_java_ea_uml/templates/java/${variables.rootPackage}/${variables.component}/dataaccess/api/${variables.className}Entity.java.ftl
rename to cobigen-templates/crud-java-ea-uml/src/main/resources/templates/java/${variables.rootPackage}/${variables.component}/dataaccess/api/${variables.className}Entity.java.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_java_ea_uml/templates/java/${variables.rootPackage}/general/common/api/ApplicationEntity.java.ftl b/cobigen-templates/crud-java-ea-uml/src/main/resources/templates/java/${variables.rootPackage}/general/common/api/ApplicationEntity.java.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_java_ea_uml/templates/java/${variables.rootPackage}/general/common/api/ApplicationEntity.java.ftl
rename to cobigen-templates/crud-java-ea-uml/src/main/resources/templates/java/${variables.rootPackage}/general/common/api/ApplicationEntity.java.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_java_ea_uml/templates/java/${variables.rootPackage}/general/dataaccess/api/ApplicationPersistenceEntity.java.ftl b/cobigen-templates/crud-java-ea-uml/src/main/resources/templates/java/${variables.rootPackage}/general/dataaccess/api/ApplicationPersistenceEntity.java.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_java_ea_uml/templates/java/${variables.rootPackage}/general/dataaccess/api/ApplicationPersistenceEntity.java.ftl
rename to cobigen-templates/crud-java-ea-uml/src/main/resources/templates/java/${variables.rootPackage}/general/dataaccess/api/ApplicationPersistenceEntity.java.ftl
diff --git a/cobigen-templates/crud-java-ea-uml/src/test/java/com/devonfw/cobigen/templates/devon4j/test/templates/CrudJavaEaUmlTest.java b/cobigen-templates/crud-java-ea-uml/src/test/java/com/devonfw/cobigen/templates/devon4j/test/templates/CrudJavaEaUmlTest.java
new file mode 100644
index 0000000000..7bd5cbe40b
--- /dev/null
+++ b/cobigen-templates/crud-java-ea-uml/src/test/java/com/devonfw/cobigen/templates/devon4j/test/templates/CrudJavaEaUmlTest.java
@@ -0,0 +1,98 @@
+package com.devonfw.cobigen.templates.devon4j.test.templates;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+import org.apache.commons.io.FileUtils;
+import org.junit.BeforeClass;
+import org.junit.ClassRule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+
+import com.devonfw.cobigen.api.constants.ConfigurationConstants;
+import com.devonfw.cobigen.maven.test.AbstractMavenTest;
+import com.devonfw.cobigen.templates.devon4j.config.constant.MavenMetadata;
+
+/**
+ * Smoke tests of all templates.
+ */
+public class CrudJavaEaUmlTest extends AbstractMavenTest {
+
+  /** Root of all test resources of this test suite */
+  public static final String TEST_RESOURCES_ROOT = "src/test/resources/testdata/templatetest/";
+
+  /** Temporary files rule to create temporary folders */
+  @ClassRule
+  public static TemporaryFolder tempFolder = new TemporaryFolder();
+
+  /** The templates development folder */
+  protected static Path templatesProject;
+
+  /** The templates development folder */
+  protected static Path templatesProjectTemporary;
+
+  /**
+   * Creates a copy of the templates project in the temp directory
+   *
+   * @throws URISyntaxException if the path could not be created properly
+   * @throws IOException if accessing a directory or file fails
+   */
+  @BeforeClass
+  public static void setupDevTemplates() throws URISyntaxException, IOException {
+
+    templatesProject = new File(CrudJavaEaUmlTest.class.getProtectionDomain().getCodeSource().getLocation().toURI())
+        .getParentFile().getParentFile().toPath();
+
+    Path utilsPom = new File(CrudJavaEaUmlTest.class.getProtectionDomain().getCodeSource().getLocation().toURI())
+        .getParentFile().getParentFile().toPath().resolve("src/test/resources/utils/pom.xml");
+
+    // create a temporary directory cobigen-templates/template-sets/adapted containing the template sets
+    Path tempFolderPath = tempFolder.getRoot().toPath();
+    Path cobigenTemplatePath = tempFolderPath.resolve("cobigen-templates");
+    if (!Files.exists(cobigenTemplatePath)) {
+      Files.createDirectory(cobigenTemplatePath);
+
+      templatesProjectTemporary = cobigenTemplatePath.resolve(ConfigurationConstants.TEMPLATE_SETS_FOLDER);
+      Path templateSetsAdaptedFolder = templatesProjectTemporary.resolve(ConfigurationConstants.ADAPTED_FOLDER);
+      Files.createDirectory(templatesProjectTemporary);
+      Files.createDirectory(templateSetsAdaptedFolder);
+
+      Path templateSetPath = templateSetsAdaptedFolder.resolve("template-set");
+      FileUtils.copyDirectory(templatesProject.toFile(), templateSetPath.toFile());
+
+      if (Files.isDirectory(templateSetPath)) {
+
+        // Replace the pom.xml in the template sets. Needed so that the project in the temp directory is build
+        // properly
+        if (Files.exists(templateSetPath.resolve("pom.xml"))) {
+          try {
+            Files.delete(templateSetPath.resolve("pom.xml"));
+          } catch (IOException e) {
+            throw new IOException("Error deleting file " + templateSetPath.resolve("pom.xml"), e);
+          }
+          try {
+            Files.copy(utilsPom, templateSetPath.resolve("pom.xml"));
+          } catch (IOException e) {
+            throw new IOException("Error copying file " + utilsPom, e);
+          }
+        }
+      }
+    }
+  }
+
+  /**
+   * Test successful generation of all templates based on a XML input
+   *
+   * @throws Exception test fails
+   */
+  @Test
+  public void testAllTemplatesGeneration_XML() throws Exception {
+
+    File testProject = new File(TEST_RESOURCES_ROOT + "TestAllTemplatesXMLInput/");
+    runMavenInvoker(testProject, templatesProjectTemporary.toFile(), MavenMetadata.LOCAL_REPO);
+  }
+
+}
diff --git a/cobigen-templates/crud-java-ea-uml/src/test/resources/application.properties b/cobigen-templates/crud-java-ea-uml/src/test/resources/application.properties
new file mode 100644
index 0000000000..cf2c614efb
--- /dev/null
+++ b/cobigen-templates/crud-java-ea-uml/src/test/resources/application.properties
@@ -0,0 +1,2 @@
+server.port=8080
+server.context-path=/
\ No newline at end of file
diff --git a/cobigen-templates/templates-devon4j/src/test/resources/testdata/templatetest/TestAllTemplatesOpenApiInput/logback.xml b/cobigen-templates/crud-java-ea-uml/src/test/resources/logback.xml
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/test/resources/testdata/templatetest/TestAllTemplatesOpenApiInput/logback.xml
rename to cobigen-templates/crud-java-ea-uml/src/test/resources/logback.xml
diff --git a/cobigen-templates/templates-devon4j/src/test/resources/testdata/templatetest/TestAllTemplatesRestServiceInput/logback.xml b/cobigen-templates/crud-java-ea-uml/src/test/resources/testdata/templatetest/TestAllTemplatesXMLInput/logback.xml
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/test/resources/testdata/templatetest/TestAllTemplatesRestServiceInput/logback.xml
rename to cobigen-templates/crud-java-ea-uml/src/test/resources/testdata/templatetest/TestAllTemplatesXMLInput/logback.xml
diff --git a/cobigen-templates/templates-devon4j/src/test/resources/testdata/templatetest/TestAllTemplatesXMLInput/pom.xml b/cobigen-templates/crud-java-ea-uml/src/test/resources/testdata/templatetest/TestAllTemplatesXMLInput/pom.xml
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/test/resources/testdata/templatetest/TestAllTemplatesXMLInput/pom.xml
rename to cobigen-templates/crud-java-ea-uml/src/test/resources/testdata/templatetest/TestAllTemplatesXMLInput/pom.xml
diff --git a/cobigen-templates/templates-devon4j/src/test/resources/testdata/templatetest/TestAllTemplatesXMLInput/src/main/xml/io/github/devonfw/cobigen/generator/dataaccess/api/Input.xml b/cobigen-templates/crud-java-ea-uml/src/test/resources/testdata/templatetest/TestAllTemplatesXMLInput/src/main/xml/io/github/devonfw/cobigen/generator/dataaccess/api/Input.xml
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/test/resources/testdata/templatetest/TestAllTemplatesXMLInput/src/main/xml/io/github/devonfw/cobigen/generator/dataaccess/api/Input.xml
rename to cobigen-templates/crud-java-ea-uml/src/test/resources/testdata/templatetest/TestAllTemplatesXMLInput/src/main/xml/io/github/devonfw/cobigen/generator/dataaccess/api/Input.xml
diff --git a/cobigen-templates/crud-java-ea-uml/src/test/resources/utils/pom.xml b/cobigen-templates/crud-java-ea-uml/src/test/resources/utils/pom.xml
new file mode 100644
index 0000000000..68969e4dea
--- /dev/null
+++ b/cobigen-templates/crud-java-ea-uml/src/test/resources/utils/pom.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.devonfw.cobigen.templates</groupId>
+  <artifactId>crud-java-ea-uml</artifactId>
+  <version>2021.12.007-SNAPSHOT</version>
+  <name>Crud Java Ea Uml</name>
+  <description>A Code-based incremental Generator</description>
+  <url>https://github.com/devonfw/cobigen/templates-parent/templates-devon4j-utils</url>
+  <licenses>
+    <license>
+      <name>Apache Software License 2.0</name>
+      <url>https://raw.githubusercontent.com/devonfw/.github/master/LICENSE</url>
+      <distribution>repo</distribution>
+      <comments></comments>
+    </license>
+  </licenses>
+  <dependencies>
+    <dependency>
+      <groupId>javax.ws.rs</groupId>
+      <artifactId>javax.ws.rs-api</artifactId>
+      <version>2.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.data</groupId>
+      <artifactId>spring-data-rest-webmvc</artifactId>
+      <version>3.7.10</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+      <version>3.12.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+      <version>2.10.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>xerces</groupId>
+      <artifactId>xercesImpl</artifactId>
+      <version>2.12.2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.persistence</groupId>
+      <artifactId>javax.persistence-api</artifactId>
+      <version>2.2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>1.7.30</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <version>1.7.30</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>log4j-over-slf4j</artifactId>
+      <version>1.7.30</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+  <repositories>
+    <repository>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+      <id>ossrh</id>
+      <name>OSSRH Snapshots</name>
+      <url>https://s01.oss.sonatype.org/content/repositories/snapshots/</url>
+    </repository>
+  </repositories>
+
+  <properties>
+   <maven.compiler.source>1.8</maven.compiler.source>
+   <maven.compiler.target>1.8</maven.compiler.target>
+  </properties>
+
+  <build>
+   <resources>
+     <resource>
+       <directory>src/main/java</directory>
+     </resource>
+   </resources>
+  </build></project>
\ No newline at end of file
diff --git a/cobigen-templates/crud-java-server-app-complex/pom.xml b/cobigen-templates/crud-java-server-app-complex/pom.xml
new file mode 100644
index 0000000000..7876d0c5f7
--- /dev/null
+++ b/cobigen-templates/crud-java-server-app-complex/pom.xml
@@ -0,0 +1,19 @@
+<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>crud-java-server-app-complex</artifactId>
+  <name>CRUD Java Server App Complex template</name>
+
+  <parent>
+    <groupId>com.devonfw.cobigen.templates</groupId>
+    <artifactId>templates-parent</artifactId>
+    <version>${revision}</version>
+  </parent>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/cobigen-templates/crud-java-server-app-complex/src/main/java-templates/com/devonfw/cobigen/templates/devon4j/config/constant/MavenMetadata.java b/cobigen-templates/crud-java-server-app-complex/src/main/java-templates/com/devonfw/cobigen/templates/devon4j/config/constant/MavenMetadata.java
new file mode 100644
index 0000000000..395d46154d
--- /dev/null
+++ b/cobigen-templates/crud-java-server-app-complex/src/main/java-templates/com/devonfw/cobigen/templates/devon4j/config/constant/MavenMetadata.java
@@ -0,0 +1,12 @@
+package com.devonfw.cobigen.templates.devon4j.config.constant;
+
+/**
+ * Constants extracted from the maven pom by templating-maven-plugin.
+ * 
+ * @see "edit template in src/main/java-templates"
+ */
+public class MavenMetadata {
+
+    /** Local repository path */
+    public static final String LOCAL_REPO = "${settings.localRepository}";
+}
diff --git a/cobigen-templates/crud-java-server-app-complex/src/main/java/com/devonfw/cobigen/templates/devon4j/constants/Field.java b/cobigen-templates/crud-java-server-app-complex/src/main/java/com/devonfw/cobigen/templates/devon4j/constants/Field.java
new file mode 100644
index 0000000000..5376daaea9
--- /dev/null
+++ b/cobigen-templates/crud-java-server-app-complex/src/main/java/com/devonfw/cobigen/templates/devon4j/constants/Field.java
@@ -0,0 +1,48 @@
+package com.devonfw.cobigen.templates.devon4j.constants;
+
+/**
+ * Contains the used keys for the pojo field mapping
+ */
+public enum Field {
+
+  /**
+   * Name of the field
+   */
+  NAME("name"),
+  /**
+   * Type of the field
+   */
+  TYPE("type"),
+  /**
+   * Canonical Type of the field
+   */
+  CANONICAL_TYPE("canonicalType"),
+  /**
+   * The Javadoc of the field
+   */
+  JAVA_DOC("javaDoc"),
+  /**
+   * Annotations
+   */
+  ANNOTATIONS("annotations");
+
+  /**
+   * key value
+   */
+  private String value;
+
+  /**
+   * @param value of the key
+   */
+  Field(String value) {
+
+    this.value = value;
+  }
+
+  @Override
+  public String toString() {
+
+    return this.value;
+  }
+
+}
diff --git a/cobigen-templates/crud-java-server-app-complex/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/DevonfwUtil.java b/cobigen-templates/crud-java-server-app-complex/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/DevonfwUtil.java
new file mode 100644
index 0000000000..4de413b930
--- /dev/null
+++ b/cobigen-templates/crud-java-server-app-complex/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/DevonfwUtil.java
@@ -0,0 +1,449 @@
+package com.devonfw.cobigen.templates.devon4j.utils;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.w3c.dom.Attr;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+import com.devonfw.cobigen.templates.devon4j.constants.Field;
+
+/**
+ * A class for shared devon4j specific functions in the templates
+ *
+ */
+@SuppressWarnings("restriction")
+public class DevonfwUtil {
+
+  /**
+   * Check whether the given 'canonicalType' is a devon4j Entity, which is declared in the given 'component'
+   *
+   * @param canonicalType the type name
+   * @param component the component name
+   * @return true iff the canonicalType is a devon Entity
+   */
+  public boolean isEntityInComponent(String canonicalType, String component) {
+
+    return canonicalType.matches(String.format(".+%1$s\\.dataaccess\\.api\\.[A-Za-z0-9]+Entity(<.*)?", component));
+  }
+
+  /**
+   * Check whether the given 'canonicalType' is declared in the given 'component'
+   *
+   * @param canonicalType the type name
+   * @param component the component name
+   * @return true iff the canonicalType is inside the given component
+   */
+  public boolean isTypeInComponent(String canonicalType, String component) {
+
+    return canonicalType.matches(String.format("%1$s.[A-Za-z0-9]+(<.*)?", component));
+  }
+
+  /**
+   * Determines the ID getter for a given 'field' dependent on whether the getter should access the ID via an object
+   * reference or a direct ID getter
+   *
+   * @param field the field
+   * @param byObjectReference boolean
+   * @param component the devon4j component name
+   * @return 'get' + {@link #resolveIdVariableNameOrSetterGetterSuffix(Map, boolean, boolean, String)} + '()' with
+   *         capitalize=true
+   */
+  public String resolveIdGetter(Map<String, Object> field, boolean byObjectReference, String component) {
+
+    // If field comes from an UML file
+    if (field.getClass().toGenericString().contains("freemarker.ext.beans.HashAdapter")) {
+      return resolveIdGetter(field, byObjectReference, component);
+    }
+    return "get" + resolveIdVariableNameOrSetterGetterSuffix(field, byObjectReference, true, component) + "()";
+  }
+
+  /**
+   * Determines the ID getter for a given 'field' dependent on whether the getter should access the ID via an object
+   * reference or a direct ID getter
+   *
+   * This method is used when the field parameter comes from an UML file. The name and type of the attributes must be
+   * pre-processed for later inserting them inside the HashMap.
+   *
+   * @param field the field
+   * @param byObjectReference boolean
+   * @param component the devon4j component name
+   * @return 'get' + {@link #resolveIdVariableNameOrSetterGetterSuffix(Map, boolean, boolean, String)} + '()' with
+   *         capitalize=true
+   */
+  public String resolveIdGetter(Node field, boolean byObjectReference, String component) {
+
+    HashMap<String, Object> nodeHash = new HashMap<>();
+
+    // Putting the name of the attribute to the hash
+    nodeHash.put(Field.NAME.toString(), field.getAttributes().getNamedItem("name"));
+
+    // Putting the type of the attribute to the hash
+    NodeList childs = field.getChildNodes();
+    for (int i = 0; i < childs.getLength(); i++) {
+      // Retrieve "type" tag
+      if (childs.item(i).getNodeName().equals("type")) {
+        NamedNodeMap attrs = childs.item(i).getAttributes();
+        for (int j = 0; j < attrs.getLength(); j++) {
+          Attr attribute = (Attr) attrs.item(j);
+          // Try to find the attribute that contains the type
+          if (attribute.getName().equals("xmi:idref")) {
+            nodeHash.put(Field.TYPE.toString(), attribute.getName().replace("EAJava_", ""));
+          }
+        }
+      }
+    }
+    return "get" + resolveIdVariableNameOrSetterGetterSuffix(nodeHash, byObjectReference, true, component) + "()";
+
+  }
+
+  /**
+   * Determines the ID getter for a given 'field' dependent on whether the getter should access the ID via an object
+   * reference or a direct ID getter
+   *
+   * @param pojoClass the class object of the pojo
+   * @param fieldMap the field mapping
+   * @param byObjectReference boolean
+   * @param component the devon4j component name
+   * @return 'get' + {@link #resolveIdVariableNameOrSetterGetterSuffix(Map, boolean, boolean, String)} + '()' with
+   *         capitalize=true
+   * @throws NoSuchFieldException indicating a severe problem in the used model
+   * @throws SecurityException if the field cannot be accessed for any reason
+   */
+  public String resolveIdGetter(Class<?> pojoClass, Map<String, Object> fieldMap, boolean byObjectReference,
+      String component) throws NoSuchFieldException, SecurityException {
+
+    return "get" + resolveIdVariableNameOrSetterGetterSuffix(pojoClass, fieldMap, byObjectReference, true, component)
+        + "()";
+  }
+
+  /**
+   * same as {@link #resolveIdGetter(Map, boolean, String)} but with byObjectReference=false and component=""
+   *
+   * @param field the field
+   * @return 'get' + {@link #resolveIdVariableNameOrSetterGetterSuffix(Map,boolean,boolean,String)} + '()' with
+   *         capitalize=true
+   */
+  public String resolveIdGetter(Map<String, Object> field) {
+
+    return this.resolveIdGetter(field, false, "");
+  }
+
+  /**
+   * same as {@link #resolveIdGetter(Class,Map,boolean,String)} but with byObjectReference=false and component=""
+   *
+   * @param pojoClass the class object of the pojo
+   * @param fieldMap the field mapping
+   * @return 'get' + {@link #resolveIdVariableNameOrSetterGetterSuffix(Map,boolean,boolean,String)} + '()' with
+   *         capitalize=true
+   * @throws NoSuchFieldException indicating a severe problem in the used model
+   * @throws SecurityException if the field cannot be accessed for any reason
+   */
+  public String resolveIdGetter(Class<?> pojoClass, Map<String, Object> fieldMap)
+      throws NoSuchFieldException, SecurityException {
+
+    return resolveIdGetter(pojoClass, fieldMap, false, "");
+  }
+
+  /**
+   * Determines the ID setter for a given 'field' dependent on whether the setter should access the ID via an object
+   * reference or a direct ID setter. In contrast to resolveIdGetter, this function does not generate the function
+   * parenthesis to enable parameter declaration.
+   *
+   * @param field the field
+   * @param byObjectReference boolean
+   * @param component the devon4j component name
+   * @return 'set' + {@link #resolveIdVariableNameOrSetterGetterSuffix(Map, boolean, boolean, String)} with
+   *         capitalize=true
+   */
+  public String resolveIdSetter(Map<String, Object> field, boolean byObjectReference, String component) {
+
+    return "set" + resolveIdVariableNameOrSetterGetterSuffix(field, byObjectReference, true, component);
+  }
+
+  /**
+   * same as {@link #resolveIdSetter(Map, boolean, String)} but with byObjectReference=false and component=""
+   *
+   * @param field the field
+   * @return 'set' + {@link #resolveIdVariableNameOrSetterGetterSuffix(Map, boolean, boolean, String)} with
+   *         capitalize=true
+   */
+  public String resolveIdSetter(Map<String, Object> field) {
+
+    return this.resolveIdSetter(field, false, "");
+  }
+
+  /**
+   * Determines the ID setter for a given 'field' dependent on whether the setter should access the ID via an object
+   * reference or a direct ID setter. In contrast to resolveIdGetter, this function does not generate the function
+   * parenthesis to enable parameter declaration.
+   *
+   * @param pojoClass the class object of the pojo
+   * @param fieldMap the field mapping
+   * @param byObjectReference boolean
+   * @param component the devon4j component name
+   * @return 'set'+ {@link #resolveIdVariableNameOrSetterGetterSuffix(Map,boolean,boolean,String)} with capitalize=true
+   * @throws NoSuchFieldException indicating a severe problem in the used model
+   * @throws SecurityException if the field cannot be accessed for any reason
+   */
+  public String resolveIdSetter(Class<?> pojoClass, Map<String, Object> fieldMap, boolean byObjectReference,
+      String component) throws NoSuchFieldException, SecurityException {
+
+    return "set" + resolveIdVariableNameOrSetterGetterSuffix(pojoClass, fieldMap, byObjectReference, true, component);
+  }
+
+  /**
+   * same as {@link #resolveIdSetter(Class,Map,boolean,String)} but with byObjectReference=false and component=""
+   *
+   * @param pojoClass the class object of the pojo
+   * @param fieldMap the field mapping
+   * @return 'set' + {@link #resolveIdVariableNameOrSetterGetterSuffix(Map,boolean,boolean,String)} with capitalize=true
+   * @throws NoSuchFieldException indicating a severe problem in the used model
+   * @throws SecurityException if the field cannot be accessed for any reason
+   */
+  public String resolveIdSetter(Class<?> pojoClass, Map<String, Object> fieldMap)
+      throws NoSuchFieldException, SecurityException {
+
+    return resolveIdSetter(pojoClass, fieldMap, false, "");
+  }
+
+  /**
+   * Determines the variable name for the id value of the 'field'
+   *
+   * @param field the field
+   * @return {@link #resolveIdVariableNameOrSetterGetterSuffix(Map, boolean, boolean, String)}) with
+   *         byObjectReference=false, capitalize=false and component=""
+   */
+  public String resolveIdVariableName(Map<String, Object> field) {
+
+    // the component is passed down as an empty string since byObjectReference is false and therefore the
+    // component is
+    // never touched
+    return resolveIdVariableNameOrSetterGetterSuffix(field, false, false, "");
+  }
+
+  /**
+   * Determines the variable name for the id value of the specified field in the pojo
+   *
+   * @param pojoClass the class object of the pojo
+   * @param fieldMap the field mapping
+   * @return {@link #resolveIdVariableNameOrSetterGetterSuffix(Class, Map, boolean, boolean, String)}) with
+   *         byObjectReference=false, capitalize=false and component=""
+   * @throws NoSuchFieldException indicating a severe problem in the used model
+   * @throws SecurityException if the field cannot be accessed for any reason
+   */
+  public String resolveIdVariableName(Class<?> pojoClass, Map<String, Object> fieldMap)
+      throws NoSuchFieldException, SecurityException {
+
+    // the component is passed down as an empty string since byObjectReference is false and therefore the
+    // component is
+    // never touched
+    return resolveIdVariableNameOrSetterGetterSuffix(pojoClass, fieldMap, false, false, "");
+  }
+
+  /**
+   * Determines the ID setter/getter suffix for a given 'field' dependent on whether the setter/getter should access the
+   * ID via an object reference or a direct ID setter/getter
+   *
+   * @param field the field
+   * @param byObjectReference boolean
+   * @param capitalize if the field name should be capitalized
+   * @param component the devon4j component. Only needed if $byObjectReference is true
+   * @return idVariable name or getter/setter suffix
+   */
+  public String resolveIdVariableNameOrSetterGetterSuffix(Map<String, Object> field, boolean byObjectReference,
+      boolean capitalize, String component) {
+
+    String fieldName = (String) field.get(Field.NAME.toString());
+    if (capitalize) {
+      fieldName = fieldName.substring(0, 1).toUpperCase() + fieldName.substring(1);
+    }
+    String suffix = "";
+
+    String fieldType = (String) field.get(Field.TYPE.toString());
+    String fieldCType = (String) field.get(Field.CANONICAL_TYPE.toString());
+    if (fieldType.contains("Entity")) {
+      if (fieldCType.startsWith("java.util.List") || fieldCType.startsWith("java.util.Set")) {
+        suffix = "Ids";
+        if (fieldName.endsWith("s")) {
+          // Assume trailing 's' as indicator for a plural
+          fieldName = fieldName.substring(0, fieldName.length() - 1);
+        }
+      } else {
+        suffix = "Id";
+      }
+      if (byObjectReference && isTypeInComponent(fieldCType, component)) {
+        // direct references for Entities in same component, so get id of the object reference
+        suffix = "().getId";
+      }
+    }
+
+    return fieldName + suffix;
+
+  }
+
+  /**
+   * Determines the ID setter/getter suffix for a given 'field' dependent on whether the setter/getter should access the
+   * ID via an object reference or a direct ID setter/getter
+   *
+   * @param pojoClass the {@link Class} object of the pojo
+   * @param fieldMap the field mapping
+   * @param byObjectReference boolean
+   * @param capitalize if the field name should be capitalized
+   * @param component the devon4j component. Only needed if byObjectReference is true
+   * @return idVariable name or getter/setter suffix
+   * @throws NoSuchFieldException indicating a severe problem in the used model
+   * @throws SecurityException if the field cannot be accessed for any reason
+   */
+  public String resolveIdVariableNameOrSetterGetterSuffix(Class<?> pojoClass, Map<String, Object> fieldMap,
+      boolean byObjectReference, boolean capitalize, String component) throws NoSuchFieldException, SecurityException {
+
+    String resultName = (String) fieldMap.get(Field.NAME.toString());
+    if (capitalize) {
+      resultName = resultName.substring(0, 1).toUpperCase() + resultName.substring(1);
+    }
+    String suffix = "";
+    String fieldType = (String) fieldMap.get(Field.TYPE.toString());
+    String fieldName = (String) fieldMap.get(Field.NAME.toString());
+    if (fieldType.contains("Entity")) {
+      if (Collection.class.isAssignableFrom(pojoClass.getDeclaredField(fieldName).getType())) {
+        suffix = "Ids";
+        if (resultName.endsWith("s")) {
+          // Assume trailing 's' as indicator for a plural
+          resultName = resultName.substring(0, resultName.length() - 1);
+        }
+      } else {
+        suffix = "Id";
+      }
+      if (byObjectReference
+          && isEntityInComponent(pojoClass.getDeclaredField(fieldName).getType().getName(), component)) {
+        // direct references for Entities in same component, so get id of the object reference
+        suffix = "().getId";
+      }
+    }
+
+    return resultName + suffix;
+
+  }
+
+  /**
+   * Returns the argument type of the list or set from a field. If the string contains "Entity" it will remove that
+   * part. For example, if we have a List &lt;SampleEntity&gt; it will return "Sample"
+   *
+   * @param field the field
+   * @param pojoClass the object class of the Entity that contains the field
+   * @return fieldType argument of the list
+   * @throws SecurityException if field type could not accessed
+   * @throws NoSuchFieldException if field could not be found
+   */
+  public String getListArgumentType(Map<String, Object> field, Class<?> pojoClass)
+      throws NoSuchFieldException, SecurityException {
+
+    JavaUtil javaUtil = new JavaUtil();
+
+    String fieldType = (String) field.get(Field.TYPE.toString());
+    String fieldName = (String) field.get(Field.NAME.toString());
+
+    if (fieldType.contains("Entity")) {
+      if (javaUtil.isCollection(pojoClass, fieldName)) {
+
+        fieldType = fieldType.replace("Entity", "");
+        // Regex: Extracts the argument type of the list 'List<type>' => type
+        String regex = "(?<=\\<).+?(?=\\>)";
+        Pattern pattern = Pattern.compile(regex);
+        Matcher regexMatcher = pattern.matcher(fieldType);
+
+        if (regexMatcher.find()) {
+          fieldType = regexMatcher.group(0);
+        }
+      }
+    }
+    return fieldType;
+
+  }
+
+  /**
+   * Converts all occurrences of devon4j Entity types in the given 'field' simple type (possibly generic) to Longs
+   *
+   * @param field the field
+   * @return the field type as String. If field type contains 'Entity' the result is Long
+   */
+  public String getSimpleEntityTypeAsLongReference(Map<String, Object> field) {
+
+    String fieldType = (String) field.get(Field.TYPE.toString());
+    if (fieldType.endsWith("Entity")) {
+      fieldType = fieldType.replaceAll("[^<>]+Entity", "Long");
+    }
+    return fieldType;
+  }
+
+  /**
+   * If the string last character is an 's', then it gets removed
+   *
+   * @param targetClassName string to remove plural
+   * @return string without 's'
+   */
+  public String removePlural(String targetClassName) {
+
+    if (targetClassName.charAt(targetClassName.length() - 1) == 's') {
+      targetClassName = targetClassName.substring(0, targetClassName.length() - 1);
+    }
+    return targetClassName;
+  }
+
+  /**
+   * Checks whether the operation with the given ID corresponds to any standard CRUD method name.
+   *
+   * @param operationId operation ID interpreted as method name
+   * @param entityName entity name to check standard CRUD methods for
+   * @return <code>true</code> if the operation ID maps any standard CRUD method name, <code>false</code> otherwise
+   */
+  public boolean isCrudOperation(String operationId, String entityName) {
+
+    if (operationId == null) {
+      return false;
+    }
+    String opIdLowerCase = operationId.toLowerCase();
+    String entityNameLowerCase = entityName.toLowerCase();
+    if (opIdLowerCase.contains(entityNameLowerCase)) {
+      return opIdLowerCase.equals("find" + entityNameLowerCase)
+          || opIdLowerCase.equals("find" + entityNameLowerCase + "Etos")
+          || opIdLowerCase.equals("delete" + entityNameLowerCase) || opIdLowerCase.equals("save" + entityNameLowerCase);
+    } else {
+      return false;
+    }
+  }
+
+  /**
+   * Converts the given media type to the spring Java enum value
+   *
+   * @param mediaType to be converted
+   * @return the spring enum value representing the given media type
+   */
+  public String getSpringMediaType(String mediaType) {
+
+    switch (mediaType) {
+      case "application/xml":
+        return "APPLICATION_XML_VALUE";
+      case "application / x-www-form-urlencoded":
+        return "APPLICATION_FORM_URLENCODED_VALUE";
+      case "multipart/form-data":
+        return "MULTIPART_FORM_DATA_VALUE";
+      case "text/plain":
+        return "TEXT_PLAIN_VALUE";
+      case "text/html":
+        return "TEXT_HTML_VALUE";
+      case "application/pdf":
+        return "APPLICATION_PDF_VALUE";
+      case "image/png":
+        return "IMAGE_PNG_VALUE";
+      default:
+        return "APPLICATION_JSON_VALUE";
+    }
+  }
+}
\ No newline at end of file
diff --git a/cobigen-templates/crud-java-server-app-complex/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/JavaUtil.java b/cobigen-templates/crud-java-server-app-complex/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/JavaUtil.java
new file mode 100644
index 0000000000..ced2f5fde2
--- /dev/null
+++ b/cobigen-templates/crud-java-server-app-complex/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/JavaUtil.java
@@ -0,0 +1,464 @@
+package com.devonfw.cobigen.templates.devon4j.utils;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.Collection;
+import java.util.Map;
+
+import org.apache.commons.lang3.ClassUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Provides type operations, mainly checks and casts for Java Primitives, to be used in the templates
+ *
+ */
+public class JavaUtil {
+
+  /**
+   * Logger for this class
+   */
+  private static final Logger LOG = LoggerFactory.getLogger(JavaUtil.class);
+
+  /**
+   * The constructor.
+   */
+  public JavaUtil() {
+
+    // Empty for CobiGen to automatically instantiate it
+  }
+
+  /**
+   * Returns the Object version of a Java primitive or the input if the input isn't a java primitive
+   * 
+   * @param simpleType String
+   * @return the corresponding object wrapper type simple name of the input if the input is the name of a primitive java
+   *         type. The input itself if not. (e.g. "int" results in "Integer")
+   * @throws ClassNotFoundException should not occur.
+   */
+  public String boxJavaPrimitives(String simpleType) throws ClassNotFoundException {
+
+    if (equalsJavaPrimitive(simpleType)) {
+      return ClassUtils.primitiveToWrapper(ClassUtils.getClass(simpleType)).getSimpleName();
+    } else {
+      return simpleType;
+    }
+
+  }
+
+  /**
+   * Returns the simple name of the type of a field in the pojoClass. If the type is a java primitive the name of the
+   * wrapper class is returned
+   *
+   * @param pojoClass {@link Class} the class object of the pojo
+   * @param fieldName {@link String} the name of the field
+   * @return String. The simple name of the field's type. The simple name of the wrapper class in case of java
+   *         primitives
+   * @throws NoSuchFieldException indicating something awefully wrong in the used model
+   * @throws SecurityException if the field cannot be accessed.
+   */
+  public String boxJavaPrimitives(Class<?> pojoClass, String fieldName) throws NoSuchFieldException, SecurityException {
+
+    if (pojoClass == null) {
+      throw new IllegalAccessError(
+          "Class object is null. Cannot generate template as it might obviously depend on reflection.");
+    }
+
+    if (equalsJavaPrimitive(pojoClass, fieldName)) {
+      return ClassUtils.primitiveToWrapper(pojoClass.getDeclaredField(fieldName).getType()).getSimpleName();
+    } else {
+      Field field = pojoClass.getDeclaredField(fieldName);
+      if (field == null) {
+        field = pojoClass.getField(fieldName);
+      }
+      if (field == null) {
+        throw new IllegalAccessError("Could not find field " + fieldName + " in class " + pojoClass);
+      } else {
+        return field.getType().getSimpleName();
+      }
+    }
+  }
+
+  /**
+   * Checks if the given type is a Java primitive
+   *
+   * @param simpleType the type to be checked
+   * @return true iff simpleType is a Java primitive
+   */
+  public boolean equalsJavaPrimitive(String simpleType) {
+
+    try {
+      return ClassUtils.getClass(simpleType).isPrimitive();
+    } catch (ClassNotFoundException e) {
+      LOG.warn("{}: Could not find {}", e.getMessage(), simpleType);
+      return false;
+    }
+  }
+
+  /**
+   * Checks if the given type is a Java primitive or wrapper
+   *
+   * @param simpleType the type to be checked
+   * @return true iff simpleType is a Java primitive or wrapper
+   */
+  public boolean equalsJavaPrimitiveOrWrapper(String simpleType) {
+
+    try {
+      return ClassUtils.isPrimitiveOrWrapper(ClassUtils.getClass(simpleType));
+    } catch (ClassNotFoundException e) {
+      LOG.warn("{}: Could not find {}", e.getMessage(), simpleType);
+      return false;
+    }
+  }
+
+  /**
+   * Checks if the type of the field in the pojo's class is a java primitive
+   *
+   * @param pojoClass the {@link Class} object of the pojo
+   * @param fieldName the name of the field to be checked
+   * @return true iff the field is a java primitive
+   * @throws NoSuchFieldException indicating something awefully wrong in the used model
+   * @throws SecurityException if the field cannot be accessed.
+   */
+  public boolean equalsJavaPrimitive(Class<?> pojoClass, String fieldName)
+      throws NoSuchFieldException, SecurityException {
+
+    if (pojoClass == null) {
+      return false;
+    }
+
+    Field field = pojoClass.getDeclaredField(fieldName);
+    if (field == null) {
+      field = pojoClass.getField(fieldName);
+    }
+    if (field == null) {
+      return false;
+    } else {
+      return field.getType().isPrimitive();
+    }
+  }
+
+  /**
+   * Checks if the given type is a Java primitive or a Java primitive array
+   *
+   * @param simpleType the Type name to be checked
+   * @return true iff {@link #equalsJavaPrimitive(String)} is true or if simpleType is an array with a primitive
+   *         component
+   */
+  public boolean equalsJavaPrimitiveIncludingArrays(String simpleType) {
+
+    Class<?> klasse;
+
+    try {
+      klasse = ClassUtils.getClass(simpleType).getComponentType();
+    } catch (ClassNotFoundException e) {
+      LOG.warn("{}: Could not find {}", e.getMessage(), simpleType);
+      return false;
+    }
+    return equalsJavaPrimitive(simpleType) || (klasse != null && klasse.isPrimitive());
+  }
+
+  /**
+   * Checks if the given field in the pojo class is a java primitive or an array of java primitives
+   *
+   * @param pojoClass the class object of the pojo
+   * @param fieldName the name of the field to be checked
+   * @return true iff {@link #equalsJavaPrimitive(Class, String)} is true or the field is an array of primitives
+   * @throws NoSuchFieldException indicating something awfully wrong in the used model
+   * @throws SecurityException if the field cannot be accessed.
+   */
+  public boolean equalsJavaPrimitiveIncludingArrays(Class<?> pojoClass, String fieldName)
+      throws NoSuchFieldException, SecurityException {
+
+    return equalsJavaPrimitive(pojoClass, fieldName) || (pojoClass.getDeclaredField(fieldName).getType().isArray()
+        && pojoClass.getDeclaredField(fieldName).getType().getComponentType().isPrimitive());
+  }
+
+  /**
+   * Returns a cast statement for a given (java primitive, variable name) pair or nothing if the type isn't a java
+   * primitive
+   *
+   * @param simpleType Java Type
+   * @param varName Variable name
+   * @return String either of the form '((Java Primitive Object Type)varName)' if simpleType is a primitive or the empty
+   *         String otherwise
+   * @throws ClassNotFoundException should not occur
+   */
+  public String castJavaPrimitives(String simpleType, String varName) throws ClassNotFoundException {
+
+    if (equalsJavaPrimitive(simpleType)) {
+      return String.format("((%1$s)%2$s)", boxJavaPrimitives(simpleType), varName);
+    } else {
+      return "";
+    }
+  }
+
+  /**
+   * Returns a cast statement for a given (java primitive, variable name) pair or nothing if the type isn't a java
+   * primitive
+   *
+   * @param pojoClass the class object of the pojo
+   * @param fieldName the name of the field to be casted
+   * @return if fieldName points to a primitive field then a casted statement (e.g. for an int field:
+   *         '((Integer)field)') or an empty String otherwise
+   * @throws NoSuchFieldException indicating something awefully wrong in the used model
+   * @throws SecurityException if the field cannot be accessed.
+   */
+  public String castJavaPrimitives(Class<?> pojoClass, String fieldName)
+      throws NoSuchFieldException, SecurityException {
+
+    if (equalsJavaPrimitive(pojoClass, fieldName)) {
+      return String.format("((%1$s)%2$s)", boxJavaPrimitives(pojoClass, fieldName), fieldName);
+    } else {
+      return "";
+    }
+  }
+
+  /**
+   * @param pojoClass {@link Class} the class object of the pojo
+   * @param fieldName {@link String} the name of the field
+   * @return true if the field is an instance of java.utils.Collections
+   * @throws NoSuchFieldException indicating something awefully wrong in the used model
+   * @throws SecurityException if the field cannot be accessed.
+   */
+  public boolean isCollection(Class<?> pojoClass, String fieldName) throws NoSuchFieldException, SecurityException {
+
+    if (pojoClass == null) {
+      return false;
+    }
+
+    Field field = pojoClass.getDeclaredField(fieldName);
+    if (field == null) {
+      field = pojoClass.getField(fieldName);
+    }
+    if (field == null) {
+      return false;
+    } else {
+      return Collection.class.isAssignableFrom(field.getType());
+    }
+
+  }
+
+  /**
+   * Returns the Ext Type to a given java type
+   *
+   * @param simpleType any java type's simple name
+   * @return corresponding Ext type
+   */
+  public String getExtType(String simpleType) {
+
+    switch (simpleType) {
+      case "short":
+      case "Short":
+      case "int":
+      case "Integer":
+      case "long":
+      case "Long":
+        return "Integer";
+      case "float":
+      case "Float":
+      case "double":
+      case "Double":
+        return "Number";
+      case "boolean":
+      case "Boolean":
+        return "Boolean";
+      case "char":
+      case "Character":
+      case "String":
+        return "String";
+      case "Date":
+        return "Date";
+      default:
+        return "Field";
+    }
+  }
+
+  /**
+   * returns the Angular5 type associated with a Java primitive
+   *
+   * @param simpleType :{@link String} the type to be parsed
+   * @return the corresponding Angular type or 'any' otherwise
+   */
+  public String getAngularType(String simpleType) {
+
+    switch (simpleType) {
+      case "boolean":
+        return "boolean";
+      case "Boolean":
+        return "boolean";
+      case "short":
+        return "number";
+      case "Short":
+        return "number";
+      case "int":
+        return "number";
+      case "Integer":
+        return "number";
+      case "long":
+        return "number";
+      case "Long":
+        return "number";
+      case "float":
+        return "number";
+      case "Float":
+        return "number";
+      case "double":
+        return "number";
+      case "Double":
+        return "number";
+      case "char":
+        return "string";
+      case "Character":
+        return "string";
+      case "String":
+        return "string";
+      case "byte":
+        return "number";
+      default:
+        return "any";
+    }
+  }
+
+  /**
+   * returns the class name of the return type of a specific method.
+   *
+   * @param pojoClass {@link Class}&lt;?&gt; the class object of the pojo
+   * @param methodName {@link String} the name of the method
+   * @return the class name of the return type of the specified method
+   * @throws SecurityException If no method of the given name can be found
+   * @throws NoSuchMethodException If no method of the given name can be found
+   */
+  public String getReturnType(Class<?> pojoClass, String methodName) throws NoSuchMethodException, SecurityException {
+
+    if (pojoClass == null) {
+      throw new IllegalAccessError(
+          "Class object is null. Cannot generate template as it might obviously depend on reflection.");
+    }
+    String s = "-";
+    Method method = findMethod(pojoClass, methodName);
+    if (method != null && !method.getReturnType().equals(Void.TYPE)) {
+      s = method.getReturnType().toString();
+      s = s.substring(s.lastIndexOf('.') + 1, s.length());
+    }
+    return s;
+  }
+
+  /**
+   *
+   * This methods returns the return type of the method in the given pojoClass which are annotated with the parameter
+   * annotatedClass
+   *
+   * @param pojoClass - The class in which to find if it has methods with annotatedClass
+   * @param annotatedClassName - The annotation which needs to be found
+   * @return Return type of the method annotated with the given annotation, else "null"
+   * @throws ClassNotFoundException if the annotated class name could not be found in the class path
+   */
+  @SuppressWarnings("unchecked")
+  public String getReturnTypeOfMethodAnnotatedWith(Class<?> pojoClass, String annotatedClassName)
+      throws ClassNotFoundException {
+
+    if (pojoClass == null) {
+      throw new IllegalAccessError(
+          "Class object is null. Cannot generate template as it might obviously depend on reflection.");
+    }
+
+    Method[] methods = pojoClass.getDeclaredMethods();
+    for (Method method : methods) {
+      if (!method.getName().startsWith("get")) {
+        continue;
+      }
+      for (Annotation a : method.getAnnotations()) {
+        // better if (method.isAnnotationPresent(classObj)) {, but postponed as of different class
+        // loaders of a.getClass() and pojoClass.getClass()
+        if (a.getClass().getCanonicalName().equals(annotatedClassName)) {
+          return method.getReturnType().getSimpleName();
+        }
+      }
+    }
+    return "null";
+  }
+
+  /**
+   * returns the HTTP request type corresponding to an annotation type
+   *
+   * @param annotations The annotation to get the type name of
+   * @return the HTTP request type name of the selected annotation
+   */
+  public String getRequestType(Map<String, Object> annotations) {
+
+    if (annotations.containsKey("javax_ws_rs_GET")) {
+      return "GET";
+    } else if (annotations.containsKey("javax_ws_rs_PUT")) {
+      return "PUT";
+    } else if (annotations.containsKey("javax_ws_rs_POST")) {
+      return "POST";
+    } else if (annotations.containsKey("javax_ws_rs_DELETE")) {
+      return "DELETE";
+    } else if (annotations.containsKey("javax_ws_rs_PATCH")) {
+      return "PATCH";
+    } else {
+      return "-";
+    }
+  }
+
+  /**
+   * Helper method to find a class's specific method
+   *
+   * @param pojoClass {@link Class}&lt;?&gt; the class object of the pojo
+   * @param methodName The name of the method to be found
+   * @return The method object of the method to be found, null if it wasn't found
+   */
+  private Method findMethod(Class<?> pojoClass, String methodName) {
+
+    if (pojoClass == null) {
+      throw new IllegalAccessError(
+          "Class object is null. Cannot generate template as it might obviously depend on reflection.");
+    }
+    for (Method m : pojoClass.getMethods()) {
+      if (m.getName().equals(methodName)) {
+        return m;
+      }
+    }
+    return null;
+  }
+
+  /**
+   * Checks whether the class given by the full qualified name is an enum
+   *
+   * @param className full qualified class name
+   * @return <code>true</code> if the class is an enum, <code>false</code> otherwise
+   */
+  public boolean isEnum(String className) {
+
+    try {
+      return ClassUtils.getClass(className).isEnum();
+    } catch (ClassNotFoundException e) {
+      LOG.warn("{}: Could not find {}", e.getMessage(), className);
+      return false;
+    }
+  }
+
+  /**
+   * Returns the first enum value of an enum class
+   *
+   * @param className full qualified class name
+   * @return the first enum value name found in order
+   */
+  public String getFirstEnumValue(String className) {
+
+    try {
+      Class<?> enumClass = ClassUtils.getClass(className);
+      Field[] declaredFields = enumClass.getDeclaredFields();
+      if (declaredFields.length > 0) {
+        return declaredFields[0].getName();
+      } else {
+        return null;
+      }
+    } catch (ClassNotFoundException e) {
+      LOG.warn("{}: Could not find {}", e.getMessage(), className);
+      return null;
+    }
+  }
+}
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app_complex/functions.ftl b/cobigen-templates/crud-java-server-app-complex/src/main/resources/functions.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app_complex/functions.ftl
rename to cobigen-templates/crud-java-server-app-complex/src/main/resources/functions.ftl
diff --git a/cobigen-templates/crud-java-server-app-complex/src/main/resources/template-set.xml b/cobigen-templates/crud-java-server-app-complex/src/main/resources/template-set.xml
new file mode 100644
index 0000000000..16f6353b0d
--- /dev/null
+++ b/cobigen-templates/crud-java-server-app-complex/src/main/resources/template-set.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:templateSetConfiguration version="6.0" xmlns:tns="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration" xmlns:cc="http://capgemini.com/devonfw/cobigen/ContextConfiguration" xmlns:tc="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration templateSetConfiguration.xsd ">
+<cc:contextConfiguration version="3.0">
+  <cc:trigger id="crud_java_server_app_complex" type="java">
+    <cc:containerMatcher type="package" value="((.+\.)?([^\.]+))\.([^\.]+)\.dataaccess\.api" retrieveObjectsRecursively="false" />
+    <cc:matcher type="fqn" value="((.+\.)?([^\.]+))\.([^\.]+)\.dataaccess\.api\.([^\.]+)Entity">
+      <cc:variableAssignment type="regex" key="rootPackage" value="1" />
+      <cc:variableAssignment type="regex" key="domain" value="3" />
+      <cc:variableAssignment type="regex" key="component" value="4" />
+      <cc:variableAssignment type="regex" key="entityName" value="5" />
+    </cc:matcher>
+  </cc:trigger>
+  <cc:tags>
+    <cc:tag name="Java"></cc:tag>
+    <cc:tag name="CRUD"></cc:tag>
+    <cc:tag name="Server"></cc:tag>
+    <cc:tag name="App"></cc:tag>
+  </cc:tags>
+
+</cc:contextConfiguration>
+
+<tc:templatesConfiguration version="5.0">
+
+  <tc:templates>
+    <tc:templateExtension ref="crud_complex_${variables.component#cap_first}.java" mergeStrategy="javamerge" />
+    <tc:templateExtension ref="crud_complex_${variables.component#cap_first}Impl.java" mergeStrategy="javamerge" />
+
+    <tc:templateExtension ref="crud_complex_UcFind${variables.entityName}.java" mergeStrategy="javamerge" />
+    <tc:templateExtension ref="crud_complex_UcFind${variables.entityName}Impl.java" mergeStrategy="javamerge" />
+    <tc:templateExtension ref="crud_complex_UcManage${variables.entityName}.java" mergeStrategy="javamerge" />
+    <tc:templateExtension ref="crud_complex_UcManage${variables.entityName}Impl.java" mergeStrategy="javamerge" />
+
+    <!-- CTOs specific increments -->
+    <tc:templateExtension ref="crud_complex_UcFind${variables.entityName}Ctos.java" destinationPath="../api/src/main/java/${variables.rootPackage}/${variables.component}/logic/api/usecase/UcFind${variables.entityName}.java" mergeStrategy="javamerge" />
+    <tc:templateExtension ref="crud_complex_UcFind${variables.entityName}ImplCtos.java" destinationPath="src/main/java/${variables.rootPackage}/${variables.component}/logic/impl/usecase/UcFind${variables.entityName}Impl.java" mergeStrategy="javamerge" />
+    <tc:templateExtension ref="crud_complex_${variables.component#cap_first}ImplCtos.java" destinationPath="src/main/java/${variables.rootPackage}/${variables.component}/logic/impl/${variables.component#cap_first}Impl.java" mergeStrategy="javamerge" />
+    <tc:templateExtension ref="crud_complex_${variables.component#cap_first}Ctos.java" destinationPath="../api/src/main/java/${variables.rootPackage}/${variables.component}/logic/api/${variables.component#cap_first}.java" mergeStrategy="javamerge" />
+
+    <tc:templateExtension ref="crud_complex_AbstractLogic.java" mergeStrategy="javamerge" />
+
+
+  </tc:templates>
+
+  <tc:templateScans>
+    <tc:templateScan templateNamePrefix="crud_complex_" templatePath="templates" destinationPath="src/main" />
+  </tc:templateScans>
+
+  <tc:increments>
+    <tc:increment name="logic_impl_complex" description="CRUD UC logic" explanation="Creates the logic layer for java application.">
+      <tc:templateRef ref="crud_complex_AbstractBeanMapperSupport.java" />
+      <tc:templateRef ref="crud_complex_${variables.component#cap_first}.java" />
+      <tc:templateRef ref="crud_complex_Abstract${variables.entityName}Uc.java" />
+      <tc:templateRef ref="crud_complex_AbstractUc.java" />
+      <tc:templateRef ref="crud_complex_AbstractLogic.java" />
+      <tc:templateRef ref="crud_complex_${variables.component#cap_first}Impl.java" />
+      <tc:templateRef ref="crud_complex_UcFind${variables.entityName}.java" />
+      <tc:templateRef ref="crud_complex_UcManage${variables.entityName}.java" />
+      <tc:templateRef ref="crud_complex_UcFind${variables.entityName}Impl.java" />
+      <tc:templateRef ref="crud_complex_UcManage${variables.entityName}Impl.java" />
+    </tc:increment>
+    <tc:increment name="logic_complex_ctos" description="CRUD UC logic (CTOs)">
+      <tc:templateRef ref="crud_complex_AbstractUc.java" />
+      <tc:templateRef ref="crud_complex_Abstract${variables.entityName}Uc.java" />
+      <tc:templateRef ref="crud_complex_UcFind${variables.entityName}Ctos.java" />
+      <tc:templateRef ref="crud_complex_UcFind${variables.entityName}ImplCtos.java" />
+      <tc:templateRef ref="crud_complex_${variables.component#cap_first}Ctos.java" />
+      <tc:templateRef ref="crud_complex_${variables.component#cap_first}ImplCtos.java" />
+    </tc:increment>
+  </tc:increments>
+</tc:templatesConfiguration>
+</tns:templateSetConfiguration>
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app_complex/templates/java/${variables.rootPackage}/${variables.component}/logic/api/${variables.component#cap_first}.java.ftl b/cobigen-templates/crud-java-server-app-complex/src/main/resources/templates/java/${variables.rootPackage}/${variables.component}/logic/api/${variables.component#cap_first}.java.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app_complex/templates/java/${variables.rootPackage}/${variables.component}/logic/api/${variables.component#cap_first}.java.ftl
rename to cobigen-templates/crud-java-server-app-complex/src/main/resources/templates/java/${variables.rootPackage}/${variables.component}/logic/api/${variables.component#cap_first}.java.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app_complex/templates/java/${variables.rootPackage}/${variables.component}/logic/api/${variables.component#cap_first}Ctos.java.ftl b/cobigen-templates/crud-java-server-app-complex/src/main/resources/templates/java/${variables.rootPackage}/${variables.component}/logic/api/${variables.component#cap_first}Ctos.java.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app_complex/templates/java/${variables.rootPackage}/${variables.component}/logic/api/${variables.component#cap_first}Ctos.java.ftl
rename to cobigen-templates/crud-java-server-app-complex/src/main/resources/templates/java/${variables.rootPackage}/${variables.component}/logic/api/${variables.component#cap_first}Ctos.java.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app/templates/java/${variables.rootPackage}/${variables.component}/common/api/cobigen.properties b/cobigen-templates/crud-java-server-app-complex/src/main/resources/templates/java/${variables.rootPackage}/${variables.component}/logic/api/cobigen.properties
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app/templates/java/${variables.rootPackage}/${variables.component}/common/api/cobigen.properties
rename to cobigen-templates/crud-java-server-app-complex/src/main/resources/templates/java/${variables.rootPackage}/${variables.component}/logic/api/cobigen.properties
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app_complex/templates/java/${variables.rootPackage}/${variables.component}/logic/api/usecase/UcFind${variables.entityName}.java.ftl b/cobigen-templates/crud-java-server-app-complex/src/main/resources/templates/java/${variables.rootPackage}/${variables.component}/logic/api/usecase/UcFind${variables.entityName}.java.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app_complex/templates/java/${variables.rootPackage}/${variables.component}/logic/api/usecase/UcFind${variables.entityName}.java.ftl
rename to cobigen-templates/crud-java-server-app-complex/src/main/resources/templates/java/${variables.rootPackage}/${variables.component}/logic/api/usecase/UcFind${variables.entityName}.java.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app_complex/templates/java/${variables.rootPackage}/${variables.component}/logic/api/usecase/UcFind${variables.entityName}Ctos.java.ftl b/cobigen-templates/crud-java-server-app-complex/src/main/resources/templates/java/${variables.rootPackage}/${variables.component}/logic/api/usecase/UcFind${variables.entityName}Ctos.java.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app_complex/templates/java/${variables.rootPackage}/${variables.component}/logic/api/usecase/UcFind${variables.entityName}Ctos.java.ftl
rename to cobigen-templates/crud-java-server-app-complex/src/main/resources/templates/java/${variables.rootPackage}/${variables.component}/logic/api/usecase/UcFind${variables.entityName}Ctos.java.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app_complex/templates/java/${variables.rootPackage}/${variables.component}/logic/api/usecase/UcManage${variables.entityName}.java.ftl b/cobigen-templates/crud-java-server-app-complex/src/main/resources/templates/java/${variables.rootPackage}/${variables.component}/logic/api/usecase/UcManage${variables.entityName}.java.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app_complex/templates/java/${variables.rootPackage}/${variables.component}/logic/api/usecase/UcManage${variables.entityName}.java.ftl
rename to cobigen-templates/crud-java-server-app-complex/src/main/resources/templates/java/${variables.rootPackage}/${variables.component}/logic/api/usecase/UcManage${variables.entityName}.java.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app_complex/templates/java/${variables.rootPackage}/${variables.component}/logic/base/usecase/Abstract${variables.entityName}Uc.java.ftl b/cobigen-templates/crud-java-server-app-complex/src/main/resources/templates/java/${variables.rootPackage}/${variables.component}/logic/base/usecase/Abstract${variables.entityName}Uc.java.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app_complex/templates/java/${variables.rootPackage}/${variables.component}/logic/base/usecase/Abstract${variables.entityName}Uc.java.ftl
rename to cobigen-templates/crud-java-server-app-complex/src/main/resources/templates/java/${variables.rootPackage}/${variables.component}/logic/base/usecase/Abstract${variables.entityName}Uc.java.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app_complex/templates/java/${variables.rootPackage}/${variables.component}/logic/impl/${variables.component#cap_first}Impl.java.ftl b/cobigen-templates/crud-java-server-app-complex/src/main/resources/templates/java/${variables.rootPackage}/${variables.component}/logic/impl/${variables.component#cap_first}Impl.java.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app_complex/templates/java/${variables.rootPackage}/${variables.component}/logic/impl/${variables.component#cap_first}Impl.java.ftl
rename to cobigen-templates/crud-java-server-app-complex/src/main/resources/templates/java/${variables.rootPackage}/${variables.component}/logic/impl/${variables.component#cap_first}Impl.java.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app_complex/templates/java/${variables.rootPackage}/${variables.component}/logic/impl/${variables.component#cap_first}ImplCtos.java.ftl b/cobigen-templates/crud-java-server-app-complex/src/main/resources/templates/java/${variables.rootPackage}/${variables.component}/logic/impl/${variables.component#cap_first}ImplCtos.java.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app_complex/templates/java/${variables.rootPackage}/${variables.component}/logic/impl/${variables.component#cap_first}ImplCtos.java.ftl
rename to cobigen-templates/crud-java-server-app-complex/src/main/resources/templates/java/${variables.rootPackage}/${variables.component}/logic/impl/${variables.component#cap_first}ImplCtos.java.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app_complex/templates/java/${variables.rootPackage}/${variables.component}/logic/impl/usecase/UcFind${variables.entityName}Impl.java.ftl b/cobigen-templates/crud-java-server-app-complex/src/main/resources/templates/java/${variables.rootPackage}/${variables.component}/logic/impl/usecase/UcFind${variables.entityName}Impl.java.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app_complex/templates/java/${variables.rootPackage}/${variables.component}/logic/impl/usecase/UcFind${variables.entityName}Impl.java.ftl
rename to cobigen-templates/crud-java-server-app-complex/src/main/resources/templates/java/${variables.rootPackage}/${variables.component}/logic/impl/usecase/UcFind${variables.entityName}Impl.java.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app_complex/templates/java/${variables.rootPackage}/${variables.component}/logic/impl/usecase/UcFind${variables.entityName}ImplCtos.java.ftl b/cobigen-templates/crud-java-server-app-complex/src/main/resources/templates/java/${variables.rootPackage}/${variables.component}/logic/impl/usecase/UcFind${variables.entityName}ImplCtos.java.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app_complex/templates/java/${variables.rootPackage}/${variables.component}/logic/impl/usecase/UcFind${variables.entityName}ImplCtos.java.ftl
rename to cobigen-templates/crud-java-server-app-complex/src/main/resources/templates/java/${variables.rootPackage}/${variables.component}/logic/impl/usecase/UcFind${variables.entityName}ImplCtos.java.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app_complex/templates/java/${variables.rootPackage}/${variables.component}/logic/impl/usecase/UcManage${variables.entityName}Impl.java.ftl b/cobigen-templates/crud-java-server-app-complex/src/main/resources/templates/java/${variables.rootPackage}/${variables.component}/logic/impl/usecase/UcManage${variables.entityName}Impl.java.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app_complex/templates/java/${variables.rootPackage}/${variables.component}/logic/impl/usecase/UcManage${variables.entityName}Impl.java.ftl
rename to cobigen-templates/crud-java-server-app-complex/src/main/resources/templates/java/${variables.rootPackage}/${variables.component}/logic/impl/usecase/UcManage${variables.entityName}Impl.java.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app/templates/java/${variables.rootPackage}/general/common/base/AbstractBeanMapperSupport.java.ftl b/cobigen-templates/crud-java-server-app-complex/src/main/resources/templates/java/${variables.rootPackage}/general/common/base/AbstractBeanMapperSupport.java.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app/templates/java/${variables.rootPackage}/general/common/base/AbstractBeanMapperSupport.java.ftl
rename to cobigen-templates/crud-java-server-app-complex/src/main/resources/templates/java/${variables.rootPackage}/general/common/base/AbstractBeanMapperSupport.java.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app_complex/templates/java/${variables.rootPackage}/general/logic/base/AbstractLogic.java.ftl b/cobigen-templates/crud-java-server-app-complex/src/main/resources/templates/java/${variables.rootPackage}/general/logic/base/AbstractLogic.java.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app_complex/templates/java/${variables.rootPackage}/general/logic/base/AbstractLogic.java.ftl
rename to cobigen-templates/crud-java-server-app-complex/src/main/resources/templates/java/${variables.rootPackage}/general/logic/base/AbstractLogic.java.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app_complex/templates/java/${variables.rootPackage}/general/logic/base/AbstractUc.java.ftl b/cobigen-templates/crud-java-server-app-complex/src/main/resources/templates/java/${variables.rootPackage}/general/logic/base/AbstractUc.java.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app_complex/templates/java/${variables.rootPackage}/general/logic/base/AbstractUc.java.ftl
rename to cobigen-templates/crud-java-server-app-complex/src/main/resources/templates/java/${variables.rootPackage}/general/logic/base/AbstractUc.java.ftl
diff --git a/cobigen-templates/crud-java-server-app-complex/src/test/java/com/devonfw/cobigen/templates/devon4j/test/templates/CrudJavaServerAppComplexTest.java b/cobigen-templates/crud-java-server-app-complex/src/test/java/com/devonfw/cobigen/templates/devon4j/test/templates/CrudJavaServerAppComplexTest.java
new file mode 100644
index 0000000000..c2bcaafac8
--- /dev/null
+++ b/cobigen-templates/crud-java-server-app-complex/src/test/java/com/devonfw/cobigen/templates/devon4j/test/templates/CrudJavaServerAppComplexTest.java
@@ -0,0 +1,99 @@
+package com.devonfw.cobigen.templates.devon4j.test.templates;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+import org.apache.commons.io.FileUtils;
+import org.junit.BeforeClass;
+import org.junit.ClassRule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+
+import com.devonfw.cobigen.api.constants.ConfigurationConstants;
+import com.devonfw.cobigen.maven.test.AbstractMavenTest;
+import com.devonfw.cobigen.templates.devon4j.config.constant.MavenMetadata;
+
+/**
+ * Smoke tests of all templates.
+ */
+public class CrudJavaServerAppComplexTest extends AbstractMavenTest {
+
+  /** Root of all test resources of this test suite */
+  public static final String TEST_RESOURCES_ROOT = "src/test/resources/testdata/templatetest/";
+
+  /** Temporary files rule to create temporary folders */
+  @ClassRule
+  public static TemporaryFolder tempFolder = new TemporaryFolder();
+
+  /** The templates development folder */
+  protected static Path templatesProject;
+
+  /** The templates development folder */
+  protected static Path templatesProjectTemporary;
+
+  /**
+   * Creates a copy of the templates project in the temp directory
+   *
+   * @throws URISyntaxException if the path could not be created properly
+   * @throws IOException if accessing a directory or file fails
+   */
+  @BeforeClass
+  public static void setupDevTemplates() throws URISyntaxException, IOException {
+
+    templatesProject = new File(
+        CrudJavaServerAppComplexTest.class.getProtectionDomain().getCodeSource().getLocation().toURI()).getParentFile()
+            .getParentFile().toPath();
+
+    Path utilsPom = new File(
+        CrudJavaServerAppComplexTest.class.getProtectionDomain().getCodeSource().getLocation().toURI()).getParentFile()
+            .getParentFile().toPath().resolve("src/test/resources/utils/pom.xml");
+
+    // create a temporary directory cobigen-templates/template-sets/adapted containing the template sets
+    Path tempFolderPath = tempFolder.getRoot().toPath();
+    Path cobigenTemplatePath = tempFolderPath.resolve("cobigen-templates");
+    if (!Files.exists(cobigenTemplatePath)) {
+      Files.createDirectory(cobigenTemplatePath);
+
+      templatesProjectTemporary = cobigenTemplatePath.resolve(ConfigurationConstants.TEMPLATE_SETS_FOLDER);
+      Path templateSetsAdaptedFolder = templatesProjectTemporary.resolve(ConfigurationConstants.ADAPTED_FOLDER);
+      Files.createDirectory(templatesProjectTemporary);
+      Files.createDirectory(templateSetsAdaptedFolder);
+
+      Path templateSetPath = templateSetsAdaptedFolder.resolve("template-set");
+      FileUtils.copyDirectory(templatesProject.toFile(), templateSetPath.toFile());
+
+      if (Files.isDirectory(templateSetPath)) {
+
+        // Replace the pom.xml in the template sets. Needed so that the project in the temp directory is build
+        // properly
+        if (Files.exists(templateSetPath.resolve("pom.xml"))) {
+          try {
+            Files.delete(templateSetPath.resolve("pom.xml"));
+          } catch (IOException e) {
+            throw new IOException("Error deleting file " + templateSetPath.resolve("pom.xml"), e);
+          }
+          try {
+            Files.copy(utilsPom, templateSetPath.resolve("pom.xml"));
+          } catch (IOException e) {
+            throw new IOException("Error copying file " + utilsPom, e);
+          }
+        }
+      }
+    }
+  }
+
+  /**
+   * Test successful generation of all templates based on an entity
+   *
+   * @throws Exception test fails
+   */
+  @Test
+  public void testAllTemplatesGeneration_EntityInput() throws Exception {
+
+    File testProject = new File(TEST_RESOURCES_ROOT + "TestAllTemplatesEntityInput/");
+    runMavenInvoker(testProject, templatesProjectTemporary.toFile(), MavenMetadata.LOCAL_REPO);
+  }
+}
diff --git a/cobigen-templates/crud-java-server-app-complex/src/test/resources/application.properties b/cobigen-templates/crud-java-server-app-complex/src/test/resources/application.properties
new file mode 100644
index 0000000000..cf2c614efb
--- /dev/null
+++ b/cobigen-templates/crud-java-server-app-complex/src/test/resources/application.properties
@@ -0,0 +1,2 @@
+server.port=8080
+server.context-path=/
\ No newline at end of file
diff --git a/cobigen-templates/crud-java-server-app-complex/src/test/resources/logback.xml b/cobigen-templates/crud-java-server-app-complex/src/test/resources/logback.xml
new file mode 100644
index 0000000000..5f29165f75
--- /dev/null
+++ b/cobigen-templates/crud-java-server-app-complex/src/test/resources/logback.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- This file is for logback classic. The file contains the configuration for slf4j logging -->
+<configuration>
+	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+			<Pattern>%d{HH:mm:ss.SSS} [%thread] [C:%X{correlationId}] - %-5level - %logger{36} - %msg%n
+			</Pattern>
+		</encoder>
+	</appender>
+
+	<root level="INFO">
+		<appender-ref ref="STDOUT" />
+	</root>
+</configuration>
diff --git a/cobigen-templates/crud-java-server-app-complex/src/test/resources/testdata/templatetest/TestAllTemplatesEntityInput/logback.xml b/cobigen-templates/crud-java-server-app-complex/src/test/resources/testdata/templatetest/TestAllTemplatesEntityInput/logback.xml
new file mode 100644
index 0000000000..5f29165f75
--- /dev/null
+++ b/cobigen-templates/crud-java-server-app-complex/src/test/resources/testdata/templatetest/TestAllTemplatesEntityInput/logback.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- This file is for logback classic. The file contains the configuration for slf4j logging -->
+<configuration>
+	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+			<Pattern>%d{HH:mm:ss.SSS} [%thread] [C:%X{correlationId}] - %-5level - %logger{36} - %msg%n
+			</Pattern>
+		</encoder>
+	</appender>
+
+	<root level="INFO">
+		<appender-ref ref="STDOUT" />
+	</root>
+</configuration>
diff --git a/cobigen-templates/templates-devon4j/src/test/resources/testdata/templatetest/TestAllTemplatesEntityInput/pom.xml b/cobigen-templates/crud-java-server-app-complex/src/test/resources/testdata/templatetest/TestAllTemplatesEntityInput/pom.xml
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/test/resources/testdata/templatetest/TestAllTemplatesEntityInput/pom.xml
rename to cobigen-templates/crud-java-server-app-complex/src/test/resources/testdata/templatetest/TestAllTemplatesEntityInput/pom.xml
diff --git a/cobigen-templates/templates-devon4j/src/test/resources/testdata/templatetest/TestAllTemplatesEntityInput/src/main/java/io/github/devonfw/cobigen/generator/dataaccess/api/InputEntity.java b/cobigen-templates/crud-java-server-app-complex/src/test/resources/testdata/templatetest/TestAllTemplatesEntityInput/src/main/java/io/github/devonfw/cobigen/generator/dataaccess/api/InputEntity.java
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/test/resources/testdata/templatetest/TestAllTemplatesEntityInput/src/main/java/io/github/devonfw/cobigen/generator/dataaccess/api/InputEntity.java
rename to cobigen-templates/crud-java-server-app-complex/src/test/resources/testdata/templatetest/TestAllTemplatesEntityInput/src/main/java/io/github/devonfw/cobigen/generator/dataaccess/api/InputEntity.java
diff --git a/cobigen-templates/crud-java-server-app-complex/src/test/resources/utils/pom.xml b/cobigen-templates/crud-java-server-app-complex/src/test/resources/utils/pom.xml
new file mode 100644
index 0000000000..2f59b21378
--- /dev/null
+++ b/cobigen-templates/crud-java-server-app-complex/src/test/resources/utils/pom.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.devonfw.cobigen.templates</groupId>
+  <artifactId>crud-java-server-app-complex</artifactId>
+  <version>2021.12.007-SNAPSHOT</version>
+  <name>Crud Java Server App Complex</name>
+  <description>A Code-based incremental Generator</description>
+  <url>https://github.com/devonfw/cobigen/templates-parent/templates-devon4j-utils</url>
+  <licenses>
+    <license>
+      <name>Apache Software License 2.0</name>
+      <url>https://raw.githubusercontent.com/devonfw/.github/master/LICENSE</url>
+      <distribution>repo</distribution>
+      <comments></comments>
+    </license>
+  </licenses>
+  <dependencies>
+    <dependency>
+      <groupId>javax.ws.rs</groupId>
+      <artifactId>javax.ws.rs-api</artifactId>
+      <version>2.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.data</groupId>
+      <artifactId>spring-data-rest-webmvc</artifactId>
+      <version>3.7.10</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+      <version>3.12.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+      <version>2.10.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>xerces</groupId>
+      <artifactId>xercesImpl</artifactId>
+      <version>2.12.2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.persistence</groupId>
+      <artifactId>javax.persistence-api</artifactId>
+      <version>2.2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>1.7.30</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <version>1.7.30</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>log4j-over-slf4j</artifactId>
+      <version>1.7.30</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+  <repositories>
+    <repository>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+      <id>ossrh</id>
+      <name>OSSRH Snapshots</name>
+      <url>https://s01.oss.sonatype.org/content/repositories/snapshots/</url>
+    </repository>
+  </repositories>
+
+  <properties>
+   <maven.compiler.source>1.8</maven.compiler.source>
+   <maven.compiler.target>1.8</maven.compiler.target>
+  </properties>
+
+  <build>
+   <resources>
+     <resource>
+       <directory>src/main/java</directory>
+     </resource>
+   </resources>
+  </build></project>
\ No newline at end of file
diff --git a/cobigen-templates/crud-java-server-app/pom.xml b/cobigen-templates/crud-java-server-app/pom.xml
new file mode 100644
index 0000000000..ba577e68e5
--- /dev/null
+++ b/cobigen-templates/crud-java-server-app/pom.xml
@@ -0,0 +1,19 @@
+<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>crud-java-server-app</artifactId>
+  <name>CRUD Java Server App template</name>
+
+  <parent>
+    <groupId>com.devonfw.cobigen.templates</groupId>
+    <artifactId>templates-parent</artifactId>
+    <version>${revision}</version>
+  </parent>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+    </dependency>
+  </dependencies>
+</project>
\ No newline at end of file
diff --git a/cobigen-templates/crud-java-server-app/src/main/java-templates/com/devonfw/cobigen/templates/devon4j/config/constant/MavenMetadata.java b/cobigen-templates/crud-java-server-app/src/main/java-templates/com/devonfw/cobigen/templates/devon4j/config/constant/MavenMetadata.java
new file mode 100644
index 0000000000..395d46154d
--- /dev/null
+++ b/cobigen-templates/crud-java-server-app/src/main/java-templates/com/devonfw/cobigen/templates/devon4j/config/constant/MavenMetadata.java
@@ -0,0 +1,12 @@
+package com.devonfw.cobigen.templates.devon4j.config.constant;
+
+/**
+ * Constants extracted from the maven pom by templating-maven-plugin.
+ * 
+ * @see "edit template in src/main/java-templates"
+ */
+public class MavenMetadata {
+
+    /** Local repository path */
+    public static final String LOCAL_REPO = "${settings.localRepository}";
+}
diff --git a/cobigen-templates/crud-java-server-app/src/main/java/com/devonfw/cobigen/templates/devon4j/constants/Field.java b/cobigen-templates/crud-java-server-app/src/main/java/com/devonfw/cobigen/templates/devon4j/constants/Field.java
new file mode 100644
index 0000000000..5376daaea9
--- /dev/null
+++ b/cobigen-templates/crud-java-server-app/src/main/java/com/devonfw/cobigen/templates/devon4j/constants/Field.java
@@ -0,0 +1,48 @@
+package com.devonfw.cobigen.templates.devon4j.constants;
+
+/**
+ * Contains the used keys for the pojo field mapping
+ */
+public enum Field {
+
+  /**
+   * Name of the field
+   */
+  NAME("name"),
+  /**
+   * Type of the field
+   */
+  TYPE("type"),
+  /**
+   * Canonical Type of the field
+   */
+  CANONICAL_TYPE("canonicalType"),
+  /**
+   * The Javadoc of the field
+   */
+  JAVA_DOC("javaDoc"),
+  /**
+   * Annotations
+   */
+  ANNOTATIONS("annotations");
+
+  /**
+   * key value
+   */
+  private String value;
+
+  /**
+   * @param value of the key
+   */
+  Field(String value) {
+
+    this.value = value;
+  }
+
+  @Override
+  public String toString() {
+
+    return this.value;
+  }
+
+}
diff --git a/cobigen-templates/crud-java-server-app/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/DevonfwUtil.java b/cobigen-templates/crud-java-server-app/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/DevonfwUtil.java
new file mode 100644
index 0000000000..4de413b930
--- /dev/null
+++ b/cobigen-templates/crud-java-server-app/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/DevonfwUtil.java
@@ -0,0 +1,449 @@
+package com.devonfw.cobigen.templates.devon4j.utils;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.w3c.dom.Attr;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+import com.devonfw.cobigen.templates.devon4j.constants.Field;
+
+/**
+ * A class for shared devon4j specific functions in the templates
+ *
+ */
+@SuppressWarnings("restriction")
+public class DevonfwUtil {
+
+  /**
+   * Check whether the given 'canonicalType' is a devon4j Entity, which is declared in the given 'component'
+   *
+   * @param canonicalType the type name
+   * @param component the component name
+   * @return true iff the canonicalType is a devon Entity
+   */
+  public boolean isEntityInComponent(String canonicalType, String component) {
+
+    return canonicalType.matches(String.format(".+%1$s\\.dataaccess\\.api\\.[A-Za-z0-9]+Entity(<.*)?", component));
+  }
+
+  /**
+   * Check whether the given 'canonicalType' is declared in the given 'component'
+   *
+   * @param canonicalType the type name
+   * @param component the component name
+   * @return true iff the canonicalType is inside the given component
+   */
+  public boolean isTypeInComponent(String canonicalType, String component) {
+
+    return canonicalType.matches(String.format("%1$s.[A-Za-z0-9]+(<.*)?", component));
+  }
+
+  /**
+   * Determines the ID getter for a given 'field' dependent on whether the getter should access the ID via an object
+   * reference or a direct ID getter
+   *
+   * @param field the field
+   * @param byObjectReference boolean
+   * @param component the devon4j component name
+   * @return 'get' + {@link #resolveIdVariableNameOrSetterGetterSuffix(Map, boolean, boolean, String)} + '()' with
+   *         capitalize=true
+   */
+  public String resolveIdGetter(Map<String, Object> field, boolean byObjectReference, String component) {
+
+    // If field comes from an UML file
+    if (field.getClass().toGenericString().contains("freemarker.ext.beans.HashAdapter")) {
+      return resolveIdGetter(field, byObjectReference, component);
+    }
+    return "get" + resolveIdVariableNameOrSetterGetterSuffix(field, byObjectReference, true, component) + "()";
+  }
+
+  /**
+   * Determines the ID getter for a given 'field' dependent on whether the getter should access the ID via an object
+   * reference or a direct ID getter
+   *
+   * This method is used when the field parameter comes from an UML file. The name and type of the attributes must be
+   * pre-processed for later inserting them inside the HashMap.
+   *
+   * @param field the field
+   * @param byObjectReference boolean
+   * @param component the devon4j component name
+   * @return 'get' + {@link #resolveIdVariableNameOrSetterGetterSuffix(Map, boolean, boolean, String)} + '()' with
+   *         capitalize=true
+   */
+  public String resolveIdGetter(Node field, boolean byObjectReference, String component) {
+
+    HashMap<String, Object> nodeHash = new HashMap<>();
+
+    // Putting the name of the attribute to the hash
+    nodeHash.put(Field.NAME.toString(), field.getAttributes().getNamedItem("name"));
+
+    // Putting the type of the attribute to the hash
+    NodeList childs = field.getChildNodes();
+    for (int i = 0; i < childs.getLength(); i++) {
+      // Retrieve "type" tag
+      if (childs.item(i).getNodeName().equals("type")) {
+        NamedNodeMap attrs = childs.item(i).getAttributes();
+        for (int j = 0; j < attrs.getLength(); j++) {
+          Attr attribute = (Attr) attrs.item(j);
+          // Try to find the attribute that contains the type
+          if (attribute.getName().equals("xmi:idref")) {
+            nodeHash.put(Field.TYPE.toString(), attribute.getName().replace("EAJava_", ""));
+          }
+        }
+      }
+    }
+    return "get" + resolveIdVariableNameOrSetterGetterSuffix(nodeHash, byObjectReference, true, component) + "()";
+
+  }
+
+  /**
+   * Determines the ID getter for a given 'field' dependent on whether the getter should access the ID via an object
+   * reference or a direct ID getter
+   *
+   * @param pojoClass the class object of the pojo
+   * @param fieldMap the field mapping
+   * @param byObjectReference boolean
+   * @param component the devon4j component name
+   * @return 'get' + {@link #resolveIdVariableNameOrSetterGetterSuffix(Map, boolean, boolean, String)} + '()' with
+   *         capitalize=true
+   * @throws NoSuchFieldException indicating a severe problem in the used model
+   * @throws SecurityException if the field cannot be accessed for any reason
+   */
+  public String resolveIdGetter(Class<?> pojoClass, Map<String, Object> fieldMap, boolean byObjectReference,
+      String component) throws NoSuchFieldException, SecurityException {
+
+    return "get" + resolveIdVariableNameOrSetterGetterSuffix(pojoClass, fieldMap, byObjectReference, true, component)
+        + "()";
+  }
+
+  /**
+   * same as {@link #resolveIdGetter(Map, boolean, String)} but with byObjectReference=false and component=""
+   *
+   * @param field the field
+   * @return 'get' + {@link #resolveIdVariableNameOrSetterGetterSuffix(Map,boolean,boolean,String)} + '()' with
+   *         capitalize=true
+   */
+  public String resolveIdGetter(Map<String, Object> field) {
+
+    return this.resolveIdGetter(field, false, "");
+  }
+
+  /**
+   * same as {@link #resolveIdGetter(Class,Map,boolean,String)} but with byObjectReference=false and component=""
+   *
+   * @param pojoClass the class object of the pojo
+   * @param fieldMap the field mapping
+   * @return 'get' + {@link #resolveIdVariableNameOrSetterGetterSuffix(Map,boolean,boolean,String)} + '()' with
+   *         capitalize=true
+   * @throws NoSuchFieldException indicating a severe problem in the used model
+   * @throws SecurityException if the field cannot be accessed for any reason
+   */
+  public String resolveIdGetter(Class<?> pojoClass, Map<String, Object> fieldMap)
+      throws NoSuchFieldException, SecurityException {
+
+    return resolveIdGetter(pojoClass, fieldMap, false, "");
+  }
+
+  /**
+   * Determines the ID setter for a given 'field' dependent on whether the setter should access the ID via an object
+   * reference or a direct ID setter. In contrast to resolveIdGetter, this function does not generate the function
+   * parenthesis to enable parameter declaration.
+   *
+   * @param field the field
+   * @param byObjectReference boolean
+   * @param component the devon4j component name
+   * @return 'set' + {@link #resolveIdVariableNameOrSetterGetterSuffix(Map, boolean, boolean, String)} with
+   *         capitalize=true
+   */
+  public String resolveIdSetter(Map<String, Object> field, boolean byObjectReference, String component) {
+
+    return "set" + resolveIdVariableNameOrSetterGetterSuffix(field, byObjectReference, true, component);
+  }
+
+  /**
+   * same as {@link #resolveIdSetter(Map, boolean, String)} but with byObjectReference=false and component=""
+   *
+   * @param field the field
+   * @return 'set' + {@link #resolveIdVariableNameOrSetterGetterSuffix(Map, boolean, boolean, String)} with
+   *         capitalize=true
+   */
+  public String resolveIdSetter(Map<String, Object> field) {
+
+    return this.resolveIdSetter(field, false, "");
+  }
+
+  /**
+   * Determines the ID setter for a given 'field' dependent on whether the setter should access the ID via an object
+   * reference or a direct ID setter. In contrast to resolveIdGetter, this function does not generate the function
+   * parenthesis to enable parameter declaration.
+   *
+   * @param pojoClass the class object of the pojo
+   * @param fieldMap the field mapping
+   * @param byObjectReference boolean
+   * @param component the devon4j component name
+   * @return 'set'+ {@link #resolveIdVariableNameOrSetterGetterSuffix(Map,boolean,boolean,String)} with capitalize=true
+   * @throws NoSuchFieldException indicating a severe problem in the used model
+   * @throws SecurityException if the field cannot be accessed for any reason
+   */
+  public String resolveIdSetter(Class<?> pojoClass, Map<String, Object> fieldMap, boolean byObjectReference,
+      String component) throws NoSuchFieldException, SecurityException {
+
+    return "set" + resolveIdVariableNameOrSetterGetterSuffix(pojoClass, fieldMap, byObjectReference, true, component);
+  }
+
+  /**
+   * same as {@link #resolveIdSetter(Class,Map,boolean,String)} but with byObjectReference=false and component=""
+   *
+   * @param pojoClass the class object of the pojo
+   * @param fieldMap the field mapping
+   * @return 'set' + {@link #resolveIdVariableNameOrSetterGetterSuffix(Map,boolean,boolean,String)} with capitalize=true
+   * @throws NoSuchFieldException indicating a severe problem in the used model
+   * @throws SecurityException if the field cannot be accessed for any reason
+   */
+  public String resolveIdSetter(Class<?> pojoClass, Map<String, Object> fieldMap)
+      throws NoSuchFieldException, SecurityException {
+
+    return resolveIdSetter(pojoClass, fieldMap, false, "");
+  }
+
+  /**
+   * Determines the variable name for the id value of the 'field'
+   *
+   * @param field the field
+   * @return {@link #resolveIdVariableNameOrSetterGetterSuffix(Map, boolean, boolean, String)}) with
+   *         byObjectReference=false, capitalize=false and component=""
+   */
+  public String resolveIdVariableName(Map<String, Object> field) {
+
+    // the component is passed down as an empty string since byObjectReference is false and therefore the
+    // component is
+    // never touched
+    return resolveIdVariableNameOrSetterGetterSuffix(field, false, false, "");
+  }
+
+  /**
+   * Determines the variable name for the id value of the specified field in the pojo
+   *
+   * @param pojoClass the class object of the pojo
+   * @param fieldMap the field mapping
+   * @return {@link #resolveIdVariableNameOrSetterGetterSuffix(Class, Map, boolean, boolean, String)}) with
+   *         byObjectReference=false, capitalize=false and component=""
+   * @throws NoSuchFieldException indicating a severe problem in the used model
+   * @throws SecurityException if the field cannot be accessed for any reason
+   */
+  public String resolveIdVariableName(Class<?> pojoClass, Map<String, Object> fieldMap)
+      throws NoSuchFieldException, SecurityException {
+
+    // the component is passed down as an empty string since byObjectReference is false and therefore the
+    // component is
+    // never touched
+    return resolveIdVariableNameOrSetterGetterSuffix(pojoClass, fieldMap, false, false, "");
+  }
+
+  /**
+   * Determines the ID setter/getter suffix for a given 'field' dependent on whether the setter/getter should access the
+   * ID via an object reference or a direct ID setter/getter
+   *
+   * @param field the field
+   * @param byObjectReference boolean
+   * @param capitalize if the field name should be capitalized
+   * @param component the devon4j component. Only needed if $byObjectReference is true
+   * @return idVariable name or getter/setter suffix
+   */
+  public String resolveIdVariableNameOrSetterGetterSuffix(Map<String, Object> field, boolean byObjectReference,
+      boolean capitalize, String component) {
+
+    String fieldName = (String) field.get(Field.NAME.toString());
+    if (capitalize) {
+      fieldName = fieldName.substring(0, 1).toUpperCase() + fieldName.substring(1);
+    }
+    String suffix = "";
+
+    String fieldType = (String) field.get(Field.TYPE.toString());
+    String fieldCType = (String) field.get(Field.CANONICAL_TYPE.toString());
+    if (fieldType.contains("Entity")) {
+      if (fieldCType.startsWith("java.util.List") || fieldCType.startsWith("java.util.Set")) {
+        suffix = "Ids";
+        if (fieldName.endsWith("s")) {
+          // Assume trailing 's' as indicator for a plural
+          fieldName = fieldName.substring(0, fieldName.length() - 1);
+        }
+      } else {
+        suffix = "Id";
+      }
+      if (byObjectReference && isTypeInComponent(fieldCType, component)) {
+        // direct references for Entities in same component, so get id of the object reference
+        suffix = "().getId";
+      }
+    }
+
+    return fieldName + suffix;
+
+  }
+
+  /**
+   * Determines the ID setter/getter suffix for a given 'field' dependent on whether the setter/getter should access the
+   * ID via an object reference or a direct ID setter/getter
+   *
+   * @param pojoClass the {@link Class} object of the pojo
+   * @param fieldMap the field mapping
+   * @param byObjectReference boolean
+   * @param capitalize if the field name should be capitalized
+   * @param component the devon4j component. Only needed if byObjectReference is true
+   * @return idVariable name or getter/setter suffix
+   * @throws NoSuchFieldException indicating a severe problem in the used model
+   * @throws SecurityException if the field cannot be accessed for any reason
+   */
+  public String resolveIdVariableNameOrSetterGetterSuffix(Class<?> pojoClass, Map<String, Object> fieldMap,
+      boolean byObjectReference, boolean capitalize, String component) throws NoSuchFieldException, SecurityException {
+
+    String resultName = (String) fieldMap.get(Field.NAME.toString());
+    if (capitalize) {
+      resultName = resultName.substring(0, 1).toUpperCase() + resultName.substring(1);
+    }
+    String suffix = "";
+    String fieldType = (String) fieldMap.get(Field.TYPE.toString());
+    String fieldName = (String) fieldMap.get(Field.NAME.toString());
+    if (fieldType.contains("Entity")) {
+      if (Collection.class.isAssignableFrom(pojoClass.getDeclaredField(fieldName).getType())) {
+        suffix = "Ids";
+        if (resultName.endsWith("s")) {
+          // Assume trailing 's' as indicator for a plural
+          resultName = resultName.substring(0, resultName.length() - 1);
+        }
+      } else {
+        suffix = "Id";
+      }
+      if (byObjectReference
+          && isEntityInComponent(pojoClass.getDeclaredField(fieldName).getType().getName(), component)) {
+        // direct references for Entities in same component, so get id of the object reference
+        suffix = "().getId";
+      }
+    }
+
+    return resultName + suffix;
+
+  }
+
+  /**
+   * Returns the argument type of the list or set from a field. If the string contains "Entity" it will remove that
+   * part. For example, if we have a List &lt;SampleEntity&gt; it will return "Sample"
+   *
+   * @param field the field
+   * @param pojoClass the object class of the Entity that contains the field
+   * @return fieldType argument of the list
+   * @throws SecurityException if field type could not accessed
+   * @throws NoSuchFieldException if field could not be found
+   */
+  public String getListArgumentType(Map<String, Object> field, Class<?> pojoClass)
+      throws NoSuchFieldException, SecurityException {
+
+    JavaUtil javaUtil = new JavaUtil();
+
+    String fieldType = (String) field.get(Field.TYPE.toString());
+    String fieldName = (String) field.get(Field.NAME.toString());
+
+    if (fieldType.contains("Entity")) {
+      if (javaUtil.isCollection(pojoClass, fieldName)) {
+
+        fieldType = fieldType.replace("Entity", "");
+        // Regex: Extracts the argument type of the list 'List<type>' => type
+        String regex = "(?<=\\<).+?(?=\\>)";
+        Pattern pattern = Pattern.compile(regex);
+        Matcher regexMatcher = pattern.matcher(fieldType);
+
+        if (regexMatcher.find()) {
+          fieldType = regexMatcher.group(0);
+        }
+      }
+    }
+    return fieldType;
+
+  }
+
+  /**
+   * Converts all occurrences of devon4j Entity types in the given 'field' simple type (possibly generic) to Longs
+   *
+   * @param field the field
+   * @return the field type as String. If field type contains 'Entity' the result is Long
+   */
+  public String getSimpleEntityTypeAsLongReference(Map<String, Object> field) {
+
+    String fieldType = (String) field.get(Field.TYPE.toString());
+    if (fieldType.endsWith("Entity")) {
+      fieldType = fieldType.replaceAll("[^<>]+Entity", "Long");
+    }
+    return fieldType;
+  }
+
+  /**
+   * If the string last character is an 's', then it gets removed
+   *
+   * @param targetClassName string to remove plural
+   * @return string without 's'
+   */
+  public String removePlural(String targetClassName) {
+
+    if (targetClassName.charAt(targetClassName.length() - 1) == 's') {
+      targetClassName = targetClassName.substring(0, targetClassName.length() - 1);
+    }
+    return targetClassName;
+  }
+
+  /**
+   * Checks whether the operation with the given ID corresponds to any standard CRUD method name.
+   *
+   * @param operationId operation ID interpreted as method name
+   * @param entityName entity name to check standard CRUD methods for
+   * @return <code>true</code> if the operation ID maps any standard CRUD method name, <code>false</code> otherwise
+   */
+  public boolean isCrudOperation(String operationId, String entityName) {
+
+    if (operationId == null) {
+      return false;
+    }
+    String opIdLowerCase = operationId.toLowerCase();
+    String entityNameLowerCase = entityName.toLowerCase();
+    if (opIdLowerCase.contains(entityNameLowerCase)) {
+      return opIdLowerCase.equals("find" + entityNameLowerCase)
+          || opIdLowerCase.equals("find" + entityNameLowerCase + "Etos")
+          || opIdLowerCase.equals("delete" + entityNameLowerCase) || opIdLowerCase.equals("save" + entityNameLowerCase);
+    } else {
+      return false;
+    }
+  }
+
+  /**
+   * Converts the given media type to the spring Java enum value
+   *
+   * @param mediaType to be converted
+   * @return the spring enum value representing the given media type
+   */
+  public String getSpringMediaType(String mediaType) {
+
+    switch (mediaType) {
+      case "application/xml":
+        return "APPLICATION_XML_VALUE";
+      case "application / x-www-form-urlencoded":
+        return "APPLICATION_FORM_URLENCODED_VALUE";
+      case "multipart/form-data":
+        return "MULTIPART_FORM_DATA_VALUE";
+      case "text/plain":
+        return "TEXT_PLAIN_VALUE";
+      case "text/html":
+        return "TEXT_HTML_VALUE";
+      case "application/pdf":
+        return "APPLICATION_PDF_VALUE";
+      case "image/png":
+        return "IMAGE_PNG_VALUE";
+      default:
+        return "APPLICATION_JSON_VALUE";
+    }
+  }
+}
\ No newline at end of file
diff --git a/cobigen-templates/crud-java-server-app/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/JavaUtil.java b/cobigen-templates/crud-java-server-app/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/JavaUtil.java
new file mode 100644
index 0000000000..ced2f5fde2
--- /dev/null
+++ b/cobigen-templates/crud-java-server-app/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/JavaUtil.java
@@ -0,0 +1,464 @@
+package com.devonfw.cobigen.templates.devon4j.utils;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.Collection;
+import java.util.Map;
+
+import org.apache.commons.lang3.ClassUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Provides type operations, mainly checks and casts for Java Primitives, to be used in the templates
+ *
+ */
+public class JavaUtil {
+
+  /**
+   * Logger for this class
+   */
+  private static final Logger LOG = LoggerFactory.getLogger(JavaUtil.class);
+
+  /**
+   * The constructor.
+   */
+  public JavaUtil() {
+
+    // Empty for CobiGen to automatically instantiate it
+  }
+
+  /**
+   * Returns the Object version of a Java primitive or the input if the input isn't a java primitive
+   * 
+   * @param simpleType String
+   * @return the corresponding object wrapper type simple name of the input if the input is the name of a primitive java
+   *         type. The input itself if not. (e.g. "int" results in "Integer")
+   * @throws ClassNotFoundException should not occur.
+   */
+  public String boxJavaPrimitives(String simpleType) throws ClassNotFoundException {
+
+    if (equalsJavaPrimitive(simpleType)) {
+      return ClassUtils.primitiveToWrapper(ClassUtils.getClass(simpleType)).getSimpleName();
+    } else {
+      return simpleType;
+    }
+
+  }
+
+  /**
+   * Returns the simple name of the type of a field in the pojoClass. If the type is a java primitive the name of the
+   * wrapper class is returned
+   *
+   * @param pojoClass {@link Class} the class object of the pojo
+   * @param fieldName {@link String} the name of the field
+   * @return String. The simple name of the field's type. The simple name of the wrapper class in case of java
+   *         primitives
+   * @throws NoSuchFieldException indicating something awefully wrong in the used model
+   * @throws SecurityException if the field cannot be accessed.
+   */
+  public String boxJavaPrimitives(Class<?> pojoClass, String fieldName) throws NoSuchFieldException, SecurityException {
+
+    if (pojoClass == null) {
+      throw new IllegalAccessError(
+          "Class object is null. Cannot generate template as it might obviously depend on reflection.");
+    }
+
+    if (equalsJavaPrimitive(pojoClass, fieldName)) {
+      return ClassUtils.primitiveToWrapper(pojoClass.getDeclaredField(fieldName).getType()).getSimpleName();
+    } else {
+      Field field = pojoClass.getDeclaredField(fieldName);
+      if (field == null) {
+        field = pojoClass.getField(fieldName);
+      }
+      if (field == null) {
+        throw new IllegalAccessError("Could not find field " + fieldName + " in class " + pojoClass);
+      } else {
+        return field.getType().getSimpleName();
+      }
+    }
+  }
+
+  /**
+   * Checks if the given type is a Java primitive
+   *
+   * @param simpleType the type to be checked
+   * @return true iff simpleType is a Java primitive
+   */
+  public boolean equalsJavaPrimitive(String simpleType) {
+
+    try {
+      return ClassUtils.getClass(simpleType).isPrimitive();
+    } catch (ClassNotFoundException e) {
+      LOG.warn("{}: Could not find {}", e.getMessage(), simpleType);
+      return false;
+    }
+  }
+
+  /**
+   * Checks if the given type is a Java primitive or wrapper
+   *
+   * @param simpleType the type to be checked
+   * @return true iff simpleType is a Java primitive or wrapper
+   */
+  public boolean equalsJavaPrimitiveOrWrapper(String simpleType) {
+
+    try {
+      return ClassUtils.isPrimitiveOrWrapper(ClassUtils.getClass(simpleType));
+    } catch (ClassNotFoundException e) {
+      LOG.warn("{}: Could not find {}", e.getMessage(), simpleType);
+      return false;
+    }
+  }
+
+  /**
+   * Checks if the type of the field in the pojo's class is a java primitive
+   *
+   * @param pojoClass the {@link Class} object of the pojo
+   * @param fieldName the name of the field to be checked
+   * @return true iff the field is a java primitive
+   * @throws NoSuchFieldException indicating something awefully wrong in the used model
+   * @throws SecurityException if the field cannot be accessed.
+   */
+  public boolean equalsJavaPrimitive(Class<?> pojoClass, String fieldName)
+      throws NoSuchFieldException, SecurityException {
+
+    if (pojoClass == null) {
+      return false;
+    }
+
+    Field field = pojoClass.getDeclaredField(fieldName);
+    if (field == null) {
+      field = pojoClass.getField(fieldName);
+    }
+    if (field == null) {
+      return false;
+    } else {
+      return field.getType().isPrimitive();
+    }
+  }
+
+  /**
+   * Checks if the given type is a Java primitive or a Java primitive array
+   *
+   * @param simpleType the Type name to be checked
+   * @return true iff {@link #equalsJavaPrimitive(String)} is true or if simpleType is an array with a primitive
+   *         component
+   */
+  public boolean equalsJavaPrimitiveIncludingArrays(String simpleType) {
+
+    Class<?> klasse;
+
+    try {
+      klasse = ClassUtils.getClass(simpleType).getComponentType();
+    } catch (ClassNotFoundException e) {
+      LOG.warn("{}: Could not find {}", e.getMessage(), simpleType);
+      return false;
+    }
+    return equalsJavaPrimitive(simpleType) || (klasse != null && klasse.isPrimitive());
+  }
+
+  /**
+   * Checks if the given field in the pojo class is a java primitive or an array of java primitives
+   *
+   * @param pojoClass the class object of the pojo
+   * @param fieldName the name of the field to be checked
+   * @return true iff {@link #equalsJavaPrimitive(Class, String)} is true or the field is an array of primitives
+   * @throws NoSuchFieldException indicating something awfully wrong in the used model
+   * @throws SecurityException if the field cannot be accessed.
+   */
+  public boolean equalsJavaPrimitiveIncludingArrays(Class<?> pojoClass, String fieldName)
+      throws NoSuchFieldException, SecurityException {
+
+    return equalsJavaPrimitive(pojoClass, fieldName) || (pojoClass.getDeclaredField(fieldName).getType().isArray()
+        && pojoClass.getDeclaredField(fieldName).getType().getComponentType().isPrimitive());
+  }
+
+  /**
+   * Returns a cast statement for a given (java primitive, variable name) pair or nothing if the type isn't a java
+   * primitive
+   *
+   * @param simpleType Java Type
+   * @param varName Variable name
+   * @return String either of the form '((Java Primitive Object Type)varName)' if simpleType is a primitive or the empty
+   *         String otherwise
+   * @throws ClassNotFoundException should not occur
+   */
+  public String castJavaPrimitives(String simpleType, String varName) throws ClassNotFoundException {
+
+    if (equalsJavaPrimitive(simpleType)) {
+      return String.format("((%1$s)%2$s)", boxJavaPrimitives(simpleType), varName);
+    } else {
+      return "";
+    }
+  }
+
+  /**
+   * Returns a cast statement for a given (java primitive, variable name) pair or nothing if the type isn't a java
+   * primitive
+   *
+   * @param pojoClass the class object of the pojo
+   * @param fieldName the name of the field to be casted
+   * @return if fieldName points to a primitive field then a casted statement (e.g. for an int field:
+   *         '((Integer)field)') or an empty String otherwise
+   * @throws NoSuchFieldException indicating something awefully wrong in the used model
+   * @throws SecurityException if the field cannot be accessed.
+   */
+  public String castJavaPrimitives(Class<?> pojoClass, String fieldName)
+      throws NoSuchFieldException, SecurityException {
+
+    if (equalsJavaPrimitive(pojoClass, fieldName)) {
+      return String.format("((%1$s)%2$s)", boxJavaPrimitives(pojoClass, fieldName), fieldName);
+    } else {
+      return "";
+    }
+  }
+
+  /**
+   * @param pojoClass {@link Class} the class object of the pojo
+   * @param fieldName {@link String} the name of the field
+   * @return true if the field is an instance of java.utils.Collections
+   * @throws NoSuchFieldException indicating something awefully wrong in the used model
+   * @throws SecurityException if the field cannot be accessed.
+   */
+  public boolean isCollection(Class<?> pojoClass, String fieldName) throws NoSuchFieldException, SecurityException {
+
+    if (pojoClass == null) {
+      return false;
+    }
+
+    Field field = pojoClass.getDeclaredField(fieldName);
+    if (field == null) {
+      field = pojoClass.getField(fieldName);
+    }
+    if (field == null) {
+      return false;
+    } else {
+      return Collection.class.isAssignableFrom(field.getType());
+    }
+
+  }
+
+  /**
+   * Returns the Ext Type to a given java type
+   *
+   * @param simpleType any java type's simple name
+   * @return corresponding Ext type
+   */
+  public String getExtType(String simpleType) {
+
+    switch (simpleType) {
+      case "short":
+      case "Short":
+      case "int":
+      case "Integer":
+      case "long":
+      case "Long":
+        return "Integer";
+      case "float":
+      case "Float":
+      case "double":
+      case "Double":
+        return "Number";
+      case "boolean":
+      case "Boolean":
+        return "Boolean";
+      case "char":
+      case "Character":
+      case "String":
+        return "String";
+      case "Date":
+        return "Date";
+      default:
+        return "Field";
+    }
+  }
+
+  /**
+   * returns the Angular5 type associated with a Java primitive
+   *
+   * @param simpleType :{@link String} the type to be parsed
+   * @return the corresponding Angular type or 'any' otherwise
+   */
+  public String getAngularType(String simpleType) {
+
+    switch (simpleType) {
+      case "boolean":
+        return "boolean";
+      case "Boolean":
+        return "boolean";
+      case "short":
+        return "number";
+      case "Short":
+        return "number";
+      case "int":
+        return "number";
+      case "Integer":
+        return "number";
+      case "long":
+        return "number";
+      case "Long":
+        return "number";
+      case "float":
+        return "number";
+      case "Float":
+        return "number";
+      case "double":
+        return "number";
+      case "Double":
+        return "number";
+      case "char":
+        return "string";
+      case "Character":
+        return "string";
+      case "String":
+        return "string";
+      case "byte":
+        return "number";
+      default:
+        return "any";
+    }
+  }
+
+  /**
+   * returns the class name of the return type of a specific method.
+   *
+   * @param pojoClass {@link Class}&lt;?&gt; the class object of the pojo
+   * @param methodName {@link String} the name of the method
+   * @return the class name of the return type of the specified method
+   * @throws SecurityException If no method of the given name can be found
+   * @throws NoSuchMethodException If no method of the given name can be found
+   */
+  public String getReturnType(Class<?> pojoClass, String methodName) throws NoSuchMethodException, SecurityException {
+
+    if (pojoClass == null) {
+      throw new IllegalAccessError(
+          "Class object is null. Cannot generate template as it might obviously depend on reflection.");
+    }
+    String s = "-";
+    Method method = findMethod(pojoClass, methodName);
+    if (method != null && !method.getReturnType().equals(Void.TYPE)) {
+      s = method.getReturnType().toString();
+      s = s.substring(s.lastIndexOf('.') + 1, s.length());
+    }
+    return s;
+  }
+
+  /**
+   *
+   * This methods returns the return type of the method in the given pojoClass which are annotated with the parameter
+   * annotatedClass
+   *
+   * @param pojoClass - The class in which to find if it has methods with annotatedClass
+   * @param annotatedClassName - The annotation which needs to be found
+   * @return Return type of the method annotated with the given annotation, else "null"
+   * @throws ClassNotFoundException if the annotated class name could not be found in the class path
+   */
+  @SuppressWarnings("unchecked")
+  public String getReturnTypeOfMethodAnnotatedWith(Class<?> pojoClass, String annotatedClassName)
+      throws ClassNotFoundException {
+
+    if (pojoClass == null) {
+      throw new IllegalAccessError(
+          "Class object is null. Cannot generate template as it might obviously depend on reflection.");
+    }
+
+    Method[] methods = pojoClass.getDeclaredMethods();
+    for (Method method : methods) {
+      if (!method.getName().startsWith("get")) {
+        continue;
+      }
+      for (Annotation a : method.getAnnotations()) {
+        // better if (method.isAnnotationPresent(classObj)) {, but postponed as of different class
+        // loaders of a.getClass() and pojoClass.getClass()
+        if (a.getClass().getCanonicalName().equals(annotatedClassName)) {
+          return method.getReturnType().getSimpleName();
+        }
+      }
+    }
+    return "null";
+  }
+
+  /**
+   * returns the HTTP request type corresponding to an annotation type
+   *
+   * @param annotations The annotation to get the type name of
+   * @return the HTTP request type name of the selected annotation
+   */
+  public String getRequestType(Map<String, Object> annotations) {
+
+    if (annotations.containsKey("javax_ws_rs_GET")) {
+      return "GET";
+    } else if (annotations.containsKey("javax_ws_rs_PUT")) {
+      return "PUT";
+    } else if (annotations.containsKey("javax_ws_rs_POST")) {
+      return "POST";
+    } else if (annotations.containsKey("javax_ws_rs_DELETE")) {
+      return "DELETE";
+    } else if (annotations.containsKey("javax_ws_rs_PATCH")) {
+      return "PATCH";
+    } else {
+      return "-";
+    }
+  }
+
+  /**
+   * Helper method to find a class's specific method
+   *
+   * @param pojoClass {@link Class}&lt;?&gt; the class object of the pojo
+   * @param methodName The name of the method to be found
+   * @return The method object of the method to be found, null if it wasn't found
+   */
+  private Method findMethod(Class<?> pojoClass, String methodName) {
+
+    if (pojoClass == null) {
+      throw new IllegalAccessError(
+          "Class object is null. Cannot generate template as it might obviously depend on reflection.");
+    }
+    for (Method m : pojoClass.getMethods()) {
+      if (m.getName().equals(methodName)) {
+        return m;
+      }
+    }
+    return null;
+  }
+
+  /**
+   * Checks whether the class given by the full qualified name is an enum
+   *
+   * @param className full qualified class name
+   * @return <code>true</code> if the class is an enum, <code>false</code> otherwise
+   */
+  public boolean isEnum(String className) {
+
+    try {
+      return ClassUtils.getClass(className).isEnum();
+    } catch (ClassNotFoundException e) {
+      LOG.warn("{}: Could not find {}", e.getMessage(), className);
+      return false;
+    }
+  }
+
+  /**
+   * Returns the first enum value of an enum class
+   *
+   * @param className full qualified class name
+   * @return the first enum value name found in order
+   */
+  public String getFirstEnumValue(String className) {
+
+    try {
+      Class<?> enumClass = ClassUtils.getClass(className);
+      Field[] declaredFields = enumClass.getDeclaredFields();
+      if (declaredFields.length > 0) {
+        return declaredFields[0].getName();
+      } else {
+        return null;
+      }
+    } catch (ClassNotFoundException e) {
+      LOG.warn("{}: Could not find {}", e.getMessage(), className);
+      return null;
+    }
+  }
+}
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app/functions.ftl b/cobigen-templates/crud-java-server-app/src/main/resources/functions.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app/functions.ftl
rename to cobigen-templates/crud-java-server-app/src/main/resources/functions.ftl
diff --git a/cobigen-templates/crud-java-server-app/src/main/resources/template-set.xml b/cobigen-templates/crud-java-server-app/src/main/resources/template-set.xml
new file mode 100644
index 0000000000..3f30e3a879
--- /dev/null
+++ b/cobigen-templates/crud-java-server-app/src/main/resources/template-set.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:templateSetConfiguration version="6.0" xmlns:tns="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration" xmlns:cc="http://capgemini.com/devonfw/cobigen/ContextConfiguration" xmlns:tc="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration templateSetConfiguration.xsd ">
+<cc:contextConfiguration version="3.0">
+  <cc:trigger id="crud_java_server_app" type="java">
+    <cc:containerMatcher type="package" value="((.+\.)?([^\.]+))\.([^\.]+)\.dataaccess\.api" retrieveObjectsRecursively="false" />
+    <cc:matcher type="fqn" value="((.+\.)?([^\.]+))\.([^\.]+)\.dataaccess\.api\.([^\.]+)Entity">
+      <cc:variableAssignment type="regex" key="rootPackage" value="1" />
+      <cc:variableAssignment type="regex" key="domain" value="3" />
+      <cc:variableAssignment type="regex" key="component" value="4" />
+      <cc:variableAssignment type="regex" key="entityName" value="5" />
+    </cc:matcher>
+  </cc:trigger>
+  <cc:tags>
+    <cc:tag name="Java"></cc:tag>
+    <cc:tag name="CRUD"></cc:tag>
+    <cc:tag name="Server"></cc:tag>
+    <cc:tag name="App"></cc:tag>
+  </cc:tags>
+  <cc:links>
+    <cc:link url="https://docs.spring.io/spring-data/data-commons/docs/1.6.1.RELEASE/reference/html/repositories.html"></cc:link>
+  </cc:links>
+</cc:contextConfiguration>
+
+<tc:templatesConfiguration version="5.0">
+
+  <tc:templates>
+    <tc:templateExtension ref="${variables.entityName}Entity.java" mergeStrategy="javamerge" />
+    <tc:templateExtension ref="${variables.entityName}.java" mergeStrategy="javamerge" />
+    <tc:templateExtension ref="${variables.entityName}Repository.java" mergeStrategy="javamerge" />
+
+    <tc:templateExtension ref="${variables.entityName}Cto.java" mergeStrategy="javamerge" />
+    <tc:templateExtension ref="${variables.entityName}Eto.java" mergeStrategy="javamerge" />
+    <tc:templateExtension ref="${variables.entityName}SearchCriteriaTo.java" mergeStrategy="javamerge" />
+    <tc:templateExtension ref="AbstractSearchCriteriaTo.java" mergeStrategy="javamerge" />
+
+    <tc:templateExtension ref="${variables.component#cap_first}RestServiceImpl.java" mergeStrategy="javamerge" />
+    <tc:templateExtension ref="${variables.component#cap_first}RestService.java" mergeStrategy="javamerge" />
+
+    <tc:templateExtension ref="${variables.component#cap_first}RestServiceImplCtos.java" destinationPath="src/main/java/${variables.rootPackage}/${variables.component}/service/impl/rest/${variables.component#cap_first}RestServiceImpl.java" mergeStrategy="javamerge" />
+    <tc:templateExtension ref="${variables.component#cap_first}RestServiceCtos.java" destinationPath="../api/src/main/java/${variables.rootPackage}/${variables.component}/service/api/rest/${variables.component#cap_first}RestService.java" mergeStrategy="javamerge" />
+
+    <tc:templateExtension ref="${variables.component#cap_first}SoapService.java" mergeStrategy="javamerge" />
+    <tc:templateExtension ref="${variables.component#cap_first}SoapServiceImpl.java" mergeStrategy="javamerge" />
+    <tc:templateExtension ref="ServiceConfig.java" mergeStrategy="javamerge" />
+
+    <tc:templateExtension ref="AbstractComponentFacade.java" mergeStrategy="javamerge_override" />
+  </tc:templates>
+
+  <tc:templateScans>
+    <tc:templateScan templatePath="templates" destinationPath="src/main" />
+  </tc:templateScans>
+
+  <tc:increments>
+    <tc:increment name="springdata-repository" description="CRUD SpringData Repository" explanation="Creates necessary interfaces and methods for the SpringData Repository to interact with the database.">
+      <tc:templateRef ref="${variables.entityName}Repository.java" />
+    </tc:increment>
+    <tc:increment name="tos" description="TO's">
+      <tc:templateRef ref="AbstractSearchCriteriaTo.java" />
+      <tc:templateRef ref="${variables.entityName}Eto.java" />
+      <tc:templateRef ref="${variables.entityName}SearchCriteriaTo.java" />
+    </tc:increment>
+    <tc:increment name="ctos" description="CTO's">
+      <tc:templateRef ref="${variables.entityName}Cto.java" />
+    </tc:increment>
+    <tc:increment name="dataaccess_infrastructure" description="Entity infrastructure">
+      <tc:templateRef ref="ApplicationPersistenceEntity.java" />
+      <tc:templateRef ref="ApplicationEntity.java" />
+      <tc:templateRef ref="${variables.entityName}Entity.java" />
+      <tc:templateRef ref="${variables.entityName}.java" />
+    </tc:increment>
+    <tc:increment name="rest_service_impl" description="CRUD REST services">
+      <tc:templateRef ref="AbstractBeanMapperSupport.java" />
+      <tc:templateRef ref="AbstractComponentFacade.java" />
+      <tc:templateRef ref="${variables.component#cap_first}RestServiceImpl.java" />
+      <tc:templateRef ref="${variables.component#cap_first}RestService.java" />
+    </tc:increment>
+    <tc:increment name="rest_service_impl_ctos" description="CRUD REST services (CTOs)">
+      <tc:templateRef ref="AbstractBeanMapperSupport.java" />
+      <tc:templateRef ref="AbstractComponentFacade.java" />
+      <tc:templateRef ref="${variables.component#cap_first}RestServiceImplCtos.java" />
+      <tc:templateRef ref="${variables.component#cap_first}RestServiceCtos.java" />
+    </tc:increment>
+  </tc:increments>
+</tc:templatesConfiguration>
+</tns:templateSetConfiguration>
\ No newline at end of file
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app/templates/java/${variables.rootPackage}/${variables.component}/common/api/${variables.entityName}.java.ftl b/cobigen-templates/crud-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component}/common/api/${variables.entityName}.java.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app/templates/java/${variables.rootPackage}/${variables.component}/common/api/${variables.entityName}.java.ftl
rename to cobigen-templates/crud-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component}/common/api/${variables.entityName}.java.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app/templates/java/${variables.rootPackage}/${variables.component}/common/api/${variables.entityName}SearchCriteriaTo.java.ftl b/cobigen-templates/crud-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component}/common/api/${variables.entityName}SearchCriteriaTo.java.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app/templates/java/${variables.rootPackage}/${variables.component}/common/api/${variables.entityName}SearchCriteriaTo.java.ftl
rename to cobigen-templates/crud-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component}/common/api/${variables.entityName}SearchCriteriaTo.java.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app/templates/java/${variables.rootPackage}/${variables.component}/logic/api/to/cobigen.properties b/cobigen-templates/crud-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component}/common/api/cobigen.properties
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app/templates/java/${variables.rootPackage}/${variables.component}/logic/api/to/cobigen.properties
rename to cobigen-templates/crud-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component}/common/api/cobigen.properties
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app/templates/java/${variables.rootPackage}/${variables.component}/dataaccess/api/${variables.entityName}Entity.java.ftl b/cobigen-templates/crud-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component}/dataaccess/api/${variables.entityName}Entity.java.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app/templates/java/${variables.rootPackage}/${variables.component}/dataaccess/api/${variables.entityName}Entity.java.ftl
rename to cobigen-templates/crud-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component}/dataaccess/api/${variables.entityName}Entity.java.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app/templates/java/${variables.rootPackage}/${variables.component}/dataaccess/api/repo/${variables.entityName}Repository.java.ftl b/cobigen-templates/crud-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component}/dataaccess/api/repo/${variables.entityName}Repository.java.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app/templates/java/${variables.rootPackage}/${variables.component}/dataaccess/api/repo/${variables.entityName}Repository.java.ftl
rename to cobigen-templates/crud-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component}/dataaccess/api/repo/${variables.entityName}Repository.java.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app/templates/java/${variables.rootPackage}/${variables.component}/logic/api/to/${variables.entityName}Cto.java.ftl b/cobigen-templates/crud-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component}/logic/api/to/${variables.entityName}Cto.java.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app/templates/java/${variables.rootPackage}/${variables.component}/logic/api/to/${variables.entityName}Cto.java.ftl
rename to cobigen-templates/crud-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component}/logic/api/to/${variables.entityName}Cto.java.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app/templates/java/${variables.rootPackage}/${variables.component}/logic/api/to/${variables.entityName}Eto.java.ftl b/cobigen-templates/crud-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component}/logic/api/to/${variables.entityName}Eto.java.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app/templates/java/${variables.rootPackage}/${variables.component}/logic/api/to/${variables.entityName}Eto.java.ftl
rename to cobigen-templates/crud-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component}/logic/api/to/${variables.entityName}Eto.java.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app/templates/java/${variables.rootPackage}/${variables.component}/service/api/cobigen.properties b/cobigen-templates/crud-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component}/logic/api/to/cobigen.properties
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app/templates/java/${variables.rootPackage}/${variables.component}/service/api/cobigen.properties
rename to cobigen-templates/crud-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component}/logic/api/to/cobigen.properties
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app/templates/java/${variables.rootPackage}/general/common/api/to/cobigen.properties b/cobigen-templates/crud-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component}/service/api/cobigen.properties
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app/templates/java/${variables.rootPackage}/general/common/api/to/cobigen.properties
rename to cobigen-templates/crud-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component}/service/api/cobigen.properties
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app/templates/java/${variables.rootPackage}/${variables.component}/service/api/rest/${variables.component#cap_first}RestService.java.ftl b/cobigen-templates/crud-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component}/service/api/rest/${variables.component#cap_first}RestService.java.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app/templates/java/${variables.rootPackage}/${variables.component}/service/api/rest/${variables.component#cap_first}RestService.java.ftl
rename to cobigen-templates/crud-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component}/service/api/rest/${variables.component#cap_first}RestService.java.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app/templates/java/${variables.rootPackage}/${variables.component}/service/api/rest/${variables.component#cap_first}RestServiceCtos.java.ftl b/cobigen-templates/crud-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component}/service/api/rest/${variables.component#cap_first}RestServiceCtos.java.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app/templates/java/${variables.rootPackage}/${variables.component}/service/api/rest/${variables.component#cap_first}RestServiceCtos.java.ftl
rename to cobigen-templates/crud-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component}/service/api/rest/${variables.component#cap_first}RestServiceCtos.java.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app/templates/java/${variables.rootPackage}/${variables.component}/service/api/soap/${variables.component#cap_first}SoapService.java.ftl b/cobigen-templates/crud-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component}/service/api/soap/${variables.component#cap_first}SoapService.java.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app/templates/java/${variables.rootPackage}/${variables.component}/service/api/soap/${variables.component#cap_first}SoapService.java.ftl
rename to cobigen-templates/crud-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component}/service/api/soap/${variables.component#cap_first}SoapService.java.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app/templates/java/${variables.rootPackage}/${variables.component}/service/impl/rest/${variables.component#cap_first}RestServiceImpl.java.ftl b/cobigen-templates/crud-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component}/service/impl/rest/${variables.component#cap_first}RestServiceImpl.java.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app/templates/java/${variables.rootPackage}/${variables.component}/service/impl/rest/${variables.component#cap_first}RestServiceImpl.java.ftl
rename to cobigen-templates/crud-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component}/service/impl/rest/${variables.component#cap_first}RestServiceImpl.java.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app/templates/java/${variables.rootPackage}/${variables.component}/service/impl/rest/${variables.component#cap_first}RestServiceImplCtos.java.ftl b/cobigen-templates/crud-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component}/service/impl/rest/${variables.component#cap_first}RestServiceImplCtos.java.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app/templates/java/${variables.rootPackage}/${variables.component}/service/impl/rest/${variables.component#cap_first}RestServiceImplCtos.java.ftl
rename to cobigen-templates/crud-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component}/service/impl/rest/${variables.component#cap_first}RestServiceImplCtos.java.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app/templates/java/${variables.rootPackage}/${variables.component}/service/impl/soap/${variables.component#cap_first}SoapServiceImpl.java.ftl b/cobigen-templates/crud-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component}/service/impl/soap/${variables.component#cap_first}SoapServiceImpl.java.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app/templates/java/${variables.rootPackage}/${variables.component}/service/impl/soap/${variables.component#cap_first}SoapServiceImpl.java.ftl
rename to cobigen-templates/crud-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component}/service/impl/soap/${variables.component#cap_first}SoapServiceImpl.java.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app/templates/java/${variables.rootPackage}/general/common/api/ApplicationEntity.java.ftl b/cobigen-templates/crud-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/general/common/api/ApplicationEntity.java.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app/templates/java/${variables.rootPackage}/general/common/api/ApplicationEntity.java.ftl
rename to cobigen-templates/crud-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/general/common/api/ApplicationEntity.java.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app/templates/java/${variables.rootPackage}/general/common/api/to/AbstractSearchCriteriaTo.java.ftl b/cobigen-templates/crud-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/general/common/api/to/AbstractSearchCriteriaTo.java.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app/templates/java/${variables.rootPackage}/general/common/api/to/AbstractSearchCriteriaTo.java.ftl
rename to cobigen-templates/crud-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/general/common/api/to/AbstractSearchCriteriaTo.java.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app_complex/templates/java/${variables.rootPackage}/${variables.component}/logic/api/cobigen.properties b/cobigen-templates/crud-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/general/common/api/to/cobigen.properties
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app_complex/templates/java/${variables.rootPackage}/${variables.component}/logic/api/cobigen.properties
rename to cobigen-templates/crud-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/general/common/api/to/cobigen.properties
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app_complex/templates/java/${variables.rootPackage}/general/common/base/AbstractBeanMapperSupport.java.ftl b/cobigen-templates/crud-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/general/common/base/AbstractBeanMapperSupport.java.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app_complex/templates/java/${variables.rootPackage}/general/common/base/AbstractBeanMapperSupport.java.ftl
rename to cobigen-templates/crud-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/general/common/base/AbstractBeanMapperSupport.java.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app/templates/java/${variables.rootPackage}/general/dataaccess/api/ApplicationPersistenceEntity.java.ftl b/cobigen-templates/crud-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/general/dataaccess/api/ApplicationPersistenceEntity.java.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app/templates/java/${variables.rootPackage}/general/dataaccess/api/ApplicationPersistenceEntity.java.ftl
rename to cobigen-templates/crud-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/general/dataaccess/api/ApplicationPersistenceEntity.java.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app/templates/java/${variables.rootPackage}/general/dataaccess/api/dao/ApplicationDao.java.ftl b/cobigen-templates/crud-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/general/dataaccess/api/dao/ApplicationDao.java.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app/templates/java/${variables.rootPackage}/general/dataaccess/api/dao/ApplicationDao.java.ftl
rename to cobigen-templates/crud-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/general/dataaccess/api/dao/ApplicationDao.java.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app/templates/java/${variables.rootPackage}/general/dataaccess/base/dao/ApplicationDaoImpl.java.ftl b/cobigen-templates/crud-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/general/dataaccess/base/dao/ApplicationDaoImpl.java.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app/templates/java/${variables.rootPackage}/general/dataaccess/base/dao/ApplicationDaoImpl.java.ftl
rename to cobigen-templates/crud-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/general/dataaccess/base/dao/ApplicationDaoImpl.java.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app/templates/java/${variables.rootPackage}/general/logic/base/AbstractComponentFacade.java.ftl b/cobigen-templates/crud-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/general/logic/base/AbstractComponentFacade.java.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app/templates/java/${variables.rootPackage}/general/logic/base/AbstractComponentFacade.java.ftl
rename to cobigen-templates/crud-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/general/logic/base/AbstractComponentFacade.java.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app/templates/java/${variables.rootPackage}/general/service/impl/config/ServiceConfig.java.ftl b/cobigen-templates/crud-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/general/service/impl/config/ServiceConfig.java.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app/templates/java/${variables.rootPackage}/general/service/impl/config/ServiceConfig.java.ftl
rename to cobigen-templates/crud-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/general/service/impl/config/ServiceConfig.java.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app/templates/java/${variables.rootPackage}/general/service/impl/config/WebApplicationContextLocator.java.ftl b/cobigen-templates/crud-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/general/service/impl/config/WebApplicationContextLocator.java.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app/templates/java/${variables.rootPackage}/general/service/impl/config/WebApplicationContextLocator.java.ftl
rename to cobigen-templates/crud-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/general/service/impl/config/WebApplicationContextLocator.java.ftl
diff --git a/cobigen-templates/crud-java-server-app/src/test/java/com/devonfw/cobigen/templates/devon4j/test/templates/CrudJavaServerAppGenerationTest.java b/cobigen-templates/crud-java-server-app/src/test/java/com/devonfw/cobigen/templates/devon4j/test/templates/CrudJavaServerAppGenerationTest.java
new file mode 100644
index 0000000000..8945626b9b
--- /dev/null
+++ b/cobigen-templates/crud-java-server-app/src/test/java/com/devonfw/cobigen/templates/devon4j/test/templates/CrudJavaServerAppGenerationTest.java
@@ -0,0 +1,100 @@
+package com.devonfw.cobigen.templates.devon4j.test.templates;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+import org.apache.commons.io.FileUtils;
+import org.junit.BeforeClass;
+import org.junit.ClassRule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+
+import com.devonfw.cobigen.api.constants.ConfigurationConstants;
+import com.devonfw.cobigen.maven.test.AbstractMavenTest;
+import com.devonfw.cobigen.templates.devon4j.config.constant.MavenMetadata;
+
+/**
+ * Smoke tests of all templates.
+ */
+public class CrudJavaServerAppGenerationTest extends AbstractMavenTest {
+
+  /** Root of all test resources of this test suite */
+  public static final String TEST_RESOURCES_ROOT = "src/test/resources/testdata/templatetest/";
+
+  /** Temporary files rule to create temporary folders */
+  @ClassRule
+  public static TemporaryFolder tempFolder = new TemporaryFolder();
+
+  /** The templates development folder */
+  protected static Path templatesProject;
+
+  /** The templates development folder */
+  protected static Path templatesProjectTemporary;
+
+  /**
+   * Creates a copy of the templates project in the temp directory
+   *
+   * @throws URISyntaxException if the path could not be created properly
+   * @throws IOException if accessing a directory or file fails
+   */
+  @BeforeClass
+  public static void setupDevTemplates() throws URISyntaxException, IOException {
+
+    templatesProject = new File(
+        CrudJavaServerAppGenerationTest.class.getProtectionDomain().getCodeSource().getLocation().toURI())
+            .getParentFile().getParentFile().toPath();
+
+    Path utilsPom = new File(
+        CrudJavaServerAppGenerationTest.class.getProtectionDomain().getCodeSource().getLocation().toURI())
+            .getParentFile().getParentFile().toPath().resolve("src/test/resources/utils/pom.xml");
+
+    // create a temporary directory cobigen-templates/template-sets/adapted containing the template sets
+    Path tempFolderPath = tempFolder.getRoot().toPath();
+    Path cobigenTemplatePath = tempFolderPath.resolve("cobigen-templates");
+    if (!Files.exists(cobigenTemplatePath)) {
+      Files.createDirectory(cobigenTemplatePath);
+
+      templatesProjectTemporary = cobigenTemplatePath.resolve(ConfigurationConstants.TEMPLATE_SETS_FOLDER);
+      Path templateSetsAdaptedFolder = templatesProjectTemporary.resolve(ConfigurationConstants.ADAPTED_FOLDER);
+      Files.createDirectory(templatesProjectTemporary);
+      Files.createDirectory(templateSetsAdaptedFolder);
+
+      Path templateSetPath = templateSetsAdaptedFolder.resolve("template-set");
+      FileUtils.copyDirectory(templatesProject.toFile(), templateSetPath.toFile());
+
+      if (Files.isDirectory(templateSetPath)) {
+
+        // Replace the pom.xml in the template sets. Needed so that the project in the temp directory is build
+        // properly
+        if (Files.exists(templateSetPath.resolve("pom.xml"))) {
+          try {
+            Files.delete(templateSetPath.resolve("pom.xml"));
+          } catch (IOException e) {
+            throw new IOException("Error deleting file " + templateSetPath.resolve("pom.xml"), e);
+          }
+          try {
+            Files.copy(utilsPom, templateSetPath.resolve("pom.xml"));
+          } catch (IOException e) {
+            throw new IOException("Error copying file " + utilsPom, e);
+          }
+        }
+      }
+    }
+  }
+
+  /**
+   * Test successful generation of all templates based on an entity
+   *
+   * @throws Exception test fails
+   */
+  @Test
+  public void testAllTemplatesGeneration_EntityInput() throws Exception {
+
+    File testProject = new File(TEST_RESOURCES_ROOT + "TestAllTemplatesEntityInput/");
+    runMavenInvoker(testProject, templatesProjectTemporary.toFile(), MavenMetadata.LOCAL_REPO, false);
+  }
+
+}
diff --git a/cobigen-templates/crud-java-server-app/src/test/resources/testdata/templatetest/TestAllTemplatesEntityInput/logback.xml b/cobigen-templates/crud-java-server-app/src/test/resources/testdata/templatetest/TestAllTemplatesEntityInput/logback.xml
new file mode 100644
index 0000000000..5f29165f75
--- /dev/null
+++ b/cobigen-templates/crud-java-server-app/src/test/resources/testdata/templatetest/TestAllTemplatesEntityInput/logback.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- This file is for logback classic. The file contains the configuration for slf4j logging -->
+<configuration>
+	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+			<Pattern>%d{HH:mm:ss.SSS} [%thread] [C:%X{correlationId}] - %-5level - %logger{36} - %msg%n
+			</Pattern>
+		</encoder>
+	</appender>
+
+	<root level="INFO">
+		<appender-ref ref="STDOUT" />
+	</root>
+</configuration>
diff --git a/cobigen-templates/crud-java-server-app/src/test/resources/testdata/templatetest/TestAllTemplatesEntityInput/pom.xml b/cobigen-templates/crud-java-server-app/src/test/resources/testdata/templatetest/TestAllTemplatesEntityInput/pom.xml
new file mode 100644
index 0000000000..987f810bfd
--- /dev/null
+++ b/cobigen-templates/crud-java-server-app/src/test/resources/testdata/templatetest/TestAllTemplatesEntityInput/pom.xml
@@ -0,0 +1,53 @@
+<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>com.devonfw.cobigen</groupId>
+  <artifactId>devon4jTemplateTest-TestAllTemplatesEntityInput</artifactId>
+  <version>dev-SNAPSHOT</version>
+
+  <properties>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
+  </properties>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>com.devonfw.cobigen</groupId>
+        <artifactId>cobigen-maven-plugin</artifactId>
+        <version>${pluginVersion}</version>
+        <executions>
+          <execution>
+            <id>generate</id>
+            <phase>package</phase>
+            <goals>
+              <goal>generate</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <configurationFolder>${templatesProject}</configurationFolder>
+          <inputFiles>
+            <inputFile>src/main/java/io/github/devonfw/cobigen/generator/dataaccess/api/InputEntity.java</inputFile>
+          </inputFiles>
+          <templates>
+            <template>ALL</template>
+          </templates>
+          <failOnNothingGenerated>true</failOnNothingGenerated>
+        </configuration>
+        <dependencies>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>tempeng-freemarker</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>javaplugin</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+        </dependencies>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/cobigen-templates/crud-java-server-app/src/test/resources/testdata/templatetest/TestAllTemplatesEntityInput/src/main/java/io/github/devonfw/cobigen/generator/dataaccess/api/InputEntity.java b/cobigen-templates/crud-java-server-app/src/test/resources/testdata/templatetest/TestAllTemplatesEntityInput/src/main/java/io/github/devonfw/cobigen/generator/dataaccess/api/InputEntity.java
new file mode 100644
index 0000000000..e2d76c7c9f
--- /dev/null
+++ b/cobigen-templates/crud-java-server-app/src/test/resources/testdata/templatetest/TestAllTemplatesEntityInput/src/main/java/io/github/devonfw/cobigen/generator/dataaccess/api/InputEntity.java
@@ -0,0 +1,25 @@
+package io.github.devonfw.cobigen.generator.dataaccess.api;
+
+public class InputEntity {
+    
+    private String input;
+    
+    private int complexity;
+    
+    public String getInput() {
+        return input;
+    }
+    
+    public void setInput(String input) {
+        this.input = input;
+    }
+    
+    public int getComplexity() {
+        return complexity;
+    }
+    
+    public void setComplexity(int complexity) {
+        this.complexity = complexity;
+    }
+    
+}
diff --git a/cobigen-templates/crud-java-server-app/src/test/resources/utils/pom.xml b/cobigen-templates/crud-java-server-app/src/test/resources/utils/pom.xml
new file mode 100644
index 0000000000..3c3394ce26
--- /dev/null
+++ b/cobigen-templates/crud-java-server-app/src/test/resources/utils/pom.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.devonfw.cobigen.templates</groupId>
+  <artifactId>crud-java-server-app</artifactId>
+  <version>2021.12.007-SNAPSHOT</version>
+  <name>CRUD Java Server App</name>
+  <description>A Code-based incremental Generator</description>
+  <url>https://github.com/devonfw/cobigen/templates-parent/templates-devon4j-utils</url>
+  <licenses>
+    <license>
+      <name>Apache Software License 2.0</name>
+      <url>https://raw.githubusercontent.com/devonfw/.github/master/LICENSE</url>
+      <distribution>repo</distribution>
+      <comments></comments>
+    </license>
+  </licenses>
+  <dependencies>
+    <dependency>
+      <groupId>javax.ws.rs</groupId>
+      <artifactId>javax.ws.rs-api</artifactId>
+      <version>2.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.data</groupId>
+      <artifactId>spring-data-rest-webmvc</artifactId>
+      <version>3.7.10</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+      <version>3.12.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+      <version>2.10.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>xerces</groupId>
+      <artifactId>xercesImpl</artifactId>
+      <version>2.12.2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.persistence</groupId>
+      <artifactId>javax.persistence-api</artifactId>
+      <version>2.2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>1.7.30</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <version>1.7.30</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>log4j-over-slf4j</artifactId>
+      <version>1.7.30</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+  <repositories>
+    <repository>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+      <id>ossrh</id>
+      <name>OSSRH Snapshots</name>
+      <url>https://s01.oss.sonatype.org/content/repositories/snapshots/</url>
+    </repository>
+  </repositories>
+
+  <properties>
+   <maven.compiler.source>1.8</maven.compiler.source>
+   <maven.compiler.target>1.8</maven.compiler.target>
+  </properties>
+
+  <build>
+   <resources>
+     <resource>
+       <directory>src/main/java</directory>
+     </resource>
+   </resources>
+  </build></project>
\ No newline at end of file
diff --git a/cobigen-templates/crud-ngrx-client-app/pom.xml b/cobigen-templates/crud-ngrx-client-app/pom.xml
new file mode 100644
index 0000000000..b5287e0cd5
--- /dev/null
+++ b/cobigen-templates/crud-ngrx-client-app/pom.xml
@@ -0,0 +1,19 @@
+<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>crud-ngrx-client-app</artifactId>
+  <name>CRUD NGRX Client App template</name>
+
+  <parent>
+    <groupId>com.devonfw.cobigen.templates</groupId>
+    <artifactId>templates-parent</artifactId>
+    <version>${revision}</version>
+  </parent>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+    </dependency>
+  </dependencies>
+</project>
\ No newline at end of file
diff --git a/cobigen-templates/crud-ngrx-client-app/src/main/java-templates/com/devonfw/cobigen/templates/devon4j/config/constant/MavenMetadata.java b/cobigen-templates/crud-ngrx-client-app/src/main/java-templates/com/devonfw/cobigen/templates/devon4j/config/constant/MavenMetadata.java
new file mode 100644
index 0000000000..395d46154d
--- /dev/null
+++ b/cobigen-templates/crud-ngrx-client-app/src/main/java-templates/com/devonfw/cobigen/templates/devon4j/config/constant/MavenMetadata.java
@@ -0,0 +1,12 @@
+package com.devonfw.cobigen.templates.devon4j.config.constant;
+
+/**
+ * Constants extracted from the maven pom by templating-maven-plugin.
+ * 
+ * @see "edit template in src/main/java-templates"
+ */
+public class MavenMetadata {
+
+    /** Local repository path */
+    public static final String LOCAL_REPO = "${settings.localRepository}";
+}
diff --git a/cobigen-templates/crud-ngrx-client-app/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/JavaUtil.java b/cobigen-templates/crud-ngrx-client-app/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/JavaUtil.java
new file mode 100644
index 0000000000..2d4025071d
--- /dev/null
+++ b/cobigen-templates/crud-ngrx-client-app/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/JavaUtil.java
@@ -0,0 +1,464 @@
+package com.devonfw.cobigen.templates.devon4j.utils;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.Collection;
+import java.util.Map;
+
+import org.apache.commons.lang3.ClassUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Provides type operations, mainly checks and casts for Java Primitives, to be used in the templates
+ *
+ */
+public class JavaUtil {
+
+  /**
+   * Logger for this class
+   */
+  private static final Logger LOG = LoggerFactory.getLogger(JavaUtil.class);
+
+  /**
+   * The constructor.
+   */
+  public JavaUtil() {
+
+    // Empty for CobiGen to automatically instantiate it
+  }
+
+  /**
+   * Returns the Object version of a Java primitive or the input if the input isn't a java primitive
+   *
+   * @param simpleType String
+   * @return the corresponding object wrapper type simple name of the input if the input is the name of a primitive java
+   *         type. The input itself if not. (e.g. "int" results in "Integer")
+   * @throws ClassNotFoundException should not occur.
+   */
+  public String boxJavaPrimitives(String simpleType) throws ClassNotFoundException {
+
+    if (equalsJavaPrimitive(simpleType)) {
+      return ClassUtils.primitiveToWrapper(ClassUtils.getClass(simpleType)).getSimpleName();
+    } else {
+      return simpleType;
+    }
+
+  }
+
+  /**
+   * Returns the simple name of the type of a field in the pojoClass. If the type is a java primitive the name of the
+   * wrapper class is returned
+   *
+   * @param pojoClass {@link Class} the class object of the pojo
+   * @param fieldName {@link String} the name of the field
+   * @return String. The simple name of the field's type. The simple name of the wrapper class in case of java
+   *         primitives
+   * @throws NoSuchFieldException indicating something awefully wrong in the used model
+   * @throws SecurityException if the field cannot be accessed.
+   */
+  public String boxJavaPrimitives(Class<?> pojoClass, String fieldName) throws NoSuchFieldException, SecurityException {
+
+    if (pojoClass == null) {
+      throw new IllegalAccessError(
+          "Class object is null. Cannot generate template as it might obviously depend on reflection.");
+    }
+
+    if (equalsJavaPrimitive(pojoClass, fieldName)) {
+      return ClassUtils.primitiveToWrapper(pojoClass.getDeclaredField(fieldName).getType()).getSimpleName();
+    } else {
+      Field field = pojoClass.getDeclaredField(fieldName);
+      if (field == null) {
+        field = pojoClass.getField(fieldName);
+      }
+      if (field == null) {
+        throw new IllegalAccessError("Could not find field " + fieldName + " in class " + pojoClass);
+      } else {
+        return field.getType().getSimpleName();
+      }
+    }
+  }
+
+  /**
+   * Checks if the given type is a Java primitive
+   *
+   * @param simpleType the type to be checked
+   * @return true iff simpleType is a Java primitive
+   */
+  public boolean equalsJavaPrimitive(String simpleType) {
+
+    try {
+      return ClassUtils.getClass(simpleType).isPrimitive();
+    } catch (ClassNotFoundException e) {
+      LOG.warn("{}: Could not find {}", e.getMessage(), simpleType);
+      return false;
+    }
+  }
+
+  /**
+   * Checks if the given type is a Java primitive or wrapper
+   *
+   * @param simpleType the type to be checked
+   * @return true iff simpleType is a Java primitive or wrapper
+   */
+  public boolean equalsJavaPrimitiveOrWrapper(String simpleType) {
+
+    try {
+      return ClassUtils.isPrimitiveOrWrapper(ClassUtils.getClass(simpleType));
+    } catch (ClassNotFoundException e) {
+      LOG.warn("{}: Could not find {}", e.getMessage(), simpleType);
+      return false;
+    }
+  }
+
+  /**
+   * Checks if the type of the field in the pojo's class is a java primitive
+   *
+   * @param pojoClass the {@link Class} object of the pojo
+   * @param fieldName the name of the field to be checked
+   * @return true iff the field is a java primitive
+   * @throws NoSuchFieldException indicating something awefully wrong in the used model
+   * @throws SecurityException if the field cannot be accessed.
+   */
+  public boolean equalsJavaPrimitive(Class<?> pojoClass, String fieldName)
+      throws NoSuchFieldException, SecurityException {
+
+    if (pojoClass == null) {
+      return false;
+    }
+
+    Field field = pojoClass.getDeclaredField(fieldName);
+    if (field == null) {
+      field = pojoClass.getField(fieldName);
+    }
+    if (field == null) {
+      return false;
+    } else {
+      return field.getType().isPrimitive();
+    }
+  }
+
+  /**
+   * Checks if the given type is a Java primitive or a Java primitive array
+   *
+   * @param simpleType the Type name to be checked
+   * @return true iff {@link #equalsJavaPrimitive(String)} is true or if simpleType is an array with a primitive
+   *         component
+   */
+  public boolean equalsJavaPrimitiveIncludingArrays(String simpleType) {
+
+    Class<?> klasse;
+
+    try {
+      klasse = ClassUtils.getClass(simpleType).getComponentType();
+    } catch (ClassNotFoundException e) {
+      LOG.warn("{}: Could not find {}", e.getMessage(), simpleType);
+      return false;
+    }
+    return equalsJavaPrimitive(simpleType) || (klasse != null && klasse.isPrimitive());
+  }
+
+  /**
+   * Checks if the given field in the pojo class is a java primitive or an array of java primitives
+   *
+   * @param pojoClass the class object of the pojo
+   * @param fieldName the name of the field to be checked
+   * @return true iff {@link #equalsJavaPrimitive(Class, String)} is true or the field is an array of primitives
+   * @throws NoSuchFieldException indicating something awfully wrong in the used model
+   * @throws SecurityException if the field cannot be accessed.
+   */
+  public boolean equalsJavaPrimitiveIncludingArrays(Class<?> pojoClass, String fieldName)
+      throws NoSuchFieldException, SecurityException {
+
+    return equalsJavaPrimitive(pojoClass, fieldName) || (pojoClass.getDeclaredField(fieldName).getType().isArray()
+        && pojoClass.getDeclaredField(fieldName).getType().getComponentType().isPrimitive());
+  }
+
+  /**
+   * Returns a cast statement for a given (java primitive, variable name) pair or nothing if the type isn't a java
+   * primitive
+   *
+   * @param simpleType Java Type
+   * @param varName Variable name
+   * @return String either of the form '((Java Primitive Object Type)varName)' if simpleType is a primitive or the empty
+   *         String otherwise
+   * @throws ClassNotFoundException should not occur
+   */
+  public String castJavaPrimitives(String simpleType, String varName) throws ClassNotFoundException {
+
+    if (equalsJavaPrimitive(simpleType)) {
+      return String.format("((%1$s)%2$s)", boxJavaPrimitives(simpleType), varName);
+    } else {
+      return "";
+    }
+  }
+
+  /**
+   * Returns a cast statement for a given (java primitive, variable name) pair or nothing if the type isn't a java
+   * primitive
+   *
+   * @param pojoClass the class object of the pojo
+   * @param fieldName the name of the field to be casted
+   * @return if fieldName points to a primitive field then a casted statement (e.g. for an int field:
+   *         '((Integer)field)') or an empty String otherwise
+   * @throws NoSuchFieldException indicating something awefully wrong in the used model
+   * @throws SecurityException if the field cannot be accessed.
+   */
+  public String castJavaPrimitives(Class<?> pojoClass, String fieldName)
+      throws NoSuchFieldException, SecurityException {
+
+    if (equalsJavaPrimitive(pojoClass, fieldName)) {
+      return String.format("((%1$s)%2$s)", boxJavaPrimitives(pojoClass, fieldName), fieldName);
+    } else {
+      return "";
+    }
+  }
+
+  /**
+   * @param pojoClass {@link Class} the class object of the pojo
+   * @param fieldName {@link String} the name of the field
+   * @return true if the field is an instance of java.utils.Collections
+   * @throws NoSuchFieldException indicating something awefully wrong in the used model
+   * @throws SecurityException if the field cannot be accessed.
+   */
+  public boolean isCollection(Class<?> pojoClass, String fieldName) throws NoSuchFieldException, SecurityException {
+
+    if (pojoClass == null) {
+      return false;
+    }
+
+    Field field = pojoClass.getDeclaredField(fieldName);
+    if (field == null) {
+      field = pojoClass.getField(fieldName);
+    }
+    if (field == null) {
+      return false;
+    } else {
+      return Collection.class.isAssignableFrom(field.getType());
+    }
+
+  }
+
+  /**
+   * Returns the Ext Type to a given java type
+   *
+   * @param simpleType any java type's simple name
+   * @return corresponding Ext type
+   */
+  public String getExtType(String simpleType) {
+
+    switch (simpleType) {
+      case "short":
+      case "Short":
+      case "int":
+      case "Integer":
+      case "long":
+      case "Long":
+        return "Integer";
+      case "float":
+      case "Float":
+      case "double":
+      case "Double":
+        return "Number";
+      case "boolean":
+      case "Boolean":
+        return "Boolean";
+      case "char":
+      case "Character":
+      case "String":
+        return "String";
+      case "Date":
+        return "Date";
+      default:
+        return "Field";
+    }
+  }
+
+  /**
+   * returns the Angular5 type associated with a Java primitive
+   *
+   * @param simpleType :{@link String} the type to be parsed
+   * @return the corresponding Angular type or 'any' otherwise
+   */
+  public String getAngularType(String simpleType) {
+
+    switch (simpleType) {
+      case "boolean":
+        return "boolean";
+      case "Boolean":
+        return "boolean";
+      case "short":
+        return "number";
+      case "Short":
+        return "number";
+      case "int":
+        return "number";
+      case "Integer":
+        return "number";
+      case "long":
+        return "number";
+      case "Long":
+        return "number";
+      case "float":
+        return "number";
+      case "Float":
+        return "number";
+      case "double":
+        return "number";
+      case "Double":
+        return "number";
+      case "char":
+        return "string";
+      case "Character":
+        return "string";
+      case "String":
+        return "string";
+      case "byte":
+        return "number";
+      default:
+        return "any";
+    }
+  }
+
+  /**
+   * returns the class name of the return type of a specific method.
+   *
+   * @param pojoClass {@link Class}&lt;?&gt; the class object of the pojo
+   * @param methodName {@link String} the name of the method
+   * @return the class name of the return type of the specified method
+   * @throws SecurityException If no method of the given name can be found
+   * @throws NoSuchMethodException If no method of the given name can be found
+   */
+  public String getReturnType(Class<?> pojoClass, String methodName) throws NoSuchMethodException, SecurityException {
+
+    if (pojoClass == null) {
+      throw new IllegalAccessError(
+          "Class object is null. Cannot generate template as it might obviously depend on reflection.");
+    }
+    String s = "-";
+    Method method = findMethod(pojoClass, methodName);
+    if (method != null && !method.getReturnType().equals(Void.TYPE)) {
+      s = method.getReturnType().toString();
+      s = s.substring(s.lastIndexOf('.') + 1, s.length());
+    }
+    return s;
+  }
+
+  /**
+   *
+   * This methods returns the return type of the method in the given pojoClass which are annotated with the parameter
+   * annotatedClass
+   *
+   * @param pojoClass - The class in which to find if it has methods with annotatedClass
+   * @param annotatedClassName - The annotation which needs to be found
+   * @return Return type of the method annotated with the given annotation, else "null"
+   * @throws ClassNotFoundException if the annotated class name could not be found in the class path
+   */
+  @SuppressWarnings("unchecked")
+  public String getReturnTypeOfMethodAnnotatedWith(Class<?> pojoClass, String annotatedClassName)
+      throws ClassNotFoundException {
+
+    if (pojoClass == null) {
+      throw new IllegalAccessError(
+          "Class object is null. Cannot generate template as it might obviously depend on reflection.");
+    }
+
+    Method[] methods = pojoClass.getDeclaredMethods();
+    for (Method method : methods) {
+      if (!method.getName().startsWith("get")) {
+        continue;
+      }
+      for (Annotation a : method.getAnnotations()) {
+        // better if (method.isAnnotationPresent(classObj)) {, but postponed as of different class
+        // loaders of a.getClass() and pojoClass.getClass()
+        if (a.getClass().getCanonicalName().equals(annotatedClassName)) {
+          return method.getReturnType().getSimpleName();
+        }
+      }
+    }
+    return "null";
+  }
+
+  /**
+   * returns the HTTP request type corresponding to an annotation type
+   *
+   * @param annotations The annotation to get the type name of
+   * @return the HTTP request type name of the selected annotation
+   */
+  public String getRequestType(Map<String, Object> annotations) {
+
+    if (annotations.containsKey("javax_ws_rs_GET")) {
+      return "GET";
+    } else if (annotations.containsKey("javax_ws_rs_PUT")) {
+      return "PUT";
+    } else if (annotations.containsKey("javax_ws_rs_POST")) {
+      return "POST";
+    } else if (annotations.containsKey("javax_ws_rs_DELETE")) {
+      return "DELETE";
+    } else if (annotations.containsKey("javax_ws_rs_PATCH")) {
+      return "PATCH";
+    } else {
+      return "-";
+    }
+  }
+
+  /**
+   * Helper method to find a class's specific method
+   *
+   * @param pojoClass {@link Class}&lt;?&gt; the class object of the pojo
+   * @param methodName The name of the method to be found
+   * @return The method object of the method to be found, null if it wasn't found
+   */
+  private Method findMethod(Class<?> pojoClass, String methodName) {
+
+    if (pojoClass == null) {
+      throw new IllegalAccessError(
+          "Class object is null. Cannot generate template as it might obviously depend on reflection.");
+    }
+    for (Method m : pojoClass.getMethods()) {
+      if (m.getName().equals(methodName)) {
+        return m;
+      }
+    }
+    return null;
+  }
+
+  /**
+   * Checks whether the class given by the full qualified name is an enum
+   *
+   * @param className full qualified class name
+   * @return <code>true</code> if the class is an enum, <code>false</code> otherwise
+   */
+  public boolean isEnum(String className) {
+
+    try {
+      return ClassUtils.getClass(className).isEnum();
+    } catch (ClassNotFoundException e) {
+      LOG.warn("{}: Could not find {}", e.getMessage(), className);
+      return false;
+    }
+  }
+
+  /**
+   * Returns the first enum value of an enum class
+   *
+   * @param className full qualified class name
+   * @return the first enum value name found in order
+   */
+  public String getFirstEnumValue(String className) {
+
+    try {
+      Class<?> enumClass = ClassUtils.getClass(className);
+      Field[] declaredFields = enumClass.getDeclaredFields();
+      if (declaredFields.length > 0) {
+        return declaredFields[0].getName();
+      } else {
+        return null;
+      }
+    } catch (ClassNotFoundException e) {
+      LOG.warn("{}: Could not find {}", e.getMessage(), className);
+      return null;
+    }
+  }
+}
diff --git a/cobigen-templates/crud-ngrx-client-app/src/main/resources/template-set.xml b/cobigen-templates/crud-ngrx-client-app/src/main/resources/template-set.xml
new file mode 100644
index 0000000000..f67beb2b39
--- /dev/null
+++ b/cobigen-templates/crud-ngrx-client-app/src/main/resources/template-set.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:templateSetConfiguration version="6.0" xmlns:tns="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration" xmlns:cc="http://capgemini.com/devonfw/cobigen/ContextConfiguration" xmlns:tc="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration templateSetConfiguration.xsd ">
+
+<cc:contextConfiguration version="3.0">
+  <cc:trigger id="crud_ngrx_client_app" type="java">
+    <cc:matcher type="fqn" value="((.+\.)?([^\.]+))\.([^\.]+)\.logic\.api\.to\.([^\.]+)Eto">
+      <cc:variableAssignment type="regex" key="rootPackage" value="1" />
+      <cc:variableAssignment type="regex" key="domain" value="3" />
+      <cc:variableAssignment type="regex" key="component" value="4" />
+      <cc:variableAssignment type="regex" key="etoName" value="5" />
+    </cc:matcher>
+  </cc:trigger>
+  <cc:tags>
+    <cc:tag name="NGRX"></cc:tag>
+    <cc:tag name="CRUD"></cc:tag>
+    <cc:tag name="Client"></cc:tag>
+    <cc:tag name="App"></cc:tag>
+  </cc:tags>
+  <cc:links>
+    <cc:link url="https://rxjs.dev/api"></cc:link>
+  </cc:links>
+  </cc:contextConfiguration>
+<tc:templatesConfiguration version="5.0">
+
+  <tc:templates>
+    <tc:templateExtension ref="${variables.etoName#lower_case}-dialog.component.ts" mergeStrategy="override" />
+    <tc:templateExtension ref="${variables.etoName#lower_case}-grid.component.ts" mergeStrategy="override" />
+    <tc:templateExtension ref="${variables.etoName#lower_case}-alert.component.ts" mergeStrategy="override" />
+    <tc:templateExtension ref="${variables.etoName#lower_case}.service.ts" mergeStrategy="override" />
+    <tc:templateExtension ref="${variables.etoName#lower_case}.service.spec.ts" mergeStrategy="override" />
+    <tc:templateExtension ref="${variables.etoName#lower_case}.module.ts" mergeStrategy="override" />
+    <tc:templateExtension ref="${variables.etoName#lower_case}-routing.module.ts" mergeStrategy="override" />
+    <tc:templateExtension ref="es.json" mergeStrategy="jsonmerge" />
+    <tc:templateExtension ref="en.json" mergeStrategy="jsonmerge" />
+    <tc:templateExtension ref="environment.ts" mergeStrategy="override" />
+    <tc:templateExtension ref="environment.prod.ts" mergeStrategy="override" />
+    <tc:templateExtension ref="nav-bar.component.html" mergeStrategy="html-ng*" />
+    <tc:templateExtension ref="header.component.ts" mergeStrategy="override" />
+    <tc:templateExtension ref="app-routing.module.ts" mergeStrategy="tsmerge_override" />
+    <tc:templateExtension ref="${variables.etoName#lower_case}.model.ts" mergeStrategy="override" />
+    <tc:templateExtension ref="datadetailstest.model.ts" mergeStrategy="override" />
+    <tc:templateExtension ref="httpresponse.model.ts" mergeStrategy="override" />
+    <tc:templateExtension ref="searchcriteriadata.model.ts" mergeStrategy="override" />
+    <tc:templateExtension ref="${variables.etoName#lower_case}.actions.ts" mergeStrategy="override" />
+    <tc:templateExtension ref="${variables.etoName#lower_case}.effects.spec.ts" mergeStrategy="override" />
+    <tc:templateExtension ref="${variables.etoName#lower_case}.effects.ts" mergeStrategy="override" />
+    <tc:templateExtension ref="${variables.etoName#lower_case}.reducers.spec.ts" mergeStrategy="override" />
+    <tc:templateExtension ref="${variables.etoName#lower_case}.reducers.ts" mergeStrategy="override" />
+    <tc:templateExtension ref="${variables.etoName#lower_case}.selectors.ts" mergeStrategy="override" />
+    <tc:templateExtension ref="store_index.ts" destinationPath="../../devon4ng-ngrx-template/src/app/${variables.etoName#lower_case}/store/index.ts" mergeStrategy="override" />
+    <tc:templateExtension ref="actions_index.ts" destinationPath="../../devon4ng-ngrx-template/src/app/${variables.etoName#lower_case}/store/actions/index.ts" mergeStrategy="override" />
+    <tc:templateExtension ref="effects_index.ts" destinationPath="../../devon4ng-ngrx-template/src/app/${variables.etoName#lower_case}/store/effects/index.ts" mergeStrategy="override" />
+    <tc:templateExtension ref="reducers_index.ts" destinationPath="../../devon4ng-ngrx-template/src/app/${variables.etoName#lower_case}/store/reducers/index.ts" mergeStrategy="override" />
+    <tc:templateExtension ref="selectors_index.ts" destinationPath="../../devon4ng-ngrx-template/src/app/${variables.etoName#lower_case}/store/selectors/index.ts" mergeStrategy="override" />
+  </tc:templates>
+
+  <tc:templateScans>
+    <tc:templateScan name="ts_scan" templatePath="templates" destinationPath="" />
+  </tc:templateScans>
+
+  <tc:increments>
+    <tc:increment name="devon4ng-rx-app" description="Angular CRUD rxjs App" explanation="Creates Angular stack CRUD service for rxjs application.">
+      <tc:incrementRef ref="devon4ng-rx-env" />
+      <tc:incrementRef ref="devon4ng-rx-i18n" />
+      <tc:incrementRef ref="devon4ng-rx-component" />
+    </tc:increment>
+    <tc:increment name="devon4ng-rx-env" description="Angular rxjs URL">
+      <tc:templateRef ref="environment.ts" />
+      <tc:templateRef ref="environment.prod.ts" />
+    </tc:increment>
+    <tc:increment name="devon4ng-rx-i18n" description="Angular rxjs i18n">
+      <tc:templateRef ref="es.json" />
+      <tc:templateRef ref="en.json" />
+    </tc:increment>
+    <tc:increment name="devon4ng-rx-component" description="Angular rxjs component">
+      <tc:templateRef ref="${variables.etoName#lower_case}-dialog.component.html" />
+      <tc:templateRef ref="${variables.etoName#lower_case}-dialog.component.ts" />
+      <tc:templateRef ref="${variables.etoName#lower_case}-grid.component.html" />
+      <tc:templateRef ref="${variables.etoName#lower_case}-grid.component.scss" />
+      <tc:templateRef ref="${variables.etoName#lower_case}-grid.component.ts" />
+      <tc:templateRef ref="${variables.etoName#lower_case}-alert.component.html" />
+      <tc:templateRef ref="${variables.etoName#lower_case}-alert.component.ts" />
+      <tc:templateRef ref="${variables.etoName#lower_case}-alert.component.scss" />
+      <tc:templateRef ref="${variables.etoName#lower_case}-alert.component.spec.ts" />
+      <tc:templateRef ref="${variables.etoName#lower_case}.service.ts" />
+      <tc:templateRef ref="${variables.etoName#lower_case}.service.spec.ts" />
+      <tc:templateRef ref="${variables.etoName#lower_case}.module.ts" />
+      <tc:templateRef ref="${variables.etoName#lower_case}-routing.module.ts" />
+      <tc:templateRef ref="${variables.etoName#lower_case}.model.ts" />
+      <tc:templateRef ref="datadetailstest.model.ts" />
+      <tc:templateRef ref="httpresponse.model.ts" />
+      <tc:templateRef ref="searchcriteriadata.model.ts" />
+      <tc:templateRef ref="store_index.ts" />
+      <tc:templateRef ref="${variables.etoName#lower_case}.actions.ts" />
+      <tc:templateRef ref="actions_index.ts" />
+      <tc:templateRef ref="${variables.etoName#lower_case}.effects.ts" />
+      <tc:templateRef ref="${variables.etoName#lower_case}.effects.spec.ts" />
+      <tc:templateRef ref="effects_index.ts" />
+      <tc:templateRef ref="${variables.etoName#lower_case}.reducers.ts" />
+      <tc:templateRef ref="${variables.etoName#lower_case}.reducers.spec.ts" />
+      <tc:templateRef ref="reducers_index.ts" />
+      <tc:templateRef ref="${variables.etoName#lower_case}.selectors.ts" />
+      <tc:templateRef ref="selectors_index.ts" />
+      <tc:templateRef ref="header.component.ts" />
+      <tc:templateRef ref="nav-bar.component.html" />
+      <tc:templateRef ref="app-routing.module.ts" />
+    </tc:increment>
+  </tc:increments>
+</tc:templatesConfiguration>
+</tns:templateSetConfiguration>
\ No newline at end of file
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_ngrx_client_app/templates/cobigen.properties b/cobigen-templates/crud-ngrx-client-app/src/main/resources/templates/cobigen.properties
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_ngrx_client_app/templates/cobigen.properties
rename to cobigen-templates/crud-ngrx-client-app/src/main/resources/templates/cobigen.properties
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_ngrx_client_app/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-routing.module.ts.ftl b/cobigen-templates/crud-ngrx-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-routing.module.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_ngrx_client_app/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-routing.module.ts.ftl
rename to cobigen-templates/crud-ngrx-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-routing.module.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_ngrx_client_app/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}.module.ts.ftl b/cobigen-templates/crud-ngrx-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}.module.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_ngrx_client_app/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}.module.ts.ftl
rename to cobigen-templates/crud-ngrx-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}.module.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_ngrx_client_app/templates/src/app/${variables.etoName#lower_case}/components/${variables.etoName#lower_case}-alert/${variables.etoName#lower_case}-alert.component.html.ftl b/cobigen-templates/crud-ngrx-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/components/${variables.etoName#lower_case}-alert/${variables.etoName#lower_case}-alert.component.html.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_ngrx_client_app/templates/src/app/${variables.etoName#lower_case}/components/${variables.etoName#lower_case}-alert/${variables.etoName#lower_case}-alert.component.html.ftl
rename to cobigen-templates/crud-ngrx-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/components/${variables.etoName#lower_case}-alert/${variables.etoName#lower_case}-alert.component.html.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_ngrx_client_app/templates/src/app/${variables.etoName#lower_case}/components/${variables.etoName#lower_case}-alert/${variables.etoName#lower_case}-alert.component.scss b/cobigen-templates/crud-ngrx-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/components/${variables.etoName#lower_case}-alert/${variables.etoName#lower_case}-alert.component.scss
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_ngrx_client_app/templates/src/app/${variables.etoName#lower_case}/components/${variables.etoName#lower_case}-alert/${variables.etoName#lower_case}-alert.component.scss
rename to cobigen-templates/crud-ngrx-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/components/${variables.etoName#lower_case}-alert/${variables.etoName#lower_case}-alert.component.scss
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_ngrx_client_app/templates/src/app/${variables.etoName#lower_case}/components/${variables.etoName#lower_case}-alert/${variables.etoName#lower_case}-alert.component.spec.ts.ftl b/cobigen-templates/crud-ngrx-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/components/${variables.etoName#lower_case}-alert/${variables.etoName#lower_case}-alert.component.spec.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_ngrx_client_app/templates/src/app/${variables.etoName#lower_case}/components/${variables.etoName#lower_case}-alert/${variables.etoName#lower_case}-alert.component.spec.ts.ftl
rename to cobigen-templates/crud-ngrx-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/components/${variables.etoName#lower_case}-alert/${variables.etoName#lower_case}-alert.component.spec.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_ngrx_client_app/templates/src/app/${variables.etoName#lower_case}/components/${variables.etoName#lower_case}-alert/${variables.etoName#lower_case}-alert.component.ts.ftl b/cobigen-templates/crud-ngrx-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/components/${variables.etoName#lower_case}-alert/${variables.etoName#lower_case}-alert.component.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_ngrx_client_app/templates/src/app/${variables.etoName#lower_case}/components/${variables.etoName#lower_case}-alert/${variables.etoName#lower_case}-alert.component.ts.ftl
rename to cobigen-templates/crud-ngrx-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/components/${variables.etoName#lower_case}-alert/${variables.etoName#lower_case}-alert.component.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_ngrx_client_app/templates/src/app/${variables.etoName#lower_case}/components/${variables.etoName#lower_case}-dialog/${variables.etoName#lower_case}-dialog.component.html.ftl b/cobigen-templates/crud-ngrx-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/components/${variables.etoName#lower_case}-dialog/${variables.etoName#lower_case}-dialog.component.html.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_ngrx_client_app/templates/src/app/${variables.etoName#lower_case}/components/${variables.etoName#lower_case}-dialog/${variables.etoName#lower_case}-dialog.component.html.ftl
rename to cobigen-templates/crud-ngrx-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/components/${variables.etoName#lower_case}-dialog/${variables.etoName#lower_case}-dialog.component.html.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_ngrx_client_app/templates/src/app/${variables.etoName#lower_case}/components/${variables.etoName#lower_case}-dialog/${variables.etoName#lower_case}-dialog.component.ts.ftl b/cobigen-templates/crud-ngrx-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/components/${variables.etoName#lower_case}-dialog/${variables.etoName#lower_case}-dialog.component.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_ngrx_client_app/templates/src/app/${variables.etoName#lower_case}/components/${variables.etoName#lower_case}-dialog/${variables.etoName#lower_case}-dialog.component.ts.ftl
rename to cobigen-templates/crud-ngrx-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/components/${variables.etoName#lower_case}-dialog/${variables.etoName#lower_case}-dialog.component.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_ngrx_client_app/templates/src/app/${variables.etoName#lower_case}/components/${variables.etoName#lower_case}-grid/${variables.etoName#lower_case}-grid.component.html.ftl b/cobigen-templates/crud-ngrx-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/components/${variables.etoName#lower_case}-grid/${variables.etoName#lower_case}-grid.component.html.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_ngrx_client_app/templates/src/app/${variables.etoName#lower_case}/components/${variables.etoName#lower_case}-grid/${variables.etoName#lower_case}-grid.component.html.ftl
rename to cobigen-templates/crud-ngrx-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/components/${variables.etoName#lower_case}-grid/${variables.etoName#lower_case}-grid.component.html.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_ngrx_client_app/templates/src/app/${variables.etoName#lower_case}/components/${variables.etoName#lower_case}-grid/${variables.etoName#lower_case}-grid.component.scss b/cobigen-templates/crud-ngrx-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/components/${variables.etoName#lower_case}-grid/${variables.etoName#lower_case}-grid.component.scss
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_ngrx_client_app/templates/src/app/${variables.etoName#lower_case}/components/${variables.etoName#lower_case}-grid/${variables.etoName#lower_case}-grid.component.scss
rename to cobigen-templates/crud-ngrx-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/components/${variables.etoName#lower_case}-grid/${variables.etoName#lower_case}-grid.component.scss
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_ngrx_client_app/templates/src/app/${variables.etoName#lower_case}/components/${variables.etoName#lower_case}-grid/${variables.etoName#lower_case}-grid.component.ts.ftl b/cobigen-templates/crud-ngrx-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/components/${variables.etoName#lower_case}-grid/${variables.etoName#lower_case}-grid.component.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_ngrx_client_app/templates/src/app/${variables.etoName#lower_case}/components/${variables.etoName#lower_case}-grid/${variables.etoName#lower_case}-grid.component.ts.ftl
rename to cobigen-templates/crud-ngrx-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/components/${variables.etoName#lower_case}-grid/${variables.etoName#lower_case}-grid.component.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_ngrx_client_app/templates/src/app/${variables.etoName#lower_case}/models/${variables.etoName#lower_case}.model.ts.ftl b/cobigen-templates/crud-ngrx-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/models/${variables.etoName#lower_case}.model.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_ngrx_client_app/templates/src/app/${variables.etoName#lower_case}/models/${variables.etoName#lower_case}.model.ts.ftl
rename to cobigen-templates/crud-ngrx-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/models/${variables.etoName#lower_case}.model.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_ngrx_client_app/templates/src/app/${variables.etoName#lower_case}/models/datadetailstest.model.ts.ftl b/cobigen-templates/crud-ngrx-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/models/datadetailstest.model.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_ngrx_client_app/templates/src/app/${variables.etoName#lower_case}/models/datadetailstest.model.ts.ftl
rename to cobigen-templates/crud-ngrx-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/models/datadetailstest.model.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_ngrx_client_app/templates/src/app/${variables.etoName#lower_case}/models/httpresponse.model.ts.ftl b/cobigen-templates/crud-ngrx-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/models/httpresponse.model.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_ngrx_client_app/templates/src/app/${variables.etoName#lower_case}/models/httpresponse.model.ts.ftl
rename to cobigen-templates/crud-ngrx-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/models/httpresponse.model.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_ngrx_client_app/templates/src/app/${variables.etoName#lower_case}/models/searchcriteriadata.model.ts.ftl b/cobigen-templates/crud-ngrx-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/models/searchcriteriadata.model.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_ngrx_client_app/templates/src/app/${variables.etoName#lower_case}/models/searchcriteriadata.model.ts.ftl
rename to cobigen-templates/crud-ngrx-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/models/searchcriteriadata.model.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_ngrx_client_app/templates/src/app/${variables.etoName#lower_case}/services/${variables.etoName#lower_case}.service.spec.ts.ftl b/cobigen-templates/crud-ngrx-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/services/${variables.etoName#lower_case}.service.spec.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_ngrx_client_app/templates/src/app/${variables.etoName#lower_case}/services/${variables.etoName#lower_case}.service.spec.ts.ftl
rename to cobigen-templates/crud-ngrx-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/services/${variables.etoName#lower_case}.service.spec.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_ngrx_client_app/templates/src/app/${variables.etoName#lower_case}/services/${variables.etoName#lower_case}.service.ts.ftl b/cobigen-templates/crud-ngrx-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/services/${variables.etoName#lower_case}.service.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_ngrx_client_app/templates/src/app/${variables.etoName#lower_case}/services/${variables.etoName#lower_case}.service.ts.ftl
rename to cobigen-templates/crud-ngrx-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/services/${variables.etoName#lower_case}.service.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_ngrx_client_app/templates/src/app/${variables.etoName#lower_case}/store/actions/${variables.etoName#lower_case}.actions.ts.ftl b/cobigen-templates/crud-ngrx-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/store/actions/${variables.etoName#lower_case}.actions.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_ngrx_client_app/templates/src/app/${variables.etoName#lower_case}/store/actions/${variables.etoName#lower_case}.actions.ts.ftl
rename to cobigen-templates/crud-ngrx-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/store/actions/${variables.etoName#lower_case}.actions.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_ngrx_client_app/templates/src/app/${variables.etoName#lower_case}/store/actions/actions_index.ts.ftl b/cobigen-templates/crud-ngrx-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/store/actions/actions_index.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_ngrx_client_app/templates/src/app/${variables.etoName#lower_case}/store/actions/actions_index.ts.ftl
rename to cobigen-templates/crud-ngrx-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/store/actions/actions_index.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_ngrx_client_app/templates/src/app/${variables.etoName#lower_case}/store/effects/${variables.etoName#lower_case}.effects.spec.ts.ftl b/cobigen-templates/crud-ngrx-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/store/effects/${variables.etoName#lower_case}.effects.spec.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_ngrx_client_app/templates/src/app/${variables.etoName#lower_case}/store/effects/${variables.etoName#lower_case}.effects.spec.ts.ftl
rename to cobigen-templates/crud-ngrx-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/store/effects/${variables.etoName#lower_case}.effects.spec.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_ngrx_client_app/templates/src/app/${variables.etoName#lower_case}/store/effects/${variables.etoName#lower_case}.effects.ts.ftl b/cobigen-templates/crud-ngrx-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/store/effects/${variables.etoName#lower_case}.effects.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_ngrx_client_app/templates/src/app/${variables.etoName#lower_case}/store/effects/${variables.etoName#lower_case}.effects.ts.ftl
rename to cobigen-templates/crud-ngrx-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/store/effects/${variables.etoName#lower_case}.effects.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_ngrx_client_app/templates/src/app/${variables.etoName#lower_case}/store/effects/effects_index.ts.ftl b/cobigen-templates/crud-ngrx-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/store/effects/effects_index.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_ngrx_client_app/templates/src/app/${variables.etoName#lower_case}/store/effects/effects_index.ts.ftl
rename to cobigen-templates/crud-ngrx-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/store/effects/effects_index.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_ngrx_client_app/templates/src/app/${variables.etoName#lower_case}/store/reducers/${variables.etoName#lower_case}.reducers.spec.ts.ftl b/cobigen-templates/crud-ngrx-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/store/reducers/${variables.etoName#lower_case}.reducers.spec.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_ngrx_client_app/templates/src/app/${variables.etoName#lower_case}/store/reducers/${variables.etoName#lower_case}.reducers.spec.ts.ftl
rename to cobigen-templates/crud-ngrx-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/store/reducers/${variables.etoName#lower_case}.reducers.spec.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_ngrx_client_app/templates/src/app/${variables.etoName#lower_case}/store/reducers/${variables.etoName#lower_case}.reducers.ts.ftl b/cobigen-templates/crud-ngrx-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/store/reducers/${variables.etoName#lower_case}.reducers.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_ngrx_client_app/templates/src/app/${variables.etoName#lower_case}/store/reducers/${variables.etoName#lower_case}.reducers.ts.ftl
rename to cobigen-templates/crud-ngrx-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/store/reducers/${variables.etoName#lower_case}.reducers.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_ngrx_client_app/templates/src/app/${variables.etoName#lower_case}/store/reducers/reducers_index.ts.ftl b/cobigen-templates/crud-ngrx-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/store/reducers/reducers_index.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_ngrx_client_app/templates/src/app/${variables.etoName#lower_case}/store/reducers/reducers_index.ts.ftl
rename to cobigen-templates/crud-ngrx-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/store/reducers/reducers_index.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_ngrx_client_app/templates/src/app/${variables.etoName#lower_case}/store/selectors/${variables.etoName#lower_case}.selectors.ts.ftl b/cobigen-templates/crud-ngrx-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/store/selectors/${variables.etoName#lower_case}.selectors.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_ngrx_client_app/templates/src/app/${variables.etoName#lower_case}/store/selectors/${variables.etoName#lower_case}.selectors.ts.ftl
rename to cobigen-templates/crud-ngrx-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/store/selectors/${variables.etoName#lower_case}.selectors.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_ngrx_client_app/templates/src/app/${variables.etoName#lower_case}/store/selectors/selectors_index.ts.ftl b/cobigen-templates/crud-ngrx-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/store/selectors/selectors_index.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_ngrx_client_app/templates/src/app/${variables.etoName#lower_case}/store/selectors/selectors_index.ts.ftl
rename to cobigen-templates/crud-ngrx-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/store/selectors/selectors_index.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_ngrx_client_app/templates/src/app/${variables.etoName#lower_case}/store/store_index.ts.ftl b/cobigen-templates/crud-ngrx-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/store/store_index.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_ngrx_client_app/templates/src/app/${variables.etoName#lower_case}/store/store_index.ts.ftl
rename to cobigen-templates/crud-ngrx-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/store/store_index.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_ngrx_client_app/templates/src/app/app-routing.module.ts.ftl b/cobigen-templates/crud-ngrx-client-app/src/main/resources/templates/src/app/app-routing.module.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_ngrx_client_app/templates/src/app/app-routing.module.ts.ftl
rename to cobigen-templates/crud-ngrx-client-app/src/main/resources/templates/src/app/app-routing.module.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_ngrx_client_app/templates/src/app/layout/header/header.component.ts.ftl b/cobigen-templates/crud-ngrx-client-app/src/main/resources/templates/src/app/layout/header/header.component.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_ngrx_client_app/templates/src/app/layout/header/header.component.ts.ftl
rename to cobigen-templates/crud-ngrx-client-app/src/main/resources/templates/src/app/layout/header/header.component.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_ngrx_client_app/templates/src/app/layout/nav-bar/nav-bar.component.html.ftl b/cobigen-templates/crud-ngrx-client-app/src/main/resources/templates/src/app/layout/nav-bar/nav-bar.component.html.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_ngrx_client_app/templates/src/app/layout/nav-bar/nav-bar.component.html.ftl
rename to cobigen-templates/crud-ngrx-client-app/src/main/resources/templates/src/app/layout/nav-bar/nav-bar.component.html.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_ngrx_client_app/templates/src/assets/i18n/en.json.ftl b/cobigen-templates/crud-ngrx-client-app/src/main/resources/templates/src/assets/i18n/en.json.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_ngrx_client_app/templates/src/assets/i18n/en.json.ftl
rename to cobigen-templates/crud-ngrx-client-app/src/main/resources/templates/src/assets/i18n/en.json.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_ngrx_client_app/templates/src/assets/i18n/es.json.ftl b/cobigen-templates/crud-ngrx-client-app/src/main/resources/templates/src/assets/i18n/es.json.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_ngrx_client_app/templates/src/assets/i18n/es.json.ftl
rename to cobigen-templates/crud-ngrx-client-app/src/main/resources/templates/src/assets/i18n/es.json.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_ngrx_client_app/templates/src/environments/environment.prod.ts.ftl b/cobigen-templates/crud-ngrx-client-app/src/main/resources/templates/src/environments/environment.prod.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_ngrx_client_app/templates/src/environments/environment.prod.ts.ftl
rename to cobigen-templates/crud-ngrx-client-app/src/main/resources/templates/src/environments/environment.prod.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_ngrx_client_app/templates/src/environments/environment.ts.ftl b/cobigen-templates/crud-ngrx-client-app/src/main/resources/templates/src/environments/environment.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_ngrx_client_app/templates/src/environments/environment.ts.ftl
rename to cobigen-templates/crud-ngrx-client-app/src/main/resources/templates/src/environments/environment.ts.ftl
diff --git a/cobigen-templates/crud-ngrx-client-app/src/test/java/com/devonfw/cobigen/templates/devon4j/test/templates/CrudNgrxClientAppTest.java b/cobigen-templates/crud-ngrx-client-app/src/test/java/com/devonfw/cobigen/templates/devon4j/test/templates/CrudNgrxClientAppTest.java
new file mode 100644
index 0000000000..f47b0c942d
--- /dev/null
+++ b/cobigen-templates/crud-ngrx-client-app/src/test/java/com/devonfw/cobigen/templates/devon4j/test/templates/CrudNgrxClientAppTest.java
@@ -0,0 +1,98 @@
+package com.devonfw.cobigen.templates.devon4j.test.templates;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+import org.apache.commons.io.FileUtils;
+import org.junit.BeforeClass;
+import org.junit.ClassRule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+
+import com.devonfw.cobigen.api.constants.ConfigurationConstants;
+import com.devonfw.cobigen.maven.test.AbstractMavenTest;
+import com.devonfw.cobigen.templates.devon4j.config.constant.MavenMetadata;
+
+/**
+ * Smoke tests of all templates.
+ */
+public class CrudNgrxClientAppTest extends AbstractMavenTest {
+
+  /** Root of all test resources of this test suite */
+  public static final String TEST_RESOURCES_ROOT = "src/test/resources/testdata/templatetest/";
+
+  /** Temporary files rule to create temporary folders */
+  @ClassRule
+  public static TemporaryFolder tempFolder = new TemporaryFolder();
+
+  /** The templates development folder */
+  protected static Path templatesProject;
+
+  /** The templates development folder */
+  protected static Path templatesProjectTemporary;
+
+  /**
+   * Creates a copy of the templates project in the temp directory
+   *
+   * @throws URISyntaxException if the path could not be created properly
+   * @throws IOException if accessing a directory or file fails
+   */
+  @BeforeClass
+  public static void setupDevTemplates() throws URISyntaxException, IOException {
+
+    templatesProject = new File(CrudNgrxClientAppTest.class.getProtectionDomain().getCodeSource().getLocation().toURI())
+        .getParentFile().getParentFile().toPath();
+
+    Path utilsPom = new File(CrudNgrxClientAppTest.class.getProtectionDomain().getCodeSource().getLocation().toURI())
+        .getParentFile().getParentFile().toPath().resolve("src/test/resources/utils/pom.xml");
+
+    // create a temporary directory cobigen-templates/template-sets/adapted containing the template sets
+    Path tempFolderPath = tempFolder.getRoot().toPath();
+    Path cobigenTemplatePath = tempFolderPath.resolve("cobigen-templates");
+    if (!Files.exists(cobigenTemplatePath)) {
+      Files.createDirectory(cobigenTemplatePath);
+
+      templatesProjectTemporary = cobigenTemplatePath.resolve(ConfigurationConstants.TEMPLATE_SETS_FOLDER);
+      Path templateSetsAdaptedFolder = templatesProjectTemporary.resolve(ConfigurationConstants.ADAPTED_FOLDER);
+      Files.createDirectory(templatesProjectTemporary);
+      Files.createDirectory(templateSetsAdaptedFolder);
+
+      Path templateSetPath = templateSetsAdaptedFolder.resolve("template-set");
+      FileUtils.copyDirectory(templatesProject.toFile(), templateSetPath.toFile());
+
+      if (Files.isDirectory(templateSetPath)) {
+
+        // Replace the pom.xml in the template sets. Needed so that the project in the temp directory is build
+        // properly
+        if (Files.exists(templateSetPath.resolve("pom.xml"))) {
+          try {
+            Files.delete(templateSetPath.resolve("pom.xml"));
+          } catch (IOException e) {
+            throw new IOException("Error deleting file " + templateSetPath.resolve("pom.xml"), e);
+          }
+          try {
+            Files.copy(utilsPom, templateSetPath.resolve("pom.xml"));
+          } catch (IOException e) {
+            throw new IOException("Error copying file " + utilsPom, e);
+          }
+        }
+      }
+    }
+  }
+
+  /**
+   * Test successful generation of all templates based on an ETO
+   *
+   * @throws Exception test fails
+   */
+  @Test
+  public void testAllTemplatesGeneration_EtoInput() throws Exception {
+
+    File testProject = new File(TEST_RESOURCES_ROOT + "TestAllTemplatesEtoInput/");
+    runMavenInvoker(testProject, templatesProjectTemporary.toFile(), MavenMetadata.LOCAL_REPO);
+  }
+
+}
diff --git a/cobigen-templates/crud-ngrx-client-app/src/test/resources/application.properties b/cobigen-templates/crud-ngrx-client-app/src/test/resources/application.properties
new file mode 100644
index 0000000000..cf2c614efb
--- /dev/null
+++ b/cobigen-templates/crud-ngrx-client-app/src/test/resources/application.properties
@@ -0,0 +1,2 @@
+server.port=8080
+server.context-path=/
\ No newline at end of file
diff --git a/cobigen-templates/crud-ngrx-client-app/src/test/resources/logback.xml b/cobigen-templates/crud-ngrx-client-app/src/test/resources/logback.xml
new file mode 100644
index 0000000000..5f29165f75
--- /dev/null
+++ b/cobigen-templates/crud-ngrx-client-app/src/test/resources/logback.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- This file is for logback classic. The file contains the configuration for slf4j logging -->
+<configuration>
+	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+			<Pattern>%d{HH:mm:ss.SSS} [%thread] [C:%X{correlationId}] - %-5level - %logger{36} - %msg%n
+			</Pattern>
+		</encoder>
+	</appender>
+
+	<root level="INFO">
+		<appender-ref ref="STDOUT" />
+	</root>
+</configuration>
diff --git a/cobigen-templates/crud-ngrx-client-app/src/test/resources/testdata/templatetest/TestAllTemplatesEtoInput/logback.xml b/cobigen-templates/crud-ngrx-client-app/src/test/resources/testdata/templatetest/TestAllTemplatesEtoInput/logback.xml
new file mode 100644
index 0000000000..5f29165f75
--- /dev/null
+++ b/cobigen-templates/crud-ngrx-client-app/src/test/resources/testdata/templatetest/TestAllTemplatesEtoInput/logback.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- This file is for logback classic. The file contains the configuration for slf4j logging -->
+<configuration>
+	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+			<Pattern>%d{HH:mm:ss.SSS} [%thread] [C:%X{correlationId}] - %-5level - %logger{36} - %msg%n
+			</Pattern>
+		</encoder>
+	</appender>
+
+	<root level="INFO">
+		<appender-ref ref="STDOUT" />
+	</root>
+</configuration>
diff --git a/cobigen-templates/crud-ngrx-client-app/src/test/resources/testdata/templatetest/TestAllTemplatesEtoInput/pom.xml b/cobigen-templates/crud-ngrx-client-app/src/test/resources/testdata/templatetest/TestAllTemplatesEtoInput/pom.xml
new file mode 100644
index 0000000000..68371aa12b
--- /dev/null
+++ b/cobigen-templates/crud-ngrx-client-app/src/test/resources/testdata/templatetest/TestAllTemplatesEtoInput/pom.xml
@@ -0,0 +1,79 @@
+<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>com.devonfw.cobigen</groupId>
+  <artifactId>devon4jTemplateTest-TestAllTemplatesEtoInput</artifactId>
+  <version>dev-SNAPSHOT</version>
+
+  <properties>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
+  </properties>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>com.devonfw.cobigen</groupId>
+        <artifactId>cobigen-maven-plugin</artifactId>
+        <version>${pluginVersion}</version>
+        <executions>
+          <execution>
+            <id>generate</id>
+            <phase>package</phase>
+            <goals>
+              <goal>generate</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <configurationFolder>${templatesProject}</configurationFolder>
+          <inputFiles>
+            <inputFile>src/main/java/io/github/devonfw/cobigen/generator/logic/api/to/InputEto.java</inputFile>
+          </inputFiles>
+          <templates>
+            <template>ALL</template>
+          </templates>
+          <failOnNothingGenerated>true</failOnNothingGenerated>
+        </configuration>
+        <dependencies>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>tempeng-freemarker</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>javaplugin</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>xmlplugin</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>htmlplugin</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>tsplugin</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>jsonplugin</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>openapiplugin</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+        </dependencies>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>
diff --git a/cobigen-templates/crud-ngrx-client-app/src/test/resources/testdata/templatetest/TestAllTemplatesEtoInput/src/main/java/io/github/devonfw/cobigen/generator/logic/api/to/InputEto.java b/cobigen-templates/crud-ngrx-client-app/src/test/resources/testdata/templatetest/TestAllTemplatesEtoInput/src/main/java/io/github/devonfw/cobigen/generator/logic/api/to/InputEto.java
new file mode 100644
index 0000000000..21ad4eeba9
--- /dev/null
+++ b/cobigen-templates/crud-ngrx-client-app/src/test/resources/testdata/templatetest/TestAllTemplatesEtoInput/src/main/java/io/github/devonfw/cobigen/generator/logic/api/to/InputEto.java
@@ -0,0 +1,25 @@
+package io.github.devonfw.cobigen.generator.logic.api.to;
+
+public class InputEto {
+    
+    private String input;
+    
+    private int complexity;
+    
+    public String getInput() {
+        return input;
+    }
+    
+    public void setInput(String input) {
+        this.input = input;
+    }
+    
+    public int getComplexity() {
+        return complexity;
+    }
+    
+    public void setComplexity(int complexity) {
+        this.complexity = complexity;
+    }
+    
+}
diff --git a/cobigen-templates/crud-ngrx-client-app/src/test/resources/utils/pom.xml b/cobigen-templates/crud-ngrx-client-app/src/test/resources/utils/pom.xml
new file mode 100644
index 0000000000..ee099cf3c6
--- /dev/null
+++ b/cobigen-templates/crud-ngrx-client-app/src/test/resources/utils/pom.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.devonfw.cobigen.templates</groupId>
+  <artifactId>crud-ngrx-client-app</artifactId>
+  <version>2021.12.007-SNAPSHOT</version>
+  <name>Crud Ngrx Client App</name>
+  <description>A Code-based incremental Generator</description>
+  <url>https://github.com/devonfw/cobigen/templates-parent/templates-devon4j-utils</url>
+  <licenses>
+    <license>
+      <name>Apache Software License 2.0</name>
+      <url>https://raw.githubusercontent.com/devonfw/.github/master/LICENSE</url>
+      <distribution>repo</distribution>
+      <comments></comments>
+    </license>
+  </licenses>
+  <dependencies>
+    <dependency>
+      <groupId>javax.ws.rs</groupId>
+      <artifactId>javax.ws.rs-api</artifactId>
+      <version>2.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.data</groupId>
+      <artifactId>spring-data-rest-webmvc</artifactId>
+      <version>3.7.10</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+      <version>3.12.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+      <version>2.10.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>xerces</groupId>
+      <artifactId>xercesImpl</artifactId>
+      <version>2.12.2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.persistence</groupId>
+      <artifactId>javax.persistence-api</artifactId>
+      <version>2.2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>1.7.30</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <version>1.7.30</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>log4j-over-slf4j</artifactId>
+      <version>1.7.30</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+  <repositories>
+    <repository>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+      <id>ossrh</id>
+      <name>OSSRH Snapshots</name>
+      <url>https://s01.oss.sonatype.org/content/repositories/snapshots/</url>
+    </repository>
+  </repositories>
+
+  <properties>
+   <maven.compiler.source>1.8</maven.compiler.source>
+   <maven.compiler.target>1.8</maven.compiler.target>
+  </properties>
+
+  <build>
+   <resources>
+     <resource>
+       <directory>src/main/java</directory>
+     </resource>
+   </resources>
+  </build></project>
\ No newline at end of file
diff --git a/cobigen-templates/crud-openapi-angular-client-app/pom.xml b/cobigen-templates/crud-openapi-angular-client-app/pom.xml
new file mode 100644
index 0000000000..f9f6d93770
--- /dev/null
+++ b/cobigen-templates/crud-openapi-angular-client-app/pom.xml
@@ -0,0 +1,19 @@
+<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>crud-openapi-angular-client-app</artifactId>
+  <name>CRUD OpenApi Angular Client App template</name>
+
+  <parent>
+    <groupId>com.devonfw.cobigen.templates</groupId>
+    <artifactId>templates-parent</artifactId>
+    <version>${revision}</version>
+  </parent>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+    </dependency>
+  </dependencies>
+</project>
\ No newline at end of file
diff --git a/cobigen-templates/crud-openapi-angular-client-app/src/main/java-templates/com/devonfw/cobigen/templates/devon4j/config/constant/MavenMetadata.java b/cobigen-templates/crud-openapi-angular-client-app/src/main/java-templates/com/devonfw/cobigen/templates/devon4j/config/constant/MavenMetadata.java
new file mode 100644
index 0000000000..395d46154d
--- /dev/null
+++ b/cobigen-templates/crud-openapi-angular-client-app/src/main/java-templates/com/devonfw/cobigen/templates/devon4j/config/constant/MavenMetadata.java
@@ -0,0 +1,12 @@
+package com.devonfw.cobigen.templates.devon4j.config.constant;
+
+/**
+ * Constants extracted from the maven pom by templating-maven-plugin.
+ * 
+ * @see "edit template in src/main/java-templates"
+ */
+public class MavenMetadata {
+
+    /** Local repository path */
+    public static final String LOCAL_REPO = "${settings.localRepository}";
+}
diff --git a/cobigen-templates/crud-openapi-angular-client-app/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/JavaUtil.java b/cobigen-templates/crud-openapi-angular-client-app/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/JavaUtil.java
new file mode 100644
index 0000000000..ced2f5fde2
--- /dev/null
+++ b/cobigen-templates/crud-openapi-angular-client-app/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/JavaUtil.java
@@ -0,0 +1,464 @@
+package com.devonfw.cobigen.templates.devon4j.utils;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.Collection;
+import java.util.Map;
+
+import org.apache.commons.lang3.ClassUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Provides type operations, mainly checks and casts for Java Primitives, to be used in the templates
+ *
+ */
+public class JavaUtil {
+
+  /**
+   * Logger for this class
+   */
+  private static final Logger LOG = LoggerFactory.getLogger(JavaUtil.class);
+
+  /**
+   * The constructor.
+   */
+  public JavaUtil() {
+
+    // Empty for CobiGen to automatically instantiate it
+  }
+
+  /**
+   * Returns the Object version of a Java primitive or the input if the input isn't a java primitive
+   * 
+   * @param simpleType String
+   * @return the corresponding object wrapper type simple name of the input if the input is the name of a primitive java
+   *         type. The input itself if not. (e.g. "int" results in "Integer")
+   * @throws ClassNotFoundException should not occur.
+   */
+  public String boxJavaPrimitives(String simpleType) throws ClassNotFoundException {
+
+    if (equalsJavaPrimitive(simpleType)) {
+      return ClassUtils.primitiveToWrapper(ClassUtils.getClass(simpleType)).getSimpleName();
+    } else {
+      return simpleType;
+    }
+
+  }
+
+  /**
+   * Returns the simple name of the type of a field in the pojoClass. If the type is a java primitive the name of the
+   * wrapper class is returned
+   *
+   * @param pojoClass {@link Class} the class object of the pojo
+   * @param fieldName {@link String} the name of the field
+   * @return String. The simple name of the field's type. The simple name of the wrapper class in case of java
+   *         primitives
+   * @throws NoSuchFieldException indicating something awefully wrong in the used model
+   * @throws SecurityException if the field cannot be accessed.
+   */
+  public String boxJavaPrimitives(Class<?> pojoClass, String fieldName) throws NoSuchFieldException, SecurityException {
+
+    if (pojoClass == null) {
+      throw new IllegalAccessError(
+          "Class object is null. Cannot generate template as it might obviously depend on reflection.");
+    }
+
+    if (equalsJavaPrimitive(pojoClass, fieldName)) {
+      return ClassUtils.primitiveToWrapper(pojoClass.getDeclaredField(fieldName).getType()).getSimpleName();
+    } else {
+      Field field = pojoClass.getDeclaredField(fieldName);
+      if (field == null) {
+        field = pojoClass.getField(fieldName);
+      }
+      if (field == null) {
+        throw new IllegalAccessError("Could not find field " + fieldName + " in class " + pojoClass);
+      } else {
+        return field.getType().getSimpleName();
+      }
+    }
+  }
+
+  /**
+   * Checks if the given type is a Java primitive
+   *
+   * @param simpleType the type to be checked
+   * @return true iff simpleType is a Java primitive
+   */
+  public boolean equalsJavaPrimitive(String simpleType) {
+
+    try {
+      return ClassUtils.getClass(simpleType).isPrimitive();
+    } catch (ClassNotFoundException e) {
+      LOG.warn("{}: Could not find {}", e.getMessage(), simpleType);
+      return false;
+    }
+  }
+
+  /**
+   * Checks if the given type is a Java primitive or wrapper
+   *
+   * @param simpleType the type to be checked
+   * @return true iff simpleType is a Java primitive or wrapper
+   */
+  public boolean equalsJavaPrimitiveOrWrapper(String simpleType) {
+
+    try {
+      return ClassUtils.isPrimitiveOrWrapper(ClassUtils.getClass(simpleType));
+    } catch (ClassNotFoundException e) {
+      LOG.warn("{}: Could not find {}", e.getMessage(), simpleType);
+      return false;
+    }
+  }
+
+  /**
+   * Checks if the type of the field in the pojo's class is a java primitive
+   *
+   * @param pojoClass the {@link Class} object of the pojo
+   * @param fieldName the name of the field to be checked
+   * @return true iff the field is a java primitive
+   * @throws NoSuchFieldException indicating something awefully wrong in the used model
+   * @throws SecurityException if the field cannot be accessed.
+   */
+  public boolean equalsJavaPrimitive(Class<?> pojoClass, String fieldName)
+      throws NoSuchFieldException, SecurityException {
+
+    if (pojoClass == null) {
+      return false;
+    }
+
+    Field field = pojoClass.getDeclaredField(fieldName);
+    if (field == null) {
+      field = pojoClass.getField(fieldName);
+    }
+    if (field == null) {
+      return false;
+    } else {
+      return field.getType().isPrimitive();
+    }
+  }
+
+  /**
+   * Checks if the given type is a Java primitive or a Java primitive array
+   *
+   * @param simpleType the Type name to be checked
+   * @return true iff {@link #equalsJavaPrimitive(String)} is true or if simpleType is an array with a primitive
+   *         component
+   */
+  public boolean equalsJavaPrimitiveIncludingArrays(String simpleType) {
+
+    Class<?> klasse;
+
+    try {
+      klasse = ClassUtils.getClass(simpleType).getComponentType();
+    } catch (ClassNotFoundException e) {
+      LOG.warn("{}: Could not find {}", e.getMessage(), simpleType);
+      return false;
+    }
+    return equalsJavaPrimitive(simpleType) || (klasse != null && klasse.isPrimitive());
+  }
+
+  /**
+   * Checks if the given field in the pojo class is a java primitive or an array of java primitives
+   *
+   * @param pojoClass the class object of the pojo
+   * @param fieldName the name of the field to be checked
+   * @return true iff {@link #equalsJavaPrimitive(Class, String)} is true or the field is an array of primitives
+   * @throws NoSuchFieldException indicating something awfully wrong in the used model
+   * @throws SecurityException if the field cannot be accessed.
+   */
+  public boolean equalsJavaPrimitiveIncludingArrays(Class<?> pojoClass, String fieldName)
+      throws NoSuchFieldException, SecurityException {
+
+    return equalsJavaPrimitive(pojoClass, fieldName) || (pojoClass.getDeclaredField(fieldName).getType().isArray()
+        && pojoClass.getDeclaredField(fieldName).getType().getComponentType().isPrimitive());
+  }
+
+  /**
+   * Returns a cast statement for a given (java primitive, variable name) pair or nothing if the type isn't a java
+   * primitive
+   *
+   * @param simpleType Java Type
+   * @param varName Variable name
+   * @return String either of the form '((Java Primitive Object Type)varName)' if simpleType is a primitive or the empty
+   *         String otherwise
+   * @throws ClassNotFoundException should not occur
+   */
+  public String castJavaPrimitives(String simpleType, String varName) throws ClassNotFoundException {
+
+    if (equalsJavaPrimitive(simpleType)) {
+      return String.format("((%1$s)%2$s)", boxJavaPrimitives(simpleType), varName);
+    } else {
+      return "";
+    }
+  }
+
+  /**
+   * Returns a cast statement for a given (java primitive, variable name) pair or nothing if the type isn't a java
+   * primitive
+   *
+   * @param pojoClass the class object of the pojo
+   * @param fieldName the name of the field to be casted
+   * @return if fieldName points to a primitive field then a casted statement (e.g. for an int field:
+   *         '((Integer)field)') or an empty String otherwise
+   * @throws NoSuchFieldException indicating something awefully wrong in the used model
+   * @throws SecurityException if the field cannot be accessed.
+   */
+  public String castJavaPrimitives(Class<?> pojoClass, String fieldName)
+      throws NoSuchFieldException, SecurityException {
+
+    if (equalsJavaPrimitive(pojoClass, fieldName)) {
+      return String.format("((%1$s)%2$s)", boxJavaPrimitives(pojoClass, fieldName), fieldName);
+    } else {
+      return "";
+    }
+  }
+
+  /**
+   * @param pojoClass {@link Class} the class object of the pojo
+   * @param fieldName {@link String} the name of the field
+   * @return true if the field is an instance of java.utils.Collections
+   * @throws NoSuchFieldException indicating something awefully wrong in the used model
+   * @throws SecurityException if the field cannot be accessed.
+   */
+  public boolean isCollection(Class<?> pojoClass, String fieldName) throws NoSuchFieldException, SecurityException {
+
+    if (pojoClass == null) {
+      return false;
+    }
+
+    Field field = pojoClass.getDeclaredField(fieldName);
+    if (field == null) {
+      field = pojoClass.getField(fieldName);
+    }
+    if (field == null) {
+      return false;
+    } else {
+      return Collection.class.isAssignableFrom(field.getType());
+    }
+
+  }
+
+  /**
+   * Returns the Ext Type to a given java type
+   *
+   * @param simpleType any java type's simple name
+   * @return corresponding Ext type
+   */
+  public String getExtType(String simpleType) {
+
+    switch (simpleType) {
+      case "short":
+      case "Short":
+      case "int":
+      case "Integer":
+      case "long":
+      case "Long":
+        return "Integer";
+      case "float":
+      case "Float":
+      case "double":
+      case "Double":
+        return "Number";
+      case "boolean":
+      case "Boolean":
+        return "Boolean";
+      case "char":
+      case "Character":
+      case "String":
+        return "String";
+      case "Date":
+        return "Date";
+      default:
+        return "Field";
+    }
+  }
+
+  /**
+   * returns the Angular5 type associated with a Java primitive
+   *
+   * @param simpleType :{@link String} the type to be parsed
+   * @return the corresponding Angular type or 'any' otherwise
+   */
+  public String getAngularType(String simpleType) {
+
+    switch (simpleType) {
+      case "boolean":
+        return "boolean";
+      case "Boolean":
+        return "boolean";
+      case "short":
+        return "number";
+      case "Short":
+        return "number";
+      case "int":
+        return "number";
+      case "Integer":
+        return "number";
+      case "long":
+        return "number";
+      case "Long":
+        return "number";
+      case "float":
+        return "number";
+      case "Float":
+        return "number";
+      case "double":
+        return "number";
+      case "Double":
+        return "number";
+      case "char":
+        return "string";
+      case "Character":
+        return "string";
+      case "String":
+        return "string";
+      case "byte":
+        return "number";
+      default:
+        return "any";
+    }
+  }
+
+  /**
+   * returns the class name of the return type of a specific method.
+   *
+   * @param pojoClass {@link Class}&lt;?&gt; the class object of the pojo
+   * @param methodName {@link String} the name of the method
+   * @return the class name of the return type of the specified method
+   * @throws SecurityException If no method of the given name can be found
+   * @throws NoSuchMethodException If no method of the given name can be found
+   */
+  public String getReturnType(Class<?> pojoClass, String methodName) throws NoSuchMethodException, SecurityException {
+
+    if (pojoClass == null) {
+      throw new IllegalAccessError(
+          "Class object is null. Cannot generate template as it might obviously depend on reflection.");
+    }
+    String s = "-";
+    Method method = findMethod(pojoClass, methodName);
+    if (method != null && !method.getReturnType().equals(Void.TYPE)) {
+      s = method.getReturnType().toString();
+      s = s.substring(s.lastIndexOf('.') + 1, s.length());
+    }
+    return s;
+  }
+
+  /**
+   *
+   * This methods returns the return type of the method in the given pojoClass which are annotated with the parameter
+   * annotatedClass
+   *
+   * @param pojoClass - The class in which to find if it has methods with annotatedClass
+   * @param annotatedClassName - The annotation which needs to be found
+   * @return Return type of the method annotated with the given annotation, else "null"
+   * @throws ClassNotFoundException if the annotated class name could not be found in the class path
+   */
+  @SuppressWarnings("unchecked")
+  public String getReturnTypeOfMethodAnnotatedWith(Class<?> pojoClass, String annotatedClassName)
+      throws ClassNotFoundException {
+
+    if (pojoClass == null) {
+      throw new IllegalAccessError(
+          "Class object is null. Cannot generate template as it might obviously depend on reflection.");
+    }
+
+    Method[] methods = pojoClass.getDeclaredMethods();
+    for (Method method : methods) {
+      if (!method.getName().startsWith("get")) {
+        continue;
+      }
+      for (Annotation a : method.getAnnotations()) {
+        // better if (method.isAnnotationPresent(classObj)) {, but postponed as of different class
+        // loaders of a.getClass() and pojoClass.getClass()
+        if (a.getClass().getCanonicalName().equals(annotatedClassName)) {
+          return method.getReturnType().getSimpleName();
+        }
+      }
+    }
+    return "null";
+  }
+
+  /**
+   * returns the HTTP request type corresponding to an annotation type
+   *
+   * @param annotations The annotation to get the type name of
+   * @return the HTTP request type name of the selected annotation
+   */
+  public String getRequestType(Map<String, Object> annotations) {
+
+    if (annotations.containsKey("javax_ws_rs_GET")) {
+      return "GET";
+    } else if (annotations.containsKey("javax_ws_rs_PUT")) {
+      return "PUT";
+    } else if (annotations.containsKey("javax_ws_rs_POST")) {
+      return "POST";
+    } else if (annotations.containsKey("javax_ws_rs_DELETE")) {
+      return "DELETE";
+    } else if (annotations.containsKey("javax_ws_rs_PATCH")) {
+      return "PATCH";
+    } else {
+      return "-";
+    }
+  }
+
+  /**
+   * Helper method to find a class's specific method
+   *
+   * @param pojoClass {@link Class}&lt;?&gt; the class object of the pojo
+   * @param methodName The name of the method to be found
+   * @return The method object of the method to be found, null if it wasn't found
+   */
+  private Method findMethod(Class<?> pojoClass, String methodName) {
+
+    if (pojoClass == null) {
+      throw new IllegalAccessError(
+          "Class object is null. Cannot generate template as it might obviously depend on reflection.");
+    }
+    for (Method m : pojoClass.getMethods()) {
+      if (m.getName().equals(methodName)) {
+        return m;
+      }
+    }
+    return null;
+  }
+
+  /**
+   * Checks whether the class given by the full qualified name is an enum
+   *
+   * @param className full qualified class name
+   * @return <code>true</code> if the class is an enum, <code>false</code> otherwise
+   */
+  public boolean isEnum(String className) {
+
+    try {
+      return ClassUtils.getClass(className).isEnum();
+    } catch (ClassNotFoundException e) {
+      LOG.warn("{}: Could not find {}", e.getMessage(), className);
+      return false;
+    }
+  }
+
+  /**
+   * Returns the first enum value of an enum class
+   *
+   * @param className full qualified class name
+   * @return the first enum value name found in order
+   */
+  public String getFirstEnumValue(String className) {
+
+    try {
+      Class<?> enumClass = ClassUtils.getClass(className);
+      Field[] declaredFields = enumClass.getDeclaredFields();
+      if (declaredFields.length > 0) {
+        return declaredFields[0].getName();
+      } else {
+        return null;
+      }
+    } catch (ClassNotFoundException e) {
+      LOG.warn("{}: Could not find {}", e.getMessage(), className);
+      return null;
+    }
+  }
+}
diff --git a/cobigen-templates/templates-devon4j/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/OpenApiUtil.java b/cobigen-templates/crud-openapi-angular-client-app/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/OpenApiUtil.java
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/OpenApiUtil.java
rename to cobigen-templates/crud-openapi-angular-client-app/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/OpenApiUtil.java
diff --git a/cobigen-templates/crud-openapi-angular-client-app/src/main/resources/template-set.xml b/cobigen-templates/crud-openapi-angular-client-app/src/main/resources/template-set.xml
new file mode 100644
index 0000000000..bd2640a935
--- /dev/null
+++ b/cobigen-templates/crud-openapi-angular-client-app/src/main/resources/template-set.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:templateSetConfiguration version="6.0" xmlns:tns="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration" xmlns:cc="http://capgemini.com/devonfw/cobigen/ContextConfiguration" xmlns:tc="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration templateSetConfiguration.xsd ">
+     <cc:contextConfiguration version="3.0">
+  <cc:trigger id="crud_openapi_angular_client_app" type="openapi">
+    <cc:containerMatcher type="element" value="openAPIFile" />
+    <cc:matcher type="element" value="EntityDef">
+      <cc:variableAssignment type="constant" key="domain" value="demo" />
+      <cc:variableAssignment type="property" key="component" value="componentName" />
+      <cc:variableAssignment type="property" key="etoName" value="name" />
+    </cc:matcher>
+  </cc:trigger>
+  <cc:tags>
+    <cc:tag name="Angular"></cc:tag>
+    <cc:tag name="OpenAPI"></cc:tag>
+    <cc:tag name="CRUD"></cc:tag>
+    <cc:tag name="Client"></cc:tag>
+    <cc:tag name="App"></cc:tag>
+  </cc:tags>
+
+   </cc:contextConfiguration>
+<tc:templatesConfiguration  version="5.0">
+
+  <tc:templates>
+    <tc:templateExtension ref="${variables.etoName#lower_case}-dialog.component.ts" mergeStrategy="tsmerge" />
+    <tc:templateExtension ref="${variables.etoName#lower_case}-grid.component.ts" mergeStrategy="tsmerge" />
+    <tc:templateExtension ref="${variables.etoName#lower_case}-alert.component.ts" mergeStrategy="tsmerge" />
+    <tc:templateExtension ref="${variables.etoName#lower_case}.service.ts" mergeStrategy="tsmerge" />
+    <tc:templateExtension ref="${variables.etoName#lower_case}.ts" mergeStrategy="tsmerge" />
+    <tc:templateExtension ref="model.ts" mergeStrategy="tsmerge" />
+    <tc:templateExtension ref="app.module.ts" mergeStrategy="tsmerge" />
+    <tc:templateExtension ref="es.json" mergeStrategy="jsonmerge" />
+    <tc:templateExtension ref="en.json" mergeStrategy="jsonmerge" />
+    <tc:templateExtension ref="environment.ts" mergeStrategy="tsmerge_override" />
+    <tc:templateExtension ref="environment.prod.ts" mergeStrategy="tsmerge_override" />
+    <tc:templateExtension ref="app-routing.module.ts" mergeStrategy="tsmerge_override" />
+    <tc:templateExtension ref="nav-bar.component.html" mergeStrategy="html-ng*" />
+  </tc:templates>
+
+  <tc:templateScans>
+    <tc:templateScan name="ts_scan" templatePath="templates" destinationPath="" />
+  </tc:templateScans>
+
+  <tc:increments>
+    <tc:increment name="devon4ng-app" description="CRUD devon4ng Angular App" explanation="Creates Angular stack CRUD client app.">
+      <tc:incrementRef ref="app_angular_env" />
+      <tc:incrementRef ref="app_angular_i18n" />
+      <tc:incrementRef ref="app_angular_devon4ng_component" />
+      <tc:incrementRef ref="app_angular_service_based" />
+    </tc:increment>
+    <tc:increment name="app_angular_env" description="Server URL Registration">
+      <tc:templateRef ref="environment.ts" />
+      <tc:templateRef ref="environment.prod.ts" />
+    </tc:increment>
+    <tc:increment name="app_angular_i18n" description="i18n">
+      <tc:templateRef ref="es.json" />
+      <tc:templateRef ref="en.json" />
+    </tc:increment>
+    <tc:increment name="app_angular_service_based" description="model">
+      <tc:templateRef ref="model.ts" />
+      <tc:templateRef ref="${variables.etoName#lower_case}.ts" />
+    </tc:increment>
+    <tc:increment name="app_angular_devon4ng_component" description="View Component">
+      <tc:templateRef ref="${variables.etoName#lower_case}-dialog.component.html" />
+      <tc:templateRef ref="${variables.etoName#lower_case}-dialog.component.ts" />
+      <tc:templateRef ref="${variables.etoName#lower_case}-dialog.component.spec.ts" />
+      <tc:templateRef ref="${variables.etoName#lower_case}-grid.component.html" />
+      <tc:templateRef ref="${variables.etoName#lower_case}-grid.component.scss" />
+      <tc:templateRef ref="${variables.etoName#lower_case}-grid.component.ts" />
+      <tc:templateRef ref="${variables.etoName#lower_case}-grid.component.spec.ts" />
+      <tc:templateRef ref="${variables.etoName#lower_case}-alert.component.html" />
+      <tc:templateRef ref="${variables.etoName#lower_case}-alert.component.scss" />
+      <tc:templateRef ref="${variables.etoName#lower_case}-alert.component.ts" />
+      <tc:templateRef ref="${variables.etoName#lower_case}-alert.component.spec.ts" />
+      <tc:templateRef ref="${variables.etoName#lower_case}.service.ts" />
+      <tc:templateRef ref="${variables.etoName#lower_case}.service.spec.ts" />
+      <tc:templateRef ref="${variables.etoName#lower_case}-routing.module.ts" />
+      <tc:templateRef ref="${variables.etoName#lower_case}.module.ts" />
+      <tc:templateRef ref="app.module.ts" />
+      <tc:templateRef ref="app-routing.module.ts" />
+      <tc:templateRef ref="nav-bar.component.html" />
+    </tc:increment>
+  </tc:increments>
+</tc:templatesConfiguration>
+</tns:templateSetConfiguration>
\ No newline at end of file
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_angular_client_app/templates/cobigen.properties b/cobigen-templates/crud-openapi-angular-client-app/src/main/resources/templates/cobigen.properties
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_angular_client_app/templates/cobigen.properties
rename to cobigen-templates/crud-openapi-angular-client-app/src/main/resources/templates/cobigen.properties
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_angular_client_app/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-alert/${variables.etoName#lower_case}-alert.component.html.ftl b/cobigen-templates/crud-openapi-angular-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-alert/${variables.etoName#lower_case}-alert.component.html.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_angular_client_app/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-alert/${variables.etoName#lower_case}-alert.component.html.ftl
rename to cobigen-templates/crud-openapi-angular-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-alert/${variables.etoName#lower_case}-alert.component.html.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_angular_client_app/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-alert/${variables.etoName#lower_case}-alert.component.scss b/cobigen-templates/crud-openapi-angular-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-alert/${variables.etoName#lower_case}-alert.component.scss
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_angular_client_app/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-alert/${variables.etoName#lower_case}-alert.component.scss
rename to cobigen-templates/crud-openapi-angular-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-alert/${variables.etoName#lower_case}-alert.component.scss
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_angular_client_app/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-alert/${variables.etoName#lower_case}-alert.component.spec.ts.ftl b/cobigen-templates/crud-openapi-angular-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-alert/${variables.etoName#lower_case}-alert.component.spec.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_angular_client_app/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-alert/${variables.etoName#lower_case}-alert.component.spec.ts.ftl
rename to cobigen-templates/crud-openapi-angular-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-alert/${variables.etoName#lower_case}-alert.component.spec.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_angular_client_app/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-alert/${variables.etoName#lower_case}-alert.component.ts.ftl b/cobigen-templates/crud-openapi-angular-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-alert/${variables.etoName#lower_case}-alert.component.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_angular_client_app/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-alert/${variables.etoName#lower_case}-alert.component.ts.ftl
rename to cobigen-templates/crud-openapi-angular-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-alert/${variables.etoName#lower_case}-alert.component.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_angular_client_app/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-dialog/${variables.etoName#lower_case}-dialog.component.html.ftl b/cobigen-templates/crud-openapi-angular-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-dialog/${variables.etoName#lower_case}-dialog.component.html.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_angular_client_app/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-dialog/${variables.etoName#lower_case}-dialog.component.html.ftl
rename to cobigen-templates/crud-openapi-angular-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-dialog/${variables.etoName#lower_case}-dialog.component.html.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_angular_client_app/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-dialog/${variables.etoName#lower_case}-dialog.component.spec.ts.ftl b/cobigen-templates/crud-openapi-angular-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-dialog/${variables.etoName#lower_case}-dialog.component.spec.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_angular_client_app/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-dialog/${variables.etoName#lower_case}-dialog.component.spec.ts.ftl
rename to cobigen-templates/crud-openapi-angular-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-dialog/${variables.etoName#lower_case}-dialog.component.spec.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_angular_client_app/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-dialog/${variables.etoName#lower_case}-dialog.component.ts.ftl b/cobigen-templates/crud-openapi-angular-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-dialog/${variables.etoName#lower_case}-dialog.component.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_angular_client_app/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-dialog/${variables.etoName#lower_case}-dialog.component.ts.ftl
rename to cobigen-templates/crud-openapi-angular-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-dialog/${variables.etoName#lower_case}-dialog.component.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_angular_client_app/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-grid/${variables.etoName#lower_case}-grid.component.html.ftl b/cobigen-templates/crud-openapi-angular-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-grid/${variables.etoName#lower_case}-grid.component.html.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_angular_client_app/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-grid/${variables.etoName#lower_case}-grid.component.html.ftl
rename to cobigen-templates/crud-openapi-angular-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-grid/${variables.etoName#lower_case}-grid.component.html.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_angular_client_app/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-grid/${variables.etoName#lower_case}-grid.component.scss b/cobigen-templates/crud-openapi-angular-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-grid/${variables.etoName#lower_case}-grid.component.scss
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_angular_client_app/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-grid/${variables.etoName#lower_case}-grid.component.scss
rename to cobigen-templates/crud-openapi-angular-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-grid/${variables.etoName#lower_case}-grid.component.scss
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_angular_client_app/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-grid/${variables.etoName#lower_case}-grid.component.spec.ts.ftl b/cobigen-templates/crud-openapi-angular-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-grid/${variables.etoName#lower_case}-grid.component.spec.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_angular_client_app/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-grid/${variables.etoName#lower_case}-grid.component.spec.ts.ftl
rename to cobigen-templates/crud-openapi-angular-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-grid/${variables.etoName#lower_case}-grid.component.spec.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_angular_client_app/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-grid/${variables.etoName#lower_case}-grid.component.ts.ftl b/cobigen-templates/crud-openapi-angular-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-grid/${variables.etoName#lower_case}-grid.component.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_angular_client_app/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-grid/${variables.etoName#lower_case}-grid.component.ts.ftl
rename to cobigen-templates/crud-openapi-angular-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-grid/${variables.etoName#lower_case}-grid.component.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_angular_client_app/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-routing.module.ts.ftl b/cobigen-templates/crud-openapi-angular-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-routing.module.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_angular_client_app/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-routing.module.ts.ftl
rename to cobigen-templates/crud-openapi-angular-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}-routing.module.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_angular_client_app/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}.module.ts.ftl b/cobigen-templates/crud-openapi-angular-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}.module.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_angular_client_app/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}.module.ts.ftl
rename to cobigen-templates/crud-openapi-angular-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/${variables.etoName#lower_case}.module.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_angular_client_app/templates/src/app/${variables.etoName#lower_case}/services/${variables.etoName#lower_case}.service.spec.ts.ftl b/cobigen-templates/crud-openapi-angular-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/services/${variables.etoName#lower_case}.service.spec.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_angular_client_app/templates/src/app/${variables.etoName#lower_case}/services/${variables.etoName#lower_case}.service.spec.ts.ftl
rename to cobigen-templates/crud-openapi-angular-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/services/${variables.etoName#lower_case}.service.spec.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_angular_client_app/templates/src/app/${variables.etoName#lower_case}/services/${variables.etoName#lower_case}.service.ts.ftl b/cobigen-templates/crud-openapi-angular-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/services/${variables.etoName#lower_case}.service.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_angular_client_app/templates/src/app/${variables.etoName#lower_case}/services/${variables.etoName#lower_case}.service.ts.ftl
rename to cobigen-templates/crud-openapi-angular-client-app/src/main/resources/templates/src/app/${variables.etoName#lower_case}/services/${variables.etoName#lower_case}.service.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_angular_client_app/templates/src/app/app-routing.module.ts.ftl b/cobigen-templates/crud-openapi-angular-client-app/src/main/resources/templates/src/app/app-routing.module.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_angular_client_app/templates/src/app/app-routing.module.ts.ftl
rename to cobigen-templates/crud-openapi-angular-client-app/src/main/resources/templates/src/app/app-routing.module.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_angular_client_app/templates/src/app/app.module.ts.ftl b/cobigen-templates/crud-openapi-angular-client-app/src/main/resources/templates/src/app/app.module.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_angular_client_app/templates/src/app/app.module.ts.ftl
rename to cobigen-templates/crud-openapi-angular-client-app/src/main/resources/templates/src/app/app.module.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_angular_client_app/templates/src/app/home/home.component.html.ftl b/cobigen-templates/crud-openapi-angular-client-app/src/main/resources/templates/src/app/home/home.component.html.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_angular_client_app/templates/src/app/home/home.component.html.ftl
rename to cobigen-templates/crud-openapi-angular-client-app/src/main/resources/templates/src/app/home/home.component.html.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_angular_client_app/templates/src/app/layout/nav-bar/nav-bar.component.html.ftl b/cobigen-templates/crud-openapi-angular-client-app/src/main/resources/templates/src/app/layout/nav-bar/nav-bar.component.html.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_angular_client_app/templates/src/app/layout/nav-bar/nav-bar.component.html.ftl
rename to cobigen-templates/crud-openapi-angular-client-app/src/main/resources/templates/src/app/layout/nav-bar/nav-bar.component.html.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_angular_client_app/templates/src/app/model/${variables.etoName#lower_case}.ts.ftl b/cobigen-templates/crud-openapi-angular-client-app/src/main/resources/templates/src/app/model/${variables.etoName#lower_case}.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_angular_client_app/templates/src/app/model/${variables.etoName#lower_case}.ts.ftl
rename to cobigen-templates/crud-openapi-angular-client-app/src/main/resources/templates/src/app/model/${variables.etoName#lower_case}.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_angular_client_app/templates/src/app/model/model.ts.ftl b/cobigen-templates/crud-openapi-angular-client-app/src/main/resources/templates/src/app/model/model.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_angular_client_app/templates/src/app/model/model.ts.ftl
rename to cobigen-templates/crud-openapi-angular-client-app/src/main/resources/templates/src/app/model/model.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_angular_client_app/templates/src/assets/i18n/en.json.ftl b/cobigen-templates/crud-openapi-angular-client-app/src/main/resources/templates/src/assets/i18n/en.json.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_angular_client_app/templates/src/assets/i18n/en.json.ftl
rename to cobigen-templates/crud-openapi-angular-client-app/src/main/resources/templates/src/assets/i18n/en.json.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_angular_client_app/templates/src/assets/i18n/es.json.ftl b/cobigen-templates/crud-openapi-angular-client-app/src/main/resources/templates/src/assets/i18n/es.json.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_angular_client_app/templates/src/assets/i18n/es.json.ftl
rename to cobigen-templates/crud-openapi-angular-client-app/src/main/resources/templates/src/assets/i18n/es.json.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_angular_client_app/templates/src/environments/environment.prod.ts.ftl b/cobigen-templates/crud-openapi-angular-client-app/src/main/resources/templates/src/environments/environment.prod.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_angular_client_app/templates/src/environments/environment.prod.ts.ftl
rename to cobigen-templates/crud-openapi-angular-client-app/src/main/resources/templates/src/environments/environment.prod.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_angular_client_app/templates/src/environments/environment.ts.ftl b/cobigen-templates/crud-openapi-angular-client-app/src/main/resources/templates/src/environments/environment.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_angular_client_app/templates/src/environments/environment.ts.ftl
rename to cobigen-templates/crud-openapi-angular-client-app/src/main/resources/templates/src/environments/environment.ts.ftl
diff --git a/cobigen-templates/crud-openapi-angular-client-app/src/test/java/com/devonfw/cobigen/templates/devon4j/test/templates/CrudOpenapiAngularClientAppTest.java b/cobigen-templates/crud-openapi-angular-client-app/src/test/java/com/devonfw/cobigen/templates/devon4j/test/templates/CrudOpenapiAngularClientAppTest.java
new file mode 100644
index 0000000000..28302c4458
--- /dev/null
+++ b/cobigen-templates/crud-openapi-angular-client-app/src/test/java/com/devonfw/cobigen/templates/devon4j/test/templates/CrudOpenapiAngularClientAppTest.java
@@ -0,0 +1,100 @@
+package com.devonfw.cobigen.templates.devon4j.test.templates;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+import org.apache.commons.io.FileUtils;
+import org.junit.BeforeClass;
+import org.junit.ClassRule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+
+import com.devonfw.cobigen.api.constants.ConfigurationConstants;
+import com.devonfw.cobigen.maven.test.AbstractMavenTest;
+import com.devonfw.cobigen.templates.devon4j.config.constant.MavenMetadata;
+
+/**
+ * Smoke tests of all templates.
+ */
+public class CrudOpenapiAngularClientAppTest extends AbstractMavenTest {
+
+  /** Root of all test resources of this test suite */
+  public static final String TEST_RESOURCES_ROOT = "src/test/resources/testdata/templatetest/";
+
+  /** Temporary files rule to create temporary folders */
+  @ClassRule
+  public static TemporaryFolder tempFolder = new TemporaryFolder();
+
+  /** The templates development folder */
+  protected static Path templatesProject;
+
+  /** The templates development folder */
+  protected static Path templatesProjectTemporary;
+
+  /**
+   * Creates a copy of the templates project in the temp directory
+   *
+   * @throws URISyntaxException if the path could not be created properly
+   * @throws IOException if accessing a directory or file fails
+   */
+  @BeforeClass
+  public static void setupDevTemplates() throws URISyntaxException, IOException {
+
+    templatesProject = new File(
+        CrudOpenapiAngularClientAppTest.class.getProtectionDomain().getCodeSource().getLocation().toURI())
+            .getParentFile().getParentFile().toPath();
+
+    Path utilsPom = new File(
+        CrudOpenapiAngularClientAppTest.class.getProtectionDomain().getCodeSource().getLocation().toURI())
+            .getParentFile().getParentFile().toPath().resolve("src/test/resources/utils/pom.xml");
+
+    // create a temporary directory cobigen-templates/template-sets/adapted containing the template sets
+    Path tempFolderPath = tempFolder.getRoot().toPath();
+    Path cobigenTemplatePath = tempFolderPath.resolve("cobigen-templates");
+    if (!Files.exists(cobigenTemplatePath)) {
+      Files.createDirectory(cobigenTemplatePath);
+
+      templatesProjectTemporary = cobigenTemplatePath.resolve(ConfigurationConstants.TEMPLATE_SETS_FOLDER);
+      Path templateSetsAdaptedFolder = templatesProjectTemporary.resolve(ConfigurationConstants.ADAPTED_FOLDER);
+      Files.createDirectory(templatesProjectTemporary);
+      Files.createDirectory(templateSetsAdaptedFolder);
+
+      Path templateSetPath = templateSetsAdaptedFolder.resolve("template-set");
+      FileUtils.copyDirectory(templatesProject.toFile(), templateSetPath.toFile());
+
+      if (Files.isDirectory(templateSetPath)) {
+
+        // Replace the pom.xml in the template sets. Needed so that the project in the temp directory is build
+        // properly
+        if (Files.exists(templateSetPath.resolve("pom.xml"))) {
+          try {
+            Files.delete(templateSetPath.resolve("pom.xml"));
+          } catch (IOException e) {
+            throw new IOException("Error deleting file " + templateSetPath.resolve("pom.xml"), e);
+          }
+          try {
+            Files.copy(utilsPom, templateSetPath.resolve("pom.xml"));
+          } catch (IOException e) {
+            throw new IOException("Error copying file " + utilsPom, e);
+          }
+        }
+      }
+    }
+  }
+
+  /**
+   * Test successful generation of all templates based on an ETO
+   *
+   * @throws Exception test fails
+   */
+  @Test
+  public void testAllTemplatesGeneration_OpenApiInput() throws Exception {
+
+    File testProject = new File(TEST_RESOURCES_ROOT + "TestAllTemplatesOpenApiInput/");
+    runMavenInvoker(testProject, templatesProjectTemporary.toFile(), MavenMetadata.LOCAL_REPO);
+  }
+
+}
diff --git a/cobigen-templates/crud-openapi-angular-client-app/src/test/resources/application.properties b/cobigen-templates/crud-openapi-angular-client-app/src/test/resources/application.properties
new file mode 100644
index 0000000000..cf2c614efb
--- /dev/null
+++ b/cobigen-templates/crud-openapi-angular-client-app/src/test/resources/application.properties
@@ -0,0 +1,2 @@
+server.port=8080
+server.context-path=/
\ No newline at end of file
diff --git a/cobigen-templates/crud-openapi-angular-client-app/src/test/resources/logback.xml b/cobigen-templates/crud-openapi-angular-client-app/src/test/resources/logback.xml
new file mode 100644
index 0000000000..5f29165f75
--- /dev/null
+++ b/cobigen-templates/crud-openapi-angular-client-app/src/test/resources/logback.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- This file is for logback classic. The file contains the configuration for slf4j logging -->
+<configuration>
+	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+			<Pattern>%d{HH:mm:ss.SSS} [%thread] [C:%X{correlationId}] - %-5level - %logger{36} - %msg%n
+			</Pattern>
+		</encoder>
+	</appender>
+
+	<root level="INFO">
+		<appender-ref ref="STDOUT" />
+	</root>
+</configuration>
diff --git a/cobigen-templates/templates-devon4j/src/test/resources/testdata/templatetest/TestAllTemplatesOpenApiInput/OpenAPI.yaml b/cobigen-templates/crud-openapi-angular-client-app/src/test/resources/testdata/templatetest/TestAllTemplatesOpenApiInput/OpenAPI.yaml
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/test/resources/testdata/templatetest/TestAllTemplatesOpenApiInput/OpenAPI.yaml
rename to cobigen-templates/crud-openapi-angular-client-app/src/test/resources/testdata/templatetest/TestAllTemplatesOpenApiInput/OpenAPI.yaml
diff --git a/cobigen-templates/crud-openapi-angular-client-app/src/test/resources/testdata/templatetest/TestAllTemplatesOpenApiInput/logback.xml b/cobigen-templates/crud-openapi-angular-client-app/src/test/resources/testdata/templatetest/TestAllTemplatesOpenApiInput/logback.xml
new file mode 100644
index 0000000000..5f29165f75
--- /dev/null
+++ b/cobigen-templates/crud-openapi-angular-client-app/src/test/resources/testdata/templatetest/TestAllTemplatesOpenApiInput/logback.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- This file is for logback classic. The file contains the configuration for slf4j logging -->
+<configuration>
+	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+			<Pattern>%d{HH:mm:ss.SSS} [%thread] [C:%X{correlationId}] - %-5level - %logger{36} - %msg%n
+			</Pattern>
+		</encoder>
+	</appender>
+
+	<root level="INFO">
+		<appender-ref ref="STDOUT" />
+	</root>
+</configuration>
diff --git a/cobigen-templates/templates-devon4j/src/test/resources/testdata/templatetest/TestAllTemplatesOpenApiInput/pom.xml b/cobigen-templates/crud-openapi-angular-client-app/src/test/resources/testdata/templatetest/TestAllTemplatesOpenApiInput/pom.xml
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/test/resources/testdata/templatetest/TestAllTemplatesOpenApiInput/pom.xml
rename to cobigen-templates/crud-openapi-angular-client-app/src/test/resources/testdata/templatetest/TestAllTemplatesOpenApiInput/pom.xml
diff --git a/cobigen-templates/crud-openapi-angular-client-app/src/test/resources/utils/pom.xml b/cobigen-templates/crud-openapi-angular-client-app/src/test/resources/utils/pom.xml
new file mode 100644
index 0000000000..d600eb559a
--- /dev/null
+++ b/cobigen-templates/crud-openapi-angular-client-app/src/test/resources/utils/pom.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.devonfw.cobigen.templates</groupId>
+  <artifactId>crud-openapi-angular-client-app</artifactId>
+  <version>2021.12.007-SNAPSHOT</version>
+  <name>Crud Openapi Angular Client App</name>
+  <description>A Code-based incremental Generator</description>
+  <url>https://github.com/devonfw/cobigen/templates-parent/templates-devon4j-utils</url>
+  <licenses>
+    <license>
+      <name>Apache Software License 2.0</name>
+      <url>https://raw.githubusercontent.com/devonfw/.github/master/LICENSE</url>
+      <distribution>repo</distribution>
+      <comments></comments>
+    </license>
+  </licenses>
+  <dependencies>
+    <dependency>
+      <groupId>javax.ws.rs</groupId>
+      <artifactId>javax.ws.rs-api</artifactId>
+      <version>2.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.data</groupId>
+      <artifactId>spring-data-rest-webmvc</artifactId>
+      <version>3.7.10</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+      <version>3.12.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+      <version>2.10.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>xerces</groupId>
+      <artifactId>xercesImpl</artifactId>
+      <version>2.12.2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.persistence</groupId>
+      <artifactId>javax.persistence-api</artifactId>
+      <version>2.2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>1.7.30</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <version>1.7.30</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>log4j-over-slf4j</artifactId>
+      <version>1.7.30</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+  <repositories>
+    <repository>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+      <id>ossrh</id>
+      <name>OSSRH Snapshots</name>
+      <url>https://s01.oss.sonatype.org/content/repositories/snapshots/</url>
+    </repository>
+  </repositories>
+
+  <properties>
+   <maven.compiler.source>1.8</maven.compiler.source>
+   <maven.compiler.target>1.8</maven.compiler.target>
+  </properties>
+
+  <build>
+   <resources>
+     <resource>
+       <directory>src/main/java</directory>
+     </resource>
+   </resources>
+  </build></project>
\ No newline at end of file
diff --git a/cobigen-templates/crud-openapi-angular-service-based-app/pom.xml b/cobigen-templates/crud-openapi-angular-service-based-app/pom.xml
new file mode 100644
index 0000000000..cf6571b0d4
--- /dev/null
+++ b/cobigen-templates/crud-openapi-angular-service-based-app/pom.xml
@@ -0,0 +1,13 @@
+<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>crud-openapi-angular-service-based-app</artifactId>
+  <name>CRUD OpenAPI Angular Service Based App template</name>
+
+  <parent>
+    <groupId>com.devonfw.cobigen.templates</groupId>
+    <artifactId>templates-parent</artifactId>
+    <version>${revision}</version>
+  </parent>
+
+</project>
\ No newline at end of file
diff --git a/cobigen-templates/crud-openapi-angular-service-based-app/src/main/java-templates/com/devonfw/cobigen/templates/devon4j/config/constant/MavenMetadata.java b/cobigen-templates/crud-openapi-angular-service-based-app/src/main/java-templates/com/devonfw/cobigen/templates/devon4j/config/constant/MavenMetadata.java
new file mode 100644
index 0000000000..395d46154d
--- /dev/null
+++ b/cobigen-templates/crud-openapi-angular-service-based-app/src/main/java-templates/com/devonfw/cobigen/templates/devon4j/config/constant/MavenMetadata.java
@@ -0,0 +1,12 @@
+package com.devonfw.cobigen.templates.devon4j.config.constant;
+
+/**
+ * Constants extracted from the maven pom by templating-maven-plugin.
+ * 
+ * @see "edit template in src/main/java-templates"
+ */
+public class MavenMetadata {
+
+    /** Local repository path */
+    public static final String LOCAL_REPO = "${settings.localRepository}";
+}
diff --git a/cobigen-templates/crud-openapi-angular-service-based-app/src/main/resources/template-set.xml b/cobigen-templates/crud-openapi-angular-service-based-app/src/main/resources/template-set.xml
new file mode 100644
index 0000000000..c4a3b7af7b
--- /dev/null
+++ b/cobigen-templates/crud-openapi-angular-service-based-app/src/main/resources/template-set.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:templateSetConfiguration version="6.0" xmlns:tns="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration" xmlns:cc="http://capgemini.com/devonfw/cobigen/ContextConfiguration" xmlns:tc="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration templateSetConfiguration.xsd ">
+ <cc:contextConfiguration version="3.0">
+  <cc:trigger id="crud_openapi_angular_service_based_app" type="openapi">
+    <cc:containerMatcher type="element" value="openAPIFile" />
+    <cc:matcher type="element" value="ComponentDef">
+      <cc:variableAssignment type="constant" key="domain" value="demo" />
+      <cc:variableAssignment type="property" key="component" value="name" />
+      <cc:variableAssignment type="property" key="etoName" value="name" />
+    </cc:matcher>
+  </cc:trigger>
+  <cc:tags>
+    <cc:tag name="Angular"></cc:tag>
+    <cc:tag name="OpenAPI"></cc:tag>
+    <cc:tag name="CRUD"></cc:tag>
+    <cc:tag name="Service"></cc:tag>
+    <cc:tag name="App"></cc:tag>
+  </cc:tags>
+   </cc:contextConfiguration>
+<tc:templatesConfiguration version="5.0">
+
+  <tc:templates>
+    <tc:templateExtension ref="${variables.component#lower_case}RestController.service.ts" mergeStrategy="tsmerge" />
+    <tc:templateExtension ref="api.ts" mergeStrategy="tsmerge" />
+    <tc:templateExtension ref="environment.ts" mergeStrategy="tsmerge_override" />
+    <tc:templateExtension ref="environment.prod.ts" mergeStrategy="tsmerge_override" />
+  </tc:templates>
+
+  <tc:templateScans>
+    <tc:templateScan name="ts_scan" templatePath="templates" destinationPath="" />
+  </tc:templateScans>
+
+  <tc:increments>
+    <tc:increment name="devon4ng-app" description="CRUD devon4ng Service Based Angular" explanation="Creates Angular stack CRUD REST service for the (backends) server.">
+      <tc:incrementRef ref="app_angular_env" />
+      <tc:incrementRef ref="app_angular_devon4j_component" />
+    </tc:increment>
+    <tc:increment name="app_angular_env" description="Server URL Registration">
+      <tc:templateRef ref="environment.ts" />
+      <tc:templateRef ref="environment.prod.ts" />
+    </tc:increment>
+    <tc:increment name="app_angular_devon4j_component" description="API">
+      <tc:templateRef ref="${variables.component#lower_case}RestController.service.ts" />
+      <tc:templateRef ref="api.ts" />
+    </tc:increment>
+  </tc:increments>
+</tc:templatesConfiguration>
+</tns:templateSetConfiguration>
\ No newline at end of file
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_angular_service_based_app/templates/cobigen.properties b/cobigen-templates/crud-openapi-angular-service-based-app/src/main/resources/templates/cobigen.properties
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_angular_service_based_app/templates/cobigen.properties
rename to cobigen-templates/crud-openapi-angular-service-based-app/src/main/resources/templates/cobigen.properties
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_angular_service_based_app/templates/src/app/api/${variables.component#lower_case}/${variables.component#lower_case}RestController.service.ts.ftl b/cobigen-templates/crud-openapi-angular-service-based-app/src/main/resources/templates/src/app/api/${variables.component#lower_case}/${variables.component#lower_case}RestController.service.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_angular_service_based_app/templates/src/app/api/${variables.component#lower_case}/${variables.component#lower_case}RestController.service.ts.ftl
rename to cobigen-templates/crud-openapi-angular-service-based-app/src/main/resources/templates/src/app/api/${variables.component#lower_case}/${variables.component#lower_case}RestController.service.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_angular_service_based_app/templates/src/app/api/api.ts.ftl b/cobigen-templates/crud-openapi-angular-service-based-app/src/main/resources/templates/src/app/api/api.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_angular_service_based_app/templates/src/app/api/api.ts.ftl
rename to cobigen-templates/crud-openapi-angular-service-based-app/src/main/resources/templates/src/app/api/api.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_angular_service_based_app/templates/src/environments/environment.prod.ts.ftl b/cobigen-templates/crud-openapi-angular-service-based-app/src/main/resources/templates/src/environments/environment.prod.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_angular_service_based_app/templates/src/environments/environment.prod.ts.ftl
rename to cobigen-templates/crud-openapi-angular-service-based-app/src/main/resources/templates/src/environments/environment.prod.ts.ftl
diff --git a/cobigen-templates/crud-openapi-angular-service-based-app/src/main/resources/templates/src/environments/environment.ts.ftl b/cobigen-templates/crud-openapi-angular-service-based-app/src/main/resources/templates/src/environments/environment.ts.ftl
new file mode 100644
index 0000000000..c311b61aca
--- /dev/null
+++ b/cobigen-templates/crud-openapi-angular-service-based-app/src/main/resources/templates/src/environments/environment.ts.ftl
@@ -0,0 +1,11 @@
+// The file contents for the current environment will overwrite these during build.
+// The build system defaults to the dev environment which uses `environment.ts`, but if you do
+// `ng build --env=prod` then `environment.prod.ts` will be used instead.
+// The list of which env maps to which file can be found in `angular-cli.json`.
+
+export const environment = {
+  production: false,
+  restPathRoot: 'http://localhost:8081/${variables.domain}-server/',
+  restServiceRoot: 'http://localhost:8081/${variables.domain}-server/services/rest/',
+  security: 'csrf',
+};
diff --git a/cobigen-templates/crud-openapi-angular-service-based-app/src/test/java/com/devonfw/cobigen/templates/devon4j/test/templates/CrudOpenapiAngularServiceBasedAppTest.java b/cobigen-templates/crud-openapi-angular-service-based-app/src/test/java/com/devonfw/cobigen/templates/devon4j/test/templates/CrudOpenapiAngularServiceBasedAppTest.java
new file mode 100644
index 0000000000..26d650b2b4
--- /dev/null
+++ b/cobigen-templates/crud-openapi-angular-service-based-app/src/test/java/com/devonfw/cobigen/templates/devon4j/test/templates/CrudOpenapiAngularServiceBasedAppTest.java
@@ -0,0 +1,100 @@
+package com.devonfw.cobigen.templates.devon4j.test.templates;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+import org.apache.commons.io.FileUtils;
+import org.junit.BeforeClass;
+import org.junit.ClassRule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+
+import com.devonfw.cobigen.api.constants.ConfigurationConstants;
+import com.devonfw.cobigen.maven.test.AbstractMavenTest;
+import com.devonfw.cobigen.templates.devon4j.config.constant.MavenMetadata;
+
+/**
+ * Smoke tests of all templates.
+ */
+public class CrudOpenapiAngularServiceBasedAppTest extends AbstractMavenTest {
+
+  /** Root of all test resources of this test suite */
+  public static final String TEST_RESOURCES_ROOT = "src/test/resources/testdata/templatetest/";
+
+  /** Temporary files rule to create temporary folders */
+  @ClassRule
+  public static TemporaryFolder tempFolder = new TemporaryFolder();
+
+  /** The templates development folder */
+  protected static Path templatesProject;
+
+  /** The templates development folder */
+  protected static Path templatesProjectTemporary;
+
+  /**
+   * Creates a copy of the templates project in the temp directory
+   *
+   * @throws URISyntaxException if the path could not be created properly
+   * @throws IOException if accessing a directory or file fails
+   */
+  @BeforeClass
+  public static void setupDevTemplates() throws URISyntaxException, IOException {
+
+    templatesProject = new File(
+        CrudOpenapiAngularServiceBasedAppTest.class.getProtectionDomain().getCodeSource().getLocation().toURI())
+            .getParentFile().getParentFile().toPath();
+
+    Path utilsPom = new File(
+        CrudOpenapiAngularServiceBasedAppTest.class.getProtectionDomain().getCodeSource().getLocation().toURI())
+            .getParentFile().getParentFile().toPath().resolve("src/test/resources/utils/pom.xml");
+
+    // create a temporary directory cobigen-templates/template-sets/adapted containing the template sets
+    Path tempFolderPath = tempFolder.getRoot().toPath();
+    Path cobigenTemplatePath = tempFolderPath.resolve("cobigen-templates");
+    if (!Files.exists(cobigenTemplatePath)) {
+      Files.createDirectory(cobigenTemplatePath);
+
+      templatesProjectTemporary = cobigenTemplatePath.resolve(ConfigurationConstants.TEMPLATE_SETS_FOLDER);
+      Path templateSetsAdaptedFolder = templatesProjectTemporary.resolve(ConfigurationConstants.ADAPTED_FOLDER);
+      Files.createDirectory(templatesProjectTemporary);
+      Files.createDirectory(templateSetsAdaptedFolder);
+
+      Path templateSetPath = templateSetsAdaptedFolder.resolve("template-set");
+      FileUtils.copyDirectory(templatesProject.toFile(), templateSetPath.toFile());
+
+      if (Files.isDirectory(templateSetPath)) {
+
+        // Replace the pom.xml in the template sets. Needed so that the project in the temp directory is build
+        // properly
+        if (Files.exists(templateSetPath.resolve("pom.xml"))) {
+          try {
+            Files.delete(templateSetPath.resolve("pom.xml"));
+          } catch (IOException e) {
+            throw new IOException("Error deleting file " + templateSetPath.resolve("pom.xml"), e);
+          }
+          try {
+            Files.copy(utilsPom, templateSetPath.resolve("pom.xml"));
+          } catch (IOException e) {
+            throw new IOException("Error copying file " + utilsPom, e);
+          }
+        }
+      }
+    }
+  }
+
+  /**
+   * Test successful generation of all templates based on an ETO
+   *
+   * @throws Exception test fails
+   */
+  @Test
+  public void testAllTemplatesGeneration_OpenApiInput() throws Exception {
+
+    File testProject = new File(TEST_RESOURCES_ROOT + "TestAllTemplatesOpenApiInput/");
+    runMavenInvoker(testProject, templatesProjectTemporary.toFile(), MavenMetadata.LOCAL_REPO);
+  }
+
+}
diff --git a/cobigen-templates/crud-openapi-angular-service-based-app/src/test/resources/application.properties b/cobigen-templates/crud-openapi-angular-service-based-app/src/test/resources/application.properties
new file mode 100644
index 0000000000..cf2c614efb
--- /dev/null
+++ b/cobigen-templates/crud-openapi-angular-service-based-app/src/test/resources/application.properties
@@ -0,0 +1,2 @@
+server.port=8080
+server.context-path=/
\ No newline at end of file
diff --git a/cobigen-templates/crud-openapi-angular-service-based-app/src/test/resources/logback.xml b/cobigen-templates/crud-openapi-angular-service-based-app/src/test/resources/logback.xml
new file mode 100644
index 0000000000..5f29165f75
--- /dev/null
+++ b/cobigen-templates/crud-openapi-angular-service-based-app/src/test/resources/logback.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- This file is for logback classic. The file contains the configuration for slf4j logging -->
+<configuration>
+	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+			<Pattern>%d{HH:mm:ss.SSS} [%thread] [C:%X{correlationId}] - %-5level - %logger{36} - %msg%n
+			</Pattern>
+		</encoder>
+	</appender>
+
+	<root level="INFO">
+		<appender-ref ref="STDOUT" />
+	</root>
+</configuration>
diff --git a/cobigen-templates/crud-openapi-angular-service-based-app/src/test/resources/testdata/templatetest/TestAllTemplatesOpenApiInput/OpenAPI.yaml b/cobigen-templates/crud-openapi-angular-service-based-app/src/test/resources/testdata/templatetest/TestAllTemplatesOpenApiInput/OpenAPI.yaml
new file mode 100644
index 0000000000..14b9ec10cf
--- /dev/null
+++ b/cobigen-templates/crud-openapi-angular-service-based-app/src/test/resources/testdata/templatetest/TestAllTemplatesOpenApiInput/OpenAPI.yaml
@@ -0,0 +1,131 @@
+openapi: 3.0.0
+servers:
+  - url: 'https://localhost:8081/server/services/rest'
+info:
+  title: Devon Example
+  description: Example of a API definition
+  version: 1.0.0
+  x-rootpackage: com.devonfw.demo
+paths:
+  /datamanagement/v1/someData/{id}:
+    get:
+      operationId: findSomeData
+      parameters:
+        - name: id
+          in: path
+          required: true
+          schema:
+            type: integer
+            format: int64
+            minimum: 0
+            maximum: 50
+      responses:
+        '200':
+          description: Any
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/EvenMoreData'
+            text/plain:
+              schema:
+                type: string
+  /datamanagement/v1/moreData/{id}:
+    get:
+      operationId: findMoreData
+      parameters:
+        - name: id
+          in: path
+          required: true
+          schema:
+            type: integer
+            format: int64
+            minimum: 10
+            maximum: 200
+      responses:
+        '200':
+          description: Any
+  /datamanagement/v1/someData/:
+    post:
+      responses:
+        '200':
+          description: Any
+      requestBody:
+        $ref: '#/components/requestBodies/SomeData'
+      tags:
+       - searchCriteria
+  /datamanagement/v1/moreData/validateMoreData:
+    post:
+      responses:
+       '200':
+          description: Any
+      requestBody:
+        $ref: '#/components/requestBodies/MoreData'
+components:
+    schemas:
+        SomeData:
+          x-component: DataManagement
+          description: Entity definiton of SomeData
+          type: object
+          properties:
+            AnyString:
+              type: string
+              maxLength: 100
+              minLength: 5
+              uniqueItems: true
+            furtherData:
+              type: array
+              items:
+                $ref: '#/components/schemas/FurtherData'
+        MoreData:
+          x-component: DataManagement
+          description: Entity definiton of Moredata
+          type: object
+          properties:
+            anyNumber:
+              type: number
+              format: int64
+              maximum: 100
+              minimum: 0
+            someData:
+              $ref: '#/components/schemas/SomeData'
+            allSomeData:
+              type: array
+              description: 'All SomeData'
+              items:
+                $ref: '#/components/schemas/SomeData'
+          required:
+            - saleExample
+        FurtherData:
+          x-component: AnotherComponent
+          type: object
+          properties:
+            parent:
+              $ref: '#/components/schemas/SomeData'
+            valid:
+              type: boolean
+            someList:
+              type: array
+              items:
+                type: string
+        EvenMoreData:
+          x-component: AnotherComponent
+          description: Entity definiton of more data
+          type: object
+          properties:
+            id:
+              type: integer
+              format: int64
+              uniqueItems: true
+    requestBodies:
+        SomeData:
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/SomeData'
+          required: true
+        MoreData:
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/MoreData'
+          required: true
diff --git a/cobigen-templates/crud-openapi-angular-service-based-app/src/test/resources/testdata/templatetest/TestAllTemplatesOpenApiInput/logback.xml b/cobigen-templates/crud-openapi-angular-service-based-app/src/test/resources/testdata/templatetest/TestAllTemplatesOpenApiInput/logback.xml
new file mode 100644
index 0000000000..5f29165f75
--- /dev/null
+++ b/cobigen-templates/crud-openapi-angular-service-based-app/src/test/resources/testdata/templatetest/TestAllTemplatesOpenApiInput/logback.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- This file is for logback classic. The file contains the configuration for slf4j logging -->
+<configuration>
+	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+			<Pattern>%d{HH:mm:ss.SSS} [%thread] [C:%X{correlationId}] - %-5level - %logger{36} - %msg%n
+			</Pattern>
+		</encoder>
+	</appender>
+
+	<root level="INFO">
+		<appender-ref ref="STDOUT" />
+	</root>
+</configuration>
diff --git a/cobigen-templates/crud-openapi-angular-service-based-app/src/test/resources/testdata/templatetest/TestAllTemplatesOpenApiInput/pom.xml b/cobigen-templates/crud-openapi-angular-service-based-app/src/test/resources/testdata/templatetest/TestAllTemplatesOpenApiInput/pom.xml
new file mode 100644
index 0000000000..7f84fdeef0
--- /dev/null
+++ b/cobigen-templates/crud-openapi-angular-service-based-app/src/test/resources/testdata/templatetest/TestAllTemplatesOpenApiInput/pom.xml
@@ -0,0 +1,84 @@
+<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>com.devonfw.cobigen</groupId>
+  <artifactId>devon4jTemplateTest-TestAllTemplatesOpenAPIInput</artifactId>
+  <version>dev-SNAPSHOT</version>
+
+  <properties>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
+  </properties>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>com.devonfw.cobigen</groupId>
+        <artifactId>cobigen-maven-plugin</artifactId>
+        <version>${pluginVersion}</version>
+        <executions>
+          <execution>
+            <id>generate</id>
+            <phase>package</phase>
+            <goals>
+              <goal>generate</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <configurationFolder>${templatesProject}</configurationFolder>
+          <inputFiles>
+            <inputFile>OpenAPI.yaml</inputFile>
+          </inputFiles>
+          <templates>
+            <template>ALL</template>
+          </templates>
+          <failOnNothingGenerated>true</failOnNothingGenerated>
+        </configuration>
+        <dependencies>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>tempeng-freemarker</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>javaplugin</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>htmlplugin</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>tsplugin</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>jsonplugin</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>openapiplugin</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>xmlplugin</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>textmerger</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+        </dependencies>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>
diff --git a/cobigen-templates/crud-openapi-angular-service-based-app/src/test/resources/utils/pom.xml b/cobigen-templates/crud-openapi-angular-service-based-app/src/test/resources/utils/pom.xml
new file mode 100644
index 0000000000..9a33c5c4f2
--- /dev/null
+++ b/cobigen-templates/crud-openapi-angular-service-based-app/src/test/resources/utils/pom.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.devonfw.cobigen.templates</groupId>
+  <artifactId>crud-openapi-angular-service-based-app</artifactId>
+  <version>2021.12.007-SNAPSHOT</version>
+  <name>Crud OpenApi Angular Service Based App</name>
+  <description>A Code-based incremental Generator</description>
+  <url>https://github.com/devonfw/cobigen/templates-parent/templates-devon4j-utils</url>
+  <licenses>
+    <license>
+      <name>Apache Software License 2.0</name>
+      <url>https://raw.githubusercontent.com/devonfw/.github/master/LICENSE</url>
+      <distribution>repo</distribution>
+      <comments></comments>
+    </license>
+  </licenses>
+  <dependencies>
+    <dependency>
+      <groupId>javax.ws.rs</groupId>
+      <artifactId>javax.ws.rs-api</artifactId>
+      <version>2.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.data</groupId>
+      <artifactId>spring-data-rest-webmvc</artifactId>
+      <version>3.7.10</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+      <version>3.12.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+      <version>2.10.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>xerces</groupId>
+      <artifactId>xercesImpl</artifactId>
+      <version>2.12.2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.persistence</groupId>
+      <artifactId>javax.persistence-api</artifactId>
+      <version>2.2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>1.7.30</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <version>1.7.30</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>log4j-over-slf4j</artifactId>
+      <version>1.7.30</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+  <repositories>
+    <repository>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+      <id>ossrh</id>
+      <name>OSSRH Snapshots</name>
+      <url>https://s01.oss.sonatype.org/content/repositories/snapshots/</url>
+    </repository>
+  </repositories>
+
+  <properties>
+   <maven.compiler.source>1.8</maven.compiler.source>
+   <maven.compiler.target>1.8</maven.compiler.target>
+  </properties>
+
+  <build>
+   <resources>
+     <resource>
+       <directory>src/main/java</directory>
+     </resource>
+   </resources>
+  </build></project>
\ No newline at end of file
diff --git a/cobigen-templates/crud-openapi-ionic-client-app/pom.xml b/cobigen-templates/crud-openapi-ionic-client-app/pom.xml
new file mode 100644
index 0000000000..fbfd00fd3f
--- /dev/null
+++ b/cobigen-templates/crud-openapi-ionic-client-app/pom.xml
@@ -0,0 +1,19 @@
+<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>crud-openapi-ionic-client-app</artifactId>
+  <name>CRUD OpenAPI Ionic Client App template</name>
+
+  <parent>
+    <groupId>com.devonfw.cobigen.templates</groupId>
+    <artifactId>templates-parent</artifactId>
+    <version>${revision}</version>
+  </parent>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+    </dependency>
+  </dependencies>
+</project>
\ No newline at end of file
diff --git a/cobigen-templates/crud-openapi-ionic-client-app/src/main/java-templates/com/devonfw/cobigen/templates/devon4j/config/constant/MavenMetadata.java b/cobigen-templates/crud-openapi-ionic-client-app/src/main/java-templates/com/devonfw/cobigen/templates/devon4j/config/constant/MavenMetadata.java
new file mode 100644
index 0000000000..395d46154d
--- /dev/null
+++ b/cobigen-templates/crud-openapi-ionic-client-app/src/main/java-templates/com/devonfw/cobigen/templates/devon4j/config/constant/MavenMetadata.java
@@ -0,0 +1,12 @@
+package com.devonfw.cobigen.templates.devon4j.config.constant;
+
+/**
+ * Constants extracted from the maven pom by templating-maven-plugin.
+ * 
+ * @see "edit template in src/main/java-templates"
+ */
+public class MavenMetadata {
+
+    /** Local repository path */
+    public static final String LOCAL_REPO = "${settings.localRepository}";
+}
diff --git a/cobigen-templates/crud-openapi-ionic-client-app/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/JavaUtil.java b/cobigen-templates/crud-openapi-ionic-client-app/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/JavaUtil.java
new file mode 100644
index 0000000000..ced2f5fde2
--- /dev/null
+++ b/cobigen-templates/crud-openapi-ionic-client-app/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/JavaUtil.java
@@ -0,0 +1,464 @@
+package com.devonfw.cobigen.templates.devon4j.utils;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.Collection;
+import java.util.Map;
+
+import org.apache.commons.lang3.ClassUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Provides type operations, mainly checks and casts for Java Primitives, to be used in the templates
+ *
+ */
+public class JavaUtil {
+
+  /**
+   * Logger for this class
+   */
+  private static final Logger LOG = LoggerFactory.getLogger(JavaUtil.class);
+
+  /**
+   * The constructor.
+   */
+  public JavaUtil() {
+
+    // Empty for CobiGen to automatically instantiate it
+  }
+
+  /**
+   * Returns the Object version of a Java primitive or the input if the input isn't a java primitive
+   * 
+   * @param simpleType String
+   * @return the corresponding object wrapper type simple name of the input if the input is the name of a primitive java
+   *         type. The input itself if not. (e.g. "int" results in "Integer")
+   * @throws ClassNotFoundException should not occur.
+   */
+  public String boxJavaPrimitives(String simpleType) throws ClassNotFoundException {
+
+    if (equalsJavaPrimitive(simpleType)) {
+      return ClassUtils.primitiveToWrapper(ClassUtils.getClass(simpleType)).getSimpleName();
+    } else {
+      return simpleType;
+    }
+
+  }
+
+  /**
+   * Returns the simple name of the type of a field in the pojoClass. If the type is a java primitive the name of the
+   * wrapper class is returned
+   *
+   * @param pojoClass {@link Class} the class object of the pojo
+   * @param fieldName {@link String} the name of the field
+   * @return String. The simple name of the field's type. The simple name of the wrapper class in case of java
+   *         primitives
+   * @throws NoSuchFieldException indicating something awefully wrong in the used model
+   * @throws SecurityException if the field cannot be accessed.
+   */
+  public String boxJavaPrimitives(Class<?> pojoClass, String fieldName) throws NoSuchFieldException, SecurityException {
+
+    if (pojoClass == null) {
+      throw new IllegalAccessError(
+          "Class object is null. Cannot generate template as it might obviously depend on reflection.");
+    }
+
+    if (equalsJavaPrimitive(pojoClass, fieldName)) {
+      return ClassUtils.primitiveToWrapper(pojoClass.getDeclaredField(fieldName).getType()).getSimpleName();
+    } else {
+      Field field = pojoClass.getDeclaredField(fieldName);
+      if (field == null) {
+        field = pojoClass.getField(fieldName);
+      }
+      if (field == null) {
+        throw new IllegalAccessError("Could not find field " + fieldName + " in class " + pojoClass);
+      } else {
+        return field.getType().getSimpleName();
+      }
+    }
+  }
+
+  /**
+   * Checks if the given type is a Java primitive
+   *
+   * @param simpleType the type to be checked
+   * @return true iff simpleType is a Java primitive
+   */
+  public boolean equalsJavaPrimitive(String simpleType) {
+
+    try {
+      return ClassUtils.getClass(simpleType).isPrimitive();
+    } catch (ClassNotFoundException e) {
+      LOG.warn("{}: Could not find {}", e.getMessage(), simpleType);
+      return false;
+    }
+  }
+
+  /**
+   * Checks if the given type is a Java primitive or wrapper
+   *
+   * @param simpleType the type to be checked
+   * @return true iff simpleType is a Java primitive or wrapper
+   */
+  public boolean equalsJavaPrimitiveOrWrapper(String simpleType) {
+
+    try {
+      return ClassUtils.isPrimitiveOrWrapper(ClassUtils.getClass(simpleType));
+    } catch (ClassNotFoundException e) {
+      LOG.warn("{}: Could not find {}", e.getMessage(), simpleType);
+      return false;
+    }
+  }
+
+  /**
+   * Checks if the type of the field in the pojo's class is a java primitive
+   *
+   * @param pojoClass the {@link Class} object of the pojo
+   * @param fieldName the name of the field to be checked
+   * @return true iff the field is a java primitive
+   * @throws NoSuchFieldException indicating something awefully wrong in the used model
+   * @throws SecurityException if the field cannot be accessed.
+   */
+  public boolean equalsJavaPrimitive(Class<?> pojoClass, String fieldName)
+      throws NoSuchFieldException, SecurityException {
+
+    if (pojoClass == null) {
+      return false;
+    }
+
+    Field field = pojoClass.getDeclaredField(fieldName);
+    if (field == null) {
+      field = pojoClass.getField(fieldName);
+    }
+    if (field == null) {
+      return false;
+    } else {
+      return field.getType().isPrimitive();
+    }
+  }
+
+  /**
+   * Checks if the given type is a Java primitive or a Java primitive array
+   *
+   * @param simpleType the Type name to be checked
+   * @return true iff {@link #equalsJavaPrimitive(String)} is true or if simpleType is an array with a primitive
+   *         component
+   */
+  public boolean equalsJavaPrimitiveIncludingArrays(String simpleType) {
+
+    Class<?> klasse;
+
+    try {
+      klasse = ClassUtils.getClass(simpleType).getComponentType();
+    } catch (ClassNotFoundException e) {
+      LOG.warn("{}: Could not find {}", e.getMessage(), simpleType);
+      return false;
+    }
+    return equalsJavaPrimitive(simpleType) || (klasse != null && klasse.isPrimitive());
+  }
+
+  /**
+   * Checks if the given field in the pojo class is a java primitive or an array of java primitives
+   *
+   * @param pojoClass the class object of the pojo
+   * @param fieldName the name of the field to be checked
+   * @return true iff {@link #equalsJavaPrimitive(Class, String)} is true or the field is an array of primitives
+   * @throws NoSuchFieldException indicating something awfully wrong in the used model
+   * @throws SecurityException if the field cannot be accessed.
+   */
+  public boolean equalsJavaPrimitiveIncludingArrays(Class<?> pojoClass, String fieldName)
+      throws NoSuchFieldException, SecurityException {
+
+    return equalsJavaPrimitive(pojoClass, fieldName) || (pojoClass.getDeclaredField(fieldName).getType().isArray()
+        && pojoClass.getDeclaredField(fieldName).getType().getComponentType().isPrimitive());
+  }
+
+  /**
+   * Returns a cast statement for a given (java primitive, variable name) pair or nothing if the type isn't a java
+   * primitive
+   *
+   * @param simpleType Java Type
+   * @param varName Variable name
+   * @return String either of the form '((Java Primitive Object Type)varName)' if simpleType is a primitive or the empty
+   *         String otherwise
+   * @throws ClassNotFoundException should not occur
+   */
+  public String castJavaPrimitives(String simpleType, String varName) throws ClassNotFoundException {
+
+    if (equalsJavaPrimitive(simpleType)) {
+      return String.format("((%1$s)%2$s)", boxJavaPrimitives(simpleType), varName);
+    } else {
+      return "";
+    }
+  }
+
+  /**
+   * Returns a cast statement for a given (java primitive, variable name) pair or nothing if the type isn't a java
+   * primitive
+   *
+   * @param pojoClass the class object of the pojo
+   * @param fieldName the name of the field to be casted
+   * @return if fieldName points to a primitive field then a casted statement (e.g. for an int field:
+   *         '((Integer)field)') or an empty String otherwise
+   * @throws NoSuchFieldException indicating something awefully wrong in the used model
+   * @throws SecurityException if the field cannot be accessed.
+   */
+  public String castJavaPrimitives(Class<?> pojoClass, String fieldName)
+      throws NoSuchFieldException, SecurityException {
+
+    if (equalsJavaPrimitive(pojoClass, fieldName)) {
+      return String.format("((%1$s)%2$s)", boxJavaPrimitives(pojoClass, fieldName), fieldName);
+    } else {
+      return "";
+    }
+  }
+
+  /**
+   * @param pojoClass {@link Class} the class object of the pojo
+   * @param fieldName {@link String} the name of the field
+   * @return true if the field is an instance of java.utils.Collections
+   * @throws NoSuchFieldException indicating something awefully wrong in the used model
+   * @throws SecurityException if the field cannot be accessed.
+   */
+  public boolean isCollection(Class<?> pojoClass, String fieldName) throws NoSuchFieldException, SecurityException {
+
+    if (pojoClass == null) {
+      return false;
+    }
+
+    Field field = pojoClass.getDeclaredField(fieldName);
+    if (field == null) {
+      field = pojoClass.getField(fieldName);
+    }
+    if (field == null) {
+      return false;
+    } else {
+      return Collection.class.isAssignableFrom(field.getType());
+    }
+
+  }
+
+  /**
+   * Returns the Ext Type to a given java type
+   *
+   * @param simpleType any java type's simple name
+   * @return corresponding Ext type
+   */
+  public String getExtType(String simpleType) {
+
+    switch (simpleType) {
+      case "short":
+      case "Short":
+      case "int":
+      case "Integer":
+      case "long":
+      case "Long":
+        return "Integer";
+      case "float":
+      case "Float":
+      case "double":
+      case "Double":
+        return "Number";
+      case "boolean":
+      case "Boolean":
+        return "Boolean";
+      case "char":
+      case "Character":
+      case "String":
+        return "String";
+      case "Date":
+        return "Date";
+      default:
+        return "Field";
+    }
+  }
+
+  /**
+   * returns the Angular5 type associated with a Java primitive
+   *
+   * @param simpleType :{@link String} the type to be parsed
+   * @return the corresponding Angular type or 'any' otherwise
+   */
+  public String getAngularType(String simpleType) {
+
+    switch (simpleType) {
+      case "boolean":
+        return "boolean";
+      case "Boolean":
+        return "boolean";
+      case "short":
+        return "number";
+      case "Short":
+        return "number";
+      case "int":
+        return "number";
+      case "Integer":
+        return "number";
+      case "long":
+        return "number";
+      case "Long":
+        return "number";
+      case "float":
+        return "number";
+      case "Float":
+        return "number";
+      case "double":
+        return "number";
+      case "Double":
+        return "number";
+      case "char":
+        return "string";
+      case "Character":
+        return "string";
+      case "String":
+        return "string";
+      case "byte":
+        return "number";
+      default:
+        return "any";
+    }
+  }
+
+  /**
+   * returns the class name of the return type of a specific method.
+   *
+   * @param pojoClass {@link Class}&lt;?&gt; the class object of the pojo
+   * @param methodName {@link String} the name of the method
+   * @return the class name of the return type of the specified method
+   * @throws SecurityException If no method of the given name can be found
+   * @throws NoSuchMethodException If no method of the given name can be found
+   */
+  public String getReturnType(Class<?> pojoClass, String methodName) throws NoSuchMethodException, SecurityException {
+
+    if (pojoClass == null) {
+      throw new IllegalAccessError(
+          "Class object is null. Cannot generate template as it might obviously depend on reflection.");
+    }
+    String s = "-";
+    Method method = findMethod(pojoClass, methodName);
+    if (method != null && !method.getReturnType().equals(Void.TYPE)) {
+      s = method.getReturnType().toString();
+      s = s.substring(s.lastIndexOf('.') + 1, s.length());
+    }
+    return s;
+  }
+
+  /**
+   *
+   * This methods returns the return type of the method in the given pojoClass which are annotated with the parameter
+   * annotatedClass
+   *
+   * @param pojoClass - The class in which to find if it has methods with annotatedClass
+   * @param annotatedClassName - The annotation which needs to be found
+   * @return Return type of the method annotated with the given annotation, else "null"
+   * @throws ClassNotFoundException if the annotated class name could not be found in the class path
+   */
+  @SuppressWarnings("unchecked")
+  public String getReturnTypeOfMethodAnnotatedWith(Class<?> pojoClass, String annotatedClassName)
+      throws ClassNotFoundException {
+
+    if (pojoClass == null) {
+      throw new IllegalAccessError(
+          "Class object is null. Cannot generate template as it might obviously depend on reflection.");
+    }
+
+    Method[] methods = pojoClass.getDeclaredMethods();
+    for (Method method : methods) {
+      if (!method.getName().startsWith("get")) {
+        continue;
+      }
+      for (Annotation a : method.getAnnotations()) {
+        // better if (method.isAnnotationPresent(classObj)) {, but postponed as of different class
+        // loaders of a.getClass() and pojoClass.getClass()
+        if (a.getClass().getCanonicalName().equals(annotatedClassName)) {
+          return method.getReturnType().getSimpleName();
+        }
+      }
+    }
+    return "null";
+  }
+
+  /**
+   * returns the HTTP request type corresponding to an annotation type
+   *
+   * @param annotations The annotation to get the type name of
+   * @return the HTTP request type name of the selected annotation
+   */
+  public String getRequestType(Map<String, Object> annotations) {
+
+    if (annotations.containsKey("javax_ws_rs_GET")) {
+      return "GET";
+    } else if (annotations.containsKey("javax_ws_rs_PUT")) {
+      return "PUT";
+    } else if (annotations.containsKey("javax_ws_rs_POST")) {
+      return "POST";
+    } else if (annotations.containsKey("javax_ws_rs_DELETE")) {
+      return "DELETE";
+    } else if (annotations.containsKey("javax_ws_rs_PATCH")) {
+      return "PATCH";
+    } else {
+      return "-";
+    }
+  }
+
+  /**
+   * Helper method to find a class's specific method
+   *
+   * @param pojoClass {@link Class}&lt;?&gt; the class object of the pojo
+   * @param methodName The name of the method to be found
+   * @return The method object of the method to be found, null if it wasn't found
+   */
+  private Method findMethod(Class<?> pojoClass, String methodName) {
+
+    if (pojoClass == null) {
+      throw new IllegalAccessError(
+          "Class object is null. Cannot generate template as it might obviously depend on reflection.");
+    }
+    for (Method m : pojoClass.getMethods()) {
+      if (m.getName().equals(methodName)) {
+        return m;
+      }
+    }
+    return null;
+  }
+
+  /**
+   * Checks whether the class given by the full qualified name is an enum
+   *
+   * @param className full qualified class name
+   * @return <code>true</code> if the class is an enum, <code>false</code> otherwise
+   */
+  public boolean isEnum(String className) {
+
+    try {
+      return ClassUtils.getClass(className).isEnum();
+    } catch (ClassNotFoundException e) {
+      LOG.warn("{}: Could not find {}", e.getMessage(), className);
+      return false;
+    }
+  }
+
+  /**
+   * Returns the first enum value of an enum class
+   *
+   * @param className full qualified class name
+   * @return the first enum value name found in order
+   */
+  public String getFirstEnumValue(String className) {
+
+    try {
+      Class<?> enumClass = ClassUtils.getClass(className);
+      Field[] declaredFields = enumClass.getDeclaredFields();
+      if (declaredFields.length > 0) {
+        return declaredFields[0].getName();
+      } else {
+        return null;
+      }
+    } catch (ClassNotFoundException e) {
+      LOG.warn("{}: Could not find {}", e.getMessage(), className);
+      return null;
+    }
+  }
+}
diff --git a/cobigen-templates/crud-openapi-ionic-client-app/src/main/resources/template-set.xml b/cobigen-templates/crud-openapi-ionic-client-app/src/main/resources/template-set.xml
new file mode 100644
index 0000000000..cbd540239e
--- /dev/null
+++ b/cobigen-templates/crud-openapi-ionic-client-app/src/main/resources/template-set.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:templateSetConfiguration version="6.0" xmlns:tns="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration" xmlns:cc="http://capgemini.com/devonfw/cobigen/ContextConfiguration" xmlns:tc="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration templateSetConfiguration.xsd ">
+	
+	 <cc:contextConfiguration version="3.0">
+  <cc:trigger id="crud_openapi_ionic_client_app" type="openapi">
+    <cc:containerMatcher type="element" value="openAPIFile" />
+    <cc:matcher type="element" value="EntityDef">
+      <cc:variableAssignment type="constant" key="domain" value="demo" />
+      <cc:variableAssignment type="property" key="component" value="componentName" />
+      <cc:variableAssignment type="property" key="etoName" value="name" />
+    </cc:matcher>
+  </cc:trigger>
+  <cc:tags>
+    <cc:tag name="Ionic"></cc:tag>
+    <cc:tag name="OpenAPI"></cc:tag>
+    <cc:tag name="CRUD"></cc:tag>
+    <cc:tag name="Client"></cc:tag>
+    <cc:tag name="App"></cc:tag>
+  </cc:tags>
+  <cc:links>
+    <cc:link url="https://github.com/devonfw/cobigen/wiki/howto-devonfw-CobiGen-OpenAPI"></cc:link>
+  </cc:links>
+   </cc:contextConfiguration>
+	
+	 <tc:templatesConfiguration version="5.0">
+  <tc:templates>
+    <tc:templateExtension ref="${variables.etoName#lower_case}-detail.page.ts" mergeStrategy="tsmerge" />
+    <tc:templateExtension ref="${variables.etoName#lower_case}-list.page.ts" mergeStrategy="tsmerge_override" />
+    <tc:templateExtension ref="app.component.ts" mergeStrategy="tsmerge_override" />
+    <tc:templateExtension ref="app.module.ts" mergeStrategy="tsmerge_override" />
+    <tc:templateExtension ref="${variables.etoName#lower_case}-rest.service.ts" mergeStrategy="tsmerge_override" />
+    <tc:templateExtension ref="${variables.etoName#lower_case}.ts" />
+    <tc:templateExtension ref="${variables.etoName#lower_case}-search-criteria.ts" />
+    <tc:templateExtension ref="paginated-list-to.ts" />
+    <tc:templateExtension ref="pageable.ts" />
+    <tc:templateExtension ref="sort.ts" />
+    <tc:templateExtension ref="environment.android.ts" mergeStrategy="tsmerge_override" />
+    <tc:templateExtension ref="environment.prod.ts" mergeStrategy="tsmerge_override" />
+    <tc:templateExtension ref="environment.ts" mergeStrategy="tsmerge_override" />
+    <tc:templateExtension ref="app-routing.module.ts" mergeStrategy="tsmerge_override" />
+    <tc:templateExtension ref="${variables.etoName#lower_case}-detail.page.html" mergeStrategy="html-ng*" />
+    <tc:templateExtension ref="${variables.etoName#lower_case}-list.page.html" mergeStrategy="html-ng*" />
+    <tc:templateExtension ref="es.json" mergeStrategy="jsonmerge_override" />
+    <tc:templateExtension ref="en.json" mergeStrategy="jsonmerge_override" />
+    <tc:templateExtension ref="it.json" mergeStrategy="jsonmerge_override" />
+    <tc:templateExtension ref="business-operator.service.ts" mergeStrategy="tsmerge_override" />
+  </tc:templates>
+
+  <tc:templateScans>
+    <tc:templateScan name="ts_scan" templatePath="templates" destinationPath="" />
+  </tc:templateScans>
+
+  <tc:increments>
+    <tc:increment name="devon4ng-app" description="CRUD devon4ng Ionic App" explanation="Creates Ionic stack CRUD service.">
+      <tc:incrementRef ref="app_ionic_structure" />
+      <tc:incrementRef ref="ionic_routing" />
+      <tc:incrementRef ref="ionic_i18n" />
+      <tc:incrementRef ref="ionic_component" />
+      <tc:incrementRef ref="ionic_theme" />
+    </tc:increment>
+    <tc:increment name="app_ionic_structure" description="Ionic devon4ng environments">
+      <tc:templateRef ref="environment.android.ts" />
+      <tc:templateRef ref="environment.prod.ts" />
+      <tc:templateRef ref="environment.ts" />
+    </tc:increment>
+    <tc:increment name="ionic_routing" description="Ionic routing">
+      <tc:templateRef ref="app-routing.module.ts" />
+    </tc:increment>
+    <tc:increment name="ionic_i18n" description="Ionic i18n">
+      <tc:templateRef ref="es.json" />
+      <tc:templateRef ref="en.json" />
+      <tc:templateRef ref="it.json" />
+    </tc:increment>
+    <tc:increment name="ionic_component" description="Ionic List">
+      <tc:templateRef ref="${variables.etoName#lower_case}.ts" />
+      <tc:templateRef ref="${variables.etoName#lower_case}-search-criteria.ts" />
+      <tc:templateRef ref="paginated-list-to.ts" />
+      <tc:templateRef ref="app.component.ts" />
+      <tc:templateRef ref="app.module.ts" />
+      <tc:templateRef ref="pageable.ts" />
+      <tc:templateRef ref="sort.ts" />
+      <tc:templateRef ref="${variables.etoName#lower_case}-rest.service.ts" />
+      <tc:templateRef ref="${variables.etoName#lower_case}-list.page.ts" />
+      <tc:templateRef ref="${variables.etoName#lower_case}-list.page.html" />
+      <tc:templateRef ref="${variables.etoName#lower_case}-list.page.scss" />
+      <tc:templateRef ref="${variables.etoName#lower_case}-detail.page.ts" />
+      <tc:templateRef ref="${variables.etoName#lower_case}-detail.page.html" />
+      <tc:templateRef ref="${variables.etoName#lower_case}-detail.page.scss" />
+      <tc:templateRef ref="business-operator.service.ts" />
+    </tc:increment>
+    <tc:increment name="ionic_theme" description="Ionic theme">
+      <tc:templateRef ref="variables.scss" />
+    </tc:increment>
+  </tc:increments>
+</tc:templatesConfiguration>
+</tns:templateSetConfiguration>
\ No newline at end of file
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_ionic_client_app/templates/cobigen.properties b/cobigen-templates/crud-openapi-ionic-client-app/src/main/resources/templates/cobigen.properties
old mode 100755
new mode 100644
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_ionic_client_app/templates/cobigen.properties
rename to cobigen-templates/crud-openapi-ionic-client-app/src/main/resources/templates/cobigen.properties
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_ionic_client_app/templates/src/app/app-routing.module.ts.ftl b/cobigen-templates/crud-openapi-ionic-client-app/src/main/resources/templates/src/app/app-routing.module.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_ionic_client_app/templates/src/app/app-routing.module.ts.ftl
rename to cobigen-templates/crud-openapi-ionic-client-app/src/main/resources/templates/src/app/app-routing.module.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_ionic_client_app/templates/src/app/app.component.ts.ftl b/cobigen-templates/crud-openapi-ionic-client-app/src/main/resources/templates/src/app/app.component.ts.ftl
old mode 100755
new mode 100644
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_ionic_client_app/templates/src/app/app.component.ts.ftl
rename to cobigen-templates/crud-openapi-ionic-client-app/src/main/resources/templates/src/app/app.component.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_ionic_client_app/templates/src/app/app.module.ts.ftl b/cobigen-templates/crud-openapi-ionic-client-app/src/main/resources/templates/src/app/app.module.ts.ftl
old mode 100755
new mode 100644
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_ionic_client_app/templates/src/app/app.module.ts.ftl
rename to cobigen-templates/crud-openapi-ionic-client-app/src/main/resources/templates/src/app/app.module.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_ionic_client_app/templates/src/app/pages/${variables.etoName#lower_case}-detail/${variables.etoName#lower_case}-detail.page.html.ftl b/cobigen-templates/crud-openapi-ionic-client-app/src/main/resources/templates/src/app/pages/${variables.etoName#lower_case}-detail/${variables.etoName#lower_case}-detail.page.html.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_ionic_client_app/templates/src/app/pages/${variables.etoName#lower_case}-detail/${variables.etoName#lower_case}-detail.page.html.ftl
rename to cobigen-templates/crud-openapi-ionic-client-app/src/main/resources/templates/src/app/pages/${variables.etoName#lower_case}-detail/${variables.etoName#lower_case}-detail.page.html.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_ionic_client_app/templates/src/app/pages/${variables.etoName#lower_case}-detail/${variables.etoName#lower_case}-detail.page.scss.ftl b/cobigen-templates/crud-openapi-ionic-client-app/src/main/resources/templates/src/app/pages/${variables.etoName#lower_case}-detail/${variables.etoName#lower_case}-detail.page.scss.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_ionic_client_app/templates/src/app/pages/${variables.etoName#lower_case}-detail/${variables.etoName#lower_case}-detail.page.scss.ftl
rename to cobigen-templates/crud-openapi-ionic-client-app/src/main/resources/templates/src/app/pages/${variables.etoName#lower_case}-detail/${variables.etoName#lower_case}-detail.page.scss.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_ionic_client_app/templates/src/app/pages/${variables.etoName#lower_case}-detail/${variables.etoName#lower_case}-detail.page.ts.ftl b/cobigen-templates/crud-openapi-ionic-client-app/src/main/resources/templates/src/app/pages/${variables.etoName#lower_case}-detail/${variables.etoName#lower_case}-detail.page.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_ionic_client_app/templates/src/app/pages/${variables.etoName#lower_case}-detail/${variables.etoName#lower_case}-detail.page.ts.ftl
rename to cobigen-templates/crud-openapi-ionic-client-app/src/main/resources/templates/src/app/pages/${variables.etoName#lower_case}-detail/${variables.etoName#lower_case}-detail.page.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_ionic_client_app/templates/src/app/pages/${variables.etoName#lower_case}-list/${variables.etoName#lower_case}-list.page.html.ftl b/cobigen-templates/crud-openapi-ionic-client-app/src/main/resources/templates/src/app/pages/${variables.etoName#lower_case}-list/${variables.etoName#lower_case}-list.page.html.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_ionic_client_app/templates/src/app/pages/${variables.etoName#lower_case}-list/${variables.etoName#lower_case}-list.page.html.ftl
rename to cobigen-templates/crud-openapi-ionic-client-app/src/main/resources/templates/src/app/pages/${variables.etoName#lower_case}-list/${variables.etoName#lower_case}-list.page.html.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_ionic_client_app/templates/src/app/pages/${variables.etoName#lower_case}-list/${variables.etoName#lower_case}-list.page.scss.ftl b/cobigen-templates/crud-openapi-ionic-client-app/src/main/resources/templates/src/app/pages/${variables.etoName#lower_case}-list/${variables.etoName#lower_case}-list.page.scss.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_ionic_client_app/templates/src/app/pages/${variables.etoName#lower_case}-list/${variables.etoName#lower_case}-list.page.scss.ftl
rename to cobigen-templates/crud-openapi-ionic-client-app/src/main/resources/templates/src/app/pages/${variables.etoName#lower_case}-list/${variables.etoName#lower_case}-list.page.scss.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_ionic_client_app/templates/src/app/pages/${variables.etoName#lower_case}-list/${variables.etoName#lower_case}-list.page.ts.ftl b/cobigen-templates/crud-openapi-ionic-client-app/src/main/resources/templates/src/app/pages/${variables.etoName#lower_case}-list/${variables.etoName#lower_case}-list.page.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_ionic_client_app/templates/src/app/pages/${variables.etoName#lower_case}-list/${variables.etoName#lower_case}-list.page.ts.ftl
rename to cobigen-templates/crud-openapi-ionic-client-app/src/main/resources/templates/src/app/pages/${variables.etoName#lower_case}-list/${variables.etoName#lower_case}-list.page.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_ionic_client_app/templates/src/app/services/${variables.etoName#lower_case}-rest.service.ts.ftl b/cobigen-templates/crud-openapi-ionic-client-app/src/main/resources/templates/src/app/services/${variables.etoName#lower_case}-rest.service.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_ionic_client_app/templates/src/app/services/${variables.etoName#lower_case}-rest.service.ts.ftl
rename to cobigen-templates/crud-openapi-ionic-client-app/src/main/resources/templates/src/app/services/${variables.etoName#lower_case}-rest.service.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_ionic_client_app/templates/src/app/services/interfaces/${variables.etoName#lower_case}-search-criteria.ts.ftl b/cobigen-templates/crud-openapi-ionic-client-app/src/main/resources/templates/src/app/services/interfaces/${variables.etoName#lower_case}-search-criteria.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_ionic_client_app/templates/src/app/services/interfaces/${variables.etoName#lower_case}-search-criteria.ts.ftl
rename to cobigen-templates/crud-openapi-ionic-client-app/src/main/resources/templates/src/app/services/interfaces/${variables.etoName#lower_case}-search-criteria.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_ionic_client_app/templates/src/app/services/interfaces/${variables.etoName#lower_case}.ts.ftl b/cobigen-templates/crud-openapi-ionic-client-app/src/main/resources/templates/src/app/services/interfaces/${variables.etoName#lower_case}.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_ionic_client_app/templates/src/app/services/interfaces/${variables.etoName#lower_case}.ts.ftl
rename to cobigen-templates/crud-openapi-ionic-client-app/src/main/resources/templates/src/app/services/interfaces/${variables.etoName#lower_case}.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_ionic_client_app/templates/src/app/services/interfaces/pageable.ts.ftl b/cobigen-templates/crud-openapi-ionic-client-app/src/main/resources/templates/src/app/services/interfaces/pageable.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_ionic_client_app/templates/src/app/services/interfaces/pageable.ts.ftl
rename to cobigen-templates/crud-openapi-ionic-client-app/src/main/resources/templates/src/app/services/interfaces/pageable.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_ionic_client_app/templates/src/app/services/interfaces/paginated-list-to.ts.ftl b/cobigen-templates/crud-openapi-ionic-client-app/src/main/resources/templates/src/app/services/interfaces/paginated-list-to.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_ionic_client_app/templates/src/app/services/interfaces/paginated-list-to.ts.ftl
rename to cobigen-templates/crud-openapi-ionic-client-app/src/main/resources/templates/src/app/services/interfaces/paginated-list-to.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_ionic_client_app/templates/src/app/services/interfaces/sort.ts.ftl b/cobigen-templates/crud-openapi-ionic-client-app/src/main/resources/templates/src/app/services/interfaces/sort.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_ionic_client_app/templates/src/app/services/interfaces/sort.ts.ftl
rename to cobigen-templates/crud-openapi-ionic-client-app/src/main/resources/templates/src/app/services/interfaces/sort.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_ionic_client_app/templates/src/app/services/shared/business-operator.service.ts.ftl b/cobigen-templates/crud-openapi-ionic-client-app/src/main/resources/templates/src/app/services/shared/business-operator.service.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_ionic_client_app/templates/src/app/services/shared/business-operator.service.ts.ftl
rename to cobigen-templates/crud-openapi-ionic-client-app/src/main/resources/templates/src/app/services/shared/business-operator.service.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_ionic_client_app/templates/src/assets/i18n/en.json.ftl b/cobigen-templates/crud-openapi-ionic-client-app/src/main/resources/templates/src/assets/i18n/en.json.ftl
old mode 100755
new mode 100644
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_ionic_client_app/templates/src/assets/i18n/en.json.ftl
rename to cobigen-templates/crud-openapi-ionic-client-app/src/main/resources/templates/src/assets/i18n/en.json.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_ionic_client_app/templates/src/assets/i18n/es.json.ftl b/cobigen-templates/crud-openapi-ionic-client-app/src/main/resources/templates/src/assets/i18n/es.json.ftl
old mode 100755
new mode 100644
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_ionic_client_app/templates/src/assets/i18n/es.json.ftl
rename to cobigen-templates/crud-openapi-ionic-client-app/src/main/resources/templates/src/assets/i18n/es.json.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_ionic_client_app/templates/src/assets/i18n/it.json.ftl b/cobigen-templates/crud-openapi-ionic-client-app/src/main/resources/templates/src/assets/i18n/it.json.ftl
old mode 100755
new mode 100644
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_ionic_client_app/templates/src/assets/i18n/it.json.ftl
rename to cobigen-templates/crud-openapi-ionic-client-app/src/main/resources/templates/src/assets/i18n/it.json.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_ionic_client_app/templates/src/environments/environment.android.ts.ftl b/cobigen-templates/crud-openapi-ionic-client-app/src/main/resources/templates/src/environments/environment.android.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_ionic_client_app/templates/src/environments/environment.android.ts.ftl
rename to cobigen-templates/crud-openapi-ionic-client-app/src/main/resources/templates/src/environments/environment.android.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_ionic_client_app/templates/src/environments/environment.prod.ts.ftl b/cobigen-templates/crud-openapi-ionic-client-app/src/main/resources/templates/src/environments/environment.prod.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_ionic_client_app/templates/src/environments/environment.prod.ts.ftl
rename to cobigen-templates/crud-openapi-ionic-client-app/src/main/resources/templates/src/environments/environment.prod.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_ionic_client_app/templates/src/environments/environment.ts.ftl b/cobigen-templates/crud-openapi-ionic-client-app/src/main/resources/templates/src/environments/environment.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_ionic_client_app/templates/src/environments/environment.ts.ftl
rename to cobigen-templates/crud-openapi-ionic-client-app/src/main/resources/templates/src/environments/environment.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_ionic_client_app/templates/src/theme/variables.scss.ftl b/cobigen-templates/crud-openapi-ionic-client-app/src/main/resources/templates/src/theme/variables.scss.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_ionic_client_app/templates/src/theme/variables.scss.ftl
rename to cobigen-templates/crud-openapi-ionic-client-app/src/main/resources/templates/src/theme/variables.scss.ftl
diff --git a/cobigen-templates/crud-openapi-ionic-client-app/src/test/java/com/devonfw/cobigen/templates/devon4j/test/templates/CrudOpenapiIonicClientAppTest.java b/cobigen-templates/crud-openapi-ionic-client-app/src/test/java/com/devonfw/cobigen/templates/devon4j/test/templates/CrudOpenapiIonicClientAppTest.java
new file mode 100644
index 0000000000..32051623e8
--- /dev/null
+++ b/cobigen-templates/crud-openapi-ionic-client-app/src/test/java/com/devonfw/cobigen/templates/devon4j/test/templates/CrudOpenapiIonicClientAppTest.java
@@ -0,0 +1,100 @@
+package com.devonfw.cobigen.templates.devon4j.test.templates;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+import org.apache.commons.io.FileUtils;
+import org.junit.BeforeClass;
+import org.junit.ClassRule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+
+import com.devonfw.cobigen.api.constants.ConfigurationConstants;
+import com.devonfw.cobigen.maven.test.AbstractMavenTest;
+import com.devonfw.cobigen.templates.devon4j.config.constant.MavenMetadata;
+
+/**
+ * Smoke tests of all templates.
+ */
+public class CrudOpenapiIonicClientAppTest extends AbstractMavenTest {
+
+  /** Root of all test resources of this test suite */
+  public static final String TEST_RESOURCES_ROOT = "src/test/resources/testdata/templatetest/";
+
+  /** Temporary files rule to create temporary folders */
+  @ClassRule
+  public static TemporaryFolder tempFolder = new TemporaryFolder();
+
+  /** The templates development folder */
+  protected static Path templatesProject;
+
+  /** The templates development folder */
+  protected static Path templatesProjectTemporary;
+
+  /**
+   * Creates a copy of the templates project in the temp directory
+   *
+   * @throws URISyntaxException if the path could not be created properly
+   * @throws IOException if accessing a directory or file fails
+   */
+  @BeforeClass
+  public static void setupDevTemplates() throws URISyntaxException, IOException {
+
+    templatesProject = new File(
+        CrudOpenapiIonicClientAppTest.class.getProtectionDomain().getCodeSource().getLocation().toURI()).getParentFile()
+            .getParentFile().toPath();
+
+    Path utilsPom = new File(
+        CrudOpenapiIonicClientAppTest.class.getProtectionDomain().getCodeSource().getLocation().toURI()).getParentFile()
+            .getParentFile().toPath().resolve("src/test/resources/utils/pom.xml");
+
+    // create a temporary directory cobigen-templates/template-sets/adapted containing the template sets
+    Path tempFolderPath = tempFolder.getRoot().toPath();
+    Path cobigenTemplatePath = tempFolderPath.resolve("cobigen-templates");
+    if (!Files.exists(cobigenTemplatePath)) {
+      Files.createDirectory(cobigenTemplatePath);
+
+      templatesProjectTemporary = cobigenTemplatePath.resolve(ConfigurationConstants.TEMPLATE_SETS_FOLDER);
+      Path templateSetsAdaptedFolder = templatesProjectTemporary.resolve(ConfigurationConstants.ADAPTED_FOLDER);
+      Files.createDirectory(templatesProjectTemporary);
+      Files.createDirectory(templateSetsAdaptedFolder);
+
+      Path templateSetPath = templateSetsAdaptedFolder.resolve("template-set");
+      FileUtils.copyDirectory(templatesProject.toFile(), templateSetPath.toFile());
+
+      if (Files.isDirectory(templateSetPath)) {
+
+        // Replace the pom.xml in the template sets. Needed so that the project in the temp directory is build
+        // properly
+        if (Files.exists(templateSetPath.resolve("pom.xml"))) {
+          try {
+            Files.delete(templateSetPath.resolve("pom.xml"));
+          } catch (IOException e) {
+            throw new IOException("Error deleting file " + templateSetPath.resolve("pom.xml"), e);
+          }
+          try {
+            Files.copy(utilsPom, templateSetPath.resolve("pom.xml"));
+          } catch (IOException e) {
+            throw new IOException("Error copying file " + utilsPom, e);
+          }
+        }
+      }
+    }
+  }
+
+  /**
+   * Test successful generation of all templates based on an ETO
+   *
+   * @throws Exception test fails
+   */
+  @Test
+  public void testAllTemplatesGeneration_OpenApiInput() throws Exception {
+
+    File testProject = new File(TEST_RESOURCES_ROOT + "TestAllTemplatesOpenApiInput/");
+    runMavenInvoker(testProject, templatesProjectTemporary.toFile(), MavenMetadata.LOCAL_REPO);
+  }
+
+}
diff --git a/cobigen-templates/crud-openapi-ionic-client-app/src/test/resources/application.properties b/cobigen-templates/crud-openapi-ionic-client-app/src/test/resources/application.properties
new file mode 100644
index 0000000000..cf2c614efb
--- /dev/null
+++ b/cobigen-templates/crud-openapi-ionic-client-app/src/test/resources/application.properties
@@ -0,0 +1,2 @@
+server.port=8080
+server.context-path=/
\ No newline at end of file
diff --git a/cobigen-templates/crud-openapi-ionic-client-app/src/test/resources/logback.xml b/cobigen-templates/crud-openapi-ionic-client-app/src/test/resources/logback.xml
new file mode 100644
index 0000000000..5f29165f75
--- /dev/null
+++ b/cobigen-templates/crud-openapi-ionic-client-app/src/test/resources/logback.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- This file is for logback classic. The file contains the configuration for slf4j logging -->
+<configuration>
+	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+			<Pattern>%d{HH:mm:ss.SSS} [%thread] [C:%X{correlationId}] - %-5level - %logger{36} - %msg%n
+			</Pattern>
+		</encoder>
+	</appender>
+
+	<root level="INFO">
+		<appender-ref ref="STDOUT" />
+	</root>
+</configuration>
diff --git a/cobigen-templates/crud-openapi-ionic-client-app/src/test/resources/testdata/templatetest/TestAllTemplatesOpenApiInput/OpenAPI.yaml b/cobigen-templates/crud-openapi-ionic-client-app/src/test/resources/testdata/templatetest/TestAllTemplatesOpenApiInput/OpenAPI.yaml
new file mode 100644
index 0000000000..14b9ec10cf
--- /dev/null
+++ b/cobigen-templates/crud-openapi-ionic-client-app/src/test/resources/testdata/templatetest/TestAllTemplatesOpenApiInput/OpenAPI.yaml
@@ -0,0 +1,131 @@
+openapi: 3.0.0
+servers:
+  - url: 'https://localhost:8081/server/services/rest'
+info:
+  title: Devon Example
+  description: Example of a API definition
+  version: 1.0.0
+  x-rootpackage: com.devonfw.demo
+paths:
+  /datamanagement/v1/someData/{id}:
+    get:
+      operationId: findSomeData
+      parameters:
+        - name: id
+          in: path
+          required: true
+          schema:
+            type: integer
+            format: int64
+            minimum: 0
+            maximum: 50
+      responses:
+        '200':
+          description: Any
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/EvenMoreData'
+            text/plain:
+              schema:
+                type: string
+  /datamanagement/v1/moreData/{id}:
+    get:
+      operationId: findMoreData
+      parameters:
+        - name: id
+          in: path
+          required: true
+          schema:
+            type: integer
+            format: int64
+            minimum: 10
+            maximum: 200
+      responses:
+        '200':
+          description: Any
+  /datamanagement/v1/someData/:
+    post:
+      responses:
+        '200':
+          description: Any
+      requestBody:
+        $ref: '#/components/requestBodies/SomeData'
+      tags:
+       - searchCriteria
+  /datamanagement/v1/moreData/validateMoreData:
+    post:
+      responses:
+       '200':
+          description: Any
+      requestBody:
+        $ref: '#/components/requestBodies/MoreData'
+components:
+    schemas:
+        SomeData:
+          x-component: DataManagement
+          description: Entity definiton of SomeData
+          type: object
+          properties:
+            AnyString:
+              type: string
+              maxLength: 100
+              minLength: 5
+              uniqueItems: true
+            furtherData:
+              type: array
+              items:
+                $ref: '#/components/schemas/FurtherData'
+        MoreData:
+          x-component: DataManagement
+          description: Entity definiton of Moredata
+          type: object
+          properties:
+            anyNumber:
+              type: number
+              format: int64
+              maximum: 100
+              minimum: 0
+            someData:
+              $ref: '#/components/schemas/SomeData'
+            allSomeData:
+              type: array
+              description: 'All SomeData'
+              items:
+                $ref: '#/components/schemas/SomeData'
+          required:
+            - saleExample
+        FurtherData:
+          x-component: AnotherComponent
+          type: object
+          properties:
+            parent:
+              $ref: '#/components/schemas/SomeData'
+            valid:
+              type: boolean
+            someList:
+              type: array
+              items:
+                type: string
+        EvenMoreData:
+          x-component: AnotherComponent
+          description: Entity definiton of more data
+          type: object
+          properties:
+            id:
+              type: integer
+              format: int64
+              uniqueItems: true
+    requestBodies:
+        SomeData:
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/SomeData'
+          required: true
+        MoreData:
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/MoreData'
+          required: true
diff --git a/cobigen-templates/crud-openapi-ionic-client-app/src/test/resources/testdata/templatetest/TestAllTemplatesOpenApiInput/logback.xml b/cobigen-templates/crud-openapi-ionic-client-app/src/test/resources/testdata/templatetest/TestAllTemplatesOpenApiInput/logback.xml
new file mode 100644
index 0000000000..5f29165f75
--- /dev/null
+++ b/cobigen-templates/crud-openapi-ionic-client-app/src/test/resources/testdata/templatetest/TestAllTemplatesOpenApiInput/logback.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- This file is for logback classic. The file contains the configuration for slf4j logging -->
+<configuration>
+	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+			<Pattern>%d{HH:mm:ss.SSS} [%thread] [C:%X{correlationId}] - %-5level - %logger{36} - %msg%n
+			</Pattern>
+		</encoder>
+	</appender>
+
+	<root level="INFO">
+		<appender-ref ref="STDOUT" />
+	</root>
+</configuration>
diff --git a/cobigen-templates/crud-openapi-ionic-client-app/src/test/resources/testdata/templatetest/TestAllTemplatesOpenApiInput/pom.xml b/cobigen-templates/crud-openapi-ionic-client-app/src/test/resources/testdata/templatetest/TestAllTemplatesOpenApiInput/pom.xml
new file mode 100644
index 0000000000..7f84fdeef0
--- /dev/null
+++ b/cobigen-templates/crud-openapi-ionic-client-app/src/test/resources/testdata/templatetest/TestAllTemplatesOpenApiInput/pom.xml
@@ -0,0 +1,84 @@
+<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>com.devonfw.cobigen</groupId>
+  <artifactId>devon4jTemplateTest-TestAllTemplatesOpenAPIInput</artifactId>
+  <version>dev-SNAPSHOT</version>
+
+  <properties>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
+  </properties>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>com.devonfw.cobigen</groupId>
+        <artifactId>cobigen-maven-plugin</artifactId>
+        <version>${pluginVersion}</version>
+        <executions>
+          <execution>
+            <id>generate</id>
+            <phase>package</phase>
+            <goals>
+              <goal>generate</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <configurationFolder>${templatesProject}</configurationFolder>
+          <inputFiles>
+            <inputFile>OpenAPI.yaml</inputFile>
+          </inputFiles>
+          <templates>
+            <template>ALL</template>
+          </templates>
+          <failOnNothingGenerated>true</failOnNothingGenerated>
+        </configuration>
+        <dependencies>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>tempeng-freemarker</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>javaplugin</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>htmlplugin</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>tsplugin</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>jsonplugin</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>openapiplugin</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>xmlplugin</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>textmerger</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+        </dependencies>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>
diff --git a/cobigen-templates/crud-openapi-ionic-client-app/src/test/resources/utils/pom.xml b/cobigen-templates/crud-openapi-ionic-client-app/src/test/resources/utils/pom.xml
new file mode 100644
index 0000000000..9e540cd237
--- /dev/null
+++ b/cobigen-templates/crud-openapi-ionic-client-app/src/test/resources/utils/pom.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.devonfw.cobigen.templates</groupId>
+  <artifactId>crud-openapi-ionic-client-app</artifactId>
+  <version>2021.12.007-SNAPSHOT</version>
+  <name>Crud Openapi Ionic Client App</name>
+  <description>A Code-based incremental Generator</description>
+  <url>https://github.com/devonfw/cobigen/templates-parent/templates-devon4j-utils</url>
+  <licenses>
+    <license>
+      <name>Apache Software License 2.0</name>
+      <url>https://raw.githubusercontent.com/devonfw/.github/master/LICENSE</url>
+      <distribution>repo</distribution>
+      <comments></comments>
+    </license>
+  </licenses>
+  <dependencies>
+    <dependency>
+      <groupId>javax.ws.rs</groupId>
+      <artifactId>javax.ws.rs-api</artifactId>
+      <version>2.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.data</groupId>
+      <artifactId>spring-data-rest-webmvc</artifactId>
+      <version>3.7.10</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+      <version>3.12.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+      <version>2.10.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>xerces</groupId>
+      <artifactId>xercesImpl</artifactId>
+      <version>2.12.2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.persistence</groupId>
+      <artifactId>javax.persistence-api</artifactId>
+      <version>2.2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>1.7.30</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <version>1.7.30</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>log4j-over-slf4j</artifactId>
+      <version>1.7.30</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+  <repositories>
+    <repository>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+      <id>ossrh</id>
+      <name>OSSRH Snapshots</name>
+      <url>https://s01.oss.sonatype.org/content/repositories/snapshots/</url>
+    </repository>
+  </repositories>
+
+  <properties>
+   <maven.compiler.source>1.8</maven.compiler.source>
+   <maven.compiler.target>1.8</maven.compiler.target>
+  </properties>
+
+  <build>
+   <resources>
+     <resource>
+       <directory>src/main/java</directory>
+     </resource>
+   </resources>
+  </build></project>
\ No newline at end of file
diff --git a/cobigen-templates/crud-openapi-java-server-app/pom.xml b/cobigen-templates/crud-openapi-java-server-app/pom.xml
new file mode 100644
index 0000000000..9d845790e1
--- /dev/null
+++ b/cobigen-templates/crud-openapi-java-server-app/pom.xml
@@ -0,0 +1,19 @@
+<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>crud-openapi-java-server-app</artifactId>
+  <name>CRUD OpenAPI Java Server App template</name>
+
+  <parent>
+    <groupId>com.devonfw.cobigen.templates</groupId>
+    <artifactId>templates-parent</artifactId>
+    <version>${revision}</version>
+  </parent>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+    </dependency>
+  </dependencies>
+</project>
\ No newline at end of file
diff --git a/cobigen-templates/crud-openapi-java-server-app/src/main/java-templates/com/devonfw/cobigen/templates/devon4j/config/constant/MavenMetadata.java b/cobigen-templates/crud-openapi-java-server-app/src/main/java-templates/com/devonfw/cobigen/templates/devon4j/config/constant/MavenMetadata.java
new file mode 100644
index 0000000000..395d46154d
--- /dev/null
+++ b/cobigen-templates/crud-openapi-java-server-app/src/main/java-templates/com/devonfw/cobigen/templates/devon4j/config/constant/MavenMetadata.java
@@ -0,0 +1,12 @@
+package com.devonfw.cobigen.templates.devon4j.config.constant;
+
+/**
+ * Constants extracted from the maven pom by templating-maven-plugin.
+ * 
+ * @see "edit template in src/main/java-templates"
+ */
+public class MavenMetadata {
+
+    /** Local repository path */
+    public static final String LOCAL_REPO = "${settings.localRepository}";
+}
diff --git a/cobigen-templates/crud-openapi-java-server-app/src/main/java/com/devonfw/cobigen/templates/devon4j/constants/Field.java b/cobigen-templates/crud-openapi-java-server-app/src/main/java/com/devonfw/cobigen/templates/devon4j/constants/Field.java
new file mode 100644
index 0000000000..5376daaea9
--- /dev/null
+++ b/cobigen-templates/crud-openapi-java-server-app/src/main/java/com/devonfw/cobigen/templates/devon4j/constants/Field.java
@@ -0,0 +1,48 @@
+package com.devonfw.cobigen.templates.devon4j.constants;
+
+/**
+ * Contains the used keys for the pojo field mapping
+ */
+public enum Field {
+
+  /**
+   * Name of the field
+   */
+  NAME("name"),
+  /**
+   * Type of the field
+   */
+  TYPE("type"),
+  /**
+   * Canonical Type of the field
+   */
+  CANONICAL_TYPE("canonicalType"),
+  /**
+   * The Javadoc of the field
+   */
+  JAVA_DOC("javaDoc"),
+  /**
+   * Annotations
+   */
+  ANNOTATIONS("annotations");
+
+  /**
+   * key value
+   */
+  private String value;
+
+  /**
+   * @param value of the key
+   */
+  Field(String value) {
+
+    this.value = value;
+  }
+
+  @Override
+  public String toString() {
+
+    return this.value;
+  }
+
+}
diff --git a/cobigen-templates/crud-openapi-java-server-app/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/DevonfwUtil.java b/cobigen-templates/crud-openapi-java-server-app/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/DevonfwUtil.java
new file mode 100644
index 0000000000..4de413b930
--- /dev/null
+++ b/cobigen-templates/crud-openapi-java-server-app/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/DevonfwUtil.java
@@ -0,0 +1,449 @@
+package com.devonfw.cobigen.templates.devon4j.utils;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.w3c.dom.Attr;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+import com.devonfw.cobigen.templates.devon4j.constants.Field;
+
+/**
+ * A class for shared devon4j specific functions in the templates
+ *
+ */
+@SuppressWarnings("restriction")
+public class DevonfwUtil {
+
+  /**
+   * Check whether the given 'canonicalType' is a devon4j Entity, which is declared in the given 'component'
+   *
+   * @param canonicalType the type name
+   * @param component the component name
+   * @return true iff the canonicalType is a devon Entity
+   */
+  public boolean isEntityInComponent(String canonicalType, String component) {
+
+    return canonicalType.matches(String.format(".+%1$s\\.dataaccess\\.api\\.[A-Za-z0-9]+Entity(<.*)?", component));
+  }
+
+  /**
+   * Check whether the given 'canonicalType' is declared in the given 'component'
+   *
+   * @param canonicalType the type name
+   * @param component the component name
+   * @return true iff the canonicalType is inside the given component
+   */
+  public boolean isTypeInComponent(String canonicalType, String component) {
+
+    return canonicalType.matches(String.format("%1$s.[A-Za-z0-9]+(<.*)?", component));
+  }
+
+  /**
+   * Determines the ID getter for a given 'field' dependent on whether the getter should access the ID via an object
+   * reference or a direct ID getter
+   *
+   * @param field the field
+   * @param byObjectReference boolean
+   * @param component the devon4j component name
+   * @return 'get' + {@link #resolveIdVariableNameOrSetterGetterSuffix(Map, boolean, boolean, String)} + '()' with
+   *         capitalize=true
+   */
+  public String resolveIdGetter(Map<String, Object> field, boolean byObjectReference, String component) {
+
+    // If field comes from an UML file
+    if (field.getClass().toGenericString().contains("freemarker.ext.beans.HashAdapter")) {
+      return resolveIdGetter(field, byObjectReference, component);
+    }
+    return "get" + resolveIdVariableNameOrSetterGetterSuffix(field, byObjectReference, true, component) + "()";
+  }
+
+  /**
+   * Determines the ID getter for a given 'field' dependent on whether the getter should access the ID via an object
+   * reference or a direct ID getter
+   *
+   * This method is used when the field parameter comes from an UML file. The name and type of the attributes must be
+   * pre-processed for later inserting them inside the HashMap.
+   *
+   * @param field the field
+   * @param byObjectReference boolean
+   * @param component the devon4j component name
+   * @return 'get' + {@link #resolveIdVariableNameOrSetterGetterSuffix(Map, boolean, boolean, String)} + '()' with
+   *         capitalize=true
+   */
+  public String resolveIdGetter(Node field, boolean byObjectReference, String component) {
+
+    HashMap<String, Object> nodeHash = new HashMap<>();
+
+    // Putting the name of the attribute to the hash
+    nodeHash.put(Field.NAME.toString(), field.getAttributes().getNamedItem("name"));
+
+    // Putting the type of the attribute to the hash
+    NodeList childs = field.getChildNodes();
+    for (int i = 0; i < childs.getLength(); i++) {
+      // Retrieve "type" tag
+      if (childs.item(i).getNodeName().equals("type")) {
+        NamedNodeMap attrs = childs.item(i).getAttributes();
+        for (int j = 0; j < attrs.getLength(); j++) {
+          Attr attribute = (Attr) attrs.item(j);
+          // Try to find the attribute that contains the type
+          if (attribute.getName().equals("xmi:idref")) {
+            nodeHash.put(Field.TYPE.toString(), attribute.getName().replace("EAJava_", ""));
+          }
+        }
+      }
+    }
+    return "get" + resolveIdVariableNameOrSetterGetterSuffix(nodeHash, byObjectReference, true, component) + "()";
+
+  }
+
+  /**
+   * Determines the ID getter for a given 'field' dependent on whether the getter should access the ID via an object
+   * reference or a direct ID getter
+   *
+   * @param pojoClass the class object of the pojo
+   * @param fieldMap the field mapping
+   * @param byObjectReference boolean
+   * @param component the devon4j component name
+   * @return 'get' + {@link #resolveIdVariableNameOrSetterGetterSuffix(Map, boolean, boolean, String)} + '()' with
+   *         capitalize=true
+   * @throws NoSuchFieldException indicating a severe problem in the used model
+   * @throws SecurityException if the field cannot be accessed for any reason
+   */
+  public String resolveIdGetter(Class<?> pojoClass, Map<String, Object> fieldMap, boolean byObjectReference,
+      String component) throws NoSuchFieldException, SecurityException {
+
+    return "get" + resolveIdVariableNameOrSetterGetterSuffix(pojoClass, fieldMap, byObjectReference, true, component)
+        + "()";
+  }
+
+  /**
+   * same as {@link #resolveIdGetter(Map, boolean, String)} but with byObjectReference=false and component=""
+   *
+   * @param field the field
+   * @return 'get' + {@link #resolveIdVariableNameOrSetterGetterSuffix(Map,boolean,boolean,String)} + '()' with
+   *         capitalize=true
+   */
+  public String resolveIdGetter(Map<String, Object> field) {
+
+    return this.resolveIdGetter(field, false, "");
+  }
+
+  /**
+   * same as {@link #resolveIdGetter(Class,Map,boolean,String)} but with byObjectReference=false and component=""
+   *
+   * @param pojoClass the class object of the pojo
+   * @param fieldMap the field mapping
+   * @return 'get' + {@link #resolveIdVariableNameOrSetterGetterSuffix(Map,boolean,boolean,String)} + '()' with
+   *         capitalize=true
+   * @throws NoSuchFieldException indicating a severe problem in the used model
+   * @throws SecurityException if the field cannot be accessed for any reason
+   */
+  public String resolveIdGetter(Class<?> pojoClass, Map<String, Object> fieldMap)
+      throws NoSuchFieldException, SecurityException {
+
+    return resolveIdGetter(pojoClass, fieldMap, false, "");
+  }
+
+  /**
+   * Determines the ID setter for a given 'field' dependent on whether the setter should access the ID via an object
+   * reference or a direct ID setter. In contrast to resolveIdGetter, this function does not generate the function
+   * parenthesis to enable parameter declaration.
+   *
+   * @param field the field
+   * @param byObjectReference boolean
+   * @param component the devon4j component name
+   * @return 'set' + {@link #resolveIdVariableNameOrSetterGetterSuffix(Map, boolean, boolean, String)} with
+   *         capitalize=true
+   */
+  public String resolveIdSetter(Map<String, Object> field, boolean byObjectReference, String component) {
+
+    return "set" + resolveIdVariableNameOrSetterGetterSuffix(field, byObjectReference, true, component);
+  }
+
+  /**
+   * same as {@link #resolveIdSetter(Map, boolean, String)} but with byObjectReference=false and component=""
+   *
+   * @param field the field
+   * @return 'set' + {@link #resolveIdVariableNameOrSetterGetterSuffix(Map, boolean, boolean, String)} with
+   *         capitalize=true
+   */
+  public String resolveIdSetter(Map<String, Object> field) {
+
+    return this.resolveIdSetter(field, false, "");
+  }
+
+  /**
+   * Determines the ID setter for a given 'field' dependent on whether the setter should access the ID via an object
+   * reference or a direct ID setter. In contrast to resolveIdGetter, this function does not generate the function
+   * parenthesis to enable parameter declaration.
+   *
+   * @param pojoClass the class object of the pojo
+   * @param fieldMap the field mapping
+   * @param byObjectReference boolean
+   * @param component the devon4j component name
+   * @return 'set'+ {@link #resolveIdVariableNameOrSetterGetterSuffix(Map,boolean,boolean,String)} with capitalize=true
+   * @throws NoSuchFieldException indicating a severe problem in the used model
+   * @throws SecurityException if the field cannot be accessed for any reason
+   */
+  public String resolveIdSetter(Class<?> pojoClass, Map<String, Object> fieldMap, boolean byObjectReference,
+      String component) throws NoSuchFieldException, SecurityException {
+
+    return "set" + resolveIdVariableNameOrSetterGetterSuffix(pojoClass, fieldMap, byObjectReference, true, component);
+  }
+
+  /**
+   * same as {@link #resolveIdSetter(Class,Map,boolean,String)} but with byObjectReference=false and component=""
+   *
+   * @param pojoClass the class object of the pojo
+   * @param fieldMap the field mapping
+   * @return 'set' + {@link #resolveIdVariableNameOrSetterGetterSuffix(Map,boolean,boolean,String)} with capitalize=true
+   * @throws NoSuchFieldException indicating a severe problem in the used model
+   * @throws SecurityException if the field cannot be accessed for any reason
+   */
+  public String resolveIdSetter(Class<?> pojoClass, Map<String, Object> fieldMap)
+      throws NoSuchFieldException, SecurityException {
+
+    return resolveIdSetter(pojoClass, fieldMap, false, "");
+  }
+
+  /**
+   * Determines the variable name for the id value of the 'field'
+   *
+   * @param field the field
+   * @return {@link #resolveIdVariableNameOrSetterGetterSuffix(Map, boolean, boolean, String)}) with
+   *         byObjectReference=false, capitalize=false and component=""
+   */
+  public String resolveIdVariableName(Map<String, Object> field) {
+
+    // the component is passed down as an empty string since byObjectReference is false and therefore the
+    // component is
+    // never touched
+    return resolveIdVariableNameOrSetterGetterSuffix(field, false, false, "");
+  }
+
+  /**
+   * Determines the variable name for the id value of the specified field in the pojo
+   *
+   * @param pojoClass the class object of the pojo
+   * @param fieldMap the field mapping
+   * @return {@link #resolveIdVariableNameOrSetterGetterSuffix(Class, Map, boolean, boolean, String)}) with
+   *         byObjectReference=false, capitalize=false and component=""
+   * @throws NoSuchFieldException indicating a severe problem in the used model
+   * @throws SecurityException if the field cannot be accessed for any reason
+   */
+  public String resolveIdVariableName(Class<?> pojoClass, Map<String, Object> fieldMap)
+      throws NoSuchFieldException, SecurityException {
+
+    // the component is passed down as an empty string since byObjectReference is false and therefore the
+    // component is
+    // never touched
+    return resolveIdVariableNameOrSetterGetterSuffix(pojoClass, fieldMap, false, false, "");
+  }
+
+  /**
+   * Determines the ID setter/getter suffix for a given 'field' dependent on whether the setter/getter should access the
+   * ID via an object reference or a direct ID setter/getter
+   *
+   * @param field the field
+   * @param byObjectReference boolean
+   * @param capitalize if the field name should be capitalized
+   * @param component the devon4j component. Only needed if $byObjectReference is true
+   * @return idVariable name or getter/setter suffix
+   */
+  public String resolveIdVariableNameOrSetterGetterSuffix(Map<String, Object> field, boolean byObjectReference,
+      boolean capitalize, String component) {
+
+    String fieldName = (String) field.get(Field.NAME.toString());
+    if (capitalize) {
+      fieldName = fieldName.substring(0, 1).toUpperCase() + fieldName.substring(1);
+    }
+    String suffix = "";
+
+    String fieldType = (String) field.get(Field.TYPE.toString());
+    String fieldCType = (String) field.get(Field.CANONICAL_TYPE.toString());
+    if (fieldType.contains("Entity")) {
+      if (fieldCType.startsWith("java.util.List") || fieldCType.startsWith("java.util.Set")) {
+        suffix = "Ids";
+        if (fieldName.endsWith("s")) {
+          // Assume trailing 's' as indicator for a plural
+          fieldName = fieldName.substring(0, fieldName.length() - 1);
+        }
+      } else {
+        suffix = "Id";
+      }
+      if (byObjectReference && isTypeInComponent(fieldCType, component)) {
+        // direct references for Entities in same component, so get id of the object reference
+        suffix = "().getId";
+      }
+    }
+
+    return fieldName + suffix;
+
+  }
+
+  /**
+   * Determines the ID setter/getter suffix for a given 'field' dependent on whether the setter/getter should access the
+   * ID via an object reference or a direct ID setter/getter
+   *
+   * @param pojoClass the {@link Class} object of the pojo
+   * @param fieldMap the field mapping
+   * @param byObjectReference boolean
+   * @param capitalize if the field name should be capitalized
+   * @param component the devon4j component. Only needed if byObjectReference is true
+   * @return idVariable name or getter/setter suffix
+   * @throws NoSuchFieldException indicating a severe problem in the used model
+   * @throws SecurityException if the field cannot be accessed for any reason
+   */
+  public String resolveIdVariableNameOrSetterGetterSuffix(Class<?> pojoClass, Map<String, Object> fieldMap,
+      boolean byObjectReference, boolean capitalize, String component) throws NoSuchFieldException, SecurityException {
+
+    String resultName = (String) fieldMap.get(Field.NAME.toString());
+    if (capitalize) {
+      resultName = resultName.substring(0, 1).toUpperCase() + resultName.substring(1);
+    }
+    String suffix = "";
+    String fieldType = (String) fieldMap.get(Field.TYPE.toString());
+    String fieldName = (String) fieldMap.get(Field.NAME.toString());
+    if (fieldType.contains("Entity")) {
+      if (Collection.class.isAssignableFrom(pojoClass.getDeclaredField(fieldName).getType())) {
+        suffix = "Ids";
+        if (resultName.endsWith("s")) {
+          // Assume trailing 's' as indicator for a plural
+          resultName = resultName.substring(0, resultName.length() - 1);
+        }
+      } else {
+        suffix = "Id";
+      }
+      if (byObjectReference
+          && isEntityInComponent(pojoClass.getDeclaredField(fieldName).getType().getName(), component)) {
+        // direct references for Entities in same component, so get id of the object reference
+        suffix = "().getId";
+      }
+    }
+
+    return resultName + suffix;
+
+  }
+
+  /**
+   * Returns the argument type of the list or set from a field. If the string contains "Entity" it will remove that
+   * part. For example, if we have a List &lt;SampleEntity&gt; it will return "Sample"
+   *
+   * @param field the field
+   * @param pojoClass the object class of the Entity that contains the field
+   * @return fieldType argument of the list
+   * @throws SecurityException if field type could not accessed
+   * @throws NoSuchFieldException if field could not be found
+   */
+  public String getListArgumentType(Map<String, Object> field, Class<?> pojoClass)
+      throws NoSuchFieldException, SecurityException {
+
+    JavaUtil javaUtil = new JavaUtil();
+
+    String fieldType = (String) field.get(Field.TYPE.toString());
+    String fieldName = (String) field.get(Field.NAME.toString());
+
+    if (fieldType.contains("Entity")) {
+      if (javaUtil.isCollection(pojoClass, fieldName)) {
+
+        fieldType = fieldType.replace("Entity", "");
+        // Regex: Extracts the argument type of the list 'List<type>' => type
+        String regex = "(?<=\\<).+?(?=\\>)";
+        Pattern pattern = Pattern.compile(regex);
+        Matcher regexMatcher = pattern.matcher(fieldType);
+
+        if (regexMatcher.find()) {
+          fieldType = regexMatcher.group(0);
+        }
+      }
+    }
+    return fieldType;
+
+  }
+
+  /**
+   * Converts all occurrences of devon4j Entity types in the given 'field' simple type (possibly generic) to Longs
+   *
+   * @param field the field
+   * @return the field type as String. If field type contains 'Entity' the result is Long
+   */
+  public String getSimpleEntityTypeAsLongReference(Map<String, Object> field) {
+
+    String fieldType = (String) field.get(Field.TYPE.toString());
+    if (fieldType.endsWith("Entity")) {
+      fieldType = fieldType.replaceAll("[^<>]+Entity", "Long");
+    }
+    return fieldType;
+  }
+
+  /**
+   * If the string last character is an 's', then it gets removed
+   *
+   * @param targetClassName string to remove plural
+   * @return string without 's'
+   */
+  public String removePlural(String targetClassName) {
+
+    if (targetClassName.charAt(targetClassName.length() - 1) == 's') {
+      targetClassName = targetClassName.substring(0, targetClassName.length() - 1);
+    }
+    return targetClassName;
+  }
+
+  /**
+   * Checks whether the operation with the given ID corresponds to any standard CRUD method name.
+   *
+   * @param operationId operation ID interpreted as method name
+   * @param entityName entity name to check standard CRUD methods for
+   * @return <code>true</code> if the operation ID maps any standard CRUD method name, <code>false</code> otherwise
+   */
+  public boolean isCrudOperation(String operationId, String entityName) {
+
+    if (operationId == null) {
+      return false;
+    }
+    String opIdLowerCase = operationId.toLowerCase();
+    String entityNameLowerCase = entityName.toLowerCase();
+    if (opIdLowerCase.contains(entityNameLowerCase)) {
+      return opIdLowerCase.equals("find" + entityNameLowerCase)
+          || opIdLowerCase.equals("find" + entityNameLowerCase + "Etos")
+          || opIdLowerCase.equals("delete" + entityNameLowerCase) || opIdLowerCase.equals("save" + entityNameLowerCase);
+    } else {
+      return false;
+    }
+  }
+
+  /**
+   * Converts the given media type to the spring Java enum value
+   *
+   * @param mediaType to be converted
+   * @return the spring enum value representing the given media type
+   */
+  public String getSpringMediaType(String mediaType) {
+
+    switch (mediaType) {
+      case "application/xml":
+        return "APPLICATION_XML_VALUE";
+      case "application / x-www-form-urlencoded":
+        return "APPLICATION_FORM_URLENCODED_VALUE";
+      case "multipart/form-data":
+        return "MULTIPART_FORM_DATA_VALUE";
+      case "text/plain":
+        return "TEXT_PLAIN_VALUE";
+      case "text/html":
+        return "TEXT_HTML_VALUE";
+      case "application/pdf":
+        return "APPLICATION_PDF_VALUE";
+      case "image/png":
+        return "IMAGE_PNG_VALUE";
+      default:
+        return "APPLICATION_JSON_VALUE";
+    }
+  }
+}
\ No newline at end of file
diff --git a/cobigen-templates/crud-openapi-java-server-app/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/JavaUtil.java b/cobigen-templates/crud-openapi-java-server-app/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/JavaUtil.java
new file mode 100644
index 0000000000..ced2f5fde2
--- /dev/null
+++ b/cobigen-templates/crud-openapi-java-server-app/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/JavaUtil.java
@@ -0,0 +1,464 @@
+package com.devonfw.cobigen.templates.devon4j.utils;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.Collection;
+import java.util.Map;
+
+import org.apache.commons.lang3.ClassUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Provides type operations, mainly checks and casts for Java Primitives, to be used in the templates
+ *
+ */
+public class JavaUtil {
+
+  /**
+   * Logger for this class
+   */
+  private static final Logger LOG = LoggerFactory.getLogger(JavaUtil.class);
+
+  /**
+   * The constructor.
+   */
+  public JavaUtil() {
+
+    // Empty for CobiGen to automatically instantiate it
+  }
+
+  /**
+   * Returns the Object version of a Java primitive or the input if the input isn't a java primitive
+   * 
+   * @param simpleType String
+   * @return the corresponding object wrapper type simple name of the input if the input is the name of a primitive java
+   *         type. The input itself if not. (e.g. "int" results in "Integer")
+   * @throws ClassNotFoundException should not occur.
+   */
+  public String boxJavaPrimitives(String simpleType) throws ClassNotFoundException {
+
+    if (equalsJavaPrimitive(simpleType)) {
+      return ClassUtils.primitiveToWrapper(ClassUtils.getClass(simpleType)).getSimpleName();
+    } else {
+      return simpleType;
+    }
+
+  }
+
+  /**
+   * Returns the simple name of the type of a field in the pojoClass. If the type is a java primitive the name of the
+   * wrapper class is returned
+   *
+   * @param pojoClass {@link Class} the class object of the pojo
+   * @param fieldName {@link String} the name of the field
+   * @return String. The simple name of the field's type. The simple name of the wrapper class in case of java
+   *         primitives
+   * @throws NoSuchFieldException indicating something awefully wrong in the used model
+   * @throws SecurityException if the field cannot be accessed.
+   */
+  public String boxJavaPrimitives(Class<?> pojoClass, String fieldName) throws NoSuchFieldException, SecurityException {
+
+    if (pojoClass == null) {
+      throw new IllegalAccessError(
+          "Class object is null. Cannot generate template as it might obviously depend on reflection.");
+    }
+
+    if (equalsJavaPrimitive(pojoClass, fieldName)) {
+      return ClassUtils.primitiveToWrapper(pojoClass.getDeclaredField(fieldName).getType()).getSimpleName();
+    } else {
+      Field field = pojoClass.getDeclaredField(fieldName);
+      if (field == null) {
+        field = pojoClass.getField(fieldName);
+      }
+      if (field == null) {
+        throw new IllegalAccessError("Could not find field " + fieldName + " in class " + pojoClass);
+      } else {
+        return field.getType().getSimpleName();
+      }
+    }
+  }
+
+  /**
+   * Checks if the given type is a Java primitive
+   *
+   * @param simpleType the type to be checked
+   * @return true iff simpleType is a Java primitive
+   */
+  public boolean equalsJavaPrimitive(String simpleType) {
+
+    try {
+      return ClassUtils.getClass(simpleType).isPrimitive();
+    } catch (ClassNotFoundException e) {
+      LOG.warn("{}: Could not find {}", e.getMessage(), simpleType);
+      return false;
+    }
+  }
+
+  /**
+   * Checks if the given type is a Java primitive or wrapper
+   *
+   * @param simpleType the type to be checked
+   * @return true iff simpleType is a Java primitive or wrapper
+   */
+  public boolean equalsJavaPrimitiveOrWrapper(String simpleType) {
+
+    try {
+      return ClassUtils.isPrimitiveOrWrapper(ClassUtils.getClass(simpleType));
+    } catch (ClassNotFoundException e) {
+      LOG.warn("{}: Could not find {}", e.getMessage(), simpleType);
+      return false;
+    }
+  }
+
+  /**
+   * Checks if the type of the field in the pojo's class is a java primitive
+   *
+   * @param pojoClass the {@link Class} object of the pojo
+   * @param fieldName the name of the field to be checked
+   * @return true iff the field is a java primitive
+   * @throws NoSuchFieldException indicating something awefully wrong in the used model
+   * @throws SecurityException if the field cannot be accessed.
+   */
+  public boolean equalsJavaPrimitive(Class<?> pojoClass, String fieldName)
+      throws NoSuchFieldException, SecurityException {
+
+    if (pojoClass == null) {
+      return false;
+    }
+
+    Field field = pojoClass.getDeclaredField(fieldName);
+    if (field == null) {
+      field = pojoClass.getField(fieldName);
+    }
+    if (field == null) {
+      return false;
+    } else {
+      return field.getType().isPrimitive();
+    }
+  }
+
+  /**
+   * Checks if the given type is a Java primitive or a Java primitive array
+   *
+   * @param simpleType the Type name to be checked
+   * @return true iff {@link #equalsJavaPrimitive(String)} is true or if simpleType is an array with a primitive
+   *         component
+   */
+  public boolean equalsJavaPrimitiveIncludingArrays(String simpleType) {
+
+    Class<?> klasse;
+
+    try {
+      klasse = ClassUtils.getClass(simpleType).getComponentType();
+    } catch (ClassNotFoundException e) {
+      LOG.warn("{}: Could not find {}", e.getMessage(), simpleType);
+      return false;
+    }
+    return equalsJavaPrimitive(simpleType) || (klasse != null && klasse.isPrimitive());
+  }
+
+  /**
+   * Checks if the given field in the pojo class is a java primitive or an array of java primitives
+   *
+   * @param pojoClass the class object of the pojo
+   * @param fieldName the name of the field to be checked
+   * @return true iff {@link #equalsJavaPrimitive(Class, String)} is true or the field is an array of primitives
+   * @throws NoSuchFieldException indicating something awfully wrong in the used model
+   * @throws SecurityException if the field cannot be accessed.
+   */
+  public boolean equalsJavaPrimitiveIncludingArrays(Class<?> pojoClass, String fieldName)
+      throws NoSuchFieldException, SecurityException {
+
+    return equalsJavaPrimitive(pojoClass, fieldName) || (pojoClass.getDeclaredField(fieldName).getType().isArray()
+        && pojoClass.getDeclaredField(fieldName).getType().getComponentType().isPrimitive());
+  }
+
+  /**
+   * Returns a cast statement for a given (java primitive, variable name) pair or nothing if the type isn't a java
+   * primitive
+   *
+   * @param simpleType Java Type
+   * @param varName Variable name
+   * @return String either of the form '((Java Primitive Object Type)varName)' if simpleType is a primitive or the empty
+   *         String otherwise
+   * @throws ClassNotFoundException should not occur
+   */
+  public String castJavaPrimitives(String simpleType, String varName) throws ClassNotFoundException {
+
+    if (equalsJavaPrimitive(simpleType)) {
+      return String.format("((%1$s)%2$s)", boxJavaPrimitives(simpleType), varName);
+    } else {
+      return "";
+    }
+  }
+
+  /**
+   * Returns a cast statement for a given (java primitive, variable name) pair or nothing if the type isn't a java
+   * primitive
+   *
+   * @param pojoClass the class object of the pojo
+   * @param fieldName the name of the field to be casted
+   * @return if fieldName points to a primitive field then a casted statement (e.g. for an int field:
+   *         '((Integer)field)') or an empty String otherwise
+   * @throws NoSuchFieldException indicating something awefully wrong in the used model
+   * @throws SecurityException if the field cannot be accessed.
+   */
+  public String castJavaPrimitives(Class<?> pojoClass, String fieldName)
+      throws NoSuchFieldException, SecurityException {
+
+    if (equalsJavaPrimitive(pojoClass, fieldName)) {
+      return String.format("((%1$s)%2$s)", boxJavaPrimitives(pojoClass, fieldName), fieldName);
+    } else {
+      return "";
+    }
+  }
+
+  /**
+   * @param pojoClass {@link Class} the class object of the pojo
+   * @param fieldName {@link String} the name of the field
+   * @return true if the field is an instance of java.utils.Collections
+   * @throws NoSuchFieldException indicating something awefully wrong in the used model
+   * @throws SecurityException if the field cannot be accessed.
+   */
+  public boolean isCollection(Class<?> pojoClass, String fieldName) throws NoSuchFieldException, SecurityException {
+
+    if (pojoClass == null) {
+      return false;
+    }
+
+    Field field = pojoClass.getDeclaredField(fieldName);
+    if (field == null) {
+      field = pojoClass.getField(fieldName);
+    }
+    if (field == null) {
+      return false;
+    } else {
+      return Collection.class.isAssignableFrom(field.getType());
+    }
+
+  }
+
+  /**
+   * Returns the Ext Type to a given java type
+   *
+   * @param simpleType any java type's simple name
+   * @return corresponding Ext type
+   */
+  public String getExtType(String simpleType) {
+
+    switch (simpleType) {
+      case "short":
+      case "Short":
+      case "int":
+      case "Integer":
+      case "long":
+      case "Long":
+        return "Integer";
+      case "float":
+      case "Float":
+      case "double":
+      case "Double":
+        return "Number";
+      case "boolean":
+      case "Boolean":
+        return "Boolean";
+      case "char":
+      case "Character":
+      case "String":
+        return "String";
+      case "Date":
+        return "Date";
+      default:
+        return "Field";
+    }
+  }
+
+  /**
+   * returns the Angular5 type associated with a Java primitive
+   *
+   * @param simpleType :{@link String} the type to be parsed
+   * @return the corresponding Angular type or 'any' otherwise
+   */
+  public String getAngularType(String simpleType) {
+
+    switch (simpleType) {
+      case "boolean":
+        return "boolean";
+      case "Boolean":
+        return "boolean";
+      case "short":
+        return "number";
+      case "Short":
+        return "number";
+      case "int":
+        return "number";
+      case "Integer":
+        return "number";
+      case "long":
+        return "number";
+      case "Long":
+        return "number";
+      case "float":
+        return "number";
+      case "Float":
+        return "number";
+      case "double":
+        return "number";
+      case "Double":
+        return "number";
+      case "char":
+        return "string";
+      case "Character":
+        return "string";
+      case "String":
+        return "string";
+      case "byte":
+        return "number";
+      default:
+        return "any";
+    }
+  }
+
+  /**
+   * returns the class name of the return type of a specific method.
+   *
+   * @param pojoClass {@link Class}&lt;?&gt; the class object of the pojo
+   * @param methodName {@link String} the name of the method
+   * @return the class name of the return type of the specified method
+   * @throws SecurityException If no method of the given name can be found
+   * @throws NoSuchMethodException If no method of the given name can be found
+   */
+  public String getReturnType(Class<?> pojoClass, String methodName) throws NoSuchMethodException, SecurityException {
+
+    if (pojoClass == null) {
+      throw new IllegalAccessError(
+          "Class object is null. Cannot generate template as it might obviously depend on reflection.");
+    }
+    String s = "-";
+    Method method = findMethod(pojoClass, methodName);
+    if (method != null && !method.getReturnType().equals(Void.TYPE)) {
+      s = method.getReturnType().toString();
+      s = s.substring(s.lastIndexOf('.') + 1, s.length());
+    }
+    return s;
+  }
+
+  /**
+   *
+   * This methods returns the return type of the method in the given pojoClass which are annotated with the parameter
+   * annotatedClass
+   *
+   * @param pojoClass - The class in which to find if it has methods with annotatedClass
+   * @param annotatedClassName - The annotation which needs to be found
+   * @return Return type of the method annotated with the given annotation, else "null"
+   * @throws ClassNotFoundException if the annotated class name could not be found in the class path
+   */
+  @SuppressWarnings("unchecked")
+  public String getReturnTypeOfMethodAnnotatedWith(Class<?> pojoClass, String annotatedClassName)
+      throws ClassNotFoundException {
+
+    if (pojoClass == null) {
+      throw new IllegalAccessError(
+          "Class object is null. Cannot generate template as it might obviously depend on reflection.");
+    }
+
+    Method[] methods = pojoClass.getDeclaredMethods();
+    for (Method method : methods) {
+      if (!method.getName().startsWith("get")) {
+        continue;
+      }
+      for (Annotation a : method.getAnnotations()) {
+        // better if (method.isAnnotationPresent(classObj)) {, but postponed as of different class
+        // loaders of a.getClass() and pojoClass.getClass()
+        if (a.getClass().getCanonicalName().equals(annotatedClassName)) {
+          return method.getReturnType().getSimpleName();
+        }
+      }
+    }
+    return "null";
+  }
+
+  /**
+   * returns the HTTP request type corresponding to an annotation type
+   *
+   * @param annotations The annotation to get the type name of
+   * @return the HTTP request type name of the selected annotation
+   */
+  public String getRequestType(Map<String, Object> annotations) {
+
+    if (annotations.containsKey("javax_ws_rs_GET")) {
+      return "GET";
+    } else if (annotations.containsKey("javax_ws_rs_PUT")) {
+      return "PUT";
+    } else if (annotations.containsKey("javax_ws_rs_POST")) {
+      return "POST";
+    } else if (annotations.containsKey("javax_ws_rs_DELETE")) {
+      return "DELETE";
+    } else if (annotations.containsKey("javax_ws_rs_PATCH")) {
+      return "PATCH";
+    } else {
+      return "-";
+    }
+  }
+
+  /**
+   * Helper method to find a class's specific method
+   *
+   * @param pojoClass {@link Class}&lt;?&gt; the class object of the pojo
+   * @param methodName The name of the method to be found
+   * @return The method object of the method to be found, null if it wasn't found
+   */
+  private Method findMethod(Class<?> pojoClass, String methodName) {
+
+    if (pojoClass == null) {
+      throw new IllegalAccessError(
+          "Class object is null. Cannot generate template as it might obviously depend on reflection.");
+    }
+    for (Method m : pojoClass.getMethods()) {
+      if (m.getName().equals(methodName)) {
+        return m;
+      }
+    }
+    return null;
+  }
+
+  /**
+   * Checks whether the class given by the full qualified name is an enum
+   *
+   * @param className full qualified class name
+   * @return <code>true</code> if the class is an enum, <code>false</code> otherwise
+   */
+  public boolean isEnum(String className) {
+
+    try {
+      return ClassUtils.getClass(className).isEnum();
+    } catch (ClassNotFoundException e) {
+      LOG.warn("{}: Could not find {}", e.getMessage(), className);
+      return false;
+    }
+  }
+
+  /**
+   * Returns the first enum value of an enum class
+   *
+   * @param className full qualified class name
+   * @return the first enum value name found in order
+   */
+  public String getFirstEnumValue(String className) {
+
+    try {
+      Class<?> enumClass = ClassUtils.getClass(className);
+      Field[] declaredFields = enumClass.getDeclaredFields();
+      if (declaredFields.length > 0) {
+        return declaredFields[0].getName();
+      } else {
+        return null;
+      }
+    } catch (ClassNotFoundException e) {
+      LOG.warn("{}: Could not find {}", e.getMessage(), className);
+      return null;
+    }
+  }
+}
diff --git a/cobigen-templates/crud-openapi-java-server-app/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/OpenApiUtil.java b/cobigen-templates/crud-openapi-java-server-app/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/OpenApiUtil.java
new file mode 100644
index 0000000000..a93288f45a
--- /dev/null
+++ b/cobigen-templates/crud-openapi-java-server-app/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/OpenApiUtil.java
@@ -0,0 +1,255 @@
+package com.devonfw.cobigen.templates.devon4j.utils;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.util.Map;
+
+import org.apache.commons.lang3.StringUtils;
+
+/** Utils on OpenAPI template model */
+public class OpenApiUtil {
+
+  /**
+   * Prints javax validation constraints from an OpenAPI model
+   *
+   * @param constraints OpenAPI model constraints
+   * @return the list of supported annotations in Java syntax
+   */
+  public String printJavaConstraints(Map<String, Object> constraints) {
+
+    String consts = "";
+    if (constraints.get("maximum") != null) {
+      consts = consts + "@Max(" + constraints.get("maximum") + ")";
+    }
+    if (constraints.get("minimum") != null) {
+      consts = consts + "@Min(" + constraints.get("minimum") + ")";
+    }
+    if (constraints.get("maxLength") != null) {
+      consts = consts + "@Size(max=" + constraints.get("maxLength");
+      if (constraints.get("minLength") != null) {
+        consts = consts + ", min=" + constraints.get("minLength");
+      }
+      consts = consts + ")";
+    } else {
+      if (constraints.get("minLength") != null) {
+        consts = consts + "@Size(min=" + constraints.get("minLength");
+        if (constraints.get("maxLength") != null) {
+          consts = consts + ", max=" + constraints.get("maxLength");
+        }
+        consts = consts + ")";
+      }
+    }
+    return consts;
+  }
+
+  /**
+   * Prints the return type of a response based on the OpenAPI model
+   *
+   * @param response the OpenAPI model of a response
+   * @return simple type of the response return type in Java syntax
+   */
+  public String printJavaServiceResponseReturnType(Map<String, Object> response) {
+
+    String returnType = toJavaType(response, false);
+    if ((boolean) response.get("isVoid")) {
+      return "void";
+    }
+    if ((boolean) response.get("isArray")) {
+      if ((boolean) response.get("isEntity")) {
+        if (returnType.contains("Entity")) {
+          return "List<" + returnType + ">";
+        } else {
+          return "List<" + returnType + "Entity>";
+        }
+      } else {
+        return "List<" + returnType + ">";
+      }
+    } else if ((boolean) response.get("isPaginated")) {
+      if ((boolean) response.get("isEntity")) {
+        if (returnType.contains("Entity")) {
+          return "Page<" + returnType + ">";
+        } else {
+          return "Page<" + returnType + "Entity>";
+        }
+      } else {
+        return "Page<" + returnType + ">";
+      }
+    } else {
+      return returnType;
+    }
+  }
+
+  /**
+   * Returns the Java type corresponding to the OpenAPI type definition. If the type could not be matched, Object will
+   * be returned.
+   *
+   * @param parameter OpenAPI model of a parameter
+   * @param simpleType if a Java simple type should be returned if possible
+   * @return the Java type
+   */
+  public String toJavaType(Map<String, Object> parameter, boolean simpleType) {
+
+    String typeConverted = null;
+    String format = (String) parameter.get("format");
+    String type = (String) parameter.get("type");
+    boolean isCollection = false;
+    if (parameter.get("isCollection") != null) {
+      isCollection = (boolean) parameter.get("isCollection");
+    }
+
+    boolean isEntity = (boolean) parameter.get("isEntity");
+
+    if (type != null) {
+      switch (type.toLowerCase()) {
+        case "integer":
+          if (format != null) {
+            switch (format) {
+              case "int32":
+                typeConverted = simpleType ? "int" : "Integer";
+                break;
+              case "int64":
+                typeConverted = simpleType ? "long" : "Long";
+                break;
+              default:
+                typeConverted = BigInteger.class.getSimpleName();
+                break;
+            }
+          } else {
+            typeConverted = BigInteger.class.getSimpleName();
+          }
+          break;
+        case "number":
+          if (format != null) {
+            switch (format) {
+              case "float":
+                typeConverted = simpleType ? "float" : "Float";
+                break;
+              case "double":
+                typeConverted = simpleType ? "double" : "Double";
+                break;
+              default:
+                typeConverted = BigDecimal.class.getSimpleName();
+                break;
+            }
+          } else {
+            typeConverted = BigDecimal.class.getSimpleName();
+          }
+          break;
+        case "string":
+          if (format != null) {
+            switch (format) {
+              case "date":
+                typeConverted = LocalDate.class.getSimpleName();
+                break;
+              case "date-time":
+                typeConverted = Instant.class.getSimpleName();
+                break;
+              case "binary":
+                typeConverted = simpleType ? "float" : "Float";
+                break;
+              case "email":
+              case "password":
+                typeConverted = String.class.getSimpleName();
+                break;
+              default:
+                typeConverted = "String";
+                break;
+            }
+          } else {
+            typeConverted = "String";
+          }
+          break;
+        case "boolean":
+          typeConverted = simpleType ? "boolean" : "Boolean";
+          break;
+        default:
+          typeConverted = "void";
+          break;
+      }
+    } else {
+      typeConverted = "void";
+    }
+
+    if (isCollection) {
+      if (isEntity) {
+        return "List<" + parameter.get("type") + ">";
+      } else {
+        return "List<" + typeConverted + ">";
+      }
+    } else if (isEntity) {
+      return (String) parameter.get("type");
+    }
+    return typeConverted;
+  }
+
+  /**
+   * Returns the TypeScript type corresponding to the OpenAPI type definition. If the type could not be matched, the
+   * same value will be returned.
+   *
+   * @param parameter OpenAPI model of a parameter
+   * @return the Java type
+   */
+  // getOaspTypeFromOpenAPI
+  public String toTypeScriptType(Map<String, Object> parameter) {
+
+    String typeConverted = null;
+    String type = (String) parameter.get("type");
+    boolean isCollection = false;
+    if (parameter.get("isCollection") != null) {
+      isCollection = (boolean) parameter.get("isCollection");
+    }
+
+    boolean isEntity = (boolean) parameter.get("isEntity");
+
+    if (type != null) {
+      switch (type.toLowerCase()) {
+        case "integer":
+          typeConverted = "number";
+          break;
+        default:
+          typeConverted = type;
+          break;
+      }
+    } else {
+      typeConverted = "undefined";
+    }
+
+    if (isCollection) {
+      if (isEntity) {
+        return parameter.get("type") + "[]";
+      } else {
+        return typeConverted + "[]";
+      }
+    } else if (isEntity) {
+      return (String) parameter.get("type");
+    }
+    return typeConverted;
+  }
+
+  /**
+   * Prints the service operation name based on the operationId or generates one based on the servicePath while printing
+   * a comment how to get better service names.
+   *
+   * @param operation operation Model of the OpenAPI model
+   * @param servicePath service path of the
+   * @return the service method name
+   */
+  public String printServiceOperationName(Map<String, Object> operation, String servicePath) {
+
+    String operationId = (String) operation.get("operationId");
+    if (StringUtils.isEmpty(operationId)) {
+      String[] split = servicePath.split("/");
+      String lastSegment;
+      if (!split[split.length - 1].isEmpty()) {
+        lastSegment = split[split.length - 1];
+      } else {
+        lastSegment = split[split.length - 2];
+      }
+      return ((String) operation.get("type")) + lastSegment;
+    } else {
+      return operationId;
+    }
+  }
+}
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_java_server_app/functions.ftl b/cobigen-templates/crud-openapi-java-server-app/src/main/resources/functions.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_java_server_app/functions.ftl
rename to cobigen-templates/crud-openapi-java-server-app/src/main/resources/functions.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_java_server_app/makros.ftl b/cobigen-templates/crud-openapi-java-server-app/src/main/resources/makros.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_java_server_app/makros.ftl
rename to cobigen-templates/crud-openapi-java-server-app/src/main/resources/makros.ftl
diff --git a/cobigen-templates/crud-openapi-java-server-app/src/main/resources/template-set.xml b/cobigen-templates/crud-openapi-java-server-app/src/main/resources/template-set.xml
new file mode 100644
index 0000000000..e91923bf07
--- /dev/null
+++ b/cobigen-templates/crud-openapi-java-server-app/src/main/resources/template-set.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:templateSetConfiguration version="6.0"
+                              xmlns:tns="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration"
+                              xmlns:cc="http://capgemini.com/devonfw/cobigen/ContextConfiguration"
+                              xmlns:tc="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration"
+                              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                              xsi:schemaLocation="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration templateSetConfiguration.xsd ">
+    <cc:contextConfiguration version="3.0">
+        <cc:trigger id="crud_openapi_java_server_app" type="openapi">
+            <cc:containerMatcher type="element" value="openAPIFile"/>
+            <cc:matcher type="element" value="EntityDef">
+                <cc:variableAssignment type="extension" key="rootPackage" value="x-rootpackage"/>
+                <cc:variableAssignment type="property" key="component" value="componentName"/>
+                <cc:variableAssignment type="property" key="entityName" value="name"/>
+            </cc:matcher>
+        </cc:trigger>
+        <cc:tags>
+            <cc:tag name="Java"></cc:tag>
+            <cc:tag name="OpenAPI"></cc:tag>
+            <cc:tag name="CRUD"></cc:tag>
+            <cc:tag name="Server"></cc:tag>
+            <cc:tag name="App"></cc:tag>
+        </cc:tags>
+        <cc:links>
+            <cc:link url="https://github.com/devonfw/cobigen/wiki/howto-devonfw-ide-CobiGen-PoC-E2E"></cc:link>
+        </cc:links>
+    </cc:contextConfiguration>
+    <tc:templatesConfiguration version="5.0">
+        <tc:templates>
+            <tc:templateExtension ref="${variables.entityName}Entity.java" mergeStrategy="javamerge"/>
+            <tc:templateExtension ref="${variables.entityName}.java" mergeStrategy="javamerge"/>
+            <tc:templateExtension ref="${variables.entityName}Eto.java" mergeStrategy="javamerge"/>
+            <tc:templateExtension ref="${variables.entityName}Repository.java" mergeStrategy="javamerge"/>
+            <tc:templateExtension ref="${variables.entityName}Cto.java" mergeStrategy="javamerge"/>
+            <tc:templateExtension ref="${variables.entityName}SearchCriteriaTo.java" mergeStrategy="javamerge"/>
+            <tc:templateExtension ref="${variables.component#cap_first}RestService.java" mergeStrategy="javamerge"/>
+            <tc:templateExtension ref="${variables.component#cap_first}RestServiceImpl.java" mergeStrategy="javamerge"/>
+            <tc:templateExtension ref="AbstractSearchCriteriaTo.java" mergeStrategy="javamerge"/>
+
+            <!-- Complex templates below -->
+
+            <tc:templateExtension ref="${variables.component#cap_first}.java" mergeStrategy="javamerge"/>
+            <tc:templateExtension ref="${variables.component#cap_first}Impl.java" mergeStrategy="javamerge"/>
+
+            <tc:templateExtension ref="UcFind${variables.entityName}.java" mergeStrategy="javamerge"/>
+            <tc:templateExtension ref="UcFind${variables.entityName}Impl.java" mergeStrategy="javamerge"/>
+            <tc:templateExtension ref="UcManage${variables.entityName}.java" mergeStrategy="javamerge"/>
+            <tc:templateExtension ref="UcManage${variables.entityName}Impl.java" mergeStrategy="javamerge"/>
+
+            <!-- CTOs specific increments -->
+            <tc:templateExtension ref="UcFind${variables.entityName}Ctos.java"
+                                  destinationPath="src/main/java/${variables.rootPackage}/${variables.component}/logic/api/usecase/UcFind${variables.entityName}.java"
+                                  mergeStrategy="javamerge"/>
+            <tc:templateExtension ref="UcFind${variables.entityName}ImplCtos.java"
+                                  destinationPath="src/main/java/${variables.rootPackage}/${variables.component}/logic/impl/usecase/UcFind${variables.entityName}Impl.java"
+                                  mergeStrategy="javamerge"/>
+            <tc:templateExtension ref="${variables.component#cap_first}ImplCtos.java"
+                                  destinationPath="src/main/java/${variables.rootPackage}/${variables.component}/logic/impl/${variables.component#cap_first}Impl.java"
+                                  mergeStrategy="javamerge"/>
+            <tc:templateExtension ref="${variables.component#cap_first}Ctos.java"
+                                  destinationPath="src/main/java/${variables.rootPackage}/${variables.component}/logic/api/${variables.component#cap_first}.java"
+                                  mergeStrategy="javamerge"/>
+            <tc:templateExtension ref="${variables.component#cap_first}RestServiceImplCtos.java"
+                                  destinationPath="src/main/java/${variables.rootPackage}/${variables.component}/service/impl/rest/${variables.component#cap_first}RestServiceImpl.java"
+                                  mergeStrategy="javamerge"/>
+            <tc:templateExtension ref="${variables.component#cap_first}RestServiceCtos.java"
+                                  destinationPath="src/main/java/${variables.rootPackage}/${variables.component}/service/api/rest/${variables.component#cap_first}RestService.java"
+                                  mergeStrategy="javamerge"/>
+
+            <tc:templateExtension ref="AbstractLogic.java" mergeStrategy="javamerge"/>
+        </tc:templates>
+
+        <tc:templateScans>
+            <tc:templateScan templatePath="templates" destinationPath="src/main"/>
+        </tc:templateScans>
+
+        <tc:increments>
+            <tc:increment name="server" description="CRUD devon4j Server"
+                          explanation="Creates (backends) server CRUD service for java application.">
+                <tc:incrementRef ref="tos"/>
+                <tc:incrementRef ref="ctos"/>
+                <tc:incrementRef ref="logic_impl_complex"/>
+                <tc:incrementRef ref="logic_complex_ctos"/>
+                <tc:incrementRef ref="dataaccess_infrastructure"/>
+                <tc:incrementRef ref="rest_service_impl"/>
+                <tc:incrementRef ref="rest_service_impl_ctos"/>
+                <tc:incrementRef ref="springdata-repository"/>
+            </tc:increment>
+            <tc:increment name="springdata-repository" description="CRUD SpringData Repository">
+                <tc:templateRef ref="${variables.entityName}Repository.java"/>
+            </tc:increment>
+            <tc:increment name="tos" description="TO's">
+                <tc:templateRef ref="AbstractSearchCriteriaTo.java"/>
+                <tc:templateRef ref="${variables.entityName}Eto.java"/>
+                <tc:templateRef ref="${variables.entityName}SearchCriteriaTo.java"/>
+            </tc:increment>
+            <tc:increment name="ctos" description="CTO's">
+                <tc:templateRef ref="${variables.entityName}Cto.java"/>
+            </tc:increment>
+            <tc:increment name="logic_impl_complex" description="CRUD UC logic">
+                <tc:templateRef ref="AbstractBeanMapperSupport.java"/>
+                <tc:templateRef ref="${variables.component#cap_first}.java"/>
+                <tc:templateRef ref="Abstract${variables.entityName}Uc.java"/>
+                <tc:templateRef ref="AbstractUc.java"/>
+                <tc:templateRef ref="AbstractLogic.java"/>
+                <tc:templateRef ref="${variables.component#cap_first}Impl.java"/>
+                <tc:templateRef ref="UcFind${variables.entityName}.java"/>
+                <tc:templateRef ref="UcManage${variables.entityName}.java"/>
+                <tc:templateRef ref="UcFind${variables.entityName}Impl.java"/>
+                <tc:templateRef ref="UcManage${variables.entityName}Impl.java"/>
+            </tc:increment>
+            <tc:increment name="logic_complex_ctos" description="CRUD UC logic (CTOs)">
+                <tc:templateRef ref="AbstractUc.java"/>
+                <tc:templateRef ref="Abstract${variables.entityName}Uc.java"/>
+                <tc:templateRef ref="UcFind${variables.entityName}Ctos.java"/>
+                <tc:templateRef ref="UcFind${variables.entityName}ImplCtos.java"/>
+                <tc:templateRef ref="${variables.component#cap_first}Ctos.java"/>
+                <tc:templateRef ref="${variables.component#cap_first}ImplCtos.java"/>
+            </tc:increment>
+            <tc:increment name="dataaccess_infrastructure" description="Entity infrastructure">
+                <tc:templateRef ref="ApplicationPersistenceEntity.java"/>
+                <tc:templateRef ref="ApplicationEntity.java"/>
+                <tc:templateRef ref="${variables.entityName}Entity.java"/>
+                <tc:templateRef ref="${variables.entityName}.java"/>
+            </tc:increment>
+            <tc:increment name="rest_service_impl" description="CRUD REST services">
+                <tc:templateRef ref="AbstractBeanMapperSupport.java"/>
+                <tc:templateRef ref="AbstractComponentFacade.java"/>
+                <tc:templateRef ref="${variables.component#cap_first}RestServiceImpl.java"/>
+                <tc:templateRef ref="${variables.component#cap_first}RestService.java"/>
+            </tc:increment>
+            <tc:increment name="rest_service_impl_ctos" description="CRUD REST services (CTOs)">
+                <tc:templateRef ref="AbstractBeanMapperSupport.java"/>
+                <tc:templateRef ref="AbstractComponentFacade.java"/>
+                <tc:templateRef ref="${variables.component#cap_first}RestServiceImplCtos.java"/>
+                <tc:templateRef ref="${variables.component#cap_first}RestServiceCtos.java"/>
+            </tc:increment>
+        </tc:increments>
+    </tc:templatesConfiguration>
+
+</tns:templateSetConfiguration>
\ No newline at end of file
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_java_server_app/templates/java/${variables.rootPackage}/${variables.component#lower_case}/common/api/${variables.entityName}.java.ftl b/cobigen-templates/crud-openapi-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component#lower_case}/common/api/${variables.entityName}.java.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_java_server_app/templates/java/${variables.rootPackage}/${variables.component#lower_case}/common/api/${variables.entityName}.java.ftl
rename to cobigen-templates/crud-openapi-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component#lower_case}/common/api/${variables.entityName}.java.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_java_server_app/templates/java/${variables.rootPackage}/${variables.component#lower_case}/common/api/cobigen.properties b/cobigen-templates/crud-openapi-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component#lower_case}/common/api/cobigen.properties
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_java_server_app/templates/java/${variables.rootPackage}/${variables.component#lower_case}/common/api/cobigen.properties
rename to cobigen-templates/crud-openapi-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component#lower_case}/common/api/cobigen.properties
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_java_server_app/templates/java/${variables.rootPackage}/${variables.component#lower_case}/dataaccess/api/${variables.entityName}Entity.java.ftl b/cobigen-templates/crud-openapi-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component#lower_case}/dataaccess/api/${variables.entityName}Entity.java.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_java_server_app/templates/java/${variables.rootPackage}/${variables.component#lower_case}/dataaccess/api/${variables.entityName}Entity.java.ftl
rename to cobigen-templates/crud-openapi-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component#lower_case}/dataaccess/api/${variables.entityName}Entity.java.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_java_server_app/templates/java/${variables.rootPackage}/${variables.component#lower_case}/dataaccess/api/repo/${variables.entityName}Repository.java.ftl b/cobigen-templates/crud-openapi-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component#lower_case}/dataaccess/api/repo/${variables.entityName}Repository.java.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_java_server_app/templates/java/${variables.rootPackage}/${variables.component#lower_case}/dataaccess/api/repo/${variables.entityName}Repository.java.ftl
rename to cobigen-templates/crud-openapi-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component#lower_case}/dataaccess/api/repo/${variables.entityName}Repository.java.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_java_server_app/templates/java/${variables.rootPackage}/${variables.component#lower_case}/logic/api/${variables.component#cap_first}.java.ftl b/cobigen-templates/crud-openapi-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component#lower_case}/logic/api/${variables.component#cap_first}.java.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_java_server_app/templates/java/${variables.rootPackage}/${variables.component#lower_case}/logic/api/${variables.component#cap_first}.java.ftl
rename to cobigen-templates/crud-openapi-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component#lower_case}/logic/api/${variables.component#cap_first}.java.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_java_server_app/templates/java/${variables.rootPackage}/${variables.component#lower_case}/logic/api/${variables.component#cap_first}Ctos.java.ftl b/cobigen-templates/crud-openapi-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component#lower_case}/logic/api/${variables.component#cap_first}Ctos.java.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_java_server_app/templates/java/${variables.rootPackage}/${variables.component#lower_case}/logic/api/${variables.component#cap_first}Ctos.java.ftl
rename to cobigen-templates/crud-openapi-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component#lower_case}/logic/api/${variables.component#cap_first}Ctos.java.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_java_server_app/templates/java/${variables.rootPackage}/${variables.component#lower_case}/logic/api/cobigen.properties b/cobigen-templates/crud-openapi-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component#lower_case}/logic/api/cobigen.properties
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_java_server_app/templates/java/${variables.rootPackage}/${variables.component#lower_case}/logic/api/cobigen.properties
rename to cobigen-templates/crud-openapi-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component#lower_case}/logic/api/cobigen.properties
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_java_server_app/templates/java/${variables.rootPackage}/${variables.component#lower_case}/logic/api/to/${variables.entityName}Cto.java.ftl b/cobigen-templates/crud-openapi-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component#lower_case}/logic/api/to/${variables.entityName}Cto.java.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_java_server_app/templates/java/${variables.rootPackage}/${variables.component#lower_case}/logic/api/to/${variables.entityName}Cto.java.ftl
rename to cobigen-templates/crud-openapi-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component#lower_case}/logic/api/to/${variables.entityName}Cto.java.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_java_server_app/templates/java/${variables.rootPackage}/${variables.component#lower_case}/logic/api/to/${variables.entityName}Eto.java.ftl b/cobigen-templates/crud-openapi-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component#lower_case}/logic/api/to/${variables.entityName}Eto.java.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_java_server_app/templates/java/${variables.rootPackage}/${variables.component#lower_case}/logic/api/to/${variables.entityName}Eto.java.ftl
rename to cobigen-templates/crud-openapi-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component#lower_case}/logic/api/to/${variables.entityName}Eto.java.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_java_server_app/templates/java/${variables.rootPackage}/${variables.component#lower_case}/logic/api/to/${variables.entityName}SearchCriteriaTo.java.ftl b/cobigen-templates/crud-openapi-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component#lower_case}/logic/api/to/${variables.entityName}SearchCriteriaTo.java.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_java_server_app/templates/java/${variables.rootPackage}/${variables.component#lower_case}/logic/api/to/${variables.entityName}SearchCriteriaTo.java.ftl
rename to cobigen-templates/crud-openapi-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component#lower_case}/logic/api/to/${variables.entityName}SearchCriteriaTo.java.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_java_server_app/templates/java/${variables.rootPackage}/${variables.component#lower_case}/logic/api/usecase/UcFind${variables.entityName}.java.ftl b/cobigen-templates/crud-openapi-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component#lower_case}/logic/api/usecase/UcFind${variables.entityName}.java.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_java_server_app/templates/java/${variables.rootPackage}/${variables.component#lower_case}/logic/api/usecase/UcFind${variables.entityName}.java.ftl
rename to cobigen-templates/crud-openapi-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component#lower_case}/logic/api/usecase/UcFind${variables.entityName}.java.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_java_server_app/templates/java/${variables.rootPackage}/${variables.component#lower_case}/logic/api/usecase/UcFind${variables.entityName}Ctos.java.ftl b/cobigen-templates/crud-openapi-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component#lower_case}/logic/api/usecase/UcFind${variables.entityName}Ctos.java.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_java_server_app/templates/java/${variables.rootPackage}/${variables.component#lower_case}/logic/api/usecase/UcFind${variables.entityName}Ctos.java.ftl
rename to cobigen-templates/crud-openapi-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component#lower_case}/logic/api/usecase/UcFind${variables.entityName}Ctos.java.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_java_server_app/templates/java/${variables.rootPackage}/${variables.component#lower_case}/logic/api/usecase/UcManage${variables.entityName}.java.ftl b/cobigen-templates/crud-openapi-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component#lower_case}/logic/api/usecase/UcManage${variables.entityName}.java.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_java_server_app/templates/java/${variables.rootPackage}/${variables.component#lower_case}/logic/api/usecase/UcManage${variables.entityName}.java.ftl
rename to cobigen-templates/crud-openapi-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component#lower_case}/logic/api/usecase/UcManage${variables.entityName}.java.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_java_server_app/templates/java/${variables.rootPackage}/${variables.component#lower_case}/logic/base/usecase/Abstract${variables.entityName}Uc.java.ftl b/cobigen-templates/crud-openapi-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component#lower_case}/logic/base/usecase/Abstract${variables.entityName}Uc.java.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_java_server_app/templates/java/${variables.rootPackage}/${variables.component#lower_case}/logic/base/usecase/Abstract${variables.entityName}Uc.java.ftl
rename to cobigen-templates/crud-openapi-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component#lower_case}/logic/base/usecase/Abstract${variables.entityName}Uc.java.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_java_server_app/templates/java/${variables.rootPackage}/${variables.component#lower_case}/logic/impl/${variables.component#cap_first}Impl.java.ftl b/cobigen-templates/crud-openapi-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component#lower_case}/logic/impl/${variables.component#cap_first}Impl.java.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_java_server_app/templates/java/${variables.rootPackage}/${variables.component#lower_case}/logic/impl/${variables.component#cap_first}Impl.java.ftl
rename to cobigen-templates/crud-openapi-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component#lower_case}/logic/impl/${variables.component#cap_first}Impl.java.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_java_server_app/templates/java/${variables.rootPackage}/${variables.component#lower_case}/logic/impl/${variables.component#cap_first}ImplCtos.java.ftl b/cobigen-templates/crud-openapi-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component#lower_case}/logic/impl/${variables.component#cap_first}ImplCtos.java.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_java_server_app/templates/java/${variables.rootPackage}/${variables.component#lower_case}/logic/impl/${variables.component#cap_first}ImplCtos.java.ftl
rename to cobigen-templates/crud-openapi-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component#lower_case}/logic/impl/${variables.component#cap_first}ImplCtos.java.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_java_server_app/templates/java/${variables.rootPackage}/${variables.component#lower_case}/logic/impl/usecase/UcFind${variables.entityName}Impl.java.ftl b/cobigen-templates/crud-openapi-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component#lower_case}/logic/impl/usecase/UcFind${variables.entityName}Impl.java.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_java_server_app/templates/java/${variables.rootPackage}/${variables.component#lower_case}/logic/impl/usecase/UcFind${variables.entityName}Impl.java.ftl
rename to cobigen-templates/crud-openapi-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component#lower_case}/logic/impl/usecase/UcFind${variables.entityName}Impl.java.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_java_server_app/templates/java/${variables.rootPackage}/${variables.component#lower_case}/logic/impl/usecase/UcFind${variables.entityName}ImplCtos.java.ftl b/cobigen-templates/crud-openapi-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component#lower_case}/logic/impl/usecase/UcFind${variables.entityName}ImplCtos.java.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_java_server_app/templates/java/${variables.rootPackage}/${variables.component#lower_case}/logic/impl/usecase/UcFind${variables.entityName}ImplCtos.java.ftl
rename to cobigen-templates/crud-openapi-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component#lower_case}/logic/impl/usecase/UcFind${variables.entityName}ImplCtos.java.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_java_server_app/templates/java/${variables.rootPackage}/${variables.component#lower_case}/logic/impl/usecase/UcManage${variables.entityName}Impl.java.ftl b/cobigen-templates/crud-openapi-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component#lower_case}/logic/impl/usecase/UcManage${variables.entityName}Impl.java.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_java_server_app/templates/java/${variables.rootPackage}/${variables.component#lower_case}/logic/impl/usecase/UcManage${variables.entityName}Impl.java.ftl
rename to cobigen-templates/crud-openapi-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component#lower_case}/logic/impl/usecase/UcManage${variables.entityName}Impl.java.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_java_server_app/templates/java/${variables.rootPackage}/${variables.component#lower_case}/service/api/cobigen.properties b/cobigen-templates/crud-openapi-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component#lower_case}/service/api/cobigen.properties
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_java_server_app/templates/java/${variables.rootPackage}/${variables.component#lower_case}/service/api/cobigen.properties
rename to cobigen-templates/crud-openapi-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component#lower_case}/service/api/cobigen.properties
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_java_server_app/templates/java/${variables.rootPackage}/${variables.component#lower_case}/service/api/rest/${variables.component#cap_first}RestService.java.ftl b/cobigen-templates/crud-openapi-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component#lower_case}/service/api/rest/${variables.component#cap_first}RestService.java.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_java_server_app/templates/java/${variables.rootPackage}/${variables.component#lower_case}/service/api/rest/${variables.component#cap_first}RestService.java.ftl
rename to cobigen-templates/crud-openapi-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component#lower_case}/service/api/rest/${variables.component#cap_first}RestService.java.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_java_server_app/templates/java/${variables.rootPackage}/${variables.component#lower_case}/service/api/rest/${variables.component#cap_first}RestServiceCtos.java.ftl b/cobigen-templates/crud-openapi-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component#lower_case}/service/api/rest/${variables.component#cap_first}RestServiceCtos.java.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_java_server_app/templates/java/${variables.rootPackage}/${variables.component#lower_case}/service/api/rest/${variables.component#cap_first}RestServiceCtos.java.ftl
rename to cobigen-templates/crud-openapi-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component#lower_case}/service/api/rest/${variables.component#cap_first}RestServiceCtos.java.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_java_server_app/templates/java/${variables.rootPackage}/${variables.component#lower_case}/service/impl/rest/${variables.component#cap_first}RestServiceImpl.java.ftl b/cobigen-templates/crud-openapi-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component#lower_case}/service/impl/rest/${variables.component#cap_first}RestServiceImpl.java.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_java_server_app/templates/java/${variables.rootPackage}/${variables.component#lower_case}/service/impl/rest/${variables.component#cap_first}RestServiceImpl.java.ftl
rename to cobigen-templates/crud-openapi-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component#lower_case}/service/impl/rest/${variables.component#cap_first}RestServiceImpl.java.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_java_server_app/templates/java/${variables.rootPackage}/${variables.component#lower_case}/service/impl/rest/${variables.component#cap_first}RestServiceImplCtos.java.ftl b/cobigen-templates/crud-openapi-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component#lower_case}/service/impl/rest/${variables.component#cap_first}RestServiceImplCtos.java.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_java_server_app/templates/java/${variables.rootPackage}/${variables.component#lower_case}/service/impl/rest/${variables.component#cap_first}RestServiceImplCtos.java.ftl
rename to cobigen-templates/crud-openapi-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component#lower_case}/service/impl/rest/${variables.component#cap_first}RestServiceImplCtos.java.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_java_server_app/templates/java/${variables.rootPackage}/general/common/api/ApplicationEntity.java.ftl b/cobigen-templates/crud-openapi-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/general/common/api/ApplicationEntity.java.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_java_server_app/templates/java/${variables.rootPackage}/general/common/api/ApplicationEntity.java.ftl
rename to cobigen-templates/crud-openapi-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/general/common/api/ApplicationEntity.java.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_java_server_app/templates/java/${variables.rootPackage}/general/common/api/to/AbstractSearchCriteriaTo.java.ftl b/cobigen-templates/crud-openapi-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/general/common/api/to/AbstractSearchCriteriaTo.java.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_java_server_app/templates/java/${variables.rootPackage}/general/common/api/to/AbstractSearchCriteriaTo.java.ftl
rename to cobigen-templates/crud-openapi-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/general/common/api/to/AbstractSearchCriteriaTo.java.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_java_server_app/templates/java/${variables.rootPackage}/general/common/api/to/cobigen.properties b/cobigen-templates/crud-openapi-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/general/common/api/to/cobigen.properties
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_java_server_app/templates/java/${variables.rootPackage}/general/common/api/to/cobigen.properties
rename to cobigen-templates/crud-openapi-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/general/common/api/to/cobigen.properties
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_java_server_app/templates/java/${variables.rootPackage}/general/common/base/AbstractBeanMapperSupport.java.ftl b/cobigen-templates/crud-openapi-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/general/common/base/AbstractBeanMapperSupport.java.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_java_server_app/templates/java/${variables.rootPackage}/general/common/base/AbstractBeanMapperSupport.java.ftl
rename to cobigen-templates/crud-openapi-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/general/common/base/AbstractBeanMapperSupport.java.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_java_server_app/templates/java/${variables.rootPackage}/general/dataaccess/api/ApplicationPersistenceEntity.java.ftl b/cobigen-templates/crud-openapi-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/general/dataaccess/api/ApplicationPersistenceEntity.java.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_java_server_app/templates/java/${variables.rootPackage}/general/dataaccess/api/ApplicationPersistenceEntity.java.ftl
rename to cobigen-templates/crud-openapi-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/general/dataaccess/api/ApplicationPersistenceEntity.java.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_java_server_app/templates/java/${variables.rootPackage}/general/logic/base/AbstractComponentFacade.java.ftl b/cobigen-templates/crud-openapi-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/general/logic/base/AbstractComponentFacade.java.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_java_server_app/templates/java/${variables.rootPackage}/general/logic/base/AbstractComponentFacade.java.ftl
rename to cobigen-templates/crud-openapi-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/general/logic/base/AbstractComponentFacade.java.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_java_server_app/templates/java/${variables.rootPackage}/general/logic/base/AbstractLogic.java.ftl b/cobigen-templates/crud-openapi-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/general/logic/base/AbstractLogic.java.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_java_server_app/templates/java/${variables.rootPackage}/general/logic/base/AbstractLogic.java.ftl
rename to cobigen-templates/crud-openapi-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/general/logic/base/AbstractLogic.java.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_java_server_app/templates/java/${variables.rootPackage}/general/logic/base/AbstractUc.java.ftl b/cobigen-templates/crud-openapi-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/general/logic/base/AbstractUc.java.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_java_server_app/templates/java/${variables.rootPackage}/general/logic/base/AbstractUc.java.ftl
rename to cobigen-templates/crud-openapi-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/general/logic/base/AbstractUc.java.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_java_server_app/templates/java/${variables.rootPackage}/general/service/impl/config/ServiceConfig.java.ftl b/cobigen-templates/crud-openapi-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/general/service/impl/config/ServiceConfig.java.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_java_server_app/templates/java/${variables.rootPackage}/general/service/impl/config/ServiceConfig.java.ftl
rename to cobigen-templates/crud-openapi-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/general/service/impl/config/ServiceConfig.java.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_java_server_app/templates/java/${variables.rootPackage}/general/service/impl/config/WebApplicationContextLocator.java.ftl b/cobigen-templates/crud-openapi-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/general/service/impl/config/WebApplicationContextLocator.java.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_java_server_app/templates/java/${variables.rootPackage}/general/service/impl/config/WebApplicationContextLocator.java.ftl
rename to cobigen-templates/crud-openapi-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/general/service/impl/config/WebApplicationContextLocator.java.ftl
diff --git a/cobigen-templates/crud-openapi-java-server-app/src/test/java/com/devonfw/cobigen/templates/devon4j/test/templates/CrudOpenApiJavaServerAppGenerationTest.java b/cobigen-templates/crud-openapi-java-server-app/src/test/java/com/devonfw/cobigen/templates/devon4j/test/templates/CrudOpenApiJavaServerAppGenerationTest.java
new file mode 100644
index 0000000000..635086e78c
--- /dev/null
+++ b/cobigen-templates/crud-openapi-java-server-app/src/test/java/com/devonfw/cobigen/templates/devon4j/test/templates/CrudOpenApiJavaServerAppGenerationTest.java
@@ -0,0 +1,99 @@
+package com.devonfw.cobigen.templates.devon4j.test.templates;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+import org.apache.commons.io.FileUtils;
+import org.junit.BeforeClass;
+import org.junit.ClassRule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+
+import com.devonfw.cobigen.api.constants.ConfigurationConstants;
+import com.devonfw.cobigen.maven.test.AbstractMavenTest;
+import com.devonfw.cobigen.templates.devon4j.config.constant.MavenMetadata;
+
+/**
+ * Smoke tests of all templates.
+ */
+public class CrudOpenApiJavaServerAppGenerationTest extends AbstractMavenTest {
+
+  /** Root of all test resources of this test suite */
+  public static final String TEST_RESOURCES_ROOT = "src/test/resources/testdata/templatetest/";
+
+  /** Temporary files rule to create temporary folders */
+  @ClassRule
+  public static TemporaryFolder tempFolder = new TemporaryFolder();
+
+  /** The templates development folder */
+  protected static Path templatesProject;
+
+  /** The templates development folder */
+  protected static Path templatesProjectTemporary;
+
+  /**
+   * Creates a copy of the templates project in the temp directory
+   *
+   * @throws URISyntaxException if the path could not be created properly
+   * @throws IOException if accessing a directory or file fails
+   */
+  @BeforeClass
+  public static void setupDevTemplates() throws URISyntaxException, IOException {
+
+    templatesProject = new File(
+        CrudOpenApiJavaServerAppGenerationTest.class.getProtectionDomain().getCodeSource().getLocation().toURI()).getParentFile()
+            .getParentFile().toPath();
+
+    Path utilsPom = new File(CrudOpenApiJavaServerAppGenerationTest.class.getProtectionDomain().getCodeSource().getLocation().toURI())
+        .getParentFile().getParentFile().toPath().resolve("src/test/resources/utils/pom.xml");
+
+    // create a temporary directory cobigen-templates/template-sets/adapted containing the template sets
+    Path tempFolderPath = tempFolder.getRoot().toPath();
+    Path cobigenTemplatePath = tempFolderPath.resolve("cobigen-templates");
+    if (!Files.exists(cobigenTemplatePath)) {
+      Files.createDirectory(cobigenTemplatePath);
+
+      templatesProjectTemporary = cobigenTemplatePath.resolve(ConfigurationConstants.TEMPLATE_SETS_FOLDER);
+      Path templateSetsAdaptedFolder = templatesProjectTemporary.resolve(ConfigurationConstants.ADAPTED_FOLDER);
+      Files.createDirectory(templatesProjectTemporary);
+      Files.createDirectory(templateSetsAdaptedFolder);
+
+      Path templateSetPath = templateSetsAdaptedFolder.resolve("template-set");
+      FileUtils.copyDirectory(templatesProject.toFile(), templateSetPath.toFile());
+
+      if (Files.isDirectory(templateSetPath)) {
+
+        // Replace the pom.xml in the template sets. Needed so that the project in the temp directory is build
+        // properly
+        if (Files.exists(templateSetPath.resolve("pom.xml"))) {
+          try {
+            Files.delete(templateSetPath.resolve("pom.xml"));
+          } catch (IOException e) {
+            throw new IOException("Error deleting file " + templateSetPath.resolve("pom.xml"), e);
+          }
+          try {
+            Files.copy(utilsPom, templateSetPath.resolve("pom.xml"));
+          } catch (IOException e) {
+            throw new IOException("Error copying file " + utilsPom, e);
+          }
+        }
+      }
+    }
+  }
+
+  /**
+   * Test successful generation of all templates based on an ETO
+   *
+   * @throws Exception test fails
+   */
+  @Test
+  public void testAllTemplatesGeneration_OpenApiInput() throws Exception {
+
+    File testProject = new File(TEST_RESOURCES_ROOT + "TestAllTemplatesOpenApiInput/");
+    runMavenInvoker(testProject, templatesProjectTemporary.toFile(), MavenMetadata.LOCAL_REPO);
+  }
+
+}
diff --git a/cobigen-templates/crud-openapi-java-server-app/src/test/resources/testdata/templatetest/TestAllTemplatesOpenApiInput/OpenAPI.yaml b/cobigen-templates/crud-openapi-java-server-app/src/test/resources/testdata/templatetest/TestAllTemplatesOpenApiInput/OpenAPI.yaml
new file mode 100644
index 0000000000..14b9ec10cf
--- /dev/null
+++ b/cobigen-templates/crud-openapi-java-server-app/src/test/resources/testdata/templatetest/TestAllTemplatesOpenApiInput/OpenAPI.yaml
@@ -0,0 +1,131 @@
+openapi: 3.0.0
+servers:
+  - url: 'https://localhost:8081/server/services/rest'
+info:
+  title: Devon Example
+  description: Example of a API definition
+  version: 1.0.0
+  x-rootpackage: com.devonfw.demo
+paths:
+  /datamanagement/v1/someData/{id}:
+    get:
+      operationId: findSomeData
+      parameters:
+        - name: id
+          in: path
+          required: true
+          schema:
+            type: integer
+            format: int64
+            minimum: 0
+            maximum: 50
+      responses:
+        '200':
+          description: Any
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/EvenMoreData'
+            text/plain:
+              schema:
+                type: string
+  /datamanagement/v1/moreData/{id}:
+    get:
+      operationId: findMoreData
+      parameters:
+        - name: id
+          in: path
+          required: true
+          schema:
+            type: integer
+            format: int64
+            minimum: 10
+            maximum: 200
+      responses:
+        '200':
+          description: Any
+  /datamanagement/v1/someData/:
+    post:
+      responses:
+        '200':
+          description: Any
+      requestBody:
+        $ref: '#/components/requestBodies/SomeData'
+      tags:
+       - searchCriteria
+  /datamanagement/v1/moreData/validateMoreData:
+    post:
+      responses:
+       '200':
+          description: Any
+      requestBody:
+        $ref: '#/components/requestBodies/MoreData'
+components:
+    schemas:
+        SomeData:
+          x-component: DataManagement
+          description: Entity definiton of SomeData
+          type: object
+          properties:
+            AnyString:
+              type: string
+              maxLength: 100
+              minLength: 5
+              uniqueItems: true
+            furtherData:
+              type: array
+              items:
+                $ref: '#/components/schemas/FurtherData'
+        MoreData:
+          x-component: DataManagement
+          description: Entity definiton of Moredata
+          type: object
+          properties:
+            anyNumber:
+              type: number
+              format: int64
+              maximum: 100
+              minimum: 0
+            someData:
+              $ref: '#/components/schemas/SomeData'
+            allSomeData:
+              type: array
+              description: 'All SomeData'
+              items:
+                $ref: '#/components/schemas/SomeData'
+          required:
+            - saleExample
+        FurtherData:
+          x-component: AnotherComponent
+          type: object
+          properties:
+            parent:
+              $ref: '#/components/schemas/SomeData'
+            valid:
+              type: boolean
+            someList:
+              type: array
+              items:
+                type: string
+        EvenMoreData:
+          x-component: AnotherComponent
+          description: Entity definiton of more data
+          type: object
+          properties:
+            id:
+              type: integer
+              format: int64
+              uniqueItems: true
+    requestBodies:
+        SomeData:
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/SomeData'
+          required: true
+        MoreData:
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/MoreData'
+          required: true
diff --git a/cobigen-templates/crud-openapi-java-server-app/src/test/resources/testdata/templatetest/TestAllTemplatesOpenApiInput/logback.xml b/cobigen-templates/crud-openapi-java-server-app/src/test/resources/testdata/templatetest/TestAllTemplatesOpenApiInput/logback.xml
new file mode 100644
index 0000000000..5f29165f75
--- /dev/null
+++ b/cobigen-templates/crud-openapi-java-server-app/src/test/resources/testdata/templatetest/TestAllTemplatesOpenApiInput/logback.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- This file is for logback classic. The file contains the configuration for slf4j logging -->
+<configuration>
+	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+			<Pattern>%d{HH:mm:ss.SSS} [%thread] [C:%X{correlationId}] - %-5level - %logger{36} - %msg%n
+			</Pattern>
+		</encoder>
+	</appender>
+
+	<root level="INFO">
+		<appender-ref ref="STDOUT" />
+	</root>
+</configuration>
diff --git a/cobigen-templates/crud-openapi-java-server-app/src/test/resources/testdata/templatetest/TestAllTemplatesOpenApiInput/pom.xml b/cobigen-templates/crud-openapi-java-server-app/src/test/resources/testdata/templatetest/TestAllTemplatesOpenApiInput/pom.xml
new file mode 100644
index 0000000000..7f84fdeef0
--- /dev/null
+++ b/cobigen-templates/crud-openapi-java-server-app/src/test/resources/testdata/templatetest/TestAllTemplatesOpenApiInput/pom.xml
@@ -0,0 +1,84 @@
+<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>com.devonfw.cobigen</groupId>
+  <artifactId>devon4jTemplateTest-TestAllTemplatesOpenAPIInput</artifactId>
+  <version>dev-SNAPSHOT</version>
+
+  <properties>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
+  </properties>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>com.devonfw.cobigen</groupId>
+        <artifactId>cobigen-maven-plugin</artifactId>
+        <version>${pluginVersion}</version>
+        <executions>
+          <execution>
+            <id>generate</id>
+            <phase>package</phase>
+            <goals>
+              <goal>generate</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <configurationFolder>${templatesProject}</configurationFolder>
+          <inputFiles>
+            <inputFile>OpenAPI.yaml</inputFile>
+          </inputFiles>
+          <templates>
+            <template>ALL</template>
+          </templates>
+          <failOnNothingGenerated>true</failOnNothingGenerated>
+        </configuration>
+        <dependencies>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>tempeng-freemarker</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>javaplugin</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>htmlplugin</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>tsplugin</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>jsonplugin</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>openapiplugin</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>xmlplugin</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>textmerger</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+        </dependencies>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>
diff --git a/cobigen-templates/crud-openapi-java-server-app/src/test/resources/utils/pom.xml b/cobigen-templates/crud-openapi-java-server-app/src/test/resources/utils/pom.xml
new file mode 100644
index 0000000000..95c84448de
--- /dev/null
+++ b/cobigen-templates/crud-openapi-java-server-app/src/test/resources/utils/pom.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.devonfw.cobigen.templates</groupId>
+  <artifactId>crud-openapi-java-server-app</artifactId>
+  <version>2021.12.007-SNAPSHOT</version>
+  <name>CRUD OpenApi Java Server App</name>
+  <description>A Code-based incremental Generator</description>
+  <licenses>
+    <license>
+      <name>Apache Software License 2.0</name>
+      <url>https://raw.githubusercontent.com/devonfw/.github/master/LICENSE</url>
+      <distribution>repo</distribution>
+      <comments></comments>
+    </license>
+  </licenses>
+  <dependencies>
+    <dependency>
+      <groupId>javax.ws.rs</groupId>
+      <artifactId>javax.ws.rs-api</artifactId>
+      <version>2.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.data</groupId>
+      <artifactId>spring-data-rest-webmvc</artifactId>
+      <version>3.7.10</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+      <version>3.12.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+      <version>2.10.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>xerces</groupId>
+      <artifactId>xercesImpl</artifactId>
+      <version>2.12.2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.persistence</groupId>
+      <artifactId>javax.persistence-api</artifactId>
+      <version>2.2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>1.7.30</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <version>1.7.30</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>log4j-over-slf4j</artifactId>
+      <version>1.7.30</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+  <repositories>
+    <repository>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+      <id>ossrh</id>
+      <name>OSSRH Snapshots</name>
+      <url>https://s01.oss.sonatype.org/content/repositories/snapshots/</url>
+    </repository>
+  </repositories>
+
+  <properties>
+   <maven.compiler.source>1.8</maven.compiler.source>
+   <maven.compiler.target>1.8</maven.compiler.target>
+  </properties>
+
+  <build>
+   <resources>
+     <resource>
+       <directory>src/main/java</directory>
+     </resource>
+   </resources>
+  </build></project>
\ No newline at end of file
diff --git a/cobigen-templates/crud-openapi-net/pom.xml b/cobigen-templates/crud-openapi-net/pom.xml
new file mode 100644
index 0000000000..ddd28d9c64
--- /dev/null
+++ b/cobigen-templates/crud-openapi-net/pom.xml
@@ -0,0 +1,19 @@
+<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>crud-openapi-net</artifactId>
+  <name>CRUD OpenAPI Net template</name>
+
+  <parent>
+    <groupId>com.devonfw.cobigen.templates</groupId>
+    <artifactId>templates-parent</artifactId>
+    <version>${revision}</version>
+  </parent>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+    </dependency>
+  </dependencies>
+</project>
\ No newline at end of file
diff --git a/cobigen-templates/crud-openapi-net/src/main/java-templates/com/devonfw/cobigen/templates/devon4j/config/constant/MavenMetadata.java b/cobigen-templates/crud-openapi-net/src/main/java-templates/com/devonfw/cobigen/templates/devon4j/config/constant/MavenMetadata.java
new file mode 100644
index 0000000000..395d46154d
--- /dev/null
+++ b/cobigen-templates/crud-openapi-net/src/main/java-templates/com/devonfw/cobigen/templates/devon4j/config/constant/MavenMetadata.java
@@ -0,0 +1,12 @@
+package com.devonfw.cobigen.templates.devon4j.config.constant;
+
+/**
+ * Constants extracted from the maven pom by templating-maven-plugin.
+ * 
+ * @see "edit template in src/main/java-templates"
+ */
+public class MavenMetadata {
+
+    /** Local repository path */
+    public static final String LOCAL_REPO = "${settings.localRepository}";
+}
diff --git a/cobigen-templates/crud-openapi-net/src/main/java/com/devonfw/cobigen/templates/devon4j/constants/Field.java b/cobigen-templates/crud-openapi-net/src/main/java/com/devonfw/cobigen/templates/devon4j/constants/Field.java
new file mode 100644
index 0000000000..5376daaea9
--- /dev/null
+++ b/cobigen-templates/crud-openapi-net/src/main/java/com/devonfw/cobigen/templates/devon4j/constants/Field.java
@@ -0,0 +1,48 @@
+package com.devonfw.cobigen.templates.devon4j.constants;
+
+/**
+ * Contains the used keys for the pojo field mapping
+ */
+public enum Field {
+
+  /**
+   * Name of the field
+   */
+  NAME("name"),
+  /**
+   * Type of the field
+   */
+  TYPE("type"),
+  /**
+   * Canonical Type of the field
+   */
+  CANONICAL_TYPE("canonicalType"),
+  /**
+   * The Javadoc of the field
+   */
+  JAVA_DOC("javaDoc"),
+  /**
+   * Annotations
+   */
+  ANNOTATIONS("annotations");
+
+  /**
+   * key value
+   */
+  private String value;
+
+  /**
+   * @param value of the key
+   */
+  Field(String value) {
+
+    this.value = value;
+  }
+
+  @Override
+  public String toString() {
+
+    return this.value;
+  }
+
+}
diff --git a/cobigen-templates/crud-openapi-net/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/DevonfwUtil.java b/cobigen-templates/crud-openapi-net/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/DevonfwUtil.java
new file mode 100644
index 0000000000..4de413b930
--- /dev/null
+++ b/cobigen-templates/crud-openapi-net/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/DevonfwUtil.java
@@ -0,0 +1,449 @@
+package com.devonfw.cobigen.templates.devon4j.utils;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.w3c.dom.Attr;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+import com.devonfw.cobigen.templates.devon4j.constants.Field;
+
+/**
+ * A class for shared devon4j specific functions in the templates
+ *
+ */
+@SuppressWarnings("restriction")
+public class DevonfwUtil {
+
+  /**
+   * Check whether the given 'canonicalType' is a devon4j Entity, which is declared in the given 'component'
+   *
+   * @param canonicalType the type name
+   * @param component the component name
+   * @return true iff the canonicalType is a devon Entity
+   */
+  public boolean isEntityInComponent(String canonicalType, String component) {
+
+    return canonicalType.matches(String.format(".+%1$s\\.dataaccess\\.api\\.[A-Za-z0-9]+Entity(<.*)?", component));
+  }
+
+  /**
+   * Check whether the given 'canonicalType' is declared in the given 'component'
+   *
+   * @param canonicalType the type name
+   * @param component the component name
+   * @return true iff the canonicalType is inside the given component
+   */
+  public boolean isTypeInComponent(String canonicalType, String component) {
+
+    return canonicalType.matches(String.format("%1$s.[A-Za-z0-9]+(<.*)?", component));
+  }
+
+  /**
+   * Determines the ID getter for a given 'field' dependent on whether the getter should access the ID via an object
+   * reference or a direct ID getter
+   *
+   * @param field the field
+   * @param byObjectReference boolean
+   * @param component the devon4j component name
+   * @return 'get' + {@link #resolveIdVariableNameOrSetterGetterSuffix(Map, boolean, boolean, String)} + '()' with
+   *         capitalize=true
+   */
+  public String resolveIdGetter(Map<String, Object> field, boolean byObjectReference, String component) {
+
+    // If field comes from an UML file
+    if (field.getClass().toGenericString().contains("freemarker.ext.beans.HashAdapter")) {
+      return resolveIdGetter(field, byObjectReference, component);
+    }
+    return "get" + resolveIdVariableNameOrSetterGetterSuffix(field, byObjectReference, true, component) + "()";
+  }
+
+  /**
+   * Determines the ID getter for a given 'field' dependent on whether the getter should access the ID via an object
+   * reference or a direct ID getter
+   *
+   * This method is used when the field parameter comes from an UML file. The name and type of the attributes must be
+   * pre-processed for later inserting them inside the HashMap.
+   *
+   * @param field the field
+   * @param byObjectReference boolean
+   * @param component the devon4j component name
+   * @return 'get' + {@link #resolveIdVariableNameOrSetterGetterSuffix(Map, boolean, boolean, String)} + '()' with
+   *         capitalize=true
+   */
+  public String resolveIdGetter(Node field, boolean byObjectReference, String component) {
+
+    HashMap<String, Object> nodeHash = new HashMap<>();
+
+    // Putting the name of the attribute to the hash
+    nodeHash.put(Field.NAME.toString(), field.getAttributes().getNamedItem("name"));
+
+    // Putting the type of the attribute to the hash
+    NodeList childs = field.getChildNodes();
+    for (int i = 0; i < childs.getLength(); i++) {
+      // Retrieve "type" tag
+      if (childs.item(i).getNodeName().equals("type")) {
+        NamedNodeMap attrs = childs.item(i).getAttributes();
+        for (int j = 0; j < attrs.getLength(); j++) {
+          Attr attribute = (Attr) attrs.item(j);
+          // Try to find the attribute that contains the type
+          if (attribute.getName().equals("xmi:idref")) {
+            nodeHash.put(Field.TYPE.toString(), attribute.getName().replace("EAJava_", ""));
+          }
+        }
+      }
+    }
+    return "get" + resolveIdVariableNameOrSetterGetterSuffix(nodeHash, byObjectReference, true, component) + "()";
+
+  }
+
+  /**
+   * Determines the ID getter for a given 'field' dependent on whether the getter should access the ID via an object
+   * reference or a direct ID getter
+   *
+   * @param pojoClass the class object of the pojo
+   * @param fieldMap the field mapping
+   * @param byObjectReference boolean
+   * @param component the devon4j component name
+   * @return 'get' + {@link #resolveIdVariableNameOrSetterGetterSuffix(Map, boolean, boolean, String)} + '()' with
+   *         capitalize=true
+   * @throws NoSuchFieldException indicating a severe problem in the used model
+   * @throws SecurityException if the field cannot be accessed for any reason
+   */
+  public String resolveIdGetter(Class<?> pojoClass, Map<String, Object> fieldMap, boolean byObjectReference,
+      String component) throws NoSuchFieldException, SecurityException {
+
+    return "get" + resolveIdVariableNameOrSetterGetterSuffix(pojoClass, fieldMap, byObjectReference, true, component)
+        + "()";
+  }
+
+  /**
+   * same as {@link #resolveIdGetter(Map, boolean, String)} but with byObjectReference=false and component=""
+   *
+   * @param field the field
+   * @return 'get' + {@link #resolveIdVariableNameOrSetterGetterSuffix(Map,boolean,boolean,String)} + '()' with
+   *         capitalize=true
+   */
+  public String resolveIdGetter(Map<String, Object> field) {
+
+    return this.resolveIdGetter(field, false, "");
+  }
+
+  /**
+   * same as {@link #resolveIdGetter(Class,Map,boolean,String)} but with byObjectReference=false and component=""
+   *
+   * @param pojoClass the class object of the pojo
+   * @param fieldMap the field mapping
+   * @return 'get' + {@link #resolveIdVariableNameOrSetterGetterSuffix(Map,boolean,boolean,String)} + '()' with
+   *         capitalize=true
+   * @throws NoSuchFieldException indicating a severe problem in the used model
+   * @throws SecurityException if the field cannot be accessed for any reason
+   */
+  public String resolveIdGetter(Class<?> pojoClass, Map<String, Object> fieldMap)
+      throws NoSuchFieldException, SecurityException {
+
+    return resolveIdGetter(pojoClass, fieldMap, false, "");
+  }
+
+  /**
+   * Determines the ID setter for a given 'field' dependent on whether the setter should access the ID via an object
+   * reference or a direct ID setter. In contrast to resolveIdGetter, this function does not generate the function
+   * parenthesis to enable parameter declaration.
+   *
+   * @param field the field
+   * @param byObjectReference boolean
+   * @param component the devon4j component name
+   * @return 'set' + {@link #resolveIdVariableNameOrSetterGetterSuffix(Map, boolean, boolean, String)} with
+   *         capitalize=true
+   */
+  public String resolveIdSetter(Map<String, Object> field, boolean byObjectReference, String component) {
+
+    return "set" + resolveIdVariableNameOrSetterGetterSuffix(field, byObjectReference, true, component);
+  }
+
+  /**
+   * same as {@link #resolveIdSetter(Map, boolean, String)} but with byObjectReference=false and component=""
+   *
+   * @param field the field
+   * @return 'set' + {@link #resolveIdVariableNameOrSetterGetterSuffix(Map, boolean, boolean, String)} with
+   *         capitalize=true
+   */
+  public String resolveIdSetter(Map<String, Object> field) {
+
+    return this.resolveIdSetter(field, false, "");
+  }
+
+  /**
+   * Determines the ID setter for a given 'field' dependent on whether the setter should access the ID via an object
+   * reference or a direct ID setter. In contrast to resolveIdGetter, this function does not generate the function
+   * parenthesis to enable parameter declaration.
+   *
+   * @param pojoClass the class object of the pojo
+   * @param fieldMap the field mapping
+   * @param byObjectReference boolean
+   * @param component the devon4j component name
+   * @return 'set'+ {@link #resolveIdVariableNameOrSetterGetterSuffix(Map,boolean,boolean,String)} with capitalize=true
+   * @throws NoSuchFieldException indicating a severe problem in the used model
+   * @throws SecurityException if the field cannot be accessed for any reason
+   */
+  public String resolveIdSetter(Class<?> pojoClass, Map<String, Object> fieldMap, boolean byObjectReference,
+      String component) throws NoSuchFieldException, SecurityException {
+
+    return "set" + resolveIdVariableNameOrSetterGetterSuffix(pojoClass, fieldMap, byObjectReference, true, component);
+  }
+
+  /**
+   * same as {@link #resolveIdSetter(Class,Map,boolean,String)} but with byObjectReference=false and component=""
+   *
+   * @param pojoClass the class object of the pojo
+   * @param fieldMap the field mapping
+   * @return 'set' + {@link #resolveIdVariableNameOrSetterGetterSuffix(Map,boolean,boolean,String)} with capitalize=true
+   * @throws NoSuchFieldException indicating a severe problem in the used model
+   * @throws SecurityException if the field cannot be accessed for any reason
+   */
+  public String resolveIdSetter(Class<?> pojoClass, Map<String, Object> fieldMap)
+      throws NoSuchFieldException, SecurityException {
+
+    return resolveIdSetter(pojoClass, fieldMap, false, "");
+  }
+
+  /**
+   * Determines the variable name for the id value of the 'field'
+   *
+   * @param field the field
+   * @return {@link #resolveIdVariableNameOrSetterGetterSuffix(Map, boolean, boolean, String)}) with
+   *         byObjectReference=false, capitalize=false and component=""
+   */
+  public String resolveIdVariableName(Map<String, Object> field) {
+
+    // the component is passed down as an empty string since byObjectReference is false and therefore the
+    // component is
+    // never touched
+    return resolveIdVariableNameOrSetterGetterSuffix(field, false, false, "");
+  }
+
+  /**
+   * Determines the variable name for the id value of the specified field in the pojo
+   *
+   * @param pojoClass the class object of the pojo
+   * @param fieldMap the field mapping
+   * @return {@link #resolveIdVariableNameOrSetterGetterSuffix(Class, Map, boolean, boolean, String)}) with
+   *         byObjectReference=false, capitalize=false and component=""
+   * @throws NoSuchFieldException indicating a severe problem in the used model
+   * @throws SecurityException if the field cannot be accessed for any reason
+   */
+  public String resolveIdVariableName(Class<?> pojoClass, Map<String, Object> fieldMap)
+      throws NoSuchFieldException, SecurityException {
+
+    // the component is passed down as an empty string since byObjectReference is false and therefore the
+    // component is
+    // never touched
+    return resolveIdVariableNameOrSetterGetterSuffix(pojoClass, fieldMap, false, false, "");
+  }
+
+  /**
+   * Determines the ID setter/getter suffix for a given 'field' dependent on whether the setter/getter should access the
+   * ID via an object reference or a direct ID setter/getter
+   *
+   * @param field the field
+   * @param byObjectReference boolean
+   * @param capitalize if the field name should be capitalized
+   * @param component the devon4j component. Only needed if $byObjectReference is true
+   * @return idVariable name or getter/setter suffix
+   */
+  public String resolveIdVariableNameOrSetterGetterSuffix(Map<String, Object> field, boolean byObjectReference,
+      boolean capitalize, String component) {
+
+    String fieldName = (String) field.get(Field.NAME.toString());
+    if (capitalize) {
+      fieldName = fieldName.substring(0, 1).toUpperCase() + fieldName.substring(1);
+    }
+    String suffix = "";
+
+    String fieldType = (String) field.get(Field.TYPE.toString());
+    String fieldCType = (String) field.get(Field.CANONICAL_TYPE.toString());
+    if (fieldType.contains("Entity")) {
+      if (fieldCType.startsWith("java.util.List") || fieldCType.startsWith("java.util.Set")) {
+        suffix = "Ids";
+        if (fieldName.endsWith("s")) {
+          // Assume trailing 's' as indicator for a plural
+          fieldName = fieldName.substring(0, fieldName.length() - 1);
+        }
+      } else {
+        suffix = "Id";
+      }
+      if (byObjectReference && isTypeInComponent(fieldCType, component)) {
+        // direct references for Entities in same component, so get id of the object reference
+        suffix = "().getId";
+      }
+    }
+
+    return fieldName + suffix;
+
+  }
+
+  /**
+   * Determines the ID setter/getter suffix for a given 'field' dependent on whether the setter/getter should access the
+   * ID via an object reference or a direct ID setter/getter
+   *
+   * @param pojoClass the {@link Class} object of the pojo
+   * @param fieldMap the field mapping
+   * @param byObjectReference boolean
+   * @param capitalize if the field name should be capitalized
+   * @param component the devon4j component. Only needed if byObjectReference is true
+   * @return idVariable name or getter/setter suffix
+   * @throws NoSuchFieldException indicating a severe problem in the used model
+   * @throws SecurityException if the field cannot be accessed for any reason
+   */
+  public String resolveIdVariableNameOrSetterGetterSuffix(Class<?> pojoClass, Map<String, Object> fieldMap,
+      boolean byObjectReference, boolean capitalize, String component) throws NoSuchFieldException, SecurityException {
+
+    String resultName = (String) fieldMap.get(Field.NAME.toString());
+    if (capitalize) {
+      resultName = resultName.substring(0, 1).toUpperCase() + resultName.substring(1);
+    }
+    String suffix = "";
+    String fieldType = (String) fieldMap.get(Field.TYPE.toString());
+    String fieldName = (String) fieldMap.get(Field.NAME.toString());
+    if (fieldType.contains("Entity")) {
+      if (Collection.class.isAssignableFrom(pojoClass.getDeclaredField(fieldName).getType())) {
+        suffix = "Ids";
+        if (resultName.endsWith("s")) {
+          // Assume trailing 's' as indicator for a plural
+          resultName = resultName.substring(0, resultName.length() - 1);
+        }
+      } else {
+        suffix = "Id";
+      }
+      if (byObjectReference
+          && isEntityInComponent(pojoClass.getDeclaredField(fieldName).getType().getName(), component)) {
+        // direct references for Entities in same component, so get id of the object reference
+        suffix = "().getId";
+      }
+    }
+
+    return resultName + suffix;
+
+  }
+
+  /**
+   * Returns the argument type of the list or set from a field. If the string contains "Entity" it will remove that
+   * part. For example, if we have a List &lt;SampleEntity&gt; it will return "Sample"
+   *
+   * @param field the field
+   * @param pojoClass the object class of the Entity that contains the field
+   * @return fieldType argument of the list
+   * @throws SecurityException if field type could not accessed
+   * @throws NoSuchFieldException if field could not be found
+   */
+  public String getListArgumentType(Map<String, Object> field, Class<?> pojoClass)
+      throws NoSuchFieldException, SecurityException {
+
+    JavaUtil javaUtil = new JavaUtil();
+
+    String fieldType = (String) field.get(Field.TYPE.toString());
+    String fieldName = (String) field.get(Field.NAME.toString());
+
+    if (fieldType.contains("Entity")) {
+      if (javaUtil.isCollection(pojoClass, fieldName)) {
+
+        fieldType = fieldType.replace("Entity", "");
+        // Regex: Extracts the argument type of the list 'List<type>' => type
+        String regex = "(?<=\\<).+?(?=\\>)";
+        Pattern pattern = Pattern.compile(regex);
+        Matcher regexMatcher = pattern.matcher(fieldType);
+
+        if (regexMatcher.find()) {
+          fieldType = regexMatcher.group(0);
+        }
+      }
+    }
+    return fieldType;
+
+  }
+
+  /**
+   * Converts all occurrences of devon4j Entity types in the given 'field' simple type (possibly generic) to Longs
+   *
+   * @param field the field
+   * @return the field type as String. If field type contains 'Entity' the result is Long
+   */
+  public String getSimpleEntityTypeAsLongReference(Map<String, Object> field) {
+
+    String fieldType = (String) field.get(Field.TYPE.toString());
+    if (fieldType.endsWith("Entity")) {
+      fieldType = fieldType.replaceAll("[^<>]+Entity", "Long");
+    }
+    return fieldType;
+  }
+
+  /**
+   * If the string last character is an 's', then it gets removed
+   *
+   * @param targetClassName string to remove plural
+   * @return string without 's'
+   */
+  public String removePlural(String targetClassName) {
+
+    if (targetClassName.charAt(targetClassName.length() - 1) == 's') {
+      targetClassName = targetClassName.substring(0, targetClassName.length() - 1);
+    }
+    return targetClassName;
+  }
+
+  /**
+   * Checks whether the operation with the given ID corresponds to any standard CRUD method name.
+   *
+   * @param operationId operation ID interpreted as method name
+   * @param entityName entity name to check standard CRUD methods for
+   * @return <code>true</code> if the operation ID maps any standard CRUD method name, <code>false</code> otherwise
+   */
+  public boolean isCrudOperation(String operationId, String entityName) {
+
+    if (operationId == null) {
+      return false;
+    }
+    String opIdLowerCase = operationId.toLowerCase();
+    String entityNameLowerCase = entityName.toLowerCase();
+    if (opIdLowerCase.contains(entityNameLowerCase)) {
+      return opIdLowerCase.equals("find" + entityNameLowerCase)
+          || opIdLowerCase.equals("find" + entityNameLowerCase + "Etos")
+          || opIdLowerCase.equals("delete" + entityNameLowerCase) || opIdLowerCase.equals("save" + entityNameLowerCase);
+    } else {
+      return false;
+    }
+  }
+
+  /**
+   * Converts the given media type to the spring Java enum value
+   *
+   * @param mediaType to be converted
+   * @return the spring enum value representing the given media type
+   */
+  public String getSpringMediaType(String mediaType) {
+
+    switch (mediaType) {
+      case "application/xml":
+        return "APPLICATION_XML_VALUE";
+      case "application / x-www-form-urlencoded":
+        return "APPLICATION_FORM_URLENCODED_VALUE";
+      case "multipart/form-data":
+        return "MULTIPART_FORM_DATA_VALUE";
+      case "text/plain":
+        return "TEXT_PLAIN_VALUE";
+      case "text/html":
+        return "TEXT_HTML_VALUE";
+      case "application/pdf":
+        return "APPLICATION_PDF_VALUE";
+      case "image/png":
+        return "IMAGE_PNG_VALUE";
+      default:
+        return "APPLICATION_JSON_VALUE";
+    }
+  }
+}
\ No newline at end of file
diff --git a/cobigen-templates/crud-openapi-net/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/JavaUtil.java b/cobigen-templates/crud-openapi-net/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/JavaUtil.java
new file mode 100644
index 0000000000..ced2f5fde2
--- /dev/null
+++ b/cobigen-templates/crud-openapi-net/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/JavaUtil.java
@@ -0,0 +1,464 @@
+package com.devonfw.cobigen.templates.devon4j.utils;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.Collection;
+import java.util.Map;
+
+import org.apache.commons.lang3.ClassUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Provides type operations, mainly checks and casts for Java Primitives, to be used in the templates
+ *
+ */
+public class JavaUtil {
+
+  /**
+   * Logger for this class
+   */
+  private static final Logger LOG = LoggerFactory.getLogger(JavaUtil.class);
+
+  /**
+   * The constructor.
+   */
+  public JavaUtil() {
+
+    // Empty for CobiGen to automatically instantiate it
+  }
+
+  /**
+   * Returns the Object version of a Java primitive or the input if the input isn't a java primitive
+   * 
+   * @param simpleType String
+   * @return the corresponding object wrapper type simple name of the input if the input is the name of a primitive java
+   *         type. The input itself if not. (e.g. "int" results in "Integer")
+   * @throws ClassNotFoundException should not occur.
+   */
+  public String boxJavaPrimitives(String simpleType) throws ClassNotFoundException {
+
+    if (equalsJavaPrimitive(simpleType)) {
+      return ClassUtils.primitiveToWrapper(ClassUtils.getClass(simpleType)).getSimpleName();
+    } else {
+      return simpleType;
+    }
+
+  }
+
+  /**
+   * Returns the simple name of the type of a field in the pojoClass. If the type is a java primitive the name of the
+   * wrapper class is returned
+   *
+   * @param pojoClass {@link Class} the class object of the pojo
+   * @param fieldName {@link String} the name of the field
+   * @return String. The simple name of the field's type. The simple name of the wrapper class in case of java
+   *         primitives
+   * @throws NoSuchFieldException indicating something awefully wrong in the used model
+   * @throws SecurityException if the field cannot be accessed.
+   */
+  public String boxJavaPrimitives(Class<?> pojoClass, String fieldName) throws NoSuchFieldException, SecurityException {
+
+    if (pojoClass == null) {
+      throw new IllegalAccessError(
+          "Class object is null. Cannot generate template as it might obviously depend on reflection.");
+    }
+
+    if (equalsJavaPrimitive(pojoClass, fieldName)) {
+      return ClassUtils.primitiveToWrapper(pojoClass.getDeclaredField(fieldName).getType()).getSimpleName();
+    } else {
+      Field field = pojoClass.getDeclaredField(fieldName);
+      if (field == null) {
+        field = pojoClass.getField(fieldName);
+      }
+      if (field == null) {
+        throw new IllegalAccessError("Could not find field " + fieldName + " in class " + pojoClass);
+      } else {
+        return field.getType().getSimpleName();
+      }
+    }
+  }
+
+  /**
+   * Checks if the given type is a Java primitive
+   *
+   * @param simpleType the type to be checked
+   * @return true iff simpleType is a Java primitive
+   */
+  public boolean equalsJavaPrimitive(String simpleType) {
+
+    try {
+      return ClassUtils.getClass(simpleType).isPrimitive();
+    } catch (ClassNotFoundException e) {
+      LOG.warn("{}: Could not find {}", e.getMessage(), simpleType);
+      return false;
+    }
+  }
+
+  /**
+   * Checks if the given type is a Java primitive or wrapper
+   *
+   * @param simpleType the type to be checked
+   * @return true iff simpleType is a Java primitive or wrapper
+   */
+  public boolean equalsJavaPrimitiveOrWrapper(String simpleType) {
+
+    try {
+      return ClassUtils.isPrimitiveOrWrapper(ClassUtils.getClass(simpleType));
+    } catch (ClassNotFoundException e) {
+      LOG.warn("{}: Could not find {}", e.getMessage(), simpleType);
+      return false;
+    }
+  }
+
+  /**
+   * Checks if the type of the field in the pojo's class is a java primitive
+   *
+   * @param pojoClass the {@link Class} object of the pojo
+   * @param fieldName the name of the field to be checked
+   * @return true iff the field is a java primitive
+   * @throws NoSuchFieldException indicating something awefully wrong in the used model
+   * @throws SecurityException if the field cannot be accessed.
+   */
+  public boolean equalsJavaPrimitive(Class<?> pojoClass, String fieldName)
+      throws NoSuchFieldException, SecurityException {
+
+    if (pojoClass == null) {
+      return false;
+    }
+
+    Field field = pojoClass.getDeclaredField(fieldName);
+    if (field == null) {
+      field = pojoClass.getField(fieldName);
+    }
+    if (field == null) {
+      return false;
+    } else {
+      return field.getType().isPrimitive();
+    }
+  }
+
+  /**
+   * Checks if the given type is a Java primitive or a Java primitive array
+   *
+   * @param simpleType the Type name to be checked
+   * @return true iff {@link #equalsJavaPrimitive(String)} is true or if simpleType is an array with a primitive
+   *         component
+   */
+  public boolean equalsJavaPrimitiveIncludingArrays(String simpleType) {
+
+    Class<?> klasse;
+
+    try {
+      klasse = ClassUtils.getClass(simpleType).getComponentType();
+    } catch (ClassNotFoundException e) {
+      LOG.warn("{}: Could not find {}", e.getMessage(), simpleType);
+      return false;
+    }
+    return equalsJavaPrimitive(simpleType) || (klasse != null && klasse.isPrimitive());
+  }
+
+  /**
+   * Checks if the given field in the pojo class is a java primitive or an array of java primitives
+   *
+   * @param pojoClass the class object of the pojo
+   * @param fieldName the name of the field to be checked
+   * @return true iff {@link #equalsJavaPrimitive(Class, String)} is true or the field is an array of primitives
+   * @throws NoSuchFieldException indicating something awfully wrong in the used model
+   * @throws SecurityException if the field cannot be accessed.
+   */
+  public boolean equalsJavaPrimitiveIncludingArrays(Class<?> pojoClass, String fieldName)
+      throws NoSuchFieldException, SecurityException {
+
+    return equalsJavaPrimitive(pojoClass, fieldName) || (pojoClass.getDeclaredField(fieldName).getType().isArray()
+        && pojoClass.getDeclaredField(fieldName).getType().getComponentType().isPrimitive());
+  }
+
+  /**
+   * Returns a cast statement for a given (java primitive, variable name) pair or nothing if the type isn't a java
+   * primitive
+   *
+   * @param simpleType Java Type
+   * @param varName Variable name
+   * @return String either of the form '((Java Primitive Object Type)varName)' if simpleType is a primitive or the empty
+   *         String otherwise
+   * @throws ClassNotFoundException should not occur
+   */
+  public String castJavaPrimitives(String simpleType, String varName) throws ClassNotFoundException {
+
+    if (equalsJavaPrimitive(simpleType)) {
+      return String.format("((%1$s)%2$s)", boxJavaPrimitives(simpleType), varName);
+    } else {
+      return "";
+    }
+  }
+
+  /**
+   * Returns a cast statement for a given (java primitive, variable name) pair or nothing if the type isn't a java
+   * primitive
+   *
+   * @param pojoClass the class object of the pojo
+   * @param fieldName the name of the field to be casted
+   * @return if fieldName points to a primitive field then a casted statement (e.g. for an int field:
+   *         '((Integer)field)') or an empty String otherwise
+   * @throws NoSuchFieldException indicating something awefully wrong in the used model
+   * @throws SecurityException if the field cannot be accessed.
+   */
+  public String castJavaPrimitives(Class<?> pojoClass, String fieldName)
+      throws NoSuchFieldException, SecurityException {
+
+    if (equalsJavaPrimitive(pojoClass, fieldName)) {
+      return String.format("((%1$s)%2$s)", boxJavaPrimitives(pojoClass, fieldName), fieldName);
+    } else {
+      return "";
+    }
+  }
+
+  /**
+   * @param pojoClass {@link Class} the class object of the pojo
+   * @param fieldName {@link String} the name of the field
+   * @return true if the field is an instance of java.utils.Collections
+   * @throws NoSuchFieldException indicating something awefully wrong in the used model
+   * @throws SecurityException if the field cannot be accessed.
+   */
+  public boolean isCollection(Class<?> pojoClass, String fieldName) throws NoSuchFieldException, SecurityException {
+
+    if (pojoClass == null) {
+      return false;
+    }
+
+    Field field = pojoClass.getDeclaredField(fieldName);
+    if (field == null) {
+      field = pojoClass.getField(fieldName);
+    }
+    if (field == null) {
+      return false;
+    } else {
+      return Collection.class.isAssignableFrom(field.getType());
+    }
+
+  }
+
+  /**
+   * Returns the Ext Type to a given java type
+   *
+   * @param simpleType any java type's simple name
+   * @return corresponding Ext type
+   */
+  public String getExtType(String simpleType) {
+
+    switch (simpleType) {
+      case "short":
+      case "Short":
+      case "int":
+      case "Integer":
+      case "long":
+      case "Long":
+        return "Integer";
+      case "float":
+      case "Float":
+      case "double":
+      case "Double":
+        return "Number";
+      case "boolean":
+      case "Boolean":
+        return "Boolean";
+      case "char":
+      case "Character":
+      case "String":
+        return "String";
+      case "Date":
+        return "Date";
+      default:
+        return "Field";
+    }
+  }
+
+  /**
+   * returns the Angular5 type associated with a Java primitive
+   *
+   * @param simpleType :{@link String} the type to be parsed
+   * @return the corresponding Angular type or 'any' otherwise
+   */
+  public String getAngularType(String simpleType) {
+
+    switch (simpleType) {
+      case "boolean":
+        return "boolean";
+      case "Boolean":
+        return "boolean";
+      case "short":
+        return "number";
+      case "Short":
+        return "number";
+      case "int":
+        return "number";
+      case "Integer":
+        return "number";
+      case "long":
+        return "number";
+      case "Long":
+        return "number";
+      case "float":
+        return "number";
+      case "Float":
+        return "number";
+      case "double":
+        return "number";
+      case "Double":
+        return "number";
+      case "char":
+        return "string";
+      case "Character":
+        return "string";
+      case "String":
+        return "string";
+      case "byte":
+        return "number";
+      default:
+        return "any";
+    }
+  }
+
+  /**
+   * returns the class name of the return type of a specific method.
+   *
+   * @param pojoClass {@link Class}&lt;?&gt; the class object of the pojo
+   * @param methodName {@link String} the name of the method
+   * @return the class name of the return type of the specified method
+   * @throws SecurityException If no method of the given name can be found
+   * @throws NoSuchMethodException If no method of the given name can be found
+   */
+  public String getReturnType(Class<?> pojoClass, String methodName) throws NoSuchMethodException, SecurityException {
+
+    if (pojoClass == null) {
+      throw new IllegalAccessError(
+          "Class object is null. Cannot generate template as it might obviously depend on reflection.");
+    }
+    String s = "-";
+    Method method = findMethod(pojoClass, methodName);
+    if (method != null && !method.getReturnType().equals(Void.TYPE)) {
+      s = method.getReturnType().toString();
+      s = s.substring(s.lastIndexOf('.') + 1, s.length());
+    }
+    return s;
+  }
+
+  /**
+   *
+   * This methods returns the return type of the method in the given pojoClass which are annotated with the parameter
+   * annotatedClass
+   *
+   * @param pojoClass - The class in which to find if it has methods with annotatedClass
+   * @param annotatedClassName - The annotation which needs to be found
+   * @return Return type of the method annotated with the given annotation, else "null"
+   * @throws ClassNotFoundException if the annotated class name could not be found in the class path
+   */
+  @SuppressWarnings("unchecked")
+  public String getReturnTypeOfMethodAnnotatedWith(Class<?> pojoClass, String annotatedClassName)
+      throws ClassNotFoundException {
+
+    if (pojoClass == null) {
+      throw new IllegalAccessError(
+          "Class object is null. Cannot generate template as it might obviously depend on reflection.");
+    }
+
+    Method[] methods = pojoClass.getDeclaredMethods();
+    for (Method method : methods) {
+      if (!method.getName().startsWith("get")) {
+        continue;
+      }
+      for (Annotation a : method.getAnnotations()) {
+        // better if (method.isAnnotationPresent(classObj)) {, but postponed as of different class
+        // loaders of a.getClass() and pojoClass.getClass()
+        if (a.getClass().getCanonicalName().equals(annotatedClassName)) {
+          return method.getReturnType().getSimpleName();
+        }
+      }
+    }
+    return "null";
+  }
+
+  /**
+   * returns the HTTP request type corresponding to an annotation type
+   *
+   * @param annotations The annotation to get the type name of
+   * @return the HTTP request type name of the selected annotation
+   */
+  public String getRequestType(Map<String, Object> annotations) {
+
+    if (annotations.containsKey("javax_ws_rs_GET")) {
+      return "GET";
+    } else if (annotations.containsKey("javax_ws_rs_PUT")) {
+      return "PUT";
+    } else if (annotations.containsKey("javax_ws_rs_POST")) {
+      return "POST";
+    } else if (annotations.containsKey("javax_ws_rs_DELETE")) {
+      return "DELETE";
+    } else if (annotations.containsKey("javax_ws_rs_PATCH")) {
+      return "PATCH";
+    } else {
+      return "-";
+    }
+  }
+
+  /**
+   * Helper method to find a class's specific method
+   *
+   * @param pojoClass {@link Class}&lt;?&gt; the class object of the pojo
+   * @param methodName The name of the method to be found
+   * @return The method object of the method to be found, null if it wasn't found
+   */
+  private Method findMethod(Class<?> pojoClass, String methodName) {
+
+    if (pojoClass == null) {
+      throw new IllegalAccessError(
+          "Class object is null. Cannot generate template as it might obviously depend on reflection.");
+    }
+    for (Method m : pojoClass.getMethods()) {
+      if (m.getName().equals(methodName)) {
+        return m;
+      }
+    }
+    return null;
+  }
+
+  /**
+   * Checks whether the class given by the full qualified name is an enum
+   *
+   * @param className full qualified class name
+   * @return <code>true</code> if the class is an enum, <code>false</code> otherwise
+   */
+  public boolean isEnum(String className) {
+
+    try {
+      return ClassUtils.getClass(className).isEnum();
+    } catch (ClassNotFoundException e) {
+      LOG.warn("{}: Could not find {}", e.getMessage(), className);
+      return false;
+    }
+  }
+
+  /**
+   * Returns the first enum value of an enum class
+   *
+   * @param className full qualified class name
+   * @return the first enum value name found in order
+   */
+  public String getFirstEnumValue(String className) {
+
+    try {
+      Class<?> enumClass = ClassUtils.getClass(className);
+      Field[] declaredFields = enumClass.getDeclaredFields();
+      if (declaredFields.length > 0) {
+        return declaredFields[0].getName();
+      } else {
+        return null;
+      }
+    } catch (ClassNotFoundException e) {
+      LOG.warn("{}: Could not find {}", e.getMessage(), className);
+      return null;
+    }
+  }
+}
diff --git a/cobigen-templates/crud-openapi-net/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/OpenApiUtil.java b/cobigen-templates/crud-openapi-net/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/OpenApiUtil.java
new file mode 100644
index 0000000000..a93288f45a
--- /dev/null
+++ b/cobigen-templates/crud-openapi-net/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/OpenApiUtil.java
@@ -0,0 +1,255 @@
+package com.devonfw.cobigen.templates.devon4j.utils;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.util.Map;
+
+import org.apache.commons.lang3.StringUtils;
+
+/** Utils on OpenAPI template model */
+public class OpenApiUtil {
+
+  /**
+   * Prints javax validation constraints from an OpenAPI model
+   *
+   * @param constraints OpenAPI model constraints
+   * @return the list of supported annotations in Java syntax
+   */
+  public String printJavaConstraints(Map<String, Object> constraints) {
+
+    String consts = "";
+    if (constraints.get("maximum") != null) {
+      consts = consts + "@Max(" + constraints.get("maximum") + ")";
+    }
+    if (constraints.get("minimum") != null) {
+      consts = consts + "@Min(" + constraints.get("minimum") + ")";
+    }
+    if (constraints.get("maxLength") != null) {
+      consts = consts + "@Size(max=" + constraints.get("maxLength");
+      if (constraints.get("minLength") != null) {
+        consts = consts + ", min=" + constraints.get("minLength");
+      }
+      consts = consts + ")";
+    } else {
+      if (constraints.get("minLength") != null) {
+        consts = consts + "@Size(min=" + constraints.get("minLength");
+        if (constraints.get("maxLength") != null) {
+          consts = consts + ", max=" + constraints.get("maxLength");
+        }
+        consts = consts + ")";
+      }
+    }
+    return consts;
+  }
+
+  /**
+   * Prints the return type of a response based on the OpenAPI model
+   *
+   * @param response the OpenAPI model of a response
+   * @return simple type of the response return type in Java syntax
+   */
+  public String printJavaServiceResponseReturnType(Map<String, Object> response) {
+
+    String returnType = toJavaType(response, false);
+    if ((boolean) response.get("isVoid")) {
+      return "void";
+    }
+    if ((boolean) response.get("isArray")) {
+      if ((boolean) response.get("isEntity")) {
+        if (returnType.contains("Entity")) {
+          return "List<" + returnType + ">";
+        } else {
+          return "List<" + returnType + "Entity>";
+        }
+      } else {
+        return "List<" + returnType + ">";
+      }
+    } else if ((boolean) response.get("isPaginated")) {
+      if ((boolean) response.get("isEntity")) {
+        if (returnType.contains("Entity")) {
+          return "Page<" + returnType + ">";
+        } else {
+          return "Page<" + returnType + "Entity>";
+        }
+      } else {
+        return "Page<" + returnType + ">";
+      }
+    } else {
+      return returnType;
+    }
+  }
+
+  /**
+   * Returns the Java type corresponding to the OpenAPI type definition. If the type could not be matched, Object will
+   * be returned.
+   *
+   * @param parameter OpenAPI model of a parameter
+   * @param simpleType if a Java simple type should be returned if possible
+   * @return the Java type
+   */
+  public String toJavaType(Map<String, Object> parameter, boolean simpleType) {
+
+    String typeConverted = null;
+    String format = (String) parameter.get("format");
+    String type = (String) parameter.get("type");
+    boolean isCollection = false;
+    if (parameter.get("isCollection") != null) {
+      isCollection = (boolean) parameter.get("isCollection");
+    }
+
+    boolean isEntity = (boolean) parameter.get("isEntity");
+
+    if (type != null) {
+      switch (type.toLowerCase()) {
+        case "integer":
+          if (format != null) {
+            switch (format) {
+              case "int32":
+                typeConverted = simpleType ? "int" : "Integer";
+                break;
+              case "int64":
+                typeConverted = simpleType ? "long" : "Long";
+                break;
+              default:
+                typeConverted = BigInteger.class.getSimpleName();
+                break;
+            }
+          } else {
+            typeConverted = BigInteger.class.getSimpleName();
+          }
+          break;
+        case "number":
+          if (format != null) {
+            switch (format) {
+              case "float":
+                typeConverted = simpleType ? "float" : "Float";
+                break;
+              case "double":
+                typeConverted = simpleType ? "double" : "Double";
+                break;
+              default:
+                typeConverted = BigDecimal.class.getSimpleName();
+                break;
+            }
+          } else {
+            typeConverted = BigDecimal.class.getSimpleName();
+          }
+          break;
+        case "string":
+          if (format != null) {
+            switch (format) {
+              case "date":
+                typeConverted = LocalDate.class.getSimpleName();
+                break;
+              case "date-time":
+                typeConverted = Instant.class.getSimpleName();
+                break;
+              case "binary":
+                typeConverted = simpleType ? "float" : "Float";
+                break;
+              case "email":
+              case "password":
+                typeConverted = String.class.getSimpleName();
+                break;
+              default:
+                typeConverted = "String";
+                break;
+            }
+          } else {
+            typeConverted = "String";
+          }
+          break;
+        case "boolean":
+          typeConverted = simpleType ? "boolean" : "Boolean";
+          break;
+        default:
+          typeConverted = "void";
+          break;
+      }
+    } else {
+      typeConverted = "void";
+    }
+
+    if (isCollection) {
+      if (isEntity) {
+        return "List<" + parameter.get("type") + ">";
+      } else {
+        return "List<" + typeConverted + ">";
+      }
+    } else if (isEntity) {
+      return (String) parameter.get("type");
+    }
+    return typeConverted;
+  }
+
+  /**
+   * Returns the TypeScript type corresponding to the OpenAPI type definition. If the type could not be matched, the
+   * same value will be returned.
+   *
+   * @param parameter OpenAPI model of a parameter
+   * @return the Java type
+   */
+  // getOaspTypeFromOpenAPI
+  public String toTypeScriptType(Map<String, Object> parameter) {
+
+    String typeConverted = null;
+    String type = (String) parameter.get("type");
+    boolean isCollection = false;
+    if (parameter.get("isCollection") != null) {
+      isCollection = (boolean) parameter.get("isCollection");
+    }
+
+    boolean isEntity = (boolean) parameter.get("isEntity");
+
+    if (type != null) {
+      switch (type.toLowerCase()) {
+        case "integer":
+          typeConverted = "number";
+          break;
+        default:
+          typeConverted = type;
+          break;
+      }
+    } else {
+      typeConverted = "undefined";
+    }
+
+    if (isCollection) {
+      if (isEntity) {
+        return parameter.get("type") + "[]";
+      } else {
+        return typeConverted + "[]";
+      }
+    } else if (isEntity) {
+      return (String) parameter.get("type");
+    }
+    return typeConverted;
+  }
+
+  /**
+   * Prints the service operation name based on the operationId or generates one based on the servicePath while printing
+   * a comment how to get better service names.
+   *
+   * @param operation operation Model of the OpenAPI model
+   * @param servicePath service path of the
+   * @return the service method name
+   */
+  public String printServiceOperationName(Map<String, Object> operation, String servicePath) {
+
+    String operationId = (String) operation.get("operationId");
+    if (StringUtils.isEmpty(operationId)) {
+      String[] split = servicePath.split("/");
+      String lastSegment;
+      if (!split[split.length - 1].isEmpty()) {
+        lastSegment = split[split.length - 1];
+      } else {
+        lastSegment = split[split.length - 2];
+      }
+      return ((String) operation.get("type")) + lastSegment;
+    } else {
+      return operationId;
+    }
+  }
+}
diff --git a/cobigen-templates/crud-openapi-net/src/main/resources/template-set.xml b/cobigen-templates/crud-openapi-net/src/main/resources/template-set.xml
new file mode 100644
index 0000000000..f4f7d91fac
--- /dev/null
+++ b/cobigen-templates/crud-openapi-net/src/main/resources/template-set.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:templateSetConfiguration version="6.0"
+                              xmlns:tns="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration"
+                              xmlns:cc="http://capgemini.com/devonfw/cobigen/ContextConfiguration"
+                              xmlns:tc="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration"
+                              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                              xsi:schemaLocation="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration templateSetConfiguration.xsd ">
+    <cc:contextConfiguration version="3.0">
+        <cc:trigger id="crud_openapi_net" type="openapi">
+            <cc:containerMatcher type="element" value="openAPIFile"/>
+            <cc:matcher type="element" value="EntityDef">
+                <cc:variableAssignment type="extension" key="rootPackage" value="x-rootpackage"/>
+                <cc:variableAssignment type="property" key="component" value="componentName"/>
+                <cc:variableAssignment type="property" key="entityName" value="name"/>
+            </cc:matcher>
+        </cc:trigger>
+        <cc:tags>
+            <cc:tag name="OpenAPI"></cc:tag>
+            <cc:tag name="CRUD"></cc:tag>
+            <cc:tag name="Client"></cc:tag>
+            <cc:tag name="devon4net"></cc:tag>
+        </cc:tags>
+        <cc:links>
+            <cc:link url="https://github.com/devonfw/cobigen/wiki/howto_devon4net"/>
+        </cc:links>
+    </cc:contextConfiguration>
+    <tc:templatesConfiguration version="5.0">
+
+        <tc:templateScans>
+            <tc:templateScan templatePath="templates" destinationPath=""/>
+        </tc:templateScans>
+        <tc:increments>
+            <tc:increment name="server" description="CRUD devon4net Server"
+                       explanation="Creates (backends) server CRUD service for .Net application.">
+                <tc:incrementRef ref="application"/>
+                <tc:incrementRef ref="controllers"/>
+                <tc:incrementRef ref="converter"/>
+                <tc:incrementRef ref="dtos"/>
+                <tc:incrementRef ref="exceptions"/>
+                <tc:incrementRef ref="services"/>
+                <tc:incrementRef ref="domain"/>
+            </tc:increment>
+            <tc:increment name="application" description="Application">
+                <tc:templateRef ref="Startup.cs"/>
+                <tc:templateRef ref="appsettings.Development.json"/>
+            </tc:increment>
+            <tc:increment name="controllers" description="Controllers">
+                <tc:templateRef ref="${variables.component#cap_first}Controller.cs"/>
+            </tc:increment>
+            <tc:increment name="converter" description="Converter">
+                <tc:templateRef ref="${variables.component#cap_first}Converter.cs"/>
+            </tc:increment>
+            <tc:increment name="dtos" description="DTO's">
+                <tc:templateRef ref="${variables.entityName#replace('Dto', '')#cap_first}Dto.cs"/>
+                <tc:templateRef ref="${variables.entityName#replace('Dto', '')#cap_first}ResponseDto.cs"/>
+            </tc:increment>
+            <tc:increment name="exceptions" description="Exceptions">
+                <tc:templateRef ref="${variables.entityName#cap_first}NotFoundException.cs"/>
+                <tc:templateRef ref="${variables.entityName#cap_first}NotCreatedException.cs"/>
+                <tc:templateRef ref="${variables.entityName#cap_first}NotDeletedException.cs"/>
+            </tc:increment>
+            <tc:increment name="services" description="Services">
+                <tc:templateRef ref="I${variables.component#cap_first}Service.cs"/>
+                <tc:templateRef ref="${variables.component#cap_first}Service.cs"/>
+            </tc:increment>
+            <tc:increment name="domain" description="Domain">
+                <tc:templateRef ref="CobigenContext.cs"/>
+                <tc:templateRef ref="${variables.entityName#cap_first}.cs"/>
+                <tc:templateRef ref="I${variables.entityName#cap_first}Repository.cs"/>
+                <tc:templateRef ref="${variables.entityName#cap_first}Repository.cs"/>
+            </tc:increment>
+        </tc:increments>
+    </tc:templatesConfiguration>
+</tns:templateSetConfiguration>
\ No newline at end of file
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_net/templates/Devon4Net.Application.WebAPI/Startup.cs b/cobigen-templates/crud-openapi-net/src/main/resources/templates/Devon4Net.Application.WebAPI/Startup.cs
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_net/templates/Devon4Net.Application.WebAPI/Startup.cs
rename to cobigen-templates/crud-openapi-net/src/main/resources/templates/Devon4Net.Application.WebAPI/Startup.cs
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_net/templates/Devon4Net.Application.WebAPI/appsettings.Development.json b/cobigen-templates/crud-openapi-net/src/main/resources/templates/Devon4Net.Application.WebAPI/appsettings.Development.json
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_net/templates/Devon4Net.Application.WebAPI/appsettings.Development.json
rename to cobigen-templates/crud-openapi-net/src/main/resources/templates/Devon4Net.Application.WebAPI/appsettings.Development.json
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_net/templates/Devon4Net.WebAPI.Implementation/Business/${variables.component#cap_first}Management/Controller/${variables.component#cap_first}Controller.cs.ftl b/cobigen-templates/crud-openapi-net/src/main/resources/templates/Devon4Net.WebAPI.Implementation/Business/${variables.component#cap_first}Management/Controller/${variables.component#cap_first}Controller.cs.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_net/templates/Devon4Net.WebAPI.Implementation/Business/${variables.component#cap_first}Management/Controller/${variables.component#cap_first}Controller.cs.ftl
rename to cobigen-templates/crud-openapi-net/src/main/resources/templates/Devon4Net.WebAPI.Implementation/Business/${variables.component#cap_first}Management/Controller/${variables.component#cap_first}Controller.cs.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_net/templates/Devon4Net.WebAPI.Implementation/Business/${variables.component#cap_first}Management/Converter/${variables.component#cap_first}Converter.cs.ftl b/cobigen-templates/crud-openapi-net/src/main/resources/templates/Devon4Net.WebAPI.Implementation/Business/${variables.component#cap_first}Management/Converter/${variables.component#cap_first}Converter.cs.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_net/templates/Devon4Net.WebAPI.Implementation/Business/${variables.component#cap_first}Management/Converter/${variables.component#cap_first}Converter.cs.ftl
rename to cobigen-templates/crud-openapi-net/src/main/resources/templates/Devon4Net.WebAPI.Implementation/Business/${variables.component#cap_first}Management/Converter/${variables.component#cap_first}Converter.cs.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_net/templates/Devon4Net.WebAPI.Implementation/Business/${variables.component#cap_first}Management/Dto/${variables.entityName#replace('Dto', '')#cap_first}Dto.cs.ftl b/cobigen-templates/crud-openapi-net/src/main/resources/templates/Devon4Net.WebAPI.Implementation/Business/${variables.component#cap_first}Management/Dto/${variables.entityName#replace('Dto', '')#cap_first}Dto.cs.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_net/templates/Devon4Net.WebAPI.Implementation/Business/${variables.component#cap_first}Management/Dto/${variables.entityName#replace('Dto', '')#cap_first}Dto.cs.ftl
rename to cobigen-templates/crud-openapi-net/src/main/resources/templates/Devon4Net.WebAPI.Implementation/Business/${variables.component#cap_first}Management/Dto/${variables.entityName#replace('Dto', '')#cap_first}Dto.cs.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_net/templates/Devon4Net.WebAPI.Implementation/Business/${variables.component#cap_first}Management/Dto/${variables.entityName#replace('Dto', '')#cap_first}ResponseDto.cs.ftl b/cobigen-templates/crud-openapi-net/src/main/resources/templates/Devon4Net.WebAPI.Implementation/Business/${variables.component#cap_first}Management/Dto/${variables.entityName#replace('Dto', '')#cap_first}ResponseDto.cs.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_net/templates/Devon4Net.WebAPI.Implementation/Business/${variables.component#cap_first}Management/Dto/${variables.entityName#replace('Dto', '')#cap_first}ResponseDto.cs.ftl
rename to cobigen-templates/crud-openapi-net/src/main/resources/templates/Devon4Net.WebAPI.Implementation/Business/${variables.component#cap_first}Management/Dto/${variables.entityName#replace('Dto', '')#cap_first}ResponseDto.cs.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_net/templates/Devon4Net.WebAPI.Implementation/Business/${variables.component#cap_first}Management/Exceptions/${variables.entityName#cap_first}NotCreatedException.cs.ftl b/cobigen-templates/crud-openapi-net/src/main/resources/templates/Devon4Net.WebAPI.Implementation/Business/${variables.component#cap_first}Management/Exceptions/${variables.entityName#cap_first}NotCreatedException.cs.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_net/templates/Devon4Net.WebAPI.Implementation/Business/${variables.component#cap_first}Management/Exceptions/${variables.entityName#cap_first}NotCreatedException.cs.ftl
rename to cobigen-templates/crud-openapi-net/src/main/resources/templates/Devon4Net.WebAPI.Implementation/Business/${variables.component#cap_first}Management/Exceptions/${variables.entityName#cap_first}NotCreatedException.cs.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_net/templates/Devon4Net.WebAPI.Implementation/Business/${variables.component#cap_first}Management/Exceptions/${variables.entityName#cap_first}NotDeletedException.cs.ftl b/cobigen-templates/crud-openapi-net/src/main/resources/templates/Devon4Net.WebAPI.Implementation/Business/${variables.component#cap_first}Management/Exceptions/${variables.entityName#cap_first}NotDeletedException.cs.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_net/templates/Devon4Net.WebAPI.Implementation/Business/${variables.component#cap_first}Management/Exceptions/${variables.entityName#cap_first}NotDeletedException.cs.ftl
rename to cobigen-templates/crud-openapi-net/src/main/resources/templates/Devon4Net.WebAPI.Implementation/Business/${variables.component#cap_first}Management/Exceptions/${variables.entityName#cap_first}NotDeletedException.cs.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_net/templates/Devon4Net.WebAPI.Implementation/Business/${variables.component#cap_first}Management/Exceptions/${variables.entityName#cap_first}NotFoundException.cs.ftl b/cobigen-templates/crud-openapi-net/src/main/resources/templates/Devon4Net.WebAPI.Implementation/Business/${variables.component#cap_first}Management/Exceptions/${variables.entityName#cap_first}NotFoundException.cs.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_net/templates/Devon4Net.WebAPI.Implementation/Business/${variables.component#cap_first}Management/Exceptions/${variables.entityName#cap_first}NotFoundException.cs.ftl
rename to cobigen-templates/crud-openapi-net/src/main/resources/templates/Devon4Net.WebAPI.Implementation/Business/${variables.component#cap_first}Management/Exceptions/${variables.entityName#cap_first}NotFoundException.cs.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_net/templates/Devon4Net.WebAPI.Implementation/Business/${variables.component#cap_first}Management/Service/${variables.component#cap_first}Service.cs.ftl b/cobigen-templates/crud-openapi-net/src/main/resources/templates/Devon4Net.WebAPI.Implementation/Business/${variables.component#cap_first}Management/Service/${variables.component#cap_first}Service.cs.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_net/templates/Devon4Net.WebAPI.Implementation/Business/${variables.component#cap_first}Management/Service/${variables.component#cap_first}Service.cs.ftl
rename to cobigen-templates/crud-openapi-net/src/main/resources/templates/Devon4Net.WebAPI.Implementation/Business/${variables.component#cap_first}Management/Service/${variables.component#cap_first}Service.cs.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_net/templates/Devon4Net.WebAPI.Implementation/Business/${variables.component#cap_first}Management/Service/I${variables.component#cap_first}Service.cs.ftl b/cobigen-templates/crud-openapi-net/src/main/resources/templates/Devon4Net.WebAPI.Implementation/Business/${variables.component#cap_first}Management/Service/I${variables.component#cap_first}Service.cs.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_net/templates/Devon4Net.WebAPI.Implementation/Business/${variables.component#cap_first}Management/Service/I${variables.component#cap_first}Service.cs.ftl
rename to cobigen-templates/crud-openapi-net/src/main/resources/templates/Devon4Net.WebAPI.Implementation/Business/${variables.component#cap_first}Management/Service/I${variables.component#cap_first}Service.cs.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_net/templates/Devon4Net.WebAPI.Implementation/Data/Repositories/${variables.entityName#cap_first}Repository.cs.ftl b/cobigen-templates/crud-openapi-net/src/main/resources/templates/Devon4Net.WebAPI.Implementation/Data/Repositories/${variables.entityName#cap_first}Repository.cs.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_net/templates/Devon4Net.WebAPI.Implementation/Data/Repositories/${variables.entityName#cap_first}Repository.cs.ftl
rename to cobigen-templates/crud-openapi-net/src/main/resources/templates/Devon4Net.WebAPI.Implementation/Data/Repositories/${variables.entityName#cap_first}Repository.cs.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_net/templates/Devon4Net.WebAPI.Implementation/Domain/Database/CobigenContext.cs b/cobigen-templates/crud-openapi-net/src/main/resources/templates/Devon4Net.WebAPI.Implementation/Domain/Database/CobigenContext.cs
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_net/templates/Devon4Net.WebAPI.Implementation/Domain/Database/CobigenContext.cs
rename to cobigen-templates/crud-openapi-net/src/main/resources/templates/Devon4Net.WebAPI.Implementation/Domain/Database/CobigenContext.cs
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_net/templates/Devon4Net.WebAPI.Implementation/Domain/Entities/${variables.entityName#cap_first}.cs.ftl b/cobigen-templates/crud-openapi-net/src/main/resources/templates/Devon4Net.WebAPI.Implementation/Domain/Entities/${variables.entityName#cap_first}.cs.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_net/templates/Devon4Net.WebAPI.Implementation/Domain/Entities/${variables.entityName#cap_first}.cs.ftl
rename to cobigen-templates/crud-openapi-net/src/main/resources/templates/Devon4Net.WebAPI.Implementation/Domain/Entities/${variables.entityName#cap_first}.cs.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_net/templates/Devon4Net.WebAPI.Implementation/Domain/RepositoryInterfaces/I${variables.entityName#cap_first}Repository.cs.ftl b/cobigen-templates/crud-openapi-net/src/main/resources/templates/Devon4Net.WebAPI.Implementation/Domain/RepositoryInterfaces/I${variables.entityName#cap_first}Repository.cs.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_net/templates/Devon4Net.WebAPI.Implementation/Domain/RepositoryInterfaces/I${variables.entityName#cap_first}Repository.cs.ftl
rename to cobigen-templates/crud-openapi-net/src/main/resources/templates/Devon4Net.WebAPI.Implementation/Domain/RepositoryInterfaces/I${variables.entityName#cap_first}Repository.cs.ftl
diff --git a/cobigen-templates/crud-openapi-net/src/test/java/com/devonfw/cobigen/templates/devon4j/test/templates/CrudOpenApiNetGenerationTest.java b/cobigen-templates/crud-openapi-net/src/test/java/com/devonfw/cobigen/templates/devon4j/test/templates/CrudOpenApiNetGenerationTest.java
new file mode 100644
index 0000000000..c3031d0e9e
--- /dev/null
+++ b/cobigen-templates/crud-openapi-net/src/test/java/com/devonfw/cobigen/templates/devon4j/test/templates/CrudOpenApiNetGenerationTest.java
@@ -0,0 +1,100 @@
+package com.devonfw.cobigen.templates.devon4j.test.templates;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+import org.apache.commons.io.FileUtils;
+import org.junit.BeforeClass;
+import org.junit.ClassRule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+
+import com.devonfw.cobigen.api.constants.ConfigurationConstants;
+import com.devonfw.cobigen.templates.devon4j.config.constant.MavenMetadata;
+import com.devonfw.cobigen.maven.test.AbstractMavenTest;
+
+/**
+ * Smoke tests of all templates.
+ */
+public class CrudOpenApiNetGenerationTest extends AbstractMavenTest {
+
+  /** Root of all test resources of this test suite */
+  public static final String TEST_RESOURCES_ROOT = "src/test/resources/testdata/templatetest/";
+
+  /** Temporary files rule to create temporary folders */
+  @ClassRule
+  public static TemporaryFolder tempFolder = new TemporaryFolder();
+
+  /** The templates development folder */
+  protected static Path templatesProject;
+
+  /** The templates development folder */
+  protected static Path templatesProjectTemporary;
+
+  /**
+   * Creates a copy of the templates project in the temp directory
+   *
+   * @throws URISyntaxException if the path could not be created properly
+   * @throws IOException if accessing a directory or file fails
+   */
+  @BeforeClass
+  public static void setupDevTemplates() throws URISyntaxException, IOException {
+
+    templatesProject = new File(
+        CrudOpenApiNetGenerationTest.class.getProtectionDomain().getCodeSource().getLocation().toURI()).getParentFile()
+            .getParentFile().toPath();
+
+    Path utilsPom = new File(
+        CrudOpenApiNetGenerationTest.class.getProtectionDomain().getCodeSource().getLocation().toURI()).getParentFile()
+            .getParentFile().toPath().resolve("src/test/resources/utils/pom.xml");
+
+    // create a temporary directory cobigen-templates/template-sets/adapted containing the template sets
+    Path tempFolderPath = tempFolder.getRoot().toPath();
+    Path cobigenTemplatePath = tempFolderPath.resolve("cobigen-templates");
+    if (!Files.exists(cobigenTemplatePath)) {
+      Files.createDirectory(cobigenTemplatePath);
+
+      templatesProjectTemporary = cobigenTemplatePath.resolve(ConfigurationConstants.TEMPLATE_SETS_FOLDER);
+      Path templateSetsAdaptedFolder = templatesProjectTemporary.resolve(ConfigurationConstants.ADAPTED_FOLDER);
+      Files.createDirectory(templatesProjectTemporary);
+      Files.createDirectory(templateSetsAdaptedFolder);
+
+      Path templateSetPath = templateSetsAdaptedFolder.resolve("template-set");
+      FileUtils.copyDirectory(templatesProject.toFile(), templateSetPath.toFile());
+
+      if (Files.isDirectory(templateSetPath)) {
+
+        // Replace the pom.xml in the template sets. Needed so that the project in the temp directory is build
+        // properly
+        if (Files.exists(templateSetPath.resolve("pom.xml"))) {
+          try {
+            Files.delete(templateSetPath.resolve("pom.xml"));
+          } catch (IOException e) {
+            throw new IOException("Error deleting file " + templateSetPath.resolve("pom.xml"), e);
+          }
+          try {
+            Files.copy(utilsPom, templateSetPath.resolve("pom.xml"));
+          } catch (IOException e) {
+            throw new IOException("Error copying file " + utilsPom, e);
+          }
+        }
+      }
+    }
+  }
+
+  /**
+   * Test successful generation of all templates based on an ETO
+   *
+   * @throws Exception test fails
+   */
+  @Test
+  public void testAllTemplatesGeneration_OpenApiInput() throws Exception {
+
+    File testProject = new File(TEST_RESOURCES_ROOT + "TestAllTemplatesOpenApiInput/");
+    runMavenInvoker(testProject, templatesProjectTemporary.toFile(), MavenMetadata.LOCAL_REPO);
+  }
+
+}
diff --git a/cobigen-templates/crud-openapi-net/src/test/resources/testdata/templatetest/TestAllTemplatesOpenApiInput/OpenAPI.yaml b/cobigen-templates/crud-openapi-net/src/test/resources/testdata/templatetest/TestAllTemplatesOpenApiInput/OpenAPI.yaml
new file mode 100644
index 0000000000..14b9ec10cf
--- /dev/null
+++ b/cobigen-templates/crud-openapi-net/src/test/resources/testdata/templatetest/TestAllTemplatesOpenApiInput/OpenAPI.yaml
@@ -0,0 +1,131 @@
+openapi: 3.0.0
+servers:
+  - url: 'https://localhost:8081/server/services/rest'
+info:
+  title: Devon Example
+  description: Example of a API definition
+  version: 1.0.0
+  x-rootpackage: com.devonfw.demo
+paths:
+  /datamanagement/v1/someData/{id}:
+    get:
+      operationId: findSomeData
+      parameters:
+        - name: id
+          in: path
+          required: true
+          schema:
+            type: integer
+            format: int64
+            minimum: 0
+            maximum: 50
+      responses:
+        '200':
+          description: Any
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/EvenMoreData'
+            text/plain:
+              schema:
+                type: string
+  /datamanagement/v1/moreData/{id}:
+    get:
+      operationId: findMoreData
+      parameters:
+        - name: id
+          in: path
+          required: true
+          schema:
+            type: integer
+            format: int64
+            minimum: 10
+            maximum: 200
+      responses:
+        '200':
+          description: Any
+  /datamanagement/v1/someData/:
+    post:
+      responses:
+        '200':
+          description: Any
+      requestBody:
+        $ref: '#/components/requestBodies/SomeData'
+      tags:
+       - searchCriteria
+  /datamanagement/v1/moreData/validateMoreData:
+    post:
+      responses:
+       '200':
+          description: Any
+      requestBody:
+        $ref: '#/components/requestBodies/MoreData'
+components:
+    schemas:
+        SomeData:
+          x-component: DataManagement
+          description: Entity definiton of SomeData
+          type: object
+          properties:
+            AnyString:
+              type: string
+              maxLength: 100
+              minLength: 5
+              uniqueItems: true
+            furtherData:
+              type: array
+              items:
+                $ref: '#/components/schemas/FurtherData'
+        MoreData:
+          x-component: DataManagement
+          description: Entity definiton of Moredata
+          type: object
+          properties:
+            anyNumber:
+              type: number
+              format: int64
+              maximum: 100
+              minimum: 0
+            someData:
+              $ref: '#/components/schemas/SomeData'
+            allSomeData:
+              type: array
+              description: 'All SomeData'
+              items:
+                $ref: '#/components/schemas/SomeData'
+          required:
+            - saleExample
+        FurtherData:
+          x-component: AnotherComponent
+          type: object
+          properties:
+            parent:
+              $ref: '#/components/schemas/SomeData'
+            valid:
+              type: boolean
+            someList:
+              type: array
+              items:
+                type: string
+        EvenMoreData:
+          x-component: AnotherComponent
+          description: Entity definiton of more data
+          type: object
+          properties:
+            id:
+              type: integer
+              format: int64
+              uniqueItems: true
+    requestBodies:
+        SomeData:
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/SomeData'
+          required: true
+        MoreData:
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/MoreData'
+          required: true
diff --git a/cobigen-templates/crud-openapi-net/src/test/resources/testdata/templatetest/TestAllTemplatesOpenApiInput/logback.xml b/cobigen-templates/crud-openapi-net/src/test/resources/testdata/templatetest/TestAllTemplatesOpenApiInput/logback.xml
new file mode 100644
index 0000000000..5f29165f75
--- /dev/null
+++ b/cobigen-templates/crud-openapi-net/src/test/resources/testdata/templatetest/TestAllTemplatesOpenApiInput/logback.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- This file is for logback classic. The file contains the configuration for slf4j logging -->
+<configuration>
+	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+			<Pattern>%d{HH:mm:ss.SSS} [%thread] [C:%X{correlationId}] - %-5level - %logger{36} - %msg%n
+			</Pattern>
+		</encoder>
+	</appender>
+
+	<root level="INFO">
+		<appender-ref ref="STDOUT" />
+	</root>
+</configuration>
diff --git a/cobigen-templates/crud-openapi-net/src/test/resources/testdata/templatetest/TestAllTemplatesOpenApiInput/pom.xml b/cobigen-templates/crud-openapi-net/src/test/resources/testdata/templatetest/TestAllTemplatesOpenApiInput/pom.xml
new file mode 100644
index 0000000000..7f84fdeef0
--- /dev/null
+++ b/cobigen-templates/crud-openapi-net/src/test/resources/testdata/templatetest/TestAllTemplatesOpenApiInput/pom.xml
@@ -0,0 +1,84 @@
+<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>com.devonfw.cobigen</groupId>
+  <artifactId>devon4jTemplateTest-TestAllTemplatesOpenAPIInput</artifactId>
+  <version>dev-SNAPSHOT</version>
+
+  <properties>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
+  </properties>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>com.devonfw.cobigen</groupId>
+        <artifactId>cobigen-maven-plugin</artifactId>
+        <version>${pluginVersion}</version>
+        <executions>
+          <execution>
+            <id>generate</id>
+            <phase>package</phase>
+            <goals>
+              <goal>generate</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <configurationFolder>${templatesProject}</configurationFolder>
+          <inputFiles>
+            <inputFile>OpenAPI.yaml</inputFile>
+          </inputFiles>
+          <templates>
+            <template>ALL</template>
+          </templates>
+          <failOnNothingGenerated>true</failOnNothingGenerated>
+        </configuration>
+        <dependencies>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>tempeng-freemarker</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>javaplugin</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>htmlplugin</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>tsplugin</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>jsonplugin</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>openapiplugin</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>xmlplugin</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>textmerger</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+        </dependencies>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>
diff --git a/cobigen-templates/crud-openapi-net/src/test/resources/utils/pom.xml b/cobigen-templates/crud-openapi-net/src/test/resources/utils/pom.xml
new file mode 100644
index 0000000000..4336fbf1a7
--- /dev/null
+++ b/cobigen-templates/crud-openapi-net/src/test/resources/utils/pom.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.devonfw.cobigen.templates</groupId>
+  <artifactId>crud-openapi-net</artifactId>
+  <version>2021.12.007-SNAPSHOT</version>
+  <name>CRUD OpenApi Net</name>
+  <description>A Code-based incremental Generator</description>
+  <licenses>
+    <license>
+      <name>Apache Software License 2.0</name>
+      <url>https://raw.githubusercontent.com/devonfw/.github/master/LICENSE</url>
+      <distribution>repo</distribution>
+      <comments></comments>
+    </license>
+  </licenses>
+  <dependencies>
+    <dependency>
+      <groupId>javax.ws.rs</groupId>
+      <artifactId>javax.ws.rs-api</artifactId>
+      <version>2.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.data</groupId>
+      <artifactId>spring-data-rest-webmvc</artifactId>
+      <version>3.7.10</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+      <version>3.12.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+      <version>2.10.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>xerces</groupId>
+      <artifactId>xercesImpl</artifactId>
+      <version>2.12.2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.persistence</groupId>
+      <artifactId>javax.persistence-api</artifactId>
+      <version>2.2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>1.7.30</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <version>1.7.30</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>log4j-over-slf4j</artifactId>
+      <version>1.7.30</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+  <repositories>
+    <repository>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+      <id>ossrh</id>
+      <name>OSSRH Snapshots</name>
+      <url>https://s01.oss.sonatype.org/content/repositories/snapshots/</url>
+    </repository>
+  </repositories>
+
+  <properties>
+   <maven.compiler.source>1.8</maven.compiler.source>
+   <maven.compiler.target>1.8</maven.compiler.target>
+  </properties>
+
+  <build>
+   <resources>
+     <resource>
+       <directory>src/main/java</directory>
+     </resource>
+   </resources>
+  </build></project>
\ No newline at end of file
diff --git a/cobigen-templates/crud-typescript-angular-client-app/pom.xml b/cobigen-templates/crud-typescript-angular-client-app/pom.xml
new file mode 100644
index 0000000000..602944faf3
--- /dev/null
+++ b/cobigen-templates/crud-typescript-angular-client-app/pom.xml
@@ -0,0 +1,13 @@
+<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>crud-typescript-angular-client-app</artifactId>
+  <name>CRUD TypeScript Angular Client App template</name>
+
+  <parent>
+    <groupId>com.devonfw.cobigen.templates</groupId>
+    <artifactId>templates-parent</artifactId>
+    <version>${revision}</version>
+  </parent>
+
+</project>
\ No newline at end of file
diff --git a/cobigen-templates/crud-typescript-angular-client-app/src/main/java-templates/com/devonfw/cobigen/templates/devon4j/config/constant/MavenMetadata.java b/cobigen-templates/crud-typescript-angular-client-app/src/main/java-templates/com/devonfw/cobigen/templates/devon4j/config/constant/MavenMetadata.java
new file mode 100644
index 0000000000..395d46154d
--- /dev/null
+++ b/cobigen-templates/crud-typescript-angular-client-app/src/main/java-templates/com/devonfw/cobigen/templates/devon4j/config/constant/MavenMetadata.java
@@ -0,0 +1,12 @@
+package com.devonfw.cobigen.templates.devon4j.config.constant;
+
+/**
+ * Constants extracted from the maven pom by templating-maven-plugin.
+ * 
+ * @see "edit template in src/main/java-templates"
+ */
+public class MavenMetadata {
+
+    /** Local repository path */
+    public static final String LOCAL_REPO = "${settings.localRepository}";
+}
diff --git a/cobigen-templates/crud-typescript-angular-client-app/src/main/resources/template-set.xml b/cobigen-templates/crud-typescript-angular-client-app/src/main/resources/template-set.xml
new file mode 100644
index 0000000000..e5a9b786f5
--- /dev/null
+++ b/cobigen-templates/crud-typescript-angular-client-app/src/main/resources/template-set.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--suppress XmlPathReference -->
+<tns:templateSetConfiguration version="6.0"
+                              xmlns:tns="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration"
+                              xmlns:cc="http://capgemini.com/devonfw/cobigen/ContextConfiguration"
+                              xmlns:tc="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration"
+                              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                              xsi:schemaLocation="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration templateSetConfiguration.xsd ">
+    <cc:contextConfiguration version="3.0">
+        <cc:trigger id="crud_typescript_angular_client_app" type="typescript">
+            <cc:matcher type="fqn" value="([^\.]+).entity">
+                <cc:variableAssignment type="regex" key="entityName" value="1"/>
+                <cc:variableAssignment type="regex" key="component" value="1"/>
+                <cc:variableAssignment type="constant" key="domain" value="demo"/>
+            </cc:matcher>
+        </cc:trigger>
+        <cc:tags>
+            <cc:tag name="Angular"></cc:tag>
+            <cc:tag name="TypeScript"></cc:tag>
+            <cc:tag name="CRUD"></cc:tag>
+            <cc:tag name="Client"></cc:tag>
+            <cc:tag name="App"></cc:tag>
+        </cc:tags>
+    </cc:contextConfiguration>
+    <tc:templatesConfiguration xmlns="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0">
+
+        <tc:templates>
+            <tc:templateExtension ref="${variables.entityName#lower_case}-dialog.component.ts" mergeStrategy="tsmerge" />
+            <tc:templateExtension ref="${variables.entityName#lower_case}-grid.component.ts" mergeStrategy="tsmerge" />
+            <tc:templateExtension ref="${variables.entityName#lower_case}-alert.component.ts" mergeStrategy="tsmerge" />
+            <tc:templateExtension ref="${variables.entityName#lower_case}.service.ts" mergeStrategy="tsmerge" />
+            <tc:templateExtension ref="${variables.entityName#lower_case}.ts" mergeStrategy="tsmerge" />
+            <tc:templateExtension ref="model.ts" mergeStrategy="tsmerge" />
+            <tc:templateExtension ref="app.module.ts" mergeStrategy="tsmerge" />
+            <tc:templateExtension ref="es.json" mergeStrategy="jsonmerge" />
+            <tc:templateExtension ref="en.json" mergeStrategy="jsonmerge" />
+            <tc:templateExtension ref="environment.ts" mergeStrategy="tsmerge_override" />
+            <tc:templateExtension ref="environment.prod.ts" mergeStrategy="tsmerge_override" />
+            <tc:templateExtension ref="app-routing.module.ts" mergeStrategy="tsmerge_override" />
+            <tc:templateExtension ref="login.service.ts" mergeStrategy="tsmerge_override" />
+            <tc:templateExtension ref="business-operations.service.ts" mergeStrategy="tsmerge_override" />
+            <tc:templateExtension ref="sort.ts" mergeStrategy="tsmerge_override" />
+            <tc:templateExtension ref="home.component.html" mergeStrategy="override" />
+        </tc:templates>
+
+        <tc:templateScans>
+            <tc:templateScan name="ts_scan" templatePath="templates" destinationPath="" />
+        </tc:templateScans>
+
+        <tc:increments>
+            <tc:increment name="devon4ng-app" description="CRUD devon4ng Angular App" explanation="Creates Angular stack CRUD service.">
+                <tc:incrementRef ref="app_angular_env" />
+                <tc:incrementRef ref="app_angular_i18n" />
+                <tc:incrementRef ref="app_angular_security" />
+                <tc:incrementRef ref="app_angular_devon4ng_component" />
+                <tc:incrementRef ref="app_angular_service_based" />
+            </tc:increment>
+            <tc:increment name="app_angular_env" description="Server URL Registration">
+                <tc:templateRef ref="environment.ts" />
+                <tc:templateRef ref="environment.prod.ts" />
+            </tc:increment>
+            <tc:increment name="app_angular_i18n" description="i18n">
+                <tc:templateRef ref="es.json" />
+                <tc:templateRef ref="en.json" />
+            </tc:increment>
+            <tc:increment name="app_angular_security" description="Security">
+                <tc:templateRef ref="login.service.ts" />
+                <tc:templateRef ref="business-operations.service.ts" />
+            </tc:increment>
+            <tc:increment name="app_angular_service_based" description="model">
+                <tc:templateRef ref="model.ts" />
+                <tc:templateRef ref="${variables.entityName#lower_case}.ts" />
+            </tc:increment>
+            <tc:increment name="app_angular_devon4ng_component" description="View Component">
+                <tc:templateRef ref="${variables.entityName#lower_case}-dialog.component.html" />
+                <tc:templateRef ref="${variables.entityName#lower_case}-dialog.component.ts" />
+                <tc:templateRef ref="${variables.entityName#lower_case}-dialog.component.spec.ts" />
+                <tc:templateRef ref="${variables.entityName#lower_case}-grid.component.html" />
+                <tc:templateRef ref="${variables.entityName#lower_case}-grid.component.scss" />
+                <tc:templateRef ref="${variables.entityName#lower_case}-grid.component.ts" />
+                <tc:templateRef ref="${variables.entityName#lower_case}-grid.component.spec.ts" />
+                <tc:templateRef ref="${variables.entityName#lower_case}-alert.component.html" />
+                <tc:templateRef ref="${variables.entityName#lower_case}-alert.component.scss" />
+                <tc:templateRef ref="${variables.entityName#lower_case}-alert.component.ts" />
+                <tc:templateRef ref="${variables.entityName#lower_case}-alert.component.spec.ts" />
+                <tc:templateRef ref="${variables.entityName#lower_case}.service.ts" />
+                <tc:templateRef ref="${variables.entityName#lower_case}.service.spec.ts" />
+                <tc:templateRef ref="${variables.entityName#lower_case}.module.ts" />
+                <tc:templateRef ref="home.component.html" />
+                <tc:templateRef ref="app.module.ts" />
+                <tc:templateRef ref="app-routing.module.ts" />
+                <tc:templateRef ref="sort.ts" />
+            </tc:increment>
+        </tc:increments>
+    </tc:templatesConfiguration>
+</tns:templateSetConfiguration>
\ No newline at end of file
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_typescript_angular_client_app/templates/cobigen.properties b/cobigen-templates/crud-typescript-angular-client-app/src/main/resources/templates/cobigen.properties
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_typescript_angular_client_app/templates/cobigen.properties
rename to cobigen-templates/crud-typescript-angular-client-app/src/main/resources/templates/cobigen.properties
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_typescript_angular_client_app/templates/src/app/${variables.entityName#lower_case}/${variables.entityName#lower_case}-alert/${variables.entityName#lower_case}-alert.component.html.ftl b/cobigen-templates/crud-typescript-angular-client-app/src/main/resources/templates/src/app/${variables.entityName#lower_case}/${variables.entityName#lower_case}-alert/${variables.entityName#lower_case}-alert.component.html.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_typescript_angular_client_app/templates/src/app/${variables.entityName#lower_case}/${variables.entityName#lower_case}-alert/${variables.entityName#lower_case}-alert.component.html.ftl
rename to cobigen-templates/crud-typescript-angular-client-app/src/main/resources/templates/src/app/${variables.entityName#lower_case}/${variables.entityName#lower_case}-alert/${variables.entityName#lower_case}-alert.component.html.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_typescript_angular_client_app/templates/src/app/${variables.entityName#lower_case}/${variables.entityName#lower_case}-alert/${variables.entityName#lower_case}-alert.component.scss b/cobigen-templates/crud-typescript-angular-client-app/src/main/resources/templates/src/app/${variables.entityName#lower_case}/${variables.entityName#lower_case}-alert/${variables.entityName#lower_case}-alert.component.scss
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_typescript_angular_client_app/templates/src/app/${variables.entityName#lower_case}/${variables.entityName#lower_case}-alert/${variables.entityName#lower_case}-alert.component.scss
rename to cobigen-templates/crud-typescript-angular-client-app/src/main/resources/templates/src/app/${variables.entityName#lower_case}/${variables.entityName#lower_case}-alert/${variables.entityName#lower_case}-alert.component.scss
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_typescript_angular_client_app/templates/src/app/${variables.entityName#lower_case}/${variables.entityName#lower_case}-alert/${variables.entityName#lower_case}-alert.component.spec.ts.ftl b/cobigen-templates/crud-typescript-angular-client-app/src/main/resources/templates/src/app/${variables.entityName#lower_case}/${variables.entityName#lower_case}-alert/${variables.entityName#lower_case}-alert.component.spec.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_typescript_angular_client_app/templates/src/app/${variables.entityName#lower_case}/${variables.entityName#lower_case}-alert/${variables.entityName#lower_case}-alert.component.spec.ts.ftl
rename to cobigen-templates/crud-typescript-angular-client-app/src/main/resources/templates/src/app/${variables.entityName#lower_case}/${variables.entityName#lower_case}-alert/${variables.entityName#lower_case}-alert.component.spec.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_typescript_angular_client_app/templates/src/app/${variables.entityName#lower_case}/${variables.entityName#lower_case}-alert/${variables.entityName#lower_case}-alert.component.ts.ftl b/cobigen-templates/crud-typescript-angular-client-app/src/main/resources/templates/src/app/${variables.entityName#lower_case}/${variables.entityName#lower_case}-alert/${variables.entityName#lower_case}-alert.component.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_typescript_angular_client_app/templates/src/app/${variables.entityName#lower_case}/${variables.entityName#lower_case}-alert/${variables.entityName#lower_case}-alert.component.ts.ftl
rename to cobigen-templates/crud-typescript-angular-client-app/src/main/resources/templates/src/app/${variables.entityName#lower_case}/${variables.entityName#lower_case}-alert/${variables.entityName#lower_case}-alert.component.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_typescript_angular_client_app/templates/src/app/${variables.entityName#lower_case}/${variables.entityName#lower_case}-dialog/${variables.entityName#lower_case}-dialog.component.html.ftl b/cobigen-templates/crud-typescript-angular-client-app/src/main/resources/templates/src/app/${variables.entityName#lower_case}/${variables.entityName#lower_case}-dialog/${variables.entityName#lower_case}-dialog.component.html.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_typescript_angular_client_app/templates/src/app/${variables.entityName#lower_case}/${variables.entityName#lower_case}-dialog/${variables.entityName#lower_case}-dialog.component.html.ftl
rename to cobigen-templates/crud-typescript-angular-client-app/src/main/resources/templates/src/app/${variables.entityName#lower_case}/${variables.entityName#lower_case}-dialog/${variables.entityName#lower_case}-dialog.component.html.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_typescript_angular_client_app/templates/src/app/${variables.entityName#lower_case}/${variables.entityName#lower_case}-dialog/${variables.entityName#lower_case}-dialog.component.spec.ts.ftl b/cobigen-templates/crud-typescript-angular-client-app/src/main/resources/templates/src/app/${variables.entityName#lower_case}/${variables.entityName#lower_case}-dialog/${variables.entityName#lower_case}-dialog.component.spec.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_typescript_angular_client_app/templates/src/app/${variables.entityName#lower_case}/${variables.entityName#lower_case}-dialog/${variables.entityName#lower_case}-dialog.component.spec.ts.ftl
rename to cobigen-templates/crud-typescript-angular-client-app/src/main/resources/templates/src/app/${variables.entityName#lower_case}/${variables.entityName#lower_case}-dialog/${variables.entityName#lower_case}-dialog.component.spec.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_typescript_angular_client_app/templates/src/app/${variables.entityName#lower_case}/${variables.entityName#lower_case}-dialog/${variables.entityName#lower_case}-dialog.component.ts.ftl b/cobigen-templates/crud-typescript-angular-client-app/src/main/resources/templates/src/app/${variables.entityName#lower_case}/${variables.entityName#lower_case}-dialog/${variables.entityName#lower_case}-dialog.component.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_typescript_angular_client_app/templates/src/app/${variables.entityName#lower_case}/${variables.entityName#lower_case}-dialog/${variables.entityName#lower_case}-dialog.component.ts.ftl
rename to cobigen-templates/crud-typescript-angular-client-app/src/main/resources/templates/src/app/${variables.entityName#lower_case}/${variables.entityName#lower_case}-dialog/${variables.entityName#lower_case}-dialog.component.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_typescript_angular_client_app/templates/src/app/${variables.entityName#lower_case}/${variables.entityName#lower_case}-grid/${variables.entityName#lower_case}-grid.component.html.ftl b/cobigen-templates/crud-typescript-angular-client-app/src/main/resources/templates/src/app/${variables.entityName#lower_case}/${variables.entityName#lower_case}-grid/${variables.entityName#lower_case}-grid.component.html.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_typescript_angular_client_app/templates/src/app/${variables.entityName#lower_case}/${variables.entityName#lower_case}-grid/${variables.entityName#lower_case}-grid.component.html.ftl
rename to cobigen-templates/crud-typescript-angular-client-app/src/main/resources/templates/src/app/${variables.entityName#lower_case}/${variables.entityName#lower_case}-grid/${variables.entityName#lower_case}-grid.component.html.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_typescript_angular_client_app/templates/src/app/${variables.entityName#lower_case}/${variables.entityName#lower_case}-grid/${variables.entityName#lower_case}-grid.component.scss b/cobigen-templates/crud-typescript-angular-client-app/src/main/resources/templates/src/app/${variables.entityName#lower_case}/${variables.entityName#lower_case}-grid/${variables.entityName#lower_case}-grid.component.scss
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_typescript_angular_client_app/templates/src/app/${variables.entityName#lower_case}/${variables.entityName#lower_case}-grid/${variables.entityName#lower_case}-grid.component.scss
rename to cobigen-templates/crud-typescript-angular-client-app/src/main/resources/templates/src/app/${variables.entityName#lower_case}/${variables.entityName#lower_case}-grid/${variables.entityName#lower_case}-grid.component.scss
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_typescript_angular_client_app/templates/src/app/${variables.entityName#lower_case}/${variables.entityName#lower_case}-grid/${variables.entityName#lower_case}-grid.component.spec.ts.ftl b/cobigen-templates/crud-typescript-angular-client-app/src/main/resources/templates/src/app/${variables.entityName#lower_case}/${variables.entityName#lower_case}-grid/${variables.entityName#lower_case}-grid.component.spec.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_typescript_angular_client_app/templates/src/app/${variables.entityName#lower_case}/${variables.entityName#lower_case}-grid/${variables.entityName#lower_case}-grid.component.spec.ts.ftl
rename to cobigen-templates/crud-typescript-angular-client-app/src/main/resources/templates/src/app/${variables.entityName#lower_case}/${variables.entityName#lower_case}-grid/${variables.entityName#lower_case}-grid.component.spec.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_typescript_angular_client_app/templates/src/app/${variables.entityName#lower_case}/${variables.entityName#lower_case}-grid/${variables.entityName#lower_case}-grid.component.ts.ftl b/cobigen-templates/crud-typescript-angular-client-app/src/main/resources/templates/src/app/${variables.entityName#lower_case}/${variables.entityName#lower_case}-grid/${variables.entityName#lower_case}-grid.component.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_typescript_angular_client_app/templates/src/app/${variables.entityName#lower_case}/${variables.entityName#lower_case}-grid/${variables.entityName#lower_case}-grid.component.ts.ftl
rename to cobigen-templates/crud-typescript-angular-client-app/src/main/resources/templates/src/app/${variables.entityName#lower_case}/${variables.entityName#lower_case}-grid/${variables.entityName#lower_case}-grid.component.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_typescript_angular_client_app/templates/src/app/${variables.entityName#lower_case}/${variables.entityName#lower_case}.module.ts.ftl b/cobigen-templates/crud-typescript-angular-client-app/src/main/resources/templates/src/app/${variables.entityName#lower_case}/${variables.entityName#lower_case}.module.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_typescript_angular_client_app/templates/src/app/${variables.entityName#lower_case}/${variables.entityName#lower_case}.module.ts.ftl
rename to cobigen-templates/crud-typescript-angular-client-app/src/main/resources/templates/src/app/${variables.entityName#lower_case}/${variables.entityName#lower_case}.module.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_typescript_angular_client_app/templates/src/app/${variables.entityName#lower_case}/services/${variables.entityName#lower_case}.service.spec.ts.ftl b/cobigen-templates/crud-typescript-angular-client-app/src/main/resources/templates/src/app/${variables.entityName#lower_case}/services/${variables.entityName#lower_case}.service.spec.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_typescript_angular_client_app/templates/src/app/${variables.entityName#lower_case}/services/${variables.entityName#lower_case}.service.spec.ts.ftl
rename to cobigen-templates/crud-typescript-angular-client-app/src/main/resources/templates/src/app/${variables.entityName#lower_case}/services/${variables.entityName#lower_case}.service.spec.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_typescript_angular_client_app/templates/src/app/${variables.entityName#lower_case}/services/${variables.entityName#lower_case}.service.ts.ftl b/cobigen-templates/crud-typescript-angular-client-app/src/main/resources/templates/src/app/${variables.entityName#lower_case}/services/${variables.entityName#lower_case}.service.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_typescript_angular_client_app/templates/src/app/${variables.entityName#lower_case}/services/${variables.entityName#lower_case}.service.ts.ftl
rename to cobigen-templates/crud-typescript-angular-client-app/src/main/resources/templates/src/app/${variables.entityName#lower_case}/services/${variables.entityName#lower_case}.service.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_typescript_angular_client_app/templates/src/app/app-routing.module.ts.ftl b/cobigen-templates/crud-typescript-angular-client-app/src/main/resources/templates/src/app/app-routing.module.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_typescript_angular_client_app/templates/src/app/app-routing.module.ts.ftl
rename to cobigen-templates/crud-typescript-angular-client-app/src/main/resources/templates/src/app/app-routing.module.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_typescript_angular_client_app/templates/src/app/app.module.ts.ftl b/cobigen-templates/crud-typescript-angular-client-app/src/main/resources/templates/src/app/app.module.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_typescript_angular_client_app/templates/src/app/app.module.ts.ftl
rename to cobigen-templates/crud-typescript-angular-client-app/src/main/resources/templates/src/app/app.module.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_typescript_angular_client_app/templates/src/app/core/interfaces/sort.ts.ftl b/cobigen-templates/crud-typescript-angular-client-app/src/main/resources/templates/src/app/core/interfaces/sort.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_typescript_angular_client_app/templates/src/app/core/interfaces/sort.ts.ftl
rename to cobigen-templates/crud-typescript-angular-client-app/src/main/resources/templates/src/app/core/interfaces/sort.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_typescript_angular_client_app/templates/src/app/core/security/login.service.ts.ftl b/cobigen-templates/crud-typescript-angular-client-app/src/main/resources/templates/src/app/core/security/login.service.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_typescript_angular_client_app/templates/src/app/core/security/login.service.ts.ftl
rename to cobigen-templates/crud-typescript-angular-client-app/src/main/resources/templates/src/app/core/security/login.service.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_typescript_angular_client_app/templates/src/app/core/shared/business-operations.service.ts.ftl b/cobigen-templates/crud-typescript-angular-client-app/src/main/resources/templates/src/app/core/shared/business-operations.service.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_typescript_angular_client_app/templates/src/app/core/shared/business-operations.service.ts.ftl
rename to cobigen-templates/crud-typescript-angular-client-app/src/main/resources/templates/src/app/core/shared/business-operations.service.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_typescript_angular_client_app/templates/src/app/home/home.component.html.ftl b/cobigen-templates/crud-typescript-angular-client-app/src/main/resources/templates/src/app/home/home.component.html.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_typescript_angular_client_app/templates/src/app/home/home.component.html.ftl
rename to cobigen-templates/crud-typescript-angular-client-app/src/main/resources/templates/src/app/home/home.component.html.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_typescript_angular_client_app/templates/src/app/model/${variables.entityName#lower_case}.ts.ftl b/cobigen-templates/crud-typescript-angular-client-app/src/main/resources/templates/src/app/model/${variables.entityName#lower_case}.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_typescript_angular_client_app/templates/src/app/model/${variables.entityName#lower_case}.ts.ftl
rename to cobigen-templates/crud-typescript-angular-client-app/src/main/resources/templates/src/app/model/${variables.entityName#lower_case}.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_typescript_angular_client_app/templates/src/app/model/model.ts.ftl b/cobigen-templates/crud-typescript-angular-client-app/src/main/resources/templates/src/app/model/model.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_typescript_angular_client_app/templates/src/app/model/model.ts.ftl
rename to cobigen-templates/crud-typescript-angular-client-app/src/main/resources/templates/src/app/model/model.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_typescript_angular_client_app/templates/src/assets/i18n/en.json.ftl b/cobigen-templates/crud-typescript-angular-client-app/src/main/resources/templates/src/assets/i18n/en.json.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_typescript_angular_client_app/templates/src/assets/i18n/en.json.ftl
rename to cobigen-templates/crud-typescript-angular-client-app/src/main/resources/templates/src/assets/i18n/en.json.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_typescript_angular_client_app/templates/src/assets/i18n/es.json.ftl b/cobigen-templates/crud-typescript-angular-client-app/src/main/resources/templates/src/assets/i18n/es.json.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_typescript_angular_client_app/templates/src/assets/i18n/es.json.ftl
rename to cobigen-templates/crud-typescript-angular-client-app/src/main/resources/templates/src/assets/i18n/es.json.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_typescript_angular_client_app/templates/src/environments/environment.prod.ts.ftl b/cobigen-templates/crud-typescript-angular-client-app/src/main/resources/templates/src/environments/environment.prod.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_typescript_angular_client_app/templates/src/environments/environment.prod.ts.ftl
rename to cobigen-templates/crud-typescript-angular-client-app/src/main/resources/templates/src/environments/environment.prod.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_typescript_angular_client_app/templates/src/environments/environment.ts.ftl b/cobigen-templates/crud-typescript-angular-client-app/src/main/resources/templates/src/environments/environment.ts.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_typescript_angular_client_app/templates/src/environments/environment.ts.ftl
rename to cobigen-templates/crud-typescript-angular-client-app/src/main/resources/templates/src/environments/environment.ts.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_typescript_angular_client_app/variables.ftl b/cobigen-templates/crud-typescript-angular-client-app/src/main/resources/variables.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/crud_typescript_angular_client_app/variables.ftl
rename to cobigen-templates/crud-typescript-angular-client-app/src/main/resources/variables.ftl
diff --git a/cobigen-templates/crud-typescript-angular-client-app/src/test/java/com/devonfw/cobigen/templates/devon4j/test/templates/CrudTypescriptAngularClientAppTest.java b/cobigen-templates/crud-typescript-angular-client-app/src/test/java/com/devonfw/cobigen/templates/devon4j/test/templates/CrudTypescriptAngularClientAppTest.java
new file mode 100644
index 0000000000..bc2cc3ae0c
--- /dev/null
+++ b/cobigen-templates/crud-typescript-angular-client-app/src/test/java/com/devonfw/cobigen/templates/devon4j/test/templates/CrudTypescriptAngularClientAppTest.java
@@ -0,0 +1,100 @@
+package com.devonfw.cobigen.templates.devon4j.test.templates;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+import org.apache.commons.io.FileUtils;
+import org.junit.BeforeClass;
+import org.junit.ClassRule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+
+import com.devonfw.cobigen.api.constants.ConfigurationConstants;
+import com.devonfw.cobigen.maven.test.AbstractMavenTest;
+import com.devonfw.cobigen.templates.devon4j.config.constant.MavenMetadata;
+
+/**
+ * Smoke tests of all templates.
+ */
+public class CrudTypescriptAngularClientAppTest extends AbstractMavenTest {
+
+  /** Root of all test resources of this test suite */
+  public static final String TEST_RESOURCES_ROOT = "src/test/resources/testdata/templatetest/";
+
+  /** Temporary files rule to create temporary folders */
+  @ClassRule
+  public static TemporaryFolder tempFolder = new TemporaryFolder();
+
+  /** The templates development folder */
+  protected static Path templatesProject;
+
+  /** The templates development folder */
+  protected static Path templatesProjectTemporary;
+
+  /**
+   * Creates a copy of the templates project in the temp directory
+   *
+   * @throws URISyntaxException if the path could not be created properly
+   * @throws IOException if accessing a directory or file fails
+   */
+  @BeforeClass
+  public static void setupDevTemplates() throws URISyntaxException, IOException {
+
+    templatesProject = new File(
+        CrudTypescriptAngularClientAppTest.class.getProtectionDomain().getCodeSource().getLocation().toURI())
+            .getParentFile().getParentFile().toPath();
+
+    Path utilsPom = new File(
+        CrudTypescriptAngularClientAppTest.class.getProtectionDomain().getCodeSource().getLocation().toURI())
+            .getParentFile().getParentFile().toPath().resolve("src/test/resources/utils/pom.xml");
+
+    // create a temporary directory cobigen-templates/template-sets/adapted containing the template sets
+    Path tempFolderPath = tempFolder.getRoot().toPath();
+    Path cobigenTemplatePath = tempFolderPath.resolve("cobigen-templates");
+    if (!Files.exists(cobigenTemplatePath)) {
+      Files.createDirectory(cobigenTemplatePath);
+
+      templatesProjectTemporary = cobigenTemplatePath.resolve(ConfigurationConstants.TEMPLATE_SETS_FOLDER);
+      Path templateSetsAdaptedFolder = templatesProjectTemporary.resolve(ConfigurationConstants.ADAPTED_FOLDER);
+      Files.createDirectory(templatesProjectTemporary);
+      Files.createDirectory(templateSetsAdaptedFolder);
+
+      Path templateSetPath = templateSetsAdaptedFolder.resolve("template-set");
+      FileUtils.copyDirectory(templatesProject.toFile(), templateSetPath.toFile());
+
+      if (Files.isDirectory(templateSetPath)) {
+
+        // Replace the pom.xml in the template sets. Needed so that the project in the temp directory is build
+        // properly
+        if (Files.exists(templateSetPath.resolve("pom.xml"))) {
+          try {
+            Files.delete(templateSetPath.resolve("pom.xml"));
+          } catch (IOException e) {
+            throw new IOException("Error deleting file " + templateSetPath.resolve("pom.xml"), e);
+          }
+          try {
+            Files.copy(utilsPom, templateSetPath.resolve("pom.xml"));
+          } catch (IOException e) {
+            throw new IOException("Error copying file " + utilsPom, e);
+          }
+        }
+      }
+    }
+  }
+
+  /**
+   * Test successful generation of all templates based on a TypeScript entity
+   *
+   * @throws Exception test fails
+   */
+  @Test
+  public void testAllTemplatesGeneration_TypescriptEntityInput() throws Exception {
+
+    File testProject = new File(TEST_RESOURCES_ROOT + "TestAllTemplatesEntityInput/");
+    runMavenInvoker(testProject, templatesProjectTemporary.toFile(), MavenMetadata.LOCAL_REPO);
+  }
+
+}
diff --git a/cobigen-templates/crud-typescript-angular-client-app/src/test/resources/application.properties b/cobigen-templates/crud-typescript-angular-client-app/src/test/resources/application.properties
new file mode 100644
index 0000000000..cf2c614efb
--- /dev/null
+++ b/cobigen-templates/crud-typescript-angular-client-app/src/test/resources/application.properties
@@ -0,0 +1,2 @@
+server.port=8080
+server.context-path=/
\ No newline at end of file
diff --git a/cobigen-templates/crud-typescript-angular-client-app/src/test/resources/logback.xml b/cobigen-templates/crud-typescript-angular-client-app/src/test/resources/logback.xml
new file mode 100644
index 0000000000..5f29165f75
--- /dev/null
+++ b/cobigen-templates/crud-typescript-angular-client-app/src/test/resources/logback.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- This file is for logback classic. The file contains the configuration for slf4j logging -->
+<configuration>
+	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+			<Pattern>%d{HH:mm:ss.SSS} [%thread] [C:%X{correlationId}] - %-5level - %logger{36} - %msg%n
+			</Pattern>
+		</encoder>
+	</appender>
+
+	<root level="INFO">
+		<appender-ref ref="STDOUT" />
+	</root>
+</configuration>
diff --git a/cobigen-templates/crud-typescript-angular-client-app/src/test/resources/testdata/templatetest/TestAllTemplatesEntityInput/baseFile.entity.ts b/cobigen-templates/crud-typescript-angular-client-app/src/test/resources/testdata/templatetest/TestAllTemplatesEntityInput/baseFile.entity.ts
new file mode 100644
index 0000000000..d8f3f6f8b2
--- /dev/null
+++ b/cobigen-templates/crud-typescript-angular-client-app/src/test/resources/testdata/templatetest/TestAllTemplatesEntityInput/baseFile.entity.ts
@@ -0,0 +1,22 @@
+import { a } from 'b';
+import { c } from 'd';
+export { e } from 'f';
+
+  /**
+    * Should format correctly this line
+ * Api Documentation
+ *
+ * OpenAPI spec version: 1.0
+ */
+class a {
+	
+	aProperty: number = 2;
+	
+	aMethod(){
+		
+	}
+}
+
+export interface a { 
+  private b: number;
+}
\ No newline at end of file
diff --git a/cobigen-templates/crud-typescript-angular-client-app/src/test/resources/testdata/templatetest/TestAllTemplatesEntityInput/logback.xml b/cobigen-templates/crud-typescript-angular-client-app/src/test/resources/testdata/templatetest/TestAllTemplatesEntityInput/logback.xml
new file mode 100644
index 0000000000..5f29165f75
--- /dev/null
+++ b/cobigen-templates/crud-typescript-angular-client-app/src/test/resources/testdata/templatetest/TestAllTemplatesEntityInput/logback.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- This file is for logback classic. The file contains the configuration for slf4j logging -->
+<configuration>
+	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+			<Pattern>%d{HH:mm:ss.SSS} [%thread] [C:%X{correlationId}] - %-5level - %logger{36} - %msg%n
+			</Pattern>
+		</encoder>
+	</appender>
+
+	<root level="INFO">
+		<appender-ref ref="STDOUT" />
+	</root>
+</configuration>
diff --git a/cobigen-templates/crud-typescript-angular-client-app/src/test/resources/testdata/templatetest/TestAllTemplatesEntityInput/pom.xml b/cobigen-templates/crud-typescript-angular-client-app/src/test/resources/testdata/templatetest/TestAllTemplatesEntityInput/pom.xml
new file mode 100644
index 0000000000..3e3cbe8ba5
--- /dev/null
+++ b/cobigen-templates/crud-typescript-angular-client-app/src/test/resources/testdata/templatetest/TestAllTemplatesEntityInput/pom.xml
@@ -0,0 +1,58 @@
+<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>com.devonfw.cobigen</groupId>
+  <artifactId>devon4jTemplateTest-TestAllTemplatesEntityInput</artifactId>
+  <version>dev-SNAPSHOT</version>
+
+  <properties>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
+  </properties>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>com.devonfw.cobigen</groupId>
+        <artifactId>cobigen-maven-plugin</artifactId>
+        <version>${pluginVersion}</version>
+        <executions>
+          <execution>
+            <id>generate</id>
+            <phase>package</phase>
+            <goals>
+              <goal>generate</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <configurationFolder>${templatesProject}</configurationFolder>
+          <inputFiles>
+            <inputFile>baseFile.entity.ts</inputFile>
+          </inputFiles>
+          <templates>
+            <template>ALL</template>
+          </templates>
+          <failOnNothingGenerated>true</failOnNothingGenerated>
+        </configuration>
+        <dependencies>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>tempeng-freemarker</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>tsplugin</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>jsonplugin</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+        </dependencies>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/cobigen-templates/crud-typescript-angular-client-app/src/test/resources/testdata/templatetest/TestAllTemplatesEntityInput/src/main/java/io/github/devonfw/cobigen/generator/dataaccess/api/InputEntity.java b/cobigen-templates/crud-typescript-angular-client-app/src/test/resources/testdata/templatetest/TestAllTemplatesEntityInput/src/main/java/io/github/devonfw/cobigen/generator/dataaccess/api/InputEntity.java
new file mode 100644
index 0000000000..e2d76c7c9f
--- /dev/null
+++ b/cobigen-templates/crud-typescript-angular-client-app/src/test/resources/testdata/templatetest/TestAllTemplatesEntityInput/src/main/java/io/github/devonfw/cobigen/generator/dataaccess/api/InputEntity.java
@@ -0,0 +1,25 @@
+package io.github.devonfw.cobigen.generator.dataaccess.api;
+
+public class InputEntity {
+    
+    private String input;
+    
+    private int complexity;
+    
+    public String getInput() {
+        return input;
+    }
+    
+    public void setInput(String input) {
+        this.input = input;
+    }
+    
+    public int getComplexity() {
+        return complexity;
+    }
+    
+    public void setComplexity(int complexity) {
+        this.complexity = complexity;
+    }
+    
+}
diff --git a/cobigen-templates/crud-typescript-angular-client-app/src/test/resources/utils/pom.xml b/cobigen-templates/crud-typescript-angular-client-app/src/test/resources/utils/pom.xml
new file mode 100644
index 0000000000..c692753c92
--- /dev/null
+++ b/cobigen-templates/crud-typescript-angular-client-app/src/test/resources/utils/pom.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.devonfw.cobigen.templates</groupId>
+  <artifactId>crud-typescript-angular-client-app</artifactId>
+  <version>2021.12.007-SNAPSHOT</version>
+  <name>Crud Typescript Angular Client App</name>
+  <description>A Code-based incremental Generator</description>
+  <url>https://github.com/devonfw/cobigen/templates-parent/templates-devon4j-utils</url>
+  <licenses>
+    <license>
+      <name>Apache Software License 2.0</name>
+      <url>https://raw.githubusercontent.com/devonfw/.github/master/LICENSE</url>
+      <distribution>repo</distribution>
+      <comments></comments>
+    </license>
+  </licenses>
+  <dependencies>
+    <dependency>
+      <groupId>javax.ws.rs</groupId>
+      <artifactId>javax.ws.rs-api</artifactId>
+      <version>2.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.data</groupId>
+      <artifactId>spring-data-rest-webmvc</artifactId>
+      <version>3.7.10</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+      <version>3.12.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+      <version>2.10.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>xerces</groupId>
+      <artifactId>xercesImpl</artifactId>
+      <version>2.12.2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.persistence</groupId>
+      <artifactId>javax.persistence-api</artifactId>
+      <version>2.2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>1.7.30</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <version>1.7.30</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>log4j-over-slf4j</artifactId>
+      <version>1.7.30</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+  <repositories>
+    <repository>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+      <id>ossrh</id>
+      <name>OSSRH Snapshots</name>
+      <url>https://s01.oss.sonatype.org/content/repositories/snapshots/</url>
+    </repository>
+  </repositories>
+
+  <properties>
+   <maven.compiler.source>1.8</maven.compiler.source>
+   <maven.compiler.target>1.8</maven.compiler.target>
+  </properties>
+
+  <build>
+   <resources>
+     <resource>
+       <directory>src/main/java</directory>
+     </resource>
+   </resources>
+  </build></project>
\ No newline at end of file
diff --git a/cobigen-templates/kafka-documentation/pom.xml b/cobigen-templates/kafka-documentation/pom.xml
new file mode 100644
index 0000000000..fc496c637a
--- /dev/null
+++ b/cobigen-templates/kafka-documentation/pom.xml
@@ -0,0 +1,24 @@
+<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>kafka-documentation</artifactId>
+  <name>Kafka Documentation template</name>
+
+  <parent>
+    <groupId>com.devonfw.cobigen.templates</groupId>
+    <artifactId>templates-parent</artifactId>
+    <version>${revision}</version>
+  </parent>
+
+  <dependencies>
+    <dependency>
+      <groupId>javax.ws.rs</groupId>
+      <artifactId>javax.ws.rs-api</artifactId>
+      <version>2.0</version>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+    </dependency>
+  </dependencies>
+</project>
\ No newline at end of file
diff --git a/cobigen-templates/templates-devon4j/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/documentation/JavaDocumentationUtil.java b/cobigen-templates/kafka-documentation/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/documentation/JavaDocumentationUtil.java
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/documentation/JavaDocumentationUtil.java
rename to cobigen-templates/kafka-documentation/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/documentation/JavaDocumentationUtil.java
diff --git a/cobigen-templates/kafka-documentation/src/main/resources/template-set.xml b/cobigen-templates/kafka-documentation/src/main/resources/template-set.xml
new file mode 100644
index 0000000000..b97ddec904
--- /dev/null
+++ b/cobigen-templates/kafka-documentation/src/main/resources/template-set.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:templateSetConfiguration version="6.0"
+                              xmlns:tns="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration"
+                              xmlns:cc="http://capgemini.com/devonfw/cobigen/ContextConfiguration"
+                              xmlns:tc="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration"
+                              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                              xsi:schemaLocation="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration templateSetConfiguration.xsd ">
+    <cc:contextConfiguration version="3.0">
+        <cc:trigger id="Swagger_Docs" type="java">
+            <cc:containerMatcher type="package" value="((.+\.)?([^\.]+))\.([^\.]+)\.service\.data" retrieveObjectsRecursively="false" />
+            <cc:matcher type="fqn" value="((.+\.)?([^\.]+))\.([^\.]+)\.service\.data\.([^\.]+)To">
+                <cc:variableAssignment type="regex" key="rootPackage" value="1" />
+                <cc:variableAssignment type="regex" key="domain" value="3" />
+                <cc:variableAssignment type="regex" key="component" value="4" />
+                <cc:variableAssignment type="regex" key="toName" value="5" />
+            </cc:matcher>
+        </cc:trigger>
+        <cc:tags>
+            <cc:tag name="Kafka"></cc:tag>
+            <cc:tag name="Documentation"></cc:tag>
+        </cc:tags>
+        <cc:links>
+            <cc:link url="https://kafka.apache.org/documentation/"></cc:link>
+        </cc:links>
+    </cc:contextConfiguration>
+    <tc:templatesConfiguration version="5.0">
+
+        <tc:templates>
+            <tc:templateExtension ref="Documentation.adoc" mergeStrategy="textmerge_append" />
+        </tc:templates>
+
+        <tc:templateScans>
+            <tc:templateScan templatePath="templates" destinationPath="" />
+        </tc:templateScans>
+
+        <tc:increments>
+            <tc:increment name="Kafka_Docs" description="Documentation" explanation="Contains information about the operations of the kafka application.">
+                <tc:templateRef ref="Documentation.adoc" />
+            </tc:increment>
+        </tc:increments>
+    </tc:templatesConfiguration>
+
+</tns:templateSetConfiguration>
\ No newline at end of file
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/kafka_documentation/templates/docs/${variables.component}To.adoc.ftl b/cobigen-templates/kafka-documentation/src/main/resources/templates/docs/${variables.component}To.adoc.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/kafka_documentation/templates/docs/${variables.component}To.adoc.ftl
rename to cobigen-templates/kafka-documentation/src/main/resources/templates/docs/${variables.component}To.adoc.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/kafka_documentation/templates/docs/Documentation.adoc.ftl b/cobigen-templates/kafka-documentation/src/main/resources/templates/docs/Documentation.adoc.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/kafka_documentation/templates/docs/Documentation.adoc.ftl
rename to cobigen-templates/kafka-documentation/src/main/resources/templates/docs/Documentation.adoc.ftl
diff --git a/cobigen-templates/named-queries/pom.xml b/cobigen-templates/named-queries/pom.xml
new file mode 100644
index 0000000000..49f83e48a7
--- /dev/null
+++ b/cobigen-templates/named-queries/pom.xml
@@ -0,0 +1,13 @@
+<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>named-queries</artifactId>
+  <name>Named Queries template</name>
+
+  <parent>
+    <groupId>com.devonfw.cobigen.templates</groupId>
+    <artifactId>templates-parent</artifactId>
+    <version>${revision}</version>
+  </parent>
+
+</project>
\ No newline at end of file
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/named_queries/NamedQueries.java.ftl b/cobigen-templates/named-queries/src/main/resources/NamedQueries.java.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/named_queries/NamedQueries.java.ftl
rename to cobigen-templates/named-queries/src/main/resources/NamedQueries.java.ftl
diff --git a/cobigen-templates/named-queries/src/main/resources/template-set.xml b/cobigen-templates/named-queries/src/main/resources/template-set.xml
new file mode 100644
index 0000000000..8b71406890
--- /dev/null
+++ b/cobigen-templates/named-queries/src/main/resources/template-set.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:templateSetConfiguration version="6.0"
+                              xmlns:tns="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration"
+                              xmlns:cc="http://capgemini.com/devonfw/cobigen/ContextConfiguration"
+                              xmlns:tc="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration"
+                              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                              xsi:schemaLocation="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration templateSetConfiguration.xsd ">
+
+    <cc:contextConfiguration version="3.0">
+
+        <cc:trigger id="constants_named_queries" type="xml" templateFolder="constants/named_queries">
+            <cc:matcher type="nodename" value="entity-mappings">
+                <cc:variableAssignment type="constant" key="rootPackage" value="com.devonfw.gastronomy.restaurant"/>
+            </cc:matcher>
+        </cc:trigger>
+        <cc:tags>
+            <cc:tag name="NamedQueries"></cc:tag>
+        </cc:tags>
+    </cc:contextConfiguration>
+    <tc:templatesConfiguration version="5.0">
+        <tc:templates>
+            <tc:template name="named_queries"
+                         destinationPath="src/main/java/${variables.rootPackage}/general/common/api/constants/NamedQueries.java"
+                         templateFile="NamedQueries.java.ftl"/>
+        </tc:templates>
+        <tc:increments>
+            <tc:increment name="named_queries" description="Named Query Constants"
+                          explanation="Generates basic query constants schema.">
+                <tc:templateRef ref="named_queries"/>
+            </tc:increment>
+        </tc:increments>
+    </tc:templatesConfiguration>
+</tns:templateSetConfiguration>
\ No newline at end of file
diff --git a/cobigen-templates/openapi-documentation/pom.xml b/cobigen-templates/openapi-documentation/pom.xml
new file mode 100644
index 0000000000..d7d8746738
--- /dev/null
+++ b/cobigen-templates/openapi-documentation/pom.xml
@@ -0,0 +1,13 @@
+<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>openapi-documentation</artifactId>
+  <name>OpenAPI Documentation template</name>
+
+  <parent>
+    <groupId>com.devonfw.cobigen.templates</groupId>
+    <artifactId>templates-parent</artifactId>
+    <version>${revision}</version>
+  </parent>
+
+</project>
\ No newline at end of file
diff --git a/cobigen-templates/templates-devon4j/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/documentation/DocumentationUtil.java b/cobigen-templates/openapi-documentation/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/documentation/DocumentationUtil.java
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/documentation/DocumentationUtil.java
rename to cobigen-templates/openapi-documentation/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/documentation/DocumentationUtil.java
diff --git a/cobigen-templates/templates-devon4j/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/documentation/OpenApiDocumentationUtil.java b/cobigen-templates/openapi-documentation/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/documentation/OpenApiDocumentationUtil.java
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/documentation/OpenApiDocumentationUtil.java
rename to cobigen-templates/openapi-documentation/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/documentation/OpenApiDocumentationUtil.java
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/openapi_documentation/functions.ftl b/cobigen-templates/openapi-documentation/src/main/resources/functions.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/openapi_documentation/functions.ftl
rename to cobigen-templates/openapi-documentation/src/main/resources/functions.ftl
diff --git a/cobigen-templates/openapi-documentation/src/main/resources/template-set.xml b/cobigen-templates/openapi-documentation/src/main/resources/template-set.xml
new file mode 100644
index 0000000000..460011a9d0
--- /dev/null
+++ b/cobigen-templates/openapi-documentation/src/main/resources/template-set.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:templateSetConfiguration version="6.0"
+                              xmlns:tns="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration"
+                              xmlns:cc="http://capgemini.com/devonfw/cobigen/ContextConfiguration"
+                              xmlns:tc="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration"
+                              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                              xsi:schemaLocation="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration templateSetConfiguration.xsd ">
+    <cc:contextConfiguration version="3.0">
+        <cc:trigger id="OpenAPI_docs" type="openapi">
+            <cc:containerMatcher type="element" value="openAPIFile"/>
+            <cc:matcher type="element" value="EntityDef">
+                <cc:variableAssignment type="constant" key="rootPackage" value="com.devonfw"/>
+                <cc:variableAssignment type="property" key="component" value="componentName"/>
+                <cc:variableAssignment type="property" key="entityName" value="name"/>
+            </cc:matcher>
+        </cc:trigger>
+        <cc:tags>
+            <cc:tag name="OpenAPI"></cc:tag>
+            <cc:tag name="Documentation"></cc:tag>
+        </cc:tags>
+        <cc:links>
+            <cc:link url="https://github.com/devonfw/cobigen/wiki/cobigen-openapiplugin"></cc:link>
+        </cc:links>
+    </cc:contextConfiguration>
+    <tc:templatesConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0">
+
+        <tc:templates>
+            <tc:templateExtension ref="Documentation.adoc" mergeStrategy="textmerge_appendWithNewLine"/>
+        </tc:templates>
+
+        <tc:templateScans>
+            <tc:templateScan templatePath="templates" destinationPath=""/>
+        </tc:templateScans>
+
+        <tc:increments>
+            <tc:increment name="OpenAPI_Docs" description="Documentation"
+                       explanation="Contains information about the operations of the OpenAPI application.">
+                <tc:templateRef ref="Documentation.adoc"/>
+            </tc:increment>
+        </tc:increments>
+    </tc:templatesConfiguration>
+</tns:templateSetConfiguration>
\ No newline at end of file
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/openapi_documentation/templates/docs/${variables.component}Doc.adoc.ftl b/cobigen-templates/openapi-documentation/src/main/resources/templates/docs/${variables.component}Doc.adoc.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/openapi_documentation/templates/docs/${variables.component}Doc.adoc.ftl
rename to cobigen-templates/openapi-documentation/src/main/resources/templates/docs/${variables.component}Doc.adoc.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/openapi_documentation/templates/docs/Documentation.adoc.ftl b/cobigen-templates/openapi-documentation/src/main/resources/templates/docs/Documentation.adoc.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/openapi_documentation/templates/docs/Documentation.adoc.ftl
rename to cobigen-templates/openapi-documentation/src/main/resources/templates/docs/Documentation.adoc.ftl
diff --git a/cobigen-templates/pom.xml b/cobigen-templates/pom.xml
index 48cf2f9652..09f7db4f18 100644
--- a/cobigen-templates/pom.xml
+++ b/cobigen-templates/pom.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-  xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
+  <groupId>com.devonfw.cobigen.templates</groupId>
   <artifactId>templates-parent</artifactId>
   <name>CobiGen - Templates Parent</name>
   <packaging>pom</packaging>
@@ -10,10 +11,36 @@
     <groupId>com.devonfw.cobigen</groupId>
     <artifactId>master-parent</artifactId>
     <version>${revision}</version>
+    <relativePath>../pom.xml</relativePath>
   </parent>
 
+  <properties>
+    <skip.deployment>false</skip.deployment>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
+  </properties>
+
   <modules>
-    <module>templates-devon4j</module>
+    <module>templates-devon4j-utils</module>
+    <module>templates-devon4j-tests</module>
+    <module>crud-angular-client-app</module>
+    <module>crud-ionic-client-app</module>
+    <module>crud-java-ea-uml</module>
+    <module>crud-java-server-app</module>
+    <module>crud-java-server-app-complex</module>
+    <module>crud-ngrx-client-app</module>
+    <module>crud-openapi-angular-client-app</module>
+    <module>crud-openapi-angular-service-based-app</module>
+    <module>crud-openapi-ionic-client-app</module>
+    <module>crud-openapi-java-server-app</module>
+    <module>crud-openapi-net</module>
+    <module>crud-typescript-angular-client-app</module>
+    <module>kafka-documentation</module>
+    <module>named-queries</module>
+    <module>openapi-documentation</module>
+    <module>rest-documentation</module>
+    <module>security-permissions</module>
+    <module>testdata-builder</module>
   </modules>
 
   <dependencies>
@@ -26,16 +53,22 @@
   </dependencies>
 
   <build>
-    <resources>
-      <resource>
-        <directory>src/main/templates</directory>
-        <targetPath>src/main/templates</targetPath>
-      </resource>
-      <resource>
-        <directory>src/main/resources</directory>
-      </resource>
-    </resources>
     <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-source-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>attach-sources</id>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <skipSource>${skip.deployment}</skipSource>
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-resources-plugin</artifactId>
@@ -67,6 +100,13 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-antrun-plugin</artifactId>
+        <dependencies>
+          <dependency>
+            <groupId>ant-contrib</groupId>
+            <artifactId>ant-contrib</artifactId>
+            <version>20020829</version>
+          </dependency>
+        </dependencies>
         <executions>
           <execution>
             <phase>prepare-package</phase>
@@ -76,7 +116,29 @@
             <configuration>
               <tasks>
                 <echo>Integrate flattened POM manually</echo>
-                <copy file=".flattened-pom.xml" tofile="${project.build.outputDirectory}/pom.xml"/>
+                <!-- Patching the flattened-pom file -->
+                <!-- Removing the last </project> line -->
+                <taskdef resource="net/sf/antcontrib/antcontrib.properties" classpathref="maven.plugin.classpath" />
+                <if>
+                  <available file="../pom_patch.xml" />
+                  <then>
+                    <echo message="The value of property foo is bar" />
+                    <replace file=".flattened-pom.xml" value="" token="&lt;/project>"></replace>
+                    <!-- Updating the patch file -->
+                    <replace file="../pom_patch.xml" value="${maven.compiler.source}" token="{maven.compiler.source}"></replace>
+                    <replace file="../pom_patch.xml" value="${maven.compiler.target}" token="{maven.compiler.target}"></replace>
+                    <!-- Adding content -->
+                    <concat destfile=".flattened-pom.xml" append="true">
+                      <filelist dir="." files="../pom_patch.xml" />
+                    </concat>
+                    <!-- Restoring the patch file -->
+                    <replace file="../pom_patch.xml" value="{maven.compiler.source}" token="${maven.compiler.source}"></replace>
+                    <replace file="../pom_patch.xml" value="{maven.compiler.target}" token="${maven.compiler.target}"></replace>
+                    <!-- Restoring the last </project> line -->
+                    <concat destfile=".flattened-pom.xml" append="true">&lt;/project></concat>
+                  </then>
+                </if>
+                <copy file=".flattened-pom.xml" tofile="${project.build.outputDirectory}/pom.xml" />
               </tasks>
             </configuration>
           </execution>
@@ -84,4 +146,44 @@
       </plugin>
     </plugins>
   </build>
-</project>
+
+  <!--profile to attach template-set.xml which resides in other sub-modules and excludes this build in parent project -->
+  <profiles>
+    <profile>
+      <id>attach-artifacts</id>
+      <activation>
+        <file>
+          <exists>src/main/resources/template-set.xml</exists>
+        </file>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>build-helper-maven-plugin</artifactId>
+            <version>3.3.0</version>
+            <executions>
+              <execution>
+                <id>attach-artifacts</id>
+                <phase>package</phase>
+                <goals>
+                  <goal>attach-artifact</goal>
+                </goals>
+                <configuration>
+                  <artifacts>
+                    <artifact>
+                      <file>src\main\resources\template-set.xml</file>
+                      <type>xml</type>
+                      <classifier>template-set</classifier>
+                    </artifact>
+                  </artifacts>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+
+</project>
\ No newline at end of file
diff --git a/cobigen-templates/pom_patch.xml b/cobigen-templates/pom_patch.xml
new file mode 100644
index 0000000000..1dc364a9cb
--- /dev/null
+++ b/cobigen-templates/pom_patch.xml
@@ -0,0 +1,4 @@
+  <properties>
+   <maven.compiler.source>{maven.compiler.source}</maven.compiler.source>
+   <maven.compiler.target>{maven.compiler.source}</maven.compiler.target>
+  </properties>
diff --git a/cobigen-templates/rest-documentation/pom.xml b/cobigen-templates/rest-documentation/pom.xml
new file mode 100644
index 0000000000..6d2c790050
--- /dev/null
+++ b/cobigen-templates/rest-documentation/pom.xml
@@ -0,0 +1,24 @@
+<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>rest-documentation</artifactId>
+  <name>REST Documentation template</name>
+
+  <parent>
+    <groupId>com.devonfw.cobigen.templates</groupId>
+    <artifactId>templates-parent</artifactId>
+    <version>${revision}</version>
+  </parent>
+
+  <dependencies>
+    <dependency>
+      <groupId>javax.ws.rs</groupId>
+      <artifactId>javax.ws.rs-api</artifactId>
+      <version>2.0</version>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+    </dependency>
+  </dependencies>
+</project>
\ No newline at end of file
diff --git a/cobigen-templates/rest-documentation/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/documentation/JavaDocumentationUtil.java b/cobigen-templates/rest-documentation/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/documentation/JavaDocumentationUtil.java
new file mode 100644
index 0000000000..8832368645
--- /dev/null
+++ b/cobigen-templates/rest-documentation/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/documentation/JavaDocumentationUtil.java
@@ -0,0 +1,346 @@
+package com.devonfw.cobigen.templates.devon4j.utils.documentation;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Parameter;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
+import com.fasterxml.jackson.annotation.PropertyAccessor;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
+/**
+ *
+ */
+public class JavaDocumentationUtil {
+
+  /** Full qualified name of spring RequestMapping annotation */
+  private final String requestMapping = "org_springframework_web_bind_annotation_RequestMapping";
+
+  /** Full qualified name of javax Path annotation */
+  private final String javaxPath = "javax_ws_rs_Path";
+
+  /**
+   * Creates a list of parameters of a specific method as an asciidoc string, including its name, type, description,
+   * constraints
+   *
+   * @param pojoClass {@link Class}&lt;?&gt; the class object of the pojo
+   * @param methodName {@link String} the name of the method to get the parameter info of
+   * @param javaDoc the javadoc of the method, taken from the javaplugin model
+   * @return A list of the parameters info in asciidoc code
+   * @throws Exception When errors occur in invoking an annotations method
+   */
+  public String getParams(Class<?> pojoClass, String methodName, Map<String, Object> javaDoc) throws Exception {
+
+    String result = "";
+    Method m = findMethod(pojoClass, methodName);
+    if (m.getParameterCount() < 1) {
+      return "!-!-!-!-";
+    }
+    if (m.getParameterCount() == 1) {
+      if (!m.getParameters()[0].getType().isPrimitive()) {
+        return "!-!-!-!-";
+      }
+    }
+    for (Parameter param : m.getParameters()) {
+      // Add the name of the parameter as path or query parameter
+      boolean isPath = param.isAnnotationPresent(javax.ws.rs.PathParam.class);
+      boolean isQuery = param.isAnnotationPresent(javax.ws.rs.QueryParam.class);
+      if (isPath || isQuery) {
+        result += "!";
+        if (isPath) {
+          result += "{" + param.getAnnotation(javax.ws.rs.PathParam.class).value() + "}" + System.lineSeparator();
+        } else if (isQuery) {
+          result += "?" + param.getAnnotation(javax.ws.rs.QueryParam.class).value() + System.lineSeparator();
+        }
+
+        // Add the type
+        String type = param.getType().getSimpleName();
+        result += "!" + type + System.lineSeparator();
+
+        // Add the constraints
+        result += "!";
+        int counter = 0;
+        for (Annotation anno : param.getAnnotations()) {
+          String annoName = anno.annotationType().getName();
+          Pattern p = Pattern.compile("javax\\.validation\\.constraints\\.([^\\.]*)");
+          Matcher match = p.matcher(annoName);
+          if (match.find()) {
+            counter++;
+            String shortName = annoName.substring(annoName.lastIndexOf('.') + 1);
+            Object value;
+            Method method;
+            try {
+              method = anno.getClass().getMethod("value");
+              value = method.invoke(anno);
+              result += shortName + " = " + value + " +" + System.lineSeparator();
+            } catch (NoSuchMethodException e) {
+              result += shortName + " +" + System.lineSeparator();
+            } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException
+                | SecurityException e) {
+              throw new Exception(e.getMessage());
+            }
+          }
+        }
+        if (counter == 0) {
+          result += "-" + System.lineSeparator();
+        }
+
+        // Add Javadoc
+        Map<String, String> params = (Map<String, String>) javaDoc.get("params");
+        result += "!" + getJavaDocWithoutLink(params.get(param.getName())) + " +" + System.lineSeparator();
+      }
+    }
+    return result;
+  }
+
+  /**
+   * returns the javadoc of an element, stripped of any links to other sources
+   *
+   * @param doc the javadoc to be changed
+   * @return the input string stripped of all links
+   */
+  public String getJavaDocWithoutLink(String doc) {
+
+    Pattern p = Pattern.compile("(\\{@link ([^\\}]*)\\})");
+    Matcher m = p.matcher(doc);
+    while (m.find()) {
+      doc = doc.replace(m.group(1), m.group(2));
+    }
+    return doc;
+  }
+
+  /**
+   * Create a response in JSON format, iterating through non-primitive types to get their data as well
+   *
+   * @param pojoClass The input class
+   * @param methodName The name of the operation to get the response of
+   * @return A JSON representation of the response object
+   * @throws Exception When Jackson fails
+   */
+  public String getJSONResponseBody(Class<?> pojoClass, String methodName) throws Exception {
+
+    Class<?> responseType = findMethod(pojoClass, methodName).getReturnType();
+    if (hasBody(pojoClass, methodName, true)) {
+      return getJSON(responseType);
+    }
+    return "-";
+  }
+
+  /**
+   * Create a request in JSON format, iterating through non-primitive types to get their data as well
+   *
+   * @param pojoClass The input class
+   * @param methodName The name of the operation to get the request of
+   * @return A JSON representation of the request object
+   * @throws Exception When Jackson fails
+   */
+  public String getJSONRequestBody(Class<?> pojoClass, String methodName) throws Exception {
+
+    Method m = findMethod(pojoClass, methodName);
+    if (hasBody(pojoClass, methodName, false)) {
+      Parameter param = m.getParameters()[0];
+      Class<?> requestType = param.getType();
+      return getJSON(requestType);
+    }
+    return "-";
+  }
+
+  /**
+   * Using Jackson, creates a JSON string for Asciidoc
+   *
+   * @param clazz The class to create the JSON string of
+   * @return A JSON representation of the given class
+   * @throws Exception When Jackson fails
+   */
+  public String getJSON(Class<?> clazz) throws Exception {
+
+    ObjectMapper mapper = new ObjectMapper();
+    mapper.setVisibility(PropertyAccessor.FIELD, Visibility.ANY);
+    mapper.enable(SerializationFeature.INDENT_OUTPUT);
+    try {
+      Object obj = clazz.newInstance();
+      return "...." + System.lineSeparator() + mapper.writeValueAsString(obj) + System.lineSeparator() + "....";
+    } catch (InstantiationException | IllegalAccessException | JsonProcessingException e) {
+      throw new Exception(e.getMessage());
+    }
+  }
+
+  /**
+   * Checks if a request/response has a body
+   *
+   * @param pojoClass {@link Class}&lt;?&gt; the class object of the pojo
+   * @param methodName The name of the operation to be checked
+   * @param isResponse true if the response of the operation should be checked, false if the request should be checked
+   * @return true if the response/request has a body, false if not
+   * @throws SecurityException If no method of the given name can be found
+   */
+  public boolean hasBody(Class<?> pojoClass, String methodName, boolean isResponse) throws SecurityException {
+
+    Method m = findMethod(pojoClass, methodName);
+    if (isResponse) {
+      Class<?> returnType = m.getReturnType();
+      if (!returnType.isPrimitive() && !returnType.equals(Void.TYPE)) {
+        return true;
+      }
+    } else {
+      int nr = 0;
+      int position = 0;
+      for (Parameter param : m.getParameters()) {
+        if (!param.isAnnotationPresent(javax.ws.rs.PathParam.class)
+            && !param.isAnnotationPresent(javax.ws.rs.QueryParam.class)) {
+          nr++;
+          position = Integer.parseInt(param.getName().replace("arg", ""));
+        }
+      }
+      if (nr == 1) {
+        Parameter param = m.getParameters()[position];
+        Class<?> requestType = param.getType();
+        if (!requestType.isPrimitive() && !requestType.equals(Void.TYPE)
+            && !param.isAnnotationPresent(javax.ws.rs.PathParam.class)
+            && !param.isAnnotationPresent(javax.ws.rs.QueryParam.class)) {
+          return true;
+        }
+      }
+    }
+    return false;
+  }
+
+  /**
+   * returns the HTTP request type corresponding to an annotation type
+   *
+   * @param annotations The annotation to get the type name of
+   * @return the HTTP request type name of the selected annotation
+   */
+  public String getRequestType(Map<String, Object> annotations) {
+
+    String type = "";
+    if (annotations.containsKey(this.requestMapping)) {
+      Map<String, Object> method = (Map<String, Object>) annotations.get(this.requestMapping);
+      String rm = (String) method.get("method");
+      type = rm.toLowerCase();
+    }
+    if (annotations.containsKey("javax_ws_rs_GET") || type.equals("requestmethod.get")) {
+      return "GET";
+    } else if (annotations.containsKey("javax_ws_rs_PUT") || type.equals("requestmethod.put")) {
+      return "PUT";
+    } else if (annotations.containsKey("javax_ws_rs_POST") || type.equals("requestmethod.post")) {
+      return "POST";
+    } else if (annotations.containsKey("javax_ws_rs_DELETE") || type.equals("requestmethod.delete")) {
+      return "DELETE";
+    } else if (annotations.containsKey("javax_ws_rs_PATCH") || type.equals("requestmethod.patch")) {
+      return "PATCH";
+    } else {
+      return "-";
+    }
+  }
+
+  /**
+   * Gets the path of an operation
+   *
+   * @param pojoAnnotations the annotation map of the given pojo
+   * @param method The method to get the operation path of
+   * @return The path of an operation
+   * @throws IOException If no application_properties file is found
+   */
+  public String getOperationPath(Map<String, Object> pojoAnnotations, Map<String, Object> method) throws IOException {
+
+    String path = getPath(pojoAnnotations);
+    Map<String, Object> pathAnno = new HashMap<>();
+    if (pojoAnnotations.containsKey(this.javaxPath)) {
+      pathAnno = (Map<String, Object>) pojoAnnotations.get(this.javaxPath);
+    } else if (pojoAnnotations.containsKey(this.requestMapping)) {
+      pathAnno = (Map<String, Object>) pojoAnnotations.get(this.requestMapping);
+    }
+    if (pathAnno.containsKey("value")) {
+      String toAdd = (String) pathAnno.get("value");
+      if (toAdd.startsWith("/") && path.endsWith("/")) {
+        path += toAdd.substring(1);
+      }
+    }
+    return path;
+  }
+
+  /**
+   * Gets the path of a component
+   *
+   * @param pojoAnnotations the annotation map of the given pojo
+   * @return The communal path of a component
+   * @throws IOException If no application_properties file is found
+   */
+  public String getPath(Map<String, Object> pojoAnnotations) throws IOException {
+
+    String path = extractRootPath();
+    Map<String, Object> pathAnno = new HashMap<>();
+    if (pojoAnnotations.containsKey(this.javaxPath)) {
+      pathAnno = (Map<String, Object>) pojoAnnotations.get(this.javaxPath);
+    } else if (pojoAnnotations.containsKey(this.requestMapping)) {
+      pathAnno = (Map<String, Object>) pojoAnnotations.get(this.requestMapping);
+    }
+    if (pathAnno.containsKey("value")) {
+      String toAdd = (String) pathAnno.get("value");
+      if (toAdd.startsWith("/") && path.endsWith(":")) {
+        path += toAdd.substring(1);
+      }
+    }
+    return path;
+  }
+
+  /**
+   * Checks the class path for an application.properties file and extracts the port and path from it
+   *
+   * @return The root path of the application
+   * @throws IOException If no application.properties file could be found
+   */
+  private String extractRootPath() throws IOException {
+
+    Class<?> clazz = this.getClass();
+    String t = "";
+    StringBuilder sb = new StringBuilder("http://localhost:");
+    try (InputStream in = clazz.getClassLoader().getResourceAsStream("application.properties")) {
+      if (in != null) {
+        try (InputStreamReader reader = new InputStreamReader(in); BufferedReader br = new BufferedReader(reader)) {
+          while ((t = br.readLine()) != null) {
+            if (t.matches("server\\.port=(\\d{0,5})") || t.matches("server\\.context-path=([^\\s]*)")) {
+              sb.append(t.substring(t.indexOf('=') + 1));
+            }
+          }
+          return sb.toString();
+        }
+      } else {
+        return "";
+      }
+    }
+  }
+
+  /**
+   * Helper method to find a class's specific method
+   *
+   * @param pojoClass {@link Class}&lt;?&gt; the class object of the pojo
+   * @param methodName The name of the method to be found
+   * @return The method object of the method to be found, null if it wasn't found
+   */
+  private Method findMethod(Class<?> pojoClass, String methodName) {
+
+    if (pojoClass == null) {
+      throw new IllegalAccessError(
+          "Class object is null. Cannot generate template as it might obviously depend on reflection.");
+    }
+    for (Method m : pojoClass.getMethods()) {
+      if (m.getName().equals(methodName)) {
+        return m;
+      }
+    }
+    return null;
+  }
+}
diff --git a/cobigen-templates/rest-documentation/src/main/resources/template-set.xml b/cobigen-templates/rest-documentation/src/main/resources/template-set.xml
new file mode 100644
index 0000000000..650bd46afc
--- /dev/null
+++ b/cobigen-templates/rest-documentation/src/main/resources/template-set.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:templateSetConfiguration version="6.0"
+                              xmlns:tns="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration"
+                              xmlns:cc="http://capgemini.com/devonfw/cobigen/ContextConfiguration"
+                              xmlns:tc="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration"
+                              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                              xsi:schemaLocation="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration templateSetConfiguration.xsd ">
+    <cc:contextConfiguration version="3.0">
+        <cc:trigger id="REST_Docs" type="java">
+            <cc:containerMatcher type="package" value="((.+\.)?([^\.]+))\.([^\.]+)\.service\.api\.rest"
+                                 retrieveObjectsRecursively="false"/>
+            <cc:matcher type="fqn" value="((.+\.)?([^\.]+))\.([^\.]+)\.service\.api\.rest\.([^\.]+)RestService">
+                <cc:variableAssignment type="regex" key="rootPackage" value="1"/>
+                <cc:variableAssignment type="regex" key="domain" value="3"/>
+                <cc:variableAssignment type="regex" key="component" value="4"/>
+            </cc:matcher>
+        </cc:trigger>
+        <cc:tags>
+            <cc:tag name="REST"></cc:tag>
+            <cc:tag name="Documentation"></cc:tag>
+        </cc:tags>
+    </cc:contextConfiguration>
+    <tc:templatesConfiguration version="5.0">
+
+        <tc:templates>
+            <tc:templateExtension ref="Documentation.adoc" mergeStrategy="textmerge_append"/>
+        </tc:templates>
+
+        <tc:templateScans>
+            <tc:templateScan templatePath="templates" destinationPath=""/>
+        </tc:templateScans>
+
+        <tc:increments>
+            <tc:increment name="Rest_Docs" description="Documentation"
+                          explanation="Contains information about the operations of the REST application.">
+                <tc:templateRef ref="Documentation.adoc"/>
+            </tc:increment>
+        </tc:increments>
+    </tc:templatesConfiguration>
+</tns:templateSetConfiguration>
\ No newline at end of file
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/rest_documentation/templates/docs/${variables.component}RESTInterfaces.adoc.ftl b/cobigen-templates/rest-documentation/src/main/resources/templates/docs/${variables.component}RESTInterfaces.adoc.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/rest_documentation/templates/docs/${variables.component}RESTInterfaces.adoc.ftl
rename to cobigen-templates/rest-documentation/src/main/resources/templates/docs/${variables.component}RESTInterfaces.adoc.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/rest_documentation/templates/docs/Documentation.adoc.ftl b/cobigen-templates/rest-documentation/src/main/resources/templates/docs/Documentation.adoc.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/rest_documentation/templates/docs/Documentation.adoc.ftl
rename to cobigen-templates/rest-documentation/src/main/resources/templates/docs/Documentation.adoc.ftl
diff --git a/cobigen-templates/security-permissions/pom.xml b/cobigen-templates/security-permissions/pom.xml
new file mode 100644
index 0000000000..f9e305af34
--- /dev/null
+++ b/cobigen-templates/security-permissions/pom.xml
@@ -0,0 +1,13 @@
+<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>security-permissions</artifactId>
+  <name>Security permissions template</name>
+
+  <parent>
+    <groupId>com.devonfw.cobigen.templates</groupId>
+    <artifactId>templates-parent</artifactId>
+    <version>${revision}</version>
+  </parent>
+
+</project>
\ No newline at end of file
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/security_permissions/PermissionConstants.java.ftl b/cobigen-templates/security-permissions/src/main/resources/PermissionConstants.java.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/security_permissions/PermissionConstants.java.ftl
rename to cobigen-templates/security-permissions/src/main/resources/PermissionConstants.java.ftl
diff --git a/cobigen-templates/security-permissions/src/main/resources/template-set.xml b/cobigen-templates/security-permissions/src/main/resources/template-set.xml
new file mode 100644
index 0000000000..ca925563ef
--- /dev/null
+++ b/cobigen-templates/security-permissions/src/main/resources/template-set.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:templateSetConfiguration version="6.0"
+  xmlns:tns="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration"
+  xmlns:cc="http://capgemini.com/devonfw/cobigen/ContextConfiguration"
+  xmlns:tc="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration templateSetConfiguration.xsd ">
+  <cc:contextConfiguration version="3.0">
+    <cc:trigger id="constants_security_permissions" type="xml">
+      <cc:matcher type="nodename" value="access-control-schema">
+        <cc:variableAssignment type="constant" key="rootPackage"
+          value="com.devonfw.gastronomy.restaurant"/>
+      </cc:matcher>
+    </cc:trigger>
+    <cc:tags>
+      <cc:tag name="Security"></cc:tag>
+      <cc:tag name="Permissions"></cc:tag>
+    </cc:tags>
+  </cc:contextConfiguration>
+  <tc:templatesConfiguration version="5.0">
+    <tc:templates>
+      <tc:template name="permission_constants"
+        destinationPath="src/main/java/${variables.rootPackage}/general/common/api/constants/PermissionConstants.java"
+        templateFile="PermissionConstants.java.ftl" mergeStrategy="override"/>
+    </tc:templates>
+    <tc:increments>
+      <tc:increment name="permission_constants" description="Permission Constants"
+        explanation="Creates the PermissionConstants that can be used to secure REST API methods.">
+        <tc:templateRef ref="permission_constants"/>
+      </tc:increment>
+    </tc:increments>
+  </tc:templatesConfiguration>
+
+</tns:templateSetConfiguration>
\ No newline at end of file
diff --git a/cobigen-templates/templates-devon4j/logback.xml b/cobigen-templates/templates-devon4j-tests/logback.xml
similarity index 100%
rename from cobigen-templates/templates-devon4j/logback.xml
rename to cobigen-templates/templates-devon4j-tests/logback.xml
diff --git a/cobigen-templates/templates-devon4j-tests/pom.xml b/cobigen-templates/templates-devon4j-tests/pom.xml
new file mode 100644
index 0000000000..1eec2470e9
--- /dev/null
+++ b/cobigen-templates/templates-devon4j-tests/pom.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+  xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>templates-devon4j-tests</artifactId>
+  <name>CobiGen - devon4j Templates Tests</name>
+
+  <parent>
+    <groupId>com.devonfw.cobigen.templates</groupId>
+    <artifactId>templates-parent</artifactId>
+    <version>${revision}</version>
+  </parent>
+
+  <properties>
+    <skip.deployment>false</skip.deployment>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>javax.ws.rs</groupId>
+      <artifactId>javax.ws.rs-api</artifactId>
+      <version>2.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.data</groupId>
+      <artifactId>spring-data-rest-webmvc</artifactId>
+      <version>3.7.10</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>xerces</groupId>
+      <artifactId>xercesImpl</artifactId>
+      <version>2.12.2</version>
+    </dependency>
+    <dependency>
+      <groupId>javax.persistence</groupId>
+      <artifactId>javax.persistence-api</artifactId>
+      <version>2.2</version>
+    </dependency>
+    <dependency>
+      <groupId>org.assertj</groupId>
+      <artifactId>assertj-core</artifactId>
+      <version>3.10.0</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+</project>
diff --git a/cobigen-templates/templates-devon4j-tests/src/main/java-templates/com/devonfw/cobigen/templates/devon4j/config/constant/MavenMetadata.java b/cobigen-templates/templates-devon4j-tests/src/main/java-templates/com/devonfw/cobigen/templates/devon4j/config/constant/MavenMetadata.java
new file mode 100644
index 0000000000..395d46154d
--- /dev/null
+++ b/cobigen-templates/templates-devon4j-tests/src/main/java-templates/com/devonfw/cobigen/templates/devon4j/config/constant/MavenMetadata.java
@@ -0,0 +1,12 @@
+package com.devonfw.cobigen.templates.devon4j.config.constant;
+
+/**
+ * Constants extracted from the maven pom by templating-maven-plugin.
+ * 
+ * @see "edit template in src/main/java-templates"
+ */
+public class MavenMetadata {
+
+    /** Local repository path */
+    public static final String LOCAL_REPO = "${settings.localRepository}";
+}
diff --git a/cobigen-templates/templates-devon4j/src/main/resources/META-INF/LICENSE.txt b/cobigen-templates/templates-devon4j-tests/src/main/resources/META-INF/LICENSE.txt
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/resources/META-INF/LICENSE.txt
rename to cobigen-templates/templates-devon4j-tests/src/main/resources/META-INF/LICENSE.txt
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/named_queries/context.xml b/cobigen-templates/templates-devon4j-tests/src/main/templates/named_queries/context.xml
similarity index 54%
rename from cobigen-templates/templates-devon4j/src/main/templates/named_queries/context.xml
rename to cobigen-templates/templates-devon4j-tests/src/main/templates/named_queries/context.xml
index a3365447d6..e0aa1ee404 100644
--- a/cobigen-templates/templates-devon4j/src/main/templates/named_queries/context.xml
+++ b/cobigen-templates/templates-devon4j-tests/src/main/templates/named_queries/context.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="2.2">
+<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="2.3">
   <trigger id="constants_named_queries" type="xml">
     <matcher type="nodename" value="entity-mappings">
-      <variableAssignment type="constant" key="rootPackage" value="com.devonfw.gastronomy.restaurant"/>
+      <variableAssignment type="constant" key="rootPackage" value="com.devonfw.gastronomy.restaurant" />
     </matcher>
   </trigger>
-</contextConfiguration>
+  <links>
+    <link url="https://github.com/devonfw/devon4j/blob/master/documentation/guide-dao.asciidoc#static-queries-for-dao-implementation"></link>
+  </links>
+</contextConfiguration>
\ No newline at end of file
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/security_permissions/context.xml b/cobigen-templates/templates-devon4j-tests/src/main/templates/security_permissions/context.xml
similarity index 59%
rename from cobigen-templates/templates-devon4j/src/main/templates/security_permissions/context.xml
rename to cobigen-templates/templates-devon4j-tests/src/main/templates/security_permissions/context.xml
index def83023b0..930ad79991 100644
--- a/cobigen-templates/templates-devon4j/src/main/templates/security_permissions/context.xml
+++ b/cobigen-templates/templates-devon4j-tests/src/main/templates/security_permissions/context.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="2.2">
+<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="2.3">
   <trigger id="constants_security_permissions" type="xml">
     <matcher type="nodename" value="access-control-schema">
-      <variableAssignment type="constant" key="rootPackage" value="com.devonfw.gastronomy.restaurant"/>
+      <variableAssignment type="constant" key="rootPackage" value="com.devonfw.gastronomy.restaurant" />
     </matcher>
   </trigger>
-</contextConfiguration>
+  <links>
+    <link url="https://github.com/devonfw/devon4j/wiki/tutorial-security#securing-methods"></link>
+  </links>
+</contextConfiguration>
\ No newline at end of file
diff --git a/cobigen-templates/templates-devon4j-tests/src/test/java/com/devonfw/cobigen/templates/devon4j/test/templates/TemplatesGenerationTest.java b/cobigen-templates/templates-devon4j-tests/src/test/java/com/devonfw/cobigen/templates/devon4j/test/templates/TemplatesGenerationTest.java
new file mode 100644
index 0000000000..cc868fd0ce
--- /dev/null
+++ b/cobigen-templates/templates-devon4j-tests/src/test/java/com/devonfw/cobigen/templates/devon4j/test/templates/TemplatesGenerationTest.java
@@ -0,0 +1,181 @@
+package com.devonfw.cobigen.templates.devon4j.test.templates;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Stream;
+
+import org.apache.commons.io.FileUtils;
+import org.junit.BeforeClass;
+import org.junit.ClassRule;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+
+import com.devonfw.cobigen.api.constants.ConfigurationConstants;
+import com.devonfw.cobigen.maven.test.AbstractMavenTest;
+import com.devonfw.cobigen.templates.devon4j.config.constant.MavenMetadata;
+
+/**
+ * Smoke tests of all templates.
+ */
+@Ignore
+public class TemplatesGenerationTest extends AbstractMavenTest {
+
+  /** Root of all test resources of this test suite */
+  public static final String TEST_RESOURCES_ROOT = "src/test/resources/testdata/templatetest/";
+
+  /** Temporary files rule to create temporary folders */
+  @ClassRule
+  public static TemporaryFolder tempFolder = new TemporaryFolder();
+
+  /** The templates development folder */
+  protected static Path templatesProject;
+
+  /** The templates development folder */
+  protected static Path templatesProjectTemporary;
+
+  /**
+   * Creates a copy of the templates project in the temp directory
+   *
+   * @throws URISyntaxException if the path could not be created properly
+   * @throws IOException if accessing a directory or file fails
+   */
+  @BeforeClass
+  public static void setupDevTemplates() throws URISyntaxException, IOException {
+
+    templatesProject = new File(
+        TemplatesGenerationTest.class.getProtectionDomain().getCodeSource().getLocation().toURI()).getParentFile()
+            .getParentFile().getParentFile().toPath();
+
+    Path utilsPom = new File(TemplatesGenerationTest.class.getProtectionDomain().getCodeSource().getLocation().toURI())
+        .getParentFile().getParentFile().toPath().resolve("src/test/resources/utils/pom.xml");
+
+    // create a temporary directory cobigen-templates/template-sets/adapted containing the template sets
+    Path tempFolderPath = tempFolder.getRoot().toPath();
+    Path cobigenTemplatePath = tempFolderPath.resolve("cobigen-templates");
+    if (!Files.exists(cobigenTemplatePath)) {
+      Files.createDirectory(cobigenTemplatePath);
+
+      templatesProjectTemporary = cobigenTemplatePath.resolve(ConfigurationConstants.TEMPLATE_SETS_FOLDER);
+      Path templateSetsAdaptedFolder = templatesProjectTemporary.resolve(ConfigurationConstants.ADAPTED_FOLDER);
+      Files.createDirectory(templatesProjectTemporary);
+      Files.createDirectory(templateSetsAdaptedFolder);
+
+      FileUtils.copyDirectory(templatesProject.toFile(), templateSetsAdaptedFolder.toFile());
+
+      List<Path> devTemplateSets = new ArrayList<>();
+      try (Stream<Path> files = Files.list(templateSetsAdaptedFolder)) {
+        files.forEach(path -> {
+          devTemplateSets.add(path);
+        });
+      }
+
+      for (Path path : devTemplateSets) {
+        if (Files.isDirectory(path)) {
+          Path resourcesFolder = path.resolve("src/main/resources");
+          Path templatesFolder = path.resolve(ConfigurationConstants.TEMPLATE_RESOURCE_FOLDER);
+          if (Files.exists(resourcesFolder) && !Files.exists(templatesFolder)) {
+            try {
+              Files.move(resourcesFolder, templatesFolder);
+            } catch (IOException e) {
+              throw new IOException("Error moving directory " + resourcesFolder, e);
+            }
+          }
+
+          // Replace the pom.xml in the template sets. Needed so that the project in the temp directory is build
+          // properly
+          if (Files.exists(path.resolve("pom.xml"))) {
+            try {
+              Files.delete(path.resolve("pom.xml"));
+            } catch (IOException e) {
+              throw new IOException("Error deleting file " + path.resolve("pom.xml"), e);
+            }
+            try {
+              Files.copy(utilsPom, path.resolve("pom.xml"));
+            } catch (IOException e) {
+              throw new IOException("Error copying file " + utilsPom, e);
+            }
+          }
+        }
+      }
+    }
+  }
+
+  /**
+   * Test successful generation of all templates based on an entity
+   *
+   * @throws Exception test fails
+   */
+  @Test
+  public void testAllTemplatesGeneration_EntityInput() throws Exception {
+
+    File testProject = new File(TEST_RESOURCES_ROOT + "TestAllTemplatesEntityInput/");
+    runMavenInvoker(testProject, templatesProjectTemporary.toFile(), MavenMetadata.LOCAL_REPO);
+  }
+
+  /**
+   * Test successful generation of all templates based on an ETO
+   *
+   * @throws Exception test fails
+   */
+  @Test
+  public void testAllTemplatesGeneration_EtoInput() throws Exception {
+
+    File testProject = new File(TEST_RESOURCES_ROOT + "TestAllTemplatesEtoInput/");
+    runMavenInvoker(testProject, templatesProjectTemporary.toFile(), MavenMetadata.LOCAL_REPO);
+  }
+
+  /**
+   * Test successful generation of all templates based on an ETO
+   *
+   * @throws Exception test fails
+   */
+  @Test
+  public void testAllTemplatesGeneration_OpenApiInput() throws Exception {
+
+    File testProject = new File(TEST_RESOURCES_ROOT + "TestAllTemplatesOpenApiInput/");
+    runMavenInvoker(testProject, templatesProjectTemporary.toFile(), MavenMetadata.LOCAL_REPO);
+  }
+
+  /**
+   * Test successful generation of all templates based on a RestService
+   *
+   * @throws Exception test fails
+   */
+  @Test
+  public void testAllTemplatesGeneration_RestServiceInput() throws Exception {
+
+    File testProject = new File(TEST_RESOURCES_ROOT + "TestAllTemplatesRestServiceInput/");
+    runMavenInvoker(testProject, templatesProjectTemporary.toFile(), MavenMetadata.LOCAL_REPO);
+  }
+
+  /**
+   * Test successful generation of all templates based on a TO
+   *
+   * @throws Exception test fails
+   */
+  @Test
+  public void testAllTemplatesGeneration_ToInput() throws Exception {
+
+    File testProject = new File(TEST_RESOURCES_ROOT + "TestAllTemplatesToInput/");
+    runMavenInvoker(testProject, templatesProjectTemporary.toFile(), MavenMetadata.LOCAL_REPO);
+  }
+
+  /**
+   * Test successful generation of all templates based on a
+   *
+   * @throws Exception test fails
+   */
+  @Test
+  public void testAllTemplatesGeneration_XML() throws Exception {
+
+    File testProject = new File(TEST_RESOURCES_ROOT + "TestAllTemplatesXMLInput/");
+    runMavenInvoker(testProject, templatesProjectTemporary.toFile(), MavenMetadata.LOCAL_REPO);
+  }
+
+}
diff --git a/cobigen-templates/templates-devon4j-tests/src/test/resources/application.properties b/cobigen-templates/templates-devon4j-tests/src/test/resources/application.properties
new file mode 100644
index 0000000000..cf2c614efb
--- /dev/null
+++ b/cobigen-templates/templates-devon4j-tests/src/test/resources/application.properties
@@ -0,0 +1,2 @@
+server.port=8080
+server.context-path=/
\ No newline at end of file
diff --git a/cobigen-templates/templates-devon4j-tests/src/test/resources/logback.xml b/cobigen-templates/templates-devon4j-tests/src/test/resources/logback.xml
new file mode 100644
index 0000000000..5f29165f75
--- /dev/null
+++ b/cobigen-templates/templates-devon4j-tests/src/test/resources/logback.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- This file is for logback classic. The file contains the configuration for slf4j logging -->
+<configuration>
+	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+			<Pattern>%d{HH:mm:ss.SSS} [%thread] [C:%X{correlationId}] - %-5level - %logger{36} - %msg%n
+			</Pattern>
+		</encoder>
+	</appender>
+
+	<root level="INFO">
+		<appender-ref ref="STDOUT" />
+	</root>
+</configuration>
diff --git a/cobigen-templates/templates-devon4j-tests/src/test/resources/testdata/templatetest/TestAllTemplatesEntityInput/logback.xml b/cobigen-templates/templates-devon4j-tests/src/test/resources/testdata/templatetest/TestAllTemplatesEntityInput/logback.xml
new file mode 100644
index 0000000000..5f29165f75
--- /dev/null
+++ b/cobigen-templates/templates-devon4j-tests/src/test/resources/testdata/templatetest/TestAllTemplatesEntityInput/logback.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- This file is for logback classic. The file contains the configuration for slf4j logging -->
+<configuration>
+	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+			<Pattern>%d{HH:mm:ss.SSS} [%thread] [C:%X{correlationId}] - %-5level - %logger{36} - %msg%n
+			</Pattern>
+		</encoder>
+	</appender>
+
+	<root level="INFO">
+		<appender-ref ref="STDOUT" />
+	</root>
+</configuration>
diff --git a/cobigen-templates/templates-devon4j-tests/src/test/resources/testdata/templatetest/TestAllTemplatesEntityInput/pom.xml b/cobigen-templates/templates-devon4j-tests/src/test/resources/testdata/templatetest/TestAllTemplatesEntityInput/pom.xml
new file mode 100644
index 0000000000..530ec2a8c0
--- /dev/null
+++ b/cobigen-templates/templates-devon4j-tests/src/test/resources/testdata/templatetest/TestAllTemplatesEntityInput/pom.xml
@@ -0,0 +1,68 @@
+<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>com.devonfw.cobigen</groupId>
+  <artifactId>devon4jTemplateTest-TestAllTemplatesEntityInput</artifactId>
+  <version>dev-SNAPSHOT</version>
+
+  <properties>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
+  </properties>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>com.devonfw.cobigen</groupId>
+        <artifactId>cobigen-maven-plugin</artifactId>
+        <version>${pluginVersion}</version>
+        <executions>
+          <execution>
+            <id>generate</id>
+            <phase>package</phase>
+            <goals>
+              <goal>generate</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <configurationFolder>${templatesProject}</configurationFolder>
+          <inputFiles>
+            <inputFile>src/main/java/io/github/devonfw/cobigen/generator/dataaccess/api/InputEntity.java</inputFile>
+          </inputFiles>
+          <templates>
+            <template>ALL</template>
+          </templates>
+          <failOnNothingGenerated>true</failOnNothingGenerated>
+        </configuration>
+        <dependencies>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>tempeng-freemarker</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>javaplugin</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>xmlplugin</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>openapiplugin</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>tsplugin</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+        </dependencies>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/cobigen-templates/templates-devon4j-tests/src/test/resources/testdata/templatetest/TestAllTemplatesEntityInput/src/main/java/io/github/devonfw/cobigen/generator/dataaccess/api/InputEntity.java b/cobigen-templates/templates-devon4j-tests/src/test/resources/testdata/templatetest/TestAllTemplatesEntityInput/src/main/java/io/github/devonfw/cobigen/generator/dataaccess/api/InputEntity.java
new file mode 100644
index 0000000000..e2d76c7c9f
--- /dev/null
+++ b/cobigen-templates/templates-devon4j-tests/src/test/resources/testdata/templatetest/TestAllTemplatesEntityInput/src/main/java/io/github/devonfw/cobigen/generator/dataaccess/api/InputEntity.java
@@ -0,0 +1,25 @@
+package io.github.devonfw.cobigen.generator.dataaccess.api;
+
+public class InputEntity {
+    
+    private String input;
+    
+    private int complexity;
+    
+    public String getInput() {
+        return input;
+    }
+    
+    public void setInput(String input) {
+        this.input = input;
+    }
+    
+    public int getComplexity() {
+        return complexity;
+    }
+    
+    public void setComplexity(int complexity) {
+        this.complexity = complexity;
+    }
+    
+}
diff --git a/cobigen-templates/templates-devon4j-tests/src/test/resources/testdata/templatetest/TestAllTemplatesEtoInput/logback.xml b/cobigen-templates/templates-devon4j-tests/src/test/resources/testdata/templatetest/TestAllTemplatesEtoInput/logback.xml
new file mode 100644
index 0000000000..5f29165f75
--- /dev/null
+++ b/cobigen-templates/templates-devon4j-tests/src/test/resources/testdata/templatetest/TestAllTemplatesEtoInput/logback.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- This file is for logback classic. The file contains the configuration for slf4j logging -->
+<configuration>
+	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+			<Pattern>%d{HH:mm:ss.SSS} [%thread] [C:%X{correlationId}] - %-5level - %logger{36} - %msg%n
+			</Pattern>
+		</encoder>
+	</appender>
+
+	<root level="INFO">
+		<appender-ref ref="STDOUT" />
+	</root>
+</configuration>
diff --git a/cobigen-templates/templates-devon4j-tests/src/test/resources/testdata/templatetest/TestAllTemplatesEtoInput/pom.xml b/cobigen-templates/templates-devon4j-tests/src/test/resources/testdata/templatetest/TestAllTemplatesEtoInput/pom.xml
new file mode 100644
index 0000000000..68371aa12b
--- /dev/null
+++ b/cobigen-templates/templates-devon4j-tests/src/test/resources/testdata/templatetest/TestAllTemplatesEtoInput/pom.xml
@@ -0,0 +1,79 @@
+<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>com.devonfw.cobigen</groupId>
+  <artifactId>devon4jTemplateTest-TestAllTemplatesEtoInput</artifactId>
+  <version>dev-SNAPSHOT</version>
+
+  <properties>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
+  </properties>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>com.devonfw.cobigen</groupId>
+        <artifactId>cobigen-maven-plugin</artifactId>
+        <version>${pluginVersion}</version>
+        <executions>
+          <execution>
+            <id>generate</id>
+            <phase>package</phase>
+            <goals>
+              <goal>generate</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <configurationFolder>${templatesProject}</configurationFolder>
+          <inputFiles>
+            <inputFile>src/main/java/io/github/devonfw/cobigen/generator/logic/api/to/InputEto.java</inputFile>
+          </inputFiles>
+          <templates>
+            <template>ALL</template>
+          </templates>
+          <failOnNothingGenerated>true</failOnNothingGenerated>
+        </configuration>
+        <dependencies>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>tempeng-freemarker</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>javaplugin</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>xmlplugin</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>htmlplugin</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>tsplugin</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>jsonplugin</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>openapiplugin</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+        </dependencies>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>
diff --git a/cobigen-templates/templates-devon4j-tests/src/test/resources/testdata/templatetest/TestAllTemplatesEtoInput/src/main/java/io/github/devonfw/cobigen/generator/logic/api/to/InputEto.java b/cobigen-templates/templates-devon4j-tests/src/test/resources/testdata/templatetest/TestAllTemplatesEtoInput/src/main/java/io/github/devonfw/cobigen/generator/logic/api/to/InputEto.java
new file mode 100644
index 0000000000..21ad4eeba9
--- /dev/null
+++ b/cobigen-templates/templates-devon4j-tests/src/test/resources/testdata/templatetest/TestAllTemplatesEtoInput/src/main/java/io/github/devonfw/cobigen/generator/logic/api/to/InputEto.java
@@ -0,0 +1,25 @@
+package io.github.devonfw.cobigen.generator.logic.api.to;
+
+public class InputEto {
+    
+    private String input;
+    
+    private int complexity;
+    
+    public String getInput() {
+        return input;
+    }
+    
+    public void setInput(String input) {
+        this.input = input;
+    }
+    
+    public int getComplexity() {
+        return complexity;
+    }
+    
+    public void setComplexity(int complexity) {
+        this.complexity = complexity;
+    }
+    
+}
diff --git a/cobigen-templates/templates-devon4j-tests/src/test/resources/testdata/templatetest/TestAllTemplatesOpenApiInput/OpenAPI.yaml b/cobigen-templates/templates-devon4j-tests/src/test/resources/testdata/templatetest/TestAllTemplatesOpenApiInput/OpenAPI.yaml
new file mode 100644
index 0000000000..14b9ec10cf
--- /dev/null
+++ b/cobigen-templates/templates-devon4j-tests/src/test/resources/testdata/templatetest/TestAllTemplatesOpenApiInput/OpenAPI.yaml
@@ -0,0 +1,131 @@
+openapi: 3.0.0
+servers:
+  - url: 'https://localhost:8081/server/services/rest'
+info:
+  title: Devon Example
+  description: Example of a API definition
+  version: 1.0.0
+  x-rootpackage: com.devonfw.demo
+paths:
+  /datamanagement/v1/someData/{id}:
+    get:
+      operationId: findSomeData
+      parameters:
+        - name: id
+          in: path
+          required: true
+          schema:
+            type: integer
+            format: int64
+            minimum: 0
+            maximum: 50
+      responses:
+        '200':
+          description: Any
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/EvenMoreData'
+            text/plain:
+              schema:
+                type: string
+  /datamanagement/v1/moreData/{id}:
+    get:
+      operationId: findMoreData
+      parameters:
+        - name: id
+          in: path
+          required: true
+          schema:
+            type: integer
+            format: int64
+            minimum: 10
+            maximum: 200
+      responses:
+        '200':
+          description: Any
+  /datamanagement/v1/someData/:
+    post:
+      responses:
+        '200':
+          description: Any
+      requestBody:
+        $ref: '#/components/requestBodies/SomeData'
+      tags:
+       - searchCriteria
+  /datamanagement/v1/moreData/validateMoreData:
+    post:
+      responses:
+       '200':
+          description: Any
+      requestBody:
+        $ref: '#/components/requestBodies/MoreData'
+components:
+    schemas:
+        SomeData:
+          x-component: DataManagement
+          description: Entity definiton of SomeData
+          type: object
+          properties:
+            AnyString:
+              type: string
+              maxLength: 100
+              minLength: 5
+              uniqueItems: true
+            furtherData:
+              type: array
+              items:
+                $ref: '#/components/schemas/FurtherData'
+        MoreData:
+          x-component: DataManagement
+          description: Entity definiton of Moredata
+          type: object
+          properties:
+            anyNumber:
+              type: number
+              format: int64
+              maximum: 100
+              minimum: 0
+            someData:
+              $ref: '#/components/schemas/SomeData'
+            allSomeData:
+              type: array
+              description: 'All SomeData'
+              items:
+                $ref: '#/components/schemas/SomeData'
+          required:
+            - saleExample
+        FurtherData:
+          x-component: AnotherComponent
+          type: object
+          properties:
+            parent:
+              $ref: '#/components/schemas/SomeData'
+            valid:
+              type: boolean
+            someList:
+              type: array
+              items:
+                type: string
+        EvenMoreData:
+          x-component: AnotherComponent
+          description: Entity definiton of more data
+          type: object
+          properties:
+            id:
+              type: integer
+              format: int64
+              uniqueItems: true
+    requestBodies:
+        SomeData:
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/SomeData'
+          required: true
+        MoreData:
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/MoreData'
+          required: true
diff --git a/cobigen-templates/templates-devon4j-tests/src/test/resources/testdata/templatetest/TestAllTemplatesOpenApiInput/logback.xml b/cobigen-templates/templates-devon4j-tests/src/test/resources/testdata/templatetest/TestAllTemplatesOpenApiInput/logback.xml
new file mode 100644
index 0000000000..5f29165f75
--- /dev/null
+++ b/cobigen-templates/templates-devon4j-tests/src/test/resources/testdata/templatetest/TestAllTemplatesOpenApiInput/logback.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- This file is for logback classic. The file contains the configuration for slf4j logging -->
+<configuration>
+	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+			<Pattern>%d{HH:mm:ss.SSS} [%thread] [C:%X{correlationId}] - %-5level - %logger{36} - %msg%n
+			</Pattern>
+		</encoder>
+	</appender>
+
+	<root level="INFO">
+		<appender-ref ref="STDOUT" />
+	</root>
+</configuration>
diff --git a/cobigen-templates/templates-devon4j-tests/src/test/resources/testdata/templatetest/TestAllTemplatesOpenApiInput/pom.xml b/cobigen-templates/templates-devon4j-tests/src/test/resources/testdata/templatetest/TestAllTemplatesOpenApiInput/pom.xml
new file mode 100644
index 0000000000..7f84fdeef0
--- /dev/null
+++ b/cobigen-templates/templates-devon4j-tests/src/test/resources/testdata/templatetest/TestAllTemplatesOpenApiInput/pom.xml
@@ -0,0 +1,84 @@
+<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>com.devonfw.cobigen</groupId>
+  <artifactId>devon4jTemplateTest-TestAllTemplatesOpenAPIInput</artifactId>
+  <version>dev-SNAPSHOT</version>
+
+  <properties>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
+  </properties>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>com.devonfw.cobigen</groupId>
+        <artifactId>cobigen-maven-plugin</artifactId>
+        <version>${pluginVersion}</version>
+        <executions>
+          <execution>
+            <id>generate</id>
+            <phase>package</phase>
+            <goals>
+              <goal>generate</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <configurationFolder>${templatesProject}</configurationFolder>
+          <inputFiles>
+            <inputFile>OpenAPI.yaml</inputFile>
+          </inputFiles>
+          <templates>
+            <template>ALL</template>
+          </templates>
+          <failOnNothingGenerated>true</failOnNothingGenerated>
+        </configuration>
+        <dependencies>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>tempeng-freemarker</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>javaplugin</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>htmlplugin</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>tsplugin</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>jsonplugin</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>openapiplugin</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>xmlplugin</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>textmerger</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+        </dependencies>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>
diff --git a/cobigen-templates/templates-devon4j/src/test/resources/testdata/templatetest/TestAllTemplatesToInput/logback.xml b/cobigen-templates/templates-devon4j-tests/src/test/resources/testdata/templatetest/TestAllTemplatesRestServiceInput/logback.xml
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/test/resources/testdata/templatetest/TestAllTemplatesToInput/logback.xml
rename to cobigen-templates/templates-devon4j-tests/src/test/resources/testdata/templatetest/TestAllTemplatesRestServiceInput/logback.xml
diff --git a/cobigen-templates/templates-devon4j/src/test/resources/testdata/templatetest/TestAllTemplatesRestServiceInput/pom.xml b/cobigen-templates/templates-devon4j-tests/src/test/resources/testdata/templatetest/TestAllTemplatesRestServiceInput/pom.xml
similarity index 98%
rename from cobigen-templates/templates-devon4j/src/test/resources/testdata/templatetest/TestAllTemplatesRestServiceInput/pom.xml
rename to cobigen-templates/templates-devon4j-tests/src/test/resources/testdata/templatetest/TestAllTemplatesRestServiceInput/pom.xml
index 72b7a5d2a6..0e1900e9dd 100644
--- a/cobigen-templates/templates-devon4j/src/test/resources/testdata/templatetest/TestAllTemplatesRestServiceInput/pom.xml
+++ b/cobigen-templates/templates-devon4j-tests/src/test/resources/testdata/templatetest/TestAllTemplatesRestServiceInput/pom.xml
@@ -19,7 +19,7 @@
     <dependency>
       <groupId>org.springframework.data</groupId>
       <artifactId>spring-data-rest-webmvc</artifactId>
-      <version>3.0.9.RELEASE</version>
+      <version>3.7.10</version>
     </dependency>
   </dependencies>
 
diff --git a/cobigen-templates/templates-devon4j/src/test/resources/testdata/templatetest/TestAllTemplatesRestServiceInput/src/main/java/io/github/devonfw/cobigen/generator/service/api/rest/InputNoAnnotationsRestService.java b/cobigen-templates/templates-devon4j-tests/src/test/resources/testdata/templatetest/TestAllTemplatesRestServiceInput/src/main/java/io/github/devonfw/cobigen/generator/service/api/rest/InputNoAnnotationsRestService.java
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/test/resources/testdata/templatetest/TestAllTemplatesRestServiceInput/src/main/java/io/github/devonfw/cobigen/generator/service/api/rest/InputNoAnnotationsRestService.java
rename to cobigen-templates/templates-devon4j-tests/src/test/resources/testdata/templatetest/TestAllTemplatesRestServiceInput/src/main/java/io/github/devonfw/cobigen/generator/service/api/rest/InputNoAnnotationsRestService.java
diff --git a/cobigen-templates/templates-devon4j/src/test/resources/testdata/templatetest/TestAllTemplatesRestServiceInput/src/main/java/io/github/devonfw/cobigen/generator/service/api/rest/JavaxAnnotationsInputRestService.java b/cobigen-templates/templates-devon4j-tests/src/test/resources/testdata/templatetest/TestAllTemplatesRestServiceInput/src/main/java/io/github/devonfw/cobigen/generator/service/api/rest/JavaxAnnotationsInputRestService.java
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/test/resources/testdata/templatetest/TestAllTemplatesRestServiceInput/src/main/java/io/github/devonfw/cobigen/generator/service/api/rest/JavaxAnnotationsInputRestService.java
rename to cobigen-templates/templates-devon4j-tests/src/test/resources/testdata/templatetest/TestAllTemplatesRestServiceInput/src/main/java/io/github/devonfw/cobigen/generator/service/api/rest/JavaxAnnotationsInputRestService.java
diff --git a/cobigen-templates/templates-devon4j/src/test/resources/testdata/templatetest/TestAllTemplatesRestServiceInput/src/main/java/io/github/devonfw/cobigen/generator/service/api/rest/SpringAnnotationsInputRestService.java b/cobigen-templates/templates-devon4j-tests/src/test/resources/testdata/templatetest/TestAllTemplatesRestServiceInput/src/main/java/io/github/devonfw/cobigen/generator/service/api/rest/SpringAnnotationsInputRestService.java
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/test/resources/testdata/templatetest/TestAllTemplatesRestServiceInput/src/main/java/io/github/devonfw/cobigen/generator/service/api/rest/SpringAnnotationsInputRestService.java
rename to cobigen-templates/templates-devon4j-tests/src/test/resources/testdata/templatetest/TestAllTemplatesRestServiceInput/src/main/java/io/github/devonfw/cobigen/generator/service/api/rest/SpringAnnotationsInputRestService.java
diff --git a/cobigen-templates/templates-devon4j/src/test/resources/testdata/templatetest/TestAllTemplatesXMLInput/logback.xml b/cobigen-templates/templates-devon4j-tests/src/test/resources/testdata/templatetest/TestAllTemplatesToInput/logback.xml
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/test/resources/testdata/templatetest/TestAllTemplatesXMLInput/logback.xml
rename to cobigen-templates/templates-devon4j-tests/src/test/resources/testdata/templatetest/TestAllTemplatesToInput/logback.xml
diff --git a/cobigen-templates/templates-devon4j/src/test/resources/testdata/templatetest/TestAllTemplatesToInput/pom.xml b/cobigen-templates/templates-devon4j-tests/src/test/resources/testdata/templatetest/TestAllTemplatesToInput/pom.xml
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/test/resources/testdata/templatetest/TestAllTemplatesToInput/pom.xml
rename to cobigen-templates/templates-devon4j-tests/src/test/resources/testdata/templatetest/TestAllTemplatesToInput/pom.xml
diff --git a/cobigen-templates/templates-devon4j/src/test/resources/testdata/templatetest/TestAllTemplatesToInput/src/main/java/io/github/devonfw/cobigen/generator/service/api/rest/InputNoAnnotationsTo.java b/cobigen-templates/templates-devon4j-tests/src/test/resources/testdata/templatetest/TestAllTemplatesToInput/src/main/java/io/github/devonfw/cobigen/generator/service/api/rest/InputNoAnnotationsTo.java
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/test/resources/testdata/templatetest/TestAllTemplatesToInput/src/main/java/io/github/devonfw/cobigen/generator/service/api/rest/InputNoAnnotationsTo.java
rename to cobigen-templates/templates-devon4j-tests/src/test/resources/testdata/templatetest/TestAllTemplatesToInput/src/main/java/io/github/devonfw/cobigen/generator/service/api/rest/InputNoAnnotationsTo.java
diff --git a/cobigen-templates/templates-devon4j/src/test/resources/testdata/templatetest/TestAllTemplatesToInput/src/main/java/io/github/devonfw/cobigen/generator/service/api/rest/InputTo.java b/cobigen-templates/templates-devon4j-tests/src/test/resources/testdata/templatetest/TestAllTemplatesToInput/src/main/java/io/github/devonfw/cobigen/generator/service/api/rest/InputTo.java
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/test/resources/testdata/templatetest/TestAllTemplatesToInput/src/main/java/io/github/devonfw/cobigen/generator/service/api/rest/InputTo.java
rename to cobigen-templates/templates-devon4j-tests/src/test/resources/testdata/templatetest/TestAllTemplatesToInput/src/main/java/io/github/devonfw/cobigen/generator/service/api/rest/InputTo.java
diff --git a/cobigen-templates/templates-devon4j-tests/src/test/resources/testdata/templatetest/TestAllTemplatesXMLInput/logback.xml b/cobigen-templates/templates-devon4j-tests/src/test/resources/testdata/templatetest/TestAllTemplatesXMLInput/logback.xml
new file mode 100644
index 0000000000..29e5047b5f
--- /dev/null
+++ b/cobigen-templates/templates-devon4j-tests/src/test/resources/testdata/templatetest/TestAllTemplatesXMLInput/logback.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- This file is for logback classic. The file contains the configuration for slf4j logging -->
+<configuration>
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+      <Pattern>%d{HH:mm:ss.SSS} [%thread] [C:%X{correlationId}] - %-5level - %logger{36} - %msg%n
+      </Pattern>
+    </encoder>
+  </appender>
+
+  <root level="INFO">
+    <appender-ref ref="STDOUT" />
+  </root>
+</configuration>
diff --git a/cobigen-templates/templates-devon4j-tests/src/test/resources/testdata/templatetest/TestAllTemplatesXMLInput/pom.xml b/cobigen-templates/templates-devon4j-tests/src/test/resources/testdata/templatetest/TestAllTemplatesXMLInput/pom.xml
new file mode 100644
index 0000000000..57252bf691
--- /dev/null
+++ b/cobigen-templates/templates-devon4j-tests/src/test/resources/testdata/templatetest/TestAllTemplatesXMLInput/pom.xml
@@ -0,0 +1,73 @@
+<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>com.devonfw</groupId>
+  <artifactId>devon4jTemplateTest-TestAllTemplatesXMLInput</artifactId>
+  <version>dev-SNAPSHOT</version>
+
+  <properties>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
+  </properties>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>com.devonfw.cobigen</groupId>
+        <artifactId>cobigen-maven-plugin</artifactId>
+        <version>${pluginVersion}</version>
+        <executions>
+          <execution>
+            <id>generate</id>
+            <phase>package</phase>
+            <goals>
+              <goal>generate</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <configurationFolder>${templatesProject}</configurationFolder>
+          <inputFiles>
+            <inputFile>src/main/xml/io/github/devonfw/cobigen/generator/dataaccess/api/Input.xml</inputFile>
+          </inputFiles>
+          <templates>
+            <template>ALL</template>
+          </templates>
+          <failOnNothingGenerated>true</failOnNothingGenerated>
+        </configuration>
+        <dependencies>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>tempeng-freemarker</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>javaplugin</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>xmlplugin</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>openapiplugin</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>textmerger</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>tsplugin</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+        </dependencies>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/cobigen-templates/templates-devon4j/src/test/resources/testinput/XMI-UML.xml b/cobigen-templates/templates-devon4j-tests/src/test/resources/testdata/templatetest/TestAllTemplatesXMLInput/src/main/xml/io/github/devonfw/cobigen/generator/dataaccess/api/Input.xml
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/test/resources/testinput/XMI-UML.xml
rename to cobigen-templates/templates-devon4j-tests/src/test/resources/testdata/templatetest/TestAllTemplatesXMLInput/src/main/xml/io/github/devonfw/cobigen/generator/dataaccess/api/Input.xml
diff --git a/cobigen-templates/templates-devon4j/src/test/resources/testinput/InputEntity.java b/cobigen-templates/templates-devon4j-tests/src/test/resources/testinput/InputEntity.java
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/test/resources/testinput/InputEntity.java
rename to cobigen-templates/templates-devon4j-tests/src/test/resources/testinput/InputEntity.java
diff --git a/cobigen-templates/templates-devon4j-tests/src/test/resources/testinput/XMI-UML.xml b/cobigen-templates/templates-devon4j-tests/src/test/resources/testinput/XMI-UML.xml
new file mode 100644
index 0000000000..4073f5c5eb
--- /dev/null
+++ b/cobigen-templates/templates-devon4j-tests/src/test/resources/testinput/XMI-UML.xml
@@ -0,0 +1,391 @@
+<?xml version="1.0" encoding="windows-1252"?>
+<xmi:XMI xmi:version="2.1" xmlns:uml="http://schema.omg.org/spec/UML/2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1">
+  <xmi:Documentation exporter="Enterprise Architect" exporterVersion="6.5"/>
+  <uml:Model xmi:type="uml:Model" name="EA_Model" visibility="public">
+    <packagedElement xmi:type="uml:Package" xmi:id="EAPK_329F83E4_CA77_40af_968A_101D9A0AB879" name="Model" visibility="public">
+      <packagedElement xmi:type="uml:Package" xmi:id="EAPK_9C189016_9A46_4c58_B9E3_4E25FA3ACA35" name="Class Model" visibility="public">
+        <packagedElement xmi:type="uml:Package" xmi:id="EAPK_306CDA5C_B1A7_4c42_BA18_EE56F915E786" name="Schoolmanagement" visibility="public">
+          <packagedElement xmi:type="uml:Class" xmi:id="EAID_1D7DCE81_651D_40f2_A6E5_A522CF6E0C64" name="Marks" visibility="public">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="EAID_74D55CAA_D22A_46b3_BE6E_7F074B8BDE5E" name="attributeExample" visibility="private" isStatic="false" isReadOnly="false" isDerived="false" isOrdered="false" isUnique="true" isDerivedUnion="false">
+              <lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000001_D22A_46b3_BE6E_7F074B8BDE5E" value="1"/>
+              <upperValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000002_D22A_46b3_BE6E_7F074B8BDE5E" value="1"/>
+              <type xmi:idref="EAJava_int"/>
+            </ownedAttribute>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Association" xmi:id="EAID_396CC69C_ECD0_483d_BE28_A972782B7A05" visibility="public">
+            <memberEnd xmi:idref="EAID_dst6CC69C_ECD0_483d_BE28_A972782B7A05"/>
+            <memberEnd xmi:idref="EAID_src6CC69C_ECD0_483d_BE28_A972782B7A05"/>
+            <ownedEnd xmi:type="uml:Property" xmi:id="EAID_src6CC69C_ECD0_483d_BE28_A972782B7A05" visibility="public" association="EAID_396CC69C_ECD0_483d_BE28_A972782B7A05" isStatic="false" isReadOnly="false" isDerived="false" isOrdered="false" isUnique="true" isDerivedUnion="false" aggregation="none">
+              <type xmi:idref="EAID_4509184A_D724_495f_AAEB_1ACE1AD90879"/>
+              <lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000003__ECD0_483d_BE28_A972782B7A05" value="1"/>
+              <upperValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000004__ECD0_483d_BE28_A972782B7A05" value="1"/>
+            </ownedEnd>
+            <ownedEnd xmi:type="uml:Property" xmi:id="EAID_dst6CC69C_ECD0_483d_BE28_A972782B7A05" visibility="public" association="EAID_396CC69C_ECD0_483d_BE28_A972782B7A05" isStatic="false" isReadOnly="false" isDerived="false" isOrdered="false" isUnique="true" isDerivedUnion="false" aggregation="none">
+              <type xmi:idref="EAID_1D7DCE81_651D_40f2_A6E5_A522CF6E0C64"/>
+              <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000005__ECD0_483d_BE28_A972782B7A05" value="-1"/>
+              <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000006__ECD0_483d_BE28_A972782B7A05" value="-1"/>
+            </ownedEnd>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Class" xmi:id="EAID_4509184A_D724_495f_AAEB_1ACE1AD90879" name="Student" visibility="public">
+            <ownedOperation xmi:id="EAID_15243897_6472_43aa_8FBC_246812EF64D6" name="newOperation" visibility="public" concurrency="sequential">
+              <ownedParameter xmi:id="EAID_A65764ED_E71B_4ce1_9617_C9DC6E19FE3C" name="indice" direction="in" isStream="false" isException="false" isOrdered="false" isUnique="true" type="EAJava_int"/>
+              <ownedParameter xmi:id="EAID_RT000000_6472_43aa_8FBC_246812EF64D6" name="return" direction="return" type="EAJava_long"/>
+            </ownedOperation>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Association" xmi:id="EAID_2D621F9A_B9C0_4c51_BF4A_9321E2A8B598" visibility="public">
+            <memberEnd xmi:idref="EAID_dst621F9A_B9C0_4c51_BF4A_9321E2A8B598"/>
+            <memberEnd xmi:idref="EAID_src621F9A_B9C0_4c51_BF4A_9321E2A8B598"/>
+            <ownedEnd xmi:type="uml:Property" xmi:id="EAID_src621F9A_B9C0_4c51_BF4A_9321E2A8B598" visibility="public" association="EAID_2D621F9A_B9C0_4c51_BF4A_9321E2A8B598" isStatic="false" isReadOnly="false" isDerived="false" isOrdered="false" isUnique="true" isDerivedUnion="false" aggregation="none">
+              <type xmi:idref="EAID_6EA6FC61_FB9B_4e8e_98A1_30BD386AEA9A"/>
+              <lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000007__B9C0_4c51_BF4A_9321E2A8B598" value="1"/>
+              <upperValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000008__B9C0_4c51_BF4A_9321E2A8B598" value="1"/>
+            </ownedEnd>
+            <ownedEnd xmi:type="uml:Property" xmi:id="EAID_dst621F9A_B9C0_4c51_BF4A_9321E2A8B598" visibility="public" association="EAID_2D621F9A_B9C0_4c51_BF4A_9321E2A8B598" isStatic="false" isReadOnly="false" isDerived="false" isOrdered="false" isUnique="true" isDerivedUnion="false" aggregation="none">
+              <type xmi:idref="EAID_4509184A_D724_495f_AAEB_1ACE1AD90879"/>
+              <lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000013__B9C0_4c51_BF4A_9321E2A8B598" value="1"/>
+              <upperValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000014__B9C0_4c51_BF4A_9321E2A8B598" value="1"/>
+            </ownedEnd>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Association" xmi:id="EAID_6987A295_068B_4b57_995E_4EC9EE43D131" visibility="public">
+            <memberEnd xmi:idref="EAID_dst87A295_068B_4b57_995E_4EC9EE43D131"/>
+            <memberEnd xmi:idref="EAID_src87A295_068B_4b57_995E_4EC9EE43D131"/>
+            <ownedEnd xmi:type="uml:Property" xmi:id="EAID_src87A295_068B_4b57_995E_4EC9EE43D131" visibility="public" association="EAID_6987A295_068B_4b57_995E_4EC9EE43D131" isStatic="false" isReadOnly="false" isDerived="false" isOrdered="false" isUnique="true" isDerivedUnion="false" aggregation="none">
+              <type xmi:idref="EAID_C2E366C0_510F_4145_B650_110537B98360"/>
+              <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000009__068B_4b57_995E_4EC9EE43D131" value="-1"/>
+              <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000010__068B_4b57_995E_4EC9EE43D131" value="-1"/>
+            </ownedEnd>
+            <ownedEnd xmi:type="uml:Property" xmi:id="EAID_dst87A295_068B_4b57_995E_4EC9EE43D131" visibility="public" association="EAID_6987A295_068B_4b57_995E_4EC9EE43D131" isStatic="false" isReadOnly="false" isDerived="false" isOrdered="false" isUnique="true" isDerivedUnion="false" aggregation="none">
+              <type xmi:idref="EAID_4509184A_D724_495f_AAEB_1ACE1AD90879"/>
+              <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000011__068B_4b57_995E_4EC9EE43D131" value="-1"/>
+              <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000012__068B_4b57_995E_4EC9EE43D131" value="-1"/>
+            </ownedEnd>
+          </packagedElement>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Package" xmi:id="EAPK_2BEE9025_81F1_4585_ADA3_BDFB6731DA6D" name="usermanagement" visibility="public">
+          <packagedElement xmi:type="uml:Class" xmi:id="EAID_C2E366C0_510F_4145_B650_110537B98360" name="User" visibility="public"/>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Package" xmi:id="EAPK_A3EEA6C1_792B_40ae_AB55_E9B28FAA7326" name="Workersmanagement" visibility="public">
+          <packagedElement xmi:type="uml:Class" xmi:id="EAID_6EA6FC61_FB9B_4e8e_98A1_30BD386AEA9A" name="Teacher" visibility="public"/>
+        </packagedElement>
+      </packagedElement>
+    </packagedElement>
+  </uml:Model>
+  <xmi:Extension extender="Enterprise Architect" extenderID="6.5">
+    <elements>
+      <element xmi:idref="EAPK_329F83E4_CA77_40af_968A_101D9A0AB879">
+        <packageproperties/>
+        <paths/>
+        <times created="2012-04-17 00:00:00" modified="2012-04-17 00:00:00" lastloaddate="2017-10-31 13:24:25"/>
+        <flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE" packageFlags="isModel=1;"/>
+      </element>
+      <element xmi:idref="EAPK_9C189016_9A46_4c58_B9E3_4E25FA3ACA35" xmi:type="uml:Package" name="Class Model" scope="public">
+        <model package2="EAID_9C189016_9A46_4c58_B9E3_4E25FA3ACA35" package="EAPK_329F83E4_CA77_40af_968A_101D9A0AB879" tpos="6" ea_localid="2" ea_eleType="package"/>
+        <properties isSpecification="false" sType="Package" nType="0" scope="public"/>
+        <project author="jdiazgon" phase="1.0" created="2017-10-31 10:46:40" modified="2017-10-31 10:46:40" complexity="1" status="Proposed"/>
+        <code/>
+        <style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+        <tags/>
+        <xrefs/>
+        <extendedProperties tagged="0" package_name="Model"/>
+        <packageproperties tpos="6"/>
+        <paths/>
+        <times created="2017-10-31 10:46:40" modified="2017-10-31 10:46:40" lastloaddate="2017-10-31 11:59:49" lastsavedate="2017-10-31 10:46:40"/>
+        <flags iscontrolled="FALSE" isnamespace="1" isprotected="FALSE" batchsave="0" batchload="0" usedtd="FALSE" logxml="FALSE" packageFlags="isModel=1;VICON=3;"/>
+      </element>
+      <element xmi:idref="EAPK_306CDA5C_B1A7_4c42_BA18_EE56F915E786" xmi:type="uml:Package" name="Schoolmanagement" scope="public">
+        <model package2="EAID_306CDA5C_B1A7_4c42_BA18_EE56F915E786" package="EAPK_9C189016_9A46_4c58_B9E3_4E25FA3ACA35" tpos="0" ea_localid="6" ea_eleType="package"/>
+        <properties isSpecification="false" sType="Package" nType="0" scope="public"/>
+        <project author="jdiazgon" version="1.0" phase="1.0" created="2017-10-31 10:52:03" modified="2017-10-31 13:16:51" complexity="1" status="Proposed"/>
+        <code gentype="Java"/>
+        <style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+        <tags/>
+        <xrefs/>
+        <extendedProperties tagged="0" package_name="Class Model"/>
+        <packageproperties version="1.0"/>
+        <paths/>
+        <times created="2017-10-31 10:52:03" modified="2017-10-31 12:54:32"/>
+        <flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
+      </element>
+      <element xmi:idref="EAID_1D7DCE81_651D_40f2_A6E5_A522CF6E0C64" xmi:type="uml:Class" name="Marks" scope="public">
+        <model package="EAPK_306CDA5C_B1A7_4c42_BA18_EE56F915E786" tpos="0" ea_localid="10" ea_eleType="element"/>
+        <properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+        <project author="jdiazgon" version="1.0" phase="1.0" created="2017-10-31 10:46:40" modified="2017-10-31 10:52:42" complexity="1" status="Proposed"/>
+        <code gentype="Java"/>
+        <style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+        <tags/>
+        <xrefs value="$XREFPROP=$XID={EA26F31B-AFB5-4d88-9F7E-3E439464AC42}$XID;$NAM=CustomProperties$NAM;$TYP=element property$TYP;$VIS=Public$VIS;$DES=@PROP=@NAME=isActive@ENDNAME;@TYPE=Boolean@ENDTYPE;@VALU=@ENDVALU;@PRMT=@ENDPRMT;@ENDPROP;$DES;$CLT={1D7DCE81-651D-40f2-A6E5-A522CF6E0C64}$CLT;$ENDXREF;"/>
+        <extendedProperties tagged="0" package_name="Schoolmanagement" eventflags="LNK=68d2;"/>
+        <attributes>
+          <attribute xmi:idref="EAID_74D55CAA_D22A_46b3_BE6E_7F074B8BDE5E" name="attributeExample" scope="Private">
+            <initial/>
+            <documentation/>
+            <model ea_localid="1" ea_guid="{74D55CAA-D22A-46b3-BE6E-7F074B8BDE5E}"/>
+            <properties type="int" collection="false" duplicates="0" changeability="changeable"/>
+            <coords ordered="0"/>
+            <containment containment="Not Specified" position="0"/>
+            <stereotype/>
+            <bounds lower="1" upper="1"/>
+            <options/>
+            <style/>
+            <styleex value="volatile=0;"/>
+            <tags/>
+            <xrefs/>
+          </attribute>
+        </attributes>
+        <links>
+          <Association xmi:id="EAID_396CC69C_ECD0_483d_BE28_A972782B7A05" start="EAID_4509184A_D724_495f_AAEB_1ACE1AD90879" end="EAID_1D7DCE81_651D_40f2_A6E5_A522CF6E0C64"/>
+        </links>
+      </element>
+      <element xmi:idref="EAID_4509184A_D724_495f_AAEB_1ACE1AD90879" xmi:type="uml:Class" name="Student" scope="public">
+        <model package="EAPK_306CDA5C_B1A7_4c42_BA18_EE56F915E786" tpos="0" ea_localid="84" ea_eleType="element"/>
+        <properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+        <project author="jdiazgon" version="1.0" phase="1.0" created="2017-10-31 13:07:54" modified="2017-10-31 13:08:06" complexity="1" status="Proposed"/>
+        <code product_name="Java" gentype="Java"/>
+        <style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+        <tags/>
+        <xrefs/>
+        <extendedProperties tagged="0" package_name="Schoolmanagement"/>
+        <operations>
+          <operation xmi:idref="EAID_15243897_6472_43aa_8FBC_246812EF64D6" name="newOperation" scope="Public">
+            <properties position="0"/>
+            <stereotype/>
+            <model ea_guid="{15243897-6472-43aa-8FBC-246812EF64D6}" ea_localid="1"/>
+            <type type="long" const="false" static="false" isAbstract="false" synchronised="0" concurrency="Sequential" pure="0" isQuery="false"/>
+            <behaviour/>
+            <code/>
+            <style/>
+            <styleex/>
+            <documentation/>
+            <tags/>
+            <parameters>
+              <parameter xmi:idref="EAID_RETURNID_6472_43aa_8FBC_246812EF64D6" visibility="public">
+                <properties pos="0" type="long" const="false" ea_guid="{RETURNID-6472-43aa-8FBC-246812EF64D6}"/>
+                <style/>
+                <styleex/>
+                <documentation/>
+                <tags/>
+                <xrefs/>
+              </parameter>
+              <parameter xmi:idref="EAID_A65764ED_E71B_4ce1_9617_C9DC6E19FE3C" visibility="public">
+                <properties pos="0" type="int" const="false" ea_guid="{A65764ED-E71B-4ce1-9617-C9DC6E19FE3C}"/>
+                <style/>
+                <styleex/>
+                <documentation/>
+                <tags/>
+                <xrefs/>
+              </parameter>
+            </parameters>
+            <xrefs/>
+          </operation>
+        </operations>
+        <links>
+          <Association xmi:id="EAID_396CC69C_ECD0_483d_BE28_A972782B7A05" start="EAID_4509184A_D724_495f_AAEB_1ACE1AD90879" end="EAID_1D7DCE81_651D_40f2_A6E5_A522CF6E0C64"/>
+          <Association xmi:id="EAID_2D621F9A_B9C0_4c51_BF4A_9321E2A8B598" start="EAID_6EA6FC61_FB9B_4e8e_98A1_30BD386AEA9A" end="EAID_4509184A_D724_495f_AAEB_1ACE1AD90879"/>
+          <Association xmi:id="EAID_6987A295_068B_4b57_995E_4EC9EE43D131" start="EAID_C2E366C0_510F_4145_B650_110537B98360" end="EAID_4509184A_D724_495f_AAEB_1ACE1AD90879"/>
+        </links>
+      </element>
+      <element xmi:idref="EAPK_2BEE9025_81F1_4585_ADA3_BDFB6731DA6D" xmi:type="uml:Package" name="usermanagement" scope="public">
+        <model package2="EAID_2BEE9025_81F1_4585_ADA3_BDFB6731DA6D" package="EAPK_9C189016_9A46_4c58_B9E3_4E25FA3ACA35" tpos="0" ea_localid="23" ea_eleType="package"/>
+        <properties isSpecification="false" sType="Package" nType="0" scope="public"/>
+        <project author="jdiazgon" version="1.0" phase="1.0" created="2017-10-31 13:04:42" modified="2017-10-31 13:16:51" complexity="1" status="Proposed"/>
+        <code gentype="Java"/>
+        <style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+        <tags/>
+        <xrefs/>
+        <extendedProperties tagged="0" package_name="Class Model"/>
+        <packageproperties version="1.0"/>
+        <paths/>
+        <times created="2017-10-31 13:04:42" modified="2017-10-31 13:04:42"/>
+        <flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
+      </element>
+      <element xmi:idref="EAID_C2E366C0_510F_4145_B650_110537B98360" xmi:type="uml:Class" name="User" scope="public">
+        <model package="EAPK_2BEE9025_81F1_4585_ADA3_BDFB6731DA6D" tpos="0" ea_localid="82" ea_eleType="element"/>
+        <properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+        <project author="jdiazgon" version="1.0" phase="1.0" created="2017-10-31 13:04:52" modified="2017-10-31 13:08:50" complexity="1" status="Proposed"/>
+        <code product_name="Java" gentype="Java"/>
+        <style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+        <tags/>
+        <xrefs/>
+        <extendedProperties tagged="0" package_name="usermanagement"/>
+        <links>
+          <Association xmi:id="EAID_6987A295_068B_4b57_995E_4EC9EE43D131" start="EAID_C2E366C0_510F_4145_B650_110537B98360" end="EAID_4509184A_D724_495f_AAEB_1ACE1AD90879"/>
+        </links>
+      </element>
+      <element xmi:idref="EAPK_A3EEA6C1_792B_40ae_AB55_E9B28FAA7326" xmi:type="uml:Package" name="Workersmanagement" scope="public">
+        <model package2="EAID_A3EEA6C1_792B_40ae_AB55_E9B28FAA7326" package="EAPK_9C189016_9A46_4c58_B9E3_4E25FA3ACA35" tpos="0" ea_localid="5" ea_eleType="package"/>
+        <properties isSpecification="false" sType="Package" nType="0" scope="public"/>
+        <project author="jdiazgon" version="1.0" phase="1.0" created="2017-10-31 10:48:44" modified="2017-10-31 13:29:43" complexity="1" status="Proposed"/>
+        <code gentype="Java"/>
+        <style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+        <tags/>
+        <xrefs/>
+        <extendedProperties tagged="0" package_name="Class Model"/>
+        <packageproperties version="1.0"/>
+        <paths/>
+        <times created="2017-10-31 10:48:44" modified="2017-10-31 13:29:43"/>
+        <flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
+      </element>
+      <element xmi:idref="EAID_6EA6FC61_FB9B_4e8e_98A1_30BD386AEA9A" xmi:type="uml:Class" name="Teacher" scope="public">
+        <model package="EAPK_A3EEA6C1_792B_40ae_AB55_E9B28FAA7326" tpos="0" ea_localid="83" ea_eleType="element"/>
+        <properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+        <project author="jdiazgon" version="1.0" phase="1.0" created="2017-10-31 13:07:31" modified="2017-10-31 13:07:41" complexity="1" status="Proposed"/>
+        <code product_name="Java" gentype="Java"/>
+        <style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+        <tags/>
+        <xrefs/>
+        <extendedProperties tagged="0" package_name="Workersmanagement"/>
+        <links>
+          <Association xmi:id="EAID_2D621F9A_B9C0_4c51_BF4A_9321E2A8B598" start="EAID_6EA6FC61_FB9B_4e8e_98A1_30BD386AEA9A" end="EAID_4509184A_D724_495f_AAEB_1ACE1AD90879"/>
+        </links>
+      </element>
+    </elements>
+    <connectors>
+      <connector xmi:idref="EAID_396CC69C_ECD0_483d_BE28_A972782B7A05">
+        <source xmi:idref="EAID_4509184A_D724_495f_AAEB_1ACE1AD90879">
+          <model ea_localid="84" type="Class" name="Student"/>
+          <role visibility="Public" targetScope="instance"/>
+          <type multiplicity="1" aggregation="none" containment="Unspecified"/>
+          <constraints/>
+          <modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+          <style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Unspecified;"/>
+          <documentation/>
+          <xrefs/>
+          <tags/>
+        </source>
+        <target xmi:idref="EAID_1D7DCE81_651D_40f2_A6E5_A522CF6E0C64">
+          <model ea_localid="10" type="Class" name="Marks"/>
+          <role visibility="Public" targetScope="instance"/>
+          <type multiplicity="*" aggregation="none" containment="Unspecified"/>
+          <constraints/>
+          <modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+          <style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Unspecified;"/>
+          <documentation/>
+          <xrefs/>
+          <tags/>
+        </target>
+        <model ea_localid="28"/>
+        <properties ea_type="Association" direction="Unspecified"/>
+        <modifiers isRoot="false" isLeaf="false"/>
+        <parameterSubstitutions/>
+        <documentation/>
+        <appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+        <labels lb="1" rb="*"/>
+        <extendedProperties virtualInheritance="0"/>
+        <style/>
+        <xrefs/>
+        <tags/>
+      </connector>
+      <connector xmi:idref="EAID_2D621F9A_B9C0_4c51_BF4A_9321E2A8B598">
+        <source xmi:idref="EAID_6EA6FC61_FB9B_4e8e_98A1_30BD386AEA9A">
+          <model ea_localid="83" type="Class" name="Teacher"/>
+          <role visibility="Public" targetScope="instance"/>
+          <type multiplicity="1" aggregation="none" containment="Unspecified"/>
+          <constraints/>
+          <modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+          <style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Unspecified;"/>
+          <documentation/>
+          <xrefs/>
+          <tags/>
+        </source>
+        <target xmi:idref="EAID_4509184A_D724_495f_AAEB_1ACE1AD90879">
+          <model ea_localid="84" type="Class" name="Student"/>
+          <role visibility="Public" targetScope="instance"/>
+          <type multiplicity="1" aggregation="none" containment="Unspecified"/>
+          <constraints/>
+          <modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+          <style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Unspecified;"/>
+          <documentation/>
+          <xrefs/>
+          <tags/>
+        </target>
+        <model ea_localid="29"/>
+        <properties ea_type="Association" direction="Unspecified"/>
+        <modifiers isRoot="false" isLeaf="false"/>
+        <parameterSubstitutions/>
+        <documentation/>
+        <appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+        <labels lb="1" rb="1"/>
+        <extendedProperties virtualInheritance="0"/>
+        <style/>
+        <xrefs/>
+        <tags/>
+      </connector>
+      <connector xmi:idref="EAID_6987A295_068B_4b57_995E_4EC9EE43D131">
+        <source xmi:idref="EAID_C2E366C0_510F_4145_B650_110537B98360">
+          <model ea_localid="82" type="Class" name="User"/>
+          <role visibility="Public" targetScope="instance"/>
+          <type multiplicity="*" aggregation="none" containment="Unspecified"/>
+          <constraints/>
+          <modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+          <style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Unspecified;"/>
+          <documentation/>
+          <xrefs/>
+          <tags/>
+        </source>
+        <target xmi:idref="EAID_4509184A_D724_495f_AAEB_1ACE1AD90879">
+          <model ea_localid="84" type="Class" name="Student"/>
+          <role visibility="Public" targetScope="instance"/>
+          <type multiplicity="*" aggregation="none" containment="Unspecified"/>
+          <constraints/>
+          <modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+          <style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Unspecified;"/>
+          <documentation/>
+          <xrefs/>
+          <tags/>
+        </target>
+        <model ea_localid="30"/>
+        <properties ea_type="Association" direction="Unspecified"/>
+        <modifiers isRoot="false" isLeaf="false"/>
+        <parameterSubstitutions/>
+        <documentation/>
+        <appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+        <labels lb="*" rb="*"/>
+        <extendedProperties virtualInheritance="0"/>
+        <style/>
+        <xrefs/>
+        <tags/>
+      </connector>
+    </connectors>
+    <primitivetypes>
+      <packagedElement xmi:type="uml:Package" xmi:id="EAPrimitiveTypesPackage" name="EA_PrimitiveTypes_Package" visibility="public">
+        <packagedElement xmi:type="uml:Package" xmi:id="EAJavaTypesPackage" name="EA_Java_Types_Package" visibility="public">
+          <packagedElement xmi:type="uml:PrimitiveType" xmi:id="EAJava_int" name="int" visibility="public">
+            <generalization xmi:type="uml:Generalization" xmi:id="EAJava_int_General">
+              <general href="http://schema.omg.org/spec/UML/2.1/uml.xml#Integer"/>
+            </generalization>
+          </packagedElement>
+          <packagedElement xmi:type="uml:PrimitiveType" xmi:id="EAJava_long" name="long" visibility="public">
+            <generalization xmi:type="uml:Generalization" xmi:id="EAJava_long_General">
+              <general href="http://schema.omg.org/spec/UML/2.1/uml.xml#UnlimitedNatural"/>
+            </generalization>
+          </packagedElement>
+        </packagedElement>
+      </packagedElement>
+    </primitivetypes>
+    <profiles/>
+    <diagrams>
+      <diagram xmi:id="EAID_67365953_FB82_43e7_AAE8_DCDFE6F07390">
+        <model package="EAPK_9C189016_9A46_4c58_B9E3_4E25FA3ACA35" localID="2" owner="EAPK_9C189016_9A46_4c58_B9E3_4E25FA3ACA35"/>
+        <properties name="Example" type="Logical"/>
+        <project author="jdiazgon" version="1.0" created="2017-10-31 00:00:00" modified="2017-10-31 13:59:21"/>
+        <style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=0;HighlightForeign=0;PackageContents=0;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=795;DocSize.cy=1138;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
+        <style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;ProfileData=;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=8305E2C2;"/>
+        <swimlanes value="locked=false;orientation=0;width=0;inbar=false;names=false;color=0;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=0;ufh=0;cls=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;"/>
+        <matrixitems value="locked=false;matrixactive=false;swimlanesactive=true;kanbanactive=false;width=1;clrLine=0;"/>
+        <extendedProperties/>
+        <elements>
+          <element geometry="Left=171;Top=204;Right=302;Bottom=274;" subject="EAID_4509184A_D724_495f_AAEB_1ACE1AD90879" seqno="1" style="DUID=F5DAACF8;"/>
+          <element geometry="Left=157;Top=56;Right=247;Bottom=126;" subject="EAID_6EA6FC61_FB9B_4e8e_98A1_30BD386AEA9A" seqno="2" style="DUID=4EF9FFFB;"/>
+          <element geometry="Left=177;Top=436;Right=267;Bottom=506;" subject="EAID_C2E366C0_510F_4145_B650_110537B98360" seqno="3" style="DUID=F6A2D808;"/>
+          <element geometry="Left=129;Top=361;Right=482;Bottom=599;" subject="EAID_2BEE9025_81F1_4585_ADA3_BDFB6731DA6D" seqno="4" style=" DUID=34E8D0CD;"/>
+          <element geometry="Left=518;Top=210;Right=608;Bottom=280;" subject="EAID_1D7DCE81_651D_40f2_A6E5_A522CF6E0C64" seqno="5" style="DUID=6A3106D9;"/>
+          <element geometry="Left=122;Top=22;Right=272;Bottom=139;" subject="EAID_A3EEA6C1_792B_40ae_AB55_E9B28FAA7326" seqno="6" style=" DUID=1A1604F4;"/>
+          <element geometry="Left=123;Top=159;Right=657;Bottom=310;" subject="EAID_306CDA5C_B1A7_4c42_BA18_EE56F915E786" seqno="7" style=" DUID=9BD4557C;"/>
+          <element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=CX=5:CY=13:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LLT=;LMT=;LMB=;LRT=;LRB=CX=5:CY=13:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_6987A295_068B_4b57_995E_4EC9EE43D131" style="Mode=3;EOID=F5DAACF8;SOID=F6A2D808;Color=-1;LWidth=0;Hidden=0;"/>
+          <element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=3;$LLB=CX=5:CY=13:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LLT=;LMT=;LMB=;LRT=;LRB=CX=5:CY=13:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_2D621F9A_B9C0_4c51_BF4A_9321E2A8B598" style="Mode=3;EOID=F5DAACF8;SOID=4EF9FFFB;Color=-1;LWidth=0;Hidden=0;"/>
+          <element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=2;$LLB=CX=5:CY=13:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LLT=;LMT=;LMB=;LRT=;LRB=CX=5:CY=13:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_396CC69C_ECD0_483d_BE28_A972782B7A05" style="Mode=3;EOID=6A3106D9;SOID=F5DAACF8;Color=-1;LWidth=0;Hidden=0;"/>
+        </elements>
+      </diagram>
+    </diagrams>
+  </xmi:Extension>
+</xmi:XMI>
diff --git a/cobigen-templates/templates-devon4j-tests/src/test/resources/utils/pom.xml b/cobigen-templates/templates-devon4j-tests/src/test/resources/utils/pom.xml
new file mode 100644
index 0000000000..2053429589
--- /dev/null
+++ b/cobigen-templates/templates-devon4j-tests/src/test/resources/utils/pom.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.devonfw.cobigen.templates</groupId>
+  <artifactId>templates-devon4j-utils</artifactId>
+  <version>2021.12.007-SNAPSHOT</version>
+  <name>CobiGen Devon4j Templates Utils</name>
+  <description>A Code-based incremental Generator</description>
+  <url>https://github.com/devonfw/cobigen/templates-parent/templates-devon4j-utils</url>
+  <licenses>
+    <license>
+      <name>Apache Software License 2.0</name>
+      <url>https://raw.githubusercontent.com/devonfw/.github/master/LICENSE</url>
+      <distribution>repo</distribution>
+      <comments></comments>
+    </license>
+  </licenses>
+  <dependencies>
+    <dependency>
+      <groupId>javax.ws.rs</groupId>
+      <artifactId>javax.ws.rs-api</artifactId>
+      <version>2.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.data</groupId>
+      <artifactId>spring-data-rest-webmvc</artifactId>
+      <version>3.7.10</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+      <version>3.12.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+      <version>2.10.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>xerces</groupId>
+      <artifactId>xercesImpl</artifactId>
+      <version>2.12.2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.persistence</groupId>
+      <artifactId>javax.persistence-api</artifactId>
+      <version>2.2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>1.7.30</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <version>1.7.30</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>log4j-over-slf4j</artifactId>
+      <version>1.7.30</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+  <repositories>
+    <repository>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+      <id>ossrh</id>
+      <name>OSSRH Snapshots</name>
+      <url>https://s01.oss.sonatype.org/content/repositories/snapshots/</url>
+    </repository>
+  </repositories>
+
+  <properties>
+   <maven.compiler.source>1.8</maven.compiler.source>
+   <maven.compiler.target>1.8</maven.compiler.target>
+  </properties>
+
+  <build>
+   <resources>
+     <resource>
+       <directory>src/main/java</directory>
+     </resource>
+   </resources>
+  </build></project>
\ No newline at end of file
diff --git a/cobigen-templates/templates-devon4j/pom.xml b/cobigen-templates/templates-devon4j-utils/pom.xml
similarity index 75%
rename from cobigen-templates/templates-devon4j/pom.xml
rename to cobigen-templates/templates-devon4j-utils/pom.xml
index 9bcaece44e..77a9e57ad0 100644
--- a/cobigen-templates/templates-devon4j/pom.xml
+++ b/cobigen-templates/templates-devon4j-utils/pom.xml
@@ -1,22 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-  xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>templates-devon4j</artifactId>
-  <packaging>jar</packaging>
-  <name>CobiGen - devon4j Templates</name>
+  <artifactId>templates-devon4j-utils</artifactId>
+  <name>CobiGen Devon4j Templates Utils</name>
 
   <parent>
-    <groupId>com.devonfw.cobigen</groupId>
+    <groupId>com.devonfw.cobigen.templates</groupId>
     <artifactId>templates-parent</artifactId>
     <version>${revision}</version>
-    <relativePath>../pom.xml</relativePath>
   </parent>
 
-   <properties>
+  <properties>
     <skip.deployment>false</skip.deployment>
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
   </properties>
 
   <dependencies>
@@ -28,7 +23,7 @@
     <dependency>
       <groupId>org.springframework.data</groupId>
       <artifactId>spring-data-rest-webmvc</artifactId>
-      <version>3.0.9.RELEASE</version>
+      <version>3.7.10</version>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
@@ -38,11 +33,6 @@
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
     </dependency>
-    <dependency>
-      <groupId>xerces</groupId>
-      <artifactId>xercesImpl</artifactId>
-      <version>2.12.2</version>
-    </dependency>
     <dependency>
       <groupId>javax.persistence</groupId>
       <artifactId>javax.persistence-api</artifactId>
@@ -57,14 +47,16 @@
   </dependencies>
 
   <build>
+    <resources>
+      <resource>
+        <directory>src/main/java</directory>
+      </resource>
+    </resources>
     <plugins>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>flatten-maven-plugin</artifactId>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-antrun-plugin</artifactId>
+        <version>1.8</version>
         <executions>
           <execution>
             <phase>prepare-package</phase>
@@ -95,4 +87,4 @@
       </plugin>
     </plugins>
   </build>
-</project>
+</project>
\ No newline at end of file
diff --git a/cobigen-templates/templates-devon4j/pom_patch.xml b/cobigen-templates/templates-devon4j-utils/pom_patch.xml
similarity index 72%
rename from cobigen-templates/templates-devon4j/pom_patch.xml
rename to cobigen-templates/templates-devon4j-utils/pom_patch.xml
index 286c928c08..4741c86b53 100644
--- a/cobigen-templates/templates-devon4j/pom_patch.xml
+++ b/cobigen-templates/templates-devon4j-utils/pom_patch.xml
@@ -6,8 +6,7 @@
   <build>
    <resources>
      <resource>
-       <directory>src/main/templates</directory>
-       <targetPath>src/main/templates</targetPath>
+       <directory>src/main/java</directory>
      </resource>
    </resources>
   </build>
diff --git a/cobigen-templates/templates-devon4j-utils/src/main/java-templates/com/devonfw/cobigen/templates/devon4j/config/constant/MavenMetadata.java b/cobigen-templates/templates-devon4j-utils/src/main/java-templates/com/devonfw/cobigen/templates/devon4j/config/constant/MavenMetadata.java
new file mode 100644
index 0000000000..395d46154d
--- /dev/null
+++ b/cobigen-templates/templates-devon4j-utils/src/main/java-templates/com/devonfw/cobigen/templates/devon4j/config/constant/MavenMetadata.java
@@ -0,0 +1,12 @@
+package com.devonfw.cobigen.templates.devon4j.config.constant;
+
+/**
+ * Constants extracted from the maven pom by templating-maven-plugin.
+ * 
+ * @see "edit template in src/main/java-templates"
+ */
+public class MavenMetadata {
+
+    /** Local repository path */
+    public static final String LOCAL_REPO = "${settings.localRepository}";
+}
diff --git a/cobigen-templates/templates-devon4j-utils/src/main/java/com/devonfw/cobigen/templates/devon4j/constants/Field.java b/cobigen-templates/templates-devon4j-utils/src/main/java/com/devonfw/cobigen/templates/devon4j/constants/Field.java
new file mode 100644
index 0000000000..5376daaea9
--- /dev/null
+++ b/cobigen-templates/templates-devon4j-utils/src/main/java/com/devonfw/cobigen/templates/devon4j/constants/Field.java
@@ -0,0 +1,48 @@
+package com.devonfw.cobigen.templates.devon4j.constants;
+
+/**
+ * Contains the used keys for the pojo field mapping
+ */
+public enum Field {
+
+  /**
+   * Name of the field
+   */
+  NAME("name"),
+  /**
+   * Type of the field
+   */
+  TYPE("type"),
+  /**
+   * Canonical Type of the field
+   */
+  CANONICAL_TYPE("canonicalType"),
+  /**
+   * The Javadoc of the field
+   */
+  JAVA_DOC("javaDoc"),
+  /**
+   * Annotations
+   */
+  ANNOTATIONS("annotations");
+
+  /**
+   * key value
+   */
+  private String value;
+
+  /**
+   * @param value of the key
+   */
+  Field(String value) {
+
+    this.value = value;
+  }
+
+  @Override
+  public String toString() {
+
+    return this.value;
+  }
+
+}
diff --git a/cobigen-templates/templates-devon4j/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/DevonfwUtil.java b/cobigen-templates/templates-devon4j-utils/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/DevonfwUtil.java
similarity index 98%
rename from cobigen-templates/templates-devon4j/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/DevonfwUtil.java
rename to cobigen-templates/templates-devon4j-utils/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/DevonfwUtil.java
index 36e39b5e06..1a9adc0b59 100644
--- a/cobigen-templates/templates-devon4j/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/DevonfwUtil.java
+++ b/cobigen-templates/templates-devon4j-utils/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/DevonfwUtil.java
@@ -8,10 +8,10 @@
 
 import org.w3c.dom.Attr;
 import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
 import com.devonfw.cobigen.templates.devon4j.constants.Field;
-import com.sun.org.apache.xerces.internal.dom.DeferredElementNSImpl;
 
 /**
  * A class for shared devon4j specific functions in the templates
@@ -58,7 +58,7 @@ public String resolveIdGetter(Map<String, Object> field, boolean byObjectReferen
 
     // If field comes from an UML file
     if (field.getClass().toGenericString().contains("freemarker.ext.beans.HashAdapter")) {
-      DeferredElementNSImpl umlNode = (DeferredElementNSImpl) field;
+      Node umlNode = (Node) field;
       return resolveIdGetter(umlNode, byObjectReference, component);
     }
     return "get" + resolveIdVariableNameOrSetterGetterSuffix(field, byObjectReference, true, component) + "()";
@@ -77,12 +77,12 @@ public String resolveIdGetter(Map<String, Object> field, boolean byObjectReferen
    * @return 'get' + {@link #resolveIdVariableNameOrSetterGetterSuffix(Map, boolean, boolean, String)} + '()' with
    *         capitalize=true
    */
-  public String resolveIdGetter(DeferredElementNSImpl field, boolean byObjectReference, String component) {
+  public String resolveIdGetter(Node field, boolean byObjectReference, String component) {
 
-    HashMap nodeHash = new HashMap<>();
+    HashMap<String, Object> nodeHash = new HashMap<>();
 
     // Putting the name of the attribute to the hash
-    nodeHash.put(Field.NAME.toString(), field.getAttribute("name"));
+    nodeHash.put(Field.NAME.toString(), field.getAttributes().getNamedItem("name"));
 
     // Putting the type of the attribute to the hash
     NodeList childs = field.getChildNodes();
diff --git a/cobigen-templates/templates-devon4j/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/IDGenerator.java b/cobigen-templates/templates-devon4j-utils/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/IDGenerator.java
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/IDGenerator.java
rename to cobigen-templates/templates-devon4j-utils/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/IDGenerator.java
diff --git a/cobigen-templates/templates-devon4j-utils/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/JavaUtil.java b/cobigen-templates/templates-devon4j-utils/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/JavaUtil.java
new file mode 100644
index 0000000000..ced2f5fde2
--- /dev/null
+++ b/cobigen-templates/templates-devon4j-utils/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/JavaUtil.java
@@ -0,0 +1,464 @@
+package com.devonfw.cobigen.templates.devon4j.utils;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.Collection;
+import java.util.Map;
+
+import org.apache.commons.lang3.ClassUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Provides type operations, mainly checks and casts for Java Primitives, to be used in the templates
+ *
+ */
+public class JavaUtil {
+
+  /**
+   * Logger for this class
+   */
+  private static final Logger LOG = LoggerFactory.getLogger(JavaUtil.class);
+
+  /**
+   * The constructor.
+   */
+  public JavaUtil() {
+
+    // Empty for CobiGen to automatically instantiate it
+  }
+
+  /**
+   * Returns the Object version of a Java primitive or the input if the input isn't a java primitive
+   * 
+   * @param simpleType String
+   * @return the corresponding object wrapper type simple name of the input if the input is the name of a primitive java
+   *         type. The input itself if not. (e.g. "int" results in "Integer")
+   * @throws ClassNotFoundException should not occur.
+   */
+  public String boxJavaPrimitives(String simpleType) throws ClassNotFoundException {
+
+    if (equalsJavaPrimitive(simpleType)) {
+      return ClassUtils.primitiveToWrapper(ClassUtils.getClass(simpleType)).getSimpleName();
+    } else {
+      return simpleType;
+    }
+
+  }
+
+  /**
+   * Returns the simple name of the type of a field in the pojoClass. If the type is a java primitive the name of the
+   * wrapper class is returned
+   *
+   * @param pojoClass {@link Class} the class object of the pojo
+   * @param fieldName {@link String} the name of the field
+   * @return String. The simple name of the field's type. The simple name of the wrapper class in case of java
+   *         primitives
+   * @throws NoSuchFieldException indicating something awefully wrong in the used model
+   * @throws SecurityException if the field cannot be accessed.
+   */
+  public String boxJavaPrimitives(Class<?> pojoClass, String fieldName) throws NoSuchFieldException, SecurityException {
+
+    if (pojoClass == null) {
+      throw new IllegalAccessError(
+          "Class object is null. Cannot generate template as it might obviously depend on reflection.");
+    }
+
+    if (equalsJavaPrimitive(pojoClass, fieldName)) {
+      return ClassUtils.primitiveToWrapper(pojoClass.getDeclaredField(fieldName).getType()).getSimpleName();
+    } else {
+      Field field = pojoClass.getDeclaredField(fieldName);
+      if (field == null) {
+        field = pojoClass.getField(fieldName);
+      }
+      if (field == null) {
+        throw new IllegalAccessError("Could not find field " + fieldName + " in class " + pojoClass);
+      } else {
+        return field.getType().getSimpleName();
+      }
+    }
+  }
+
+  /**
+   * Checks if the given type is a Java primitive
+   *
+   * @param simpleType the type to be checked
+   * @return true iff simpleType is a Java primitive
+   */
+  public boolean equalsJavaPrimitive(String simpleType) {
+
+    try {
+      return ClassUtils.getClass(simpleType).isPrimitive();
+    } catch (ClassNotFoundException e) {
+      LOG.warn("{}: Could not find {}", e.getMessage(), simpleType);
+      return false;
+    }
+  }
+
+  /**
+   * Checks if the given type is a Java primitive or wrapper
+   *
+   * @param simpleType the type to be checked
+   * @return true iff simpleType is a Java primitive or wrapper
+   */
+  public boolean equalsJavaPrimitiveOrWrapper(String simpleType) {
+
+    try {
+      return ClassUtils.isPrimitiveOrWrapper(ClassUtils.getClass(simpleType));
+    } catch (ClassNotFoundException e) {
+      LOG.warn("{}: Could not find {}", e.getMessage(), simpleType);
+      return false;
+    }
+  }
+
+  /**
+   * Checks if the type of the field in the pojo's class is a java primitive
+   *
+   * @param pojoClass the {@link Class} object of the pojo
+   * @param fieldName the name of the field to be checked
+   * @return true iff the field is a java primitive
+   * @throws NoSuchFieldException indicating something awefully wrong in the used model
+   * @throws SecurityException if the field cannot be accessed.
+   */
+  public boolean equalsJavaPrimitive(Class<?> pojoClass, String fieldName)
+      throws NoSuchFieldException, SecurityException {
+
+    if (pojoClass == null) {
+      return false;
+    }
+
+    Field field = pojoClass.getDeclaredField(fieldName);
+    if (field == null) {
+      field = pojoClass.getField(fieldName);
+    }
+    if (field == null) {
+      return false;
+    } else {
+      return field.getType().isPrimitive();
+    }
+  }
+
+  /**
+   * Checks if the given type is a Java primitive or a Java primitive array
+   *
+   * @param simpleType the Type name to be checked
+   * @return true iff {@link #equalsJavaPrimitive(String)} is true or if simpleType is an array with a primitive
+   *         component
+   */
+  public boolean equalsJavaPrimitiveIncludingArrays(String simpleType) {
+
+    Class<?> klasse;
+
+    try {
+      klasse = ClassUtils.getClass(simpleType).getComponentType();
+    } catch (ClassNotFoundException e) {
+      LOG.warn("{}: Could not find {}", e.getMessage(), simpleType);
+      return false;
+    }
+    return equalsJavaPrimitive(simpleType) || (klasse != null && klasse.isPrimitive());
+  }
+
+  /**
+   * Checks if the given field in the pojo class is a java primitive or an array of java primitives
+   *
+   * @param pojoClass the class object of the pojo
+   * @param fieldName the name of the field to be checked
+   * @return true iff {@link #equalsJavaPrimitive(Class, String)} is true or the field is an array of primitives
+   * @throws NoSuchFieldException indicating something awfully wrong in the used model
+   * @throws SecurityException if the field cannot be accessed.
+   */
+  public boolean equalsJavaPrimitiveIncludingArrays(Class<?> pojoClass, String fieldName)
+      throws NoSuchFieldException, SecurityException {
+
+    return equalsJavaPrimitive(pojoClass, fieldName) || (pojoClass.getDeclaredField(fieldName).getType().isArray()
+        && pojoClass.getDeclaredField(fieldName).getType().getComponentType().isPrimitive());
+  }
+
+  /**
+   * Returns a cast statement for a given (java primitive, variable name) pair or nothing if the type isn't a java
+   * primitive
+   *
+   * @param simpleType Java Type
+   * @param varName Variable name
+   * @return String either of the form '((Java Primitive Object Type)varName)' if simpleType is a primitive or the empty
+   *         String otherwise
+   * @throws ClassNotFoundException should not occur
+   */
+  public String castJavaPrimitives(String simpleType, String varName) throws ClassNotFoundException {
+
+    if (equalsJavaPrimitive(simpleType)) {
+      return String.format("((%1$s)%2$s)", boxJavaPrimitives(simpleType), varName);
+    } else {
+      return "";
+    }
+  }
+
+  /**
+   * Returns a cast statement for a given (java primitive, variable name) pair or nothing if the type isn't a java
+   * primitive
+   *
+   * @param pojoClass the class object of the pojo
+   * @param fieldName the name of the field to be casted
+   * @return if fieldName points to a primitive field then a casted statement (e.g. for an int field:
+   *         '((Integer)field)') or an empty String otherwise
+   * @throws NoSuchFieldException indicating something awefully wrong in the used model
+   * @throws SecurityException if the field cannot be accessed.
+   */
+  public String castJavaPrimitives(Class<?> pojoClass, String fieldName)
+      throws NoSuchFieldException, SecurityException {
+
+    if (equalsJavaPrimitive(pojoClass, fieldName)) {
+      return String.format("((%1$s)%2$s)", boxJavaPrimitives(pojoClass, fieldName), fieldName);
+    } else {
+      return "";
+    }
+  }
+
+  /**
+   * @param pojoClass {@link Class} the class object of the pojo
+   * @param fieldName {@link String} the name of the field
+   * @return true if the field is an instance of java.utils.Collections
+   * @throws NoSuchFieldException indicating something awefully wrong in the used model
+   * @throws SecurityException if the field cannot be accessed.
+   */
+  public boolean isCollection(Class<?> pojoClass, String fieldName) throws NoSuchFieldException, SecurityException {
+
+    if (pojoClass == null) {
+      return false;
+    }
+
+    Field field = pojoClass.getDeclaredField(fieldName);
+    if (field == null) {
+      field = pojoClass.getField(fieldName);
+    }
+    if (field == null) {
+      return false;
+    } else {
+      return Collection.class.isAssignableFrom(field.getType());
+    }
+
+  }
+
+  /**
+   * Returns the Ext Type to a given java type
+   *
+   * @param simpleType any java type's simple name
+   * @return corresponding Ext type
+   */
+  public String getExtType(String simpleType) {
+
+    switch (simpleType) {
+      case "short":
+      case "Short":
+      case "int":
+      case "Integer":
+      case "long":
+      case "Long":
+        return "Integer";
+      case "float":
+      case "Float":
+      case "double":
+      case "Double":
+        return "Number";
+      case "boolean":
+      case "Boolean":
+        return "Boolean";
+      case "char":
+      case "Character":
+      case "String":
+        return "String";
+      case "Date":
+        return "Date";
+      default:
+        return "Field";
+    }
+  }
+
+  /**
+   * returns the Angular5 type associated with a Java primitive
+   *
+   * @param simpleType :{@link String} the type to be parsed
+   * @return the corresponding Angular type or 'any' otherwise
+   */
+  public String getAngularType(String simpleType) {
+
+    switch (simpleType) {
+      case "boolean":
+        return "boolean";
+      case "Boolean":
+        return "boolean";
+      case "short":
+        return "number";
+      case "Short":
+        return "number";
+      case "int":
+        return "number";
+      case "Integer":
+        return "number";
+      case "long":
+        return "number";
+      case "Long":
+        return "number";
+      case "float":
+        return "number";
+      case "Float":
+        return "number";
+      case "double":
+        return "number";
+      case "Double":
+        return "number";
+      case "char":
+        return "string";
+      case "Character":
+        return "string";
+      case "String":
+        return "string";
+      case "byte":
+        return "number";
+      default:
+        return "any";
+    }
+  }
+
+  /**
+   * returns the class name of the return type of a specific method.
+   *
+   * @param pojoClass {@link Class}&lt;?&gt; the class object of the pojo
+   * @param methodName {@link String} the name of the method
+   * @return the class name of the return type of the specified method
+   * @throws SecurityException If no method of the given name can be found
+   * @throws NoSuchMethodException If no method of the given name can be found
+   */
+  public String getReturnType(Class<?> pojoClass, String methodName) throws NoSuchMethodException, SecurityException {
+
+    if (pojoClass == null) {
+      throw new IllegalAccessError(
+          "Class object is null. Cannot generate template as it might obviously depend on reflection.");
+    }
+    String s = "-";
+    Method method = findMethod(pojoClass, methodName);
+    if (method != null && !method.getReturnType().equals(Void.TYPE)) {
+      s = method.getReturnType().toString();
+      s = s.substring(s.lastIndexOf('.') + 1, s.length());
+    }
+    return s;
+  }
+
+  /**
+   *
+   * This methods returns the return type of the method in the given pojoClass which are annotated with the parameter
+   * annotatedClass
+   *
+   * @param pojoClass - The class in which to find if it has methods with annotatedClass
+   * @param annotatedClassName - The annotation which needs to be found
+   * @return Return type of the method annotated with the given annotation, else "null"
+   * @throws ClassNotFoundException if the annotated class name could not be found in the class path
+   */
+  @SuppressWarnings("unchecked")
+  public String getReturnTypeOfMethodAnnotatedWith(Class<?> pojoClass, String annotatedClassName)
+      throws ClassNotFoundException {
+
+    if (pojoClass == null) {
+      throw new IllegalAccessError(
+          "Class object is null. Cannot generate template as it might obviously depend on reflection.");
+    }
+
+    Method[] methods = pojoClass.getDeclaredMethods();
+    for (Method method : methods) {
+      if (!method.getName().startsWith("get")) {
+        continue;
+      }
+      for (Annotation a : method.getAnnotations()) {
+        // better if (method.isAnnotationPresent(classObj)) {, but postponed as of different class
+        // loaders of a.getClass() and pojoClass.getClass()
+        if (a.getClass().getCanonicalName().equals(annotatedClassName)) {
+          return method.getReturnType().getSimpleName();
+        }
+      }
+    }
+    return "null";
+  }
+
+  /**
+   * returns the HTTP request type corresponding to an annotation type
+   *
+   * @param annotations The annotation to get the type name of
+   * @return the HTTP request type name of the selected annotation
+   */
+  public String getRequestType(Map<String, Object> annotations) {
+
+    if (annotations.containsKey("javax_ws_rs_GET")) {
+      return "GET";
+    } else if (annotations.containsKey("javax_ws_rs_PUT")) {
+      return "PUT";
+    } else if (annotations.containsKey("javax_ws_rs_POST")) {
+      return "POST";
+    } else if (annotations.containsKey("javax_ws_rs_DELETE")) {
+      return "DELETE";
+    } else if (annotations.containsKey("javax_ws_rs_PATCH")) {
+      return "PATCH";
+    } else {
+      return "-";
+    }
+  }
+
+  /**
+   * Helper method to find a class's specific method
+   *
+   * @param pojoClass {@link Class}&lt;?&gt; the class object of the pojo
+   * @param methodName The name of the method to be found
+   * @return The method object of the method to be found, null if it wasn't found
+   */
+  private Method findMethod(Class<?> pojoClass, String methodName) {
+
+    if (pojoClass == null) {
+      throw new IllegalAccessError(
+          "Class object is null. Cannot generate template as it might obviously depend on reflection.");
+    }
+    for (Method m : pojoClass.getMethods()) {
+      if (m.getName().equals(methodName)) {
+        return m;
+      }
+    }
+    return null;
+  }
+
+  /**
+   * Checks whether the class given by the full qualified name is an enum
+   *
+   * @param className full qualified class name
+   * @return <code>true</code> if the class is an enum, <code>false</code> otherwise
+   */
+  public boolean isEnum(String className) {
+
+    try {
+      return ClassUtils.getClass(className).isEnum();
+    } catch (ClassNotFoundException e) {
+      LOG.warn("{}: Could not find {}", e.getMessage(), className);
+      return false;
+    }
+  }
+
+  /**
+   * Returns the first enum value of an enum class
+   *
+   * @param className full qualified class name
+   * @return the first enum value name found in order
+   */
+  public String getFirstEnumValue(String className) {
+
+    try {
+      Class<?> enumClass = ClassUtils.getClass(className);
+      Field[] declaredFields = enumClass.getDeclaredFields();
+      if (declaredFields.length > 0) {
+        return declaredFields[0].getName();
+      } else {
+        return null;
+      }
+    } catch (ClassNotFoundException e) {
+      LOG.warn("{}: Could not find {}", e.getMessage(), className);
+      return null;
+    }
+  }
+}
diff --git a/cobigen-templates/templates-devon4j-utils/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/OpenApiUtil.java b/cobigen-templates/templates-devon4j-utils/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/OpenApiUtil.java
new file mode 100644
index 0000000000..a93288f45a
--- /dev/null
+++ b/cobigen-templates/templates-devon4j-utils/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/OpenApiUtil.java
@@ -0,0 +1,255 @@
+package com.devonfw.cobigen.templates.devon4j.utils;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.util.Map;
+
+import org.apache.commons.lang3.StringUtils;
+
+/** Utils on OpenAPI template model */
+public class OpenApiUtil {
+
+  /**
+   * Prints javax validation constraints from an OpenAPI model
+   *
+   * @param constraints OpenAPI model constraints
+   * @return the list of supported annotations in Java syntax
+   */
+  public String printJavaConstraints(Map<String, Object> constraints) {
+
+    String consts = "";
+    if (constraints.get("maximum") != null) {
+      consts = consts + "@Max(" + constraints.get("maximum") + ")";
+    }
+    if (constraints.get("minimum") != null) {
+      consts = consts + "@Min(" + constraints.get("minimum") + ")";
+    }
+    if (constraints.get("maxLength") != null) {
+      consts = consts + "@Size(max=" + constraints.get("maxLength");
+      if (constraints.get("minLength") != null) {
+        consts = consts + ", min=" + constraints.get("minLength");
+      }
+      consts = consts + ")";
+    } else {
+      if (constraints.get("minLength") != null) {
+        consts = consts + "@Size(min=" + constraints.get("minLength");
+        if (constraints.get("maxLength") != null) {
+          consts = consts + ", max=" + constraints.get("maxLength");
+        }
+        consts = consts + ")";
+      }
+    }
+    return consts;
+  }
+
+  /**
+   * Prints the return type of a response based on the OpenAPI model
+   *
+   * @param response the OpenAPI model of a response
+   * @return simple type of the response return type in Java syntax
+   */
+  public String printJavaServiceResponseReturnType(Map<String, Object> response) {
+
+    String returnType = toJavaType(response, false);
+    if ((boolean) response.get("isVoid")) {
+      return "void";
+    }
+    if ((boolean) response.get("isArray")) {
+      if ((boolean) response.get("isEntity")) {
+        if (returnType.contains("Entity")) {
+          return "List<" + returnType + ">";
+        } else {
+          return "List<" + returnType + "Entity>";
+        }
+      } else {
+        return "List<" + returnType + ">";
+      }
+    } else if ((boolean) response.get("isPaginated")) {
+      if ((boolean) response.get("isEntity")) {
+        if (returnType.contains("Entity")) {
+          return "Page<" + returnType + ">";
+        } else {
+          return "Page<" + returnType + "Entity>";
+        }
+      } else {
+        return "Page<" + returnType + ">";
+      }
+    } else {
+      return returnType;
+    }
+  }
+
+  /**
+   * Returns the Java type corresponding to the OpenAPI type definition. If the type could not be matched, Object will
+   * be returned.
+   *
+   * @param parameter OpenAPI model of a parameter
+   * @param simpleType if a Java simple type should be returned if possible
+   * @return the Java type
+   */
+  public String toJavaType(Map<String, Object> parameter, boolean simpleType) {
+
+    String typeConverted = null;
+    String format = (String) parameter.get("format");
+    String type = (String) parameter.get("type");
+    boolean isCollection = false;
+    if (parameter.get("isCollection") != null) {
+      isCollection = (boolean) parameter.get("isCollection");
+    }
+
+    boolean isEntity = (boolean) parameter.get("isEntity");
+
+    if (type != null) {
+      switch (type.toLowerCase()) {
+        case "integer":
+          if (format != null) {
+            switch (format) {
+              case "int32":
+                typeConverted = simpleType ? "int" : "Integer";
+                break;
+              case "int64":
+                typeConverted = simpleType ? "long" : "Long";
+                break;
+              default:
+                typeConverted = BigInteger.class.getSimpleName();
+                break;
+            }
+          } else {
+            typeConverted = BigInteger.class.getSimpleName();
+          }
+          break;
+        case "number":
+          if (format != null) {
+            switch (format) {
+              case "float":
+                typeConverted = simpleType ? "float" : "Float";
+                break;
+              case "double":
+                typeConverted = simpleType ? "double" : "Double";
+                break;
+              default:
+                typeConverted = BigDecimal.class.getSimpleName();
+                break;
+            }
+          } else {
+            typeConverted = BigDecimal.class.getSimpleName();
+          }
+          break;
+        case "string":
+          if (format != null) {
+            switch (format) {
+              case "date":
+                typeConverted = LocalDate.class.getSimpleName();
+                break;
+              case "date-time":
+                typeConverted = Instant.class.getSimpleName();
+                break;
+              case "binary":
+                typeConverted = simpleType ? "float" : "Float";
+                break;
+              case "email":
+              case "password":
+                typeConverted = String.class.getSimpleName();
+                break;
+              default:
+                typeConverted = "String";
+                break;
+            }
+          } else {
+            typeConverted = "String";
+          }
+          break;
+        case "boolean":
+          typeConverted = simpleType ? "boolean" : "Boolean";
+          break;
+        default:
+          typeConverted = "void";
+          break;
+      }
+    } else {
+      typeConverted = "void";
+    }
+
+    if (isCollection) {
+      if (isEntity) {
+        return "List<" + parameter.get("type") + ">";
+      } else {
+        return "List<" + typeConverted + ">";
+      }
+    } else if (isEntity) {
+      return (String) parameter.get("type");
+    }
+    return typeConverted;
+  }
+
+  /**
+   * Returns the TypeScript type corresponding to the OpenAPI type definition. If the type could not be matched, the
+   * same value will be returned.
+   *
+   * @param parameter OpenAPI model of a parameter
+   * @return the Java type
+   */
+  // getOaspTypeFromOpenAPI
+  public String toTypeScriptType(Map<String, Object> parameter) {
+
+    String typeConverted = null;
+    String type = (String) parameter.get("type");
+    boolean isCollection = false;
+    if (parameter.get("isCollection") != null) {
+      isCollection = (boolean) parameter.get("isCollection");
+    }
+
+    boolean isEntity = (boolean) parameter.get("isEntity");
+
+    if (type != null) {
+      switch (type.toLowerCase()) {
+        case "integer":
+          typeConverted = "number";
+          break;
+        default:
+          typeConverted = type;
+          break;
+      }
+    } else {
+      typeConverted = "undefined";
+    }
+
+    if (isCollection) {
+      if (isEntity) {
+        return parameter.get("type") + "[]";
+      } else {
+        return typeConverted + "[]";
+      }
+    } else if (isEntity) {
+      return (String) parameter.get("type");
+    }
+    return typeConverted;
+  }
+
+  /**
+   * Prints the service operation name based on the operationId or generates one based on the servicePath while printing
+   * a comment how to get better service names.
+   *
+   * @param operation operation Model of the OpenAPI model
+   * @param servicePath service path of the
+   * @return the service method name
+   */
+  public String printServiceOperationName(Map<String, Object> operation, String servicePath) {
+
+    String operationId = (String) operation.get("operationId");
+    if (StringUtils.isEmpty(operationId)) {
+      String[] split = servicePath.split("/");
+      String lastSegment;
+      if (!split[split.length - 1].isEmpty()) {
+        lastSegment = split[split.length - 1];
+      } else {
+        lastSegment = split[split.length - 2];
+      }
+      return ((String) operation.get("type")) + lastSegment;
+    } else {
+      return operationId;
+    }
+  }
+}
diff --git a/cobigen-templates/templates-devon4j-utils/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/documentation/DocumentationUtil.java b/cobigen-templates/templates-devon4j-utils/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/documentation/DocumentationUtil.java
new file mode 100644
index 0000000000..4eda4c9d8e
--- /dev/null
+++ b/cobigen-templates/templates-devon4j-utils/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/documentation/DocumentationUtil.java
@@ -0,0 +1,32 @@
+package com.devonfw.cobigen.templates.devon4j.utils.documentation;
+
+/**
+ *
+ */
+public class DocumentationUtil {
+
+  /**
+   * Creates asciidoc code for colour coded HTTP request types
+   *
+   * @param type the HTTP request type to be coloured
+   * @return the asciidoc code for differently coloured request types, aqua for get, lime for post, red for delete,
+   *         yellow for put and fuchsia for patch (HTML colour names)
+   */
+  public String getTypeWithAsciidocColour(String type) {
+
+    switch (type.toLowerCase()) {
+      case "get":
+        return "[aqua]#" + type.toUpperCase() + "#";
+      case "post":
+        return "[lime]#" + type.toUpperCase() + "#";
+      case "delete":
+        return "[red]#" + type.toUpperCase() + "#";
+      case "put":
+        return "[yellow]#" + type.toUpperCase() + "#";
+      case "patch":
+        return "[fuchsia]#" + type.toUpperCase() + "#";
+      default:
+        return "";
+    }
+  }
+}
diff --git a/cobigen-templates/templates-devon4j-utils/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/documentation/JavaDocumentationUtil.java b/cobigen-templates/templates-devon4j-utils/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/documentation/JavaDocumentationUtil.java
new file mode 100644
index 0000000000..8832368645
--- /dev/null
+++ b/cobigen-templates/templates-devon4j-utils/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/documentation/JavaDocumentationUtil.java
@@ -0,0 +1,346 @@
+package com.devonfw.cobigen.templates.devon4j.utils.documentation;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Parameter;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
+import com.fasterxml.jackson.annotation.PropertyAccessor;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
+/**
+ *
+ */
+public class JavaDocumentationUtil {
+
+  /** Full qualified name of spring RequestMapping annotation */
+  private final String requestMapping = "org_springframework_web_bind_annotation_RequestMapping";
+
+  /** Full qualified name of javax Path annotation */
+  private final String javaxPath = "javax_ws_rs_Path";
+
+  /**
+   * Creates a list of parameters of a specific method as an asciidoc string, including its name, type, description,
+   * constraints
+   *
+   * @param pojoClass {@link Class}&lt;?&gt; the class object of the pojo
+   * @param methodName {@link String} the name of the method to get the parameter info of
+   * @param javaDoc the javadoc of the method, taken from the javaplugin model
+   * @return A list of the parameters info in asciidoc code
+   * @throws Exception When errors occur in invoking an annotations method
+   */
+  public String getParams(Class<?> pojoClass, String methodName, Map<String, Object> javaDoc) throws Exception {
+
+    String result = "";
+    Method m = findMethod(pojoClass, methodName);
+    if (m.getParameterCount() < 1) {
+      return "!-!-!-!-";
+    }
+    if (m.getParameterCount() == 1) {
+      if (!m.getParameters()[0].getType().isPrimitive()) {
+        return "!-!-!-!-";
+      }
+    }
+    for (Parameter param : m.getParameters()) {
+      // Add the name of the parameter as path or query parameter
+      boolean isPath = param.isAnnotationPresent(javax.ws.rs.PathParam.class);
+      boolean isQuery = param.isAnnotationPresent(javax.ws.rs.QueryParam.class);
+      if (isPath || isQuery) {
+        result += "!";
+        if (isPath) {
+          result += "{" + param.getAnnotation(javax.ws.rs.PathParam.class).value() + "}" + System.lineSeparator();
+        } else if (isQuery) {
+          result += "?" + param.getAnnotation(javax.ws.rs.QueryParam.class).value() + System.lineSeparator();
+        }
+
+        // Add the type
+        String type = param.getType().getSimpleName();
+        result += "!" + type + System.lineSeparator();
+
+        // Add the constraints
+        result += "!";
+        int counter = 0;
+        for (Annotation anno : param.getAnnotations()) {
+          String annoName = anno.annotationType().getName();
+          Pattern p = Pattern.compile("javax\\.validation\\.constraints\\.([^\\.]*)");
+          Matcher match = p.matcher(annoName);
+          if (match.find()) {
+            counter++;
+            String shortName = annoName.substring(annoName.lastIndexOf('.') + 1);
+            Object value;
+            Method method;
+            try {
+              method = anno.getClass().getMethod("value");
+              value = method.invoke(anno);
+              result += shortName + " = " + value + " +" + System.lineSeparator();
+            } catch (NoSuchMethodException e) {
+              result += shortName + " +" + System.lineSeparator();
+            } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException
+                | SecurityException e) {
+              throw new Exception(e.getMessage());
+            }
+          }
+        }
+        if (counter == 0) {
+          result += "-" + System.lineSeparator();
+        }
+
+        // Add Javadoc
+        Map<String, String> params = (Map<String, String>) javaDoc.get("params");
+        result += "!" + getJavaDocWithoutLink(params.get(param.getName())) + " +" + System.lineSeparator();
+      }
+    }
+    return result;
+  }
+
+  /**
+   * returns the javadoc of an element, stripped of any links to other sources
+   *
+   * @param doc the javadoc to be changed
+   * @return the input string stripped of all links
+   */
+  public String getJavaDocWithoutLink(String doc) {
+
+    Pattern p = Pattern.compile("(\\{@link ([^\\}]*)\\})");
+    Matcher m = p.matcher(doc);
+    while (m.find()) {
+      doc = doc.replace(m.group(1), m.group(2));
+    }
+    return doc;
+  }
+
+  /**
+   * Create a response in JSON format, iterating through non-primitive types to get their data as well
+   *
+   * @param pojoClass The input class
+   * @param methodName The name of the operation to get the response of
+   * @return A JSON representation of the response object
+   * @throws Exception When Jackson fails
+   */
+  public String getJSONResponseBody(Class<?> pojoClass, String methodName) throws Exception {
+
+    Class<?> responseType = findMethod(pojoClass, methodName).getReturnType();
+    if (hasBody(pojoClass, methodName, true)) {
+      return getJSON(responseType);
+    }
+    return "-";
+  }
+
+  /**
+   * Create a request in JSON format, iterating through non-primitive types to get their data as well
+   *
+   * @param pojoClass The input class
+   * @param methodName The name of the operation to get the request of
+   * @return A JSON representation of the request object
+   * @throws Exception When Jackson fails
+   */
+  public String getJSONRequestBody(Class<?> pojoClass, String methodName) throws Exception {
+
+    Method m = findMethod(pojoClass, methodName);
+    if (hasBody(pojoClass, methodName, false)) {
+      Parameter param = m.getParameters()[0];
+      Class<?> requestType = param.getType();
+      return getJSON(requestType);
+    }
+    return "-";
+  }
+
+  /**
+   * Using Jackson, creates a JSON string for Asciidoc
+   *
+   * @param clazz The class to create the JSON string of
+   * @return A JSON representation of the given class
+   * @throws Exception When Jackson fails
+   */
+  public String getJSON(Class<?> clazz) throws Exception {
+
+    ObjectMapper mapper = new ObjectMapper();
+    mapper.setVisibility(PropertyAccessor.FIELD, Visibility.ANY);
+    mapper.enable(SerializationFeature.INDENT_OUTPUT);
+    try {
+      Object obj = clazz.newInstance();
+      return "...." + System.lineSeparator() + mapper.writeValueAsString(obj) + System.lineSeparator() + "....";
+    } catch (InstantiationException | IllegalAccessException | JsonProcessingException e) {
+      throw new Exception(e.getMessage());
+    }
+  }
+
+  /**
+   * Checks if a request/response has a body
+   *
+   * @param pojoClass {@link Class}&lt;?&gt; the class object of the pojo
+   * @param methodName The name of the operation to be checked
+   * @param isResponse true if the response of the operation should be checked, false if the request should be checked
+   * @return true if the response/request has a body, false if not
+   * @throws SecurityException If no method of the given name can be found
+   */
+  public boolean hasBody(Class<?> pojoClass, String methodName, boolean isResponse) throws SecurityException {
+
+    Method m = findMethod(pojoClass, methodName);
+    if (isResponse) {
+      Class<?> returnType = m.getReturnType();
+      if (!returnType.isPrimitive() && !returnType.equals(Void.TYPE)) {
+        return true;
+      }
+    } else {
+      int nr = 0;
+      int position = 0;
+      for (Parameter param : m.getParameters()) {
+        if (!param.isAnnotationPresent(javax.ws.rs.PathParam.class)
+            && !param.isAnnotationPresent(javax.ws.rs.QueryParam.class)) {
+          nr++;
+          position = Integer.parseInt(param.getName().replace("arg", ""));
+        }
+      }
+      if (nr == 1) {
+        Parameter param = m.getParameters()[position];
+        Class<?> requestType = param.getType();
+        if (!requestType.isPrimitive() && !requestType.equals(Void.TYPE)
+            && !param.isAnnotationPresent(javax.ws.rs.PathParam.class)
+            && !param.isAnnotationPresent(javax.ws.rs.QueryParam.class)) {
+          return true;
+        }
+      }
+    }
+    return false;
+  }
+
+  /**
+   * returns the HTTP request type corresponding to an annotation type
+   *
+   * @param annotations The annotation to get the type name of
+   * @return the HTTP request type name of the selected annotation
+   */
+  public String getRequestType(Map<String, Object> annotations) {
+
+    String type = "";
+    if (annotations.containsKey(this.requestMapping)) {
+      Map<String, Object> method = (Map<String, Object>) annotations.get(this.requestMapping);
+      String rm = (String) method.get("method");
+      type = rm.toLowerCase();
+    }
+    if (annotations.containsKey("javax_ws_rs_GET") || type.equals("requestmethod.get")) {
+      return "GET";
+    } else if (annotations.containsKey("javax_ws_rs_PUT") || type.equals("requestmethod.put")) {
+      return "PUT";
+    } else if (annotations.containsKey("javax_ws_rs_POST") || type.equals("requestmethod.post")) {
+      return "POST";
+    } else if (annotations.containsKey("javax_ws_rs_DELETE") || type.equals("requestmethod.delete")) {
+      return "DELETE";
+    } else if (annotations.containsKey("javax_ws_rs_PATCH") || type.equals("requestmethod.patch")) {
+      return "PATCH";
+    } else {
+      return "-";
+    }
+  }
+
+  /**
+   * Gets the path of an operation
+   *
+   * @param pojoAnnotations the annotation map of the given pojo
+   * @param method The method to get the operation path of
+   * @return The path of an operation
+   * @throws IOException If no application_properties file is found
+   */
+  public String getOperationPath(Map<String, Object> pojoAnnotations, Map<String, Object> method) throws IOException {
+
+    String path = getPath(pojoAnnotations);
+    Map<String, Object> pathAnno = new HashMap<>();
+    if (pojoAnnotations.containsKey(this.javaxPath)) {
+      pathAnno = (Map<String, Object>) pojoAnnotations.get(this.javaxPath);
+    } else if (pojoAnnotations.containsKey(this.requestMapping)) {
+      pathAnno = (Map<String, Object>) pojoAnnotations.get(this.requestMapping);
+    }
+    if (pathAnno.containsKey("value")) {
+      String toAdd = (String) pathAnno.get("value");
+      if (toAdd.startsWith("/") && path.endsWith("/")) {
+        path += toAdd.substring(1);
+      }
+    }
+    return path;
+  }
+
+  /**
+   * Gets the path of a component
+   *
+   * @param pojoAnnotations the annotation map of the given pojo
+   * @return The communal path of a component
+   * @throws IOException If no application_properties file is found
+   */
+  public String getPath(Map<String, Object> pojoAnnotations) throws IOException {
+
+    String path = extractRootPath();
+    Map<String, Object> pathAnno = new HashMap<>();
+    if (pojoAnnotations.containsKey(this.javaxPath)) {
+      pathAnno = (Map<String, Object>) pojoAnnotations.get(this.javaxPath);
+    } else if (pojoAnnotations.containsKey(this.requestMapping)) {
+      pathAnno = (Map<String, Object>) pojoAnnotations.get(this.requestMapping);
+    }
+    if (pathAnno.containsKey("value")) {
+      String toAdd = (String) pathAnno.get("value");
+      if (toAdd.startsWith("/") && path.endsWith(":")) {
+        path += toAdd.substring(1);
+      }
+    }
+    return path;
+  }
+
+  /**
+   * Checks the class path for an application.properties file and extracts the port and path from it
+   *
+   * @return The root path of the application
+   * @throws IOException If no application.properties file could be found
+   */
+  private String extractRootPath() throws IOException {
+
+    Class<?> clazz = this.getClass();
+    String t = "";
+    StringBuilder sb = new StringBuilder("http://localhost:");
+    try (InputStream in = clazz.getClassLoader().getResourceAsStream("application.properties")) {
+      if (in != null) {
+        try (InputStreamReader reader = new InputStreamReader(in); BufferedReader br = new BufferedReader(reader)) {
+          while ((t = br.readLine()) != null) {
+            if (t.matches("server\\.port=(\\d{0,5})") || t.matches("server\\.context-path=([^\\s]*)")) {
+              sb.append(t.substring(t.indexOf('=') + 1));
+            }
+          }
+          return sb.toString();
+        }
+      } else {
+        return "";
+      }
+    }
+  }
+
+  /**
+   * Helper method to find a class's specific method
+   *
+   * @param pojoClass {@link Class}&lt;?&gt; the class object of the pojo
+   * @param methodName The name of the method to be found
+   * @return The method object of the method to be found, null if it wasn't found
+   */
+  private Method findMethod(Class<?> pojoClass, String methodName) {
+
+    if (pojoClass == null) {
+      throw new IllegalAccessError(
+          "Class object is null. Cannot generate template as it might obviously depend on reflection.");
+    }
+    for (Method m : pojoClass.getMethods()) {
+      if (m.getName().equals(methodName)) {
+        return m;
+      }
+    }
+    return null;
+  }
+}
diff --git a/cobigen-templates/templates-devon4j-utils/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/documentation/OpenApiDocumentationUtil.java b/cobigen-templates/templates-devon4j-utils/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/documentation/OpenApiDocumentationUtil.java
new file mode 100644
index 0000000000..f7d9472b71
--- /dev/null
+++ b/cobigen-templates/templates-devon4j-utils/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/documentation/OpenApiDocumentationUtil.java
@@ -0,0 +1,74 @@
+package com.devonfw.cobigen.templates.devon4j.utils.documentation;
+
+import java.util.Map;
+
+/**
+ *
+ */
+public class OpenApiDocumentationUtil {
+
+  /**
+   * Adds indicators to a parameter name based on them being a ?query or a {path} parameter
+   *
+   * @param param the parameter to add indicators too
+   * @return The name of the given parameter with the prefix ? or surrounded by {}
+   */
+  public String getParam(Map<String, Object> param) {
+
+    String result = "";
+    String type = (String) param.get("type");
+    if (type == null || type.equals("void")) {
+      result = "void";
+    } else {
+      if ((boolean) param.get("inPath")) {
+        result += "{" + type + "}";
+      } else if ((boolean) param.get("inQuery")) {
+        result += "?" + type;
+      }
+    }
+    return result;
+  }
+
+  /**
+   * Lists the constraints of an operations parameter as asciidoc code
+   *
+   * @param param The parameter which constraints should be listed
+   * @return The list of constraints as asciidoc code
+   */
+  public String getConstraintList(Map<String, Object> param) {
+
+    String result = "";
+    Map<String, Object> constraints = (Map<String, Object>) param.get("constraints");
+    boolean required = false;
+    int nrParam = 0;
+    if (constraints != null) {
+      if (constraints.containsKey("notNull")) {
+        required = (boolean) constraints.get("notNull");
+      }
+      if (required) {
+        result += "[red]#__Required__# +" + System.lineSeparator();
+        nrParam++;
+      }
+      for (String key : constraints.keySet()) {
+        if (!key.equals("notNull")) {
+          Object val = constraints.get(key);
+          if (val != null) {
+            if (val instanceof Boolean) {
+              if ((boolean) val) {
+                result += key + " +" + System.lineSeparator();
+                nrParam++;
+              }
+            } else {
+              result += key + " = " + val + " +" + System.lineSeparator();
+              nrParam++;
+            }
+          }
+        }
+      }
+    }
+    if (nrParam == 0) {
+      result = "-";
+    }
+    return result;
+  }
+}
diff --git a/cobigen-templates/templates-devon4j-utils/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/uml/Connector.java b/cobigen-templates/templates-devon4j-utils/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/uml/Connector.java
new file mode 100644
index 0000000000..fd1a9c838d
--- /dev/null
+++ b/cobigen-templates/templates-devon4j-utils/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/uml/Connector.java
@@ -0,0 +1,104 @@
+package com.devonfw.cobigen.templates.devon4j.utils.uml;
+
+/**
+ * Connector is one association between classes in a class diagram. This class is used for storing that data, for later
+ * developing templates.
+ */
+public class Connector {
+
+  private String counterpartName = "";
+
+  private String counterpartMultiplicity = "";
+
+  private String className;
+
+  private String multiplicity;
+
+  final Boolean ISSOURCE;
+
+  final Boolean ISTARGET;
+
+  /**
+   * @param className The name of the connector
+   * @param multiplicity The multiplicity of the target of this connector
+   * @param isSource True if the connector is the source, false if it is the target
+   */
+  public Connector(String className, String multiplicity, boolean isSource) {
+
+    this.className = className;
+    this.multiplicity = multiplicity;
+    this.ISSOURCE = isSource;
+    this.ISTARGET = !isSource;
+  }
+
+  /**
+   * @return className name of the class
+   */
+  public String getClassName() {
+
+    return this.className;
+  }
+
+  /**
+   * @param className name of the class
+   */
+  public void setClassName(String className) {
+
+    this.className = className;
+  }
+
+  /**
+   * @return multiplicity
+   */
+  public String getMultiplicity() {
+
+    return this.multiplicity;
+  }
+
+  /**
+   * @param multiplicity multiplicity of the connection
+   */
+  public void setMultiplicity(String multiplicity) {
+
+    this.multiplicity = multiplicity;
+  }
+
+  /**
+   * @return counterpartName
+   */
+  public String getCounterpartName() {
+
+    return this.counterpartName;
+  }
+
+  /**
+   * @param counterpartName Name of the counter part entity
+   */
+  public void setCounterpartName(String counterpartName) {
+
+    this.counterpartName = counterpartName;
+  }
+
+  /**
+   * @return counterpartMultiplicity
+   */
+  public String getCounterpartMultiplicity() {
+
+    return this.counterpartMultiplicity;
+  }
+
+  /**
+   * @param counterpartMuliplicity multiplicity of the counter part entity
+   */
+  public void setCounterpartMultiplicity(String counterpartMuliplicity) {
+
+    this.counterpartMultiplicity = counterpartMuliplicity;
+  }
+
+  @Override
+  public String toString() {
+
+    return this.ISSOURCE + " " + this.className + " " + this.multiplicity + " --> " + this.counterpartName + " "
+        + this.counterpartMultiplicity + " " + this.ISTARGET;
+  }
+}
diff --git a/cobigen-templates/templates-devon4j/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/uml/UmlUtil.java b/cobigen-templates/templates-devon4j-utils/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/uml/UmlUtil.java
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/uml/UmlUtil.java
rename to cobigen-templates/templates-devon4j-utils/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/uml/UmlUtil.java
diff --git a/cobigen-templates/templates-devon4j-utils/src/main/resources/META-INF/LICENSE.txt b/cobigen-templates/templates-devon4j-utils/src/main/resources/META-INF/LICENSE.txt
new file mode 100644
index 0000000000..49c6980566
--- /dev/null
+++ b/cobigen-templates/templates-devon4j-utils/src/main/resources/META-INF/LICENSE.txt
@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2015-2018 Capgemini SE.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/cobigen-templates/templates-devon4j/src/test/java/com/devonfw/cobigen/templates/devon4j/test/utils/DevonfwUtilTest.java b/cobigen-templates/templates-devon4j-utils/src/test/java/com/devonfw/cobigen/templates/devon4j/test/utils/DevonfwUtilTest.java
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/test/java/com/devonfw/cobigen/templates/devon4j/test/utils/DevonfwUtilTest.java
rename to cobigen-templates/templates-devon4j-utils/src/test/java/com/devonfw/cobigen/templates/devon4j/test/utils/DevonfwUtilTest.java
diff --git a/cobigen-templates/templates-devon4j-utils/src/test/java/com/devonfw/cobigen/templates/devon4j/test/utils/JavaUtilTest.java b/cobigen-templates/templates-devon4j-utils/src/test/java/com/devonfw/cobigen/templates/devon4j/test/utils/JavaUtilTest.java
new file mode 100644
index 0000000000..38ef807a0b
--- /dev/null
+++ b/cobigen-templates/templates-devon4j-utils/src/test/java/com/devonfw/cobigen/templates/devon4j/test/utils/JavaUtilTest.java
@@ -0,0 +1,319 @@
+package com.devonfw.cobigen.templates.devon4j.test.utils;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import com.devonfw.cobigen.templates.devon4j.test.utils.resources.TestClass;
+import com.devonfw.cobigen.templates.devon4j.test.utils.resources.TestTwoClass;
+import com.devonfw.cobigen.templates.devon4j.utils.JavaUtil;
+
+/**
+ * Test class for {@link JavaUtil}
+ */
+public class JavaUtilTest {
+
+    private static Class<?> clazz;
+
+    private static Class<?> clazzTwo;
+
+    @BeforeClass
+    public static void beforeAll() {
+
+        clazz = new TestClass().getClass();
+        clazzTwo = new TestTwoClass().getClass();
+    }
+
+    /**
+     * Tests if {@link JavaUtil#equalsJavaPrimitive(String)} returns true when a
+     * primitive is passed
+     */
+    @Test
+    public void testEqualsJavaPrimitiveWithPrimitive() {
+
+        assertThat(new JavaUtil().equalsJavaPrimitive("int")).isTrue();
+    }
+
+    /**
+     * Tests if {@link JavaUtil#equalsJavaPrimitive(Class&lt;?>,String)} returns
+     * true when a primitive is passed
+     */
+    @Test
+    public void testPojoEqualsJavaPrimitiveWithPrimitive() throws NoSuchFieldException, SecurityException {
+
+        assertThat(new JavaUtil().equalsJavaPrimitive(clazz, "primitive")).isTrue();
+    }
+
+    /**
+     * Tests if {@link JavaUtil#equalsJavaPrimitive(String)} returns false when a
+     * boxed java primitive class is passed
+     */
+    @Test
+    public void testEqualsJavaPrimitiveWithBoxedPrimitive() {
+
+        assertThat(new JavaUtil().equalsJavaPrimitive("Integer")).isFalse();
+    }
+
+    /**
+     * Tests if {@link JavaUtil#equalsJavaPrimitive(Class&lt;?>,String)} returns
+     * false when a boxed java primitive class
+     * is passed
+     */
+    @Test
+    public void testPojoEqualsJavaPrimitiveWithBoxedPrimitive() throws NoSuchFieldException, SecurityException {
+
+        assertThat(new JavaUtil().equalsJavaPrimitive(clazz, "boxed")).isFalse();
+    }
+
+    /**
+     * Tests if {@link JavaUtil#equalsJavaPrimitive(String)} returns false when a
+     * java primitive array is passed
+     */
+    @Test
+    public void testEqualsJavaPrimitiveWithPrimitiveArray() {
+
+        assertThat(new JavaUtil().equalsJavaPrimitive("int[]")).isFalse();
+    }
+
+    /**
+     * Tests if {@link JavaUtil#equalsJavaPrimitive(Class&lt;?>,String)} returns
+     * false when a java primitive array is
+     * passed
+     */
+    @Test
+    public void testPojoEqualsJavaPrimitiveWithPrimitiveArray() throws NoSuchFieldException, SecurityException {
+
+        assertThat(new JavaUtil().equalsJavaPrimitive(clazz, "primitiveArray")).isFalse();
+    }
+
+    /**
+     * Tests if {@link JavaUtil#equalsJavaPrimitive(String)} returns false when a
+     * non-primitive but existing class is
+     * passed
+     */
+    @Test
+    public void testEqualsJavaPrimitiveWOPrimitive() {
+
+        assertThat(new JavaUtil().equalsJavaPrimitive("util.JavaUtilTest")).isFalse();
+    }
+
+    /**
+     * Tests if {@link JavaUtil#equalsJavaPrimitive(Class,String)} returns false
+     * when a non-primitive but existing class
+     * is passed
+     */
+    @Test
+    public void testPojoEqualsJavaPrimitiveWOPrimitive() throws NoSuchFieldException, SecurityException {
+
+        assertThat(new JavaUtil().equalsJavaPrimitive(clazz, "object")).isFalse();
+    }
+
+    /**
+     * Tests if {@link JavaUtil#equalsJavaPrimitive(String)} returns false when a
+     * non-primitive non-existing class is
+     * passed
+     */
+    @Test
+    public void testEqualsJavaPrimitiveWOExistingClass() {
+
+        assertThat(new JavaUtil().equalsJavaPrimitive("DefinitelyNotAClass")).isFalse();
+    }
+
+    /**
+     * Tests if {@link JavaUtil#equalsJavaPrimitive(Class,String)} throws an
+     * exception when a non-existing field is
+     * accessed
+     */
+    @Test(expected = NoSuchFieldException.class)
+    public void testPojoEqualsJavaPrimitiveWOExistingClass() throws NoSuchFieldException, SecurityException {
+
+        assertThat(new JavaUtil().equalsJavaPrimitive(clazz, "definitelyNotAField")).isFalse();
+    }
+
+    /**
+     * Tests if {@link JavaUtil#equalsJavaPrimitiveIncludingArrays(String)} returns
+     * true for a java primitive
+     */
+    @Test
+    public void testEqualsJavaPrimitiveIncludingArrays() {
+
+        assertThat(new JavaUtil().equalsJavaPrimitiveIncludingArrays("int")).isTrue();
+    }
+
+    /**
+     * Tests if {@link JavaUtil#equalsJavaPrimitiveIncludingArrays(Class,String)}
+     * returns true for a java primitive
+     */
+    @Test
+    public void testPojoEqualsJavaPrimitiveIncludingArrays() throws NoSuchFieldException, SecurityException {
+
+        assertThat(new JavaUtil().equalsJavaPrimitiveIncludingArrays(clazz, "primitive")).isTrue();
+    }
+
+    /**
+     * Tests if {@link JavaUtil#equalsJavaPrimitiveIncludingArrays(String)} returns
+     * true for a java primitive array
+     */
+    @Test
+    public void testEqualsJavaPrimitiveIncludingArraysWPrimitiveArray() {
+
+        assertThat(new JavaUtil().equalsJavaPrimitiveIncludingArrays("int[]")).isTrue();
+    }
+
+    /**
+     * Tests if {@link JavaUtil#equalsJavaPrimitiveIncludingArrays(Class,String)}
+     * returns true for a java primitive array
+     */
+    @Test
+    public void testPojoEqualsJavaPrimitiveIncludingArraysWPrimitiveArray()
+            throws NoSuchFieldException, SecurityException {
+
+        assertThat(new JavaUtil().equalsJavaPrimitiveIncludingArrays(clazz, "primitiveArray")).isTrue();
+    }
+
+    /**
+     * Tests if {@link JavaUtil#equalsJavaPrimitiveIncludingArrays(String)} returns
+     * false for a java non-primitive array
+     */
+    @Test
+    public void testEqualsJavaPrimitiveIncludingArraysWArray() {
+
+        assertThat(new JavaUtil().equalsJavaPrimitiveIncludingArrays("Integer[]")).isFalse();
+    }
+
+    /**
+     * Tests if {@link JavaUtil#equalsJavaPrimitiveIncludingArrays(Class,String)}
+     * returns false for a java non-primitive
+     * array
+     */
+    @Test
+    public void testPojoEqualsJavaPrimitiveIncludingArraysWArray() throws NoSuchFieldException, SecurityException {
+
+        assertThat(new JavaUtil().equalsJavaPrimitiveIncludingArrays(clazz, "objectArray")).isFalse();
+    }
+
+    /**
+     * Tests if {@link utils.JavaUtil#boxJavaPrimitives(String)} returns the object
+     * wrapper for a java primitive
+     */
+    @Test
+    public void testBoxJavaPrimitive() throws Exception {
+
+        assertThat(new JavaUtil().boxJavaPrimitives("int")).isEqualTo("Integer");
+    }
+
+    /**
+     * Tests if {@link utils.JavaUtil#boxJavaPrimitives(Class,String)} returns the
+     * object wrapper for a java primitive
+     */
+    @Test
+    public void testPojoBoxJavaPrimitive() throws Exception {
+
+        assertThat(new JavaUtil().boxJavaPrimitives(clazz, "primitive")).isEqualTo("Integer");
+    }
+
+    /**
+     * Tests if {@link utils.JavaUtil#boxJavaPrimitives(String)} returns the input
+     * String for a primitive array
+     */
+    @Test
+    public void testBoxJavaPrimitiveWPrimitiveArray() throws Exception {
+
+        assertThat(new JavaUtil().boxJavaPrimitives("int[]")).isEqualTo("int[]");
+    }
+
+    /**
+     * Tests if {@link utils.JavaUtil#boxJavaPrimitives(Class,String)} returns the
+     * input String for a primitive array
+     */
+    @Test
+    public void testPojoBoxJavaPrimitiveWPrimitiveArray() throws Exception {
+
+        assertThat(new JavaUtil().boxJavaPrimitives(clazz, "primitiveArray")).isEqualTo("int[]");
+    }
+
+    /**
+     * Tests if {@link utils.JavaUtil#boxJavaPrimitives(String)} returns the input
+     * String for a non primitive
+     */
+    @Test
+    public void testBoxJavaPrimitiveWOPrimitive() throws Exception {
+
+        assertThat(new JavaUtil().boxJavaPrimitives("Notint")).isEqualTo("Notint");
+    }
+
+    /**
+     * Tests if {@link utils.JavaUtil#boxJavaPrimitives(Class,String)} returns the
+     * simple type name for a non primitive
+     */
+    @Test
+    public void testPojoBoxJavaPrimitiveWOPrimitive() throws Exception {
+
+        assertThat(new JavaUtil().boxJavaPrimitives(clazz, "object")).isEqualTo("String");
+    }
+
+    /**
+     * tests if {@link utils.JavaUtil#boxJavaPrimitives(String, String)} casts the
+     * var name if it is primitive
+     */
+    @Test
+    public void testCastJavaPrimitiveStatement() throws Exception {
+
+        assertThat(new JavaUtil().castJavaPrimitives("int", "var")).isEqualTo("((Integer)var)");
+    }
+
+    /**
+     * tests if {@link utils.JavaUtil#boxJavaPrimitives(Class,String)} casts the var
+     * name if it is primitive
+     */
+    @Test
+    public void testPojoCastJavaPrimitiveStatement() throws Exception {
+
+        assertThat(new JavaUtil().castJavaPrimitives(clazz, "primitive")).isEqualTo("((Integer)primitive)");
+    }
+
+    /**
+     * tests if {@link utils.JavaUtil#boxJavaPrimitives(String, String)} doesn't
+     * cast the var name if it isn't a primitive
+     */
+    @Test
+    public void testCastJavaPrimitiveStatementWOCast() throws Exception {
+
+        assertThat(new JavaUtil().castJavaPrimitives("Integer", "var")).isEqualTo("");
+    }
+
+    /**
+     * tests if {@link utils.JavaUtil#boxJavaPrimitives(Class,String)} doesn't cast
+     * the var name if it isn't a primitive
+     */
+    @Test
+    public void testPojoCastJavaPrimitiveStatementWOCast() throws Exception {
+
+        assertThat(new JavaUtil().castJavaPrimitives(clazz, "object")).isEqualTo("");
+    }
+
+    /**
+     * tests if the field is {@link java.util.List} or {@link java.util.Set}
+     */
+    @Test
+    public void testIsCollection() throws NoSuchFieldException, SecurityException {
+
+        assertThat(new JavaUtil().isCollection(clazz, "entitys")).isTrue();
+        assertThat(new JavaUtil().isCollection(clazz, "setEntitys")).isTrue();
+        assertThat(new JavaUtil().isCollection(clazz, "boxed")).isFalse();
+    }
+
+    /**
+     * tests if the return type is properly retrieved
+     *
+     * @throws SecurityException
+     * @throws NoSuchMethodException
+     */
+    @Test
+    public void testGetReturnType() throws NoSuchMethodException, SecurityException {
+
+        assertThat(new JavaUtil().getReturnType(clazz, "methodWithReturnType")).isEqualTo("String");
+        assertThat(new JavaUtil().getReturnType(clazz, "methodWithVoidReturnType")).isEqualTo("-");
+    }
+}
\ No newline at end of file
diff --git a/cobigen-templates/templates-devon4j/src/test/java/com/devonfw/cobigen/templates/devon4j/test/utils/documentation/DocumentationUtilTest.java b/cobigen-templates/templates-devon4j-utils/src/test/java/com/devonfw/cobigen/templates/devon4j/test/utils/documentation/DocumentationUtilTest.java
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/test/java/com/devonfw/cobigen/templates/devon4j/test/utils/documentation/DocumentationUtilTest.java
rename to cobigen-templates/templates-devon4j-utils/src/test/java/com/devonfw/cobigen/templates/devon4j/test/utils/documentation/DocumentationUtilTest.java
diff --git a/cobigen-templates/templates-devon4j/src/test/java/com/devonfw/cobigen/templates/devon4j/test/utils/documentation/JavaDocumentationUtilTest.java b/cobigen-templates/templates-devon4j-utils/src/test/java/com/devonfw/cobigen/templates/devon4j/test/utils/documentation/JavaDocumentationUtilTest.java
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/test/java/com/devonfw/cobigen/templates/devon4j/test/utils/documentation/JavaDocumentationUtilTest.java
rename to cobigen-templates/templates-devon4j-utils/src/test/java/com/devonfw/cobigen/templates/devon4j/test/utils/documentation/JavaDocumentationUtilTest.java
diff --git a/cobigen-templates/templates-devon4j/src/test/java/com/devonfw/cobigen/templates/devon4j/test/utils/documentation/OpenApiDocumentationUtilTest.java b/cobigen-templates/templates-devon4j-utils/src/test/java/com/devonfw/cobigen/templates/devon4j/test/utils/documentation/OpenApiDocumentationUtilTest.java
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/test/java/com/devonfw/cobigen/templates/devon4j/test/utils/documentation/OpenApiDocumentationUtilTest.java
rename to cobigen-templates/templates-devon4j-utils/src/test/java/com/devonfw/cobigen/templates/devon4j/test/utils/documentation/OpenApiDocumentationUtilTest.java
diff --git a/cobigen-templates/templates-devon4j/src/test/java/com/devonfw/cobigen/templates/devon4j/test/utils/resources/TestClass.java b/cobigen-templates/templates-devon4j-utils/src/test/java/com/devonfw/cobigen/templates/devon4j/test/utils/resources/TestClass.java
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/test/java/com/devonfw/cobigen/templates/devon4j/test/utils/resources/TestClass.java
rename to cobigen-templates/templates-devon4j-utils/src/test/java/com/devonfw/cobigen/templates/devon4j/test/utils/resources/TestClass.java
diff --git a/cobigen-templates/templates-devon4j/src/test/java/com/devonfw/cobigen/templates/devon4j/test/utils/resources/TestEntity.java b/cobigen-templates/templates-devon4j-utils/src/test/java/com/devonfw/cobigen/templates/devon4j/test/utils/resources/TestEntity.java
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/test/java/com/devonfw/cobigen/templates/devon4j/test/utils/resources/TestEntity.java
rename to cobigen-templates/templates-devon4j-utils/src/test/java/com/devonfw/cobigen/templates/devon4j/test/utils/resources/TestEntity.java
diff --git a/cobigen-templates/templates-devon4j/src/test/java/com/devonfw/cobigen/templates/devon4j/test/utils/resources/TestTwoClass.java b/cobigen-templates/templates-devon4j-utils/src/test/java/com/devonfw/cobigen/templates/devon4j/test/utils/resources/TestTwoClass.java
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/test/java/com/devonfw/cobigen/templates/devon4j/test/utils/resources/TestTwoClass.java
rename to cobigen-templates/templates-devon4j-utils/src/test/java/com/devonfw/cobigen/templates/devon4j/test/utils/resources/TestTwoClass.java
diff --git a/cobigen-templates/templates-devon4j/src/test/java/com/devonfw/cobigen/templates/devon4j/test/utils/resources/dataaccess/api/DeepEntity.java b/cobigen-templates/templates-devon4j-utils/src/test/java/com/devonfw/cobigen/templates/devon4j/test/utils/resources/dataaccess/api/DeepEntity.java
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/test/java/com/devonfw/cobigen/templates/devon4j/test/utils/resources/dataaccess/api/DeepEntity.java
rename to cobigen-templates/templates-devon4j-utils/src/test/java/com/devonfw/cobigen/templates/devon4j/test/utils/resources/dataaccess/api/DeepEntity.java
diff --git a/cobigen-templates/templates-devon4j/src/test/java/com/devonfw/cobigen/templates/devon4j/test/utils/resources/dataaccess/api/TestEntityComponent.java b/cobigen-templates/templates-devon4j-utils/src/test/java/com/devonfw/cobigen/templates/devon4j/test/utils/resources/dataaccess/api/TestEntityComponent.java
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/test/java/com/devonfw/cobigen/templates/devon4j/test/utils/resources/dataaccess/api/TestEntityComponent.java
rename to cobigen-templates/templates-devon4j-utils/src/test/java/com/devonfw/cobigen/templates/devon4j/test/utils/resources/dataaccess/api/TestEntityComponent.java
diff --git a/cobigen-templates/templates-devon4j/src/test/java/com/devonfw/cobigen/templates/devon4j/test/utils/resources/uml/completeUmlXmi.xml b/cobigen-templates/templates-devon4j-utils/src/test/java/com/devonfw/cobigen/templates/devon4j/test/utils/resources/uml/completeUmlXmi.xml
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/test/java/com/devonfw/cobigen/templates/devon4j/test/utils/resources/uml/completeUmlXmi.xml
rename to cobigen-templates/templates-devon4j-utils/src/test/java/com/devonfw/cobigen/templates/devon4j/test/utils/resources/uml/completeUmlXmi.xml
diff --git a/cobigen-templates/templates-devon4j/src/test/java/com/devonfw/cobigen/templates/devon4j/test/utils/uml/UmlUtilTest.java b/cobigen-templates/templates-devon4j-utils/src/test/java/com/devonfw/cobigen/templates/devon4j/test/utils/uml/UmlUtilTest.java
similarity index 97%
rename from cobigen-templates/templates-devon4j/src/test/java/com/devonfw/cobigen/templates/devon4j/test/utils/uml/UmlUtilTest.java
rename to cobigen-templates/templates-devon4j-utils/src/test/java/com/devonfw/cobigen/templates/devon4j/test/utils/uml/UmlUtilTest.java
index 48afed4784..f7cf823447 100644
--- a/cobigen-templates/templates-devon4j/src/test/java/com/devonfw/cobigen/templates/devon4j/test/utils/uml/UmlUtilTest.java
+++ b/cobigen-templates/templates-devon4j-utils/src/test/java/com/devonfw/cobigen/templates/devon4j/test/utils/uml/UmlUtilTest.java
@@ -10,7 +10,6 @@
 import javax.xml.parsers.DocumentBuilderFactory;
 
 import org.apache.commons.io.FileUtils;
-import org.apache.xerces.dom.DeferredNode;
 import org.junit.Before;
 import org.junit.Test;
 import org.w3c.dom.Document;
@@ -88,7 +87,7 @@ private List<Connector> getConnectors() {
       Node connector = connectors.item(i);
       NodeList attributes = connector.getChildNodes();
       for (int j = 0; j < attributes.getLength(); j++) {
-        DeferredNode attr = (DeferredNode) attributes.item(j);
+        Node attr = attributes.item(j);
         if (attr.getNodeName().equals("source")) {
           source = attr;
           NodeList sourceAttributes = attr.getChildNodes();
diff --git a/cobigen-templates/templates-devon4j-utils/src/test/resources/application.properties b/cobigen-templates/templates-devon4j-utils/src/test/resources/application.properties
new file mode 100644
index 0000000000..cf2c614efb
--- /dev/null
+++ b/cobigen-templates/templates-devon4j-utils/src/test/resources/application.properties
@@ -0,0 +1,2 @@
+server.port=8080
+server.context-path=/
\ No newline at end of file
diff --git a/cobigen-templates/templates-devon4j-utils/src/test/resources/logback.xml b/cobigen-templates/templates-devon4j-utils/src/test/resources/logback.xml
new file mode 100644
index 0000000000..5f29165f75
--- /dev/null
+++ b/cobigen-templates/templates-devon4j-utils/src/test/resources/logback.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- This file is for logback classic. The file contains the configuration for slf4j logging -->
+<configuration>
+	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+			<Pattern>%d{HH:mm:ss.SSS} [%thread] [C:%X{correlationId}] - %-5level - %logger{36} - %msg%n
+			</Pattern>
+		</encoder>
+	</appender>
+
+	<root level="INFO">
+		<appender-ref ref="STDOUT" />
+	</root>
+</configuration>
diff --git a/cobigen-templates/templates-devon4j-utils/src/test/resources/testdata/templatetest/TestAllTemplatesEntityInput/logback.xml b/cobigen-templates/templates-devon4j-utils/src/test/resources/testdata/templatetest/TestAllTemplatesEntityInput/logback.xml
new file mode 100644
index 0000000000..5f29165f75
--- /dev/null
+++ b/cobigen-templates/templates-devon4j-utils/src/test/resources/testdata/templatetest/TestAllTemplatesEntityInput/logback.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- This file is for logback classic. The file contains the configuration for slf4j logging -->
+<configuration>
+	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+			<Pattern>%d{HH:mm:ss.SSS} [%thread] [C:%X{correlationId}] - %-5level - %logger{36} - %msg%n
+			</Pattern>
+		</encoder>
+	</appender>
+
+	<root level="INFO">
+		<appender-ref ref="STDOUT" />
+	</root>
+</configuration>
diff --git a/cobigen-templates/templates-devon4j-utils/src/test/resources/testdata/templatetest/TestAllTemplatesEntityInput/pom.xml b/cobigen-templates/templates-devon4j-utils/src/test/resources/testdata/templatetest/TestAllTemplatesEntityInput/pom.xml
new file mode 100644
index 0000000000..530ec2a8c0
--- /dev/null
+++ b/cobigen-templates/templates-devon4j-utils/src/test/resources/testdata/templatetest/TestAllTemplatesEntityInput/pom.xml
@@ -0,0 +1,68 @@
+<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>com.devonfw.cobigen</groupId>
+  <artifactId>devon4jTemplateTest-TestAllTemplatesEntityInput</artifactId>
+  <version>dev-SNAPSHOT</version>
+
+  <properties>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
+  </properties>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>com.devonfw.cobigen</groupId>
+        <artifactId>cobigen-maven-plugin</artifactId>
+        <version>${pluginVersion}</version>
+        <executions>
+          <execution>
+            <id>generate</id>
+            <phase>package</phase>
+            <goals>
+              <goal>generate</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <configurationFolder>${templatesProject}</configurationFolder>
+          <inputFiles>
+            <inputFile>src/main/java/io/github/devonfw/cobigen/generator/dataaccess/api/InputEntity.java</inputFile>
+          </inputFiles>
+          <templates>
+            <template>ALL</template>
+          </templates>
+          <failOnNothingGenerated>true</failOnNothingGenerated>
+        </configuration>
+        <dependencies>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>tempeng-freemarker</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>javaplugin</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>xmlplugin</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>openapiplugin</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>tsplugin</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+        </dependencies>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/cobigen-templates/templates-devon4j-utils/src/test/resources/testdata/templatetest/TestAllTemplatesEntityInput/src/main/java/io/github/devonfw/cobigen/generator/dataaccess/api/InputEntity.java b/cobigen-templates/templates-devon4j-utils/src/test/resources/testdata/templatetest/TestAllTemplatesEntityInput/src/main/java/io/github/devonfw/cobigen/generator/dataaccess/api/InputEntity.java
new file mode 100644
index 0000000000..e2d76c7c9f
--- /dev/null
+++ b/cobigen-templates/templates-devon4j-utils/src/test/resources/testdata/templatetest/TestAllTemplatesEntityInput/src/main/java/io/github/devonfw/cobigen/generator/dataaccess/api/InputEntity.java
@@ -0,0 +1,25 @@
+package io.github.devonfw.cobigen.generator.dataaccess.api;
+
+public class InputEntity {
+    
+    private String input;
+    
+    private int complexity;
+    
+    public String getInput() {
+        return input;
+    }
+    
+    public void setInput(String input) {
+        this.input = input;
+    }
+    
+    public int getComplexity() {
+        return complexity;
+    }
+    
+    public void setComplexity(int complexity) {
+        this.complexity = complexity;
+    }
+    
+}
diff --git a/cobigen-templates/templates-devon4j-utils/src/test/resources/testdata/templatetest/TestAllTemplatesEtoInput/logback.xml b/cobigen-templates/templates-devon4j-utils/src/test/resources/testdata/templatetest/TestAllTemplatesEtoInput/logback.xml
new file mode 100644
index 0000000000..5f29165f75
--- /dev/null
+++ b/cobigen-templates/templates-devon4j-utils/src/test/resources/testdata/templatetest/TestAllTemplatesEtoInput/logback.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- This file is for logback classic. The file contains the configuration for slf4j logging -->
+<configuration>
+	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+			<Pattern>%d{HH:mm:ss.SSS} [%thread] [C:%X{correlationId}] - %-5level - %logger{36} - %msg%n
+			</Pattern>
+		</encoder>
+	</appender>
+
+	<root level="INFO">
+		<appender-ref ref="STDOUT" />
+	</root>
+</configuration>
diff --git a/cobigen-templates/templates-devon4j-utils/src/test/resources/testdata/templatetest/TestAllTemplatesEtoInput/pom.xml b/cobigen-templates/templates-devon4j-utils/src/test/resources/testdata/templatetest/TestAllTemplatesEtoInput/pom.xml
new file mode 100644
index 0000000000..68371aa12b
--- /dev/null
+++ b/cobigen-templates/templates-devon4j-utils/src/test/resources/testdata/templatetest/TestAllTemplatesEtoInput/pom.xml
@@ -0,0 +1,79 @@
+<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>com.devonfw.cobigen</groupId>
+  <artifactId>devon4jTemplateTest-TestAllTemplatesEtoInput</artifactId>
+  <version>dev-SNAPSHOT</version>
+
+  <properties>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
+  </properties>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>com.devonfw.cobigen</groupId>
+        <artifactId>cobigen-maven-plugin</artifactId>
+        <version>${pluginVersion}</version>
+        <executions>
+          <execution>
+            <id>generate</id>
+            <phase>package</phase>
+            <goals>
+              <goal>generate</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <configurationFolder>${templatesProject}</configurationFolder>
+          <inputFiles>
+            <inputFile>src/main/java/io/github/devonfw/cobigen/generator/logic/api/to/InputEto.java</inputFile>
+          </inputFiles>
+          <templates>
+            <template>ALL</template>
+          </templates>
+          <failOnNothingGenerated>true</failOnNothingGenerated>
+        </configuration>
+        <dependencies>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>tempeng-freemarker</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>javaplugin</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>xmlplugin</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>htmlplugin</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>tsplugin</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>jsonplugin</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>openapiplugin</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+        </dependencies>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>
diff --git a/cobigen-templates/templates-devon4j-utils/src/test/resources/testdata/templatetest/TestAllTemplatesEtoInput/src/main/java/io/github/devonfw/cobigen/generator/logic/api/to/InputEto.java b/cobigen-templates/templates-devon4j-utils/src/test/resources/testdata/templatetest/TestAllTemplatesEtoInput/src/main/java/io/github/devonfw/cobigen/generator/logic/api/to/InputEto.java
new file mode 100644
index 0000000000..21ad4eeba9
--- /dev/null
+++ b/cobigen-templates/templates-devon4j-utils/src/test/resources/testdata/templatetest/TestAllTemplatesEtoInput/src/main/java/io/github/devonfw/cobigen/generator/logic/api/to/InputEto.java
@@ -0,0 +1,25 @@
+package io.github.devonfw.cobigen.generator.logic.api.to;
+
+public class InputEto {
+    
+    private String input;
+    
+    private int complexity;
+    
+    public String getInput() {
+        return input;
+    }
+    
+    public void setInput(String input) {
+        this.input = input;
+    }
+    
+    public int getComplexity() {
+        return complexity;
+    }
+    
+    public void setComplexity(int complexity) {
+        this.complexity = complexity;
+    }
+    
+}
diff --git a/cobigen-templates/templates-devon4j-utils/src/test/resources/testdata/templatetest/TestAllTemplatesOpenApiInput/OpenAPI.yaml b/cobigen-templates/templates-devon4j-utils/src/test/resources/testdata/templatetest/TestAllTemplatesOpenApiInput/OpenAPI.yaml
new file mode 100644
index 0000000000..14b9ec10cf
--- /dev/null
+++ b/cobigen-templates/templates-devon4j-utils/src/test/resources/testdata/templatetest/TestAllTemplatesOpenApiInput/OpenAPI.yaml
@@ -0,0 +1,131 @@
+openapi: 3.0.0
+servers:
+  - url: 'https://localhost:8081/server/services/rest'
+info:
+  title: Devon Example
+  description: Example of a API definition
+  version: 1.0.0
+  x-rootpackage: com.devonfw.demo
+paths:
+  /datamanagement/v1/someData/{id}:
+    get:
+      operationId: findSomeData
+      parameters:
+        - name: id
+          in: path
+          required: true
+          schema:
+            type: integer
+            format: int64
+            minimum: 0
+            maximum: 50
+      responses:
+        '200':
+          description: Any
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/EvenMoreData'
+            text/plain:
+              schema:
+                type: string
+  /datamanagement/v1/moreData/{id}:
+    get:
+      operationId: findMoreData
+      parameters:
+        - name: id
+          in: path
+          required: true
+          schema:
+            type: integer
+            format: int64
+            minimum: 10
+            maximum: 200
+      responses:
+        '200':
+          description: Any
+  /datamanagement/v1/someData/:
+    post:
+      responses:
+        '200':
+          description: Any
+      requestBody:
+        $ref: '#/components/requestBodies/SomeData'
+      tags:
+       - searchCriteria
+  /datamanagement/v1/moreData/validateMoreData:
+    post:
+      responses:
+       '200':
+          description: Any
+      requestBody:
+        $ref: '#/components/requestBodies/MoreData'
+components:
+    schemas:
+        SomeData:
+          x-component: DataManagement
+          description: Entity definiton of SomeData
+          type: object
+          properties:
+            AnyString:
+              type: string
+              maxLength: 100
+              minLength: 5
+              uniqueItems: true
+            furtherData:
+              type: array
+              items:
+                $ref: '#/components/schemas/FurtherData'
+        MoreData:
+          x-component: DataManagement
+          description: Entity definiton of Moredata
+          type: object
+          properties:
+            anyNumber:
+              type: number
+              format: int64
+              maximum: 100
+              minimum: 0
+            someData:
+              $ref: '#/components/schemas/SomeData'
+            allSomeData:
+              type: array
+              description: 'All SomeData'
+              items:
+                $ref: '#/components/schemas/SomeData'
+          required:
+            - saleExample
+        FurtherData:
+          x-component: AnotherComponent
+          type: object
+          properties:
+            parent:
+              $ref: '#/components/schemas/SomeData'
+            valid:
+              type: boolean
+            someList:
+              type: array
+              items:
+                type: string
+        EvenMoreData:
+          x-component: AnotherComponent
+          description: Entity definiton of more data
+          type: object
+          properties:
+            id:
+              type: integer
+              format: int64
+              uniqueItems: true
+    requestBodies:
+        SomeData:
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/SomeData'
+          required: true
+        MoreData:
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/MoreData'
+          required: true
diff --git a/cobigen-templates/templates-devon4j-utils/src/test/resources/testdata/templatetest/TestAllTemplatesOpenApiInput/logback.xml b/cobigen-templates/templates-devon4j-utils/src/test/resources/testdata/templatetest/TestAllTemplatesOpenApiInput/logback.xml
new file mode 100644
index 0000000000..5f29165f75
--- /dev/null
+++ b/cobigen-templates/templates-devon4j-utils/src/test/resources/testdata/templatetest/TestAllTemplatesOpenApiInput/logback.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- This file is for logback classic. The file contains the configuration for slf4j logging -->
+<configuration>
+	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+			<Pattern>%d{HH:mm:ss.SSS} [%thread] [C:%X{correlationId}] - %-5level - %logger{36} - %msg%n
+			</Pattern>
+		</encoder>
+	</appender>
+
+	<root level="INFO">
+		<appender-ref ref="STDOUT" />
+	</root>
+</configuration>
diff --git a/cobigen-templates/templates-devon4j-utils/src/test/resources/testdata/templatetest/TestAllTemplatesOpenApiInput/pom.xml b/cobigen-templates/templates-devon4j-utils/src/test/resources/testdata/templatetest/TestAllTemplatesOpenApiInput/pom.xml
new file mode 100644
index 0000000000..7f84fdeef0
--- /dev/null
+++ b/cobigen-templates/templates-devon4j-utils/src/test/resources/testdata/templatetest/TestAllTemplatesOpenApiInput/pom.xml
@@ -0,0 +1,84 @@
+<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>com.devonfw.cobigen</groupId>
+  <artifactId>devon4jTemplateTest-TestAllTemplatesOpenAPIInput</artifactId>
+  <version>dev-SNAPSHOT</version>
+
+  <properties>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
+  </properties>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>com.devonfw.cobigen</groupId>
+        <artifactId>cobigen-maven-plugin</artifactId>
+        <version>${pluginVersion}</version>
+        <executions>
+          <execution>
+            <id>generate</id>
+            <phase>package</phase>
+            <goals>
+              <goal>generate</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <configurationFolder>${templatesProject}</configurationFolder>
+          <inputFiles>
+            <inputFile>OpenAPI.yaml</inputFile>
+          </inputFiles>
+          <templates>
+            <template>ALL</template>
+          </templates>
+          <failOnNothingGenerated>true</failOnNothingGenerated>
+        </configuration>
+        <dependencies>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>tempeng-freemarker</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>javaplugin</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>htmlplugin</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>tsplugin</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>jsonplugin</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>openapiplugin</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>xmlplugin</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>textmerger</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+        </dependencies>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>
diff --git a/cobigen-templates/templates-devon4j-utils/src/test/resources/testdata/templatetest/TestAllTemplatesRestServiceInput/logback.xml b/cobigen-templates/templates-devon4j-utils/src/test/resources/testdata/templatetest/TestAllTemplatesRestServiceInput/logback.xml
new file mode 100644
index 0000000000..29e5047b5f
--- /dev/null
+++ b/cobigen-templates/templates-devon4j-utils/src/test/resources/testdata/templatetest/TestAllTemplatesRestServiceInput/logback.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- This file is for logback classic. The file contains the configuration for slf4j logging -->
+<configuration>
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+      <Pattern>%d{HH:mm:ss.SSS} [%thread] [C:%X{correlationId}] - %-5level - %logger{36} - %msg%n
+      </Pattern>
+    </encoder>
+  </appender>
+
+  <root level="INFO">
+    <appender-ref ref="STDOUT" />
+  </root>
+</configuration>
diff --git a/cobigen-templates/templates-devon4j-utils/src/test/resources/testdata/templatetest/TestAllTemplatesRestServiceInput/pom.xml b/cobigen-templates/templates-devon4j-utils/src/test/resources/testdata/templatetest/TestAllTemplatesRestServiceInput/pom.xml
new file mode 100644
index 0000000000..0e1900e9dd
--- /dev/null
+++ b/cobigen-templates/templates-devon4j-utils/src/test/resources/testdata/templatetest/TestAllTemplatesRestServiceInput/pom.xml
@@ -0,0 +1,88 @@
+<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>com.devonfw.cobigen</groupId>
+  <artifactId>devon4jTemplateTest-TestAllTemplatesRestServiceInput</artifactId>
+  <version>dev-SNAPSHOT</version>
+
+  <properties>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>javax.ws.rs</groupId>
+      <artifactId>javax.ws.rs-api</artifactId>
+      <version>2.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.data</groupId>
+      <artifactId>spring-data-rest-webmvc</artifactId>
+      <version>3.7.10</version>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>com.devonfw.cobigen</groupId>
+        <artifactId>cobigen-maven-plugin</artifactId>
+        <version>${pluginVersion}</version>
+        <executions>
+          <execution>
+            <id>generate</id>
+            <phase>package</phase>
+            <goals>
+              <goal>generate</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <configurationFolder>${templatesProject}</configurationFolder>
+          <inputFiles>
+            <inputFile>src/main/java/io/github/devonfw/cobigen/generator/service/api/rest/InputNoAnnotationsRestService.java</inputFile>
+            <inputFile>src/main/java/io/github/devonfw/cobigen/generator/service/api/rest/JavaxAnnotationsInputRestService.java</inputFile>
+            <inputFile>src/main/java/io/github/devonfw/cobigen/generator/service/api/rest/SpringAnnotationsInputRestService.java</inputFile>
+          </inputFiles>
+          <templates>
+            <template>ALL</template>
+          </templates>
+          <failOnNothingGenerated>true</failOnNothingGenerated>
+        </configuration>
+        <dependencies>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>tempeng-freemarker</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>javaplugin</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>xmlplugin</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>openapiplugin</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>textmerger</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>tsplugin</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+        </dependencies>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/cobigen-templates/templates-devon4j-utils/src/test/resources/testdata/templatetest/TestAllTemplatesRestServiceInput/src/main/java/io/github/devonfw/cobigen/generator/service/api/rest/InputNoAnnotationsRestService.java b/cobigen-templates/templates-devon4j-utils/src/test/resources/testdata/templatetest/TestAllTemplatesRestServiceInput/src/main/java/io/github/devonfw/cobigen/generator/service/api/rest/InputNoAnnotationsRestService.java
new file mode 100644
index 0000000000..d39f130981
--- /dev/null
+++ b/cobigen-templates/templates-devon4j-utils/src/test/resources/testdata/templatetest/TestAllTemplatesRestServiceInput/src/main/java/io/github/devonfw/cobigen/generator/service/api/rest/InputNoAnnotationsRestService.java
@@ -0,0 +1,11 @@
+package io.github.devonfw.cobigen.generator.service.api.rest;
+
+public interface InputNoAnnotationsRestService {
+
+  public String getVisitor(long id);
+
+  public String saveVisitor(String visitor);
+
+  public void deleteVisitor(long id);
+
+}
\ No newline at end of file
diff --git a/cobigen-templates/templates-devon4j-utils/src/test/resources/testdata/templatetest/TestAllTemplatesRestServiceInput/src/main/java/io/github/devonfw/cobigen/generator/service/api/rest/JavaxAnnotationsInputRestService.java b/cobigen-templates/templates-devon4j-utils/src/test/resources/testdata/templatetest/TestAllTemplatesRestServiceInput/src/main/java/io/github/devonfw/cobigen/generator/service/api/rest/JavaxAnnotationsInputRestService.java
new file mode 100644
index 0000000000..4065952fc9
--- /dev/null
+++ b/cobigen-templates/templates-devon4j-utils/src/test/resources/testdata/templatetest/TestAllTemplatesRestServiceInput/src/main/java/io/github/devonfw/cobigen/generator/service/api/rest/JavaxAnnotationsInputRestService.java
@@ -0,0 +1,46 @@
+package io.github.devonfw.cobigen.generator.service.api.rest;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+@Path("/test/v1")
+@Consumes(MediaType.APPLICATION_JSON)
+@Produces(MediaType.APPLICATION_JSON)
+public interface JavaxAnnotationsInputRestService {
+
+  /**
+   * Delegates to nothing.
+   *
+   * @param id the ID of nothing
+   * @return nothing really
+   */
+  @GET
+  @Path("/test1/{id}/")
+  public String getVisitor(long id);
+
+  /**
+   * Delegates to nothing.
+   *
+   * @param nothing actually
+   * @return apparently a String
+   */
+  @POST
+  @Path("/test/")
+  public String saveVisitor(String test);
+
+  /**
+   * Delegates to nothing.
+   *
+   * @param id ID of nothing to be deleted
+   */
+  @DELETE
+  @Path("/test2/{id}/")
+  public void deleteVisitor(long id);
+
+}
\ No newline at end of file
diff --git a/cobigen-templates/templates-devon4j-utils/src/test/resources/testdata/templatetest/TestAllTemplatesRestServiceInput/src/main/java/io/github/devonfw/cobigen/generator/service/api/rest/SpringAnnotationsInputRestService.java b/cobigen-templates/templates-devon4j-utils/src/test/resources/testdata/templatetest/TestAllTemplatesRestServiceInput/src/main/java/io/github/devonfw/cobigen/generator/service/api/rest/SpringAnnotationsInputRestService.java
new file mode 100644
index 0000000000..27857ca508
--- /dev/null
+++ b/cobigen-templates/templates-devon4j-utils/src/test/resources/testdata/templatetest/TestAllTemplatesRestServiceInput/src/main/java/io/github/devonfw/cobigen/generator/service/api/rest/SpringAnnotationsInputRestService.java
@@ -0,0 +1,38 @@
+package io.github.devonfw.cobigen.generator.service.api.rest;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+@RequestMapping("/test/v1")
+public interface SpringAnnotationsInputRestService {
+
+    /**
+     * Delegates to nothing.
+     *
+     * @param id
+     *            the ID of nothing
+     * @return nothing really
+     */
+    @RequestMapping(path = "/test1/{id}/", method = RequestMethod.GET)
+    public String getVisitor(long id);
+
+    /**
+     * Delegates to nothing.
+     *
+     * @param nothing
+     *            actually
+     * @return apparently a String
+     */
+    @RequestMapping(path = "/test/", method = RequestMethod.POST)
+    public String saveVisitor(String test);
+
+    /**
+     * Delegates to nothing.
+     *
+     * @param id
+     *            ID of nothing to be deleted
+     */
+    @RequestMapping(path = "/test2/{id}/", method = RequestMethod.DELETE)
+    public void deleteVisitor(long id);
+
+}
\ No newline at end of file
diff --git a/cobigen-templates/templates-devon4j-utils/src/test/resources/testdata/templatetest/TestAllTemplatesToInput/logback.xml b/cobigen-templates/templates-devon4j-utils/src/test/resources/testdata/templatetest/TestAllTemplatesToInput/logback.xml
new file mode 100644
index 0000000000..29e5047b5f
--- /dev/null
+++ b/cobigen-templates/templates-devon4j-utils/src/test/resources/testdata/templatetest/TestAllTemplatesToInput/logback.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- This file is for logback classic. The file contains the configuration for slf4j logging -->
+<configuration>
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+      <Pattern>%d{HH:mm:ss.SSS} [%thread] [C:%X{correlationId}] - %-5level - %logger{36} - %msg%n
+      </Pattern>
+    </encoder>
+  </appender>
+
+  <root level="INFO">
+    <appender-ref ref="STDOUT" />
+  </root>
+</configuration>
diff --git a/cobigen-templates/templates-devon4j-utils/src/test/resources/testdata/templatetest/TestAllTemplatesToInput/pom.xml b/cobigen-templates/templates-devon4j-utils/src/test/resources/testdata/templatetest/TestAllTemplatesToInput/pom.xml
new file mode 100644
index 0000000000..3a401be638
--- /dev/null
+++ b/cobigen-templates/templates-devon4j-utils/src/test/resources/testdata/templatetest/TestAllTemplatesToInput/pom.xml
@@ -0,0 +1,82 @@
+<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>com.devonfw.cobigen</groupId>
+  <artifactId>devon4jTemplateTest-TestAllTemplatesToInput</artifactId>
+  <version>dev-SNAPSHOT</version>
+
+  <properties>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>io.swagger</groupId>
+      <artifactId>swagger-annotations</artifactId>
+      <version>1.5.19</version>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>com.devonfw.cobigen</groupId>
+        <artifactId>cobigen-maven-plugin</artifactId>
+        <version>${pluginVersion}</version>
+        <executions>
+          <execution>
+            <id>generate</id>
+            <phase>package</phase>
+            <goals>
+              <goal>generate</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <configurationFolder>${templatesProject}</configurationFolder>
+          <inputFiles>
+            <inputFile>src/main/java/io/github/devonfw/cobigen/generator/service/api/rest/InputNoAnnotationsTo.java</inputFile>
+            <inputFile>src/main/java/io/github/devonfw/cobigen/generator/service/api/rest/InputTo.java</inputFile>
+          </inputFiles>
+          <templates>
+            <template>ALL</template>
+          </templates>
+          <failOnNothingGenerated>true</failOnNothingGenerated>
+        </configuration>
+        <dependencies>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>tempeng-freemarker</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>javaplugin</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>xmlplugin</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>openapiplugin</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>textmerger</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>tsplugin</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+        </dependencies>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/cobigen-templates/templates-devon4j-utils/src/test/resources/testdata/templatetest/TestAllTemplatesToInput/src/main/java/io/github/devonfw/cobigen/generator/service/api/rest/InputNoAnnotationsTo.java b/cobigen-templates/templates-devon4j-utils/src/test/resources/testdata/templatetest/TestAllTemplatesToInput/src/main/java/io/github/devonfw/cobigen/generator/service/api/rest/InputNoAnnotationsTo.java
new file mode 100644
index 0000000000..8679556758
--- /dev/null
+++ b/cobigen-templates/templates-devon4j-utils/src/test/resources/testdata/templatetest/TestAllTemplatesToInput/src/main/java/io/github/devonfw/cobigen/generator/service/api/rest/InputNoAnnotationsTo.java
@@ -0,0 +1,46 @@
+package io.github.devonfw.cobigen.generator.service.data;
+
+/**
+ * Transfer object for an address.
+ */
+public class InputNoAnnotationsTo {
+
+  /** Test */
+  private String test;
+
+  /** Test2 */
+  private String testTwo;
+
+
+  /**
+   * @param test new value of {@link #gettest}.
+   */
+  public void setTest(String test) {
+
+    this.test = test;
+  }
+  
+  /**
+   * @return test
+   */
+  public String getTest() {
+
+    return this.test;
+  }
+
+  /**
+   * @return testTwo
+   */
+  public String getTestTwo() {
+
+    return this.testTwo;
+  }
+
+  /**
+   * @param testTwo new value of {@link #testTwo}.
+   */
+  public void setTestTwo(String testTwo) {
+
+    this.testTwo = testTwo;
+  }
+}
\ No newline at end of file
diff --git a/cobigen-templates/templates-devon4j-utils/src/test/resources/testdata/templatetest/TestAllTemplatesToInput/src/main/java/io/github/devonfw/cobigen/generator/service/api/rest/InputTo.java b/cobigen-templates/templates-devon4j-utils/src/test/resources/testdata/templatetest/TestAllTemplatesToInput/src/main/java/io/github/devonfw/cobigen/generator/service/api/rest/InputTo.java
new file mode 100644
index 0000000000..76e2bdd36a
--- /dev/null
+++ b/cobigen-templates/templates-devon4j-utils/src/test/resources/testdata/templatetest/TestAllTemplatesToInput/src/main/java/io/github/devonfw/cobigen/generator/service/api/rest/InputTo.java
@@ -0,0 +1,59 @@
+package io.github.devonfw.cobigen.generator.service.data;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * Transfer object for an address.
+ */
+@ApiModel
+public class InputTo {
+
+  /** 
+   * Test 
+   * @value test
+   * @required true
+   * @example test
+   * @datatype test
+   * @emptyvalue false
+   * */
+  @ApiModelProperty(value = "test", required = true, example = "test")
+  private String test;
+
+  /** Test2 */
+  @ApiModelProperty(value = "test2", required = true, example = "test2")
+  private String testTwo;
+
+
+  /**
+   * @param test new value of {@link #gettest}.
+   */
+  public void setTest(String test) {
+
+    this.test = test;
+  }
+  
+  /**
+   * @return test
+   */
+  public String getTest() {
+
+    return this.test;
+  }
+
+  /**
+   * @return testTwo
+   */
+  public String getTestTwo() {
+
+    return this.testTwo;
+  }
+
+  /**
+   * @param testTwo new value of {@link #testTwo}.
+   */
+  public void setTestTwo(String testTwo) {
+
+    this.testTwo = testTwo;
+  }
+}
\ No newline at end of file
diff --git a/cobigen-templates/templates-devon4j-utils/src/test/resources/testdata/templatetest/TestAllTemplatesXMLInput/logback.xml b/cobigen-templates/templates-devon4j-utils/src/test/resources/testdata/templatetest/TestAllTemplatesXMLInput/logback.xml
new file mode 100644
index 0000000000..29e5047b5f
--- /dev/null
+++ b/cobigen-templates/templates-devon4j-utils/src/test/resources/testdata/templatetest/TestAllTemplatesXMLInput/logback.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- This file is for logback classic. The file contains the configuration for slf4j logging -->
+<configuration>
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+      <Pattern>%d{HH:mm:ss.SSS} [%thread] [C:%X{correlationId}] - %-5level - %logger{36} - %msg%n
+      </Pattern>
+    </encoder>
+  </appender>
+
+  <root level="INFO">
+    <appender-ref ref="STDOUT" />
+  </root>
+</configuration>
diff --git a/cobigen-templates/templates-devon4j-utils/src/test/resources/testdata/templatetest/TestAllTemplatesXMLInput/pom.xml b/cobigen-templates/templates-devon4j-utils/src/test/resources/testdata/templatetest/TestAllTemplatesXMLInput/pom.xml
new file mode 100644
index 0000000000..57252bf691
--- /dev/null
+++ b/cobigen-templates/templates-devon4j-utils/src/test/resources/testdata/templatetest/TestAllTemplatesXMLInput/pom.xml
@@ -0,0 +1,73 @@
+<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>com.devonfw</groupId>
+  <artifactId>devon4jTemplateTest-TestAllTemplatesXMLInput</artifactId>
+  <version>dev-SNAPSHOT</version>
+
+  <properties>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
+  </properties>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>com.devonfw.cobigen</groupId>
+        <artifactId>cobigen-maven-plugin</artifactId>
+        <version>${pluginVersion}</version>
+        <executions>
+          <execution>
+            <id>generate</id>
+            <phase>package</phase>
+            <goals>
+              <goal>generate</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <configurationFolder>${templatesProject}</configurationFolder>
+          <inputFiles>
+            <inputFile>src/main/xml/io/github/devonfw/cobigen/generator/dataaccess/api/Input.xml</inputFile>
+          </inputFiles>
+          <templates>
+            <template>ALL</template>
+          </templates>
+          <failOnNothingGenerated>true</failOnNothingGenerated>
+        </configuration>
+        <dependencies>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>tempeng-freemarker</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>javaplugin</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>xmlplugin</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>openapiplugin</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>textmerger</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>tsplugin</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+        </dependencies>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/cobigen-templates/templates-devon4j-utils/src/test/resources/testdata/templatetest/TestAllTemplatesXMLInput/src/main/xml/io/github/devonfw/cobigen/generator/dataaccess/api/Input.xml b/cobigen-templates/templates-devon4j-utils/src/test/resources/testdata/templatetest/TestAllTemplatesXMLInput/src/main/xml/io/github/devonfw/cobigen/generator/dataaccess/api/Input.xml
new file mode 100644
index 0000000000..4073f5c5eb
--- /dev/null
+++ b/cobigen-templates/templates-devon4j-utils/src/test/resources/testdata/templatetest/TestAllTemplatesXMLInput/src/main/xml/io/github/devonfw/cobigen/generator/dataaccess/api/Input.xml
@@ -0,0 +1,391 @@
+<?xml version="1.0" encoding="windows-1252"?>
+<xmi:XMI xmi:version="2.1" xmlns:uml="http://schema.omg.org/spec/UML/2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1">
+  <xmi:Documentation exporter="Enterprise Architect" exporterVersion="6.5"/>
+  <uml:Model xmi:type="uml:Model" name="EA_Model" visibility="public">
+    <packagedElement xmi:type="uml:Package" xmi:id="EAPK_329F83E4_CA77_40af_968A_101D9A0AB879" name="Model" visibility="public">
+      <packagedElement xmi:type="uml:Package" xmi:id="EAPK_9C189016_9A46_4c58_B9E3_4E25FA3ACA35" name="Class Model" visibility="public">
+        <packagedElement xmi:type="uml:Package" xmi:id="EAPK_306CDA5C_B1A7_4c42_BA18_EE56F915E786" name="Schoolmanagement" visibility="public">
+          <packagedElement xmi:type="uml:Class" xmi:id="EAID_1D7DCE81_651D_40f2_A6E5_A522CF6E0C64" name="Marks" visibility="public">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="EAID_74D55CAA_D22A_46b3_BE6E_7F074B8BDE5E" name="attributeExample" visibility="private" isStatic="false" isReadOnly="false" isDerived="false" isOrdered="false" isUnique="true" isDerivedUnion="false">
+              <lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000001_D22A_46b3_BE6E_7F074B8BDE5E" value="1"/>
+              <upperValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000002_D22A_46b3_BE6E_7F074B8BDE5E" value="1"/>
+              <type xmi:idref="EAJava_int"/>
+            </ownedAttribute>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Association" xmi:id="EAID_396CC69C_ECD0_483d_BE28_A972782B7A05" visibility="public">
+            <memberEnd xmi:idref="EAID_dst6CC69C_ECD0_483d_BE28_A972782B7A05"/>
+            <memberEnd xmi:idref="EAID_src6CC69C_ECD0_483d_BE28_A972782B7A05"/>
+            <ownedEnd xmi:type="uml:Property" xmi:id="EAID_src6CC69C_ECD0_483d_BE28_A972782B7A05" visibility="public" association="EAID_396CC69C_ECD0_483d_BE28_A972782B7A05" isStatic="false" isReadOnly="false" isDerived="false" isOrdered="false" isUnique="true" isDerivedUnion="false" aggregation="none">
+              <type xmi:idref="EAID_4509184A_D724_495f_AAEB_1ACE1AD90879"/>
+              <lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000003__ECD0_483d_BE28_A972782B7A05" value="1"/>
+              <upperValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000004__ECD0_483d_BE28_A972782B7A05" value="1"/>
+            </ownedEnd>
+            <ownedEnd xmi:type="uml:Property" xmi:id="EAID_dst6CC69C_ECD0_483d_BE28_A972782B7A05" visibility="public" association="EAID_396CC69C_ECD0_483d_BE28_A972782B7A05" isStatic="false" isReadOnly="false" isDerived="false" isOrdered="false" isUnique="true" isDerivedUnion="false" aggregation="none">
+              <type xmi:idref="EAID_1D7DCE81_651D_40f2_A6E5_A522CF6E0C64"/>
+              <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000005__ECD0_483d_BE28_A972782B7A05" value="-1"/>
+              <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000006__ECD0_483d_BE28_A972782B7A05" value="-1"/>
+            </ownedEnd>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Class" xmi:id="EAID_4509184A_D724_495f_AAEB_1ACE1AD90879" name="Student" visibility="public">
+            <ownedOperation xmi:id="EAID_15243897_6472_43aa_8FBC_246812EF64D6" name="newOperation" visibility="public" concurrency="sequential">
+              <ownedParameter xmi:id="EAID_A65764ED_E71B_4ce1_9617_C9DC6E19FE3C" name="indice" direction="in" isStream="false" isException="false" isOrdered="false" isUnique="true" type="EAJava_int"/>
+              <ownedParameter xmi:id="EAID_RT000000_6472_43aa_8FBC_246812EF64D6" name="return" direction="return" type="EAJava_long"/>
+            </ownedOperation>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Association" xmi:id="EAID_2D621F9A_B9C0_4c51_BF4A_9321E2A8B598" visibility="public">
+            <memberEnd xmi:idref="EAID_dst621F9A_B9C0_4c51_BF4A_9321E2A8B598"/>
+            <memberEnd xmi:idref="EAID_src621F9A_B9C0_4c51_BF4A_9321E2A8B598"/>
+            <ownedEnd xmi:type="uml:Property" xmi:id="EAID_src621F9A_B9C0_4c51_BF4A_9321E2A8B598" visibility="public" association="EAID_2D621F9A_B9C0_4c51_BF4A_9321E2A8B598" isStatic="false" isReadOnly="false" isDerived="false" isOrdered="false" isUnique="true" isDerivedUnion="false" aggregation="none">
+              <type xmi:idref="EAID_6EA6FC61_FB9B_4e8e_98A1_30BD386AEA9A"/>
+              <lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000007__B9C0_4c51_BF4A_9321E2A8B598" value="1"/>
+              <upperValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000008__B9C0_4c51_BF4A_9321E2A8B598" value="1"/>
+            </ownedEnd>
+            <ownedEnd xmi:type="uml:Property" xmi:id="EAID_dst621F9A_B9C0_4c51_BF4A_9321E2A8B598" visibility="public" association="EAID_2D621F9A_B9C0_4c51_BF4A_9321E2A8B598" isStatic="false" isReadOnly="false" isDerived="false" isOrdered="false" isUnique="true" isDerivedUnion="false" aggregation="none">
+              <type xmi:idref="EAID_4509184A_D724_495f_AAEB_1ACE1AD90879"/>
+              <lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000013__B9C0_4c51_BF4A_9321E2A8B598" value="1"/>
+              <upperValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000014__B9C0_4c51_BF4A_9321E2A8B598" value="1"/>
+            </ownedEnd>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Association" xmi:id="EAID_6987A295_068B_4b57_995E_4EC9EE43D131" visibility="public">
+            <memberEnd xmi:idref="EAID_dst87A295_068B_4b57_995E_4EC9EE43D131"/>
+            <memberEnd xmi:idref="EAID_src87A295_068B_4b57_995E_4EC9EE43D131"/>
+            <ownedEnd xmi:type="uml:Property" xmi:id="EAID_src87A295_068B_4b57_995E_4EC9EE43D131" visibility="public" association="EAID_6987A295_068B_4b57_995E_4EC9EE43D131" isStatic="false" isReadOnly="false" isDerived="false" isOrdered="false" isUnique="true" isDerivedUnion="false" aggregation="none">
+              <type xmi:idref="EAID_C2E366C0_510F_4145_B650_110537B98360"/>
+              <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000009__068B_4b57_995E_4EC9EE43D131" value="-1"/>
+              <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000010__068B_4b57_995E_4EC9EE43D131" value="-1"/>
+            </ownedEnd>
+            <ownedEnd xmi:type="uml:Property" xmi:id="EAID_dst87A295_068B_4b57_995E_4EC9EE43D131" visibility="public" association="EAID_6987A295_068B_4b57_995E_4EC9EE43D131" isStatic="false" isReadOnly="false" isDerived="false" isOrdered="false" isUnique="true" isDerivedUnion="false" aggregation="none">
+              <type xmi:idref="EAID_4509184A_D724_495f_AAEB_1ACE1AD90879"/>
+              <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000011__068B_4b57_995E_4EC9EE43D131" value="-1"/>
+              <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000012__068B_4b57_995E_4EC9EE43D131" value="-1"/>
+            </ownedEnd>
+          </packagedElement>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Package" xmi:id="EAPK_2BEE9025_81F1_4585_ADA3_BDFB6731DA6D" name="usermanagement" visibility="public">
+          <packagedElement xmi:type="uml:Class" xmi:id="EAID_C2E366C0_510F_4145_B650_110537B98360" name="User" visibility="public"/>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Package" xmi:id="EAPK_A3EEA6C1_792B_40ae_AB55_E9B28FAA7326" name="Workersmanagement" visibility="public">
+          <packagedElement xmi:type="uml:Class" xmi:id="EAID_6EA6FC61_FB9B_4e8e_98A1_30BD386AEA9A" name="Teacher" visibility="public"/>
+        </packagedElement>
+      </packagedElement>
+    </packagedElement>
+  </uml:Model>
+  <xmi:Extension extender="Enterprise Architect" extenderID="6.5">
+    <elements>
+      <element xmi:idref="EAPK_329F83E4_CA77_40af_968A_101D9A0AB879">
+        <packageproperties/>
+        <paths/>
+        <times created="2012-04-17 00:00:00" modified="2012-04-17 00:00:00" lastloaddate="2017-10-31 13:24:25"/>
+        <flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE" packageFlags="isModel=1;"/>
+      </element>
+      <element xmi:idref="EAPK_9C189016_9A46_4c58_B9E3_4E25FA3ACA35" xmi:type="uml:Package" name="Class Model" scope="public">
+        <model package2="EAID_9C189016_9A46_4c58_B9E3_4E25FA3ACA35" package="EAPK_329F83E4_CA77_40af_968A_101D9A0AB879" tpos="6" ea_localid="2" ea_eleType="package"/>
+        <properties isSpecification="false" sType="Package" nType="0" scope="public"/>
+        <project author="jdiazgon" phase="1.0" created="2017-10-31 10:46:40" modified="2017-10-31 10:46:40" complexity="1" status="Proposed"/>
+        <code/>
+        <style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+        <tags/>
+        <xrefs/>
+        <extendedProperties tagged="0" package_name="Model"/>
+        <packageproperties tpos="6"/>
+        <paths/>
+        <times created="2017-10-31 10:46:40" modified="2017-10-31 10:46:40" lastloaddate="2017-10-31 11:59:49" lastsavedate="2017-10-31 10:46:40"/>
+        <flags iscontrolled="FALSE" isnamespace="1" isprotected="FALSE" batchsave="0" batchload="0" usedtd="FALSE" logxml="FALSE" packageFlags="isModel=1;VICON=3;"/>
+      </element>
+      <element xmi:idref="EAPK_306CDA5C_B1A7_4c42_BA18_EE56F915E786" xmi:type="uml:Package" name="Schoolmanagement" scope="public">
+        <model package2="EAID_306CDA5C_B1A7_4c42_BA18_EE56F915E786" package="EAPK_9C189016_9A46_4c58_B9E3_4E25FA3ACA35" tpos="0" ea_localid="6" ea_eleType="package"/>
+        <properties isSpecification="false" sType="Package" nType="0" scope="public"/>
+        <project author="jdiazgon" version="1.0" phase="1.0" created="2017-10-31 10:52:03" modified="2017-10-31 13:16:51" complexity="1" status="Proposed"/>
+        <code gentype="Java"/>
+        <style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+        <tags/>
+        <xrefs/>
+        <extendedProperties tagged="0" package_name="Class Model"/>
+        <packageproperties version="1.0"/>
+        <paths/>
+        <times created="2017-10-31 10:52:03" modified="2017-10-31 12:54:32"/>
+        <flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
+      </element>
+      <element xmi:idref="EAID_1D7DCE81_651D_40f2_A6E5_A522CF6E0C64" xmi:type="uml:Class" name="Marks" scope="public">
+        <model package="EAPK_306CDA5C_B1A7_4c42_BA18_EE56F915E786" tpos="0" ea_localid="10" ea_eleType="element"/>
+        <properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+        <project author="jdiazgon" version="1.0" phase="1.0" created="2017-10-31 10:46:40" modified="2017-10-31 10:52:42" complexity="1" status="Proposed"/>
+        <code gentype="Java"/>
+        <style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+        <tags/>
+        <xrefs value="$XREFPROP=$XID={EA26F31B-AFB5-4d88-9F7E-3E439464AC42}$XID;$NAM=CustomProperties$NAM;$TYP=element property$TYP;$VIS=Public$VIS;$DES=@PROP=@NAME=isActive@ENDNAME;@TYPE=Boolean@ENDTYPE;@VALU=@ENDVALU;@PRMT=@ENDPRMT;@ENDPROP;$DES;$CLT={1D7DCE81-651D-40f2-A6E5-A522CF6E0C64}$CLT;$ENDXREF;"/>
+        <extendedProperties tagged="0" package_name="Schoolmanagement" eventflags="LNK=68d2;"/>
+        <attributes>
+          <attribute xmi:idref="EAID_74D55CAA_D22A_46b3_BE6E_7F074B8BDE5E" name="attributeExample" scope="Private">
+            <initial/>
+            <documentation/>
+            <model ea_localid="1" ea_guid="{74D55CAA-D22A-46b3-BE6E-7F074B8BDE5E}"/>
+            <properties type="int" collection="false" duplicates="0" changeability="changeable"/>
+            <coords ordered="0"/>
+            <containment containment="Not Specified" position="0"/>
+            <stereotype/>
+            <bounds lower="1" upper="1"/>
+            <options/>
+            <style/>
+            <styleex value="volatile=0;"/>
+            <tags/>
+            <xrefs/>
+          </attribute>
+        </attributes>
+        <links>
+          <Association xmi:id="EAID_396CC69C_ECD0_483d_BE28_A972782B7A05" start="EAID_4509184A_D724_495f_AAEB_1ACE1AD90879" end="EAID_1D7DCE81_651D_40f2_A6E5_A522CF6E0C64"/>
+        </links>
+      </element>
+      <element xmi:idref="EAID_4509184A_D724_495f_AAEB_1ACE1AD90879" xmi:type="uml:Class" name="Student" scope="public">
+        <model package="EAPK_306CDA5C_B1A7_4c42_BA18_EE56F915E786" tpos="0" ea_localid="84" ea_eleType="element"/>
+        <properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+        <project author="jdiazgon" version="1.0" phase="1.0" created="2017-10-31 13:07:54" modified="2017-10-31 13:08:06" complexity="1" status="Proposed"/>
+        <code product_name="Java" gentype="Java"/>
+        <style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+        <tags/>
+        <xrefs/>
+        <extendedProperties tagged="0" package_name="Schoolmanagement"/>
+        <operations>
+          <operation xmi:idref="EAID_15243897_6472_43aa_8FBC_246812EF64D6" name="newOperation" scope="Public">
+            <properties position="0"/>
+            <stereotype/>
+            <model ea_guid="{15243897-6472-43aa-8FBC-246812EF64D6}" ea_localid="1"/>
+            <type type="long" const="false" static="false" isAbstract="false" synchronised="0" concurrency="Sequential" pure="0" isQuery="false"/>
+            <behaviour/>
+            <code/>
+            <style/>
+            <styleex/>
+            <documentation/>
+            <tags/>
+            <parameters>
+              <parameter xmi:idref="EAID_RETURNID_6472_43aa_8FBC_246812EF64D6" visibility="public">
+                <properties pos="0" type="long" const="false" ea_guid="{RETURNID-6472-43aa-8FBC-246812EF64D6}"/>
+                <style/>
+                <styleex/>
+                <documentation/>
+                <tags/>
+                <xrefs/>
+              </parameter>
+              <parameter xmi:idref="EAID_A65764ED_E71B_4ce1_9617_C9DC6E19FE3C" visibility="public">
+                <properties pos="0" type="int" const="false" ea_guid="{A65764ED-E71B-4ce1-9617-C9DC6E19FE3C}"/>
+                <style/>
+                <styleex/>
+                <documentation/>
+                <tags/>
+                <xrefs/>
+              </parameter>
+            </parameters>
+            <xrefs/>
+          </operation>
+        </operations>
+        <links>
+          <Association xmi:id="EAID_396CC69C_ECD0_483d_BE28_A972782B7A05" start="EAID_4509184A_D724_495f_AAEB_1ACE1AD90879" end="EAID_1D7DCE81_651D_40f2_A6E5_A522CF6E0C64"/>
+          <Association xmi:id="EAID_2D621F9A_B9C0_4c51_BF4A_9321E2A8B598" start="EAID_6EA6FC61_FB9B_4e8e_98A1_30BD386AEA9A" end="EAID_4509184A_D724_495f_AAEB_1ACE1AD90879"/>
+          <Association xmi:id="EAID_6987A295_068B_4b57_995E_4EC9EE43D131" start="EAID_C2E366C0_510F_4145_B650_110537B98360" end="EAID_4509184A_D724_495f_AAEB_1ACE1AD90879"/>
+        </links>
+      </element>
+      <element xmi:idref="EAPK_2BEE9025_81F1_4585_ADA3_BDFB6731DA6D" xmi:type="uml:Package" name="usermanagement" scope="public">
+        <model package2="EAID_2BEE9025_81F1_4585_ADA3_BDFB6731DA6D" package="EAPK_9C189016_9A46_4c58_B9E3_4E25FA3ACA35" tpos="0" ea_localid="23" ea_eleType="package"/>
+        <properties isSpecification="false" sType="Package" nType="0" scope="public"/>
+        <project author="jdiazgon" version="1.0" phase="1.0" created="2017-10-31 13:04:42" modified="2017-10-31 13:16:51" complexity="1" status="Proposed"/>
+        <code gentype="Java"/>
+        <style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+        <tags/>
+        <xrefs/>
+        <extendedProperties tagged="0" package_name="Class Model"/>
+        <packageproperties version="1.0"/>
+        <paths/>
+        <times created="2017-10-31 13:04:42" modified="2017-10-31 13:04:42"/>
+        <flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
+      </element>
+      <element xmi:idref="EAID_C2E366C0_510F_4145_B650_110537B98360" xmi:type="uml:Class" name="User" scope="public">
+        <model package="EAPK_2BEE9025_81F1_4585_ADA3_BDFB6731DA6D" tpos="0" ea_localid="82" ea_eleType="element"/>
+        <properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+        <project author="jdiazgon" version="1.0" phase="1.0" created="2017-10-31 13:04:52" modified="2017-10-31 13:08:50" complexity="1" status="Proposed"/>
+        <code product_name="Java" gentype="Java"/>
+        <style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+        <tags/>
+        <xrefs/>
+        <extendedProperties tagged="0" package_name="usermanagement"/>
+        <links>
+          <Association xmi:id="EAID_6987A295_068B_4b57_995E_4EC9EE43D131" start="EAID_C2E366C0_510F_4145_B650_110537B98360" end="EAID_4509184A_D724_495f_AAEB_1ACE1AD90879"/>
+        </links>
+      </element>
+      <element xmi:idref="EAPK_A3EEA6C1_792B_40ae_AB55_E9B28FAA7326" xmi:type="uml:Package" name="Workersmanagement" scope="public">
+        <model package2="EAID_A3EEA6C1_792B_40ae_AB55_E9B28FAA7326" package="EAPK_9C189016_9A46_4c58_B9E3_4E25FA3ACA35" tpos="0" ea_localid="5" ea_eleType="package"/>
+        <properties isSpecification="false" sType="Package" nType="0" scope="public"/>
+        <project author="jdiazgon" version="1.0" phase="1.0" created="2017-10-31 10:48:44" modified="2017-10-31 13:29:43" complexity="1" status="Proposed"/>
+        <code gentype="Java"/>
+        <style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+        <tags/>
+        <xrefs/>
+        <extendedProperties tagged="0" package_name="Class Model"/>
+        <packageproperties version="1.0"/>
+        <paths/>
+        <times created="2017-10-31 10:48:44" modified="2017-10-31 13:29:43"/>
+        <flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
+      </element>
+      <element xmi:idref="EAID_6EA6FC61_FB9B_4e8e_98A1_30BD386AEA9A" xmi:type="uml:Class" name="Teacher" scope="public">
+        <model package="EAPK_A3EEA6C1_792B_40ae_AB55_E9B28FAA7326" tpos="0" ea_localid="83" ea_eleType="element"/>
+        <properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+        <project author="jdiazgon" version="1.0" phase="1.0" created="2017-10-31 13:07:31" modified="2017-10-31 13:07:41" complexity="1" status="Proposed"/>
+        <code product_name="Java" gentype="Java"/>
+        <style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+        <tags/>
+        <xrefs/>
+        <extendedProperties tagged="0" package_name="Workersmanagement"/>
+        <links>
+          <Association xmi:id="EAID_2D621F9A_B9C0_4c51_BF4A_9321E2A8B598" start="EAID_6EA6FC61_FB9B_4e8e_98A1_30BD386AEA9A" end="EAID_4509184A_D724_495f_AAEB_1ACE1AD90879"/>
+        </links>
+      </element>
+    </elements>
+    <connectors>
+      <connector xmi:idref="EAID_396CC69C_ECD0_483d_BE28_A972782B7A05">
+        <source xmi:idref="EAID_4509184A_D724_495f_AAEB_1ACE1AD90879">
+          <model ea_localid="84" type="Class" name="Student"/>
+          <role visibility="Public" targetScope="instance"/>
+          <type multiplicity="1" aggregation="none" containment="Unspecified"/>
+          <constraints/>
+          <modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+          <style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Unspecified;"/>
+          <documentation/>
+          <xrefs/>
+          <tags/>
+        </source>
+        <target xmi:idref="EAID_1D7DCE81_651D_40f2_A6E5_A522CF6E0C64">
+          <model ea_localid="10" type="Class" name="Marks"/>
+          <role visibility="Public" targetScope="instance"/>
+          <type multiplicity="*" aggregation="none" containment="Unspecified"/>
+          <constraints/>
+          <modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+          <style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Unspecified;"/>
+          <documentation/>
+          <xrefs/>
+          <tags/>
+        </target>
+        <model ea_localid="28"/>
+        <properties ea_type="Association" direction="Unspecified"/>
+        <modifiers isRoot="false" isLeaf="false"/>
+        <parameterSubstitutions/>
+        <documentation/>
+        <appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+        <labels lb="1" rb="*"/>
+        <extendedProperties virtualInheritance="0"/>
+        <style/>
+        <xrefs/>
+        <tags/>
+      </connector>
+      <connector xmi:idref="EAID_2D621F9A_B9C0_4c51_BF4A_9321E2A8B598">
+        <source xmi:idref="EAID_6EA6FC61_FB9B_4e8e_98A1_30BD386AEA9A">
+          <model ea_localid="83" type="Class" name="Teacher"/>
+          <role visibility="Public" targetScope="instance"/>
+          <type multiplicity="1" aggregation="none" containment="Unspecified"/>
+          <constraints/>
+          <modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+          <style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Unspecified;"/>
+          <documentation/>
+          <xrefs/>
+          <tags/>
+        </source>
+        <target xmi:idref="EAID_4509184A_D724_495f_AAEB_1ACE1AD90879">
+          <model ea_localid="84" type="Class" name="Student"/>
+          <role visibility="Public" targetScope="instance"/>
+          <type multiplicity="1" aggregation="none" containment="Unspecified"/>
+          <constraints/>
+          <modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+          <style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Unspecified;"/>
+          <documentation/>
+          <xrefs/>
+          <tags/>
+        </target>
+        <model ea_localid="29"/>
+        <properties ea_type="Association" direction="Unspecified"/>
+        <modifiers isRoot="false" isLeaf="false"/>
+        <parameterSubstitutions/>
+        <documentation/>
+        <appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+        <labels lb="1" rb="1"/>
+        <extendedProperties virtualInheritance="0"/>
+        <style/>
+        <xrefs/>
+        <tags/>
+      </connector>
+      <connector xmi:idref="EAID_6987A295_068B_4b57_995E_4EC9EE43D131">
+        <source xmi:idref="EAID_C2E366C0_510F_4145_B650_110537B98360">
+          <model ea_localid="82" type="Class" name="User"/>
+          <role visibility="Public" targetScope="instance"/>
+          <type multiplicity="*" aggregation="none" containment="Unspecified"/>
+          <constraints/>
+          <modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+          <style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Unspecified;"/>
+          <documentation/>
+          <xrefs/>
+          <tags/>
+        </source>
+        <target xmi:idref="EAID_4509184A_D724_495f_AAEB_1ACE1AD90879">
+          <model ea_localid="84" type="Class" name="Student"/>
+          <role visibility="Public" targetScope="instance"/>
+          <type multiplicity="*" aggregation="none" containment="Unspecified"/>
+          <constraints/>
+          <modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+          <style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Unspecified;"/>
+          <documentation/>
+          <xrefs/>
+          <tags/>
+        </target>
+        <model ea_localid="30"/>
+        <properties ea_type="Association" direction="Unspecified"/>
+        <modifiers isRoot="false" isLeaf="false"/>
+        <parameterSubstitutions/>
+        <documentation/>
+        <appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+        <labels lb="*" rb="*"/>
+        <extendedProperties virtualInheritance="0"/>
+        <style/>
+        <xrefs/>
+        <tags/>
+      </connector>
+    </connectors>
+    <primitivetypes>
+      <packagedElement xmi:type="uml:Package" xmi:id="EAPrimitiveTypesPackage" name="EA_PrimitiveTypes_Package" visibility="public">
+        <packagedElement xmi:type="uml:Package" xmi:id="EAJavaTypesPackage" name="EA_Java_Types_Package" visibility="public">
+          <packagedElement xmi:type="uml:PrimitiveType" xmi:id="EAJava_int" name="int" visibility="public">
+            <generalization xmi:type="uml:Generalization" xmi:id="EAJava_int_General">
+              <general href="http://schema.omg.org/spec/UML/2.1/uml.xml#Integer"/>
+            </generalization>
+          </packagedElement>
+          <packagedElement xmi:type="uml:PrimitiveType" xmi:id="EAJava_long" name="long" visibility="public">
+            <generalization xmi:type="uml:Generalization" xmi:id="EAJava_long_General">
+              <general href="http://schema.omg.org/spec/UML/2.1/uml.xml#UnlimitedNatural"/>
+            </generalization>
+          </packagedElement>
+        </packagedElement>
+      </packagedElement>
+    </primitivetypes>
+    <profiles/>
+    <diagrams>
+      <diagram xmi:id="EAID_67365953_FB82_43e7_AAE8_DCDFE6F07390">
+        <model package="EAPK_9C189016_9A46_4c58_B9E3_4E25FA3ACA35" localID="2" owner="EAPK_9C189016_9A46_4c58_B9E3_4E25FA3ACA35"/>
+        <properties name="Example" type="Logical"/>
+        <project author="jdiazgon" version="1.0" created="2017-10-31 00:00:00" modified="2017-10-31 13:59:21"/>
+        <style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=0;HighlightForeign=0;PackageContents=0;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=795;DocSize.cy=1138;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
+        <style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;ProfileData=;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=8305E2C2;"/>
+        <swimlanes value="locked=false;orientation=0;width=0;inbar=false;names=false;color=0;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=0;ufh=0;cls=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;"/>
+        <matrixitems value="locked=false;matrixactive=false;swimlanesactive=true;kanbanactive=false;width=1;clrLine=0;"/>
+        <extendedProperties/>
+        <elements>
+          <element geometry="Left=171;Top=204;Right=302;Bottom=274;" subject="EAID_4509184A_D724_495f_AAEB_1ACE1AD90879" seqno="1" style="DUID=F5DAACF8;"/>
+          <element geometry="Left=157;Top=56;Right=247;Bottom=126;" subject="EAID_6EA6FC61_FB9B_4e8e_98A1_30BD386AEA9A" seqno="2" style="DUID=4EF9FFFB;"/>
+          <element geometry="Left=177;Top=436;Right=267;Bottom=506;" subject="EAID_C2E366C0_510F_4145_B650_110537B98360" seqno="3" style="DUID=F6A2D808;"/>
+          <element geometry="Left=129;Top=361;Right=482;Bottom=599;" subject="EAID_2BEE9025_81F1_4585_ADA3_BDFB6731DA6D" seqno="4" style=" DUID=34E8D0CD;"/>
+          <element geometry="Left=518;Top=210;Right=608;Bottom=280;" subject="EAID_1D7DCE81_651D_40f2_A6E5_A522CF6E0C64" seqno="5" style="DUID=6A3106D9;"/>
+          <element geometry="Left=122;Top=22;Right=272;Bottom=139;" subject="EAID_A3EEA6C1_792B_40ae_AB55_E9B28FAA7326" seqno="6" style=" DUID=1A1604F4;"/>
+          <element geometry="Left=123;Top=159;Right=657;Bottom=310;" subject="EAID_306CDA5C_B1A7_4c42_BA18_EE56F915E786" seqno="7" style=" DUID=9BD4557C;"/>
+          <element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=CX=5:CY=13:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LLT=;LMT=;LMB=;LRT=;LRB=CX=5:CY=13:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_6987A295_068B_4b57_995E_4EC9EE43D131" style="Mode=3;EOID=F5DAACF8;SOID=F6A2D808;Color=-1;LWidth=0;Hidden=0;"/>
+          <element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=3;$LLB=CX=5:CY=13:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LLT=;LMT=;LMB=;LRT=;LRB=CX=5:CY=13:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_2D621F9A_B9C0_4c51_BF4A_9321E2A8B598" style="Mode=3;EOID=F5DAACF8;SOID=4EF9FFFB;Color=-1;LWidth=0;Hidden=0;"/>
+          <element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=2;$LLB=CX=5:CY=13:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LLT=;LMT=;LMB=;LRT=;LRB=CX=5:CY=13:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_396CC69C_ECD0_483d_BE28_A972782B7A05" style="Mode=3;EOID=6A3106D9;SOID=F5DAACF8;Color=-1;LWidth=0;Hidden=0;"/>
+        </elements>
+      </diagram>
+    </diagrams>
+  </xmi:Extension>
+</xmi:XMI>
diff --git a/cobigen-templates/templates-devon4j-utils/src/test/resources/testinput/InputEntity.java b/cobigen-templates/templates-devon4j-utils/src/test/resources/testinput/InputEntity.java
new file mode 100644
index 0000000000..f69ad3b4f9
--- /dev/null
+++ b/cobigen-templates/templates-devon4j-utils/src/test/resources/testinput/InputEntity.java
@@ -0,0 +1,38 @@
+package testinput.testapp.testcomponent.dataaccess.api;
+
+import java.util.Collection;
+
+@SuppressWarnings("javadoc")
+public class InputEntity {
+
+    private String stringField;
+
+    private Collection<String> collectionOfStrings;
+
+    private int nativeInt;
+
+    public String getStringField() {
+        return stringField;
+    }
+
+    public void setStringField(String stringField) {
+        this.stringField = stringField;
+    }
+
+    public Collection<String> getCollectionOfStrings() {
+        return collectionOfStrings;
+    }
+
+    public void setCollectionOfStrings(Collection<String> collectionOfStrings) {
+        this.collectionOfStrings = collectionOfStrings;
+    }
+
+    public int getNativeInt() {
+        return nativeInt;
+    }
+
+    public void setNativeInt(int nativeInt) {
+        this.nativeInt = nativeInt;
+    }
+
+}
diff --git a/cobigen-templates/templates-devon4j-utils/src/test/resources/testinput/XMI-UML.xml b/cobigen-templates/templates-devon4j-utils/src/test/resources/testinput/XMI-UML.xml
new file mode 100644
index 0000000000..4073f5c5eb
--- /dev/null
+++ b/cobigen-templates/templates-devon4j-utils/src/test/resources/testinput/XMI-UML.xml
@@ -0,0 +1,391 @@
+<?xml version="1.0" encoding="windows-1252"?>
+<xmi:XMI xmi:version="2.1" xmlns:uml="http://schema.omg.org/spec/UML/2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1">
+  <xmi:Documentation exporter="Enterprise Architect" exporterVersion="6.5"/>
+  <uml:Model xmi:type="uml:Model" name="EA_Model" visibility="public">
+    <packagedElement xmi:type="uml:Package" xmi:id="EAPK_329F83E4_CA77_40af_968A_101D9A0AB879" name="Model" visibility="public">
+      <packagedElement xmi:type="uml:Package" xmi:id="EAPK_9C189016_9A46_4c58_B9E3_4E25FA3ACA35" name="Class Model" visibility="public">
+        <packagedElement xmi:type="uml:Package" xmi:id="EAPK_306CDA5C_B1A7_4c42_BA18_EE56F915E786" name="Schoolmanagement" visibility="public">
+          <packagedElement xmi:type="uml:Class" xmi:id="EAID_1D7DCE81_651D_40f2_A6E5_A522CF6E0C64" name="Marks" visibility="public">
+            <ownedAttribute xmi:type="uml:Property" xmi:id="EAID_74D55CAA_D22A_46b3_BE6E_7F074B8BDE5E" name="attributeExample" visibility="private" isStatic="false" isReadOnly="false" isDerived="false" isOrdered="false" isUnique="true" isDerivedUnion="false">
+              <lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000001_D22A_46b3_BE6E_7F074B8BDE5E" value="1"/>
+              <upperValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000002_D22A_46b3_BE6E_7F074B8BDE5E" value="1"/>
+              <type xmi:idref="EAJava_int"/>
+            </ownedAttribute>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Association" xmi:id="EAID_396CC69C_ECD0_483d_BE28_A972782B7A05" visibility="public">
+            <memberEnd xmi:idref="EAID_dst6CC69C_ECD0_483d_BE28_A972782B7A05"/>
+            <memberEnd xmi:idref="EAID_src6CC69C_ECD0_483d_BE28_A972782B7A05"/>
+            <ownedEnd xmi:type="uml:Property" xmi:id="EAID_src6CC69C_ECD0_483d_BE28_A972782B7A05" visibility="public" association="EAID_396CC69C_ECD0_483d_BE28_A972782B7A05" isStatic="false" isReadOnly="false" isDerived="false" isOrdered="false" isUnique="true" isDerivedUnion="false" aggregation="none">
+              <type xmi:idref="EAID_4509184A_D724_495f_AAEB_1ACE1AD90879"/>
+              <lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000003__ECD0_483d_BE28_A972782B7A05" value="1"/>
+              <upperValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000004__ECD0_483d_BE28_A972782B7A05" value="1"/>
+            </ownedEnd>
+            <ownedEnd xmi:type="uml:Property" xmi:id="EAID_dst6CC69C_ECD0_483d_BE28_A972782B7A05" visibility="public" association="EAID_396CC69C_ECD0_483d_BE28_A972782B7A05" isStatic="false" isReadOnly="false" isDerived="false" isOrdered="false" isUnique="true" isDerivedUnion="false" aggregation="none">
+              <type xmi:idref="EAID_1D7DCE81_651D_40f2_A6E5_A522CF6E0C64"/>
+              <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000005__ECD0_483d_BE28_A972782B7A05" value="-1"/>
+              <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000006__ECD0_483d_BE28_A972782B7A05" value="-1"/>
+            </ownedEnd>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Class" xmi:id="EAID_4509184A_D724_495f_AAEB_1ACE1AD90879" name="Student" visibility="public">
+            <ownedOperation xmi:id="EAID_15243897_6472_43aa_8FBC_246812EF64D6" name="newOperation" visibility="public" concurrency="sequential">
+              <ownedParameter xmi:id="EAID_A65764ED_E71B_4ce1_9617_C9DC6E19FE3C" name="indice" direction="in" isStream="false" isException="false" isOrdered="false" isUnique="true" type="EAJava_int"/>
+              <ownedParameter xmi:id="EAID_RT000000_6472_43aa_8FBC_246812EF64D6" name="return" direction="return" type="EAJava_long"/>
+            </ownedOperation>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Association" xmi:id="EAID_2D621F9A_B9C0_4c51_BF4A_9321E2A8B598" visibility="public">
+            <memberEnd xmi:idref="EAID_dst621F9A_B9C0_4c51_BF4A_9321E2A8B598"/>
+            <memberEnd xmi:idref="EAID_src621F9A_B9C0_4c51_BF4A_9321E2A8B598"/>
+            <ownedEnd xmi:type="uml:Property" xmi:id="EAID_src621F9A_B9C0_4c51_BF4A_9321E2A8B598" visibility="public" association="EAID_2D621F9A_B9C0_4c51_BF4A_9321E2A8B598" isStatic="false" isReadOnly="false" isDerived="false" isOrdered="false" isUnique="true" isDerivedUnion="false" aggregation="none">
+              <type xmi:idref="EAID_6EA6FC61_FB9B_4e8e_98A1_30BD386AEA9A"/>
+              <lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000007__B9C0_4c51_BF4A_9321E2A8B598" value="1"/>
+              <upperValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000008__B9C0_4c51_BF4A_9321E2A8B598" value="1"/>
+            </ownedEnd>
+            <ownedEnd xmi:type="uml:Property" xmi:id="EAID_dst621F9A_B9C0_4c51_BF4A_9321E2A8B598" visibility="public" association="EAID_2D621F9A_B9C0_4c51_BF4A_9321E2A8B598" isStatic="false" isReadOnly="false" isDerived="false" isOrdered="false" isUnique="true" isDerivedUnion="false" aggregation="none">
+              <type xmi:idref="EAID_4509184A_D724_495f_AAEB_1ACE1AD90879"/>
+              <lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000013__B9C0_4c51_BF4A_9321E2A8B598" value="1"/>
+              <upperValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000014__B9C0_4c51_BF4A_9321E2A8B598" value="1"/>
+            </ownedEnd>
+          </packagedElement>
+          <packagedElement xmi:type="uml:Association" xmi:id="EAID_6987A295_068B_4b57_995E_4EC9EE43D131" visibility="public">
+            <memberEnd xmi:idref="EAID_dst87A295_068B_4b57_995E_4EC9EE43D131"/>
+            <memberEnd xmi:idref="EAID_src87A295_068B_4b57_995E_4EC9EE43D131"/>
+            <ownedEnd xmi:type="uml:Property" xmi:id="EAID_src87A295_068B_4b57_995E_4EC9EE43D131" visibility="public" association="EAID_6987A295_068B_4b57_995E_4EC9EE43D131" isStatic="false" isReadOnly="false" isDerived="false" isOrdered="false" isUnique="true" isDerivedUnion="false" aggregation="none">
+              <type xmi:idref="EAID_C2E366C0_510F_4145_B650_110537B98360"/>
+              <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000009__068B_4b57_995E_4EC9EE43D131" value="-1"/>
+              <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000010__068B_4b57_995E_4EC9EE43D131" value="-1"/>
+            </ownedEnd>
+            <ownedEnd xmi:type="uml:Property" xmi:id="EAID_dst87A295_068B_4b57_995E_4EC9EE43D131" visibility="public" association="EAID_6987A295_068B_4b57_995E_4EC9EE43D131" isStatic="false" isReadOnly="false" isDerived="false" isOrdered="false" isUnique="true" isDerivedUnion="false" aggregation="none">
+              <type xmi:idref="EAID_4509184A_D724_495f_AAEB_1ACE1AD90879"/>
+              <lowerValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000011__068B_4b57_995E_4EC9EE43D131" value="-1"/>
+              <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000012__068B_4b57_995E_4EC9EE43D131" value="-1"/>
+            </ownedEnd>
+          </packagedElement>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Package" xmi:id="EAPK_2BEE9025_81F1_4585_ADA3_BDFB6731DA6D" name="usermanagement" visibility="public">
+          <packagedElement xmi:type="uml:Class" xmi:id="EAID_C2E366C0_510F_4145_B650_110537B98360" name="User" visibility="public"/>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Package" xmi:id="EAPK_A3EEA6C1_792B_40ae_AB55_E9B28FAA7326" name="Workersmanagement" visibility="public">
+          <packagedElement xmi:type="uml:Class" xmi:id="EAID_6EA6FC61_FB9B_4e8e_98A1_30BD386AEA9A" name="Teacher" visibility="public"/>
+        </packagedElement>
+      </packagedElement>
+    </packagedElement>
+  </uml:Model>
+  <xmi:Extension extender="Enterprise Architect" extenderID="6.5">
+    <elements>
+      <element xmi:idref="EAPK_329F83E4_CA77_40af_968A_101D9A0AB879">
+        <packageproperties/>
+        <paths/>
+        <times created="2012-04-17 00:00:00" modified="2012-04-17 00:00:00" lastloaddate="2017-10-31 13:24:25"/>
+        <flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE" packageFlags="isModel=1;"/>
+      </element>
+      <element xmi:idref="EAPK_9C189016_9A46_4c58_B9E3_4E25FA3ACA35" xmi:type="uml:Package" name="Class Model" scope="public">
+        <model package2="EAID_9C189016_9A46_4c58_B9E3_4E25FA3ACA35" package="EAPK_329F83E4_CA77_40af_968A_101D9A0AB879" tpos="6" ea_localid="2" ea_eleType="package"/>
+        <properties isSpecification="false" sType="Package" nType="0" scope="public"/>
+        <project author="jdiazgon" phase="1.0" created="2017-10-31 10:46:40" modified="2017-10-31 10:46:40" complexity="1" status="Proposed"/>
+        <code/>
+        <style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+        <tags/>
+        <xrefs/>
+        <extendedProperties tagged="0" package_name="Model"/>
+        <packageproperties tpos="6"/>
+        <paths/>
+        <times created="2017-10-31 10:46:40" modified="2017-10-31 10:46:40" lastloaddate="2017-10-31 11:59:49" lastsavedate="2017-10-31 10:46:40"/>
+        <flags iscontrolled="FALSE" isnamespace="1" isprotected="FALSE" batchsave="0" batchload="0" usedtd="FALSE" logxml="FALSE" packageFlags="isModel=1;VICON=3;"/>
+      </element>
+      <element xmi:idref="EAPK_306CDA5C_B1A7_4c42_BA18_EE56F915E786" xmi:type="uml:Package" name="Schoolmanagement" scope="public">
+        <model package2="EAID_306CDA5C_B1A7_4c42_BA18_EE56F915E786" package="EAPK_9C189016_9A46_4c58_B9E3_4E25FA3ACA35" tpos="0" ea_localid="6" ea_eleType="package"/>
+        <properties isSpecification="false" sType="Package" nType="0" scope="public"/>
+        <project author="jdiazgon" version="1.0" phase="1.0" created="2017-10-31 10:52:03" modified="2017-10-31 13:16:51" complexity="1" status="Proposed"/>
+        <code gentype="Java"/>
+        <style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+        <tags/>
+        <xrefs/>
+        <extendedProperties tagged="0" package_name="Class Model"/>
+        <packageproperties version="1.0"/>
+        <paths/>
+        <times created="2017-10-31 10:52:03" modified="2017-10-31 12:54:32"/>
+        <flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
+      </element>
+      <element xmi:idref="EAID_1D7DCE81_651D_40f2_A6E5_A522CF6E0C64" xmi:type="uml:Class" name="Marks" scope="public">
+        <model package="EAPK_306CDA5C_B1A7_4c42_BA18_EE56F915E786" tpos="0" ea_localid="10" ea_eleType="element"/>
+        <properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+        <project author="jdiazgon" version="1.0" phase="1.0" created="2017-10-31 10:46:40" modified="2017-10-31 10:52:42" complexity="1" status="Proposed"/>
+        <code gentype="Java"/>
+        <style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+        <tags/>
+        <xrefs value="$XREFPROP=$XID={EA26F31B-AFB5-4d88-9F7E-3E439464AC42}$XID;$NAM=CustomProperties$NAM;$TYP=element property$TYP;$VIS=Public$VIS;$DES=@PROP=@NAME=isActive@ENDNAME;@TYPE=Boolean@ENDTYPE;@VALU=@ENDVALU;@PRMT=@ENDPRMT;@ENDPROP;$DES;$CLT={1D7DCE81-651D-40f2-A6E5-A522CF6E0C64}$CLT;$ENDXREF;"/>
+        <extendedProperties tagged="0" package_name="Schoolmanagement" eventflags="LNK=68d2;"/>
+        <attributes>
+          <attribute xmi:idref="EAID_74D55CAA_D22A_46b3_BE6E_7F074B8BDE5E" name="attributeExample" scope="Private">
+            <initial/>
+            <documentation/>
+            <model ea_localid="1" ea_guid="{74D55CAA-D22A-46b3-BE6E-7F074B8BDE5E}"/>
+            <properties type="int" collection="false" duplicates="0" changeability="changeable"/>
+            <coords ordered="0"/>
+            <containment containment="Not Specified" position="0"/>
+            <stereotype/>
+            <bounds lower="1" upper="1"/>
+            <options/>
+            <style/>
+            <styleex value="volatile=0;"/>
+            <tags/>
+            <xrefs/>
+          </attribute>
+        </attributes>
+        <links>
+          <Association xmi:id="EAID_396CC69C_ECD0_483d_BE28_A972782B7A05" start="EAID_4509184A_D724_495f_AAEB_1ACE1AD90879" end="EAID_1D7DCE81_651D_40f2_A6E5_A522CF6E0C64"/>
+        </links>
+      </element>
+      <element xmi:idref="EAID_4509184A_D724_495f_AAEB_1ACE1AD90879" xmi:type="uml:Class" name="Student" scope="public">
+        <model package="EAPK_306CDA5C_B1A7_4c42_BA18_EE56F915E786" tpos="0" ea_localid="84" ea_eleType="element"/>
+        <properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+        <project author="jdiazgon" version="1.0" phase="1.0" created="2017-10-31 13:07:54" modified="2017-10-31 13:08:06" complexity="1" status="Proposed"/>
+        <code product_name="Java" gentype="Java"/>
+        <style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+        <tags/>
+        <xrefs/>
+        <extendedProperties tagged="0" package_name="Schoolmanagement"/>
+        <operations>
+          <operation xmi:idref="EAID_15243897_6472_43aa_8FBC_246812EF64D6" name="newOperation" scope="Public">
+            <properties position="0"/>
+            <stereotype/>
+            <model ea_guid="{15243897-6472-43aa-8FBC-246812EF64D6}" ea_localid="1"/>
+            <type type="long" const="false" static="false" isAbstract="false" synchronised="0" concurrency="Sequential" pure="0" isQuery="false"/>
+            <behaviour/>
+            <code/>
+            <style/>
+            <styleex/>
+            <documentation/>
+            <tags/>
+            <parameters>
+              <parameter xmi:idref="EAID_RETURNID_6472_43aa_8FBC_246812EF64D6" visibility="public">
+                <properties pos="0" type="long" const="false" ea_guid="{RETURNID-6472-43aa-8FBC-246812EF64D6}"/>
+                <style/>
+                <styleex/>
+                <documentation/>
+                <tags/>
+                <xrefs/>
+              </parameter>
+              <parameter xmi:idref="EAID_A65764ED_E71B_4ce1_9617_C9DC6E19FE3C" visibility="public">
+                <properties pos="0" type="int" const="false" ea_guid="{A65764ED-E71B-4ce1-9617-C9DC6E19FE3C}"/>
+                <style/>
+                <styleex/>
+                <documentation/>
+                <tags/>
+                <xrefs/>
+              </parameter>
+            </parameters>
+            <xrefs/>
+          </operation>
+        </operations>
+        <links>
+          <Association xmi:id="EAID_396CC69C_ECD0_483d_BE28_A972782B7A05" start="EAID_4509184A_D724_495f_AAEB_1ACE1AD90879" end="EAID_1D7DCE81_651D_40f2_A6E5_A522CF6E0C64"/>
+          <Association xmi:id="EAID_2D621F9A_B9C0_4c51_BF4A_9321E2A8B598" start="EAID_6EA6FC61_FB9B_4e8e_98A1_30BD386AEA9A" end="EAID_4509184A_D724_495f_AAEB_1ACE1AD90879"/>
+          <Association xmi:id="EAID_6987A295_068B_4b57_995E_4EC9EE43D131" start="EAID_C2E366C0_510F_4145_B650_110537B98360" end="EAID_4509184A_D724_495f_AAEB_1ACE1AD90879"/>
+        </links>
+      </element>
+      <element xmi:idref="EAPK_2BEE9025_81F1_4585_ADA3_BDFB6731DA6D" xmi:type="uml:Package" name="usermanagement" scope="public">
+        <model package2="EAID_2BEE9025_81F1_4585_ADA3_BDFB6731DA6D" package="EAPK_9C189016_9A46_4c58_B9E3_4E25FA3ACA35" tpos="0" ea_localid="23" ea_eleType="package"/>
+        <properties isSpecification="false" sType="Package" nType="0" scope="public"/>
+        <project author="jdiazgon" version="1.0" phase="1.0" created="2017-10-31 13:04:42" modified="2017-10-31 13:16:51" complexity="1" status="Proposed"/>
+        <code gentype="Java"/>
+        <style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+        <tags/>
+        <xrefs/>
+        <extendedProperties tagged="0" package_name="Class Model"/>
+        <packageproperties version="1.0"/>
+        <paths/>
+        <times created="2017-10-31 13:04:42" modified="2017-10-31 13:04:42"/>
+        <flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
+      </element>
+      <element xmi:idref="EAID_C2E366C0_510F_4145_B650_110537B98360" xmi:type="uml:Class" name="User" scope="public">
+        <model package="EAPK_2BEE9025_81F1_4585_ADA3_BDFB6731DA6D" tpos="0" ea_localid="82" ea_eleType="element"/>
+        <properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+        <project author="jdiazgon" version="1.0" phase="1.0" created="2017-10-31 13:04:52" modified="2017-10-31 13:08:50" complexity="1" status="Proposed"/>
+        <code product_name="Java" gentype="Java"/>
+        <style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+        <tags/>
+        <xrefs/>
+        <extendedProperties tagged="0" package_name="usermanagement"/>
+        <links>
+          <Association xmi:id="EAID_6987A295_068B_4b57_995E_4EC9EE43D131" start="EAID_C2E366C0_510F_4145_B650_110537B98360" end="EAID_4509184A_D724_495f_AAEB_1ACE1AD90879"/>
+        </links>
+      </element>
+      <element xmi:idref="EAPK_A3EEA6C1_792B_40ae_AB55_E9B28FAA7326" xmi:type="uml:Package" name="Workersmanagement" scope="public">
+        <model package2="EAID_A3EEA6C1_792B_40ae_AB55_E9B28FAA7326" package="EAPK_9C189016_9A46_4c58_B9E3_4E25FA3ACA35" tpos="0" ea_localid="5" ea_eleType="package"/>
+        <properties isSpecification="false" sType="Package" nType="0" scope="public"/>
+        <project author="jdiazgon" version="1.0" phase="1.0" created="2017-10-31 10:48:44" modified="2017-10-31 13:29:43" complexity="1" status="Proposed"/>
+        <code gentype="Java"/>
+        <style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+        <tags/>
+        <xrefs/>
+        <extendedProperties tagged="0" package_name="Class Model"/>
+        <packageproperties version="1.0"/>
+        <paths/>
+        <times created="2017-10-31 10:48:44" modified="2017-10-31 13:29:43"/>
+        <flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
+      </element>
+      <element xmi:idref="EAID_6EA6FC61_FB9B_4e8e_98A1_30BD386AEA9A" xmi:type="uml:Class" name="Teacher" scope="public">
+        <model package="EAPK_A3EEA6C1_792B_40ae_AB55_E9B28FAA7326" tpos="0" ea_localid="83" ea_eleType="element"/>
+        <properties isSpecification="false" sType="Class" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false" isActive="false"/>
+        <project author="jdiazgon" version="1.0" phase="1.0" created="2017-10-31 13:07:31" modified="2017-10-31 13:07:41" complexity="1" status="Proposed"/>
+        <code product_name="Java" gentype="Java"/>
+        <style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+        <tags/>
+        <xrefs/>
+        <extendedProperties tagged="0" package_name="Workersmanagement"/>
+        <links>
+          <Association xmi:id="EAID_2D621F9A_B9C0_4c51_BF4A_9321E2A8B598" start="EAID_6EA6FC61_FB9B_4e8e_98A1_30BD386AEA9A" end="EAID_4509184A_D724_495f_AAEB_1ACE1AD90879"/>
+        </links>
+      </element>
+    </elements>
+    <connectors>
+      <connector xmi:idref="EAID_396CC69C_ECD0_483d_BE28_A972782B7A05">
+        <source xmi:idref="EAID_4509184A_D724_495f_AAEB_1ACE1AD90879">
+          <model ea_localid="84" type="Class" name="Student"/>
+          <role visibility="Public" targetScope="instance"/>
+          <type multiplicity="1" aggregation="none" containment="Unspecified"/>
+          <constraints/>
+          <modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+          <style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Unspecified;"/>
+          <documentation/>
+          <xrefs/>
+          <tags/>
+        </source>
+        <target xmi:idref="EAID_1D7DCE81_651D_40f2_A6E5_A522CF6E0C64">
+          <model ea_localid="10" type="Class" name="Marks"/>
+          <role visibility="Public" targetScope="instance"/>
+          <type multiplicity="*" aggregation="none" containment="Unspecified"/>
+          <constraints/>
+          <modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+          <style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Unspecified;"/>
+          <documentation/>
+          <xrefs/>
+          <tags/>
+        </target>
+        <model ea_localid="28"/>
+        <properties ea_type="Association" direction="Unspecified"/>
+        <modifiers isRoot="false" isLeaf="false"/>
+        <parameterSubstitutions/>
+        <documentation/>
+        <appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+        <labels lb="1" rb="*"/>
+        <extendedProperties virtualInheritance="0"/>
+        <style/>
+        <xrefs/>
+        <tags/>
+      </connector>
+      <connector xmi:idref="EAID_2D621F9A_B9C0_4c51_BF4A_9321E2A8B598">
+        <source xmi:idref="EAID_6EA6FC61_FB9B_4e8e_98A1_30BD386AEA9A">
+          <model ea_localid="83" type="Class" name="Teacher"/>
+          <role visibility="Public" targetScope="instance"/>
+          <type multiplicity="1" aggregation="none" containment="Unspecified"/>
+          <constraints/>
+          <modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+          <style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Unspecified;"/>
+          <documentation/>
+          <xrefs/>
+          <tags/>
+        </source>
+        <target xmi:idref="EAID_4509184A_D724_495f_AAEB_1ACE1AD90879">
+          <model ea_localid="84" type="Class" name="Student"/>
+          <role visibility="Public" targetScope="instance"/>
+          <type multiplicity="1" aggregation="none" containment="Unspecified"/>
+          <constraints/>
+          <modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+          <style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Unspecified;"/>
+          <documentation/>
+          <xrefs/>
+          <tags/>
+        </target>
+        <model ea_localid="29"/>
+        <properties ea_type="Association" direction="Unspecified"/>
+        <modifiers isRoot="false" isLeaf="false"/>
+        <parameterSubstitutions/>
+        <documentation/>
+        <appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+        <labels lb="1" rb="1"/>
+        <extendedProperties virtualInheritance="0"/>
+        <style/>
+        <xrefs/>
+        <tags/>
+      </connector>
+      <connector xmi:idref="EAID_6987A295_068B_4b57_995E_4EC9EE43D131">
+        <source xmi:idref="EAID_C2E366C0_510F_4145_B650_110537B98360">
+          <model ea_localid="82" type="Class" name="User"/>
+          <role visibility="Public" targetScope="instance"/>
+          <type multiplicity="*" aggregation="none" containment="Unspecified"/>
+          <constraints/>
+          <modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+          <style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Unspecified;"/>
+          <documentation/>
+          <xrefs/>
+          <tags/>
+        </source>
+        <target xmi:idref="EAID_4509184A_D724_495f_AAEB_1ACE1AD90879">
+          <model ea_localid="84" type="Class" name="Student"/>
+          <role visibility="Public" targetScope="instance"/>
+          <type multiplicity="*" aggregation="none" containment="Unspecified"/>
+          <constraints/>
+          <modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+          <style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Unspecified;"/>
+          <documentation/>
+          <xrefs/>
+          <tags/>
+        </target>
+        <model ea_localid="30"/>
+        <properties ea_type="Association" direction="Unspecified"/>
+        <modifiers isRoot="false" isLeaf="false"/>
+        <parameterSubstitutions/>
+        <documentation/>
+        <appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+        <labels lb="*" rb="*"/>
+        <extendedProperties virtualInheritance="0"/>
+        <style/>
+        <xrefs/>
+        <tags/>
+      </connector>
+    </connectors>
+    <primitivetypes>
+      <packagedElement xmi:type="uml:Package" xmi:id="EAPrimitiveTypesPackage" name="EA_PrimitiveTypes_Package" visibility="public">
+        <packagedElement xmi:type="uml:Package" xmi:id="EAJavaTypesPackage" name="EA_Java_Types_Package" visibility="public">
+          <packagedElement xmi:type="uml:PrimitiveType" xmi:id="EAJava_int" name="int" visibility="public">
+            <generalization xmi:type="uml:Generalization" xmi:id="EAJava_int_General">
+              <general href="http://schema.omg.org/spec/UML/2.1/uml.xml#Integer"/>
+            </generalization>
+          </packagedElement>
+          <packagedElement xmi:type="uml:PrimitiveType" xmi:id="EAJava_long" name="long" visibility="public">
+            <generalization xmi:type="uml:Generalization" xmi:id="EAJava_long_General">
+              <general href="http://schema.omg.org/spec/UML/2.1/uml.xml#UnlimitedNatural"/>
+            </generalization>
+          </packagedElement>
+        </packagedElement>
+      </packagedElement>
+    </primitivetypes>
+    <profiles/>
+    <diagrams>
+      <diagram xmi:id="EAID_67365953_FB82_43e7_AAE8_DCDFE6F07390">
+        <model package="EAPK_9C189016_9A46_4c58_B9E3_4E25FA3ACA35" localID="2" owner="EAPK_9C189016_9A46_4c58_B9E3_4E25FA3ACA35"/>
+        <properties name="Example" type="Logical"/>
+        <project author="jdiazgon" version="1.0" created="2017-10-31 00:00:00" modified="2017-10-31 13:59:21"/>
+        <style1 value="ShowPrivate=1;ShowProtected=1;ShowPublic=1;HideRelationships=0;Locked=0;Border=0;HighlightForeign=0;PackageContents=0;SequenceNotes=0;ScalePrintImage=0;PPgs.cx=0;PPgs.cy=0;DocSize.cx=795;DocSize.cy=1138;ShowDetails=0;Orientation=P;Zoom=100;ShowTags=0;OpParams=1;VisibleAttributeDetail=0;ShowOpRetType=1;ShowIcons=1;CollabNums=0;HideProps=0;ShowReqs=0;ShowCons=0;PaperSize=9;HideParents=0;UseAlias=0;HideAtts=0;HideOps=0;HideStereo=0;HideElemStereo=0;ShowTests=0;ShowMaint=0;ConnectorNotation=UML 2.1;ExplicitNavigability=0;ShowShape=1;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;ShowNotes=0;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;"/>
+        <style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;ProfileData=;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=8305E2C2;"/>
+        <swimlanes value="locked=false;orientation=0;width=0;inbar=false;names=false;color=0;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=0;ufh=0;cls=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;"/>
+        <matrixitems value="locked=false;matrixactive=false;swimlanesactive=true;kanbanactive=false;width=1;clrLine=0;"/>
+        <extendedProperties/>
+        <elements>
+          <element geometry="Left=171;Top=204;Right=302;Bottom=274;" subject="EAID_4509184A_D724_495f_AAEB_1ACE1AD90879" seqno="1" style="DUID=F5DAACF8;"/>
+          <element geometry="Left=157;Top=56;Right=247;Bottom=126;" subject="EAID_6EA6FC61_FB9B_4e8e_98A1_30BD386AEA9A" seqno="2" style="DUID=4EF9FFFB;"/>
+          <element geometry="Left=177;Top=436;Right=267;Bottom=506;" subject="EAID_C2E366C0_510F_4145_B650_110537B98360" seqno="3" style="DUID=F6A2D808;"/>
+          <element geometry="Left=129;Top=361;Right=482;Bottom=599;" subject="EAID_2BEE9025_81F1_4585_ADA3_BDFB6731DA6D" seqno="4" style=" DUID=34E8D0CD;"/>
+          <element geometry="Left=518;Top=210;Right=608;Bottom=280;" subject="EAID_1D7DCE81_651D_40f2_A6E5_A522CF6E0C64" seqno="5" style="DUID=6A3106D9;"/>
+          <element geometry="Left=122;Top=22;Right=272;Bottom=139;" subject="EAID_A3EEA6C1_792B_40ae_AB55_E9B28FAA7326" seqno="6" style=" DUID=1A1604F4;"/>
+          <element geometry="Left=123;Top=159;Right=657;Bottom=310;" subject="EAID_306CDA5C_B1A7_4c42_BA18_EE56F915E786" seqno="7" style=" DUID=9BD4557C;"/>
+          <element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=CX=5:CY=13:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LLT=;LMT=;LMB=;LRT=;LRB=CX=5:CY=13:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_6987A295_068B_4b57_995E_4EC9EE43D131" style="Mode=3;EOID=F5DAACF8;SOID=F6A2D808;Color=-1;LWidth=0;Hidden=0;"/>
+          <element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=3;$LLB=CX=5:CY=13:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LLT=;LMT=;LMB=;LRT=;LRB=CX=5:CY=13:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_2D621F9A_B9C0_4c51_BF4A_9321E2A8B598" style="Mode=3;EOID=F5DAACF8;SOID=4EF9FFFB;Color=-1;LWidth=0;Hidden=0;"/>
+          <element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=2;$LLB=CX=5:CY=13:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LLT=;LMT=;LMB=;LRT=;LRB=CX=5:CY=13:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_396CC69C_ECD0_483d_BE28_A972782B7A05" style="Mode=3;EOID=6A3106D9;SOID=F5DAACF8;Color=-1;LWidth=0;Hidden=0;"/>
+        </elements>
+      </diagram>
+    </diagrams>
+  </xmi:Extension>
+</xmi:XMI>
diff --git a/cobigen-templates/templates-devon4j/.classpath b/cobigen-templates/templates-devon4j/.classpath
deleted file mode 100644
index f5e7776dd7..0000000000
--- a/cobigen-templates/templates-devon4j/.classpath
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" output="eclipse-target/classes" path="src/main/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="eclipse-target/classes" path="src/main/templates">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" output="eclipse-target/test-classes" path="src/test/java">
-		<attributes>
-			<attribute name="test" value="true"/>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="eclipse-target/test-classes" path="src/test/resources">
-		<attributes>
-			<attribute name="test" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
-	<classpathentry kind="src" output="eclipse-target/classes" path="eclipse-target/generated-sources/java-templates">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="eclipse-target/classes" path="src/main/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" path="eclipse-target/generated-sources/annotations">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="ignore_optional_problems" value="true"/>
-			<attribute name="m2e-apt" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" output="eclipse-target/test-classes" path="eclipse-target/generated-test-sources/test-annotations">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="ignore_optional_problems" value="true"/>
-			<attribute name="m2e-apt" value="true"/>
-			<attribute name="test" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="eclipse-target/classes"/>
-</classpath>
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_angular_client_app/context.xml b/cobigen-templates/templates-devon4j/src/main/templates/crud_angular_client_app/context.xml
deleted file mode 100644
index f284bf5142..0000000000
--- a/cobigen-templates/templates-devon4j/src/main/templates/crud_angular_client_app/context.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="2.2">
-
-
-
-
-  <trigger id="crud_angular_client_app" type="java">
-    <matcher type="fqn" value="((.+\.)?([^\.]+))\.([^\.]+)\.logic\.api\.to\.([^\.]+)Eto">
-      <variableAssignment type="regex" key="rootPackage" value="1"/>
-      <variableAssignment type="regex" key="domain" value="3"/>
-      <variableAssignment type="regex" key="component" value="4"/>
-      <variableAssignment type="regex" key="etoName" value="5"/>
-    </matcher>
-  </trigger>
-
-
-
-
-</contextConfiguration>
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_angular_client_app/templates.xml b/cobigen-templates/templates-devon4j/src/main/templates/crud_angular_client_app/templates.xml
deleted file mode 100644
index 68bef72f27..0000000000
--- a/cobigen-templates/templates-devon4j/src/main/templates/crud_angular_client_app/templates.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<templatesConfiguration xmlns="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.1">
-
-  <templates>
-    <templateExtension ref="${variables.etoName#lower_case}-dialog.component.ts" mergeStrategy="tsmerge"/>
-    <templateExtension ref="${variables.etoName#lower_case}-grid.component.ts" mergeStrategy="tsmerge"/>
-    <templateExtension ref="${variables.etoName#lower_case}-alert.component.ts" mergeStrategy="tsmerge"/>
-    <templateExtension ref="${variables.etoName#lower_case}.service.ts" mergeStrategy="tsmerge"/>
-    <templateExtension ref="app.module.ts" mergeStrategy="tsmerge"/>
-    <templateExtension ref="es.json" mergeStrategy="jsonmerge"/>
-    <templateExtension ref="en.json" mergeStrategy="jsonmerge"/>
-    <templateExtension ref="app-routing.module.ts" mergeStrategy="tsmerge_override"/>
-    <templateExtension ref="nav-bar.component.html" mergeStrategy="html-ng*"/>
-  </templates>
-
-  <templateScans>
-    <templateScan name="ts_scan" templatePath="templates" destinationPath="" />
-  </templateScans>
-
-  <increments>
-    <increment name="devon4ng-app" description="CRUD devon4ng Angular App">
-      <incrementRef ref="app_angular_i18n"/>
-      <incrementRef ref="app_angular_devon4ng_component"/>
-    </increment>
-
-    <increment name="app_angular_i18n" description="Angular i18n">
-      <templateRef ref="es.json"/>
-      <templateRef ref="en.json"/>
-    </increment>
-    <increment name="app_angular_devon4ng_component" description="Angular devon4ng Component">
-      <templateRef ref="${variables.etoName#lower_case}-dialog.component.html"/>
-      <templateRef ref="${variables.etoName#lower_case}-dialog.component.ts"/>
-      <templateRef ref="${variables.etoName#lower_case}-dialog.component.spec.ts"/>
-      <templateRef ref="${variables.etoName#lower_case}-grid.component.html"/>
-      <templateRef ref="${variables.etoName#lower_case}-grid.component.scss"/>
-      <templateRef ref="${variables.etoName#lower_case}-grid.component.ts"/>
-      <templateRef ref="${variables.etoName#lower_case}-grid.component.spec.ts"/>
-      <templateRef ref="${variables.etoName#lower_case}-alert.component.html"/>
-      <templateRef ref="${variables.etoName#lower_case}-alert.component.scss"/>
-      <templateRef ref="${variables.etoName#lower_case}-alert.component.ts"/>
-      <templateRef ref="${variables.etoName#lower_case}-alert.component.spec.ts"/>
-      <templateRef ref="${variables.etoName#lower_case}.service.ts"/>
-      <templateRef ref="${variables.etoName#lower_case}.service.spec.ts"/>
-      <templateRef ref="${variables.etoName#lower_case}-routing.module.ts"/>
-	  <templateRef ref="${variables.etoName#lower_case}.module.ts"/>
-      <templateRef ref="app.module.ts"/>
-      <templateRef ref="app-routing.module.ts"/>
-       <templateRef ref="nav-bar.component.html"/>
-    </increment>
-  </increments>
-</templatesConfiguration>
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_ionic_client_app/context.xml b/cobigen-templates/templates-devon4j/src/main/templates/crud_ionic_client_app/context.xml
deleted file mode 100644
index 6358d6c74b..0000000000
--- a/cobigen-templates/templates-devon4j/src/main/templates/crud_ionic_client_app/context.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="2.2">
-
-
-
-  <trigger id="crud_ionic_client_app" type="java">
-    <matcher type="fqn" value="((.+\.)?([^\.]+))\.([^\.]+)\.logic\.api\.to\.([^\.]+)Eto">
-      <variableAssignment type="regex" key="rootPackage" value="1"/>
-      <variableAssignment type="regex" key="domain" value="3"/>
-      <variableAssignment type="regex" key="component" value="4"/>
-      <variableAssignment type="regex" key="etoName" value="5"/>
-    </matcher>
-  </trigger>
-
-
-</contextConfiguration>
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_ionic_client_app/templates.xml b/cobigen-templates/templates-devon4j/src/main/templates/crud_ionic_client_app/templates.xml
deleted file mode 100644
index 8759232e2d..0000000000
--- a/cobigen-templates/templates-devon4j/src/main/templates/crud_ionic_client_app/templates.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<templatesConfiguration xmlns="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.1">
-
-  <templates>
-    <templateExtension ref="${variables.etoName#lower_case}-detail.page.ts" mergeStrategy="tsmerge"/>
-    <templateExtension ref="${variables.etoName#lower_case}-list.page.ts" mergeStrategy="tsmerge_override"/>
-    <templateExtension ref="app.component.ts" mergeStrategy="tsmerge_override"/>
-    <templateExtension ref="app.module.ts" mergeStrategy="tsmerge_override"/>
-    <templateExtension ref="${variables.etoName#lower_case}-rest.service.ts" mergeStrategy="tsmerge_override"/>
-    <templateExtension ref="${variables.etoName#lower_case}.ts" />
-    <templateExtension ref="${variables.etoName#lower_case}-search-criteria.ts" />
-    <templateExtension ref="paginated-list-to.ts" />
-    <templateExtension ref="pageable.ts" />
-    <templateExtension ref="sort.ts" />
-    <templateExtension ref="environment.android.ts" mergeStrategy="tsmerge_override"/>
-    <templateExtension ref="environment.prod.ts" mergeStrategy="tsmerge_override"/>
-    <templateExtension ref="environment.ts" mergeStrategy="tsmerge_override"/>
-    <templateExtension ref="app-routing.module.ts" mergeStrategy="tsmerge_override"/>
-    <templateExtension ref="${variables.etoName#lower_case}-detail.page.html" mergeStrategy="html-ng*"/>
-    <templateExtension ref="${variables.etoName#lower_case}-list.page.html" mergeStrategy="html-ng*"/>
-    <templateExtension ref="es.json" mergeStrategy="jsonmerge_override"/>
-    <templateExtension ref="en.json" mergeStrategy="jsonmerge_override"/>
-    <templateExtension ref="business-operator.service.ts" mergeStrategy="tsmerge_override"/>
-  </templates>
-
-  <templateScans>
-    <templateScan templatePath="templates" destinationPath="src/main/java"/>
-  </templateScans>
-
-  <increments>
-  <increment name="devon4ng-app" description="CRUD devon4ng Ionic App">
-      <incrementRef ref="app_ionic_structure"/>
-      <incrementRef ref="ionic_routing"/>
-      <incrementRef ref="ionic_i18n"/>
-      <incrementRef ref="ionic_component"/>
-      <incrementRef ref="ionic_theme"/>
-    </increment>
-    <increment name="app_ionic_structure" description="Ionic devon4ng environments">
-      <templateRef ref="environment.android.ts" />
-      <templateRef ref="environment.prod.ts" />
-      <templateRef ref="environment.ts" />
-    </increment>
-    <increment name="ionic_routing" description="Ionic routing">
-      <templateRef ref="app-routing.module.ts"/>
-    </increment>
-    <increment name="ionic_i18n" description="Ionic i18n">
-      <templateRef ref="es.json"/>
-      <templateRef ref="en.json"/>
-    </increment>
-    <increment name="ionic_component" description="Ionic List">
-      <templateRef ref="${variables.etoName#lower_case}.ts"/>
-      <templateRef ref="${variables.etoName#lower_case}-search-criteria.ts"/>
-      <templateRef ref="paginated-list-to.ts"/>
-      <templateRef ref="app.component.ts"/>
-      <templateRef ref="app.module.ts"/>
-      <templateRef ref="pageable.ts"/>
-      <templateRef ref="sort.ts"/>
-      <templateRef ref="${variables.etoName#lower_case}-rest.service.ts"/>
-      <templateRef ref="${variables.etoName#lower_case}-list.page.ts"/>
-      <templateRef ref="${variables.etoName#lower_case}-list.page.html"/>
-      <templateRef ref="${variables.etoName#lower_case}-list.page.scss"/>
-      <templateRef ref="${variables.etoName#lower_case}-detail.page.ts"/>
-      <templateRef ref="${variables.etoName#lower_case}-detail.page.html"/>
-      <templateRef ref="${variables.etoName#lower_case}-detail.page.scss"/>
-      <templateRef ref="business-operator.service.ts"/>
-    </increment>
-    <increment name="ionic_theme" description="Ionic theme">
-      <templateRef ref="variables.scss"/>
-    </increment>
-  </increments>
-</templatesConfiguration>
\ No newline at end of file
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_java_ea_uml/context.xml b/cobigen-templates/templates-devon4j/src/main/templates/crud_java_ea_uml/context.xml
deleted file mode 100644
index b2b1d41fbe..0000000000
--- a/cobigen-templates/templates-devon4j/src/main/templates/crud_java_ea_uml/context.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="2.2">
-
-
-  <trigger id="crud_java_ea_uml" type="xml">
-    <containerMatcher type="xpath" value="./uml:Model//packagedElement[@xmi:type='uml:Class']"/>
-    <matcher type="xpath" value="self::node()[@xmi:type='uml:Class']/ancestor::uml:Model">
-      <variableAssignment type="xpath" key="rootPackage"
-        value="self::node()/ancestor::packagedElement/packagedElement/@name"/>
-      <variableAssignment type="xpath" key="component"
-        value="self::node()/ancestor::packagedElement/packagedElement/packagedElement/@name"/>
-      <variableAssignment type="xpath" key="className" value="self::node()/@name"/>
-    </matcher>
-  </trigger>
-
-</contextConfiguration>
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_java_ea_uml/templates.xml b/cobigen-templates/templates-devon4j/src/main/templates/crud_java_ea_uml/templates.xml
deleted file mode 100644
index db0b72b96e..0000000000
--- a/cobigen-templates/templates-devon4j/src/main/templates/crud_java_ea_uml/templates.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<templatesConfiguration xmlns="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.1">
-
-  <templates>
-    <templateExtension ref="${variables.className}Entity.java" mergeStrategy="javamerge"/>
-  </templates>
-
-  <templateScans>
-    <templateScan templatePath="templates" destinationPath="src/main"/>
-  </templateScans>
-
-  <increments>
-  <increment name="xml_uml_entity" description="Entity infrastructure">
-      <templateRef ref="${variables.className}Entity.java"/>
-      <templateRef ref="${variables.className}.java"/>
-      <templateRef ref="ApplicationEntity.java"/>
-      <templateRef ref="ApplicationPersistenceEntity.java"/>
-    </increment>
-  </increments>
-</templatesConfiguration>
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app/context.xml b/cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app/context.xml
deleted file mode 100644
index 10676296ea..0000000000
--- a/cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app/context.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="2.2">
-
-  <trigger id="crud_java_server_app" type="java">
-    <containerMatcher type="package" value="((.+\.)?([^\.]+))\.([^\.]+)\.dataaccess\.api"
-      retrieveObjectsRecursively="false"/>
-    <matcher type="fqn" value="((.+\.)?([^\.]+))\.([^\.]+)\.dataaccess\.api\.([^\.]+)Entity">
-      <variableAssignment type="regex" key="rootPackage" value="1"/>
-      <variableAssignment type="regex" key="domain" value="3"/>
-      <variableAssignment type="regex" key="component" value="4"/>
-      <variableAssignment type="regex" key="entityName" value="5"/>
-    </matcher>
-  </trigger>
-
-
-</contextConfiguration>
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app/templates.xml b/cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app/templates.xml
deleted file mode 100644
index 73095e24e6..0000000000
--- a/cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app/templates.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<templatesConfiguration xmlns="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.1">
-
-  <templates>
-    <templateExtension ref="${variables.entityName}Entity.java" mergeStrategy="javamerge"/>
-    <templateExtension ref="${variables.entityName}.java" mergeStrategy="javamerge"/>
-    <templateExtension ref="${variables.entityName}Repository.java" mergeStrategy="javamerge"/>
-
-    <templateExtension ref="${variables.entityName}Cto.java" mergeStrategy="javamerge"/>
-    <templateExtension ref="${variables.entityName}Eto.java" mergeStrategy="javamerge"/>
-    <templateExtension ref="${variables.entityName}SearchCriteriaTo.java" mergeStrategy="javamerge"/>    
-    <templateExtension ref="AbstractSearchCriteriaTo.java" mergeStrategy="javamerge"/>
-
-    <templateExtension ref="${variables.component#cap_first}RestServiceImpl.java" mergeStrategy="javamerge"/>
-    <templateExtension ref="${variables.component#cap_first}RestService.java" mergeStrategy="javamerge"/>
-
-    <templateExtension ref="${variables.component#cap_first}RestServiceImplCtos.java" 
-                       destinationPath="src/main/java/${variables.rootPackage}/${variables.component}/service/impl/rest/${variables.component#cap_first}RestServiceImpl.java"
-                       mergeStrategy="javamerge"/>
-    <templateExtension ref="${variables.component#cap_first}RestServiceCtos.java" 
-                       destinationPath="../api/src/main/java/${variables.rootPackage}/${variables.component}/service/api/rest/${variables.component#cap_first}RestService.java"
-                       mergeStrategy="javamerge"/>
-
-    <templateExtension ref="${variables.component#cap_first}SoapService.java" mergeStrategy="javamerge"/>
-    <templateExtension ref="${variables.component#cap_first}SoapServiceImpl.java" mergeStrategy="javamerge"/>
-    <templateExtension ref="ServiceConfig.java" mergeStrategy="javamerge"/>
-	    
-    <templateExtension ref="AbstractComponentFacade.java" mergeStrategy="javamerge_override"/>
-  </templates>
-
-  <templateScans>
-    <templateScan templatePath="templates" destinationPath="src/main"/>
-  </templateScans>
-
-  <increments>
-    <increment name="springdata-repository" description="CRUD SpringData Repository">
-      <templateRef ref="${variables.entityName}Repository.java"/>
-    </increment>
-    <increment name="tos" description="TO's">
-      <templateRef ref="AbstractSearchCriteriaTo.java"/>
-      <templateRef ref="${variables.entityName}Eto.java"/>
-      <templateRef ref="${variables.entityName}SearchCriteriaTo.java"/>
-    </increment>
-    <increment name="ctos" description="CTO's">
-      <templateRef ref="${variables.entityName}Cto.java"/>
-    </increment>
-    <!-- <increment name="logic_impl" description="CRUD logic (all in one)">
-      <templateRef ref="AbstractBeanMapperSupport.java"/>
-      <templateRef ref="AbstractComponentFacade.java"/>
-      <templateRef ref="${variables.component#cap_first}Impl.java"/>
-      <templateRef ref="${variables.component#cap_first}.java"/>
-    </increment>-->
-    <increment name="dataaccess_infrastructure" description="Entity infrastructure">
-      <templateRef ref="ApplicationPersistenceEntity.java"/>
-      <templateRef ref="ApplicationEntity.java"/>
-      <templateRef ref="${variables.entityName}Entity.java"/>
-      <templateRef ref="${variables.entityName}.java"/>
-    </increment>
-    <increment name="rest_service_impl" description="CRUD REST services">
-      <templateRef ref="AbstractBeanMapperSupport.java"/>
-      <templateRef ref="AbstractComponentFacade.java"/>
-      <templateRef ref="${variables.component#cap_first}RestServiceImpl.java"/>
-      <templateRef ref="${variables.component#cap_first}RestService.java"/>
-    </increment>
-    <increment name="rest_service_impl_ctos" description="CRUD REST services (CTOs)">
-      <templateRef ref="AbstractBeanMapperSupport.java"/>
-      <templateRef ref="AbstractComponentFacade.java"/>
-      <templateRef ref="${variables.component#cap_first}RestServiceImplCtos.java"/>
-      <templateRef ref="${variables.component#cap_first}RestServiceCtos.java"/>
-    </increment>
-    <!-- <increment name="soap_service_impl" description="CRUD SOAP services">
-      <templateRef ref="ServiceConfig.java"/> 
-      <templateRef ref="WebApplicationContextLocator.java"/>
-      <templateRef ref="${variables.component#cap_first}SoapService.java"/>
-      <templateRef ref="${variables.component#cap_first}SoapServiceImpl.java"/>
-    </increment>-->
-  </increments>
-</templatesConfiguration>
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app_complex/context.xml b/cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app_complex/context.xml
deleted file mode 100644
index 20452af3dc..0000000000
--- a/cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app_complex/context.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="2.2">
-
-  <trigger id="crud_java_server_app_complex" type="java">
-    <containerMatcher type="package" value="((.+\.)?([^\.]+))\.([^\.]+)\.dataaccess\.api"
-      retrieveObjectsRecursively="false"/>
-    <matcher type="fqn" value="((.+\.)?([^\.]+))\.([^\.]+)\.dataaccess\.api\.([^\.]+)Entity">
-      <variableAssignment type="regex" key="rootPackage" value="1"/>
-      <variableAssignment type="regex" key="domain" value="3"/>
-      <variableAssignment type="regex" key="component" value="4"/>
-      <variableAssignment type="regex" key="entityName" value="5"/>
-    </matcher>
-  </trigger>
-
-
-
-</contextConfiguration>
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app_complex/templates.xml b/cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app_complex/templates.xml
deleted file mode 100644
index 4b6cb70b9c..0000000000
--- a/cobigen-templates/templates-devon4j/src/main/templates/crud_java_server_app_complex/templates.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<templatesConfiguration xmlns="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.1">
-
-  <templates>
-    <templateExtension ref="crud_complex_${variables.component#cap_first}.java" mergeStrategy="javamerge"/>
-    <templateExtension ref="crud_complex_${variables.component#cap_first}Impl.java" mergeStrategy="javamerge"/>
-
-    <templateExtension ref="crud_complex_UcFind${variables.entityName}.java" mergeStrategy="javamerge"/>
-    <templateExtension ref="crud_complex_UcFind${variables.entityName}Impl.java" mergeStrategy="javamerge"/>
-    <templateExtension ref="crud_complex_UcManage${variables.entityName}.java" mergeStrategy="javamerge"/>
-    <templateExtension ref="crud_complex_UcManage${variables.entityName}Impl.java" mergeStrategy="javamerge"/>
-    
-    <!-- CTOs specific increments -->
-    <templateExtension ref="crud_complex_UcFind${variables.entityName}Ctos.java" 
-                       destinationPath="../api/src/main/java/${variables.rootPackage}/${variables.component}/logic/api/usecase/UcFind${variables.entityName}.java" 
-                       mergeStrategy="javamerge"/>
-    <templateExtension ref="crud_complex_UcFind${variables.entityName}ImplCtos.java" 
-                       destinationPath="src/main/java/${variables.rootPackage}/${variables.component}/logic/impl/usecase/UcFind${variables.entityName}Impl.java"
-                       mergeStrategy="javamerge"/>
-    <templateExtension ref="crud_complex_${variables.component#cap_first}ImplCtos.java" 
-                       destinationPath="src/main/java/${variables.rootPackage}/${variables.component}/logic/impl/${variables.component#cap_first}Impl.java"
-                       mergeStrategy="javamerge"/>
-    <templateExtension ref="crud_complex_${variables.component#cap_first}Ctos.java" 
-                       destinationPath="../api/src/main/java/${variables.rootPackage}/${variables.component}/logic/api/${variables.component#cap_first}.java"
-                       mergeStrategy="javamerge"/>
-                       
-    <templateExtension ref="crud_complex_AbstractLogic.java" mergeStrategy="javamerge"/>
-    
-    
-  </templates>
-
-  <templateScans>
-    <templateScan templateNamePrefix="crud_complex_" templatePath="templates" destinationPath="src/main"/>
-  </templateScans>
-
-  <increments>
-    <increment name="logic_impl_complex" description="CRUD UC logic">
-      <templateRef ref="crud_complex_AbstractBeanMapperSupport.java"/>
-      <templateRef ref="crud_complex_${variables.component#cap_first}.java"/>
-      <templateRef ref="crud_complex_Abstract${variables.entityName}Uc.java"/>
-      <templateRef ref="crud_complex_AbstractUc.java"/>
-      <templateRef ref="crud_complex_AbstractLogic.java"/>
-      <templateRef ref="crud_complex_${variables.component#cap_first}Impl.java"/>
-      <templateRef ref="crud_complex_UcFind${variables.entityName}.java"/>
-      <templateRef ref="crud_complex_UcManage${variables.entityName}.java"/>
-      <templateRef ref="crud_complex_UcFind${variables.entityName}Impl.java"/>
-      <templateRef ref="crud_complex_UcManage${variables.entityName}Impl.java"/>
-    </increment>
-    <increment name="logic_complex_ctos" description="CRUD UC logic (CTOs)">
-      <templateRef ref="crud_complex_AbstractUc.java"/>
-      <templateRef ref="crud_complex_Abstract${variables.entityName}Uc.java"/>
-      <templateRef ref="crud_complex_UcFind${variables.entityName}Ctos.java"/>
-      <templateRef ref="crud_complex_UcFind${variables.entityName}ImplCtos.java"/>
-      <templateRef ref="crud_complex_${variables.component#cap_first}Ctos.java"/>
-      <templateRef ref="crud_complex_${variables.component#cap_first}ImplCtos.java"/>
-    </increment>
-  </increments>
-</templatesConfiguration>
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_ngrx_client_app/context.xml b/cobigen-templates/templates-devon4j/src/main/templates/crud_ngrx_client_app/context.xml
deleted file mode 100644
index c72d41a1e8..0000000000
--- a/cobigen-templates/templates-devon4j/src/main/templates/crud_ngrx_client_app/context.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="2.2">
-
-
-  <trigger id="crud_ngrx_client_app" type="java">
-    <matcher type="fqn" value="((.+\.)?([^\.]+))\.([^\.]+)\.logic\.api\.to\.([^\.]+)Eto">
-      <variableAssignment type="regex" key="rootPackage" value="1"/>
-      <variableAssignment type="regex" key="domain" value="3"/>
-      <variableAssignment type="regex" key="component" value="4"/>
-      <variableAssignment type="regex" key="etoName" value="5"/>
-    </matcher>
-  </trigger>
-
-
-</contextConfiguration>
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_ngrx_client_app/templates.xml b/cobigen-templates/templates-devon4j/src/main/templates/crud_ngrx_client_app/templates.xml
deleted file mode 100644
index 7aea241c69..0000000000
--- a/cobigen-templates/templates-devon4j/src/main/templates/crud_ngrx_client_app/templates.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<templatesConfiguration xmlns="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.1">
-
-  <templates>
-    <templateExtension ref="${variables.etoName#lower_case}-dialog.component.ts" mergeStrategy="override"/>
-    <templateExtension ref="${variables.etoName#lower_case}-grid.component.ts" mergeStrategy="override"/>
-    <templateExtension ref="${variables.etoName#lower_case}-alert.component.ts" mergeStrategy="override"/>
-    <templateExtension ref="${variables.etoName#lower_case}.service.ts" mergeStrategy="override"/>
-    <templateExtension ref="${variables.etoName#lower_case}.service.spec.ts" mergeStrategy="override"/>
-    <templateExtension ref="${variables.etoName#lower_case}.module.ts" mergeStrategy="override"/>
-    <templateExtension ref="${variables.etoName#lower_case}-routing.module.ts" mergeStrategy="override"/>
-    <templateExtension ref="es.json" mergeStrategy="jsonmerge"/>
-    <templateExtension ref="en.json" mergeStrategy="jsonmerge"/>
-    <templateExtension ref="environment.ts" mergeStrategy="override"/>
-    <templateExtension ref="environment.prod.ts" mergeStrategy="override"/>
-    <templateExtension ref="nav-bar.component.html" mergeStrategy="html-ng*"/>
-  	<templateExtension ref="header.component.ts" mergeStrategy="override"/>
-  	<templateExtension ref="app-routing.module.ts" mergeStrategy="tsmerge_override"/>
-  	<templateExtension ref="${variables.etoName#lower_case}.model.ts" mergeStrategy="override"/>
-    <templateExtension ref="datadetailstest.model.ts" mergeStrategy="override"/>
-    <templateExtension ref="httpresponse.model.ts" mergeStrategy="override"/>
-    <templateExtension ref="searchcriteriadata.model.ts" mergeStrategy="override"/>
-	  <templateExtension ref="${variables.etoName#lower_case}.actions.ts" mergeStrategy="override"/>
-    <templateExtension ref="${variables.etoName#lower_case}.effects.spec.ts" mergeStrategy="override"/>
-	  <templateExtension ref="${variables.etoName#lower_case}.effects.ts" mergeStrategy="override"/>
-    <templateExtension ref="${variables.etoName#lower_case}.reducers.spec.ts" mergeStrategy="override"/>
-	  <templateExtension ref="${variables.etoName#lower_case}.reducers.ts" mergeStrategy="override"/>
-    <templateExtension ref="${variables.etoName#lower_case}.selectors.ts" mergeStrategy="override"/>
-    <templateExtension ref="store_index.ts" destinationPath="../../devon4ng-ngrx-template/src/app/${variables.etoName#lower_case}/store/index.ts" mergeStrategy="override"/>
-    <templateExtension ref="actions_index.ts" destinationPath="../../devon4ng-ngrx-template/src/app/${variables.etoName#lower_case}/store/actions/index.ts" mergeStrategy="override"/>
-    <templateExtension ref="effects_index.ts" destinationPath="../../devon4ng-ngrx-template/src/app/${variables.etoName#lower_case}/store/effects/index.ts" mergeStrategy="override"/>
-    <templateExtension ref="reducers_index.ts" destinationPath="../../devon4ng-ngrx-template/src/app/${variables.etoName#lower_case}/store/reducers/index.ts" mergeStrategy="override"/>
-    <templateExtension ref="selectors_index.ts" destinationPath="../../devon4ng-ngrx-template/src/app/${variables.etoName#lower_case}/store/selectors/index.ts" mergeStrategy="override"/>
-  </templates>
-
-  <templateScans>
-    <templateScan name="ts_scan" templatePath="templates" destinationPath="" />
-  </templateScans>
-
-  <increments>
-    <increment name="devon4ng-rx-app" description="Angular CRUD rxjs App">
-      <incrementRef ref="devon4ng-rx-env"/>
-      <incrementRef ref="devon4ng-rx-i18n"/>
-      <incrementRef ref="devon4ng-rx-component"/>
-    </increment>
-    <increment name="devon4ng-rx-env" description="Angular rxjs URL">
-        <templateRef ref="environment.ts"/>
-        <templateRef ref="environment.prod.ts"/>
-    </increment>
-    <increment name="devon4ng-rx-i18n" description="Angular rxjs i18n">
-      <templateRef ref="es.json"/>
-      <templateRef ref="en.json"/>
-    </increment>
-    <increment name="devon4ng-rx-component" description="Angular rxjs component">
-      <templateRef ref="${variables.etoName#lower_case}-dialog.component.html"/>
-      <templateRef ref="${variables.etoName#lower_case}-dialog.component.ts"/>
-      <templateRef ref="${variables.etoName#lower_case}-grid.component.html"/>
-      <templateRef ref="${variables.etoName#lower_case}-grid.component.scss"/>
-      <templateRef ref="${variables.etoName#lower_case}-grid.component.ts"/>
-      <templateRef ref="${variables.etoName#lower_case}-alert.component.html"/>
-      <templateRef ref="${variables.etoName#lower_case}-alert.component.ts"/>
-      <templateRef ref="${variables.etoName#lower_case}-alert.component.scss"/>
-      <templateRef ref="${variables.etoName#lower_case}-alert.component.spec.ts"/>
-      <templateRef ref="${variables.etoName#lower_case}.service.ts"/>
-      <templateRef ref="${variables.etoName#lower_case}.service.spec.ts"/>
-      <templateRef ref="${variables.etoName#lower_case}.module.ts"/>
-      <templateRef ref="${variables.etoName#lower_case}-routing.module.ts"/>
-      <templateRef ref="${variables.etoName#lower_case}.model.ts"/>
-      <templateRef ref="datadetailstest.model.ts"/>
-      <templateRef ref="httpresponse.model.ts"/>
-      <templateRef ref="searchcriteriadata.model.ts"/>
-      <templateRef ref="store_index.ts"/>
-      <templateRef ref="${variables.etoName#lower_case}.actions.ts"/>
-      <templateRef ref="actions_index.ts"/>
-      <templateRef ref="${variables.etoName#lower_case}.effects.ts"/>
-	    <templateRef ref="${variables.etoName#lower_case}.effects.spec.ts"/>
-      <templateRef ref="effects_index.ts"/>
-      <templateRef ref="${variables.etoName#lower_case}.reducers.ts"/>
-	    <templateRef ref="${variables.etoName#lower_case}.reducers.spec.ts"/>
-      <templateRef ref="reducers_index.ts"/>
-      <templateRef ref="${variables.etoName#lower_case}.selectors.ts"/>
-      <templateRef ref="selectors_index.ts"/>
-      <templateRef ref="header.component.ts"/>
-      <templateRef ref="nav-bar.component.html"/>
-      <templateRef ref="app-routing.module.ts"/>
-    </increment>
-  </increments>
-</templatesConfiguration>
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_angular_client_app/context.xml b/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_angular_client_app/context.xml
deleted file mode 100644
index 99d567c3da..0000000000
--- a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_angular_client_app/context.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="2.2">
-
-
-  <trigger id="crud_openapi_angular_client_app" type="openapi">
-    <containerMatcher type="element" value="openAPIFile"/>
-    <matcher type="element" value="EntityDef">
-      <variableAssignment type="constant" key="domain" value="demo"/>
-      <variableAssignment type="property" key="component" value="componentName"/>
-      <variableAssignment type="property" key="etoName" value="name"/>
-    </matcher>
-  </trigger>
-
-
-</contextConfiguration>
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_angular_client_app/templates.xml b/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_angular_client_app/templates.xml
deleted file mode 100644
index 52ba8f032d..0000000000
--- a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_angular_client_app/templates.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<templatesConfiguration xmlns="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.1">
-
-  <templates>
-    <templateExtension ref="${variables.etoName#lower_case}-dialog.component.ts" mergeStrategy="tsmerge"/>
-    <templateExtension ref="${variables.etoName#lower_case}-grid.component.ts" mergeStrategy="tsmerge"/>
-    <templateExtension ref="${variables.etoName#lower_case}-alert.component.ts" mergeStrategy="tsmerge"/>
-    <templateExtension ref="${variables.etoName#lower_case}.service.ts" mergeStrategy="tsmerge"/>
-    <templateExtension ref="${variables.etoName#lower_case}.ts" mergeStrategy="tsmerge"/>
-    <templateExtension ref="model.ts" mergeStrategy="tsmerge"/>
-    <templateExtension ref="app.module.ts" mergeStrategy="tsmerge"/>
-    <templateExtension ref="es.json" mergeStrategy="jsonmerge"/>
-    <templateExtension ref="en.json" mergeStrategy="jsonmerge"/>
-    <templateExtension ref="environment.ts" mergeStrategy="tsmerge_override"/>
-    <templateExtension ref="environment.prod.ts" mergeStrategy="tsmerge_override"/>
-    <templateExtension ref="app-routing.module.ts" mergeStrategy="tsmerge_override"/>
-    <templateExtension ref="nav-bar.component.html" mergeStrategy="html-ng*"/>
-  </templates>
-
-  <templateScans>
-    <templateScan name="ts_scan" templatePath="templates" destinationPath=""/>
-  </templateScans>
-
-  <increments>
-    <increment name="devon4ng-app" description="CRUD devon4ng Angular App">
-      <incrementRef ref="app_angular_env"/>
-      <incrementRef ref="app_angular_i18n"/>
-      <incrementRef ref="app_angular_devon4ng_component"/>
-      <incrementRef ref="app_angular_service_based"/>
-    </increment>
-    <increment name="app_angular_env" description="Server URL Registration">
-      <templateRef ref="environment.ts"/>
-      <templateRef ref="environment.prod.ts"/>
-    </increment>
-    <increment name="app_angular_i18n" description="i18n">
-      <templateRef ref="es.json"/>
-      <templateRef ref="en.json"/>
-    </increment>
-    <increment name="app_angular_service_based" description="model">
-      <templateRef ref="model.ts"/>
-      <templateRef ref="${variables.etoName#lower_case}.ts"/>
-    </increment>
-    <increment name="app_angular_devon4ng_component" description="View Component">
-      <templateRef ref="${variables.etoName#lower_case}-dialog.component.html"/>
-      <templateRef ref="${variables.etoName#lower_case}-dialog.component.ts"/>
-      <templateRef ref="${variables.etoName#lower_case}-dialog.component.spec.ts"/>
-      <templateRef ref="${variables.etoName#lower_case}-grid.component.html"/>
-      <templateRef ref="${variables.etoName#lower_case}-grid.component.scss"/>
-      <templateRef ref="${variables.etoName#lower_case}-grid.component.ts"/>
-      <templateRef ref="${variables.etoName#lower_case}-grid.component.spec.ts"/>
-      <templateRef ref="${variables.etoName#lower_case}-alert.component.html"/>
-      <templateRef ref="${variables.etoName#lower_case}-alert.component.scss"/>
-      <templateRef ref="${variables.etoName#lower_case}-alert.component.ts"/>
-      <templateRef ref="${variables.etoName#lower_case}-alert.component.spec.ts"/>
-      <templateRef ref="${variables.etoName#lower_case}.service.ts"/>
-      <templateRef ref="${variables.etoName#lower_case}.service.spec.ts"/>
-      <templateRef ref="${variables.etoName#lower_case}-routing.module.ts"/>
-	  <templateRef ref="${variables.etoName#lower_case}.module.ts"/>
-      <templateRef ref="app.module.ts"/>
-      <templateRef ref="app-routing.module.ts"/>
-       <templateRef ref="nav-bar.component.html"/>
-    </increment>
-  </increments>
-</templatesConfiguration>
\ No newline at end of file
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_angular_service_based_app/templates.xml b/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_angular_service_based_app/templates.xml
deleted file mode 100644
index d184d3703a..0000000000
--- a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_angular_service_based_app/templates.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<templatesConfiguration xmlns="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.1">
-
-  <templates>
-    <templateExtension ref="${variables.component#lower_case}RestController.service.ts" mergeStrategy="tsmerge"/>
-    <templateExtension ref="api.ts" mergeStrategy="tsmerge"/>
-    <templateExtension ref="environment.ts" mergeStrategy="tsmerge_override"/>
-    <templateExtension ref="environment.prod.ts" mergeStrategy="tsmerge_override"/> 
-  </templates>
-
-  <templateScans>
-    <templateScan name="ts_scan" templatePath="templates" destinationPath=""/>
-  </templateScans>
-
-  <increments>
-    <increment name="devon4ng-app" description="CRUD devon4ng Service Based Angular">
-      <incrementRef ref="app_angular_env"/>
-      <incrementRef ref="app_angular_devon4j_component"/>
-    </increment>
-    <increment name="app_angular_env" description="Server URL Registration">
-      <templateRef ref="environment.ts"/>
-      <templateRef ref="environment.prod.ts"/>
-    </increment>
-    <increment name="app_angular_devon4j_component" description="API">
-      <templateRef ref="${variables.component#lower_case}RestController.service.ts"/>
-      <templateRef ref="api.ts"/>
-    </increment>
-  </increments>
-</templatesConfiguration>
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_ionic_client_app/context.xml b/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_ionic_client_app/context.xml
deleted file mode 100644
index 69658fdad4..0000000000
--- a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_ionic_client_app/context.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="2.2">
-
-
-  <trigger id="crud_openapi_ionic_client_app" type="openapi">
-    <containerMatcher type="element" value="openAPIFile"/>
-    <matcher type="element" value="EntityDef">
-      <variableAssignment type="constant" key="domain" value="demo"/>
-      <variableAssignment type="property" key="component" value="componentName"/>
-      <variableAssignment type="property" key="etoName" value="name"/>
-    </matcher>
-  </trigger>
-</contextConfiguration>
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_ionic_client_app/templates.xml b/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_ionic_client_app/templates.xml
deleted file mode 100755
index 245cc67489..0000000000
--- a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_ionic_client_app/templates.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<templatesConfiguration xmlns="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.1">
-
-  <templates>
-    <templateExtension ref="${variables.etoName#lower_case}-detail.page.ts" mergeStrategy="tsmerge"/>
-    <templateExtension ref="${variables.etoName#lower_case}-list.page.ts" mergeStrategy="tsmerge_override"/>
-    <templateExtension ref="app.component.ts" mergeStrategy="tsmerge_override"/>
-    <templateExtension ref="app.module.ts" mergeStrategy="tsmerge_override"/>
-    <templateExtension ref="${variables.etoName#lower_case}-rest.service.ts" mergeStrategy="tsmerge_override"/>
-    <templateExtension ref="${variables.etoName#lower_case}.ts" />
-    <templateExtension ref="${variables.etoName#lower_case}-search-criteria.ts" />
-    <templateExtension ref="paginated-list-to.ts" />
-    <templateExtension ref="pageable.ts" />
-    <templateExtension ref="sort.ts" />
-    <templateExtension ref="environment.android.ts" mergeStrategy="tsmerge_override"/>
-    <templateExtension ref="environment.prod.ts" mergeStrategy="tsmerge_override"/>
-    <templateExtension ref="environment.ts" mergeStrategy="tsmerge_override"/>
-    <templateExtension ref="app-routing.module.ts" mergeStrategy="tsmerge_override"/>
-    <templateExtension ref="${variables.etoName#lower_case}-detail.page.html" mergeStrategy="html-ng*"/>
-    <templateExtension ref="${variables.etoName#lower_case}-list.page.html" mergeStrategy="html-ng*"/>
-    <templateExtension ref="es.json" mergeStrategy="jsonmerge_override"/>
-    <templateExtension ref="en.json" mergeStrategy="jsonmerge_override"/>
-    <templateExtension ref="it.json" mergeStrategy="jsonmerge_override"/>
-    <templateExtension ref="business-operator.service.ts" mergeStrategy="tsmerge_override"/>
-  </templates>
-
-  <templateScans>
-    <templateScan name="ts_scan" templatePath="templates" destinationPath=""/>
-  </templateScans>
-
-  <increments>
-    <increment name="devon4ng-app" description="CRUD devon4ng Ionic App">
-      <incrementRef ref="app_ionic_structure"/>
-      <incrementRef ref="ionic_routing"/>
-      <incrementRef ref="ionic_i18n"/>
-      <incrementRef ref="ionic_component"/>
-      <incrementRef ref="ionic_theme"/>
-    </increment>
-    <increment name="app_ionic_structure" description="Ionic devon4ng environments">
-      <templateRef ref="environment.android.ts" />
-      <templateRef ref="environment.prod.ts" />
-      <templateRef ref="environment.ts" />
-    </increment>
-    <increment name="ionic_routing" description="Ionic routing">
-      <templateRef ref="app-routing.module.ts"/>
-    </increment>
-    <increment name="ionic_i18n" description="Ionic i18n">
-      <templateRef ref="es.json"/>
-      <templateRef ref="en.json"/>
-      <templateRef ref="it.json"/>
-    </increment>
-    <increment name="ionic_component" description="Ionic List">
-      <templateRef ref="${variables.etoName#lower_case}.ts"/>
-      <templateRef ref="${variables.etoName#lower_case}-search-criteria.ts"/>
-      <templateRef ref="paginated-list-to.ts"/>
-      <templateRef ref="app.component.ts"/>
-      <templateRef ref="app.module.ts"/>
-      <templateRef ref="pageable.ts"/>
-      <templateRef ref="sort.ts"/>
-      <templateRef ref="${variables.etoName#lower_case}-rest.service.ts"/>
-      <templateRef ref="${variables.etoName#lower_case}-list.page.ts"/>
-      <templateRef ref="${variables.etoName#lower_case}-list.page.html"/>
-      <templateRef ref="${variables.etoName#lower_case}-list.page.scss"/>
-      <templateRef ref="${variables.etoName#lower_case}-detail.page.ts"/>
-      <templateRef ref="${variables.etoName#lower_case}-detail.page.html"/>
-      <templateRef ref="${variables.etoName#lower_case}-detail.page.scss"/>
-      <templateRef ref="business-operator.service.ts"/>
-    </increment>
-    <increment name="ionic_theme" description="Ionic theme">
-      <templateRef ref="variables.scss"/>
-    </increment>
-  </increments>
-</templatesConfiguration>
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_java_server_app/context.xml b/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_java_server_app/context.xml
deleted file mode 100644
index 7c2bc8d2ea..0000000000
--- a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_java_server_app/context.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="2.2">
-
-
-  <trigger id="crud_openapi_java_server_app" type="openapi">
-    <containerMatcher type="element" value="openAPIFile"/>
-    <matcher type="element" value="EntityDef">
-      <variableAssignment type="extension" key="rootPackage" value="x-rootpackage"/>
-      <variableAssignment type="property" key="component" value="componentName"/>
-      <variableAssignment type="property" key="entityName" value="name"/>
-    </matcher>
-  </trigger>
-
-
-
-</contextConfiguration>
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_java_server_app/templates.xml b/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_java_server_app/templates.xml
deleted file mode 100644
index 78213ba47f..0000000000
--- a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_java_server_app/templates.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<templatesConfiguration xmlns="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration"
-  version="2.1">
-  <templates>
-    <templateExtension ref="${variables.entityName}Entity.java" mergeStrategy="javamerge"/>
-    <templateExtension ref="${variables.entityName}.java" mergeStrategy="javamerge"/>
-    <templateExtension ref="${variables.entityName}Eto.java" mergeStrategy="javamerge"/>
-    <templateExtension ref="${variables.entityName}Repository.java" mergeStrategy="javamerge"/>
-    <templateExtension ref="${variables.entityName}Cto.java" mergeStrategy="javamerge"/>
-    <templateExtension ref="${variables.entityName}SearchCriteriaTo.java" mergeStrategy="javamerge"/>
-    <templateExtension ref="${variables.component#cap_first}RestService.java" mergeStrategy="javamerge"/>
-    <templateExtension ref="${variables.component#cap_first}RestServiceImpl.java" mergeStrategy="javamerge"/>
-    <templateExtension ref="AbstractSearchCriteriaTo.java" mergeStrategy="javamerge"/>
-    
-    <!-- Complex templates below -->
-    
-    <templateExtension ref="${variables.component#cap_first}.java" mergeStrategy="javamerge"/>
-    <templateExtension ref="${variables.component#cap_first}Impl.java" mergeStrategy="javamerge"/>
-
-    <templateExtension ref="UcFind${variables.entityName}.java" mergeStrategy="javamerge"/>
-    <templateExtension ref="UcFind${variables.entityName}Impl.java" mergeStrategy="javamerge"/>
-    <templateExtension ref="UcManage${variables.entityName}.java" mergeStrategy="javamerge"/>
-    <templateExtension ref="UcManage${variables.entityName}Impl.java" mergeStrategy="javamerge"/>
-    
-    <!-- CTOs specific increments -->
-    <templateExtension ref="UcFind${variables.entityName}Ctos.java" 
-                       destinationPath="src/main/java/${variables.rootPackage}/${variables.component}/logic/api/usecase/UcFind${variables.entityName}.java" 
-                       mergeStrategy="javamerge"/>
-    <templateExtension ref="UcFind${variables.entityName}ImplCtos.java" 
-                       destinationPath="src/main/java/${variables.rootPackage}/${variables.component}/logic/impl/usecase/UcFind${variables.entityName}Impl.java"
-                       mergeStrategy="javamerge"/>
-    <templateExtension ref="${variables.component#cap_first}ImplCtos.java" 
-                       destinationPath="src/main/java/${variables.rootPackage}/${variables.component}/logic/impl/${variables.component#cap_first}Impl.java"
-                       mergeStrategy="javamerge"/>
-    <templateExtension ref="${variables.component#cap_first}Ctos.java" 
-                       destinationPath="src/main/java/${variables.rootPackage}/${variables.component}/logic/api/${variables.component#cap_first}.java"
-                       mergeStrategy="javamerge"/>
-    <templateExtension ref="${variables.component#cap_first}RestServiceImplCtos.java" 
-                       destinationPath="src/main/java/${variables.rootPackage}/${variables.component}/service/impl/rest/${variables.component#cap_first}RestServiceImpl.java"
-                       mergeStrategy="javamerge"/>
-    <templateExtension ref="${variables.component#cap_first}RestServiceCtos.java" 
-                       destinationPath="src/main/java/${variables.rootPackage}/${variables.component}/service/api/rest/${variables.component#cap_first}RestService.java"
-                       mergeStrategy="javamerge"/>                       
-                       
-    <templateExtension ref="AbstractLogic.java" mergeStrategy="javamerge"/>
-  </templates>
-
-  <templateScans>
-    <templateScan templatePath="templates" destinationPath="src/main"/>    
-  </templateScans>
-
-  <increments>
-    <increment name="server" description="CRUD devon4j Server">
-      <incrementRef ref="tos"/>
-      <incrementRef ref="ctos"/>
-      <incrementRef ref="logic_impl_complex"/>
-      <incrementRef ref="logic_complex_ctos"/>
-      <incrementRef ref="dataaccess_infrastructure"/>
-      <incrementRef ref="rest_service_impl"/>
-      <incrementRef ref="rest_service_impl_ctos"/>
-      <incrementRef ref="springdata-repository"/>
-    </increment>
-    <increment name="springdata-repository" description="CRUD SpringData Repository">
-      <templateRef ref="${variables.entityName}Repository.java"/>
-    </increment>
-    <increment name="tos" description="TO's">
-      <templateRef ref="AbstractSearchCriteriaTo.java"/>
-      <templateRef ref="${variables.entityName}Eto.java"/>
-      <templateRef ref="${variables.entityName}SearchCriteriaTo.java"/>
-    </increment>
-    <increment name="ctos" description="CTO's">
-      <templateRef ref="${variables.entityName}Cto.java"/>
-    </increment>
-    <increment name="logic_impl_complex" description="CRUD UC logic">
-      <templateRef ref="AbstractBeanMapperSupport.java"/>
-      <templateRef ref="${variables.component#cap_first}.java"/>
-      <templateRef ref="Abstract${variables.entityName}Uc.java"/>
-      <templateRef ref="AbstractUc.java"/>
-      <templateRef ref="AbstractLogic.java"/>
-      <templateRef ref="${variables.component#cap_first}Impl.java"/>
-      <templateRef ref="UcFind${variables.entityName}.java"/>
-      <templateRef ref="UcManage${variables.entityName}.java"/>
-      <templateRef ref="UcFind${variables.entityName}Impl.java"/>
-      <templateRef ref="UcManage${variables.entityName}Impl.java"/>
-    </increment>
-    <increment name="logic_complex_ctos" description="CRUD UC logic (CTOs)">
-      <templateRef ref="AbstractUc.java"/>
-      <templateRef ref="Abstract${variables.entityName}Uc.java"/>
-      <templateRef ref="UcFind${variables.entityName}Ctos.java"/>
-      <templateRef ref="UcFind${variables.entityName}ImplCtos.java"/>
-      <templateRef ref="${variables.component#cap_first}Ctos.java"/>
-      <templateRef ref="${variables.component#cap_first}ImplCtos.java"/>
-    </increment>
-    <increment name="dataaccess_infrastructure" description="Entity infrastructure">
-      <templateRef ref="ApplicationPersistenceEntity.java"/>
-      <templateRef ref="ApplicationEntity.java"/>
-      <templateRef ref="${variables.entityName}Entity.java"/>
-      <templateRef ref="${variables.entityName}.java"/>
-    </increment>
-    <increment name="rest_service_impl" description="CRUD REST services">
-      <templateRef ref="AbstractBeanMapperSupport.java"/>
-      <templateRef ref="AbstractComponentFacade.java"/>
-      <templateRef ref="${variables.component#cap_first}RestServiceImpl.java"/>
-      <templateRef ref="${variables.component#cap_first}RestService.java"/>
-    </increment>
-    <increment name="rest_service_impl_ctos" description="CRUD REST services (CTOs)">
-      <templateRef ref="AbstractBeanMapperSupport.java"/>
-      <templateRef ref="AbstractComponentFacade.java"/>
-      <templateRef ref="${variables.component#cap_first}RestServiceImplCtos.java"/>
-      <templateRef ref="${variables.component#cap_first}RestServiceCtos.java"/>
-    </increment>
-  </increments>
-</templatesConfiguration>
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_net/context.xml b/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_net/context.xml
deleted file mode 100644
index 3e37f15141..0000000000
--- a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_net/context.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="2.2">
-
-
-  <trigger id="crud_openapi_net" type="openapi">
-    <containerMatcher type="element" value="openAPIFile"/>
-    <matcher type="element" value="EntityDef">
-      <variableAssignment type="extension" key="rootPackage" value="x-rootpackage"/>
-      <variableAssignment type="property" key="component" value="componentName"/>
-      <variableAssignment type="property" key="entityName" value="name"/>
-    </matcher>
-  </trigger>
-
-</contextConfiguration>
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_net/templates.xml b/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_net/templates.xml
deleted file mode 100644
index a40e0890c1..0000000000
--- a/cobigen-templates/templates-devon4j/src/main/templates/crud_openapi_net/templates.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<templatesConfiguration xmlns="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration"
-  version="2.1">
-  
-  <templateScans>
-    <templateScan templatePath="templates" destinationPath=""/>
-  </templateScans>
-  
-  <increments>
-    <increment name="server" description="CRUD devon4net Server">
-      <incrementRef ref="application"/>
-      <incrementRef ref="controllers"/>
-      <incrementRef ref="converter"/>
-      <incrementRef ref="dtos"/>
-      <incrementRef ref="exceptions"/>
-      <incrementRef ref="services"/>
-      <incrementRef ref="domain"/>
-    </increment>
-    <increment name="application" description="Application">
-        <templateRef ref="Startup.cs"/>
-        <templateRef ref="appsettings.Development.json"/>
-    </increment>
-        <increment name="controllers" description="Controllers">
-        <templateRef ref= "${variables.component#cap_first}Controller.cs"/>
-    </increment>
-    <increment name="converter" description="Converter">
-        <templateRef ref="${variables.component#cap_first}Converter.cs"/>
-    </increment>
-    <increment name="dtos" description="DTO's">
-        <templateRef ref="${variables.entityName#replace('Dto', '')#cap_first}Dto.cs"/>
-        <templateRef ref="${variables.entityName#replace('Dto', '')#cap_first}ResponseDto.cs"/>
-    </increment>
-    <increment name="exceptions" description="Exceptions">
-        <templateRef ref="${variables.entityName#cap_first}NotFoundException.cs"/>
-        <templateRef ref="${variables.entityName#cap_first}NotCreatedException.cs"/>
-        <templateRef ref="${variables.entityName#cap_first}NotDeletedException.cs"/>
-    </increment>
-    <increment name="services" description="Services">
-        <templateRef ref="I${variables.component#cap_first}Service.cs"/>
-        <templateRef ref="${variables.component#cap_first}Service.cs"/>
-    </increment>
-    <increment name="domain" description="Domain">
-        <templateRef ref="CobigenContext.cs"/>
-        <templateRef ref="${variables.entityName#cap_first}.cs"/>
-        <templateRef ref="I${variables.entityName#cap_first}Repository.cs"/>
-        <templateRef ref="${variables.entityName#cap_first}Repository.cs"/>
-    </increment>
-  </increments>
-</templatesConfiguration>
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_typescript_angular_client_app/context.xml b/cobigen-templates/templates-devon4j/src/main/templates/crud_typescript_angular_client_app/context.xml
deleted file mode 100644
index 7eb19f072b..0000000000
--- a/cobigen-templates/templates-devon4j/src/main/templates/crud_typescript_angular_client_app/context.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="2.2">
-
-
-  <trigger id="crud_typescript_angular_client_app" type="typescript">
-    <matcher type="fqn" value="([^\.]+).entity">
-      <variableAssignment type="regex" key="entityName" value="1"/>
-      <variableAssignment type="regex" key="component" value="1"/>
-      <variableAssignment type="constant" key="domain" value="demo"/>
-    </matcher>
-  </trigger>
-
-</contextConfiguration>
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/crud_typescript_angular_client_app/templates.xml b/cobigen-templates/templates-devon4j/src/main/templates/crud_typescript_angular_client_app/templates.xml
deleted file mode 100644
index e9affb3475..0000000000
--- a/cobigen-templates/templates-devon4j/src/main/templates/crud_typescript_angular_client_app/templates.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<templatesConfiguration xmlns="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.1">
-
-  <templates>
-    <templateExtension ref="${variables.entityName#lower_case}-dialog.component.ts" mergeStrategy="tsmerge"/>
-    <templateExtension ref="${variables.entityName#lower_case}-grid.component.ts" mergeStrategy="tsmerge"/>
-    <templateExtension ref="${variables.entityName#lower_case}-alert.component.ts" mergeStrategy="tsmerge"/>
-    <templateExtension ref="${variables.entityName#lower_case}.service.ts" mergeStrategy="tsmerge"/>
-    <templateExtension ref="${variables.entityName#lower_case}.ts" mergeStrategy="tsmerge"/>
-    <templateExtension ref="model.ts" mergeStrategy="tsmerge"/>
-    <templateExtension ref="app.module.ts" mergeStrategy="tsmerge"/>
-    <templateExtension ref="es.json" mergeStrategy="jsonmerge"/>
-    <templateExtension ref="en.json" mergeStrategy="jsonmerge"/>
-    <templateExtension ref="environment.ts" mergeStrategy="tsmerge_override"/>
-    <templateExtension ref="environment.prod.ts" mergeStrategy="tsmerge_override"/>
-    <templateExtension ref="app-routing.module.ts" mergeStrategy="tsmerge_override"/>
-    <templateExtension ref="login.service.ts" mergeStrategy="tsmerge_override"/>
-    <templateExtension ref="business-operations.service.ts" mergeStrategy="tsmerge_override"/>
-    <templateExtension ref="sort.ts" mergeStrategy="tsmerge_override"/>
-    <templateExtension ref="home.component.html" mergeStrategy="override"/>    
-  </templates>
-
-  <templateScans>
-    <templateScan name="ts_scan" templatePath="templates" destinationPath=""/>
-  </templateScans>
-
-  <increments>
-    <increment name="devon4ng-app" description="CRUD devon4ng Angular App">
-      <incrementRef ref="app_angular_env"/>
-      <incrementRef ref="app_angular_i18n"/>
-      <incrementRef ref="app_angular_security"/>
-      <incrementRef ref="app_angular_devon4ng_component"/>
-      <incrementRef ref="app_angular_service_based"/>
-    </increment>
-    <increment name="app_angular_env" description="Server URL Registration">
-      <templateRef ref="environment.ts"/>
-      <templateRef ref="environment.prod.ts"/>
-    </increment>
-    <increment name="app_angular_i18n" description="i18n">
-      <templateRef ref="es.json"/>
-      <templateRef ref="en.json"/>
-    </increment>
-    <increment name="app_angular_security" description="Security">
-      <templateRef ref="login.service.ts"/>
-      <templateRef ref="business-operations.service.ts"/>
-    </increment>
-    <increment name="app_angular_service_based" description="model">
-      <templateRef ref="model.ts"/>
-      <templateRef ref="${variables.entityName#lower_case}.ts"/>
-    </increment>
-    <increment name="app_angular_devon4ng_component" description="View Component">
-      <templateRef ref="${variables.entityName#lower_case}-dialog.component.html"/>
-      <templateRef ref="${variables.entityName#lower_case}-dialog.component.ts"/>
-      <templateRef ref="${variables.entityName#lower_case}-dialog.component.spec.ts"/>
-      <templateRef ref="${variables.entityName#lower_case}-grid.component.html"/>
-      <templateRef ref="${variables.entityName#lower_case}-grid.component.scss"/>
-      <templateRef ref="${variables.entityName#lower_case}-grid.component.ts"/>
-      <templateRef ref="${variables.entityName#lower_case}-grid.component.spec.ts"/>
-      <templateRef ref="${variables.entityName#lower_case}-alert.component.html"/>
-      <templateRef ref="${variables.entityName#lower_case}-alert.component.scss"/>
-      <templateRef ref="${variables.entityName#lower_case}-alert.component.ts"/>
-      <templateRef ref="${variables.entityName#lower_case}-alert.component.spec.ts"/>
-      <templateRef ref="${variables.entityName#lower_case}.service.ts"/>
-      <templateRef ref="${variables.entityName#lower_case}.service.spec.ts"/>
-      <templateRef ref="${variables.entityName#lower_case}.module.ts"/>
-      <templateRef ref="home.component.html"/>
-      <templateRef ref="app.module.ts"/>
-      <templateRef ref="app-routing.module.ts"/>
-      <templateRef ref="sort.ts"/>
-    </increment>
-  </increments>
-</templatesConfiguration>
\ No newline at end of file
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/kafka_documentation/context.xml b/cobigen-templates/templates-devon4j/src/main/templates/kafka_documentation/context.xml
deleted file mode 100644
index 5fc8d5bcd6..0000000000
--- a/cobigen-templates/templates-devon4j/src/main/templates/kafka_documentation/context.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="2.2">
-
-  <trigger id="Swagger_Docs" type="java">
-    <containerMatcher type="package" value="((.+\.)?([^\.]+))\.([^\.]+)\.service\.data"
-      retrieveObjectsRecursively="false"/>
-    <matcher type="fqn" value="((.+\.)?([^\.]+))\.([^\.]+)\.service\.data\.([^\.]+)To">
-      <variableAssignment type="regex" key="rootPackage" value="1"/>
-      <variableAssignment type="regex" key="domain" value="3"/>
-      <variableAssignment type="regex" key="component" value="4"/>
-      <variableAssignment type="regex" key="toName" value="5"/>
-    </matcher>
-  </trigger>
-</contextConfiguration>
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/named_queries/templates.xml b/cobigen-templates/templates-devon4j/src/main/templates/named_queries/templates.xml
deleted file mode 100644
index b0257f7119..0000000000
--- a/cobigen-templates/templates-devon4j/src/main/templates/named_queries/templates.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<templatesConfiguration xmlns="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration" version="2.1">
-    <templates>
-        <template name="named_queries" destinationPath="src/main/java/${variables.rootPackage}/general/common/api/constants/NamedQueries.java" templateFile="NamedQueries.java.ftl"/>
-    </templates>
-    <increments>
-        <increment name="named_queries" description="Named Query Constants">
-            <templateRef ref="named_queries"/>
-        </increment>
-    </increments>
-</templatesConfiguration>
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/openapi_documentation/context.xml b/cobigen-templates/templates-devon4j/src/main/templates/openapi_documentation/context.xml
deleted file mode 100644
index 353671332f..0000000000
--- a/cobigen-templates/templates-devon4j/src/main/templates/openapi_documentation/context.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="2.2">
-
-
- <trigger id="OpenAPI_docs" type="openapi">
-    <containerMatcher type="element" value="openAPIFile"/>
-    <matcher type="element" value="EntityDef">
-      <variableAssignment type="constant" key="rootPackage" value="com.devonfw"/>
-      <variableAssignment type="property" key="component" value="componentName"/>
-      <variableAssignment type="property" key="entityName" value="name"/>
-    </matcher>
-  </trigger>
-
-</contextConfiguration>
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/openapi_documentation/templates.xml b/cobigen-templates/templates-devon4j/src/main/templates/openapi_documentation/templates.xml
deleted file mode 100644
index 65bec1bd4f..0000000000
--- a/cobigen-templates/templates-devon4j/src/main/templates/openapi_documentation/templates.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<templatesConfiguration xmlns="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.1">
-
-  <templates>
-    <templateExtension ref="Documentation.adoc" mergeStrategy="textmerge_appendWithNewLine"/>
-  </templates>
-
-  <templateScans>
-    <templateScan templatePath="templates" destinationPath=""/>
-  </templateScans>
-
-  <increments>
-    <increment name="OpenAPI_Docs" description="Documentation">
-      <templateRef ref="Documentation.adoc"/>
-    </increment>
-  </increments>
-</templatesConfiguration>
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/rest_documentation/context.xml b/cobigen-templates/templates-devon4j/src/main/templates/rest_documentation/context.xml
deleted file mode 100644
index d09d42a6c3..0000000000
--- a/cobigen-templates/templates-devon4j/src/main/templates/rest_documentation/context.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="2.2">
-
-
-  <trigger id="REST_Docs" type="java">
-    <containerMatcher type="package" value="((.+\.)?([^\.]+))\.([^\.]+)\.service\.api\.rest"
-      retrieveObjectsRecursively="false"/>
-    <matcher type="fqn" value="((.+\.)?([^\.]+))\.([^\.]+)\.service\.api\.rest\.([^\.]+)RestService">
-      <variableAssignment type="regex" key="rootPackage" value="1"/>
-      <variableAssignment type="regex" key="domain" value="3"/>
-      <variableAssignment type="regex" key="component" value="4"/>
-    </matcher>
-  </trigger>
-
-
-</contextConfiguration>
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/rest_documentation/templates.xml b/cobigen-templates/templates-devon4j/src/main/templates/rest_documentation/templates.xml
deleted file mode 100644
index 3b8158c263..0000000000
--- a/cobigen-templates/templates-devon4j/src/main/templates/rest_documentation/templates.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<templatesConfiguration xmlns="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.1">
-
-  <templates>
-    <templateExtension ref="Documentation.adoc" mergeStrategy="textmerge_append"/>
-  </templates>
-
-  <templateScans>
-    <templateScan templatePath="templates" destinationPath=""/>
-  </templateScans>
-
-  <increments>
-    <increment name="Rest_Docs" description="Documentation">
-      <templateRef ref="Documentation.adoc"/>
-    </increment>
-  </increments>
-</templatesConfiguration>
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/security_permissions/templates.xml b/cobigen-templates/templates-devon4j/src/main/templates/security_permissions/templates.xml
deleted file mode 100644
index 2bd3601d56..0000000000
--- a/cobigen-templates/templates-devon4j/src/main/templates/security_permissions/templates.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<templatesConfiguration xmlns="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration" version="2.1">
-    <templates>
-        <template name="permission_constants" destinationPath="src/main/java/${variables.rootPackage}/general/common/api/constants/PermissionConstants.java" templateFile="PermissionConstants.java.ftl" mergeStrategy="override"/>
-    </templates>
-    <increments>
-        <increment name="permission_constants" description="Permission Constants">
-            <templateRef ref="permission_constants"/>
-        </increment>
-    </increments>
-</templatesConfiguration>
\ No newline at end of file
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/testdata_builder/context.xml b/cobigen-templates/templates-devon4j/src/main/templates/testdata_builder/context.xml
deleted file mode 100644
index 3b3ca2c82f..0000000000
--- a/cobigen-templates/templates-devon4j/src/main/templates/testdata_builder/context.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="2.2">
-
-
-  <trigger id="testdata_builder" type="java">
-    <containerMatcher type="package" value="((.+\.)?([^\.]+))\.([^\.]+)\.dataaccess\.api"
-      retrieveObjectsRecursively="false"/>
-    <matcher type="fqn" value="((.+\.)?([^\.]+))\.([^\.]+)\.dataaccess\.api\.([^\.]+Entity)">
-      <variableAssignment type="regex" key="rootPackage" value="1"/>
-      <variableAssignment type="regex" key="domain" value="3"/>
-      <variableAssignment type="regex" key="component" value="4"/>
-      <variableAssignment type="regex" key="pojoName" value="5"/>
-    </matcher>
-    <matcher type="fqn" value="((.+\.)?([^\.]+))\.([^\.]+)\.logic\.api\.to\.([^\.]+[E|C]to)">
-      <variableAssignment type="regex" key="rootPackage" value="1"/>
-      <variableAssignment type="regex" key="domain" value="3"/>
-      <variableAssignment type="regex" key="component" value="4"/>
-      <variableAssignment type="regex" key="pojoName" value="5"/>
-    </matcher>
-    <matcher type="expression" value="instanceof java.lang.Enum" accumulationType="NOT"/>
-    <matcher type="expression" value="isAbstract" accumulationType="NOT"/>
-  </trigger>
-
-</contextConfiguration>
diff --git a/cobigen-templates/templates-devon4j/src/test/java/com/devonfw/cobigen/templates/devon4j/test/templates/TemplatesGenerationTest.java b/cobigen-templates/templates-devon4j/src/test/java/com/devonfw/cobigen/templates/devon4j/test/templates/TemplatesGenerationTest.java
deleted file mode 100644
index a830440750..0000000000
--- a/cobigen-templates/templates-devon4j/src/test/java/com/devonfw/cobigen/templates/devon4j/test/templates/TemplatesGenerationTest.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package com.devonfw.cobigen.templates.devon4j.test.templates;
-
-import java.io.File;
-
-import org.junit.Test;
-
-import com.devonfw.cobigen.maven.test.AbstractMavenTest;
-import com.devonfw.cobigen.templates.devon4j.config.constant.MavenMetadata;
-
-/**
- * Smoke tests of all templates.
- */
-public class TemplatesGenerationTest extends AbstractMavenTest {
-
-  /** Root of all test resources of this test suite */
-  public static final String TEST_RESOURCES_ROOT = "src/test/resources/testdata/templatetest/";
-
-  /**
-   * Test successful generation of all templates based on an entity
-   *
-   * @throws Exception test fails
-   */
-  @Test
-  public void testAllTemplatesGeneration_EntityInput() throws Exception {
-
-    File testProject = new File(TEST_RESOURCES_ROOT + "TestAllTemplatesEntityInput/");
-    runMavenInvoker(testProject, new File("").getAbsoluteFile(), MavenMetadata.LOCAL_REPO);
-  }
-
-  /**
-   * Test successful generation of all templates based on an ETO
-   *
-   * @throws Exception test fails
-   */
-  @Test
-  public void testAllTemplatesGeneration_EtoInput() throws Exception {
-
-    File testProject = new File(TEST_RESOURCES_ROOT + "TestAllTemplatesEtoInput/");
-    runMavenInvoker(testProject, new File("").getAbsoluteFile(), MavenMetadata.LOCAL_REPO);
-  }
-
-  /**
-   * Test successful generation of all templates based on an ETO
-   *
-   * @throws Exception test fails
-   */
-  @Test
-  public void testAllTemplatesGeneration_OpenApiInput() throws Exception {
-
-    File testProject = new File(TEST_RESOURCES_ROOT + "TestAllTemplatesOpenApiInput/");
-    runMavenInvoker(testProject, new File("").getAbsoluteFile(), MavenMetadata.LOCAL_REPO);
-  }
-
-  /**
-   * Test successful generation of all templates based on a RestService
-   *
-   * @throws Exception test fails
-   */
-  @Test
-  public void testAllTemplatesGeneration_RestServiceInput() throws Exception {
-
-    File testProject = new File(TEST_RESOURCES_ROOT + "TestAllTemplatesRestServiceInput/");
-    runMavenInvoker(testProject, new File("").getAbsoluteFile(), MavenMetadata.LOCAL_REPO);
-  }
-
-  /**
-   * Test successful generation of all templates based on a TO
-   *
-   * @throws Exception test fails
-   */
-  @Test
-  public void testAllTemplatesGeneration_ToInput() throws Exception {
-
-    File testProject = new File(TEST_RESOURCES_ROOT + "TestAllTemplatesToInput/");
-    runMavenInvoker(testProject, new File("").getAbsoluteFile(), MavenMetadata.LOCAL_REPO);
-  }
-
-  /**
-   * Test successful generation of all templates based on a
-   *
-   * @throws Exception test fails
-   */
-  @Test
-  public void testAllTemplatesGeneration_XML() throws Exception {
-
-    File testProject = new File(TEST_RESOURCES_ROOT + "TestAllTemplatesXMLInput/");
-    runMavenInvoker(testProject, new File("").getAbsoluteFile(), MavenMetadata.LOCAL_REPO);
-  }
-
-}
diff --git a/cobigen-templates/templates-devon4j/src/test/java/com/devonfw/cobigen/templates/devon4j/test/utils/JavaUtilTest.java b/cobigen-templates/templates-devon4j/src/test/java/com/devonfw/cobigen/templates/devon4j/test/utils/JavaUtilTest.java
deleted file mode 100644
index 1223ec246c..0000000000
--- a/cobigen-templates/templates-devon4j/src/test/java/com/devonfw/cobigen/templates/devon4j/test/utils/JavaUtilTest.java
+++ /dev/null
@@ -1,299 +0,0 @@
-package com.devonfw.cobigen.templates.devon4j.test.utils;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import java.lang.reflect.Method;
-
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import com.devonfw.cobigen.templates.devon4j.test.utils.resources.TestClass;
-import com.devonfw.cobigen.templates.devon4j.test.utils.resources.TestTwoClass;
-import com.devonfw.cobigen.templates.devon4j.utils.JavaUtil;
-
-/**
- * Test class for {@link JavaUtil}
- */
-public class JavaUtilTest {
-
-  private static Class<?> clazz;
-
-  private static Class<?> clazzTwo;
-
-  @BeforeClass
-  public static void beforeAll() {
-
-    clazz = new TestClass().getClass();
-    clazzTwo = new TestTwoClass().getClass();
-  }
-
-  /**
-   * Tests if {@link JavaUtil#equalsJavaPrimitive(String)} returns true when a primitive is passed
-   */
-  @Test
-  public void testEqualsJavaPrimitiveWithPrimitive() {
-
-    assertThat(new JavaUtil().equalsJavaPrimitive("int")).isTrue();
-  }
-
-  /**
-   * Tests if {@link JavaUtil#equalsJavaPrimitive(Class&lt;?>,String)} returns true when a primitive is passed
-   */
-  @Test
-  public void testPojoEqualsJavaPrimitiveWithPrimitive() throws NoSuchFieldException, SecurityException {
-
-    assertThat(new JavaUtil().equalsJavaPrimitive(clazz, "primitive")).isTrue();
-  }
-
-  /**
-   * Tests if {@link JavaUtil#equalsJavaPrimitive(String)} returns false when a boxed java primitive class is passed
-   */
-  @Test
-  public void testEqualsJavaPrimitiveWithBoxedPrimitive() {
-
-    assertThat(new JavaUtil().equalsJavaPrimitive("Integer")).isFalse();
-  }
-
-  /**
-   * Tests if {@link JavaUtil#equalsJavaPrimitive(Class&lt;?>,String)} returns false when a boxed java primitive class
-   * is passed
-   */
-  @Test
-  public void testPojoEqualsJavaPrimitiveWithBoxedPrimitive() throws NoSuchFieldException, SecurityException {
-
-    assertThat(new JavaUtil().equalsJavaPrimitive(clazz, "boxed")).isFalse();
-  }
-
-  /**
-   * Tests if {@link JavaUtil#equalsJavaPrimitive(String)} returns false when a java primitive array is passed
-   */
-  @Test
-  public void testEqualsJavaPrimitiveWithPrimitiveArray() {
-
-    assertThat(new JavaUtil().equalsJavaPrimitive("int[]")).isFalse();
-  }
-
-  /**
-   * Tests if {@link JavaUtil#equalsJavaPrimitive(Class&lt;?>,String)} returns false when a java primitive array is
-   * passed
-   */
-  @Test
-  public void testPojoEqualsJavaPrimitiveWithPrimitiveArray() throws NoSuchFieldException, SecurityException {
-
-    assertThat(new JavaUtil().equalsJavaPrimitive(clazz, "primitiveArray")).isFalse();
-  }
-
-  /**
-   * Tests if {@link JavaUtil#equalsJavaPrimitive(String)} returns false when a non-primitive but existing class is
-   * passed
-   */
-  @Test
-  public void testEqualsJavaPrimitiveWOPrimitive() {
-
-    assertThat(new JavaUtil().equalsJavaPrimitive("util.JavaUtilTest")).isFalse();
-  }
-
-  /**
-   * Tests if {@link JavaUtil#equalsJavaPrimitive(Class,String)} returns false when a non-primitive but existing class
-   * is passed
-   */
-  @Test
-  public void testPojoEqualsJavaPrimitiveWOPrimitive() throws NoSuchFieldException, SecurityException {
-
-    assertThat(new JavaUtil().equalsJavaPrimitive(clazz, "object")).isFalse();
-  }
-
-  /**
-   * Tests if {@link JavaUtil#equalsJavaPrimitive(String)} returns false when a non-primitive non-existing class is
-   * passed
-   */
-  @Test
-  public void testEqualsJavaPrimitiveWOExistingClass() {
-
-    assertThat(new JavaUtil().equalsJavaPrimitive("DefinitelyNotAClass")).isFalse();
-  }
-
-  /**
-   * Tests if {@link JavaUtil#equalsJavaPrimitive(Class,String)} throws an exception when a non-existing field is
-   * accessed
-   */
-  @Test(expected = NoSuchFieldException.class)
-  public void testPojoEqualsJavaPrimitiveWOExistingClass() throws NoSuchFieldException, SecurityException {
-
-    assertThat(new JavaUtil().equalsJavaPrimitive(clazz, "definitelyNotAField")).isFalse();
-  }
-
-  /**
-   * Tests if {@link JavaUtil#equalsJavaPrimitiveIncludingArrays(String)} returns true for a java primitive
-   */
-  @Test
-  public void testEqualsJavaPrimitiveIncludingArrays() {
-
-    assertThat(new JavaUtil().equalsJavaPrimitiveIncludingArrays("int")).isTrue();
-  }
-
-  /**
-   * Tests if {@link JavaUtil#equalsJavaPrimitiveIncludingArrays(Class,String)} returns true for a java primitive
-   */
-  @Test
-  public void testPojoEqualsJavaPrimitiveIncludingArrays() throws NoSuchFieldException, SecurityException {
-
-    assertThat(new JavaUtil().equalsJavaPrimitiveIncludingArrays(clazz, "primitive")).isTrue();
-  }
-
-  /**
-   * Tests if {@link JavaUtil#equalsJavaPrimitiveIncludingArrays(String)} returns true for a java primitive array
-   */
-  @Test
-  public void testEqualsJavaPrimitiveIncludingArraysWPrimitiveArray() {
-
-    assertThat(new JavaUtil().equalsJavaPrimitiveIncludingArrays("int[]")).isTrue();
-  }
-
-  /**
-   * Tests if {@link JavaUtil#equalsJavaPrimitiveIncludingArrays(Class,String)} returns true for a java primitive array
-   */
-  @Test
-  public void testPojoEqualsJavaPrimitiveIncludingArraysWPrimitiveArray()
-      throws NoSuchFieldException, SecurityException {
-
-    assertThat(new JavaUtil().equalsJavaPrimitiveIncludingArrays(clazz, "primitiveArray")).isTrue();
-  }
-
-  /**
-   * Tests if {@link JavaUtil#equalsJavaPrimitiveIncludingArrays(String)} returns false for a java non-primitive array
-   */
-  @Test
-  public void testEqualsJavaPrimitiveIncludingArraysWArray() {
-
-    assertThat(new JavaUtil().equalsJavaPrimitiveIncludingArrays("Integer[]")).isFalse();
-  }
-
-  /**
-   * Tests if {@link JavaUtil#equalsJavaPrimitiveIncludingArrays(Class,String)} returns false for a java non-primitive
-   * array
-   */
-  @Test
-  public void testPojoEqualsJavaPrimitiveIncludingArraysWArray() throws NoSuchFieldException, SecurityException {
-
-    assertThat(new JavaUtil().equalsJavaPrimitiveIncludingArrays(clazz, "objectArray")).isFalse();
-  }
-
-  /**
-   * Tests if {@link utils.JavaUtil#boxJavaPrimitives(String)} returns the object wrapper for a java primitive
-   */
-  @Test
-  public void testBoxJavaPrimitive() throws Exception {
-
-    assertThat(new JavaUtil().boxJavaPrimitives("int")).isEqualTo("Integer");
-  }
-
-  /**
-   * Tests if {@link utils.JavaUtil#boxJavaPrimitives(Class,String)} returns the object wrapper for a java primitive
-   */
-  @Test
-  public void testPojoBoxJavaPrimitive() throws Exception {
-
-    assertThat(new JavaUtil().boxJavaPrimitives(clazz, "primitive")).isEqualTo("Integer");
-  }
-
-  /**
-   * Tests if {@link utils.JavaUtil#boxJavaPrimitives(String)} returns the input String for a primitive array
-   */
-  @Test
-  public void testBoxJavaPrimitiveWPrimitiveArray() throws Exception {
-
-    assertThat(new JavaUtil().boxJavaPrimitives("int[]")).isEqualTo("int[]");
-  }
-
-  /**
-   * Tests if {@link utils.JavaUtil#boxJavaPrimitives(Class,String)} returns the input String for a primitive array
-   */
-  @Test
-  public void testPojoBoxJavaPrimitiveWPrimitiveArray() throws Exception {
-
-    assertThat(new JavaUtil().boxJavaPrimitives(clazz, "primitiveArray")).isEqualTo("int[]");
-  }
-
-  /**
-   * Tests if {@link utils.JavaUtil#boxJavaPrimitives(String)} returns the input String for a non primitive
-   */
-  @Test
-  public void testBoxJavaPrimitiveWOPrimitive() throws Exception {
-
-    assertThat(new JavaUtil().boxJavaPrimitives("Notint")).isEqualTo("Notint");
-  }
-
-  /**
-   * Tests if {@link utils.JavaUtil#boxJavaPrimitives(Class,String)} returns the simple type name for a non primitive
-   */
-  @Test
-  public void testPojoBoxJavaPrimitiveWOPrimitive() throws Exception {
-
-    assertThat(new JavaUtil().boxJavaPrimitives(clazz, "object")).isEqualTo("String");
-  }
-
-  /**
-   * tests if {@link utils.JavaUtil#boxJavaPrimitives(String, String)} casts the var name if it is primitive
-   */
-  @Test
-  public void testCastJavaPrimitiveStatement() throws Exception {
-
-    assertThat(new JavaUtil().castJavaPrimitives("int", "var")).isEqualTo("((Integer)var)");
-  }
-
-  /**
-   * tests if {@link utils.JavaUtil#boxJavaPrimitives(Class,String)} casts the var name if it is primitive
-   */
-  @Test
-  public void testPojoCastJavaPrimitiveStatement() throws Exception {
-
-    assertThat(new JavaUtil().castJavaPrimitives(clazz, "primitive")).isEqualTo("((Integer)primitive)");
-  }
-
-  /**
-   * tests if {@link utils.JavaUtil#boxJavaPrimitives(String, String)} doesn't cast the var name if it isn't a primitive
-   */
-  @Test
-  public void testCastJavaPrimitiveStatementWOCast() throws Exception {
-
-    assertThat(new JavaUtil().castJavaPrimitives("Integer", "var")).isEqualTo("");
-  }
-
-  /**
-   * tests if {@link utils.JavaUtil#boxJavaPrimitives(Class,String)} doesn't cast the var name if it isn't a primitive
-   */
-  @Test
-  public void testPojoCastJavaPrimitiveStatementWOCast() throws Exception {
-
-    assertThat(new JavaUtil().castJavaPrimitives(clazz, "object")).isEqualTo("");
-  }
-
-  /**
-   * tests if the field is {@link java.util.List} or {@link java.util.Set}
-   */
-  @Test
-  public void testIsCollection() throws NoSuchFieldException, SecurityException {
-
-    assertThat(new JavaUtil().isCollection(clazz, "entitys")).isTrue();
-    assertThat(new JavaUtil().isCollection(clazz, "setEntitys")).isTrue();
-    assertThat(new JavaUtil().isCollection(clazz, "boxed")).isFalse();
-  }
-
-  /**
-   * tests if the return type is properly retrieved
-   *
-   * @throws SecurityException
-   * @throws NoSuchMethodException
-   */
-  @Test
-  public void testGetReturnType() throws NoSuchMethodException, SecurityException {
-
-    for (Method m : clazz.getMethods()) {
-
-      System.out.println(m.getName());
-    }
-    assertThat(new JavaUtil().getReturnType(clazz, "methodWithReturnType")).isEqualTo("String");
-    assertThat(new JavaUtil().getReturnType(clazz, "methodWithVoidReturnType")).isEqualTo("-");
-  }
-}
\ No newline at end of file
diff --git a/cobigen-templates/testdata-builder/pom.xml b/cobigen-templates/testdata-builder/pom.xml
new file mode 100644
index 0000000000..a54f9980ee
--- /dev/null
+++ b/cobigen-templates/testdata-builder/pom.xml
@@ -0,0 +1,19 @@
+<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>testdata-builder</artifactId>
+  <name>Testdata Builder template</name>
+
+  <parent>
+    <groupId>com.devonfw.cobigen.templates</groupId>
+    <artifactId>templates-parent</artifactId>
+    <version>${revision}</version>
+  </parent>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+    </dependency>
+  </dependencies>
+</project>
\ No newline at end of file
diff --git a/cobigen-templates/testdata-builder/src/main/java-templates/com/devonfw/cobigen/templates/devon4j/config/constant/MavenMetadata.java b/cobigen-templates/testdata-builder/src/main/java-templates/com/devonfw/cobigen/templates/devon4j/config/constant/MavenMetadata.java
new file mode 100644
index 0000000000..395d46154d
--- /dev/null
+++ b/cobigen-templates/testdata-builder/src/main/java-templates/com/devonfw/cobigen/templates/devon4j/config/constant/MavenMetadata.java
@@ -0,0 +1,12 @@
+package com.devonfw.cobigen.templates.devon4j.config.constant;
+
+/**
+ * Constants extracted from the maven pom by templating-maven-plugin.
+ * 
+ * @see "edit template in src/main/java-templates"
+ */
+public class MavenMetadata {
+
+    /** Local repository path */
+    public static final String LOCAL_REPO = "${settings.localRepository}";
+}
diff --git a/cobigen-templates/testdata-builder/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/JavaUtil.java b/cobigen-templates/testdata-builder/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/JavaUtil.java
new file mode 100644
index 0000000000..2d4025071d
--- /dev/null
+++ b/cobigen-templates/testdata-builder/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/JavaUtil.java
@@ -0,0 +1,464 @@
+package com.devonfw.cobigen.templates.devon4j.utils;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.Collection;
+import java.util.Map;
+
+import org.apache.commons.lang3.ClassUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Provides type operations, mainly checks and casts for Java Primitives, to be used in the templates
+ *
+ */
+public class JavaUtil {
+
+  /**
+   * Logger for this class
+   */
+  private static final Logger LOG = LoggerFactory.getLogger(JavaUtil.class);
+
+  /**
+   * The constructor.
+   */
+  public JavaUtil() {
+
+    // Empty for CobiGen to automatically instantiate it
+  }
+
+  /**
+   * Returns the Object version of a Java primitive or the input if the input isn't a java primitive
+   *
+   * @param simpleType String
+   * @return the corresponding object wrapper type simple name of the input if the input is the name of a primitive java
+   *         type. The input itself if not. (e.g. "int" results in "Integer")
+   * @throws ClassNotFoundException should not occur.
+   */
+  public String boxJavaPrimitives(String simpleType) throws ClassNotFoundException {
+
+    if (equalsJavaPrimitive(simpleType)) {
+      return ClassUtils.primitiveToWrapper(ClassUtils.getClass(simpleType)).getSimpleName();
+    } else {
+      return simpleType;
+    }
+
+  }
+
+  /**
+   * Returns the simple name of the type of a field in the pojoClass. If the type is a java primitive the name of the
+   * wrapper class is returned
+   *
+   * @param pojoClass {@link Class} the class object of the pojo
+   * @param fieldName {@link String} the name of the field
+   * @return String. The simple name of the field's type. The simple name of the wrapper class in case of java
+   *         primitives
+   * @throws NoSuchFieldException indicating something awefully wrong in the used model
+   * @throws SecurityException if the field cannot be accessed.
+   */
+  public String boxJavaPrimitives(Class<?> pojoClass, String fieldName) throws NoSuchFieldException, SecurityException {
+
+    if (pojoClass == null) {
+      throw new IllegalAccessError(
+          "Class object is null. Cannot generate template as it might obviously depend on reflection.");
+    }
+
+    if (equalsJavaPrimitive(pojoClass, fieldName)) {
+      return ClassUtils.primitiveToWrapper(pojoClass.getDeclaredField(fieldName).getType()).getSimpleName();
+    } else {
+      Field field = pojoClass.getDeclaredField(fieldName);
+      if (field == null) {
+        field = pojoClass.getField(fieldName);
+      }
+      if (field == null) {
+        throw new IllegalAccessError("Could not find field " + fieldName + " in class " + pojoClass);
+      } else {
+        return field.getType().getSimpleName();
+      }
+    }
+  }
+
+  /**
+   * Checks if the given type is a Java primitive
+   *
+   * @param simpleType the type to be checked
+   * @return true iff simpleType is a Java primitive
+   */
+  public boolean equalsJavaPrimitive(String simpleType) {
+
+    try {
+      return ClassUtils.getClass(simpleType).isPrimitive();
+    } catch (ClassNotFoundException e) {
+      LOG.warn("{}: Could not find {}", e.getMessage(), simpleType);
+      return false;
+    }
+  }
+
+  /**
+   * Checks if the given type is a Java primitive or wrapper
+   *
+   * @param simpleType the type to be checked
+   * @return true iff simpleType is a Java primitive or wrapper
+   */
+  public boolean equalsJavaPrimitiveOrWrapper(String simpleType) {
+
+    try {
+      return ClassUtils.isPrimitiveOrWrapper(ClassUtils.getClass(simpleType));
+    } catch (ClassNotFoundException e) {
+      LOG.warn("{}: Could not find {}", e.getMessage(), simpleType);
+      return false;
+    }
+  }
+
+  /**
+   * Checks if the type of the field in the pojo's class is a java primitive
+   *
+   * @param pojoClass the {@link Class} object of the pojo
+   * @param fieldName the name of the field to be checked
+   * @return true iff the field is a java primitive
+   * @throws NoSuchFieldException indicating something awefully wrong in the used model
+   * @throws SecurityException if the field cannot be accessed.
+   */
+  public boolean equalsJavaPrimitive(Class<?> pojoClass, String fieldName)
+      throws NoSuchFieldException, SecurityException {
+
+    if (pojoClass == null) {
+      return false;
+    }
+
+    Field field = pojoClass.getDeclaredField(fieldName);
+    if (field == null) {
+      field = pojoClass.getField(fieldName);
+    }
+    if (field == null) {
+      return false;
+    } else {
+      return field.getType().isPrimitive();
+    }
+  }
+
+  /**
+   * Checks if the given type is a Java primitive or a Java primitive array
+   *
+   * @param simpleType the Type name to be checked
+   * @return true iff {@link #equalsJavaPrimitive(String)} is true or if simpleType is an array with a primitive
+   *         component
+   */
+  public boolean equalsJavaPrimitiveIncludingArrays(String simpleType) {
+
+    Class<?> klasse;
+
+    try {
+      klasse = ClassUtils.getClass(simpleType).getComponentType();
+    } catch (ClassNotFoundException e) {
+      LOG.warn("{}: Could not find {}", e.getMessage(), simpleType);
+      return false;
+    }
+    return equalsJavaPrimitive(simpleType) || (klasse != null && klasse.isPrimitive());
+  }
+
+  /**
+   * Checks if the given field in the pojo class is a java primitive or an array of java primitives
+   *
+   * @param pojoClass the class object of the pojo
+   * @param fieldName the name of the field to be checked
+   * @return true iff {@link #equalsJavaPrimitive(Class, String)} is true or the field is an array of primitives
+   * @throws NoSuchFieldException indicating something awfully wrong in the used model
+   * @throws SecurityException if the field cannot be accessed.
+   */
+  public boolean equalsJavaPrimitiveIncludingArrays(Class<?> pojoClass, String fieldName)
+      throws NoSuchFieldException, SecurityException {
+
+    return equalsJavaPrimitive(pojoClass, fieldName) || (pojoClass.getDeclaredField(fieldName).getType().isArray()
+        && pojoClass.getDeclaredField(fieldName).getType().getComponentType().isPrimitive());
+  }
+
+  /**
+   * Returns a cast statement for a given (java primitive, variable name) pair or nothing if the type isn't a java
+   * primitive
+   *
+   * @param simpleType Java Type
+   * @param varName Variable name
+   * @return String either of the form '((Java Primitive Object Type)varName)' if simpleType is a primitive or the empty
+   *         String otherwise
+   * @throws ClassNotFoundException should not occur
+   */
+  public String castJavaPrimitives(String simpleType, String varName) throws ClassNotFoundException {
+
+    if (equalsJavaPrimitive(simpleType)) {
+      return String.format("((%1$s)%2$s)", boxJavaPrimitives(simpleType), varName);
+    } else {
+      return "";
+    }
+  }
+
+  /**
+   * Returns a cast statement for a given (java primitive, variable name) pair or nothing if the type isn't a java
+   * primitive
+   *
+   * @param pojoClass the class object of the pojo
+   * @param fieldName the name of the field to be casted
+   * @return if fieldName points to a primitive field then a casted statement (e.g. for an int field:
+   *         '((Integer)field)') or an empty String otherwise
+   * @throws NoSuchFieldException indicating something awefully wrong in the used model
+   * @throws SecurityException if the field cannot be accessed.
+   */
+  public String castJavaPrimitives(Class<?> pojoClass, String fieldName)
+      throws NoSuchFieldException, SecurityException {
+
+    if (equalsJavaPrimitive(pojoClass, fieldName)) {
+      return String.format("((%1$s)%2$s)", boxJavaPrimitives(pojoClass, fieldName), fieldName);
+    } else {
+      return "";
+    }
+  }
+
+  /**
+   * @param pojoClass {@link Class} the class object of the pojo
+   * @param fieldName {@link String} the name of the field
+   * @return true if the field is an instance of java.utils.Collections
+   * @throws NoSuchFieldException indicating something awefully wrong in the used model
+   * @throws SecurityException if the field cannot be accessed.
+   */
+  public boolean isCollection(Class<?> pojoClass, String fieldName) throws NoSuchFieldException, SecurityException {
+
+    if (pojoClass == null) {
+      return false;
+    }
+
+    Field field = pojoClass.getDeclaredField(fieldName);
+    if (field == null) {
+      field = pojoClass.getField(fieldName);
+    }
+    if (field == null) {
+      return false;
+    } else {
+      return Collection.class.isAssignableFrom(field.getType());
+    }
+
+  }
+
+  /**
+   * Returns the Ext Type to a given java type
+   *
+   * @param simpleType any java type's simple name
+   * @return corresponding Ext type
+   */
+  public String getExtType(String simpleType) {
+
+    switch (simpleType) {
+      case "short":
+      case "Short":
+      case "int":
+      case "Integer":
+      case "long":
+      case "Long":
+        return "Integer";
+      case "float":
+      case "Float":
+      case "double":
+      case "Double":
+        return "Number";
+      case "boolean":
+      case "Boolean":
+        return "Boolean";
+      case "char":
+      case "Character":
+      case "String":
+        return "String";
+      case "Date":
+        return "Date";
+      default:
+        return "Field";
+    }
+  }
+
+  /**
+   * returns the Angular5 type associated with a Java primitive
+   *
+   * @param simpleType :{@link String} the type to be parsed
+   * @return the corresponding Angular type or 'any' otherwise
+   */
+  public String getAngularType(String simpleType) {
+
+    switch (simpleType) {
+      case "boolean":
+        return "boolean";
+      case "Boolean":
+        return "boolean";
+      case "short":
+        return "number";
+      case "Short":
+        return "number";
+      case "int":
+        return "number";
+      case "Integer":
+        return "number";
+      case "long":
+        return "number";
+      case "Long":
+        return "number";
+      case "float":
+        return "number";
+      case "Float":
+        return "number";
+      case "double":
+        return "number";
+      case "Double":
+        return "number";
+      case "char":
+        return "string";
+      case "Character":
+        return "string";
+      case "String":
+        return "string";
+      case "byte":
+        return "number";
+      default:
+        return "any";
+    }
+  }
+
+  /**
+   * returns the class name of the return type of a specific method.
+   *
+   * @param pojoClass {@link Class}&lt;?&gt; the class object of the pojo
+   * @param methodName {@link String} the name of the method
+   * @return the class name of the return type of the specified method
+   * @throws SecurityException If no method of the given name can be found
+   * @throws NoSuchMethodException If no method of the given name can be found
+   */
+  public String getReturnType(Class<?> pojoClass, String methodName) throws NoSuchMethodException, SecurityException {
+
+    if (pojoClass == null) {
+      throw new IllegalAccessError(
+          "Class object is null. Cannot generate template as it might obviously depend on reflection.");
+    }
+    String s = "-";
+    Method method = findMethod(pojoClass, methodName);
+    if (method != null && !method.getReturnType().equals(Void.TYPE)) {
+      s = method.getReturnType().toString();
+      s = s.substring(s.lastIndexOf('.') + 1, s.length());
+    }
+    return s;
+  }
+
+  /**
+   *
+   * This methods returns the return type of the method in the given pojoClass which are annotated with the parameter
+   * annotatedClass
+   *
+   * @param pojoClass - The class in which to find if it has methods with annotatedClass
+   * @param annotatedClassName - The annotation which needs to be found
+   * @return Return type of the method annotated with the given annotation, else "null"
+   * @throws ClassNotFoundException if the annotated class name could not be found in the class path
+   */
+  @SuppressWarnings("unchecked")
+  public String getReturnTypeOfMethodAnnotatedWith(Class<?> pojoClass, String annotatedClassName)
+      throws ClassNotFoundException {
+
+    if (pojoClass == null) {
+      throw new IllegalAccessError(
+          "Class object is null. Cannot generate template as it might obviously depend on reflection.");
+    }
+
+    Method[] methods = pojoClass.getDeclaredMethods();
+    for (Method method : methods) {
+      if (!method.getName().startsWith("get")) {
+        continue;
+      }
+      for (Annotation a : method.getAnnotations()) {
+        // better if (method.isAnnotationPresent(classObj)) {, but postponed as of different class
+        // loaders of a.getClass() and pojoClass.getClass()
+        if (a.getClass().getCanonicalName().equals(annotatedClassName)) {
+          return method.getReturnType().getSimpleName();
+        }
+      }
+    }
+    return "null";
+  }
+
+  /**
+   * returns the HTTP request type corresponding to an annotation type
+   *
+   * @param annotations The annotation to get the type name of
+   * @return the HTTP request type name of the selected annotation
+   */
+  public String getRequestType(Map<String, Object> annotations) {
+
+    if (annotations.containsKey("javax_ws_rs_GET")) {
+      return "GET";
+    } else if (annotations.containsKey("javax_ws_rs_PUT")) {
+      return "PUT";
+    } else if (annotations.containsKey("javax_ws_rs_POST")) {
+      return "POST";
+    } else if (annotations.containsKey("javax_ws_rs_DELETE")) {
+      return "DELETE";
+    } else if (annotations.containsKey("javax_ws_rs_PATCH")) {
+      return "PATCH";
+    } else {
+      return "-";
+    }
+  }
+
+  /**
+   * Helper method to find a class's specific method
+   *
+   * @param pojoClass {@link Class}&lt;?&gt; the class object of the pojo
+   * @param methodName The name of the method to be found
+   * @return The method object of the method to be found, null if it wasn't found
+   */
+  private Method findMethod(Class<?> pojoClass, String methodName) {
+
+    if (pojoClass == null) {
+      throw new IllegalAccessError(
+          "Class object is null. Cannot generate template as it might obviously depend on reflection.");
+    }
+    for (Method m : pojoClass.getMethods()) {
+      if (m.getName().equals(methodName)) {
+        return m;
+      }
+    }
+    return null;
+  }
+
+  /**
+   * Checks whether the class given by the full qualified name is an enum
+   *
+   * @param className full qualified class name
+   * @return <code>true</code> if the class is an enum, <code>false</code> otherwise
+   */
+  public boolean isEnum(String className) {
+
+    try {
+      return ClassUtils.getClass(className).isEnum();
+    } catch (ClassNotFoundException e) {
+      LOG.warn("{}: Could not find {}", e.getMessage(), className);
+      return false;
+    }
+  }
+
+  /**
+   * Returns the first enum value of an enum class
+   *
+   * @param className full qualified class name
+   * @return the first enum value name found in order
+   */
+  public String getFirstEnumValue(String className) {
+
+    try {
+      Class<?> enumClass = ClassUtils.getClass(className);
+      Field[] declaredFields = enumClass.getDeclaredFields();
+      if (declaredFields.length > 0) {
+        return declaredFields[0].getName();
+      } else {
+        return null;
+      }
+    } catch (ClassNotFoundException e) {
+      LOG.warn("{}: Could not find {}", e.getMessage(), className);
+      return null;
+    }
+  }
+}
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/testdata_builder/ObjectBuilder.java.ftl b/cobigen-templates/testdata-builder/src/main/resources/ObjectBuilder.java.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/testdata_builder/ObjectBuilder.java.ftl
rename to cobigen-templates/testdata-builder/src/main/resources/ObjectBuilder.java.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/testdata_builder/ObjectBuilder_customFunctions.java.ftl b/cobigen-templates/testdata-builder/src/main/resources/ObjectBuilder_customFunctions.java.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/testdata_builder/ObjectBuilder_customFunctions.java.ftl
rename to cobigen-templates/testdata-builder/src/main/resources/ObjectBuilder_customFunctions.java.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/testdata_builder/ObjectBuilder_fillMandatoryFields.java.ftl b/cobigen-templates/testdata-builder/src/main/resources/ObjectBuilder_fillMandatoryFields.java.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/testdata_builder/ObjectBuilder_fillMandatoryFields.java.ftl
rename to cobigen-templates/testdata-builder/src/main/resources/ObjectBuilder_fillMandatoryFields.java.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/testdata_builder/ObjectBuilder_persistable.java.ftl b/cobigen-templates/testdata-builder/src/main/resources/ObjectBuilder_persistable.java.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/testdata_builder/ObjectBuilder_persistable.java.ftl
rename to cobigen-templates/testdata-builder/src/main/resources/ObjectBuilder_persistable.java.ftl
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/testdata_builder/makros.ftl b/cobigen-templates/testdata-builder/src/main/resources/makros.ftl
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/testdata_builder/makros.ftl
rename to cobigen-templates/testdata-builder/src/main/resources/makros.ftl
diff --git a/cobigen-templates/testdata-builder/src/main/resources/template-set.xml b/cobigen-templates/testdata-builder/src/main/resources/template-set.xml
new file mode 100644
index 0000000000..2e258d22ad
--- /dev/null
+++ b/cobigen-templates/testdata-builder/src/main/resources/template-set.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:templateSetConfiguration version="6.0"
+  xmlns:tns="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration"
+  xmlns:cc="http://capgemini.com/devonfw/cobigen/ContextConfiguration"
+  xmlns:tc="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration templateSetConfiguration.xsd ">
+  <cc:contextConfiguration version="3.0">
+    <cc:trigger id="testdata_builder" type="java">
+      <cc:containerMatcher type="package" value="((.+\.)?([^\.]+))\.([^\.]+)\.dataaccess\.api"
+        retrieveObjectsRecursively="false"/>
+      <cc:matcher type="fqn" value="((.+\.)?([^\.]+))\.([^\.]+)\.dataaccess\.api\.([^\.]+Entity)">
+        <cc:variableAssignment type="regex" key="rootPackage" value="1"/>
+        <cc:variableAssignment type="regex" key="domain" value="3"/>
+        <cc:variableAssignment type="regex" key="component" value="4"/>
+        <cc:variableAssignment type="regex" key="pojoName" value="5"/>
+      </cc:matcher>
+      <cc:matcher type="fqn" value="((.+\.)?([^\.]+))\.([^\.]+)\.logic\.api\.to\.([^\.]+[E|C]to)">
+        <cc:variableAssignment type="regex" key="rootPackage" value="1"/>
+        <cc:variableAssignment type="regex" key="domain" value="3"/>
+        <cc:variableAssignment type="regex" key="component" value="4"/>
+        <cc:variableAssignment type="regex" key="pojoName" value="5"/>
+      </cc:matcher>
+      <cc:matcher type="expression" value="instanceof java.lang.Enum" accumulationType="NOT"/>
+      <cc:matcher type="expression" value="isAbstract" accumulationType="NOT"/>
+    </cc:trigger>
+    <cc:tags>
+      <cc:tag name="TestData"></cc:tag>
+      <cc:tag name="Builder"></cc:tag>
+    </cc:tags>
+    <cc:links>
+      <cc:link url="https://github.com/devonfw/cobigen/wiki/cobigen-usecases#test-data-builder-for-devon4j"></cc:link>
+    </cc:links>
+  </cc:contextConfiguration>
+  <tc:templatesConfiguration version="5.0">
+    <tc:templates>
+      <tc:template name="entityBuilder"
+        destinationPath="src/test/java/${variables.rootPackage}/common/api/builders/${variables.pojoName}Builder.java"
+        templateFile="ObjectBuilder.java.ftl" mergeStrategy="javamerge"/>
+      <tc:template name="entityBuilder_customFunctions"
+        destinationPath="src/test/java/${variables.rootPackage}/common/api/builders/${variables.pojoName}Builder.java"
+        templateFile="ObjectBuilder_customFunctions.java.ftl" mergeStrategy="javamerge"/>
+      <tc:template name="entityBuilder_fillMandatoryFields"
+        destinationPath="src/test/java/${variables.rootPackage}/common/api/builders/${variables.pojoName}Builder.java"
+        templateFile="ObjectBuilder_fillMandatoryFields.java.ftl" mergeStrategy="javamerge_override"/>
+      <tc:template name="entityBuilder_persistable"
+        destinationPath="src/test/java/${variables.rootPackage}/common/api/builders/${variables.pojoName}Builder.java"
+        templateFile="ObjectBuilder_persistable.java.ftl" mergeStrategy="javamerge"/>
+    </tc:templates>
+    <tc:increments>
+      <tc:increment name="testdata_builder" description="Testdata builder"
+        explanation="Creates a builder pattern for POJOs (Plain Old Java Objects).">
+        <tc:templateRef ref="entityBuilder"/>
+        <tc:templateRef ref="entityBuilder_fillMandatoryFields"/>
+        <tc:templateRef ref="entityBuilder_customFunctions"/>
+      </tc:increment>
+      <tc:increment name="testdata_builder_persistable" description="Testdata builder (persistable)">
+        <tc:templateRef ref="entityBuilder"/>
+        <tc:templateRef ref="entityBuilder_fillMandatoryFields"/>
+        <tc:templateRef ref="entityBuilder_customFunctions"/>
+        <tc:templateRef ref="entityBuilder_persistable"/>
+      </tc:increment>
+    </tc:increments>
+  </tc:templatesConfiguration>
+</tns:templateSetConfiguration>
diff --git a/cobigen-templates/testdata-builder/src/test/java/com/devonfw/cobigen/templates/devon4j/test/templates/TestDataBuilderGenerationTest.java b/cobigen-templates/testdata-builder/src/test/java/com/devonfw/cobigen/templates/devon4j/test/templates/TestDataBuilderGenerationTest.java
new file mode 100644
index 0000000000..7018e5a0c2
--- /dev/null
+++ b/cobigen-templates/testdata-builder/src/test/java/com/devonfw/cobigen/templates/devon4j/test/templates/TestDataBuilderGenerationTest.java
@@ -0,0 +1,100 @@
+package com.devonfw.cobigen.templates.devon4j.test.templates;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+import org.apache.commons.io.FileUtils;
+import org.junit.BeforeClass;
+import org.junit.ClassRule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+
+import com.devonfw.cobigen.api.constants.ConfigurationConstants;
+import com.devonfw.cobigen.maven.test.AbstractMavenTest;
+import com.devonfw.cobigen.templates.devon4j.config.constant.MavenMetadata;
+
+/**
+ * Smoke tests of all templates.
+ */
+public class TestDataBuilderGenerationTest extends AbstractMavenTest {
+
+  /** Root of all test resources of this test suite */
+  public static final String TEST_RESOURCES_ROOT = "src/test/resources/testdata/templatetest/";
+
+  /** Temporary files rule to create temporary folders */
+  @ClassRule
+  public static TemporaryFolder tempFolder = new TemporaryFolder();
+
+  /** The templates development folder */
+  protected static Path templatesProject;
+
+  /** The templates development folder */
+  protected static Path templatesProjectTemporary;
+
+  /**
+   * Creates a copy of the templates project in the temp directory
+   *
+   * @throws URISyntaxException if the path could not be created properly
+   * @throws IOException if accessing a directory or file fails
+   */
+  @BeforeClass
+  public static void setupDevTemplates() throws URISyntaxException, IOException {
+
+    templatesProject = new File(
+        TestDataBuilderGenerationTest.class.getProtectionDomain().getCodeSource().getLocation().toURI()).getParentFile()
+            .getParentFile().toPath();
+
+    Path utilsPom = new File(
+        TestDataBuilderGenerationTest.class.getProtectionDomain().getCodeSource().getLocation().toURI()).getParentFile()
+            .getParentFile().toPath().resolve("src/test/resources/utils/pom.xml");
+
+    // create a temporary directory cobigen-templates/template-sets/adapted containing the template sets
+    Path tempFolderPath = tempFolder.getRoot().toPath();
+    Path cobigenTemplatePath = tempFolderPath.resolve("cobigen-templates");
+    if (!Files.exists(cobigenTemplatePath)) {
+      Files.createDirectory(cobigenTemplatePath);
+
+      templatesProjectTemporary = cobigenTemplatePath.resolve(ConfigurationConstants.TEMPLATE_SETS_FOLDER);
+      Path templateSetsAdaptedFolder = templatesProjectTemporary.resolve(ConfigurationConstants.ADAPTED_FOLDER);
+      Files.createDirectory(templatesProjectTemporary);
+      Files.createDirectory(templateSetsAdaptedFolder);
+
+      Path templateSetPath = templateSetsAdaptedFolder.resolve("template-set");
+      FileUtils.copyDirectory(templatesProject.toFile(), templateSetPath.toFile());
+
+      if (Files.isDirectory(templateSetPath)) {
+
+        // Replace the pom.xml in the template sets. Needed so that the project in the temp directory is build
+        // properly
+        if (Files.exists(templateSetPath.resolve("pom.xml"))) {
+          try {
+            Files.delete(templateSetPath.resolve("pom.xml"));
+          } catch (IOException e) {
+            throw new IOException("Error deleting file " + templateSetPath.resolve("pom.xml"), e);
+          }
+          try {
+            Files.copy(utilsPom, templateSetPath.resolve("pom.xml"));
+          } catch (IOException e) {
+            throw new IOException("Error copying file " + utilsPom, e);
+          }
+        }
+      }
+    }
+  }
+
+  /**
+   * Test successful generation of all templates based on an entity
+   *
+   * @throws Exception test fails
+   */
+  @Test
+  public void testAllTemplatesGeneration_EntityInput() throws Exception {
+
+    File testProject = new File(TEST_RESOURCES_ROOT + "TestAllTemplatesEntityInput/");
+    runMavenInvoker(testProject, templatesProjectTemporary.toFile(), MavenMetadata.LOCAL_REPO);
+  }
+
+}
diff --git a/cobigen-templates/testdata-builder/src/test/resources/testdata/templatetest/TestAllTemplatesEntityInput/logback.xml b/cobigen-templates/testdata-builder/src/test/resources/testdata/templatetest/TestAllTemplatesEntityInput/logback.xml
new file mode 100644
index 0000000000..5f29165f75
--- /dev/null
+++ b/cobigen-templates/testdata-builder/src/test/resources/testdata/templatetest/TestAllTemplatesEntityInput/logback.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- This file is for logback classic. The file contains the configuration for slf4j logging -->
+<configuration>
+	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+			<Pattern>%d{HH:mm:ss.SSS} [%thread] [C:%X{correlationId}] - %-5level - %logger{36} - %msg%n
+			</Pattern>
+		</encoder>
+	</appender>
+
+	<root level="INFO">
+		<appender-ref ref="STDOUT" />
+	</root>
+</configuration>
diff --git a/cobigen-templates/testdata-builder/src/test/resources/testdata/templatetest/TestAllTemplatesEntityInput/pom.xml b/cobigen-templates/testdata-builder/src/test/resources/testdata/templatetest/TestAllTemplatesEntityInput/pom.xml
new file mode 100644
index 0000000000..987f810bfd
--- /dev/null
+++ b/cobigen-templates/testdata-builder/src/test/resources/testdata/templatetest/TestAllTemplatesEntityInput/pom.xml
@@ -0,0 +1,53 @@
+<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>com.devonfw.cobigen</groupId>
+  <artifactId>devon4jTemplateTest-TestAllTemplatesEntityInput</artifactId>
+  <version>dev-SNAPSHOT</version>
+
+  <properties>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
+  </properties>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>com.devonfw.cobigen</groupId>
+        <artifactId>cobigen-maven-plugin</artifactId>
+        <version>${pluginVersion}</version>
+        <executions>
+          <execution>
+            <id>generate</id>
+            <phase>package</phase>
+            <goals>
+              <goal>generate</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <configurationFolder>${templatesProject}</configurationFolder>
+          <inputFiles>
+            <inputFile>src/main/java/io/github/devonfw/cobigen/generator/dataaccess/api/InputEntity.java</inputFile>
+          </inputFiles>
+          <templates>
+            <template>ALL</template>
+          </templates>
+          <failOnNothingGenerated>true</failOnNothingGenerated>
+        </configuration>
+        <dependencies>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>tempeng-freemarker</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.devonfw.cobigen</groupId>
+            <artifactId>javaplugin</artifactId>
+            <version>${pluginVersion}</version>
+          </dependency>
+        </dependencies>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/cobigen-templates/testdata-builder/src/test/resources/testdata/templatetest/TestAllTemplatesEntityInput/src/main/java/io/github/devonfw/cobigen/generator/dataaccess/api/InputEntity.java b/cobigen-templates/testdata-builder/src/test/resources/testdata/templatetest/TestAllTemplatesEntityInput/src/main/java/io/github/devonfw/cobigen/generator/dataaccess/api/InputEntity.java
new file mode 100644
index 0000000000..e2d76c7c9f
--- /dev/null
+++ b/cobigen-templates/testdata-builder/src/test/resources/testdata/templatetest/TestAllTemplatesEntityInput/src/main/java/io/github/devonfw/cobigen/generator/dataaccess/api/InputEntity.java
@@ -0,0 +1,25 @@
+package io.github.devonfw.cobigen.generator.dataaccess.api;
+
+public class InputEntity {
+    
+    private String input;
+    
+    private int complexity;
+    
+    public String getInput() {
+        return input;
+    }
+    
+    public void setInput(String input) {
+        this.input = input;
+    }
+    
+    public int getComplexity() {
+        return complexity;
+    }
+    
+    public void setComplexity(int complexity) {
+        this.complexity = complexity;
+    }
+    
+}
diff --git a/cobigen-templates/testdata-builder/src/test/resources/utils/pom.xml b/cobigen-templates/testdata-builder/src/test/resources/utils/pom.xml
new file mode 100644
index 0000000000..e790420be9
--- /dev/null
+++ b/cobigen-templates/testdata-builder/src/test/resources/utils/pom.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.devonfw.cobigen.templates</groupId>
+  <artifactId>testdata-builder</artifactId>
+  <version>2021.12.007-SNAPSHOT</version>
+  <name>Test Data Builder</name>
+  <description>A Code-based incremental Generator</description>
+  <licenses>
+    <license>
+      <name>Apache Software License 2.0</name>
+      <url>https://raw.githubusercontent.com/devonfw/.github/master/LICENSE</url>
+      <distribution>repo</distribution>
+      <comments></comments>
+    </license>
+  </licenses>
+  <dependencies>
+    <dependency>
+      <groupId>javax.ws.rs</groupId>
+      <artifactId>javax.ws.rs-api</artifactId>
+      <version>2.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.data</groupId>
+      <artifactId>spring-data-rest-webmvc</artifactId>
+      <version>3.7.10</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+      <version>3.12.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+      <version>2.10.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>xerces</groupId>
+      <artifactId>xercesImpl</artifactId>
+      <version>2.12.2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.persistence</groupId>
+      <artifactId>javax.persistence-api</artifactId>
+      <version>2.2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>1.7.30</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <version>1.7.30</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>log4j-over-slf4j</artifactId>
+      <version>1.7.30</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+  <repositories>
+    <repository>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+      <id>ossrh</id>
+      <name>OSSRH Snapshots</name>
+      <url>https://s01.oss.sonatype.org/content/repositories/snapshots/</url>
+    </repository>
+  </repositories>
+
+  <properties>
+   <maven.compiler.source>1.8</maven.compiler.source>
+   <maven.compiler.target>1.8</maven.compiler.target>
+  </properties>
+
+  <build>
+   <resources>
+     <resource>
+       <directory>src/main/java</directory>
+     </resource>
+   </resources>
+  </build></project>
\ No newline at end of file
diff --git a/cobigen/cobigen-core-api/pom.xml b/cobigen/cobigen-core-api/pom.xml
index 8924f9bbc9..ddd6253af0 100644
--- a/cobigen/cobigen-core-api/pom.xml
+++ b/cobigen/cobigen-core-api/pom.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-  xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>core-api</artifactId>
   <name>CobiGen Core - API</name>
@@ -32,7 +31,6 @@
     <dependency>
       <groupId>org.zeroturnaround</groupId>
       <artifactId>zt-exec</artifactId>
-      <version>1.12</version>
     </dependency>
 
     <dependency>
@@ -40,11 +38,45 @@
       <artifactId>core-test</artifactId>
       <scope>test</scope>
     </dependency>
+
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
       <scope>test</scope>
     </dependency>
+
+    <!-- enables JSON creation for REST search response API -->
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+    </dependency>
+
+    <!-- http client -->
+    <dependency>
+      <groupId>com.squareup.okhttp3</groupId>
+      <artifactId>okhttp</artifactId>
+    </dependency>
+
+    <!-- Needed for WireMock test support -->
+    <dependency>
+      <groupId>com.github.tomakehurst</groupId>
+      <artifactId>wiremock-standalone</artifactId>
+      <version>2.27.2</version>
+      <scope>test</scope>
+    </dependency>
+
+    <!-- Needed for settings.xml decryption -->
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-sec-dispatcher</artifactId>
+      <version>2.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-cipher</artifactId>
+      <version>2.0</version>
+    </dependency>
   </dependencies>
 
   <build>
@@ -62,4 +94,4 @@
       </plugin>
     </plugins>
   </build>
-</project>
+</project>
\ No newline at end of file
diff --git a/cobigen/cobigen-core-api/src/main/java/com/devonfw/cobigen/api/TemplateAdapter.java b/cobigen/cobigen-core-api/src/main/java/com/devonfw/cobigen/api/TemplateAdapter.java
new file mode 100644
index 0000000000..7475f42660
--- /dev/null
+++ b/cobigen/cobigen-core-api/src/main/java/com/devonfw/cobigen/api/TemplateAdapter.java
@@ -0,0 +1,98 @@
+package com.devonfw.cobigen.api;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.List;
+
+import com.devonfw.cobigen.api.exception.TemplateSelectionForAdaptionException;
+import com.devonfw.cobigen.api.exception.UpgradeTemplatesNotificationException;
+
+/** The TemplateAdapter implements methods for adapting template jars */
+public interface TemplateAdapter {
+  /**
+   * Adapt the templates. Can either adapt an old monolithic template structure or independent template sets.
+   *
+   * @throws IOException If CobiGen is not able to extract the jar file to the destination folder
+   * @throws UpgradeTemplatesNotificationException If an old monolithic structure was adapted. Can be catched to ask the
+   *         user for an upgrade of the templates.
+   * @throws TemplateSelectionForAdaptionException If a new template structure is given. To ask the user to select the
+   *         template sets to adapt.
+   */
+  public void adaptTemplates()
+      throws IOException, UpgradeTemplatesNotificationException, TemplateSelectionForAdaptionException;
+
+  /**
+   * Adapt a given set of template set jars.
+   *
+   * @param templateSetJars A {@link List} of the {@link Path} of the template set jars to adapt
+   * @param forceOverride Indicator whether an already adapted template set should be overridden
+   * @throws IOException If CobiGen is not able to extract the jar file to the destination folder
+   */
+  public void adaptTemplateSets(List<Path> templateSetJars, boolean forceOverride) throws IOException;
+
+  /**
+   * Adapt a set of template set jars to a given destination folder.
+   *
+   * @param templateSetJars A {@link List} of the {@link Path} of the template set jars to adapt
+   * @param destinationPath The parent folder where the jars should be extracted to
+   * @param forceOverride Indicator whether an already adapted template set should be overridden
+   * @throws IOException If CobiGen is not able to extract the jar file to the destination folder
+   */
+  public void adaptTemplateSets(List<Path> templateSetJars, Path destinationPath, boolean forceOverride)
+      throws IOException;
+
+  /**
+   * Adapt an old monolithic template jar structure.
+   *
+   * @param forceOverride Indicator whether an already adapted template set should be overridden
+   * @throws IOException If CobiGen is not able to extract the jar file to the destination folder
+   */
+  public void adaptMonolithicTemplates(boolean forceOverride) throws IOException;
+
+  /**
+   * Adapt an old monolithic template jar structure to a given destination folder.
+   *
+   * @param destinationPath The folder where the jars should be extracted to
+   * @param forceOverride Indicator whether an already adapted template set should be overridden
+   * @throws IOException If CobiGen is not able to extract the jar file to the destination folder
+   */
+  public void adaptMonolithicTemplates(Path destinationPath, boolean forceOverride) throws IOException;
+
+  /**
+   * Gets a list of available template set jars to adapt. Template set jars without sources will not be added to this
+   * list.
+   *
+   * @return A {@link List} of {@link Path} with all adaptable template set jar files found.
+   */
+  public List<Path> getTemplateSetJars();
+
+  /**
+   * Checks if the template configuration consists of an old monolithic template set or independent template sets.
+   *
+   * @return Returns {@code true} if the template structure consists of an old monolithic template set. Otherwise false.
+   */
+  public boolean isMonolithicTemplatesConfiguration();
+
+  /**
+   * Get the parent location of the templates.
+   *
+   * @return The {@link Path} of the templates location.
+   */
+  public Path getTemplatesLocation();
+
+  /**
+   * Checks if a given template set is already adapted
+   *
+   * @param templateSetJar The {@link Path} to the template set to check.
+   * @return Returns {@code true} if the template set is already adapted. Otherwise false.
+   */
+  public boolean isTemplateSetAlreadyAdapted(Path templateSetJar);
+
+  /**
+   * Upgrade an adapted monolithic template structure to the new template structure consisting of template sets.
+   *
+   * @param templatesProject path to the templates which should be upgraded.
+   * @return the new path to the new template-sets
+   */
+  Path upgradeMonolithicTemplates(Path templatesProject);
+}
\ No newline at end of file
diff --git a/cobigen/cobigen-core-api/src/main/java/com/devonfw/cobigen/api/constants/ConfigurationConstants.java b/cobigen/cobigen-core-api/src/main/java/com/devonfw/cobigen/api/constants/ConfigurationConstants.java
index 94fa4ee66e..ce21d5eafc 100644
--- a/cobigen/cobigen-core-api/src/main/java/com/devonfw/cobigen/api/constants/ConfigurationConstants.java
+++ b/cobigen/cobigen-core-api/src/main/java/com/devonfw/cobigen/api/constants/ConfigurationConstants.java
@@ -20,19 +20,31 @@ public class ConfigurationConstants {
   /** Templates configuration file name */
   public static final String TEMPLATES_CONFIG_FILENAME = "templates.xml";
 
-  /** Filename of the {@link Properties} used to customize cobigen properties and template relocation. */
+  /** Template Set configuration file name */
+  public static final String TEMPLATE_SET_CONFIG_FILENAME = "template-set.xml";
+
+  /** Template Set filename for Freemarker functions */
+  public static final String TEMPLATE_SET_FREEMARKER_FUNCTIONS_FILE_NAME = "functions.ftl";
+
+  /** Filename of the {@link Properties} used to customize CobiGen properties and template relocation. */
   public static final String COBIGEN_PROPERTIES = "cobigen.properties";
 
   /** Resource folder containing templates */
   public static final String TEMPLATE_RESOURCE_FOLDER = "src/main/templates";
 
+  /** Resource folder containing util classes */
+  public static final String UTIL_RESOURCE_FOLDER = "src/main/java";
+
+  /** Resource folder containing maven configuration resources */
+  public static final String MAVEN_CONFIGURATION_RESOURCE_FOLDER = "src/main/resources";
+
   /** Resource folder containing merge schemas */
   public static final String MERGE_SCHEMA_RESOURCE_FOLDER = "src/main/resources/mergeSchemas";
 
   /** Delimiter splitting the template folder and value of references in templates.xml files */
   public static final String REFERENCE_DELIMITER = "::";
 
-  // configuration resource constants of cobigen home
+  // configuration resource constants of CobiGen home
 
   /** Default directory name in the home folder in case of {@link #DEFAULT_HOME} */
   public static final String DEFAULT_HOME_DIR_NAME = ".cobigen";
@@ -43,6 +55,15 @@ public class ConfigurationConstants {
   /** Name of the templates folder */
   public static final String TEMPLATES_FOLDER = "templates";
 
+  /** Name of the template sets downloaded folder */
+  public static final String DOWNLOADED_FOLDER = "downloaded";
+
+  /** Name of the template sets adapted folder */
+  public static final String ADAPTED_FOLDER = "adapted";
+
+  /** Name of the template sets folder */
+  public static final String TEMPLATE_SETS_FOLDER = "template-sets";
+
   /** Name of the extracted templates project */
   public static final String COBIGEN_TEMPLATES = "CobiGen_Templates";
 
@@ -57,9 +78,60 @@ public class ConfigurationConstants {
    */
   public static final String CONFIG_PROPERTY_TEMPLATES_PATH = "templates";
 
-  // cobigen configuration environment variables
+  /**
+   * Name of configuration key for location of template sets.
+   */
+  public static final String CONFIG_PROPERTY_TEMPLATE_SETS_PATH = "template-sets";
+
+  /**
+   * Name of configuration key to be able to configure multiple (comma separated) groupIds
+   */
+  public static final String CONFIG_PROPERTY_TEMPLATE_SETS_GROUPIDS = "template-sets.groupIds";
+
+  /**
+   * Name of configuration key to allow snapshots of template-sets to be offered
+   */
+  public static final String CONFIG_PROPERTY_TEMPLATE_SETS_SNAPSHOTS = "template-sets.allow-snapshots";
+
+  /**
+   * Name of configuration key to disable by default querying of default public groupIds
+   */
+  public static final String CONFIG_PROPERTY_TEMPLATE_SETS_DISABLE_LOOKUP = "template-sets.disable-default-lookup";
 
-  /** Name of the environment variable pointing to cobigen configuration file */
+  /**
+   * Name of configuration key to hide very specific template sets
+   */
+  public static final String CONFIG_PROPERTY_TEMPLATE_SETS_HIDE = "template-sets.hide";
+
+  /**
+   * Name of configuration key to save specific time
+   */
+  public static final String CONFIG_PROPERTY_POSTPONE_UPGRADE_MESSAGE_UNTIL = "postpone-upgrade-message-until";
+
+  /**
+   * Name of configuration key to preinstall specific template sets
+   */
+  public static final String CONFIG_PROPERTY_TEMPLATE_SETS_INSTALLED = "template-sets.installed";
+
+  /**
+   * Default (public) CobiGen GroupId
+   */
+  public static final String CONFIG_PROPERTY_TEMPLATE_SETS_DEFAULT_GROUPID = "com.devonfw.cobigen.templates";
+
+  // CobiGen configuration environment variables
+
+  /** Name of the environment variable pointing to CobiGen configuration file */
   public static final String CONFIG_ENV_HOME = "COBIGEN_HOME";
 
+  /** Name of the backup folder containing the old configuration */
+  public static final String BACKUP_FOLDER = "backup";
+
+  /**
+   * Default CobiGen version
+   *
+   * TODO: retrieve the version dynamically (not as a constant) at runtime, see:
+   * https://github.com/devonfw/cobigen/issues/1669
+   */
+  public static final String CONFIG_PROPERTY_TEMPLATE_SETS_DEFAULT_VERSION = "2021.12.007";
+
 }
diff --git a/cobigen/cobigen-core-api/src/main/java/com/devonfw/cobigen/api/constants/TemplatesJarConstants.java b/cobigen/cobigen-core-api/src/main/java/com/devonfw/cobigen/api/constants/TemplatesJarConstants.java
index 4028c22da2..8fe754573f 100644
--- a/cobigen/cobigen-core-api/src/main/java/com/devonfw/cobigen/api/constants/TemplatesJarConstants.java
+++ b/cobigen/cobigen-core-api/src/main/java/com/devonfw/cobigen/api/constants/TemplatesJarConstants.java
@@ -9,6 +9,12 @@ public class TemplatesJarConstants {
    */
   public static final String DOWNLOADED_JAR_FOLDER = "/.metadata/cobigen_jars";
 
+  /**
+   * Regular expression to check the correct definition of maven coordinates to download a template-set with the
+   * configuration key template-sets.installed in the properties.
+   */
+  public static final String MAVEN_COORDINATES_CHECK = "([a-zA-Z0-9_\\-\\.]+):([a-zA-Z0-9_-]+)(:([0-9]+(\\.[0-9]+)*(-SNAPSHOT)?|LATEST))?";
+
   /**
    * Jar regular expression name to be used in a file name filter, so that we can check whether the templates are
    * already downloaded. Checks "templates-anystring-anydigitbetweendots.jar"
diff --git a/cobigen/cobigen-core-api/src/main/java/com/devonfw/cobigen/api/exception/DeprecatedMonolithicConfigurationException.java b/cobigen/cobigen-core-api/src/main/java/com/devonfw/cobigen/api/exception/DeprecatedMonolithicConfigurationException.java
new file mode 100644
index 0000000000..57706dde75
--- /dev/null
+++ b/cobigen/cobigen-core-api/src/main/java/com/devonfw/cobigen/api/exception/DeprecatedMonolithicConfigurationException.java
@@ -0,0 +1,65 @@
+package com.devonfw.cobigen.api.exception;
+
+import java.nio.file.Path;
+
+/**
+ * Exception that indicates that an old monolithic template structure has been found. For asking if the template
+ * structure should be upgraded later.
+ */
+public class DeprecatedMonolithicConfigurationException extends CobiGenRuntimeException {
+
+  /**
+   * Default serial version UID.
+   */
+  private static final long serialVersionUID = 1;
+
+  /**
+   * Path to the monolithicConfiguration.
+   */
+  private static Path monolithicConfiguration = null;
+
+  /**
+   * Gets the path to the monolithic configuration.
+   *
+   * @return path to the monolithic configuration
+   */
+  public static Path getMonolithicConfiguration() {
+
+    return monolithicConfiguration;
+  }
+
+  /**
+   * The constructor.
+   *
+   * @param message informative message describing the exception or where it has been occurred
+   * @param cause originating this exception
+   */
+  public DeprecatedMonolithicConfigurationException(String message, Throwable cause) {
+
+    super(message, cause);
+  }
+
+  /**
+   * The constructor.
+   *
+   * Creates a new {@link DeprecatedMonolithicConfigurationException} with a proper notification message
+   */
+  public DeprecatedMonolithicConfigurationException() {
+
+    super("You are using an old templates configuration. Please consider upgrading your templates! Thank you!");
+  }
+
+  /**
+   * The constructor.
+   *
+   * Creates a new {@link DeprecatedMonolithicConfigurationException} with a proper notification message
+   *
+   * @param monolithicConfiguration path to the monolithicConfiguration
+   */
+  public DeprecatedMonolithicConfigurationException(Path monolithicConfiguration) {
+
+    super("You are using an old templates configuration. Please consider upgrading your templates! Thank you!");
+    DeprecatedMonolithicConfigurationException.monolithicConfiguration = monolithicConfiguration;
+  }
+
+}
diff --git a/cobigen/cobigen-core-api/src/main/java/com/devonfw/cobigen/api/exception/NotYetSupportedException.java b/cobigen/cobigen-core-api/src/main/java/com/devonfw/cobigen/api/exception/NotYetSupportedException.java
index fdba12b370..e0fe28287c 100644
--- a/cobigen/cobigen-core-api/src/main/java/com/devonfw/cobigen/api/exception/NotYetSupportedException.java
+++ b/cobigen/cobigen-core-api/src/main/java/com/devonfw/cobigen/api/exception/NotYetSupportedException.java
@@ -2,8 +2,6 @@
 
 /**
  * States that any logic has been triggered, which is currently not supported.
- *
- * @author mbrunnli (Jun 22, 2015)
  */
 public class NotYetSupportedException extends CobiGenRuntimeException {
 
@@ -16,7 +14,6 @@ public class NotYetSupportedException extends CobiGenRuntimeException {
    * Creates a new {@link NotYetSupportedException} with the given Message.
    *
    * @param msg error message
-   * @author mbrunnli (Jun 22, 2015)
    */
   public NotYetSupportedException(String msg) {
 
diff --git a/cobigen/cobigen-core-api/src/main/java/com/devonfw/cobigen/api/exception/TemplateSelectionForAdaptionException.java b/cobigen/cobigen-core-api/src/main/java/com/devonfw/cobigen/api/exception/TemplateSelectionForAdaptionException.java
new file mode 100644
index 0000000000..841b2939cc
--- /dev/null
+++ b/cobigen/cobigen-core-api/src/main/java/com/devonfw/cobigen/api/exception/TemplateSelectionForAdaptionException.java
@@ -0,0 +1,36 @@
+package com.devonfw.cobigen.api.exception;
+
+import java.nio.file.Path;
+import java.util.List;
+
+/**
+ * Exception that indicates that a new template structure is available. For asking which template sets should be
+ * adapted.
+ */
+public class TemplateSelectionForAdaptionException extends Exception {
+  /** Generated serial version UID */
+  private static final long serialVersionUID = 1;
+
+  /** List of available template sets. */
+  private List<Path> templateSets;
+
+  /**
+   * Creates a new {@link TemplateSelectionForAdaptionException}
+   *
+   * @param templateSets A list with available template sets to adapt.
+   *
+   */
+  public TemplateSelectionForAdaptionException(List<Path> templateSets) {
+
+    super("Select the template sets you want to adapt.");
+    this.templateSets = templateSets;
+  }
+
+  /**
+   * @return templateSets All available template sets.
+   */
+  public List<Path> getTemplateSets() {
+
+    return this.templateSets;
+  }
+}
\ No newline at end of file
diff --git a/cobigen/cobigen-core-api/src/main/java/com/devonfw/cobigen/api/exception/UnknownExpressionException.java b/cobigen/cobigen-core-api/src/main/java/com/devonfw/cobigen/api/exception/UnknownExpressionException.java
index 4efbb6b2c1..6f385dede5 100644
--- a/cobigen/cobigen-core-api/src/main/java/com/devonfw/cobigen/api/exception/UnknownExpressionException.java
+++ b/cobigen/cobigen-core-api/src/main/java/com/devonfw/cobigen/api/exception/UnknownExpressionException.java
@@ -2,8 +2,6 @@
 
 /**
  * Occurs if a variable expression in the configuration xml is unknown
- *
- * @author mbrunnli (18.02.2013)
  */
 public class UnknownExpressionException extends InvalidConfigurationException {
 
@@ -16,7 +14,6 @@ public class UnknownExpressionException extends InvalidConfigurationException {
    * Creates a new {@link UnknownExpressionException}
    *
    * @param unknownExpression unknown expression which could not be resolved
-   * @author mbrunnli (18.02.2013)
    */
   public UnknownExpressionException(String unknownExpression) {
 
diff --git a/cobigen/cobigen-core-api/src/main/java/com/devonfw/cobigen/api/exception/UpgradeTemplatesNotificationException.java b/cobigen/cobigen-core-api/src/main/java/com/devonfw/cobigen/api/exception/UpgradeTemplatesNotificationException.java
new file mode 100644
index 0000000000..ad6dd32e7a
--- /dev/null
+++ b/cobigen/cobigen-core-api/src/main/java/com/devonfw/cobigen/api/exception/UpgradeTemplatesNotificationException.java
@@ -0,0 +1,22 @@
+package com.devonfw.cobigen.api.exception;
+
+/**
+ * Exception that indicates that an old monolithic template structure has been adapted. For asking if the template
+ * structure should be upgraded.
+ */
+public class UpgradeTemplatesNotificationException extends Exception {
+
+  /** Generated serial version UID */
+  private static final long serialVersionUID = 1;
+
+  /**
+   * Creates a new {@link UpgradeTemplatesNotificationException} with a proper notification message
+   *
+   */
+  public UpgradeTemplatesNotificationException() {
+
+    super(
+        "You are using an old, monolithic template project. Do you want to upgrade your template project to the new template structure with independent template sets?");
+  }
+
+}
diff --git a/cobigen/cobigen-core-api/src/main/java/com/devonfw/cobigen/api/to/MatcherTo.java b/cobigen/cobigen-core-api/src/main/java/com/devonfw/cobigen/api/to/MatcherTo.java
index dde05e1906..60c4163135 100644
--- a/cobigen/cobigen-core-api/src/main/java/com/devonfw/cobigen/api/to/MatcherTo.java
+++ b/cobigen/cobigen-core-api/src/main/java/com/devonfw/cobigen/api/to/MatcherTo.java
@@ -26,7 +26,6 @@ public class MatcherTo {
    * @param type the matchers type
    * @param value to match against
    * @param target object to be matched
-   * @author mbrunnli (08.04.2014)
    */
   public MatcherTo(String type, String value, Object target) {
 
@@ -39,7 +38,6 @@ public MatcherTo(String type, String value, Object target) {
    * Returns the type
    *
    * @return the type
-   * @author mbrunnli (08.04.2014)
    */
   public String getType() {
 
@@ -50,7 +48,6 @@ public String getType() {
    * Returns the value to match against
    *
    * @return the value to match against
-   * @author mbrunnli (08.04.2014)
    */
   public String getValue() {
 
@@ -61,7 +58,6 @@ public String getValue() {
    * Returns the target to be matched
    *
    * @return the target to be matched
-   * @author mbrunnli (08.04.2014)
    */
   public Object getTarget() {
 
diff --git a/cobigen/cobigen-core-api/src/main/java/com/devonfw/cobigen/api/util/CobiGenPaths.java b/cobigen/cobigen-core-api/src/main/java/com/devonfw/cobigen/api/util/CobiGenPaths.java
index 0f746f9a72..06ecd109e7 100644
--- a/cobigen/cobigen-core-api/src/main/java/com/devonfw/cobigen/api/util/CobiGenPaths.java
+++ b/cobigen/cobigen-core-api/src/main/java/com/devonfw/cobigen/api/util/CobiGenPaths.java
@@ -11,10 +11,11 @@
 import org.slf4j.LoggerFactory;
 
 import com.devonfw.cobigen.api.constants.ConfigurationConstants;
+import com.devonfw.cobigen.api.constants.MavenConstants;
 import com.devonfw.cobigen.api.exception.CobiGenRuntimeException;
 
 /**
- * Utilities related to the cobigen configurations including:
+ * Utilities related to the CobiGen configurations including:
  *
  * 1. templates location
  */
@@ -23,6 +24,20 @@ public class CobiGenPaths {
   /** Logger instance */
   private static final Logger LOG = LoggerFactory.getLogger(CobiGenPaths.class);
 
+  /** Path for tests to change the CobiGen Home */
+  private static Path testPath = null;
+
+  /**
+   * Sets a custom path to CobiGen home (use this for tests only!!!)
+   *
+   * @param customPath Path to CobiGen home
+   */
+  public static void setCobiGenHomeTestPath(Path customPath) {
+
+    testPath = customPath;
+    LOG.debug("Changed CobiGen home path to: {}", customPath);
+  }
+
   /**
    * Returns the CobiGen home directory, or creates a new one if it does not exist
    *
@@ -30,6 +45,11 @@ public class CobiGenPaths {
    */
   public static Path getCobiGenHomePath() {
 
+    if (testPath != null) {
+      LOG.debug("Custom CobiGen home path found at: {} returning it instead.", testPath);
+      return testPath;
+    }
+
     String envValue = System.getenv(ConfigurationConstants.CONFIG_ENV_HOME);
     Path cobiGenPath;
     if (!StringUtils.isEmpty(envValue)) {
@@ -54,8 +74,8 @@ public static Path getCobiGenHomePath() {
   }
 
   /**
-   * Returns the templates home directory (which is located inside CobiGen home folder), or creates a new one if it does
-   * not exist
+   * Returns the templates home directory (which is located inside CobiGen home folder). The folder is no longer created
+   * if it does not exist. Instead CobiGen will switch to the template sets folder.
    *
    * @return {@link Path} of the templates home directory
    */
@@ -65,27 +85,93 @@ public static Path getTemplatesFolderPath() {
   }
 
   /**
-   * Returns the templates home directory (which is located inside CobiGen home folder), or creates a new one if it does
-   * not exist
+   * Returns the templates home directory (which is located inside CobiGen home folder). The folder is no longer created
+   * if it does not exist. Instead CobiGen will switch to the template sets folder.
    *
-   * @param home cobigen configuration home directory
+   * @param home CobiGen configuration home directory
    * @return {@link Path} of the templates home directory
    */
   public static Path getTemplatesFolderPath(Path home) {
 
     Path templatesPath = home.resolve(ConfigurationConstants.TEMPLATES_FOLDER);
 
+    return templatesPath;
+
+  }
+
+  /**
+   * Returns the template set home directory (which is located inside CobiGen home folder). The directory will not be
+   * created
+   *
+   * @return {@link Path} of the templates home directory
+   */
+  public static Path getTemplateSetsFolderPath() {
+
+    return getTemplateSetsFolderPath(getCobiGenHomePath(), false);
+  }
+
+  /**
+   * Returns the template set home directory (which is located inside CobiGen home folder). If createFolder is true, the
+   * directory will be created.
+   *
+   * @param createFolder if true, the directory is also created
+   *
+   * @return {@link Path} of the templates home directory
+   */
+  public static Path getTemplateSetsFolderPath(boolean createFolder) {
+
+    return getTemplateSetsFolderPath(getCobiGenHomePath(), createFolder);
+  }
+
+  /**
+   * Returns the template sets home directory (which is located inside CobiGen home folder). The directory will not be
+   * created
+   *
+   * @param home CobiGen configuration home directory
+   * @return {@link Path} of the template sets home directory
+   */
+  public static Path getTemplateSetsFolderPath(Path home) {
+
+    return getTemplateSetsFolderPath(home, false);
+  }
+
+  /**
+   * Returns the template sets home directory (which is located inside CobiGen home folder). If createFolder is true,
+   * the directory will be created.
+   *
+   * @param home CobiGen configuration home directory
+   * @param createFolder if true, the folder will be created if it does not already exists
+   * @return {@link Path} of the template sets home directory
+   */
+  public static Path getTemplateSetsFolderPath(Path home, boolean createFolder) {
+
+    Path templatesPath = home.resolve(ConfigurationConstants.TEMPLATE_SETS_FOLDER);
+    if (createFolder) {
+      createFolder(templatesPath);
+    }
+    return templatesPath;
+  }
+
+  /**
+   * Creates a directory at given path location
+   *
+   * @param folderPath Path of new folder
+   * @return
+   */
+  private static Path createFolder(Path folderPath) {
+
     // We first check whether we already have a directory
-    if (Files.exists(templatesPath)) {
-      return templatesPath;
+    if (Files.exists(folderPath)) {
+      return folderPath;
     }
 
     try {
-      Files.createDirectories(templatesPath);
+      Files.createDirectories(folderPath);
     } catch (IOException e) {
-      throw new CobiGenRuntimeException("Unable to create path " + templatesPath);
+      throw new CobiGenRuntimeException("Unable to create path " + folderPath);
     }
-    return templatesPath;
+
+    return folderPath;
   }
 
   /**
@@ -113,4 +199,45 @@ public static Path getExternalProcessesPath(String processPath) {
 
   }
 
+  /**
+   * Returns the path of the context.xml in a monolithic structure
+   *
+   * @param templatesLocation the path to the CobiGen templates project
+   * @return the parent path to the context.xml
+   */
+  public static Path getContextLocation(Path templatesLocation) {
+
+    if (Files.exists(templatesLocation.resolve(ConfigurationConstants.CONTEXT_CONFIG_FILENAME))) {
+      return templatesLocation;
+    } else if (Files.exists(templatesLocation.resolve(ConfigurationConstants.TEMPLATE_RESOURCE_FOLDER)
+        .resolve(ConfigurationConstants.CONTEXT_CONFIG_FILENAME))) {
+      return templatesLocation.resolve(ConfigurationConstants.TEMPLATE_RESOURCE_FOLDER);
+    } else if (Files.exists(templatesLocation.resolve(ConfigurationConstants.COBIGEN_TEMPLATES)
+        .resolve(ConfigurationConstants.TEMPLATE_RESOURCE_FOLDER)
+        .resolve(ConfigurationConstants.CONTEXT_CONFIG_FILENAME))) {
+      return templatesLocation.resolve(ConfigurationConstants.COBIGEN_TEMPLATES)
+          .resolve(ConfigurationConstants.TEMPLATE_RESOURCE_FOLDER);
+    } else {
+      throw new CobiGenRuntimeException("Could not find any context.xml !" + templatesLocation);
+    }
+  }
+
+  /**
+   * Returns the path of the pom.xml in a monolithic structure
+   *
+   * @param templatesLocation the path to the CobiGen templates project
+   * @return parent path to the found pom.xml
+   */
+  public static Path getPomLocation(Path templatesLocation) {
+
+    if (Files.exists(templatesLocation.resolve(MavenConstants.POM))) {
+      return templatesLocation;
+    } else if (Files
+        .exists(templatesLocation.resolve(ConfigurationConstants.COBIGEN_TEMPLATES).resolve(MavenConstants.POM))) {
+      return templatesLocation.resolve(ConfigurationConstants.COBIGEN_TEMPLATES);
+    } else {
+      throw new CobiGenRuntimeException("Could not find any pom.xml !" + templatesLocation);
+    }
+  }
+
 }
diff --git a/cobigen/cobigen-core-api/src/main/java/com/devonfw/cobigen/api/util/ExceptionUtil.java b/cobigen/cobigen-core-api/src/main/java/com/devonfw/cobigen/api/util/ExceptionUtil.java
index d56abf0934..469376c729 100644
--- a/cobigen/cobigen-core-api/src/main/java/com/devonfw/cobigen/api/util/ExceptionUtil.java
+++ b/cobigen/cobigen-core-api/src/main/java/com/devonfw/cobigen/api/util/ExceptionUtil.java
@@ -7,9 +7,6 @@
 
 /**
  * This class provides commonly interesting exception handling methods
- *
- * @author <a href="m_brunnl@cs.uni-kl.de">Malte Brunnlieb</a>
- * @version $Revision$
  */
 public class ExceptionUtil {
 
diff --git a/cobigen/cobigen-core-api/src/main/java/com/devonfw/cobigen/api/util/MavenCoordinate.java b/cobigen/cobigen-core-api/src/main/java/com/devonfw/cobigen/api/util/MavenCoordinate.java
new file mode 100644
index 0000000000..96f51f2c43
--- /dev/null
+++ b/cobigen/cobigen-core-api/src/main/java/com/devonfw/cobigen/api/util/MavenCoordinate.java
@@ -0,0 +1,89 @@
+package com.devonfw.cobigen.api.util;
+
+import java.util.Objects;
+
+/**
+ * This MavenCoordinate class is just a dataholder with maven coordinates.
+ */
+public class MavenCoordinate {
+
+  /**
+   * the groupId of the maven artifact
+   */
+  private String groupId;
+
+  /**
+   * the artifactId of the maven artifact
+   */
+  private String artifactId;
+
+  /**
+   * the version of the maven artifact
+   */
+  private String version;
+
+  /**
+   * Creates a new {@link MavenCoordinate} object with the given properties
+   *
+   * @param groupId a {@link String} with the groupId of the maven artifact
+   * @param artifactId {@link String} with the artifactId of the maven artifact
+   * @param version {@link String} with the version of the maven artifact
+   */
+  public MavenCoordinate(String groupId, String artifactId, String version) {
+
+    this.groupId = groupId;
+    this.artifactId = artifactId;
+    this.version = version;
+  }
+
+  /**
+   * Returns the value of the artifactID
+   *
+   * @return {@link String} artifactID
+   */
+  public String getArtifactId() {
+
+    return this.artifactId;
+  }
+
+  /**
+   * Returns the value of the groupID
+   *
+   * @return {@link String} groupID
+   */
+  public String getGroupId() {
+
+    return this.groupId;
+  }
+
+  /**
+   * Returns the value of the version
+   *
+   * @return {@link String} version
+   */
+  public String getVersion() {
+
+    return this.version;
+  }
+
+  @Override
+  public int hashCode() {
+
+    return Objects.hash(this.artifactId, this.groupId, this.version);
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+
+    if (this == obj) {
+      return true;
+    }
+    if (!(obj instanceof MavenCoordinate)) {
+      return false;
+    }
+    MavenCoordinate other = (MavenCoordinate) obj;
+    return Objects.equals(this.artifactId, other.artifactId) && Objects.equals(this.groupId, other.groupId)
+        && Objects.equals(this.version, other.version);
+  }
+
+}
diff --git a/cobigen/cobigen-core-api/src/main/java/com/devonfw/cobigen/api/util/MavenUtil.java b/cobigen/cobigen-core-api/src/main/java/com/devonfw/cobigen/api/util/MavenUtil.java
index 9cf83b73a1..8cf1b9d646 100644
--- a/cobigen/cobigen-core-api/src/main/java/com/devonfw/cobigen/api/util/MavenUtil.java
+++ b/cobigen/cobigen-core-api/src/main/java/com/devonfw/cobigen/api/util/MavenUtil.java
@@ -40,6 +40,9 @@ public class MavenUtil {
   /** Logger instance. */
   private static final Logger LOG = LoggerFactory.getLogger(MavenUtil.class);
 
+  /** Maven repository */
+  private static Path MAVEN_REPO = null;
+
   /**
    * Executes a Maven class path build command which will download all the transitive dependencies needed for the CLI
    *
@@ -225,13 +228,31 @@ public static String generatePomFileHash(Path pomFile, Path m2RepoPath) {
    */
   public static Path determineMavenRepositoryPath() {
 
+    if (MAVEN_REPO != null) {
+      LOG.debug("Using {} as cached maven repository path.", MAVEN_REPO);
+      return MAVEN_REPO;
+    }
     Path m2Repo = Paths
         .get(runCommand(SystemUtils.getUserHome().toPath(), Lists.newArrayList(SystemUtil.determineMvnPath().toString(),
             "help:evaluate", "-Dexpression=settings.localRepository", "-DforceStdout")));
     LOG.debug("Determined {} as maven repository path.", m2Repo);
+    MAVEN_REPO = m2Repo;
     return m2Repo;
   }
 
+  /**
+   * Returns maven's settings.xml as a string by using maven evaluate
+   *
+   * @return the maven's settings.xml as string
+   */
+  public static String determineMavenSettings() {
+
+    LOG.info("Determine content of maven's settings.xml");
+    String mavenSettings = runCommand(SystemUtils.getUserHome().toPath(), Lists.newArrayList(
+        SystemUtil.determineMvnPath().toString(), "help:evaluate", "-Dexpression=settings", "-DforceStdout"));
+    return mavenSettings;
+  }
+
   /**
    * Execute any command in the given execution directory with the given arguments
    *
diff --git a/cobigen/cobigen-core-api/src/main/java/com/devonfw/cobigen/api/util/StringUtil.java b/cobigen/cobigen-core-api/src/main/java/com/devonfw/cobigen/api/util/StringUtil.java
index 81d22830ca..6cc539d510 100644
--- a/cobigen/cobigen-core-api/src/main/java/com/devonfw/cobigen/api/util/StringUtil.java
+++ b/cobigen/cobigen-core-api/src/main/java/com/devonfw/cobigen/api/util/StringUtil.java
@@ -39,7 +39,6 @@ public static String uncapFirst(String in) {
    * @param codeBlock which should be consolidate
    * @param lineDelimiter the line delimiter of the file or null if none
    * @return the consolidated code block
-   * @author mbrunnli (04.06.2013)
    */
   public static String consolidateLineEndings(String codeBlock, String lineDelimiter) {
 
diff --git a/cobigen/cobigen-core-api/src/main/java/com/devonfw/cobigen/api/util/TemplatesJarUtil.java b/cobigen/cobigen-core-api/src/main/java/com/devonfw/cobigen/api/util/TemplatesJarUtil.java
index 40d7a28267..f82785e8a6 100644
--- a/cobigen/cobigen-core-api/src/main/java/com/devonfw/cobigen/api/util/TemplatesJarUtil.java
+++ b/cobigen/cobigen-core-api/src/main/java/com/devonfw/cobigen/api/util/TemplatesJarUtil.java
@@ -1,7 +1,6 @@
 package com.devonfw.cobigen.api.util;
 
 import java.io.File;
-import java.io.FilenameFilter;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.HttpURLConnection;
@@ -11,10 +10,21 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.devonfw.cobigen.api.constants.ConfigurationConstants;
 import com.devonfw.cobigen.api.constants.TemplatesJarConstants;
 import com.devonfw.cobigen.api.exception.CobiGenRuntimeException;
 
@@ -24,39 +34,8 @@
  */
 public class TemplatesJarUtil {
 
-  /**
-   * Filters the files on a directory so that we can check whether the templates jar are already downloaded
-   */
-  static FilenameFilter fileNameFilterJar = new FilenameFilter() {
-
-    @Override
-    public boolean accept(File dir, String name) {
-
-      String lowercaseName = name.toLowerCase();
-      String regex = TemplatesJarConstants.JAR_FILE_REGEX_NAME;
-
-      Pattern p = Pattern.compile(regex);
-      Matcher m = p.matcher(lowercaseName);
-      return m.find();
-    }
-  };
-
-  /**
-   * Filters the files on a directory so that we can check whether the templates jar are already downloaded
-   */
-  static FilenameFilter fileNameFilterSources = new FilenameFilter() {
-
-    @Override
-    public boolean accept(File dir, String name) {
-
-      String lowercaseName = name.toLowerCase();
-      String regex = TemplatesJarConstants.SOURCES_FILE_REGEX_NAME;
-
-      Pattern p = Pattern.compile(regex);
-      Matcher m = p.matcher(lowercaseName);
-      return m.find();
-    }
-  };
+  /** Logger instance. */
+  private static final Logger LOG = LoggerFactory.getLogger(TemplatesJarUtil.class);
 
   /**
    * @param groupId of the artifact to download
@@ -66,11 +45,12 @@ public boolean accept(File dir, String name) {
    * @param templatesDirectory directory where the templates jar are located
    * @return fileName Name of the file downloaded
    */
-  private static String downloadJar(String groupId, String artifactId, String version, boolean isDownloadSource,
+  public static String downloadJar(String groupId, String artifactId, String version, boolean isDownloadSource,
       File templatesDirectory) {
 
     // By default the version should be latest
-    if (version.isEmpty() || version == null) {
+    if (StringUtils.isEmpty(version)) {
+
       version = "LATEST";
     }
 
@@ -83,16 +63,10 @@ private static String downloadJar(String groupId, String artifactId, String vers
 
     String fileName = "";
 
-    File[] jarFiles;
-
-    if (isDownloadSource) {
-      jarFiles = templatesDirectory.listFiles(fileNameFilterSources);
-    } else {
-      jarFiles = templatesDirectory.listFiles(fileNameFilterJar);
-    }
-
+    Path jarFilePath = getJarFile(isDownloadSource, templatesDirectory.toPath());
     try {
-      if (jarFiles.length <= 0 || isJarOutdated(jarFiles[0], mavenUrl, isDownloadSource, templatesDirectory)) {
+      if (jarFilePath == null || !Files.exists(jarFilePath)
+          || isJarOutdated(jarFilePath.toFile(), mavenUrl, isDownloadSource, templatesDirectory)) {
 
         HttpURLConnection conn = initializeConnection(mavenUrl);
         try (InputStream inputStream = conn.getInputStream()) {
@@ -106,8 +80,8 @@ private static String downloadJar(String groupId, String artifactId, String vers
         }
         conn.disconnect();
       } else {
-        fileName = jarFiles[0].getPath().substring(jarFiles[0].getPath().lastIndexOf(File.separator) + 1);
-
+        fileName = jarFilePath.toFile().getPath()
+            .substring(jarFilePath.toFile().getPath().lastIndexOf(File.separator) + 1);
       }
     } catch (IOException e) {
       throw new CobiGenRuntimeException("Could not download file from " + mavenUrl, e);
@@ -116,6 +90,49 @@ private static String downloadJar(String groupId, String artifactId, String vers
   }
 
   /**
+   * Downloads a jar from a given URL to template set downloaded directory
+   *
+   * @param downloadURL URl to download from
+   * @param templateSetDirectory directory where the template sets are located
+   * @return fileName Name of the file downloaded
+   */
+  public static String downloadJarFromURL(String downloadURL, Path templateSetDirectory) {
+
+    String fileName = "";
+    Path downloaded = templateSetDirectory.resolve(ConfigurationConstants.DOWNLOADED_FOLDER);
+
+    if (!Files.exists(downloaded)) {
+      LOG.info("Downloaded folder could not be found and will be created.");
+      try {
+        Files.createDirectory(templateSetDirectory.resolve(ConfigurationConstants.DOWNLOADED_FOLDER));
+      } catch (IOException e) {
+        throw new CobiGenRuntimeException("Could not create Downloaded Folder", e);
+      }
+    }
+
+    HttpURLConnection conn;
+    try {
+      conn = initializeConnection(downloadURL.toString());
+      try (InputStream inputStream = conn.getInputStream()) {
+
+        fileName = conn.getURL().getFile().substring(conn.getURL().getFile().lastIndexOf("/") + 1);
+        Path file = downloaded.resolve(fileName);
+        Path targetPath = file;
+        if (!Files.exists(file)) {
+          Files.copy(inputStream, targetPath, StandardCopyOption.REPLACE_EXISTING);
+        }
+      }
+      conn.disconnect();
+    } catch (IOException e) {
+      throw new CobiGenRuntimeException("Could not download file from: " + downloadURL, e);
+    }
+
+    return fileName;
+  }
+
+  /**
+   * Downloads the latest devon4j templates
+   *
    * @param isDownloadSource true if downloading source jar file
    * @param templatesDirectory directory where the templates jar are located
    * @return fileName Name of the file downloaded
@@ -126,6 +143,79 @@ public static String downloadLatestDevon4jTemplates(boolean isDownloadSource, Fi
         TemplatesJarConstants.DEVON4J_TEMPLATES_ARTIFACTID, "LATEST", isDownloadSource, templatesDirectory);
   }
 
+  /**
+   * Downloads multiple jar files defined by the maven coordinates. Only downloads if files are not present or adapted
+   * folder does not exist.
+   *
+   * @param templatesDirectory directory where the templates jar are located
+   * @param mavenCoordinates list with {@link MavenCoordinate} that will be loaded
+   */
+  public static void downloadTemplatesByMavenCoordinates(Path templatesDirectory,
+      List<MavenCoordinate> mavenCoordinates) {
+
+    if (mavenCoordinates == null || mavenCoordinates.isEmpty()) {
+      return;
+      // no templates specified
+    }
+
+    Set<MavenCoordinate> existingTemplates = new HashSet<>();
+    Path adapted = templatesDirectory.resolve(ConfigurationConstants.ADAPTED_FOLDER);
+    Path downloaded = templatesDirectory.resolve(ConfigurationConstants.DOWNLOADED_FOLDER);
+    // search for already available template-sets
+    if (Files.exists(adapted)) {
+      existingTemplates.addAll(getMatchingTemplates(mavenCoordinates, adapted));
+    }
+    if (Files.exists(downloaded)) {
+      existingTemplates.addAll(getMatchingTemplates(mavenCoordinates, downloaded));
+    } else {
+      LOG.info("downloaded folder could not be found and will be created ");
+      try {
+        Files.createDirectory(templatesDirectory.resolve(ConfigurationConstants.DOWNLOADED_FOLDER));
+      } catch (IOException e) {
+        throw new CobiGenRuntimeException("Could not create Download Folder", e);
+      }
+    }
+
+    if (!existingTemplates.isEmpty()) {
+      mavenCoordinates.removeAll(existingTemplates);
+    }
+
+    for (MavenCoordinate mavenCoordinate : mavenCoordinates) {
+      downloadJar(mavenCoordinate.getGroupId(), mavenCoordinate.getArtifactId(), mavenCoordinate.getVersion(), false,
+          downloaded.toFile());
+      downloadJar(mavenCoordinate.getGroupId(), mavenCoordinate.getArtifactId(), mavenCoordinate.getVersion(), true,
+          downloaded.toFile());
+    }
+
+  }
+
+  /**
+   * Checks if the given Path contains Folders or files with a artifact name from a list of maven artifact. This
+   * function is used to check if templates already exists and just uses the artifactId and not the version of the
+   * artifacts
+   *
+   * @param mavenCoordinates a List of maven coordinates that are check for matching templates
+   * @param path Path to the directory that contains the Templates.
+   * @return Set with MavenCoordinate that are already present in the directory
+   */
+  private static Set<MavenCoordinate> getMatchingTemplates(List<MavenCoordinate> mavenCoordinates, Path path) {
+
+    HashSet<MavenCoordinate> existingTemplates = new HashSet<>();
+
+    for (MavenCoordinate mavenCoordinate : mavenCoordinates) {
+      try {
+        if (Files.list(path).anyMatch(f -> (f.getFileName().toString().contains(mavenCoordinate.getArtifactId())))) {
+          existingTemplates.add(mavenCoordinate);
+        }
+      } catch (IOException e) {
+        LOG.warn("Failed to get all files and directories from the folder " + path, e);
+
+      }
+    }
+    return existingTemplates;
+
+  }
+
   /**
    * Checks whether there is a newer version of the templates on Maven
    *
@@ -218,28 +308,61 @@ private static HttpURLConnection initializeConnection(String mavenUrl)
     return conn;
   }
 
+  /**
+   * Returns a list of the file paths of the template set jars
+   *
+   * @param templatesDirectory directory where the templates are located
+   *
+   * @return file of the jar downloaded or null if it was not found
+   */
+  public static List<Path> getJarFiles(Path templatesDirectory) {
+
+    ArrayList<Path> jarPaths = new ArrayList<>();
+
+    try (Stream<Path> files = Files.list(templatesDirectory)) {
+      files.forEach(path -> {
+        if (path.toString().endsWith(".jar")) {
+          jarPaths.add(path);
+        }
+      });
+    } catch (IOException e) {
+      throw new CobiGenRuntimeException("Could not read configuration root directory.", e);
+    }
+
+    if (!jarPaths.isEmpty()) {
+      return jarPaths;
+    } else {
+      // There are no jars downloaded
+      return jarPaths;
+    }
+  }
+
   /**
    * Returns the file path of the templates jar
    *
    * @param isSource true if we want to get source jar file path
    * @param templatesDirectory directory where the templates are located
    * @return file of the jar downloaded or null if it was not found
+   *
    */
-  public static File getJarFile(boolean isSource, File templatesDirectory) {
+  public static Path getJarFile(boolean isSource, Path templatesDirectory) {
 
-    File[] jarFiles;
+    List<Path> jarPaths = null;
+    String regex = isSource ? TemplatesJarConstants.SOURCES_FILE_REGEX_NAME : TemplatesJarConstants.JAR_FILE_REGEX_NAME;
+    Pattern pattern = Pattern.compile(regex);
 
-    if (isSource) {
-      jarFiles = templatesDirectory.listFiles(fileNameFilterSources);
-    } else {
-      jarFiles = templatesDirectory.listFiles(fileNameFilterJar);
+    try (Stream<Path> stream = Files.list(templatesDirectory)) {
+      jarPaths = stream.filter(path -> pattern.matcher(path.toString()).find()).collect(Collectors.toList());
+    } catch (IOException e) {
+      LOG.error("Error while reading templates directory", e);
     }
 
-    if (jarFiles.length > 0) {
-      return jarFiles[0];
+    if (jarPaths != null && !jarPaths.isEmpty()) {
+      return jarPaths.get(0);
     } else {
       // There are no jars downlaoded
       return null;
     }
   }
+
 }
diff --git a/cobigen/cobigen-core-systemtest/pom.xml b/cobigen/cobigen-core-systemtest/pom.xml
index c3e66f1981..ddbba0de87 100644
--- a/cobigen/cobigen-core-systemtest/pom.xml
+++ b/cobigen/cobigen-core-systemtest/pom.xml
@@ -1,10 +1,16 @@
-<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">
+<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>
   <artifactId>core-systemtest</artifactId>
   <name>CobiGen Core - Systemtest</name>
   <packaging>jar</packaging>
 
+  <properties>
+    <valid.templateset.downloaded1.test.path>src\test\resources\testdata\systemtest\GenerationTestTemplateSetsXml\template-sets\downloaded\downloaded1-test</valid.templateset.downloaded1.test.path>
+    <valid.templateset.downloaded2.test.path>src\test\resources\testdata\systemtest\GenerationTestTemplateSetsXml\template-sets\downloaded\downloaded2-test</valid.templateset.downloaded2.test.path>
+    <maven.test.TemplateProcessingTest.adapted.path1>src\test\resources\testdata\systemtest\TemplateProcessingTest\template-sets\adapted\crud-java-server-app</maven.test.TemplateProcessingTest.adapted.path1>
+    <maven.test.TemplateProcessingTest.adapted.path2>src\test\resources\testdata\systemtest\TemplateProcessingTest\template-sets\adapted\crud-java-server-app-complex</maven.test.TemplateProcessingTest.adapted.path2>
+  </properties>
+
   <parent>
     <groupId>com.devonfw.cobigen</groupId>
     <artifactId>core-parent</artifactId>
@@ -40,5 +46,97 @@
       <artifactId>javaplugin</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>openapiplugin</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>exec-maven-plugin</artifactId>
+        <version>3.0.0</version>
+        <executions>
+          <execution>
+            <id>Install valid downloaded1 template set test project</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>exec</goal>
+            </goals>
+            <configuration>
+              <executable>mvn</executable>
+              <workingDirectory>${valid.templateset.downloaded1.test.path}</workingDirectory>
+              <arguments>
+                <argument>install</argument>
+                <!-- https://stackoverflow.com/a/66801171 -->
+                <argument>-Djansi.force=true</argument>
+                <argument>-Djansi.passthrough=true</argument>
+                <argument>-B</argument>
+                <argument>-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn</argument>
+              </arguments>
+            </configuration>
+          </execution>
+          <execution>
+            <id>Install valid downloaded2 template set test project</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>exec</goal>
+            </goals>
+            <configuration>
+              <executable>mvn</executable>
+              <workingDirectory>${valid.templateset.downloaded2.test.path}</workingDirectory>
+              <arguments>
+                <argument>install</argument>
+                <!-- https://stackoverflow.com/a/66801171 -->
+                <argument>-Djansi.force=true</argument>
+                <argument>-Djansi.passthrough=true</argument>
+                <argument>-B</argument>
+                <argument>-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn</argument>
+              </arguments>
+            </configuration>
+          </execution>
+          <execution>
+            <id>Install TemplateProcessingTest downloaded1 template set test project</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>exec</goal>
+            </goals>
+            <configuration>
+              <executable>mvn</executable>
+              <workingDirectory>${maven.test.TemplateProcessingTest.adapted.path1}</workingDirectory>
+              <arguments>
+                <argument>install</argument>
+                <!-- https://stackoverflow.com/a/66801171 -->
+                <argument>-Djansi.force=true</argument>
+                <argument>-Djansi.passthrough=true</argument>
+                <argument>-B</argument>
+                <argument>-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn</argument>
+              </arguments>
+            </configuration>
+          </execution>
+          <execution>
+            <id>Install TemplateProcessingTest downloaded2 template set test project</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>exec</goal>
+            </goals>
+            <configuration>
+              <executable>mvn</executable>
+              <workingDirectory>${maven.test.TemplateProcessingTest.adapted.path2}</workingDirectory>
+              <arguments>
+                <argument>install</argument>
+                <!-- https://stackoverflow.com/a/66801171 -->
+                <argument>-Djansi.force=true</argument>
+                <argument>-Djansi.passthrough=true</argument>
+                <argument>-B</argument>
+                <argument>-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn</argument>
+              </arguments>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 </project>
\ No newline at end of file
diff --git a/cobigen/cobigen-core-systemtest/src/test/java/com/devonfw/cobigen/systemtest/ClassLoadingIT.java b/cobigen/cobigen-core-systemtest/src/test/java/com/devonfw/cobigen/systemtest/ClassLoadingIT.java
index 76c1230412..82d61fd777 100644
--- a/cobigen/cobigen-core-systemtest/src/test/java/com/devonfw/cobigen/systemtest/ClassLoadingIT.java
+++ b/cobigen/cobigen-core-systemtest/src/test/java/com/devonfw/cobigen/systemtest/ClassLoadingIT.java
@@ -15,6 +15,7 @@
 import java.nio.file.Paths;
 import java.util.List;
 
+import org.junit.Ignore;
 import org.junit.Test;
 import org.mockito.ArgumentMatchers;
 
@@ -43,6 +44,11 @@ public class ClassLoadingIT extends AbstractApiTest {
    */
   private static String testFileRootPath = apiTestsRootPath + "ClassLoadTest/";
 
+  /**
+   * Root path to all template-set resources used in this test case
+   */
+  private static String testTemplateSetFileRootPath = apiTestsRootPath + "ClassLoadTemplateSetTest/";
+
   /**
    * Tests the usage of sample logic classes to be used in a template.
    *
@@ -59,7 +65,7 @@ public void callClassLoadingTest() throws Exception {
 
     // pre-processing
     File templatesFolder = new File(testFileRootPath + "templates");
-    CobiGen target = CobiGenFactory.create(templatesFolder.toURI());
+    CobiGen target = CobiGenFactory.create(templatesFolder.toURI(), true);
     List<TemplateTo> templates = target.getMatchingTemplates(containerInput);
 
     // Execution
@@ -72,9 +78,85 @@ public void callClassLoadingTest() throws Exception {
     assertThat(report).isSuccessful();
     assertThat(generatedFile).exists();
     assertThat(generatedFile).isFile().hasSameContentAs(expectedResult);
+  }
+
+  /**
+   * Tests the usage of sample logic classes to be used in a template-set.
+   *
+   * @throws Exception test fails
+   */
+  @Test
+  public void callClassLoadingTemplateSetTest() throws Exception {
+
+    // Mocking
+    CobiGen cobigen = CobiGenFactory.create(new File(testTemplateSetFileRootPath + "template-sets").toURI());
+
+    Object input = cobigen.read(
+        new File("src/test/java/com/devonfw/cobigen/systemtest/testobjects/io/generator/logic/api/to/InputEto.java")
+            .toPath(),
+        Charset.forName("UTF-8"), getClass().getClassLoader());
 
+    // Useful to see generates if necessary, comment the generationRootFolder above then
+    File generationRootFolder = this.tmpFolder.newFolder("generationRootFolder");
+
+    // pre-processing
+    List<TemplateTo> templates = cobigen.getMatchingTemplates(input);
+
+    // Execution
+    GenerationReportTo report = cobigen.generate(input, templates.get(0), Paths.get(generationRootFolder.toURI()),
+        false);
+
+    // Verification
+    File expectedResult = new File(testTemplateSetFileRootPath, "expected/generated.txt");
+    File generatedFile = new File(generationRootFolder, "generated.txt");
+    assertThat(report).isSuccessful();
+    assertThat(generatedFile).exists();
+    assertThat(generatedFile).isFile().hasSameContentAs(expectedResult);
   }
 
+  /**
+   * Tests the usage of sample logic classes to be used in different template set versions. Test resources use an equal
+   * utility class name with a different implementation to simulate a version a conflict
+   *
+   * @throws Exception test fails
+   */
+  @Test
+  @Ignore // TODO: re-enable when versions can be detected and version handling was implemented, see:
+          // https://github.com/devonfw/cobigen/issues/1665
+  public void callClassLoadingTemplateSetTestWithVersionConflict() throws Exception {
+
+    // Mocking
+    CobiGen cobigen = CobiGenFactory.create(new File(testTemplateSetFileRootPath + "conflicted/template-sets").toURI());
+
+    Object input = cobigen.read(
+        new File("src/test/java/com/devonfw/cobigen/systemtest/testobjects/io/generator/logic/api/to/InputEto.java")
+            .toPath(),
+        Charset.forName("UTF-8"), getClass().getClassLoader());
+
+    // Useful to see generates if necessary, comment the generationRootFolder above then
+    File generationRootFolder = this.tmpFolder.newFolder("generationRootFolder");
+
+    // pre-processing
+    List<TemplateTo> templates = cobigen.getMatchingTemplates(input);
+
+    GenerationReportTo report = cobigen.generate(input, templates.get(0), Paths.get(generationRootFolder.toURI()),
+        false);
+
+    // Verification
+    assertThat(report).isSuccessful();
+    assertThat(templates).hasSize(1);
+    File expectedResult = new File(testTemplateSetFileRootPath, "expected-conflicted/generated.txt");
+    File generatedFile = new File(generationRootFolder, "generated.txt");
+    assertThat(generatedFile).exists();
+    assertThat(generatedFile).isFile().hasSameContentAs(expectedResult);
+  }
+
+  /**
+   * TODO: Check if this test is still usable and what it does exactly, see:
+   * https://github.com/devonfw/cobigen/issues/1678
+   *
+   * @throws Exception test fails
+   */
   @Test
   public void testLoadEnumClass() throws Exception {
 
@@ -86,7 +168,7 @@ public void testLoadEnumClass() throws Exception {
 
     // pre-processing
     File templatesFolder = new File(testFileRootPath + "templates");
-    CobiGen target = CobiGenFactory.create(templatesFolder.toURI());
+    CobiGen target = CobiGenFactory.create(templatesFolder.toURI(), true);
     List<TemplateTo> templates = target.getMatchingTemplates(containerInput);
 
     // Execution
diff --git a/cobigen/cobigen-core-systemtest/src/test/java/com/devonfw/cobigen/systemtest/ContainerMatcherIT.java b/cobigen/cobigen-core-systemtest/src/test/java/com/devonfw/cobigen/systemtest/ContainerMatcherIT.java
index 2aad055128..5068f47c13 100644
--- a/cobigen/cobigen-core-systemtest/src/test/java/com/devonfw/cobigen/systemtest/ContainerMatcherIT.java
+++ b/cobigen/cobigen-core-systemtest/src/test/java/com/devonfw/cobigen/systemtest/ContainerMatcherIT.java
@@ -62,7 +62,7 @@ public void testContainerMatcherDoesNotMatchWithoutMatcher() throws Exception {
 
     // Execution
     File templatesFolder = new File(testFileRootPath + "templates");
-    CobiGen target = CobiGenFactory.create(templatesFolder.toURI());
+    CobiGen target = CobiGenFactory.create(templatesFolder.toURI(), true);
     List<String> matchingTriggerIds = target.getMatchingTriggerIds(containerInput);
 
     // Verification
@@ -84,7 +84,7 @@ public void testContainerMatcherMatches() throws Exception {
 
     // Execution
     File templatesFolder = new File(testFileRootPath + "templates");
-    CobiGen target = CobiGenFactory.create(templatesFolder.toURI());
+    CobiGen target = CobiGenFactory.create(templatesFolder.toURI(), true);
     List<String> matchingTriggerIds = target.getMatchingTriggerIds(containerInput);
 
     // Verification
@@ -106,7 +106,7 @@ public void testContextVariableResolving() throws Exception {
 
     // Execution
     File templatesFolder = new File(testFileRootPath + "templates");
-    CobiGen target = CobiGenFactory.create(templatesFolder.toURI());
+    CobiGen target = CobiGenFactory.create(templatesFolder.toURI(), true);
     List<TemplateTo> matchingTemplates = target.getMatchingTemplates(containerInput);
 
     // Verification
@@ -127,7 +127,7 @@ public void testContextVariableResolvingOnGeneration() throws Exception {
 
     // pre-processing
     File templatesFolder = new File(testFileRootPath + "templates");
-    CobiGen target = CobiGenFactory.create(templatesFolder.toURI());
+    CobiGen target = CobiGenFactory.create(templatesFolder.toURI(), true);
     List<TemplateTo> templates = target.getMatchingTemplates(containerInput);
 
     // Execution
@@ -151,7 +151,7 @@ public void testGetAllIncrements() throws Exception {
 
     // pre-processing
     File templatesFolder = new File(testFileRootPath + "templates");
-    CobiGen target = CobiGenFactory.create(templatesFolder.toURI());
+    CobiGen target = CobiGenFactory.create(templatesFolder.toURI(), true);
 
     // Execution
     List<IncrementTo> increments = target.getMatchingIncrements(containerInput);
@@ -175,7 +175,7 @@ public void testMultipleTriggerWithContainerMatchers() throws Exception {
 
     // pre-processing
     File templatesFolder = new File(testFileRootPath + "templates");
-    CobiGen target = CobiGenFactory.create(templatesFolder.toURI());
+    CobiGen target = CobiGenFactory.create(templatesFolder.toURI(), true);
 
     // Execution
     List<String> triggerIds = target.getMatchingTriggerIds(containerInput);
@@ -200,7 +200,7 @@ public void testMultipleTriggerWithDifferentContainerMatchersAccumulationType()
 
     // pre-processing
     File templatesFolder = new File(testFileRootPath + "accumulationType");
-    CobiGen target = CobiGenFactory.create(templatesFolder.toURI());
+    CobiGen target = CobiGenFactory.create(templatesFolder.toURI(), true);
 
     // Execution
     List<String> triggerIds = target.getMatchingTriggerIds(containerInput);
@@ -283,7 +283,7 @@ public String toString() {
 
     // create CobiGen instance
     File templatesFolder = new File(testFileRootPath + "selectiveContainerGeneration");
-    CobiGen target = CobiGenFactory.create(templatesFolder.toURI());
+    CobiGen target = CobiGenFactory.create(templatesFolder.toURI(), true);
     File folder = this.tmpFolder.newFolder();
 
     // Execution
@@ -319,7 +319,6 @@ private Object createTestDataAndConfigureMock(boolean containerChildMatchesTrigg
    *        matcher
    * @param multipleContainerChildren defines whether the container should contain multiple children
    * @return the container as input for generation interpreter for
-   * @author mbrunnli (16.10.2014)
    */
   @SuppressWarnings("unchecked")
   private Object createTestDataAndConfigureMock(boolean containerChildMatchesTrigger,
diff --git a/cobigen/cobigen-core-systemtest/src/test/java/com/devonfw/cobigen/systemtest/DownloadTemplateSetsIT.java b/cobigen/cobigen-core-systemtest/src/test/java/com/devonfw/cobigen/systemtest/DownloadTemplateSetsIT.java
new file mode 100644
index 0000000000..5803e089d3
--- /dev/null
+++ b/cobigen/cobigen-core-systemtest/src/test/java/com/devonfw/cobigen/systemtest/DownloadTemplateSetsIT.java
@@ -0,0 +1,91 @@
+package com.devonfw.cobigen.systemtest;
+
+import static com.github.stefanbirkner.systemlambda.SystemLambda.withEnvironmentVariable;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+import org.junit.Ignore;
+import org.junit.Test;
+
+import com.devonfw.cobigen.api.constants.ConfigurationConstants;
+import com.devonfw.cobigen.impl.CobiGenFactory;
+import com.devonfw.cobigen.systemtest.common.AbstractApiTest;
+
+/**
+ * Test suite for download processes of template sets.
+ */
+public class DownloadTemplateSetsIT extends AbstractApiTest {
+
+  /**
+   * Root path to the resources used in this test
+   */
+  private static String testFileRootPath = apiTestsRootPath + "DownloadTemplateSets";
+
+  /**
+   * Tests if a template set SNAPSHOT defined in properties template-sets.installed can be retrieved and downloaded from
+   * sonatype
+   *
+   * TODO: Check if this test is still valid, see: https://github.com/devonfw/cobigen/issues/1672
+   *
+   * @throws Exception test fails
+   */
+  @Test
+  public void testDownloadTemplateSetWithProperty() throws Exception {
+
+    File folder = this.tmpFolder.newFolder("DownloadTemplatesetsTest");
+
+    File target = new File(folder, ConfigurationConstants.COBIGEN_CONFIG_FILE);
+    try (BufferedWriter writer = new BufferedWriter(new FileWriter(target))) {
+      writer.write(
+          "template-sets.installed=com.devonfw.cobigen.templates:crud-openapi-angular-client-app:2021.12.007-SNAPSHOT");
+    }
+
+    Path templateSetFolder = Files
+        .createDirectories(folder.toPath().resolve(ConfigurationConstants.TEMPLATE_SETS_FOLDER));
+
+    withEnvironmentVariable(ConfigurationConstants.CONFIG_ENV_HOME, folder.getAbsolutePath()).execute(() -> {
+      CobiGenFactory.create(templateSetFolder.toUri(), false);
+
+    });
+
+    Path downloadedFolder = templateSetFolder.resolve(ConfigurationConstants.DOWNLOADED_FOLDER);
+    assertThat(downloadedFolder).exists();
+    assertThat(downloadedFolder.toFile().listFiles()).hasSize(2);
+  }
+
+  /**
+   * Tests if a template set without a version number defined in properties template-sets.installed can be retrieved and
+   * the latest version gets downloaded from sonatype
+   *
+   * @throws Exception test fails
+   */
+  @Test
+  @Ignore // TODO: re-enable when https://github.com/devonfw/cobigen/issues/1656 capability to download LATEST version
+          // of template-sets was implemented
+  public void testDownloadTemplateSetWithoutVersionPropertyDownloadsLatestVersion() throws Exception {
+
+    File folder = this.tmpFolder.newFolder("DownloadTemplatesetsTest");
+
+    File target = new File(folder, ConfigurationConstants.COBIGEN_CONFIG_FILE);
+    try (BufferedWriter writer = new BufferedWriter(new FileWriter(target))) {
+      writer.write("template-sets.installed=com.devonfw.cobigen.templates:crud-openapi-angular-client-app");
+    }
+
+    Path templateSetFolder = Files
+        .createDirectories(folder.toPath().resolve(ConfigurationConstants.TEMPLATE_SETS_FOLDER));
+
+    withEnvironmentVariable(ConfigurationConstants.CONFIG_ENV_HOME, folder.getAbsolutePath()).execute(() -> {
+      CobiGenFactory.create(templateSetFolder.toUri(), false);
+
+    });
+
+    Path downloadedFolder = templateSetFolder.resolve(ConfigurationConstants.DOWNLOADED_FOLDER);
+    assertThat(downloadedFolder).exists();
+    assertThat(downloadedFolder.toFile().listFiles()).hasSize(2);
+  }
+}
diff --git a/cobigen/cobigen-core-systemtest/src/test/java/com/devonfw/cobigen/systemtest/GenerationIT.java b/cobigen/cobigen-core-systemtest/src/test/java/com/devonfw/cobigen/systemtest/GenerationIT.java
index 771a4a71b9..7ce25f2ce5 100644
--- a/cobigen/cobigen-core-systemtest/src/test/java/com/devonfw/cobigen/systemtest/GenerationIT.java
+++ b/cobigen/cobigen-core-systemtest/src/test/java/com/devonfw/cobigen/systemtest/GenerationIT.java
@@ -13,6 +13,7 @@
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
+import java.nio.charset.Charset;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -47,10 +48,15 @@
 public class GenerationIT extends AbstractApiTest {
 
   /**
-   * Root path to all resources used in this test case
+   * Root path to the resources used in this test case with context.xml and templates.xml
    */
   private static String testFileRootPath = apiTestsRootPath + "GenerationTest/";
 
+  /**
+   * Root path to the resources used in this test case with template-set.xml
+   */
+  private static String testFileRootPathTemplateSetXml = apiTestsRootPath + "GenerationTestTemplateSetsXml/";
+
   /**
    * Tests that sources get overwritten if merge strategy override is configured.
    *
@@ -65,9 +71,9 @@ public void testOverrideMergeStrategy() throws Exception {
     File target = new File(folder, "generated.txt");
     FileUtils.write(target, "base");
 
-    CobiGen cobigen = CobiGenFactory.create(new File(testFileRootPath + "overrideMergeStrategy").toURI());
+    CobiGen cobigen = CobiGenFactory.create(new File(testFileRootPath + "overrideMergeStrategy").toURI(), true);
     List<TemplateTo> templates = cobigen.getMatchingTemplates(input);
-    assertThat(templates).hasSize(1);
+    assertThat(templates).hasSize(2);
 
     GenerationReportTo report = cobigen.generate(input, templates.get(0), Paths.get(folder.toURI()));
 
@@ -75,6 +81,76 @@ public void testOverrideMergeStrategy() throws Exception {
     assertThat(target).hasContent("overwritten");
   }
 
+  /**
+   * Tests that multiple template sets with templates, increments and triggers get read and generate of all matching
+   * (java) templates is successful
+   *
+   * @throws Exception test fails.
+   */
+  @Test
+  public void testReadMultipleTemplateSetsWithJavaInput() throws Exception {
+
+    CobiGen cobigen = CobiGenFactory.create(new File(testFileRootPathTemplateSetXml + "template-sets").toURI());
+
+    Object input = cobigen.read(
+        new File("src/test/java/com/devonfw/cobigen/systemtest/testobjects/io/generator/logic/api/to/InputEto.java")
+            .toPath(),
+        Charset.forName("UTF-8"), getClass().getClassLoader());
+
+    File folder = this.tmpFolder.newFolder("GenerationTest");
+    File target = new File(folder, "generated.txt");
+    FileUtils.write(target, "base");
+
+    List<TemplateTo> templates = cobigen.getMatchingTemplates(input);
+    List<IncrementTo> increments = cobigen.getMatchingIncrements(input);
+    List<String> triggersIds = cobigen.getMatchingTriggerIds(input);
+    assertThat(templates).hasSize(4);
+    assertThat(increments).hasSize(4);
+    assertThat(triggersIds).hasSize(4);
+
+    GenerationReportTo report1 = cobigen.generate(input, templates.get(0), Paths.get(folder.toURI()));
+    GenerationReportTo report2 = cobigen.generate(input, templates.get(1), Paths.get(folder.toURI()));
+    GenerationReportTo report3 = cobigen.generate(input, templates.get(2), Paths.get(folder.toURI()));
+    GenerationReportTo report4 = cobigen.generate(input, templates.get(3), Paths.get(folder.toURI()));
+
+    assertThat(report1).isSuccessful();
+    assertThat(report2).isSuccessful();
+    assertThat(report3).isSuccessful();
+    assertThat(report4).isSuccessful();
+  }
+
+  /**
+   * Tests that multiple template sets with templates, increments and triggers get read and generate of one matching
+   * template set (OpenAPI) is successful
+   *
+   * @throws Exception test fails.
+   */
+  @Test
+  public void testReadMultipleTemplateSetsWithOpenApiInputOnly() throws Exception {
+
+    CobiGen cobigen = CobiGenFactory.create(new File(testFileRootPathTemplateSetXml + "template-sets").toURI());
+
+    Object input = cobigen
+        .read(new File("src/test/java/com/devonfw/cobigen/systemtest/testobjects/io/generator/logic/api/to/test.yaml")
+            .toPath(), Charset.forName("UTF-8"), getClass().getClassLoader());
+
+    File folder = this.tmpFolder.newFolder("GenerationTest");
+    File target = new File(folder, "generated.txt");
+    FileUtils.write(target, "base");
+
+    List<TemplateTo> templates = cobigen.getMatchingTemplates(input);
+    List<IncrementTo> increments = cobigen.getMatchingIncrements(input);
+    List<String> triggersIds = cobigen.getMatchingTriggerIds(input);
+    assertThat(templates).hasSize(1);
+    assertThat(increments).hasSize(1);
+    assertThat(triggersIds).hasSize(1);
+
+    GenerationReportTo report1 = cobigen.generate(input, templates.get(0), Paths.get(folder.toURI()));
+
+    assertThat(report1).isSuccessful();
+
+  }
+
   /**
    * Tests whether the generation of external increments works properly.
    *
@@ -91,7 +167,7 @@ public void testGenerationWithExternalIncrements() throws Exception {
     FileUtils.write(target, "base");
 
     // when
-    CobiGen cobigen = CobiGenFactory.create(new File(testFileRootPath + "externalIncrementsGeneration").toURI());
+    CobiGen cobigen = CobiGenFactory.create(new File(testFileRootPath + "externalIncrementsGeneration").toURI(), true);
     List<TemplateTo> templates = cobigen.getMatchingTemplates(input);
     List<IncrementTo> increments = cobigen.getMatchingIncrements(input);
     List<String> triggersIds = cobigen.getMatchingTriggerIds(input);
@@ -180,7 +256,7 @@ public String toString() {
     // further setup
     File folder = this.tmpFolder.newFolder();
 
-    CobiGen cobigen = CobiGenFactory.create(new File(testFileRootPath + "variableAvailability").toURI());
+    CobiGen cobigen = CobiGenFactory.create(new File(testFileRootPath + "variableAvailability").toURI(), true);
     List<TemplateTo> templates = cobigen.getMatchingTemplates(input);
     TemplateTo targetTemplate = getTemplate(templates, "t1");
 
@@ -240,7 +316,7 @@ public String toString() {
       IOUtils.write("cobigenPropTarget=extValue", writer);
     }
 
-    CobiGen cobigen = CobiGenFactory.create(new File(testFileRootPath + "variableAvailability").toURI());
+    CobiGen cobigen = CobiGenFactory.create(new File(testFileRootPath + "variableAvailability").toURI(), true);
     List<TemplateTo> templates = cobigen.getMatchingTemplates(input);
     TemplateTo targetTemplate = getTemplate(templates, "t2");
 
diff --git a/cobigen/cobigen-core-systemtest/src/test/java/com/devonfw/cobigen/systemtest/TemplateProcessingTest.java b/cobigen/cobigen-core-systemtest/src/test/java/com/devonfw/cobigen/systemtest/TemplateProcessingTest.java
new file mode 100644
index 0000000000..2bb4f222bc
--- /dev/null
+++ b/cobigen/cobigen-core-systemtest/src/test/java/com/devonfw/cobigen/systemtest/TemplateProcessingTest.java
@@ -0,0 +1,145 @@
+package com.devonfw.cobigen.systemtest;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertThrows;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
+
+import org.apache.commons.io.FileUtils;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+
+import com.devonfw.cobigen.api.TemplateAdapter;
+import com.devonfw.cobigen.api.constants.ConfigurationConstants;
+import com.devonfw.cobigen.api.exception.TemplateSelectionForAdaptionException;
+import com.devonfw.cobigen.api.exception.UpgradeTemplatesNotificationException;
+import com.devonfw.cobigen.impl.adapter.TemplateAdapterImpl;
+import com.devonfw.cobigen.systemtest.common.AbstractApiTest;
+
+/**
+ * Test suite for extract templates scenarios.
+ */
+public class TemplateProcessingTest extends AbstractApiTest {
+
+  /** Temporary files rule to create temporary folders or files */
+  @Rule
+  public TemporaryFolder tempFolder = new TemporaryFolder();
+
+  /**
+   * Tests if template sets can be adapted properly
+   *
+   * @throws IOException if an Exception occurs
+   * @throws Exception test fails
+   */
+  @Test
+  public void adaptTemplateSetsTest() throws IOException, Exception {
+
+    Path cobiGenHomeTemplateSets = this.tempFolder.newFolder("playground", "templateSetsHome").toPath();
+    Path downloadedTemplateSetsPath = cobiGenHomeTemplateSets.resolve(ConfigurationConstants.TEMPLATE_SETS_FOLDER)
+        .resolve(ConfigurationConstants.DOWNLOADED_FOLDER);
+    if (!Files.exists(downloadedTemplateSetsPath)) {
+      Files.createDirectories(downloadedTemplateSetsPath);
+    }
+    String testFileRootPath = "src/test/resources/testdata/systemtest/TemplateProcessingTest/template-sets/downloaded";
+    FileUtils.copyDirectory(new File(testFileRootPath), downloadedTemplateSetsPath.toFile());
+
+    // Prepare the test directories
+    Path cobigenTemplateSetsFolderPath = cobiGenHomeTemplateSets.resolve(ConfigurationConstants.TEMPLATE_SETS_FOLDER);
+    Path downloadedTemplateSetsFolderPath = cobigenTemplateSetsFolderPath
+        .resolve(ConfigurationConstants.DOWNLOADED_FOLDER);
+    Path adaptedTemplateSetsFolderPath = cobigenTemplateSetsFolderPath.resolve(ConfigurationConstants.ADAPTED_FOLDER);
+
+    // Adapt the templates
+    TemplateAdapter templateAdapter = new TemplateAdapterImpl(cobigenTemplateSetsFolderPath);
+
+    Exception exception = assertThrows(TemplateSelectionForAdaptionException.class, () -> {
+      templateAdapter.adaptTemplates();
+    });
+
+    List<Path> templateSetJars = ((TemplateSelectionForAdaptionException) exception).getTemplateSets();
+    templateAdapter.adaptTemplateSets(templateSetJars, adaptedTemplateSetsFolderPath, false);
+
+    assertThat(cobigenTemplateSetsFolderPath).exists();
+    assertThat(downloadedTemplateSetsFolderPath).exists();
+    assertThat(adaptedTemplateSetsFolderPath).exists();
+
+    Path templateSetSimple = adaptedTemplateSetsFolderPath.resolve("crud-java-server-app-1.0.0");
+    Path templateSetComplex = adaptedTemplateSetsFolderPath.resolve("crud-java-server-app-complex-1.0.0");
+
+    // check if adapted template set exists
+    assertThat(templateSetSimple).exists();
+    assertThat(templateSetComplex).exists();
+
+    Path templateSetResourcesPath = templateSetSimple
+        .resolve(ConfigurationConstants.MAVEN_CONFIGURATION_RESOURCE_FOLDER);
+    Path templateSetResourcesPathComplex = templateSetComplex
+        .resolve(ConfigurationConstants.MAVEN_CONFIGURATION_RESOURCE_FOLDER);
+
+    // check if templates folder exists
+    assertThat(templateSetSimple.resolve(templateSetResourcesPath).resolve(ConfigurationConstants.TEMPLATES_FOLDER))
+        .exists();
+    assertThat(
+        templateSetComplex.resolve(templateSetResourcesPathComplex).resolve(ConfigurationConstants.TEMPLATES_FOLDER))
+            .exists();
+
+    // check if template-set.xml exists
+    assertThat(templateSetSimple.resolve(templateSetResourcesPath)
+        .resolve(ConfigurationConstants.TEMPLATE_SET_CONFIG_FILENAME)).exists();
+    assertThat(templateSetComplex.resolve(templateSetResourcesPathComplex)
+        .resolve(ConfigurationConstants.TEMPLATE_SET_CONFIG_FILENAME)).exists();
+
+    // validate correct folder structure
+    assertThat(templateSetSimple.resolve(templateSetResourcesPath)
+        .resolve(ConfigurationConstants.TEMPLATE_SET_FREEMARKER_FUNCTIONS_FILE_NAME)).exists();
+    assertThat(templateSetComplex.resolve(templateSetResourcesPathComplex)
+        .resolve(ConfigurationConstants.TEMPLATE_SET_FREEMARKER_FUNCTIONS_FILE_NAME)).exists();
+
+    // check if template set utility resource folder exists
+    assertThat(templateSetSimple.resolve(ConfigurationConstants.UTIL_RESOURCE_FOLDER)).exists();
+    assertThat(templateSetComplex.resolve(ConfigurationConstants.UTIL_RESOURCE_FOLDER)).exists();
+
+    // validate maven specific contents
+    assertThat(templateSetSimple.resolve("pom.xml")).exists();
+    assertThat(templateSetComplex.resolve("pom.xml")).exists();
+
+    // check if META-INF was deleted
+    assertThat(templateSetResourcesPath.resolve("META-INF")).doesNotExist();
+    assertThat(templateSetResourcesPathComplex.resolve("META-INF")).doesNotExist();
+  }
+
+  /**
+   * Test of adapt templates with old CobiGen_Templates project existing
+   *
+   * TODO: Check if this test is really validating a complete adapt of a monolithic template, see:
+   * https://github.com/devonfw/cobigen/issues/1681
+   *
+   * @throws IOException if an Exception occurs
+   */
+  @Test
+  public void adaptTemplatesWithOldConfiguration() throws IOException {
+
+    String testFileRootPathMonolithicTemplates = apiTestsRootPath + "AdaptMonolithicTemplatesTest/";
+    Path cobiGenHomeMonolithicTemplates = this.tempFolder.newFolder("playground", "templatesMonolithicHome").toPath();
+
+    FileUtils.copyDirectory(new File(testFileRootPathMonolithicTemplates), cobiGenHomeMonolithicTemplates.toFile());
+
+    Path cobigenTemplatesParent = cobiGenHomeMonolithicTemplates
+        .resolve(ConfigurationConstants.CONFIG_PROPERTY_TEMPLATES_PATH);
+
+    Path cobigenTemplatesProject = cobigenTemplatesParent.resolve(ConfigurationConstants.COBIGEN_TEMPLATES);
+
+    TemplateAdapter templateAdapter = new TemplateAdapterImpl(cobigenTemplatesParent);
+    assertThrows(UpgradeTemplatesNotificationException.class, () -> {
+      templateAdapter.adaptTemplates();
+    });
+
+    assertThat(cobigenTemplatesProject).exists().isDirectory();
+    assertThat(cobigenTemplatesProject.resolve(ConfigurationConstants.TEMPLATE_RESOURCE_FOLDER)).exists().isDirectory();
+    assertThat(cobigenTemplatesProject.resolve("src/main/java")).exists().isDirectory();
+  }
+}
diff --git a/cobigen/cobigen-core-systemtest/src/test/java/com/devonfw/cobigen/systemtest/TemplateScanIT.java b/cobigen/cobigen-core-systemtest/src/test/java/com/devonfw/cobigen/systemtest/TemplateScanIT.java
index 72be6e73d3..3f54cfd144 100644
--- a/cobigen/cobigen-core-systemtest/src/test/java/com/devonfw/cobigen/systemtest/TemplateScanIT.java
+++ b/cobigen/cobigen-core-systemtest/src/test/java/com/devonfw/cobigen/systemtest/TemplateScanIT.java
@@ -7,6 +7,7 @@
 import static org.junit.Assert.assertThat;
 
 import java.io.File;
+import java.nio.charset.Charset;
 import java.nio.file.Paths;
 import java.util.List;
 
@@ -29,13 +30,18 @@ public class TemplateScanIT extends AbstractApiTest {
    */
   private static String testFileRootPath = apiTestsRootPath + "TemplateScanTest/";
 
+  /**
+   * Root path to all template-set resources used in this test case
+   */
+  private static String testFileRootPathTemplateSets = apiTestsRootPath + "TemplateScanTemplateSetTest/";
+
   /**
    * Tests the correct destination resolution for resources obtained by template-scans
    *
    * @throws Exception test fails
    */
   @Test
-  public void testCorrectDestinationResoution() throws Exception {
+  public void testCorrectDestinationResolution() throws Exception {
 
     Object input = PluginMockFactory.createSimpleJavaConfigurationMock();
 
@@ -45,7 +51,7 @@ public void testCorrectDestinationResoution() throws Exception {
 
     // pre-processing
     File templatesFolder = new File(testFileRootPath);
-    CobiGen target = CobiGenFactory.create(templatesFolder.toURI());
+    CobiGen target = CobiGenFactory.create(templatesFolder.toURI(), true);
     List<TemplateTo> templates = target.getMatchingTemplates(input);
     assertThat(templates).isNotNull();
 
@@ -73,7 +79,7 @@ public void testScanTemplatesFromArchivFile() throws Exception {
     Object input = PluginMockFactory.createSimpleJavaConfigurationMock();
 
     // test processing
-    CobiGen cobigen = CobiGenFactory.create(new File(testFileRootPath + "valid.zip").toURI());
+    CobiGen cobigen = CobiGenFactory.create(new File(testFileRootPath + "valid.zip").toURI(), true);
     List<TemplateTo> templates = cobigen.getMatchingTemplates(input);
 
     // checking
@@ -88,7 +94,7 @@ public void testScanTemplatesFromArchivFile() throws Exception {
    * @throws Exception test fails
    */
   @Test
-  public void testCorrectDestinationResoution_emptyPathElement() throws Exception {
+  public void testCorrectDestinationResolution_emptyPathElement() throws Exception {
 
     Object input = PluginMockFactory.createSimpleJavaConfigurationMock();
 
@@ -98,7 +104,7 @@ public void testCorrectDestinationResoution_emptyPathElement() throws Exception
 
     // pre-processing
     File templatesFolder = new File(testFileRootPath);
-    CobiGen target = CobiGenFactory.create(templatesFolder.toURI());
+    CobiGen target = CobiGenFactory.create(templatesFolder.toURI(), true);
     List<TemplateTo> templates = target.getMatchingTemplates(input);
     assertThat(templates).isNotNull();
 
@@ -120,7 +126,7 @@ public void testCorrectDestinationResoution_emptyPathElement() throws Exception
    * @throws Exception test fails
    */
   @Test
-  public void testCorrectDestinationResoution_emptyPathElements() throws Exception {
+  public void testCorrectDestinationResolution_emptyPathElements() throws Exception {
 
     Object input = PluginMockFactory.createSimpleJavaConfigurationMock();
 
@@ -130,7 +136,7 @@ public void testCorrectDestinationResoution_emptyPathElements() throws Exception
 
     // pre-processing
     File templatesFolder = new File(testFileRootPath);
-    CobiGen target = CobiGenFactory.create(templatesFolder.toURI());
+    CobiGen target = CobiGenFactory.create(templatesFolder.toURI(), true);
     List<TemplateTo> templates = target.getMatchingTemplates(input);
     assertThat(templates).isNotNull();
 
@@ -146,4 +152,34 @@ public void testCorrectDestinationResoution_emptyPathElements() throws Exception
         + File.separator + "java" + File.separator + "base" + File.separator + "MultiEmpty.java")).exists();
   }
 
+  /**
+   * Tests if a template-set with a ts_scan node can be read and generated successfully
+   *
+   * @throws Exception
+   */
+  @Test
+  public void testTemplateSetCorrectDestinationResolution() throws Exception {
+
+    CobiGen cobigen = CobiGenFactory.create(new File(testFileRootPathTemplateSets + "template-sets").toURI());
+
+    Object input = cobigen.read(
+        new File("src/test/java/com/devonfw/cobigen/systemtest/testobjects/io/generator/logic/api/to/InputEto.java")
+            .toPath(),
+        Charset.forName("UTF-8"), getClass().getClassLoader());
+
+    File generationRootFolder = this.tmpFolder.newFolder("generationRootFolder");
+
+    List<TemplateTo> templates = cobigen.getMatchingTemplates(input);
+    assertThat(templates).isNotNull();
+
+    TemplateTo targetTemplate = getTemplateById(templates, "generated.txt");
+    assertThat(targetTemplate).isNotNull();
+
+    // Execution
+    GenerationReportTo report = cobigen.generate(input, targetTemplate, Paths.get(generationRootFolder.toURI()), false);
+
+    // Validation
+    assertThat(report).isSuccessful();
+  }
+
 }
diff --git a/cobigen/cobigen-core-systemtest/src/test/java/com/devonfw/cobigen/systemtest/TemplatesInstallationTest.java b/cobigen/cobigen-core-systemtest/src/test/java/com/devonfw/cobigen/systemtest/TemplatesInstallationTest.java
new file mode 100644
index 0000000000..9ff7573f42
--- /dev/null
+++ b/cobigen/cobigen-core-systemtest/src/test/java/com/devonfw/cobigen/systemtest/TemplatesInstallationTest.java
@@ -0,0 +1,130 @@
+package com.devonfw.cobigen.systemtest;
+
+import static com.github.stefanbirkner.systemlambda.SystemLambda.withEnvironmentVariable;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+
+import org.junit.Test;
+
+import com.devonfw.cobigen.api.constants.ConfigurationConstants;
+import com.devonfw.cobigen.impl.CobiGenFactory;
+import com.devonfw.cobigen.systemtest.common.AbstractApiTest;
+
+/**
+ * Test suite for template installation with the cobigen startup
+ *
+ */
+public class TemplatesInstallationTest extends AbstractApiTest {
+
+  /**
+   * Tests if the templates specified in the .cobigen file will be loaded at startup with the template-set structure and
+   * an existing downloaded folder.
+   *
+   * TODO: Check if this test is valid, see: https://github.com/devonfw/cobigen/issues/1672
+   *
+   * @throws Exception test fails.
+   */
+  @Test
+  public void testInstallTemplatesAtStartup() throws Exception {
+
+    File folder = this.tmpFolder.newFolder("TemplateSetsInstalledTest");
+    withEnvironmentVariable(ConfigurationConstants.CONFIG_ENV_HOME, folder.getAbsolutePath()).execute(() -> {
+      File templateSets = this.tmpFolder.newFolder("TemplateSetsInstalledTest",
+          ConfigurationConstants.TEMPLATE_SETS_FOLDER);
+      File downloaded = this.tmpFolder.newFolder("TemplateSetsInstalledTest",
+          ConfigurationConstants.TEMPLATE_SETS_FOLDER, "downloaded");
+      File target = new File(folder, ConfigurationConstants.COBIGEN_CONFIG_FILE);
+      try (BufferedWriter writer = new BufferedWriter(new FileWriter(target))) {
+        writer.write(
+            "template-sets.installed=com.devonfw.cobigen.templates:crud-openapi-angular-client-app:2021.12.007-SNAPSHOT");
+      }
+      CobiGenFactory.create(templateSets.toURI());
+      assertThat(downloaded.listFiles()).hasSize(2);
+    });
+
+  }
+
+  /**
+   * Tests if the templates specified in the .cobigen file won´t be loaded when an adapted folder already exists.
+   *
+   * TODO: Check if this test is valid, see: https://github.com/devonfw/cobigen/issues/1672
+   *
+   * @throws Exception test fails.
+   */
+  @Test
+  public void testInstallTemplatesAtStartupAdapted() throws Exception {
+
+    File folder = this.tmpFolder.newFolder("TemplateSetsInstalledTest");
+    withEnvironmentVariable(ConfigurationConstants.CONFIG_ENV_HOME, folder.getAbsolutePath()).execute(() -> {
+      File templateSets = this.tmpFolder.newFolder("TemplateSetsInstalledTest",
+          ConfigurationConstants.TEMPLATE_SETS_FOLDER);
+      File adapted = this.tmpFolder.newFolder("TemplateSetsInstalledTest", ConfigurationConstants.TEMPLATE_SETS_FOLDER,
+          ConfigurationConstants.ADAPTED_FOLDER);
+      File downloaded = this.tmpFolder.newFolder("TemplateSetsInstalledTest",
+          ConfigurationConstants.TEMPLATE_SETS_FOLDER, ConfigurationConstants.DOWNLOADED_FOLDER);
+      File target = new File(folder, ConfigurationConstants.COBIGEN_CONFIG_FILE);
+      try (BufferedWriter writer = new BufferedWriter(new FileWriter(target))) {
+        writer.write(
+            "template-sets.installed=com.devonfw.cobigen.templates:crud-openapi-angular-client-app:2021.12.007-SNAPSHOT");
+      }
+      CobiGenFactory.create(templateSets.toURI());
+      assertThat(downloaded.listFiles()).hasSize(2);
+    });
+
+  }
+
+  /**
+   * Tests if the templates specified in the .cobigen file will be loaded at startup with the template-set structure
+   * without an existing downloaded folder.
+   *
+   * TODO: Check if this test is valid, see: https://github.com/devonfw/cobigen/issues/1672
+   *
+   * @throws Exception test fails.
+   */
+  @Test
+  public void testInstallTemplatesAtStartupWithoutDownloaded() throws Exception {
+
+    File folder = this.tmpFolder.newFolder("TemplateSetsInstalledTest");
+    withEnvironmentVariable(ConfigurationConstants.CONFIG_ENV_HOME, folder.getAbsolutePath()).execute(() -> {
+      File templateSets = this.tmpFolder.newFolder("TemplateSetsInstalledTest",
+          ConfigurationConstants.TEMPLATE_SETS_FOLDER);
+      File downloaded = templateSets.toPath().resolve(ConfigurationConstants.DOWNLOADED_FOLDER).toFile();
+      File target = new File(folder, ConfigurationConstants.COBIGEN_CONFIG_FILE);
+      try (BufferedWriter writer = new BufferedWriter(new FileWriter(target))) {
+        writer.write(
+            "template-sets.installed=com.devonfw.cobigen.templates:crud-openapi-angular-client-app:2021.12.007-SNAPSHOT");
+      }
+      CobiGenFactory.create(templateSets.toURI());
+      assertThat(downloaded.listFiles()).hasSize(2);
+    });
+  }
+
+  /**
+   * Tests if the templates specified in the .cobigen file will be checked for the correct format defined in the
+   * documentation.
+   *
+   * TODO: Check if this test is valid, see: https://github.com/devonfw/cobigen/issues/1672
+   *
+   * @throws Exception test fails.
+   */
+  @Test
+  public void testInstallTemplatesAtStartupWithWrongCoordinates() throws Exception {
+
+    File folder = this.tmpFolder.newFolder("TemplateSetsInstalledTest");
+    withEnvironmentVariable(ConfigurationConstants.CONFIG_ENV_HOME, folder.getAbsolutePath()).execute(() -> {
+      File templateSets = this.tmpFolder.newFolder("TemplateSetsInstalledTest",
+          ConfigurationConstants.TEMPLATE_SETS_FOLDER);
+      File downloaded = this.tmpFolder.newFolder("TemplateSetsInstalledTest",
+          ConfigurationConstants.TEMPLATE_SETS_FOLDER, "downloaded");
+      File target = new File(folder, ConfigurationConstants.COBIGEN_CONFIG_FILE);
+      try (BufferedWriter writer = new BufferedWriter(new FileWriter(target))) {
+        writer.write("template-sets.installed=com.com.com:com-com:com.com");
+      }
+      CobiGenFactory.create(templateSets.toURI());
+      assertThat(downloaded.listFiles()).hasSize(0);
+    });
+  }
+}
diff --git a/cobigen/cobigen-core-systemtest/src/test/java/com/devonfw/cobigen/systemtest/TransactionalGenerationIT.java b/cobigen/cobigen-core-systemtest/src/test/java/com/devonfw/cobigen/systemtest/TransactionalGenerationIT.java
index b208635398..0f2ef26043 100644
--- a/cobigen/cobigen-core-systemtest/src/test/java/com/devonfw/cobigen/systemtest/TransactionalGenerationIT.java
+++ b/cobigen/cobigen-core-systemtest/src/test/java/com/devonfw/cobigen/systemtest/TransactionalGenerationIT.java
@@ -7,12 +7,12 @@
 
 import org.junit.Test;
 
-import com.devonfw.cobigen.systemtest.common.AbstractApiTest;
-import com.devonfw.cobigen.systemtest.util.PluginMockFactory;
 import com.devonfw.cobigen.api.CobiGen;
 import com.devonfw.cobigen.api.to.GenerationReportTo;
 import com.devonfw.cobigen.api.to.IncrementTo;
 import com.devonfw.cobigen.impl.CobiGenFactory;
+import com.devonfw.cobigen.systemtest.common.AbstractApiTest;
+import com.devonfw.cobigen.systemtest.util.PluginMockFactory;
 
 /**
  * This test suit focuses on the transactional behavior of generation. In specific, that temporary files will be
@@ -35,7 +35,7 @@ public void testNoPartialApplicationOfGeneration() throws Throwable {
     Object generationInput = PluginMockFactory.createSimpleJavaConfigurationMock();
     File targetRoot = this.tmpFolder.newFolder();
 
-    CobiGen cobigen = CobiGenFactory.create(new File(testFileRootPath + "templates").toURI());
+    CobiGen cobigen = CobiGenFactory.create(new File(testFileRootPath + "templates").toURI(), true);
     List<IncrementTo> matchingIncrements = cobigen.getMatchingIncrements(generationInput);
 
     // act
diff --git a/cobigen/cobigen-core-systemtest/src/test/java/com/devonfw/cobigen/systemtest/TriggerActivationIT.java b/cobigen/cobigen-core-systemtest/src/test/java/com/devonfw/cobigen/systemtest/TriggerActivationIT.java
index db48f63600..e65dbcaaaa 100644
--- a/cobigen/cobigen-core-systemtest/src/test/java/com/devonfw/cobigen/systemtest/TriggerActivationIT.java
+++ b/cobigen/cobigen-core-systemtest/src/test/java/com/devonfw/cobigen/systemtest/TriggerActivationIT.java
@@ -58,6 +58,7 @@ public void testNoActivation_1Of2AND_MatcherMatches() throws Exception {
     when(triggerInterpreter.getInputReader()).thenReturn(inputReader);
 
     when(inputReader.isValidInput(anything())).thenReturn(true);
+
     when(matcher.matches(argThat(new MatcherToMatcher(equalTo("and1"), any(String.class), sameInstance(input)))))
         .thenReturn(false);
     when(matcher.matches(argThat(new MatcherToMatcher(equalTo("and2"), any(String.class), sameInstance(input)))))
@@ -70,7 +71,7 @@ public void testNoActivation_1Of2AND_MatcherMatches() throws Exception {
     PluginRegistry.registerTriggerInterpreter(triggerInterpreter, activator);
 
     // execution
-    CobiGen cobigen = CobiGenFactory.create(new File(testFileRootPath + "templates").toURI());
+    CobiGen cobigen = CobiGenFactory.create(new File(testFileRootPath + "templates").toURI(), true);
     List<String> matchingTriggerIds = cobigen.getMatchingTriggerIds(input);
 
     assertThat(matchingTriggerIds, not(hasItem("triggerId")));
@@ -109,7 +110,7 @@ public void testNoActivation_1Of2AND_1OR_MatcherMatches() throws Exception {
     PluginRegistry.registerTriggerInterpreter(triggerInterpreter, activator);
 
     // execution
-    CobiGen cobigen = CobiGenFactory.create(new File(testFileRootPath + "templates").toURI());
+    CobiGen cobigen = CobiGenFactory.create(new File(testFileRootPath + "templates").toURI(), true);
     List<String> matchingTriggerIds = cobigen.getMatchingTriggerIds(input);
 
     assertThat(matchingTriggerIds, not(hasItem("triggerId")));
@@ -131,6 +132,8 @@ public void testActivation_2Of2AND_MatcherMatches() throws Exception {
     MatcherInterpreter matcher = mock(MatcherInterpreter.class);
     InputReader inputReader = mock(InputReader.class);
 
+    when(inputReader.isValidInput(ArgumentMatchers.any())).thenReturn(true);
+
     when(triggerInterpreter.getType()).thenReturn("test");
     when(triggerInterpreter.getMatcher()).thenReturn(matcher);
     when(triggerInterpreter.getInputReader()).thenReturn(inputReader);
@@ -148,7 +151,7 @@ public void testActivation_2Of2AND_MatcherMatches() throws Exception {
     PluginRegistry.registerTriggerInterpreter(triggerInterpreter, activator);
 
     // execution
-    CobiGen cobigen = CobiGenFactory.create(new File(testFileRootPath + "templates").toURI());
+    CobiGen cobigen = CobiGenFactory.create(new File(testFileRootPath + "templates").toURI(), true);
     List<String> matchingTriggerIds = cobigen.getMatchingTriggerIds(input);
 
     assertThat(matchingTriggerIds, hasItem("triggerId"));
@@ -187,7 +190,7 @@ public void testNoActivation_2Of2AND_1NOT_MatcherMatches() throws Exception {
     PluginRegistry.registerTriggerInterpreter(triggerInterpreter, activator);
 
     // execution
-    CobiGen cobigen = CobiGenFactory.create(new File(testFileRootPath + "templates").toURI());
+    CobiGen cobigen = CobiGenFactory.create(new File(testFileRootPath + "templates").toURI(), true);
     List<String> matchingTriggerIds = cobigen.getMatchingTriggerIds(input);
 
     assertThat(matchingTriggerIds, not(hasItem("triggerId")));
@@ -197,7 +200,6 @@ public void testNoActivation_2Of2AND_1NOT_MatcherMatches() throws Exception {
    * Tests that a trigger will not be activated in case of one OR matcher but no AND matcher matches.
    *
    * @throws Exception test fails
-   * @author mbrunnli (22.02.2015)
    */
   @Test
   public void testNoActivation_1OR_0AND_MatcherMatches() throws Exception {
@@ -227,7 +229,7 @@ public void testNoActivation_1OR_0AND_MatcherMatches() throws Exception {
     PluginRegistry.registerTriggerInterpreter(triggerInterpreter, activator);
 
     // execution
-    CobiGen cobigen = CobiGenFactory.create(new File(testFileRootPath + "templates").toURI());
+    CobiGen cobigen = CobiGenFactory.create(new File(testFileRootPath + "templates").toURI(), true);
     List<String> matchingTriggerIds = cobigen.getMatchingTriggerIds(input);
 
     assertThat(matchingTriggerIds, not(hasItem("triggerId")));
@@ -266,7 +268,7 @@ public void testNoActivation_1OR_1NOT_MatcherMatches() throws Exception {
     PluginRegistry.registerTriggerInterpreter(triggerInterpreter, activator);
 
     // execution
-    CobiGen cobigen = CobiGenFactory.create(new File(testFileRootPath + "templates").toURI());
+    CobiGen cobigen = CobiGenFactory.create(new File(testFileRootPath + "templates").toURI(), true);
     List<String> matchingTriggerIds = cobigen.getMatchingTriggerIds(input);
 
     assertThat(matchingTriggerIds, not(hasItem("triggerId")));
@@ -301,7 +303,7 @@ public void testActivation_1OR_MatcherMatches() throws Exception {
     PluginRegistry.registerTriggerInterpreter(triggerInterpreter, activator);
 
     // execution
-    CobiGen cobigen = CobiGenFactory.create(new File(testFileRootPath + "templates").toURI());
+    CobiGen cobigen = CobiGenFactory.create(new File(testFileRootPath + "templates").toURI(), true);
     List<String> matchingTriggerIds = cobigen.getMatchingTriggerIds(input);
 
     assertThat(matchingTriggerIds, hasItem("triggerId2"));
diff --git a/cobigen/cobigen-core-systemtest/src/test/java/com/devonfw/cobigen/systemtest/testobjects/io/generator/logic/api/to/InputEto.java b/cobigen/cobigen-core-systemtest/src/test/java/com/devonfw/cobigen/systemtest/testobjects/io/generator/logic/api/to/InputEto.java
new file mode 100644
index 0000000000..a6dfd7f6b4
--- /dev/null
+++ b/cobigen/cobigen-core-systemtest/src/test/java/com/devonfw/cobigen/systemtest/testobjects/io/generator/logic/api/to/InputEto.java
@@ -0,0 +1,29 @@
+package com.devonfw.cobigen.systemtest.testobjects.io.generator.logic.api.to;
+
+public class InputEto {
+
+  private String input;
+
+  private int complexity;
+
+  public String getInput() {
+
+    return this.input;
+  }
+
+  public void setInput(String input) {
+
+    this.input = input;
+  }
+
+  public int getComplexity() {
+
+    return this.complexity;
+  }
+
+  public void setComplexity(int complexity) {
+
+    this.complexity = complexity;
+  }
+
+}
diff --git a/cobigen/cobigen-core-systemtest/src/test/java/com/devonfw/cobigen/systemtest/testobjects/io/generator/logic/api/to/test.yaml b/cobigen/cobigen-core-systemtest/src/test/java/com/devonfw/cobigen/systemtest/testobjects/io/generator/logic/api/to/test.yaml
new file mode 100644
index 0000000000..14b9ec10cf
--- /dev/null
+++ b/cobigen/cobigen-core-systemtest/src/test/java/com/devonfw/cobigen/systemtest/testobjects/io/generator/logic/api/to/test.yaml
@@ -0,0 +1,131 @@
+openapi: 3.0.0
+servers:
+  - url: 'https://localhost:8081/server/services/rest'
+info:
+  title: Devon Example
+  description: Example of a API definition
+  version: 1.0.0
+  x-rootpackage: com.devonfw.demo
+paths:
+  /datamanagement/v1/someData/{id}:
+    get:
+      operationId: findSomeData
+      parameters:
+        - name: id
+          in: path
+          required: true
+          schema:
+            type: integer
+            format: int64
+            minimum: 0
+            maximum: 50
+      responses:
+        '200':
+          description: Any
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/EvenMoreData'
+            text/plain:
+              schema:
+                type: string
+  /datamanagement/v1/moreData/{id}:
+    get:
+      operationId: findMoreData
+      parameters:
+        - name: id
+          in: path
+          required: true
+          schema:
+            type: integer
+            format: int64
+            minimum: 10
+            maximum: 200
+      responses:
+        '200':
+          description: Any
+  /datamanagement/v1/someData/:
+    post:
+      responses:
+        '200':
+          description: Any
+      requestBody:
+        $ref: '#/components/requestBodies/SomeData'
+      tags:
+       - searchCriteria
+  /datamanagement/v1/moreData/validateMoreData:
+    post:
+      responses:
+       '200':
+          description: Any
+      requestBody:
+        $ref: '#/components/requestBodies/MoreData'
+components:
+    schemas:
+        SomeData:
+          x-component: DataManagement
+          description: Entity definiton of SomeData
+          type: object
+          properties:
+            AnyString:
+              type: string
+              maxLength: 100
+              minLength: 5
+              uniqueItems: true
+            furtherData:
+              type: array
+              items:
+                $ref: '#/components/schemas/FurtherData'
+        MoreData:
+          x-component: DataManagement
+          description: Entity definiton of Moredata
+          type: object
+          properties:
+            anyNumber:
+              type: number
+              format: int64
+              maximum: 100
+              minimum: 0
+            someData:
+              $ref: '#/components/schemas/SomeData'
+            allSomeData:
+              type: array
+              description: 'All SomeData'
+              items:
+                $ref: '#/components/schemas/SomeData'
+          required:
+            - saleExample
+        FurtherData:
+          x-component: AnotherComponent
+          type: object
+          properties:
+            parent:
+              $ref: '#/components/schemas/SomeData'
+            valid:
+              type: boolean
+            someList:
+              type: array
+              items:
+                type: string
+        EvenMoreData:
+          x-component: AnotherComponent
+          description: Entity definiton of more data
+          type: object
+          properties:
+            id:
+              type: integer
+              format: int64
+              uniqueItems: true
+    requestBodies:
+        SomeData:
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/SomeData'
+          required: true
+        MoreData:
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/MoreData'
+          required: true
diff --git a/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/AdaptMonolithicTemplatesTest/templates/templates-devon4j-0.0.1-sources.jar b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/AdaptMonolithicTemplatesTest/templates/templates-devon4j-0.0.1-sources.jar
new file mode 100644
index 0000000000..7a3be01981
Binary files /dev/null and b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/AdaptMonolithicTemplatesTest/templates/templates-devon4j-0.0.1-sources.jar differ
diff --git a/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/AdaptMonolithicTemplatesTest/templates/templates-devon4j-0.0.1.jar b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/AdaptMonolithicTemplatesTest/templates/templates-devon4j-0.0.1.jar
new file mode 100644
index 0000000000..9dafe1645d
Binary files /dev/null and b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/AdaptMonolithicTemplatesTest/templates/templates-devon4j-0.0.1.jar differ
diff --git a/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/ClassLoadTemplateSetTest/conflicted/template-sets/adapted/template-set1/pom.xml b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/ClassLoadTemplateSetTest/conflicted/template-sets/adapted/template-set1/pom.xml
new file mode 100644
index 0000000000..31ebb749b4
--- /dev/null
+++ b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/ClassLoadTemplateSetTest/conflicted/template-sets/adapted/template-set1/pom.xml
@@ -0,0 +1,12 @@
+<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>com.devonfw.test</groupId>
+  <artifactId>classpath-template-set-load-test</artifactId>
+  <packaging>jar</packaging>
+  <version>dev-SNAPSHOT-1</version>
+  <properties>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
+  </properties>
+</project>
diff --git a/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/ClassLoadTemplateSetTest/conflicted/template-sets/adapted/template-set1/src/main/resources/template-set.xml b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/ClassLoadTemplateSetTest/conflicted/template-sets/adapted/template-set1/src/main/resources/template-set.xml
new file mode 100644
index 0000000000..623e32c4de
--- /dev/null
+++ b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/ClassLoadTemplateSetTest/conflicted/template-sets/adapted/template-set1/src/main/resources/template-set.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<tns:templateSetConfiguration version="6.0"
+  xmlns:tns="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration"
+  xmlns:cc="http://capgemini.com/devonfw/cobigen/ContextConfiguration"
+  xmlns:tc="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration templateSetConfiguration.xsd ">
+  <cc:contextConfiguration version="3.0">
+    <cc:trigger id="entities" type="java">
+      <!--  <cc:matcher type="fqn" value=".+">-->
+      <cc:matcher type="fqn" value="((.+\.)?([^\.]+))\.([^\.]+)\.logic\.api\.to\.([^\.]+)Eto">
+        <cc:variableAssignment type="constant" key="etoName" value="5"/>
+        <cc:variableAssignment type="regex" key="etoName2" value="4" />
+      </cc:matcher>
+    </cc:trigger>
+    <cc:tags>
+      <cc:tag name="bla"/>
+    </cc:tags>
+  </cc:contextConfiguration>
+  <tc:templatesConfiguration version="5.0">
+    <tc:templates>
+      <tc:template name="t1" destinationPath="generated.txt" templateFile="templates/generated.txt.ftl"
+        mergeStrategy="override"/>
+    </tc:templates>
+
+    <tc:increments>
+      <tc:increment name="i1" description="the only increment">
+        <tc:templateRef ref="t1"/>
+      </tc:increment>
+    </tc:increments>
+  </tc:templatesConfiguration>
+</tns:templateSetConfiguration>
diff --git a/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/ClassLoadTemplateSetTest/conflicted/template-sets/adapted/template-set1/src/main/resources/templates/generated.txt.ftl b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/ClassLoadTemplateSetTest/conflicted/template-sets/adapted/template-set1/src/main/resources/templates/generated.txt.ftl
new file mode 100644
index 0000000000..7933008564
--- /dev/null
+++ b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/ClassLoadTemplateSetTest/conflicted/template-sets/adapted/template-set1/src/main/resources/templates/generated.txt.ftl
@@ -0,0 +1,2 @@
+Testing JarredClass:
+String is ${JarredClass.methodTwo(3,1)}
\ No newline at end of file
diff --git a/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/ClassLoadTemplateSetTest/conflicted/template-sets/adapted/template-set2/pom.xml b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/ClassLoadTemplateSetTest/conflicted/template-sets/adapted/template-set2/pom.xml
new file mode 100644
index 0000000000..95050ccd70
--- /dev/null
+++ b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/ClassLoadTemplateSetTest/conflicted/template-sets/adapted/template-set2/pom.xml
@@ -0,0 +1,12 @@
+<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>com.devonfw.test</groupId>
+  <artifactId>classpath-template-set-load-test</artifactId>
+  <packaging>jar</packaging>
+  <version>dev-SNAPSHOT-1.1</version>
+  <properties>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
+  </properties>
+</project>
diff --git a/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/ClassLoadTemplateSetTest/conflicted/template-sets/adapted/template-set2/src/main/resources/template-set.xml b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/ClassLoadTemplateSetTest/conflicted/template-sets/adapted/template-set2/src/main/resources/template-set.xml
new file mode 100644
index 0000000000..010b94529a
--- /dev/null
+++ b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/ClassLoadTemplateSetTest/conflicted/template-sets/adapted/template-set2/src/main/resources/template-set.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<tns:templateSetConfiguration version="6.0"
+  xmlns:tns="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration"
+  xmlns:cc="http://capgemini.com/devonfw/cobigen/ContextConfiguration"
+  xmlns:tc="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration templateSetConfiguration.xsd ">
+  <cc:contextConfiguration version="3.0">
+    <cc:trigger id="entities2" type="java">
+      <!--  <cc:matcher type="fqn" value=".+">-->
+      <cc:matcher type="fqn" value="((.+\.)?([^\.]+))\.([^\.]+)\.logic\.api\.to\.([^\.]+)Eto">
+        <cc:variableAssignment type="constant" key="etoName" value="5"/>
+        <cc:variableAssignment type="regex" key="etoName2" value="4" />
+      </cc:matcher>
+    </cc:trigger>
+    <cc:tags>
+      <cc:tag name="bla"/>
+    </cc:tags>
+  </cc:contextConfiguration>
+  <tc:templatesConfiguration version="5.0">
+    <tc:templates>
+      <tc:template name="t2" destinationPath="generated.txt" templateFile="templates/generated.txt.ftl"
+        mergeStrategy="override"/>
+    </tc:templates>
+
+    <tc:increments>
+      <tc:increment name="i2" description="the only increment">
+        <tc:templateRef ref="t2"/>
+      </tc:increment>
+    </tc:increments>
+  </tc:templatesConfiguration>
+</tns:templateSetConfiguration>
diff --git a/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/ClassLoadTemplateSetTest/conflicted/template-sets/adapted/template-set2/src/main/resources/templates/generated.txt.ftl b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/ClassLoadTemplateSetTest/conflicted/template-sets/adapted/template-set2/src/main/resources/templates/generated.txt.ftl
new file mode 100644
index 0000000000..7933008564
--- /dev/null
+++ b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/ClassLoadTemplateSetTest/conflicted/template-sets/adapted/template-set2/src/main/resources/templates/generated.txt.ftl
@@ -0,0 +1,2 @@
+Testing JarredClass:
+String is ${JarredClass.methodTwo(3,1)}
\ No newline at end of file
diff --git a/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/ClassLoadTemplateSetTest/expected-conflicted/generated.txt b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/ClassLoadTemplateSetTest/expected-conflicted/generated.txt
new file mode 100644
index 0000000000..8be2db595a
--- /dev/null
+++ b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/ClassLoadTemplateSetTest/expected-conflicted/generated.txt
@@ -0,0 +1,2 @@
+Testing JarredClass:
+String is 2
\ No newline at end of file
diff --git a/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/ClassLoadTemplateSetTest/expected/generated.txt b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/ClassLoadTemplateSetTest/expected/generated.txt
new file mode 100644
index 0000000000..554cc0ce7c
--- /dev/null
+++ b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/ClassLoadTemplateSetTest/expected/generated.txt
@@ -0,0 +1,4 @@
+Testing JarredClass:
+String is Something
+5
+generator
\ No newline at end of file
diff --git a/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/ClassLoadTemplateSetTest/template-sets/adapted/template-set1/pom.xml b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/ClassLoadTemplateSetTest/template-sets/adapted/template-set1/pom.xml
new file mode 100644
index 0000000000..09c2256fa8
--- /dev/null
+++ b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/ClassLoadTemplateSetTest/template-sets/adapted/template-set1/pom.xml
@@ -0,0 +1,12 @@
+<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>com.devonfw.test</groupId>
+  <artifactId>classpath-template-set-load-test</artifactId>
+  <packaging>jar</packaging>
+  <version>dev-SNAPSHOT</version>
+  <properties>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
+  </properties>
+</project>
diff --git a/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/ClassLoadTemplateSetTest/template-sets/adapted/template-set1/src/main/java/JarredClass.java b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/ClassLoadTemplateSetTest/template-sets/adapted/template-set1/src/main/java/JarredClass.java
new file mode 100644
index 0000000000..e0df9f3f81
--- /dev/null
+++ b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/ClassLoadTemplateSetTest/template-sets/adapted/template-set1/src/main/java/JarredClass.java
@@ -0,0 +1,12 @@
+public class JarredClass {
+
+public String methodOne(String str) {
+	return str;
+}
+
+public int methodTwo(int a, int b) {
+
+	return a+b;
+
+}
+}
\ No newline at end of file
diff --git a/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/ClassLoadTemplateSetTest/template-sets/adapted/template-set1/src/main/resources/template-set.xml b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/ClassLoadTemplateSetTest/template-sets/adapted/template-set1/src/main/resources/template-set.xml
new file mode 100644
index 0000000000..623e32c4de
--- /dev/null
+++ b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/ClassLoadTemplateSetTest/template-sets/adapted/template-set1/src/main/resources/template-set.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<tns:templateSetConfiguration version="6.0"
+  xmlns:tns="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration"
+  xmlns:cc="http://capgemini.com/devonfw/cobigen/ContextConfiguration"
+  xmlns:tc="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration templateSetConfiguration.xsd ">
+  <cc:contextConfiguration version="3.0">
+    <cc:trigger id="entities" type="java">
+      <!--  <cc:matcher type="fqn" value=".+">-->
+      <cc:matcher type="fqn" value="((.+\.)?([^\.]+))\.([^\.]+)\.logic\.api\.to\.([^\.]+)Eto">
+        <cc:variableAssignment type="constant" key="etoName" value="5"/>
+        <cc:variableAssignment type="regex" key="etoName2" value="4" />
+      </cc:matcher>
+    </cc:trigger>
+    <cc:tags>
+      <cc:tag name="bla"/>
+    </cc:tags>
+  </cc:contextConfiguration>
+  <tc:templatesConfiguration version="5.0">
+    <tc:templates>
+      <tc:template name="t1" destinationPath="generated.txt" templateFile="templates/generated.txt.ftl"
+        mergeStrategy="override"/>
+    </tc:templates>
+
+    <tc:increments>
+      <tc:increment name="i1" description="the only increment">
+        <tc:templateRef ref="t1"/>
+      </tc:increment>
+    </tc:increments>
+  </tc:templatesConfiguration>
+</tns:templateSetConfiguration>
diff --git a/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/ClassLoadTemplateSetTest/template-sets/adapted/template-set1/src/main/resources/templates/generated.txt.ftl b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/ClassLoadTemplateSetTest/template-sets/adapted/template-set1/src/main/resources/templates/generated.txt.ftl
new file mode 100644
index 0000000000..d1a48913eb
--- /dev/null
+++ b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/ClassLoadTemplateSetTest/template-sets/adapted/template-set1/src/main/resources/templates/generated.txt.ftl
@@ -0,0 +1,4 @@
+Testing JarredClass:
+String is ${JarredClass.methodOne("Something")}
+${variables.etoName}
+${variables.etoName2}
\ No newline at end of file
diff --git a/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/ClassLoadTest/templates/context.xml b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/ClassLoadTest/templates/context.xml
index 584f4debe5..63baa607fc 100644
--- a/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/ClassLoadTest/templates/context.xml
+++ b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/ClassLoadTest/templates/context.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="2.1">
+<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="3.0">
     <trigger id="entities" type="mockplugin" templateFolder="testTemplates">
         <containerMatcher type="package" value="(.+\.)?\.testdata" retrieveObjectsRecursively="false"/>
         <matcher type="fqn" value="((.+\.)?)\.testdata\.([^\.]+)Entity">
@@ -7,4 +7,7 @@
             <variableAssignment type="regex" key="entityName" value="3"/>
         </matcher>
     </trigger>
+  <tags>
+    <tag name="bla" />
+  </tags>
 </contextConfiguration>
diff --git a/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/ContainerMatcherTest/accumulationType/context.xml b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/ContainerMatcherTest/accumulationType/context.xml
index b45c869cc9..ff7cd8f9be 100644
--- a/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/ContainerMatcherTest/accumulationType/context.xml
+++ b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/ContainerMatcherTest/accumulationType/context.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="2.1">
+<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="3.0">
     <trigger id="entities" type="mockplugin" templateFolder="testTemplates">
         <containerMatcher type="package" value="(.+\.)?\.testdata" retrieveObjectsRecursively="false"/>
         <matcher type="fqn" value="((.+\.)?)\.testdata\.([^\.]+)Entity" accumulationType="NOT">
@@ -14,4 +14,7 @@
             <variableAssignment type="regex" key="entityName" value="3"/>
         </matcher>
     </trigger>
+  <tags>
+    <tag name="bla" />
+  </tags>
 </contextConfiguration>
diff --git a/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/ContainerMatcherTest/selectiveContainerGeneration/context.xml b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/ContainerMatcherTest/selectiveContainerGeneration/context.xml
index b92f380837..4698326c97 100644
--- a/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/ContainerMatcherTest/selectiveContainerGeneration/context.xml
+++ b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/ContainerMatcherTest/selectiveContainerGeneration/context.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="2.1">
+<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="3.0">
     <trigger id="trigger1" type="test" templateFolder="templates">
         <containerMatcher type="container" value="?" retrieveObjectsRecursively="false"/>
         <matcher type="or" value="?"/>
         <matcher type="not" value="?" accumulationType="NOT"/>
     </trigger>
+  <tags>
+    <tag name="bla" />
+  </tags>
 </contextConfiguration>
diff --git a/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/ContainerMatcherTest/templates/context.xml b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/ContainerMatcherTest/templates/context.xml
index 49fc78510e..eee5cfecf8 100644
--- a/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/ContainerMatcherTest/templates/context.xml
+++ b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/ContainerMatcherTest/templates/context.xml
@@ -1,17 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="2.1">
-    <trigger id="entities" type="mockplugin" templateFolder="testTemplates">
-        <containerMatcher type="package" value="(.+\.)?\.testdata" retrieveObjectsRecursively="false"/>
-        <matcher type="fqn" value="((.+\.)?)\.testdata\.([^\.]+)Entity">
-            <variableAssignment type="regex" key="rootPackage" value="1"/>
-            <variableAssignment type="regex" key="entityName" value="3"/>
-        </matcher>
-    </trigger>
-    <trigger id="entities2" type="mockplugin" templateFolder="testTemplates">
-        <containerMatcher type="package" value="(.+\.)?\.testdata" retrieveObjectsRecursively="false"/>
-        <matcher type="fqn" value="((.+\.)?)\.testdata\.([^\.]+)Entity">
-            <variableAssignment type="regex" key="rootPackage" value="1"/>
-            <variableAssignment type="regex" key="entityName" value="3"/>
-        </matcher>
-    </trigger>
-</contextConfiguration>
+<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="3.0">
+  <trigger id="entities" type="mockplugin" templateFolder="testTemplates">
+    <containerMatcher type="package" value="(.+\.)?\.testdata" retrieveObjectsRecursively="false" />
+    <matcher type="fqn" value="((.+\.)?)\.testdata\.([^\.]+)Entity">
+      <variableAssignment type="regex" key="rootPackage" value="1" />
+      <variableAssignment type="regex" key="entityName" value="3" />
+    </matcher>
+  </trigger>
+  <trigger id="entities2" type="mockplugin" templateFolder="testTemplates">
+    <containerMatcher type="package" value="(.+\.)?\.testdata" retrieveObjectsRecursively="false" />
+    <matcher type="fqn" value="((.+\.)?)\.testdata\.([^\.]+)Entity">
+      <variableAssignment type="regex" key="rootPackage" value="1" />
+      <variableAssignment type="regex" key="entityName" value="3" />
+    </matcher>
+  </trigger>
+  <tags>
+    <tag name="bla" />
+  </tags>
+</contextConfiguration>
\ No newline at end of file
diff --git a/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTest/externalIncrementGenerationException/context.xml b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTest/externalIncrementGenerationException/context.xml
index b83fddfd4b..9b0fbb2182 100644
--- a/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTest/externalIncrementGenerationException/context.xml
+++ b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTest/externalIncrementGenerationException/context.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="2.1">
+<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="3.0">
     <trigger id="external_incrementref" type="mockplugin" templateFolder="valid_external_incrementref">
         <matcher type="fqn" value="Whatever is still matched">
         </matcher>
@@ -8,4 +8,7 @@
         <matcher type="invalid" value="Whatever is still not matched">
         </matcher>
     </trigger>
+  <tags>
+    <tag name="bla" />
+  </tags>
 </contextConfiguration>
diff --git a/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTest/externalIncrementsGeneration/context.xml b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTest/externalIncrementsGeneration/context.xml
index bab90712bc..63e19bc8de 100644
--- a/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTest/externalIncrementsGeneration/context.xml
+++ b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTest/externalIncrementsGeneration/context.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="2.1">
+<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="3.0">
     <trigger id="valid_external_incrementref" type="mockplugin" templateFolder="valid_external_incrementref">
         <matcher type="fqn" value=".+">
         </matcher>
@@ -8,4 +8,7 @@
         <matcher type="fqn" value=".+">
         </matcher>
     </trigger>
+  <tags>
+    <tag name="bla" />
+  </tags>
 </contextConfiguration>
diff --git a/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTest/overrideMergeStrategy/context.xml b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTest/overrideMergeStrategy/context.xml
index 76db547ddc..5a6ff2c9b0 100644
--- a/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTest/overrideMergeStrategy/context.xml
+++ b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTest/overrideMergeStrategy/context.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="2.1">
+<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="3.0">
     <trigger id="entities" type="mockplugin" templateFolder="testTemplates">
         <matcher type="fqn" value=".+">
         </matcher>
     </trigger>
+    <trigger id="entities2" type="mockplugin" templateFolder="testTemplates2">
+        <matcher type="fqn" value=".+">
+        </matcher>
+    </trigger>
+  <tags>
+    <tag name="bla" />
+  </tags>
 </contextConfiguration>
diff --git a/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTest/overrideMergeStrategy/testTemplates2/generated.txt.ftl b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTest/overrideMergeStrategy/testTemplates2/generated.txt.ftl
new file mode 100644
index 0000000000..67c1a95c2d
--- /dev/null
+++ b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTest/overrideMergeStrategy/testTemplates2/generated.txt.ftl
@@ -0,0 +1 @@
+overwritten
\ No newline at end of file
diff --git a/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTest/overrideMergeStrategy/testTemplates2/templates.xml b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTest/overrideMergeStrategy/testTemplates2/templates.xml
new file mode 100644
index 0000000000..5179590c2b
--- /dev/null
+++ b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTest/overrideMergeStrategy/testTemplates2/templates.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<templatesConfiguration xmlns="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration" version="2.1">
+    <templates>
+        <template name="t2" destinationPath="generated.txt" templateFile="generated.txt.ftl" mergeStrategy="override"/>
+    </templates>
+    <increments>
+        <increment name="i2" description="the only increment">
+            <templateRef ref="t2"/>
+        </increment>
+    </increments>
+</templatesConfiguration>
diff --git a/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTest/variableAvailability/context.xml b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTest/variableAvailability/context.xml
index 9cfbfc81e3..bfb9ac9be1 100644
--- a/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTest/variableAvailability/context.xml
+++ b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTest/variableAvailability/context.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="2.1">
+<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="3.0">
     <trigger id="entities" type="mockplugin" templateFolder="testTemplates">
         <matcher type="fqn" value=".+">
-          <variableAssignment type="constant" key="contextVar" value="contextValue" /> 
+          <variableAssignment type="constant" key="contextVar" value="contextValue" />
         </matcher>
     </trigger>
+  <tags>
+    <tag name="bla" />
+  </tags>
 </contextConfiguration>
diff --git a/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTestTemplateSetsXml/template-sets-conflicted/adapted/template-test/template-set.xml b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTestTemplateSetsXml/template-sets-conflicted/adapted/template-test/template-set.xml
new file mode 100644
index 0000000000..736ccab654
--- /dev/null
+++ b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTestTemplateSetsXml/template-sets-conflicted/adapted/template-test/template-set.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<tns:templateSetConfiguration version="6.0"
+  xmlns:tns="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration"
+  xmlns:cc="http://capgemini.com/devonfw/cobigen/ContextConfiguration"
+  xmlns:tc="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration templateSetConfiguration.xsd ">
+  <cc:contextConfiguration version="3.0">
+    <cc:trigger id="entities" type="java">
+      <cc:matcher type="fqn" value=".+">
+      </cc:matcher>
+    </cc:trigger>
+    <cc:tags>
+      <cc:tag name="bla"/>
+    </cc:tags>
+  </cc:contextConfiguration>
+  <tc:templatesConfiguration version="5.0">
+    <tc:templates>
+      <tc:template name="t1" destinationPath="generated.txt" templateFile="generated.txt.ftl"
+        mergeStrategy="override"/>
+    </tc:templates>
+
+    <tc:increments>
+      <tc:increment name="i1" description="the only increment">
+        <tc:templateRef ref="t1"/>
+      </tc:increment>
+    </tc:increments>
+  </tc:templatesConfiguration>
+</tns:templateSetConfiguration>
diff --git a/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTestTemplateSetsXml/template-sets-conflicted/adapted/template-test/templates/generated.txt.ftl b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTestTemplateSetsXml/template-sets-conflicted/adapted/template-test/templates/generated.txt.ftl
new file mode 100644
index 0000000000..67c1a95c2d
--- /dev/null
+++ b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTestTemplateSetsXml/template-sets-conflicted/adapted/template-test/templates/generated.txt.ftl
@@ -0,0 +1 @@
+overwritten
\ No newline at end of file
diff --git a/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTestTemplateSetsXml/template-sets-conflicted/template-sets/adapted/template-test/pom.xml b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTestTemplateSetsXml/template-sets-conflicted/template-sets/adapted/template-test/pom.xml
new file mode 100644
index 0000000000..378cdec7c2
--- /dev/null
+++ b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTestTemplateSetsXml/template-sets-conflicted/template-sets/adapted/template-test/pom.xml
@@ -0,0 +1,12 @@
+<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>com.devonfw.test</groupId>
+  <artifactId>generation-conflict-test-1</artifactId>
+  <packaging>jar</packaging>
+  <version>dev-SNAPSHOT</version>
+  <properties>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
+  </properties>
+</project>
diff --git a/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTestTemplateSetsXml/template-sets-conflicted/template-sets/adapted/template-test/template-set.xml b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTestTemplateSetsXml/template-sets-conflicted/template-sets/adapted/template-test/template-set.xml
new file mode 100644
index 0000000000..736ccab654
--- /dev/null
+++ b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTestTemplateSetsXml/template-sets-conflicted/template-sets/adapted/template-test/template-set.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<tns:templateSetConfiguration version="6.0"
+  xmlns:tns="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration"
+  xmlns:cc="http://capgemini.com/devonfw/cobigen/ContextConfiguration"
+  xmlns:tc="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration templateSetConfiguration.xsd ">
+  <cc:contextConfiguration version="3.0">
+    <cc:trigger id="entities" type="java">
+      <cc:matcher type="fqn" value=".+">
+      </cc:matcher>
+    </cc:trigger>
+    <cc:tags>
+      <cc:tag name="bla"/>
+    </cc:tags>
+  </cc:contextConfiguration>
+  <tc:templatesConfiguration version="5.0">
+    <tc:templates>
+      <tc:template name="t1" destinationPath="generated.txt" templateFile="generated.txt.ftl"
+        mergeStrategy="override"/>
+    </tc:templates>
+
+    <tc:increments>
+      <tc:increment name="i1" description="the only increment">
+        <tc:templateRef ref="t1"/>
+      </tc:increment>
+    </tc:increments>
+  </tc:templatesConfiguration>
+</tns:templateSetConfiguration>
diff --git a/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTestTemplateSetsXml/template-sets-conflicted/template-sets/adapted/template-test/templates/generated.txt.ftl b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTestTemplateSetsXml/template-sets-conflicted/template-sets/adapted/template-test/templates/generated.txt.ftl
new file mode 100644
index 0000000000..67c1a95c2d
--- /dev/null
+++ b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTestTemplateSetsXml/template-sets-conflicted/template-sets/adapted/template-test/templates/generated.txt.ftl
@@ -0,0 +1 @@
+overwritten
\ No newline at end of file
diff --git a/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTestTemplateSetsXml/template-sets-conflicted/template-sets/downloaded/template-test.jar b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTestTemplateSetsXml/template-sets-conflicted/template-sets/downloaded/template-test.jar
new file mode 100644
index 0000000000..558675a890
Binary files /dev/null and b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTestTemplateSetsXml/template-sets-conflicted/template-sets/downloaded/template-test.jar differ
diff --git a/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTestTemplateSetsXml/template-sets/adapted/template-test/src/main/resources/template-set.xml b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTestTemplateSetsXml/template-sets/adapted/template-test/src/main/resources/template-set.xml
new file mode 100644
index 0000000000..bcc726d43b
--- /dev/null
+++ b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTestTemplateSetsXml/template-sets/adapted/template-test/src/main/resources/template-set.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<tns:templateSetConfiguration version="6.0"
+  xmlns:tns="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration"
+  xmlns:cc="http://capgemini.com/devonfw/cobigen/ContextConfiguration"
+  xmlns:tc="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration templateSetConfiguration.xsd ">
+  <cc:contextConfiguration version="3.0">
+    <cc:trigger id="entities" type="java">
+      <cc:matcher type="fqn" value=".+">
+      </cc:matcher>
+    </cc:trigger>
+    <cc:tags>
+      <cc:tag name="bla"/>
+    </cc:tags>
+  </cc:contextConfiguration>
+  <tc:templatesConfiguration version="5.0">
+    <tc:templates>
+      <tc:template name="t1" destinationPath="generated.txt" templateFile="templates/generated.txt.ftl"
+        mergeStrategy="override"/>
+    </tc:templates>
+
+    <tc:increments>
+      <tc:increment name="i1" description="the only increment">
+        <tc:templateRef ref="t1"/>
+      </tc:increment>
+    </tc:increments>
+  </tc:templatesConfiguration>
+</tns:templateSetConfiguration>
diff --git a/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTestTemplateSetsXml/template-sets/adapted/template-test/src/main/resources/templates/generated.txt.ftl b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTestTemplateSetsXml/template-sets/adapted/template-test/src/main/resources/templates/generated.txt.ftl
new file mode 100644
index 0000000000..67c1a95c2d
--- /dev/null
+++ b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTestTemplateSetsXml/template-sets/adapted/template-test/src/main/resources/templates/generated.txt.ftl
@@ -0,0 +1 @@
+overwritten
\ No newline at end of file
diff --git a/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTestTemplateSetsXml/template-sets/adapted/template-test2/src/main/resources/template-set.xml b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTestTemplateSetsXml/template-sets/adapted/template-test2/src/main/resources/template-set.xml
new file mode 100644
index 0000000000..071e9e6b4a
--- /dev/null
+++ b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTestTemplateSetsXml/template-sets/adapted/template-test2/src/main/resources/template-set.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<tns:templateSetConfiguration version="6.0"
+  xmlns:tns="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration"
+  xmlns:cc="http://capgemini.com/devonfw/cobigen/ContextConfiguration"
+  xmlns:tc="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration templateSetConfiguration.xsd ">
+  <cc:contextConfiguration version="3.0">
+    <cc:trigger id="entities2" type="openapi">
+      <cc:containerMatcher type="element" value="openAPIFile"/>
+        <cc:matcher type="element" value="EntityDef">
+          <cc:variableAssignment type="extension" key="rootPackage" value="x-rootpackage"/>
+          <cc:variableAssignment type="property" key="component" value="componentName"/>
+          <cc:variableAssignment type="property" key="entityName" value="name"/>
+        </cc:matcher>
+    </cc:trigger>
+    <cc:tags>
+      <cc:tag name="bla"/>
+    </cc:tags>
+  </cc:contextConfiguration>
+  <tc:templatesConfiguration version="5.0">
+    <tc:templates>
+      <tc:template name="t2" destinationPath="generated.txt" templateFile="templates/generated.txt.ftl"
+        mergeStrategy="override"/>
+    </tc:templates>
+
+    <tc:increments>
+      <tc:increment name="i2" description="the only increment">
+        <tc:templateRef ref="t2"/>
+      </tc:increment>
+    </tc:increments>
+  </tc:templatesConfiguration>
+</tns:templateSetConfiguration>
diff --git a/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTestTemplateSetsXml/template-sets/adapted/template-test2/src/main/resources/templates/generated.txt.ftl b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTestTemplateSetsXml/template-sets/adapted/template-test2/src/main/resources/templates/generated.txt.ftl
new file mode 100644
index 0000000000..67c1a95c2d
--- /dev/null
+++ b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTestTemplateSetsXml/template-sets/adapted/template-test2/src/main/resources/templates/generated.txt.ftl
@@ -0,0 +1 @@
+overwritten
\ No newline at end of file
diff --git a/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTestTemplateSetsXml/template-sets/adapted/template-testdata_builder/src/main/resources/ObjectBuilder.java.ftl b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTestTemplateSetsXml/template-sets/adapted/template-testdata_builder/src/main/resources/ObjectBuilder.java.ftl
new file mode 100644
index 0000000000..d6f54d2258
--- /dev/null
+++ b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTestTemplateSetsXml/template-sets/adapted/template-testdata_builder/src/main/resources/ObjectBuilder.java.ftl
@@ -0,0 +1,50 @@
+package ${variables.rootPackage}.common.builders;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.function.Consumer;
+
+import ${pojo.package}.${pojo.name};
+
+/**
+ * Test data builder for ${pojo.name} generated with cobigen.
+ */
+public class ${pojo.name}Builder {
+
+    private List<Consumer<${pojo.name}>> parameterToBeApplied;
+
+  /**
+   * The constructor.
+   */
+    public ${pojo.name}Builder() {
+    this.parameterToBeApplied = new LinkedList<>();
+    fillMandatoryFields();
+    fillMandatoryFields_custom();
+  }
+
+    <#list pojo.methodAccessibleFields as field>
+    <#if field.name != "id" && field.name != "modificationCounter">
+  /**
+   * @param ${field.name} the ${field.name} to add.
+   * @return the builder for fluent population of fields.
+   */
+  public ${pojo.name}Builder ${field.name}(final ${field.type} ${field.name}) {
+        this.parameterToBeApplied.add(target -> target.set${field.name?cap_first}(${field.name}));
+
+        return this;
+    }
+    </#if>
+    </#list>
+
+  /**
+   * @return the populated ${pojo.name}.
+   */
+    public ${pojo.name} createNew() {
+        ${pojo.name} ${pojo.name?lower_case} = new ${pojo.name}();
+        for (Consumer<${pojo.name}> parameter : parameterToBeApplied) {
+            parameter.accept(${pojo.name?lower_case});
+        }
+        return ${pojo.name?lower_case};
+    }
+
+}
\ No newline at end of file
diff --git a/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTestTemplateSetsXml/template-sets/adapted/template-testdata_builder/src/main/resources/template-set.xml b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTestTemplateSetsXml/template-sets/adapted/template-testdata_builder/src/main/resources/template-set.xml
new file mode 100644
index 0000000000..b2043a1157
--- /dev/null
+++ b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTestTemplateSetsXml/template-sets/adapted/template-testdata_builder/src/main/resources/template-set.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:templateSetConfiguration version="6.0"
+  xmlns:tns="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration"
+  xmlns:cc="http://capgemini.com/devonfw/cobigen/ContextConfiguration"
+  xmlns:tc="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration templateSetConfiguration.xsd ">
+  <cc:contextConfiguration version="3.0">
+    <cc:trigger id="testdata_builder" type="java">
+      <cc:containerMatcher type="package" value="((.+\.)?([^\.]+))\.([^\.]+)\.dataaccess\.api"
+        retrieveObjectsRecursively="false"/>
+      <cc:matcher type="fqn" value="((.+\.)?([^\.]+))\.([^\.]+)\.logic\.api\.to\.([^\.]+[E|C]to)">
+        <cc:variableAssignment type="regex" key="rootPackage" value="1"/>
+        <cc:variableAssignment type="regex" key="domain" value="3"/>
+        <cc:variableAssignment type="regex" key="component" value="4"/>
+        <cc:variableAssignment type="regex" key="pojoName" value="5"/>
+      </cc:matcher>
+    </cc:trigger>
+    <cc:tags>
+      <cc:tag name="TestData"></cc:tag>
+    </cc:tags>
+    <cc:links>
+      <cc:link url="url-test"></cc:link>
+    </cc:links>
+  </cc:contextConfiguration>
+  <tc:templatesConfiguration version="5.0">
+    <tc:templates>
+      <tc:template name="entityBuilder"
+        destinationPath="src/test/java/${variables.rootPackage}/common/api/builders/${variables.pojoName}Builder.java"
+        templateFile="ObjectBuilder.java.ftl" mergeStrategy="javamerge"/>
+    </tc:templates>
+    <tc:increments>
+      <tc:increment name="testdata_builder" description="Testdata builder"
+        explanation="Creates a builder pattern for POJOs (Plain Old Java Objects).">
+        <tc:templateRef ref="entityBuilder"/>
+      </tc:increment>
+    </tc:increments>
+  </tc:templatesConfiguration>
+</tns:templateSetConfiguration>
diff --git a/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTestTemplateSetsXml/template-sets/downloaded/downloaded1-test/pom.xml b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTestTemplateSetsXml/template-sets/downloaded/downloaded1-test/pom.xml
new file mode 100644
index 0000000000..9191475794
--- /dev/null
+++ b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTestTemplateSetsXml/template-sets/downloaded/downloaded1-test/pom.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+  xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.devonfw.test</groupId>
+  <artifactId>downloaded-template-set1-test</artifactId>
+  <version>test</version>
+  <packaging>jar</packaging>
+  <properties>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
+  </properties>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>2.3.1</version>
+        <configuration>
+          <outputDirectory>../../downloaded</outputDirectory>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>
\ No newline at end of file
diff --git a/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTestTemplateSetsXml/template-sets/downloaded/downloaded1-test/src/main/resources/template-set.xml b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTestTemplateSetsXml/template-sets/downloaded/downloaded1-test/src/main/resources/template-set.xml
new file mode 100644
index 0000000000..dd504103a8
--- /dev/null
+++ b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTestTemplateSetsXml/template-sets/downloaded/downloaded1-test/src/main/resources/template-set.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<tns:templateSetConfiguration version="6.0"
+  xmlns:tns="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration"
+  xmlns:cc="http://capgemini.com/devonfw/cobigen/ContextConfiguration"
+  xmlns:tc="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration templateSetConfiguration.xsd ">
+  <cc:contextConfiguration version="3.0">
+    <cc:trigger id="downloaded1" type="java">
+      <cc:matcher type="fqn" value=".+">
+      </cc:matcher>
+    </cc:trigger>
+    <cc:tags>
+      <cc:tag name="bla"/>
+    </cc:tags>
+  </cc:contextConfiguration>
+  <tc:templatesConfiguration version="5.0">
+    <tc:templates>
+      <tc:template name="d1" destinationPath="generated.txt" templateFile="templates/generated.txt.ftl"
+        mergeStrategy="override"/>
+    </tc:templates>
+
+    <tc:increments>
+      <tc:increment name="i5" description="the only increment">
+        <tc:templateRef ref="d1"/>
+      </tc:increment>
+    </tc:increments>
+  </tc:templatesConfiguration>
+</tns:templateSetConfiguration>
diff --git a/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTestTemplateSetsXml/template-sets/downloaded/downloaded1-test/src/main/resources/templates/generated.txt.ftl b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTestTemplateSetsXml/template-sets/downloaded/downloaded1-test/src/main/resources/templates/generated.txt.ftl
new file mode 100644
index 0000000000..67c1a95c2d
--- /dev/null
+++ b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTestTemplateSetsXml/template-sets/downloaded/downloaded1-test/src/main/resources/templates/generated.txt.ftl
@@ -0,0 +1 @@
+overwritten
\ No newline at end of file
diff --git a/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTestTemplateSetsXml/template-sets/downloaded/downloaded2-test/pom.xml b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTestTemplateSetsXml/template-sets/downloaded/downloaded2-test/pom.xml
new file mode 100644
index 0000000000..3790f94d40
--- /dev/null
+++ b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTestTemplateSetsXml/template-sets/downloaded/downloaded2-test/pom.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+  xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.devonfw.test</groupId>
+  <artifactId>downloaded-template-set2-test</artifactId>
+  <version>test</version>
+  <packaging>jar</packaging>
+  <properties>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
+  </properties>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>2.3.1</version>
+        <configuration>
+          <outputDirectory>../../downloaded</outputDirectory>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>
\ No newline at end of file
diff --git a/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTestTemplateSetsXml/template-sets/downloaded/downloaded2-test/src/main/resources/template-set.xml b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTestTemplateSetsXml/template-sets/downloaded/downloaded2-test/src/main/resources/template-set.xml
new file mode 100644
index 0000000000..3389e1e672
--- /dev/null
+++ b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTestTemplateSetsXml/template-sets/downloaded/downloaded2-test/src/main/resources/template-set.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<tns:templateSetConfiguration version="6.0"
+  xmlns:tns="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration"
+  xmlns:cc="http://capgemini.com/devonfw/cobigen/ContextConfiguration"
+  xmlns:tc="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration templateSetConfiguration.xsd ">
+  <cc:contextConfiguration version="3.0">
+    <cc:trigger id="downloaded2" type="java">
+      <cc:matcher type="fqn" value=".+">
+      </cc:matcher>
+    </cc:trigger>
+    <cc:tags>
+      <cc:tag name="bla"/>
+    </cc:tags>
+  </cc:contextConfiguration>
+  <tc:templatesConfiguration version="5.0">
+    <tc:templates>
+      <tc:template name="d2" destinationPath="generated.txt" templateFile="templates/generated.txt.ftl"
+        mergeStrategy="override"/>
+    </tc:templates>
+
+    <tc:increments>
+      <tc:increment name="i6" description="the only increment">
+        <tc:templateRef ref="d2"/>
+      </tc:increment>
+    </tc:increments>
+  </tc:templatesConfiguration>
+</tns:templateSetConfiguration>
diff --git a/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTestTemplateSetsXml/template-sets/downloaded/downloaded2-test/src/main/resources/templates/generated.txt.ftl b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTestTemplateSetsXml/template-sets/downloaded/downloaded2-test/src/main/resources/templates/generated.txt.ftl
new file mode 100644
index 0000000000..67c1a95c2d
--- /dev/null
+++ b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTestTemplateSetsXml/template-sets/downloaded/downloaded2-test/src/main/resources/templates/generated.txt.ftl
@@ -0,0 +1 @@
+overwritten
\ No newline at end of file
diff --git a/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/TemplateProcessingTest/template-sets/adapted/crud-java-server-app-complex/pom.xml b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/TemplateProcessingTest/template-sets/adapted/crud-java-server-app-complex/pom.xml
new file mode 100644
index 0000000000..3c69a2539d
--- /dev/null
+++ b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/TemplateProcessingTest/template-sets/adapted/crud-java-server-app-complex/pom.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+  xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.devonfw.test</groupId>
+  <artifactId>crud-java-server-app-complex</artifactId>
+  <version>1.0.0</version>
+  <packaging>jar</packaging>
+  <properties>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
+  </properties>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>2.3.1</version>
+        <configuration>
+          <outputDirectory>../../downloaded</outputDirectory>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-source-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>attach-sources</id>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <skipSource>${skip.deployment}</skipSource>
+          <outputDirectory>../../downloaded</outputDirectory>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-resources-plugin</artifactId>
+        <version>2.7</version>
+        <configuration>
+          <encoding>UTF-8</encoding>
+        </configuration>
+      </plugin>
+      <!-- Inject Maven Properties in java-templates source folder -->
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>templating-maven-plugin</artifactId>
+        <version>1.0.0</version>
+        <executions>
+          <execution>
+            <id>generate-maven-properties-class</id>
+            <goals>
+              <goal>filter-sources</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>prepare-package</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <tasks>
+                <echo>Integrate POM manually</echo>
+                <copy file="pom.xml" tofile="${project.build.outputDirectory}/pom.xml"/>
+              </tasks>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>
\ No newline at end of file
diff --git a/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/TemplateProcessingTest/template-sets/adapted/crud-java-server-app-complex/src/main/java/com/test.java b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/TemplateProcessingTest/template-sets/adapted/crud-java-server-app-complex/src/main/java/com/test.java
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/TemplateProcessingTest/template-sets/adapted/crud-java-server-app-complex/src/main/resources/functions.ftl b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/TemplateProcessingTest/template-sets/adapted/crud-java-server-app-complex/src/main/resources/functions.ftl
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/TemplateProcessingTest/template-sets/adapted/crud-java-server-app-complex/src/main/resources/template-set.xml b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/TemplateProcessingTest/template-sets/adapted/crud-java-server-app-complex/src/main/resources/template-set.xml
new file mode 100644
index 0000000000..5cfe219789
--- /dev/null
+++ b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/TemplateProcessingTest/template-sets/adapted/crud-java-server-app-complex/src/main/resources/template-set.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:templateSetConfiguration version="6.0" xmlns:tns="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration" xmlns:cc="http://capgemini.com/devonfw/cobigen/ContextConfiguration" xmlns:tc="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration templateSetConfiguration.xsd ">
+<cc:contextConfiguration version="3.0">
+  <cc:trigger id="crud_java_server_app_complex" type="java">
+    <cc:containerMatcher type="package" value="((.+\.)?([^\.]+))\.([^\.]+)\.dataaccess\.api" retrieveObjectsRecursively="false" />
+    <cc:matcher type="fqn" value="((.+\.)?([^\.]+))\.([^\.]+)\.dataaccess\.api\.([^\.]+)Entity">
+      <cc:variableAssignment type="regex" key="rootPackage" value="1" />
+      <cc:variableAssignment type="regex" key="domain" value="3" />
+      <cc:variableAssignment type="regex" key="component" value="4" />
+      <cc:variableAssignment type="regex" key="entityName" value="5" />
+    </cc:matcher>
+  </cc:trigger>
+  <cc:tags>
+    <cc:tag name="Java"></cc:tag>
+    <cc:tag name="CRUD"></cc:tag>
+    <cc:tag name="Server"></cc:tag>
+    <cc:tag name="App"></cc:tag>
+  </cc:tags>
+  <cc:links>
+    <cc:link url="https://docs.spring.io/spring-data/data-commons/docs/1.6.1.RELEASE/reference/html/repositories.html"></cc:link>
+  </cc:links>
+</cc:contextConfiguration>
+
+<tc:templatesConfiguration version="5.0">
+
+  <tc:templates>
+    <tc:templateExtension ref="${variables.entityName}Eto.java" mergeStrategy="javamerge"/>
+  </tc:templates>
+
+  <tc:templateScans>
+    <tc:templateScan name="ts_scan" templatePath="templates" destinationPath="" />
+  </tc:templateScans>
+
+  <tc:increments>
+    <tc:increment name="tos" description="TO's">
+      <tc:templateRef ref="${variables.entityName}Eto.java"/>
+    </tc:increment>
+  </tc:increments>
+</tc:templatesConfiguration>
+</tns:templateSetConfiguration>
\ No newline at end of file
diff --git a/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/TemplateProcessingTest/template-sets/adapted/crud-java-server-app-complex/src/main/resources/templates/java/${variables.rootPackage}/${variables.component}/logic/api/to/${variables.entityName}Eto.java.ftl b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/TemplateProcessingTest/template-sets/adapted/crud-java-server-app-complex/src/main/resources/templates/java/${variables.rootPackage}/${variables.component}/logic/api/to/${variables.entityName}Eto.java.ftl
new file mode 100644
index 0000000000..0c233890ea
--- /dev/null
+++ b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/TemplateProcessingTest/template-sets/adapted/crud-java-server-app-complex/src/main/resources/templates/java/${variables.rootPackage}/${variables.component}/logic/api/to/${variables.entityName}Eto.java.ftl
@@ -0,0 +1 @@
+package test;
\ No newline at end of file
diff --git a/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/TemplateProcessingTest/template-sets/adapted/crud-java-server-app/pom.xml b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/TemplateProcessingTest/template-sets/adapted/crud-java-server-app/pom.xml
new file mode 100644
index 0000000000..3558920d14
--- /dev/null
+++ b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/TemplateProcessingTest/template-sets/adapted/crud-java-server-app/pom.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+  xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.devonfw.test</groupId>
+  <artifactId>crud-java-server-app</artifactId>
+  <version>1.0.0</version>
+  <packaging>jar</packaging>
+  <properties>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
+  </properties>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>2.3.1</version>
+        <configuration>
+          <outputDirectory>../../downloaded</outputDirectory>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-source-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>attach-sources</id>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <skipSource>${skip.deployment}</skipSource>
+          <outputDirectory>../../downloaded</outputDirectory>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-resources-plugin</artifactId>
+        <version>2.7</version>
+        <configuration>
+          <encoding>UTF-8</encoding>
+        </configuration>
+      </plugin>
+      <!-- Inject Maven Properties in java-templates source folder -->
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>templating-maven-plugin</artifactId>
+        <version>1.0.0</version>
+        <executions>
+          <execution>
+            <id>generate-maven-properties-class</id>
+            <goals>
+              <goal>filter-sources</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>prepare-package</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <tasks>
+                <echo>Integrate POM manually</echo>
+                <copy file="pom.xml" tofile="${project.build.outputDirectory}/pom.xml"/>
+              </tasks>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>
\ No newline at end of file
diff --git a/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/TemplateProcessingTest/template-sets/adapted/crud-java-server-app/src/main/java/com/test.java b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/TemplateProcessingTest/template-sets/adapted/crud-java-server-app/src/main/java/com/test.java
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/TemplateProcessingTest/template-sets/adapted/crud-java-server-app/src/main/resources/functions.ftl b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/TemplateProcessingTest/template-sets/adapted/crud-java-server-app/src/main/resources/functions.ftl
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/TemplateProcessingTest/template-sets/adapted/crud-java-server-app/src/main/resources/template-set.xml b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/TemplateProcessingTest/template-sets/adapted/crud-java-server-app/src/main/resources/template-set.xml
new file mode 100644
index 0000000000..4515b452ec
--- /dev/null
+++ b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/TemplateProcessingTest/template-sets/adapted/crud-java-server-app/src/main/resources/template-set.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:templateSetConfiguration version="6.0" xmlns:tns="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration" xmlns:cc="http://capgemini.com/devonfw/cobigen/ContextConfiguration" xmlns:tc="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration templateSetConfiguration.xsd ">
+<cc:contextConfiguration version="3.0">
+  <cc:trigger id="crud_java_server_app" type="java">
+    <cc:containerMatcher type="package" value="((.+\.)?([^\.]+))\.([^\.]+)\.dataaccess\.api" retrieveObjectsRecursively="false" />
+    <cc:matcher type="fqn" value="((.+\.)?([^\.]+))\.([^\.]+)\.dataaccess\.api\.([^\.]+)Entity">
+      <cc:variableAssignment type="regex" key="rootPackage" value="1" />
+      <cc:variableAssignment type="regex" key="domain" value="3" />
+      <cc:variableAssignment type="regex" key="component" value="4" />
+      <cc:variableAssignment type="regex" key="entityName" value="5" />
+    </cc:matcher>
+  </cc:trigger>
+  <cc:tags>
+    <cc:tag name="Java"></cc:tag>
+    <cc:tag name="CRUD"></cc:tag>
+    <cc:tag name="Server"></cc:tag>
+    <cc:tag name="App"></cc:tag>
+  </cc:tags>
+  <cc:links>
+    <cc:link url="https://docs.spring.io/spring-data/data-commons/docs/1.6.1.RELEASE/reference/html/repositories.html"></cc:link>
+  </cc:links>
+</cc:contextConfiguration>
+
+<tc:templatesConfiguration version="5.0">
+
+  <tc:templates>
+    <tc:templateExtension ref="${variables.entityName}Eto.java" mergeStrategy="javamerge"/>
+  </tc:templates>
+
+  <tc:templateScans>
+    <tc:templateScan name="ts_scan" templatePath="templates" destinationPath="" />
+  </tc:templateScans>
+
+  <tc:increments>
+    <tc:increment name="tos" description="TO's">
+      <tc:templateRef ref="${variables.entityName}Eto.java"/>
+    </tc:increment>
+  </tc:increments>
+</tc:templatesConfiguration>
+</tns:templateSetConfiguration>
\ No newline at end of file
diff --git a/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/TemplateProcessingTest/template-sets/adapted/crud-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component}/logic/api/to/${variables.entityName}Eto.java.ftl b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/TemplateProcessingTest/template-sets/adapted/crud-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component}/logic/api/to/${variables.entityName}Eto.java.ftl
new file mode 100644
index 0000000000..0c233890ea
--- /dev/null
+++ b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/TemplateProcessingTest/template-sets/adapted/crud-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component}/logic/api/to/${variables.entityName}Eto.java.ftl
@@ -0,0 +1 @@
+package test;
\ No newline at end of file
diff --git a/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/TemplateScanTemplateSetTest/template-sets/adapted/template-set1/src/main/resources/template-set.xml b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/TemplateScanTemplateSetTest/template-sets/adapted/template-set1/src/main/resources/template-set.xml
new file mode 100644
index 0000000000..024b4f4fa0
--- /dev/null
+++ b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/TemplateScanTemplateSetTest/template-sets/adapted/template-set1/src/main/resources/template-set.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<tns:templateSetConfiguration version="6.0"
+  xmlns:tns="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration"
+  xmlns:cc="http://capgemini.com/devonfw/cobigen/ContextConfiguration"
+  xmlns:tc="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration templateSetConfiguration.xsd ">
+  <cc:contextConfiguration version="3.0">
+    <cc:trigger id="entities" type="java">
+      <cc:matcher type="fqn" value=".+">
+      </cc:matcher>
+    </cc:trigger>
+    <cc:tags>
+      <cc:tag name="bla"/>
+    </cc:tags>
+  </cc:contextConfiguration>
+  <tc:templatesConfiguration version="5.0">
+    <tc:templates>
+      <tc:template name="t1" destinationPath="generated.txt" templateFile="templates/generated.txt.ftl"
+        mergeStrategy="override"/>
+    </tc:templates>
+
+    <tc:templateScans>
+      <tc:templateScan templatePath="templates" destinationPath="src/main"/>
+    </tc:templateScans>
+
+    <tc:increments>
+      <tc:increment name="i1" description="the only increment">
+        <tc:templateRef ref="t1"/>
+      </tc:increment>
+    </tc:increments>
+  </tc:templatesConfiguration>
+</tns:templateSetConfiguration>
diff --git a/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/TemplateScanTemplateSetTest/template-sets/adapted/template-set1/src/main/resources/templates/generated.txt.ftl b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/TemplateScanTemplateSetTest/template-sets/adapted/template-set1/src/main/resources/templates/generated.txt.ftl
new file mode 100644
index 0000000000..67c1a95c2d
--- /dev/null
+++ b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/TemplateScanTemplateSetTest/template-sets/adapted/template-set1/src/main/resources/templates/generated.txt.ftl
@@ -0,0 +1 @@
+overwritten
\ No newline at end of file
diff --git a/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/TemplateScanTest/context.xml b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/TemplateScanTest/context.xml
index 06b863855f..8e452035c9 100644
--- a/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/TemplateScanTest/context.xml
+++ b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/TemplateScanTest/context.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="2.1">
+<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="3.0">
     <trigger id="entities" type="mockplugin" templateFolder="test">
         <containerMatcher type="package" value="(.+\.)?\.testdata" retrieveObjectsRecursively="false"/>
         <matcher type="fqn" value="((.+\.)?)\.testdata\.([^\.]+)Entity">
@@ -7,4 +7,7 @@
             <variableAssignment type="regex" key="entityName" value="3"/>
         </matcher>
     </trigger>
+  <tags>
+    <tag name="bla" />
+  </tags>
 </contextConfiguration>
diff --git a/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/TemplateScanTest/valid.zip b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/TemplateScanTest/valid.zip
index 4264badf87..6316c6c85f 100644
Binary files a/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/TemplateScanTest/valid.zip and b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/TemplateScanTest/valid.zip differ
diff --git a/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/TransactionalGenerationTest/templates/context.xml b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/TransactionalGenerationTest/templates/context.xml
index 76db547ddc..31f63127f8 100644
--- a/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/TransactionalGenerationTest/templates/context.xml
+++ b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/TransactionalGenerationTest/templates/context.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="2.1">
+<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="3.0">
     <trigger id="entities" type="mockplugin" templateFolder="testTemplates">
         <matcher type="fqn" value=".+">
         </matcher>
     </trigger>
+  <tags>
+    <tag name="bla" />
+  </tags>
 </contextConfiguration>
diff --git a/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/TriggerActivationTest/templates/context.xml b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/TriggerActivationTest/templates/context.xml
index cd22ff0587..6e5c5295df 100644
--- a/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/TriggerActivationTest/templates/context.xml
+++ b/cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/TriggerActivationTest/templates/context.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="2.1">
+<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="3.0">
     <trigger id="triggerId" type="test" templateFolder="*">
         <matcher type="and1" value="*" accumulationType="AND"/>
         <matcher type="and2" value="*" accumulationType="AND"/>
@@ -10,4 +10,7 @@
         <matcher type="or" value="*"/>
         <matcher type="not" value="*" accumulationType="NOT"/>
     </trigger>
+  <tags>
+    <tag name="bla" />
+  </tags>
 </contextConfiguration>
diff --git a/cobigen/cobigen-core-test/pom.xml b/cobigen/cobigen-core-test/pom.xml
index 93b2ed5a6d..23fe4b8e6b 100644
--- a/cobigen/cobigen-core-test/pom.xml
+++ b/cobigen/cobigen-core-test/pom.xml
@@ -54,4 +54,4 @@
       <version>4.1.1</version>
     </dependency>
   </dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/cobigen/cobigen-core/pom.xml b/cobigen/cobigen-core/pom.xml
index ae87e073c0..e97f0815a1 100644
--- a/cobigen/cobigen-core/pom.xml
+++ b/cobigen/cobigen-core/pom.xml
@@ -1,19 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-  xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>core</artifactId>
   <name>CobiGen Core</name>
   <packaging>jar</packaging>
-
   <parent>
     <groupId>com.devonfw.cobigen</groupId>
     <artifactId>core-parent</artifactId>
     <version>${revision}</version>
   </parent>
-
   <properties>
     <skip.deployment>false</skip.deployment>
+    <valid.templateset.test.path>src\test\resources\testdata\unittest\config\reader\TemplateSetConfigurationReaderTest\valid_template_sets\template-sets\downloaded\crud-java-server-app</valid.templateset.test.path>
+    <valid.templateset.downloaded.test.path>src\test\resources\testdata\unittest\config\reader\TemplateSetConfigurationReaderTest\valid_template_sets_downloaded\template-sets\downloaded\crud-java-server-app</valid.templateset.downloaded.test.path>
   </properties>
 
   <dependencies>
@@ -21,20 +20,21 @@
       <groupId>com.devonfw.cobigen</groupId>
       <artifactId>core-api</artifactId>
     </dependency>
-
+    <dependency>
+      <groupId>com.devonfw.cobigen</groupId>
+      <artifactId>core-artifact-retriever</artifactId>
+    </dependency>
     <dependency>
       <groupId>com.devonfw.cobigen</groupId>
       <artifactId>core-api</artifactId>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
-
     <dependency>
       <groupId>com.devonfw.cobigen</groupId>
       <artifactId>core-test</artifactId>
       <scope>test</scope>
     </dependency>
-
     <!-- Enables XPath for FreeMarker templates -->
     <dependency>
       <groupId>jaxen</groupId>
@@ -45,25 +45,12 @@
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
     </dependency>
-
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-    </dependency>
-
     <!-- enables XPath queries over object structures -->
     <dependency>
       <groupId>commons-jxpath</groupId>
       <artifactId>commons-jxpath</artifactId>
       <version>1.3</version>
     </dependency>
-
-    <dependency>
-      <groupId>net.sf.m-m-m</groupId>
-      <artifactId>mmm-util-core</artifactId>
-      <version>7.4.0</version>
-    </dependency>
-
     <!-- Needed for JDK 9+ -->
     <dependency>
       <groupId>jakarta.xml.bind</groupId>
@@ -78,14 +65,22 @@
       <artifactId>jaxb-impl</artifactId>
     </dependency>
     <!-- END JDK 9 -->
-
     <dependency>
-    <groupId>ma.glasnost.orika</groupId>
-    <artifactId>orika-core</artifactId>
-    <version>1.5.4</version>
-</dependency>
+      <groupId>ma.glasnost.orika</groupId>
+      <artifactId>orika-core</artifactId>
+      <version>1.5.4</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-model</artifactId>
+      <version>3.8.5</version>
+    </dependency>
+    <dependency>
+      <groupId>io.github.m-m-m</groupId>
+      <artifactId>mmm-base</artifactId>
+      <version>0.9.1</version>
+    </dependency>
   </dependencies>
-
   <build>
     <plugins>
       <!-- Inject Maven Properties in java-templates source folder -->
@@ -102,7 +97,6 @@
           </execution>
         </executions>
       </plugin>
-
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
@@ -112,12 +106,11 @@
           <excludePackageNames>com.devonfw.cobigen.impl.config.entity.io.v1_2</excludePackageNames>
           <excludePackageNames>com.devonfw.cobigen.impl.config.entity.io.v2_0</excludePackageNames>
           <excludePackageNames>com.devonfw.cobigen.impl.config.entity.io.v2_1</excludePackageNames>
-          <excludePackageNames>com.devonfw.cobigen.impl.config.entity.io.v2_2</excludePackageNames>
+          <excludePackageNames>com.devonfw.cobigen.impl.config.entity.io.v3.0</excludePackageNames>
           <excludePackageNames>com.devonfw.cobigen.impl.config.entity.io.v4_0</excludePackageNames>
           <excludePackageNames>com.devonfw.cobigen.impl.config.entity.io</excludePackageNames>
         </configuration>
       </plugin>
-
       <!-- Used for JUnit tests, we need to copy a test resources file to the jar -->
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
@@ -139,7 +132,6 @@
           </execution>
         </executions>
       </plugin>
-
       <!-- Generation of configuration beans -->
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
@@ -203,16 +195,16 @@
             </configuration>
           </execution>
           <execution>
-            <id>generate-v2.2-configuration</id>
+            <id>generate-v3.0-configuration</id>
             <phase>generate-sources</phase>
             <goals>
               <goal>xjc</goal>
             </goals>
             <configuration>
-              <packageName>com.devonfw.cobigen.impl.config.entity.io.v2_2</packageName>
-              <outputDirectory>${project.build.directory}/generated-sources/config/v2.2</outputDirectory>
+              <packageName>com.devonfw.cobigen.impl.config.entity.io.v3_0</packageName>
+              <outputDirectory>${project.build.directory}/generated-sources/config/v3_0</outputDirectory>
               <sources>
-                <source>${basedir}/src/main/resources/schema/v2.2</source>
+                <source>${basedir}/src/main/resources/schema/v3.0</source>
               </sources>
             </configuration>
           </execution>
@@ -230,6 +222,34 @@
               </sources>
             </configuration>
           </execution>
+          <execution>
+            <id>generate-v5.0-configuration</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>xjc</goal>
+            </goals>
+            <configuration>
+              <packageName>com.devonfw.cobigen.impl.config.entity.io.v5_0</packageName>
+              <outputDirectory>${project.build.directory}/generated-sources/config/v5.0</outputDirectory>
+              <sources>
+                <source>${basedir}/src/main/resources/schema/v5.0</source>
+              </sources>
+            </configuration>
+          </execution>
+          <execution>
+            <id>generate-v6.0-configuration</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>xjc</goal>
+            </goals>
+            <configuration>
+              <packageName>com.devonfw.cobigen.impl.config.entity.io.v6_0</packageName>
+              <outputDirectory>${project.build.directory}/generated-sources/config/v6.0</outputDirectory>
+              <sources>
+                <source>${basedir}/src/main/resources/schema/v6.0</source>
+              </sources>
+            </configuration>
+          </execution>
           <!-- Redundant generation due to stability reasons of the configuration upgrade mechanism -->
           <execution>
             <id>generate-current-configuration</id>
@@ -241,8 +261,7 @@
               <packageName>com.devonfw.cobigen.impl.config.entity.io</packageName>
               <outputDirectory>${project.build.directory}/generated-sources/config/current</outputDirectory>
               <sources>
-                <source>${basedir}/src/main/resources/schema/v2.2/contextConfiguration.xsd</source>
-                <source>${basedir}/src/main/resources/schema/v4.0/templatesConfiguration.xsd</source>
+                <source>${basedir}/src/main/resources/schema/v6.0/templateSetConfiguration.xsd</source>
               </sources>
             </configuration>
           </execution>
@@ -279,6 +298,51 @@
           </dependency>
         </dependencies>
       </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>exec-maven-plugin</artifactId>
+        <version>3.0.0</version>
+        <executions>
+          <execution>
+            <id>Install test valid template set test project</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>exec</goal>
+            </goals>
+            <configuration>
+              <executable>mvn</executable>
+              <workingDirectory>${valid.templateset.downloaded.test.path}</workingDirectory>
+              <arguments>
+                <argument>install</argument>
+                <!-- https://stackoverflow.com/a/66801171 -->
+                <argument>-Djansi.force=true</argument>
+                <argument>-Djansi.passthrough=true</argument>
+                <argument>-B</argument>
+                <argument>-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn</argument>
+              </arguments>
+            </configuration>
+          </execution>
+          <execution>
+            <id>Install valid downloaded template set project</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>exec</goal>
+            </goals>
+            <configuration>
+              <executable>mvn</executable>
+              <workingDirectory>${valid.templateset.test.path}</workingDirectory>
+              <arguments>
+                <argument>install</argument>
+                <!-- https://stackoverflow.com/a/66801171 -->
+                <argument>-Djansi.force=true</argument>
+                <argument>-Djansi.passthrough=true</argument>
+                <argument>-B</argument>
+                <argument>-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn</argument>
+              </arguments>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
-</project>
+</project>
\ No newline at end of file
diff --git a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/CobiGenFactory.java b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/CobiGenFactory.java
index 9721ef74c2..4c9d06eb2f 100644
--- a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/CobiGenFactory.java
+++ b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/CobiGenFactory.java
@@ -2,8 +2,9 @@
 
 import java.net.URI;
 import java.net.URL;
-import java.nio.file.DirectoryNotEmptyException;
 import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.List;
 import java.util.Objects;
 
 import org.slf4j.Logger;
@@ -11,17 +12,20 @@
 
 import com.devonfw.cobigen.api.CobiGen;
 import com.devonfw.cobigen.api.HealthCheck;
-import com.devonfw.cobigen.api.constants.ConfigurationConstants;
+import com.devonfw.cobigen.api.TemplateAdapter;
+import com.devonfw.cobigen.api.exception.DeprecatedMonolithicConfigurationException;
 import com.devonfw.cobigen.api.exception.InvalidConfigurationException;
-import com.devonfw.cobigen.api.util.CobiGenPaths;
+import com.devonfw.cobigen.api.util.TemplatesJarUtil;
+import com.devonfw.cobigen.impl.adapter.TemplateAdapterImpl;
 import com.devonfw.cobigen.impl.aop.BeanFactory;
 import com.devonfw.cobigen.impl.aop.ProxyFactory;
 import com.devonfw.cobigen.impl.config.ConfigurationHolder;
+import com.devonfw.cobigen.impl.config.ConfigurationProperties;
 import com.devonfw.cobigen.impl.extension.PluginRegistry;
 import com.devonfw.cobigen.impl.healthcheck.HealthCheckImpl;
 import com.devonfw.cobigen.impl.util.ConfigurationClassLoaderUtil;
 import com.devonfw.cobigen.impl.util.ConfigurationFinder;
-import com.devonfw.cobigen.impl.util.ExtractTemplatesUtil;
+import com.devonfw.cobigen.retriever.ArtifactRetriever;
 
 /**
  * CobiGen's Factory to create new instances of {@link CobiGen}.
@@ -57,6 +61,34 @@ public static CobiGen create(ClassLoader classloader) throws InvalidConfiguratio
    */
   public static CobiGen create(URI configFileOrFolder) throws InvalidConfigurationException {
 
+    return create(configFileOrFolder, false);
+  }
+
+  /**
+   * Creates a new {@link CobiGen} while searching a valid configuration at the given path
+   *
+   * @param configFileOrFolder the root folder containing the context.xml and all templates, configurations etc.
+   * @return a new instance of {@link CobiGen}
+   * @throws InvalidConfigurationException if the context configuration could not be read properly.
+   */
+  public static CobiGen create() throws InvalidConfigurationException {
+
+    return create(false);
+  }
+
+  /**
+   * Creates a new {@link CobiGen} while searching a valid configuration at the given path and also start downloading
+   * templates defined in the properties
+   *
+   * @param configFileOrFolder the root folder containing the context.xml and all templates, configurations etc.
+   * @param allowMonolithicConfiguration ignores deprecated monolithic template folder structure and if found does not
+   *        throw a DeprecatedMonolithicConfigurationException
+   * @return a new instance of {@link CobiGen}
+   * @throws InvalidConfigurationException if the context configuration could not be read properly.
+   */
+  public static CobiGen create(URI configFileOrFolder, boolean allowMonolithicConfiguration)
+      throws InvalidConfigurationException {
+
     Objects.requireNonNull(configFileOrFolder, "The URI pointing to the configuration could not be null.");
 
     ConfigurationHolder configurationHolder = new ConfigurationHolder(configFileOrFolder);
@@ -65,36 +97,43 @@ public static CobiGen create(URI configFileOrFolder) throws InvalidConfiguration
     CobiGen createBean = beanFactory.createBean(CobiGen.class);
     // Notifies all plugins of new template root path
     PluginRegistry.notifyPlugins(configurationHolder.getConfigurationPath());
+
+    if (!allowMonolithicConfiguration && !configurationHolder.isTemplateSetConfiguration()) {
+      throw new DeprecatedMonolithicConfigurationException(Paths.get(configFileOrFolder));
+    }
+    // install Template Sets defined in .properties file
+    if (configurationHolder.isTemplateSetConfiguration()) {
+      ConfigurationProperties config = configurationHolder.getConfigurationProperties();
+      // if installed template sets property was not empty, install found template sets
+      if (!config.getTemplateSetsInstalled().isEmpty()) {
+        Path templatesLocation = configurationHolder.getConfigurationPath();
+        List<String> downloadUrls = ArtifactRetriever.retrieveTemplateSetJarDownloadURLs(config.getGroupIds(),
+            config.getTemplateSetsInstalled());
+        for (String downloadUrl : downloadUrls) {
+          TemplatesJarUtil.downloadJarFromURL(downloadUrl, templatesLocation);
+        }
+      }
+    }
     return createBean;
   }
 
   /**
    * Creates a new {@link CobiGen}
    *
+   * @param allowMonolithicConfiguration ignores deprecated monolithic template folder structure and if found does not
+   *        throw a DeprecatedMonolithicConfigurationException
    * @return a new instance of {@link CobiGen}
    * @throws InvalidConfigurationException if the context configuration could not be read properly.
    */
-  public static CobiGen create() throws InvalidConfigurationException {
+  public static CobiGen create(boolean allowMonolithicConfiguration) throws InvalidConfigurationException {
 
     URI configFileOrFolder = ConfigurationFinder.findTemplatesLocation();
     if (configFileOrFolder == null) {
       throw new InvalidConfigurationException(
           "No valid templates can be found. Please configure your cobigen configuration file properly or place the templates in cobigen home directory. Creating CobiGen instance aborted.");
     }
-    return create(configFileOrFolder);
-  }
 
-  /**
-   * Extracts templates project to the given path
-   *
-   * @return path to have the templates extracted
-   * @throws DirectoryNotEmptyException if the directory is not empty
-   */
-  public static Path extractTemplates() throws DirectoryNotEmptyException {
-
-    Path templatesLocation = CobiGenPaths.getTemplatesFolderPath();
-    ExtractTemplatesUtil.extractTemplates(templatesLocation.resolve(ConfigurationConstants.COBIGEN_TEMPLATES), false);
-    return templatesLocation.resolve(ConfigurationConstants.COBIGEN_TEMPLATES);
+    return create(configFileOrFolder, allowMonolithicConfiguration);
   }
 
   /**
@@ -107,4 +146,15 @@ public static HealthCheck createHealthCheck() {
     return ProxyFactory.getProxy(new HealthCheckImpl());
   }
 
+  /**
+   * Upgrades the given template configuration.
+   *
+   * @param configurationPath path to the templates Configuration
+   * @return the new path to the new template-sets
+   */
+  public static Path startTemplatesUpgrader(Path configurationPath) {
+
+    TemplateAdapter templateAdapter = new TemplateAdapterImpl(configurationPath);
+    return templateAdapter.upgradeMonolithicTemplates(configurationPath);
+  }
 }
diff --git a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/adapter/TemplateAdapterImpl.java b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/adapter/TemplateAdapterImpl.java
new file mode 100644
index 0000000000..0f243f08d3
--- /dev/null
+++ b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/adapter/TemplateAdapterImpl.java
@@ -0,0 +1,435 @@
+package com.devonfw.cobigen.impl.adapter;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URI;
+import java.nio.file.DirectoryNotEmptyException;
+import java.nio.file.DirectoryStream;
+import java.nio.file.FileSystem;
+import java.nio.file.FileSystems;
+import java.nio.file.FileVisitResult;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.SimpleFileVisitor;
+import java.nio.file.StandardCopyOption;
+import java.nio.file.attribute.BasicFileAttributes;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+import org.apache.commons.io.FileUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.devonfw.cobigen.api.TemplateAdapter;
+import com.devonfw.cobigen.api.constants.BackupPolicy;
+import com.devonfw.cobigen.api.constants.ConfigurationConstants;
+import com.devonfw.cobigen.api.exception.CobiGenRuntimeException;
+import com.devonfw.cobigen.api.exception.TemplateSelectionForAdaptionException;
+import com.devonfw.cobigen.api.exception.UpgradeTemplatesNotificationException;
+import com.devonfw.cobigen.api.util.CobiGenPaths;
+import com.devonfw.cobigen.api.util.TemplatesJarUtil;
+import com.devonfw.cobigen.impl.config.constant.ContextConfigurationVersion;
+import com.devonfw.cobigen.impl.config.upgrade.AbstractConfigurationUpgrader;
+import com.devonfw.cobigen.impl.config.upgrade.ContextConfigurationUpgrader;
+import com.devonfw.cobigen.impl.util.ConfigurationFinder;
+import com.devonfw.cobigen.impl.util.FileSystemUtil;
+
+/**
+ * Implementation of {@link TemplateAdapter}. Provides methods for adapting template sets as well as the old monolithic
+ * template structure.
+ */
+public class TemplateAdapterImpl implements TemplateAdapter {
+  /** Logger instance. */
+  private static final Logger LOG = LoggerFactory.getLogger(TemplateAdapterImpl.class);
+
+  /** The parent location of the template. */
+  private Path templatesLocation;
+
+  /**
+   * Creates a new {@link TemplateAdapter} instance. The location of the templates if is not specified, so the location
+   * is searched by the core module itself. Or if specified, handles the adaption of templates at the given templates
+   * location.
+   *
+   * @param templatesLocation The {@link Path} of the location to search the templates for.
+   */
+  public TemplateAdapterImpl(Path templatesLocation) {
+
+    if (templatesLocation == null) {
+      URI templatesLocationPath = ConfigurationFinder.findTemplatesLocation();
+      if (Files.exists(Paths.get(templatesLocationPath))) {
+        this.templatesLocation = Paths.get(templatesLocationPath);
+        if (this.templatesLocation.getFileName().toString().contains(".jar")) {
+          this.templatesLocation = this.templatesLocation.getParent();
+        }
+      }
+    } else {
+      this.templatesLocation = templatesLocation;
+    }
+  }
+
+  @Override
+  public void adaptTemplates()
+      throws IOException, UpgradeTemplatesNotificationException, TemplateSelectionForAdaptionException {
+
+    if (isMonolithicTemplatesConfiguration()) {
+      Path destinationPath = this.templatesLocation.resolve(ConfigurationConstants.COBIGEN_TEMPLATES);
+      adaptMonolithicTemplates(destinationPath, false);
+      throw new UpgradeTemplatesNotificationException();
+    } else {
+      throw new TemplateSelectionForAdaptionException(getTemplateSetJars());
+    }
+  }
+
+  @Override
+  public void adaptTemplateSets(List<Path> templateSetJars, boolean forceOverride) throws IOException {
+
+    Path destinationPath = this.templatesLocation.resolve(ConfigurationConstants.ADAPTED_FOLDER);
+    adaptTemplateSets(templateSetJars, destinationPath, forceOverride);
+  }
+
+  @Override
+  public void adaptTemplateSets(List<Path> templateSetJars, Path destinationPath, boolean forceOverride)
+      throws IOException {
+
+    try {
+      processTemplateSetJars(templateSetJars, destinationPath, forceOverride);
+      LOG.info("Successfully extracted templates to @ {}", destinationPath);
+    } catch (IOException e) {
+      throw new CobiGenRuntimeException("Not able to extract templates to " + destinationPath, e);
+    }
+  }
+
+  /**
+   * Extracts a specified set of template jars to the specified target. The list is specified by the user in CLI or
+   * Eclipse module.
+   *
+   * @param templateSetJarsToAdapt A {@link List} of {@link Path} with the template jars to adapt.
+   * @param destinationPath The {@link Path} where the jars should be extracted to
+   * @param forceOverride Indicator whether an already adapted template set should be overridden
+   * @throws IOException If CobiGen is not able to extract the jar file to the destination folder
+   */
+  private void processTemplateSetJars(List<Path> templateSetJarsToAdapt, Path destinationPath, boolean forceOverride)
+      throws IOException {
+
+    for (Path templateSetJar : templateSetJarsToAdapt) {
+      LOG.debug("Processing jar file @ {}", templateSetJar);
+      String fileName = templateSetJar.getFileName().toString().replace(".jar", "");
+      Path destination = destinationPath.resolve(fileName);
+
+      boolean extract = false;
+      try {
+        extract = validatePaths(destination, forceOverride);
+      } catch (IOException e) {
+        LOG.info("Unable to extract template jar file to {}", destination);
+      }
+
+      if (extract) {
+        if (!isEmpty(destination) && forceOverride) {
+          LOG.info("Override the existing destination folder {}", destination);
+          deleteDirectoryRecursively(destination);
+        }
+
+        Path resourcesDestinationPath = destination.resolve(ConfigurationConstants.MAVEN_CONFIGURATION_RESOURCE_FOLDER);
+        // extract sources jar to target directory
+        String sourcesFileName = templateSetJar.getFileName().toString().replace(".jar", "-sources.jar");
+
+        extractArchive(templateSetJar.getParent().resolve(sourcesFileName), resourcesDestinationPath);
+
+        // delete META-INF folder
+        if (resourcesDestinationPath.resolve("META-INF").toFile().exists()) {
+          FileUtils.deleteDirectory(resourcesDestinationPath.resolve("META-INF").toFile());
+        }
+
+        // create src/main/java directory
+        Files.createDirectories(destination.resolve("src/main/java"));
+
+        // move com folder to src/main/java/com
+        Files.move(resourcesDestinationPath.resolve("com"), destination.resolve("src/main/java/com"),
+            StandardCopyOption.REPLACE_EXISTING);
+
+        URI zipFile = URI.create("jar:file:" + templateSetJar.toUri().getPath());
+        try (FileSystem fs = FileSystemUtil.getOrCreateFileSystem(zipFile)) {
+          Files.copy(fs.getPath("pom.xml"), destination.resolve("pom.xml"), StandardCopyOption.REPLACE_EXISTING);
+        }
+
+      }
+    }
+  }
+
+  @Override
+  public void adaptMonolithicTemplates(boolean forceOverride) throws IOException {
+
+    Path destinationPath = this.templatesLocation.resolve(ConfigurationConstants.COBIGEN_TEMPLATES);
+    this.adaptMonolithicTemplates(destinationPath, forceOverride);
+  }
+
+  @Override
+  public void adaptMonolithicTemplates(Path destinationPath, boolean forceOverride) throws IOException {
+
+    if (validatePaths(destinationPath, forceOverride)) {
+      try {
+        extractMonolithicJar(destinationPath, forceOverride);
+      } catch (IOException e) {
+        throw new CobiGenRuntimeException("Not able to extract monolithic templates to " + destinationPath, e);
+      }
+    }
+  }
+
+  /**
+   * Unpacks the source CobiGen_Templates Jar and creates a new CobiGen_Templates folder structure at
+   * $destinationPath/CobiGen_Templates location
+   *
+   * @param destinationPath path to be used as target directory
+   * @throws IOException if no destination path could be set
+   *
+   */
+  private void extractMonolithicJar(Path destinationPath, boolean forceOverride) throws IOException {
+
+    if (!isEmpty(destinationPath) && forceOverride) {
+      LOG.info("Override the existing destination folder {}", destinationPath);
+      deleteDirectoryRecursively(destinationPath);
+    }
+    Path sourcesJarPath = TemplatesJarUtil.getJarFile(true, this.templatesLocation);
+    Path classesJarPath = TemplatesJarUtil.getJarFile(false, this.templatesLocation);
+    if (sourcesJarPath == null && classesJarPath == null) {
+      LOG.info("No monolithic jar found in {}!", this.templatesLocation);
+      return;
+    }
+    LOG.debug("Processing jar file @ {}", sourcesJarPath);
+    // extract sources jar to target directory
+    extractArchive(sourcesJarPath, destinationPath);
+    // create src/main/java directory
+    Files.createDirectory(destinationPath.resolve("src/main/java"));
+    // move com folder to src/main/java/com
+    Files.move(destinationPath.resolve("com"), destinationPath.resolve("src/main/java/com"),
+        StandardCopyOption.REPLACE_EXISTING);
+    // create src/main/resources directory
+    Files.createDirectory(destinationPath.resolve("src/main/resources"));
+    // move META-INF folder to src/main/resources
+    Files.move(destinationPath.resolve("META-INF"), destinationPath.resolve("src/main/resources/META-INF"),
+        StandardCopyOption.REPLACE_EXISTING);
+    // delete MANIFEST.MF
+    Files.deleteIfExists(destinationPath.resolve("src/main/resources/META-INF/MANIFEST.MF"));
+    URI zipFile = URI.create("jar:file:" + classesJarPath.toUri().getPath());
+    // extract classes jar pom.xml
+    try (FileSystem fs = FileSystemUtil.getOrCreateFileSystem(zipFile)) {
+      Files.copy(fs.getPath("pom.xml"), destinationPath.resolve("pom.xml"), StandardCopyOption.REPLACE_EXISTING);
+    }
+    LOG.info("Successfully extracted templates to @ {}", destinationPath);
+  }
+
+  @Override
+  public List<Path> getTemplateSetJars() {
+
+    List<Path> resultJars = new ArrayList<>();
+
+    Path downloadedJarsFolder = this.templatesLocation.resolve(ConfigurationConstants.DOWNLOADED_FOLDER);
+    if (!Files.exists(downloadedJarsFolder)) {
+      LOG.info("No template set jars found. Folder {} does not exist.", downloadedJarsFolder);
+      return resultJars;
+    }
+
+    List<Path> JarFiles = TemplatesJarUtil.getJarFiles(downloadedJarsFolder);
+    Map<Boolean, List<Path>> jarMap = JarFiles.stream()
+        .collect(Collectors.partitioningBy(f -> f.getFileName().toString().contains("-sources.jar")));
+    List<Path> templateSetJars = jarMap.get(false);
+    List<Path> templateSetJarsSources = jarMap.get(true);
+
+    for (Path templateSetjar : templateSetJars) {
+      String fileName = templateSetjar.getFileName().toString().replace(".jar", "");
+      Iterator<Path> sourcesJarsIterator = templateSetJarsSources.iterator();
+      while (sourcesJarsIterator.hasNext()) {
+        if (sourcesJarsIterator.next().getFileName().toString().contains(fileName)) {
+          sourcesJarsIterator.remove();
+          resultJars.add(templateSetjar);
+          break;
+        }
+      }
+    }
+
+    templateSetJars.removeAll(resultJars);
+    if (!templateSetJars.isEmpty()) {
+      for (Path jarWithMissingSource : templateSetJars) {
+        LOG.error("Missing Source for Jar: " + jarWithMissingSource.getFileName());
+        // no matching source file found either download or handle somehow
+        // TODO throw Exception or download the missing source, see: https://github.com/devonfw/cobigen/issues/1671
+      }
+    }
+    return resultJars;
+  }
+
+  @Override
+  public boolean isMonolithicTemplatesConfiguration() {
+
+    if (this.templatesLocation != null
+        && this.templatesLocation.getFileName().endsWith(ConfigurationConstants.TEMPLATE_SETS_FOLDER)) {
+      return false;
+    }
+    return true;
+  }
+
+  /**
+   * Get the location to load the templates from.
+   *
+   * @return templatesLocation The {@link Path} where the templates are located.
+   */
+  @Override
+  public Path getTemplatesLocation() {
+
+    return this.templatesLocation;
+  }
+
+  @Override
+  public boolean isTemplateSetAlreadyAdapted(Path templateSetJar) {
+
+    if (templateSetJar != null && Files.exists(templateSetJar)) {
+      Path adaptedFolder = this.templatesLocation.resolve(ConfigurationConstants.ADAPTED_FOLDER);
+      if (Files.exists(adaptedFolder)
+          && Files.exists(adaptedFolder.resolve(templateSetJar.getFileName().toString().replace(".jar", "")))) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  /**
+   * Extracts an archive as is to a target directory while keeping its folder structure
+   *
+   * @param sourcePath Path of the archive to unpack
+   * @param targetPath Path of the target directory to unpack the source archive to
+   * @throws IOException if an error occurred while processing the jar or its target directory
+   */
+  private void extractArchive(Path sourcePath, Path targetPath) throws IOException {
+
+    if (FileSystemUtil.isZipFile(sourcePath.toUri())) {
+      // Important cast for jdk 17 compatibility
+      FileSystem fs = FileSystems.newFileSystem(sourcePath, (ClassLoader) null);
+      Path path = fs.getPath("/");
+      Files.walkFileTree(path, new SimpleFileVisitor<Path>() {
+        @Override
+        public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
+
+          Path relativePath = path.relativize(file);
+          Path targetPathResolved = targetPath.resolve(relativePath.toString());
+          Files.deleteIfExists(targetPathResolved);
+          Files.createDirectories(targetPathResolved.getParent());
+          Files.copy(file, targetPathResolved);
+          return FileVisitResult.CONTINUE;
+        }
+
+        @Override
+        public FileVisitResult visitFileFailed(Path file, IOException exc) throws IOException {
+
+          // Log errors but do not throw an exception
+          LOG.warn("An IOException occurred while reading a file on path {} with message: {}", file, exc.getMessage());
+          LOG.debug("An IOException occurred while reading a file on path {} with message: {}", file,
+              LOG.isDebugEnabled() ? exc : null);
+          return FileVisitResult.CONTINUE;
+        }
+      });
+    } else {
+      LOG.info("Source path is not a ZIP file {}", sourcePath);
+    }
+  }
+
+  /**
+   * Validates the given source and destination paths.
+   *
+   * @param destinationPath The {@link Path} to adapt the template into
+   * @param forceOverride Indicator if already adapted templates should be overridden
+   * @return Returns {@code true} the path are valid and the templates can be extracted to the given path
+   * @throws IOException
+   */
+  private boolean validatePaths(Path destinationPath, boolean forceOverride) throws IOException {
+
+    Objects.requireNonNull(this.templatesLocation, "Templates location cannot be null");
+    Objects.requireNonNull(destinationPath, "Destination path cannot be null");
+    if (!Files.exists(this.templatesLocation)) {
+      LOG.info("Templates location {} does not exist.", this.templatesLocation);
+      return false;
+    }
+    if (!Files.isDirectory(destinationPath)) {
+      try {
+        Files.createDirectories(destinationPath);
+      } catch (IOException e) {
+        throw new CobiGenRuntimeException("Unable to create directory " + destinationPath);
+      }
+    }
+    if (!isEmpty(destinationPath) && !forceOverride) {
+      throw new DirectoryNotEmptyException(destinationPath.toString());
+    }
+    return true;
+  }
+
+  /**
+   * Deletes a directory and its sub directories recursively
+   *
+   * @param pathToBeDeleted the directory which should be deleted recursively
+   * @throws IOException if the file could not be deleted
+   */
+  private void deleteDirectoryRecursively(Path pathToBeDeleted) throws IOException {
+
+    Files.walk(pathToBeDeleted).sorted(Comparator.reverseOrder()).map(Path::toFile).forEach(File::delete);
+  }
+
+  /**
+   * Check if directory is empty
+   *
+   * @param directory to be checked
+   * @return <code>true</code> if is empty, <code>false</code> otherwise
+   * @throws IOException in case the directory could not be read
+   */
+  private boolean isEmpty(final Path directory) throws IOException {
+
+    try (DirectoryStream<Path> dirStream = Files.newDirectoryStream(directory)) {
+      return !dirStream.iterator().hasNext();
+    }
+  }
+
+  @Override
+  public Path upgradeMonolithicTemplates(Path templatesProject) {
+
+    Path templatesPath = null;
+    Path CobigenTemplates;
+    if (templatesProject != null) {
+      CobigenTemplates = CobiGenPaths.getPomLocation(templatesProject);
+      templatesPath = FileSystemUtil.createFileSystemDependentPath(CobigenTemplates.toUri());
+    } else {
+      templatesPath = FileSystemUtil.createFileSystemDependentPath(ConfigurationFinder.findTemplatesLocation());
+      CobigenTemplates = CobiGenPaths.getPomLocation(templatesPath);
+    }
+    AbstractConfigurationUpgrader<ContextConfigurationVersion> contextUpgraderObject = new ContextConfigurationUpgrader();
+    // Upgrade the context.xml to the new template-set with latest version
+    // TODO: Check if this can be optimized, see: https://github.com/devonfw/cobigen/issues/1676
+    contextUpgraderObject.upgradeConfigurationToLatestVersion(templatesPath, BackupPolicy.NO_BACKUP);
+    LOG.info("context.xml upgraded successfully. {}", templatesPath);
+    LOG.info("Templates successfully upgraded. \n ");
+    // check the new Path to the template-set after the upgrade
+    Path newTemplates;
+    if (templatesProject == null) {
+      // 1. check in .cobigen Home
+      // No need to check renaming in Home folder since we only have two templates folders:
+      // templates and templates-set
+      newTemplates = Paths.get(ConfigurationFinder.findTemplatesLocation());
+    } else {
+      // 2. otherwise check in the given customTemplates
+      // check renaming
+      // 2.1 renaming from CobiGen_Templates to template-sets occurred
+      if (Files.exists(CobigenTemplates.getParent().resolve(ConfigurationConstants.TEMPLATE_SETS_FOLDER)))
+        newTemplates = CobigenTemplates.getParent().resolve(ConfigurationConstants.TEMPLATE_SETS_FOLDER);
+      else {
+        // 2.2 Renaming from templates to template-sets occurred
+        newTemplates = CobigenTemplates.getParent().getParent().resolve(ConfigurationConstants.TEMPLATE_SETS_FOLDER)
+            .resolve(ConfigurationConstants.ADAPTED_FOLDER);
+      }
+    }
+    LOG.info("New templates location: {} ", newTemplates);
+    return newTemplates;
+  }
+}
\ No newline at end of file
diff --git a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/aop/BeanFactory.java b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/aop/BeanFactory.java
index 283687eb5a..9c7b05e681 100644
--- a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/aop/BeanFactory.java
+++ b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/aop/BeanFactory.java
@@ -15,7 +15,6 @@
 import com.devonfw.cobigen.impl.generator.InputResolverImpl;
 import com.devonfw.cobigen.impl.generator.MatcherEvaluatorImpl;
 import com.devonfw.cobigen.impl.generator.TriggerMatchingEvaluatorImpl;
-import com.google.common.collect.Lists;
 
 /**
  * AOP factory with a specific simple scope to not introduce any heavy weight frameworks and make separation of concerns
@@ -24,7 +23,7 @@
 public class BeanFactory {
 
   /** Pre-configure known beans to be injectable to prevent from performance issues */
-  private static final List<Class<?>> KNOWN_BEANS = Lists.newArrayList(ConfigurationInterpreterImpl.class,
+  private static final List<Class<?>> KNOWN_BEANS = List.of(ConfigurationInterpreterImpl.class,
       GenerationProcessorImpl.class, InputInterpreterImpl.class, MatcherEvaluatorImpl.class, InputResolverImpl.class,
       TriggerMatchingEvaluatorImpl.class, CobiGenImpl.class);
 
diff --git a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/aop/ProxyFactory.java b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/aop/ProxyFactory.java
index 03f68e0162..524dbe9da3 100644
--- a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/aop/ProxyFactory.java
+++ b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/aop/ProxyFactory.java
@@ -3,6 +3,7 @@
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
@@ -14,7 +15,6 @@
 import com.devonfw.cobigen.api.annotation.Cached;
 import com.devonfw.cobigen.api.annotation.ExceptionFacade;
 import com.devonfw.cobigen.api.exception.CobiGenRuntimeException;
-import com.google.common.collect.Maps;
 
 /**
  * A factory for creating Proxy objects.
@@ -35,7 +35,7 @@ public final class ProxyFactory {
   private static Map<Object, Object> _cache = new WeakHashMap<>();
 
   static {
-    annotationToInterceptorMap = Maps.newHashMap();
+    annotationToInterceptorMap = new HashMap<>();
     annotationToInterceptorMap.put(Cached.class.getCanonicalName(), CachedInterceptor.class);
     annotationToInterceptorMap.put(ExceptionFacade.class.getCanonicalName(), ExceptionFacadeInterceptor.class);
   }
diff --git a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/ConfigurationHolder.java b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/ConfigurationHolder.java
index 2e114c864d..ef7e988132 100644
--- a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/ConfigurationHolder.java
+++ b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/ConfigurationHolder.java
@@ -3,11 +3,19 @@
 import java.net.URI;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.devonfw.cobigen.api.constants.ConfigurationConstants;
 import com.devonfw.cobigen.api.exception.InvalidConfigurationException;
+import com.devonfw.cobigen.api.util.CobiGenPaths;
 import com.devonfw.cobigen.impl.config.entity.Trigger;
 import com.devonfw.cobigen.impl.extension.PluginRegistry;
+import com.devonfw.cobigen.impl.util.ConfigurationFinder;
 import com.devonfw.cobigen.impl.util.FileSystemUtil;
 import com.google.common.collect.Maps;
 
@@ -16,18 +24,27 @@
  */
 public class ConfigurationHolder {
 
-  /** Cached templates configurations. Configuration File URI -> Trigger ID -> configuration instance */
-  private Map<Path, Map<String, TemplatesConfiguration>> templatesConfigurations = Maps.newHashMap();
+  /** Logger instance */
+  private static final Logger LOG = LoggerFactory.getLogger(ConfigurationHolder.class);
+
+  /** Cached templates configurations. Trigger ID -> Configuration File URI -> configuration instance */
+  private Map<String, Map<Path, TemplatesConfiguration>> templatesConfigurations = Maps.newHashMap();
 
   /** Cached context configuration */
   private ContextConfiguration contextConfiguration;
 
+  /** Cached templateSet configuration */
+  private TemplateSetConfiguration templateSetConfiguration;
+
   /** Root path of the configuration */
   private Path configurationPath;
 
   /** The OS filesystem path of the configuration */
   private URI configurationLocation;
 
+  /** Location where the properties are saved */
+  private ConfigurationProperties configurationProperties;
+
   /**
    * Creates a new {@link ConfigurationHolder} which serves as a cache for CobiGen's external configuration.
    *
@@ -35,12 +52,31 @@ public class ConfigurationHolder {
    */
   public ConfigurationHolder(URI configurationLocation) {
 
-    this.configurationPath = FileSystemUtil.createFileSystemDependentPath(configurationLocation);
     this.configurationLocation = configurationLocation;
+    this.configurationPath = FileSystemUtil.createFileSystemDependentPath(configurationLocation);
+    this.configurationProperties = ConfigurationFinder.retrieveCobiGenProperties(
+        CobiGenPaths.getCobiGenHomePath().resolve(ConfigurationConstants.COBIGEN_CONFIG_FILE));
+
     // updates the root template path and informs all of its observers
     PluginRegistry.notifyPlugins(this.configurationPath);
   }
 
+  /**
+   * @return templateSetConfiguration
+   */
+  public TemplateSetConfiguration getTemplateSetConfiguration() {
+
+    return this.templateSetConfiguration;
+  }
+
+  /**
+   * @return configurationProperties
+   */
+  public ConfigurationProperties getConfigurationProperties() {
+
+    return this.configurationProperties;
+  }
+
   /**
    * @return <code>true</code> if the configuration is based in a JAR file
    */
@@ -75,15 +111,42 @@ public Path getConfigurationPath() {
    */
   public TemplatesConfiguration readTemplatesConfiguration(Trigger trigger) {
 
+    Path configRoot = readContextConfiguration().retrieveConfigRootByTrigger(trigger.getId());
     Path templateFolder = Paths.get(trigger.getTemplateFolder());
-    if (!this.templatesConfigurations.containsKey(templateFolder)) {
-      this.templatesConfigurations.put(templateFolder, Maps.<String, TemplatesConfiguration> newHashMap());
 
-      TemplatesConfiguration config = new TemplatesConfiguration(this.configurationPath, trigger, this);
-      this.templatesConfigurations.get(templateFolder).put(trigger.getId(), config);
+    if (!this.templatesConfigurations.containsKey(trigger.getId())) {
+
+      TemplatesConfiguration config;
+
+      if (isTemplateSetConfiguration()) {
+
+        List<TemplatesConfiguration> templatesConfigurations = getTemplateSetConfiguration()
+            .getTemplatesConfigurations();
+
+        for (TemplatesConfiguration configurations : templatesConfigurations) {
+          Trigger localTrigger = configurations.getTrigger();
+          if (localTrigger.equals(trigger)) {
+            return configurations;
+          }
+        }
+
+      }
+      config = new TemplatesConfiguration(configRoot, trigger, this);
+
+      this.templatesConfigurations.put(trigger.getId(), Maps.<Path, TemplatesConfiguration> newHashMap());
+
+      this.templatesConfigurations.get(trigger.getId()).put(templateFolder, config);
     }
 
-    return this.templatesConfigurations.get(templateFolder).get(trigger.getId());
+    return this.templatesConfigurations.get(trigger.getId()).get(templateFolder);
+  }
+
+  /**
+   * @return templatesConfigurations
+   */
+  public Map<String, Map<Path, TemplatesConfiguration>> getTemplatesConfigurations() {
+
+    return this.templatesConfigurations;
   }
 
   /**
@@ -95,8 +158,75 @@ public TemplatesConfiguration readTemplatesConfiguration(Trigger trigger) {
   public ContextConfiguration readContextConfiguration() {
 
     if (this.contextConfiguration == null) {
-      this.contextConfiguration = new ContextConfiguration(this.configurationPath);
+      if (isTemplateSetConfiguration()) {
+        if (this.templateSetConfiguration == null) {
+          this.templateSetConfiguration = new TemplateSetConfiguration(this.configurationPath);
+
+        }
+        return new ContextConfiguration(
+            this.templateSetConfiguration.getTemplateSetConfigurationReader().getContextConfiguration(),
+            this.configurationPath, this, this.templateSetConfiguration.getTriggers());
+
+      } else {
+
+        this.contextConfiguration = new ContextConfiguration(this.configurationPath);
+      }
     }
+
     return this.contextConfiguration;
   }
+
+  /**
+   * Checks if this this a template set configuration or a templates configuration (true if templateSetConfiguraion)
+   *
+   * @return true if the template folder structure consists of template sets or false if the monolithic structure is
+   *         used.
+   */
+  public boolean isTemplateSetConfiguration() {
+
+    // TODO: Replace with a better logic for template set detection later f.e. groupid, see:
+    // https://github.com/devonfw/cobigen/issues/1660
+    if (this.configurationPath.toUri().getScheme().equals("jar")
+        || !this.configurationPath.getFileName().toString().equals(ConfigurationConstants.TEMPLATE_SETS_FOLDER)) {
+      return false;
+    }
+    return true;
+
+  }
+
+  /**
+   * Search for the location of the Java utils
+   *
+   * @return the {@link Path} of the location of the util classes or null if no location was found
+   */
+  public List<Path> getUtilsLocation() {
+
+    List<Path> utilsLocationPaths = new ArrayList<>();
+    if (isTemplateSetConfiguration()) {
+      List<Trigger> triggers = readContextConfiguration().getTriggers();
+
+      for (Trigger trigger : triggers) {
+        Path configLocation = readContextConfiguration().retrieveTemplateSetUtilsLocationByTrigger(trigger.getId());
+        utilsLocationPaths.add(configLocation);
+      }
+    } else {
+      utilsLocationPaths.add(Paths.get(this.configurationLocation));
+    }
+
+    return utilsLocationPaths;
+  }
+
+  /**
+   * Retrieves a template set configuration within a map of template sets by its template set folder path
+   *
+   * @param templateSetConfigurations Cached templateSet configurations
+   * @param templateSetFolder folder where to get the specific configuration from
+   * @return the {@link TemplateSetConfiguration} instance saved in the given map
+   */
+  public TemplateSetConfiguration retrieveTemplateSetConfiguration(
+      Map<Path, TemplateSetConfiguration> templateSetConfigurations, Path templateSetFolder) {
+
+    return templateSetConfigurations.get(templateSetFolder);
+  }
+
 }
diff --git a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/ConfigurationProperties.java b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/ConfigurationProperties.java
new file mode 100644
index 0000000000..28c3a2bf61
--- /dev/null
+++ b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/ConfigurationProperties.java
@@ -0,0 +1,122 @@
+package com.devonfw.cobigen.impl.config;
+
+import java.util.List;
+
+import com.devonfw.cobigen.api.util.MavenCoordinate;
+
+/**
+ * Data wrapper for configuration Properties. The properties are groupIds, hideTemplates, allowSnapshots and
+ * templateSetsInstalled
+ */
+public class ConfigurationProperties {
+
+  /** variable for template-set artifacts */
+  private List<String> groupIds;
+
+  /** allow snapshots of template-sets */
+  private boolean allowSnapshots;
+
+  /** List of mavenCoordinates for the template sets that should be installed at CobiGen startup */
+  private List<MavenCoordinate> templateSetsInstalled;
+
+  /** variable to hide very specific template sets or versions of template sets */
+  private List<MavenCoordinate> hideTemplateSets;
+
+  /**
+   * The constructor. Loads properties from a given source
+   *
+   * @param groupIds groupID from key template-sets.groupIds
+   * @param allowSnapshots from key template-sets.allow-snapshot
+   * @param hideTemplates from key template-set.hide
+   * @param templateSetsInstalled list of mavenCoordinate that define the templates sets that should be installed
+   */
+  public ConfigurationProperties(List<String> groupIds, boolean allowSnapshots, List<MavenCoordinate> hideTemplates,
+      List<MavenCoordinate> templateSetsInstalled) {
+
+    this.groupIds = groupIds;
+    this.allowSnapshots = allowSnapshots;
+    this.hideTemplateSets = hideTemplates;
+    this.templateSetsInstalled = templateSetsInstalled;
+  }
+
+  /**
+   * Returns a list of the saved groupIds
+   *
+   * @return groupIds
+   */
+  public List<String> getGroupIds() {
+
+    return this.groupIds;
+  }
+
+  /**
+   * Sets a list of the groupIds from a source
+   *
+   * @param groupIds new value of {@link #getgroupIds}.
+   */
+  public void setGroupIds(List<String> groupIds) {
+
+    this.groupIds = groupIds;
+  }
+
+  /**
+   * Returns a boolean which states if specific Snapshots should be allowed.
+   *
+   * @return allowSnapshots
+   */
+  public boolean isAllowSnapshots() {
+
+    return this.allowSnapshots;
+  }
+
+  /**
+   * Sets a value on the snapshot
+   *
+   * @param allowSnapshots new value of {@link #getallowSnapshots}.
+   */
+  public void setAllowSnapshots(boolean allowSnapshots) {
+
+    this.allowSnapshots = allowSnapshots;
+  }
+
+  /**
+   * Returns a list of the saved templates to be hidden
+   *
+   * @return hideTemplateSets
+   */
+  public List<MavenCoordinate> getHideTemplateSets() {
+
+    return this.hideTemplateSets;
+  }
+
+  /**
+   * Sets a list of the HideTemplate from a source
+   *
+   * @param hideTemplateSets new value of {@link #gethideTemplateSets}.
+   */
+  public void setHideTemplateSets(List<MavenCoordinate> hideTemplateSets) {
+
+    this.hideTemplateSets = hideTemplateSets;
+  }
+
+  /**
+   * Returns a list of maven coordinates for the download of template sets
+   *
+   * @return maven coordinates
+   */
+  public List<MavenCoordinate> getTemplateSetsInstalled() {
+
+    return this.templateSetsInstalled;
+  }
+
+  /**
+   * Set a list of template sets that should be installed at startup
+   *
+   * @param templateSetsInstalled new value of {@link #getTemplateSetsInstalled}.
+   */
+  public void setTemplateSetsInstalled(List<MavenCoordinate> templateSetsInstalled) {
+
+    this.templateSetsInstalled = templateSetsInstalled;
+  }
+
+}
diff --git a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/ContextConfiguration.java b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/ContextConfiguration.java
index b7f3f1f292..c019ea0974 100644
--- a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/ContextConfiguration.java
+++ b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/ContextConfiguration.java
@@ -1,6 +1,7 @@
 package com.devonfw.cobigen.impl.config;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
@@ -26,6 +27,21 @@ public class ContextConfiguration {
    */
   private Path configurationPath;
 
+  /**
+   * This is the automatically generated ContextConfiguration
+   */
+  private com.devonfw.cobigen.impl.config.entity.io.ContextConfiguration contextConfiguration;
+
+  /**
+   * The reader to read the context.xml files
+   */
+  private ContextConfigurationReader contextConfigurationReader;
+
+  /**
+   * The {@link ConfigurationHolder}
+   */
+  private ConfigurationHolder configurationHolder;
+
   /**
    * Creates a new {@link ContextConfiguration} with the contents initially loaded from the context.xml
    *
@@ -38,6 +54,23 @@ public ContextConfiguration(Path configRoot) throws InvalidConfigurationExceptio
     readConfiguration(configRoot);
   }
 
+  /**
+   * Creates a new {@link ContextConfiguration} with the contents initially loaded from the template-set.xml
+   *
+   * @param contextConfiguration provided by template-set reader
+   * @param configRoot root path for the configuration of CobiGen
+   * @param configurationHolder the {@link ConfigurationHolder} to initialize
+   * @param triggers the map of triggers
+   */
+  public ContextConfiguration(com.devonfw.cobigen.impl.config.entity.io.ContextConfiguration contextConfiguration,
+      Path configRoot, ConfigurationHolder configurationHolder, Map<String, Trigger> triggers) {
+
+    this.configurationHolder = configurationHolder;
+    this.configurationPath = configRoot;
+    this.contextConfigurationReader = new ContextConfigurationReader(contextConfiguration, configRoot);
+    this.triggers = triggers;
+  }
+
   /**
    * Reads the configuration from the given path
    *
@@ -46,9 +79,13 @@ public ContextConfiguration(Path configRoot) throws InvalidConfigurationExceptio
    */
   private void readConfiguration(Path configRoot) throws InvalidConfigurationException {
 
-    ContextConfigurationReader reader = new ContextConfigurationReader(configRoot);
-    this.configurationPath = reader.getContextRoot();
-    this.triggers = reader.loadTriggers();
+    if (this.contextConfigurationReader == null) {
+      this.contextConfigurationReader = new ContextConfigurationReader(configRoot);
+    }
+
+    this.configurationPath = this.contextConfigurationReader.getContextRoot();
+    this.triggers = this.contextConfigurationReader.loadTriggers();
+
   }
 
   /**
@@ -73,6 +110,14 @@ public List<Trigger> getTriggers() {
     return new ArrayList<>(this.triggers.values());
   }
 
+  /**
+   * @return the version
+   */
+  public BigDecimal getVersion() {
+
+    return this.contextConfiguration.getVersion();
+  }
+
   /**
    * Returns the {@link Trigger} with the given id
    *
@@ -94,4 +139,38 @@ public Path getConfigurationPath() {
     return this.configurationPath;
   }
 
+  /**
+   * Retrieves the directory of the configuration root directory by given trigger ID
+   *
+   * @param triggerId the trigger id to get the config location for
+   * @return the {@link Path} of the config location of the trigger
+   */
+  public Path retrieveConfigRootByTrigger(String triggerId) {
+
+    if (this.configurationHolder != null) {
+      Map<String, Path> rootTemplateFolders = this.configurationHolder.getTemplateSetConfiguration()
+          .getRootTemplateFolders();
+      Path rootTemplateFolder = rootTemplateFolders.get(triggerId);
+      return rootTemplateFolder;
+    }
+
+    return this.configurationPath;
+  }
+
+  /**
+   * Retrieves the utility folder from the given trigger id
+   *
+   * @param triggerId String of triggerId to search for
+   * @return Path to utility folder
+   */
+  public Path retrieveTemplateSetUtilsLocationByTrigger(String triggerId) {
+
+    if (this.configurationHolder != null) {
+      Map<String, Path> utilityFolders = this.configurationHolder.getTemplateSetConfiguration().getUtilFolders();
+      Path utilityFolder = utilityFolders.get(triggerId);
+      return utilityFolder;
+    }
+    return this.configurationPath;
+  }
+
 }
diff --git a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/TemplateSetConfiguration.java b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/TemplateSetConfiguration.java
new file mode 100644
index 0000000000..156c363dcf
--- /dev/null
+++ b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/TemplateSetConfiguration.java
@@ -0,0 +1,266 @@
+package com.devonfw.cobigen.impl.config;
+
+import java.io.File;
+import java.nio.file.Path;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.devonfw.cobigen.api.exception.InvalidConfigurationException;
+import com.devonfw.cobigen.api.util.MavenCoordinate;
+import com.devonfw.cobigen.impl.config.entity.Increment;
+import com.devonfw.cobigen.impl.config.entity.Template;
+import com.devonfw.cobigen.impl.config.entity.TemplateFolder;
+import com.devonfw.cobigen.impl.config.entity.Trigger;
+import com.devonfw.cobigen.impl.config.reader.ContextConfigurationReader;
+import com.devonfw.cobigen.impl.config.reader.TemplateSetConfigurationReader;
+import com.devonfw.cobigen.impl.config.reader.TemplatesConfigurationReader;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+
+/**
+ * This is the readable and persistent representation of the automatically generated TemplateSetConfiguration file
+ */
+public class TemplateSetConfiguration {
+
+  /** Logger instance */
+  private static final Logger LOG = LoggerFactory.getLogger(TemplateSetConfiguration.class);
+
+  /** The stored properties are groupIds, allowSnapshots and hideTemplates */
+  private ConfigurationProperties configurationProperties;
+
+  /** List of mavenCoordinates for the template sets that should be installed at cobigen startup */
+  private List<MavenCoordinate> mavenCoordinates;
+
+  /** All available {@link Trigger}s */
+  private Map<String, Trigger> triggers;
+
+  /** All available {@Link Template}s */
+  private Map<String, Template> templates;
+
+  /** All available {@Link Increment} */
+  private Map<String, Increment> increments;
+
+  List<TemplatesConfiguration> templatesConfigurations;
+
+  /**
+   * @return increments
+   */
+  public Map<String, Increment> getIncrements() {
+
+    return this.increments;
+  }
+
+  /** The automatically generated templateSetConfiguration this class wraps */
+  private com.devonfw.cobigen.impl.config.entity.io.TemplateSetConfiguration templateSetConfiguration;
+
+  /** The reader to read the template-set.xml files */
+  private TemplateSetConfigurationReader templateSetConfigurationReader;
+
+  private ConfigurationHolder configurationHolder;
+
+  /**
+   * Map of the root template folders distinguished by their trigger ID
+   */
+  private Map<String, Path> rootTemplateFolders;
+
+  /**
+   * Map of the utility folders distinguished by their trigger ID
+   */
+  private Map<String, Path> utilFolders;
+
+  /**
+   * @return utilFolders
+   */
+  public Map<String, Path> getUtilFolders() {
+
+    return this.utilFolders;
+  }
+
+  /**
+   * The constructor.
+   *
+   * @param configurationPath CobiGen configuration root path
+   */
+  public TemplateSetConfiguration(Path configurationPath) {
+
+    this.triggers = Maps.newHashMap();
+    this.templates = Maps.newHashMap();
+    this.rootTemplateFolders = Maps.newHashMap();
+    this.utilFolders = Maps.newHashMap();
+    readConfiguration(configurationPath);
+  }
+
+  /**
+   * Reads the configuration from the given path
+   *
+   * @param configurationPath CobiGen configuration root path
+   * @throws InvalidConfigurationException thrown if the {@link File} is not valid with respect to the context.xsd
+   */
+  public void readConfiguration(Path configurationPath) throws InvalidConfigurationException {
+
+    if (this.templateSetConfigurationReader == null) {
+      this.templateSetConfigurationReader = new TemplateSetConfigurationReader(configurationPath);
+    }
+
+    List<Path> templateSetsAdapted = this.templateSetConfigurationReader.getTemplateSetConfigurationPathsAdapted();
+    List<Path> templateSetsDownloaded = this.templateSetConfigurationReader
+        .getTemplateSetConfigurationPathsDownloaded();
+
+    this.increments = new HashMap<>();
+    this.templatesConfigurations = Lists.newLinkedList();
+    if (!templateSetsAdapted.isEmpty()) {
+      for (Path templateSetFile : templateSetsAdapted) {
+        initializeTemplateSets(false, configurationPath, templateSetFile);
+      }
+    }
+
+    if (!templateSetsDownloaded.isEmpty()) {
+      for (Path templateSetFile : templateSetsDownloaded) {
+        initializeTemplateSets(true, configurationPath, templateSetFile);
+      }
+    }
+
+  }
+
+  /**
+   * Initializes template sets
+   *
+   * @param isZipFile boolean true if downloaded template-sets need to be processed
+   * @param configurationPath CobiGen configuration root path
+   * @param templateSetFile Path to template-set xml to be processed
+   */
+  private void initializeTemplateSets(boolean isZipFile, Path configurationPath, Path templateSetFile) {
+
+    this.templateSetConfigurationReader.readConfiguration(templateSetFile);
+
+    com.devonfw.cobigen.impl.config.entity.io.TemplatesConfiguration templatesConfigurationStatic = this.templateSetConfigurationReader
+        .getTemplatesConfiguration();
+
+    com.devonfw.cobigen.impl.config.entity.io.ContextConfiguration contextConfigurationStatic = this.templateSetConfigurationReader
+        .getContextConfiguration();
+
+    TemplateFolder templateFolder = this.templateSetConfigurationReader.getRootTemplateFolder();
+
+    TemplatesConfigurationReader templatesConfigurationReader = new TemplatesConfigurationReader(
+        templatesConfigurationStatic, templateFolder, this.configurationHolder, templateSetFile);
+
+    ContextConfigurationReader contextConfigurationReader = new ContextConfigurationReader(contextConfigurationStatic,
+        templateSetFile);
+
+    Map<String, Trigger> trigger = contextConfigurationReader.loadTriggers();
+
+    // uses the 1st element because a template-set has only one trigger
+    Trigger activeTrigger = trigger.get(trigger.keySet().toArray()[0]);
+
+    Map<Path, Path> configLocations = this.templateSetConfigurationReader.getConfigLocations();
+    Path templateSetRootFolder = configLocations.get(templateSetFile);
+    this.utilFolders.put(activeTrigger.getId(), templateSetRootFolder);
+
+    this.rootTemplateFolders.put(activeTrigger.getId(), templateFolder.getPath());
+    this.triggers.putAll(trigger);
+
+    Map<String, Template> loadedTemplates = templatesConfigurationReader.loadTemplates(activeTrigger);
+    this.templates.putAll(loadedTemplates);
+
+    Map<String, Increment> loadedIncrements = templatesConfigurationReader.loadIncrements(loadedTemplates,
+        activeTrigger);
+    this.increments.putAll(templatesConfigurationReader.loadIncrements(loadedTemplates, activeTrigger));
+    String templateEngine = templatesConfigurationReader.getTemplateEngine();
+
+    TemplatesConfiguration templatesConfiguration = new TemplatesConfiguration(configurationPath, activeTrigger,
+        loadedTemplates, loadedIncrements, templateEngine);
+
+    this.templatesConfigurations.add(templatesConfiguration);
+  }
+
+  /**
+   * @return templatesConfigurations
+   */
+  public List<TemplatesConfiguration> getTemplatesConfigurations() {
+
+    return this.templatesConfigurations;
+  }
+
+  /**
+   * @return templateSetConfigurationReader
+   */
+  public TemplateSetConfigurationReader getTemplateSetConfigurationReader() {
+
+    return this.templateSetConfigurationReader;
+  }
+
+  /**
+   * @return rootTemplateFolders
+   */
+  public Map<String, Path> getRootTemplateFolders() {
+
+    return this.rootTemplateFolders;
+  }
+
+  /**
+   * Reloads the configuration from source. This function might be called if the configuration file has changed in a
+   * running system
+   *
+   * @param configRoot CobiGen configuration root path
+   * @throws InvalidConfigurationException thrown if the {@link File} is not valid with respect to the template-set.xsd
+   */
+  public void reloadConfigurationFromFile(Path configRoot) throws InvalidConfigurationException {
+
+    readConfiguration(configRoot);
+  }
+
+  /**
+   * @return Trigger from wrapped templateSetConfiguration
+   */
+  public List<com.devonfw.cobigen.impl.config.entity.io.Trigger> getTrigger() {
+
+    return this.templateSetConfiguration.getContextConfiguration().getTrigger();
+  }
+
+  /**
+   * @return s the map of triggers
+   */
+  public Map<String, Trigger> getTriggers() {
+
+    return this.triggers;
+  }
+
+  /**
+   * @return s the map of the templates
+   */
+  public Map<String, Template> getTemplates() {
+
+    return this.templates;
+  }
+
+  /**
+   * Returns a list of maven coordinates for the download of template sets
+   *
+   * @return maven coordinates
+   */
+  public List<MavenCoordinate> getMavenCoordinates() {
+
+    return this.mavenCoordinates;
+  }
+
+  /**
+   * @return configurationProperties
+   */
+  public ConfigurationProperties getConfigurationProperties() {
+
+    return this.configurationProperties;
+  }
+
+  /**
+   * @param configurationProperties new value of {@link #getconfigurationProperties}.
+   */
+  public void setConfigurationProperties(ConfigurationProperties configurationProperties) {
+
+    this.configurationProperties = configurationProperties;
+  }
+
+}
\ No newline at end of file
diff --git a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/TemplatesConfiguration.java b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/TemplatesConfiguration.java
index b0657a304c..b5dc42b04e 100644
--- a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/TemplatesConfiguration.java
+++ b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/TemplatesConfiguration.java
@@ -43,6 +43,25 @@ public class TemplatesConfiguration {
    */
   private TemplatesConfigurationReader externalReader;
 
+  /**
+   * Creates a new {@link TemplatesConfiguration} with the contents initially loaded from the template-set.xml
+   *
+   * @param configRoot root path for the configuration of CobiGen
+   * @param trigger the {@link Trigger}
+   * @param templates the map of templates
+   * @param increments the map of increments
+   * @param templateEngine the string of template engine
+   */
+  public TemplatesConfiguration(Path configRoot, Trigger trigger, Map<String, Template> templates,
+      Map<String, Increment> increments, String templateEngine) {
+
+    this.templatesFolderName = trigger.getTemplateFolder();
+    this.templates = templates;
+    this.increments = increments;
+    this.templateEngine = templateEngine;
+    this.trigger = trigger;
+  }
+
   /**
    * Creates a new {@link TemplatesConfiguration} for the given template folder with the given settings reference. We
    * use the configurationHolder to store there all the external TemplatesConfiguration
@@ -66,6 +85,7 @@ public TemplatesConfiguration(Path configRoot, Trigger trigger, ConfigurationHol
     this.increments = reader.loadIncrements(this.templates, trigger);
     this.templateEngine = reader.getTemplateEngine();
     this.trigger = trigger;
+
   }
 
   /**
diff --git a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/constant/ContextConfigurationVersion.java b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/constant/ContextConfigurationVersion.java
index 745b375770..eba7149ad0 100644
--- a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/constant/ContextConfigurationVersion.java
+++ b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/constant/ContextConfigurationVersion.java
@@ -1,13 +1,10 @@
 package com.devonfw.cobigen.impl.config.constant;
 
 import java.util.Map;
-
-import com.google.common.collect.Maps;
+import java.util.TreeMap;
 
 /**
  * Version steps of the templates configuration.
- *
- * @author mbrunnli (Jun 22, 2015)
  */
 public enum ContextConfigurationVersion {
 
@@ -36,10 +33,10 @@ public enum ContextConfigurationVersion {
   /**
    * ChangeLog:
    * <ul>
-   * <li>made templateFolder optional</li>
+   * <li>added links and tags, made templateFolder optional</li>
    * </ul>
    */
-  v2_2(2.2f, true);
+  v3_0(3.0f, false);
 
   /** Comparable float representation of the version number. */
   private float floatRepresentation;
@@ -61,7 +58,6 @@ private ContextConfigurationVersion(float floatRepresentation, boolean backwardC
 
   /**
    * @return the comparable float representation value of the version.
-   * @author mbrunnli (May 17, 2016)
    */
   public float getFloatRepresentation() {
 
@@ -93,7 +89,7 @@ public static ContextConfigurationVersion getLatest() {
    */
   public static Map<Float, Boolean> valuesSorted() {
 
-    Map<Float, Boolean> floatVersions = Maps.newTreeMap();
+    Map<Float, Boolean> floatVersions = new TreeMap<>();
     for (ContextConfigurationVersion v : values()) {
       floatVersions.put(v.getFloatRepresentation(), v.isBackwardCompatible());
     }
diff --git a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/constant/TemplateSetConfigurationVersion.java b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/constant/TemplateSetConfigurationVersion.java
new file mode 100644
index 0000000000..03ee70a69a
--- /dev/null
+++ b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/constant/TemplateSetConfigurationVersion.java
@@ -0,0 +1,78 @@
+package com.devonfw.cobigen.impl.config.constant;
+
+import java.util.Map;
+
+import com.google.common.collect.Maps;
+
+/** Version steps of the templates configuration. */
+public enum TemplateSetConfigurationVersion {
+
+  /**
+   * Initial release. Merges the content of the context.xml and the templates.xml into a new template-set.xml file.
+   */
+  v6_0(6f, false);
+
+  /** Comparable float representation of the version number. */
+  private float floatRepresentation;
+
+  /** States whether the configuration is backward compatible to the previous version */
+  private boolean backwardCompatible;
+
+  /**
+   * The constructor.
+   *
+   * @param floatRepresentation comparable float representation of the version number.
+   * @param backwardCompatible whether the configuration is backward compatible to the previous version
+   */
+  private TemplateSetConfigurationVersion(float floatRepresentation, boolean backwardCompatible) {
+
+    this.floatRepresentation = floatRepresentation;
+    this.backwardCompatible = backwardCompatible;
+  }
+
+  /**
+   * @return the comparable float representation value of the version.
+   */
+  public float getFloatRepresentation() {
+
+    return this.floatRepresentation;
+  }
+
+  /**
+   * @return whether the configuration is backward compatible to the previous version.
+   */
+  public boolean isBackwardCompatible() {
+
+    return this.backwardCompatible;
+  }
+
+  /**
+   * Get latest template set version supported by this CobiGen release.
+   *
+   * @return latest template set version supported by this CobiGen release.
+   */
+  public static TemplateSetConfigurationVersion getLatest() {
+
+    return values()[values().length - 1];
+  }
+
+  /**
+   * Returns the sorted float representations of the enum's values.
+   *
+   * @return a sorted List
+   */
+  public static Map<Float, Boolean> valuesSorted() {
+
+    Map<Float, Boolean> floatVersions = Maps.newTreeMap();
+    for (TemplateSetConfigurationVersion v : values()) {
+      floatVersions.put(v.getFloatRepresentation(), v.isBackwardCompatible());
+    }
+    return floatVersions;
+  }
+
+  @Override
+  public String toString() {
+
+    return name().replace("_", ".");
+  };
+}
diff --git a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/constant/TemplatesConfigurationVersion.java b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/constant/TemplatesConfigurationVersion.java
index 92d1b90b95..5ceab32a5d 100644
--- a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/constant/TemplatesConfigurationVersion.java
+++ b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/constant/TemplatesConfigurationVersion.java
@@ -1,8 +1,7 @@
 package com.devonfw.cobigen.impl.config.constant;
 
 import java.util.Map;
-
-import com.google.common.collect.Maps;
+import java.util.TreeMap;
 
 /** Version steps of the templates configuration. */
 public enum TemplatesConfigurationVersion {
@@ -36,7 +35,15 @@ public enum TemplatesConfigurationVersion {
    * <li>new attribute templateEngine (#293)</li>
    * </ul>
    */
-  v4_0(4.0f, true);
+  v4_0(4.0f, true),
+
+  /**
+   * ChangeLog:
+   * <ul>
+   * <li>added explanation attribute to increments</li>
+   * </ul>
+   */
+  v5_0(5.0f, true);
 
   /** Comparable float representation of the version number. */
   private float floatRepresentation;
@@ -89,7 +96,7 @@ public static TemplatesConfigurationVersion getLatest() {
    */
   public static Map<Float, Boolean> valuesSorted() {
 
-    Map<Float, Boolean> floatVersions = Maps.newTreeMap();
+    Map<Float, Boolean> floatVersions = new TreeMap<>();
     for (TemplatesConfigurationVersion v : values()) {
       floatVersions.put(v.getFloatRepresentation(), v.isBackwardCompatible());
     }
diff --git a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/constant/WikiConstants.java b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/constant/WikiConstants.java
index d157328f1a..9659453cd4 100644
--- a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/constant/WikiConstants.java
+++ b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/constant/WikiConstants.java
@@ -4,4 +4,9 @@ public class WikiConstants {
 
   public final static String WIKI_UPDATE_OLD_CONFIG = "https://github.com/devonfw/cobigen/wiki/cobigen-core_configuration#update-old-config";
 
+  /**
+   * Link to the WIKI page, describing the upgrade process
+   */
+  public static final String WIKI_UPGRADE_MONOLITHIC_CONFIGURATION = "https://github.com/devonfw/cobigen/wiki/cobigen-core_configuration.asciidoc#configuration-upgrade";
+
 }
diff --git a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/entity/AbstractMatcher.java b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/entity/AbstractMatcher.java
index ead97e53f1..26c6afb141 100644
--- a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/entity/AbstractMatcher.java
+++ b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/entity/AbstractMatcher.java
@@ -27,7 +27,6 @@ public AbstractMatcher(String type, String value) {
    * Returns the matcher type
    *
    * @return matcher type
-   * @author mbrunnli (08.04.2014)
    */
   public String getType() {
 
@@ -38,7 +37,6 @@ public String getType() {
    * Returns the value the matcher should match against
    *
    * @return the value the matcher should match against
-   * @author mbrunnli (08.04.2014)
    */
   public String getValue() {
 
diff --git a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/entity/ContainerMatcher.java b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/entity/ContainerMatcher.java
index 28a780ff3d..7c26fb4c0b 100644
--- a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/entity/ContainerMatcher.java
+++ b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/entity/ContainerMatcher.java
@@ -2,8 +2,6 @@
 
 /**
  * The {@link ContainerMatcher} type corresponds to the &lt;containerMatcher&gt; xml node
- *
- * @author mbrunnli (13.10.2014)
  */
 public class ContainerMatcher extends AbstractMatcher {
 
@@ -18,7 +16,6 @@ public class ContainerMatcher extends AbstractMatcher {
    * @param type of the matcher
    * @param value value to be processed by the matcher
    * @param retrieveObjectsRecursively states whether objects should be retrieved recursively or not
-   * @author mbrunnli (13.10.2014)
    */
   public ContainerMatcher(String type, String value, boolean retrieveObjectsRecursively) {
 
@@ -30,7 +27,6 @@ public ContainerMatcher(String type, String value, boolean retrieveObjectsRecurs
    * Returns the field 'retrieveObjectsRecursively'
    *
    * @return value of retrieveObjectsRecursively
-   * @author mbrunnli (18.01.2015)
    */
   public boolean isRetrieveObjectsRecursively() {
 
diff --git a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/entity/Trigger.java b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/entity/Trigger.java
index a1af0844cd..5ab019e72a 100644
--- a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/entity/Trigger.java
+++ b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/entity/Trigger.java
@@ -6,7 +6,7 @@
 import java.util.List;
 
 /**
- * Storage class for trigger data provided within the context.xml
+ * Storage class for trigger data provided within the context.xml or template-set.xml
  */
 public class Trigger {
 
@@ -47,6 +47,10 @@ public Trigger(String id, String type, String templateFolder, Charset inputChars
     this.id = id;
     this.type = type;
     this.templateFolder = templateFolder;
+    // required because template folder field is optional in template set triggers
+    if (templateFolder.isEmpty() || templateFolder.equals("/")) {
+      this.templateFolder = "";
+    }
     this.inputCharset = inputCharset;
     this.matchers = matcher == null ? new LinkedList<>() : matcher;
     this.containerMatchers = containerMatchers == null ? new LinkedList<>() : containerMatchers;
diff --git a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/entity/VariableAssignment.java b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/entity/VariableAssignment.java
index 47d2a24f92..f00d661f10 100644
--- a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/entity/VariableAssignment.java
+++ b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/entity/VariableAssignment.java
@@ -4,8 +4,6 @@
 
 /**
  * A {@link VariableAssignment} key value pair, which will be interpreted by any plug-in declaring the {@link #type}
- *
- * @author mbrunnli (15.04.2013)
  */
 public class VariableAssignment {
 
@@ -35,7 +33,6 @@ public class VariableAssignment {
    * @param type Type of the variable assignment, interpreted by the plug-ins
    * @param varName variable name
    * @param value concrete string value
-   * @author mbrunnli (15.04.2013)
    */
   public VariableAssignment(String type, String varName, String value, boolean mandatory) {
 
@@ -51,7 +48,6 @@ public VariableAssignment(String type, String varName, String value, boolean man
    * @param type Type of the variable assignment, interpreted by the plug-ins
    * @param varName variable name
    * @param value concrete string value
-   * @author mbrunnli (15.04.2013)
    */
   public VariableAssignment(String type, String varName, String value) {
 
@@ -65,7 +61,6 @@ public VariableAssignment(String type, String varName, String value) {
    * Returns the variable assignment type
    *
    * @return the variable assignment type
-   * @author mbrunnli (08.04.2014)
    */
   public String getType() {
 
@@ -76,7 +71,6 @@ public String getType() {
    * Returns the variable name
    *
    * @return the variable name
-   * @author mbrunnli (15.04.2013)
    */
   public String getVarName() {
 
@@ -87,7 +81,6 @@ public String getVarName() {
    * Returns the value
    *
    * @return the value
-   * @author mbrunnli (08.04.2014)
    */
   public String getValue() {
 
diff --git a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/entity/Variables.java b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/entity/Variables.java
index 40cb209baa..0b6d483584 100644
--- a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/entity/Variables.java
+++ b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/entity/Variables.java
@@ -8,8 +8,6 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import net.sf.mmm.util.lang.api.CaseSyntax;
-
 import com.devonfw.cobigen.api.constants.ConfigurationConstants;
 import com.devonfw.cobigen.api.exception.UnknownExpressionException;
 import com.devonfw.cobigen.api.util.StringUtil;
@@ -17,6 +15,8 @@
 import com.devonfw.cobigen.impl.exceptions.UnknownContextVariableException;
 import com.devonfw.cobigen.impl.model.ModelBuilderImpl;
 
+import io.github.mmm.base.text.CaseSyntax;
+
 /**
  * This class is a container for variables that can inherit from parent {@link Variables} building a hierarchy. The
  * {@link #containsKey(String) keys} for {@link #get(String) getting} and {@link #put(String, String) setting} variables
@@ -35,11 +35,15 @@ public class Variables {
    */
   private static final char DUMMY_LETTER_FOR_DOT = 'ʵ';
 
-  /** Regex {@link Pattern} for variable in dollar syntax (<code>${...}</code>). */
+  /**
+   * Regex {@link Pattern} for variable in dollar syntax (<code>${...}</code>).
+   */
   private static final Pattern PATTERN_VARIABLE_DOLLAR_SYNTAX = Pattern
       .compile("\\$\\{([^?#}]+)(((\\?|#)[^}?#]+)*)\\}");
 
-  /** Regex {@link Pattern} for variable in language-agnostic case-syntax (<code>x_..._x</code>). */
+  /**
+   * Regex {@link Pattern} for variable in language-agnostic case-syntax (<code>x_..._x</code>).
+   */
   private static final Pattern PATTERN_VARIABLE_CASE_SYNTAX = Pattern.compile("[xX]__([a-zA-Z0-9_-]+?)__[xX]");
 
   /** The parent {@link Variables} to inherit or {@code null}. */
@@ -290,7 +294,8 @@ private String resolveVariables(String string, Pattern pattern, boolean supportC
         variableKey = variableKey.substring(PREFIX_VARIABLES.length());
       }
       // a variable like ${detail} can be explicitly set to null
-      // this is considered as the empty string but null instead of "" is required for free-marker
+      // this is considered as the empty string but null instead of "" is required for
+      // free-marker
       if (!containsKey(variableKey)) {
         throw new UnknownContextVariableException(variableKey);
       }
diff --git a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/reader/ContextConfigurationReader.java b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/reader/ContextConfigurationReader.java
index e9b914888f..60b51f9321 100644
--- a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/reader/ContextConfigurationReader.java
+++ b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/reader/ContextConfigurationReader.java
@@ -38,8 +38,6 @@
 import com.devonfw.cobigen.impl.config.entity.io.ContextConfiguration;
 import com.devonfw.cobigen.impl.config.versioning.VersionValidator;
 import com.devonfw.cobigen.impl.config.versioning.VersionValidator.Type;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
 
 import jakarta.xml.bind.JAXBContext;
 import jakarta.xml.bind.JAXBException;
@@ -49,6 +47,9 @@
 /** The {@link ContextConfigurationReader} reads the context xml */
 public class ContextConfigurationReader {
 
+  /** Logger instance. */
+  private static final Logger LOG = LoggerFactory.getLogger(ContextConfigurationReader.class);
+
   /** Map with XML Nodes 'context' of the context.xml files */
   private Map<Path, ContextConfiguration> contextConfigurations;
 
@@ -58,9 +59,6 @@ public class ContextConfigurationReader {
   /** Root of the context configuration file, used for passing to ContextConfiguration */
   private Path contextRoot;
 
-  /** Logger instance. */
-  private static final Logger LOG = LoggerFactory.getLogger(ContextConfigurationReader.class);
-
   /**
    * Creates a new instance of the {@link ContextConfigurationReader} which initially parses the given context file
    *
@@ -75,7 +73,7 @@ public ContextConfigurationReader(Path configRoot) throws InvalidConfigurationEx
 
     this.contextFiles = new ArrayList<>();
 
-    // use old context.xml in templates root
+    // use old context.xml in templates root (CobiGen_Templates)
     Path contextFile = configRoot.resolve(ConfigurationConstants.CONTEXT_CONFIG_FILENAME);
 
     if (!Files.exists(contextFile)) {
@@ -84,16 +82,11 @@ public ContextConfigurationReader(Path configRoot) throws InvalidConfigurationEx
       contextFile = configRoot.resolve(ConfigurationConstants.CONTEXT_CONFIG_FILENAME);
       if (!Files.exists(contextFile)) {
 
-        this.contextFiles = loadContextFilesInSubfolder(configRoot);
-
-        if (this.contextFiles.isEmpty()) {
-          throw new InvalidConfigurationException(contextFile, "Could not find any context configuration file.");
-        }
+        throw new InvalidConfigurationException(contextFile, "Could not find any context configuration file.");
 
       } else {
         checkForConflict(configRoot, contextFile);
         this.contextFiles.add(contextFile);
-
       }
     } else {
       Path subConfigRoot = configRoot.resolve(ConfigurationConstants.TEMPLATE_RESOURCE_FOLDER);
@@ -109,53 +102,88 @@ public ContextConfigurationReader(Path configRoot) throws InvalidConfigurationEx
   }
 
   /**
-   * Checks if a conflict with the old and modular configuration exists
+   * Creates a new instance of the {@link ContextConfigurationReader} which already parsed the template-set.xml file
    *
-   * @param configRoot Path to root directory of the configuration
-   * @param contextFile Path to context file of the configuration
+   * @param contextConfiguration the {@link ContextConfiguration} provided by the template-set
+   * @param contextRoot root directory of the configuration
+   * @throws InvalidConfigurationException if the configuration is not valid against its xsd specification
    */
-  private void checkForConflict(Path configRoot, Path contextFile) {
+  public ContextConfigurationReader(ContextConfiguration contextConfiguration, Path contextRoot)
+      throws InvalidConfigurationException {
 
-    if (!loadContextFilesInSubfolder(configRoot).isEmpty()) {
-      String message = "You are using an old configuration of the templates in addition to new ones. Please make sure this is not the case as both at the same time are not supported. For more details visit this wiki page: "
-          + WikiConstants.WIKI_UPDATE_OLD_CONFIG;
-      ConfigurationConflictException exception = new ConfigurationConflictException(contextFile, message);
-      LOG.error("A conflict with the old and modular configuration exists", exception);
-      throw exception;
+    if (contextRoot == null) {
+      throw new IllegalArgumentException("Configuration path cannot be null.");
     }
 
+    if (this.contextConfigurations == null) {
+      this.contextConfigurations = new HashMap<>();
+    }
+
+    this.contextRoot = contextRoot;
+    this.contextConfigurations.put(contextRoot, contextConfiguration);
+
   }
 
   /**
-   * search for configuration Files in the subfolders of configRoot
+   * Loads all {@link Matcher}s of a given {@link com.devonfw.cobigen.impl.config.entity.io.Trigger}
    *
-   * @param configRoot root directory of the configuration
-   * @throws InvalidConfigurationException if the configuration is not valid against its xsd specification
+   * @param trigger {@link com.devonfw.cobigen.impl.config.entity.io.Trigger} to retrieve the {@link Matcher}s from
+   * @return the {@link List} of {@link Matcher}s
    */
-  private List<Path> loadContextFilesInSubfolder(Path configRoot) {
+  private List<Matcher> loadMatchers(com.devonfw.cobigen.impl.config.entity.io.Trigger trigger) {
 
-    List<Path> contextPaths = new ArrayList<>();
+    List<Matcher> matcher = new LinkedList<>();
+    for (com.devonfw.cobigen.impl.config.entity.io.Matcher m : trigger.getMatcher()) {
+      matcher.add(new Matcher(m.getType(), m.getValue(), loadVariableAssignments(m), m.getAccumulationType()));
+    }
+    return matcher;
+  }
 
-    List<Path> templateDirectories = new ArrayList<>();
+  /**
+   * Loads all {@link ContainerMatcher}s of a given {@link com.devonfw.cobigen.impl.config.entity.io.Trigger}
+   *
+   * @param trigger {@link com.devonfw.cobigen.impl.config.entity.io.Trigger} to retrieve the {@link Matcher}s from
+   * @return the {@link List} of {@link Matcher}s
+   */
+  private List<ContainerMatcher> loadContainerMatchers(com.devonfw.cobigen.impl.config.entity.io.Trigger trigger) {
 
-    try (Stream<Path> files = Files.list(configRoot)) {
-      files.forEach(path -> {
-        if (Files.isDirectory(path)) {
-          templateDirectories.add(path);
-        }
-      });
-    } catch (IOException e) {
-      throw new InvalidConfigurationException(configRoot, "Could not read configuration root directory.", e);
+    List<ContainerMatcher> containerMatchers = new LinkedList<>();
+    for (com.devonfw.cobigen.impl.config.entity.io.ContainerMatcher cm : trigger.getContainerMatcher()) {
+      containerMatchers.add(new ContainerMatcher(cm.getType(), cm.getValue(), cm.isRetrieveObjectsRecursively()));
     }
+    return containerMatchers;
+  }
 
-    for (Path file : templateDirectories) {
-      Path contextPath = file.resolve(ConfigurationConstants.CONTEXT_CONFIG_FILENAME);
-      if (Files.exists(contextPath)) {
-        contextPaths.add(contextPath);
-      }
+  /**
+   * Loads all {@link VariableAssignment}s from a given {@link com.devonfw.cobigen.impl.config.entity.io.Matcher}
+   *
+   * from
+   *
+   * @return the {@link List} of {@link Matcher}s
+   */
+  private List<VariableAssignment> loadVariableAssignments(com.devonfw.cobigen.impl.config.entity.io.Matcher matcher) {
+
+    List<VariableAssignment> variableAssignments = new LinkedList<>();
+    for (com.devonfw.cobigen.impl.config.entity.io.VariableAssignment va : matcher.getVariableAssignment()) {
+      variableAssignments.add(new VariableAssignment(va.getType(), va.getKey(), va.getValue(), va.isMandatory()));
     }
+    return variableAssignments;
+  }
 
-    return contextPaths;
+  /**
+   * @return the path of the context file
+   */
+  public Path getContextRoot() {
+
+    return this.contextRoot;
+  }
+
+  /**
+   * @return the list of the context files
+   */
+  public List<Path> getContextFiles() {
+
+    return this.contextFiles;
   }
 
   /**
@@ -179,8 +207,9 @@ private void readConfiguration() {
         // Unmarshal without schema checks for getting the version attribute of the root node.
         // This is necessary to provide an automatic upgrade client later on
         Object rootNode = unmarschaller.unmarshal(in);
+        BigDecimal configVersion;
         if (rootNode instanceof ContextConfiguration) {
-          BigDecimal configVersion = ((ContextConfiguration) rootNode).getVersion();
+          configVersion = ((ContextConfiguration) rootNode).getVersion();
           if (configVersion == null) {
             throw new InvalidConfigurationException(contextFile,
                 "The required 'version' attribute of node \"contextConfiguration\" has not been set");
@@ -197,10 +226,10 @@ private void readConfiguration() {
         // Unmarshal with schema checks for checking the correctness and give the user more hints to
         // correct his failures
         SchemaFactory schemaFactory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
-        ContextConfigurationVersion latestConfigurationVersion = ContextConfigurationVersion.getLatest();
+        ContextConfigurationVersion contextVersion = ContextConfigurationVersion.values()[configVersion.intValue()];
         try (
             InputStream schemaStream = getClass()
-                .getResourceAsStream("/schema/" + latestConfigurationVersion + "/contextConfiguration.xsd");
+                .getResourceAsStream("/schema/" + contextVersion + "/contextConfiguration.xsd");
             InputStream configInputStream = Files.newInputStream(contextFile)) {
 
           Schema schema = schemaFactory.newSchema(new StreamSource(schemaStream));
@@ -234,88 +263,75 @@ private void readConfiguration() {
   }
 
   /**
-   * Loads all {@link Trigger}s of the static context into the local representation
+   * Checks if a conflict with the old and modular configuration exists
    *
-   * @return a {@link List} containing all the {@link Trigger}s
-   */
-  public Map<String, Trigger> loadTriggers() {
-
-    Map<String, Trigger> triggers = Maps.newHashMap();
-    for (Path contextFile : this.contextConfigurations.keySet()) {
-      ContextConfiguration contextConfiguration = this.contextConfigurations.get(contextFile);
-      for (com.devonfw.cobigen.impl.config.entity.io.Trigger t : contextConfiguration.getTrigger()) {
-        // templateFolder property is optional in schema version 2.2. If not set take the path of the context.xml file
-        String templateFolder = t.getTemplateFolder();
-        if (templateFolder.isEmpty() || templateFolder.equals("/")) {
-          templateFolder = contextFile.getParent().getFileName().toString();
-        }
-        triggers.put(t.getId(), new Trigger(t.getId(), t.getType(), templateFolder,
-            Charset.forName(t.getInputCharset()), loadMatchers(t), loadContainerMatchers(t)));
-      }
-    }
-    return triggers;
-  }
-
-  /**
-   * Loads all {@link Matcher}s of a given {@link com.devonfw.cobigen.impl.config.entity.io.Trigger}
+   * TODO: Check if this is still needed, see: https://github.com/devonfw/cobigen/issues/1662
    *
-   * @param trigger {@link com.devonfw.cobigen.impl.config.entity.io.Trigger} to retrieve the {@link Matcher}s from
-   * @return the {@link List} of {@link Matcher}s
+   * @param configRoot Path to root directory of the configuration
+   * @param contextFile Path to context file of the configuration
    */
-  private List<Matcher> loadMatchers(com.devonfw.cobigen.impl.config.entity.io.Trigger trigger) {
+  private void checkForConflict(Path configRoot, Path contextFile) {
 
-    List<Matcher> matcher = new LinkedList<>();
-    for (com.devonfw.cobigen.impl.config.entity.io.Matcher m : trigger.getMatcher()) {
-      matcher.add(new Matcher(m.getType(), m.getValue(), loadVariableAssignments(m), m.getAccumulationType()));
+    if (!loadContextFilesInSubfolder(configRoot).isEmpty()) {
+      String message = "You are using an old configuration of the templates in addition to new ones. Please make sure this is not the case as both at the same time are not supported. For more details visit this wiki page: "
+          + WikiConstants.WIKI_UPDATE_OLD_CONFIG;
+      ConfigurationConflictException exception = new ConfigurationConflictException(contextFile, message);
+      LOG.error("A conflict with the old and modular configuration exists", exception);
+      throw exception;
     }
-    return matcher;
+
   }
 
   /**
-   * Loads all {@link ContainerMatcher}s of a given {@link com.devonfw.cobigen.impl.config.entity.io.Trigger}
+   * Searches for configuration Files in the sub folders of configRoot
    *
-   * @param trigger {@link com.devonfw.cobigen.impl.config.entity.io.Trigger} to retrieve the {@link Matcher}s from
-   * @return the {@link List} of {@link Matcher}s
+   * TODO: Check if this is still needed, see: https://github.com/devonfw/cobigen/issues/1662
+   *
+   * @param configRoot root directory of the configuration
+   * @throws InvalidConfigurationException if the configuration is not valid against its xsd specification
    */
-  private List<ContainerMatcher> loadContainerMatchers(com.devonfw.cobigen.impl.config.entity.io.Trigger trigger) {
+  private List<Path> loadContextFilesInSubfolder(Path configRoot) {
 
-    List<ContainerMatcher> containerMatchers = Lists.newLinkedList();
-    for (com.devonfw.cobigen.impl.config.entity.io.ContainerMatcher cm : trigger.getContainerMatcher()) {
-      containerMatchers.add(new ContainerMatcher(cm.getType(), cm.getValue(), cm.isRetrieveObjectsRecursively()));
-    }
-    return containerMatchers;
-  }
+    List<Path> contextPaths = new ArrayList<>();
 
-  /**
-   * Loads all {@link VariableAssignment}s from a given {@link com.devonfw.cobigen.impl.config.entity.io.Matcher}
-   *
-   * @param matcher {@link com.devonfw.cobigen.impl.config.entity.io.Matcher} to retrieve the {@link VariableAssignment}
-   *        from
-   * @return the {@link List} of {@link Matcher}s
-   */
-  private List<VariableAssignment> loadVariableAssignments(com.devonfw.cobigen.impl.config.entity.io.Matcher matcher) {
+    List<Path> templateDirectories = new ArrayList<>();
 
-    List<VariableAssignment> variableAssignments = new LinkedList<>();
-    for (com.devonfw.cobigen.impl.config.entity.io.VariableAssignment va : matcher.getVariableAssignment()) {
-      variableAssignments.add(new VariableAssignment(va.getType(), va.getKey(), va.getValue(), va.isMandatory()));
+    try (Stream<Path> files = Files.list(configRoot)) {
+      files.forEach(path -> {
+        if (Files.isDirectory(path)) {
+          templateDirectories.add(path);
+        }
+      });
+    } catch (IOException e) {
+      throw new InvalidConfigurationException(configRoot, "Could not read configuration root directory.", e);
     }
-    return variableAssignments;
-  }
 
-  /**
-   * @return the path of the context file
-   */
-  public Path getContextRoot() {
+    for (Path file : templateDirectories) {
+      Path contextPath = file.resolve(ConfigurationConstants.CONTEXT_CONFIG_FILENAME);
+      if (Files.exists(contextPath)) {
+        contextPaths.add(contextPath);
+      }
+    }
 
-    return this.contextRoot;
+    return contextPaths;
   }
 
   /**
-   * @return the list of the context files
+   * Loads all {@link Trigger}s of the static context into the local representation
+   *
+   * @return a {@link List} containing all the {@link Trigger}s
    */
-  public List<Path> getContextFiles() {
+  public Map<String, Trigger> loadTriggers() {
 
-    return this.contextFiles;
+    Map<String, Trigger> triggers = new HashMap<>();
+    for (Path contextFile : this.contextConfigurations.keySet()) {
+      ContextConfiguration contextConfiguration = this.contextConfigurations.get(contextFile);
+      for (com.devonfw.cobigen.impl.config.entity.io.Trigger t : contextConfiguration.getTrigger()) {
+        triggers.put(t.getId(), new Trigger(t.getId(), t.getType(), t.getTemplateFolder(),
+            Charset.forName(t.getInputCharset()), loadMatchers(t), loadContainerMatchers(t)));
+      }
+    }
+    return triggers;
   }
 
-}
+}
\ No newline at end of file
diff --git a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/reader/TemplateSetConfigurationManager.java b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/reader/TemplateSetConfigurationManager.java
new file mode 100644
index 0000000000..ddc0cbb428
--- /dev/null
+++ b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/reader/TemplateSetConfigurationManager.java
@@ -0,0 +1,119 @@
+package com.devonfw.cobigen.impl.config.reader;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Stream;
+
+import com.devonfw.cobigen.api.constants.ConfigurationConstants;
+import com.devonfw.cobigen.api.exception.InvalidConfigurationException;
+import com.devonfw.cobigen.api.util.TemplatesJarUtil;
+import com.devonfw.cobigen.impl.util.FileSystemUtil;
+
+/**
+ * This class takes care of finding either adapted or downloaded template-set files.
+ *
+ * TODO: Move into TemplateSetConfigurationReader, see: https://github.com/devonfw/cobigen/issues/1668
+ */
+public class TemplateSetConfigurationManager {
+
+  /** List with the paths of the configuration locations for the template-set.xml files */
+  private Map<Path, Path> configLocations;
+
+  /**
+   * The constructor.
+   */
+  public TemplateSetConfigurationManager() {
+
+    this.configLocations = new HashMap<>();
+
+  }
+
+  /**
+   * @return configLocations
+   */
+  public Map<Path, Path> getConfigLocations() {
+
+    return this.configLocations;
+  }
+
+  /**
+   * Search for configuration files in the sub folders of adapted templates
+   *
+   * @param configRoot root directory of the configuration template-sets/adapted
+   * @return List of Paths to the adapted templateSetFiles
+   */
+  protected List<Path> loadTemplateSetFilesAdapted(Path configRoot) {
+
+    List<Path> templateSetDirectories = retrieveTemplateSetDirectories(configRoot);
+
+    List<Path> adaptedTemplateSets = new ArrayList<>();
+    for (Path templateDirectory : templateSetDirectories) {
+      Path templateSetFilePath = templateDirectory.resolve(ConfigurationConstants.MAVEN_CONFIGURATION_RESOURCE_FOLDER)
+          .resolve(ConfigurationConstants.TEMPLATE_SET_CONFIG_FILENAME);
+
+      // makes sure that only valid template set folders get added
+      if (Files.exists(templateSetFilePath)) {
+        adaptedTemplateSets.add(templateSetFilePath);
+
+        this.configLocations.put(templateSetFilePath, templateDirectory);
+      }
+    }
+
+    return adaptedTemplateSets;
+  }
+
+  /**
+   * Retrieves a list of template set directories
+   *
+   * @param configRoot List of template set directories
+   */
+  private List<Path> retrieveTemplateSetDirectories(Path configRoot) {
+
+    List<Path> templateSetDirectories = new ArrayList<>();
+    try (Stream<Path> files = Files.list(configRoot)) {
+      files.forEach(path -> {
+        if (Files.isDirectory(path)) {
+          templateSetDirectories.add(path);
+        }
+      });
+    } catch (IOException e) {
+      throw new InvalidConfigurationException(configRoot, "Could not read configuration root directory.", e);
+    }
+
+    return templateSetDirectories;
+  }
+
+  /**
+   * Search for configuration files in the subfolder for downloaded template jars
+   *
+   * @param configRoot root directory of the configuration template-sets/downloaded
+   * @return List of Paths to the downloaded templateSetFiles
+   */
+  protected List<Path> loadTemplateSetFilesDownloaded(Path configRoot) {
+
+    // TODO: add check for valid templatesetjar util
+    List<Path> templateJars = TemplatesJarUtil.getJarFiles(configRoot);
+    List<Path> downloadedTemplateSets = new ArrayList<>();
+    if (!templateJars.isEmpty()) {
+      for (Path jarPath : templateJars) {
+        Path configurationPath = FileSystemUtil.createFileSystemDependentPath(jarPath.toUri());
+        Path templateSetFilePath = configurationPath.resolve(ConfigurationConstants.TEMPLATE_SET_CONFIG_FILENAME);
+
+        // makes sure that only valid template set jars get added
+        if (Files.exists(templateSetFilePath)) {
+          downloadedTemplateSets.add(templateSetFilePath);
+          this.configLocations.put(templateSetFilePath, jarPath);
+        }
+
+      }
+    }
+
+    return downloadedTemplateSets;
+  }
+
+}
diff --git a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/reader/TemplateSetConfigurationReader.java b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/reader/TemplateSetConfigurationReader.java
new file mode 100644
index 0000000000..db8b01a58d
--- /dev/null
+++ b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/reader/TemplateSetConfigurationReader.java
@@ -0,0 +1,274 @@
+package com.devonfw.cobigen.impl.config.reader;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.math.BigDecimal;
+import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.xml.XMLConstants;
+import javax.xml.validation.Schema;
+import javax.xml.validation.SchemaFactory;
+
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
+
+import com.devonfw.cobigen.api.constants.ConfigurationConstants;
+import com.devonfw.cobigen.api.exception.InvalidConfigurationException;
+import com.devonfw.cobigen.api.util.ExceptionUtil;
+import com.devonfw.cobigen.api.util.JvmUtil;
+import com.devonfw.cobigen.impl.config.constant.MavenMetadata;
+import com.devonfw.cobigen.impl.config.constant.TemplateSetConfigurationVersion;
+import com.devonfw.cobigen.impl.config.entity.TemplateFolder;
+import com.devonfw.cobigen.impl.config.entity.io.TemplatesConfiguration;
+import com.devonfw.cobigen.impl.config.versioning.VersionValidator;
+import com.devonfw.cobigen.impl.config.versioning.VersionValidator.Type;
+
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.UnmarshalException;
+import jakarta.xml.bind.Unmarshaller;
+
+/**
+ * The {@link TemplateSetConfigurationReader} combines everything from the {@link TemplatesConfigurationReader} and
+ * {@link ContextConfigurationReader}
+ */
+public class TemplateSetConfigurationReader {
+
+  /** Path of the template set configuration file */
+  private Path templateSetFile;
+
+  /** Path of the configuration location for a template-set.xml file e.g. src/main/resources */
+  private Path configLocation;
+
+  /** The static representation of the TemplateSetConfiguration */
+  private com.devonfw.cobigen.impl.config.entity.io.TemplateSetConfiguration templateSetConfiguration;
+
+  /** List with the paths of the configuration locations for the template-set.xml files */
+  // TODO: Check if this map can replace templateSetFile and configLocation, see:
+  // https://github.com/devonfw/cobigen/issues/1668
+  private Map<Path, Path> configLocations = new HashMap<>();
+
+  /**
+   * The {@link com.devonfw.cobigen.impl.config.entity.io.ContextConfiguration}
+   */
+  private com.devonfw.cobigen.impl.config.entity.io.ContextConfiguration contextConfiguration;
+
+  /**
+   * The {@link TemplatesConfiguration} to initialize
+   */
+  private TemplatesConfiguration templatesConfiguration;
+
+  /** The top-level folder where the templates are located. */
+  private TemplateFolder rootTemplateFolder;
+
+  /** The list of adapted template set configuration paths */
+  private List<Path> templateSetConfigurationPathsAdapted;
+
+  /** The list of downloaded template set configuration paths */
+  private List<Path> templateSetConfigurationPathsDownloaded;
+
+  /**
+   * The TemplateSetConfigurationManager manages adapted and downloaded template sets
+   *
+   * TODO: Check if it can be integrated into this reader, see: https://github.com/devonfw/cobigen/issues/1668
+   *
+   */
+  private final TemplateSetConfigurationManager templateSetConfigurationManager = new TemplateSetConfigurationManager();
+
+  /**
+   * The constructor.
+   *
+   * @param configRoot Path of the configuration root directory
+   */
+  public TemplateSetConfigurationReader(Path configRoot) {
+
+    if (configRoot == null) {
+      throw new IllegalArgumentException("Configuration path cannot be null.");
+    }
+
+    this.templateSetConfigurationPathsAdapted = new ArrayList<>();
+    this.templateSetConfigurationPathsDownloaded = new ArrayList<>();
+
+    Path templateSetsDownloaded = configRoot.resolve(ConfigurationConstants.DOWNLOADED_FOLDER);
+    Path templateSetsAdapted = configRoot.resolve(ConfigurationConstants.ADAPTED_FOLDER);
+
+    if (!Files.exists(templateSetsDownloaded) && !Files.exists(templateSetsAdapted)) {
+      throw new InvalidConfigurationException(configRoot,
+          "Could not find any template-set configuration file in the given folder.");
+    } else {
+      if (Files.exists(templateSetsAdapted)) {
+        this.templateSetConfigurationPathsAdapted
+            .addAll(this.templateSetConfigurationManager.loadTemplateSetFilesAdapted(templateSetsAdapted));
+      }
+
+      if (Files.exists(templateSetsDownloaded)) {
+        this.templateSetConfigurationPathsDownloaded
+            .addAll(this.templateSetConfigurationManager.loadTemplateSetFilesDownloaded(templateSetsDownloaded));
+      }
+      this.configLocations = this.templateSetConfigurationManager.getConfigLocations();
+
+      if (this.templateSetConfigurationPathsAdapted.isEmpty()
+          && this.templateSetConfigurationPathsDownloaded.isEmpty()) {
+        throw new InvalidConfigurationException(configRoot,
+            "Could not find any template-set configuration file in the given folder.");
+      }
+    }
+
+  }
+
+  /**
+   * @return contextConfiguration
+   */
+  public com.devonfw.cobigen.impl.config.entity.io.ContextConfiguration getContextConfiguration() {
+
+    return this.contextConfiguration;
+  }
+
+  /**
+   * @return templatesConfiguration
+   */
+  public TemplatesConfiguration getTemplatesConfiguration() {
+
+    return this.templatesConfiguration;
+  }
+
+  /**
+   * @return configLocations
+   */
+  public Map<Path, Path> getConfigLocations() {
+
+    return this.configLocations;
+  }
+
+  /**
+   * @return templateSetConfigurationPaths
+   */
+  public List<Path> getTemplateSetConfigurationPathsAdapted() {
+
+    return this.templateSetConfigurationPathsAdapted;
+  }
+
+  /**
+   * @return templateSetConfigurationPathsDownloaded
+   */
+  public List<Path> getTemplateSetConfigurationPathsDownloaded() {
+
+    return this.templateSetConfigurationPathsDownloaded;
+  }
+
+  /**
+   * @return rootTemplateFolder
+   */
+  public TemplateFolder getRootTemplateFolder() {
+
+    return this.rootTemplateFolder;
+  }
+
+  /**
+   * Reads the template set xml file and initializes the templates and context configurations and readers
+   *
+   * @param templateSetFile Path to template-set xml file
+   */
+  @SuppressWarnings("hiding")
+  public void readConfiguration(Path templateSetFile) {
+
+    this.templateSetFile = templateSetFile;
+    this.configLocation = this.templateSetFile.getParent();
+
+    this.rootTemplateFolder = TemplateFolder.create(this.configLocation);
+
+    if (!Files.exists(this.templateSetFile)) {
+      throw new InvalidConfigurationException(this.templateSetFile, "Could not find templates set configuration file.");
+    }
+
+    // workaround to make JAXB work in OSGi context by
+    // https://github.com/ControlSystemStudio/cs-studio/issues/2530#issuecomment-450991188
+    final ClassLoader orig = Thread.currentThread().getContextClassLoader();
+    if (JvmUtil.isRunningJava9OrLater()) {
+      Thread.currentThread().setContextClassLoader(JAXBContext.class.getClassLoader());
+    }
+
+    try (InputStream in = Files.newInputStream(this.templateSetFile)) {
+      Unmarshaller unmarschaller = JAXBContext
+          .newInstance(com.devonfw.cobigen.impl.config.entity.io.TemplateSetConfiguration.class).createUnmarshaller();
+
+      // Unmarshal without schema checks for getting the version attribute of the root node.
+      // This is necessary to provide an automatic upgrade client later on
+      com.devonfw.cobigen.impl.config.entity.io.TemplateSetConfiguration rootNode = (com.devonfw.cobigen.impl.config.entity.io.TemplateSetConfiguration) unmarschaller
+          .unmarshal(in);
+      BigDecimal configVersion;
+      if (rootNode != null) {
+        configVersion = rootNode.getVersion();
+        if (configVersion == null) {
+          throw new InvalidConfigurationException(this.templateSetFile,
+              "The required 'version' attribute of node \"templateSetConfiguration\" has not been set");
+        } else {
+          VersionValidator validator = new VersionValidator(Type.TEMPLATE_SET_CONFIGURATION, MavenMetadata.VERSION);
+          validator.validate(configVersion.floatValue(), false);
+        }
+      } else {
+        throw new InvalidConfigurationException(this.templateSetFile,
+            "Unknown Root Node. Use \"templateSetConfiguration\" as root Node");
+      }
+
+      // If we reach this point, the configuration version and root node has been validated.
+      // Unmarshal with schema checks for checking the correctness and give the user more hints to
+      // correct his failures
+      SchemaFactory schemaFactory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
+      TemplateSetConfigurationVersion templateSetVersion = TemplateSetConfigurationVersion.getLatest();
+
+      URL schemaStream = getClass().getResource("/schema/" + templateSetVersion + "/templateSetConfiguration.xsd");
+      try (InputStream configInputStream = Files.newInputStream(this.templateSetFile)) {
+
+        Schema schema = schemaFactory.newSchema(schemaStream);
+        unmarschaller.setSchema(schema);
+        rootNode = (com.devonfw.cobigen.impl.config.entity.io.TemplateSetConfiguration) unmarschaller
+            .unmarshal(configInputStream);
+        this.templateSetConfiguration = rootNode;
+
+        this.templatesConfiguration = rootNode.getTemplatesConfiguration();
+        this.contextConfiguration = rootNode.getContextConfiguration();
+
+      }
+    } catch (JAXBException e) {
+      // try getting SAXParseException for better error handling and user support
+      Throwable parseCause = ExceptionUtil.getCause(e, SAXParseException.class, UnmarshalException.class);
+      String message = "";
+      if (parseCause != null && parseCause.getMessage() != null) {
+        message = parseCause.getMessage();
+      }
+
+      throw new InvalidConfigurationException(this.templateSetFile,
+          "Could not parse template set configuration file:\n" + message, e);
+    } catch (SAXException e) {
+      // Should never occur. Programming error.
+      throw new IllegalStateException("Could not parse template set configuration schema. Please state this as a bug.");
+    } catch (NumberFormatException e) {
+      // The version number is currently the only xml value which will be parsed to a number data type
+      // So provide help
+      throw new InvalidConfigurationException(
+          "Invalid version number defined. The version of the template set configuration should consist of 'major.minor' version.");
+    } catch (IOException e) {
+      throw new InvalidConfigurationException(this.templateSetFile, "Could not read template set configuration file.",
+          e);
+    } finally {
+      Thread.currentThread().setContextClassLoader(orig);
+    }
+
+  }
+
+  /**
+   * @return templateSetConfigurations
+   */
+  public com.devonfw.cobigen.impl.config.entity.io.TemplateSetConfiguration getTemplateSetConfiguration() {
+
+    return this.templateSetConfiguration;
+  }
+
+}
diff --git a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/reader/TemplatesConfigurationReader.java b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/reader/TemplatesConfigurationReader.java
index 26c2f1d479..ffc8390e8b 100644
--- a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/reader/TemplatesConfigurationReader.java
+++ b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/reader/TemplatesConfigurationReader.java
@@ -54,7 +54,6 @@
 import com.devonfw.cobigen.impl.config.versioning.VersionValidator.Type;
 import com.devonfw.cobigen.impl.exceptions.UnknownContextVariableException;
 import com.devonfw.cobigen.impl.extension.TemplateEngineRegistry;
-import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 
 import jakarta.xml.bind.JAXBContext;
@@ -86,7 +85,7 @@ public class TemplatesConfigurationReader {
   private JXPathContext xPathContext;
 
   /** Cache to find all templates by name for each template scan */
-  private Map<String, List<String>> templateScanTemplates = Maps.newHashMap();
+  private Map<String, List<String>> templateScanTemplates = new HashMap<>();
 
   /** The top-level folder where the templates are located. */
   private TemplateFolder rootTemplateFolder;
@@ -142,6 +141,24 @@ public TemplatesConfigurationReader(Path projectRoot, String templateFolder, Con
     this.configurationHolder = configurationHolder;
   }
 
+  /**
+   * The constructor which is being used by the {@link TemplateSetConfigurationReader}
+   *
+   * @param templatesConfiguration {@link TemplatesConfiguration} to initialize from
+   *        {@link TemplateSetConfigurationReader}
+   * @param rootTemplateFolder the root template folder
+   * @param configurationHolder The {@link ConfigurationHolder} used for reading templates folder
+   * @param templateSetConfigurationFile Path to template-set xml to be processed
+   */
+  public TemplatesConfigurationReader(TemplatesConfiguration templatesConfiguration, TemplateFolder rootTemplateFolder,
+      ConfigurationHolder configurationHolder, Path templateSetConfigurationFile) {
+
+    this.configurationHolder = configurationHolder;
+    this.configNode = templatesConfiguration;
+    this.configFilePath = templateSetConfigurationFile;
+    this.rootTemplateFolder = rootTemplateFolder;
+  }
+
   /**
    * Returns the configured template engine to be used
    *
diff --git a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/resolver/PathExpressionResolver.java b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/resolver/PathExpressionResolver.java
index ea0e5d8c16..f744da046f 100644
--- a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/resolver/PathExpressionResolver.java
+++ b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/resolver/PathExpressionResolver.java
@@ -1,6 +1,5 @@
 package com.devonfw.cobigen.impl.config.resolver;
 
-import com.devonfw.cobigen.impl.config.ContextConfiguration;
 import com.devonfw.cobigen.impl.config.entity.Variables;
 import com.devonfw.cobigen.impl.exceptions.UnknownContextVariableException;
 
diff --git a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/upgrade/AbstractConfigurationUpgrader.java b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/upgrade/AbstractConfigurationUpgrader.java
index f8ec1364b7..3ceaf8f930 100644
--- a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/upgrade/AbstractConfigurationUpgrader.java
+++ b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/upgrade/AbstractConfigurationUpgrader.java
@@ -8,6 +8,9 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -16,6 +19,7 @@
 import javax.xml.validation.Schema;
 import javax.xml.validation.SchemaFactory;
 
+import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -26,9 +30,11 @@
 import com.devonfw.cobigen.api.exception.CobiGenRuntimeException;
 import com.devonfw.cobigen.api.exception.InvalidConfigurationException;
 import com.devonfw.cobigen.api.exception.NotYetSupportedException;
+import com.devonfw.cobigen.api.util.CobiGenPaths;
 import com.devonfw.cobigen.api.util.ExceptionUtil;
 import com.devonfw.cobigen.api.util.JvmUtil;
 import com.devonfw.cobigen.impl.exceptions.BackupFailedException;
+import com.google.common.collect.Lists;
 
 import jakarta.xml.bind.JAXB;
 import jakarta.xml.bind.JAXBContext;
@@ -53,13 +59,17 @@ public abstract class AbstractConfigurationUpgrader<VERSIONS_TYPE extends Enum<?
   /** All enum values from the versions {@link Enum} */
   private VERSIONS_TYPE[] versions;
 
-  /** Name of the configuration (simple type of the {@link #configurationJaxbRootNode} with whitespaces) */
+  /**
+   * Name of the configuration (simple type of the {@link #configurationJaxbRootNode} with whitespaces)
+   */
   private String configurationName;
 
   /** Standardized file name of the configuration */
   private String configurationFilename;
 
-  /** Name of the configuration (simple type of the {@link #configurationJaxbRootNode} appended by .xsd) */
+  /**
+   * Name of the configuration (simple type of the {@link #configurationJaxbRootNode} appended by .xsd)
+   */
   private String configurationXsdFilename;
 
   /** JAXB root object class of the configuration for (un-)marshalling */
@@ -76,7 +86,6 @@ public abstract class AbstractConfigurationUpgrader<VERSIONS_TYPE extends Enum<?
    * @param version an arbitrary instance to perform reflection on during upgrading.
    * @param configurationJaxbRootNode JAXB root object class of the configuration for (un-)marshalling.
    * @param configurationFilename standardized file name of the configuration
-   * @author mbrunnli (Jun 23, 2015)
    */
   @SuppressWarnings("unchecked")
   AbstractConfigurationUpgrader(VERSIONS_TYPE version, Class<?> configurationJaxbRootNode,
@@ -110,7 +119,7 @@ public abstract class AbstractConfigurationUpgrader<VERSIONS_TYPE extends Enum<?
    */
   public boolean isCompliantToLatestSupportedVersion(Path configurationRoot) {
 
-    return resolveLatestCompatibleSchemaVersion(configurationRoot, true) != null;
+    return resolveLatestCompatibleSchemaVersion(configurationRoot, true, null) != null;
   }
 
   /**
@@ -122,7 +131,21 @@ public boolean isCompliantToLatestSupportedVersion(Path configurationRoot) {
    */
   public VERSIONS_TYPE resolveLatestCompatibleSchemaVersion(Path configurationRoot) {
 
-    return resolveLatestCompatibleSchemaVersion(configurationRoot, false);
+    return resolveLatestCompatibleSchemaVersion(configurationRoot, false, null);
+  }
+
+  /**
+   * Checks, whether the configuration can be read with an old schema version and a maximum version to be used for the
+   * resolver (mainly used for tests)
+   *
+   * @param configurationRoot the root folder containing the configuration
+   * @param maxVersionToUse the latest version to be used for the resolver
+   * @return the newest schema version, the configuration is compliant with or <code>null</code> if the configuration is
+   *         not compliant to any.
+   */
+  public VERSIONS_TYPE resolveLatestCompatibleSchemaVersion(Path configurationRoot, VERSIONS_TYPE maxVersionToUse) {
+
+    return resolveLatestCompatibleSchemaVersion(configurationRoot, false, maxVersionToUse);
   }
 
   /**
@@ -130,38 +153,37 @@ public VERSIONS_TYPE resolveLatestCompatibleSchemaVersion(Path configurationRoot
    *
    * @param configurationRoot the root folder containing the configuration
    * @param justCheckLatestVersion just checks latest supported version and returns
+   * @param maxVersion the latest version to be used for the resolver
    * @return the newest schema version, the configuration is compliant with or <code>null</code> if the configuration is
    *         not compliant to any.
    */
-  private VERSIONS_TYPE resolveLatestCompatibleSchemaVersion(Path configurationRoot, boolean justCheckLatestVersion) {
+  private VERSIONS_TYPE resolveLatestCompatibleSchemaVersion(Path configurationRoot, boolean justCheckLatestVersion,
+      VERSIONS_TYPE maxVersion) {
 
     LOG.info("Try reading {} (including trails with legacy schema).", this.configurationName);
 
-    Path configurationFile = configurationRoot.resolve(this.configurationFilename);
+    Path configurationFile = configurationRoot.endsWith(this.configurationFilename) ? configurationRoot
+        : configurationRoot.resolve(this.configurationFilename);
 
-    for (int i = this.versions.length - 1; i >= 0; i--) {
-      VERSIONS_TYPE lv = this.versions[i];
-      LOG.info("Try {} schema '{}'.", this.configurationName, lv.toString());
-      try {
-        Class<?> jaxbConfigurationClass = getJaxbConfigurationClass(lv);
-        Object rootNode = unmarshallConfiguration(configurationFile, lv, jaxbConfigurationClass);
-
-        // check, whether the read node can be casted to the correct configuration root node object
-        if (!jaxbConfigurationClass.isAssignableFrom(rootNode.getClass())) {
-          LOG.info("It was not possible to read {} with schema '{}' .", this.configurationName, lv.toString());
-        } else {
-          LOG.info("It was possible to read {} with schema '{}' .", this.configurationName, lv.toString());
-          return lv;
-        }
-      } catch (Throwable e) {
-        Throwable cause = ExceptionUtil.getCause(e, SAXParseException.class, UnmarshalException.class);
-        if (cause != null && cause.getMessage() != null) {
-          LOG.info("Not able to read {} configuration with schema '{}': {}", this.configurationName, lv.toString(),
-              cause.getMessage());
-        } else {
-          LOG.warn("Not able to read {} configuration with schema '{}' .", this.configurationName, lv.toString(), e);
+    if (maxVersion != null) {
+      List<VERSIONS_TYPE> reducedVersionsList = limitVersions(maxVersion);
+
+      for (VERSIONS_TYPE version : Lists.reverse(reducedVersionsList)) {
+        if (isConfgurationFileCompatibleToSchemaVersion(version, configurationFile)) {
+          return version;
         }
       }
+      LOG.info("Could not read configuration {} (with versions limited to: {}).", this.configurationName, maxVersion);
+      return null;
+    }
+
+    VERSIONS_TYPE[] reversedVersions = Arrays.copyOf(this.versions, this.versions.length);
+    ArrayUtils.reverse(reversedVersions);
+
+    for (VERSIONS_TYPE version : Arrays.asList(reversedVersions)) {
+      if (isConfgurationFileCompatibleToSchemaVersion(version, configurationFile)) {
+        return version;
+      }
 
       if (justCheckLatestVersion) {
         LOG.info("Could not read configuration {} with schema {} (latest).", this.configurationName,
@@ -173,6 +195,59 @@ private VERSIONS_TYPE resolveLatestCompatibleSchemaVersion(Path configurationRoo
     return null;
   }
 
+  /**
+   * Limits the version list to the maximum version provided
+   *
+   * @param maxVersion maximum version to set
+   * @return List of new versions reduced by maximum version
+   */
+  private List<VERSIONS_TYPE> limitVersions(VERSIONS_TYPE maxVersion) {
+
+    List<VERSIONS_TYPE> versionsList = new ArrayList<>(Arrays.asList(this.versions));
+    List<VERSIONS_TYPE> reducedVersionsList = new ArrayList<>();
+    for (VERSIONS_TYPE version : versionsList) {
+      if (version.ordinal() <= maxVersion.ordinal()) {
+        reducedVersionsList.add(version);
+      }
+    }
+    return reducedVersionsList;
+  }
+
+  /**
+   * Checks if the provided version is compatible to the provided configuration file
+   *
+   * @param version current version to validate against
+   * @param configurationFile current configuration file to validate with version
+   * @return true if the version is compatible to the configuration file and false if not
+   */
+  private boolean isConfgurationFileCompatibleToSchemaVersion(VERSIONS_TYPE version, Path configurationFile) {
+
+    LOG.info("Try {} schema '{}'.", this.configurationName, version.toString());
+    try {
+      Class<?> jaxbConfigurationClass = getJaxbConfigurationClass(version);
+      Object rootNode = unmarshallConfiguration(configurationFile, version, jaxbConfigurationClass);
+
+      // check, whether the read node can be casted to the correct configuration root
+      // node object
+      if (!jaxbConfigurationClass.isAssignableFrom(rootNode.getClass())) {
+        LOG.info("It was not possible to read {} with schema '{}' .", this.configurationName, version.toString());
+      } else {
+        LOG.info("It was possible to read {} with schema '{}' .", this.configurationName, version.toString());
+        return true;
+      }
+    } catch (Throwable e) {
+      Throwable cause = ExceptionUtil.getCause(e, SAXParseException.class, UnmarshalException.class);
+      if (cause != null && cause.getMessage() != null) {
+        LOG.info("Not able to read {} configuration with schema '{}': {}", this.configurationName, version.toString(),
+            cause.getMessage());
+      } else {
+        LOG.warn("Not able to read {} configuration with schema '{}' .", this.configurationName, version.toString(), e);
+      }
+    }
+
+    return false;
+  }
+
   /**
    * Upgrades the configuration to the latest supported version.
    *
@@ -185,56 +260,91 @@ private VERSIONS_TYPE resolveLatestCompatibleSchemaVersion(Path configurationRoo
    */
   public boolean upgradeConfigurationToLatestVersion(Path configurationRoot, BackupPolicy backupPolicy) {
 
+    return upgradeConfigurationToLatestVersion(configurationRoot, backupPolicy, null);
+  }
+
+  /**
+   * Upgrades the configuration to the latest supported version with option to limit lookup of the maximum version.
+   *
+   * @param templatesProject the path to the templates project
+   * @param backupPolicy the {@link BackupPolicy} to choose if a backup is necessary or not.
+   * @param maxVersion the latest version to be used for the upgrade (limits the versions to choose from)
+   * @return if a manual adoptions has to be performed after upgrading
+   * @throws BackupFailedException if the backup could not be created
+   *
+   *         configurationRoot the root folder containing the configuration with the specified
+   *         {@link #configurationFilename}. See {@link #AbstractConfigurationUpgrader(Enum, Class, String)} for more
+   *         information.
+   */
+  public boolean upgradeConfigurationToLatestVersion(Path templatesProject, BackupPolicy backupPolicy,
+      VERSIONS_TYPE maxVersion) {
+
+    Path configurationLocation = templatesProject;
+    if (this.getClass().equals(ContextConfigurationUpgrader.class))
+      configurationLocation = CobiGenPaths.getContextLocation(templatesProject);
+
     boolean manualAdoptionsNecessary = false;
 
-    VERSIONS_TYPE currentVersion = resolveLatestCompatibleSchemaVersion(configurationRoot);
-    Path configurationFile = configurationRoot.resolve(this.configurationFilename);
-    if (currentVersion == null) {
+    VERSIONS_TYPE validatedVersion;
+    List<VERSIONS_TYPE> versionsList = new ArrayList<>();
+
+    // check if versions need to be limited
+    if (maxVersion != null) {
+      versionsList = limitVersions(maxVersion);
+      validatedVersion = resolveLatestCompatibleSchemaVersion(configurationLocation, maxVersion);
+    } else {
+      versionsList = Arrays.asList(this.versions);
+      validatedVersion = resolveLatestCompatibleSchemaVersion(configurationLocation);
+    }
+
+    Path configurationFile = configurationLocation.resolve(this.configurationFilename);
+    if (validatedVersion == null) {
       throw new InvalidConfigurationException(configurationFile.toUri().toString(),
           StringUtils.capitalize(this.configurationName) + " does not match any current or legacy schema definitions.");
     } else {
-      VERSIONS_TYPE latestVersion = this.versions[this.versions.length - 1];
+      VERSIONS_TYPE latestVersion = versionsList.get(0);
       // increasing iteration of versions
-      for (int i = 0; i < this.versions.length; i++) {
-        if (currentVersion == latestVersion) {
+      for (int i = 0; i < versionsList.size(); i++) {
+        if (validatedVersion == latestVersion) {
           break; // already up to date
         }
-        if (currentVersion == this.versions[i]) {
+        if (validatedVersion == versionsList.get(i)) {
           LOG.info("Upgrading {} '{}' from version {} to {}...", this.configurationName, configurationFile.toUri(),
-              this.versions[i], this.versions[i + 1]);
+              versionsList.get(i), versionsList.get(i + 1));
 
           Object rootNode;
           try {
-            Class<?> jaxbConfigurationClass = getJaxbConfigurationClass(this.versions[i]);
-            rootNode = unmarshallConfiguration(configurationFile, this.versions[i], jaxbConfigurationClass);
+            Class<?> jaxbConfigurationClass = getJaxbConfigurationClass(versionsList.get(i));
+            rootNode = unmarshallConfiguration(configurationFile, versionsList.get(i), jaxbConfigurationClass);
 
             createBackup(configurationFile, backupPolicy);
 
-            // NotYetSupportedException
-            ConfigurationUpgradeResult result = performNextUpgradeStep(this.versions[i], rootNode);
-            manualAdoptionsNecessary |= result.areManualAdoptionsNecessary();
-
-            try (OutputStream out = Files.newOutputStream(configurationFile)) {
-              JAXB.marshal(result.getResultConfigurationJaxbRootNode(), out);
+            List<ConfigurationUpgradeResult> results = performNextUpgradeStep(versionsList.get(i), rootNode,
+                templatesProject);
+            for (ConfigurationUpgradeResult result : results) {
+
+              manualAdoptionsNecessary |= result.areManualAdoptionsNecessary();
+              try (OutputStream out = Files.newOutputStream(result.getConfigurationPath())) {
+                JAXB.marshal(result.getResultConfigurationJaxbRootNode(), out);
+              }
+
+              // implicitly check upgrade step
+              VERSIONS_TYPE currentVersion = resolveLatestCompatibleSchemaVersion(result.getConfigurationPath());
+              // if CobiGen does not understand the upgraded file... throw exception
+              if (currentVersion == null) {
+                throw new CobiGenRuntimeException("An error occurred while upgrading " + this.configurationName
+                    + " from version " + versionsList.get(i) + " to " + versionsList.get(i + 1) + ".");
+              }
             }
-
-            // implicitly check upgrade step
-            currentVersion = resolveLatestCompatibleSchemaVersion(configurationRoot);
-
           } catch (NotYetSupportedException | BackupFailedException e) {
             throw e;
           } catch (Throwable e) {
             throw new CobiGenRuntimeException(
                 "An unexpected exception occurred while upgrading the " + this.configurationName + " from version '"
-                    + this.versions[i] + "' to '" + this.versions[i + 1] + "'.",
+                    + versionsList.get(i) + "' to '" + versionsList.get(i + 1) + "'.",
                 e);
           }
 
-          // if CobiGen does not understand the upgraded file... throw exception
-          if (currentVersion == null) {
-            throw new CobiGenRuntimeException("An error occurred while upgrading " + this.configurationName
-                + " from version " + this.versions[i] + " to " + this.versions[i + 1] + ".");
-          }
         }
       }
     }
@@ -247,14 +357,15 @@ public boolean upgradeConfigurationToLatestVersion(Path configurationRoot, Backu
    *
    * @param source version from which to upgrade to the latest version.
    * @param previousConfigurationRootNode JAXB configuration root node of the configuration to be upgraded
+   * @param configurationRoot the directory where the configuration is located
    * @return {@link ConfigurationUpgradeResult}, which contains the JAXB root node of the upgraded configuration.
    *         Further it contains a flag to indicate manual adoptions to be necessary after upgrading.
    * @throws Exception Any exception thrown during processing will be wrapped into a {@link CobiGenRuntimeException} by
    *         the {@link AbstractConfigurationUpgrader} with an appropriate message. {@link NotYetSupportedException}s
    *         will be forwarded untouched to the user.
    */
-  protected abstract ConfigurationUpgradeResult performNextUpgradeStep(VERSIONS_TYPE source,
-      Object previousConfigurationRootNode) throws Exception;
+  protected abstract List<ConfigurationUpgradeResult> performNextUpgradeStep(VERSIONS_TYPE source,
+      Object previousConfigurationRootNode, Path configurationRoot) throws Exception;
 
   /**
    * Creates a backup of the given file. If ignoreFailedBackup is set to <code>true</code>, the backup will silently log
@@ -278,7 +389,8 @@ private void createBackup(Path file, BackupPolicy backupPolicy) {
       }
       Path backupPath = file.resolveSibling(backupFilename);
       try {
-        Files.copy(file, backupPath, StandardCopyOption.COPY_ATTRIBUTES);
+        if (!Files.exists(backupPath))
+          Files.copy(file, backupPath, StandardCopyOption.COPY_ATTRIBUTES);
         LOG.info("Backup of templates configuration file created ('{}').", backupPath.toUri());
         break;
       } catch (FileAlreadyExistsException e) {
diff --git a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/upgrade/ConfigurationUpgradeResult.java b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/upgrade/ConfigurationUpgradeResult.java
index a8676dcc9a..c6746890ea 100644
--- a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/upgrade/ConfigurationUpgradeResult.java
+++ b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/upgrade/ConfigurationUpgradeResult.java
@@ -1,23 +1,47 @@
 package com.devonfw.cobigen.impl.config.upgrade;
 
+import java.nio.file.Path;
+
 /**
  * Result object encompassing all results from a configuration upgrade step.
- *
- * @author mbrunnli (Jun 23, 2015)
  */
 public class ConfigurationUpgradeResult {
 
   /** The JAXB root node of the upgraded configuration */
   private Object resultConfigurationJaxbRootNode;
 
-  /** States, whether manual adoptions are necessary after the automatic upgrade to work properly */
+  /** The Path to the upgraded configuration */
+  private Path configurationPath;
+
+  /**
+   * Returns the value of the field 'configurationPath'
+   *
+   * @return {@link Path} to the configuration
+   */
+  public Path getConfigurationPath() {
+
+    return this.configurationPath;
+  }
+
+  /**
+   * Sets the field 'configurationPath'
+   *
+   * @param {@link Path} to the configuration
+   */
+  public void setConfigurationPath(Path configurationPath) {
+
+    this.configurationPath = configurationPath;
+  }
+
+  /**
+   * States, whether manual adoptions are necessary after the automatic upgrade to work properly
+   */
   private boolean manualAdoptionsNecessary;
 
   /**
    * Returns the field 'resultConfigurationJaxbRootNode'
    *
    * @return value of resultConfigurationJaxbRootNode
-   * @author mbrunnli (Jun 23, 2015)
    */
   public Object getResultConfigurationJaxbRootNode() {
 
@@ -25,21 +49,22 @@ public Object getResultConfigurationJaxbRootNode() {
   }
 
   /**
-   * Sets the field 'resultConfigurationJaxbRootNode'.
+   * Sets the field 'resultConfigurationJaxbRootNode' and 'configurationPath'.
    *
    * @param resultConfigurationJaxbRootNode new value of resultConfigurationJaxbRootNode
-   * @author mbrunnli (Jun 23, 2015)
+   * @param {{@link Path} new value of configurationPath
    */
-  public void setResultConfigurationJaxbRootNode(Object resultConfigurationJaxbRootNode) {
+  public void setResultConfigurationJaxbRootNodeAndPath(Object resultConfigurationJaxbRootNode,
+      Path configurationPath) {
 
     this.resultConfigurationJaxbRootNode = resultConfigurationJaxbRootNode;
+    this.configurationPath = configurationPath;
   }
 
   /**
    * Returns the field 'manualAdoptionsNecessary'
    *
    * @return value of manualAdoptionsNecessary
-   * @author mbrunnli (Jun 23, 2015)
    */
   public boolean areManualAdoptionsNecessary() {
 
@@ -50,7 +75,6 @@ public boolean areManualAdoptionsNecessary() {
    * Sets the field 'manualAdoptionsNecessary'.
    *
    * @param manualAdoptionsNecessary new value of manualAdoptionsNecessary
-   * @author mbrunnli (Jun 23, 2015)
    */
   public void setManualAdoptionsNecessary(boolean manualAdoptionsNecessary) {
 
diff --git a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/upgrade/ContextConfigurationUpgrader.java b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/upgrade/ContextConfigurationUpgrader.java
index 3b62461f65..32c4e8b08c 100644
--- a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/upgrade/ContextConfigurationUpgrader.java
+++ b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/upgrade/ContextConfigurationUpgrader.java
@@ -1,10 +1,14 @@
 package com.devonfw.cobigen.impl.config.upgrade;
 
 import java.math.BigDecimal;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 
 import com.devonfw.cobigen.api.constants.ConfigurationConstants;
 import com.devonfw.cobigen.api.exception.NotYetSupportedException;
-import com.devonfw.cobigen.impl.config.ContextConfiguration;
+import com.devonfw.cobigen.api.util.CobiGenPaths;
 import com.devonfw.cobigen.impl.config.constant.ContextConfigurationVersion;
 
 import ma.glasnost.orika.MapperFacade;
@@ -14,42 +18,39 @@
 /**
  * This class encompasses all logic for legacy context configuration detection and upgrading these to the latest
  * supported version.
- *
- * @author mbrunnli (Jun 22, 2015)
  */
 public class ContextConfigurationUpgrader extends AbstractConfigurationUpgrader<ContextConfigurationVersion> {
 
   /**
    * Creates a new {@link ContextConfigurationUpgrader} instance.
-   *
-   * @author mbrunnli (Jun 23, 2015)
    */
   public ContextConfigurationUpgrader() {
 
-    super(ContextConfigurationVersion.v1_0, ContextConfiguration.class, ConfigurationConstants.CONTEXT_CONFIG_FILENAME);
+    super(ContextConfigurationVersion.v1_0, com.devonfw.cobigen.impl.config.entity.io.v1_0.ContextConfiguration.class,
+        ConfigurationConstants.CONTEXT_CONFIG_FILENAME);
   }
 
   @Override
-  protected ConfigurationUpgradeResult performNextUpgradeStep(ContextConfigurationVersion source,
-      Object previousConfigurationRootNode) throws Exception {
+  protected List<ConfigurationUpgradeResult> performNextUpgradeStep(ContextConfigurationVersion source,
+      Object previousConfigurationRootNode, Path templatesLocation) throws Exception {
 
+    Path configurationRoot = CobiGenPaths.getContextLocation(templatesLocation);
     ConfigurationUpgradeResult result = new ConfigurationUpgradeResult();
     MapperFactory mapperFactory;
     MapperFacade mapper;
-    com.devonfw.cobigen.impl.config.entity.io.v2_2.ContextConfiguration upgradedConfig;
-
+    com.devonfw.cobigen.impl.config.entity.io.v2_1.ContextConfiguration upgradedConfig_2_1;
+    List<ConfigurationUpgradeResult> results = new ArrayList<>();
     switch (source) {
       case v2_0:
 
-      case v2_1:
         mapperFactory = new DefaultMapperFactory.Builder().useAutoMapping(true).mapNulls(true).build();
         mapperFactory
             .classMap(com.devonfw.cobigen.impl.config.entity.io.v2_0.ContextConfiguration.class,
-                com.devonfw.cobigen.impl.config.entity.io.v2_2.ContextConfiguration.class)
+                com.devonfw.cobigen.impl.config.entity.io.v2_1.ContextConfiguration.class)
             .field("triggers.trigger", "trigger").byDefault().register();
         mapperFactory
             .classMap(com.devonfw.cobigen.impl.config.entity.io.v2_0.ContainerMatcher.class,
-                com.devonfw.cobigen.impl.config.entity.io.v2_2.ContainerMatcher.class)
+                com.devonfw.cobigen.impl.config.entity.io.v2_1.ContainerMatcher.class)
             .field(
                 "retrieveObjectsRecursively:{isRetrieveObjectsRecursively|setRetrieveObjectsRecursively(new Boolean(%s))|type=java.lang.Boolean}",
                 "retrieveObjectsRecursively:{isRetrieveObjectsRecursively|setRetrieveObjectsRecursively(new Boolean(%s))|type=java.lang.Boolean}")
@@ -57,19 +58,31 @@ protected ConfigurationUpgradeResult performNextUpgradeStep(ContextConfiguration
 
         mapper = mapperFactory.getMapperFacade();
 
-        upgradedConfig = mapper.map(previousConfigurationRootNode,
-            com.devonfw.cobigen.impl.config.entity.io.v2_2.ContextConfiguration.class);
-        upgradedConfig.setVersion(new BigDecimal("2.2"));
+        upgradedConfig_2_1 = mapper.map(previousConfigurationRootNode,
+            com.devonfw.cobigen.impl.config.entity.io.v2_1.ContextConfiguration.class);
+        upgradedConfig_2_1.setVersion(new BigDecimal("2.1"));
 
-        result.setResultConfigurationJaxbRootNode(upgradedConfig);
+        result.setResultConfigurationJaxbRootNodeAndPath(upgradedConfig_2_1,
+            configurationRoot.resolve(ConfigurationConstants.CONTEXT_CONFIG_FILENAME));
+        results.add(result);
 
+        break;
+      case v2_1:
+        TemplateSetUpgrader templatesSetUpgrader = new TemplateSetUpgrader();
+        Map<com.devonfw.cobigen.impl.config.entity.io.v3_0.ContextConfiguration, Path> contextMap = templatesSetUpgrader
+            .upgradeTemplatesToTemplateSets(templatesLocation);
+        for (com.devonfw.cobigen.impl.config.entity.io.v3_0.ContextConfiguration context : contextMap.keySet()) {
+          ConfigurationUpgradeResult tempResult = new ConfigurationUpgradeResult();
+          tempResult.setResultConfigurationJaxbRootNodeAndPath(context, contextMap.get(context));
+          results.add(tempResult);
+        }
         break;
       default:
         throw new NotYetSupportedException(
             "An upgrade of the context configuration from a version previous to v2.0 is not yet supported.");
     }
 
-    return result;
+    return results;
   }
 
 }
diff --git a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/upgrade/TemplateConfigurationUpgrader.java b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/upgrade/TemplateConfigurationUpgrader.java
index 0ba55934fb..78083353fa 100644
--- a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/upgrade/TemplateConfigurationUpgrader.java
+++ b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/upgrade/TemplateConfigurationUpgrader.java
@@ -1,11 +1,13 @@
 package com.devonfw.cobigen.impl.config.upgrade;
 
 import java.math.BigDecimal;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
 
 import com.devonfw.cobigen.api.constants.ConfigurationConstants;
 import com.devonfw.cobigen.api.exception.NotYetSupportedException;
 import com.devonfw.cobigen.impl.config.constant.TemplatesConfigurationVersion;
-import com.devonfw.cobigen.impl.config.entity.io.TemplatesConfiguration;
 import com.devonfw.cobigen.impl.config.entity.io.v1_2.Increment;
 import com.devonfw.cobigen.impl.config.entity.io.v1_2.IncrementRef;
 import com.devonfw.cobigen.impl.config.entity.io.v1_2.Template;
@@ -20,26 +22,24 @@
 /**
  * This class encompasses all logic for legacy templates configuration detection and upgrading these to the latest
  * supported version.
- *
- * @author mbrunnli (Jun 22, 2015)
  */
 public class TemplateConfigurationUpgrader extends AbstractConfigurationUpgrader<TemplatesConfigurationVersion> {
 
   /**
    * Creates a new {@link TemplateConfigurationUpgrader} instance.
-   *
-   * @author mbrunnli (Jun 23, 2015)
    */
   public TemplateConfigurationUpgrader() {
 
-    super(TemplatesConfigurationVersion.v1_0, TemplatesConfiguration.class,
+    super(TemplatesConfigurationVersion.v1_0,
+        com.devonfw.cobigen.impl.config.entity.io.v1_0.TemplatesConfiguration.class,
         ConfigurationConstants.TEMPLATES_CONFIG_FILENAME);
   }
 
   @Override
-  protected ConfigurationUpgradeResult performNextUpgradeStep(TemplatesConfigurationVersion source,
-      Object previousConfigurationRootNode) throws Exception {
+  protected List<ConfigurationUpgradeResult> performNextUpgradeStep(TemplatesConfigurationVersion source,
+      Object previousConfigurationRootNode, Path configurationRoot) throws Exception {
 
+    List<ConfigurationUpgradeResult> results = new ArrayList<>();
     ConfigurationUpgradeResult result = new ConfigurationUpgradeResult();
 
     switch (source) {
@@ -65,7 +65,33 @@ protected ConfigurationUpgradeResult performNextUpgradeStep(TemplatesConfigurati
             previousConfigurationRootNode, com.devonfw.cobigen.impl.config.entity.io.v2_1.TemplatesConfiguration.class);
         upgradedConfig.setVersion(new BigDecimal("2.1"));
 
-        result.setResultConfigurationJaxbRootNode(upgradedConfig);
+        result.setResultConfigurationJaxbRootNodeAndPath(upgradedConfig,
+            configurationRoot.resolve(ConfigurationConstants.TEMPLATES_CONFIG_FILENAME));
+        results.add(result);
+      }
+        break;
+      case v2_1: { // to 4.0
+        MapperFactory mapperFactory = new DefaultMapperFactory.Builder().mapNulls(true).useAutoMapping(true).build();
+        MapperFacade mapper = mapperFactory.getMapperFacade();
+        com.devonfw.cobigen.impl.config.entity.io.v4_0.TemplatesConfiguration upgradedConfig = mapper.map(
+            previousConfigurationRootNode, com.devonfw.cobigen.impl.config.entity.io.v4_0.TemplatesConfiguration.class);
+        upgradedConfig.setVersion(new BigDecimal("4.0"));
+
+        result.setResultConfigurationJaxbRootNodeAndPath(upgradedConfig,
+            configurationRoot.resolve(ConfigurationConstants.TEMPLATES_CONFIG_FILENAME));
+        results.add(result);
+      }
+        break;
+      case v4_0: { // to 5.0
+        MapperFactory mapperFactory = new DefaultMapperFactory.Builder().mapNulls(true).useAutoMapping(true).build();
+        MapperFacade mapper = mapperFactory.getMapperFacade();
+        com.devonfw.cobigen.impl.config.entity.io.v5_0.TemplatesConfiguration upgradedConfig = mapper.map(
+            previousConfigurationRootNode, com.devonfw.cobigen.impl.config.entity.io.v5_0.TemplatesConfiguration.class);
+        upgradedConfig.setVersion(new BigDecimal("5.0"));
+
+        result.setResultConfigurationJaxbRootNodeAndPath(upgradedConfig,
+            configurationRoot.resolve(ConfigurationConstants.TEMPLATES_CONFIG_FILENAME));
+        results.add(result);
       }
         break;
       default:
@@ -73,7 +99,7 @@ protected ConfigurationUpgradeResult performNextUpgradeStep(TemplatesConfigurati
             + " to a newer one is currently not supported.");
     }
 
-    return result;
+    return results;
   }
 
 }
diff --git a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/upgrade/TemplateSetUpgrader.java b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/upgrade/TemplateSetUpgrader.java
new file mode 100644
index 0000000000..4216efa9e6
--- /dev/null
+++ b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/upgrade/TemplateSetUpgrader.java
@@ -0,0 +1,315 @@
+package com.devonfw.cobigen.impl.config.upgrade;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.math.BigDecimal;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.io.FileUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.devonfw.cobigen.api.constants.ConfigurationConstants;
+import com.devonfw.cobigen.api.constants.MavenConstants;
+import com.devonfw.cobigen.api.exception.CobiGenRuntimeException;
+import com.devonfw.cobigen.api.exception.InvalidConfigurationException;
+import com.devonfw.cobigen.api.util.CobiGenPaths;
+import com.devonfw.cobigen.impl.config.entity.io.Trigger;
+import com.devonfw.cobigen.impl.config.entity.io.v3_0.Link;
+import com.devonfw.cobigen.impl.config.entity.io.v3_0.Links;
+import com.devonfw.cobigen.impl.config.entity.io.v3_0.Tag;
+import com.devonfw.cobigen.impl.config.entity.io.v3_0.Tags;
+
+import jakarta.xml.bind.JAXB;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Unmarshaller;
+import ma.glasnost.orika.MapperFacade;
+import ma.glasnost.orika.MapperFactory;
+import ma.glasnost.orika.impl.DefaultMapperFactory;
+
+/**
+ * Upgrader for the templates from v2_1 to v3_0 that splits the monolithic template structure into version 3.0 with
+ * template sets
+ */
+public class TemplateSetUpgrader {
+
+  /** Logger instance. */
+  private static final Logger LOG = LoggerFactory.getLogger(TemplateSetUpgrader.class);
+
+  /** Mapper factory instance. */
+  private MapperFactory mapperFactory;
+
+  /** Mapper Facade instance. */
+  private MapperFacade mapper;
+
+  /**
+   * Creates a new {@link TemplateSetUpgrader} instance to upgrade v2.1 ContextConfigurations to v3.0
+   */
+  public TemplateSetUpgrader() {
+
+    this.mapperFactory = new DefaultMapperFactory.Builder().useAutoMapping(true).mapNulls(true).build();
+    this.mapperFactory
+        .classMap(com.devonfw.cobigen.impl.config.entity.io.v3_0.ContainerMatcher.class,
+            com.devonfw.cobigen.impl.config.entity.io.v3_0.ContainerMatcher.class)
+        .field(
+            "retrieveObjectsRecursively:{isRetrieveObjectsRecursively|setRetrieveObjectsRecursively(new Boolean(%s))|type=java.lang.Boolean}",
+            "retrieveObjectsRecursively:{isRetrieveObjectsRecursively|setRetrieveObjectsRecursively(new Boolean(%s))|type=java.lang.Boolean}")
+        .byDefault().register();
+    this.mapperFactory.classMap(com.devonfw.cobigen.impl.config.entity.io.v3_0.Trigger.class,
+        com.devonfw.cobigen.impl.config.entity.io.v3_0.Trigger.class).byDefault().register();
+    this.mapperFactory.classMap(com.devonfw.cobigen.impl.config.entity.io.v3_0.Matcher.class,
+        com.devonfw.cobigen.impl.config.entity.io.v3_0.Matcher.class).byDefault().register();
+    this.mapperFactory
+        .classMap(com.devonfw.cobigen.impl.config.entity.io.v3_0.ContainerMatcher.class,
+            com.devonfw.cobigen.impl.config.entity.io.v3_0.ContainerMatcher.class)
+        .field(
+            "retrieveObjectsRecursively:{isRetrieveObjectsRecursively|setRetrieveObjectsRecursively(new Boolean(%s))|type=java.lang.Boolean}",
+            "retrieveObjectsRecursively:{isRetrieveObjectsRecursively|setRetrieveObjectsRecursively(new Boolean(%s))|type=java.lang.Boolean}")
+        .byDefault().register();
+    this.mapper = this.mapperFactory.getMapperFacade();
+  }
+
+  /**
+   * Upgrades the ContextConfiguration from v2.1 to the new structure from v3.0. The monolithic pom and context files
+   * will be split into multiple files corresponding to every template set that will be created.
+   *
+   * @param templatesLocation Path to the templates location
+   *
+   * @return {@link Map} collection that contains the upgraded v3.0
+   *         {@link com.devonfw.cobigen.impl.config.entity.io.v3_0.ContextConfiguration} as key and a {@link Path} for
+   *         the new location of the context.xml as value
+   * @throws Exception if an issue occurred in directory copy operations
+   */
+  public Map<com.devonfw.cobigen.impl.config.entity.io.v3_0.ContextConfiguration, Path> upgradeTemplatesToTemplateSets(
+      Path templatesLocation) throws Exception {
+
+    Path cobigenTemplatesFolder = CobiGenPaths.getPomLocation(templatesLocation);
+    Path parentOfCobigenTemplates = cobigenTemplatesFolder.getParent();
+    Path templateSets = null;
+    File folderToRename = null;
+    Path backupFolder = null;
+    if (parentOfCobigenTemplates.endsWith(ConfigurationConstants.TEMPLATES_FOLDER)) {
+      // #1 case Here we need to rename parentOfCobigenTemplates to template-sets
+      templateSets = parentOfCobigenTemplates.getParent().resolve(ConfigurationConstants.TEMPLATE_SETS_FOLDER);
+      folderToRename = parentOfCobigenTemplates.toFile();
+      backupFolder = parentOfCobigenTemplates.getParent().resolve(ConfigurationConstants.BACKUP_FOLDER);
+    } else {
+      // #2 case we need to rename cobigenTemplatesFolder to template-sets, this is only the case if the
+      // parentOfCobigenTemplates name is not "templates"
+      templateSets = parentOfCobigenTemplates.resolve(ConfigurationConstants.TEMPLATE_SETS_FOLDER);
+      folderToRename = cobigenTemplatesFolder.toFile();
+      backupFolder = parentOfCobigenTemplates.resolve(ConfigurationConstants.BACKUP_FOLDER);
+    }
+    // backup of old files
+    Files.createDirectory(backupFolder);
+    try {
+      FileUtils.copyDirectoryToDirectory(folderToRename, backupFolder.toFile());
+    } catch (IOException e) {
+      LOG.error("An error occured while backing up the old template folder", e);
+      throw new CobiGenRuntimeException(e.getMessage(), e);
+    }
+
+    Path adapted = folderToRename.toPath().resolve(ConfigurationConstants.ADAPTED_FOLDER);
+    if (Files.exists(templateSets)) {
+      throw new CobiGenRuntimeException("template-sets folder already exists!");
+    }
+    if (!Files.exists(adapted)) {
+      Files.createDirectory(adapted);
+    }
+    Path folderOfContextLocation = CobiGenPaths.getContextLocation(templatesLocation);
+
+    com.devonfw.cobigen.impl.config.entity.io.v2_1.ContextConfiguration contextConfiguration = getContextConfiguration(
+        folderOfContextLocation);
+
+    List<com.devonfw.cobigen.impl.config.entity.io.v3_0.ContextConfiguration> contextFiles = splitContext(
+        contextConfiguration);
+    Map<com.devonfw.cobigen.impl.config.entity.io.v3_0.ContextConfiguration, Path> contextMap = new HashMap<>();
+    for (com.devonfw.cobigen.impl.config.entity.io.v3_0.ContextConfiguration cc : contextFiles) {
+      for (com.devonfw.cobigen.impl.config.entity.io.v3_0.Trigger trigger : cc.getTrigger()) {
+        Path triggerFolder = folderOfContextLocation.resolve(trigger.getTemplateFolder());
+        Path newTriggerFolder = adapted.resolve(trigger.getTemplateFolder());
+        Path utilsPath = folderOfContextLocation.getParent().resolve("java");
+        try {
+          FileUtils.copyDirectory(triggerFolder.toFile(),
+              newTriggerFolder.resolve(ConfigurationConstants.TEMPLATE_RESOURCE_FOLDER).toFile());
+        } catch (Exception e) {
+          LOG.error("An error occurred while copying the template Folder", e);
+          throw new CobiGenRuntimeException(e.getMessage(), e);
+        }
+        try {
+          if (Files.exists(utilsPath)) {
+            FileUtils.copyDirectory(utilsPath.toFile(),
+                newTriggerFolder.resolve(ConfigurationConstants.UTIL_RESOURCE_FOLDER).toFile());
+          }
+        } catch (Exception e) {
+          LOG.error("An error occurred while copying the template utilities Folder", e);
+          throw new CobiGenRuntimeException(e.getMessage(), e);
+        }
+
+        Path newContextPath = newTriggerFolder.resolve(ConfigurationConstants.TEMPLATE_RESOURCE_FOLDER)
+            .resolve(ConfigurationConstants.CONTEXT_CONFIG_FILENAME);
+        contextMap.put(cc, newContextPath);
+        // creates actual context configuration file
+        try (OutputStream out = Files.newOutputStream(newContextPath)) {
+          JAXB.marshal(cc, out);
+        }
+        writeNewPomFile(cobigenTemplatesFolder, newTriggerFolder, trigger);
+        newContextPath = templateSets.resolve(folderToRename.toPath().relativize(newTriggerFolder)
+            .resolve(ConfigurationConstants.TEMPLATE_RESOURCE_FOLDER)
+            .resolve(ConfigurationConstants.CONTEXT_CONFIG_FILENAME));
+        contextMap.put(cc, newContextPath);
+      }
+    }
+
+    // cleanup
+    for (File file : folderToRename.listFiles()) {
+      if (!file.getName().equals(ConfigurationConstants.ADAPTED_FOLDER)) {
+        FileUtils.forceDelete(file);
+      }
+    }
+    folderToRename.renameTo(templateSets.toFile());
+
+    return contextMap;
+
+  }
+
+  /**
+   * Writes a pom.xml file for the split context and template folder
+   *
+   * @param cobigenTemplates Path to the CobiGen_Templates folder
+   * @param newTemplateFolder Path to the split template folder
+   * @param trigger {@link com.devonfw.cobigen.impl.config.entity.io.v3_0.Trigger} to the related template folder
+   * @throws IOException when an IOError occurred while reading the monolithic pom file
+   * @throws FileNotFoundException when a monolithic pom file could not be found
+   */
+  private void writeNewPomFile(Path cobigenTemplates, Path newTemplateFolder,
+      com.devonfw.cobigen.impl.config.entity.io.v3_0.Trigger trigger) throws IOException, FileNotFoundException {
+
+    // Pom.xml creation
+    try {
+      Path oldPom = cobigenTemplates.resolve(MavenConstants.POM);
+      Path newPom = newTemplateFolder.resolve(MavenConstants.POM);
+      if (!Files.exists(newPom))
+        Files.createFile(newPom);
+
+      // read the content of the pom.xml then replace it
+      Charset charset = StandardCharsets.UTF_8;
+      String content = new String(Files.readAllBytes(oldPom), charset);
+      content = content.replaceAll("</modelVersion>\n" + "  <groupId>([a-zA-Z]+(\\.[a-zA-Z]+)+)</groupId>",
+          "</modelVersion>\n" + "  <groupId>" + ConfigurationConstants.CONFIG_PROPERTY_TEMPLATE_SETS_DEFAULT_GROUPID
+              + "</groupId>");
+      content = content.replaceAll("</groupId>\n" + "  <artifactId>.*</artifactId>", "</groupId>\n" + "  <artifactId>"
+          + newTemplateFolder.getFileName().toString().replace('_', '-') + "</artifactId>");
+      // TODO: retrieve the version dynamically (not as a constant) at runtime, see:
+      // https://github.com/devonfw/cobigen/issues/1669
+      content = content.replaceAll("</artifactId>\n" + "  <version>([0-9]+(\\.[0-9]+)+)</version>", "</artifactId>\n"
+          + "  <version>" + ConfigurationConstants.CONFIG_PROPERTY_TEMPLATE_SETS_DEFAULT_VERSION + "</version>");
+      content = content.replaceAll("</version>\n" + "  <name>.*</name>",
+          "</version>\n" + "  <name>" + newTemplateFolder.getFileName().toString() + "</name>");
+      Files.write(newPom, content.getBytes(charset));
+
+    } catch (FileNotFoundException e) {
+      LOG.error("Monolithic pom file could not be found", e);
+      throw new CobiGenRuntimeException(e.getMessage(), e);
+    } catch (IOException e) {
+      LOG.error("IOError while reading the monolithic pom file", e);
+      throw new CobiGenRuntimeException(e.getMessage(), e);
+    }
+
+  }
+
+  /**
+   * Splits a contextConfiguration and converts a {@link Trigger} and his data to a v3_0 Trigger
+   *
+   * @param ContextConfiguration {@link ContextConfiguration} of the monolithic context that will be split
+   * @return {@link com.devonfw.cobigen.impl.config.entity.io.v3_0.ContextConfiguration} List of the split
+   *         contextConfiguration files
+   */
+  private List<com.devonfw.cobigen.impl.config.entity.io.v3_0.ContextConfiguration> splitContext(
+      com.devonfw.cobigen.impl.config.entity.io.v2_1.ContextConfiguration monolithic) {
+
+    List<com.devonfw.cobigen.impl.config.entity.io.v3_0.ContextConfiguration> splitContexts = new ArrayList<>();
+    List<com.devonfw.cobigen.impl.config.entity.io.v2_1.Trigger> triggerList = monolithic.getTrigger();
+    for (com.devonfw.cobigen.impl.config.entity.io.v2_1.Trigger trigger : triggerList) {
+      com.devonfw.cobigen.impl.config.entity.io.v3_0.ContextConfiguration contextConfiguration3_0 = new com.devonfw.cobigen.impl.config.entity.io.v3_0.ContextConfiguration();
+      com.devonfw.cobigen.impl.config.entity.io.v3_0.Trigger trigger3_0 = new com.devonfw.cobigen.impl.config.entity.io.v3_0.Trigger();
+      trigger3_0.setId(trigger.getId());
+      trigger3_0.setInputCharset(trigger.getInputCharset());
+      trigger3_0.setType(trigger.getType());
+      trigger3_0.setTemplateFolder(trigger.getTemplateFolder());
+
+      List<com.devonfw.cobigen.impl.config.entity.io.v3_0.Matcher> v3MList = this.mapper.mapAsList(trigger.getMatcher(),
+          com.devonfw.cobigen.impl.config.entity.io.v3_0.Matcher.class);
+      List<com.devonfw.cobigen.impl.config.entity.io.v3_0.ContainerMatcher> v3CMList = this.mapper.mapAsList(
+          trigger.getContainerMatcher(), com.devonfw.cobigen.impl.config.entity.io.v3_0.ContainerMatcher.class);
+      trigger3_0.getContainerMatcher().addAll(v3CMList);
+      trigger3_0.getMatcher().addAll(v3MList);
+      contextConfiguration3_0.getTrigger().add(trigger3_0);
+      Tags tags = new Tags();
+      Tag tag = new Tag();
+      tag.setName(
+          "PLACEHOLDER---This tag was inserted through the upgrade process and has to be changed manually---PLACEHOLDER");
+      tags.getTag().add(tag);
+      contextConfiguration3_0.setTags(tags);
+      Links links = new Links();
+      Link link = new Link();
+      link.setUrl(
+          "PLACEHOLDER---This tag was inserted through the upgrade process and has to be changed manually---PLACEHOLDER");
+      links.getLink().add(link);
+      contextConfiguration3_0.setLinks(links);
+      contextConfiguration3_0.setVersion(new BigDecimal("3.0"));
+      splitContexts.add(contextConfiguration3_0);
+    }
+    return splitContexts;
+  }
+
+  /**
+   * Locates and returns the correct context file
+   *
+   * @param contextFile Path to the contextFile
+   * @return {@link com.devonfw.cobigen.impl.config.entity.io.v2_1.ContextConfiguration} of the context.xml file
+   * @throws FileNotFoundException if no context.xml could be found
+   * @throws InvalidConfigurationException if context file provided some XML errors
+   */
+  private com.devonfw.cobigen.impl.config.entity.io.v2_1.ContextConfiguration getContextConfiguration(Path contextFile)
+      throws FileNotFoundException, InvalidConfigurationException {
+
+    if (contextFile == null) {
+      throw new CobiGenRuntimeException("Templates location cannot be null!");
+    }
+    // check if context exits here
+    Path context = contextFile.resolve(ConfigurationConstants.CONTEXT_CONFIG_FILENAME);
+    if (Files.exists(context)) {
+      LOG.info("Found Context File");
+    } else {
+      throw new FileNotFoundException("Context.xml could not be found");
+    }
+
+    try (InputStream in = Files.newInputStream(context)) {
+      Unmarshaller unmarschaller = JAXBContext
+          .newInstance(com.devonfw.cobigen.impl.config.entity.io.v2_1.ContextConfiguration.class).createUnmarshaller();
+
+      Object rootNode = unmarschaller.unmarshal(in);
+      if (rootNode instanceof com.devonfw.cobigen.impl.config.entity.io.v2_1.ContextConfiguration) {
+        return (com.devonfw.cobigen.impl.config.entity.io.v2_1.ContextConfiguration) rootNode;
+      }
+    } catch (IOException e) {
+      throw new InvalidConfigurationException("Context file could not be found", e);
+    } catch (JAXBException e) {
+      throw new InvalidConfigurationException("Context file provided some XML errors", e);
+    }
+    return null;
+  }
+
+}
diff --git a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/versioning/VersionValidator.java b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/versioning/VersionValidator.java
index f0a923b990..f2c7024965 100644
--- a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/versioning/VersionValidator.java
+++ b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/versioning/VersionValidator.java
@@ -6,9 +6,11 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.devonfw.cobigen.api.exception.DeprecatedMonolithicConfigurationException;
 import com.devonfw.cobigen.api.exception.InvalidConfigurationException;
 import com.devonfw.cobigen.api.exception.NotYetSupportedException;
 import com.devonfw.cobigen.impl.config.constant.ContextConfigurationVersion;
+import com.devonfw.cobigen.impl.config.constant.TemplateSetConfigurationVersion;
 import com.devonfw.cobigen.impl.config.constant.TemplatesConfigurationVersion;
 
 /**
@@ -23,7 +25,10 @@ public enum Type {
     /** Validates the {@link ContextConfigurationVersion} */
     CONTEXT_CONFIGURATION,
     /** Validates the {@link TemplatesConfigurationVersion} */
-    TEMPLATES_CONFIGURATION
+    TEMPLATES_CONFIGURATION,
+    /** Validates the {@link TemplateSetConfigurationVersion} */
+    TEMPLATE_SET_CONFIGURATION
+
   }
 
   /** Logger instance */
@@ -57,6 +62,10 @@ public VersionValidator(Type validatorType, String cobiGenVersion) {
         this.configName = "templates configuration";
         this.versionSteps = TemplatesConfigurationVersion.valuesSorted();
         break;
+      case TEMPLATE_SET_CONFIGURATION:
+        this.configName = "template set configuration";
+        this.versionSteps = TemplateSetConfigurationVersion.valuesSorted();
+        break;
       default:
         throw new NotYetSupportedException("Unknown configuration type.");
     }
@@ -69,6 +78,19 @@ public VersionValidator(Type validatorType, String cobiGenVersion) {
    */
   public void validate(float configVersion) {
 
+    // TODO: Change allowMonolithicConfiguration to false, see: https://github.com/devonfw/cobigen/issues/1670
+    validate(configVersion, true);
+  }
+
+  /**
+   * Validates the given version with the running instance of CobiGen.
+   *
+   * @param configVersion version to be validated
+   * @param allowMonolithicConfiguration ignores deprecated monolithic template folder structure and if found does not
+   *        throw a DeprecatedMonolithicConfigurationException
+   */
+  public void validate(float configVersion, boolean allowMonolithicConfiguration) {
+
     Float currentCobiGenVersion;
     String currentCobiGenVersionStr = this.cobiGenVersion;
     currentCobiGenVersionStr = currentCobiGenVersionStr.substring(0, currentCobiGenVersionStr.lastIndexOf("."));
@@ -92,8 +114,8 @@ public void validate(float configVersion) {
             && !versionStep.getValue()) {
           LOG.warn("{} version too old for current CobiGen version. CobiGen: {} / {}: {}", this.configName,
               currentCobiGenVersionStr, this.configName, configVersion);
-          throw new InvalidConfigurationException("The " + this.configName + " with version '" + configVersion
-              + "' has to be upgraded to a compatible " + this.configName + " version.");
+          if (!allowMonolithicConfiguration)
+            throw new DeprecatedMonolithicConfigurationException();
         }
       }
       LOG.debug("Compatible {} as no breaking changes found. CobiGen: {} / {}: {}", this.configName,
diff --git a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/exceptions/UnknownContextVariableException.java b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/exceptions/UnknownContextVariableException.java
index 7257507958..e02af71195 100644
--- a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/exceptions/UnknownContextVariableException.java
+++ b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/exceptions/UnknownContextVariableException.java
@@ -17,7 +17,7 @@ public class UnknownContextVariableException extends InvalidConfigurationExcepti
    */
   public UnknownContextVariableException(String variableName) {
 
-    super(
-        "Either unknown context variable: " + variableName + "or invalid external incrementRef in case of having one.");
+    super("Either unknown context variable: " + variableName
+        + " or invalid external incrementRef in case of having one.");
   }
 }
diff --git a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/exceptions/UnknownTemplateException.java b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/exceptions/UnknownTemplateException.java
index fab75b51a5..ff8369be4e 100644
--- a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/exceptions/UnknownTemplateException.java
+++ b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/exceptions/UnknownTemplateException.java
@@ -5,8 +5,6 @@
 /**
  * The {@link UnknownTemplateException} occurs if a template is requested which is not registered in the template
  * configuration
- *
- * @author mbrunnli (19.02.2013)
  */
 public class UnknownTemplateException extends InvalidConfigurationException {
 
diff --git a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/generator/ConfigurationInterpreterImpl.java b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/generator/ConfigurationInterpreterImpl.java
index 02fb37ac0b..9a3f43e58d 100644
--- a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/generator/ConfigurationInterpreterImpl.java
+++ b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/generator/ConfigurationInterpreterImpl.java
@@ -3,6 +3,7 @@
 import java.nio.file.Path;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 import java.util.WeakHashMap;
 
 import javax.inject.Inject;
@@ -167,6 +168,16 @@ private List<TemplatesConfiguration> getMatchingTemplatesConfigurations(Object m
     List<TemplatesConfiguration> templateConfigurations = Lists.newLinkedList();
 
     for (Trigger trigger : this.triggerMatchingEvaluator.getMatchingTriggers(matcherInput)) {
+
+      if (this.configurationHolder.isTemplateSetConfiguration()) {
+        Map<Path, TemplatesConfiguration> map = this.configurationHolder.getTemplatesConfigurations()
+            .get(trigger.getId());
+
+        if (map != null) {
+          templateConfigurations.addAll(map.values());
+        }
+      }
+
       TemplatesConfiguration templatesConfiguration = this.configurationHolder.readTemplatesConfiguration(trigger);
       if (templatesConfiguration != null) {
         if (!templateConfigurations.contains(templatesConfiguration)) {
diff --git a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/generator/GenerationProcessorImpl.java b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/generator/GenerationProcessorImpl.java
index 1f6cab3e3c..12a1e1801e 100644
--- a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/generator/GenerationProcessorImpl.java
+++ b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/generator/GenerationProcessorImpl.java
@@ -11,6 +11,7 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.nio.file.StandardCopyOption;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Formatter;
 import java.util.List;
@@ -61,6 +62,7 @@
 import com.devonfw.cobigen.impl.generator.api.InputResolver;
 import com.devonfw.cobigen.impl.model.ModelBuilderImpl;
 import com.devonfw.cobigen.impl.util.ConfigurationClassLoaderUtil;
+import com.devonfw.cobigen.impl.util.FileSystemUtil;
 import com.devonfw.cobigen.impl.validator.InputValidator;
 import com.google.common.collect.Maps;
 
@@ -159,9 +161,8 @@ public GenerationReportTo generate(Object input, List<? extends GenerableArtifac
       }
     }
 
-    Path templateConfigPath = Paths.get(this.configurationHolder.getConfigurationLocation());
     progressCallback.accept("Prepend Templates Classloader", 10);
-    inputProjectClassLoader = prependTemplatesClassloader(templateConfigPath, inputProjectClassLoader);
+    inputProjectClassLoader = prependTemplatesClassloader(inputProjectClassLoader);
     if (inputProjectClassLoader != null) {
       try {
         logicClasses = ConfigurationClassLoaderUtil.resolveUtilClasses(this.configurationHolder,
@@ -256,38 +257,52 @@ public GenerationReportTo generate(Object input, List<? extends GenerableArtifac
    * @return the combined classloader for the templates with classLoader argument as parent or null if both arguments
    *         passed as null
    */
-  private ClassLoader prependTemplatesClassloader(Path configLocation, ClassLoader inputProjectClassLoader) {
+  private ClassLoader prependTemplatesClassloader(ClassLoader inputProjectClassLoader) {
 
+    Path configLocation = Paths.get(this.configurationHolder.getConfigurationLocation());
     ClassLoader combinedClassLoader = inputProjectClassLoader != null ? inputProjectClassLoader
         : Thread.currentThread().getContextClassLoader();
-    if (configLocation != null) {
 
-      Path pomFile = this.configurationHolder.getConfigurationPath().resolve("pom.xml");
+    if (configLocation != null && !this.configurationHolder.getUtilsLocation().isEmpty()) {
+      List<Path> utilsLocations = this.configurationHolder.getUtilsLocation();
       Path cpCacheFile = null;
       try {
-        if (Files.exists(pomFile)) {
-          LOG.debug("Found templates to be configured by maven.");
+        List<URL> urlList = new ArrayList<>();
+        for (Path utilsLocation : utilsLocations) {
 
-          String pomFileHash = MavenUtil.generatePomFileHash(pomFile, MavenUtil.determineMavenRepositoryPath());
-
-          if (this.configurationHolder.isJarConfig()) {
-            cpCacheFile = configLocation
-                .resolveSibling(String.format(MavenConstants.CLASSPATH_CACHE_FILE, pomFileHash));
+          Path pomFile;
+          if (FileSystemUtil.isZipFile(utilsLocation.toUri())) {
+            Path utilsPath = FileSystemUtil.createFileSystemDependentPath(utilsLocation.toUri());
+            pomFile = utilsPath.resolve("pom.xml");
           } else {
+            pomFile = utilsLocation.resolve("pom.xml");
+          }
+
+          if (Files.exists(pomFile)) {
+            String pomFileHash = MavenUtil.generatePomFileHash(pomFile, MavenUtil.determineMavenRepositoryPath());
+
+            // gets classpath cache file within template-sets folder
             cpCacheFile = configLocation.resolve(String.format(MavenConstants.CLASSPATH_CACHE_FILE, pomFileHash));
+
+            // gets classpath cache file from parent directory of configuration location of monolithic template jar
+            if (!this.configurationHolder.isTemplateSetConfiguration() && this.configurationHolder.isJarConfig()) {
+              cpCacheFile = configLocation
+                  .resolveSibling(String.format(MavenConstants.CLASSPATH_CACHE_FILE, pomFileHash));
+            }
+
+            combinedClassLoader = MavenUtil.addURLsFromCachedClassPathsFile(cpCacheFile, pomFile, combinedClassLoader);
           }
 
-          combinedClassLoader = MavenUtil.addURLsFromCachedClassPathsFile(cpCacheFile, pomFile, combinedClassLoader);
+          if (Files.isDirectory(utilsLocation) && Files.exists(pomFile)) {
+            compileTemplateUtils(utilsLocation);
+            urlList.add(utilsLocation.resolve("target").resolve("classes").toUri().toURL());
+          } else {
+            urlList.add(utilsLocation.toUri().toURL());
+          }
         }
 
         // prepend jar/compiled resources as well
-        URL[] urls;
-        if (Files.isDirectory(configLocation) && Files.exists(pomFile)) {
-          compileTemplateUtils(configLocation);
-          urls = new URL[] { configLocation.resolve("target").resolve("classes").toUri().toURL() };
-        } else {
-          urls = new URL[] { configLocation.toUri().toURL() };
-        }
+        URL[] urls = urlList.toArray(new URL[urlList.size()]);
         combinedClassLoader = new URLClassLoader(urls, combinedClassLoader);
         return combinedClassLoader;
       } catch (MalformedURLException e) {
@@ -410,8 +425,8 @@ private void generate(TemplateTo template, TriggerInterpreter triggerInterpreter
     String templateEngineName = tConfig.getTemplateEngine();
     TextTemplateEngine templateEngine = TemplateEngineRegistry.getEngine(templateEngineName);
 
-    templateEngine.setTemplateFolder(this.configurationHolder.readContextConfiguration().getConfigurationPath()
-        .resolve(trigger.getTemplateFolder()));
+    templateEngine.setTemplateFolder(this.configurationHolder.readContextConfiguration()
+        .retrieveConfigRootByTrigger(trigger.getId()).resolve(trigger.getTemplateFolder()));
 
     Template templateEty = tConfig.getTemplate(template.getId());
     if (templateEty == null) {
@@ -545,7 +560,7 @@ private void writeBrokenPatchFile(String targetCharset, File tmpOriginalFile, St
   }
 
   /**
-   * Builds the model for he given input.
+   * Builds the model for the given input.
    *
    * @param triggerInterpreter {@link TriggerInterpreter} to be used
    * @param trigger activated {@link Trigger}
diff --git a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/generator/MatcherEvaluatorImpl.java b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/generator/MatcherEvaluatorImpl.java
index e650a08e4f..e3279cea9d 100644
--- a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/generator/MatcherEvaluatorImpl.java
+++ b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/generator/MatcherEvaluatorImpl.java
@@ -43,7 +43,7 @@ public boolean matches(Object matcherInput, List<Matcher> matcherList, TriggerIn
           default:
         }
       } else {
-        if (matcher.getAccumulationType() == AccumulationType.AND) {
+        if (matcher.getAccumulationType().equals(AccumulationType.AND)) {
           LOG.trace("AND Matcher does not match -> trigger match fails.");
           matcherSetMatches = false;
           break MATCHER_LOOP;
diff --git a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/healthcheck/HealthCheckImpl.java b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/healthcheck/HealthCheckImpl.java
index 489600ac9a..ff38be8138 100644
--- a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/healthcheck/HealthCheckImpl.java
+++ b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/healthcheck/HealthCheckImpl.java
@@ -54,7 +54,6 @@ public HealthCheckReport upgradeContextConfiguration(Path configurationFolder, B
   public HealthCheckReport upgradeTemplatesConfiguration(Path templatesConfigurationFolder, BackupPolicy backupPolicy) {
 
     LOG.info("Upgrade of the templates configuration in '{}' triggered.", templatesConfigurationFolder);
-    System.out.println(templatesConfigurationFolder.toString());
 
     TemplateConfigurationUpgrader templateConfigurationUpgrader = new TemplateConfigurationUpgrader();
     try {
diff --git a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/model/ContextVariableResolver.java b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/model/ContextVariableResolver.java
index bf51b78573..c4f3eecd8d 100644
--- a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/model/ContextVariableResolver.java
+++ b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/model/ContextVariableResolver.java
@@ -98,7 +98,6 @@ public Variables resolveVariables(TriggerInterpreter triggerInterpreter, Variabl
    *
    * @param m {@link Matcher} to retrieve the {@link VariableAssignment}s from
    * @return a {@link List} of {@link VariableAssignmentTo}s
-   * @author mbrunnli (08.04.2014)
    */
   private List<VariableAssignmentTo> getVariableAssignments(Matcher m) {
 
diff --git a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/util/ConfigurationClassLoaderUtil.java b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/util/ConfigurationClassLoaderUtil.java
index 0a834361fc..59a6886066 100644
--- a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/util/ConfigurationClassLoaderUtil.java
+++ b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/util/ConfigurationClassLoaderUtil.java
@@ -118,13 +118,15 @@ public static List<Class<?>> resolveUtilClasses(ConfigurationHolder configuratio
     List<Class<?>> result = new LinkedList<>();
     List<URL> classLoaderUrls = new ArrayList<>(); // stores ClassLoader URLs
 
-    if (configurationHolder.isJarConfig()) {
-      result = resolveFromJar(classLoader, configurationHolder);
-    } else {
-      ClassLoader inputClassLoader = null;
-      classLoaderUrls = addFoldersToClassLoaderUrls(configurationHolder.getConfigurationPath());
-      inputClassLoader = getUrlClassLoader(classLoaderUrls.toArray(new URL[] {}), classLoader);
-      result = resolveFromFolder(configurationHolder.getConfigurationPath(), inputClassLoader);
+    List<Path> utilsLocations = configurationHolder.getUtilsLocation();
+    for (Path utilsLocation : utilsLocations) {
+      if (FileSystemUtil.isZipFile(utilsLocation.toUri())) {
+        result.addAll(resolveFromJar(classLoader, utilsLocation));
+      } else {
+        classLoaderUrls = addFoldersToClassLoaderUrls(utilsLocation);
+        ClassLoader inputClassLoader = getUrlClassLoader(classLoaderUrls.toArray(new URL[] {}), classLoader);
+        result.addAll(resolveFromFolder(utilsLocation, inputClassLoader));
+      }
     }
 
     return result;
@@ -140,7 +142,6 @@ public static List<Class<?>> resolveUtilClasses(ConfigurationHolder configuratio
   private static List<Class<?>> resolveFromFolder(Path templateRoot, ClassLoader inputClassLoader) {
 
     LOG.debug("Processing configuration from {}", templateRoot.toString());
-    LOG.info("Searching for classes in configuration folder...");
     List<Path> foundPaths = new LinkedList<>();
     List<Class<?>> result = new ArrayList<>();
 
@@ -169,7 +170,7 @@ private static List<Class<?>> resolveFromFolder(Path templateRoot, ClassLoader i
         }
       }
     } else {
-      LOG.info("Could not find any compiled classes to be loaded as util classes in template folder.");
+      LOG.debug("Could not find any compiled classes to be loaded as util classes in template folder.");
     }
 
     return result;
@@ -179,18 +180,18 @@ private static List<Class<?>> resolveFromFolder(Path templateRoot, ClassLoader i
    * Resolves utility classes from Jar archive
    *
    * @param inputClassLoader ClassLoader to use for storing of classes
-   * @param configurationHolder configuration holder
+   * @param utilLocation Path to utilities location
    * @return List of classes to load utilities from
    */
-  private static List<Class<?>> resolveFromJar(ClassLoader inputClassLoader, ConfigurationHolder configurationHolder) {
+  private static List<Class<?>> resolveFromJar(ClassLoader inputClassLoader, Path utilLocation) {
 
-    LOG.debug("Processing configuration archive {}", configurationHolder.getConfigurationLocation());
+    LOG.debug("Processing configuration archive {}", utilLocation);
     LOG.info("Searching for classes in configuration archive...");
 
     List<Class<?>> result = new ArrayList<>();
     List<String> foundClasses = new LinkedList<>();
     try {
-      foundClasses = walkJarFile(configurationHolder);
+      foundClasses = walkJarFile(utilLocation);
     } catch (IOException e) {
       LOG.error("Could not read templates jar file", e);
     }
@@ -245,16 +246,18 @@ public FileVisitResult visitFileFailed(Path file, IOException exc) throws IOExce
   /**
    * Walks the jar file in search of utility classes
    *
-   * @param configurationHolder the holder of the parsed configuration
+   * @param utilLocation Path to utilities location
    * @return List<String> of file paths containing class files
    * @throws IOException if file could not be visited
    */
-  private static List<String> walkJarFile(ConfigurationHolder configurationHolder) throws IOException {
+  private static List<String> walkJarFile(Path utilLocation) throws IOException {
 
     List<String> foundClasses = new LinkedList<>();
     // walk the jar file
-    LOG.debug("Searching for classes in {}", configurationHolder.getConfigurationLocation());
-    Files.walkFileTree(configurationHolder.getConfigurationPath(), new SimpleFileVisitor<Path>() {
+    LOG.debug("Searching for classes in {}", utilLocation);
+    Path configurationPath = FileSystemUtil.createFileSystemDependentPath(utilLocation.toUri());
+
+    Files.walkFileTree(configurationPath, new SimpleFileVisitor<Path>() {
 
       @Override
       public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
diff --git a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/util/ConfigurationFinder.java b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/util/ConfigurationFinder.java
index 3ab2790be7..b1a365122f 100644
--- a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/util/ConfigurationFinder.java
+++ b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/util/ConfigurationFinder.java
@@ -1,6 +1,5 @@
 package com.devonfw.cobigen.impl.util;
 
-import java.io.File;
 import java.io.IOException;
 import java.io.StringReader;
 import java.net.URI;
@@ -8,6 +7,9 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 import java.util.Properties;
 import java.util.stream.Collectors;
 
@@ -16,14 +18,14 @@
 import org.slf4j.LoggerFactory;
 
 import com.devonfw.cobigen.api.constants.ConfigurationConstants;
-import com.devonfw.cobigen.api.exception.CobiGenRuntimeException;
+import com.devonfw.cobigen.api.exception.InvalidConfigurationException;
 import com.devonfw.cobigen.api.util.CobiGenPaths;
+import com.devonfw.cobigen.api.util.MavenCoordinate;
 import com.devonfw.cobigen.api.util.TemplatesJarUtil;
+import com.devonfw.cobigen.impl.config.ConfigurationProperties;
 
 /**
- * Utilities related to the cobigen configurations including:
- *
- * 1. templates location
+ * Class which handles the CobiGen Configuration including Properties and monolithic templates / template-set locations
  */
 public class ConfigurationFinder {
 
@@ -31,48 +33,133 @@ public class ConfigurationFinder {
   private static final Logger LOG = LoggerFactory.getLogger(ConfigurationFinder.class);
 
   /**
-   * The method finds location of templates. It could be CobiGen_Templates folder or a template artifact
+   * Retrieves {@link ConfigurationProperties} from .properties file if valid properties were found otherwise returns
+   * default values
+   *
+   * @param propertiesPath Path to a .properties file
+   * @return {@link ConfigurationProperties} instance
    *
-   * @return template location uri if exist, otherwise null
+   */
+  public static ConfigurationProperties retrieveCobiGenProperties(Path propertiesPath) {
+
+    Properties props = new Properties();
+    try {
+      props = readConfigurationFile(propertiesPath);
+    } catch (InvalidConfigurationException e) {
+      LOG.info("This path {} is invalid. The default Config values will be loaded instead.", propertiesPath);
+    }
+
+    String groupId = ConfigurationConstants.CONFIG_PROPERTY_TEMPLATE_SETS_GROUPIDS;
+    String snapshot = ConfigurationConstants.CONFIG_PROPERTY_TEMPLATE_SETS_SNAPSHOTS;
+    String hide = ConfigurationConstants.CONFIG_PROPERTY_TEMPLATE_SETS_HIDE;
+    String disableLookup = ConfigurationConstants.CONFIG_PROPERTY_TEMPLATE_SETS_DISABLE_LOOKUP;
+    String defaultGroupId = ConfigurationConstants.CONFIG_PROPERTY_TEMPLATE_SETS_DEFAULT_GROUPID;
+    String templateSetsInstalled = ConfigurationConstants.CONFIG_PROPERTY_TEMPLATE_SETS_INSTALLED;
+
+    List<String> groupIdsList = new ArrayList<>();
+    if (props.getProperty(groupId) != null) {
+      groupIdsList = Arrays.asList(props.getProperty(groupId).split(","));
+    }
+    // Creating a new ArrayList object which can be modified and prevents UnsupportedOperationException.
+    List<String> groupIds = new ArrayList<>(groupIdsList);
+    if (props.getProperty(disableLookup) == null || props.getProperty(disableLookup).equals("false"))
+      if (!groupIds.contains(defaultGroupId))
+        groupIds.add(defaultGroupId);
+
+    boolean useSnapshots;
+    useSnapshots = false;
+    if (props.getProperty(snapshot) != null) {
+      if (props.getProperty(snapshot).equals("true"))
+        useSnapshots = true;
+    }
+
+    List<String> hiddenIdsString = new ArrayList<>();
+    if (props.getProperty(hide) != null) {
+      hiddenIdsString = Arrays.asList(props.getProperty(hide).split(","));
+    }
+
+    List<String> mavenCoordinates = new ArrayList<>();
+    if (props.getProperty(templateSetsInstalled) != null) {
+      mavenCoordinates = Arrays.asList(props.getProperty(templateSetsInstalled).split(","));
+    }
+
+    List<MavenCoordinate> hiddenIds = MavenCoordinateUtil.convertToMavenCoordinates(hiddenIdsString);
+    List<MavenCoordinate> convertedMavenCoordinates = MavenCoordinateUtil.convertToMavenCoordinates(mavenCoordinates);
+
+    ConfigurationProperties configurationProperties = new ConfigurationProperties(groupIds, useSnapshots, hiddenIds,
+        convertedMavenCoordinates);
+
+    return configurationProperties;
+  }
+
+  /**
+   * The method finds location of templates. It could be CobiGen_Templates folder or a template artifact or a template
+   * set configuration
+   *
+   * @return template location URI if exist, otherwise null
    */
   public static URI findTemplatesLocation() {
 
     Path cobigenHome = CobiGenPaths.getCobiGenHomePath();
     Path configFile = cobigenHome.resolve(ConfigurationConstants.COBIGEN_CONFIG_FILE);
 
-    if (configFile != null && Files.exists(configFile)) {
+    if (configFile != null && Files.exists(configFile) && !Files.isDirectory(configFile)) {
       LOG.debug("Custom cobigen configuration found at {}", configFile);
-      Properties props = readConfigrationFile(configFile);
+      Properties props = readConfigurationFile(configFile);
       String templatesLocation = props.getProperty(ConfigurationConstants.CONFIG_PROPERTY_TEMPLATES_PATH);
-      if (StringUtils.isNotEmpty(templatesLocation)) {
-        LOG.info("Custom templates path found. Taking templates from {}", templatesLocation);
-        Path templatesPath = Paths.get(templatesLocation);
-        if (Files.exists(templatesPath)) {
-          return Paths.get(templatesLocation).toUri();
-        } else {
-          LOG.info("Value of property {} in {} is invalid. Fall back to templates from {}",
-              ConfigurationConstants.CONFIG_PROPERTY_TEMPLATES_PATH, configFile,
-              CobiGenPaths.getTemplatesFolderPath(cobigenHome));
-        }
+      String templateSetsLocation = props.getProperty(ConfigurationConstants.CONFIG_PROPERTY_TEMPLATE_SETS_PATH);
+
+      // use new template set configuration
+      Path templateSetsFolderLocation = getTemplatesFolderLocation(cobigenHome, configFile, templateSetsLocation);
+      if (templateSetsFolderLocation != null && Files.exists(templateSetsFolderLocation)) {
+        return templateSetsFolderLocation.toUri();
+      }
+
+      // use old templates configuration
+      Path templatesFolderLocation = getTemplatesFolderLocation(cobigenHome, configFile, templatesLocation);
+      if (templatesFolderLocation != null && Files.exists(templatesFolderLocation)) {
+        return templatesFolderLocation.toUri();
+      }
+    }
+    return findTemplates(cobigenHome);
+  }
+
+  /**
+   * Gets folder location of templates
+   *
+   * @param cobigenHome Path of CobiGen home directory
+   * @param configFile Path of configuration file
+   * @param templatesLocation String of templatesLocation property
+   */
+  private static Path getTemplatesFolderLocation(Path cobigenHome, Path configFile, String templatesLocation) {
+
+    if (StringUtils.isNotEmpty(templatesLocation)) {
+      LOG.info("Custom templates path found. Taking templates from {}", templatesLocation);
+      Path templatesPath = Paths.get(templatesLocation);
+      if (Files.exists(templatesPath)) {
+        return Paths.get(templatesLocation);
       } else {
-        LOG.info("Property {} is not set in {}. Fall back to templates from {}",
+        LOG.info("Value of property {} in {} is invalid. Fall back to templates from {}",
             ConfigurationConstants.CONFIG_PROPERTY_TEMPLATES_PATH, configFile,
             CobiGenPaths.getTemplatesFolderPath(cobigenHome));
+        return null;
       }
     } else {
-      LOG.info("No custom templates configuration found. Getting templates from {}",
+      LOG.info("Property {} is not set in {}. Fall back to templates from {}",
+          ConfigurationConstants.CONFIG_PROPERTY_TEMPLATES_PATH, configFile,
           CobiGenPaths.getTemplatesFolderPath(cobigenHome));
+      return null;
     }
-    return findTemplates(cobigenHome);
   }
 
   /**
-   * This is a helper method to read a given cobigen configuration file
+   * This is a helper method to read a given CobiGen configuration file
    *
-   * @param cobigenConfigFile cobigen configuration file
+   * @param cobigenConfigFile CobiGen configuration file
+   * @throws InvalidConfigurationException if the file isn't present or the path is invalid
    * @return Properties containing configuration
    */
-  private static Properties readConfigrationFile(Path cobigenConfigFile) {
+  private static Properties readConfigurationFile(Path cobigenConfigFile) {
 
     Properties props = new Properties();
     try {
@@ -83,55 +170,47 @@ private static Properties readConfigrationFile(Path cobigenConfigFile) {
         props.load(strReader);
       }
     } catch (IOException e) {
-      throw new CobiGenRuntimeException("An error occured while reading the config file " + cobigenConfigFile, e);
+      throw new InvalidConfigurationException("An error occured while reading the config file " + cobigenConfigFile, e);
     }
     return props;
   }
 
   /**
-   * This is a helper method to find templates in cobigen home
+   * This is a helper method to find templates or template sets in CobiGen home
    *
-   * @param home cobigen configuration home directory
-   * @return templates location if found, otherwise null
+   * @param home CobiGen configuration home directory
+   * @return templates / template sets location if found, otherwise null
    */
   private static URI findTemplates(Path home) {
 
     Path templatesPath = CobiGenPaths.getTemplatesFolderPath(home);
     Path templatesFolderPath = templatesPath.resolve(ConfigurationConstants.COBIGEN_TEMPLATES);
 
-    // 1. use Cobigen_Templates folder
-    if (Files.exists(templatesFolderPath)) {
-      return templatesFolderPath.toUri();
-    }
-
-    // 2. use template jar
-    Path jarPath = getTemplateJar(templatesPath);
-    if (jarPath != null) {
-      return jarPath.toUri();
-    }
-
-    // 3.try finding a jar on current classpath
+    // 1. create/use new template sets folder
+    Path templateSetsFolderPath = CobiGenPaths.getTemplateSetsFolderPath(home, false);
 
-    LOG.info("Could not find any templates in cobigen home directory {}. Downloading...",
-        CobiGenPaths.getCobiGenHomePath());
+    Path templateSetsAdaptedFolderPath = templateSetsFolderPath.resolve(ConfigurationConstants.ADAPTED_FOLDER);
+    Path templateSetsDownloadedFolderPath = templateSetsFolderPath.resolve(ConfigurationConstants.DOWNLOADED_FOLDER);
 
-    TemplatesJarUtil.downloadLatestDevon4jTemplates(true, templatesPath.toFile());
-    TemplatesJarUtil.downloadLatestDevon4jTemplates(false, templatesPath.toFile());
-    return getTemplateJar(templatesPath).toUri();
-  }
+    // 2. check adapted and downloaded folder
+    if (Files.exists(templateSetsAdaptedFolderPath) || Files.exists(templateSetsDownloadedFolderPath)) {
+      return templateSetsFolderPath.toUri();
+    }
 
-  /**
-   * @param templatesPath the templates cache directory
-   *
-   * @return the path of the templates jar
-   */
-  private static Path getTemplateJar(Path templatesPath) {
+    // 3. use old Cobigen_Templates folder
+    if (Files.exists(templatesFolderPath)) {
+      return templatesFolderPath.toUri();
+    }
 
-    File templateJar = TemplatesJarUtil.getJarFile(false, templatesPath.toFile());
-    if (templateJar != null && Files.exists(templatesPath)) {
-      return templateJar.toPath();
+    // 4. use template jar
+    if (Files.exists(templatesPath)) {
+      Path jarFilePath = TemplatesJarUtil.getJarFile(false, templatesPath);
+      if (jarFilePath != null && Files.exists(jarFilePath)) {
+        return jarFilePath.toUri();
+      }
     }
-    return null;
+    templateSetsFolderPath = CobiGenPaths.getTemplateSetsFolderPath(home, true);
+    return templateSetsFolderPath.toUri();
   }
 
 }
diff --git a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/util/ExtractTemplatesUtil.java b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/util/ExtractTemplatesUtil.java
deleted file mode 100644
index 00625aed14..0000000000
--- a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/util/ExtractTemplatesUtil.java
+++ /dev/null
@@ -1,193 +0,0 @@
-package com.devonfw.cobigen.impl.util;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URI;
-import java.nio.file.DirectoryNotEmptyException;
-import java.nio.file.DirectoryStream;
-import java.nio.file.FileSystem;
-import java.nio.file.FileSystems;
-import java.nio.file.FileVisitResult;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.nio.file.SimpleFileVisitor;
-import java.nio.file.StandardCopyOption;
-import java.nio.file.attribute.BasicFileAttributes;
-import java.util.Comparator;
-import java.util.Objects;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.devonfw.cobigen.api.constants.ConfigurationConstants;
-import com.devonfw.cobigen.api.exception.CobiGenRuntimeException;
-import com.devonfw.cobigen.api.util.CobiGenPaths;
-import com.devonfw.cobigen.api.util.TemplatesJarUtil;
-
-/**
- * Util to extract Templates
- */
-public class ExtractTemplatesUtil {
-
-  /** Logger instance. */
-  private static final Logger LOG = LoggerFactory.getLogger(ExtractTemplatesUtil.class);
-
-  /**
-   * Extracts templates project to the given path
-   *
-   * @param extractTo Path to extract the templates into
-   * @param forceOverride force to overwrite the contents of the target folder
-   * @throws DirectoryNotEmptyException if the given directory is not empty. Can be used to ask for overwriting
-   */
-  public static void extractTemplates(Path extractTo, boolean forceOverride) throws DirectoryNotEmptyException {
-
-    // find templates will also download jars if needed as a side effect and will return the path to the
-    // files.
-    URI findTemplatesLocation = ConfigurationFinder.findTemplatesLocation();
-    if (Files.isDirectory(Paths.get(findTemplatesLocation))) {
-      LOG.info("Templates already found at {}. You can edit them in place to adapt your generation results.",
-          extractTo);
-      return;
-    }
-
-    Objects.requireNonNull(extractTo, "Target path cannot be null");
-    if (!Files.isDirectory(extractTo)) {
-      try {
-        Files.createDirectories(extractTo);
-      } catch (IOException e) {
-        throw new CobiGenRuntimeException("Unable to create directory " + extractTo);
-      }
-    }
-
-    try {
-      if (!isEmpty(extractTo) && !forceOverride) {
-        throw new DirectoryNotEmptyException(extractTo.toString());
-      }
-
-      LOG.info(
-          "CobiGen is attempting to download the latest CobiGen_Templates.jar and will extract it to cobigen home directory {}. please wait...",
-          ConfigurationConstants.DEFAULT_HOME);
-      File templatesDirectory = extractTo.toFile();
-      processJar(templatesDirectory.toPath());
-      LOG.info("Successfully downloaded and extracted templates to @ {}",
-          templatesDirectory.toPath().resolve(ConfigurationConstants.COBIGEN_TEMPLATES));
-    } catch (DirectoryNotEmptyException e) {
-      throw e;
-    } catch (IOException e) {
-      throw new CobiGenRuntimeException("Not able to extract templates to " + extractTo, e);
-    }
-  }
-
-  /**
-   * Unpacks the source CobiGen_Templates Jar and creates a new CobiGen_Templates folder structure at
-   * $destinationPath/CobiGen_Templates location
-   *
-   * @param destinationPath path to be used as target directory
-   * @throws IOException if no destination path could be set
-   */
-  private static void processJar(Path destinationPath) throws IOException {
-
-    if (destinationPath == null) {
-      throw new IOException("Cobigen folder path not found!");
-    }
-
-    File cobigenTemplatesPath = CobiGenPaths.getTemplatesFolderPath().toFile();
-
-    Path sourcesJarPath = TemplatesJarUtil.getJarFile(true, cobigenTemplatesPath).toPath();
-    Path classesJarPath = TemplatesJarUtil.getJarFile(false, cobigenTemplatesPath).toPath();
-
-    LOG.debug("Processing jar file @ {}", sourcesJarPath);
-
-    // extract sources jar to target directory
-    extractArchive(sourcesJarPath, destinationPath);
-
-    // create src/main/java directory
-    Files.createDirectory(destinationPath.resolve("src/main/java"));
-
-    // move com folder to src/main/java/com
-    Files.move(destinationPath.resolve("com"), destinationPath.resolve("src/main/java/com"),
-        StandardCopyOption.REPLACE_EXISTING);
-
-    // create src/main/resources directory
-    Files.createDirectory(destinationPath.resolve("src/main/resources"));
-
-    // move META-INF folder to src/main/resources
-    Files.move(destinationPath.resolve("META-INF"), destinationPath.resolve("src/main/resources/META-INF"),
-        StandardCopyOption.REPLACE_EXISTING);
-
-    // delete MANIFEST.MF
-    Files.deleteIfExists(destinationPath.resolve("src/main/resources/META-INF/MANIFEST.MF"));
-
-    URI zipFile = URI.create("jar:file:" + classesJarPath.toUri().getPath());
-
-    // extract classes jar pom.xml
-    try (FileSystem fs = FileSystemUtil.getOrCreateFileSystem(zipFile)) {
-      Files.copy(fs.getPath("pom.xml"), destinationPath.resolve("pom.xml"), StandardCopyOption.REPLACE_EXISTING);
-    }
-
-  }
-
-  /**
-   * Deletes a directory and its sub directories recursively
-   *
-   * @param pathToBeDeleted the directory which should be deleted recursively
-   * @throws IOException if the file could not be deleted
-   */
-  public static void deleteDirectoryRecursively(Path pathToBeDeleted) throws IOException {
-
-    Files.walk(pathToBeDeleted).sorted(Comparator.reverseOrder()).map(Path::toFile).forEach(File::delete);
-  }
-
-  /**
-   * Extracts an archive as is to a target directory while keeping its folder structure
-   *
-   * @param sourcePath Path of the archive to unpack
-   * @param targetPath Path of the target directory to unpack the source archive to
-   * @throws IOException if an error occurred while processing the jar or its target directory
-   */
-  private static void extractArchive(Path sourcePath, Path targetPath) throws IOException {
-
-    // TODO: janv_capgemini check if sourcePath is an archive and throw exception if not
-    FileSystem fs = FileSystems.newFileSystem(sourcePath, null);
-
-    Path path = fs.getPath("/");
-    Files.walkFileTree(path, new SimpleFileVisitor<Path>() {
-      @Override
-      public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
-
-        Path relativePath = path.relativize(file);
-        Path targetPathResolved = targetPath.resolve(relativePath.toString());
-        Files.deleteIfExists(targetPathResolved);
-        Files.createDirectories(targetPathResolved.getParent());
-        Files.copy(file, targetPathResolved);
-        return FileVisitResult.CONTINUE;
-      }
-
-      @Override
-      public FileVisitResult visitFileFailed(Path file, IOException exc) throws IOException {
-
-        // Log errors but do not throw an exception
-        LOG.warn("An IOException occurred while reading a file on path {} with message: {}", file, exc.getMessage());
-        LOG.debug("An IOException occurred while reading a file on path {} with message: {}", file,
-            LOG.isDebugEnabled() ? exc : null);
-        return FileVisitResult.CONTINUE;
-      }
-    });
-
-  }
-
-  /**
-   * Check if directory is empty
-   *
-   * @param directory to be checked
-   * @return <code>true</code> if is empty, <code>false</code> otherwise
-   * @throws IOException in case the directory could not be read
-   */
-  private static boolean isEmpty(final Path directory) throws IOException {
-
-    try (DirectoryStream<Path> dirStream = Files.newDirectoryStream(directory)) {
-      return !dirStream.iterator().hasNext();
-    }
-  }
-}
diff --git a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/util/FileSystemUtil.java b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/util/FileSystemUtil.java
index ffa60f895a..99e5ea8dc3 100644
--- a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/util/FileSystemUtil.java
+++ b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/util/FileSystemUtil.java
@@ -31,7 +31,7 @@ public class FileSystemUtil {
   public static Path createFileSystemDependentPath(URI targetUri) {
 
     URI workURI = URI.create(targetUri.toString());
-    if (FileSystemUtil.isZipFile(workURI)) {
+    if (isZipFile(workURI)) {
       // reformat URI to be loaded by the zip/jar file system provider
       workURI = URI.create("jar:file:" + new File(workURI).toURI().getPath());
     }
@@ -102,4 +102,5 @@ public static boolean isZipFile(URI uri) {
       throw new CobiGenRuntimeException("Unable to read file " + file.getAbsolutePath(), e);
     }
   }
+
 }
diff --git a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/util/MavenCoordinateUtil.java b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/util/MavenCoordinateUtil.java
new file mode 100644
index 0000000000..ff129b922f
--- /dev/null
+++ b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/util/MavenCoordinateUtil.java
@@ -0,0 +1,46 @@
+package com.devonfw.cobigen.impl.util;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.devonfw.cobigen.api.constants.TemplatesJarConstants;
+import com.devonfw.cobigen.api.util.MavenCoordinate;
+
+/**
+ * Converts a list of maven coordinates in String form to an actual List of maven Coordinates
+ *
+ */
+public class MavenCoordinateUtil {
+
+  private static final Logger LOG = LoggerFactory.getLogger(MavenCoordinateUtil.class);
+
+  /**
+   * Takes a string with multiple maven coordinates separates them and checks if they meet the maven naming conventions
+   * and are therefore valid.
+   *
+   * @param mavenCoordinatesString a String that contains maven coordinates
+   * @return List with {@link MavenCoordinate}
+   */
+  public static List<MavenCoordinate> convertToMavenCoordinates(List<String> mavenCoordinatesString) {
+
+    List<MavenCoordinate> result = new ArrayList<>();
+    for (String mavenCoordinate : mavenCoordinatesString) {
+      mavenCoordinate = mavenCoordinate.trim();
+      if (!mavenCoordinate.matches(TemplatesJarConstants.MAVEN_COORDINATES_CHECK)) {
+        LOG.warn("configuration key:" + mavenCoordinate + " in .cobigen for "
+            + "template-sets.installed or template-sets.hide doesnt match the specification and could not be used");
+      } else {
+        String[] split = mavenCoordinate.split(":");
+        String groupID = split[0];
+        String artifactID = split[1];
+        String version = split.length > 2 ? split[2] : null;
+        result.add(new MavenCoordinate(groupID, artifactID, version));
+      }
+    }
+    return result;
+  }
+
+}
diff --git a/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/util/PostponeUtil.java b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/util/PostponeUtil.java
new file mode 100644
index 0000000000..cb50b5d1bd
--- /dev/null
+++ b/cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/util/PostponeUtil.java
@@ -0,0 +1,160 @@
+package com.devonfw.cobigen.impl.util;
+
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.sql.Timestamp;
+import java.util.Date;
+import java.util.Properties;
+
+import org.apache.commons.lang3.time.DateUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.devonfw.cobigen.api.constants.ConfigurationConstants;
+import com.devonfw.cobigen.api.exception.CobiGenRuntimeException;
+import com.devonfw.cobigen.api.util.CobiGenPaths;
+
+/**
+ * This util class is used to set(create) a timestamp property, read it, and checks if exists. Also can check if a
+ * timestamp passed the current time.
+ *
+ */
+public class PostponeUtil {
+
+  /** Logger instance */
+  private static final Logger LOG = LoggerFactory.getLogger(PostponeUtil.class);
+
+  /**
+   * Writes the Timestamp to a config file.
+   *
+   * @param configFile the config file or .cobigen file containing the properties.
+   * @param timestamp to be added to the config file
+   * @throws IOException
+   */
+  public static void writeTimestamp(Path configFile, Timestamp timestamp) throws IOException {
+
+    Properties props = new Properties();
+
+    if (!Files.exists(configFile))
+      Files.createFile(configFile);
+
+    props.setProperty(ConfigurationConstants.CONFIG_PROPERTY_POSTPONE_UPGRADE_MESSAGE_UNTIL, timestamp.toString());
+    try (FileOutputStream configfileOutputStream = new FileOutputStream(configFile.toFile())) {
+      props.store(configfileOutputStream, null);
+    } catch (IOException e) {
+      LOG.error("An error has occurred while writing the timestamp to the config file.", e);
+    }
+  }
+
+  /**
+   * Reads the Timestamp from a config file.
+   *
+   * @param configFile the config file or .cobigen file containing the properties.
+   * @return the timestamp found in a config file
+   */
+  public static Timestamp readTimestamp(Path configFile) {
+
+    Properties props = new Properties();
+
+    try (FileInputStream configfileInputStream = new FileInputStream(configFile.toFile())) {
+      props.load(configfileInputStream);
+    } catch (IOException e) {
+      LOG.error("An error has occurred while reading the timestamp from the config file.", e);
+      throw new CobiGenRuntimeException("An error has occurred while reading the timestamp from the config file.");
+    }
+    String strTimestamp = ConfigurationConstants.CONFIG_PROPERTY_POSTPONE_UPGRADE_MESSAGE_UNTIL;
+    String stampprop = props.getProperty(strTimestamp);
+    if (stampprop != null) {
+      return Timestamp.valueOf(props.getProperty(strTimestamp));
+    }
+    return null;
+  }
+
+  /**
+   * Creates a time stamp
+   *
+   * @return a new Timestamp with the current time
+   */
+  public static Timestamp createInstantTimestamp() {
+
+    Date currentDate = new Date();
+    return new Timestamp(currentDate.getTime());
+  }
+
+  /**
+   * Searches any Timestamp inside the config file in the HomePath, to determine whether that time is already passed.
+   *
+   * @return true if the current time already passed the time written in the config file.
+   */
+  public static boolean isTimePassed() {
+
+    return isTimePassed(getHomePath());
+  }
+
+  /**
+   * Searches any Timestamp inside the config file, to determine whether that time is already passed.
+   *
+   * @param configFile the config file or .cobigen file containing the properties.
+   * @return boolean true if config file not exists, if no Timestamp found, or if the current time already passed the
+   *         time written in the config file.
+   */
+  public static boolean isTimePassed(Path configFile) {
+
+    if (!Files.exists(configFile)) {
+      return true;
+    } else if (PostponeUtil.readTimestamp(configFile) == null) {
+      return true;
+    } else if (PostponeUtil.createInstantTimestamp().after(PostponeUtil.readTimestamp(configFile))) {
+      return true;
+    } else {
+      return false;
+    }
+  }
+
+  /**
+   * Adds a new Timestamp to the config file in HomePath.
+   */
+  public static void addATimestampForOneMonth() {
+
+    addATimestampForOneMonth(getHomePath());
+  }
+
+  /**
+   * Adds a new Timestamp in the config file with the current time + one month
+   *
+   * @param configFile the config file or .cobigen file containing the properties.
+   */
+  public static void addATimestampForOneMonth(Path configFile) {
+
+    addATimestampForASpecificTime(configFile, DateUtils.addMonths(new Date(), 1));
+  }
+
+  /**
+   * Adds a specific date to the config file.
+   *
+   * @param configFile the config file or .cobigen file containing the properties.
+   * @param date to be added to the config file
+   */
+  public static void addATimestampForASpecificTime(Path configFile, Date date) {
+
+    try {
+      PostponeUtil.writeTimestamp(configFile, new Timestamp(date.getTime()));
+    } catch (IOException e) {
+      LOG.error("An error has occurred while writing the timestamp to the config file.");
+      throw new CobiGenRuntimeException("An error has occurred while writing the timestamp to the config file.");
+    }
+  }
+
+  /**
+   * @return Cobigen HomePath
+   */
+  public static Path getHomePath() {
+
+    Path cobigenHome = CobiGenPaths.getCobiGenHomePath();
+
+    return cobigenHome.resolve(ConfigurationConstants.COBIGEN_CONFIG_FILE);
+  }
+}
diff --git a/cobigen/cobigen-core/src/main/resources/schema/v2.2/contextConfiguration.xsd b/cobigen/cobigen-core/src/main/resources/schema/v2.2/contextConfiguration.xsd
deleted file mode 100644
index b84cc3a304..0000000000
--- a/cobigen/cobigen-core/src/main/resources/schema/v2.2/contextConfiguration.xsd
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://capgemini.com/devonfw/cobigen/ContextConfiguration"
-  targetNamespace="http://capgemini.com/devonfw/cobigen/ContextConfiguration" elementFormDefault="qualified" version="2.2">
-
-  <xs:element name="contextConfiguration">
-    <xs:complexType>
-      <xs:sequence minOccurs="0" maxOccurs="unbounded">
-      <xs:element name="trigger" type="tns:trigger"/>
-    </xs:sequence>
-      <xs:attribute name="version" use="required" type="xs:decimal"/>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:complexType name="trigger">
-    <xs:sequence>
-      <xs:element name="containerMatcher" type="tns:containerMatcher" minOccurs="0" maxOccurs="unbounded"/>
-      <xs:element name="matcher" type="tns:matcher" minOccurs="0" maxOccurs="unbounded"/>
-    </xs:sequence>
-    <xs:attribute name="id" use="required" type="xs:NCName"/>
-    <xs:attribute name="type" use="required" type="xs:string"/>
-    <xs:attribute name="templateFolder" use="optional" type="xs:string" default="/"/>
-    <xs:attribute name="inputCharset" use="optional" type="xs:string" default="UTF-8"/>
-  </xs:complexType>
-
-  <xs:complexType name="matcher">
-    <xs:sequence>
-      <xs:element name="variableAssignment" type="tns:variableAssignment" minOccurs="0" maxOccurs="unbounded"/>
-    </xs:sequence>
-    <xs:attribute name="type" type="xs:string" use="required"/>
-    <xs:attribute name="value" type="xs:string" use="required"/>
-    <xs:attribute name="accumulationType" type="tns:accumulationType" use="optional" default="OR"/>
-  </xs:complexType>
-
-  <xs:complexType name="containerMatcher">
-    <xs:attribute name="type" type="xs:string" use="required"/>
-    <xs:attribute name="value" type="xs:string" use="required"/>
-    <xs:attribute name="retrieveObjectsRecursively" type="xs:boolean" use="optional" default="false"/>
-  </xs:complexType>
-
-  <xs:simpleType name="accumulationType">
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="AND"/>
-      <xs:enumeration value="OR"/>
-      <xs:enumeration value="NOT"/>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:complexType name="variableAssignment">
-    <xs:attribute name="type" use="required" type="xs:string"/>
-    <xs:attribute name="key" use="required" type="xs:NCName"/>
-    <xs:attribute name="value" use="required" type="xs:string"/>
-    <xs:attribute name="mandatory" use="optional" type="xs:boolean" default="false"/>
-  </xs:complexType>
-
-</xs:schema>
diff --git a/cobigen/cobigen-core/src/main/resources/schema/v3.0/contextConfiguration.xsd b/cobigen/cobigen-core/src/main/resources/schema/v3.0/contextConfiguration.xsd
new file mode 100644
index 0000000000..e88dc8efbd
--- /dev/null
+++ b/cobigen/cobigen-core/src/main/resources/schema/v3.0/contextConfiguration.xsd
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" targetNamespace="http://capgemini.com/devonfw/cobigen/ContextConfiguration" elementFormDefault="qualified" version="3.0">
+
+  <xs:element name="contextConfiguration">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element name="trigger" type="tns:trigger" minOccurs="0" maxOccurs="unbounded" />
+        <xs:element name="tags" type="tns:tags" minOccurs="1" maxOccurs="1" />
+        <xs:element name="links" type="tns:links" minOccurs="0" maxOccurs="1" />
+      </xs:sequence>
+      <xs:attribute name="version" use="required" type="xs:decimal" />
+    </xs:complexType>
+  </xs:element>
+
+  <xs:complexType name="trigger">
+    <xs:sequence>
+      <xs:element name="containerMatcher" type="tns:containerMatcher" minOccurs="0" maxOccurs="unbounded" />
+      <xs:element name="matcher" type="tns:matcher" minOccurs="0" maxOccurs="unbounded" />
+    </xs:sequence>
+    <xs:attribute name="id" use="required" type="xs:NCName" />
+    <xs:attribute name="type" use="required" type="xs:string" />
+    <xs:attribute name="templateFolder" use="optional" type="xs:string" default="/" />
+    <xs:attribute name="inputCharset" use="optional" type="xs:string" default="UTF-8" />
+  </xs:complexType>
+
+  <xs:complexType name="matcher">
+    <xs:sequence>
+      <xs:element name="variableAssignment" type="tns:variableAssignment" minOccurs="0" maxOccurs="unbounded" />
+    </xs:sequence>
+    <xs:attribute name="type" type="xs:string" use="required" />
+    <xs:attribute name="value" type="xs:string" use="required" />
+    <xs:attribute name="accumulationType" type="tns:accumulationType" use="optional" default="OR" />
+  </xs:complexType>
+
+  <xs:complexType name="containerMatcher">
+    <xs:attribute name="type" type="xs:string" use="required" />
+    <xs:attribute name="value" type="xs:string" use="required" />
+    <xs:attribute name="retrieveObjectsRecursively" type="xs:boolean" use="optional" default="false" />
+  </xs:complexType>
+
+  <xs:simpleType name="accumulationType">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="AND" />
+      <xs:enumeration value="OR" />
+      <xs:enumeration value="NOT" />
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:complexType name="variableAssignment">
+    <xs:attribute name="type" use="required" type="xs:string" />
+    <xs:attribute name="key" use="required" type="xs:NCName" />
+    <xs:attribute name="value" use="required" type="xs:string" />
+    <xs:attribute name="mandatory" use="optional" type="xs:boolean" default="false" />
+  </xs:complexType>
+
+  <xs:complexType name="tags">
+    <xs:sequence maxOccurs="unbounded" minOccurs="1">
+      <xs:element name="tag" type="tns:tag" />
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="tag">
+    <xs:attribute name="name" use="required" type="xs:string" />
+  </xs:complexType>
+
+  <xs:complexType name="links">
+    <xs:sequence maxOccurs="unbounded" minOccurs="1">
+      <xs:element name="link" type="tns:link" />
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="link">
+    <xs:attribute name="url" use="required" type="xs:string" />
+    <xs:attribute name="description" use="optional" type="xs:string" />
+  </xs:complexType>
+
+</xs:schema>
\ No newline at end of file
diff --git a/cobigen/cobigen-core/src/main/resources/schema/v5.0/templatesConfiguration.xsd b/cobigen/cobigen-core/src/main/resources/schema/v5.0/templatesConfiguration.xsd
new file mode 100644
index 0000000000..47c4bf35d5
--- /dev/null
+++ b/cobigen/cobigen-core/src/main/resources/schema/v5.0/templatesConfiguration.xsd
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration" targetNamespace="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration" elementFormDefault="qualified" version="5.0">
+
+  <xs:element name="templatesConfiguration">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element name="templates" minOccurs="0" type="tns:templates" />
+        <xs:element name="templateScans" minOccurs="0" type="tns:templateScans" />
+        <xs:element name="increments" minOccurs="0" type="tns:increments" />
+      </xs:sequence>
+      <xs:attribute name="templateEngine" use="optional" type="xs:string" default="FreeMarker"/>
+      <xs:attribute name="version" use="required" type="xs:decimal" />
+    </xs:complexType>
+  </xs:element>
+
+  <xs:complexType name="templates">
+    <xs:sequence>
+      <xs:element name="template" minOccurs="0" maxOccurs="unbounded" type="tns:template" />
+      <xs:element name="templateExtension" minOccurs="0" maxOccurs="unbounded" type="tns:templateExtension" />
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="templateScans">
+    <xs:sequence maxOccurs="unbounded" minOccurs="0">
+      <xs:element name="templateScan" type="tns:templateScan" />
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="template">
+    <xs:attribute name="name" use="required" type="xs:string" />
+    <xs:attribute name="destinationPath" use="required" type="xs:string" />
+    <xs:attribute name="templateFile" use="required" type="xs:string" />
+    <xs:attribute name="mergeStrategy" use="optional" type="xs:string" />
+    <xs:attribute name="targetCharset" use="optional" type="xs:string" default="UTF-8" />
+  </xs:complexType>
+
+  <xs:complexType name="templateExtension">
+    <xs:attribute name="ref" use="required" type="xs:string" />
+    <xs:attribute name="destinationPath" use="optional" type="xs:string" />
+    <xs:attribute name="mergeStrategy" use="optional" type="xs:string" />
+    <xs:attribute name="targetCharset" use="optional" type="xs:string" />
+  </xs:complexType>
+
+  <xs:complexType name="templateScan">
+    <xs:attribute name="name" use="optional" type="xs:string" />
+    <xs:attribute name="templateNamePrefix" use="optional" type="xs:string" />
+    <xs:attribute name="templatePath" use="required" type="xs:string" />
+    <xs:attribute name="destinationPath" use="required" type="xs:string" />
+    <xs:attribute name="mergeStrategy" use="optional" type="xs:string" />
+    <xs:attribute name="targetCharset" use="optional" type="xs:string" default="UTF-8" />
+  </xs:complexType>
+
+  <xs:complexType name="increments">
+    <xs:sequence maxOccurs="unbounded" minOccurs="1">
+      <xs:element name="increment" type="tns:increment" />
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="increment">
+    <xs:choice maxOccurs="unbounded" minOccurs="1">
+      <xs:element name="templateRef" type="tns:templateRef" />
+      <xs:element name="incrementRef" type="tns:incrementRef" />
+      <xs:element name="templateScanRef" type="tns:templateScanRef" />
+    </xs:choice>
+    <xs:attribute name="name" use="required" type="xs:string" />
+    <xs:attribute name="description" use="required" type="xs:string" />
+    <xs:attribute name="explanation" use="optional" type="xs:string" />
+  </xs:complexType>
+
+  <xs:complexType name="templateRef">
+    <xs:attribute name="ref" use="required" type="xs:string" />
+  </xs:complexType>
+
+  <xs:complexType name="incrementRef">
+    <xs:attribute name="ref" use="required" type="xs:string" />
+  </xs:complexType>
+
+  <xs:complexType name="templateScanRef">
+    <xs:attribute name="ref" use="required" type="xs:string" />
+  </xs:complexType>
+
+</xs:schema>
\ No newline at end of file
diff --git a/cobigen/cobigen-core/src/main/resources/schema/v6.0/contextConfiguration.xsd b/cobigen/cobigen-core/src/main/resources/schema/v6.0/contextConfiguration.xsd
new file mode 100644
index 0000000000..2bf8564984
--- /dev/null
+++ b/cobigen/cobigen-core/src/main/resources/schema/v6.0/contextConfiguration.xsd
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" targetNamespace="http://capgemini.com/devonfw/cobigen/ContextConfiguration" elementFormDefault="qualified" version="6.0">
+
+  <xs:element name="contextConfiguration">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element name="trigger" type="tns:trigger" minOccurs="0" maxOccurs="unbounded" />
+        <xs:element name="tags" type="tns:tags" minOccurs="1" maxOccurs="1" />
+        <xs:element name="links" type="tns:links" minOccurs="0" maxOccurs="1" />
+      </xs:sequence>
+      <xs:attribute name="version" use="required" type="xs:decimal" />
+    </xs:complexType>
+  </xs:element>
+
+  <xs:complexType name="trigger">
+    <xs:sequence>
+      <xs:element name="containerMatcher" type="tns:containerMatcher" minOccurs="0" maxOccurs="unbounded" />
+      <xs:element name="matcher" type="tns:matcher" minOccurs="0" maxOccurs="unbounded" />
+    </xs:sequence>
+    <xs:attribute name="id" use="required" type="xs:NCName" />
+    <xs:attribute name="type" use="required" type="xs:string" />
+    <xs:attribute name="templateFolder" use="optional" type="xs:string" default="/" />
+    <xs:attribute name="inputCharset" use="optional" type="xs:string" default="UTF-8" />
+  </xs:complexType>
+
+  <xs:complexType name="matcher">
+    <xs:sequence>
+      <xs:element name="variableAssignment" type="tns:variableAssignment" minOccurs="0" maxOccurs="unbounded" />
+    </xs:sequence>
+    <xs:attribute name="type" type="xs:string" use="required" />
+    <xs:attribute name="value" type="xs:string" use="required" />
+    <xs:attribute name="accumulationType" type="tns:accumulationType" use="optional" default="OR" />
+  </xs:complexType>
+
+  <xs:complexType name="containerMatcher">
+    <xs:attribute name="type" type="xs:string" use="required" />
+    <xs:attribute name="value" type="xs:string" use="required" />
+    <xs:attribute name="retrieveObjectsRecursively" type="xs:boolean" use="optional" default="false" />
+  </xs:complexType>
+
+  <xs:simpleType name="accumulationType">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="AND" />
+      <xs:enumeration value="OR" />
+      <xs:enumeration value="NOT" />
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:complexType name="variableAssignment">
+    <xs:attribute name="type" use="required" type="xs:string" />
+    <xs:attribute name="key" use="required" type="xs:NCName" />
+    <xs:attribute name="value" use="required" type="xs:string" />
+    <xs:attribute name="mandatory" use="optional" type="xs:boolean" default="false" />
+  </xs:complexType>
+
+  <xs:complexType name="tags">
+    <xs:sequence maxOccurs="unbounded" minOccurs="1">
+      <xs:element name="tag" type="tns:tag" />
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="tag">
+    <xs:attribute name="name" use="required" type="xs:string" />
+  </xs:complexType>
+
+  <xs:complexType name="links">
+    <xs:sequence maxOccurs="unbounded" minOccurs="1">
+      <xs:element name="link" type="tns:link" />
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="link">
+    <xs:attribute name="url" use="required" type="xs:string" />
+    <xs:attribute name="description" use="optional" type="xs:string" />
+  </xs:complexType>
+
+</xs:schema>
\ No newline at end of file
diff --git a/cobigen/cobigen-core/src/main/resources/schema/v6.0/templateSetConfiguration.xsd b/cobigen/cobigen-core/src/main/resources/schema/v6.0/templateSetConfiguration.xsd
new file mode 100644
index 0000000000..968eb74354
--- /dev/null
+++ b/cobigen/cobigen-core/src/main/resources/schema/v6.0/templateSetConfiguration.xsd
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+  xmlns:tns="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration"
+  targetNamespace="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration"
+  xmlns:cc="http://capgemini.com/devonfw/cobigen/ContextConfiguration"
+  xmlns:tc="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration" elementFormDefault="qualified" version="6.0">
+
+
+  <xs:import schemaLocation="contextConfiguration.xsd"
+    namespace="http://capgemini.com/devonfw/cobigen/ContextConfiguration"/>
+  <xs:import schemaLocation="templatesConfiguration.xsd"
+    namespace="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration"/>
+
+  <xs:element name="templateSetConfiguration">
+    <xs:complexType>
+       <xs:all>
+        <xs:element ref="cc:contextConfiguration"/>
+        <xs:element ref="tc:templatesConfiguration"/>
+      </xs:all>
+      <xs:attribute name="version" use="required" type="xs:decimal"/>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>
\ No newline at end of file
diff --git a/cobigen/cobigen-core/src/main/resources/schema/v6.0/templatesConfiguration.xsd b/cobigen/cobigen-core/src/main/resources/schema/v6.0/templatesConfiguration.xsd
new file mode 100644
index 0000000000..b53556aa75
--- /dev/null
+++ b/cobigen/cobigen-core/src/main/resources/schema/v6.0/templatesConfiguration.xsd
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration" targetNamespace="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration" elementFormDefault="qualified" version="6.0">
+
+  <xs:element name="templatesConfiguration">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element name="templates" minOccurs="0" type="tns:templates" />
+        <xs:element name="templateScans" minOccurs="0" type="tns:templateScans" />
+        <xs:element name="increments" minOccurs="0" type="tns:increments" />
+      </xs:sequence>
+      <xs:attribute name="templateEngine" use="optional" type="xs:string" default="FreeMarker"/>
+      <xs:attribute name="version" use="required" type="xs:decimal" />
+    </xs:complexType>
+  </xs:element>
+
+  <xs:complexType name="templates">
+    <xs:sequence>
+      <xs:element name="template" minOccurs="0" maxOccurs="unbounded" type="tns:template" />
+      <xs:element name="templateExtension" minOccurs="0" maxOccurs="unbounded" type="tns:templateExtension" />
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="templateScans">
+    <xs:sequence maxOccurs="unbounded" minOccurs="0">
+      <xs:element name="templateScan" type="tns:templateScan" />
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="template">
+    <xs:attribute name="name" use="required" type="xs:string" />
+    <xs:attribute name="destinationPath" use="required" type="xs:string" />
+    <xs:attribute name="templateFile" use="required" type="xs:string" />
+    <xs:attribute name="mergeStrategy" use="optional" type="xs:string" />
+    <xs:attribute name="targetCharset" use="optional" type="xs:string" default="UTF-8" />
+  </xs:complexType>
+
+  <xs:complexType name="templateExtension">
+    <xs:attribute name="ref" use="required" type="xs:string" />
+    <xs:attribute name="destinationPath" use="optional" type="xs:string" />
+    <xs:attribute name="mergeStrategy" use="optional" type="xs:string" />
+    <xs:attribute name="targetCharset" use="optional" type="xs:string" />
+  </xs:complexType>
+
+  <xs:complexType name="templateScan">
+    <xs:attribute name="name" use="optional" type="xs:string" />
+    <xs:attribute name="templateNamePrefix" use="optional" type="xs:string" />
+    <xs:attribute name="templatePath" use="required" type="xs:string" />
+    <xs:attribute name="destinationPath" use="required" type="xs:string" />
+    <xs:attribute name="mergeStrategy" use="optional" type="xs:string" />
+    <xs:attribute name="targetCharset" use="optional" type="xs:string" default="UTF-8" />
+  </xs:complexType>
+
+  <xs:complexType name="increments">
+    <xs:sequence maxOccurs="unbounded" minOccurs="1">
+      <xs:element name="increment" type="tns:increment" />
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="increment">
+    <xs:choice maxOccurs="unbounded" minOccurs="1">
+      <xs:element name="templateRef" type="tns:templateRef" />
+      <xs:element name="incrementRef" type="tns:incrementRef" />
+      <xs:element name="templateScanRef" type="tns:templateScanRef" />
+    </xs:choice>
+    <xs:attribute name="name" use="required" type="xs:string" />
+    <xs:attribute name="description" use="required" type="xs:string" />
+    <xs:attribute name="explanation" use="optional" type="xs:string" />
+  </xs:complexType>
+
+  <xs:complexType name="templateRef">
+    <xs:attribute name="ref" use="required" type="xs:string" />
+  </xs:complexType>
+
+  <xs:complexType name="incrementRef">
+    <xs:attribute name="ref" use="required" type="xs:string" />
+  </xs:complexType>
+
+  <xs:complexType name="templateScanRef">
+    <xs:attribute name="ref" use="required" type="xs:string" />
+  </xs:complexType>
+
+</xs:schema>
\ No newline at end of file
diff --git a/cobigen/cobigen-core/src/test/java/com/devonfw/cobigen/unittest/CobiGenFactoryTest.java b/cobigen/cobigen-core/src/test/java/com/devonfw/cobigen/unittest/CobiGenFactoryTest.java
new file mode 100644
index 0000000000..44970a078a
--- /dev/null
+++ b/cobigen/cobigen-core/src/test/java/com/devonfw/cobigen/unittest/CobiGenFactoryTest.java
@@ -0,0 +1,67 @@
+package com.devonfw.cobigen.unittest;
+
+import static com.github.stefanbirkner.systemlambda.SystemLambda.withEnvironmentVariable;
+
+import java.io.File;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import org.apache.commons.io.FileUtils;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+
+import com.devonfw.cobigen.api.constants.ConfigurationConstants;
+import com.devonfw.cobigen.api.exception.InvalidConfigurationException;
+import com.devonfw.cobigen.impl.CobiGenFactory;
+
+import junit.framework.TestCase;
+
+/**
+ * This {@link TestCase} tests the {@link CobiGenFactory}
+ */
+public class CobiGenFactoryTest {
+
+  /**
+   * JUnit Rule to temporarily create files and folders, which will be automatically removed after test execution
+   */
+  @Rule
+  public TemporaryFolder tmpFolder = new TemporaryFolder();
+
+  /**
+   * Tests whether a valid configuration can be read from template-sets/adapted folder does not throw a
+   * {@link InvalidConfigurationException}
+   *
+   * @throws Exception test fails
+   */
+  @Test
+  public void testTemplateSetDownloadedLoadedFromNewConfiguration() throws Exception {
+
+    Path downloadedPath = Paths.get(
+        "src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/valid_template_sets_downloaded/template-sets");
+
+    File folder = this.tmpFolder.newFolder("TemplateSetsInstalledTest");
+    FileUtils.copyDirectory(downloadedPath.getParent().toFile(), folder);
+    withEnvironmentVariable(ConfigurationConstants.CONFIG_ENV_HOME, folder.getAbsolutePath()).execute(() -> {
+      CobiGenFactory.create(folder.toPath().resolve("template-sets").toUri(), false);
+    });
+  }
+
+  /**
+   * Tests whether a valid configuration can be read from template-sets/adapted folder does not throw a
+   * {@link InvalidConfigurationException}
+   *
+   * @throws Exception test fails
+   */
+  @Test
+  public void testTemplateSetAdaptedLoadedFromNewConfiguration() throws Exception {
+
+    Path adaptedPath = Paths.get(
+        "src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/valid_template_sets_adapted/template-sets");
+    File folder = this.tmpFolder.newFolder("TemplateSetsInstalledTest");
+    FileUtils.copyDirectory(adaptedPath.getParent().toFile(), folder);
+    withEnvironmentVariable(ConfigurationConstants.CONFIG_ENV_HOME, folder.getAbsolutePath()).execute(() -> {
+      CobiGenFactory.create(folder.toPath().resolve("template-sets").toUri(), false);
+    });
+  }
+}
\ No newline at end of file
diff --git a/cobigen/cobigen-core/src/test/java/com/devonfw/cobigen/unittest/adapter/TemplateAdapterTest.java b/cobigen/cobigen-core/src/test/java/com/devonfw/cobigen/unittest/adapter/TemplateAdapterTest.java
new file mode 100644
index 0000000000..e7713f1a01
--- /dev/null
+++ b/cobigen/cobigen-core/src/test/java/com/devonfw/cobigen/unittest/adapter/TemplateAdapterTest.java
@@ -0,0 +1,156 @@
+package com.devonfw.cobigen.unittest.adapter;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
+
+import org.junit.ClassRule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+
+import com.devonfw.cobigen.api.TemplateAdapter;
+import com.devonfw.cobigen.api.constants.ConfigurationConstants;
+import com.devonfw.cobigen.impl.adapter.TemplateAdapterImpl;
+
+/**
+ * Tests for {@link TemplateAdapterImpl}
+ */
+public class TemplateAdapterTest {
+
+  /** Temporary files rule to create temporary folders or files */
+  @ClassRule
+  public static TemporaryFolder tempFolder = new TemporaryFolder();
+
+  /**
+   * Tests if the {@link TemplateAdapter} isMonolithicTemplatesConfiguration() recognizes that it is an old monolithic
+   * template structure
+   *
+   * @throws IOException test fails
+   *
+   */
+  @Test
+  public void testIsMonolithicTemplatesConfigurationWithOldConfig() throws IOException {
+
+    Path rootTestPathMonolithicTemplates = tempFolder
+        .newFolder("homeMonolithicTemplates", ConfigurationConstants.TEMPLATES_FOLDER).toPath();
+
+    TemplateAdapter templateAdapter = new TemplateAdapterImpl(rootTestPathMonolithicTemplates);
+    assertThat(templateAdapter.isMonolithicTemplatesConfiguration()).isTrue();
+  }
+
+  /**
+   * Tests if the {@link TemplateAdapter} isMonolithicTemplatesConfiguration() recognizes that it is a new template
+   * structure
+   *
+   * @throws IOException test fails
+   *
+   */
+  @Test
+  public void testIsMonolithicTemplatesConfigurationWithNewConfig() throws IOException {
+
+    Path rootTestPathTemplateSets = tempFolder.newFolder("NotMonolithic", ConfigurationConstants.TEMPLATE_SETS_FOLDER)
+        .toPath();
+    Files.createDirectory(rootTestPathTemplateSets.resolve(ConfigurationConstants.DOWNLOADED_FOLDER));
+
+    TemplateAdapter templateAdapter = new TemplateAdapterImpl(rootTestPathTemplateSets);
+    assertThat(templateAdapter.isMonolithicTemplatesConfiguration()).isFalse();
+  }
+
+  /**
+   * Tests if the {@link TemplateAdapter} getTemplateSetJars() is able to get two adaptable template sets (consisting of
+   * classes and sources)
+   *
+   * @throws IOException test fails
+   *
+   */
+  @Test
+  public void testGetTemplateJarsToAdaptFindsTwoAdaptableTemplateSets() throws IOException {
+
+    Path rootTestPathTemplateSets = tempFolder.newFolder("TwoAdaptable", ConfigurationConstants.TEMPLATE_SETS_FOLDER)
+        .toPath();
+
+    Path downloadedFolder = Files
+        .createDirectory(rootTestPathTemplateSets.resolve(ConfigurationConstants.DOWNLOADED_FOLDER));
+    Files.createFile(downloadedFolder.resolve("template-set-1.jar"));
+    Files.createFile(downloadedFolder.resolve("template-set-1-sources.jar"));
+    Files.createFile(downloadedFolder.resolve("template-set-2.jar"));
+    Files.createFile(downloadedFolder.resolve("template-set-2-sources.jar"));
+    TemplateAdapter templateAdapter = new TemplateAdapterImpl(rootTestPathTemplateSets);
+    List<Path> templateJars = templateAdapter.getTemplateSetJars();
+    assertThat(templateJars.size()).isEqualTo(2);
+  }
+
+  /**
+   * Tests if the {@link TemplateAdapter} getTemplateSetJars() returns an empty list if no adaptable template set was
+   * found (missing sources)
+   *
+   * @throws IOException test fails
+   */
+  @Test
+  public void testGetTemplateJarsToAdaptWithMissingSourceFileReturnsEmptyList() throws IOException {
+
+    Path rootTestPathTemplateSets = tempFolder.newFolder("MissingSource", ConfigurationConstants.TEMPLATE_SETS_FOLDER)
+        .toPath();
+
+    Path downloadedFolder = Files
+        .createDirectory(rootTestPathTemplateSets.resolve(ConfigurationConstants.DOWNLOADED_FOLDER));
+    Files.createFile(downloadedFolder.resolve("template-set-1.jar"));
+    TemplateAdapter templateAdapter = new TemplateAdapterImpl(rootTestPathTemplateSets);
+    List<Path> templateJars = templateAdapter.getTemplateSetJars();
+    assertThat(templateJars).isEmpty();
+  }
+
+  /**
+   * Tests if the {@link TemplateAdapter} getTemplateSetJars() returns an empty list if no adaptable template set was
+   * found (empty folder)
+   *
+   * @throws IOException test fails
+   */
+  @Test
+  public void testGetTemplateJarsToAdaptReturnsEmptyListForEmptyFolder() throws IOException {
+
+    Path rootTestPathTemplateSets = tempFolder.newFolder("EmptyFolder", ConfigurationConstants.TEMPLATE_SETS_FOLDER)
+        .toPath();
+
+    Files.createDirectory(rootTestPathTemplateSets.resolve(ConfigurationConstants.DOWNLOADED_FOLDER));
+    TemplateAdapter templateAdapter = new TemplateAdapterImpl(rootTestPathTemplateSets);
+    List<Path> templateJars = templateAdapter.getTemplateSetJars();
+    assertThat(templateJars).isEmpty();
+  }
+
+  /**
+   * Tests if the {@link TemplateAdapter} isTemplateSetAlreadyAdapted() recognizes which template sets are already
+   * adapted
+   *
+   * @throws IOException test fails
+   *
+   */
+  @Test
+  public void testIsTemplateSetAlreadyAdapted() throws IOException {
+
+    Path rootTestPathTemplateSets = tempFolder.newFolder("AlreadyAdapted", ConfigurationConstants.TEMPLATE_SETS_FOLDER)
+        .toPath();
+    Path downloadedFolder = Files
+        .createDirectory(rootTestPathTemplateSets.resolve(ConfigurationConstants.DOWNLOADED_FOLDER));
+    Files.createFile(downloadedFolder.resolve("template-set-1.jar"));
+    Files.createFile(downloadedFolder.resolve("template-set-1-sources.jar"));
+    Files.createFile(downloadedFolder.resolve("template-set-2.jar"));
+    Path adaptedFolder = Files.createDirectory(rootTestPathTemplateSets.resolve(ConfigurationConstants.ADAPTED_FOLDER));
+    Files.createDirectory(adaptedFolder.resolve("template-set-1"));
+
+    TemplateAdapter templateAdapter = new TemplateAdapterImpl(rootTestPathTemplateSets);
+
+    Path templateJarAdapted = rootTestPathTemplateSets.resolve(ConfigurationConstants.DOWNLOADED_FOLDER)
+        .resolve("template-set-1.jar");
+
+    Path templateJarNotAdapted = rootTestPathTemplateSets.resolve(ConfigurationConstants.DOWNLOADED_FOLDER)
+        .resolve("template-set-2.jar");
+
+    assertThat(templateAdapter.isTemplateSetAlreadyAdapted(templateJarAdapted)).isTrue();
+    assertThat(templateAdapter.isTemplateSetAlreadyAdapted(templateJarNotAdapted)).isFalse();
+  }
+
+}
diff --git a/cobigen/cobigen-core/src/test/java/com/devonfw/cobigen/unittest/config/ConfigurationFinderTest.java b/cobigen/cobigen-core/src/test/java/com/devonfw/cobigen/unittest/config/ConfigurationFinderTest.java
new file mode 100644
index 0000000000..e55fdf6b88
--- /dev/null
+++ b/cobigen/cobigen-core/src/test/java/com/devonfw/cobigen/unittest/config/ConfigurationFinderTest.java
@@ -0,0 +1,338 @@
+package com.devonfw.cobigen.unittest.config;
+
+import static com.github.stefanbirkner.systemlambda.SystemLambda.withEnvironmentVariable;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URI;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Arrays;
+import java.util.List;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+
+import com.devonfw.cobigen.api.constants.ConfigurationConstants;
+import com.devonfw.cobigen.impl.config.ConfigurationProperties;
+import com.devonfw.cobigen.impl.util.ConfigurationFinder;
+
+import junit.framework.TestCase;
+
+/**
+ * This {@link TestCase} tests the {@link ConfigurationFinder}
+ */
+public class ConfigurationFinderTest {
+
+  /**
+   * JUnit Rule to temporarily create files and folders, which will be automatically removed after test execution
+   */
+  @Rule
+  public TemporaryFolder tmpFolder = new TemporaryFolder();
+
+  /**
+   * Test retrieveCobiGenProperties Method in ConfigurationFinder if invalid properties found, to load the default
+   * values.
+   *
+   * @throws IOException test fails
+   */
+  @Test
+  public void emptyConfigurationTest() throws IOException {
+
+    Path emptyConfiguration = Paths
+        .get("src/test/resources/testdata/unittest/config/properties/emptyConfigProperties/config.properties");
+    ConfigurationProperties conf = ConfigurationFinder.retrieveCobiGenProperties(emptyConfiguration);
+
+    assertThat(conf.getGroupIds()).contains(ConfigurationConstants.CONFIG_PROPERTY_TEMPLATE_SETS_DEFAULT_GROUPID);
+    assertThat(conf.getHideTemplateSets()).isEmpty();
+    assertThat(conf.isAllowSnapshots()).isFalse();
+  }
+
+  /**
+   * Test retrieveCobiGenProperties Method in ConfigurationFinder if valid properties found, to load these valid
+   * properties correctly.
+   *
+   * @throws IOException test fails
+   */
+  @Test
+  public void validConfigurationTest() throws IOException {
+
+    Path validConfiguration = Paths
+        .get("src/test/resources/testdata/unittest/config/properties/validConfigProperties/config.properties");
+    ConfigurationProperties conf = ConfigurationFinder.retrieveCobiGenProperties(validConfiguration);
+
+    assertThat(conf.getGroupIds()).containsSequence("devonfw-cobigen-bla", "abcd", "blablob",
+        ConfigurationConstants.CONFIG_PROPERTY_TEMPLATE_SETS_DEFAULT_GROUPID);
+    assertThat(conf.isAllowSnapshots()).isTrue();
+    assertThat(conf.getHideTemplateSets().get(0).getArtifactId().equals("com.devonfw"));
+    assertThat(conf.getHideTemplateSets().get(0).getGroupId().equals("test-artifact"));
+    assertThat(conf.getHideTemplateSets().get(0).getVersion().equals("3.2.1-SNAPSHOT"));
+  }
+
+  /**
+   * Test retrieveCobiGenProperties Method in ConfigurationFinder if valid properties found, to load these valid
+   * properties correctly.
+   *
+   * @throws IOException test fails
+   */
+  @Test
+  public void invalidInputConfigurationTest() throws IOException {
+
+    Path validConfiguration = Paths
+        .get("src/test/resources/testdata/unittest/config/properties/invalidConfigProperties/config.properties");
+    ConfigurationProperties conf = ConfigurationFinder.retrieveCobiGenProperties(validConfiguration);
+
+    assertTrue(conf.getHideTemplateSets().isEmpty());
+    assertTrue(conf.getTemplateSetsInstalled().isEmpty());
+  }
+
+  /**
+   * Test retrieveCobiGenProperties Method in ConfigurationFinder if file *.properties not found , to load the default
+   * values.
+   *
+   * @throws IOException test fails
+   *
+   */
+  @Test
+  public void invalidPathTest() throws IOException {
+
+    Path invalidPath = Paths.get("path/which/does/not/exist");
+    ConfigurationProperties conf = ConfigurationFinder.retrieveCobiGenProperties(invalidPath);
+
+    assertThat(conf.getGroupIds()).contains(ConfigurationConstants.CONFIG_PROPERTY_TEMPLATE_SETS_DEFAULT_GROUPID);
+    assertThat(conf.getHideTemplateSets()).isEmpty();
+    assertThat(conf.isAllowSnapshots()).isFalse();
+  }
+
+  /**
+   * Test of findTemplates without an existing templates or template-set folder, expecting to return a created
+   * template-set folder
+   *
+   * @throws Exception test fails
+   */
+  @Test
+  public void testFindTemplatesLocation_WithoutExistingFolders() throws Exception {
+
+    File userHome = this.tmpFolder.newFolder("user-home");
+    withEnvironmentVariable(ConfigurationConstants.CONFIG_ENV_HOME, userHome.getAbsolutePath()).execute(() -> {
+      URI templateSets = ConfigurationFinder.findTemplatesLocation();
+      assertThat(Paths.get(templateSets)).exists();
+      assertThat(Paths.get(templateSets).getFileName().toString())
+          .isEqualTo(ConfigurationConstants.TEMPLATE_SETS_FOLDER);
+    });
+  }
+
+  /**
+   * Test of findTemplates with an existing template-set/adapted folder, expecting to return the template-set folder
+   *
+   * @throws Exception test fails
+   */
+  @Test
+  public void testFindTemplateLocation_WithTemplateSetFolderContainingAdaptedFolder() throws Exception {
+
+    File userHome = this.tmpFolder.newFolder("user-home");
+    this.tmpFolder.newFolder("user-home", ConfigurationConstants.TEMPLATE_SETS_FOLDER,
+        ConfigurationConstants.ADAPTED_FOLDER);
+    withEnvironmentVariable(ConfigurationConstants.CONFIG_ENV_HOME, userHome.getAbsolutePath()).execute(() -> {
+      URI adapted = ConfigurationFinder.findTemplatesLocation();
+      assertThat(Paths.get(adapted)).exists();
+      assertThat(Paths.get(adapted).getFileName().toString()).isEqualTo(ConfigurationConstants.TEMPLATE_SETS_FOLDER);
+    });
+  }
+
+  /**
+   * Test of findTemplates with an existing template-set/downloaded folder, expecting to return the template-set folder
+   *
+   * @throws Exception test fails
+   */
+  @Test
+  public void testFindTemplateLocation_WithTemplateSetFolderContainingDownloadedFolder() throws Exception {
+
+    File userHome = this.tmpFolder.newFolder("user-home");
+    this.tmpFolder.newFolder("user-home", ConfigurationConstants.TEMPLATE_SETS_FOLDER,
+        ConfigurationConstants.DOWNLOADED_FOLDER);
+    withEnvironmentVariable(ConfigurationConstants.CONFIG_ENV_HOME, userHome.getAbsolutePath()).execute(() -> {
+      URI downloaded = ConfigurationFinder.findTemplatesLocation();
+      assertThat(Paths.get(downloaded)).exists();
+      assertThat(Paths.get(downloaded).getFileName().toString()).isEqualTo(ConfigurationConstants.TEMPLATE_SETS_FOLDER);
+    });
+  }
+
+  /**
+   * Test of findTemplates with an existing templates folder with template jars, expecting to return the path to a jar.
+   *
+   * @throws Exception test fails
+   */
+  @Test
+  public void testFindTemplateLocation_WithTemplatesFolderContainingJars() throws Exception {
+
+    File userHome = this.tmpFolder.newFolder("user-home");
+    File templateS = this.tmpFolder.newFolder("user-home", ConfigurationConstants.TEMPLATES_FOLDER);
+    Files.createFile(templateS.toPath().resolve("templates-devon4j-1.0-sources.jar"));
+    Files.createFile(templateS.toPath().resolve("templates-devon4j-1.0.jar"));
+    withEnvironmentVariable(ConfigurationConstants.CONFIG_ENV_HOME, userHome.getAbsolutePath()).execute(() -> {
+      URI templates = ConfigurationFinder.findTemplatesLocation();
+      assertThat(Paths.get(templates)).exists();
+      assertThat(Paths.get(templates).getFileName().toString()).containsSequence("templates-devon4j-1.0");
+    });
+  }
+
+  /**
+   * Test of findTemplates with an existing templates folder without template jars , expecting to return a newly created
+   * template-Set folder
+   *
+   * @throws Exception test fails
+   */
+  @Test
+  public void testFindTemplateLocation_WithTemplatesFolderWithoutJars() throws Exception {
+
+    File userHome = this.tmpFolder.newFolder("user-home");
+    this.tmpFolder.newFolder("user-home", ConfigurationConstants.TEMPLATES_FOLDER);
+    withEnvironmentVariable(ConfigurationConstants.CONFIG_ENV_HOME, userHome.getAbsolutePath()).execute(() -> {
+      URI templates = ConfigurationFinder.findTemplatesLocation();
+      assertThat(Paths.get(templates)).exists();
+      assertThat(Paths.get(templates).getFileName().toString()).isEqualTo(ConfigurationConstants.TEMPLATE_SETS_FOLDER);
+    });
+  }
+
+  /**
+   * Test of findTemplates with an existing templates/CobiGen_Templates folder, expecting to return the
+   * CobiGen_Templates folder
+   *
+   * @throws Exception test fails
+   */
+  @Test
+  public void testFindTemplateLocation_WithTemplatesFolderContainingCobiGenTemplatesFolder() throws Exception {
+
+    File userHome = this.tmpFolder.newFolder("user-home");
+    this.tmpFolder.newFolder("user-home", ConfigurationConstants.TEMPLATES_FOLDER,
+        ConfigurationConstants.COBIGEN_TEMPLATES);
+    withEnvironmentVariable(ConfigurationConstants.CONFIG_ENV_HOME, userHome.getAbsolutePath()).execute(() -> {
+      URI CobigenTemplates = ConfigurationFinder.findTemplatesLocation();
+      assertThat(Paths.get(CobigenTemplates)).exists();
+      assertThat(Paths.get(CobigenTemplates).getFileName().toString())
+          .isEqualTo(ConfigurationConstants.COBIGEN_TEMPLATES);
+    });
+  }
+
+  /**
+   * Test of findTemplates with an existing template-set/downloaded folder and template-set/adapted folder, expecting to
+   * return the template-set folder
+   *
+   * @throws Exception test fails
+   */
+  @Test
+  public void testFindTemplateLocation_WithTemplateSetFolderContainingDownloadedAndAdaptedFolder() throws Exception {
+
+    File userHome = this.tmpFolder.newFolder("user-home");
+    this.tmpFolder.newFolder("user-home", ConfigurationConstants.TEMPLATE_SETS_FOLDER,
+        ConfigurationConstants.DOWNLOADED_FOLDER);
+    this.tmpFolder.newFolder("user-home", ConfigurationConstants.TEMPLATE_SETS_FOLDER,
+        ConfigurationConstants.ADAPTED_FOLDER);
+    withEnvironmentVariable(ConfigurationConstants.CONFIG_ENV_HOME, userHome.getAbsolutePath()).execute(() -> {
+      URI downloaded = ConfigurationFinder.findTemplatesLocation();
+      assertThat(Paths.get(downloaded)).exists();
+      assertThat(Paths.get(downloaded).getFileName().toString()).isEqualTo(ConfigurationConstants.TEMPLATE_SETS_FOLDER);
+    });
+  }
+
+  /**
+   * Test of findTemplates with templates value set in the cobigen file, expecting to return the value from the .cobigen
+   * file
+   *
+   * @throws Exception test fails
+   */
+  @Test
+  public void testFindTemplateLocation_WithTemplatesPropertySet() throws Exception {
+
+    File userHome = this.tmpFolder.newFolder("user-home");
+    File customTemplatesFolder = this.tmpFolder.newFolder("customTemplatesFolder",
+        ConfigurationConstants.TEMPLATES_FOLDER);
+    Path propertieFile = Files.createFile(userHome.toPath().resolve(".cobigen"));
+    List<String> properties = Arrays.asList("templates=" + customTemplatesFolder.getAbsolutePath());
+    Files.write(propertieFile, properties);
+
+    withEnvironmentVariable(ConfigurationConstants.CONFIG_ENV_HOME, userHome.getAbsolutePath()).execute(() -> {
+      URI templates = ConfigurationFinder.findTemplatesLocation();
+      assertThat(Paths.get(templates)).exists();
+      assertThat(templates).isEqualTo(customTemplatesFolder.toURI());
+    });
+  }
+
+  /**
+   * Test of findTemplates with template-set value set in the cobigen file, the value is faulty and the folder does not
+   * exist. Expecting to create a template-set folder in the COBIGEN_HOME home directory.
+   *
+   * @throws Exception test fails
+   */
+  @Test
+  public void testFindTemplateLocation_WithIvalidTemplateSetPropertySet() throws Exception {
+
+    File userHome = this.tmpFolder.newFolder("user-home");
+    File customTemplatesFolder = this.tmpFolder.newFolder("customTemplatesFolder");
+    Path propertieFile = Files.createFile(userHome.toPath().resolve(".cobigen"));
+    List<String> properties = Arrays
+        .asList("template-sets=" + customTemplatesFolder.getAbsolutePath().replaceFirst("custom", "nonExistend"));
+    Files.write(propertieFile, properties);
+
+    withEnvironmentVariable(ConfigurationConstants.CONFIG_ENV_HOME, userHome.getAbsolutePath()).execute(() -> {
+      URI templates = ConfigurationFinder.findTemplatesLocation();
+      assertThat(Paths.get(templates)).exists();
+      assertThat(Paths.get(templates))
+          .isEqualTo(userHome.toPath().resolve(ConfigurationConstants.TEMPLATE_SETS_FOLDER));
+    });
+  }
+
+  /**
+   * Test of findTemplates with template-set value set in the cobigen file, expecting to return the value from the
+   * .cobigen file
+   *
+   * @throws Exception test fails
+   */
+  @Test
+  public void testFindTemplateLocation_WithTemplateSetPropertySet() throws Exception {
+
+    File userHome = this.tmpFolder.newFolder("user-home");
+    File customTemplatesFolder = this.tmpFolder.newFolder("customTemplatesFolder",
+        ConfigurationConstants.TEMPLATE_SETS_FOLDER);
+    Path propertieFile = Files.createFile(userHome.toPath().resolve(".cobigen"));
+    List<String> properties = Arrays.asList("template-sets=" + customTemplatesFolder.getAbsolutePath());
+    Files.write(propertieFile, properties);
+
+    withEnvironmentVariable(ConfigurationConstants.CONFIG_ENV_HOME, userHome.getAbsolutePath()).execute(() -> {
+      URI templateSets = ConfigurationFinder.findTemplatesLocation();
+      assertThat(Paths.get(templateSets)).exists();
+      assertThat(templateSets).isEqualTo(customTemplatesFolder.toURI());
+    });
+  }
+
+  /**
+   *
+   * Test of findTemplates with templates value set in the cobigen file, the value is faulty and the folder does not
+   * exist. Expecting to create a template-set folder in the COBIGEN_HOME home directory and return the folder.
+   *
+   * @throws Exception test fails
+   */
+  @Test
+  public void testFindTemplateLocation_WithIvalidTemplatesPropertySet() throws Exception {
+
+    File userHome = this.tmpFolder.newFolder("user-home");
+    File customTemplatesFolder = this.tmpFolder.newFolder("customTemplatesFolder");
+    Path propertieFile = Files.createFile(userHome.toPath().resolve(".cobigen"));
+    List<String> properties = Arrays
+        .asList("templates=" + customTemplatesFolder.getAbsolutePath().replaceFirst("custom", "nonExistend"));
+    Files.write(propertieFile, properties);
+
+    withEnvironmentVariable(ConfigurationConstants.CONFIG_ENV_HOME, userHome.getAbsolutePath()).execute(() -> {
+      URI templateSets = ConfigurationFinder.findTemplatesLocation();
+      assertThat(Paths.get(templateSets)).exists();
+      assertThat(Paths.get(templateSets))
+          .isEqualTo(userHome.toPath().resolve(ConfigurationConstants.TEMPLATE_SETS_FOLDER));
+    });
+  }
+
+}
diff --git a/cobigen/cobigen-core/src/test/java/com/devonfw/cobigen/unittest/config/reader/ContextConfigurationReaderTest.java b/cobigen/cobigen-core/src/test/java/com/devonfw/cobigen/unittest/config/reader/ContextConfigurationReaderTest.java
index b7cd9b099e..507525d625 100644
--- a/cobigen/cobigen-core/src/test/java/com/devonfw/cobigen/unittest/config/reader/ContextConfigurationReaderTest.java
+++ b/cobigen/cobigen-core/src/test/java/com/devonfw/cobigen/unittest/config/reader/ContextConfigurationReaderTest.java
@@ -1,16 +1,14 @@
 package com.devonfw.cobigen.unittest.config.reader;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertThrows;
 
+import java.io.File;
 import java.nio.file.Paths;
 
 import org.junit.Test;
 
-import com.devonfw.cobigen.api.exception.ConfigurationConflictException;
 import com.devonfw.cobigen.api.exception.InvalidConfigurationException;
 import com.devonfw.cobigen.impl.CobiGenFactory;
-import com.devonfw.cobigen.impl.config.constant.WikiConstants;
 import com.devonfw.cobigen.impl.config.reader.ContextConfigurationReader;
 import com.devonfw.cobigen.unittest.config.common.AbstractUnitTest;
 
@@ -34,50 +32,8 @@ public class ContextConfigurationReaderTest extends AbstractUnitTest {
   @Test(expected = InvalidConfigurationException.class)
   public void testErrorOnInvalidConfiguration() throws InvalidConfigurationException {
 
-    new ContextConfigurationReader(Paths.get(testFileRootPath + "faulty"));
-  }
-
-  /**
-   * Tests whether an {@link ConfigurationConflictException} will be thrown when both a v2.1 and v2.2 context.xml are
-   * present (new templates with old custom templates). Also tests if the thrown error message contains a link to the
-   * wiki.
-   *
-   * Backward Compatibility test, remove when monolithic context.xml is deprecated.
-   *
-   * @throws ConfigurationConflictException if a conflict occurred
-   *
-   */
-  @Test
-  public void testConflictConfiguration() throws ConfigurationConflictException {
-
-    Throwable bothPresent = assertThrows(ConfigurationConflictException.class, () -> {
-      new ContextConfigurationReader(Paths.get(testFileRootPath + "invalid_new"));
-    });
-
-    assertThat(bothPresent instanceof ConfigurationConflictException);
-    assertThat(bothPresent.getMessage()).contains(WikiConstants.WIKI_UPDATE_OLD_CONFIG);
-  }
-
-  /**
-   * Tests whether a valid v2.2 configuration can be read from src/main/templates/templateSet folder
-   *
-   * @throws Exception test fails
-   */
-  @Test
-  public void testContextLoadedFromNewConfiguration() throws Exception {
-
-    CobiGenFactory.create(Paths.get(testFileRootPath + "valid_new").toUri());
-  }
-
-  /**
-   * Tests if multiple (2) templates are found with v2.2 context configuration
-   *
-   */
-  @Test
-  public void testNewConfiguration() {
-
-    ContextConfigurationReader context = new ContextConfigurationReader(Paths.get(testFileRootPath + "valid_new"));
-    assertThat(context.getContextFiles().size()).isEqualTo(2);
+    ContextConfigurationReader reader = new ContextConfigurationReader(
+        Paths.get(new File(testFileRootPath + "faulty").toURI()));
   }
 
   /**
@@ -90,11 +46,11 @@ public void testNewConfiguration() {
   @Test
   public void testContextLoadedFromOldConfiguration() throws Exception {
 
-    CobiGenFactory.create(Paths.get(testFileRootPath + "valid_source_folder").toUri());
+    CobiGenFactory.create(new File(testFileRootPath + "valid_source_folder").toURI(), true);
   }
 
   /**
-   * Tests that exactly one v2.1 context configuration is read
+   * Tests that exactly one v3.0 context configuration is read
    *
    * Backward Compatibility test, remove when monolithic context.xml is deprecated.
    *
@@ -103,7 +59,7 @@ public void testContextLoadedFromOldConfiguration() throws Exception {
   public void testOldConfiguration() {
 
     ContextConfigurationReader context = new ContextConfigurationReader(
-        Paths.get(testFileRootPath + "valid_source_folder"));
+        Paths.get(new File(testFileRootPath + "valid_source_folder").toURI()));
     assertThat(context.getContextFiles().size()).isEqualTo(1);
   }
 
@@ -115,7 +71,7 @@ public void testOldConfiguration() {
   @Test
   public void testReadConfigurationFromZip() throws Exception {
 
-    CobiGenFactory.create(Paths.get(testFileRootPath + "valid.zip").toUri());
+    CobiGenFactory.create(new File(testFileRootPath + "valid.zip").toURI(), true);
   }
 
-}
+}
\ No newline at end of file
diff --git a/cobigen/cobigen-core/src/test/java/com/devonfw/cobigen/unittest/config/reader/TemplateSetConfigurationReaderTest.java b/cobigen/cobigen-core/src/test/java/com/devonfw/cobigen/unittest/config/reader/TemplateSetConfigurationReaderTest.java
new file mode 100644
index 0000000000..9ac17f2768
--- /dev/null
+++ b/cobigen/cobigen-core/src/test/java/com/devonfw/cobigen/unittest/config/reader/TemplateSetConfigurationReaderTest.java
@@ -0,0 +1,172 @@
+package com.devonfw.cobigen.unittest.config.reader;
+
+import static com.github.stefanbirkner.systemlambda.SystemLambda.withEnvironmentVariable;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import java.io.File;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import org.apache.commons.io.FileUtils;
+import org.junit.Ignore;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+
+import com.devonfw.cobigen.api.constants.ConfigurationConstants;
+import com.devonfw.cobigen.api.exception.InvalidConfigurationException;
+import com.devonfw.cobigen.impl.config.TemplateSetConfiguration;
+import com.devonfw.cobigen.impl.config.reader.TemplateSetConfigurationReader;
+import com.devonfw.cobigen.unittest.config.common.AbstractUnitTest;
+
+import junit.framework.TestCase;
+
+/**
+ * This {@link TestCase} tests the {@link TemplateSetConfigurationReader}
+ */
+
+public class TemplateSetConfigurationReaderTest extends AbstractUnitTest {
+
+  /**
+   * JUnit Rule to temporarily create files and folders, which will be automatically removed after test execution
+   */
+  @Rule
+  public TemporaryFolder tmpFolder = new TemporaryFolder();
+
+  /**
+   * Root path to all resources used in this test case
+   */
+  private final static Path TEST_FILE_ROOT_PATH = Paths
+      .get("src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/");
+
+  private final static Path INVALID_CONFIGURATION_PATH = Paths.get(TEST_FILE_ROOT_PATH + "/invalid_template_sets")
+      .resolve(ConfigurationConstants.TEMPLATE_SETS_FOLDER);
+
+  /**
+   * Tests whether an invalid configuration results in an {@link InvalidConfigurationException}
+   *
+   * @throws InvalidConfigurationException expected
+   */
+  @Test // (expected = InvalidConfigurationException.class)
+  public void testErrorOnInvalidConfiguration() throws InvalidConfigurationException {
+
+    // when
+    assertThatThrownBy(() -> {
+
+      new TemplateSetConfiguration(TEST_FILE_ROOT_PATH.resolve("faulty"));
+
+    }).isInstanceOf(InvalidConfigurationException.class)
+        .hasMessage(TEST_FILE_ROOT_PATH.resolve("faulty").toAbsolutePath() + ":\n"
+            + "Could not find any template-set configuration file in the given folder.");
+
+  }
+
+  /**
+   * Tests whether an {@link InvalidConfigurationException} will be thrown when no template set configuration is found
+   * in the template-sets directory
+   *
+   * @throws InvalidConfigurationException if no template set configuration is found
+   *
+   */
+  @Test
+  public void testInvalidTemplateSets() throws InvalidConfigurationException {
+
+    assertThatThrownBy(() -> {
+
+      new TemplateSetConfiguration(INVALID_CONFIGURATION_PATH);
+
+    }).isInstanceOf(InvalidConfigurationException.class).hasMessage(INVALID_CONFIGURATION_PATH.toAbsolutePath() + ":\n"
+        + "Could not find any template-set configuration file in the given folder.");
+
+  }
+
+  /**
+   * Tests if duplicated template sets using same trigger id and increment name were not loadable and an exception was
+   * thrown
+   *
+   * @throws Exception test fails
+   */
+  @Ignore // TODO: Detection and handling of duplicates needs to be implemented first, then the test can be enabled,
+          // see: https://github.com/devonfw/cobigen/issues/1663
+  @Test
+  public void testTemplateSetsDuplicatedThrowsError() throws Exception {
+
+    File folder = this.tmpFolder.newFolder("TemplateSetsDuplicatedTest");
+    Path templateSetPathAdapted = TEST_FILE_ROOT_PATH.resolve("valid_template_sets_duplicated");
+    FileUtils.copyDirectory(templateSetPathAdapted.toFile(), folder);
+    withEnvironmentVariable(ConfigurationConstants.CONFIG_ENV_HOME, folder.getAbsolutePath()).execute(() -> {
+      TemplateSetConfiguration templateSetConfiguration = new TemplateSetConfiguration(
+          folder.toPath().resolve("template-sets"));
+      // TODO add check for proper exception message
+    });
+  }
+
+  /**
+   * Tests if a template set configuration can be found from a template set jar file
+   *
+   * @throws Exception test fails
+   *
+   */
+  @Test
+  public void testTemplateSetsDownloaded() throws Exception {
+
+    File folder = this.tmpFolder.newFolder("TemplateSetsInstalledTest");
+    Path templateSetPath = TEST_FILE_ROOT_PATH.resolve("valid_template_sets_downloaded/");
+    FileUtils.copyDirectory(templateSetPath.toFile(), folder);
+    withEnvironmentVariable(ConfigurationConstants.CONFIG_ENV_HOME, folder.getAbsolutePath()).execute(() -> {
+      TemplateSetConfiguration templateSetConfiguration = new TemplateSetConfiguration(
+          folder.toPath().resolve("template-sets"));
+      assertThat(templateSetConfiguration.getTemplatesConfigurations().size()).isEqualTo(1);
+    });
+  }
+
+  /**
+   * Tests if template-set configuration can be found in both adapted and downloaded folder of the template sets
+   * directory
+   *
+   * @throws Exception test fails
+   *
+   */
+  @Test
+  public void testTemplateSetsAdaptedAndDownloaded() throws Exception {
+
+    File folder = this.tmpFolder.newFolder("TemplateSetsInstalledTest");
+    Path templateSetPath = TEST_FILE_ROOT_PATH.resolve("valid_template_sets/");
+    FileUtils.copyDirectory(templateSetPath.toFile(), folder);
+    withEnvironmentVariable(ConfigurationConstants.CONFIG_ENV_HOME, folder.getAbsolutePath()).execute(() -> {
+
+      TemplateSetConfiguration templateSetConfiguration = new TemplateSetConfiguration(
+          folder.toPath().resolve("template-sets"));
+
+      assertThat(templateSetConfiguration.getTemplatesConfigurations().size()).isEqualTo(3);
+    });
+  }
+
+  /**
+   * Tests if template-set configuration can be found in both adapted and downloaded folder of the template sets
+   * directory, even if an invalid folder .settings was added to the adapted folder
+   *
+   * @throws Exception test fails
+   *
+   */
+  @Test
+  public void testGetTemplatesWithInvalidAdaptedFolder() throws Exception {
+
+    File folder = this.tmpFolder.newFolder("TemplateSetsInstalledTest");
+    Path templateSetPath = TEST_FILE_ROOT_PATH.resolve("valid_template_sets/");
+    FileUtils.copyDirectory(templateSetPath.toFile(), folder);
+    // create an invalid folder which has to be ignored
+    Files.createDirectory(folder.toPath().resolve("template-sets").resolve("adapted").resolve(".settings"));
+
+    withEnvironmentVariable(ConfigurationConstants.CONFIG_ENV_HOME, folder.getAbsolutePath()).execute(() -> {
+
+      TemplateSetConfiguration templateSetConfiguration = new TemplateSetConfiguration(
+          folder.toPath().resolve("template-sets"));
+
+      assertThat(templateSetConfiguration.getTemplatesConfigurations().size()).isEqualTo(3);
+    });
+  }
+
+}
\ No newline at end of file
diff --git a/cobigen/cobigen-core/src/test/java/com/devonfw/cobigen/unittest/config/reader/TemplatesConfigurationReaderTest.java b/cobigen/cobigen-core/src/test/java/com/devonfw/cobigen/unittest/config/reader/TemplatesConfigurationReaderTest.java
index 307d3f9492..98d5b810bf 100644
--- a/cobigen/cobigen-core/src/test/java/com/devonfw/cobigen/unittest/config/reader/TemplatesConfigurationReaderTest.java
+++ b/cobigen/cobigen-core/src/test/java/com/devonfw/cobigen/unittest/config/reader/TemplatesConfigurationReaderTest.java
@@ -90,6 +90,10 @@ public void testTemplateScan() throws Exception {
     assertThat(templateFooClass.getMergeStrategy()).isNull();
   }
 
+  /**
+   * TODO: Check if this test is still needed (reverse engineer its use case), see:
+   * https://github.com/devonfw/cobigen/issues/1666
+   */
   @Test
   public void testTemplatesSourceFolder() {
 
@@ -700,4 +704,4 @@ private Template verifyScannedTemplate(Map<String, Template> templates, String t
     }
     return template;
   }
-}
+}
\ No newline at end of file
diff --git a/cobigen/cobigen-core/src/test/java/com/devonfw/cobigen/unittest/config/resolver/PathExpressionResolverTest.java b/cobigen/cobigen-core/src/test/java/com/devonfw/cobigen/unittest/config/resolver/PathExpressionResolverTest.java
index a7c86e9cac..1a1624d54f 100644
--- a/cobigen/cobigen-core/src/test/java/com/devonfw/cobigen/unittest/config/resolver/PathExpressionResolverTest.java
+++ b/cobigen/cobigen-core/src/test/java/com/devonfw/cobigen/unittest/config/resolver/PathExpressionResolverTest.java
@@ -2,17 +2,15 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import net.sf.mmm.util.lang.api.CaseSyntax;
-
 import org.junit.Test;
 
 import com.devonfw.cobigen.impl.config.entity.Variables;
 import com.devonfw.cobigen.impl.config.resolver.PathExpressionResolver;
 
+import io.github.mmm.base.text.CaseSyntax;
+
 /**
  * Test suite for {@link PathExpressionResolver}
- *
- * @author mbrunnli (16.09.2014)
  */
 public class PathExpressionResolverTest {
 
diff --git a/cobigen/cobigen-core/src/test/java/com/devonfw/cobigen/unittest/config/upgrade/ContextConfigurationUpgraderTest.java b/cobigen/cobigen-core/src/test/java/com/devonfw/cobigen/unittest/config/upgrade/ContextConfigurationUpgraderTest.java
index 7e8ad14d00..5bd83d4d33 100644
--- a/cobigen/cobigen-core/src/test/java/com/devonfw/cobigen/unittest/config/upgrade/ContextConfigurationUpgraderTest.java
+++ b/cobigen/cobigen-core/src/test/java/com/devonfw/cobigen/unittest/config/upgrade/ContextConfigurationUpgraderTest.java
@@ -1,12 +1,17 @@
 package com.devonfw.cobigen.unittest.config.upgrade;
 
+import static com.github.stefanbirkner.systemlambda.SystemLambda.withEnvironmentVariable;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.io.File;
 import java.io.FileReader;
+import java.io.Reader;
+import java.nio.file.Path;
 
+import org.apache.commons.io.FileUtils;
 import org.custommonkey.xmlunit.XMLTestCase;
 import org.custommonkey.xmlunit.XMLUnit;
+import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
@@ -16,7 +21,6 @@
 import com.devonfw.cobigen.impl.config.constant.ContextConfigurationVersion;
 import com.devonfw.cobigen.impl.config.upgrade.ContextConfigurationUpgrader;
 import com.devonfw.cobigen.unittest.config.common.AbstractUnitTest;
-import com.google.common.io.Files;
 
 /**
  * Test suite for {@link ContextConfigurationUpgrader}
@@ -24,57 +28,194 @@
 public class ContextConfigurationUpgraderTest extends AbstractUnitTest {
 
   /** Root path to all resources used in this test case */
-  private static String testFileRootPath = "src/test/resources/testdata/unittest/config/upgrade/ContextConfigurationUpgraderTest/";
+  private static String contextTestFileRootPath = "src/test/resources/testdata/unittest/config/upgrade/ContextConfigurationUpgraderTest";
+
+  private static String templateTestFileRootPath = "src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest";
 
   /** JUnit Rule to create and automatically cleanup temporarily files/folders */
   @Rule
   public TemporaryFolder tempFolder = new TemporaryFolder();
 
   /**
-   * Tests the valid upgrade of a context configuration from version v2.0 to latest version. Please make sure that
-   * .../ContextConfigurationUpgraderTest/valid-latest_version exists
+   * Tests the valid upgrade of a context configuration from version v2.0 to v2.1. Please make sure that
+   * .../ContextConfigurationUpgraderTest/valid-v2.1 exists
    *
    * @throws Exception test fails
    */
   @Test
-  public void testCorrectUpgrade_v2_0_TO_LATEST() throws Exception {
+  public void testCorrectUpgrade_v2_0_TO_v_2_1() throws Exception {
 
     // preparation
-    File tmpTargetConfig = this.tempFolder.newFile(ConfigurationConstants.CONTEXT_CONFIG_FILENAME);
-    File sourceTestdata = new File(testFileRootPath + "valid-v2.0/" + ConfigurationConstants.CONTEXT_CONFIG_FILENAME);
-    Files.copy(sourceTestdata, tmpTargetConfig);
+    ContextConfigurationVersion currentVersion = ContextConfigurationVersion.v2_0;
+    ContextConfigurationVersion targetVersion = ContextConfigurationVersion.v2_1;
+    String currentVersionPath = "valid-v2.0";
+    String targetVersionPath = "valid-v2.1";
+
+    Path cobigen = this.tempFolder.newFolder(ConfigurationConstants.COBIGEN_CONFIG_FILE).toPath();
+    Path context = cobigen.resolve(ConfigurationConstants.CONTEXT_CONFIG_FILENAME);
+    File sourceTestdata = new File(contextTestFileRootPath + File.separator + currentVersionPath + File.separator
+        + ConfigurationConstants.CONTEXT_CONFIG_FILENAME);
+
+    FileUtils.copyDirectory(new File(contextTestFileRootPath + File.separator + currentVersionPath), cobigen.toFile());
 
     ContextConfigurationUpgrader sut = new ContextConfigurationUpgrader();
 
-    ContextConfigurationVersion version = sut.resolveLatestCompatibleSchemaVersion(this.tempFolder.getRoot().toPath());
-    assertThat(version).as("Source Version").isEqualTo(ContextConfigurationVersion.v2_0);
+    ContextConfigurationVersion version = sut.resolveLatestCompatibleSchemaVersion(context, currentVersion);
+    assertThat(version).as("Source Version").isEqualTo(currentVersion);
 
-    sut.upgradeConfigurationToLatestVersion(this.tempFolder.getRoot().toPath(), BackupPolicy.ENFORCE_BACKUP);
-    assertThat(tmpTargetConfig.toPath().resolveSibling("context.bak.xml").toFile()).exists()
-        .hasSameContentAs(sourceTestdata);
+    sut.upgradeConfigurationToLatestVersion(cobigen, BackupPolicy.ENFORCE_BACKUP, targetVersion);
+    assertThat(cobigen.resolve("context.bak.xml").toFile()).exists().hasSameContentAs(sourceTestdata);
 
-    version = sut.resolveLatestCompatibleSchemaVersion(this.tempFolder.getRoot().toPath());
-    assertThat(version).as("Target version").isEqualTo(ContextConfigurationVersion.getLatest());
+    version = sut.resolveLatestCompatibleSchemaVersion(cobigen, targetVersion);
+    assertThat(version).as("Target version").isEqualTo(targetVersion);
 
     XMLUnit.setIgnoreWhitespace(true);
-    new XMLTestCase() {
-    }.assertXMLEqual(new FileReader(testFileRootPath + "valid-" + ContextConfigurationVersion.getLatest() + "/"
-        + ConfigurationConstants.CONTEXT_CONFIG_FILENAME), new FileReader(tmpTargetConfig));
+    try (
+        Reader firstReader = new FileReader(contextTestFileRootPath + File.separator + targetVersionPath
+            + File.separator + ConfigurationConstants.CONTEXT_CONFIG_FILENAME);
+        Reader secondReader = new FileReader(context.toFile())) {
+      new XMLTestCase() {
+      }.assertXMLEqual(firstReader, secondReader);
+    }
+  }
+
+  /**
+   * Tests the valid upgrade of a context configuration from version v2.1 to v3.0. Please make sure that
+   * .../ContextConfigurationUpgraderTest/valid-v3.0 exists
+   *
+   * @throws Exception test fails
+   */
+  @Test
+  public void testCorrectUpgrade_v2_1_TO_v3_0() throws Exception {
+
+
+    File cobigen = this.tempFolder.newFolder(ConfigurationConstants.COBIGEN_CONFIG_FILE);
+
+    withEnvironmentVariable(ConfigurationConstants.CONFIG_ENV_HOME, cobigen.toPath().toString()).execute(() -> {
+      // preparation
+      ContextConfigurationVersion currentVersion = ContextConfigurationVersion.v2_1;
+      ContextConfigurationVersion targetVersion = ContextConfigurationVersion.v3_0;
+      String currentVersionPath = "valid-2.1";
+      String targetVersionPath = "valid-v3.0";
+
+      Path templates = cobigen.toPath().resolve(ConfigurationConstants.CONFIG_PROPERTY_TEMPLATES_PATH)
+          .resolve(ConfigurationConstants.COBIGEN_TEMPLATES);
+      Path context = templates.resolve(ConfigurationConstants.TEMPLATE_RESOURCE_FOLDER)
+          .resolve(ConfigurationConstants.CONTEXT_CONFIG_FILENAME);
+
+      FileUtils.copyDirectory(new File(templateTestFileRootPath + File.separator + currentVersionPath), cobigen);
+
+      ContextConfigurationUpgrader sut = new ContextConfigurationUpgrader();
+
+      ContextConfigurationVersion version = sut.resolveLatestCompatibleSchemaVersion(context, currentVersion);
+      assertThat(version).as("Source Version").isEqualTo(currentVersion);
+
+      sut.upgradeConfigurationToLatestVersion(templates, BackupPolicy.ENFORCE_BACKUP, targetVersion);
+      // copy resources again to check if backup was successful
+      String pom = "templates/CobiGen_Templates/pom.xml";
+      FileUtils.copyDirectory(new File(templateTestFileRootPath + File.separator + currentVersionPath), cobigen);
+
+      Path newTemplatesLocation = cobigen.toPath().resolve(ConfigurationConstants.TEMPLATE_SETS_FOLDER)
+          .resolve(ConfigurationConstants.ADAPTED_FOLDER);
+      Path backupContextPath = cobigen.toPath().resolve("backup")
+          .resolve(ConfigurationConstants.CONFIG_PROPERTY_TEMPLATES_PATH)
+          .resolve(ConfigurationConstants.COBIGEN_TEMPLATES).resolve(ConfigurationConstants.TEMPLATE_RESOURCE_FOLDER)
+          .resolve(ConfigurationConstants.CONTEXT_CONFIG_FILENAME);
+
+      for (String s : newTemplatesLocation.toFile().list()) {
+        Path newContextPath = newTemplatesLocation.resolve(s).resolve(ConfigurationConstants.TEMPLATE_RESOURCE_FOLDER);
+
+        version = sut.resolveLatestCompatibleSchemaVersion(newContextPath, targetVersion);
+        assertThat(version).as("Target version").isEqualTo(targetVersion);
+
+        newContextPath = newContextPath.resolve(ConfigurationConstants.CONTEXT_CONFIG_FILENAME);
+        XMLUnit.setIgnoreWhitespace(true);
+        try (
+            Reader firstReader = new FileReader(contextTestFileRootPath + File.separator + targetVersionPath
+                + File.separator + s + File.separator + ConfigurationConstants.CONTEXT_CONFIG_FILENAME);
+            Reader secondReader = new FileReader(newContextPath.toFile())) {
+          new XMLTestCase() {
+          }.assertXMLEqual(firstReader, secondReader);
+        }
+      }
+    });
   }
 
   /**
-   * Tests if latest context configuration is compatible to latest schema version.
+   * Tests if v2.0 context configuration is compatible to v2.0 schema.
    *
    * @throws Exception test fails
    */
   @Test
-  public void testCorrectLatestSchemaDetection() throws Exception {
+  public void testCorrectV2_0SchemaDetection() throws Exception {
 
     // preparation
-    File targetConfig = new File(testFileRootPath + "valid-" + ContextConfigurationVersion.getLatest());
+    ContextConfigurationVersion currentVersion = ContextConfigurationVersion.v2_0;
+    File targetConfig = new File(contextTestFileRootPath + "/valid-" + currentVersion);
+
+    for (File context : targetConfig.listFiles()) {
+      ContextConfigurationVersion version = new ContextConfigurationUpgrader()
+          .resolveLatestCompatibleSchemaVersion(context.toPath(), currentVersion);
+      assertThat(version).isEqualTo(currentVersion);
+    }
+  }
 
-    ContextConfigurationVersion version = new ContextConfigurationUpgrader()
-        .resolveLatestCompatibleSchemaVersion(targetConfig.toPath());
-    assertThat(version).isEqualTo(ContextConfigurationVersion.getLatest());
+  /**
+   * Tests if v2.1 context configuration is compatible to v2.1 schema.
+   *
+   * @throws Exception test fails
+   */
+  @Test
+  public void testCorrectV2_1SchemaDetection() throws Exception {
+
+    // preparation
+    ContextConfigurationVersion currentVersion = ContextConfigurationVersion.v2_1;
+    File targetConfig = new File(contextTestFileRootPath + "/valid-" + currentVersion);
+
+    for (File context : targetConfig.listFiles()) {
+      ContextConfigurationVersion version = new ContextConfigurationUpgrader()
+          .resolveLatestCompatibleSchemaVersion(context.toPath(), currentVersion);
+      assertThat(version).isEqualTo(currentVersion);
+    }
+  }
+
+  /**
+   * Tests if v3.0 context configuration is compatible to v3.0 schema.
+   *
+   * @throws Exception test fails
+   */
+  @Test
+  public void testCorrectV3_0SchemaDetection() throws Exception {
+
+    // preparation
+    ContextConfigurationVersion currentVersion = ContextConfigurationVersion.v3_0;
+    File targetConfig = new File(contextTestFileRootPath + "/valid-" + currentVersion);
+
+    for (File context : targetConfig.listFiles()) {
+      ContextConfigurationVersion version = new ContextConfigurationUpgrader()
+          .resolveLatestCompatibleSchemaVersion(context.toPath(), currentVersion);
+      assertThat(version).isEqualTo(currentVersion);
+    }
+  }
+
+  /**
+   * Tests if v3.0 context configuration schema is not compatible to v2.1 configuration file.
+   *
+   * @throws Exception test fails
+   */
+  @Test
+  public void testV2_1IsIncompatibleToV3_0Schema() throws Exception {
+
+
+    // preparation
+    ContextConfigurationVersion currentVersion = ContextConfigurationVersion.v2_1;
+    ContextConfigurationVersion targetVersion = ContextConfigurationVersion.v3_0;
+    File targetConfig = new File(contextTestFileRootPath + "/valid-" + currentVersion);
+
+    for (File context : targetConfig.listFiles()) {
+      ContextConfigurationVersion version = new ContextConfigurationUpgrader()
+          .resolveLatestCompatibleSchemaVersion(context.toPath());
+      assertThat(version).isNotEqualTo(targetVersion);
+    }
   }
-}
+}
\ No newline at end of file
diff --git a/cobigen/cobigen-core/src/test/java/com/devonfw/cobigen/unittest/config/upgrade/TemplateConfigurationUpgraderTest.java b/cobigen/cobigen-core/src/test/java/com/devonfw/cobigen/unittest/config/upgrade/TemplateConfigurationUpgraderTest.java
index e0a31508bc..0424923429 100644
--- a/cobigen/cobigen-core/src/test/java/com/devonfw/cobigen/unittest/config/upgrade/TemplateConfigurationUpgraderTest.java
+++ b/cobigen/cobigen-core/src/test/java/com/devonfw/cobigen/unittest/config/upgrade/TemplateConfigurationUpgraderTest.java
@@ -36,29 +36,34 @@ public class TemplateConfigurationUpgraderTest extends AbstractUnitTest {
    * @throws Exception test fails
    */
   @Test
-  public void testCorrectUpgrade_v1_2_TO_v2_1() throws Exception {
+  public void testCorrectUpgrade_v1_2_TO_2_1() throws Exception {
 
     // preparation
     File tmpTargetConfig = this.tempFolder.newFile(ConfigurationConstants.TEMPLATES_CONFIG_FILENAME);
     File sourceTestdata = new File(testFileRootPath + "valid-v1.2/" + ConfigurationConstants.TEMPLATES_CONFIG_FILENAME);
     Files.copy(sourceTestdata, tmpTargetConfig);
 
+    TemplatesConfigurationVersion currentVersion = TemplatesConfigurationVersion.v1_2;
+    TemplatesConfigurationVersion targetVersion = TemplatesConfigurationVersion.v2_1;
+
     TemplateConfigurationUpgrader sut = new TemplateConfigurationUpgrader();
 
-    TemplatesConfigurationVersion version = sut.resolveLatestCompatibleSchemaVersion(this.tempFolder.getRoot().toPath());
-    assertThat(version).as("Source Version").isEqualTo(TemplatesConfigurationVersion.v1_2);
+    TemplatesConfigurationVersion version = sut.resolveLatestCompatibleSchemaVersion(this.tempFolder.getRoot().toPath(),
+        targetVersion);
+    assertThat(version).as("Source Version").isEqualTo(currentVersion);
 
-    sut.upgradeConfigurationToLatestVersion(this.tempFolder.getRoot().toPath(), BackupPolicy.ENFORCE_BACKUP);
+    sut.upgradeConfigurationToLatestVersion(this.tempFolder.getRoot().toPath(), BackupPolicy.ENFORCE_BACKUP,
+        targetVersion);
     assertThat(tmpTargetConfig.toPath().resolveSibling("templates.bak.xml").toFile()).exists()
         .hasSameContentAs(sourceTestdata);
 
-    version = sut.resolveLatestCompatibleSchemaVersion(this.tempFolder.getRoot().toPath());
-    assertThat(version).as("Target version").isEqualTo(TemplatesConfigurationVersion.v4_0);
+    version = sut.resolveLatestCompatibleSchemaVersion(this.tempFolder.getRoot().toPath(), targetVersion);
+    assertThat(version).as("Target version").isEqualTo(targetVersion);
 
     XMLUnit.setIgnoreWhitespace(true);
     try (
         FileReader vgl = new FileReader(
-            testFileRootPath + "valid-v2.1/" + ConfigurationConstants.TEMPLATES_CONFIG_FILENAME);
+            testFileRootPath + "valid-" + targetVersion + "/" + ConfigurationConstants.TEMPLATES_CONFIG_FILENAME);
         FileReader tmp = new FileReader(tmpTargetConfig)) {
       new XMLTestCase() {
       }.assertXMLEqual(vgl, tmp);
@@ -66,18 +71,95 @@ public void testCorrectUpgrade_v1_2_TO_v2_1() throws Exception {
   }
 
   /**
-   * Tests the valid upgrade of a templates configuration from version v1.2 to v2.1.
+   * Tests if latest templates configuration is compatible to latest schema version.
    *
    * @throws Exception test fails
    */
   @Test
-  public void testCorrectV2_1SchemaDetection() throws Exception {
+  public void testCorrectLatestSchemaDetection() throws Exception {
 
     // preparation
-    File targetConfig = new File(testFileRootPath + "valid-v2.1");
+    File targetConfig = new File(testFileRootPath + "valid-" + TemplatesConfigurationVersion.getLatest());
 
     TemplatesConfigurationVersion version = new TemplateConfigurationUpgrader()
         .resolveLatestCompatibleSchemaVersion(targetConfig.toPath());
-    assertThat(version).isEqualTo(TemplatesConfigurationVersion.v4_0);
+    assertThat(version).isEqualTo(TemplatesConfigurationVersion.getLatest());
   }
+
+  /**
+   * Tests if v1.2 template configuration is compatible to v1.2 schema.
+   *
+   * @throws Exception test fails
+   */
+  @Test
+  public void testCorrectV1_2SchemaDetection() throws Exception {
+
+    // preparation
+    TemplatesConfigurationVersion currentVersion = TemplatesConfigurationVersion.v1_2;
+    File targetConfig = new File(testFileRootPath + "/valid-" + currentVersion);
+
+    for (File context : targetConfig.listFiles()) {
+      TemplatesConfigurationVersion version = new TemplateConfigurationUpgrader()
+          .resolveLatestCompatibleSchemaVersion(context.toPath(), currentVersion);
+      assertThat(version).isEqualTo(currentVersion);
+    }
+  }
+
+  /**
+   * Tests if v2.1 template configuration is compatible to v2.1 schema.
+   *
+   * @throws Exception test fails
+   */
+  @Test
+  public void testCorrectV2_1SchemaDetection() throws Exception {
+
+    // preparation
+    TemplatesConfigurationVersion currentVersion = TemplatesConfigurationVersion.v2_1;
+    File targetConfig = new File(testFileRootPath + "/valid-" + currentVersion);
+
+    for (File context : targetConfig.listFiles()) {
+      TemplatesConfigurationVersion version = new TemplateConfigurationUpgrader()
+          .resolveLatestCompatibleSchemaVersion(context.toPath(), currentVersion);
+      assertThat(version).isEqualTo(currentVersion);
+    }
+  }
+
+  /**
+   * Tests if v4.0 template configuration is compatible to v4.0 schema.
+   *
+   * @throws Exception test fails
+   */
+  @Test
+  public void testCorrectV4_0SchemaDetection() throws Exception {
+
+    // preparation
+    TemplatesConfigurationVersion currentVersion = TemplatesConfigurationVersion.v4_0;
+    File targetConfig = new File(testFileRootPath + "/valid-" + currentVersion);
+
+    for (File context : targetConfig.listFiles()) {
+      TemplatesConfigurationVersion version = new TemplateConfigurationUpgrader()
+          .resolveLatestCompatibleSchemaVersion(context.toPath(), currentVersion);
+      assertThat(version).isEqualTo(currentVersion);
+    }
+  }
+
+  /**
+   * Tests if v5.0 template configuration is compatible to v5.0 schema.
+   *
+   * @throws Exception test fails
+   */
+  @Test
+  public void testCorrectV5_0SchemaDetection() throws Exception {
+
+    // preparation
+    TemplatesConfigurationVersion currentVersion = TemplatesConfigurationVersion.v5_0;
+    File targetConfig = new File(testFileRootPath + "/valid-" + currentVersion);
+
+    for (File context : targetConfig.listFiles()) {
+      TemplatesConfigurationVersion version = new TemplateConfigurationUpgrader()
+          .resolveLatestCompatibleSchemaVersion(context.toPath(), currentVersion);
+      assertThat(version).isEqualTo(currentVersion);
+    }
+  }
+
 }
diff --git a/cobigen/cobigen-core/src/test/java/com/devonfw/cobigen/unittest/config/upgrade/TemplateSetUpgraderTest.java b/cobigen/cobigen-core/src/test/java/com/devonfw/cobigen/unittest/config/upgrade/TemplateSetUpgraderTest.java
new file mode 100644
index 0000000000..04a705cafc
--- /dev/null
+++ b/cobigen/cobigen-core/src/test/java/com/devonfw/cobigen/unittest/config/upgrade/TemplateSetUpgraderTest.java
@@ -0,0 +1,226 @@
+package com.devonfw.cobigen.unittest.config.upgrade;
+
+import static com.github.stefanbirkner.systemlambda.SystemLambda.withEnvironmentVariable;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import javax.xml.XMLConstants;
+import javax.xml.transform.stream.StreamSource;
+import javax.xml.validation.Schema;
+import javax.xml.validation.SchemaFactory;
+import javax.xml.validation.Validator;
+
+import org.apache.commons.io.FileUtils;
+import org.junit.Ignore;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+import org.xml.sax.SAXException;
+
+import com.devonfw.cobigen.api.constants.BackupPolicy;
+import com.devonfw.cobigen.api.constants.ConfigurationConstants;
+import com.devonfw.cobigen.impl.config.upgrade.ContextConfigurationUpgrader;
+import com.devonfw.cobigen.impl.config.upgrade.TemplateSetUpgrader;
+import com.devonfw.cobigen.unittest.config.common.AbstractUnitTest;
+
+/**
+ * Test suite for {@link TemplateSetUpgrader}
+ */
+public class TemplateSetUpgraderTest extends AbstractUnitTest {
+
+  /** Root path to all resources used in this test case */
+  private static String testFileRootPath = "src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/";
+
+  /** JUnit Rule to create and automatically cleanup temporarily files/folders */
+  @Rule
+  public TemporaryFolder tempFolder = new TemporaryFolder();
+
+  /**
+   * Test the correct folder creation
+   *
+   * TODO: Check if this test is still valid, see: https://github.com/devonfw/cobigen/issues/1682
+   *
+   * @throws Exception test fails
+   */
+  @Test
+  @Ignore // TODO: re-enable when upgrader was implemented, see: https://github.com/devonfw/cobigen/issues/1595
+  public void testTemplateSetUpgrade() throws Exception {
+
+    Path currentHome = this.tempFolder.newFolder(ConfigurationConstants.DEFAULT_HOME_DIR_NAME).toPath();
+
+    FileUtils.copyDirectory(new File(testFileRootPath + "valid-2.1"), currentHome.toFile());
+    Path templateLocation = currentHome.resolve(ConfigurationConstants.TEMPLATES_FOLDER)
+        .resolve(ConfigurationConstants.COBIGEN_TEMPLATES);
+
+    withEnvironmentVariable(ConfigurationConstants.CONFIG_ENV_HOME, currentHome.toString()).execute(() -> {
+      TemplateSetUpgrader templateSetUpgrader = new TemplateSetUpgrader();
+      templateSetUpgrader.upgradeTemplatesToTemplateSets(templateLocation);
+
+      Path templateSetsPath = templateLocation.getParent().getParent()
+          .resolve(ConfigurationConstants.TEMPLATE_SETS_FOLDER);
+      Path backup = templateLocation.getParent().getParent().resolve(ConfigurationConstants.BACKUP_FOLDER);
+      Path templateSetsAdapted = templateSetsPath.resolve(ConfigurationConstants.ADAPTED_FOLDER);
+      assertThat(templateSetsPath).exists();
+      assertThat(templateSetsAdapted).exists();
+      assertThat(backup).exists();
+    });
+  }
+
+  /**
+   * Test the correct folder creation
+   *
+   * TODO: Check if this test is still valid, see: https://github.com/devonfw/cobigen/issues/1682
+   *
+   * @throws Exception test fails
+   */
+  @Test
+  public void testTemplateSetUpgradeWithoutTemplatesFolder() throws Exception {
+
+    Path currentHome = this.tempFolder.newFolder(ConfigurationConstants.DEFAULT_HOME_DIR_NAME).toPath();
+
+    FileUtils.copyDirectory(new File(testFileRootPath + "valid-2.1/templates"), currentHome.toFile());
+    Path templateLocation = currentHome.resolve(ConfigurationConstants.COBIGEN_TEMPLATES);
+
+    withEnvironmentVariable(ConfigurationConstants.CONFIG_ENV_HOME, currentHome.toString()).execute(() -> {
+      TemplateSetUpgrader templateSetUpgrader = new TemplateSetUpgrader();
+      templateSetUpgrader.upgradeTemplatesToTemplateSets(templateLocation);
+
+      Path templateSetsPath = templateLocation.getParent().resolve(ConfigurationConstants.TEMPLATE_SETS_FOLDER);
+      Path templateSetsAdapted = templateSetsPath.resolve(ConfigurationConstants.ADAPTED_FOLDER);
+      Path backup = templateLocation.getParent().resolve(ConfigurationConstants.BACKUP_FOLDER);
+      assertThat(templateSetsPath).exists();
+      assertThat(templateSetsAdapted).exists();
+      assertThat(backup).exists();
+    });
+  }
+
+  /**
+   * Tests if the Template files have been correctly copied into both the new template set and the backup folder
+   *
+   * @throws Exception test fails
+   */
+  @Test
+  @Ignore // TODO: re-enable when upgrader was implemented, see: https://github.com/devonfw/cobigen/issues/1595
+  public void testTemplateSetUpgradeCopyOfTemplates() throws Exception {
+
+    Path currentHome = this.tempFolder.newFolder(ConfigurationConstants.DEFAULT_HOME_DIR_NAME).toPath();
+
+    FileUtils.copyDirectory(new File(testFileRootPath + "valid-2.1"), currentHome.toFile());
+    Path templateLocation = currentHome.resolve(ConfigurationConstants.TEMPLATES_FOLDER)
+        .resolve(ConfigurationConstants.COBIGEN_TEMPLATES);
+
+    withEnvironmentVariable(ConfigurationConstants.CONFIG_ENV_HOME, currentHome.toString()).execute(() -> {
+      Path templatesFolder = templateLocation.resolve(ConfigurationConstants.TEMPLATE_RESOURCE_FOLDER);
+      int OldTemplatesFileCount = templatesFolder.toFile().list().length;
+      List<Path> templatesFolderPaths = Files.walk(currentHome.resolve(ConfigurationConstants.TEMPLATES_FOLDER))
+          .map(Path::getFileName).collect(Collectors.toList());
+
+      TemplateSetUpgrader templateSetUpgrader = new TemplateSetUpgrader();
+      Map<com.devonfw.cobigen.impl.config.entity.io.v3_0.ContextConfiguration, Path> newContextConfigurations = templateSetUpgrader
+          .upgradeTemplatesToTemplateSets(templateLocation);
+
+      Path newTemplatesPath = templateLocation.getParent().getParent()
+          .resolve(ConfigurationConstants.TEMPLATE_SETS_FOLDER).resolve(ConfigurationConstants.ADAPTED_FOLDER);
+      Set<File> NewPathFilesSet = new HashSet<>(Arrays.asList(newTemplatesPath.toFile().listFiles()));
+
+      assertEquals(OldTemplatesFileCount - 1, NewPathFilesSet.size());
+
+      for (Path contextpath : newContextConfigurations.values()) {
+        assertThat(contextpath).exists();
+
+        validateContextConfigurationFile(contextpath, "v3.0");
+
+      }
+      List<Path> backupFolderFiles = Files.walk(
+          currentHome.resolve(ConfigurationConstants.BACKUP_FOLDER).resolve(ConfigurationConstants.TEMPLATES_FOLDER))
+          .map(Path::getFileName).collect(Collectors.toList());
+      assertThat(backupFolderFiles).containsAll(templatesFolderPaths);
+
+      for (File file : NewPathFilesSet) {
+        if (!file.getName().equals(ConfigurationConstants.CONTEXT_CONFIG_FILENAME)) {
+          assertThat(templatesFolderPaths).contains(file.toPath().getFileName());
+        }
+      }
+    });
+
+  }
+
+  /**
+   * Validates a context configuration file with given xsd schema version and fails the test if the validation failed.
+   *
+   * @param contextpath Path to context configuration file.
+   * @param schemaVersion String version to validate against f.e. : v2.2.
+   * @throws SAXException if a fatal error is found.
+   * @throws IOException if the underlying reader throws an IOException.
+   */
+  @Ignore // TODO: re-enable when upgrader was implemented, see: https://github.com/devonfw/cobigen/issues/1595
+  private void validateContextConfigurationFile(Path contextpath, String schemaVersion)
+      throws SAXException, IOException {
+
+    SchemaFactory schemaFactory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
+    try (InputStream schemaStream = getClass()
+        .getResourceAsStream("/schema/" + schemaVersion + "/contextConfiguration.xsd")) {
+      StreamSource schemaSourceStream = new StreamSource(schemaStream);
+      Schema schema = schemaFactory.newSchema(schemaSourceStream);
+      Validator validator = schema.newValidator();
+      StreamSource contextStream = new StreamSource(contextpath.toFile());
+      try {
+        validator.validate(contextStream);
+      } catch (SAXException e) {
+        fail("Exception shows that validator has found an error with the context configuration file \n" + e);
+        contextStream.getInputStream().close();
+        schemaStream.close();
+      }
+      schemaStream.close();
+    }
+
+  }
+
+  /**
+   * Tests if the context.xml has been created in the correct location and that it was correctly created as a v3.0
+   * schema
+   *
+   * @throws Exception test fails
+   */
+  @Test
+  @Ignore // TODO: re-enable when upgrader was implemented, see: https://github.com/devonfw/cobigen/issues/1595
+  public void testTemplateSetUpgradeContextSplit() throws Exception {
+
+    Path currentHome = this.tempFolder.newFolder(ConfigurationConstants.DEFAULT_HOME_DIR_NAME).toPath();
+
+    FileUtils.copyDirectory(new File(testFileRootPath + "valid-2.1"), currentHome.toFile());
+    Path templateLocation = currentHome.resolve(ConfigurationConstants.TEMPLATES_FOLDER)
+        .resolve(ConfigurationConstants.COBIGEN_TEMPLATES);
+
+    withEnvironmentVariable(ConfigurationConstants.CONFIG_ENV_HOME, currentHome.toString()).execute(() -> {
+      ContextConfigurationUpgrader upgrader = new ContextConfigurationUpgrader();
+      upgrader.upgradeConfigurationToLatestVersion(templateLocation, BackupPolicy.ENFORCE_BACKUP);
+
+      Path newTemplatesPath = templateLocation.getParent().getParent()
+          .resolve(ConfigurationConstants.TEMPLATE_SETS_FOLDER);
+      newTemplatesPath = newTemplatesPath.resolve(ConfigurationConstants.ADAPTED_FOLDER);
+
+      for (String s : newTemplatesPath.toFile().list()) {
+        Path newContextPath = newTemplatesPath.resolve(s).resolve(ConfigurationConstants.TEMPLATE_RESOURCE_FOLDER);
+        newContextPath = newContextPath.resolve(ConfigurationConstants.CONTEXT_CONFIG_FILENAME);
+        assertThat(newContextPath.toFile()).exists();
+
+        validateContextConfigurationFile(newContextPath, "v3.0");
+      }
+    });
+  }
+
+}
diff --git a/cobigen/cobigen-core/src/test/java/com/devonfw/cobigen/unittest/healthcheck/HealthCheckTest.java b/cobigen/cobigen-core/src/test/java/com/devonfw/cobigen/unittest/healthcheck/HealthCheckTest.java
index d9c8f463f9..862aac3ec9 100644
--- a/cobigen/cobigen-core/src/test/java/com/devonfw/cobigen/unittest/healthcheck/HealthCheckTest.java
+++ b/cobigen/cobigen-core/src/test/java/com/devonfw/cobigen/unittest/healthcheck/HealthCheckTest.java
@@ -7,6 +7,7 @@
 import java.nio.file.Path;
 
 import org.apache.commons.io.FileUtils;
+import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
@@ -20,6 +21,7 @@
 /**
  * Test suite for {@link HealthCheckImpl} class.
  */
+@Ignore // TODO: re-enable when upgrade from monolithic to template-sets was implemented, see: https://github.com/devonfw/cobigen/issues/1595
 public class HealthCheckTest {
 
   /**
@@ -198,7 +200,6 @@ public void testFailingUpgradeContextConfigurationWithNoTemplatesConfig() throws
     FileUtils.copyDirectory(configurationFolder.toFile(), executionFolder.toFile());
     // act
     HealthCheckReport report = healthcheck.upgradeContextConfiguration(executionFolder, backuppolicy);
-    System.out.print(report.getErrors());
     assertThat(report).isOfContextVersion(executionFolder, "2.0");
   }
 
diff --git a/cobigen/cobigen-core/src/test/java/com/devonfw/cobigen/unittest/templates/TemplateJarDownloaderTest.java b/cobigen/cobigen-core/src/test/java/com/devonfw/cobigen/unittest/templates/TemplateJarDownloaderTest.java
index b4fb487b9d..87ed5329af 100644
--- a/cobigen/cobigen-core/src/test/java/com/devonfw/cobigen/unittest/templates/TemplateJarDownloaderTest.java
+++ b/cobigen/cobigen-core/src/test/java/com/devonfw/cobigen/unittest/templates/TemplateJarDownloaderTest.java
@@ -3,11 +3,19 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.io.File;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
 
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 
+import com.devonfw.cobigen.api.constants.ConfigurationConstants;
+import com.devonfw.cobigen.api.constants.TemplatesJarConstants;
+import com.devonfw.cobigen.api.util.MavenCoordinate;
 import com.devonfw.cobigen.api.util.TemplatesJarUtil;
 import com.devonfw.cobigen.unittest.config.common.AbstractUnitTest;
 
@@ -16,13 +24,186 @@
  */
 public class TemplateJarDownloaderTest extends AbstractUnitTest {
 
-  /** Root path to all resources used in this test case */
-  private static String testFileRootPath = "src/test/resources/testdata/unittest/config/templatesJar/";
-
   /** JUnit Rule to create and automatically cleanup temporarily files/folders */
   @Rule
   public TemporaryFolder tempFolder = new TemporaryFolder();
 
+  /** List with MavenCoordinates for template downloader */
+  public List<MavenCoordinate> mavenCoordinatesList;
+
+  /**
+   * Location of the templates sets.
+   */
+  public File templateLocation;
+
+  /**
+   * Downloaded folder for template jars.
+   */
+  public File downloadedFolder;
+
+  /**
+   * Creation of folder structure for the tests
+   *
+   * @throws Exception
+   */
+  @Before
+  public void init() throws Exception {
+
+    this.templateLocation = this.tempFolder.newFolder("templateLocation");
+    this.downloadedFolder = this.tempFolder.newFolder("templateLocation", ConfigurationConstants.DOWNLOADED_FOLDER);
+    this.mavenCoordinatesList = new ArrayList<>();
+  }
+
+  /**
+   * Cleanup after test
+   */
+  @After
+  public void cleanup() {
+
+    this.mavenCoordinatesList.clear();
+    this.tempFolder.delete();
+  }
+
+  /**
+   * Helper function in this test suite to create maven coordinates for cobigen devon4j templates. If the version is
+   * null LATEST is used
+   *
+   * @param version version of the cobigen templates jar. If null LATEST will be used.
+   * @return returns a {@link MavenCoordinate} object for cobigen devon4j templates.
+   */
+  private MavenCoordinate createMavenCoordinateForDevon4jTemplates(String version) {
+
+    String versionNotNull = version == null ? "LATEST" : version;
+    return new MavenCoordinate(TemplatesJarConstants.DEVON4J_TEMPLATES_GROUPID,
+        TemplatesJarConstants.DEVON4J_TEMPLATES_ARTIFACTID, versionNotNull);
+  }
+
+  /**
+   * Tests if already existing jar will prevent the download of templates
+   *
+   * @throws Exception
+   */
+  @Test
+  public void testDownloadTemplatesAlreadyExisting() throws Exception {
+
+    // preparation
+    this.mavenCoordinatesList.add(new MavenCoordinate("com.group", "artifact-id", "1.0"));
+    this.mavenCoordinatesList.add(new MavenCoordinate("some.group", "some-artifact", "2.01"));
+    createFileOrFolder(this.mavenCoordinatesList.get(0), this.downloadedFolder, false);
+    createFileOrFolder(this.mavenCoordinatesList.get(1), this.downloadedFolder, false);
+    // Perform download
+    TemplatesJarUtil.downloadTemplatesByMavenCoordinates(this.templateLocation.toPath(), this.mavenCoordinatesList);
+    assertThat(this.downloadedFolder.listFiles()).hasSize(2);
+    // Perform download
+    TemplatesJarUtil.downloadTemplatesByMavenCoordinates(this.templateLocation.toPath(), this.mavenCoordinatesList);
+    assertThat(this.downloadedFolder.listFiles()).hasSize(2);
+  }
+
+  /**
+   * Tests if templates can be loaded without providing a version
+   */
+  @Test
+  public void testDownloadTemplatesWithoutVersion() {
+
+    // preparation
+    this.mavenCoordinatesList.add(createMavenCoordinateForDevon4jTemplates(""));
+    // Perform download
+    TemplatesJarUtil.downloadTemplatesByMavenCoordinates(this.templateLocation.toPath(), this.mavenCoordinatesList);
+    // Assert
+    assertThat(this.downloadedFolder.listFiles()).hasSize(2);
+    assertThat(this.downloadedFolder.listFiles())
+        .allMatch(f -> f.getName().matches("templates-devon4j-2021.12.006(-sources)?.jar"));
+    // preparation
+    this.mavenCoordinatesList.add(createMavenCoordinateForDevon4jTemplates("LATEST"));
+    this.mavenCoordinatesList.remove(0);
+    // Perform download
+    TemplatesJarUtil.downloadTemplatesByMavenCoordinates(this.templateLocation.toPath(), this.mavenCoordinatesList);
+    // Assert
+    assertThat(this.downloadedFolder.listFiles()).hasSize(2);
+
+  }
+
+  /**
+   * Test if LATEST templates can be loaded
+   */
+  @Test
+  public void testDownloadTemplatesWithLATEST() {
+
+    // preparation
+    this.mavenCoordinatesList.add(createMavenCoordinateForDevon4jTemplates("LATEST"));
+    // Perform download
+    TemplatesJarUtil.downloadTemplatesByMavenCoordinates(this.templateLocation.toPath(), this.mavenCoordinatesList);
+    // Assert
+    assertThat(this.downloadedFolder.listFiles()).hasSize(2);
+    assertThat(this.downloadedFolder.listFiles())
+        .allMatch(f -> f.getName().matches("templates-devon4j-2021.12.006(-sources)?.jar"));
+
+  }
+
+  /**
+   * Test if no download occurs if one template is adapted the second one is downloaded and the third is missing
+   *
+   * @throws Exception
+   */
+  @Test
+  public void testDownloadTemplates() throws Exception {
+
+    // preparation
+    File adapted = this.tempFolder.newFolder("templateLocation/adapted");
+    this.mavenCoordinatesList.add(new MavenCoordinate("com.group", "artifact-id", "1.0"));
+    this.mavenCoordinatesList.add(new MavenCoordinate("some.group", "some-artifact", "2.01"));
+    this.mavenCoordinatesList.add(createMavenCoordinateForDevon4jTemplates(null));
+    this.mavenCoordinatesList.add(createMavenCoordinateForDevon4jTemplates(null));
+    createFileOrFolder(this.mavenCoordinatesList.get(0), adapted, true);
+    createFileOrFolder(this.mavenCoordinatesList.get(1), this.downloadedFolder, false);
+    // Perform download
+    TemplatesJarUtil.downloadTemplatesByMavenCoordinates(this.templateLocation.toPath(), this.mavenCoordinatesList);
+    // Assert
+    assertThat(this.downloadedFolder.listFiles()).hasSize(3);
+    assertThat(adapted.listFiles()).hasSize(1);
+  }
+
+  /**
+   * Test if new templates will be loaded into downloaded if already adapted templates exits
+   *
+   * @throws Exception
+   */
+
+  @Test
+  public void testDownloadTemplatesAlreadyAdapted() throws Exception {
+
+    // preparation
+    File adapted = this.tempFolder.newFolder("templateLocation/adapted");
+    this.mavenCoordinatesList.add(new MavenCoordinate("com.group", "artifact-id", "1.0"));
+    this.mavenCoordinatesList.add(new MavenCoordinate("some.group", "some-artifact", "2.01"));
+    this.mavenCoordinatesList.add(new MavenCoordinate("com.com", "app-app", "87"));
+    this.mavenCoordinatesList.add(createMavenCoordinateForDevon4jTemplates(null));
+    createFileOrFolder(this.mavenCoordinatesList.get(0), adapted, true);
+    createFileOrFolder(this.mavenCoordinatesList.get(1), adapted, true);
+    createFileOrFolder(this.mavenCoordinatesList.get(2), adapted, true);
+    // Perform download
+    TemplatesJarUtil.downloadTemplatesByMavenCoordinates(this.templateLocation.toPath(), this.mavenCoordinatesList);
+    // Assert
+    assertThat(this.downloadedFolder.listFiles()).hasSize(2);
+    assertThat(adapted.listFiles()).hasSize(3);
+
+  }
+
+  private void createFileOrFolder(MavenCoordinate m, File f, boolean folder) throws Exception {
+
+    String templateName = m.getArtifactId() + "-" + m.getGroupId() + "-" + m.getVersion();
+    if (folder) {
+      Path temp = this.tempFolder.getRoot().toPath().relativize(f.toPath());
+      this.tempFolder.newFolder(temp.resolve(templateName).toString());
+    } else {
+      try {
+        File.createTempFile(templateName, ".jar", f);
+      } catch (Exception e) {
+        throw e;
+      }
+    }
+  }
+
   /**
    * Tests the valid upgrade of a templates jar
    *
@@ -32,6 +213,8 @@ public class TemplateJarDownloaderTest extends AbstractUnitTest {
   public void testCorrectTemplatesUpgrade() throws Exception {
 
     // preparation
+    this.downloadedFolder.delete();
+    this.templateLocation.delete();
     this.tempFolder.newFile("templates-devon4j-3.0.0.jar");
     File tmpJarFolder = this.tempFolder.getRoot();
 
diff --git a/cobigen/cobigen-core/src/test/java/com/devonfw/cobigen/unittest/util/ConfigurationUtilTest.java b/cobigen/cobigen-core/src/test/java/com/devonfw/cobigen/unittest/util/ConfigurationUtilTest.java
index 9e09d7f02d..2dd9626e27 100644
--- a/cobigen/cobigen-core/src/test/java/com/devonfw/cobigen/unittest/util/ConfigurationUtilTest.java
+++ b/cobigen/cobigen-core/src/test/java/com/devonfw/cobigen/unittest/util/ConfigurationUtilTest.java
@@ -1,10 +1,10 @@
 package com.devonfw.cobigen.unittest.util;
 
-import static com.github.stefanbirkner.systemlambda.SystemLambda.restoreSystemProperties;
 import static com.github.stefanbirkner.systemlambda.SystemLambda.withEnvironmentVariable;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.io.File;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 
@@ -17,36 +17,35 @@
 import com.devonfw.cobigen.impl.util.ConfigurationFinder;
 
 /**
- *
+ * Test suite for Configuration Utility scenarios.
  */
 public class ConfigurationUtilTest {
 
+  /** Temporary files rule to create temporary folders or files */
   @Rule
   public TemporaryFolder tmpFolder = new TemporaryFolder();
 
+  /**
+   * Tests findTemplatesLocation logic Checks if a template jar is located inside the downloaded folder of template-sets
+   * Checks if a template jar can be loaded directly when being set from the .cobigen properties file
+   */
   @Test
-  public void testFindTemplatesLocation() throws Exception {
+  public void testFindTemplateSetsLocation() throws Exception {
 
-    restoreSystemProperties(() -> {
-      File userHome = this.tmpFolder.newFolder("user-home");
+    File userHome = this.tmpFolder.newFolder("user-home");
+    withEnvironmentVariable(ConfigurationConstants.CONFIG_ENV_HOME, userHome.getAbsolutePath()).execute(() -> {
       System.setProperty("user.home", userHome.getAbsolutePath());
-
-      Path defaultCobigenHome = userHome.toPath().resolve(ConfigurationConstants.DEFAULT_HOME_DIR_NAME);
-      Path templatesFolder = defaultCobigenHome.resolve(ConfigurationConstants.TEMPLATES_FOLDER);
+      Path templatesFolder = userHome.toPath().resolve(ConfigurationConstants.TEMPLATE_SETS_FOLDER);
       Files.createDirectories(templatesFolder);
       String templatesArtifact = "templates-devon4j-1.0.jar";
 
-      withEnvironmentVariable(ConfigurationConstants.CONFIG_ENV_HOME, null).execute(() -> {
-        Path templatesProject = templatesFolder.resolve(ConfigurationConstants.COBIGEN_TEMPLATES);
-        Files.createDirectories(templatesProject);
-        Path templatesJar = templatesFolder.resolve(templatesArtifact);
-        Files.createFile(templatesJar);
-        // found CobiGen_Templates project
-        assertThat(ConfigurationFinder.findTemplatesLocation()).isEqualTo(templatesProject.toFile().toURI());
-        Files.delete(templatesProject);
-        // found templates artifact
-        assertThat(ConfigurationFinder.findTemplatesLocation()).isEqualTo(templatesJar.toFile().toURI());
-      });
+      Path downloadedTemplatesDirectory = templatesFolder.resolve(ConfigurationConstants.DOWNLOADED_FOLDER);
+      Files.createDirectories(downloadedTemplatesDirectory);
+      Path templatesJar = templatesFolder.resolve(templatesArtifact);
+      Files.createFile(templatesJar);
+      // found template-sets directory
+      assertThat(ConfigurationFinder.findTemplatesLocation()).isEqualTo(templatesFolder.toFile().toURI());
+      Files.delete(downloadedTemplatesDirectory);
 
       // configuration file exists
       File randomDirectoryForConfigFile = this.tmpFolder.newFolder();
@@ -58,7 +57,7 @@ public void testFindTemplatesLocation() throws Exception {
 
       String templatesLocation = templates.getAbsolutePath().replace("\\", "\\\\");
       FileUtils.writeStringToFile(configFile,
-          ConfigurationConstants.CONFIG_PROPERTY_TEMPLATES_PATH + "=" + templatesLocation);
+          ConfigurationConstants.CONFIG_PROPERTY_TEMPLATES_PATH + "=" + templatesLocation, StandardCharsets.UTF_8);
 
       withEnvironmentVariable(ConfigurationConstants.CONFIG_ENV_HOME, randomDirectoryForConfigFile.getAbsolutePath())
           .execute(() -> {
@@ -66,12 +65,10 @@ public void testFindTemplatesLocation() throws Exception {
             assertThat(ConfigurationFinder.findTemplatesLocation()).isEqualTo(templates.toURI());
           });
 
-      withEnvironmentVariable(ConfigurationConstants.CONFIG_ENV_HOME, null).execute(() -> {
-        Path configFileInCobigenHome = defaultCobigenHome.resolve(ConfigurationConstants.COBIGEN_CONFIG_FILE);
-        FileUtils.copyFile(configFile, configFileInCobigenHome.toFile());
-        // configuration file found in cobigen home directory
-        assertThat(ConfigurationFinder.findTemplatesLocation()).isEqualTo(templates.toURI());
-      });
+      Path configFileInCobigenHome = userHome.toPath().resolve(ConfigurationConstants.COBIGEN_CONFIG_FILE);
+      FileUtils.copyFile(configFile, configFileInCobigenHome.toFile());
+      // configuration file found in cobigen home directory
+      assertThat(ConfigurationFinder.findTemplatesLocation()).isEqualTo(templates.toURI());
     });
   }
 }
diff --git a/cobigen/cobigen-core/src/test/java/com/devonfw/cobigen/unittest/util/PostponeUtilTest.java b/cobigen/cobigen-core/src/test/java/com/devonfw/cobigen/unittest/util/PostponeUtilTest.java
new file mode 100644
index 0000000000..2b8d65f8f0
--- /dev/null
+++ b/cobigen/cobigen-core/src/test/java/com/devonfw/cobigen/unittest/util/PostponeUtilTest.java
@@ -0,0 +1,66 @@
+package com.devonfw.cobigen.unittest.util;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.sql.Timestamp;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+
+import com.devonfw.cobigen.impl.util.PostponeUtil;
+
+/**
+ * Tests TimestampUtil class on write to the configuration file and read from the configuration file correctly
+ *
+ */
+public class PostponeUtilTest {
+
+  /**
+   * JUnit Rule to temporarily create files and folders, which will be automatically removed after test execution
+   */
+  @Rule
+  public TemporaryFolder tmpFolder = new TemporaryFolder();
+
+  /**
+   *
+   * Tests the write method from TimestampUtil also tests that only one timestamp will be stored at a time
+   *
+   * @throws IOException test fails
+   */
+  @Test
+  public void testWriteTimestamp() throws IOException {
+
+    Path configFile = Files.createFile(this.tmpFolder.getRoot().toPath().resolve("configFile"));
+    Timestamp InstantTimestamp = PostponeUtil.createInstantTimestamp();
+    PostponeUtil.addATimestampForOneMonth(configFile);
+    PostponeUtil.writeTimestamp(configFile, InstantTimestamp);
+
+    Timestamp InstantTimestampCopy = PostponeUtil.readTimestamp(configFile);
+
+    assertThat(InstantTimestamp).isEqualTo(InstantTimestampCopy);
+
+  }
+
+  /**
+   *
+   * Tests the readTimestamp method from TimestampUtil
+   *
+   * @throws IOException test fails
+   */
+  @Test
+  public void testReadTimestamp() throws IOException {
+
+    Path configFile = Files.createFile(this.tmpFolder.getRoot().toPath().resolve("configFile"));
+    Timestamp InstantTimestamp = PostponeUtil.createInstantTimestamp();
+    PostponeUtil.writeTimestamp(configFile, InstantTimestamp);
+
+    Timestamp InstantTimestampCopy = PostponeUtil.readTimestamp(configFile);
+
+    assertThat(InstantTimestamp).isEqualTo(InstantTimestampCopy);
+
+  }
+}
diff --git a/cobigen/cobigen-core/src/test/java/com/devonfw/cobigen/unittest/versioning/VersionValidatorTest.java b/cobigen/cobigen-core/src/test/java/com/devonfw/cobigen/unittest/versioning/VersionValidatorTest.java
index 6faa4d9c7c..5437e2be7f 100644
--- a/cobigen/cobigen-core/src/test/java/com/devonfw/cobigen/unittest/versioning/VersionValidatorTest.java
+++ b/cobigen/cobigen-core/src/test/java/com/devonfw/cobigen/unittest/versioning/VersionValidatorTest.java
@@ -4,22 +4,19 @@
 
 import org.junit.Test;
 
+import com.devonfw.cobigen.api.exception.DeprecatedMonolithicConfigurationException;
 import com.devonfw.cobigen.api.exception.InvalidConfigurationException;
 import com.devonfw.cobigen.impl.config.versioning.VersionValidator;
 import com.devonfw.cobigen.impl.config.versioning.VersionValidator.Type;
 
 /**
  * Test suite for {@link VersionValidator} class.
- *
- * @author mbrunnli (May 17, 2016)
  */
 public class VersionValidatorTest {
 
   /**
    * Testing the CobiGen version to be too old for the provided configuration version, which indicates to make an update
    * of CobiGen to read the configuration properly.
-   *
-   * @author mbrunnli (May 17, 2016)
    */
   @Test(expected = InvalidConfigurationException.class)
   public void testInvalidCobiGenVersion_tooOld_contextConfiguration() {
@@ -36,17 +33,16 @@ public void testInvalidCobiGenVersion_tooOld_contextConfiguration() {
   /**
    * Testing the CobiGen version to be too new for the provided configuration version, which indicates to make an update
    * of the configuration to read it properly.
-   *
-   * @author mbrunnli (May 17, 2016)
    */
-  @Test(expected = InvalidConfigurationException.class)
+  @Test(expected = DeprecatedMonolithicConfigurationException.class)
   public void testInvalidCobiGenVersion_tooNew_contextConfiguration() {
 
     try {
       VersionValidator validator = new VersionValidator(Type.CONTEXT_CONFIGURATION, "2.1.0");
-      validator.validate(1.2f);
-    } catch (InvalidConfigurationException e) {
-      assertThat(e.getMessage()).matches(".* version '1.2' has to be upgraded .*");
+      validator.validate(1.2f, false);
+    } catch (DeprecatedMonolithicConfigurationException e) {
+      assertThat(e.getMessage()).matches(
+          "You are using an old templates configuration. Please consider upgrading your templates! Thank you!");
       throw e;
     }
   }
diff --git a/cobigen/cobigen-core/src/test/resources/testdata/unittest/ExternalProcess/DummyExe b/cobigen/cobigen-core/src/test/resources/testdata/unittest/ExternalProcess/DummyExe
deleted file mode 100644
index 2eeeb9d4d0..0000000000
Binary files a/cobigen/cobigen-core/src/test/resources/testdata/unittest/ExternalProcess/DummyExe and /dev/null differ
diff --git a/cobigen/cobigen-core/src/test/resources/testdata/unittest/ExternalProcess/DummyExe.exe b/cobigen/cobigen-core/src/test/resources/testdata/unittest/ExternalProcess/DummyExe.exe
deleted file mode 100644
index 4612730a84..0000000000
Binary files a/cobigen/cobigen-core/src/test/resources/testdata/unittest/ExternalProcess/DummyExe.exe and /dev/null differ
diff --git a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/properties/emptyConfigProperties/config.properties b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/properties/emptyConfigProperties/config.properties
new file mode 100644
index 0000000000..5fb0428181
--- /dev/null
+++ b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/properties/emptyConfigProperties/config.properties
@@ -0,0 +1,2 @@
+foo=foo
+bar=bar
\ No newline at end of file
diff --git a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/properties/invalidConfigProperties/config.properties b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/properties/invalidConfigProperties/config.properties
new file mode 100644
index 0000000000..068df3c9be
--- /dev/null
+++ b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/properties/invalidConfigProperties/config.properties
@@ -0,0 +1,2 @@
+template-sets.installed=com.com.com:com.com:com.com:com;blabla:blabla:
+template-sets.hide=com.com.com:com.com:com.com:com;blabla:blabla:
\ No newline at end of file
diff --git a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/properties/validConfigProperties/config.properties b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/properties/validConfigProperties/config.properties
new file mode 100644
index 0000000000..5d861919e7
--- /dev/null
+++ b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/properties/validConfigProperties/config.properties
@@ -0,0 +1,4 @@
+template-sets.groupIds=devonfw-cobigen-bla,abcd,blablob
+template-sets.allow-snapshots=true
+template-sets.disable-default-lookup=false
+template-sets.hide=com.devonfw:test-artifact:3.2.1-SNAPSHOT
diff --git a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/ContextConfigurationReaderTest/faulty/context.xml b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/ContextConfigurationReaderTest/faulty/context.xml
index 30c4b5603d..89bf426c6e 100644
--- a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/ContextConfigurationReaderTest/faulty/context.xml
+++ b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/ContextConfigurationReaderTest/faulty/context.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.1">
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.0">
 
     <Trigger name="testdataFramework" type="java" templateFolder="testdata_framework">
     </Trigger>
+	
+	<tags>
+		<tag name="bla"/>
+	</tags>
 
 </contextConfiguration>
diff --git a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/ContextConfigurationReaderTest/invalid_new/src/main/templates/test_template/context.xml b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/ContextConfigurationReaderTest/invalid_new/src/main/templates/test_template/context.xml
deleted file mode 100644
index caccd81ab9..0000000000
--- a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/ContextConfigurationReaderTest/invalid_new/src/main/templates/test_template/context.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  version="2.2">
-  <trigger id="valid" type="java">
-    <matcher type="fqn" value="*">
-    </matcher>
-  </trigger>
-</contextConfiguration>
\ No newline at end of file
diff --git a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/ContextConfigurationReaderTest/valid.zip b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/ContextConfigurationReaderTest/valid.zip
index bdffb89f08..e1efb36fda 100644
Binary files a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/ContextConfigurationReaderTest/valid.zip and b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/ContextConfigurationReaderTest/valid.zip differ
diff --git a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/ContextConfigurationReaderTest/invalid_new/src/main/templates/context.xml b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/ContextConfigurationReaderTest/valid/context.xml
similarity index 84%
rename from cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/ContextConfigurationReaderTest/invalid_new/src/main/templates/context.xml
rename to cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/ContextConfigurationReaderTest/valid/context.xml
index 9b2de76c8e..ee8e6d631b 100644
--- a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/ContextConfigurationReaderTest/invalid_new/src/main/templates/context.xml
+++ b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/ContextConfigurationReaderTest/valid/context.xml
@@ -1,8 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  version="2.1">
+  version="3.0">
   <trigger id="valid" type="java" templateFolder="valid">
     <matcher type="fqn" value="*">
     </matcher>
   </trigger>
+	
+	<tags>
+		<tag name="bla"/>
+	</tags>
+	
 </contextConfiguration>
\ No newline at end of file
diff --git a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/ContextConfigurationReaderTest/valid_new/src/main/templates/test_template/context.xml b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/ContextConfigurationReaderTest/valid_new/src/main/templates/test_template/context.xml
deleted file mode 100644
index caccd81ab9..0000000000
--- a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/ContextConfigurationReaderTest/valid_new/src/main/templates/test_template/context.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  version="2.2">
-  <trigger id="valid" type="java">
-    <matcher type="fqn" value="*">
-    </matcher>
-  </trigger>
-</contextConfiguration>
\ No newline at end of file
diff --git a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/ContextConfigurationReaderTest/valid_new/src/main/templates/test_template2/context.xml b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/ContextConfigurationReaderTest/valid_new/src/main/templates/test_template2/context.xml
deleted file mode 100644
index caccd81ab9..0000000000
--- a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/ContextConfigurationReaderTest/valid_new/src/main/templates/test_template2/context.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  version="2.2">
-  <trigger id="valid" type="java">
-    <matcher type="fqn" value="*">
-    </matcher>
-  </trigger>
-</contextConfiguration>
\ No newline at end of file
diff --git a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/ContextConfigurationReaderTest/valid_source_folder/src/main/templates/context.xml b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/ContextConfigurationReaderTest/valid_source_folder/src/main/templates/context.xml
index 9b2de76c8e..ee8e6d631b 100644
--- a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/ContextConfigurationReaderTest/valid_source_folder/src/main/templates/context.xml
+++ b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/ContextConfigurationReaderTest/valid_source_folder/src/main/templates/context.xml
@@ -1,8 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  version="2.1">
+  version="3.0">
   <trigger id="valid" type="java" templateFolder="valid">
     <matcher type="fqn" value="*">
     </matcher>
   </trigger>
+	
+	<tags>
+		<tag name="bla"/>
+	</tags>
+	
 </contextConfiguration>
\ No newline at end of file
diff --git a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/faulty/template-set.xml b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/faulty/template-set.xml
new file mode 100644
index 0000000000..a952395b7a
--- /dev/null
+++ b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/faulty/template-set.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<templateSetConfiguration xmlns="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.0">
+
+    <Trigger name="testdataFramework" type="java" templateFolder="testdata_framework">
+    </Trigger>
+
+	<tags>
+		<tag name="bla"/>
+	</tags>
+
+</templateSetConfiguration>
diff --git a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/valid_template_sets/template-sets/adapted/template-set/src/main/resources/template-set.xml b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/valid_template_sets/template-sets/adapted/template-set/src/main/resources/template-set.xml
new file mode 100644
index 0000000000..f29b28a87e
--- /dev/null
+++ b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/valid_template_sets/template-sets/adapted/template-set/src/main/resources/template-set.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:templateSetConfiguration version="6.0" xmlns:tns="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration" xmlns:cc="http://capgemini.com/devonfw/cobigen/ContextConfiguration" xmlns:tc="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration templateSetConfiguration.xsd ">
+
+  <cc:contextConfiguration version="6.0">
+    <cc:trigger id="valid" type="java">
+      <cc:matcher type="fqn" value="*"></cc:matcher>
+    </cc:trigger>
+    <cc:tags>
+      <cc:tag name="bla"/>
+    </cc:tags>
+  </cc:contextConfiguration>
+
+  <tc:templatesConfiguration version="6.0">
+    <tc:templates>
+      <tc:template name="prefix_Foo2Class.java"
+        destinationPath="src/main/java/foo/Foo2Class${variable}.java" templateFile="templates/foo/Foo2Class.java.ftl"
+        mergeStrategy="javamerge"/>
+      <tc:templateExtension ref="prefix2_FooClass.java"
+        destinationPath="adapted/path/FooClass.java" mergeStrategy="javamerge" targetCharset="ISO-8859-1"/>
+      <tc:templateExtension ref="prefix2_Foo2Class.java"/>
+    </tc:templates>
+
+    <tc:templateScans>
+      <tc:templateScan templateNamePrefix="prefix_" templatePath="templates/foo"
+        destinationPath="src/main/java/foo"/>
+      <tc:templateScan templateNamePrefix="prefix2_" templatePath="templates/bar"
+        destinationPath="src/main/java/bar"/>
+    </tc:templateScans>
+  </tc:templatesConfiguration>
+
+</tns:templateSetConfiguration>
\ No newline at end of file
diff --git a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/valid_template_sets/template-sets/adapted/template-set/src/main/resources/templates/bar/BarClass.java.ftl b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/valid_template_sets/template-sets/adapted/template-set/src/main/resources/templates/bar/BarClass.java.ftl
new file mode 100644
index 0000000000..8a3e03898d
--- /dev/null
+++ b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/valid_template_sets/template-sets/adapted/template-set/src/main/resources/templates/bar/BarClass.java.ftl
@@ -0,0 +1,4 @@
+package foo.bar;
+
+public class BarClass {
+}
\ No newline at end of file
diff --git a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/valid_template_sets/template-sets/adapted/template-set/src/main/resources/templates/bar/Foo2Class.java.ftl b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/valid_template_sets/template-sets/adapted/template-set/src/main/resources/templates/bar/Foo2Class.java.ftl
new file mode 100644
index 0000000000..ab33918376
--- /dev/null
+++ b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/valid_template_sets/template-sets/adapted/template-set/src/main/resources/templates/bar/Foo2Class.java.ftl
@@ -0,0 +1,4 @@
+package foo;
+
+public class Foo2Class {
+}
\ No newline at end of file
diff --git a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/valid_template_sets/template-sets/adapted/template-set/src/main/resources/templates/bar/FooClass.java.ftl b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/valid_template_sets/template-sets/adapted/template-set/src/main/resources/templates/bar/FooClass.java.ftl
new file mode 100644
index 0000000000..f0fa31bd27
--- /dev/null
+++ b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/valid_template_sets/template-sets/adapted/template-set/src/main/resources/templates/bar/FooClass.java.ftl
@@ -0,0 +1,4 @@
+package foo;
+
+public class FooClass {
+}
\ No newline at end of file
diff --git a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/valid_template_sets/template-sets/adapted/template-set/src/main/resources/templates/foo/Foo2Class.java.ftl b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/valid_template_sets/template-sets/adapted/template-set/src/main/resources/templates/foo/Foo2Class.java.ftl
new file mode 100644
index 0000000000..f0fa31bd27
--- /dev/null
+++ b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/valid_template_sets/template-sets/adapted/template-set/src/main/resources/templates/foo/Foo2Class.java.ftl
@@ -0,0 +1,4 @@
+package foo;
+
+public class FooClass {
+}
\ No newline at end of file
diff --git a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/valid_template_sets/template-sets/adapted/template-set/src/main/resources/templates/foo/FooClass.java.ftl b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/valid_template_sets/template-sets/adapted/template-set/src/main/resources/templates/foo/FooClass.java.ftl
new file mode 100644
index 0000000000..ab33918376
--- /dev/null
+++ b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/valid_template_sets/template-sets/adapted/template-set/src/main/resources/templates/foo/FooClass.java.ftl
@@ -0,0 +1,4 @@
+package foo;
+
+public class Foo2Class {
+}
\ No newline at end of file
diff --git a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/valid_template_sets/template-sets/adapted/template-set/src/main/resources/templates/foo/bar/BarClass.java.ftl b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/valid_template_sets/template-sets/adapted/template-set/src/main/resources/templates/foo/bar/BarClass.java.ftl
new file mode 100644
index 0000000000..8a3e03898d
--- /dev/null
+++ b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/valid_template_sets/template-sets/adapted/template-set/src/main/resources/templates/foo/bar/BarClass.java.ftl
@@ -0,0 +1,4 @@
+package foo.bar;
+
+public class BarClass {
+}
\ No newline at end of file
diff --git a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/valid_template_sets/template-sets/adapted/test_template/src/main/resources/template-set.xml b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/valid_template_sets/template-sets/adapted/test_template/src/main/resources/template-set.xml
new file mode 100644
index 0000000000..f29b28a87e
--- /dev/null
+++ b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/valid_template_sets/template-sets/adapted/test_template/src/main/resources/template-set.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:templateSetConfiguration version="6.0" xmlns:tns="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration" xmlns:cc="http://capgemini.com/devonfw/cobigen/ContextConfiguration" xmlns:tc="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration templateSetConfiguration.xsd ">
+
+  <cc:contextConfiguration version="6.0">
+    <cc:trigger id="valid" type="java">
+      <cc:matcher type="fqn" value="*"></cc:matcher>
+    </cc:trigger>
+    <cc:tags>
+      <cc:tag name="bla"/>
+    </cc:tags>
+  </cc:contextConfiguration>
+
+  <tc:templatesConfiguration version="6.0">
+    <tc:templates>
+      <tc:template name="prefix_Foo2Class.java"
+        destinationPath="src/main/java/foo/Foo2Class${variable}.java" templateFile="templates/foo/Foo2Class.java.ftl"
+        mergeStrategy="javamerge"/>
+      <tc:templateExtension ref="prefix2_FooClass.java"
+        destinationPath="adapted/path/FooClass.java" mergeStrategy="javamerge" targetCharset="ISO-8859-1"/>
+      <tc:templateExtension ref="prefix2_Foo2Class.java"/>
+    </tc:templates>
+
+    <tc:templateScans>
+      <tc:templateScan templateNamePrefix="prefix_" templatePath="templates/foo"
+        destinationPath="src/main/java/foo"/>
+      <tc:templateScan templateNamePrefix="prefix2_" templatePath="templates/bar"
+        destinationPath="src/main/java/bar"/>
+    </tc:templateScans>
+  </tc:templatesConfiguration>
+
+</tns:templateSetConfiguration>
\ No newline at end of file
diff --git a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/valid_template_sets/template-sets/adapted/test_template/src/main/resources/templates/bar/BarClass.java.ftl b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/valid_template_sets/template-sets/adapted/test_template/src/main/resources/templates/bar/BarClass.java.ftl
new file mode 100644
index 0000000000..8a3e03898d
--- /dev/null
+++ b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/valid_template_sets/template-sets/adapted/test_template/src/main/resources/templates/bar/BarClass.java.ftl
@@ -0,0 +1,4 @@
+package foo.bar;
+
+public class BarClass {
+}
\ No newline at end of file
diff --git a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/valid_template_sets/template-sets/adapted/test_template/src/main/resources/templates/bar/Foo2Class.java.ftl b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/valid_template_sets/template-sets/adapted/test_template/src/main/resources/templates/bar/Foo2Class.java.ftl
new file mode 100644
index 0000000000..ab33918376
--- /dev/null
+++ b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/valid_template_sets/template-sets/adapted/test_template/src/main/resources/templates/bar/Foo2Class.java.ftl
@@ -0,0 +1,4 @@
+package foo;
+
+public class Foo2Class {
+}
\ No newline at end of file
diff --git a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/valid_template_sets/template-sets/adapted/test_template/src/main/resources/templates/bar/FooClass.java.ftl b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/valid_template_sets/template-sets/adapted/test_template/src/main/resources/templates/bar/FooClass.java.ftl
new file mode 100644
index 0000000000..f0fa31bd27
--- /dev/null
+++ b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/valid_template_sets/template-sets/adapted/test_template/src/main/resources/templates/bar/FooClass.java.ftl
@@ -0,0 +1,4 @@
+package foo;
+
+public class FooClass {
+}
\ No newline at end of file
diff --git a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/valid_template_sets/template-sets/adapted/test_template/src/main/resources/templates/foo/Foo2Class.java.ftl b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/valid_template_sets/template-sets/adapted/test_template/src/main/resources/templates/foo/Foo2Class.java.ftl
new file mode 100644
index 0000000000..f0fa31bd27
--- /dev/null
+++ b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/valid_template_sets/template-sets/adapted/test_template/src/main/resources/templates/foo/Foo2Class.java.ftl
@@ -0,0 +1,4 @@
+package foo;
+
+public class FooClass {
+}
\ No newline at end of file
diff --git a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/valid_template_sets/template-sets/adapted/test_template/src/main/resources/templates/foo/FooClass.java.ftl b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/valid_template_sets/template-sets/adapted/test_template/src/main/resources/templates/foo/FooClass.java.ftl
new file mode 100644
index 0000000000..ab33918376
--- /dev/null
+++ b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/valid_template_sets/template-sets/adapted/test_template/src/main/resources/templates/foo/FooClass.java.ftl
@@ -0,0 +1,4 @@
+package foo;
+
+public class Foo2Class {
+}
\ No newline at end of file
diff --git a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/valid_template_sets/template-sets/adapted/test_template/src/main/resources/templates/foo/bar/BarClass.java.ftl b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/valid_template_sets/template-sets/adapted/test_template/src/main/resources/templates/foo/bar/BarClass.java.ftl
new file mode 100644
index 0000000000..8a3e03898d
--- /dev/null
+++ b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/valid_template_sets/template-sets/adapted/test_template/src/main/resources/templates/foo/bar/BarClass.java.ftl
@@ -0,0 +1,4 @@
+package foo.bar;
+
+public class BarClass {
+}
\ No newline at end of file
diff --git a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/valid_template_sets/template-sets/downloaded/crud-java-server-app/pom.xml b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/valid_template_sets/template-sets/downloaded/crud-java-server-app/pom.xml
new file mode 100644
index 0000000000..338fee4ab5
--- /dev/null
+++ b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/valid_template_sets/template-sets/downloaded/crud-java-server-app/pom.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+  xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.devonfw.test</groupId>
+  <artifactId>crud-java-server-app</artifactId>
+  <version>test</version>
+  <packaging>jar</packaging>
+  <properties>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
+  </properties>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>2.3.1</version>
+        <configuration>
+          <outputDirectory>../../downloaded</outputDirectory>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>
\ No newline at end of file
diff --git a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/valid_template_sets/template-sets/downloaded/crud-java-server-app/src/main/resources/template-set.xml b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/valid_template_sets/template-sets/downloaded/crud-java-server-app/src/main/resources/template-set.xml
new file mode 100644
index 0000000000..4515b452ec
--- /dev/null
+++ b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/valid_template_sets/template-sets/downloaded/crud-java-server-app/src/main/resources/template-set.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:templateSetConfiguration version="6.0" xmlns:tns="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration" xmlns:cc="http://capgemini.com/devonfw/cobigen/ContextConfiguration" xmlns:tc="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration templateSetConfiguration.xsd ">
+<cc:contextConfiguration version="3.0">
+  <cc:trigger id="crud_java_server_app" type="java">
+    <cc:containerMatcher type="package" value="((.+\.)?([^\.]+))\.([^\.]+)\.dataaccess\.api" retrieveObjectsRecursively="false" />
+    <cc:matcher type="fqn" value="((.+\.)?([^\.]+))\.([^\.]+)\.dataaccess\.api\.([^\.]+)Entity">
+      <cc:variableAssignment type="regex" key="rootPackage" value="1" />
+      <cc:variableAssignment type="regex" key="domain" value="3" />
+      <cc:variableAssignment type="regex" key="component" value="4" />
+      <cc:variableAssignment type="regex" key="entityName" value="5" />
+    </cc:matcher>
+  </cc:trigger>
+  <cc:tags>
+    <cc:tag name="Java"></cc:tag>
+    <cc:tag name="CRUD"></cc:tag>
+    <cc:tag name="Server"></cc:tag>
+    <cc:tag name="App"></cc:tag>
+  </cc:tags>
+  <cc:links>
+    <cc:link url="https://docs.spring.io/spring-data/data-commons/docs/1.6.1.RELEASE/reference/html/repositories.html"></cc:link>
+  </cc:links>
+</cc:contextConfiguration>
+
+<tc:templatesConfiguration version="5.0">
+
+  <tc:templates>
+    <tc:templateExtension ref="${variables.entityName}Eto.java" mergeStrategy="javamerge"/>
+  </tc:templates>
+
+  <tc:templateScans>
+    <tc:templateScan name="ts_scan" templatePath="templates" destinationPath="" />
+  </tc:templateScans>
+
+  <tc:increments>
+    <tc:increment name="tos" description="TO's">
+      <tc:templateRef ref="${variables.entityName}Eto.java"/>
+    </tc:increment>
+  </tc:increments>
+</tc:templatesConfiguration>
+</tns:templateSetConfiguration>
\ No newline at end of file
diff --git a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/valid_template_sets/template-sets/downloaded/crud-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component}/logic/api/to/${variables.entityName}Eto.java.ftl b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/valid_template_sets/template-sets/downloaded/crud-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component}/logic/api/to/${variables.entityName}Eto.java.ftl
new file mode 100644
index 0000000000..0c233890ea
--- /dev/null
+++ b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/valid_template_sets/template-sets/downloaded/crud-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component}/logic/api/to/${variables.entityName}Eto.java.ftl
@@ -0,0 +1 @@
+package test;
\ No newline at end of file
diff --git a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/valid_template_sets_adapted/template-sets/adapted/template-set1/src/main/resources/src/environments/environment.ts.ftl b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/valid_template_sets_adapted/template-sets/adapted/template-set1/src/main/resources/src/environments/environment.ts.ftl
new file mode 100644
index 0000000000..c311b61aca
--- /dev/null
+++ b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/valid_template_sets_adapted/template-sets/adapted/template-set1/src/main/resources/src/environments/environment.ts.ftl
@@ -0,0 +1,11 @@
+// The file contents for the current environment will overwrite these during build.
+// The build system defaults to the dev environment which uses `environment.ts`, but if you do
+// `ng build --env=prod` then `environment.prod.ts` will be used instead.
+// The list of which env maps to which file can be found in `angular-cli.json`.
+
+export const environment = {
+  production: false,
+  restPathRoot: 'http://localhost:8081/${variables.domain}-server/',
+  restServiceRoot: 'http://localhost:8081/${variables.domain}-server/services/rest/',
+  security: 'csrf',
+};
diff --git a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/valid_template_sets_adapted/template-sets/adapted/template-set1/src/main/resources/template-set.xml b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/valid_template_sets_adapted/template-sets/adapted/template-set1/src/main/resources/template-set.xml
new file mode 100644
index 0000000000..88aec27bdd
--- /dev/null
+++ b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/valid_template_sets_adapted/template-sets/adapted/template-set1/src/main/resources/template-set.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:templateSetConfiguration version="6.0"
+  xmlns:tns="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration"
+  xmlns:tns1="http://capgemini.com/devonfw/cobigen/ContextConfiguration"
+  xmlns:tns2="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration templateSetConfiguration.xsd ">
+  <tns1:contextConfiguration version="6.0">
+    <tns1:trigger id="template_set_1_trigger" type="openapi">
+      <tns1:matcher type="element" value="ComponentDef">
+        <tns1:variableAssignment type="constant" key="domain" value="demo"/>
+      </tns1:matcher>
+    </tns1:trigger>
+    <tns1:tags>
+      <tns1:tag name="bla"/>
+    </tns1:tags>
+  </tns1:contextConfiguration>
+  <tns2:templatesConfiguration version="6.0">
+    <tns2:templates>
+      <tns2:templateExtension ref="environment.ts" mergeStrategy="tsmerge_override"/>
+    </tns2:templates>
+
+    <tns2:templateScans>
+      <tns2:templateScan name="ts_scan" templatePath="templates" destinationPath=""/>
+    </tns2:templateScans>
+
+    <tns2:increments>
+      <tns2:increment name="template_set_increment1" description="Increment 1 description">
+        <tns2:templateRef ref="environment.ts"/>
+      </tns2:increment>
+    </tns2:increments>
+  </tns2:templatesConfiguration>
+</tns:templateSetConfiguration>
diff --git a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/valid_template_sets_adapted/template-sets/adapted/template-set2/src/main/resources/src/environments/environment2.ts.ftl b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/valid_template_sets_adapted/template-sets/adapted/template-set2/src/main/resources/src/environments/environment2.ts.ftl
new file mode 100644
index 0000000000..c311b61aca
--- /dev/null
+++ b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/valid_template_sets_adapted/template-sets/adapted/template-set2/src/main/resources/src/environments/environment2.ts.ftl
@@ -0,0 +1,11 @@
+// The file contents for the current environment will overwrite these during build.
+// The build system defaults to the dev environment which uses `environment.ts`, but if you do
+// `ng build --env=prod` then `environment.prod.ts` will be used instead.
+// The list of which env maps to which file can be found in `angular-cli.json`.
+
+export const environment = {
+  production: false,
+  restPathRoot: 'http://localhost:8081/${variables.domain}-server/',
+  restServiceRoot: 'http://localhost:8081/${variables.domain}-server/services/rest/',
+  security: 'csrf',
+};
diff --git a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/valid_template_sets_adapted/template-sets/adapted/template-set2/src/main/resources/template-set.xml b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/valid_template_sets_adapted/template-sets/adapted/template-set2/src/main/resources/template-set.xml
new file mode 100644
index 0000000000..5f5de5d134
--- /dev/null
+++ b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/valid_template_sets_adapted/template-sets/adapted/template-set2/src/main/resources/template-set.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:templateSetConfiguration version="6.0"
+  xmlns:tns="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration"
+  xmlns:tns1="http://capgemini.com/devonfw/cobigen/ContextConfiguration"
+  xmlns:tns2="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration templateSetConfiguration.xsd ">
+  <tns1:contextConfiguration version="6.0">
+    <tns1:trigger id="template_set2_trigger" type="openapi">
+      <tns1:matcher type="element" value="ComponentDef">
+        <tns1:variableAssignment type="constant" key="domain" value="demo"/>
+      </tns1:matcher>
+    </tns1:trigger>
+    <tns1:tags>
+      <tns1:tag name="bla"/>
+    </tns1:tags>
+  </tns1:contextConfiguration>
+  <tns2:templatesConfiguration version="6.0">
+    <tns2:templates>
+      <tns2:templateExtension ref="environment2.ts" mergeStrategy="tsmerge_override"/>
+    </tns2:templates>
+
+    <tns2:templateScans>
+      <tns2:templateScan name="ts_scan" templatePath="templates" destinationPath=""/>
+    </tns2:templateScans>
+
+    <tns2:increments>
+      <tns2:increment name="template_set_increment2" description="Increment 2 description">
+        <tns2:templateRef ref="environment2.ts"/>
+      </tns2:increment>
+    </tns2:increments>
+  </tns2:templatesConfiguration>
+</tns:templateSetConfiguration>
diff --git a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/valid_template_sets_downloaded/template-sets/downloaded/crud-java-server-app/pom.xml b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/valid_template_sets_downloaded/template-sets/downloaded/crud-java-server-app/pom.xml
new file mode 100644
index 0000000000..338fee4ab5
--- /dev/null
+++ b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/valid_template_sets_downloaded/template-sets/downloaded/crud-java-server-app/pom.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+  xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.devonfw.test</groupId>
+  <artifactId>crud-java-server-app</artifactId>
+  <version>test</version>
+  <packaging>jar</packaging>
+  <properties>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
+  </properties>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>2.3.1</version>
+        <configuration>
+          <outputDirectory>../../downloaded</outputDirectory>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>
\ No newline at end of file
diff --git a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/valid_template_sets_downloaded/template-sets/downloaded/crud-java-server-app/src/main/resources/template-set.xml b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/valid_template_sets_downloaded/template-sets/downloaded/crud-java-server-app/src/main/resources/template-set.xml
new file mode 100644
index 0000000000..4515b452ec
--- /dev/null
+++ b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/valid_template_sets_downloaded/template-sets/downloaded/crud-java-server-app/src/main/resources/template-set.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:templateSetConfiguration version="6.0" xmlns:tns="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration" xmlns:cc="http://capgemini.com/devonfw/cobigen/ContextConfiguration" xmlns:tc="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration templateSetConfiguration.xsd ">
+<cc:contextConfiguration version="3.0">
+  <cc:trigger id="crud_java_server_app" type="java">
+    <cc:containerMatcher type="package" value="((.+\.)?([^\.]+))\.([^\.]+)\.dataaccess\.api" retrieveObjectsRecursively="false" />
+    <cc:matcher type="fqn" value="((.+\.)?([^\.]+))\.([^\.]+)\.dataaccess\.api\.([^\.]+)Entity">
+      <cc:variableAssignment type="regex" key="rootPackage" value="1" />
+      <cc:variableAssignment type="regex" key="domain" value="3" />
+      <cc:variableAssignment type="regex" key="component" value="4" />
+      <cc:variableAssignment type="regex" key="entityName" value="5" />
+    </cc:matcher>
+  </cc:trigger>
+  <cc:tags>
+    <cc:tag name="Java"></cc:tag>
+    <cc:tag name="CRUD"></cc:tag>
+    <cc:tag name="Server"></cc:tag>
+    <cc:tag name="App"></cc:tag>
+  </cc:tags>
+  <cc:links>
+    <cc:link url="https://docs.spring.io/spring-data/data-commons/docs/1.6.1.RELEASE/reference/html/repositories.html"></cc:link>
+  </cc:links>
+</cc:contextConfiguration>
+
+<tc:templatesConfiguration version="5.0">
+
+  <tc:templates>
+    <tc:templateExtension ref="${variables.entityName}Eto.java" mergeStrategy="javamerge"/>
+  </tc:templates>
+
+  <tc:templateScans>
+    <tc:templateScan name="ts_scan" templatePath="templates" destinationPath="" />
+  </tc:templateScans>
+
+  <tc:increments>
+    <tc:increment name="tos" description="TO's">
+      <tc:templateRef ref="${variables.entityName}Eto.java"/>
+    </tc:increment>
+  </tc:increments>
+</tc:templatesConfiguration>
+</tns:templateSetConfiguration>
\ No newline at end of file
diff --git a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/valid_template_sets_downloaded/template-sets/downloaded/crud-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component}/logic/api/to/${variables.entityName}Eto.java.ftl b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/valid_template_sets_downloaded/template-sets/downloaded/crud-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component}/logic/api/to/${variables.entityName}Eto.java.ftl
new file mode 100644
index 0000000000..0c233890ea
--- /dev/null
+++ b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/valid_template_sets_downloaded/template-sets/downloaded/crud-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component}/logic/api/to/${variables.entityName}Eto.java.ftl
@@ -0,0 +1 @@
+package test;
\ No newline at end of file
diff --git a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/valid_template_sets_duplicated/template-sets/adapted/template-set1/template-set.xml b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/valid_template_sets_duplicated/template-sets/adapted/template-set1/template-set.xml
new file mode 100644
index 0000000000..44fbb599e9
--- /dev/null
+++ b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/valid_template_sets_duplicated/template-sets/adapted/template-set1/template-set.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:templateSetConfiguration version="6.0" xmlns:tns="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration" xmlns:tns1="http://capgemini.com/devonfw/cobigen/ContextConfiguration" xmlns:tns2="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration templateSetConfiguration.xsd ">
+  <tns1:contextConfiguration version="6.0">
+      <tns1:trigger id="template_set_1_trigger" type="openapi">
+    <tns1:matcher type="element" value="ComponentDef">
+      <tns1:variableAssignment type="constant" key="domain" value="demo"/>
+    </tns1:matcher>
+  </tns1:trigger>
+    <tns1:tags>
+      <tns1:tag name="bla" />
+    </tns1:tags>
+  </tns1:contextConfiguration>
+  <tns2:templatesConfiguration version="6.0">
+<tns2:templates>
+    <tns2:templateExtension ref="environment.ts" mergeStrategy="tsmerge_override"/>
+  </tns2:templates>
+
+  <tns2:templateScans>
+    <tns2:templateScan name="ts_scan" templatePath="templates" destinationPath=""/>
+  </tns2:templateScans>
+
+  <tns2:increments>
+    <tns2:increment name="template_set_increment1" description="Increment 1 description">
+      <tns2:templateRef ref="environment.ts"/>
+    </tns2:increment>
+  </tns2:increments>
+  </tns2:templatesConfiguration>
+</tns:templateSetConfiguration>
diff --git a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/valid_template_sets_duplicated/template-sets/adapted/template-set1/templates/src/environments/environment.ts.ftl b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/valid_template_sets_duplicated/template-sets/adapted/template-set1/templates/src/environments/environment.ts.ftl
new file mode 100644
index 0000000000..c311b61aca
--- /dev/null
+++ b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/valid_template_sets_duplicated/template-sets/adapted/template-set1/templates/src/environments/environment.ts.ftl
@@ -0,0 +1,11 @@
+// The file contents for the current environment will overwrite these during build.
+// The build system defaults to the dev environment which uses `environment.ts`, but if you do
+// `ng build --env=prod` then `environment.prod.ts` will be used instead.
+// The list of which env maps to which file can be found in `angular-cli.json`.
+
+export const environment = {
+  production: false,
+  restPathRoot: 'http://localhost:8081/${variables.domain}-server/',
+  restServiceRoot: 'http://localhost:8081/${variables.domain}-server/services/rest/',
+  security: 'csrf',
+};
diff --git a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/valid_template_sets_duplicated/template-sets/adapted/template-set2/template-set.xml b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/valid_template_sets_duplicated/template-sets/adapted/template-set2/template-set.xml
new file mode 100644
index 0000000000..fc85fba98a
--- /dev/null
+++ b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/valid_template_sets_duplicated/template-sets/adapted/template-set2/template-set.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:templateSetConfiguration version="6.0"
+  xmlns:tns="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration"
+  xmlns:tns1="http://capgemini.com/devonfw/cobigen/ContextConfiguration"
+  xmlns:tns2="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration templateSetConfiguration.xsd ">
+  <tns1:contextConfiguration version="6.0">
+    <tns1:trigger id="template_set1_trigger" type="openapi">
+      <tns1:matcher type="element" value="ComponentDef">
+        <tns1:variableAssignment type="constant" key="domain" value="demo"/>
+      </tns1:matcher>
+    </tns1:trigger>
+    <tns1:tags>
+      <tns1:tag name="bla"/>
+    </tns1:tags>
+  </tns1:contextConfiguration>
+  <tns2:templatesConfiguration version="6.0">
+    <tns2:templates>
+      <tns2:templateExtension ref="environment.ts" mergeStrategy="tsmerge_override"/>
+    </tns2:templates>
+
+    <tns2:templateScans>
+      <tns2:templateScan name="ts_scan" templatePath="templates" destinationPath=""/>
+    </tns2:templateScans>
+
+    <tns2:increments>
+      <tns2:increment name="template_set_increment1" description="Increment 1 description">
+        <tns2:templateRef ref="environment.ts"/>
+      </tns2:increment>
+    </tns2:increments>
+  </tns2:templatesConfiguration>
+</tns:templateSetConfiguration>
diff --git a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/valid_template_sets_duplicated/template-sets/adapted/template-set2/templates/src/environments/environment.ts.ftl b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/valid_template_sets_duplicated/template-sets/adapted/template-set2/templates/src/environments/environment.ts.ftl
new file mode 100644
index 0000000000..c311b61aca
--- /dev/null
+++ b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplateSetConfigurationReaderTest/valid_template_sets_duplicated/template-sets/adapted/template-set2/templates/src/environments/environment.ts.ftl
@@ -0,0 +1,11 @@
+// The file contents for the current environment will overwrite these during build.
+// The build system defaults to the dev environment which uses `environment.ts`, but if you do
+// `ng build --env=prod` then `environment.prod.ts` will be used instead.
+// The list of which env maps to which file can be found in `angular-cli.json`.
+
+export const environment = {
+  production: false,
+  restPathRoot: 'http://localhost:8081/${variables.domain}-server/',
+  restServiceRoot: 'http://localhost:8081/${variables.domain}-server/services/rest/',
+  security: 'csrf',
+};
diff --git a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplatesConfigurationReaderTest/context.xml b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplatesConfigurationReaderTest/context.xml
index 6eff6731ae..7346b73da9 100644
--- a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplatesConfigurationReaderTest/context.xml
+++ b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/reader/TemplatesConfigurationReaderTest/context.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.1">
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.0">
 
   <trigger id="valid_incrementref_outside_folder" type="xml" templateFolder="valid_incrementref_outside_folder">
     <matcher type="nodename" value="xmi:XMI">
@@ -13,7 +13,7 @@
     </matcher>
   </trigger>
   <trigger id="valid_relocate_template_vs_scan" type="xml" templateFolder="valid_relocate_template_vs_scan">
-  <matcher type="nodename" value="xmi:XMI">
+    <matcher type="nodename" value="xmi:XMI">
       <variableAssignment type="constant" key="className" value="Bill"/>
     </matcher>
   </trigger>
@@ -22,4 +22,7 @@
       <variableAssignment type="constant" key="className" value="Bill"/>
     </matcher>
   </trigger>
+  <tags>
+    <tag name="someTag"/>
+  </tags>
 </contextConfiguration>
diff --git a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/ContextConfigurationUpgraderTest/valid-v2.2/context.xml b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/ContextConfigurationUpgraderTest/valid-v2.2/context.xml
deleted file mode 100644
index 9559944b0a..0000000000
--- a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/ContextConfigurationUpgraderTest/valid-v2.2/context.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  version="2.2">
-
-  <trigger id="valid" type="java" templateFolder="valid" inputCharset="UTF-8">
-    <matcher type="fqn" value="*" accumulationType="NOT">
-      <variableAssignment type="constant" key="foo" value="BLUBB1"/>
-      <variableAssignment type="constant" key="bar" value="BLAABB1"/>
-    </matcher>
-    <matcher type="fqn" value="*" accumulationType="OR">
-      <variableAssignment type="constant" key="foo" value="BLUBB2"/>
-      <variableAssignment type="constant" key="bar" value="BLAABB2"/>
-    </matcher>
-  </trigger>
-  <trigger id="valid2" type="java" templateFolder="valid" inputCharset="UTF-8">
-    <containerMatcher type="fqn" value="asdf.asd.fasdf.asfd." retrieveObjectsRecursively="true"/>
-    <matcher type="fqn" value="*" accumulationType="AND">
-      <variableAssignment type="constant" key="foo" value="BLUBB"/>
-    </matcher>
-  </trigger>
-
-</contextConfiguration>
\ No newline at end of file
diff --git a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/ContextConfigurationUpgraderTest/valid-v3.0/templateSet1/context.xml b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/ContextConfigurationUpgraderTest/valid-v3.0/templateSet1/context.xml
new file mode 100644
index 0000000000..61bc928ed1
--- /dev/null
+++ b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/ContextConfigurationUpgraderTest/valid-v3.0/templateSet1/context.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="3.0">
+	<trigger id="templateSet1" type="java" templateFolder="templateSet1" inputCharset="UTF-8">
+		<containerMatcher type="package" value="someValue" retrieveObjectsRecursively="false" />
+		<matcher type="fqn" value="*" accumulationType="NOT">
+			<variableAssignment type="constant" key="foo" value="BLUBB1" />
+		</matcher>
+	</trigger>
+	<tags>
+		<tag name="PLACEHOLDER---This tag was inserted through the upgrade process and has to be changed manually---PLACEHOLDER" />
+	</tags>
+	<links>
+		<link url="PLACEHOLDER---This tag was inserted through the upgrade process and has to be changed manually---PLACEHOLDER" />
+	</links>
+</contextConfiguration>
\ No newline at end of file
diff --git a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/ContextConfigurationUpgraderTest/valid-v3.0/templateSet2/context.xml b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/ContextConfigurationUpgraderTest/valid-v3.0/templateSet2/context.xml
new file mode 100644
index 0000000000..327e6e400b
--- /dev/null
+++ b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/ContextConfigurationUpgraderTest/valid-v3.0/templateSet2/context.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="3.0">
+  <trigger id="templateSet2" type="someType" templateFolder="templateSet2" inputCharset="UTF-8">
+    <containerMatcher type="element" value="someValue" retrieveObjectsRecursively="true"/>
+    <matcher type="element" value="*" accumulationType="OR">
+      <variableAssignment type="constant" key="foo" value="BlABLA1"/>
+    </matcher>
+  </trigger>
+  	<tags>
+		<tag name="PLACEHOLDER---This tag was inserted through the upgrade process and has to be changed manually---PLACEHOLDER" />
+	</tags>
+	<links>
+		<link url="PLACEHOLDER---This tag was inserted through the upgrade process and has to be changed manually---PLACEHOLDER" />
+	</links>
+</contextConfiguration>
\ No newline at end of file
diff --git a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.0/templates/CobiGen_Templates/pom.xml b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.0/templates/CobiGen_Templates/pom.xml
new file mode 100644
index 0000000000..4bc0a32864
--- /dev/null
+++ b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.0/templates/CobiGen_Templates/pom.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.devonfw.cobigen</groupId>
+  <artifactId>templates-devon4j</artifactId>
+  <version>2021.12.006</version>
+  <name>CobiGen - devon4j Templates</name>
+  <description>A Code-based incremental Generator</description>
+  <url>https://github.com/devonfw/cobigen/templates-parent/templates-devon4j</url>
+  <licenses>
+    <license>
+      <name>Apache Software License 2.0</name>
+      <url>https://raw.githubusercontent.com/devonfw/.github/master/LICENSE</url>
+      <distribution>repo</distribution>
+      <comments></comments>
+    </license>
+  </licenses>
+  <developers>
+    <developer>
+      <name>Malte Brunnlieb</name>
+      <organization>Capgemini</organization>
+    </developer>
+  </developers>
+  <scm>
+    <connection>scm:git:git@github.com:devonfw/cobigen.git/templates-parent/templates-devon4j</connection>
+    <developerConnection>scm:git:git@github.com:devonfw/cobigen.git/templates-parent/templates-devon4j</developerConnection>
+    <url>git@github.com:devonfw/cobigen.git/templates-parent/templates-devon4j</url>
+  </scm>
+  <dependencies>
+    <dependency>
+      <groupId>javax.ws.rs</groupId>
+      <artifactId>javax.ws.rs-api</artifactId>
+      <version>2.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.data</groupId>
+      <artifactId>spring-data-rest-webmvc</artifactId>
+      <version>3.7.10</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+      <version>3.12.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+      <version>2.10.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>xerces</groupId>
+      <artifactId>xercesImpl</artifactId>
+      <version>2.12.2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.persistence</groupId>
+      <artifactId>javax.persistence-api</artifactId>
+      <version>2.2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>1.7.30</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <version>1.7.30</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>log4j-over-slf4j</artifactId>
+      <version>1.7.30</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+  <repositories>
+    <repository>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+      <id>ossrh</id>
+      <name>OSSRH Snapshots</name>
+      <url>https://s01.oss.sonatype.org/content/repositories/snapshots/</url>
+    </repository>
+  </repositories>
+
+  <properties>
+   <maven.compiler.source>1.8</maven.compiler.source>
+   <maven.compiler.target>1.8</maven.compiler.target>
+  </properties>
+
+  <build>
+   <resources>
+     <resource>
+       <directory>src/main/templates</directory>
+       <targetPath>src/main/templates</targetPath>
+     </resource>
+   </resources>
+  </build>
+</project>
\ No newline at end of file
diff --git a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.0/templates/CobiGen_Templates/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/JavaUtil.java b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.0/templates/CobiGen_Templates/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/JavaUtil.java
new file mode 100644
index 0000000000..ced2f5fde2
--- /dev/null
+++ b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.0/templates/CobiGen_Templates/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/JavaUtil.java
@@ -0,0 +1,464 @@
+package com.devonfw.cobigen.templates.devon4j.utils;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.Collection;
+import java.util.Map;
+
+import org.apache.commons.lang3.ClassUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Provides type operations, mainly checks and casts for Java Primitives, to be used in the templates
+ *
+ */
+public class JavaUtil {
+
+  /**
+   * Logger for this class
+   */
+  private static final Logger LOG = LoggerFactory.getLogger(JavaUtil.class);
+
+  /**
+   * The constructor.
+   */
+  public JavaUtil() {
+
+    // Empty for CobiGen to automatically instantiate it
+  }
+
+  /**
+   * Returns the Object version of a Java primitive or the input if the input isn't a java primitive
+   * 
+   * @param simpleType String
+   * @return the corresponding object wrapper type simple name of the input if the input is the name of a primitive java
+   *         type. The input itself if not. (e.g. "int" results in "Integer")
+   * @throws ClassNotFoundException should not occur.
+   */
+  public String boxJavaPrimitives(String simpleType) throws ClassNotFoundException {
+
+    if (equalsJavaPrimitive(simpleType)) {
+      return ClassUtils.primitiveToWrapper(ClassUtils.getClass(simpleType)).getSimpleName();
+    } else {
+      return simpleType;
+    }
+
+  }
+
+  /**
+   * Returns the simple name of the type of a field in the pojoClass. If the type is a java primitive the name of the
+   * wrapper class is returned
+   *
+   * @param pojoClass {@link Class} the class object of the pojo
+   * @param fieldName {@link String} the name of the field
+   * @return String. The simple name of the field's type. The simple name of the wrapper class in case of java
+   *         primitives
+   * @throws NoSuchFieldException indicating something awefully wrong in the used model
+   * @throws SecurityException if the field cannot be accessed.
+   */
+  public String boxJavaPrimitives(Class<?> pojoClass, String fieldName) throws NoSuchFieldException, SecurityException {
+
+    if (pojoClass == null) {
+      throw new IllegalAccessError(
+          "Class object is null. Cannot generate template as it might obviously depend on reflection.");
+    }
+
+    if (equalsJavaPrimitive(pojoClass, fieldName)) {
+      return ClassUtils.primitiveToWrapper(pojoClass.getDeclaredField(fieldName).getType()).getSimpleName();
+    } else {
+      Field field = pojoClass.getDeclaredField(fieldName);
+      if (field == null) {
+        field = pojoClass.getField(fieldName);
+      }
+      if (field == null) {
+        throw new IllegalAccessError("Could not find field " + fieldName + " in class " + pojoClass);
+      } else {
+        return field.getType().getSimpleName();
+      }
+    }
+  }
+
+  /**
+   * Checks if the given type is a Java primitive
+   *
+   * @param simpleType the type to be checked
+   * @return true iff simpleType is a Java primitive
+   */
+  public boolean equalsJavaPrimitive(String simpleType) {
+
+    try {
+      return ClassUtils.getClass(simpleType).isPrimitive();
+    } catch (ClassNotFoundException e) {
+      LOG.warn("{}: Could not find {}", e.getMessage(), simpleType);
+      return false;
+    }
+  }
+
+  /**
+   * Checks if the given type is a Java primitive or wrapper
+   *
+   * @param simpleType the type to be checked
+   * @return true iff simpleType is a Java primitive or wrapper
+   */
+  public boolean equalsJavaPrimitiveOrWrapper(String simpleType) {
+
+    try {
+      return ClassUtils.isPrimitiveOrWrapper(ClassUtils.getClass(simpleType));
+    } catch (ClassNotFoundException e) {
+      LOG.warn("{}: Could not find {}", e.getMessage(), simpleType);
+      return false;
+    }
+  }
+
+  /**
+   * Checks if the type of the field in the pojo's class is a java primitive
+   *
+   * @param pojoClass the {@link Class} object of the pojo
+   * @param fieldName the name of the field to be checked
+   * @return true iff the field is a java primitive
+   * @throws NoSuchFieldException indicating something awefully wrong in the used model
+   * @throws SecurityException if the field cannot be accessed.
+   */
+  public boolean equalsJavaPrimitive(Class<?> pojoClass, String fieldName)
+      throws NoSuchFieldException, SecurityException {
+
+    if (pojoClass == null) {
+      return false;
+    }
+
+    Field field = pojoClass.getDeclaredField(fieldName);
+    if (field == null) {
+      field = pojoClass.getField(fieldName);
+    }
+    if (field == null) {
+      return false;
+    } else {
+      return field.getType().isPrimitive();
+    }
+  }
+
+  /**
+   * Checks if the given type is a Java primitive or a Java primitive array
+   *
+   * @param simpleType the Type name to be checked
+   * @return true iff {@link #equalsJavaPrimitive(String)} is true or if simpleType is an array with a primitive
+   *         component
+   */
+  public boolean equalsJavaPrimitiveIncludingArrays(String simpleType) {
+
+    Class<?> klasse;
+
+    try {
+      klasse = ClassUtils.getClass(simpleType).getComponentType();
+    } catch (ClassNotFoundException e) {
+      LOG.warn("{}: Could not find {}", e.getMessage(), simpleType);
+      return false;
+    }
+    return equalsJavaPrimitive(simpleType) || (klasse != null && klasse.isPrimitive());
+  }
+
+  /**
+   * Checks if the given field in the pojo class is a java primitive or an array of java primitives
+   *
+   * @param pojoClass the class object of the pojo
+   * @param fieldName the name of the field to be checked
+   * @return true iff {@link #equalsJavaPrimitive(Class, String)} is true or the field is an array of primitives
+   * @throws NoSuchFieldException indicating something awfully wrong in the used model
+   * @throws SecurityException if the field cannot be accessed.
+   */
+  public boolean equalsJavaPrimitiveIncludingArrays(Class<?> pojoClass, String fieldName)
+      throws NoSuchFieldException, SecurityException {
+
+    return equalsJavaPrimitive(pojoClass, fieldName) || (pojoClass.getDeclaredField(fieldName).getType().isArray()
+        && pojoClass.getDeclaredField(fieldName).getType().getComponentType().isPrimitive());
+  }
+
+  /**
+   * Returns a cast statement for a given (java primitive, variable name) pair or nothing if the type isn't a java
+   * primitive
+   *
+   * @param simpleType Java Type
+   * @param varName Variable name
+   * @return String either of the form '((Java Primitive Object Type)varName)' if simpleType is a primitive or the empty
+   *         String otherwise
+   * @throws ClassNotFoundException should not occur
+   */
+  public String castJavaPrimitives(String simpleType, String varName) throws ClassNotFoundException {
+
+    if (equalsJavaPrimitive(simpleType)) {
+      return String.format("((%1$s)%2$s)", boxJavaPrimitives(simpleType), varName);
+    } else {
+      return "";
+    }
+  }
+
+  /**
+   * Returns a cast statement for a given (java primitive, variable name) pair or nothing if the type isn't a java
+   * primitive
+   *
+   * @param pojoClass the class object of the pojo
+   * @param fieldName the name of the field to be casted
+   * @return if fieldName points to a primitive field then a casted statement (e.g. for an int field:
+   *         '((Integer)field)') or an empty String otherwise
+   * @throws NoSuchFieldException indicating something awefully wrong in the used model
+   * @throws SecurityException if the field cannot be accessed.
+   */
+  public String castJavaPrimitives(Class<?> pojoClass, String fieldName)
+      throws NoSuchFieldException, SecurityException {
+
+    if (equalsJavaPrimitive(pojoClass, fieldName)) {
+      return String.format("((%1$s)%2$s)", boxJavaPrimitives(pojoClass, fieldName), fieldName);
+    } else {
+      return "";
+    }
+  }
+
+  /**
+   * @param pojoClass {@link Class} the class object of the pojo
+   * @param fieldName {@link String} the name of the field
+   * @return true if the field is an instance of java.utils.Collections
+   * @throws NoSuchFieldException indicating something awefully wrong in the used model
+   * @throws SecurityException if the field cannot be accessed.
+   */
+  public boolean isCollection(Class<?> pojoClass, String fieldName) throws NoSuchFieldException, SecurityException {
+
+    if (pojoClass == null) {
+      return false;
+    }
+
+    Field field = pojoClass.getDeclaredField(fieldName);
+    if (field == null) {
+      field = pojoClass.getField(fieldName);
+    }
+    if (field == null) {
+      return false;
+    } else {
+      return Collection.class.isAssignableFrom(field.getType());
+    }
+
+  }
+
+  /**
+   * Returns the Ext Type to a given java type
+   *
+   * @param simpleType any java type's simple name
+   * @return corresponding Ext type
+   */
+  public String getExtType(String simpleType) {
+
+    switch (simpleType) {
+      case "short":
+      case "Short":
+      case "int":
+      case "Integer":
+      case "long":
+      case "Long":
+        return "Integer";
+      case "float":
+      case "Float":
+      case "double":
+      case "Double":
+        return "Number";
+      case "boolean":
+      case "Boolean":
+        return "Boolean";
+      case "char":
+      case "Character":
+      case "String":
+        return "String";
+      case "Date":
+        return "Date";
+      default:
+        return "Field";
+    }
+  }
+
+  /**
+   * returns the Angular5 type associated with a Java primitive
+   *
+   * @param simpleType :{@link String} the type to be parsed
+   * @return the corresponding Angular type or 'any' otherwise
+   */
+  public String getAngularType(String simpleType) {
+
+    switch (simpleType) {
+      case "boolean":
+        return "boolean";
+      case "Boolean":
+        return "boolean";
+      case "short":
+        return "number";
+      case "Short":
+        return "number";
+      case "int":
+        return "number";
+      case "Integer":
+        return "number";
+      case "long":
+        return "number";
+      case "Long":
+        return "number";
+      case "float":
+        return "number";
+      case "Float":
+        return "number";
+      case "double":
+        return "number";
+      case "Double":
+        return "number";
+      case "char":
+        return "string";
+      case "Character":
+        return "string";
+      case "String":
+        return "string";
+      case "byte":
+        return "number";
+      default:
+        return "any";
+    }
+  }
+
+  /**
+   * returns the class name of the return type of a specific method.
+   *
+   * @param pojoClass {@link Class}&lt;?&gt; the class object of the pojo
+   * @param methodName {@link String} the name of the method
+   * @return the class name of the return type of the specified method
+   * @throws SecurityException If no method of the given name can be found
+   * @throws NoSuchMethodException If no method of the given name can be found
+   */
+  public String getReturnType(Class<?> pojoClass, String methodName) throws NoSuchMethodException, SecurityException {
+
+    if (pojoClass == null) {
+      throw new IllegalAccessError(
+          "Class object is null. Cannot generate template as it might obviously depend on reflection.");
+    }
+    String s = "-";
+    Method method = findMethod(pojoClass, methodName);
+    if (method != null && !method.getReturnType().equals(Void.TYPE)) {
+      s = method.getReturnType().toString();
+      s = s.substring(s.lastIndexOf('.') + 1, s.length());
+    }
+    return s;
+  }
+
+  /**
+   *
+   * This methods returns the return type of the method in the given pojoClass which are annotated with the parameter
+   * annotatedClass
+   *
+   * @param pojoClass - The class in which to find if it has methods with annotatedClass
+   * @param annotatedClassName - The annotation which needs to be found
+   * @return Return type of the method annotated with the given annotation, else "null"
+   * @throws ClassNotFoundException if the annotated class name could not be found in the class path
+   */
+  @SuppressWarnings("unchecked")
+  public String getReturnTypeOfMethodAnnotatedWith(Class<?> pojoClass, String annotatedClassName)
+      throws ClassNotFoundException {
+
+    if (pojoClass == null) {
+      throw new IllegalAccessError(
+          "Class object is null. Cannot generate template as it might obviously depend on reflection.");
+    }
+
+    Method[] methods = pojoClass.getDeclaredMethods();
+    for (Method method : methods) {
+      if (!method.getName().startsWith("get")) {
+        continue;
+      }
+      for (Annotation a : method.getAnnotations()) {
+        // better if (method.isAnnotationPresent(classObj)) {, but postponed as of different class
+        // loaders of a.getClass() and pojoClass.getClass()
+        if (a.getClass().getCanonicalName().equals(annotatedClassName)) {
+          return method.getReturnType().getSimpleName();
+        }
+      }
+    }
+    return "null";
+  }
+
+  /**
+   * returns the HTTP request type corresponding to an annotation type
+   *
+   * @param annotations The annotation to get the type name of
+   * @return the HTTP request type name of the selected annotation
+   */
+  public String getRequestType(Map<String, Object> annotations) {
+
+    if (annotations.containsKey("javax_ws_rs_GET")) {
+      return "GET";
+    } else if (annotations.containsKey("javax_ws_rs_PUT")) {
+      return "PUT";
+    } else if (annotations.containsKey("javax_ws_rs_POST")) {
+      return "POST";
+    } else if (annotations.containsKey("javax_ws_rs_DELETE")) {
+      return "DELETE";
+    } else if (annotations.containsKey("javax_ws_rs_PATCH")) {
+      return "PATCH";
+    } else {
+      return "-";
+    }
+  }
+
+  /**
+   * Helper method to find a class's specific method
+   *
+   * @param pojoClass {@link Class}&lt;?&gt; the class object of the pojo
+   * @param methodName The name of the method to be found
+   * @return The method object of the method to be found, null if it wasn't found
+   */
+  private Method findMethod(Class<?> pojoClass, String methodName) {
+
+    if (pojoClass == null) {
+      throw new IllegalAccessError(
+          "Class object is null. Cannot generate template as it might obviously depend on reflection.");
+    }
+    for (Method m : pojoClass.getMethods()) {
+      if (m.getName().equals(methodName)) {
+        return m;
+      }
+    }
+    return null;
+  }
+
+  /**
+   * Checks whether the class given by the full qualified name is an enum
+   *
+   * @param className full qualified class name
+   * @return <code>true</code> if the class is an enum, <code>false</code> otherwise
+   */
+  public boolean isEnum(String className) {
+
+    try {
+      return ClassUtils.getClass(className).isEnum();
+    } catch (ClassNotFoundException e) {
+      LOG.warn("{}: Could not find {}", e.getMessage(), className);
+      return false;
+    }
+  }
+
+  /**
+   * Returns the first enum value of an enum class
+   *
+   * @param className full qualified class name
+   * @return the first enum value name found in order
+   */
+  public String getFirstEnumValue(String className) {
+
+    try {
+      Class<?> enumClass = ClassUtils.getClass(className);
+      Field[] declaredFields = enumClass.getDeclaredFields();
+      if (declaredFields.length > 0) {
+        return declaredFields[0].getName();
+      } else {
+        return null;
+      }
+    } catch (ClassNotFoundException e) {
+      LOG.warn("{}: Could not find {}", e.getMessage(), className);
+      return null;
+    }
+  }
+}
diff --git a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.0/templates/CobiGen_Templates/src/main/templates/context.xml b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.0/templates/CobiGen_Templates/src/main/templates/context.xml
new file mode 100644
index 0000000000..1c7ed3ad41
--- /dev/null
+++ b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.0/templates/CobiGen_Templates/src/main/templates/context.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="2.0">
+  <trigger id="templateSet1" type="java" templateFolder="templateSet1" inputCharset="UTF-8">
+    <containerMatcher type="package" value="someValue"
+      retrieveObjectsRecursively="false"/>
+    <matcher type="fqn" value="*" accumulationType="NOT">
+      <variableAssignment type="constant" key="foo" value="BLUBB1"/>
+    </matcher>
+  </trigger>
+  <trigger id="templateSet2" type="someType" templateFolder="templateSet2" inputCharset="UTF-8">
+    <containerMatcher type="element" value="someValue" retrieveObjectsRecursively="true"/>
+    <matcher type="element" value="*" accumulationType="OR">
+      <variableAssignment type="constant" key="foo" value="BlABLA1"/>
+    </matcher>
+  </trigger>
+</contextConfiguration>
diff --git a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.0/templates/CobiGen_Templates/src/main/templates/templateSet1/ObjectBuilder.java.ftl b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.0/templates/CobiGen_Templates/src/main/templates/templateSet1/ObjectBuilder.java.ftl
new file mode 100644
index 0000000000..fc8f58c822
--- /dev/null
+++ b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.0/templates/CobiGen_Templates/src/main/templates/templateSet1/ObjectBuilder.java.ftl
@@ -0,0 +1,51 @@
+<#include '/makros.ftl'>
+package ${variables.rootPackage}.common.builders;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.function.Consumer;
+
+import ${pojo.package}.${pojo.name};
+
+/**
+ * Test data builder for ${pojo.name} generated with cobigen.
+ */
+public class ${pojo.name}Builder {
+
+    private List<Consumer<${pojo.name}>> parameterToBeApplied;
+
+  /**
+   * The constructor.
+   */
+    public ${pojo.name}Builder() {
+    this.parameterToBeApplied = new LinkedList<>();
+    fillMandatoryFields();
+    fillMandatoryFields_custom();
+  }
+
+    <#list pojo.methodAccessibleFields as field>
+    <#if field.name != "id" && field.name != "modificationCounter">
+  /**
+   * @param ${field.name} the ${field.name} to add.
+   * @return the builder for fluent population of fields.
+   */
+  public ${pojo.name}Builder ${field.name}(final ${field.type} ${field.name}) {
+        this.parameterToBeApplied.add(target -> target.set${field.name?cap_first}(${field.name}));
+
+        return this;
+    }
+    </#if>
+    </#list>
+
+  /**
+   * @return the populated ${pojo.name}.
+   */
+    public ${pojo.name} createNew() {
+        ${pojo.name} ${pojo.name?lower_case} = new ${pojo.name}();
+        for (Consumer<${pojo.name}> parameter : parameterToBeApplied) {
+            parameter.accept(${pojo.name?lower_case});
+        }
+        return ${pojo.name?lower_case};
+    }
+
+}
\ No newline at end of file
diff --git a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.0/templates/CobiGen_Templates/src/main/templates/templateSet1/ObjectBuilder_customFunctions.java.ftl b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.0/templates/CobiGen_Templates/src/main/templates/templateSet1/ObjectBuilder_customFunctions.java.ftl
new file mode 100644
index 0000000000..e97598610d
--- /dev/null
+++ b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.0/templates/CobiGen_Templates/src/main/templates/templateSet1/ObjectBuilder_customFunctions.java.ftl
@@ -0,0 +1,22 @@
+<#include '/makros.ftl'>
+package ${variables.rootPackage}.common.builders;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.function.Consumer;
+
+import ${pojo.package}.${pojo.name};
+
+/**
+ * Test data builder for ${pojo.name} generated with cobigen.
+ */
+public class ${pojo.name}Builder {
+
+	/**
+	 * Might be enriched to users needs (will not be overwritten)
+	 */	
+    private void fillMandatoryFields_custom() {
+    
+    }
+
+}
\ No newline at end of file
diff --git a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.0/templates/CobiGen_Templates/src/main/templates/templateSet1/ObjectBuilder_fillMandatoryFields.java.ftl b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.0/templates/CobiGen_Templates/src/main/templates/templateSet1/ObjectBuilder_fillMandatoryFields.java.ftl
new file mode 100644
index 0000000000..2e82fa9cd0
--- /dev/null
+++ b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.0/templates/CobiGen_Templates/src/main/templates/templateSet1/ObjectBuilder_fillMandatoryFields.java.ftl
@@ -0,0 +1,22 @@
+<#include '/makros.ftl'>
+package ${variables.rootPackage}.common.builders;
+
+/**
+ * Test data builder for ${pojo.name} generated with cobigen.
+ */
+public class ${pojo.name}Builder {
+
+	/**
+	 * Fills all mandatory fields by default. (will be overwritten on re-generation)
+	 */
+    private void fillMandatoryFields() {
+	    <#list pojo.methodAccessibleFields as attr>		
+		<#if (attr.annotations.javax_validation_constraints_NotNull)?has_content
+		  || ((attr.annotations.javax_persistence_Column.nullable)?has_content
+		   && attr.annotations.javax_persistence_Column.nullable == "false")>
+		<@callNotNullPropertyWithDefaultValue attr=attr/>	
+		</#if>
+	    </#list>
+    }
+    
+}
diff --git a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.0/templates/CobiGen_Templates/src/main/templates/templateSet1/ObjectBuilder_persistable.java.ftl b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.0/templates/CobiGen_Templates/src/main/templates/templateSet1/ObjectBuilder_persistable.java.ftl
new file mode 100644
index 0000000000..9c0e2c4f42
--- /dev/null
+++ b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.0/templates/CobiGen_Templates/src/main/templates/templateSet1/ObjectBuilder_persistable.java.ftl
@@ -0,0 +1,45 @@
+<#include '/makros.ftl'>
+package ${variables.rootPackage}.common.builders;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.function.Consumer;
+
+import javax.persistence.EntityManager;
+
+import ${pojo.package}.${pojo.name};
+
+/**
+ * Test data builder for ${pojo.name} generated with cobigen.
+ */
+public class ${pojo.name}Builder {
+
+  /**
+   * @param em the {@link EntityManager}
+   * @return the ${pojo.name}
+   */
+   public ${pojo.name} persist(EntityManager em) {
+        ${pojo.name} ${pojo.name?lower_case} = createNew();
+        em.persist(${pojo.name?lower_case});
+        return ${pojo.name?lower_case};
+    }
+    
+  /**
+   * @param em the {@link EntityManager}
+   * @param quantity the quantity
+   * @return a list of ${pojo.name}
+   */
+    public List<${pojo.name}> persistAndDuplicate(EntityManager em, int quantity) {
+
+        List<${pojo.name}> ${pojo.name?lower_case}List = new LinkedList<>();
+        for (int i = 0; i < quantity; i++) {
+            ${pojo.name} ${pojo.name?lower_case} = createNew();
+            // TODO alter at least values with unique key constraints to prevent from exceptions while persisting
+            em.persist(${pojo.name?lower_case});
+            ${pojo.name?lower_case}List.add(${pojo.name?lower_case});
+        }
+
+        return ${pojo.name?lower_case}List;
+    }
+
+}
\ No newline at end of file
diff --git a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.0/templates/CobiGen_Templates/src/main/templates/templateSet1/makros.ftl b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.0/templates/CobiGen_Templates/src/main/templates/templateSet1/makros.ftl
new file mode 100644
index 0000000000..1d40c4d681
--- /dev/null
+++ b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.0/templates/CobiGen_Templates/src/main/templates/templateSet1/makros.ftl
@@ -0,0 +1,53 @@
+<#macro callNotNullPropertyWithDefaultValue attr>
+<#if attr.canonicalType = "byte" || attr.canonicalType = "java.lang.Byte" >
+	${attr.name}((byte)1);
+<#elseif attr.canonicalType  = "short" || attr.canonicalType = "java.lang.Short" >
+	${attr.name}((short)1);
+<#elseif attr.canonicalType  = "int" || attr.canonicalType = "java.lang.Integer" >
+	${attr.name}(1);
+<#elseif attr.canonicalType  = "long" || attr.canonicalType = "java.lang.Long" >
+	${attr.name}(1L);
+<#elseif attr.canonicalType  = "float" || attr.canonicalType = "java.lang.Float" >
+	${attr.name}(1f);
+<#elseif attr.canonicalType  = "double" || attr.canonicalType = "java.lang.Double" >
+	${attr.name}(1d);
+<#elseif attr.canonicalType  = "char" || attr.canonicalType = "java.lang.Character" >
+	${attr.name}('c');
+<#elseif attr.canonicalType  = "boolean" || attr.canonicalType = "java.lang.Boolean" >
+	${attr.name}(true);
+<#elseif attr.canonicalType   = "java.lang.String">
+	${attr.name}("DefaultString");
+<#elseif attr.canonicalType   = "java.lang.Number">
+	${attr.name}(1);
+<#elseif attr.canonicalType   = "java.util.Currency">
+  ${attr.name}(Currency.getInstance("USD"));
+<#elseif attr.canonicalType   = "java.math.BigDecimal">
+  ${attr.name}(BigDecimal.valueOf(1.0));
+<#elseif attr.canonicalType   = "java.time.LocalTime">
+  ${attr.name}(LocalTime.now());
+<#elseif attr.canonicalType   = "java.time.LocalDate">
+  ${attr.name}(LocalDate.now());
+<#elseif attr.canonicalType   = "java.time.LocalDateTime">
+  ${attr.name}(LocalDateTime.now());
+<#elseif attr.canonicalType   = "java.time.ZonedDateTime">
+  ${attr.name}(ZonedDateTime.now());
+<#elseif JavaUtil.isEnum(attr.canonicalType)>
+  ${attr.name}(${attr.type}.${JavaUtil.getFirstEnumValue(attr.canonicalType)});
+<#elseif attr.canonicalType?ends_with("[]")>
+  ${attr.name}(new ${attr.type?keep_before_last("[]")}[0]);
+<#elseif getPackage(attr.canonicalType) = pojo.package>
+	${attr.name}(new ${attr.name?cap_first}Builder().createNew());
+<#else>
+	//TODO ${attr.name}(...); //set Default ${attr.canonicalType}
+</#if>
+</#macro>
+
+<#function getPackage fqn>
+	<#assign lastIndexOfDot=fqn?last_index_of(".")+1 />
+	<#assign package = fqn?substring(0, lastIndexOfDot) />
+	<#if package = "">
+		<#-- Heuristic, which might cause faulty generation results in some not often occuring cases -->
+		<#assign package = pojo.package>
+	</#if>
+	<#return package>
+</#function>
diff --git a/cobigen-templates/templates-devon4j/src/main/templates/testdata_builder/templates.xml b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.0/templates/CobiGen_Templates/src/main/templates/templateSet1/templates.xml
similarity index 100%
rename from cobigen-templates/templates-devon4j/src/main/templates/testdata_builder/templates.xml
rename to cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.0/templates/CobiGen_Templates/src/main/templates/templateSet1/templates.xml
diff --git a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.0/templates/CobiGen_Templates/src/main/templates/templateSet2/ObjectBuilder.java.ftl b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.0/templates/CobiGen_Templates/src/main/templates/templateSet2/ObjectBuilder.java.ftl
new file mode 100644
index 0000000000..fc8f58c822
--- /dev/null
+++ b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.0/templates/CobiGen_Templates/src/main/templates/templateSet2/ObjectBuilder.java.ftl
@@ -0,0 +1,51 @@
+<#include '/makros.ftl'>
+package ${variables.rootPackage}.common.builders;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.function.Consumer;
+
+import ${pojo.package}.${pojo.name};
+
+/**
+ * Test data builder for ${pojo.name} generated with cobigen.
+ */
+public class ${pojo.name}Builder {
+
+    private List<Consumer<${pojo.name}>> parameterToBeApplied;
+
+  /**
+   * The constructor.
+   */
+    public ${pojo.name}Builder() {
+    this.parameterToBeApplied = new LinkedList<>();
+    fillMandatoryFields();
+    fillMandatoryFields_custom();
+  }
+
+    <#list pojo.methodAccessibleFields as field>
+    <#if field.name != "id" && field.name != "modificationCounter">
+  /**
+   * @param ${field.name} the ${field.name} to add.
+   * @return the builder for fluent population of fields.
+   */
+  public ${pojo.name}Builder ${field.name}(final ${field.type} ${field.name}) {
+        this.parameterToBeApplied.add(target -> target.set${field.name?cap_first}(${field.name}));
+
+        return this;
+    }
+    </#if>
+    </#list>
+
+  /**
+   * @return the populated ${pojo.name}.
+   */
+    public ${pojo.name} createNew() {
+        ${pojo.name} ${pojo.name?lower_case} = new ${pojo.name}();
+        for (Consumer<${pojo.name}> parameter : parameterToBeApplied) {
+            parameter.accept(${pojo.name?lower_case});
+        }
+        return ${pojo.name?lower_case};
+    }
+
+}
\ No newline at end of file
diff --git a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.0/templates/CobiGen_Templates/src/main/templates/templateSet2/ObjectBuilder_customFunctions.java.ftl b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.0/templates/CobiGen_Templates/src/main/templates/templateSet2/ObjectBuilder_customFunctions.java.ftl
new file mode 100644
index 0000000000..e97598610d
--- /dev/null
+++ b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.0/templates/CobiGen_Templates/src/main/templates/templateSet2/ObjectBuilder_customFunctions.java.ftl
@@ -0,0 +1,22 @@
+<#include '/makros.ftl'>
+package ${variables.rootPackage}.common.builders;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.function.Consumer;
+
+import ${pojo.package}.${pojo.name};
+
+/**
+ * Test data builder for ${pojo.name} generated with cobigen.
+ */
+public class ${pojo.name}Builder {
+
+	/**
+	 * Might be enriched to users needs (will not be overwritten)
+	 */	
+    private void fillMandatoryFields_custom() {
+    
+    }
+
+}
\ No newline at end of file
diff --git a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.0/templates/CobiGen_Templates/src/main/templates/templateSet2/ObjectBuilder_fillMandatoryFields.java.ftl b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.0/templates/CobiGen_Templates/src/main/templates/templateSet2/ObjectBuilder_fillMandatoryFields.java.ftl
new file mode 100644
index 0000000000..2e82fa9cd0
--- /dev/null
+++ b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.0/templates/CobiGen_Templates/src/main/templates/templateSet2/ObjectBuilder_fillMandatoryFields.java.ftl
@@ -0,0 +1,22 @@
+<#include '/makros.ftl'>
+package ${variables.rootPackage}.common.builders;
+
+/**
+ * Test data builder for ${pojo.name} generated with cobigen.
+ */
+public class ${pojo.name}Builder {
+
+	/**
+	 * Fills all mandatory fields by default. (will be overwritten on re-generation)
+	 */
+    private void fillMandatoryFields() {
+	    <#list pojo.methodAccessibleFields as attr>		
+		<#if (attr.annotations.javax_validation_constraints_NotNull)?has_content
+		  || ((attr.annotations.javax_persistence_Column.nullable)?has_content
+		   && attr.annotations.javax_persistence_Column.nullable == "false")>
+		<@callNotNullPropertyWithDefaultValue attr=attr/>	
+		</#if>
+	    </#list>
+    }
+    
+}
diff --git a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.0/templates/CobiGen_Templates/src/main/templates/templateSet2/ObjectBuilder_persistable.java.ftl b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.0/templates/CobiGen_Templates/src/main/templates/templateSet2/ObjectBuilder_persistable.java.ftl
new file mode 100644
index 0000000000..9c0e2c4f42
--- /dev/null
+++ b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.0/templates/CobiGen_Templates/src/main/templates/templateSet2/ObjectBuilder_persistable.java.ftl
@@ -0,0 +1,45 @@
+<#include '/makros.ftl'>
+package ${variables.rootPackage}.common.builders;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.function.Consumer;
+
+import javax.persistence.EntityManager;
+
+import ${pojo.package}.${pojo.name};
+
+/**
+ * Test data builder for ${pojo.name} generated with cobigen.
+ */
+public class ${pojo.name}Builder {
+
+  /**
+   * @param em the {@link EntityManager}
+   * @return the ${pojo.name}
+   */
+   public ${pojo.name} persist(EntityManager em) {
+        ${pojo.name} ${pojo.name?lower_case} = createNew();
+        em.persist(${pojo.name?lower_case});
+        return ${pojo.name?lower_case};
+    }
+    
+  /**
+   * @param em the {@link EntityManager}
+   * @param quantity the quantity
+   * @return a list of ${pojo.name}
+   */
+    public List<${pojo.name}> persistAndDuplicate(EntityManager em, int quantity) {
+
+        List<${pojo.name}> ${pojo.name?lower_case}List = new LinkedList<>();
+        for (int i = 0; i < quantity; i++) {
+            ${pojo.name} ${pojo.name?lower_case} = createNew();
+            // TODO alter at least values with unique key constraints to prevent from exceptions while persisting
+            em.persist(${pojo.name?lower_case});
+            ${pojo.name?lower_case}List.add(${pojo.name?lower_case});
+        }
+
+        return ${pojo.name?lower_case}List;
+    }
+
+}
\ No newline at end of file
diff --git a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.0/templates/CobiGen_Templates/src/main/templates/templateSet2/makros.ftl b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.0/templates/CobiGen_Templates/src/main/templates/templateSet2/makros.ftl
new file mode 100644
index 0000000000..1d40c4d681
--- /dev/null
+++ b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.0/templates/CobiGen_Templates/src/main/templates/templateSet2/makros.ftl
@@ -0,0 +1,53 @@
+<#macro callNotNullPropertyWithDefaultValue attr>
+<#if attr.canonicalType = "byte" || attr.canonicalType = "java.lang.Byte" >
+	${attr.name}((byte)1);
+<#elseif attr.canonicalType  = "short" || attr.canonicalType = "java.lang.Short" >
+	${attr.name}((short)1);
+<#elseif attr.canonicalType  = "int" || attr.canonicalType = "java.lang.Integer" >
+	${attr.name}(1);
+<#elseif attr.canonicalType  = "long" || attr.canonicalType = "java.lang.Long" >
+	${attr.name}(1L);
+<#elseif attr.canonicalType  = "float" || attr.canonicalType = "java.lang.Float" >
+	${attr.name}(1f);
+<#elseif attr.canonicalType  = "double" || attr.canonicalType = "java.lang.Double" >
+	${attr.name}(1d);
+<#elseif attr.canonicalType  = "char" || attr.canonicalType = "java.lang.Character" >
+	${attr.name}('c');
+<#elseif attr.canonicalType  = "boolean" || attr.canonicalType = "java.lang.Boolean" >
+	${attr.name}(true);
+<#elseif attr.canonicalType   = "java.lang.String">
+	${attr.name}("DefaultString");
+<#elseif attr.canonicalType   = "java.lang.Number">
+	${attr.name}(1);
+<#elseif attr.canonicalType   = "java.util.Currency">
+  ${attr.name}(Currency.getInstance("USD"));
+<#elseif attr.canonicalType   = "java.math.BigDecimal">
+  ${attr.name}(BigDecimal.valueOf(1.0));
+<#elseif attr.canonicalType   = "java.time.LocalTime">
+  ${attr.name}(LocalTime.now());
+<#elseif attr.canonicalType   = "java.time.LocalDate">
+  ${attr.name}(LocalDate.now());
+<#elseif attr.canonicalType   = "java.time.LocalDateTime">
+  ${attr.name}(LocalDateTime.now());
+<#elseif attr.canonicalType   = "java.time.ZonedDateTime">
+  ${attr.name}(ZonedDateTime.now());
+<#elseif JavaUtil.isEnum(attr.canonicalType)>
+  ${attr.name}(${attr.type}.${JavaUtil.getFirstEnumValue(attr.canonicalType)});
+<#elseif attr.canonicalType?ends_with("[]")>
+  ${attr.name}(new ${attr.type?keep_before_last("[]")}[0]);
+<#elseif getPackage(attr.canonicalType) = pojo.package>
+	${attr.name}(new ${attr.name?cap_first}Builder().createNew());
+<#else>
+	//TODO ${attr.name}(...); //set Default ${attr.canonicalType}
+</#if>
+</#macro>
+
+<#function getPackage fqn>
+	<#assign lastIndexOfDot=fqn?last_index_of(".")+1 />
+	<#assign package = fqn?substring(0, lastIndexOfDot) />
+	<#if package = "">
+		<#-- Heuristic, which might cause faulty generation results in some not often occuring cases -->
+		<#assign package = pojo.package>
+	</#if>
+	<#return package>
+</#function>
diff --git a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.0/templates/CobiGen_Templates/src/main/templates/templateSet2/templates.xml b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.0/templates/CobiGen_Templates/src/main/templates/templateSet2/templates.xml
new file mode 100644
index 0000000000..58faf11db1
--- /dev/null
+++ b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.0/templates/CobiGen_Templates/src/main/templates/templateSet2/templates.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<templatesConfiguration xmlns="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration" version="2.1">
+    <templates>
+        <template name="entityBuilder" destinationPath="src/test/java/${variables.rootPackage}/common/api/builders/${variables.pojoName}Builder.java" templateFile="ObjectBuilder.java.ftl" mergeStrategy="javamerge"/>
+        <template name="entityBuilder_customFunctions" destinationPath="src/test/java/${variables.rootPackage}/common/api/builders/${variables.pojoName}Builder.java" templateFile="ObjectBuilder_customFunctions.java.ftl" mergeStrategy="javamerge"/>
+        <template name="entityBuilder_fillMandatoryFields" destinationPath="src/test/java/${variables.rootPackage}/common/api/builders/${variables.pojoName}Builder.java" templateFile="ObjectBuilder_fillMandatoryFields.java.ftl" mergeStrategy="javamerge_override"/>
+        <template name="entityBuilder_persistable" destinationPath="src/test/java/${variables.rootPackage}/common/api/builders/${variables.pojoName}Builder.java" templateFile="ObjectBuilder_persistable.java.ftl" mergeStrategy="javamerge"/>
+    </templates>
+    <increments>
+        <increment name="testdata_builder" description="Testdata builder">
+            <templateRef ref="entityBuilder"/>
+            <templateRef ref="entityBuilder_fillMandatoryFields"/>
+            <templateRef ref="entityBuilder_customFunctions"/>
+        </increment>
+        <increment name="testdata_builder_persistable" description="Testdata builder (persistable)">
+            <templateRef ref="entityBuilder"/>
+            <templateRef ref="entityBuilder_fillMandatoryFields"/>
+            <templateRef ref="entityBuilder_customFunctions"/>
+            <templateRef ref="entityBuilder_persistable"/>
+        </increment>
+    </increments>
+</templatesConfiguration>
diff --git a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.1/templates/CobiGen_Templates/pom.xml b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.1/templates/CobiGen_Templates/pom.xml
new file mode 100644
index 0000000000..4bc0a32864
--- /dev/null
+++ b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.1/templates/CobiGen_Templates/pom.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.devonfw.cobigen</groupId>
+  <artifactId>templates-devon4j</artifactId>
+  <version>2021.12.006</version>
+  <name>CobiGen - devon4j Templates</name>
+  <description>A Code-based incremental Generator</description>
+  <url>https://github.com/devonfw/cobigen/templates-parent/templates-devon4j</url>
+  <licenses>
+    <license>
+      <name>Apache Software License 2.0</name>
+      <url>https://raw.githubusercontent.com/devonfw/.github/master/LICENSE</url>
+      <distribution>repo</distribution>
+      <comments></comments>
+    </license>
+  </licenses>
+  <developers>
+    <developer>
+      <name>Malte Brunnlieb</name>
+      <organization>Capgemini</organization>
+    </developer>
+  </developers>
+  <scm>
+    <connection>scm:git:git@github.com:devonfw/cobigen.git/templates-parent/templates-devon4j</connection>
+    <developerConnection>scm:git:git@github.com:devonfw/cobigen.git/templates-parent/templates-devon4j</developerConnection>
+    <url>git@github.com:devonfw/cobigen.git/templates-parent/templates-devon4j</url>
+  </scm>
+  <dependencies>
+    <dependency>
+      <groupId>javax.ws.rs</groupId>
+      <artifactId>javax.ws.rs-api</artifactId>
+      <version>2.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.data</groupId>
+      <artifactId>spring-data-rest-webmvc</artifactId>
+      <version>3.7.10</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+      <version>3.12.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+      <version>2.10.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>xerces</groupId>
+      <artifactId>xercesImpl</artifactId>
+      <version>2.12.2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.persistence</groupId>
+      <artifactId>javax.persistence-api</artifactId>
+      <version>2.2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>1.7.30</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <version>1.7.30</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>log4j-over-slf4j</artifactId>
+      <version>1.7.30</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+  <repositories>
+    <repository>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+      <id>ossrh</id>
+      <name>OSSRH Snapshots</name>
+      <url>https://s01.oss.sonatype.org/content/repositories/snapshots/</url>
+    </repository>
+  </repositories>
+
+  <properties>
+   <maven.compiler.source>1.8</maven.compiler.source>
+   <maven.compiler.target>1.8</maven.compiler.target>
+  </properties>
+
+  <build>
+   <resources>
+     <resource>
+       <directory>src/main/templates</directory>
+       <targetPath>src/main/templates</targetPath>
+     </resource>
+   </resources>
+  </build>
+</project>
\ No newline at end of file
diff --git a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.1/templates/CobiGen_Templates/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/JavaUtil.java b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.1/templates/CobiGen_Templates/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/JavaUtil.java
new file mode 100644
index 0000000000..ced2f5fde2
--- /dev/null
+++ b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.1/templates/CobiGen_Templates/src/main/java/com/devonfw/cobigen/templates/devon4j/utils/JavaUtil.java
@@ -0,0 +1,464 @@
+package com.devonfw.cobigen.templates.devon4j.utils;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.Collection;
+import java.util.Map;
+
+import org.apache.commons.lang3.ClassUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Provides type operations, mainly checks and casts for Java Primitives, to be used in the templates
+ *
+ */
+public class JavaUtil {
+
+  /**
+   * Logger for this class
+   */
+  private static final Logger LOG = LoggerFactory.getLogger(JavaUtil.class);
+
+  /**
+   * The constructor.
+   */
+  public JavaUtil() {
+
+    // Empty for CobiGen to automatically instantiate it
+  }
+
+  /**
+   * Returns the Object version of a Java primitive or the input if the input isn't a java primitive
+   * 
+   * @param simpleType String
+   * @return the corresponding object wrapper type simple name of the input if the input is the name of a primitive java
+   *         type. The input itself if not. (e.g. "int" results in "Integer")
+   * @throws ClassNotFoundException should not occur.
+   */
+  public String boxJavaPrimitives(String simpleType) throws ClassNotFoundException {
+
+    if (equalsJavaPrimitive(simpleType)) {
+      return ClassUtils.primitiveToWrapper(ClassUtils.getClass(simpleType)).getSimpleName();
+    } else {
+      return simpleType;
+    }
+
+  }
+
+  /**
+   * Returns the simple name of the type of a field in the pojoClass. If the type is a java primitive the name of the
+   * wrapper class is returned
+   *
+   * @param pojoClass {@link Class} the class object of the pojo
+   * @param fieldName {@link String} the name of the field
+   * @return String. The simple name of the field's type. The simple name of the wrapper class in case of java
+   *         primitives
+   * @throws NoSuchFieldException indicating something awefully wrong in the used model
+   * @throws SecurityException if the field cannot be accessed.
+   */
+  public String boxJavaPrimitives(Class<?> pojoClass, String fieldName) throws NoSuchFieldException, SecurityException {
+
+    if (pojoClass == null) {
+      throw new IllegalAccessError(
+          "Class object is null. Cannot generate template as it might obviously depend on reflection.");
+    }
+
+    if (equalsJavaPrimitive(pojoClass, fieldName)) {
+      return ClassUtils.primitiveToWrapper(pojoClass.getDeclaredField(fieldName).getType()).getSimpleName();
+    } else {
+      Field field = pojoClass.getDeclaredField(fieldName);
+      if (field == null) {
+        field = pojoClass.getField(fieldName);
+      }
+      if (field == null) {
+        throw new IllegalAccessError("Could not find field " + fieldName + " in class " + pojoClass);
+      } else {
+        return field.getType().getSimpleName();
+      }
+    }
+  }
+
+  /**
+   * Checks if the given type is a Java primitive
+   *
+   * @param simpleType the type to be checked
+   * @return true iff simpleType is a Java primitive
+   */
+  public boolean equalsJavaPrimitive(String simpleType) {
+
+    try {
+      return ClassUtils.getClass(simpleType).isPrimitive();
+    } catch (ClassNotFoundException e) {
+      LOG.warn("{}: Could not find {}", e.getMessage(), simpleType);
+      return false;
+    }
+  }
+
+  /**
+   * Checks if the given type is a Java primitive or wrapper
+   *
+   * @param simpleType the type to be checked
+   * @return true iff simpleType is a Java primitive or wrapper
+   */
+  public boolean equalsJavaPrimitiveOrWrapper(String simpleType) {
+
+    try {
+      return ClassUtils.isPrimitiveOrWrapper(ClassUtils.getClass(simpleType));
+    } catch (ClassNotFoundException e) {
+      LOG.warn("{}: Could not find {}", e.getMessage(), simpleType);
+      return false;
+    }
+  }
+
+  /**
+   * Checks if the type of the field in the pojo's class is a java primitive
+   *
+   * @param pojoClass the {@link Class} object of the pojo
+   * @param fieldName the name of the field to be checked
+   * @return true iff the field is a java primitive
+   * @throws NoSuchFieldException indicating something awefully wrong in the used model
+   * @throws SecurityException if the field cannot be accessed.
+   */
+  public boolean equalsJavaPrimitive(Class<?> pojoClass, String fieldName)
+      throws NoSuchFieldException, SecurityException {
+
+    if (pojoClass == null) {
+      return false;
+    }
+
+    Field field = pojoClass.getDeclaredField(fieldName);
+    if (field == null) {
+      field = pojoClass.getField(fieldName);
+    }
+    if (field == null) {
+      return false;
+    } else {
+      return field.getType().isPrimitive();
+    }
+  }
+
+  /**
+   * Checks if the given type is a Java primitive or a Java primitive array
+   *
+   * @param simpleType the Type name to be checked
+   * @return true iff {@link #equalsJavaPrimitive(String)} is true or if simpleType is an array with a primitive
+   *         component
+   */
+  public boolean equalsJavaPrimitiveIncludingArrays(String simpleType) {
+
+    Class<?> klasse;
+
+    try {
+      klasse = ClassUtils.getClass(simpleType).getComponentType();
+    } catch (ClassNotFoundException e) {
+      LOG.warn("{}: Could not find {}", e.getMessage(), simpleType);
+      return false;
+    }
+    return equalsJavaPrimitive(simpleType) || (klasse != null && klasse.isPrimitive());
+  }
+
+  /**
+   * Checks if the given field in the pojo class is a java primitive or an array of java primitives
+   *
+   * @param pojoClass the class object of the pojo
+   * @param fieldName the name of the field to be checked
+   * @return true iff {@link #equalsJavaPrimitive(Class, String)} is true or the field is an array of primitives
+   * @throws NoSuchFieldException indicating something awfully wrong in the used model
+   * @throws SecurityException if the field cannot be accessed.
+   */
+  public boolean equalsJavaPrimitiveIncludingArrays(Class<?> pojoClass, String fieldName)
+      throws NoSuchFieldException, SecurityException {
+
+    return equalsJavaPrimitive(pojoClass, fieldName) || (pojoClass.getDeclaredField(fieldName).getType().isArray()
+        && pojoClass.getDeclaredField(fieldName).getType().getComponentType().isPrimitive());
+  }
+
+  /**
+   * Returns a cast statement for a given (java primitive, variable name) pair or nothing if the type isn't a java
+   * primitive
+   *
+   * @param simpleType Java Type
+   * @param varName Variable name
+   * @return String either of the form '((Java Primitive Object Type)varName)' if simpleType is a primitive or the empty
+   *         String otherwise
+   * @throws ClassNotFoundException should not occur
+   */
+  public String castJavaPrimitives(String simpleType, String varName) throws ClassNotFoundException {
+
+    if (equalsJavaPrimitive(simpleType)) {
+      return String.format("((%1$s)%2$s)", boxJavaPrimitives(simpleType), varName);
+    } else {
+      return "";
+    }
+  }
+
+  /**
+   * Returns a cast statement for a given (java primitive, variable name) pair or nothing if the type isn't a java
+   * primitive
+   *
+   * @param pojoClass the class object of the pojo
+   * @param fieldName the name of the field to be casted
+   * @return if fieldName points to a primitive field then a casted statement (e.g. for an int field:
+   *         '((Integer)field)') or an empty String otherwise
+   * @throws NoSuchFieldException indicating something awefully wrong in the used model
+   * @throws SecurityException if the field cannot be accessed.
+   */
+  public String castJavaPrimitives(Class<?> pojoClass, String fieldName)
+      throws NoSuchFieldException, SecurityException {
+
+    if (equalsJavaPrimitive(pojoClass, fieldName)) {
+      return String.format("((%1$s)%2$s)", boxJavaPrimitives(pojoClass, fieldName), fieldName);
+    } else {
+      return "";
+    }
+  }
+
+  /**
+   * @param pojoClass {@link Class} the class object of the pojo
+   * @param fieldName {@link String} the name of the field
+   * @return true if the field is an instance of java.utils.Collections
+   * @throws NoSuchFieldException indicating something awefully wrong in the used model
+   * @throws SecurityException if the field cannot be accessed.
+   */
+  public boolean isCollection(Class<?> pojoClass, String fieldName) throws NoSuchFieldException, SecurityException {
+
+    if (pojoClass == null) {
+      return false;
+    }
+
+    Field field = pojoClass.getDeclaredField(fieldName);
+    if (field == null) {
+      field = pojoClass.getField(fieldName);
+    }
+    if (field == null) {
+      return false;
+    } else {
+      return Collection.class.isAssignableFrom(field.getType());
+    }
+
+  }
+
+  /**
+   * Returns the Ext Type to a given java type
+   *
+   * @param simpleType any java type's simple name
+   * @return corresponding Ext type
+   */
+  public String getExtType(String simpleType) {
+
+    switch (simpleType) {
+      case "short":
+      case "Short":
+      case "int":
+      case "Integer":
+      case "long":
+      case "Long":
+        return "Integer";
+      case "float":
+      case "Float":
+      case "double":
+      case "Double":
+        return "Number";
+      case "boolean":
+      case "Boolean":
+        return "Boolean";
+      case "char":
+      case "Character":
+      case "String":
+        return "String";
+      case "Date":
+        return "Date";
+      default:
+        return "Field";
+    }
+  }
+
+  /**
+   * returns the Angular5 type associated with a Java primitive
+   *
+   * @param simpleType :{@link String} the type to be parsed
+   * @return the corresponding Angular type or 'any' otherwise
+   */
+  public String getAngularType(String simpleType) {
+
+    switch (simpleType) {
+      case "boolean":
+        return "boolean";
+      case "Boolean":
+        return "boolean";
+      case "short":
+        return "number";
+      case "Short":
+        return "number";
+      case "int":
+        return "number";
+      case "Integer":
+        return "number";
+      case "long":
+        return "number";
+      case "Long":
+        return "number";
+      case "float":
+        return "number";
+      case "Float":
+        return "number";
+      case "double":
+        return "number";
+      case "Double":
+        return "number";
+      case "char":
+        return "string";
+      case "Character":
+        return "string";
+      case "String":
+        return "string";
+      case "byte":
+        return "number";
+      default:
+        return "any";
+    }
+  }
+
+  /**
+   * returns the class name of the return type of a specific method.
+   *
+   * @param pojoClass {@link Class}&lt;?&gt; the class object of the pojo
+   * @param methodName {@link String} the name of the method
+   * @return the class name of the return type of the specified method
+   * @throws SecurityException If no method of the given name can be found
+   * @throws NoSuchMethodException If no method of the given name can be found
+   */
+  public String getReturnType(Class<?> pojoClass, String methodName) throws NoSuchMethodException, SecurityException {
+
+    if (pojoClass == null) {
+      throw new IllegalAccessError(
+          "Class object is null. Cannot generate template as it might obviously depend on reflection.");
+    }
+    String s = "-";
+    Method method = findMethod(pojoClass, methodName);
+    if (method != null && !method.getReturnType().equals(Void.TYPE)) {
+      s = method.getReturnType().toString();
+      s = s.substring(s.lastIndexOf('.') + 1, s.length());
+    }
+    return s;
+  }
+
+  /**
+   *
+   * This methods returns the return type of the method in the given pojoClass which are annotated with the parameter
+   * annotatedClass
+   *
+   * @param pojoClass - The class in which to find if it has methods with annotatedClass
+   * @param annotatedClassName - The annotation which needs to be found
+   * @return Return type of the method annotated with the given annotation, else "null"
+   * @throws ClassNotFoundException if the annotated class name could not be found in the class path
+   */
+  @SuppressWarnings("unchecked")
+  public String getReturnTypeOfMethodAnnotatedWith(Class<?> pojoClass, String annotatedClassName)
+      throws ClassNotFoundException {
+
+    if (pojoClass == null) {
+      throw new IllegalAccessError(
+          "Class object is null. Cannot generate template as it might obviously depend on reflection.");
+    }
+
+    Method[] methods = pojoClass.getDeclaredMethods();
+    for (Method method : methods) {
+      if (!method.getName().startsWith("get")) {
+        continue;
+      }
+      for (Annotation a : method.getAnnotations()) {
+        // better if (method.isAnnotationPresent(classObj)) {, but postponed as of different class
+        // loaders of a.getClass() and pojoClass.getClass()
+        if (a.getClass().getCanonicalName().equals(annotatedClassName)) {
+          return method.getReturnType().getSimpleName();
+        }
+      }
+    }
+    return "null";
+  }
+
+  /**
+   * returns the HTTP request type corresponding to an annotation type
+   *
+   * @param annotations The annotation to get the type name of
+   * @return the HTTP request type name of the selected annotation
+   */
+  public String getRequestType(Map<String, Object> annotations) {
+
+    if (annotations.containsKey("javax_ws_rs_GET")) {
+      return "GET";
+    } else if (annotations.containsKey("javax_ws_rs_PUT")) {
+      return "PUT";
+    } else if (annotations.containsKey("javax_ws_rs_POST")) {
+      return "POST";
+    } else if (annotations.containsKey("javax_ws_rs_DELETE")) {
+      return "DELETE";
+    } else if (annotations.containsKey("javax_ws_rs_PATCH")) {
+      return "PATCH";
+    } else {
+      return "-";
+    }
+  }
+
+  /**
+   * Helper method to find a class's specific method
+   *
+   * @param pojoClass {@link Class}&lt;?&gt; the class object of the pojo
+   * @param methodName The name of the method to be found
+   * @return The method object of the method to be found, null if it wasn't found
+   */
+  private Method findMethod(Class<?> pojoClass, String methodName) {
+
+    if (pojoClass == null) {
+      throw new IllegalAccessError(
+          "Class object is null. Cannot generate template as it might obviously depend on reflection.");
+    }
+    for (Method m : pojoClass.getMethods()) {
+      if (m.getName().equals(methodName)) {
+        return m;
+      }
+    }
+    return null;
+  }
+
+  /**
+   * Checks whether the class given by the full qualified name is an enum
+   *
+   * @param className full qualified class name
+   * @return <code>true</code> if the class is an enum, <code>false</code> otherwise
+   */
+  public boolean isEnum(String className) {
+
+    try {
+      return ClassUtils.getClass(className).isEnum();
+    } catch (ClassNotFoundException e) {
+      LOG.warn("{}: Could not find {}", e.getMessage(), className);
+      return false;
+    }
+  }
+
+  /**
+   * Returns the first enum value of an enum class
+   *
+   * @param className full qualified class name
+   * @return the first enum value name found in order
+   */
+  public String getFirstEnumValue(String className) {
+
+    try {
+      Class<?> enumClass = ClassUtils.getClass(className);
+      Field[] declaredFields = enumClass.getDeclaredFields();
+      if (declaredFields.length > 0) {
+        return declaredFields[0].getName();
+      } else {
+        return null;
+      }
+    } catch (ClassNotFoundException e) {
+      LOG.warn("{}: Could not find {}", e.getMessage(), className);
+      return null;
+    }
+  }
+}
diff --git a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.1/templates/CobiGen_Templates/src/main/templates/context.xml b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.1/templates/CobiGen_Templates/src/main/templates/context.xml
new file mode 100644
index 0000000000..d403b5c0da
--- /dev/null
+++ b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.1/templates/CobiGen_Templates/src/main/templates/context.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="2.1">
+  <trigger id="templateSet1" type="java" templateFolder="templateSet1" inputCharset="UTF-8">
+    <containerMatcher type="package" value="someValue"
+      retrieveObjectsRecursively="false"/>
+    <matcher type="fqn" value="*" accumulationType="NOT">
+      <variableAssignment type="constant" key="foo" value="BLUBB1"/>
+    </matcher>
+  </trigger>
+  <trigger id="templateSet2" type="someType" templateFolder="templateSet2" inputCharset="UTF-8">
+    <containerMatcher type="element" value="someValue" retrieveObjectsRecursively="true"/>
+    <matcher type="element" value="*" accumulationType="OR">
+      <variableAssignment type="constant" key="foo" value="BlABLA1"/>
+    </matcher>
+  </trigger>
+</contextConfiguration>
diff --git a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.1/templates/CobiGen_Templates/src/main/templates/templateSet1/ObjectBuilder.java.ftl b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.1/templates/CobiGen_Templates/src/main/templates/templateSet1/ObjectBuilder.java.ftl
new file mode 100644
index 0000000000..fc8f58c822
--- /dev/null
+++ b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.1/templates/CobiGen_Templates/src/main/templates/templateSet1/ObjectBuilder.java.ftl
@@ -0,0 +1,51 @@
+<#include '/makros.ftl'>
+package ${variables.rootPackage}.common.builders;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.function.Consumer;
+
+import ${pojo.package}.${pojo.name};
+
+/**
+ * Test data builder for ${pojo.name} generated with cobigen.
+ */
+public class ${pojo.name}Builder {
+
+    private List<Consumer<${pojo.name}>> parameterToBeApplied;
+
+  /**
+   * The constructor.
+   */
+    public ${pojo.name}Builder() {
+    this.parameterToBeApplied = new LinkedList<>();
+    fillMandatoryFields();
+    fillMandatoryFields_custom();
+  }
+
+    <#list pojo.methodAccessibleFields as field>
+    <#if field.name != "id" && field.name != "modificationCounter">
+  /**
+   * @param ${field.name} the ${field.name} to add.
+   * @return the builder for fluent population of fields.
+   */
+  public ${pojo.name}Builder ${field.name}(final ${field.type} ${field.name}) {
+        this.parameterToBeApplied.add(target -> target.set${field.name?cap_first}(${field.name}));
+
+        return this;
+    }
+    </#if>
+    </#list>
+
+  /**
+   * @return the populated ${pojo.name}.
+   */
+    public ${pojo.name} createNew() {
+        ${pojo.name} ${pojo.name?lower_case} = new ${pojo.name}();
+        for (Consumer<${pojo.name}> parameter : parameterToBeApplied) {
+            parameter.accept(${pojo.name?lower_case});
+        }
+        return ${pojo.name?lower_case};
+    }
+
+}
\ No newline at end of file
diff --git a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.1/templates/CobiGen_Templates/src/main/templates/templateSet1/ObjectBuilder_customFunctions.java.ftl b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.1/templates/CobiGen_Templates/src/main/templates/templateSet1/ObjectBuilder_customFunctions.java.ftl
new file mode 100644
index 0000000000..e97598610d
--- /dev/null
+++ b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.1/templates/CobiGen_Templates/src/main/templates/templateSet1/ObjectBuilder_customFunctions.java.ftl
@@ -0,0 +1,22 @@
+<#include '/makros.ftl'>
+package ${variables.rootPackage}.common.builders;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.function.Consumer;
+
+import ${pojo.package}.${pojo.name};
+
+/**
+ * Test data builder for ${pojo.name} generated with cobigen.
+ */
+public class ${pojo.name}Builder {
+
+	/**
+	 * Might be enriched to users needs (will not be overwritten)
+	 */	
+    private void fillMandatoryFields_custom() {
+    
+    }
+
+}
\ No newline at end of file
diff --git a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.1/templates/CobiGen_Templates/src/main/templates/templateSet1/ObjectBuilder_fillMandatoryFields.java.ftl b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.1/templates/CobiGen_Templates/src/main/templates/templateSet1/ObjectBuilder_fillMandatoryFields.java.ftl
new file mode 100644
index 0000000000..2e82fa9cd0
--- /dev/null
+++ b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.1/templates/CobiGen_Templates/src/main/templates/templateSet1/ObjectBuilder_fillMandatoryFields.java.ftl
@@ -0,0 +1,22 @@
+<#include '/makros.ftl'>
+package ${variables.rootPackage}.common.builders;
+
+/**
+ * Test data builder for ${pojo.name} generated with cobigen.
+ */
+public class ${pojo.name}Builder {
+
+	/**
+	 * Fills all mandatory fields by default. (will be overwritten on re-generation)
+	 */
+    private void fillMandatoryFields() {
+	    <#list pojo.methodAccessibleFields as attr>		
+		<#if (attr.annotations.javax_validation_constraints_NotNull)?has_content
+		  || ((attr.annotations.javax_persistence_Column.nullable)?has_content
+		   && attr.annotations.javax_persistence_Column.nullable == "false")>
+		<@callNotNullPropertyWithDefaultValue attr=attr/>	
+		</#if>
+	    </#list>
+    }
+    
+}
diff --git a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.1/templates/CobiGen_Templates/src/main/templates/templateSet1/ObjectBuilder_persistable.java.ftl b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.1/templates/CobiGen_Templates/src/main/templates/templateSet1/ObjectBuilder_persistable.java.ftl
new file mode 100644
index 0000000000..9c0e2c4f42
--- /dev/null
+++ b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.1/templates/CobiGen_Templates/src/main/templates/templateSet1/ObjectBuilder_persistable.java.ftl
@@ -0,0 +1,45 @@
+<#include '/makros.ftl'>
+package ${variables.rootPackage}.common.builders;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.function.Consumer;
+
+import javax.persistence.EntityManager;
+
+import ${pojo.package}.${pojo.name};
+
+/**
+ * Test data builder for ${pojo.name} generated with cobigen.
+ */
+public class ${pojo.name}Builder {
+
+  /**
+   * @param em the {@link EntityManager}
+   * @return the ${pojo.name}
+   */
+   public ${pojo.name} persist(EntityManager em) {
+        ${pojo.name} ${pojo.name?lower_case} = createNew();
+        em.persist(${pojo.name?lower_case});
+        return ${pojo.name?lower_case};
+    }
+    
+  /**
+   * @param em the {@link EntityManager}
+   * @param quantity the quantity
+   * @return a list of ${pojo.name}
+   */
+    public List<${pojo.name}> persistAndDuplicate(EntityManager em, int quantity) {
+
+        List<${pojo.name}> ${pojo.name?lower_case}List = new LinkedList<>();
+        for (int i = 0; i < quantity; i++) {
+            ${pojo.name} ${pojo.name?lower_case} = createNew();
+            // TODO alter at least values with unique key constraints to prevent from exceptions while persisting
+            em.persist(${pojo.name?lower_case});
+            ${pojo.name?lower_case}List.add(${pojo.name?lower_case});
+        }
+
+        return ${pojo.name?lower_case}List;
+    }
+
+}
\ No newline at end of file
diff --git a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.1/templates/CobiGen_Templates/src/main/templates/templateSet1/makros.ftl b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.1/templates/CobiGen_Templates/src/main/templates/templateSet1/makros.ftl
new file mode 100644
index 0000000000..1d40c4d681
--- /dev/null
+++ b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.1/templates/CobiGen_Templates/src/main/templates/templateSet1/makros.ftl
@@ -0,0 +1,53 @@
+<#macro callNotNullPropertyWithDefaultValue attr>
+<#if attr.canonicalType = "byte" || attr.canonicalType = "java.lang.Byte" >
+	${attr.name}((byte)1);
+<#elseif attr.canonicalType  = "short" || attr.canonicalType = "java.lang.Short" >
+	${attr.name}((short)1);
+<#elseif attr.canonicalType  = "int" || attr.canonicalType = "java.lang.Integer" >
+	${attr.name}(1);
+<#elseif attr.canonicalType  = "long" || attr.canonicalType = "java.lang.Long" >
+	${attr.name}(1L);
+<#elseif attr.canonicalType  = "float" || attr.canonicalType = "java.lang.Float" >
+	${attr.name}(1f);
+<#elseif attr.canonicalType  = "double" || attr.canonicalType = "java.lang.Double" >
+	${attr.name}(1d);
+<#elseif attr.canonicalType  = "char" || attr.canonicalType = "java.lang.Character" >
+	${attr.name}('c');
+<#elseif attr.canonicalType  = "boolean" || attr.canonicalType = "java.lang.Boolean" >
+	${attr.name}(true);
+<#elseif attr.canonicalType   = "java.lang.String">
+	${attr.name}("DefaultString");
+<#elseif attr.canonicalType   = "java.lang.Number">
+	${attr.name}(1);
+<#elseif attr.canonicalType   = "java.util.Currency">
+  ${attr.name}(Currency.getInstance("USD"));
+<#elseif attr.canonicalType   = "java.math.BigDecimal">
+  ${attr.name}(BigDecimal.valueOf(1.0));
+<#elseif attr.canonicalType   = "java.time.LocalTime">
+  ${attr.name}(LocalTime.now());
+<#elseif attr.canonicalType   = "java.time.LocalDate">
+  ${attr.name}(LocalDate.now());
+<#elseif attr.canonicalType   = "java.time.LocalDateTime">
+  ${attr.name}(LocalDateTime.now());
+<#elseif attr.canonicalType   = "java.time.ZonedDateTime">
+  ${attr.name}(ZonedDateTime.now());
+<#elseif JavaUtil.isEnum(attr.canonicalType)>
+  ${attr.name}(${attr.type}.${JavaUtil.getFirstEnumValue(attr.canonicalType)});
+<#elseif attr.canonicalType?ends_with("[]")>
+  ${attr.name}(new ${attr.type?keep_before_last("[]")}[0]);
+<#elseif getPackage(attr.canonicalType) = pojo.package>
+	${attr.name}(new ${attr.name?cap_first}Builder().createNew());
+<#else>
+	//TODO ${attr.name}(...); //set Default ${attr.canonicalType}
+</#if>
+</#macro>
+
+<#function getPackage fqn>
+	<#assign lastIndexOfDot=fqn?last_index_of(".")+1 />
+	<#assign package = fqn?substring(0, lastIndexOfDot) />
+	<#if package = "">
+		<#-- Heuristic, which might cause faulty generation results in some not often occuring cases -->
+		<#assign package = pojo.package>
+	</#if>
+	<#return package>
+</#function>
diff --git a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.1/templates/CobiGen_Templates/src/main/templates/templateSet1/templates.xml b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.1/templates/CobiGen_Templates/src/main/templates/templateSet1/templates.xml
new file mode 100644
index 0000000000..58faf11db1
--- /dev/null
+++ b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.1/templates/CobiGen_Templates/src/main/templates/templateSet1/templates.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<templatesConfiguration xmlns="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration" version="2.1">
+    <templates>
+        <template name="entityBuilder" destinationPath="src/test/java/${variables.rootPackage}/common/api/builders/${variables.pojoName}Builder.java" templateFile="ObjectBuilder.java.ftl" mergeStrategy="javamerge"/>
+        <template name="entityBuilder_customFunctions" destinationPath="src/test/java/${variables.rootPackage}/common/api/builders/${variables.pojoName}Builder.java" templateFile="ObjectBuilder_customFunctions.java.ftl" mergeStrategy="javamerge"/>
+        <template name="entityBuilder_fillMandatoryFields" destinationPath="src/test/java/${variables.rootPackage}/common/api/builders/${variables.pojoName}Builder.java" templateFile="ObjectBuilder_fillMandatoryFields.java.ftl" mergeStrategy="javamerge_override"/>
+        <template name="entityBuilder_persistable" destinationPath="src/test/java/${variables.rootPackage}/common/api/builders/${variables.pojoName}Builder.java" templateFile="ObjectBuilder_persistable.java.ftl" mergeStrategy="javamerge"/>
+    </templates>
+    <increments>
+        <increment name="testdata_builder" description="Testdata builder">
+            <templateRef ref="entityBuilder"/>
+            <templateRef ref="entityBuilder_fillMandatoryFields"/>
+            <templateRef ref="entityBuilder_customFunctions"/>
+        </increment>
+        <increment name="testdata_builder_persistable" description="Testdata builder (persistable)">
+            <templateRef ref="entityBuilder"/>
+            <templateRef ref="entityBuilder_fillMandatoryFields"/>
+            <templateRef ref="entityBuilder_customFunctions"/>
+            <templateRef ref="entityBuilder_persistable"/>
+        </increment>
+    </increments>
+</templatesConfiguration>
diff --git a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.1/templates/CobiGen_Templates/src/main/templates/templateSet2/ObjectBuilder.java.ftl b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.1/templates/CobiGen_Templates/src/main/templates/templateSet2/ObjectBuilder.java.ftl
new file mode 100644
index 0000000000..fc8f58c822
--- /dev/null
+++ b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.1/templates/CobiGen_Templates/src/main/templates/templateSet2/ObjectBuilder.java.ftl
@@ -0,0 +1,51 @@
+<#include '/makros.ftl'>
+package ${variables.rootPackage}.common.builders;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.function.Consumer;
+
+import ${pojo.package}.${pojo.name};
+
+/**
+ * Test data builder for ${pojo.name} generated with cobigen.
+ */
+public class ${pojo.name}Builder {
+
+    private List<Consumer<${pojo.name}>> parameterToBeApplied;
+
+  /**
+   * The constructor.
+   */
+    public ${pojo.name}Builder() {
+    this.parameterToBeApplied = new LinkedList<>();
+    fillMandatoryFields();
+    fillMandatoryFields_custom();
+  }
+
+    <#list pojo.methodAccessibleFields as field>
+    <#if field.name != "id" && field.name != "modificationCounter">
+  /**
+   * @param ${field.name} the ${field.name} to add.
+   * @return the builder for fluent population of fields.
+   */
+  public ${pojo.name}Builder ${field.name}(final ${field.type} ${field.name}) {
+        this.parameterToBeApplied.add(target -> target.set${field.name?cap_first}(${field.name}));
+
+        return this;
+    }
+    </#if>
+    </#list>
+
+  /**
+   * @return the populated ${pojo.name}.
+   */
+    public ${pojo.name} createNew() {
+        ${pojo.name} ${pojo.name?lower_case} = new ${pojo.name}();
+        for (Consumer<${pojo.name}> parameter : parameterToBeApplied) {
+            parameter.accept(${pojo.name?lower_case});
+        }
+        return ${pojo.name?lower_case};
+    }
+
+}
\ No newline at end of file
diff --git a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.1/templates/CobiGen_Templates/src/main/templates/templateSet2/ObjectBuilder_customFunctions.java.ftl b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.1/templates/CobiGen_Templates/src/main/templates/templateSet2/ObjectBuilder_customFunctions.java.ftl
new file mode 100644
index 0000000000..e97598610d
--- /dev/null
+++ b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.1/templates/CobiGen_Templates/src/main/templates/templateSet2/ObjectBuilder_customFunctions.java.ftl
@@ -0,0 +1,22 @@
+<#include '/makros.ftl'>
+package ${variables.rootPackage}.common.builders;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.function.Consumer;
+
+import ${pojo.package}.${pojo.name};
+
+/**
+ * Test data builder for ${pojo.name} generated with cobigen.
+ */
+public class ${pojo.name}Builder {
+
+	/**
+	 * Might be enriched to users needs (will not be overwritten)
+	 */	
+    private void fillMandatoryFields_custom() {
+    
+    }
+
+}
\ No newline at end of file
diff --git a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.1/templates/CobiGen_Templates/src/main/templates/templateSet2/ObjectBuilder_fillMandatoryFields.java.ftl b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.1/templates/CobiGen_Templates/src/main/templates/templateSet2/ObjectBuilder_fillMandatoryFields.java.ftl
new file mode 100644
index 0000000000..2e82fa9cd0
--- /dev/null
+++ b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.1/templates/CobiGen_Templates/src/main/templates/templateSet2/ObjectBuilder_fillMandatoryFields.java.ftl
@@ -0,0 +1,22 @@
+<#include '/makros.ftl'>
+package ${variables.rootPackage}.common.builders;
+
+/**
+ * Test data builder for ${pojo.name} generated with cobigen.
+ */
+public class ${pojo.name}Builder {
+
+	/**
+	 * Fills all mandatory fields by default. (will be overwritten on re-generation)
+	 */
+    private void fillMandatoryFields() {
+	    <#list pojo.methodAccessibleFields as attr>		
+		<#if (attr.annotations.javax_validation_constraints_NotNull)?has_content
+		  || ((attr.annotations.javax_persistence_Column.nullable)?has_content
+		   && attr.annotations.javax_persistence_Column.nullable == "false")>
+		<@callNotNullPropertyWithDefaultValue attr=attr/>	
+		</#if>
+	    </#list>
+    }
+    
+}
diff --git a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.1/templates/CobiGen_Templates/src/main/templates/templateSet2/ObjectBuilder_persistable.java.ftl b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.1/templates/CobiGen_Templates/src/main/templates/templateSet2/ObjectBuilder_persistable.java.ftl
new file mode 100644
index 0000000000..9c0e2c4f42
--- /dev/null
+++ b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.1/templates/CobiGen_Templates/src/main/templates/templateSet2/ObjectBuilder_persistable.java.ftl
@@ -0,0 +1,45 @@
+<#include '/makros.ftl'>
+package ${variables.rootPackage}.common.builders;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.function.Consumer;
+
+import javax.persistence.EntityManager;
+
+import ${pojo.package}.${pojo.name};
+
+/**
+ * Test data builder for ${pojo.name} generated with cobigen.
+ */
+public class ${pojo.name}Builder {
+
+  /**
+   * @param em the {@link EntityManager}
+   * @return the ${pojo.name}
+   */
+   public ${pojo.name} persist(EntityManager em) {
+        ${pojo.name} ${pojo.name?lower_case} = createNew();
+        em.persist(${pojo.name?lower_case});
+        return ${pojo.name?lower_case};
+    }
+    
+  /**
+   * @param em the {@link EntityManager}
+   * @param quantity the quantity
+   * @return a list of ${pojo.name}
+   */
+    public List<${pojo.name}> persistAndDuplicate(EntityManager em, int quantity) {
+
+        List<${pojo.name}> ${pojo.name?lower_case}List = new LinkedList<>();
+        for (int i = 0; i < quantity; i++) {
+            ${pojo.name} ${pojo.name?lower_case} = createNew();
+            // TODO alter at least values with unique key constraints to prevent from exceptions while persisting
+            em.persist(${pojo.name?lower_case});
+            ${pojo.name?lower_case}List.add(${pojo.name?lower_case});
+        }
+
+        return ${pojo.name?lower_case}List;
+    }
+
+}
\ No newline at end of file
diff --git a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.1/templates/CobiGen_Templates/src/main/templates/templateSet2/makros.ftl b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.1/templates/CobiGen_Templates/src/main/templates/templateSet2/makros.ftl
new file mode 100644
index 0000000000..1d40c4d681
--- /dev/null
+++ b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.1/templates/CobiGen_Templates/src/main/templates/templateSet2/makros.ftl
@@ -0,0 +1,53 @@
+<#macro callNotNullPropertyWithDefaultValue attr>
+<#if attr.canonicalType = "byte" || attr.canonicalType = "java.lang.Byte" >
+	${attr.name}((byte)1);
+<#elseif attr.canonicalType  = "short" || attr.canonicalType = "java.lang.Short" >
+	${attr.name}((short)1);
+<#elseif attr.canonicalType  = "int" || attr.canonicalType = "java.lang.Integer" >
+	${attr.name}(1);
+<#elseif attr.canonicalType  = "long" || attr.canonicalType = "java.lang.Long" >
+	${attr.name}(1L);
+<#elseif attr.canonicalType  = "float" || attr.canonicalType = "java.lang.Float" >
+	${attr.name}(1f);
+<#elseif attr.canonicalType  = "double" || attr.canonicalType = "java.lang.Double" >
+	${attr.name}(1d);
+<#elseif attr.canonicalType  = "char" || attr.canonicalType = "java.lang.Character" >
+	${attr.name}('c');
+<#elseif attr.canonicalType  = "boolean" || attr.canonicalType = "java.lang.Boolean" >
+	${attr.name}(true);
+<#elseif attr.canonicalType   = "java.lang.String">
+	${attr.name}("DefaultString");
+<#elseif attr.canonicalType   = "java.lang.Number">
+	${attr.name}(1);
+<#elseif attr.canonicalType   = "java.util.Currency">
+  ${attr.name}(Currency.getInstance("USD"));
+<#elseif attr.canonicalType   = "java.math.BigDecimal">
+  ${attr.name}(BigDecimal.valueOf(1.0));
+<#elseif attr.canonicalType   = "java.time.LocalTime">
+  ${attr.name}(LocalTime.now());
+<#elseif attr.canonicalType   = "java.time.LocalDate">
+  ${attr.name}(LocalDate.now());
+<#elseif attr.canonicalType   = "java.time.LocalDateTime">
+  ${attr.name}(LocalDateTime.now());
+<#elseif attr.canonicalType   = "java.time.ZonedDateTime">
+  ${attr.name}(ZonedDateTime.now());
+<#elseif JavaUtil.isEnum(attr.canonicalType)>
+  ${attr.name}(${attr.type}.${JavaUtil.getFirstEnumValue(attr.canonicalType)});
+<#elseif attr.canonicalType?ends_with("[]")>
+  ${attr.name}(new ${attr.type?keep_before_last("[]")}[0]);
+<#elseif getPackage(attr.canonicalType) = pojo.package>
+	${attr.name}(new ${attr.name?cap_first}Builder().createNew());
+<#else>
+	//TODO ${attr.name}(...); //set Default ${attr.canonicalType}
+</#if>
+</#macro>
+
+<#function getPackage fqn>
+	<#assign lastIndexOfDot=fqn?last_index_of(".")+1 />
+	<#assign package = fqn?substring(0, lastIndexOfDot) />
+	<#if package = "">
+		<#-- Heuristic, which might cause faulty generation results in some not often occuring cases -->
+		<#assign package = pojo.package>
+	</#if>
+	<#return package>
+</#function>
diff --git a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.1/templates/CobiGen_Templates/src/main/templates/templateSet2/templates.xml b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.1/templates/CobiGen_Templates/src/main/templates/templateSet2/templates.xml
new file mode 100644
index 0000000000..58faf11db1
--- /dev/null
+++ b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplateSetUpgraderTest/valid-2.1/templates/CobiGen_Templates/src/main/templates/templateSet2/templates.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<templatesConfiguration xmlns="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration" version="2.1">
+    <templates>
+        <template name="entityBuilder" destinationPath="src/test/java/${variables.rootPackage}/common/api/builders/${variables.pojoName}Builder.java" templateFile="ObjectBuilder.java.ftl" mergeStrategy="javamerge"/>
+        <template name="entityBuilder_customFunctions" destinationPath="src/test/java/${variables.rootPackage}/common/api/builders/${variables.pojoName}Builder.java" templateFile="ObjectBuilder_customFunctions.java.ftl" mergeStrategy="javamerge"/>
+        <template name="entityBuilder_fillMandatoryFields" destinationPath="src/test/java/${variables.rootPackage}/common/api/builders/${variables.pojoName}Builder.java" templateFile="ObjectBuilder_fillMandatoryFields.java.ftl" mergeStrategy="javamerge_override"/>
+        <template name="entityBuilder_persistable" destinationPath="src/test/java/${variables.rootPackage}/common/api/builders/${variables.pojoName}Builder.java" templateFile="ObjectBuilder_persistable.java.ftl" mergeStrategy="javamerge"/>
+    </templates>
+    <increments>
+        <increment name="testdata_builder" description="Testdata builder">
+            <templateRef ref="entityBuilder"/>
+            <templateRef ref="entityBuilder_fillMandatoryFields"/>
+            <templateRef ref="entityBuilder_customFunctions"/>
+        </increment>
+        <increment name="testdata_builder_persistable" description="Testdata builder (persistable)">
+            <templateRef ref="entityBuilder"/>
+            <templateRef ref="entityBuilder_fillMandatoryFields"/>
+            <templateRef ref="entityBuilder_customFunctions"/>
+            <templateRef ref="entityBuilder_persistable"/>
+        </increment>
+    </increments>
+</templatesConfiguration>
diff --git a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplatesConfigurationUpgraderTest/valid-v2.1/templates.xml b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplatesConfigurationUpgraderTest/valid-v2.1/templates.xml
index a1f45fafa4..486d93bbb8 100644
--- a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplatesConfigurationUpgraderTest/valid-v2.1/templates.xml
+++ b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplatesConfigurationUpgraderTest/valid-v2.1/templates.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <templatesConfiguration xmlns="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.1">
-	<templates>
-		<template name="resources_resources_spring_common" destinationPath="src/main/resources/resources/spring/common.xml"	templateFile="resources/resources/spring/common.xml.ftl" targetCharset="UTF-8"/>
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.1">
+  <templates>
+    <template name="resources_resources_spring_common" destinationPath="src/main/resources/resources/spring/common.xml" templateFile="resources/resources/spring/common.xml.ftl" targetCharset="UTF-8"/>
     <template name="prefix_Foo2Class.java" templateFile="foo/Foo2Class.java.ftl" destinationPath="src/main/java/foo/Foo2Class${variable}.java" mergeStrategy="javamerge" targetCharset="UTF-8"/>
 
     <templateExtension ref="prefix2_FooClass.java" destinationPath="adapted/path/FooClass.java" mergeStrategy="javamerge" targetCharset="ISO-8859-1"/>
     <templateExtension ref="prefix2_Foo2Class.java" />
-	</templates>
+  </templates>
 
   <templateScans>
     <templateScan templatePath="foo" templateNamePrefix="prefix_" destinationPath="src/main/java/foo" targetCharset="UTF-8"/>
     <templateScan templatePath="bar" templateNamePrefix="prefix2_" destinationPath="src/main/java/bar" targetCharset="UTF-8"/>
   </templateScans>
 
-	<increments>
-		<increment name="gui_spring" description="Spring configuration">
-			<templateRef ref="resources_resources_spring_common" />
-		</increment>
-		<increment name="gui" description="GUI">
-			<incrementRef ref="gui_spring" />
-		</increment>
-	</increments>
+  <increments>
+    <increment name="gui_spring" description="Spring configuration">
+      <templateRef ref="resources_resources_spring_common" />
+    </increment>
+    <increment name="gui" description="GUI">
+      <incrementRef ref="gui_spring" />
+    </increment>
+  </increments>
 </templatesConfiguration>
diff --git a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplatesConfigurationUpgraderTest/valid-v4.0/templates.xml b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplatesConfigurationUpgraderTest/valid-v4.0/templates.xml
new file mode 100644
index 0000000000..c517a19c76
--- /dev/null
+++ b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplatesConfigurationUpgraderTest/valid-v4.0/templates.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<templatesConfiguration xmlns="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="4.0" templateEngine="FreeMarker">
+  <templates>
+    <template name="resources_resources_spring_common" destinationPath="src/main/resources/resources/spring/common.xml"	templateFile="resources/resources/spring/common.xml.ftl" targetCharset="UTF-8"/>
+    <template name="prefix_Foo2Class.java" templateFile="foo/Foo2Class.java.ftl" destinationPath="src/main/java/foo/Foo2Class${variable}.java" mergeStrategy="javamerge" targetCharset="UTF-8"/>
+
+    <templateExtension ref="prefix2_FooClass.java" destinationPath="adapted/path/FooClass.java" mergeStrategy="javamerge" targetCharset="ISO-8859-1"/>
+    <templateExtension ref="prefix2_Foo2Class.java" />
+  </templates>
+
+  <templateScans>
+    <templateScan templatePath="foo" templateNamePrefix="prefix_" destinationPath="src/main/java/foo" targetCharset="UTF-8"/>
+    <templateScan templatePath="bar" templateNamePrefix="prefix2_" destinationPath="src/main/java/bar" targetCharset="UTF-8"/>
+  </templateScans>
+
+  <increments>
+    <increment name="gui_spring" description="Spring configuration">
+      <templateRef ref="resources_resources_spring_common" />
+    </increment>
+    <increment name="gui" description="GUI">
+      <incrementRef ref="gui_spring" />
+    </increment>
+  </increments>
+</templatesConfiguration>
diff --git a/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplatesConfigurationUpgraderTest/valid-v5.0/templates.xml b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplatesConfigurationUpgraderTest/valid-v5.0/templates.xml
new file mode 100644
index 0000000000..a57d97645c
--- /dev/null
+++ b/cobigen/cobigen-core/src/test/resources/testdata/unittest/config/upgrade/TemplatesConfigurationUpgraderTest/valid-v5.0/templates.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<templatesConfiguration xmlns="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0" templateEngine="FreeMarker">
+  <templates>
+    <template name="resources_resources_spring_common" destinationPath="src/main/resources/resources/spring/common.xml"  templateFile="resources/resources/spring/common.xml.ftl" targetCharset="UTF-8"/>
+    <template name="prefix_Foo2Class.java" templateFile="foo/Foo2Class.java.ftl" destinationPath="src/main/java/foo/Foo2Class${variable}.java" mergeStrategy="javamerge" targetCharset="UTF-8"/>
+
+    <templateExtension ref="prefix2_FooClass.java" destinationPath="adapted/path/FooClass.java" mergeStrategy="javamerge" targetCharset="ISO-8859-1"/>
+    <templateExtension ref="prefix2_Foo2Class.java" />
+  </templates>
+
+  <templateScans>
+    <templateScan templatePath="foo" templateNamePrefix="prefix_" destinationPath="src/main/java/foo" targetCharset="UTF-8"/>
+    <templateScan templatePath="bar" templateNamePrefix="prefix2_" destinationPath="src/main/java/bar" targetCharset="UTF-8"/>
+  </templateScans>
+
+  <increments>
+    <increment name="gui_spring" description="Spring configuration">
+      <templateRef ref="resources_resources_spring_common" />
+    </increment>
+    <increment name="gui" description="GUI">
+      <incrementRef ref="gui_spring" />
+    </increment>
+  </increments>
+</templatesConfiguration>
diff --git a/cobigen/core-artifact-retriever/pom.xml b/cobigen/core-artifact-retriever/pom.xml
new file mode 100644
index 0000000000..e25d97998f
--- /dev/null
+++ b/cobigen/core-artifact-retriever/pom.xml
@@ -0,0 +1,81 @@
+<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>com.devonfw.cobigen</groupId>
+    <artifactId>core-parent</artifactId>
+    <version>${revision}</version>
+  </parent>
+
+  <artifactId>core-artifact-retriever</artifactId>
+  <name>CobiGen Core - Artifact Retriever</name>
+  <packaging>jar</packaging>
+
+  <properties>
+    <skip.deployment>false</skip.deployment>
+  </properties>
+
+    <dependencies>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+    </dependency>
+
+    <!-- Helper libraries, especially for java reflection -->
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+    </dependency>
+
+    <!-- Proper process reader -->
+    <dependency>
+      <groupId>org.zeroturnaround</groupId>
+      <artifactId>zt-exec</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>com.devonfw.cobigen</groupId>
+      <artifactId>core-test</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <!-- enables JSON creation for REST search response API -->
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+    </dependency>
+
+    <!-- http client -->
+    <dependency>
+      <groupId>com.squareup.okhttp3</groupId>
+      <artifactId>okhttp</artifactId>
+    </dependency>
+
+    <!-- Needed for WireMock test support -->
+    <dependency>
+      <groupId>com.github.tomakehurst</groupId>
+      <artifactId>wiremock-jre8</artifactId>
+      <version>2.35.0</version>
+      <scope>test</scope>
+    </dependency>
+
+    <!-- JAXB RI -->
+    <dependency>
+      <groupId>com.sun.xml.bind</groupId>
+      <artifactId>jaxb-impl</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>com.devonfw.cobigen</groupId>
+      <artifactId>core-api</artifactId>
+    </dependency>
+
+  </dependencies>
+</project>
\ No newline at end of file
diff --git a/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/ArtifactRetriever.java b/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/ArtifactRetriever.java
new file mode 100644
index 0000000000..170d6ed1b7
--- /dev/null
+++ b/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/ArtifactRetriever.java
@@ -0,0 +1,171 @@
+package com.devonfw.cobigen.retriever;
+
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.devonfw.cobigen.api.util.MavenCoordinate;
+import com.devonfw.cobigen.api.util.MavenUtil;
+import com.devonfw.cobigen.retriever.mavensearch.MavenSearchArtifactRetriever;
+import com.devonfw.cobigen.retriever.mavensearch.constants.MavenSearchRepositoryConstants;
+import com.devonfw.cobigen.retriever.settings.MavenProxy;
+import com.devonfw.cobigen.retriever.settings.MavenSettings;
+import com.devonfw.cobigen.retriever.settings.to.model.MavenSettingsModel;
+import com.devonfw.cobigen.retriever.settings.to.model.MavenSettingsProxyModel;
+import com.devonfw.cobigen.retriever.settings.to.model.MavenSettingsRepositoryModel;
+import com.devonfw.cobigen.retriever.settings.to.model.MavenSettingsServerModel;
+
+/**
+ * Used to obtain maven artifact download URLs
+ */
+public class ArtifactRetriever {
+
+  private static final Logger LOG = LoggerFactory.getLogger(ArtifactRetriever.class);
+
+  /**
+   * Retrieves template set jar download URLs by given maven group IDs and mavenCoordinates
+   *
+   * @param groupIds List of groupIds to search for download URLs
+   * @param mavenCoordinates List of {@link MavenCoordinate}
+   * @return List of download URLs as Strings
+   */
+  public static List<String> retrieveTemplateSetJarDownloadURLs(List<String> groupIds,
+      List<MavenCoordinate> mavenCoordinates) {
+
+    String mavenSettings = MavenUtil.determineMavenSettings();
+    List<URL> downloadURLs = retrieveTemplateSetXmlDownloadLinks(groupIds, mavenSettings);
+
+    List<String> templateSetJars = new ArrayList<>();
+
+    for (MavenCoordinate mavenCoordinate : mavenCoordinates) {
+      for (URL downloadURL : downloadURLs) {
+        String jarURL = downloadURL.toString().replace("&e=xml", "&e=jar").replace("&c=template-set", "");
+        if (jarURL.contains(mavenCoordinate.getArtifactId()) && jarURL.contains(mavenCoordinate.getVersion())) {
+          templateSetJars.add(jarURL);
+        }
+        String sourcesURL = downloadURL.toString().replace("&e=xml", "&e=jar").replace("&c=template-set", "&c=sources");
+        if (sourcesURL.contains(mavenCoordinate.getArtifactId()) && sourcesURL.contains(mavenCoordinate.getVersion())) {
+          templateSetJars.add(sourcesURL);
+        }
+      }
+    }
+
+    return templateSetJars;
+
+  }
+
+  /**
+   * Retrieves a list of maven artifact download URLs
+   *
+   * @param groupIdsList groupIds for template-sets
+   * @param mavenSettings string of maven's settings.xml
+   * @return list of maven artifact download URLs
+   *
+   */
+  protected static List<URL> retrieveTemplateSetXmlDownloadLinks(List<String> groupIdsList, String mavenSettings) {
+
+    List<URL> downloadLinks = new ArrayList<>();
+
+    MavenSettingsModel model = MavenSettings.generateMavenSettingsModel(mavenSettings);
+
+    MavenSettingsProxyModel activeProxy = MavenSettings
+        .determineActiveProxy(MavenSettings.generateMavenSettingsModel(mavenSettings));
+
+    List<MavenSettingsRepositoryModel> allActiveRepositories = MavenSettings
+        .retrieveRepositoriesFromMavenSettings(mavenSettings);
+
+    List<MavenSettingsRepositoryModel> repositoriesWhichAreUsingTheProxy = MavenProxy
+        .obtainRepositories(allActiveRepositories, activeProxy, true);
+
+    List<MavenSettingsRepositoryModel> repositoriesWhichDoNotUseTheProxy = MavenProxy
+        .obtainRepositories(allActiveRepositories, activeProxy, false);
+
+    if (!repositoriesWhichAreUsingTheProxy.isEmpty()) {
+      downloadLinks
+          .addAll(retrieveArtifactsFromRepository(groupIdsList, model, activeProxy, repositoriesWhichAreUsingTheProxy));
+    }
+
+    if (!repositoriesWhichDoNotUseTheProxy.isEmpty()) {
+      downloadLinks
+          .addAll(retrieveArtifactsFromRepository(groupIdsList, model, activeProxy, repositoriesWhichDoNotUseTheProxy));
+    }
+
+    // Fallback if no repositories were found
+    if (allActiveRepositories.isEmpty()) {
+      LOG.debug("No repositories were found in settings.xml, using fallback.");
+      downloadLinks.addAll(
+          retrieveArtifactsFromRepository(groupIdsList, null, null, new ArrayList<MavenSettingsRepositoryModel>()));
+    }
+
+    return downloadLinks;
+
+  }
+
+  /**
+   * Helper method to retrieve maven artifact download URLs
+   *
+   * @param groupIdsList grouIds for template-sets
+   * @param model a class on which maven's settings.xml has been mapped to
+   * @param activeProxy the currently active proxy
+   * @param repositories local repositories from maven's settings.xml
+   */
+  private static List<URL> retrieveArtifactsFromRepository(List<String> groupIdsList, MavenSettingsModel model,
+      MavenSettingsProxyModel activeProxy, List<MavenSettingsRepositoryModel> repositories) {
+
+    List<URL> result = new ArrayList<>();
+
+    for (MavenSettingsRepositoryModel repositoryModel : repositories) {
+      if (model.getServers() == null) {
+        return result;
+      }
+      MavenSettingsServerModel serverModel = getServerModel(model.getServers().getServerList(), repositoryModel);
+      if (serverModel == null) {
+        continue;
+      }
+      for (String groupID : groupIdsList) {
+        if (activeProxy != null) {
+          result.addAll(MavenSearchArtifactRetriever.retrieveMavenArtifactDownloadUrls(repositoryModel.getUrl(),
+              serverModel.getUsername(), serverModel.getPassword(), activeProxy.getHost(),
+              Integer.valueOf(activeProxy.getPort()), null, null, groupID));
+        } else {
+          result.addAll(MavenSearchArtifactRetriever.retrieveMavenArtifactDownloadUrls(repositoryModel.getUrl(),
+              serverModel.getUsername(), serverModel.getPassword(), null, 0, null, null, groupID));
+        }
+
+      }
+    }
+    // Fallback if settings.xml was not usable (uses sonatype as default)
+    if (result.isEmpty()) {
+      LOG.warn(
+          "Maven settings did not get any results, searching for artifacts using default sonatype fallback repository.");
+      for (String groupID : groupIdsList) {
+        result.addAll(MavenSearchArtifactRetriever.retrieveMavenArtifactDownloadUrls(
+            MavenSearchRepositoryConstants.FALLBACK_REPOSITORY_URL, null, null, null, 0, null, null, groupID));
+      }
+      if (result.isEmpty())
+        LOG.warn("No artifacts were found on the default sonatype fallback repository.");
+    }
+    return result;
+  }
+
+  /**
+   * Helper method to determine the matching server for a repository
+   *
+   * @param servers from maven's settings.xml
+   * @param repository for which a server is searched for
+   * @return a server or null if none is found
+   */
+  private static MavenSettingsServerModel getServerModel(List<MavenSettingsServerModel> servers,
+      MavenSettingsRepositoryModel repository) {
+
+    for (MavenSettingsServerModel serverModel : servers) {
+      if (serverModel.getId().equals(repository.getId())) {
+        return serverModel;
+      }
+    }
+    return null;
+  }
+}
diff --git a/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/mavensearch/MavenSearchArtifactRetriever.java b/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/mavensearch/MavenSearchArtifactRetriever.java
new file mode 100644
index 0000000000..30660b0dbd
--- /dev/null
+++ b/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/mavensearch/MavenSearchArtifactRetriever.java
@@ -0,0 +1,41 @@
+package com.devonfw.cobigen.retriever.mavensearch;
+
+import java.net.URL;
+import java.util.List;
+
+import com.devonfw.cobigen.retriever.mavensearch.to.model.SearchResponseFactory;
+import com.devonfw.cobigen.retriever.mavensearch.to.model.ServerCredentials;
+
+/**
+ * Class for handling the Maven REST Search API and the communication with it.
+ */
+public class MavenSearchArtifactRetriever {
+
+  /**
+   * Retrieves a list of maven artifact download URLs from available REST search APIs based on the provided groupId and
+   * server credentials.
+   *
+   * Supports: Basic authentication (using username and password), Connection through a proxy server (using proxy URL
+   * and a port)
+   *
+   * @param baseUrl String of the repository server URL
+   * @param username to use for authentication
+   * @param password to use for authentication
+   * @param proxyAddress the address of the proxy server
+   * @param proxyPort the port of the proxy server
+   * @param proxyUsername the user name to use for the proxy server authentication
+   * @param proxyPassword the password to use for the proxy server authentication
+   * @param groupId the groupId to search for
+   *
+   * @return List of artifact download URLs
+   */
+  public static List<URL> retrieveMavenArtifactDownloadUrls(String baseUrl, String username, String password,
+      String proxyAddress, int proxyPort, String proxyUsername, String proxyPassword, String groupId) {
+
+    ServerCredentials serverCredentials = new ServerCredentials(baseUrl, username, password, proxyAddress, proxyPort,
+        proxyUsername, proxyPassword);
+
+    return SearchResponseFactory.searchArtifactDownloadLinks(serverCredentials, groupId);
+  }
+
+}
diff --git a/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/mavensearch/constants/MavenSearchRepositoryConstants.java b/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/mavensearch/constants/MavenSearchRepositoryConstants.java
new file mode 100644
index 0000000000..2e27d5aede
--- /dev/null
+++ b/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/mavensearch/constants/MavenSearchRepositoryConstants.java
@@ -0,0 +1,113 @@
+package com.devonfw.cobigen.retriever.mavensearch.constants;
+
+/**
+ * Constants needed for handling the maven search REST APIs
+ */
+public class MavenSearchRepositoryConstants {
+
+  /**
+   * Message for an exception when an unexpected status code was returned by the API
+   */
+  public static final String MAVEN_SEARCH_API_EXCEPTION_UNEXPECTED_STATUS_CODE = "The search REST API returned the unexpected status code";
+
+  /**
+   * Message for an exception when no response was returned by the API
+   */
+  public static final String MAVEN_SEARCH_API_EXCEPTION_NO_RESPONSE = "It was not possible to get a response from";
+
+  /**
+   * Message for an exception when the request to the API failed
+   */
+  public static final String MAVEN_SEARCH_API_EXCEPTION_REQUEST_FAILED = "The search REST API was unable to send or receive the message from the service using the URL";
+
+  /**
+   * Message for an exception when a faulty target URL was provided
+   */
+  public static final String MAVEN_SEARCH_API_EXCEPTION_FAULTY_TARGET_URL = "CobiGen was unable to retrieve valid URLs from the REST Search API of the";
+
+  /**
+   * Message for an exception when an empty response was returned by the API
+   */
+  public static final String MAVEN_SEARCH_API_EXCEPTION_EMPTY_JSON_RESPONSE = "The search REST API recieved an empty json response from the target URL";
+
+  /**
+   * Message for an exception when an empty artifact list was returned by the API
+   */
+  public static final String MAVEN_SEARCH_API_EXCEPTION_ARTIFACT_LIST_EMPTY = "CobiGen did not find any artifacts using the REST Search API of the";
+
+  /**
+   * Message part one for an exception when the authentication for an API failed
+   */
+  public static final String MAVEN_SEARCH_API_EXCEPTION_AUTH_FAILED_ONE = "CobiGen was unable to access the REST Search API of the";
+
+  /**
+   * Message part two for an exception when the authentication for an API failed
+   */
+  public static final String MAVEN_SEARCH_API_EXCEPTION_AUTH_FAILED_TWO = "repository with authentication method: Basic Authentication using the URL";
+
+  /**
+   * Message for an exception when the API response json could not be parsed
+   */
+  public static final String MAVEN_SEARCH_API_EXCEPTION_UNABLE_TO_PARSE_JSON = "CobiGen was unable to parse the json response from the REST Search API of the";
+
+  /**
+   * Fallback repository URL
+   */
+  public static final String FALLBACK_REPOSITORY_URL = "https://s01.oss.sonatype.org";
+
+  /**
+   * Maven repository URL
+   */
+  public static final String MAVEN_REPOSITORY_URL = "https://search.maven.org";
+
+  /**
+   * Maven repository download link
+   */
+  public static final String MAVEN_REPOSITORY_DOWNLOAD_LINK = "https://repo1.maven.org/maven2";
+
+  /**
+   * Maven REST search API path
+   */
+  public static final String MAVEN_REST_SEARCH_API_PATH = "solrsearch/select";
+
+  /**
+   * Nexus2 repository URL
+   */
+  public static final String NEXUS2_REPOSITORY_URL = "https://s01.oss.sonatype.org";
+
+  /**
+   * Nexus2 repository link
+   */
+  public static final String NEXUS2_REPOSITORY_LINK = "service/local/repositories/releases/content";
+
+  /**
+   * Nexus2 SNAPSHOT repository link
+   */
+  public static final String NEXUS2_SNAPSHOT_REPOSITORY_LINK = "service/local/artifact/maven/redirect";
+
+  /**
+   * Nexus2 REST search API path
+   */
+  public static final String NEXUS2_REST_SEARCH_API_PATH = "service/local/lucene/search";
+
+  /**
+   * Nexus3 REST search API path
+   */
+  public static final String NEXUS3_REST_SEARCH_API_PATH = "service/rest/v1/search";
+
+  /**
+   * Nexus3 repository URL
+   */
+  public static final String NEXUS3_REPOSITORY_URL = "";
+
+  /**
+   * Jfrog repository URL
+   */
+  public static final String JFROG_REPOSITORY_URL = "http://localhost:8082/artifactory";
+
+  /**
+   * Jfrog REST search API path
+   */
+  public static final String JFROG_REST_SEARCH_API_PATH = "artifactory/api/search/gavc";
+
+}
diff --git a/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/mavensearch/constants/MavenSearchRepositoryType.java b/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/mavensearch/constants/MavenSearchRepositoryType.java
new file mode 100644
index 0000000000..9f86c3e2e6
--- /dev/null
+++ b/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/mavensearch/constants/MavenSearchRepositoryType.java
@@ -0,0 +1,28 @@
+package com.devonfw.cobigen.retriever.mavensearch.constants;
+
+/**
+ * Maven search repository types used to identify and name the available search REST API types (add new search
+ * repository types/versions here)
+ */
+public enum MavenSearchRepositoryType {
+
+  /**
+   * Nexus2 search repository type
+   */
+  NEXUS2,
+
+  /**
+   * Nexus3 search repository type
+   */
+  NEXUS3,
+
+  /**
+   * Maven search repository type
+   */
+  MAVEN,
+
+  /**
+   * Jfrog search repository type
+   */
+  JFROG
+}
diff --git a/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/mavensearch/exception/RestSearchResponseException.java b/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/mavensearch/exception/RestSearchResponseException.java
new file mode 100644
index 0000000000..adb10a5cb0
--- /dev/null
+++ b/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/mavensearch/exception/RestSearchResponseException.java
@@ -0,0 +1,56 @@
+package com.devonfw.cobigen.retriever.mavensearch.exception;
+
+import com.devonfw.cobigen.api.exception.CobiGenRuntimeException;
+import com.devonfw.cobigen.retriever.mavensearch.constants.MavenSearchRepositoryType;
+
+/** Exception to indicate that the REST search API encountered a problem while accessing the server. */
+public class RestSearchResponseException extends CobiGenRuntimeException {
+
+  /** The ID */
+  private static final long serialVersionUID = 1L;
+
+  /** The status code which was received by the search response */
+  private int statusCode = 0;
+
+  /** Message constant if it was not possible to get a response */
+  private static final String IT_WAS_NOT_POSSIBLE_TO = "It was not possible to get a response from";
+
+  /** Continuation of IT_WAS_NOT_POSSIBLE_TO */
+  private static final String WITH_THE_URL = "with the URL";
+
+  /** Message constant for an unexpected status code */
+  private static final String THE_SEARCH_RETURNED_UNEXPECTED_STATUS_CODE = "The search REST API returned the unexpected status code";
+
+  /**
+   * Creates a new {@link RestSearchResponseException} with the given message
+   *
+   * @param message error message of the exception
+   */
+  public RestSearchResponseException(String message) {
+
+    super(message);
+  }
+
+  /**
+   * Creates a new {@link RestSearchResponseException} with the specified message and the causing {@link Throwable}
+   *
+   * @param searchRepositoryType the repository type which got no response
+   * @param targetUrl the URL which was used to get a response
+   * @param statusCode the status code which was not expected
+   */
+  public RestSearchResponseException(MavenSearchRepositoryType searchRepositoryType, String targetUrl, int statusCode) {
+
+    super(IT_WAS_NOT_POSSIBLE_TO + ": " + searchRepositoryType + " " + WITH_THE_URL + ": " + targetUrl + "." + "\n"
+        + THE_SEARCH_RETURNED_UNEXPECTED_STATUS_CODE + ": " + statusCode + ".");
+    this.statusCode = statusCode;
+  }
+
+  /**
+   * @return statusCode
+   */
+  public int getStatusCode() {
+
+    return this.statusCode;
+  }
+
+}
diff --git a/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/mavensearch/to/model/AbstractSearchResponse.java b/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/mavensearch/to/model/AbstractSearchResponse.java
new file mode 100644
index 0000000000..d44a3fdd8f
--- /dev/null
+++ b/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/mavensearch/to/model/AbstractSearchResponse.java
@@ -0,0 +1,285 @@
+package com.devonfw.cobigen.retriever.mavensearch.to.model;
+
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.net.MalformedURLException;
+import java.net.Proxy;
+import java.net.SocketAddress;
+import java.net.URL;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.devonfw.cobigen.retriever.mavensearch.constants.MavenSearchRepositoryConstants;
+import com.devonfw.cobigen.retriever.mavensearch.constants.MavenSearchRepositoryType;
+import com.devonfw.cobigen.retriever.mavensearch.exception.RestSearchResponseException;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import okhttp3.Authenticator;
+import okhttp3.Credentials;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Request.Builder;
+import okhttp3.Response;
+import okhttp3.Route;
+
+/**
+ * This interface should be inherited for all maven REST search API responses to properly convert {@link JsonProperty}
+ * from responses to valid template-set.xml download URLs
+ */
+public abstract class AbstractSearchResponse {
+
+  /** The HTTP request write timeout */
+  private static final int WRITE_TIMEOUT = 30;
+
+  /** The HTTP request call timeout */
+  private static final int CALL_TIMEOUT = 30;
+
+  /** The HTTP request read timeout */
+  private static final int READ_TIMEOUT = 30;
+
+  /** The HTTP request connect timeout */
+  private static final int CONNECT_TIMEOUT = 10;
+
+  /** Logger instance. */
+  @JsonIgnore
+  private static final Logger LOG = LoggerFactory.getLogger(AbstractSearchResponse.class);
+
+  /**
+   * Getter for {@link MavenSearchRepositoryType} needs to be added to each implementing class to ensure that the
+   * repository type name is being used
+   *
+   * @return the {@link MavenSearchRepositoryType} type
+   */
+  public abstract MavenSearchRepositoryType getRepositoryType();
+
+  /**
+   * Creates a list of download URLs containing only template-set.xml files
+   *
+   * @return List of download links
+   * @throws MalformedURLException if an URL was not valid
+   */
+  public abstract List<URL> retrieveTemplateSetXmlDownloadURLs() throws MalformedURLException;
+
+  /**
+   * Retrieves the target link of the respective REST search API
+   *
+   * @param repositoryUrl the repository server URL
+   * @param groupId the groupId to search for
+   * @return the REST search API target link
+   */
+  public abstract String retrieveRestSearchApiTargetLink(String repositoryUrl, String groupId);
+
+  /**
+   * Removes duplicates from list of download URLs
+   *
+   * @param downloadUrls list of download URLs
+   * @return List of download links
+   * @throws MalformedURLException if an URL was not valid
+   */
+  public List<URL> removeDuplicatedDownloadURLs(List<URL> downloadUrls) throws MalformedURLException {
+
+    return downloadUrls.stream().distinct().collect(Collectors.toList());
+  }
+
+  /**
+   * Retrieves the json response from a repository URL, a group ID and a bearer authentication token
+   *
+   * @param serverCredentials to use
+   * @param groupId to search for
+   *
+   * @return String of json response
+   * @throws RestSearchResponseException if the request did not return status 200
+   */
+  public abstract String retrieveJsonResponse(ServerCredentials serverCredentials, String groupId)
+      throws RestSearchResponseException;
+
+  /**
+   * Creates a @Request with provided authentication username and password
+   *
+   * @param targetLink String link to get response from
+   * @param username String to use for authentication
+   * @param password String to use for authentication
+   * @param requestWithHeaders {@link Builder} request with headers
+   * @return {@link Builder} request to use as resource
+   */
+  private static Builder basicUsernamePasswordAuthentication(String targetLink, String username, String password,
+      Builder requestWithHeaders) {
+
+    String credential = Credentials.basic(username, password);
+    return requestWithHeaders.addHeader("Authorization", credential);
+
+  }
+
+  /**
+   * Retrieves a json response by given REST API target link using authentication
+   *
+   * @param targetLink link to get response from
+   * @param searchRepositoryType the type of the search repository
+   * @param serverCredentials to use for connection and authentication with the server
+   * @return String of json response
+   * @throws RestSearchResponseException if the returned status code was not 200 OK
+   */
+  public static String retrieveJsonResponseWithAuthentication(String targetLink,
+      MavenSearchRepositoryType searchRepositoryType, ServerCredentials serverCredentials)
+      throws RestSearchResponseException {
+
+    LOG.debug("Starting {} search REST API request with URL: {}.", searchRepositoryType, targetLink);
+
+    OkHttpClient.Builder builder = new OkHttpClient.Builder();
+
+    builder.connectTimeout(CONNECT_TIMEOUT, TimeUnit.SECONDS);
+    builder.readTimeout(READ_TIMEOUT, TimeUnit.SECONDS);
+    builder.callTimeout(CALL_TIMEOUT, TimeUnit.SECONDS);
+    builder.writeTimeout(WRITE_TIMEOUT, TimeUnit.SECONDS);
+    builder.retryOnConnectionFailure(true);
+
+    if (serverCredentials.getProxyAddress() != null && serverCredentials.getProxyPort() != 0) {
+      buildProxy(serverCredentials, builder);
+    }
+
+    OkHttpClient httpClient = builder.build();
+
+    String jsonResponse = "";
+
+    try {
+      // use no authentication
+      Response response = null;
+
+      Request request = new Request.Builder().url(targetLink).get().build();
+      Builder requestWithHeaders = request.newBuilder();
+      requestWithHeaders.addHeader("Accept", "application/json");
+
+      boolean usingBasicAuth = false;
+      // use basic authentication
+      if (serverCredentials.getUsername() != null && serverCredentials.getPassword() != null) {
+        LOG.debug("Connecting to REST API using Basic Authentication.");
+        requestWithHeaders = basicUsernamePasswordAuthentication(targetLink, serverCredentials.getUsername(),
+            serverCredentials.getPassword(), requestWithHeaders);
+        usingBasicAuth = true;
+      }
+
+      Request finalRequest = requestWithHeaders.build();
+
+      response = httpClient.newCall(finalRequest).execute();
+
+      if (response != null) {
+        int statusCode = response.code();
+        if (statusCode == 200 || statusCode == 201 || statusCode == 204) {
+          if (usingBasicAuth) {
+            LOG.debug("The connection to the REST API using Basic Authentication was successful");
+          }
+
+          jsonResponse = response.body().string();
+        } else if (statusCode == 401) {
+          LOG.debug("{} {} {} {}", MavenSearchRepositoryConstants.MAVEN_SEARCH_API_EXCEPTION_AUTH_FAILED_ONE,
+              searchRepositoryType, MavenSearchRepositoryConstants.MAVEN_SEARCH_API_EXCEPTION_AUTH_FAILED_TWO,
+              targetLink);
+          throw new RestSearchResponseException(searchRepositoryType, targetLink, statusCode);
+        } else {
+          throw new RestSearchResponseException(searchRepositoryType, targetLink, statusCode);
+        }
+
+      }
+
+    } catch (IOException e) {
+      LOG.debug("{} {}", MavenSearchRepositoryConstants.MAVEN_SEARCH_API_EXCEPTION_REQUEST_FAILED, targetLink, e);
+      return jsonResponse;
+    } catch (IllegalArgumentException e) {
+      LOG.debug("The search REST API recieved the faulty target URL: {}", targetLink, e);
+      return jsonResponse;
+    }
+
+    if (jsonResponse.isEmpty()) {
+      LOG.debug("{} {}", MavenSearchRepositoryConstants.MAVEN_SEARCH_API_EXCEPTION_EMPTY_JSON_RESPONSE, targetLink);
+    }
+
+    return jsonResponse;
+
+  }
+
+  /**
+   * Builds a {@link OkHttpClient.Builder} with proxy server credentials
+   *
+   * @param serverCredentials {@link ServerCredentials} to use for connection and authentication
+   * @param builder {@link OkHttpClient.Builder} to build with proxy
+   */
+  private static void buildProxy(ServerCredentials serverCredentials, OkHttpClient.Builder builder) {
+
+    Authenticator authenticator = null;
+
+    if (serverCredentials.getProxyUsername() != null && serverCredentials.getProxyPassword() != null) {
+      LOG.debug("Trying to connect to proxy using Basic Authentication.");
+      authenticator = new Authenticator() {
+        @Override
+        public Request authenticate(Route route, Response response) throws IOException {
+
+          String credential = Credentials.basic(serverCredentials.getProxyUsername(),
+              serverCredentials.getProxyPassword());
+          return response.request().newBuilder().header("Proxy-Authorization", credential).build();
+        }
+      };
+    }
+
+    LOG.debug("Connecting to REST API using proxy with host address: {} and port: {}",
+        serverCredentials.getProxyAddress(), serverCredentials.getProxyPort());
+
+    SocketAddress address = new InetSocketAddress(serverCredentials.getProxyAddress(),
+        serverCredentials.getProxyPort());
+    Proxy proxy = new Proxy(Proxy.Type.HTTP, address);
+    if (authenticator != null) {
+      builder.proxy(proxy).proxyAuthenticator(authenticator);
+    } else {
+      builder.proxy(proxy);
+    }
+  }
+
+  /**
+   * Creates a download link (concatenates maven repository link with groupId, artifact and version)
+   *
+   * @param mavenRepo link to the maven repository to use
+   * @param groupId for the download link
+   * @param artifactId for the download link
+   * @param version for the download link
+   * @param fileEnding file ending for the download link
+   * @return concatenated download link
+   * @throws MalformedURLException if the URL was not valid
+   */
+  protected static URL createDownloadLink(String mavenRepo, String groupId, String artifactId, String version,
+      String fileEnding) throws MalformedURLException {
+
+    String parsedGroupId = groupId.replace(".", "/");
+    String downloadFile = artifactId + "-" + version + fileEnding;
+    String downloadLink = mavenRepo + "/" + parsedGroupId + "/" + artifactId + "/" + version + "/" + downloadFile;
+    URL url = new URL(downloadLink);
+    return url;
+  }
+
+  /**
+   * Extracts a root URL from given repository URL
+   *
+   * @param repositoryUrl URL of the repository
+   * @return root URL
+   */
+  protected static String createRootURL(String repositoryUrl) {
+
+    URL url;
+    try {
+      url = new URL(repositoryUrl);
+      String baseUrl = url.getProtocol() + "://" + url.getHost();
+      if (url.getPort() != -1) {
+        baseUrl += ":" + url.getPort();
+      }
+      return baseUrl;
+    } catch (MalformedURLException e) {
+      LOG.debug("URL: {} was not valid.", repositoryUrl, e);
+      return "";
+    }
+
+  }
+
+}
\ No newline at end of file
diff --git a/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/mavensearch/to/model/SearchResponseFactory.java b/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/mavensearch/to/model/SearchResponseFactory.java
new file mode 100644
index 0000000000..5f9ba64552
--- /dev/null
+++ b/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/mavensearch/to/model/SearchResponseFactory.java
@@ -0,0 +1,111 @@
+package com.devonfw.cobigen.retriever.mavensearch.to.model;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.devonfw.cobigen.retriever.mavensearch.constants.MavenSearchRepositoryConstants;
+import com.devonfw.cobigen.retriever.mavensearch.constants.MavenSearchRepositoryType;
+import com.devonfw.cobigen.retriever.mavensearch.exception.RestSearchResponseException;
+import com.devonfw.cobigen.retriever.mavensearch.to.model.jfrog.JfrogSearchResponse;
+import com.devonfw.cobigen.retriever.mavensearch.to.model.maven.MavenSearchResponse;
+import com.devonfw.cobigen.retriever.mavensearch.to.model.nexus2.Nexus2SearchResponse;
+import com.devonfw.cobigen.retriever.mavensearch.to.model.nexus3.Nexus3SearchResponse;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.common.collect.Lists;
+
+/**
+ * Factory to create new instances of {@link AbstractSearchResponse} which handles the responses from various search
+ * REST APIs.
+ */
+public class SearchResponseFactory {
+
+  /** Logger instance. */
+  static final Logger LOG = LoggerFactory.getLogger(SearchResponseFactory.class);
+
+  /**
+   * List of available {@link AbstractSearchResponse} implementations (add new search REST API responses here)
+   */
+  private static final List<AbstractSearchResponse> SEARCH_RESPONSES = Lists.newArrayList(new MavenSearchResponse(),
+      new JfrogSearchResponse(), new Nexus2SearchResponse(), new Nexus3SearchResponse());
+
+  /**
+   * Searches for the maven artifact download links by given server credentials and groupId
+   *
+   * @param serverCredentials to use for connection and authentication
+   * @param groupId to search for
+   *
+   * @return List of download URLs
+   */
+  public static List<URL> searchArtifactDownloadLinks(ServerCredentials serverCredentials, String groupId) {
+
+    ObjectMapper mapper = new ObjectMapper();
+    List<URL> downloadLinks = new ArrayList<>();
+    MavenSearchRepositoryType searchRepositoryType = null;
+    String searchRepositoryTargetLink = "";
+
+    if (serverCredentials == null) {
+      LOG.debug("No server credentials were provided.");
+      return downloadLinks;
+    }
+
+    if (serverCredentials.getBaseUrl() == null || serverCredentials.getBaseUrl().isEmpty()) {
+      LOG.debug("The server credentials are missing the base URL.");
+      return downloadLinks;
+    }
+
+    String baseUrl = serverCredentials.getBaseUrl();
+
+    LOG.debug("Starting search for REST APIs with repository URL: {} and groupId: {} ...", baseUrl, groupId);
+
+    for (AbstractSearchResponse searchResponse : SEARCH_RESPONSES) {
+      searchRepositoryType = searchResponse.getRepositoryType();
+      searchRepositoryTargetLink = searchResponse.retrieveRestSearchApiTargetLink(baseUrl, groupId);
+      try {
+        LOG.debug("Trying to get a response from {} ...", searchRepositoryType);
+
+        String jsonResponse = searchResponse.retrieveJsonResponse(serverCredentials, groupId);
+
+        if (jsonResponse == null || jsonResponse.isEmpty()) {
+          LOG.debug("The json response was empty.");
+          return downloadLinks;
+        }
+
+        AbstractSearchResponse response = mapper.readValue(jsonResponse, searchResponse.getClass());
+
+        LOG.debug("The search REST API was able to get a response from {}", searchRepositoryType);
+
+        downloadLinks = response.retrieveTemplateSetXmlDownloadURLs();
+
+        if (downloadLinks == null) {
+          LOG.debug("{} {} repository matching the group id: {} while using the URL: {}",
+              MavenSearchRepositoryConstants.MAVEN_SEARCH_API_EXCEPTION_ARTIFACT_LIST_EMPTY, searchRepositoryType,
+              groupId, searchRepositoryTargetLink);
+          return new ArrayList<>();
+        }
+
+      } catch (RestSearchResponseException e) {
+        LOG.debug("The search REST API was unable to get a response from {}", searchRepositoryType);
+        if (SEARCH_RESPONSES.indexOf(searchResponse) != (SEARCH_RESPONSES.size() - 1)) {
+          LOG.debug("Trying to get a response from another search REST API type.");
+        }
+      } catch (JsonProcessingException e) {
+        LOG.debug("{} repository using the URL: {}",
+            MavenSearchRepositoryConstants.MAVEN_SEARCH_API_EXCEPTION_UNABLE_TO_PARSE_JSON, searchRepositoryType,
+            searchRepositoryTargetLink, e);
+      } catch (MalformedURLException e) {
+        LOG.debug("{} {} repository using the URL: {}",
+            MavenSearchRepositoryConstants.MAVEN_SEARCH_API_EXCEPTION_FAULTY_TARGET_URL, searchRepositoryType,
+            searchRepositoryTargetLink, e);
+      }
+    }
+
+    return downloadLinks;
+  }
+
+}
\ No newline at end of file
diff --git a/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/mavensearch/to/model/ServerCredentials.java b/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/mavensearch/to/model/ServerCredentials.java
new file mode 100644
index 0000000000..4637c7ec9a
--- /dev/null
+++ b/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/mavensearch/to/model/ServerCredentials.java
@@ -0,0 +1,116 @@
+package com.devonfw.cobigen.retriever.mavensearch.to.model;
+
+/**
+ * Class for storing the server credentials
+ */
+public class ServerCredentials {
+
+  /** The maven repository server base URL */
+  private String baseUrl;
+
+  /** The username to use for authentication */
+  private String username;
+
+  /** The password to use for authentication */
+  private String password;
+
+  /** The address to use for the proxy server */
+  private String proxyAddress;
+
+  /** The port to use for the proxy server */
+  private int proxyPort;
+
+  /** The user name to use for the proxy server */
+  private String proxyUsername;
+
+  /** The password to use for the proxy server */
+  private String proxyPassword;
+
+  /**
+   *
+   * The constructor.
+   *
+   * @param baseUrl The maven repository server base URL
+   * @param username to use for authentication
+   * @param password to use for authentication
+   * @param proxyAddress to use for the proxy server
+   * @param proxyPort to use for the proxy server
+   * @param proxyUsername to use for the proxy server authentication
+   * @param proxyPassword to use for the proxy server authentication
+   */
+  public ServerCredentials(String baseUrl, String username, String password, String proxyAddress, int proxyPort,
+      String proxyUsername, String proxyPassword) {
+
+    this.baseUrl = baseUrl;
+    this.username = username;
+    this.password = password;
+    this.proxyAddress = proxyAddress;
+    this.proxyPort = proxyPort;
+    this.proxyUsername = proxyUsername;
+    this.proxyPassword = proxyPassword;
+  }
+
+  /**
+   * @return baseUrl
+   */
+  public String getBaseUrl() {
+
+    return this.baseUrl;
+  }
+
+  /**
+   * Returns the username, if the username settings.xml tag is a placeholder this getter will return null instead
+   *
+   * @return username String of username
+   */
+  public String getUsername() {
+
+    if (this.username != null && this.username.startsWith("$["))
+      return null;
+    return this.username;
+  }
+
+  /**
+   * Returns the password, if the password settings.xml tag is a placeholder this getter will return null instead
+   *
+   * @return password String of password
+   */
+  public String getPassword() {
+
+    if (this.username != null && this.password.startsWith("$["))
+      return null;
+    return this.password;
+  }
+
+  /**
+   * @return proxyAddress
+   */
+  public String getProxyAddress() {
+
+    return this.proxyAddress;
+  }
+
+  /**
+   * @return proxyPort
+   */
+  public int getProxyPort() {
+
+    return this.proxyPort;
+  }
+
+  /**
+   * @return proxyUsername
+   */
+  public String getProxyUsername() {
+
+    return this.proxyUsername;
+  }
+
+  /**
+   * @return proxyPassword
+   */
+  public String getProxyPassword() {
+
+    return this.proxyPassword;
+  }
+}
diff --git a/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/mavensearch/to/model/jfrog/JfrogSearchResponse.java b/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/mavensearch/to/model/jfrog/JfrogSearchResponse.java
new file mode 100644
index 0000000000..97a958c419
--- /dev/null
+++ b/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/mavensearch/to/model/jfrog/JfrogSearchResponse.java
@@ -0,0 +1,89 @@
+package com.devonfw.cobigen.retriever.mavensearch.to.model.jfrog;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.devonfw.cobigen.api.constants.ConfigurationConstants;
+import com.devonfw.cobigen.retriever.mavensearch.constants.MavenSearchRepositoryConstants;
+import com.devonfw.cobigen.retriever.mavensearch.constants.MavenSearchRepositoryType;
+import com.devonfw.cobigen.retriever.mavensearch.exception.RestSearchResponseException;
+import com.devonfw.cobigen.retriever.mavensearch.to.model.AbstractSearchResponse;
+import com.devonfw.cobigen.retriever.mavensearch.to.model.ServerCredentials;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Json model for jfrog Search REST API response
+ */
+public class JfrogSearchResponse extends AbstractSearchResponse {
+
+  /** Logger instance. */
+  @JsonIgnore
+  private static final Logger LOG = LoggerFactory.getLogger(JfrogSearchResponse.class);
+
+  /** results */
+  @JsonProperty("results")
+  private List<JfrogSearchResponseResult> results;
+
+  /**
+   * @return results
+   */
+  @JsonIgnore
+  public List<JfrogSearchResponseResult> getResults() {
+
+    return this.results;
+  }
+
+  @Override
+  @JsonIgnore
+  public String retrieveJsonResponse(ServerCredentials serverCredentials, String groupId)
+      throws RestSearchResponseException {
+
+    String targetLink = retrieveRestSearchApiTargetLink(serverCredentials.getBaseUrl(), groupId);
+
+    return retrieveJsonResponseWithAuthentication(targetLink, getRepositoryType(), serverCredentials);
+  }
+
+  @Override
+  @JsonIgnore
+  public List<URL> retrieveTemplateSetXmlDownloadURLs() throws MalformedURLException {
+
+    List<URL> downloadLinks = new ArrayList<>();
+
+    if (getResults() == null) {
+      LOG.debug("The {} response was empty.", getRepositoryType());
+      return downloadLinks;
+    }
+
+    for (JfrogSearchResponseResult result : getResults()) {
+      if (result.getUri().endsWith(ConfigurationConstants.TEMPLATE_SET_CONFIG_FILENAME)) {
+        downloadLinks.add(new URL(result.getUri()));
+      }
+    }
+
+    return downloadLinks;
+  }
+
+  @Override
+  public MavenSearchRepositoryType getRepositoryType() {
+
+    return MavenSearchRepositoryType.JFROG;
+  }
+
+  @Override
+  public String retrieveRestSearchApiTargetLink(String repositoryUrl, String groupId) {
+
+    String rootUrl = AbstractSearchResponse.createRootURL(repositoryUrl);
+    if (rootUrl != null) {
+      return rootUrl + "/" + MavenSearchRepositoryConstants.JFROG_REST_SEARCH_API_PATH + "?g=" + groupId;
+    } else {
+      return null;
+    }
+
+  }
+}
diff --git a/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/mavensearch/to/model/jfrog/JfrogSearchResponseResult.java b/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/mavensearch/to/model/jfrog/JfrogSearchResponseResult.java
new file mode 100644
index 0000000000..98221db6f0
--- /dev/null
+++ b/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/mavensearch/to/model/jfrog/JfrogSearchResponseResult.java
@@ -0,0 +1,24 @@
+package com.devonfw.cobigen.retriever.mavensearch.to.model.jfrog;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Jfrog search response result model
+ */
+class JfrogSearchResponseResult {
+
+  /** uri */
+  @JsonProperty("uri")
+  private String uri;
+
+  /**
+   * @return uri
+   */
+  @JsonIgnore
+  public String getUri() {
+
+    return this.uri;
+  }
+
+}
diff --git a/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/mavensearch/to/model/maven/MavenSearchResponse.java b/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/mavensearch/to/model/maven/MavenSearchResponse.java
new file mode 100644
index 0000000000..7f95107b65
--- /dev/null
+++ b/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/mavensearch/to/model/maven/MavenSearchResponse.java
@@ -0,0 +1,99 @@
+package com.devonfw.cobigen.retriever.mavensearch.to.model.maven;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.devonfw.cobigen.api.constants.ConfigurationConstants;
+import com.devonfw.cobigen.retriever.mavensearch.constants.MavenSearchRepositoryConstants;
+import com.devonfw.cobigen.retriever.mavensearch.constants.MavenSearchRepositoryType;
+import com.devonfw.cobigen.retriever.mavensearch.exception.RestSearchResponseException;
+import com.devonfw.cobigen.retriever.mavensearch.to.model.AbstractSearchResponse;
+import com.devonfw.cobigen.retriever.mavensearch.to.model.ServerCredentials;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Json model for maven Search REST API response
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class MavenSearchResponse extends AbstractSearchResponse {
+
+  /** Logger instance. */
+  @JsonIgnore
+  private static final Logger LOG = LoggerFactory.getLogger(MavenSearchResponse.class);
+
+  @JsonProperty("response")
+  private MavenSearchResponseResponse response;
+
+  /**
+   * @return response
+   */
+  @JsonIgnore
+  public MavenSearchResponseResponse getResponse() {
+
+    return this.response;
+  }
+
+  @Override
+  @JsonIgnore
+  public String retrieveJsonResponse(ServerCredentials serverCredentials, String groupId)
+      throws RestSearchResponseException {
+
+    String targetLink = retrieveRestSearchApiTargetLink(serverCredentials.getBaseUrl(), groupId);
+
+    return retrieveJsonResponseWithAuthentication(targetLink, getRepositoryType(), serverCredentials);
+  }
+
+  @Override
+  @JsonIgnore
+  public List<URL> retrieveTemplateSetXmlDownloadURLs() throws MalformedURLException {
+
+    List<URL> downloadLinks = new ArrayList<>();
+
+    if (getResponse() == null) {
+      LOG.debug("The {} response was empty.", getRepositoryType());
+      return downloadLinks;
+    }
+
+    List<MavenSearchResponseDoc> docs = getResponse().getDocs();
+
+    for (MavenSearchResponseDoc doc : docs) {
+      for (String fileEnding : doc.getEc()) {
+        if (fileEnding.endsWith(ConfigurationConstants.TEMPLATE_SET_CONFIG_FILENAME)) {
+          downloadLinks.add(
+              AbstractSearchResponse.createDownloadLink(MavenSearchRepositoryConstants.MAVEN_REPOSITORY_DOWNLOAD_LINK,
+                  doc.getGroup(), doc.getArtifact(), doc.getLatestVersion(), fileEnding));
+        }
+
+      }
+
+    }
+
+    return downloadLinks;
+  }
+
+  @Override
+  public MavenSearchRepositoryType getRepositoryType() {
+
+    return MavenSearchRepositoryType.MAVEN;
+  }
+
+  @Override
+  public String retrieveRestSearchApiTargetLink(String repositoryUrl, String groupId) {
+
+    String rootUrl = AbstractSearchResponse.createRootURL(repositoryUrl);
+    if (rootUrl != null) {
+      return rootUrl + "/" + MavenSearchRepositoryConstants.MAVEN_REST_SEARCH_API_PATH + "?q=g:" + groupId + "&wt=json";
+    } else {
+      return null;
+    }
+
+  }
+
+}
\ No newline at end of file
diff --git a/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/mavensearch/to/model/maven/MavenSearchResponseDoc.java b/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/mavensearch/to/model/maven/MavenSearchResponseDoc.java
new file mode 100644
index 0000000000..9f5021e33f
--- /dev/null
+++ b/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/mavensearch/to/model/maven/MavenSearchResponseDoc.java
@@ -0,0 +1,93 @@
+package com.devonfw.cobigen.retriever.mavensearch.to.model.maven;
+
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Maven search response doc model
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+class MavenSearchResponseDoc {
+
+  /** id */
+  @JsonProperty("id")
+  private String id;
+
+  /** group */
+  @JsonProperty("g")
+  private String group;
+
+  /** artifact */
+  @JsonProperty("a")
+  private String artifact;
+
+  /** latest version */
+  @JsonProperty("latestVersion")
+  private String latestVersion;
+
+  /** repository ID */
+  @JsonProperty("repositoryId")
+  private String repositoryId;
+
+  /** ec (file ending) */
+  @JsonProperty("ec")
+  private List<String> ec;
+
+  /**
+   * @return ec
+   */
+  @JsonIgnore
+  public List<String> getEc() {
+
+    return this.ec;
+  }
+
+  /**
+   * @return id
+   */
+  @JsonIgnore
+  public String getId() {
+
+    return this.id;
+  }
+
+  /**
+   * @return group
+   */
+  @JsonIgnore
+  public String getGroup() {
+
+    return this.group;
+  }
+
+  /**
+   * @return artifact
+   */
+  @JsonIgnore
+  public String getArtifact() {
+
+    return this.artifact;
+  }
+
+  /**
+   * @return latestVersion
+   */
+  @JsonIgnore
+  public String getLatestVersion() {
+
+    return this.latestVersion;
+  }
+
+  /**
+   * @return repositoryId
+   */
+  @JsonIgnore
+  public String getRepositoryId() {
+
+    return this.repositoryId;
+  }
+
+}
diff --git a/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/mavensearch/to/model/maven/MavenSearchResponseResponse.java b/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/mavensearch/to/model/maven/MavenSearchResponseResponse.java
new file mode 100644
index 0000000000..c33ecc45b8
--- /dev/null
+++ b/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/mavensearch/to/model/maven/MavenSearchResponseResponse.java
@@ -0,0 +1,43 @@
+package com.devonfw.cobigen.retriever.mavensearch.to.model.maven;
+
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Maven search response model
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+class MavenSearchResponseResponse {
+
+  /**
+   * found results
+   */
+  @JsonProperty("numFound")
+  private int numFound;
+
+  /** docs */
+  @JsonProperty("docs")
+  private List<MavenSearchResponseDoc> docs;
+
+  /**
+   * @return numFound
+   */
+  @JsonIgnore
+  public int getNumFound() {
+
+    return this.numFound;
+  }
+
+  /**
+   * @return docs
+   */
+  @JsonIgnore
+  public List<MavenSearchResponseDoc> getDocs() {
+
+    return this.docs;
+  }
+
+}
diff --git a/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/mavensearch/to/model/nexus2/Nexus2SearchResponse.java b/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/mavensearch/to/model/nexus2/Nexus2SearchResponse.java
new file mode 100644
index 0000000000..90736ec8d4
--- /dev/null
+++ b/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/mavensearch/to/model/nexus2/Nexus2SearchResponse.java
@@ -0,0 +1,99 @@
+package com.devonfw.cobigen.retriever.mavensearch.to.model.nexus2;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.devonfw.cobigen.retriever.mavensearch.constants.MavenSearchRepositoryConstants;
+import com.devonfw.cobigen.retriever.mavensearch.constants.MavenSearchRepositoryType;
+import com.devonfw.cobigen.retriever.mavensearch.exception.RestSearchResponseException;
+import com.devonfw.cobigen.retriever.mavensearch.to.model.AbstractSearchResponse;
+import com.devonfw.cobigen.retriever.mavensearch.to.model.ServerCredentials;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Json model for nexus2 Search REST API response
+ *
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class Nexus2SearchResponse extends AbstractSearchResponse {
+
+  /** Logger instance. */
+  @JsonIgnore
+  private static final Logger LOG = LoggerFactory.getLogger(Nexus2SearchResponse.class);
+
+  /** data */
+  @JsonProperty("data")
+  private List<Nexus2SearchResponseData> data;
+
+  @Override
+  @JsonIgnore
+  public List<URL> retrieveTemplateSetXmlDownloadURLs() throws MalformedURLException {
+
+    List<URL> downloadLinks = new ArrayList<>();
+
+    if (this.data == null) {
+      LOG.debug("The {} response was empty.", getRepositoryType());
+      return downloadLinks;
+    }
+
+    for (Nexus2SearchResponseData item : this.data) {
+      for (Nexus2SearchResponseArtifactHits artifactHit : item.artifactHits) {
+        for (Nexus2SearchResponseArtifactLinks artifactLink : artifactHit.artifactLinks) {
+          if (artifactLink.getClassifier() != null && artifactLink.getClassifier().equals("template-set")) {
+            // Check for full SNAPSHOT version link
+            if (item.getVersion().contains("-SNAPSHOT")) {
+              URL snapShotUrl = new URL(MavenSearchRepositoryConstants.NEXUS2_REPOSITORY_URL + "/"
+                  + MavenSearchRepositoryConstants.NEXUS2_SNAPSHOT_REPOSITORY_LINK + "?r=snapshots" + "&g="
+                  + item.getGroupId() + "&a=" + item.getArtifactId() + "&v=" + item.getVersion() + "&e="
+                  + artifactLink.getExtension() + "&c=" + artifactLink.getClassifier());
+              downloadLinks.add(snapShotUrl);
+            } else {
+              downloadLinks.add(AbstractSearchResponse.createDownloadLink(
+                  MavenSearchRepositoryConstants.NEXUS2_REPOSITORY_URL + "/"
+                      + MavenSearchRepositoryConstants.NEXUS2_REPOSITORY_LINK,
+                  item.getGroupId(), item.getArtifactId(), item.getVersion(),
+                  "-" + artifactLink.getClassifier() + "." + artifactLink.getExtension()));
+            }
+          }
+        }
+      }
+    }
+
+    return removeDuplicatedDownloadURLs(downloadLinks);
+  }
+
+  @Override
+  @JsonIgnore
+  public String retrieveJsonResponse(ServerCredentials serverCredentials, String groupId)
+      throws RestSearchResponseException {
+
+    String targetLink = retrieveRestSearchApiTargetLink(serverCredentials.getBaseUrl(), groupId);
+
+    return retrieveJsonResponseWithAuthentication(targetLink, getRepositoryType(), serverCredentials);
+  }
+
+  @Override
+  public MavenSearchRepositoryType getRepositoryType() {
+
+    return MavenSearchRepositoryType.NEXUS2;
+  }
+
+  @Override
+  public String retrieveRestSearchApiTargetLink(String repositoryUrl, String groupId) {
+
+    String rootUrl = AbstractSearchResponse.createRootURL(repositoryUrl);
+    if (rootUrl != null) {
+      return rootUrl + "/" + MavenSearchRepositoryConstants.NEXUS2_REST_SEARCH_API_PATH + "?q=" + groupId;
+    } else {
+      return null;
+    }
+
+  }
+}
diff --git a/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/mavensearch/to/model/nexus2/Nexus2SearchResponseArtifactHits.java b/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/mavensearch/to/model/nexus2/Nexus2SearchResponseArtifactHits.java
new file mode 100644
index 0000000000..209cf994fb
--- /dev/null
+++ b/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/mavensearch/to/model/nexus2/Nexus2SearchResponseArtifactHits.java
@@ -0,0 +1,18 @@
+package com.devonfw.cobigen.retriever.mavensearch.to.model.nexus2;
+
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Nexus search response artifacthits model
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+class Nexus2SearchResponseArtifactHits {
+
+  /** artifactLinks */
+  @JsonProperty("artifactLinks")
+  public List<Nexus2SearchResponseArtifactLinks> artifactLinks;
+
+}
diff --git a/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/mavensearch/to/model/nexus2/Nexus2SearchResponseArtifactLinks.java b/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/mavensearch/to/model/nexus2/Nexus2SearchResponseArtifactLinks.java
new file mode 100644
index 0000000000..82499898bc
--- /dev/null
+++ b/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/mavensearch/to/model/nexus2/Nexus2SearchResponseArtifactLinks.java
@@ -0,0 +1,33 @@
+package com.devonfw.cobigen.retriever.mavensearch.to.model.nexus2;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Nexus 2 search response artifact links model
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+class Nexus2SearchResponseArtifactLinks {
+
+  @JsonProperty("extension")
+  private String extension;
+
+  /**
+   * @return extension
+   */
+  public String getExtension() {
+
+    return this.extension;
+  }
+
+  @JsonProperty("classifier")
+  private String classifier;
+
+  /**
+   * @return classifier
+   */
+  public String getClassifier() {
+
+    return this.classifier;
+  }
+}
diff --git a/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/mavensearch/to/model/nexus2/Nexus2SearchResponseData.java b/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/mavensearch/to/model/nexus2/Nexus2SearchResponseData.java
new file mode 100644
index 0000000000..859e4d6759
--- /dev/null
+++ b/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/mavensearch/to/model/nexus2/Nexus2SearchResponseData.java
@@ -0,0 +1,54 @@
+package com.devonfw.cobigen.retriever.mavensearch.to.model.nexus2;
+
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Nexus2 search response data model
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+class Nexus2SearchResponseData {
+
+  /** groupId */
+  @JsonProperty("groupId")
+  private String groupId;
+
+  /** artifactId */
+  @JsonProperty("artifactId")
+  private String artifactId;
+
+  /** version */
+  @JsonProperty("version")
+  private String version;
+
+  /** artifactHits */
+  @JsonProperty("artifactHits")
+  public List<Nexus2SearchResponseArtifactHits> artifactHits;
+
+  /**
+   * @return groupId
+   */
+  public String getGroupId() {
+
+    return this.groupId;
+  }
+
+  /**
+   * @return artifactId
+   */
+  public String getArtifactId() {
+
+    return this.artifactId;
+  }
+
+  /**
+   * @return version
+   */
+  public String getVersion() {
+
+    return this.version;
+  }
+
+}
diff --git a/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/mavensearch/to/model/nexus3/Nexus3SearchResponse.java b/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/mavensearch/to/model/nexus3/Nexus3SearchResponse.java
new file mode 100644
index 0000000000..48c848f83f
--- /dev/null
+++ b/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/mavensearch/to/model/nexus3/Nexus3SearchResponse.java
@@ -0,0 +1,84 @@
+package com.devonfw.cobigen.retriever.mavensearch.to.model.nexus3;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.devonfw.cobigen.api.constants.ConfigurationConstants;
+import com.devonfw.cobigen.retriever.mavensearch.constants.MavenSearchRepositoryConstants;
+import com.devonfw.cobigen.retriever.mavensearch.constants.MavenSearchRepositoryType;
+import com.devonfw.cobigen.retriever.mavensearch.exception.RestSearchResponseException;
+import com.devonfw.cobigen.retriever.mavensearch.to.model.AbstractSearchResponse;
+import com.devonfw.cobigen.retriever.mavensearch.to.model.ServerCredentials;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Json model for nexus3 Search REST API response
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class Nexus3SearchResponse extends AbstractSearchResponse {
+
+  /** Logger instance. */
+  @JsonIgnore
+  private static final Logger LOG = LoggerFactory.getLogger(Nexus3SearchResponse.class);
+
+  /** items */
+  @JsonProperty("items")
+  private List<Nexus3SearchResponseItem> items;
+
+  @Override
+  @JsonIgnore
+  public List<URL> retrieveTemplateSetXmlDownloadURLs() throws MalformedURLException {
+
+    List<URL> downloadLinks = new ArrayList<>();
+
+    if (this.items == null) {
+      LOG.debug("The {} response was empty.", getRepositoryType());
+      return downloadLinks;
+    }
+
+    for (Nexus3SearchResponseItem item : this.items) {
+      for (Nexus3SearchResponseAsset asset : item.assets) {
+        if (asset.downloadUrl.endsWith(ConfigurationConstants.TEMPLATE_SET_CONFIG_FILENAME)) {
+          downloadLinks.add(new URL(asset.downloadUrl));
+        }
+      }
+    }
+
+    return removeDuplicatedDownloadURLs(downloadLinks);
+  }
+
+  @Override
+  @JsonIgnore
+  public String retrieveJsonResponse(ServerCredentials serverCredentials, String groupId)
+      throws RestSearchResponseException {
+
+    String targetLink = retrieveRestSearchApiTargetLink(serverCredentials.getBaseUrl(), groupId);
+
+    return retrieveJsonResponseWithAuthentication(targetLink, getRepositoryType(), serverCredentials);
+  }
+
+  @Override
+  public MavenSearchRepositoryType getRepositoryType() {
+
+    return MavenSearchRepositoryType.NEXUS3;
+  }
+
+  @Override
+  public String retrieveRestSearchApiTargetLink(String repositoryUrl, String groupId) {
+
+    String rootUrl = AbstractSearchResponse.createRootURL(repositoryUrl);
+    if (rootUrl != null) {
+      return rootUrl + "/" + MavenSearchRepositoryConstants.NEXUS3_REST_SEARCH_API_PATH + "?repository=maven-central"
+          + "&group=" + groupId;
+    } else {
+      return null;
+    }
+  }
+}
diff --git a/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/mavensearch/to/model/nexus3/Nexus3SearchResponseAsset.java b/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/mavensearch/to/model/nexus3/Nexus3SearchResponseAsset.java
new file mode 100644
index 0000000000..8cc1082ecb
--- /dev/null
+++ b/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/mavensearch/to/model/nexus3/Nexus3SearchResponseAsset.java
@@ -0,0 +1,16 @@
+package com.devonfw.cobigen.retriever.mavensearch.to.model.nexus3;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Nexus3 search response asset model
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+class Nexus3SearchResponseAsset {
+
+  /** downloadUrl */
+  @JsonProperty("downloadUrl")
+  public String downloadUrl;
+
+}
diff --git a/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/mavensearch/to/model/nexus3/Nexus3SearchResponseItem.java b/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/mavensearch/to/model/nexus3/Nexus3SearchResponseItem.java
new file mode 100644
index 0000000000..be4ceab026
--- /dev/null
+++ b/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/mavensearch/to/model/nexus3/Nexus3SearchResponseItem.java
@@ -0,0 +1,18 @@
+package com.devonfw.cobigen.retriever.mavensearch.to.model.nexus3;
+
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Nexus3 search response item model
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+class Nexus3SearchResponseItem {
+
+  /** artifactHits */
+  @JsonProperty("assets")
+  public List<Nexus3SearchResponseAsset> assets;
+
+}
diff --git a/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/settings/MavenMirror.java b/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/settings/MavenMirror.java
new file mode 100644
index 0000000000..f2a36b726b
--- /dev/null
+++ b/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/settings/MavenMirror.java
@@ -0,0 +1,174 @@
+package com.devonfw.cobigen.retriever.settings;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.devonfw.cobigen.retriever.settings.to.model.MavenSettingsMirrorModel;
+import com.devonfw.cobigen.retriever.settings.to.model.MavenSettingsRepositoryModel;
+
+/**
+ * Class to operate with mirrors specified in maven's settings.xml
+ */
+public class MavenMirror {
+
+  /** Logger instance. */
+  private static final Logger LOG = LoggerFactory.getLogger(MavenMirror.class);
+
+  /** Constant for the wildcard character */
+  private static final String WILDCARD = "*";
+
+  /** Constant for the external wildcard */
+  private static final String EXTERNAL_WILDCARD = "external:*";
+
+  /** Constant for the external http wildcard */
+  private static final String EXTERNAL_HTTP_WILDCARD = "external:http:*";
+
+  /**
+   * Replaces urls of repositories with the urls of their mirrors if available
+   *
+   * @param repositories list of repositories of maven's settings.xml
+   * @param mirrors list of mirrors of maven's settings.xml
+   *
+   *        Important: The order of the mirrors is important! There can be at most one mirror for a given repository.
+   *        Maven will not aggregate the mirrors but simply picks the first match. Take a look here:
+   *        https://maven.apache.org/guides/mini/guide-mirror-settings.html
+   */
+  public static void injectMirrorUrl(List<MavenSettingsRepositoryModel> repositories,
+      List<MavenSettingsMirrorModel> mirrors) {
+
+    LOG.info("Injecting mirror urls into repositories");
+
+    if (mirrors == null || repositories == null) {
+      return;
+    }
+
+    for (MavenSettingsRepositoryModel r : repositories) {
+      for (MavenSettingsMirrorModel m : mirrors) {
+        if (matchPattern(r, m.getMirrorOf())) {
+          r.setUrl(m.getUrl());
+          break;
+        }
+      }
+    }
+  }
+
+  /**
+   * Code was taken from here:
+   * https://github.com/apache/maven/blob/c3cf29438e3d65d6ee5c5726f8611af99d9a649a/maven-compat/src/main/java/org/apache/maven/repository/DefaultMirrorSelector.java
+   *
+   * This method checks if the pattern of the mirror (mirrorOf) matches the repository. Valid patterns:
+   * <ul>
+   * <li>{@code *} = everything,</li>
+   * <li>{@code external:*} = everything not on the localhost and not file based,</li>
+   * <li>{@code external:http:*} = any repository not on the localhost using HTTP,</li>
+   * <li>{@code repo,repo1} = {@code repo} or {@code repo1},</li>
+   * <li>{@code *,!repo1} = everything except {@code repo1}.</li>
+   * </ul>
+   *
+   * @param repository repository which will be checked
+   * @param pattern pattern which will be used to determine if the repository id matches this pattern
+   *
+   * @return true if the repository is a match to this pattern.
+   */
+  private static boolean matchPattern(MavenSettingsRepositoryModel repository, String pattern) {
+
+    boolean result = false;
+    String originalId = repository.getId();
+
+    // simple checks first to short circuit processing below.
+    if (WILDCARD.equals(pattern) || pattern.equals(originalId)) {
+      result = true;
+    } else {
+      // process the list
+      String[] repos = pattern.split(",");
+      for (String repo : repos) {
+        repo = repo.trim();
+
+        // see if this is a negative match
+        if (repo.length() > 1 && repo.startsWith("!")) {
+          if (repo.substring(1).equals(originalId)) {
+            // explicitly exclude. Set result and stop processing.
+            result = false;
+            break;
+          }
+        }
+        // check for exact match
+        else if (repo.equals(originalId)) {
+          result = true;
+          break;
+        }
+        // check for external:*
+        else if (EXTERNAL_WILDCARD.equals(repo) && isExternalRepo(repository)) {
+          result = true;
+          // don't stop processing in case a future segment explicitly excludes this repo
+        }
+        // check for external:http:*
+        else if (EXTERNAL_HTTP_WILDCARD.equals(repo) && isExternalHttpRepo(repository)) {
+          result = true;
+          // don't stop processing in case a future segment explicitly excludes this repo
+        } else if (WILDCARD.equals(repo)) {
+          result = true;
+          // don't stop processing in case a future segment explicitly excludes this repo
+        }
+      }
+    }
+    return result;
+  }
+
+  /**
+   * Code was taken from here:
+   * https://github.com/apache/maven/blob/c3cf29438e3d65d6ee5c5726f8611af99d9a649a/maven-compat/src/main/java/org/apache/maven/repository/DefaultMirrorSelector.java
+   * Checks the URL to see if this repository refers to an external repository
+   *
+   * @param repository
+   * @return true if external.
+   */
+  private static boolean isExternalRepo(MavenSettingsRepositoryModel repository) {
+
+    try {
+      URL url = new URL(repository.getUrl().toString());
+      return !(isLocal(url.getHost()) || url.getProtocol().equals("file"));
+    } catch (MalformedURLException e) {
+      return false;
+    }
+  }
+
+  /**
+   * Code was taken from here:
+   * https://github.com/apache/maven/blob/c3cf29438e3d65d6ee5c5726f8611af99d9a649a/maven-compat/src/main/java/org/apache/maven/repository/DefaultMirrorSelector.java
+   *
+   * Checks the host url to see if refers to a local address
+   *
+   * @param host
+   * @return true if host refers to a local address, false otherwise
+   */
+  private static boolean isLocal(String host) {
+
+    return "localhost".equals(host) || "127.0.0.1".equals(host);
+  }
+
+  /**
+   * Code was taken from here:
+   * https://github.com/apache/maven/blob/c3cf29438e3d65d6ee5c5726f8611af99d9a649a/maven-compat/src/main/java/org/apache/maven/repository/DefaultMirrorSelector.java
+   *
+   * Checks the URL to see if this repository refers to a non-localhost repository using HTTP.
+   *
+   * @param repository
+   * @return true if external.
+   */
+  private static boolean isExternalHttpRepo(MavenSettingsRepositoryModel repository) {
+
+    try {
+      URL url = new URL(repository.getUrl().toString());
+      return ("http".equalsIgnoreCase(url.getProtocol()) || "dav".equalsIgnoreCase(url.getProtocol())
+          || "dav:http".equalsIgnoreCase(url.getProtocol()) || "dav+http".equalsIgnoreCase(url.getProtocol()))
+          && !isLocal(url.getHost());
+    } catch (MalformedURLException e) {
+      return false;
+    }
+  }
+}
diff --git a/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/settings/MavenProxy.java b/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/settings/MavenProxy.java
new file mode 100644
index 0000000000..d7a0c1118f
--- /dev/null
+++ b/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/settings/MavenProxy.java
@@ -0,0 +1,71 @@
+package com.devonfw.cobigen.retriever.settings;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.StringTokenizer;
+
+import com.devonfw.cobigen.retriever.settings.to.model.MavenSettingsProxyModel;
+import com.devonfw.cobigen.retriever.settings.to.model.MavenSettingsRepositoryModel;
+
+/**
+ * Class to operate with {@link MavenSettingsProxyModel}s specified in maven's settings.xml
+ */
+public class MavenProxy {
+
+  /**
+   * Obtains a list of {@link MavenSettingsRepositoryModel} which are using the given {@link MavenSettingsProxyModel}
+   *
+   * @param repositories list of all active {@link MavenSettingsRepositoryModel}s
+   * @param proxy the active {@link MavenSettingsProxyModel}
+   * @param withProxies boolean when set true it delivers repositories with proxies, when set false otherwise
+   * @return a list of all {@link MavenSettingsRepositoryModel}s, which are using the given proxy
+   */
+  public static List<MavenSettingsRepositoryModel> obtainRepositories(List<MavenSettingsRepositoryModel> repositories,
+      MavenSettingsProxyModel proxy, boolean withProxies) {
+
+    List<MavenSettingsRepositoryModel> result = new ArrayList<>();
+
+    for (MavenSettingsRepositoryModel r : repositories) {
+      if (withProxies == !validateNonProxyHosts(proxy, r.getUrl())) {
+        result.add(r);
+      }
+    }
+    return result;
+  }
+
+  /**
+   * Code was taken from here:
+   * https://maven.apache.org/wagon/apidocs/src-html/org/apache/maven/wagon/proxy/ProxyUtils.html#line.27
+   *
+   * Check if the specified host is in the list of non proxy hosts.
+   *
+   * @param proxy the proxy info object contains set of properties.
+   * @param targetHost the target hostname
+   * @return true if the hostname is in the list of non proxy hosts, false otherwise.
+   */
+  private static boolean validateNonProxyHosts(MavenSettingsProxyModel proxy, String targetHost) {
+
+    if (targetHost == null) {
+      targetHost = new String();
+    }
+    if (proxy == null) {
+      return false;
+    }
+    String nonProxyHosts = proxy.getNonProxyHosts();
+    if (nonProxyHosts == null) {
+      return false;
+    }
+
+    StringTokenizer tokenizer = new StringTokenizer(nonProxyHosts, "|");
+
+    while (tokenizer.hasMoreTokens()) {
+      String pattern = tokenizer.nextToken();
+      pattern = pattern.replaceAll("\\.", "\\\\.").replaceAll("\\*", ".*");
+      if (targetHost.matches(pattern)) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+}
diff --git a/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/settings/MavenSettings.java b/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/settings/MavenSettings.java
new file mode 100644
index 0000000000..38bc9650e2
--- /dev/null
+++ b/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/settings/MavenSettings.java
@@ -0,0 +1,196 @@
+package com.devonfw.cobigen.retriever.settings;
+
+import java.io.StringReader;
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.sonatype.plexus.components.cipher.DefaultPlexusCipher;
+import org.sonatype.plexus.components.cipher.PlexusCipherException;
+import org.sonatype.plexus.components.sec.dispatcher.DefaultSecDispatcher;
+import org.sonatype.plexus.components.sec.dispatcher.SecDispatcherException;
+import org.sonatype.plexus.components.sec.dispatcher.SecUtil;
+import org.sonatype.plexus.components.sec.dispatcher.model.SettingsSecurity;
+
+import com.devonfw.cobigen.api.exception.CobiGenRuntimeException;
+import com.devonfw.cobigen.retriever.settings.to.model.MavenSettingsModel;
+import com.devonfw.cobigen.retriever.settings.to.model.MavenSettingsProfileModel;
+import com.devonfw.cobigen.retriever.settings.to.model.MavenSettingsProxyModel;
+import com.devonfw.cobigen.retriever.settings.to.model.MavenSettingsRepositoryModel;
+
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Unmarshaller;
+
+/**
+ * Class to operate with maven's settings.xml
+ */
+public class MavenSettings {
+
+  /** Logger instance. */
+  private static final Logger LOG = LoggerFactory.getLogger(MavenSettings.class);
+
+  /**
+   * Retrieves a list of {@link MavenSettingsRepositoryModel} from active profiles with injected mirror URLs
+   *
+   * @param mavenSettings maven's settings.xml as a string
+   * @return list of {@link MavenSettingsRepositoryModel} from active profiles with injected mirror URLs
+   */
+  public static List<MavenSettingsRepositoryModel> retrieveRepositoriesFromMavenSettings(String mavenSettings) {
+
+    MavenSettingsModel model = generateMavenSettingsModel(mavenSettings);
+
+    List<MavenSettingsRepositoryModel> activeRepos = new LinkedList<>();
+
+    activeRepos = retrieveRepositoriesOfActiveProfiles(model);
+
+    if (model.getMirrors() == null) {
+      return activeRepos;
+    }
+
+    MavenMirror.injectMirrorUrl(activeRepos, model.getMirrors().getMirrorList());
+
+    return activeRepos;
+  }
+
+  /**
+   * Determines the active {@link MavenSettingsProxyModel} from the {@link MavenSettingsModel}
+   *
+   * @param model {@link MavenSettingsModel}, on which maven's settings.xml has been mapped on
+   * @return the active {@link MavenSettingsProxyModel} or null if their is no active one
+   */
+  public static MavenSettingsProxyModel determineActiveProxy(MavenSettingsModel model) {
+
+    if (model.getProxies() != null && model.getProxies().getProxyList() != null) {
+      for (MavenSettingsProxyModel proxy : model.getProxies().getProxyList()) {
+        if (proxy.getActive().equals("true")) {
+          return proxy;
+        }
+      }
+    }
+    return null;
+  }
+
+  /**
+   * Maps parts of maven's settings.xml to a Java class.
+   * Mapping includes: settings-, profiles-, profile-, repository-,
+   * repositories-, servers-, and server-elements
+   *
+   * @param mavenSettings string of maven's settings.xml
+   *
+   * @return Java class, on which parts of the settings.xml are mapped to
+   */
+  public static MavenSettingsModel generateMavenSettingsModel(String mavenSettings) {
+
+    LOG.info("Unmarshal maven's settings.xml");
+    mavenSettings = prepareSettings(mavenSettings);
+    try {
+      StringReader reader = new StringReader(mavenSettings);
+      JAXBContext jaxbContext = JAXBContext.newInstance(MavenSettingsModel.class);
+      Unmarshaller jaxbUnmarshaller = jaxbContext.createUnmarshaller();
+      MavenSettingsModel model = (MavenSettingsModel) jaxbUnmarshaller.unmarshal(reader);
+
+      LOG.debug("Successfully unmarshalled maven's settings.xml");
+      return model;
+    } catch (JAXBException e) {
+      throw new CobiGenRuntimeException("Unable to unmarshal maven's settings.xml", e);
+    }
+  }
+
+  /**
+   * @param mavenSettings string of maven's settings.xml
+   *
+   * @return string of prepared maven's settings, ready to be unmarshalled
+   */
+  private static String prepareSettings(String mavenSettings) {
+
+    String preparedMavenSettings = mavenSettings.substring(mavenSettings.indexOf("<settings"));
+    preparedMavenSettings = preparedMavenSettings.substring(preparedMavenSettings.indexOf(">") + 1);
+    preparedMavenSettings = "<settings>" + preparedMavenSettings;
+    return preparedMavenSettings;
+  }
+
+  /**
+   * Retrieves a list of active {@link MavenSettingsRepositoryModel}s
+   *
+   * @param model Class, on which maven's settings.xml have been mapped to
+   *
+   * @return List of {@link MavenSettingsRepositoryModel} of active profiles in maven's settings.xml
+   */
+  private static List<MavenSettingsRepositoryModel> retrieveRepositoriesOfActiveProfiles(MavenSettingsModel model) {
+
+    LOG.debug("Determining repositories of active profiles of maven's settings.xml");
+
+    List<MavenSettingsRepositoryModel> repositoriesOfActiveProfiles = new ArrayList<>();
+
+    List<MavenSettingsProfileModel> profilesList = new ArrayList<>();
+
+    List<String> activeProfileElementList = new ArrayList<>();
+
+    if (model.getActiveProfiles() != null && model.getActiveProfiles().getActiveProfilesList() != null) {
+      activeProfileElementList = model.getActiveProfiles().getActiveProfilesList();
+    }
+
+    if (model.getProfiles() != null && model.getProfiles().getProfileList() != null) {
+      profilesList = model.getProfiles().getProfileList();
+    }
+
+    for (MavenSettingsProfileModel profile : profilesList) {
+
+      if (profile.getRepositories() != null) {
+        // Check if profile was activated by the activeProfiles element
+        if (activeProfileElementList.contains(profile.getId())) {
+          repositoriesOfActiveProfiles.addAll(profile.getRepositories().getRepositoryList());
+        }
+        // Check if profile was activated by default
+        else if (profile.getActivation() != null && profile.getActivation().getActiveByDefault() != null
+            && profile.getActivation().getActiveByDefault().equals("true")) {
+          repositoriesOfActiveProfiles.addAll(profile.getRepositories().getRepositoryList());
+        }
+      }
+
+    }
+    return repositoriesOfActiveProfiles;
+  }
+
+  /**
+   * Reads the settings security file and returns a {@link SettingsSecurity}
+   *
+   * @param settingsSecurityFile absolute file path to the settings security file
+   * @return {@link SettingsSecurity}
+   * @throws SecDispatcherException if an error occurred while reading the settings security file
+   */
+  public static SettingsSecurity readSettingsSecurity(String settingsSecurityFile) throws SecDispatcherException {
+
+    return SecUtil.read(settingsSecurityFile, true);
+  }
+
+  /**
+   * Decrypts the encrypted password using the decrypted plain text master key
+   *
+   * @param encryptedPassword String of the encrypted password
+   * @param decryptedMasterKey String of the master key
+   * @return String of the decrypted password
+   * @throws PlexusCipherException if an error occurred during decryption
+   */
+  public static String decryptPassword(String encryptedPassword, String decryptedMasterKey)
+      throws PlexusCipherException {
+
+    DefaultPlexusCipher plexusCipher = new DefaultPlexusCipher();
+    return plexusCipher.decryptDecorated(encryptedPassword, decryptedMasterKey);
+  }
+
+  /**
+   * Decrypts the encrypted master password and returns the master password as a plain text
+   *
+   * @param encryptedMasterPassword String of the encrypted master password
+   * @return String of the decrypted master password
+   * @throws PlexusCipherException
+   */
+  public static String decryptMasterPassword(String encryptedMasterPassword) throws PlexusCipherException {
+
+    return decryptPassword(encryptedMasterPassword, DefaultSecDispatcher.SYSTEM_PROPERTY_SEC_LOCATION);
+  }
+}
diff --git a/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/settings/to/model/MavenSettingsActivationModel.java b/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/settings/to/model/MavenSettingsActivationModel.java
new file mode 100644
index 0000000000..6875e312e2
--- /dev/null
+++ b/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/settings/to/model/MavenSettingsActivationModel.java
@@ -0,0 +1,30 @@
+package com.devonfw.cobigen.retriever.settings.to.model;
+
+import jakarta.xml.bind.annotation.XmlElement;
+
+/**
+ * Class, which represents an activation element of maven's setting.xml
+ */
+public class MavenSettingsActivationModel {
+
+  /** Represents the active by default element of an activation model */
+  private String activeByDefault;
+
+  /**
+   * @return activeByDefault
+   */
+  public String getActiveByDefault() {
+
+    return this.activeByDefault;
+  }
+
+  /**
+   * @param activeByDefault new value of {@link #getactiveByDefault}.
+   */
+  @XmlElement
+  public void setActiveByDefault(String activeByDefault) {
+
+    this.activeByDefault = activeByDefault;
+  }
+
+}
diff --git a/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/settings/to/model/MavenSettingsActiveProfilesModel.java b/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/settings/to/model/MavenSettingsActiveProfilesModel.java
new file mode 100644
index 0000000000..a96864eb0a
--- /dev/null
+++ b/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/settings/to/model/MavenSettingsActiveProfilesModel.java
@@ -0,0 +1,35 @@
+package com.devonfw.cobigen.retriever.settings.to.model;
+
+import java.util.List;
+
+import jakarta.xml.bind.annotation.XmlElement;
+
+/**
+ * Class, which represents the activeProfiles element of maven's settings.xml
+ *
+ */
+public class MavenSettingsActiveProfilesModel {
+
+  /**
+   * Represents the activeProfile elements of activeProfiles
+   */
+  List<String> activeProfilesList;
+
+  /**
+   * @return activeProfilesList
+   */
+  public List<String> getActiveProfilesList() {
+
+    return this.activeProfilesList;
+  }
+
+  /**
+   * @param activeProfilesList new value of {@link #getactiveProfilesList}.
+   */
+  @XmlElement(name = "activeProfile")
+  public void setActiveProfilesList(List<String> activeProfilesList) {
+
+    this.activeProfilesList = activeProfilesList;
+  }
+
+}
diff --git a/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/settings/to/model/MavenSettingsMirrorModel.java b/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/settings/to/model/MavenSettingsMirrorModel.java
new file mode 100644
index 0000000000..9786c08a47
--- /dev/null
+++ b/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/settings/to/model/MavenSettingsMirrorModel.java
@@ -0,0 +1,90 @@
+package com.devonfw.cobigen.retriever.settings.to.model;
+
+import jakarta.xml.bind.annotation.XmlElement;
+
+/**
+ * Class, which represents a mirror element of the settings.xml
+ */
+public class MavenSettingsMirrorModel {
+
+  /** Represents the mirrorOf element of a mirror */
+  private String mirrorOf;
+
+  /** Represents the url element of a mirror */
+  private String url;
+
+  /** Represents the id element of a mirror */
+  private String id;
+
+  /** Represents the blocked element of a mirror */
+  private String blocked;
+
+  /**
+   * @return mirrorOf
+   */
+  public String getMirrorOf() {
+
+    return this.mirrorOf;
+  }
+
+  /**
+   * @param mirrorOf new value of {@link #getmirrorOf}.
+   */
+  @XmlElement(name = "mirrorOf")
+  public void setMirrorOf(String mirrorOf) {
+
+    this.mirrorOf = mirrorOf;
+  }
+
+  /**
+   * @return url
+   */
+  public String getUrl() {
+
+    return this.url;
+  }
+
+  /**
+   * @param url new value of {@link #geturl}.
+   */
+  @XmlElement(name = "url")
+  public void setUrl(String url) {
+
+    this.url = url;
+  }
+
+  /**
+   * @return id
+   */
+  public String getId() {
+
+    return this.id;
+  }
+
+  /**
+   * @param id new value of {@link #getid}.
+   */
+  @XmlElement(name = "id")
+  public void setId(String id) {
+
+    this.id = id;
+  }
+
+  /**
+   * @return blocked
+   */
+  public String getBlocked() {
+
+    return this.blocked;
+  }
+
+  /**
+   * @param blocked new value of {@link #getblocked}.
+   */
+  @XmlElement(name = "blocked")
+  public void setBlocked(String blocked) {
+
+    this.blocked = blocked;
+  }
+
+}
diff --git a/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/settings/to/model/MavenSettingsMirrorsModel.java b/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/settings/to/model/MavenSettingsMirrorsModel.java
new file mode 100644
index 0000000000..337f42bcfe
--- /dev/null
+++ b/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/settings/to/model/MavenSettingsMirrorsModel.java
@@ -0,0 +1,32 @@
+package com.devonfw.cobigen.retriever.settings.to.model;
+
+import java.util.List;
+
+import jakarta.xml.bind.annotation.XmlElement;
+
+/**
+ * Class, which represents the mirrors element of the settings.xml
+ */
+public class MavenSettingsMirrorsModel {
+
+  /** Represents the mirror list element in maven's settings.xml */
+  private List<MavenSettingsMirrorModel> mirrorList;
+
+  /**
+   * @return mirrorList
+   */
+  public List<MavenSettingsMirrorModel> getMirrorList() {
+
+    return this.mirrorList;
+  }
+
+  /**
+   * @param mirrorList new value of {@link #getmirrorList}.
+   */
+  @XmlElement(name = "mirror")
+  public void setMirrorList(List<MavenSettingsMirrorModel> mirrorList) {
+
+    this.mirrorList = mirrorList;
+  }
+
+}
\ No newline at end of file
diff --git a/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/settings/to/model/MavenSettingsModel.java b/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/settings/to/model/MavenSettingsModel.java
new file mode 100644
index 0000000000..47586b97cf
--- /dev/null
+++ b/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/settings/to/model/MavenSettingsModel.java
@@ -0,0 +1,112 @@
+package com.devonfw.cobigen.retriever.settings.to.model;
+
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+
+/**
+ * Class, which represents the settings element of the settings.xml
+ */
+@XmlRootElement(name = "settings")
+public class MavenSettingsModel {
+
+  /** Represents the model element in maven's settings.xml */
+  private MavenSettingsProfilesModel profiles;
+
+  /** Represents the servers element in maven's settings.xml */
+  private MavenSettingsServersModel servers;
+
+  /** Represents the mirrors element in maven's settings.xml */
+  private MavenSettingsMirrorsModel mirrors;
+
+  /** Represents the mirrors element in maven's settings.xml */
+  private MavenSettingsProxiesModel proxies;
+
+  /** Represents the activeProfiles element in maven's settings.xml */
+  private MavenSettingsActiveProfilesModel activeProfiles;
+
+  /**
+   * @return profiles
+   */
+  public MavenSettingsProfilesModel getProfiles() {
+
+    return this.profiles;
+  }
+
+  /**
+   * @param profiles new value of {@link #getprofiles}.
+   */
+  @XmlElement(name = "profiles")
+  public void setProfiles(MavenSettingsProfilesModel profiles) {
+
+    this.profiles = profiles;
+  }
+
+  /**
+   * @return servers
+   */
+  public MavenSettingsServersModel getServers() {
+
+    return this.servers;
+  }
+
+  /**
+   * @param servers new value of {@link #getservers}.
+   */
+  @XmlElement(name = "servers")
+  public void setServers(MavenSettingsServersModel servers) {
+
+    this.servers = servers;
+  }
+
+  /**
+   * @return mirrors
+   */
+  public MavenSettingsMirrorsModel getMirrors() {
+
+    return this.mirrors;
+  }
+
+  /**
+   * @param mirrors new value of {@link #getmirrors}.
+   */
+  @XmlElement(name = "mirrors")
+  public void setMirrors(MavenSettingsMirrorsModel mirrors) {
+
+    this.mirrors = mirrors;
+  }
+
+  /**
+   * @return proxies
+   */
+  public MavenSettingsProxiesModel getProxies() {
+
+    return this.proxies;
+  }
+
+  /**
+   * @param proxies new value of {@link #getproxies}.
+   */
+  @XmlElement(name = "proxies")
+  public void setProxies(MavenSettingsProxiesModel proxies) {
+
+    this.proxies = proxies;
+  }
+
+  /**
+   * @return activeProfiles
+   */
+  public MavenSettingsActiveProfilesModel getActiveProfiles() {
+
+    return this.activeProfiles;
+  }
+
+  /**
+   * @param activeProfiles new value of {@link #getactiveProfiles}.
+   */
+  @XmlElement
+  public void setActiveProfiles(MavenSettingsActiveProfilesModel activeProfiles) {
+
+    this.activeProfiles = activeProfiles;
+  }
+
+}
diff --git a/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/settings/to/model/MavenSettingsProfileModel.java b/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/settings/to/model/MavenSettingsProfileModel.java
new file mode 100644
index 0000000000..699602e1f7
--- /dev/null
+++ b/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/settings/to/model/MavenSettingsProfileModel.java
@@ -0,0 +1,69 @@
+package com.devonfw.cobigen.retriever.settings.to.model;
+
+import jakarta.xml.bind.annotation.XmlElement;
+
+/**
+ * Class, which represents the profile element of the settings.xml
+ */
+public class MavenSettingsProfileModel {
+
+  /** Represents the repositories element in maven's settings.xml */
+  private MavenSettingsRepositoriesModel repositories;
+
+  /** Represents the activation element in maven's settings.xml */
+  private MavenSettingsActivationModel activation;
+
+  /** Id of the profile */
+  private String id;
+
+  /**
+   * @return repositories
+   */
+  public MavenSettingsRepositoriesModel getRepositories() {
+
+    return this.repositories;
+  }
+
+  /**
+   * @param repositories new value of {@link #getrepositories}.
+   */
+  @XmlElement(name = "repositories")
+  public void setRepositories(MavenSettingsRepositoriesModel repositories) {
+
+    this.repositories = repositories;
+  }
+
+  /**
+   * @return id
+   */
+  public String getId() {
+
+    return this.id;
+  }
+
+  /**
+   * @param id new value of {@link #getid}.
+   */
+  @XmlElement(name = "id")
+  public void setId(String id) {
+
+    this.id = id;
+  }
+
+  /**
+   * @return activation
+   */
+  public MavenSettingsActivationModel getActivation() {
+
+    return this.activation;
+  }
+
+  /**
+   * @param activation new value of {@link #getactivation}.
+   */
+  public void setActivation(MavenSettingsActivationModel activation) {
+
+    this.activation = activation;
+  }
+
+}
\ No newline at end of file
diff --git a/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/settings/to/model/MavenSettingsProfilesModel.java b/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/settings/to/model/MavenSettingsProfilesModel.java
new file mode 100644
index 0000000000..52a7adb5a3
--- /dev/null
+++ b/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/settings/to/model/MavenSettingsProfilesModel.java
@@ -0,0 +1,32 @@
+package com.devonfw.cobigen.retriever.settings.to.model;
+
+import java.util.List;
+
+import jakarta.xml.bind.annotation.XmlElement;
+
+/**
+ * Class, which represents a profiles element of the settings.xml
+ */
+public class MavenSettingsProfilesModel {
+
+  /** Represents profile elements in maven's settings.xml */
+  private List<MavenSettingsProfileModel> profileList;
+
+  /**
+   * @return profiles
+   */
+  public List<MavenSettingsProfileModel> getProfileList() {
+
+    return this.profileList;
+  }
+
+  /**
+   * @param profiles new value of {@link #getprofiles}.
+   */
+  @XmlElement(name = "profile")
+  public void setProfileList(List<MavenSettingsProfileModel> profiles) {
+
+    this.profileList = profiles;
+  }
+
+}
diff --git a/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/settings/to/model/MavenSettingsProxiesModel.java b/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/settings/to/model/MavenSettingsProxiesModel.java
new file mode 100644
index 0000000000..0faf45e466
--- /dev/null
+++ b/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/settings/to/model/MavenSettingsProxiesModel.java
@@ -0,0 +1,32 @@
+package com.devonfw.cobigen.retriever.settings.to.model;
+
+import java.util.List;
+
+import jakarta.xml.bind.annotation.XmlElement;
+
+/**
+ * Class, which represents the proxies element of the settings.xml
+ */
+public class MavenSettingsProxiesModel {
+
+  /** List of proxy elements contained in the proxies element */
+  private List<MavenSettingsProxyModel> proxyList;
+
+  /**
+   * @return proxyList
+   */
+  public List<MavenSettingsProxyModel> getProxyList() {
+
+    return this.proxyList;
+  }
+
+  /**
+   * @param proxyList new value of {@link #getproxyList}.
+   */
+  @XmlElement(name = "proxy")
+  public void setProxyList(List<MavenSettingsProxyModel> proxyList) {
+
+    this.proxyList = proxyList;
+  }
+
+}
diff --git a/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/settings/to/model/MavenSettingsProxyModel.java b/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/settings/to/model/MavenSettingsProxyModel.java
new file mode 100644
index 0000000000..27a903f910
--- /dev/null
+++ b/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/settings/to/model/MavenSettingsProxyModel.java
@@ -0,0 +1,130 @@
+package com.devonfw.cobigen.retriever.settings.to.model;
+
+import jakarta.xml.bind.annotation.XmlElement;
+
+/**
+ * Class, which represents a proxy element of the settings.xml
+ */
+public class MavenSettingsProxyModel {
+
+  /** Represents the id element of a mirror */
+  private String id;
+
+  /** Represents the active element of a mirror */
+  private String active;
+
+  /** Represents the protocol element of a mirror */
+  private String protocol;
+
+  /** Represents the host element of a mirror */
+  private String host;
+
+  /** Represents the port element of a mirror */
+  private String port;
+
+  /** Represents the nonProxyHosts element of a mirror */
+  private String nonProxyHosts;
+
+  /**
+   * @return id
+   */
+  public String getId() {
+
+    return this.id;
+  }
+
+  /**
+   * @param id new value of {@link #getid}.
+   */
+  @XmlElement(name = "id")
+  public void setId(String id) {
+
+    this.id = id;
+  }
+
+  /**
+   * @return active
+   */
+  public String getActive() {
+
+    return this.active;
+  }
+
+  /**
+   * @param active new value of {@link #getactive}.
+   */
+  @XmlElement(name = "active")
+  public void setActive(String active) {
+
+    this.active = active;
+  }
+
+  /**
+   * @return protocol
+   */
+  public String getProtocol() {
+
+    return this.protocol;
+  }
+
+  /**
+   * @param protocol new value of {@link #getprotocol}.
+   */
+  @XmlElement(name = "protocol")
+  public void setProtocol(String protocol) {
+
+    this.protocol = protocol;
+  }
+
+  /**
+   * @return host
+   */
+  public String getHost() {
+
+    return this.host;
+  }
+
+  /**
+   * @param host new value of {@link #gethost}.
+   */
+  @XmlElement(name = "host")
+  public void setHost(String host) {
+
+    this.host = host;
+  }
+
+  /**
+   * @return port
+   */
+  public String getPort() {
+
+    return this.port;
+  }
+
+  /**
+   * @param port new value of {@link #getport}.
+   */
+  @XmlElement(name = "port")
+  public void setPort(String port) {
+
+    this.port = port;
+  }
+
+  /**
+   * @return nonProxyHosts
+   */
+  public String getNonProxyHosts() {
+
+    return this.nonProxyHosts;
+  }
+
+  /**
+   * @param nonProxyHosts new value of {@link #getnonProxyHosts}.
+   */
+  @XmlElement(name = "nonProxyHosts")
+  public void setNonProxyHosts(String nonProxyHosts) {
+
+    this.nonProxyHosts = nonProxyHosts;
+  }
+
+}
\ No newline at end of file
diff --git a/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/settings/to/model/MavenSettingsRepositoriesModel.java b/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/settings/to/model/MavenSettingsRepositoriesModel.java
new file mode 100644
index 0000000000..ac4ecf3632
--- /dev/null
+++ b/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/settings/to/model/MavenSettingsRepositoriesModel.java
@@ -0,0 +1,36 @@
+package com.devonfw.cobigen.retriever.settings.to.model;
+
+import java.util.List;
+
+import jakarta.xml.bind.annotation.XmlElement;
+
+/**
+ * Class, which represents the repositories element of the settings.xml
+ *
+ */
+
+public class MavenSettingsRepositoriesModel {
+
+  /**
+   * Represents repository elements in maven's settings.xml
+   */
+  List<MavenSettingsRepositoryModel> repositoryList;
+
+  /**
+   * @return repository
+   */
+  public List<MavenSettingsRepositoryModel> getRepositoryList() {
+
+    return this.repositoryList;
+  }
+
+  /**
+   * @param repository new value of {@link #getrepository}.
+   */
+  @XmlElement(name = "repository")
+  public void setRepositoryList(List<MavenSettingsRepositoryModel> repository) {
+
+    this.repositoryList = repository;
+  }
+
+}
\ No newline at end of file
diff --git a/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/settings/to/model/MavenSettingsRepositoryModel.java b/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/settings/to/model/MavenSettingsRepositoryModel.java
new file mode 100644
index 0000000000..ab429ea17e
--- /dev/null
+++ b/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/settings/to/model/MavenSettingsRepositoryModel.java
@@ -0,0 +1,89 @@
+package com.devonfw.cobigen.retriever.settings.to.model;
+
+import jakarta.xml.bind.annotation.XmlElement;
+
+/**
+ * Class, which represents a repository element of the settings.xml
+ */
+public class MavenSettingsRepositoryModel {
+
+  /** Represents the id of a repository element in maven's settings.xml */
+  private String id;
+
+  /** Represents the name of a repository element in maven's settings.xml */
+  private String name;
+
+  /** Represents the url of a repository element in maven's settings.xml */
+  private String url;
+
+  /**
+   * The constructor.
+   */
+  public MavenSettingsRepositoryModel() {
+
+  }
+
+  /**
+   * The constructor. It is needed for tests. As a simple way to clone a list.
+   *
+   * @param model
+   */
+  public MavenSettingsRepositoryModel(MavenSettingsRepositoryModel model) {
+
+    this.id = model.getId();
+    this.name = model.getName();
+    this.url = model.getUrl();
+  }
+
+  /**
+   * @return id
+   */
+  public String getId() {
+
+    return this.id;
+  }
+
+  /**
+   * @param id new value of {@link #getid}.
+   */
+  @XmlElement(name = "id")
+  public void setId(String id) {
+
+    this.id = id;
+  }
+
+  /**
+   * @return name
+   */
+  public String getName() {
+
+    return this.name;
+  }
+
+  /**
+   * @param name new value of {@link #getname}.
+   */
+  @XmlElement(name = "name")
+  public void setName(String name) {
+
+    this.name = name;
+  }
+
+  /**
+   * @return url
+   */
+  public String getUrl() {
+
+    return this.url;
+  }
+
+  /**
+   * @param url new value of {@link #geturl}.
+   */
+  @XmlElement(name = "url")
+  public void setUrl(String url) {
+
+    this.url = url;
+  }
+
+}
\ No newline at end of file
diff --git a/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/settings/to/model/MavenSettingsServerModel.java b/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/settings/to/model/MavenSettingsServerModel.java
new file mode 100644
index 0000000000..d6d7229190
--- /dev/null
+++ b/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/settings/to/model/MavenSettingsServerModel.java
@@ -0,0 +1,70 @@
+package com.devonfw.cobigen.retriever.settings.to.model;
+
+import jakarta.xml.bind.annotation.XmlElement;
+
+/**
+ * Class, which represents a server element of the settings.xml
+ */
+public class MavenSettingsServerModel {
+
+  /** Represents the id of a server element in maven's settings.xml */
+  private String id;
+
+  /** Represents the username of a server element in maven's settings.xml */
+  private String username;
+
+  /** Represents the password of a server element in maven's settings.xml */
+  private String password;
+
+  /**
+   * @return id
+   */
+  @XmlElement(name = "id")
+  public String getId() {
+
+    return this.id;
+  }
+
+  /**
+   * @param id new value of {@link #getid}.
+   */
+  public void setId(String id) {
+
+    this.id = id;
+  }
+
+  /**
+   * @return username
+   */
+  public String getUsername() {
+
+    return this.username;
+  }
+
+  /**
+   * @param username new value of {@link #getusername}.
+   */
+  @XmlElement(name = "username")
+  public void setUsername(String username) {
+
+    this.username = username;
+  }
+
+  /**
+   * @return password
+   */
+  public String getPassword() {
+
+    return this.password;
+  }
+
+  /**
+   * @param password new value of {@link #getpassword}.
+   */
+  @XmlElement(name = "password")
+  public void setPassword(String password) {
+
+    this.password = password;
+  }
+
+}
\ No newline at end of file
diff --git a/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/settings/to/model/MavenSettingsServersModel.java b/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/settings/to/model/MavenSettingsServersModel.java
new file mode 100644
index 0000000000..bfc336d7eb
--- /dev/null
+++ b/cobigen/core-artifact-retriever/src/main/java/com/devonfw/cobigen/retriever/settings/to/model/MavenSettingsServersModel.java
@@ -0,0 +1,32 @@
+package com.devonfw.cobigen.retriever.settings.to.model;
+
+import java.util.List;
+
+import jakarta.xml.bind.annotation.XmlElement;
+
+/**
+ * Class, which represents the servers element of the settings.xml
+ */
+public class MavenSettingsServersModel {
+
+  /** Represents server elements in maven's settings.xml */
+  private List<MavenSettingsServerModel> serverList;
+
+  /**
+   * @return server
+   */
+  public List<MavenSettingsServerModel> getServerList() {
+
+    return this.serverList;
+  }
+
+  /**
+   * @param server new value of {@link #getserver}.
+   */
+  @XmlElement(name = "server")
+  public void setServerList(List<MavenSettingsServerModel> server) {
+
+    this.serverList = server;
+  }
+
+}
diff --git a/cobigen/core-artifact-retriever/src/test/java/com/devonfw/cobigen/retriever/ArtifactRetrieverTest.java b/cobigen/core-artifact-retriever/src/test/java/com/devonfw/cobigen/retriever/ArtifactRetrieverTest.java
new file mode 100644
index 0000000000..9936e73cee
--- /dev/null
+++ b/cobigen/core-artifact-retriever/src/test/java/com/devonfw/cobigen/retriever/ArtifactRetrieverTest.java
@@ -0,0 +1,116 @@
+package com.devonfw.cobigen.retriever;
+
+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
+import static com.github.tomakehurst.wiremock.client.WireMock.get;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlMatching;
+import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.IOException;
+import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.Arrays;
+import java.util.List;
+
+import org.junit.BeforeClass;
+import org.junit.Rule;
+import org.junit.Test;
+
+import com.github.tomakehurst.wiremock.junit.WireMockRule;
+
+/**
+ * Test class for ArtifactRetriever
+ *
+ */
+public class ArtifactRetrieverTest {
+
+  /**
+   * Test resource location
+   */
+  private final static String testdataRoot = "src/test/resources/testdata/unittest/ArtifactRetrieverTest";
+
+  /**
+   * Maven settings string without a proxy
+   */
+  private static String mavenSettingsNonProxy;
+
+  /**
+   * Maven settings string without a proxy
+   */
+  private static String mavenSettingsProxy;
+
+  /**
+   * WireMock rule to initialize
+   */
+  @Rule
+  public WireMockRule wireMockRule = new WireMockRule(options().disableRequestJournal());
+
+  /**
+   * Used to initialize data needed for the tests
+   *
+   * @throws Exception if reading the maven settings fails
+   */
+  @BeforeClass
+  public static void setUpClass() throws Exception {
+
+    mavenSettingsNonProxy = new String(Files.readAllBytes(Paths.get(testdataRoot).resolve("settingsNonProxy.xml")));
+    mavenSettingsProxy = new String(Files.readAllBytes(Paths.get(testdataRoot).resolve("settingsProxy.xml")));
+  }
+
+  /**
+   * Tests a retrieval of download URLs using using a settings.xml and basic authentication
+   *
+   * @throws IOException if test resource could not be read
+   */
+  @Test
+  public void testRetrieveTemplateSetXmlDownloadLinksWithBasicAuthentication() throws IOException {
+
+    this.wireMockRule.stubFor(get(urlMatching("/artifactory/api/search/gavc.*"))
+        .withBasicAuth("testUsername", "testPassword").willReturn(aResponse().withStatus(200)
+            .withBody(Files.readAllBytes(Paths.get(testdataRoot).resolve("jfrogJsonTest.json")))));
+
+    List<String> groupIds = Arrays.asList("com.devonfw.cobigen.templates");
+
+    List<URL> downloadUrls = ArtifactRetriever.retrieveTemplateSetXmlDownloadLinks(groupIds, mavenSettingsNonProxy);
+    assertThat(downloadUrls).contains(new URL(
+        "http://localhost:8080/artifactory/api/storage/libs-release-local/com/devonfw/cobigen/templates/crud-java-server-app/2021.08.001/crud-java-server-app-2021.08.001-template-set.xml"));
+  }
+
+  /**
+   * Tests a retrieval of download URLs using using a settings.xml without a proxy
+   *
+   * @throws IOException if test resource could not be read
+   */
+  @Test
+  public void testRetrieveTemplateSetXmlDownloadLinksWithoutProxy() throws IOException {
+
+    this.wireMockRule.stubFor(get(urlMatching("/artifactory/api/search/gavc.*")).willReturn(aResponse().withStatus(200)
+        .withBody(Files.readAllBytes(Paths.get(testdataRoot).resolve("jfrogJsonTest.json")))));
+
+    List<String> groupIds = Arrays.asList("com.devonfw.cobigen.templates");
+
+    List<URL> downloadUrls = ArtifactRetriever.retrieveTemplateSetXmlDownloadLinks(groupIds, mavenSettingsNonProxy);
+    assertThat(downloadUrls).contains(new URL(
+        "http://localhost:8080/artifactory/api/storage/libs-release-local/com/devonfw/cobigen/templates/crud-java-server-app/2021.08.001/crud-java-server-app-2021.08.001-template-set.xml"));
+  }
+
+  /**
+   * Tests a retrieval of download URLs using using a settings.xml with a proxy
+   *
+   * @throws IOException if test resource could not be read
+   */
+  @Test
+  public void testRetrieveTemplateSetXmlDownloadLinksWithProxy() throws IOException {
+
+    this.wireMockRule.stubFor(get(urlMatching("/artifactory/api/search/gavc.*")).willReturn(aResponse().withStatus(200)
+        .withBody(Files.readAllBytes(Paths.get(testdataRoot).resolve("jfrogJsonTest.json")))));
+
+    List<String> groupIds = Arrays.asList("com.devonfw.cobigen.templates");
+
+    List<URL> downloadUrls = ArtifactRetriever.retrieveTemplateSetXmlDownloadLinks(groupIds, mavenSettingsProxy);
+    assertThat(downloadUrls).contains(new URL(
+        "http://localhost:8080/artifactory/api/storage/libs-release-local/com/devonfw/cobigen/templates/crud-java-server-app/2021.08.001/crud-java-server-app-2021.08.001-template-set.xml"));
+  }
+
+}
diff --git a/cobigen/core-artifact-retriever/src/test/java/com/devonfw/cobigen/retriever/MavenMirrorTest.java b/cobigen/core-artifact-retriever/src/test/java/com/devonfw/cobigen/retriever/MavenMirrorTest.java
new file mode 100644
index 0000000000..98fe90b0c6
--- /dev/null
+++ b/cobigen/core-artifact-retriever/src/test/java/com/devonfw/cobigen/retriever/MavenMirrorTest.java
@@ -0,0 +1,201 @@
+package com.devonfw.cobigen.retriever;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import com.devonfw.cobigen.retriever.settings.MavenMirror;
+import com.devonfw.cobigen.retriever.settings.MavenSettings;
+import com.devonfw.cobigen.retriever.settings.to.model.MavenSettingsMirrorModel;
+import com.devonfw.cobigen.retriever.settings.to.model.MavenSettingsModel;
+import com.devonfw.cobigen.retriever.settings.to.model.MavenSettingsRepositoryModel;
+
+/**
+ * Test class for MavenMirror
+ */
+public class MavenMirrorTest {
+
+  /** Test data root path */
+  private static final String testdataRoot = "src/test/resources/testdata/unittest/MavenMirrorTest";
+
+  /** Repositories on which the tests are performed on */
+  private static List<MavenSettingsRepositoryModel> repositoriesList;
+
+  /** Mirrors on which the tests are performed on */
+  private static List<MavenSettingsMirrorModel> mirrorsList;
+
+  /**
+   * Used to initialize data needed for the tests
+   *
+   * @throws Exception if reading the maven settings fails
+   */
+  @BeforeClass
+  public static void setUpClass() throws Exception {
+
+    MavenSettingsModel model;
+    String content;
+
+    content = new String(Files.readAllBytes(Paths.get(testdataRoot).resolve("settings.xml")));
+    model = MavenSettings.generateMavenSettingsModel(content);
+
+    // Get all the repositories for the test
+    repositoriesList = new LinkedList<>();
+    repositoriesList.add(model.getProfiles().getProfileList().get(0).getRepositories().getRepositoryList().get(0));
+    repositoriesList.add(model.getProfiles().getProfileList().get(1).getRepositories().getRepositoryList().get(0));
+    repositoriesList.add(model.getProfiles().getProfileList().get(2).getRepositories().getRepositoryList().get(0));
+
+    // Get all the mirrors for the test
+    mirrorsList = new LinkedList<>();
+    mirrorsList.addAll(model.getMirrors().getMirrorList());
+
+  }
+
+  /**
+   * Tests the injectMirrorUrl method with the wildcard selector (*)
+   */
+  @Test
+  public void testInjectMirrorUrlMultipleMirrors() {
+
+    List<MavenSettingsRepositoryModel> repositoriesListForInjectionTest = cloneList();
+
+    List<MavenSettingsMirrorModel> mirrorList = new ArrayList<>();
+    mirrorList.add(mirrorsList.get(0));
+
+    MavenMirror.injectMirrorUrl(repositoriesListForInjectionTest, mirrorList);
+
+    assertThat(repositoriesListForInjectionTest.get(0).getUrl()).isEqualTo("http://0.0.0.0/");
+    assertThat(repositoriesListForInjectionTest.get(1).getUrl()).isEqualTo("http://0.0.0.0/");
+    assertThat(repositoriesListForInjectionTest.get(2).getUrl()).isEqualTo("http://0.0.0.0/");
+  }
+
+  /**
+   * Tests the injectInjectMirrorUrl method with a single selector (eg. only repo1)
+   */
+  @Test
+  public void testInjectMirrorUrlSingleSelector() {
+
+    List<MavenSettingsRepositoryModel> repositoriesListForInjectionTest = cloneList();
+
+    List<MavenSettingsMirrorModel> mirrorList = new ArrayList<>();
+    mirrorList.add(mirrorsList.get(1));
+
+    MavenMirror.injectMirrorUrl(repositoriesListForInjectionTest, mirrorList);
+
+    assertThat(repositoriesListForInjectionTest.get(0).getUrl()).isEqualTo("http://1.1.1.1/");
+    assertThat(repositoriesListForInjectionTest.get(1).getUrl())
+        .isEqualTo("https://s01.oss.sonatype.org/content/repositories/snapshots/");
+    assertThat(repositoriesListForInjectionTest.get(2).getUrl())
+        .isEqualTo("http://s01.oss.sonatype.org/content/repositories/snapshots/");
+  }
+
+  /**
+   * Tests the injectInjectMirrorUrl method with a multiple selector (eg. repo1, repo2)
+   */
+  @Test
+  public void testInjectMirrorUrlWithMultipleSelectors() {
+
+    List<MavenSettingsRepositoryModel> repositoriesListForInjectionTest = cloneList();
+
+    List<MavenSettingsMirrorModel> mirrorList = new ArrayList<>();
+    mirrorList.add(mirrorsList.get(2));
+
+    MavenMirror.injectMirrorUrl(repositoriesListForInjectionTest, mirrorList);
+
+    assertThat(repositoriesListForInjectionTest.get(0).getUrl()).isEqualTo("http://2.2.2.2/");
+    assertThat(repositoriesListForInjectionTest.get(1).getUrl()).isEqualTo("http://2.2.2.2/");
+    assertThat(repositoriesListForInjectionTest.get(2).getUrl())
+        .isEqualTo("http://s01.oss.sonatype.org/content/repositories/snapshots/");
+  }
+
+  /**
+   * Tests the injectInjectMirrorUrl method with a exclusion selector (eg. *,!repo1)
+   */
+  @Test
+  public void testInjectMirrorUrlWithExclusionSelector() {
+
+    List<MavenSettingsRepositoryModel> repositoriesListForInjectionTest = cloneList();
+
+    List<MavenSettingsMirrorModel> mirrorList = new ArrayList<>();
+    mirrorList.add(mirrorsList.get(3));
+
+    MavenMirror.injectMirrorUrl(repositoriesListForInjectionTest, mirrorList);
+    assertThat(repositoriesListForInjectionTest.get(0).getUrl()).isEqualTo("localhost");
+    assertThat(repositoriesListForInjectionTest.get(1).getUrl()).isEqualTo("http://3.3.3.3/");
+    assertThat(repositoriesListForInjectionTest.get(2).getUrl()).isEqualTo("http://3.3.3.3/");
+  }
+
+  /**
+   * Tests the injectInjectMirrorUrl method with an external selector (eg. external:*)
+   */
+  @Test
+  public void testInjectMirrorUrlWithExternalSelector() {
+
+    List<MavenSettingsRepositoryModel> repositoriesListForInjectionTest = cloneList();
+
+    List<MavenSettingsMirrorModel> mirrorList = new ArrayList<>();
+    mirrorList.add(mirrorsList.get(4));
+
+    MavenMirror.injectMirrorUrl(repositoriesListForInjectionTest, mirrorList);
+
+    assertThat(repositoriesListForInjectionTest.get(0).getUrl()).isEqualTo("localhost");
+    assertThat(repositoriesListForInjectionTest.get(1).getUrl()).isEqualTo("http://4.4.4.4/");
+    assertThat(repositoriesListForInjectionTest.get(2).getUrl()).isEqualTo("http://4.4.4.4/");
+  }
+
+  /**
+   * Tests the injectInjectMirrorUrl method with an extended external selector (eg. external:http:*)
+   */
+  @Test
+  public void testInjectMirrorUrlWithExtendedExternalSelector() {
+
+    List<MavenSettingsRepositoryModel> repositoriesListForInjectionTest = cloneList();
+
+    List<MavenSettingsMirrorModel> mirrorList = new ArrayList<>();
+    mirrorList.add(mirrorsList.get(5));
+
+    MavenMirror.injectMirrorUrl(repositoriesListForInjectionTest, mirrorList);
+
+    assertThat(repositoriesListForInjectionTest.get(0).getUrl()).isEqualTo("localhost");
+    assertThat(repositoriesListForInjectionTest.get(1).getUrl())
+        .isEqualTo("https://s01.oss.sonatype.org/content/repositories/snapshots/");
+    assertThat(repositoriesListForInjectionTest.get(2).getUrl()).isEqualTo("http://5.5.5.5/");
+  }
+
+  /**
+   * Tests the injectInjectMirrorUrl method with a multiple mirrors
+   */
+  @Test
+  public void testInjectMirrorUrlWithMultipleMirrors() {
+
+    List<MavenSettingsRepositoryModel> repositoriesListForInjectionTest = cloneList();
+
+    MavenMirror.injectMirrorUrl(repositoriesListForInjectionTest, mirrorsList);
+
+    assertThat(repositoriesListForInjectionTest.get(0).getUrl()).isEqualTo("http://0.0.0.0/");
+    assertThat(repositoriesListForInjectionTest.get(1).getUrl()).isEqualTo("http://0.0.0.0/");
+    assertThat(repositoriesListForInjectionTest.get(2).getUrl()).isEqualTo("http://0.0.0.0/");
+  }
+
+  /**
+   * This method creates a new deep copy of the repositoriesList. It is needed because each test method needs it's own
+   * list.
+   *
+   * @return a deep copy of repositoriesList
+   */
+  private static List<MavenSettingsRepositoryModel> cloneList() {
+
+    List<MavenSettingsRepositoryModel> result = new LinkedList<>();
+    for (MavenSettingsRepositoryModel r : repositoriesList) {
+      result.add(new MavenSettingsRepositoryModel(r));
+    }
+    return result;
+  }
+
+}
diff --git a/cobigen/core-artifact-retriever/src/test/java/com/devonfw/cobigen/retriever/MavenProxyTest.java b/cobigen/core-artifact-retriever/src/test/java/com/devonfw/cobigen/retriever/MavenProxyTest.java
new file mode 100644
index 0000000000..501209f117
--- /dev/null
+++ b/cobigen/core-artifact-retriever/src/test/java/com/devonfw/cobigen/retriever/MavenProxyTest.java
@@ -0,0 +1,120 @@
+package com.devonfw.cobigen.retriever;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import com.devonfw.cobigen.api.exception.CobiGenRuntimeException;
+import com.devonfw.cobigen.retriever.settings.MavenProxy;
+import com.devonfw.cobigen.retriever.settings.MavenSettings;
+import com.devonfw.cobigen.retriever.settings.to.model.MavenSettingsModel;
+import com.devonfw.cobigen.retriever.settings.to.model.MavenSettingsProxyModel;
+import com.devonfw.cobigen.retriever.settings.to.model.MavenSettingsRepositoryModel;
+
+/**
+ * Test class for MavenProxy
+ */
+public class MavenProxyTest {
+
+  /** Test data root path */
+  private static final String testdataRoot = "src/test/resources/testdata/unittest/MavenProxyTest";
+
+  /** Repositories on which the tests are performed on */
+  private static List<MavenSettingsRepositoryModel> repositoriesList;
+
+  /** Proxies, on which the tests are performed on */
+  private static List<MavenSettingsProxyModel> proxiesList;
+
+  /**
+   * Used to initialize data needed for the tests
+   */
+  @BeforeClass
+  public static void setUpClass() {
+
+    MavenSettingsModel model;
+    String content;
+    try {
+      content = new String(Files.readAllBytes(Paths.get(testdataRoot).resolve("settings.xml")));
+    } catch (IOException e) {
+      throw new CobiGenRuntimeException("Unable to read test settings.xml", e);
+    }
+    model = MavenSettings.generateMavenSettingsModel(content);
+
+    repositoriesList = new ArrayList<>();
+    proxiesList = new ArrayList<>();
+
+    // Get all the repositories for the test
+    repositoriesList = new ArrayList<>();
+    repositoriesList.addAll(model.getProfiles().getProfileList().get(0).getRepositories().getRepositoryList());
+    repositoriesList.addAll(model.getProfiles().getProfileList().get(1).getRepositories().getRepositoryList());
+    repositoriesList.addAll(model.getProfiles().getProfileList().get(2).getRepositories().getRepositoryList());
+
+    // Get all the mirrors for the test
+    proxiesList = new ArrayList<>();
+    proxiesList = new LinkedList<>();
+    proxiesList.addAll(model.getProxies().getProxyList());
+
+  }
+
+  /**
+   * Tests, whether a declaration with multiple nonProxyHosts is working
+   */
+  @Test
+  public void testObtainRepositoriesWithProxiesWithMultipleNonProxyHosts() {
+
+    List<MavenSettingsRepositoryModel> result = MavenProxy.obtainRepositories(repositoriesList, proxiesList.get(0),
+        true);
+
+    assertThat(result.size()).isEqualTo(1);
+    assertThat(result.get(0).getUrl()).isEqualTo("localhost");
+  }
+
+  /**
+   * Tests, whether a declaration with a wildcard in nonProxyHosts is working
+   */
+  @Test
+  public void testObtainRepositoriesWithProxiesWithWildcard() {
+
+    List<MavenSettingsRepositoryModel> result = MavenProxy.obtainRepositories(repositoriesList, proxiesList.get(1),
+        true);
+
+    assertThat(result.size()).isEqualTo(0);
+  }
+
+  /**
+   * Tests, whether repositories without proxies (withProxies=false) are returned, when using a wildcard
+   */
+  @Test
+  public void testObtainRepositoriesWithoutProxiesWithWildcard() {
+
+    List<MavenSettingsRepositoryModel> result = MavenProxy.obtainRepositories(repositoriesList, proxiesList.get(1),
+        false);
+
+    assertThat(result.size()).isEqualTo(3);
+    assertThat(result.get(0).getUrl()).isEqualTo("localhost");
+    assertThat(result.get(1).getUrl()).isEqualTo("www.google.com");
+    assertThat(result.get(2).getUrl()).isEqualTo("test.example.com");
+  }
+
+  /**
+   * Tests, whether repositories without proxies (withProxies=false) are returned, when using a selector
+   */
+  @Test
+  public void testObtainRepositoriesWithoutProxiesWithSelector() {
+
+    List<MavenSettingsRepositoryModel> result = MavenProxy.obtainRepositories(repositoriesList, proxiesList.get(0),
+        false);
+
+    assertThat(result.size()).isEqualTo(2);
+    assertThat(result.get(0).getUrl()).isEqualTo("www.google.com");
+    assertThat(result.get(1).getUrl()).isEqualTo("test.example.com");
+  }
+}
diff --git a/cobigen/core-artifact-retriever/src/test/java/com/devonfw/cobigen/retriever/MavenSettingsTest.java b/cobigen/core-artifact-retriever/src/test/java/com/devonfw/cobigen/retriever/MavenSettingsTest.java
new file mode 100644
index 0000000000..b0b0737190
--- /dev/null
+++ b/cobigen/core-artifact-retriever/src/test/java/com/devonfw/cobigen/retriever/MavenSettingsTest.java
@@ -0,0 +1,221 @@
+package com.devonfw.cobigen.retriever;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.List;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.sonatype.plexus.components.sec.dispatcher.model.SettingsSecurity;
+
+import com.devonfw.cobigen.api.exception.CobiGenRuntimeException;
+import com.devonfw.cobigen.retriever.settings.MavenSettings;
+import com.devonfw.cobigen.retriever.settings.to.model.MavenSettingsModel;
+import com.devonfw.cobigen.retriever.settings.to.model.MavenSettingsProxyModel;
+import com.devonfw.cobigen.retriever.settings.to.model.MavenSettingsRepositoryModel;
+
+/**
+ * Test class for MavenSettings
+ *
+ */
+public class MavenSettingsTest {
+
+  /** Test data root path */
+  private static final String testdataRoot = "src/test/resources/testdata/unittest/MavenSettingsTest";
+
+  /** Test model */
+  private static MavenSettingsModel model;
+
+  /** Content of the test setting.xmls */
+  private static String mavenSettings;
+
+  /**
+   * Used to initialize data needed for the tests
+   */
+  @BeforeClass
+  public static void setUpClass() {
+
+    String content;
+    try {
+      content = new String(Files.readAllBytes(Paths.get(testdataRoot).resolve("settings.xml")));
+    } catch (IOException e) {
+      throw new CobiGenRuntimeException("Unable to read test settings.xml", e);
+    }
+    model = MavenSettings.generateMavenSettingsModel(content);
+    mavenSettings = content;
+  }
+
+  /**
+   * Tests, whether the the repository elements of maven's settings.xml are mapped correctly to a java class
+   */
+  @Test
+  public void testGenerateMavenSettingsModelRepository() {
+
+    String testId = model.getProfiles().getProfileList().get(0).getRepositories().getRepositoryList().get(0).getId();
+    String testName = model.getProfiles().getProfileList().get(0).getRepositories().getRepositoryList().get(0)
+        .getName();
+    String testUrl = model.getProfiles().getProfileList().get(0).getRepositories().getRepositoryList().get(0).getUrl()
+        .toString();
+
+    assertThat(testId).isEqualTo("123");
+
+    assertThat(testName).isEqualTo("devonfw SNAPSHOT releases");
+
+    assertThat(testUrl).isEqualTo("https://s01.oss.sonatype.org/content/repositories/snapshots/");
+  }
+
+  /**
+   * Tests, whether the the activation element of a profile is mapped correctly to a java class
+   */
+  @Test
+  public void testGenerateMavenSettingsModelProfile() {
+
+    String activationStatus = model.getProfiles().getProfileList().get(0).getActivation().getActiveByDefault();
+
+    assertThat(activationStatus).isEqualTo("true");
+  }
+
+  /**
+   * Tests, whether the the activeProfiles element is mapped correctly to a java class
+   */
+  @Test
+  public void testGenerateMavenSettingsModelActiveProfiles() {
+
+    List<String> activeProfiles = model.getActiveProfiles().getActiveProfilesList();
+
+    assertThat(activeProfiles.get(0)).isEqualTo("profile-1");
+    assertThat(activeProfiles.get(1)).isEqualTo("profile-3");
+  }
+
+  /**
+   * Tests, whether the the server elements of maven's settings.xml are mapped correctly to a java class
+   */
+  @Test
+  public void testGenerateMavenSettingsModelServer() {
+
+    String testId = model.getServers().getServerList().get(0).getId();
+    String testUsername = model.getServers().getServerList().get(0).getUsername();
+    String testPassword = model.getServers().getServerList().get(0).getPassword();
+
+    assertThat(testId).isEqualTo("repository");
+
+    assertThat(testUsername).isEqualTo("testUsername");
+
+    assertThat(testPassword).isEqualTo("testPassword");
+  }
+
+  /**
+   * Tests, whether the the server elements of maven's settings.xml are mapped correctly to a java class
+   */
+  @Test
+  public void testGenerateMavenSettingsModelMirror() {
+
+    String mirrorOf = model.getMirrors().getMirrorList().get(0).getMirrorOf();
+    String url = model.getMirrors().getMirrorList().get(0).getUrl();
+    String id = model.getMirrors().getMirrorList().get(0).getId();
+    String blocked = model.getMirrors().getMirrorList().get(0).getBlocked();
+
+    assertThat(mirrorOf).isEqualTo("external:http:*");
+
+    assertThat(url).isEqualTo("http://0.0.0.0/");
+
+    assertThat(id).isEqualTo("maven-default-http-blocker");
+
+    assertThat(blocked).isEqualTo("true");
+  }
+
+  /**
+   * Tests, whether the the proxy elements of maven's settings.xml are mapped correctly to a java class
+   */
+  @Test
+  public void testGenerateMavenSettingsModelProxy() {
+
+    String id = model.getProxies().getProxyList().get(0).getId();
+    String active = model.getProxies().getProxyList().get(0).getActive();
+    String protocol = model.getProxies().getProxyList().get(0).getProtocol();
+    String host = model.getProxies().getProxyList().get(0).getHost();
+    String port = model.getProxies().getProxyList().get(0).getPort();
+    String nonProxyHosts = model.getProxies().getProxyList().get(0).getNonProxyHosts();
+
+    assertThat(id).isEqualTo("example-proxy2");
+
+    assertThat(active).isEqualTo("false");
+
+    assertThat(protocol).isEqualTo("https");
+
+    assertThat(host).isEqualTo("proxy.example.com");
+
+    assertThat(port).isEqualTo("8080");
+
+    assertThat(nonProxyHosts).isEqualTo("www.google.com|*.example.com");
+  }
+
+  /**
+   * Tests, whether the only active proxy is returned
+   */
+  @Test
+  public void testGetActiveProxy() {
+
+    MavenSettingsProxyModel result = MavenSettings.determineActiveProxy(model);
+
+    assertThat(result.getId()).isEqualTo("example-proxy");
+  }
+
+  /**
+   * Tests, whether only repositories of active profiles are returned
+   */
+  @Test
+  public void testGetRepositoriesFromMavenSettings() {
+
+    List<MavenSettingsRepositoryModel> result = MavenSettings.retrieveRepositoriesFromMavenSettings(mavenSettings);
+    assertThat(result.size()).isEqualTo(3);
+    assertThat(result.get(0).getId()).isEqualTo("123");
+    assertThat(result.get(1).getId()).isEqualTo("repository");
+    assertThat(result.get(2).getId()).isEqualTo("repository1");
+  }
+
+  /**
+   * Tests a simple read of the master password inside the settings security file
+   *
+   * @throws Exception
+   */
+  @Test
+  public void testReadSettingsSecurityMasterPasswordFromSecuritiesFile() throws Exception {
+
+    String securitiesFile = Paths.get(testdataRoot).resolve("settings-security.xml").toAbsolutePath().toString();
+    SettingsSecurity settingsSecurity = MavenSettings.readSettingsSecurity(securitiesFile);
+    assertThat(settingsSecurity.getMaster()).isEqualTo("{/1SNYthinCEHRwQkYnzyoqKp3rbjGyZg/LbW7tOFTEg=}");
+  }
+
+  /**
+   * Tests the decryption process of the settings security master password
+   *
+   * @throws Exception
+   */
+  @Test
+  public void testReadSettingsSecurityMasterPassword() throws Exception {
+
+    String decodedMasterPassword = MavenSettings
+        .decryptMasterPassword("{/1SNYthinCEHRwQkYnzyoqKp3rbjGyZg/LbW7tOFTEg=}");
+    assertThat(decodedMasterPassword).isEqualTo("testpassword");
+  }
+
+  /**
+   * Tests the decryption of a password using the decrypted master password as key
+   *
+   * @throws Exception
+   */
+  @Test
+  public void testReadSettingsPassword() throws Exception {
+
+    String decodedMasterPassword = MavenSettings
+        .decryptMasterPassword("{/1SNYthinCEHRwQkYnzyoqKp3rbjGyZg/LbW7tOFTEg=}");
+    String decodedPassword = MavenSettings.decryptPassword("{jrdiSuRPexMHvBd66Hsiy3nR1VpCc8TDREVCj+6AYrU=}",
+        decodedMasterPassword);
+    assertThat(decodedPassword).isEqualTo("thisisapassword");
+  }
+
+}
diff --git a/cobigen/core-artifact-retriever/src/test/java/com/devonfw/cobigen/retriever/unittest/MavenSearchArtifactRetrieverTest.java b/cobigen/core-artifact-retriever/src/test/java/com/devonfw/cobigen/retriever/unittest/MavenSearchArtifactRetrieverTest.java
new file mode 100644
index 0000000000..316058f4c6
--- /dev/null
+++ b/cobigen/core-artifact-retriever/src/test/java/com/devonfw/cobigen/retriever/unittest/MavenSearchArtifactRetrieverTest.java
@@ -0,0 +1,156 @@
+package com.devonfw.cobigen.retriever.unittest;
+
+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
+import static com.github.tomakehurst.wiremock.client.WireMock.get;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlMatching;
+import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.IOException;
+import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.List;
+
+import org.junit.Rule;
+import org.junit.Test;
+
+import com.devonfw.cobigen.retriever.mavensearch.MavenSearchArtifactRetriever;
+import com.github.tomakehurst.wiremock.junit.WireMockRule;
+
+/**
+ * Test class for {@link MavenSearchArtifactRetriever}
+ */
+public class MavenSearchArtifactRetrieverTest {
+
+  /**
+   * WireMock rule to initialize
+   */
+  @Rule
+  public WireMockRule wireMockRule = new WireMockRule(options().disableRequestJournal());
+
+  /** Testdata root path */
+  private static final String testdataRoot = "src/test/resources/testdata/unittest/MavenSearchArtifactRetrieverTest";
+
+  /**
+   * Tests if a request to maven search REST API returns a list of download URLs
+   *
+   * @throws IOException if an error occurred while reading the test json file
+   */
+  @Test
+  public void testMavenSearchRequestGetsValidDownloadLinks() throws IOException {
+
+    // given
+    List<URL> downloadList;
+
+    this.wireMockRule.stubFor(get(urlMatching("/solrsearch/select.*")).willReturn(aResponse().withStatus(200)
+        .withBody(Files.readAllBytes(Paths.get(testdataRoot).resolve("mavenJsonTest.json")))));
+
+    this.wireMockRule
+        .stubFor(get(urlMatching("/artifactory/api/search/gavc.*")).willReturn(aResponse().withStatus(404)));
+
+    this.wireMockRule
+        .stubFor(get(urlMatching("/service/local/lucene/search/.*")).willReturn(aResponse().withStatus(404)));
+
+    this.wireMockRule.stubFor(get(urlMatching("/service/rest/v1/search.*")).willReturn(aResponse().withStatus(404)));
+
+    // when
+    downloadList = MavenSearchArtifactRetriever.retrieveMavenArtifactDownloadUrls("http://localhost:8080", null, null,
+        "", 0, null, null, "com.devonfw.cobigen");
+
+    // then
+    assertThat(downloadList).contains(new URL(
+        "https://repo1.maven.org/maven2/com/devonfw/cobigen/templates/crud-java-server-app/2021.08.001/crud-java-server-app-2021.08.001-template-set.xml"));
+  }
+
+  /**
+   * Tests if a request to nexus2 search REST API returns a list of download URLs
+   *
+   * @throws IOException if an error occurred while reading the test json file
+   */
+  @Test
+  public void testNexus2SearchRequestGetsValidDownloadLinks() throws IOException {
+
+    // given
+    List<URL> downloadList;
+
+    this.wireMockRule.stubFor(get(urlMatching("/solrsearch/select.*")).willReturn(aResponse().withStatus(404)));
+
+    this.wireMockRule
+        .stubFor(get(urlMatching("/artifactory/api/search/gavc.*")).willReturn(aResponse().withStatus(404)));
+
+    this.wireMockRule.stubFor(get(urlMatching("/service/local/lucene/search.*")).willReturn(aResponse().withStatus(200)
+        .withBody(Files.readAllBytes(Paths.get(testdataRoot).resolve("nexus2JsonTest.json")))));
+
+    this.wireMockRule.stubFor(get(urlMatching("/service/rest/v1/search.*")).willReturn(aResponse().withStatus(404)));
+
+    // when
+    downloadList = MavenSearchArtifactRetriever.retrieveMavenArtifactDownloadUrls("http://localhost:8080", null, null,
+        "", 0, null, null, "com.devonfw.cobigen");
+
+    // then
+    assertThat(downloadList).contains(new URL(
+        "https://s01.oss.sonatype.org/service/local/repositories/releases/content/com/devonfw/cobigen/templates/crud-java-server-app/2021.08.001/crud-java-server-app-2021.08.001-template-set.xml"));
+  }
+
+  /**
+   * Tests if a request to nexus3 search REST API returns a list of download URLs
+   *
+   * @throws IOException if an error occurred while reading the test json file
+   */
+  @Test
+  public void testNexus3SearchRequestGetsValidDownloadLinks() throws IOException {
+
+    // given
+    List<URL> downloadList;
+
+    this.wireMockRule.stubFor(get(urlMatching("/solrsearch/select.*")).willReturn(aResponse().withStatus(404)));
+
+    this.wireMockRule
+        .stubFor(get(urlMatching("/artifactory/api/search/gavc.*")).willReturn(aResponse().withStatus(404)));
+
+    this.wireMockRule
+        .stubFor(get(urlMatching("/service/local/lucene/search/.*")).willReturn(aResponse().withStatus(404)));
+
+    this.wireMockRule.stubFor(get(urlMatching("/service/rest/v1/search.*")).willReturn(aResponse().withStatus(200)
+        .withBody(Files.readAllBytes(Paths.get(testdataRoot).resolve("nexus3JsonTest.json")))));
+
+    // when
+    downloadList = MavenSearchArtifactRetriever.retrieveMavenArtifactDownloadUrls("http://localhost:8080", null, null,
+        "", 0, null, null, "com.devonfw.cobigen");
+
+    // then
+    assertThat(downloadList).contains(new URL(
+        "http://localhost:8081/repository/com/devonfw/cobigen/templates/crud-java-server-app/2021.08.001/crud-java-server-app-2021.08.001-template-set.xml"));
+  }
+
+  /**
+   * Tests if a request to jfrog search REST API returns a list of download URLs
+   *
+   * @throws IOException if an error occurred while reading the test json file
+   */
+  @Test
+  public void testJfrogSearchRequestGetsValidDownloadLinks() throws IOException {
+
+    // given
+    List<URL> downloadList;
+
+    this.wireMockRule.stubFor(get(urlMatching("/solrsearch/select.*")).willReturn(aResponse().withStatus(404)));
+
+    this.wireMockRule.stubFor(get(urlMatching("/artifactory/api/search/gavc.*")).willReturn(aResponse().withStatus(200)
+        .withBody(Files.readAllBytes(Paths.get(testdataRoot).resolve("jfrogJsonTest.json")))));
+
+    this.wireMockRule
+        .stubFor(get(urlMatching("/service/local/lucene/search/.*")).willReturn(aResponse().withStatus(404)));
+
+    this.wireMockRule.stubFor(get(urlMatching("/service/rest/v1/search.*")).willReturn(aResponse().withStatus(404)));
+
+    // when
+    downloadList = MavenSearchArtifactRetriever.retrieveMavenArtifactDownloadUrls("http://localhost:8080", null, null,
+        "", 0, null, null, "com.devonfw.cobigen");
+
+    // then
+    assertThat(downloadList).contains(new URL(
+        "http://localhost:8081/artifactory/api/storage/libs-release-local/com/devonfw/cobigen/templates/crud-java-server-app/2021.08.001/crud-java-server-app-2021.08.001-template-set.xml"));
+  }
+}
diff --git a/cobigen/core-artifact-retriever/src/test/java/com/devonfw/cobigen/retriever/unittest/MavenSearchResponseTest.java b/cobigen/core-artifact-retriever/src/test/java/com/devonfw/cobigen/retriever/unittest/MavenSearchResponseTest.java
new file mode 100644
index 0000000000..4af5f8e2e0
--- /dev/null
+++ b/cobigen/core-artifact-retriever/src/test/java/com/devonfw/cobigen/retriever/unittest/MavenSearchResponseTest.java
@@ -0,0 +1,120 @@
+package com.devonfw.cobigen.retriever.unittest;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.IOException;
+import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.List;
+
+import org.junit.Test;
+
+import com.devonfw.cobigen.retriever.mavensearch.to.model.jfrog.JfrogSearchResponse;
+import com.devonfw.cobigen.retriever.mavensearch.to.model.maven.MavenSearchResponse;
+import com.devonfw.cobigen.retriever.mavensearch.to.model.nexus2.Nexus2SearchResponse;
+import com.devonfw.cobigen.retriever.mavensearch.to.model.nexus3.Nexus3SearchResponse;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+/**
+ * Test class for proper parsing of maven repository search responses
+ */
+public class MavenSearchResponseTest {
+
+  /** Testdata root path */
+  private static final String testdataRoot = "src/test/resources/testdata/unittest/MavenSearchResponseTest";
+
+  /**
+   * Tests if maven json response can properly be parsed and converted to a list of download URLs
+   *
+   * @throws IOException if an error occurred while reading the test json file
+   */
+  @Test
+  public void testMavenParseDownloadLinks() throws IOException {
+
+    // given
+    ObjectMapper mapper = new ObjectMapper();
+    MavenSearchResponse response = new MavenSearchResponse();
+
+    String jsonResponse = new String(Files.readAllBytes(Paths.get(testdataRoot).resolve("mavenJsonTest.json")));
+
+    response = mapper.readValue(jsonResponse, MavenSearchResponse.class);
+    // when
+    List<URL> downloadLinks = response.retrieveTemplateSetXmlDownloadURLs();
+
+    // then
+    assertThat(downloadLinks).contains(new URL(
+        "https://repo1.maven.org/maven2/com/devonfw/cobigen/templates/crud-java-server-app/2021.08.001/crud-java-server-app-2021.08.001-template-set.xml"));
+  }
+
+  /**
+   * Tests if nexus2 json response can properly be parsed and converted to a list of download URLs
+   *
+   * @throws IOException if an error occurred while reading the test json file
+   */
+  @Test
+  public void testNexus2ParseDownloadLinks() throws IOException {
+
+    // given
+    ObjectMapper mapper = new ObjectMapper();
+    Nexus2SearchResponse response = new Nexus2SearchResponse();
+
+    String jsonResponse = new String(Files.readAllBytes(Paths.get(testdataRoot).resolve("nexus2JsonTest.json")));
+
+    response = mapper.readValue(jsonResponse, Nexus2SearchResponse.class);
+
+    // when
+    List<URL> downloadLinks = response.retrieveTemplateSetXmlDownloadURLs();
+
+    // then
+    assertThat(downloadLinks).contains(new URL(
+        "https://s01.oss.sonatype.org/service/local/repositories/releases/content/com/devonfw/cobigen/templates/crud-java-server-app/2021.08.001/crud-java-server-app-2021.08.001-template-set.xml"));
+  }
+
+  /**
+   * Tests if nexus3 json response can properly be parsed and converted to a list of download URLs
+   *
+   * @throws IOException if an error occurred while reading the test json file
+   */
+  @Test
+  public void testNexus3ParseDownloadLinks() throws IOException {
+
+    // given
+    ObjectMapper mapper = new ObjectMapper();
+    Nexus3SearchResponse response = new Nexus3SearchResponse();
+
+    String jsonResponse = new String(Files.readAllBytes(Paths.get(testdataRoot).resolve("nexus3JsonTest.json")));
+
+    response = mapper.readValue(jsonResponse, Nexus3SearchResponse.class);
+
+    // when
+    List<URL> downloadLinks = response.retrieveTemplateSetXmlDownloadURLs();
+
+    // then
+    assertThat(downloadLinks).contains(new URL(
+        "http://localhost:8081/repository/com/devonfw/cobigen/templates/crud-java-server-app/2021.08.001/crud-java-server-app-2021.08.001-template-set.xml"));
+  }
+
+  /**
+   * Tests if jfrog json response can properly be parsed and converted to a list of download URLs
+   *
+   * @throws IOException if an error occurred while reading the test json file
+   */
+  @Test
+  public void testJfrogParseDownloadLinks() throws IOException {
+
+    // given
+    ObjectMapper mapper = new ObjectMapper();
+    JfrogSearchResponse response = new JfrogSearchResponse();
+
+    String jsonResponse = new String(Files.readAllBytes(Paths.get(testdataRoot).resolve("jfrogJsonTest.json")));
+
+    // when
+    response = mapper.readValue(jsonResponse, JfrogSearchResponse.class);
+    List<URL> downloadLinks = response.retrieveTemplateSetXmlDownloadURLs();
+
+    // then
+    assertThat(downloadLinks).contains(new URL(
+        "http://localhost:8081/artifactory/api/storage/libs-release-local/com/devonfw/cobigen/templates/crud-java-server-app/2021.08.001/crud-java-server-app-2021.08.001-template-set.xml"));
+  }
+}
diff --git a/cobigen/core-artifact-retriever/src/test/java/com/devonfw/cobigen/retriever/unittest/SearchResponseFactoryTest.java b/cobigen/core-artifact-retriever/src/test/java/com/devonfw/cobigen/retriever/unittest/SearchResponseFactoryTest.java
new file mode 100644
index 0000000000..f6d54f301a
--- /dev/null
+++ b/cobigen/core-artifact-retriever/src/test/java/com/devonfw/cobigen/retriever/unittest/SearchResponseFactoryTest.java
@@ -0,0 +1,245 @@
+package com.devonfw.cobigen.retriever.unittest;
+
+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
+import static com.github.tomakehurst.wiremock.client.WireMock.get;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlMatching;
+import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.IOException;
+import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+
+import org.junit.Rule;
+import org.junit.Test;
+
+import com.devonfw.cobigen.retriever.mavensearch.to.model.SearchResponseFactory;
+import com.devonfw.cobigen.retriever.mavensearch.to.model.ServerCredentials;
+import com.github.tomakehurst.wiremock.junit.WireMockRule;
+
+/**
+ * Test class for {@link SearchResponseFactory}
+ */
+public class SearchResponseFactoryTest {
+
+  /**
+   * WireMock rule to initialize
+   */
+  @Rule
+  public WireMockRule wireMockRule = new WireMockRule(options().disableRequestJournal());
+
+  /** Testdata root path */
+  private static final String testdataRoot = "src/test/resources/testdata/unittest/SearchResponseFactoryTest";
+
+  /**
+   * Tests if retrieving maven artifacts with an invalid link cancels the process and returns an empty list.
+   */
+  @Test
+  public void testRetrieveMavenArtifactsWithInvalidLinkCancelsAndReturnsEmptyList() {
+
+    ServerCredentials serverCredentials = new ServerCredentials("this/is/not/a/link", null, null, null, 0, "", "");
+    assertThat(SearchResponseFactory.searchArtifactDownloadLinks(serverCredentials, "test")).isEmpty();
+
+  }
+
+  /**
+   * Tests if retrieving maven artifacts with basic authentication returns a list of download urls
+   *
+   * @throws IOException if the test resource could not be read
+   */
+  @Test
+  public void testRetrieveMavenArtifactsWithBasicAuthenticationReturnsAResponse() throws IOException {
+
+    this.wireMockRule.stubFor(get(urlMatching("/solrsearch/select.*")).willReturn(aResponse().withStatus(200)
+        .withBody(Files.readAllBytes(Paths.get(testdataRoot).resolve("mavenJsonTest.json")))));
+
+    ServerCredentials serverCredentials = new ServerCredentials("http://localhost:8080", "testuser", "testpassword",
+        null, 0, "", "");
+    assertThat(SearchResponseFactory.searchArtifactDownloadLinks(serverCredentials, "test")).contains(new URL(
+        "https://repo1.maven.org/maven2/com/devonfw/cobigen/templates/crud-java-server-app/2021.08.001/crud-java-server-app-2021.08.001-template-set.xml"));
+
+  }
+
+  /**
+   * Tests if retrieving maven artifacts using a valid proxy returns a list of download URLs.
+   *
+   * @throws IOException if the test resource could not be read
+   */
+  @Test
+  public void testRetrieveMavenArtifactsWithProxyReturnsAResponse() throws IOException {
+
+    this.wireMockRule.stubFor(get(urlMatching("/solrsearch/select.*")).willReturn(aResponse().withStatus(200)
+        .withBody(Files.readAllBytes(Paths.get(testdataRoot).resolve("mavenJsonTest.json")))));
+
+    ServerCredentials serverCredentials = new ServerCredentials("http://localhost:8081", null, null, "localhost", 8080,
+        "", "");
+
+    assertThat(SearchResponseFactory.searchArtifactDownloadLinks(serverCredentials, "test")).contains(new URL(
+        "https://repo1.maven.org/maven2/com/devonfw/cobigen/templates/crud-java-server-app/2021.08.001/crud-java-server-app-2021.08.001-template-set.xml"));
+
+  }
+
+  /**
+   * Tests if retrieving maven artifacts using an invalid proxy name returns an empty list of download URLs.
+   *
+   * @throws IOException if the test resource could not be read
+   */
+  @Test
+  public void testRetrieveMavenArtifactsWithInvalidProxyNameReturnsAnEmptyList() throws IOException {
+
+    this.wireMockRule.stubFor(get(urlMatching("/solrsearch/select.*")).willReturn(aResponse().withStatus(200)));
+
+    ServerCredentials serverCredentials = new ServerCredentials("http://localhost:8081", null, null, "http://localhost",
+        8080, "", "");
+
+    assertThat(SearchResponseFactory.searchArtifactDownloadLinks(serverCredentials, "test")).isEmpty();
+
+  }
+
+  /**
+   * Tests if retrieving maven artifacts using empty proxy credentials returns an empty list of download URLs.
+   *
+   * @throws IOException if the test resource could not be read
+   */
+  @Test
+  public void testRetrieveMavenArtifactsWithEmptyProxyCredentialsReturnsAnEmptyList() throws IOException {
+
+    this.wireMockRule.stubFor(get(urlMatching("/solrsearch/select.*")).willReturn(aResponse().withStatus(200)));
+
+    ServerCredentials serverCredentials = new ServerCredentials("http://localhost:8081", null, null, "http://localhost",
+        8080, null, null);
+
+    assertThat(SearchResponseFactory.searchArtifactDownloadLinks(serverCredentials, "test")).isEmpty();
+
+  }
+
+  /**
+   * Tests if retrieving maven artifacts using invalid proxy credentials returns an empty list of download URLs.
+   *
+   * @throws IOException if the test resource could not be read
+   */
+  @Test
+  public void testRetrieveMavenArtifactsWithInvalidProxyCredentialsReturnsAnEmptyList() throws IOException {
+
+    this.wireMockRule.stubFor(get(urlMatching("/solrsearch/select.*")).willReturn(aResponse().withStatus(401)));
+
+    ServerCredentials serverCredentials = new ServerCredentials("http://localhost:8081", null, null, "localhost", 8080,
+        "badusername", "badpassword");
+
+    assertThat(SearchResponseFactory.searchArtifactDownloadLinks(serverCredentials, "test")).isEmpty();
+
+  }
+
+  /**
+   * Tests if retrieving maven artifacts with an invalid username and password and returns an empty list of download
+   * URLs.
+   */
+  @Test
+  public void testRetrieveMavenArtifactsWithInvalidBasicCredentialsReturnsEmptyList() {
+
+    this.wireMockRule.stubFor(get(urlMatching("/solrsearch/select.*")).willReturn(aResponse().withStatus(401)));
+
+    ServerCredentials serverCredentials = new ServerCredentials("http://localhost:8080", null, null, null, 0, "", "");
+    assertThat(SearchResponseFactory.searchArtifactDownloadLinks(serverCredentials, "test")).isEmpty();
+
+  }
+
+  /**
+   * Tests if a maven artifact search with empty server credentials cancels the process and returns an empty list
+   */
+  @Test
+  public void testEmptyServerCredentialsCancelsAndReturnsEmptyList() {
+
+    assertThat(SearchResponseFactory.searchArtifactDownloadLinks(null, "test")).isEmpty();
+  }
+
+  /**
+   * Tests if a maven artifact search with server credentials and empty base URL cancels the process and returns an
+   * empty list of download URLs.
+   */
+  @Test
+  public void testEmptyServerCredentialsBaseUrlCancelsAndReturnsEmptyList() {
+
+    ServerCredentials serverCredentials = new ServerCredentials("", "", "", "", 0, "", "");
+
+    assertThat(SearchResponseFactory.searchArtifactDownloadLinks(serverCredentials, "test")).isEmpty();
+  }
+
+  /**
+   * Tests if a maven artifact search with an empty download list as response cancels and returns an empty list.
+   */
+  @Test
+  public void testMavenEmptyDownloadLinksAfterSearchRequestCancelsAndReturnsEmptyList() {
+
+    this.wireMockRule
+        .stubFor(get(urlMatching("/solrsearch/select.*")).willReturn(aResponse().withStatus(200).withBody("{}")));
+
+    ServerCredentials serverCredentials = new ServerCredentials("http://localhost:8080", null, null, null, 0, "", "");
+    assertThat(SearchResponseFactory.searchArtifactDownloadLinks(serverCredentials, "test")).isEmpty();
+
+    this.wireMockRule.stubFor(
+        get(urlMatching("/artifactory/api/search/gavc.*")).willReturn(aResponse().withStatus(200).withBody("{}")));
+
+    assertThat(SearchResponseFactory.searchArtifactDownloadLinks(serverCredentials, "test")).isEmpty();
+  }
+
+  /**
+   * Tests if a jfrog artifact search with an empty body as response cancels and returns an empty list.
+   */
+  @Test
+  public void testJfrogEmptyDownloadLinksAfterSearchRequestCancelsAndReturnsEmptyList() {
+
+    ServerCredentials serverCredentials = new ServerCredentials("http://localhost:8080", null, null, null, 0, "", "");
+
+    this.wireMockRule.stubFor(
+        get(urlMatching("/artifactory/api/search/gavc.*")).willReturn(aResponse().withStatus(200).withBody("{}")));
+
+    assertThat(SearchResponseFactory.searchArtifactDownloadLinks(serverCredentials, "test")).isEmpty();
+  }
+
+  /**
+   * Tests if a nexus2 artifact search with an empty body as response cancels and returns an empty list.
+   */
+  @Test
+  public void testNexus2EmptyDownloadLinksAfterSearchRequestCancelsAndReturnsEmptyList() {
+
+    ServerCredentials serverCredentials = new ServerCredentials("http://localhost:8080", null, null, null, 0, "", "");
+
+    this.wireMockRule.stubFor(
+        get(urlMatching("/service/local/lucene/search.*")).willReturn(aResponse().withStatus(200).withBody("{}")));
+
+    assertThat(SearchResponseFactory.searchArtifactDownloadLinks(serverCredentials, "test")).isEmpty();
+  }
+
+  /**
+   * Tests if a nexus3 artifact search with an empty download list as response cancels and returns an empty list.
+   */
+  @Test
+  public void testNexus3EmptyDownloadLinksAfterSearchRequestCancelsAndReturnsEmptyList() {
+
+    ServerCredentials serverCredentials = new ServerCredentials("http://localhost:8080", null, null, null, 0, "", "");
+
+    this.wireMockRule
+        .stubFor(get(urlMatching("/service/rest/v1/search.*")).willReturn(aResponse().withStatus(200).withBody("{}")));
+
+    assertThat(SearchResponseFactory.searchArtifactDownloadLinks(serverCredentials, "test")).isEmpty();
+  }
+
+  /**
+   * Tests if an empty list gets returned if the search request received an empty json string as a response
+   */
+  @Test
+  public void testSearchRequestWithEmptyJsonResponseReturnsEmptyList() {
+
+    // given
+    this.wireMockRule
+        .stubFor(get(urlMatching("/solrsearch/select.*")).willReturn(aResponse().withStatus(200).withBody("")));
+
+    ServerCredentials serverCredentials = new ServerCredentials("http://localhost:8080", null, null, null, 0, "", "");
+    assertThat(SearchResponseFactory.searchArtifactDownloadLinks(serverCredentials, "com.devonfw.cobigen.templates"))
+        .isEmpty();
+
+  }
+
+}
diff --git a/cobigen/core-artifact-retriever/src/test/java/com/devonfw/cobigen/retriever/unittest/SearchResponseTest.java b/cobigen/core-artifact-retriever/src/test/java/com/devonfw/cobigen/retriever/unittest/SearchResponseTest.java
new file mode 100644
index 0000000000..c5a2e4b436
--- /dev/null
+++ b/cobigen/core-artifact-retriever/src/test/java/com/devonfw/cobigen/retriever/unittest/SearchResponseTest.java
@@ -0,0 +1,81 @@
+package com.devonfw.cobigen.retriever.unittest;
+
+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
+import static com.github.tomakehurst.wiremock.client.WireMock.get;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlMatching;
+import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import java.io.IOException;
+
+import org.junit.Rule;
+import org.junit.Test;
+
+import com.devonfw.cobigen.retriever.mavensearch.constants.MavenSearchRepositoryType;
+import com.devonfw.cobigen.retriever.mavensearch.exception.RestSearchResponseException;
+import com.devonfw.cobigen.retriever.mavensearch.to.model.AbstractSearchResponse;
+import com.devonfw.cobigen.retriever.mavensearch.to.model.ServerCredentials;
+import com.github.tomakehurst.wiremock.http.Fault;
+import com.github.tomakehurst.wiremock.junit.WireMockRule;
+
+/**
+ * Test class for {@link AbstractSearchResponse}
+ */
+public class SearchResponseTest {
+
+  /**
+   * WireMock rule to initialize
+   */
+  @Rule
+  public WireMockRule wireMockRule = new WireMockRule(options().disableRequestJournal());
+
+  /**
+   * Tests if retrieving a json response with a connection problem (connection reset) cancels the process and returns an
+   * empty response String
+   *
+   * @throws IOException if the test resource could not be read
+   */
+  @Test
+  public void testRetrieveJsonResponseWithConnectionProblemCancelsAndReturnsEmptyString() throws IOException {
+
+    this.wireMockRule.stubFor(
+        get(urlMatching("/solrsearch/select.*")).willReturn(aResponse().withFault(Fault.CONNECTION_RESET_BY_PEER)));
+
+    ServerCredentials serverCredentials = new ServerCredentials("http://localhost:8080", null, null, null, 0, "", "");
+
+    assertThat(AbstractSearchResponse.retrieveJsonResponseWithAuthentication(
+        "http://localhost:8080/solrsearch/select.*", MavenSearchRepositoryType.MAVEN, serverCredentials)).isEmpty();
+
+  }
+
+  /**
+   * Tests if an empty String gets returned when a faulty target link was used
+   */
+  @Test
+  public void testWrongTargetLinkReturnsEmptyString() {
+
+    ServerCredentials serverCredentials = new ServerCredentials(null, null, null, null, 0, "", "");
+    assertThat(AbstractSearchResponse.retrieveJsonResponseWithAuthentication("this/is/not/a/link",
+        MavenSearchRepositoryType.MAVEN, serverCredentials)).isEmpty();
+  }
+
+  /**
+   * Tests if an {@link RestSearchResponseException} gets thrown when a status code was not 200 but 400 instead
+   */
+  @Test
+  public void testWrongResponseStatusCodeThrowsException() {
+
+    // given
+    this.wireMockRule.stubFor(get(urlMatching("/solrsearch/select.*")).willReturn(aResponse().withStatus(400)));
+
+    ServerCredentials serverCredentials = new ServerCredentials(null, null, null, null, 0, "", "");
+
+    assertThatThrownBy(() -> {
+      AbstractSearchResponse.retrieveJsonResponseWithAuthentication("http://localhost:8080",
+          MavenSearchRepositoryType.MAVEN, serverCredentials);
+    }).isInstanceOf(RestSearchResponseException.class).hasMessageContaining("http://localhost:8080");
+
+  }
+
+}
diff --git a/cobigen/core-artifact-retriever/src/test/resources/logback-test.xml b/cobigen/core-artifact-retriever/src/test/resources/logback-test.xml
new file mode 100644
index 0000000000..7a043e0457
--- /dev/null
+++ b/cobigen/core-artifact-retriever/src/test/resources/logback-test.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+      <Pattern>%d{HH:mm:ss.SSS} [%thread] [C:%X{correlationId}] - %-5level - %logger{36} - %msg%n
+      </Pattern>
+    </encoder>
+  </appender>
+
+  <logger name="wiremock.org" level="WARN" />
+
+  <root level="debug">
+    <appender-ref ref="STDOUT" />
+  </root>
+
+</configuration>
\ No newline at end of file
diff --git a/cobigen/core-artifact-retriever/src/test/resources/testdata/unittest/ArtifactRetrieverTest/jfrogJsonTest.json b/cobigen/core-artifact-retriever/src/test/resources/testdata/unittest/ArtifactRetrieverTest/jfrogJsonTest.json
new file mode 100644
index 0000000000..fc5b08c00e
--- /dev/null
+++ b/cobigen/core-artifact-retriever/src/test/resources/testdata/unittest/ArtifactRetrieverTest/jfrogJsonTest.json
@@ -0,0 +1,7 @@
+{
+"results": [
+    {
+        "uri": "http://localhost:8080/artifactory/api/storage/libs-release-local/com/devonfw/cobigen/templates/crud-java-server-app/2021.08.001/crud-java-server-app-2021.08.001-template-set.xml"
+    }
+]
+}
\ No newline at end of file
diff --git a/cobigen/core-artifact-retriever/src/test/resources/testdata/unittest/ArtifactRetrieverTest/settingsNonProxy.xml b/cobigen/core-artifact-retriever/src/test/resources/testdata/unittest/ArtifactRetrieverTest/settingsNonProxy.xml
new file mode 100644
index 0000000000..e1fc695ffc
--- /dev/null
+++ b/cobigen/core-artifact-retriever/src/test/resources/testdata/unittest/ArtifactRetrieverTest/settingsNonProxy.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<settings xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.2.0 http://maven.apache.org/xsd/settings-1.2.0.xsd" xmlns="http://maven.apache.org/SETTINGS/1.2.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <servers>
+    <server>
+      <id>repository1</id>
+      <username>testUsername</username>
+      <password>testPassword</password>
+    </server>
+  </servers>
+
+  <profiles>
+    <profile>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+      <id>profile1</id>
+      <repositories>
+        <repository>
+          <id>repository1</id>
+          <name>Sample name</name>
+          <url>http://localhost:8080</url>
+        </repository>
+      </repositories>
+    </profile>
+  </profiles>
+</settings>
\ No newline at end of file
diff --git a/cobigen/core-artifact-retriever/src/test/resources/testdata/unittest/ArtifactRetrieverTest/settingsProxy.xml b/cobigen/core-artifact-retriever/src/test/resources/testdata/unittest/ArtifactRetrieverTest/settingsProxy.xml
new file mode 100644
index 0000000000..a28ba6f349
--- /dev/null
+++ b/cobigen/core-artifact-retriever/src/test/resources/testdata/unittest/ArtifactRetrieverTest/settingsProxy.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<settings xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.2.0 http://maven.apache.org/xsd/settings-1.2.0.xsd" xmlns="http://maven.apache.org/SETTINGS/1.2.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <servers>
+    <server>
+      <id>repository1</id>
+      <username>testUsername</username>
+      <password>testPassword</password>
+    </server>
+  </servers>
+
+  <proxies>
+    <proxy>
+      <id>example-proxy</id>
+      <active>true</active>
+      <protocol>http</protocol>
+      <host>localhost</host>
+      <port>8080</port>
+      <username>proxyuser</username>
+      <password>somepassword</password>
+      <nonProxyHosts>www.google.com|*.example.com</nonProxyHosts>
+    </proxy>
+  </proxies>
+
+  <profiles>
+    <profile>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+      <id>profile1</id>
+      <repositories>
+        <repository>
+          <id>repository1</id>
+          <name>Sample name</name>
+          <url>http://localhost:8081</url>
+        </repository>
+      </repositories>
+    </profile>
+  </profiles>
+</settings>
\ No newline at end of file
diff --git a/cobigen/core-artifact-retriever/src/test/resources/testdata/unittest/MavenMirrorTest/settings.xml b/cobigen/core-artifact-retriever/src/test/resources/testdata/unittest/MavenMirrorTest/settings.xml
new file mode 100644
index 0000000000..66b137b004
--- /dev/null
+++ b/cobigen/core-artifact-retriever/src/test/resources/testdata/unittest/MavenMirrorTest/settings.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<settings>
+  <mirrors>
+    <mirror>
+      <mirrorOf>*</mirrorOf>
+      <url>http://0.0.0.0/</url>
+      <id>testMirror1</id>
+    </mirror>
+    <mirror>
+      <mirrorOf>repo1</mirrorOf>
+      <url>http://1.1.1.1/</url>
+      <id>testMirror2</id>
+    </mirror>
+    <mirror>
+      <mirrorOf>repo1, repo2</mirrorOf>
+      <url>http://2.2.2.2/</url>
+      <id>testMirror3</id>
+    </mirror>
+    <mirror>
+      <mirrorOf>*,!repo1</mirrorOf>
+      <url>http://3.3.3.3/</url>
+      <id>testMirror4</id>
+    </mirror>
+    <mirror>
+      <mirrorOf>external:*</mirrorOf>
+      <url>http://4.4.4.4/</url>
+      <id>testMirror5</id>
+    </mirror>
+    <mirror>
+      <mirrorOf>external:http:*</mirrorOf>
+      <url>http://5.5.5.5/</url>
+      <id>testMirror6</id>
+    </mirror>
+  </mirrors>
+
+  <profiles>
+    <profile>
+      <id>devonfw-snapshots1</id>
+      <repositories>
+        <repository>
+          <id>repo1</id>
+          <name>Test Repo 1</name>
+          <url>localhost</url>
+        </repository>
+      </repositories>
+    </profile>
+    <profile>
+      <id>devonfw-snapshots2</id>
+      <repositories>
+        <repository>
+          <id>repo2</id>
+          <name>Test Repo 2</name>
+          <url>https://s01.oss.sonatype.org/content/repositories/snapshots/</url>
+        </repository>
+      </repositories>
+    </profile>
+    <profile>
+      <id>devonfw-snapshots3</id>
+      <repositories>
+        <repository>
+          <id>repo3</id>
+          <name>Test Repo 3</name>
+          <url>http://s01.oss.sonatype.org/content/repositories/snapshots/</url>
+        </repository>
+      </repositories>
+    </profile>
+  </profiles>
+</settings>
\ No newline at end of file
diff --git a/cobigen/core-artifact-retriever/src/test/resources/testdata/unittest/MavenProxyTest/settings.xml b/cobigen/core-artifact-retriever/src/test/resources/testdata/unittest/MavenProxyTest/settings.xml
new file mode 100644
index 0000000000..ba3a5076ef
--- /dev/null
+++ b/cobigen/core-artifact-retriever/src/test/resources/testdata/unittest/MavenProxyTest/settings.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<settings>
+
+    <proxies>
+        <proxy>
+            <id>proxy1</id>
+            <active>false</active>
+            <protocol>http</protocol>
+            <host>proxy.example.com</host>
+            <port>8080</port>
+            <username>proxyuser</username>
+            <password>somepassword</password>
+            <nonProxyHosts>www.google.com|*.example.com</nonProxyHosts>
+        </proxy>
+        <proxy>
+            <id>proxy2</id>
+            <active>false</active>
+            <protocol>http</protocol>
+            <host>proxy.example.com</host>
+            <port>8080</port>
+            <username>proxyuser</username>
+            <password>somepassword</password>
+            <nonProxyHosts>*</nonProxyHosts>
+        </proxy>
+    </proxies>
+
+    <profiles>
+        <profile>
+            <id>profile1</id>
+            <repositories>
+                <repository>
+                    <id>repo1</id>
+                    <name>Test Repo 1</name>
+                    <url>localhost</url>
+                </repository>
+            </repositories>
+        </profile>
+        <profile>
+            <id>profile2</id>
+            <repositories>
+                <repository>
+                    <id>repo2</id>
+                    <name>Test Repo 2</name>
+                    <url>www.google.com</url>
+                </repository>
+            </repositories>
+        </profile>
+        <profile>
+            <id>profile3</id>
+            <repositories>
+                <repository>
+                    <id>repo3</id>
+                    <name>Test Repo 3</name>
+                    <url>test.example.com</url>
+                </repository>
+            </repositories>
+        </profile>
+      </profiles>
+</settings>
\ No newline at end of file
diff --git a/cobigen/core-artifact-retriever/src/test/resources/testdata/unittest/MavenSearchArtifactRetrieverTest/jfrogJsonTest.json b/cobigen/core-artifact-retriever/src/test/resources/testdata/unittest/MavenSearchArtifactRetrieverTest/jfrogJsonTest.json
new file mode 100644
index 0000000000..d14533c577
--- /dev/null
+++ b/cobigen/core-artifact-retriever/src/test/resources/testdata/unittest/MavenSearchArtifactRetrieverTest/jfrogJsonTest.json
@@ -0,0 +1,11 @@
+{
+"results": [
+    {
+        "uri": "http://localhost:8081/artifactory/api/storage/libs-release-local/org/acme/artifact/1.0/artifact-1.0-sources.jar"
+    },{
+        "uri": "http://localhost:8081/artifactory/api/storage/libs-release-local/org/acme/artifactB/1.0/artifactB-1.0-sources.jar"
+    },{
+        "uri": "http://localhost:8081/artifactory/api/storage/libs-release-local/com/devonfw/cobigen/templates/crud-java-server-app/2021.08.001/crud-java-server-app-2021.08.001-template-set.xml"
+    }
+]
+}
\ No newline at end of file
diff --git a/cobigen/core-artifact-retriever/src/test/resources/testdata/unittest/MavenSearchArtifactRetrieverTest/mavenJsonTest.json b/cobigen/core-artifact-retriever/src/test/resources/testdata/unittest/MavenSearchArtifactRetrieverTest/mavenJsonTest.json
new file mode 100644
index 0000000000..3a9d1b349f
--- /dev/null
+++ b/cobigen/core-artifact-retriever/src/test/resources/testdata/unittest/MavenSearchArtifactRetrieverTest/mavenJsonTest.json
@@ -0,0 +1,138 @@
+{
+   "responseHeader":{
+      "status":0,
+      "QTime":1,
+      "params":{
+         "q":"g:com.google.inject",
+         "core":"",
+         "indent":"off",
+         "spellcheck":"true",
+         "fl":"id,g,a,latestVersion,p,ec,repositoryId,text,timestamp,versionCount",
+         "start":"",
+         "sort":"score desc,timestamp desc,g asc,a asc",
+         "spellcheck.count":"5",
+         "rows":"20",
+         "wt":"json",
+         "version":"2.2"
+      }
+   },
+   "response":{
+      "numFound":4,
+      "start":0,
+      "docs":[
+         {
+            "id":"com.google.inject:guice",
+            "g":"com.google.inject",
+            "a":"guice",
+            "latestVersion":"5.1.0",
+            "repositoryId":"central",
+            "p":"jar",
+            "timestamp":1643061977000,
+            "versionCount":19,
+            "text":[
+               "com.google.inject",
+               "guice",
+               "-javadoc.jar",
+               "-sources.jar",
+               "-test-sources.jar",
+               "-tests.jar",
+               ".jar",
+               "-classes.jar",
+               ".pom"
+            ],
+            "ec":[
+               "-javadoc.jar",
+               "-sources.jar",
+               "-test-sources.jar",
+               "-tests.jar",
+               ".jar",
+               "-classes.jar",
+               ".pom"
+            ]
+         },
+         {
+            "id":"com.google.inject:guice-bom",
+            "g":"com.google.inject",
+            "a":"guice-bom",
+            "latestVersion":"5.1.0",
+            "repositoryId":"central",
+            "p":"pom",
+            "timestamp":1643061926000,
+            "versionCount":10,
+            "text":[
+               "com.google.inject",
+               "guice-bom",
+               ".pom"
+            ],
+            "ec":[
+               ".pom"
+            ]
+         },
+         {
+            "id":"com.google.inject:guice-parent",
+            "g":"com.google.inject",
+            "a":"guice-parent",
+            "latestVersion":"5.1.0",
+            "repositoryId":"central",
+            "p":"pom",
+            "timestamp":1643061923000,
+            "versionCount":19,
+            "text":[
+               "com.google.inject",
+               "guice-parent",
+               ".pom"
+            ],
+            "ec":[
+               ".pom"
+            ]
+         },
+         {
+            "id":"com.google.inject:jdk8-tests",
+            "g":"com.google.inject",
+            "a":"jdk8-tests",
+            "latestVersion":"5.0.1",
+            "repositoryId":"central",
+            "p":"jar",
+            "timestamp":1614380739000,
+            "versionCount":7,
+            "text":[
+               "com.google.inject",
+               "jdk8-tests",
+               ".jar",
+               "-tests.jar",
+               ".pom"
+            ],
+            "ec":[
+               ".jar",
+               "-tests.jar",
+               ".pom"
+            ]
+         },
+		 {
+            "id":"com.devonfw.cobigen.templates:crud-java-server-app",
+            "g":"com.devonfw.cobigen.templates",
+            "a":"crud-java-server-app",
+            "latestVersion":"2021.08.001",
+            "repositoryId":"local",
+            "p":"xml",
+            "timestamp":1614380739000,
+            "versionCount":7,
+            "text":[
+               ".jar",
+               ".pom",
+			   ".xml"
+            ],
+            "ec":[
+               ".jar",
+               "-template-set.xml",
+               ".pom"
+            ]
+         }
+      ]
+   },
+   "spellcheck":{
+      "suggestions":[
+         
+      ]
+   }
+}
\ No newline at end of file
diff --git a/cobigen/core-artifact-retriever/src/test/resources/testdata/unittest/MavenSearchArtifactRetrieverTest/nexus2JsonTest.json b/cobigen/core-artifact-retriever/src/test/resources/testdata/unittest/MavenSearchArtifactRetrieverTest/nexus2JsonTest.json
new file mode 100644
index 0000000000..2b4539c396
--- /dev/null
+++ b/cobigen/core-artifact-retriever/src/test/resources/testdata/unittest/MavenSearchArtifactRetrieverTest/nexus2JsonTest.json
@@ -0,0 +1,139 @@
+{
+   "totalCount":305,
+   "from":-1,
+   "count":-1,
+   "tooManyResults":false,
+   "collapsed":false,
+   "repoDetails":[
+      {
+         "repositoryId":"releases",
+         "repositoryName":"Releases",
+         "repositoryContentClass":"maven2",
+         "repositoryKind":"hosted",
+         "repositoryPolicy":"RELEASE",
+         "repositoryURL":"https://s01.oss.sonatype.org/service/local/repositories/releases"
+      }
+   ],
+   "data":[
+      {
+         "groupId":"com.devonfw.cobigen",
+         "artifactId":"openapiplugin",
+         "version":"2021.12.006",
+         "latestRelease":"2021.12.006",
+         "latestReleaseRepositoryId":"releases",
+         "highlightedFragment":"<blockquote>Group ID<UL><LI><B>com<\/B>.<B>devonfw<\/B>.<B>cobigen<\/B><\/LI><\/UL><\/blockquote>",
+         "artifactHits":[
+            {
+               "repositoryId":"releases",
+               "artifactLinks":[
+                  {
+                     "extension":"pom"
+                  },
+                  {
+                     "extension":"jar"
+                  },
+                  {
+                     "classifier":"javadoc",
+                     "extension":"jar"
+                  },
+                  {
+                     "classifier":"sources",
+                     "extension":"jar"
+                  }
+               ]
+            }
+         ]
+      },
+      {
+         "groupId":"com.devonfw.cobigen",
+         "artifactId":"openapiplugin",
+         "version":"2021.12.005",
+         "latestRelease":"2021.12.006",
+         "latestReleaseRepositoryId":"releases",
+         "highlightedFragment":"<blockquote>Group ID<UL><LI><B>com<\/B>.<B>devonfw<\/B>.<B>cobigen<\/B><\/LI><\/UL><\/blockquote>",
+         "artifactHits":[
+            {
+               "repositoryId":"releases",
+               "artifactLinks":[
+                  {
+                     "extension":"pom"
+                  },
+                  {
+                     "extension":"jar"
+                  },
+                  {
+                     "classifier":"javadoc",
+                     "extension":"jar"
+                  },
+                  {
+                     "classifier":"sources",
+                     "extension":"jar"
+                  }
+               ]
+            }
+         ]
+      },
+      {
+         "groupId":"com.devonfw.cobigen",
+         "artifactId":"jsonplugin",
+         "version":"2021.12.006",
+         "latestRelease":"2021.12.006",
+         "latestReleaseRepositoryId":"releases",
+         "highlightedFragment":"<blockquote>Group ID<UL><LI><B>com<\/B>.<B>devonfw<\/B>.<B>cobigen<\/B><\/LI><\/UL><\/blockquote>",
+         "artifactHits":[
+            {
+               "repositoryId":"releases",
+               "artifactLinks":[
+                  {
+                     "extension":"pom"
+                  },
+                  {
+                     "extension":"jar"
+                  },
+                  {
+                     "classifier":"javadoc",
+                     "extension":"jar"
+                  },
+                  {
+                     "classifier":"sources",
+                     "extension":"jar"
+                  }
+               ]
+            }
+         ]
+      },
+      {
+         "groupId":"com.devonfw.cobigen.templates",
+         "artifactId":"crud-java-server-app",
+         "version":"2021.08.001",
+         "latestRelease":"2021.08.001",
+         "latestReleaseRepositoryId":"releases",
+         "highlightedFragment":"<blockquote>Group ID<UL><LI><B>com<\/B>.<B>devonfw<\/B>.<B>cobigen<\/B><\/LI><\/UL><\/blockquote>",
+         "artifactHits":[
+            {
+               "repositoryId":"releases",
+               "artifactLinks":[
+                  {
+                     "extension":"pom"
+                  },
+                  {
+                     "classifier":"javadoc",
+                     "extension":"jar"
+                  },
+				  {
+                     "classifier":"template-set",
+                     "extension":"xml"
+                  },
+                  {
+                     "extension":"jar"
+                  },
+                  {
+                     "classifier":"sources",
+                     "extension":"jar"
+                  }
+               ]
+            }
+         ]
+      }
+   ]
+}
\ No newline at end of file
diff --git a/cobigen/core-artifact-retriever/src/test/resources/testdata/unittest/MavenSearchArtifactRetrieverTest/nexus3JsonTest.json b/cobigen/core-artifact-retriever/src/test/resources/testdata/unittest/MavenSearchArtifactRetrieverTest/nexus3JsonTest.json
new file mode 100644
index 0000000000..a3d95b2159
--- /dev/null
+++ b/cobigen/core-artifact-retriever/src/test/resources/testdata/unittest/MavenSearchArtifactRetrieverTest/nexus3JsonTest.json
@@ -0,0 +1,42 @@
+{
+  "items" : [ {
+    "id" : "bWF2ZW4tY2VudHJhbDoyZTQ3ZGRhMGYxYjU1NWUwNzE1OWRjOWY5ZGQzZmVmNA",
+    "repository" : "maven-central",
+    "format" : "maven2",
+    "group" : "org.osgi",
+    "name" : "org.osgi.core",
+    "version" : "4.3.1",
+    "assets" : [ {
+      "downloadUrl" : "http://localhost:8081/repository/maven-central/org/osgi/org.osgi.core/4.3.1/org.osgi.core-4.3.1-sources.jar",
+      "path" : "org/osgi/org.osgi.core/4.3.1/org.osgi.core-4.3.1-sources.jar",
+      "id" : "bWF2ZW4tY2VudHJhbDplMDE4OGVkMDcyOGZhNjhmNDExNzU2OGU1MjQ2NjZiYg",
+      "repository" : "maven-central",
+      "format" : "maven2",
+      "checksum" : {
+        "sha1" : "80bfafcf783988442b3a58318face1d2132db33d",
+        "md5" : "87ee0258b79dc852626b91818316b9c3"
+      }
+    }, {
+      "downloadUrl" : "http://localhost:8081/repository/maven-central/org/osgi/org.osgi.core/4.3.1/org.osgi.core-4.3.1.jar",
+      "path" : "org/osgi/org.osgi.core/4.3.1/org.osgi.core-4.3.1.jar",
+      "id" : "bWF2ZW4tY2VudHJhbDpkMDY0ODA0YThlZDVhZDZlNjhmZGU5MWNmM2NiZTgzMw",
+      "repository" : "maven-central",
+      "format" : "maven2",
+      "checksum" : {
+        "sha1" : "5458ffe2ba049e76c29f2df2dc3ffccddf8b839e",
+        "md5" : "8053bbc1b55d51f5abae005625209d08"
+      }
+    }, {
+      "downloadUrl" : "http://localhost:8081/repository/com/devonfw/cobigen/templates/crud-java-server-app/2021.08.001/crud-java-server-app-2021.08.001-template-set.xml",
+      "path" : "org/osgi/org.osgi.core/4.3.1/org.osgi.core-4.3.1.pom",
+      "id" : "bWF2ZW4tY2VudHJhbDo2NTRiYjdkMGE1OTIxMzg1OWZhMTVkMzNmYWU1ZmY3OA",
+      "repository" : "maven-central",
+      "format" : "maven2",
+      "checksum" : {
+        "sha1" : "79391fc69dd72ad1fd983d01b4572f93f644882b",
+        "md5" : "3d87a59bcdb4b131d9a63e87e0ed924a"
+      }
+    } ]
+  } ],
+  "continuationToken" : null
+}
\ No newline at end of file
diff --git a/cobigen/core-artifact-retriever/src/test/resources/testdata/unittest/MavenSearchResponseTest/jfrogJsonTest.json b/cobigen/core-artifact-retriever/src/test/resources/testdata/unittest/MavenSearchResponseTest/jfrogJsonTest.json
new file mode 100644
index 0000000000..102a5faba4
--- /dev/null
+++ b/cobigen/core-artifact-retriever/src/test/resources/testdata/unittest/MavenSearchResponseTest/jfrogJsonTest.json
@@ -0,0 +1,7 @@
+{
+"results": [
+	{
+        "uri": "http://localhost:8081/artifactory/api/storage/libs-release-local/com/devonfw/cobigen/templates/crud-java-server-app/2021.08.001/crud-java-server-app-2021.08.001-template-set.xml"
+    }
+]
+}
\ No newline at end of file
diff --git a/cobigen/core-artifact-retriever/src/test/resources/testdata/unittest/MavenSearchResponseTest/mavenJsonTest.json b/cobigen/core-artifact-retriever/src/test/resources/testdata/unittest/MavenSearchResponseTest/mavenJsonTest.json
new file mode 100644
index 0000000000..80ef347c17
--- /dev/null
+++ b/cobigen/core-artifact-retriever/src/test/resources/testdata/unittest/MavenSearchResponseTest/mavenJsonTest.json
@@ -0,0 +1,37 @@
+{
+   "responseHeader":{
+      "status":0,
+      "QTime":1
+   },
+   "response":{
+      "numFound":4,
+      "start":0,
+      "docs":[
+		 {
+            "id":"com.devonfw.cobigen.templates:crud-java-server-app",
+            "g":"com.devonfw.cobigen.templates",
+            "a":"crud-java-server-app",
+            "latestVersion":"2021.08.001",
+            "repositoryId":"local",
+            "p":"xml",
+            "timestamp":1614380739000,
+            "versionCount":7,
+            "text":[
+               ".jar",
+               ".pom",
+			   ".xml"
+            ],
+            "ec":[
+               ".jar",
+               "-template-set.xml",
+               ".pom"
+            ]
+         }
+      ]
+   },
+   "spellcheck":{
+      "suggestions":[
+         
+      ]
+   }
+}
\ No newline at end of file
diff --git a/cobigen/core-artifact-retriever/src/test/resources/testdata/unittest/MavenSearchResponseTest/nexus2JsonTest.json b/cobigen/core-artifact-retriever/src/test/resources/testdata/unittest/MavenSearchResponseTest/nexus2JsonTest.json
new file mode 100644
index 0000000000..e9d6956ec1
--- /dev/null
+++ b/cobigen/core-artifact-retriever/src/test/resources/testdata/unittest/MavenSearchResponseTest/nexus2JsonTest.json
@@ -0,0 +1,42 @@
+{
+   "totalCount":305,
+   "from":-1,
+   "count":-1,
+   "tooManyResults":false,
+   "collapsed":false,
+   "data":[
+      {
+         "groupId":"com.devonfw.cobigen.templates",
+         "artifactId":"crud-java-server-app",
+         "version":"2021.08.001",
+         "latestRelease":"2021.08.001",
+         "latestReleaseRepositoryId":"releases",
+         "highlightedFragment":"<blockquote>Group ID<UL><LI><B>com<\/B>.<B>devonfw<\/B>.<B>cobigen<\/B><\/LI><\/UL><\/blockquote>",
+         "artifactHits":[
+            {
+               "repositoryId":"releases",
+               "artifactLinks":[
+                  {
+                     "extension":"pom"
+                  },
+                  {
+                     "classifier":"javadoc",
+                     "extension":"jar"
+                  },
+				  {
+                     "classifier":"template-set",
+                     "extension":"xml"
+                  },
+                  {
+                     "extension":"jar"
+                  },
+                  {
+                     "classifier":"sources",
+                     "extension":"jar"
+                  }
+               ]
+            }
+         ]
+      }
+   ]
+}
\ No newline at end of file
diff --git a/cobigen/core-artifact-retriever/src/test/resources/testdata/unittest/MavenSearchResponseTest/nexus3JsonTest.json b/cobigen/core-artifact-retriever/src/test/resources/testdata/unittest/MavenSearchResponseTest/nexus3JsonTest.json
new file mode 100644
index 0000000000..25fbcfdec0
--- /dev/null
+++ b/cobigen/core-artifact-retriever/src/test/resources/testdata/unittest/MavenSearchResponseTest/nexus3JsonTest.json
@@ -0,0 +1,22 @@
+{
+  "items" : [ {
+    "id" : "bWF2ZW4tY2VudHJhbDoyZTQ3ZGRhMGYxYjU1NWUwNzE1OWRjOWY5ZGQzZmVmNA",
+    "repository" : "maven-central",
+    "format" : "maven2",
+    "group" : "org.osgi",
+    "name" : "org.osgi.core",
+    "version" : "4.3.1",
+    "assets" : [ {
+      "downloadUrl" : "http://localhost:8081/repository/com/devonfw/cobigen/templates/crud-java-server-app/2021.08.001/crud-java-server-app-2021.08.001-template-set.xml",
+      "path" : "org/osgi/org.osgi.core/4.3.1/org.osgi.core-4.3.1.pom",
+      "id" : "bWF2ZW4tY2VudHJhbDo2NTRiYjdkMGE1OTIxMzg1OWZhMTVkMzNmYWU1ZmY3OA",
+      "repository" : "maven-central",
+      "format" : "maven2",
+      "checksum" : {
+        "sha1" : "79391fc69dd72ad1fd983d01b4572f93f644882b",
+        "md5" : "3d87a59bcdb4b131d9a63e87e0ed924a"
+      }
+    } ]
+  } ],
+  "continuationToken" : null
+}
\ No newline at end of file
diff --git a/cobigen/core-artifact-retriever/src/test/resources/testdata/unittest/MavenSearchTest/jfrogJsonTest.json b/cobigen/core-artifact-retriever/src/test/resources/testdata/unittest/MavenSearchTest/jfrogJsonTest.json
new file mode 100644
index 0000000000..d14533c577
--- /dev/null
+++ b/cobigen/core-artifact-retriever/src/test/resources/testdata/unittest/MavenSearchTest/jfrogJsonTest.json
@@ -0,0 +1,11 @@
+{
+"results": [
+    {
+        "uri": "http://localhost:8081/artifactory/api/storage/libs-release-local/org/acme/artifact/1.0/artifact-1.0-sources.jar"
+    },{
+        "uri": "http://localhost:8081/artifactory/api/storage/libs-release-local/org/acme/artifactB/1.0/artifactB-1.0-sources.jar"
+    },{
+        "uri": "http://localhost:8081/artifactory/api/storage/libs-release-local/com/devonfw/cobigen/templates/crud-java-server-app/2021.08.001/crud-java-server-app-2021.08.001-template-set.xml"
+    }
+]
+}
\ No newline at end of file
diff --git a/cobigen/core-artifact-retriever/src/test/resources/testdata/unittest/MavenSearchTest/mavenJsonTest.json b/cobigen/core-artifact-retriever/src/test/resources/testdata/unittest/MavenSearchTest/mavenJsonTest.json
new file mode 100644
index 0000000000..3a9d1b349f
--- /dev/null
+++ b/cobigen/core-artifact-retriever/src/test/resources/testdata/unittest/MavenSearchTest/mavenJsonTest.json
@@ -0,0 +1,138 @@
+{
+   "responseHeader":{
+      "status":0,
+      "QTime":1,
+      "params":{
+         "q":"g:com.google.inject",
+         "core":"",
+         "indent":"off",
+         "spellcheck":"true",
+         "fl":"id,g,a,latestVersion,p,ec,repositoryId,text,timestamp,versionCount",
+         "start":"",
+         "sort":"score desc,timestamp desc,g asc,a asc",
+         "spellcheck.count":"5",
+         "rows":"20",
+         "wt":"json",
+         "version":"2.2"
+      }
+   },
+   "response":{
+      "numFound":4,
+      "start":0,
+      "docs":[
+         {
+            "id":"com.google.inject:guice",
+            "g":"com.google.inject",
+            "a":"guice",
+            "latestVersion":"5.1.0",
+            "repositoryId":"central",
+            "p":"jar",
+            "timestamp":1643061977000,
+            "versionCount":19,
+            "text":[
+               "com.google.inject",
+               "guice",
+               "-javadoc.jar",
+               "-sources.jar",
+               "-test-sources.jar",
+               "-tests.jar",
+               ".jar",
+               "-classes.jar",
+               ".pom"
+            ],
+            "ec":[
+               "-javadoc.jar",
+               "-sources.jar",
+               "-test-sources.jar",
+               "-tests.jar",
+               ".jar",
+               "-classes.jar",
+               ".pom"
+            ]
+         },
+         {
+            "id":"com.google.inject:guice-bom",
+            "g":"com.google.inject",
+            "a":"guice-bom",
+            "latestVersion":"5.1.0",
+            "repositoryId":"central",
+            "p":"pom",
+            "timestamp":1643061926000,
+            "versionCount":10,
+            "text":[
+               "com.google.inject",
+               "guice-bom",
+               ".pom"
+            ],
+            "ec":[
+               ".pom"
+            ]
+         },
+         {
+            "id":"com.google.inject:guice-parent",
+            "g":"com.google.inject",
+            "a":"guice-parent",
+            "latestVersion":"5.1.0",
+            "repositoryId":"central",
+            "p":"pom",
+            "timestamp":1643061923000,
+            "versionCount":19,
+            "text":[
+               "com.google.inject",
+               "guice-parent",
+               ".pom"
+            ],
+            "ec":[
+               ".pom"
+            ]
+         },
+         {
+            "id":"com.google.inject:jdk8-tests",
+            "g":"com.google.inject",
+            "a":"jdk8-tests",
+            "latestVersion":"5.0.1",
+            "repositoryId":"central",
+            "p":"jar",
+            "timestamp":1614380739000,
+            "versionCount":7,
+            "text":[
+               "com.google.inject",
+               "jdk8-tests",
+               ".jar",
+               "-tests.jar",
+               ".pom"
+            ],
+            "ec":[
+               ".jar",
+               "-tests.jar",
+               ".pom"
+            ]
+         },
+		 {
+            "id":"com.devonfw.cobigen.templates:crud-java-server-app",
+            "g":"com.devonfw.cobigen.templates",
+            "a":"crud-java-server-app",
+            "latestVersion":"2021.08.001",
+            "repositoryId":"local",
+            "p":"xml",
+            "timestamp":1614380739000,
+            "versionCount":7,
+            "text":[
+               ".jar",
+               ".pom",
+			   ".xml"
+            ],
+            "ec":[
+               ".jar",
+               "-template-set.xml",
+               ".pom"
+            ]
+         }
+      ]
+   },
+   "spellcheck":{
+      "suggestions":[
+         
+      ]
+   }
+}
\ No newline at end of file
diff --git a/cobigen/core-artifact-retriever/src/test/resources/testdata/unittest/MavenSearchTest/nexus2JsonTest.json b/cobigen/core-artifact-retriever/src/test/resources/testdata/unittest/MavenSearchTest/nexus2JsonTest.json
new file mode 100644
index 0000000000..2b4539c396
--- /dev/null
+++ b/cobigen/core-artifact-retriever/src/test/resources/testdata/unittest/MavenSearchTest/nexus2JsonTest.json
@@ -0,0 +1,139 @@
+{
+   "totalCount":305,
+   "from":-1,
+   "count":-1,
+   "tooManyResults":false,
+   "collapsed":false,
+   "repoDetails":[
+      {
+         "repositoryId":"releases",
+         "repositoryName":"Releases",
+         "repositoryContentClass":"maven2",
+         "repositoryKind":"hosted",
+         "repositoryPolicy":"RELEASE",
+         "repositoryURL":"https://s01.oss.sonatype.org/service/local/repositories/releases"
+      }
+   ],
+   "data":[
+      {
+         "groupId":"com.devonfw.cobigen",
+         "artifactId":"openapiplugin",
+         "version":"2021.12.006",
+         "latestRelease":"2021.12.006",
+         "latestReleaseRepositoryId":"releases",
+         "highlightedFragment":"<blockquote>Group ID<UL><LI><B>com<\/B>.<B>devonfw<\/B>.<B>cobigen<\/B><\/LI><\/UL><\/blockquote>",
+         "artifactHits":[
+            {
+               "repositoryId":"releases",
+               "artifactLinks":[
+                  {
+                     "extension":"pom"
+                  },
+                  {
+                     "extension":"jar"
+                  },
+                  {
+                     "classifier":"javadoc",
+                     "extension":"jar"
+                  },
+                  {
+                     "classifier":"sources",
+                     "extension":"jar"
+                  }
+               ]
+            }
+         ]
+      },
+      {
+         "groupId":"com.devonfw.cobigen",
+         "artifactId":"openapiplugin",
+         "version":"2021.12.005",
+         "latestRelease":"2021.12.006",
+         "latestReleaseRepositoryId":"releases",
+         "highlightedFragment":"<blockquote>Group ID<UL><LI><B>com<\/B>.<B>devonfw<\/B>.<B>cobigen<\/B><\/LI><\/UL><\/blockquote>",
+         "artifactHits":[
+            {
+               "repositoryId":"releases",
+               "artifactLinks":[
+                  {
+                     "extension":"pom"
+                  },
+                  {
+                     "extension":"jar"
+                  },
+                  {
+                     "classifier":"javadoc",
+                     "extension":"jar"
+                  },
+                  {
+                     "classifier":"sources",
+                     "extension":"jar"
+                  }
+               ]
+            }
+         ]
+      },
+      {
+         "groupId":"com.devonfw.cobigen",
+         "artifactId":"jsonplugin",
+         "version":"2021.12.006",
+         "latestRelease":"2021.12.006",
+         "latestReleaseRepositoryId":"releases",
+         "highlightedFragment":"<blockquote>Group ID<UL><LI><B>com<\/B>.<B>devonfw<\/B>.<B>cobigen<\/B><\/LI><\/UL><\/blockquote>",
+         "artifactHits":[
+            {
+               "repositoryId":"releases",
+               "artifactLinks":[
+                  {
+                     "extension":"pom"
+                  },
+                  {
+                     "extension":"jar"
+                  },
+                  {
+                     "classifier":"javadoc",
+                     "extension":"jar"
+                  },
+                  {
+                     "classifier":"sources",
+                     "extension":"jar"
+                  }
+               ]
+            }
+         ]
+      },
+      {
+         "groupId":"com.devonfw.cobigen.templates",
+         "artifactId":"crud-java-server-app",
+         "version":"2021.08.001",
+         "latestRelease":"2021.08.001",
+         "latestReleaseRepositoryId":"releases",
+         "highlightedFragment":"<blockquote>Group ID<UL><LI><B>com<\/B>.<B>devonfw<\/B>.<B>cobigen<\/B><\/LI><\/UL><\/blockquote>",
+         "artifactHits":[
+            {
+               "repositoryId":"releases",
+               "artifactLinks":[
+                  {
+                     "extension":"pom"
+                  },
+                  {
+                     "classifier":"javadoc",
+                     "extension":"jar"
+                  },
+				  {
+                     "classifier":"template-set",
+                     "extension":"xml"
+                  },
+                  {
+                     "extension":"jar"
+                  },
+                  {
+                     "classifier":"sources",
+                     "extension":"jar"
+                  }
+               ]
+            }
+         ]
+      }
+   ]
+}
\ No newline at end of file
diff --git a/cobigen/core-artifact-retriever/src/test/resources/testdata/unittest/MavenSearchTest/nexus3JsonTest.json b/cobigen/core-artifact-retriever/src/test/resources/testdata/unittest/MavenSearchTest/nexus3JsonTest.json
new file mode 100644
index 0000000000..a3d95b2159
--- /dev/null
+++ b/cobigen/core-artifact-retriever/src/test/resources/testdata/unittest/MavenSearchTest/nexus3JsonTest.json
@@ -0,0 +1,42 @@
+{
+  "items" : [ {
+    "id" : "bWF2ZW4tY2VudHJhbDoyZTQ3ZGRhMGYxYjU1NWUwNzE1OWRjOWY5ZGQzZmVmNA",
+    "repository" : "maven-central",
+    "format" : "maven2",
+    "group" : "org.osgi",
+    "name" : "org.osgi.core",
+    "version" : "4.3.1",
+    "assets" : [ {
+      "downloadUrl" : "http://localhost:8081/repository/maven-central/org/osgi/org.osgi.core/4.3.1/org.osgi.core-4.3.1-sources.jar",
+      "path" : "org/osgi/org.osgi.core/4.3.1/org.osgi.core-4.3.1-sources.jar",
+      "id" : "bWF2ZW4tY2VudHJhbDplMDE4OGVkMDcyOGZhNjhmNDExNzU2OGU1MjQ2NjZiYg",
+      "repository" : "maven-central",
+      "format" : "maven2",
+      "checksum" : {
+        "sha1" : "80bfafcf783988442b3a58318face1d2132db33d",
+        "md5" : "87ee0258b79dc852626b91818316b9c3"
+      }
+    }, {
+      "downloadUrl" : "http://localhost:8081/repository/maven-central/org/osgi/org.osgi.core/4.3.1/org.osgi.core-4.3.1.jar",
+      "path" : "org/osgi/org.osgi.core/4.3.1/org.osgi.core-4.3.1.jar",
+      "id" : "bWF2ZW4tY2VudHJhbDpkMDY0ODA0YThlZDVhZDZlNjhmZGU5MWNmM2NiZTgzMw",
+      "repository" : "maven-central",
+      "format" : "maven2",
+      "checksum" : {
+        "sha1" : "5458ffe2ba049e76c29f2df2dc3ffccddf8b839e",
+        "md5" : "8053bbc1b55d51f5abae005625209d08"
+      }
+    }, {
+      "downloadUrl" : "http://localhost:8081/repository/com/devonfw/cobigen/templates/crud-java-server-app/2021.08.001/crud-java-server-app-2021.08.001-template-set.xml",
+      "path" : "org/osgi/org.osgi.core/4.3.1/org.osgi.core-4.3.1.pom",
+      "id" : "bWF2ZW4tY2VudHJhbDo2NTRiYjdkMGE1OTIxMzg1OWZhMTVkMzNmYWU1ZmY3OA",
+      "repository" : "maven-central",
+      "format" : "maven2",
+      "checksum" : {
+        "sha1" : "79391fc69dd72ad1fd983d01b4572f93f644882b",
+        "md5" : "3d87a59bcdb4b131d9a63e87e0ed924a"
+      }
+    } ]
+  } ],
+  "continuationToken" : null
+}
\ No newline at end of file
diff --git a/cobigen/core-artifact-retriever/src/test/resources/testdata/unittest/MavenSettingsTest/settings-security.xml b/cobigen/core-artifact-retriever/src/test/resources/testdata/unittest/MavenSettingsTest/settings-security.xml
new file mode 100644
index 0000000000..232c1e4d14
--- /dev/null
+++ b/cobigen/core-artifact-retriever/src/test/resources/testdata/unittest/MavenSettingsTest/settings-security.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<settingsSecurity>
+  <master>{/1SNYthinCEHRwQkYnzyoqKp3rbjGyZg/LbW7tOFTEg=}</master>
+</settingsSecurity>
diff --git a/cobigen/core-artifact-retriever/src/test/resources/testdata/unittest/MavenSettingsTest/settings.xml b/cobigen/core-artifact-retriever/src/test/resources/testdata/unittest/MavenSettingsTest/settings.xml
new file mode 100644
index 0000000000..0751afe0e8
--- /dev/null
+++ b/cobigen/core-artifact-retriever/src/test/resources/testdata/unittest/MavenSettingsTest/settings.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<settings xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.2.0 http://maven.apache.org/xsd/settings-1.2.0.xsd" xmlns="http://maven.apache.org/SETTINGS/1.2.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <servers>
+    <server>
+      <id>repository</id>
+      <username>testUsername</username>
+      <password>testPassword</password>
+    </server>
+    <server>
+      <id>repository2</id>
+      <username>testUsername</username>
+      <password>testPassword</password>
+    </server>
+  </servers>
+
+  <proxies>
+    <proxy>
+      <id>example-proxy2</id>
+      <active>false</active>
+      <protocol>https</protocol>
+      <host>proxy.example.com</host>
+      <port>8080</port>
+      <username>proxyuser</username>
+      <password>somepassword</password>
+      <nonProxyHosts>www.google.com|*.example.com</nonProxyHosts>
+    </proxy>
+    <proxy>
+      <id>example-proxy</id>
+      <active>true</active>
+      <protocol>http</protocol>
+      <host>proxy.example.com</host>
+      <port>8080</port>
+      <username>proxyuser</username>
+      <password>somepassword</password>
+      <nonProxyHosts>www.google.com|*.example.com</nonProxyHosts>
+    </proxy>
+  </proxies>
+
+  <mirrors>
+    <mirror>
+      <mirrorOf>external:http:*</mirrorOf>
+      <name>Pseudo repository to mirror external repositories initially using HTTP.</name>
+      <url>http://0.0.0.0/</url>
+      <blocked>true</blocked>
+      <id>maven-default-http-blocker</id>
+    </mirror>
+  </mirrors>
+
+  <profiles>
+    <profile>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+      <id>devonfw-snapshots</id>
+      <repositories>
+        <repository>
+          <id>123</id>
+          <name>devonfw SNAPSHOT releases</name>
+          <url>https://s01.oss.sonatype.org/content/repositories/snapshots/</url>
+        </repository>
+        <repository>
+          <id>repository</id>
+          <name>test repository</name>
+          <url>https://s01.oss.sonatype.org/content/repositories/snapshots/</url>
+        </repository>
+      </repositories>
+    </profile>
+    <profile>
+      <id>profile-1</id>
+      <repositories>
+        <repository>
+          <id>repository1</id>
+          <name>test repository</name>
+          <url>https://s01.oss.sonatype.org/content/repositories/snapshots/</url>
+        </repository>
+      </repositories>
+    </profile>
+    <profile>
+      <id>profile-2</id>
+      <repositories>
+        <repository>
+          <id>repository2</id>
+          <name>test repository</name>
+          <url>https://s01.oss.sonatype.org/content/repositories/snapshots/</url>
+        </repository>
+      </repositories>
+    </profile>
+  </profiles>
+
+  <activeProfiles>
+    <activeProfile>profile-1</activeProfile>
+    <activeProfile>profile-3</activeProfile>
+  </activeProfiles>
+</settings>
\ No newline at end of file
diff --git a/cobigen/core-artifact-retriever/src/test/resources/testdata/unittest/SearchResponseFactoryTest/mavenJsonTest.json b/cobigen/core-artifact-retriever/src/test/resources/testdata/unittest/SearchResponseFactoryTest/mavenJsonTest.json
new file mode 100644
index 0000000000..80ef347c17
--- /dev/null
+++ b/cobigen/core-artifact-retriever/src/test/resources/testdata/unittest/SearchResponseFactoryTest/mavenJsonTest.json
@@ -0,0 +1,37 @@
+{
+   "responseHeader":{
+      "status":0,
+      "QTime":1
+   },
+   "response":{
+      "numFound":4,
+      "start":0,
+      "docs":[
+		 {
+            "id":"com.devonfw.cobigen.templates:crud-java-server-app",
+            "g":"com.devonfw.cobigen.templates",
+            "a":"crud-java-server-app",
+            "latestVersion":"2021.08.001",
+            "repositoryId":"local",
+            "p":"xml",
+            "timestamp":1614380739000,
+            "versionCount":7,
+            "text":[
+               ".jar",
+               ".pom",
+			   ".xml"
+            ],
+            "ec":[
+               ".jar",
+               "-template-set.xml",
+               ".pom"
+            ]
+         }
+      ]
+   },
+   "spellcheck":{
+      "suggestions":[
+         
+      ]
+   }
+}
\ No newline at end of file
diff --git a/cobigen/core-externalprocess-api/pom.xml b/cobigen/core-externalprocess-api/pom.xml
index 1e1c2958d6..392ee5c6a6 100644
--- a/cobigen/core-externalprocess-api/pom.xml
+++ b/cobigen/core-externalprocess-api/pom.xml
@@ -25,7 +25,10 @@
     <dependency>
       <groupId>com.squareup.okhttp3</groupId>
       <artifactId>okhttp</artifactId>
-      <version>4.9.1</version>
+    </dependency>
+    <dependency>
+      <groupId>com.squareup.okio</groupId>
+      <artifactId>okio</artifactId>
     </dependency>
     <dependency>
       <groupId>com.google.code.gson</groupId>
diff --git a/cobigen/pom.xml b/cobigen/pom.xml
index 46fdcfec4c..2c2b6d5a7f 100644
--- a/cobigen/pom.xml
+++ b/cobigen/pom.xml
@@ -1,4 +1,5 @@
-<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">
+<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>
   <artifactId>core-parent</artifactId>
   <name>CobiGen Core - Parent</name>
@@ -16,5 +17,6 @@
     <module>cobigen-core-test</module>
     <module>cobigen-core-systemtest</module>
     <module>core-externalprocess-api</module>
+    <module>core-artifact-retriever</module>
   </modules>
 </project>
\ No newline at end of file
diff --git a/deploy.sh b/deploy.sh
index 7dc9c5be71..a3405eb488 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -28,10 +28,11 @@ then
     gitCleanup
   fi
   cd "$SCRIPT_PATH"
-else
+elif [ "$DEPLOY_UPDATESITE" = "test" ]
+then
   echo " ! Not detected cloned gh-pages branch in ../gh-pages folder."
   ORIGIN="$(git config --get remote.origin.url)"
-  SED_OUT=$(echo $ORIGIN | sed -r -E -n 's@^https:\/\/(github.com.*)@\1@p')
+  SED_OUT=$(echo $ORIGIN | sed -r -E -n 's@^.+(github.com.*)@\1@p')
   if [ -n "$SED_OUT" ] && [ -n "$BUILD_USER" ] && [ -n "$BUILD_USER_PASSWD" ]
   then
     ORIGIN="https://${BUILD_USER}:${BUILD_USER_PASSWD}@$SED_OUT"
@@ -45,26 +46,43 @@ echo ""
 echo "##########################################"
 echo ""
 
-log_step "Cleanup Projects"
-doRunCommand "mvn clean $MVN_SETTINGS $PARALLELIZED $BATCH_MODE"
+if [[ "$NO_CLEAN" = false ]]
+then
+  log_step "Cleanup Projects"
+  doRunCommand "mvn clean $MVN_SETTINGS $PARALLELIZED $BATCH_MODE"
+fi
 
-log_step "Build & Test Core"
-# need to exclude cobigen-core-systemtest as of https://issues.sonatype.org/browse/NEXUS-19853 for deployment only!
-doRunCommand "mvn deploy $MVN_SETTINGS -f cobigen --projects !cobigen-core-systemtest $ENABLED_TEST $DEBUG $PARALLELIZED $BATCH_MODE $DEPLOY_SIGN"
+if [[ " ${COMPONENTS_TO_BUILD[*]} " =~ " core " ]]; then
+  log_step "Build & Test Core"
+  # need to exclude cobigen-core-systemtest as of https://issues.sonatype.org/browse/NEXUS-19853 for deployment only!
+  doRunCommand "mvn deploy $MVN_SETTINGS -f cobigen --projects !cobigen-core-systemtest $ENABLED_TEST $DEBUG $PARALLELIZED $BATCH_MODE $DEPLOY_SIGN"
+fi
 
-log_step "Build & Test Core Plugins"
-doRunCommand "mvn deploy $MVN_SETTINGS -f cobigen-plugins $ENABLED_TEST $DEBUG $PARALLELIZED $BATCH_MODE $DEPLOY_SIGN"
+if [[ " ${COMPONENTS_TO_BUILD[*]} " =~ " plugins " ]]; then
+  log_step "Build & Test Core Plugins"
+  doRunCommand "mvn deploy $MVN_SETTINGS -f cobigen-plugins $ENABLED_TEST $DEBUG $PARALLELIZED $BATCH_MODE $DEPLOY_SIGN"
 
-log_step "Build Core Plugins - P2 Update Sites"
-doRunCommand "mvn package $MVN_SETTINGS bundle:bundle -Pp2-build,p2-bundle -DskipTests -f cobigen-plugins --projects !cobigen-javaplugin-parent/cobigen-javaplugin-model,!cobigen-openapiplugin-parent/cobigen-openapiplugin-model,!:plugins-parent,!cobigen-javaplugin-parent,!cobigen-openapiplugin-parent,!cobigen-templateengines $DEBUG $PARALLELIZED $BATCH_MODE -Dupdatesite.repository=$DEPLOY_UPDATESITE "
-doRunCommand "mvn install $MVN_SETTINGS bundle:bundle -Pp2-build,p2-bundle -DskipTests p2:site -f cobigen-plugins --projects !cobigen-javaplugin-parent/cobigen-javaplugin-model,!cobigen-openapiplugin-parent/cobigen-openapiplugin-model,!:plugins-parent,!cobigen-javaplugin-parent,!cobigen-openapiplugin-parent,!cobigen-templateengines $DEBUG $PARALLELIZED $BATCH_MODE -Dupdatesite.repository=$DEPLOY_UPDATESITE "
-doRunCommand "mvn deploy $MVN_SETTINGS -Pp2-build,p2-bundle -DskipTests -f cobigen-plugins --projects !cobigen-javaplugin-parent/cobigen-javaplugin-model,!cobigen-openapiplugin-parent/cobigen-openapiplugin-model,!:plugins-parent,!cobigen-javaplugin-parent,!cobigen-openapiplugin-parent,!cobigen-templateengines $DEBUG $PARALLELIZED $BATCH_MODE -Dupdatesite.repository=$DEPLOY_UPDATESITE"
+  log_step "Build Core Plugins - P2 Update Sites"
+  doRunCommand "mvn package $MVN_SETTINGS bundle:bundle -Pp2-build,p2-bundle -DskipTests -f cobigen-plugins --projects !cobigen-javaplugin-parent/cobigen-javaplugin-model,!cobigen-openapiplugin-parent/cobigen-openapiplugin-model,!:plugins-parent,!cobigen-javaplugin-parent,!cobigen-openapiplugin-parent,!cobigen-templateengines $DEBUG $PARALLELIZED $BATCH_MODE -Dupdatesite.repository=$DEPLOY_UPDATESITE "
+  doRunCommand "mvn install $MVN_SETTINGS bundle:bundle -Pp2-build,p2-bundle -DskipTests p2:site -f cobigen-plugins --projects !cobigen-javaplugin-parent/cobigen-javaplugin-model,!cobigen-openapiplugin-parent/cobigen-openapiplugin-model,!:plugins-parent,!cobigen-javaplugin-parent,!cobigen-openapiplugin-parent,!cobigen-templateengines $DEBUG $PARALLELIZED $BATCH_MODE -Dupdatesite.repository=$DEPLOY_UPDATESITE "
+  doRunCommand "mvn deploy $MVN_SETTINGS -Pp2-build,p2-bundle -DskipTests -f cobigen-plugins --projects !cobigen-javaplugin-parent/cobigen-javaplugin-model,!cobigen-openapiplugin-parent/cobigen-openapiplugin-model,!:plugins-parent,!cobigen-javaplugin-parent,!cobigen-openapiplugin-parent,!cobigen-templateengines $DEBUG $PARALLELIZED $BATCH_MODE -Dupdatesite.repository=$DEPLOY_UPDATESITE"
+fi
 
 log_step "Package & Run E2E Tests"
-doRunCommand "mvn test $MVN_SETTINGS -f cobigen/cobigen-core-systemtest $ENABLED_TEST $DEBUG $BATCH_MODE"
-# need to exclude cli-systemtest as of https://issues.sonatype.org/browse/NEXUS-19853 for deployment only!
-doRunCommand "mvn deploy $MVN_SETTINGS -f cobigen-cli --projects !cli-systemtest $ENABLED_TEST $DEBUG $BATCH_MODE $DEPLOY_SIGN"
-# need to exclude cobigen-maven-systemtest as of https://issues.sonatype.org/browse/NEXUS-19853 for deployment only!
-doRunCommand "mvn deploy $MVN_SETTINGS -f cobigen-maven --projects !cobigen-maven-systemtest $ENABLED_TEST $DEBUG $BATCH_MODE $DEPLOY_SIGN"
-doRunCommand "mvn deploy $MVN_SETTINGS -f cobigen-templates $ENABLED_TEST $DEBUG $BATCH_MODE $DEPLOY_SIGN"
-doRunCommand "mvn deploy $MVN_SETTINGS -f cobigen-eclipse -Pp2-build -DskipTests $ENABLED_TEST $DEBUG $BATCH_MODE -Dupdatesite.repository=$DEPLOY_UPDATESITE"
+if [[ " ${COMPONENTS_TO_BUILD[*]} " =~ " core " ]]; then
+  doRunCommand "mvn test $MVN_SETTINGS -f cobigen/cobigen-core-systemtest $ENABLED_TEST $DEBUG $BATCH_MODE"
+fi
+if [[ " ${COMPONENTS_TO_BUILD[*]} " =~ " cli " ]]; then
+  # need to exclude cli-systemtest as of https://issues.sonatype.org/browse/NEXUS-19853 for deployment only!
+  doRunCommand "mvn deploy $MVN_SETTINGS -f cobigen-cli --projects !cli-systemtest $ENABLED_TEST $DEBUG $BATCH_MODE $DEPLOY_SIGN"
+fi
+if [[ " ${COMPONENTS_TO_BUILD[*]} " =~ " maven " ]]; then
+  # need to exclude cobigen-maven-systemtest as of https://issues.sonatype.org/browse/NEXUS-19853 for deployment only!
+  doRunCommand "mvn deploy $MVN_SETTINGS -f cobigen-maven --projects !cobigen-maven-systemtest $ENABLED_TEST $DEBUG $BATCH_MODE $DEPLOY_SIGN"
+fi
+if [[ " ${COMPONENTS_TO_BUILD[*]} " =~ " templates " ]]; then
+  doRunCommand "mvn deploy $MVN_SETTINGS -f cobigen-templates $ENABLED_TEST $DEBUG $BATCH_MODE $DEPLOY_SIGN"
+fi
+if [[ " ${COMPONENTS_TO_BUILD[*]} " =~ " eclipse " ]]; then
+  doRunCommand "mvn deploy $MVN_SETTINGS -f cobigen-eclipse -Pp2-build -DskipTests $ENABLED_TEST $DEBUG $BATCH_MODE -Dupdatesite.repository=$DEPLOY_UPDATESITE"
+fi
diff --git a/documentation/DoD.asciidoc b/documentation/DoD.asciidoc
index ed646dfc15..b1741188ea 100644
--- a/documentation/DoD.asciidoc
+++ b/documentation/DoD.asciidoc
@@ -3,7 +3,7 @@ toc::[]
 
 = Definition of done
 
-Before a pull request (PR) for devonfw-ide is ready for review, this _definition of done_ (DoD) should be satisfied.
+Before a pull request (PR) for CobiGen is ready for review, this _definition of done_ (DoD) should be satisfied.
 Please note that external contributors are not strictly required to address all of these points, as we love to get contributions and do not want to scare people from contributing with too many constraints.
 However, chances to get your change merged quickly are higher if you address all the following points.
 
diff --git a/documentation/cobigen-core_configuration.asciidoc b/documentation/cobigen-core_configuration.asciidoc
index 68ab762cff..64d483d71e 100644
--- a/documentation/cobigen-core_configuration.asciidoc
+++ b/documentation/cobigen-core_configuration.asciidoc
@@ -3,6 +3,8 @@ toc::[]
 
 = Configuration
 
+== CobiGen HOME directory
+
 CobiGen is maintaining a home directory further referenced in this documentation as `$cghome`, which is used to maintain temporary or transient data. The home folder is determined with the following location fall-back:
 
 1. System environment variable `COBIGEN_HOME` (e.g. `C:\project\ide\conf\cobigen-home`)
@@ -10,15 +12,14 @@ CobiGen is maintaining a home directory further referenced in this documentation
 
 The actual configuration of CobiGen is maintained by a single folder or jar. The location can be configured with respect to the implemented configuration fall-back mechanism. CobiGen will search for the location of the configuration in the following order:
 
-1. A configuration jar or directory, which is passed to CobiGen by the Maven or Eclipse integration or any other program using the CobiGen programming interface:
-1.1. the Maven integration allows to configure a jar dependency to be included in the currently running classpath _(of interest for link:cobigen-maven_configuration#plugin-injection-since-v3[maven configuration]_
-1.2. the Eclipse integration allows to specify a `CobiGen_Templates` project in the eclipse workspace 
+1. A configuration jar or directory, which is passed to CobiGen by the Maven or Eclipse integration or any other program using the CobiGen programming interface: +
+1.1. the Maven integration allows to configure a jar dependency to be included in the currently running classpath _(of interest for link:cobigen-maven_configuration#plugin-injection-since-v3[maven configuration]_ +
+1.2. the Eclipse integration allows to specify a `CobiGen_Templates` project in the eclipse workspace +
 2. The file `$cghome/.cobigen` exists and the property `templates` is set to a valid configuration (e.g. `templates=C:\project\ide\conf\templates` or `templates=C:\project\ide\conf\templates.jar`) _Hint: Check for log entry like `Value of property templates in $cghome/.cobigen is invalid` to identify an invalid configuration which is not taken up as expected_
 3. The folder `$cghome/templates/CobiGen_Templates` exists
 4. The lexicographical sorted first configuration jar of the following path pattern `$cghome/templates/templates-([^-]+)-(\\d+\\.?)+.jar` if exists (e.g. `templates-devon4j-2020.04.001`)
 5. CobiGen will automatically download the latest jar configuration from maven central with `groupId` `com.devonfw.cobigen` and `artifactId` `templates-devon4j` and take it like described in 4.
 
-
 Within the configuration jar or directory you will find the following structure:
 
 ```
@@ -46,10 +47,9 @@ template-sets
    |- template-set1
      |- src
        |- main
-         |- templates
+         |- resources
            |- templates
-             |- context.xml
-             |- templates.xml
+           |- template-set.xml
    |- template-set2
 ```
 
@@ -83,10 +83,16 @@ For a custom template-sets folder simply set the `template-sets` parameter like
 template-sets=C:\\project\\ide\\conf\\template-sets
 ```
 
+And finally, for a custom template-set jar set the `template-sets` parameter analogously like this:
+
+```
+templates=C:\\project\\ide\\conf\\template-sets\\my-custom-template-set-devon4j-2023.01.001.jar
+```
+
 === Template set attributes
 Since: CobiGen 2021.12.006
 
-You can specify `template-sets` attributes f.e. to restrict the teams to ask for default templates provided by CobiGen. There are `four` custom template-sets attributes:
+You can specify `template-sets` attributes f.e. to restrict the teams to ask for default templates provided by CobiGen. There are `five` custom template-sets attributes:
 
 * `template-sets.groupIds`: Search for template-set artifacts by that configuration key
 configure multiple (comma separated) `groupIds`. By default, (public) CobiGen `groupId` will be used.
@@ -118,8 +124,8 @@ The context configuration (`context.xml`) always has the following root structur
 .Context Configuration
 ```xml
 <?xml version="1.0" encoding="UTF-8"?>
-<contextConfiguration xmlns="http://capgemini.com" 
-                      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+<contextConfiguration xmlns="http://capgemini.com"
+                      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                       version="1.0">
     <triggers>
         ...
@@ -147,7 +153,7 @@ As children of the `<triggers>` node you can define different triggers. By defin
 
 === Matcher Node
 
-A trigger will be activated if its matchers hold the following formula: 
+A trigger will be activated if its matchers hold the following formula:
 
 `!(NOT || ... || NOT) && AND && ... && AND && (OR || ... || OR)`
 
@@ -164,7 +170,7 @@ Whereas NOT/AND/OR describes the `accumulationType` of a _matcher_ (see below) a
 * The attribute `value` might contain any information necessary for processing the _matcher's_ functionality. Have a look at the relevant plug-in's documentation for more detail.
 * The attribute `accumulationType` _(optional)_ specifies how the matcher will influence the trigger activation. Valid values are:
 ** OR (default): if any matcher of accumulation type OR _matches_, the trigger will be activated as long as there are no further matchers with different accumulation types
-** AND: if any matcher with AND accumulation type does _not match_, the trigger will _not_ be activated 
+** AND: if any matcher with AND accumulation type does _not match_, the trigger will _not_ be activated
 ** NOT: if any matcher with NOT accumulation type _matches_, the trigger will _not_ be activated
 
 === Variable Assignment Node
@@ -175,8 +181,8 @@ Finally, a `<matcher>` node can have multiple `<variableAssignment>` nodes as ch
 .Complete Configuration Pattern
 ```xml
 <?xml version="1.0" encoding="UTF-8"?>
-<contextConfiguration xmlns="http://capgemini.com" 
-                      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+<contextConfiguration xmlns="http://capgemini.com"
+                      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                       version="1.0">
     <triggers>
         <trigger id="..." type="..." templateFolder="...">
@@ -200,8 +206,8 @@ Such a container might be a package, which encloses multiple types or---more gen
 .`ContainerMatcher` Declaration
 ```xml
 <?xml version="1.0" encoding="UTF-8"?>
-<contextConfiguration xmlns="http://capgemini.com" 
-                      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+<contextConfiguration xmlns="http://capgemini.com"
+                      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                       version="1.0">
     <triggers>
         <trigger id="..." type="..." templateFolder="..." >
@@ -240,8 +246,8 @@ To get an intuition of the idea, the following will initially describe the first
 .Extensive Templates Configuration
 ```xml
 <?xml version="1.0" encoding="UTF-8"?>
-<templatesConfiguration xmlns="http://capgemini.com" 
-                        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+<templatesConfiguration xmlns="http://capgemini.com"
+                        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                         version="1.0" templateEngine="FreeMarker">
     <templates>
             ...
@@ -255,7 +261,7 @@ The root node `<templatesConfiguration>` specifies two attributes. The attribute
 
 The node `<templatesConfiguration>` allows two different grouping nodes as children. First, there is the `<templates>` node, which groups all declarations of templates. Second, there is the `<increments>` node, which groups all declarations about increments.
 
-=== Template Node
+=== Templates Node
 
 The `<templates>` node groups multiple `<template>` declarations, which enables further generation. Each template file should be registered at least once as a template to be considered.
 
@@ -293,18 +299,18 @@ The second configuration style for template meta-data is driven by initially sca
 .Example of Template-scan configuration
 ```xml
 <?xml version="1.0" encoding="UTF-8"?>
-<templatesConfiguration xmlns="http://capgemini.com" 
-                        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+<templatesConfiguration xmlns="http://capgemini.com"
+                        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                         version="1.2">
     <templateScans>
         <templateScan templatePath="templates" templateNamePrefix="prefix_" destinationPath="src/main/java"/>
     </templateScans>
 </templatesConfiguration>
 ```
-You can specify multiple `<templateScan ...>` nodes for different `templatePaths` and different `templateNamePrefixes`. 
+You can specify multiple `<templateScan ...>` nodes for different `templatePaths` and different `templateNamePrefixes`.
 
 * The `name` can be specified to later on reference the templates found by a template-scan within an xref:increment-node[increment]. _(since `cobigen-core-v2.1.`)_
-* The `templatePath` specifies the relative path from the `templates.xml` to the root folder from which the template scan should be performed. 
+* The `templatePath` specifies the relative path from the `templates.xml` to the root folder from which the template scan should be performed.
 * The `templateNamePrefix` _(optional)_ defines a common id prefix, which will be added to all found and automatically configured templates.
 * The `destinationPath` defines the root folder all found templates should be generated to, whereas the root folder will be a prefix for all found and automatically configured templates.
 
@@ -374,7 +380,7 @@ _(Since version 4.1.0)_  An special case of `<incrementRef ...>` is the external
 
 However, if we want to reference an increment that it is not defined inside our `templates.xml` (an increment defined for another trigger), then we can use external `incrementRef` as shown below:
 
-```xml 
+```xml
 <increment name="..." description="...">
     <incrementRef ref="trigger_id::increment_id"/>
 </increment>
@@ -382,10 +388,179 @@ However, if we want to reference an increment that it is not defined inside our
 
 The ref string is split using as delimiter `::`. The first part of the string, is the `trigger_id` to reference. That trigger contains an `increment_id`. Currently, this functionality only works when both templates use the same kind of input file.
 
+
+== Template-set Configuration
+
+
+With version 6.0 you are working with template-sets rather than the old monolithic structure with template.xml and context.xml files.
+The template-set.xml is basically a context.xml concatenated with the corresponding templates.xml all in one file.
+
+Therefore the root structure should look somewhat familiar:
+
+.Template-Set Configuration
+```xml
+<?xml version="1.0" encoding="UTF-8"?>
+<templateSetConfiguration xmlns="http://capgemini.com"
+                      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                      version="1.0">
+    <cc:contextConfiguration version="1.0">
+    <cc:triggers>
+        ...
+    </cc:triggers>
+
+    </cc:contextConfiguration>
+
+    <tc:templatesConfiguraition>
+    <tc:templates>
+            ...
+    </tc:templates>
+    <increments>
+            ...
+    </tc:increments>
+    </tc:templatesConfiguration>
+</templateSetConfiguration>
+```
+
+The corresponding parts form the old monolithic structure by their own tags, so backwards compatibility is possible.
+Also note how the prefixes are also marking the respective old parts.
+
+
+== Manual upgrade from old (monolithic) to new (template-sets) structure
+
+
+
+
+
+== Configuration Upgrade
+
+`CobiGen 2021.12.007` introduces an updated configuration folder structure:
+
+```
+template-sets
+ |- downloaded
+   |- template-set1.jar
+   |- template-set2.jar
+ |- adapted
+   |- template-set1
+     |- src
+       |- main
+         |- resources
+           |- templates
+           |- template-set.xml
+   |- template-set2
+```
+
+The updated structure splits the context.xml and the pom.xml files into multiple directories - one for each template set
+ - each with their own atomized/small/more understandable version so you can download them individually instead of all at once.
+
+If the configuration needs to be upgraded, the user will be asked whether he wants to perform an automatic upgrade. The
+upgrade can also be performed manually, but it is highly recommended to perform it automatically.
+
+=== Manual Upgrade Steps
+If you wish to manually split your templates into smaller parts, as specified in version 3.0, please follow the following instructions.
+Navigate to your CobiGen directory e.g. `$cghome/.cobigen`. If the `template-sets` folder is missing,
+please create one. Navigate into the folder and create a `downloaded` and an `adapted` folder.
+
+1. Navigate to the newly created `adapted` folder and create a new folder named after the template you want to upgrade
+e. g. `template1`
+
+2. In the newly created folder, create the following folder structure:
+```
+ |- adapted
+   |- template1
+     |- src
+       |- main
+         |- resources
+```
+Whereas `template1` is the name of the template you want to upgrade.
+[start=3]
+3. Within the old templates directory, navigate to `CobiGen_Templates\src\main\java` and copy the `java` folder, which contains the template utility source files, into your newly created `main` folder.
+The structure of the `adapted` folder should now look like this:
+```
+ |- adapted
+   |- template1
+     |- src
+       |- main
+         |- java
+         |- resources
+```
+[start=4]
+4. Navigate to the template you want to upgrade e.g. `CobiGen_Templates\src\main\templates\template1` and copy all of it's contents
+into your newly generated templates folder (`template-sets\adapted\template1\src\main\resources`).
+
+6. Switch to `template-sets\adapted\template1\src\main\resources` and create a new 'template-set.xml' file (which combines the context.xml and templates.xml), with the following content (adapted to your needs):
+```
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:templateSetConfiguration version="6.0" xmlns:tns="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration" xmlns:cc="http://capgemini.com/devonfw/cobigen/ContextConfiguration" xmlns:tc="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration templateSetConfiguration.xsd ">
+
+  <cc:contextConfiguration version="6.0">
+    <cc:trigger id="template1" type="java">
+      <cc:matcher type="fqn" value="*"></cc:matcher>
+    </cc:trigger>
+    <cc:tags>
+      <cc:tag name="bla"/>
+    </cc:tags>
+  </cc:contextConfiguration>
+
+  <tc:templatesConfiguration version="6.0">
+    <tc:templates>
+      <tc:template name="prefix_Foo2Class.java"
+        destinationPath="src/main/java/foo/Foo2Class${variable}.java" templateFile="templates/foo/Foo2Class.java.ftl"
+        mergeStrategy="javamerge"/>
+      <tc:templateExtension ref="prefix2_FooClass.java"
+        destinationPath="adapted/path/FooClass.java" mergeStrategy="javamerge" targetCharset="ISO-8859-1"/>
+      <tc:templateExtension ref="prefix2_Foo2Class.java"/>
+    </tc:templates>
+
+    <tc:templateScans>
+      <tc:templateScan templateNamePrefix="prefix_" templatePath="templates/foo"
+        destinationPath="src/main/java/foo"/>
+      <tc:templateScan templateNamePrefix="prefix2_" templatePath="templates/bar"
+        destinationPath="src/main/java/bar"/>
+    </tc:templateScans>
+  </tc:templatesConfiguration>
+
+</tns:templateSetConfiguration>
+```
+The newly generated 'template-set.xml' file contains information for just one template-set. You can copy this information for
+your template from the old 'context.xml' (located here: `CobiGen_Templates\src\main\templates`) and 'templates.xml' file (located here: `CobiGen_Templates\src\main\templates\template1`) (e.g. crud-java-server-app).
+[start=7]
+7. Switch to `template-sets\adapted\template1` and create a new `pom.xml`. With the following content (adapted to your needs):
+
+```
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <parent>
+    <groupId>com.devonfw.cobigen</groupId>
+    <artifactId>templates-devon4j</artifactId>
+    <version>2021.12.007</version>
+  </parent>
+  <artifactId>template1</artifactId>
+  <name>PLACEHOLDER---Replace this text with a correct template name---PLACEHOLDER</name>
+  <dependencies>
+    <dependency>
+
+    //Your first dependency
+
+    </dependency>
+
+    <dependency>
+
+    //Your second dependency
+
+    </dependency>
+  </dependencies>
+</project>
+
+```
+[start=8]
+8. Congratulations, you have upgraded your first template!
+
 == Java Template Logic
 
 _since `cobigen-core-3.0.0` which is included in the Eclipse and Maven Plugin since version 2.0.0_
-In addition, it is possible to implement more complex template logic by custom Java code. To enable this feature, you can simply import the the `CobiGen_Templates` by clicking on _Adapt Templates_, turn it into a simple maven project (if it is not already) and implement any Java logic in the common maven layout (e.g. in the source folder `src/main/java`). Each Java class will be instantiated by CobiGen for each generation process. Thus, you can even store any state within a Java class instance during generation. However, there is currently no guarantee according to the template processing order. 
+In addition, it is possible to implement more complex template logic by custom Java code. To enable this feature, you can simply import the the `CobiGen_Templates` by clicking on _Adapt Templates_, turn it into a simple maven project (if it is not already) and implement any Java logic in the common maven layout (e.g. in the source folder `src/main/java`). Each Java class will be instantiated by CobiGen for each generation process. Thus, you can even store any state within a Java class instance during generation. However, there is currently no guarantee according to the template processing order.
 
 As a consequence, you have to implement your Java classes with a public default (non-parameter) constructor to be used by any template. Methods of the implemented Java classes can be called within templates by the simple standard FreeMarker expression for calling Bean methods: `SimpleType.methodName(param1)`. Until now, CobiGen will shadow multiple types with the same simple name non-deterministically. So please prevent yourself from that situation.
 
diff --git a/documentation/cobigen-intellij-installation.asciidoc b/documentation/cobigen-intellij-installation.asciidoc
index 08fd10362c..c787115bb1 100644
--- a/documentation/cobigen-intellij-installation.asciidoc
+++ b/documentation/cobigen-intellij-installation.asciidoc
@@ -20,16 +20,16 @@ If you want to use IntelliJ for CobiGen project, you can follow the steps below:
 .. Go to `File`-> `Settings` -> `Build, Execution, Deployment` -> `Build Tools` -> `Maven`
 +
 --
-... **Choose** `(Maven home Path)` from your devonFolder -> devonProjects/software/maven
+... **Choose** `(Maven home Path)` from your `devonFolder` -> `devonProjects/software/maven`
 
-... **Override** `(user settings file)` -> devonProjects/conf/.m2/settings.xml
+... **Override** `(user settings file)` -> `devonProjects/conf/.m2/settings.xml`
 
-... **Override** `(Local repository)` -> devonProjects/conf/.m2/repository
+... **Override** `(Local repository)` -> `devonProjects/conf/.m2/repository`
 --
 +
 image::images/howtos/intellij/maven-settings.png[Maven Settings]
 
-.. Now go to `File` -> `Project Structure` -> `Project Settings` -> `Project add java sdk version from` -> `devonProjects/software/java`. 
+.. Now go to `File` -> `Project Structure` -> `Project Settings` -> `Project add java sdk version from` -> `devonProjects/software/java`.
 +
 Make sure you are using Java 11. If you have set up your devonfw-ide with this settings URL `https://github.com/devonfw/cobigen-ide-settings.git`, the correct version will be set automatically. If not, you can download Java 11 manually and place it into `devonProjects/software/java11`.
 +
@@ -55,13 +55,13 @@ image::images/howtos/intellij/adapter-plugin-settings.png[Eclipse Formatter Plug
 
 === IntelliJ Testing and Debugging
 
-. Disable **ArgLine**: 
+. Disable **ArgLine**:
 +
 If there are any tests that do not work, you might want to disable argline. Go to  `File` -> `Settings` -> `Build, Execution, Deployment` -> `Build Tools` -> `Maven` -> `Running Tests` then uncheck **ArgLine**
 +
 image::images/howtos/intellij/argline.png[Unchecked Argline]
 
-. Delegate IDE build and run actions to Maven: 
+. Delegate IDE build and run actions to Maven:
 +
 Go to `File` -> `Settings` -> `Build, Execution, Deployment` -> `Build Tools` -> `Maven` -> `Runner` and check `Delegate IDE build/run actions to Maven`.
 +
diff --git a/documentation/guide_dev_troubleshooting.asciidoc b/documentation/guide_dev_troubleshooting.asciidoc
index ab09dfca02..a65794fcd1 100644
--- a/documentation/guide_dev_troubleshooting.asciidoc
+++ b/documentation/guide_dev_troubleshooting.asciidoc
@@ -96,9 +96,9 @@ But on the local system the build and test process works fine.
 ==== Solution
 If you add an Eclipse test project, make sure that you git force add the .project file too. Otherwise the `importExistingGeneralProject` method will fail.
 
-== I get ongoingly wrong intendation (4 whitespaces instead of 2) by the eclipse formatter on editor save
+== I get ongoingly wrong indentation (4 whitespaces instead of 2) by the eclipse formatter on editor save
 
-The issue might be, that due to eclipse upgrades or accidential changes on the formatter configuration, you might have project specific formatter settings enabled without your knowledge or even just have an old version of eclipse nobody is compliant anymore with.
+The issue might be, that due to eclipse upgrades or accidental changes on the formatter configuration, you might have project specific formatter settings enabled without your knowledge or even just have an old version of eclipse nobody is compliant anymore with.
 To clean up your installation as well as making sure, that you don't have any project specific jdt configuration, please follow the following steps:
 
 1. Close all devonfw applications
diff --git a/documentation/images/howtos/e2e_gen/image14.png b/documentation/images/howtos/e2e_gen/image14.png
index 39c8403da6..e3dd14b086 100644
Binary files a/documentation/images/howtos/e2e_gen/image14.png and b/documentation/images/howtos/e2e_gen/image14.png differ
diff --git a/documentation/images/howtos/e2e_gen/image20.png b/documentation/images/howtos/e2e_gen/image20.png
index 632c481d5c..887ad4a698 100644
Binary files a/documentation/images/howtos/e2e_gen/image20.png and b/documentation/images/howtos/e2e_gen/image20.png differ
diff --git a/documentation/images/howtos/e2e_gen/image22.png b/documentation/images/howtos/e2e_gen/image22.png
index 1245e4d802..a47eae6541 100644
Binary files a/documentation/images/howtos/e2e_gen/image22.png and b/documentation/images/howtos/e2e_gen/image22.png differ
diff --git a/documentation/images/howtos/e2e_gen/image23.png b/documentation/images/howtos/e2e_gen/image23.png
index 26568da005..dc334d9f81 100644
Binary files a/documentation/images/howtos/e2e_gen/image23.png and b/documentation/images/howtos/e2e_gen/image23.png differ
diff --git a/documentation/images/howtos/e2e_gen/image37.png b/documentation/images/howtos/e2e_gen/image37.png
index 835fd3e8ff..ef9c217cd4 100644
Binary files a/documentation/images/howtos/e2e_gen/image37.png and b/documentation/images/howtos/e2e_gen/image37.png differ
diff --git a/documentation/images/howtos/e2e_gen/image39.png b/documentation/images/howtos/e2e_gen/image39.png
index 61720c65fc..b46e15e946 100644
Binary files a/documentation/images/howtos/e2e_gen/image39.png and b/documentation/images/howtos/e2e_gen/image39.png differ
diff --git a/documentation/mgmt_ide-setup.asciidoc b/documentation/mgmt_ide-setup.asciidoc
index e16ae99e43..a21d9a8b80 100644
--- a/documentation/mgmt_ide-setup.asciidoc
+++ b/documentation/mgmt_ide-setup.asciidoc
@@ -6,7 +6,7 @@ toc::[]
 
 == General Installation Process
 
-. First of all you will have to https://devonfw.com/website/pages/docs/devonfw-guide_ide.wiki_setup.asciidoc.html[setup the devonfw IDE]. Once the download is complete and you started the installation process via the setup command (or setup.bat), you will be prompted for a settings URL. You can just press enter as no special settings are used. Following that, you will simply have to wait and follow any instructions given.
+. First of all you will have to https://devonfw.com/website/pages/docs/devonfw-guide_ide.wiki_setup.asciidoc.html[setup the devonfw IDE] with the following settings URL: https://github.com/devonfw/cobigen-ide-settings.git. Once the download is complete and you started the installation process via the setup command (or setup.bat), you will be prompted for a settings URL. You can just press enter as no special settings are used. Following that, you will simply have to wait and follow any instructions given.
 +
 After you have executed the steps mentioned above, your install location should look like the picture below.
 +
diff --git a/functions.sh b/functions.sh
index 0c960bad31..ddca4b8982 100755
--- a/functions.sh
+++ b/functions.sh
@@ -3,106 +3,159 @@ SCRIPT_PATH="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
 pushd "$SCRIPT_PATH"
 trap popd EXIT ERR
 
+# all components
+ALL_COMPONENTS=(core plugins templates maven eclipse cli)
+
+# A POSIX variable
+OPTIND=1         # Reset in case getopts has been used previously in the shell.
+
+function show_help() {
+echo -e "\e[39m"
+echo "##########################################"
+echo ""
+cat << EOF
+
+Usage of CobiGen build & deploy script
+
+  -b | --batch             Batch mode to prevent from issues like https://stackoverflow.com/a/66801171
+  -c | --coverage          Create code coverage report
+  -C | --components=       Components to build/deploy. By default all possible values $( IFS=$','; echo "${ALL_COMPONENTS[*]}" ). Can be multiple, commaseparated
+  -d | --dirty             Dirty execution running no maven clean before build
+  -g | --gpgkey=           GPG key name to be passed for code signing
+  -h | --help              Show help
+  -p | --parallel          Parallelize execution (1 Thread per Core)
+  -r | --coverage-report   Create coverage report (building sonar-report project)
+  -s | --ci-settings       Executing maven with .m2/ci-settings.xml
+  -t | --test              Execute tests
+  -x | --debug             Run debug mode (highly verbose logs)
+  -y | --silent-confirm    Agree to all yes / no questions silently
+  -z | --dryrun            Dry run (no git push will be executed) - needed to test the release script
+
+EOF
+}
+
+# defaults
+COMPONENTS_TO_BUILD=()
+ENABLED_TEST="-DskipTests"
+MVN_SETTINGS=""
+BATCH_MODE=""
+PARALLELIZED=""
+DEBUG=""
+DRYRUN=false
+NO_CLEAN=false
+GPG_KEYNAME=""
+COVERAGE=""
+COV_REPORT=false
+
 echo ""
 echo "##########################################"
 echo ""
-echo "Script config: "
-if [[ "$*" == *test* ]]
-then
-  ENABLED_TEST=""
-  echo -e "\e[92m  > With test execution\e[39m"
-else
-  ENABLED_TEST="-DskipTests"
-  echo "  * No test execution (pass 'test' as argument to enable)"
-fi
+echo "Configuration: "
 
-if [[ "$*" == *repo-mvn-settings* ]]
+# Automatically get GPG key from env
+if [[ -n "$GPG_KEY" ]]
 then
-  MVN_SETTINGS="-s .mvn/settings.xml"
-  echo -e "\e[92m  > Executing with .mvn/settings.xml \e[39m"
-else
-  MVN_SETTINGS=""
-  echo "  * Executing with individually configured settings.xml (pass 'repo-mvn-settings' as argument to enable execution with .mvn/settings.xml)"
+  GPG_KEYNAME=$GPG_KEY
+  echo -e "\e[92m  > GPG Key set to $GPG_KEYNAME\e[39m"
 fi
 
-if [[ "$*" == *batch* ]]
+MVN_DEBUG="-DtrimStackTrace=false -Dtycho.debug.resolver=true -X"
+# Automatically enable debug logging on github actions debug run
+if [[ "$RUNNER_DEBUG" == true ]]
 then
-  # https://stackoverflow.com/a/66801171 # the latter will remove maven download logs / might cause https://stackoverflow.com/a/66801171 issues
-  BATCH_MODE="-Djansi.force=true -Djansi.passthrough=true -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn"
-  echo -e "\e[92m  > Running in batch mode\e[39m"
-else
-  BATCH_MODE=""
-  echo "  * No batch mode, showing all downloads + ascii colors (pass 'batch' as argument to enable)"
+  DEBUG="$MVN_DEBUG"
+  echo -e "\e[92m  > Running in debug mode\e[39m"
 fi
 
-if [[ "$*" == *parallel* ]]
-then
-  PARALLELIZED="-T1C"
-  echo -e "\e[92m  > Parallel execution of 1 thread per core\e[39m"
-else
-  PARALLELIZED=""
-  echo "  * No parallel execution (pass 'parallel' as argument to enable)"
-fi
+echo -e "\e[91m"
 
-if [[ "$*" == *debug* ]]
-then
-  DEBUG="-DtrimStackTrace=false -Dtycho.debug.resolver=true -X" # set to false to see hidden exceptions
-  echo -e "\e[92m  > Debug Mode\e[39m"
-else
-  DEBUG=""
-  echo "  * No debug mode (pass 'debug' as argument to enable)"
+if ! options="$(getopt -l "batch,coverage,components:,dirty,gpgkey:,help,parallel,coverage-report,repo-settings,test,debug,silent-confirm,dryrun" -o "bcC:dg:hprstxyz" -- "$@")"; then
+  show_help
+  exit 1
 fi
+eval set -- "$options"
 
-if [[ "$*" == *dryrun* ]]
-then
-  DRYRUN=true
-  echo -e "\e[92m  > Dryrun - No git push will be executed\e[39m"
-else
-  DRYRUN=false
-  echo "  * No dryrun (pass 'dryrun' as argument to enable)"
-fi
+while true
+do
+  case "$1" in
+    -b|--batch)
+      # the latter will remove maven download logs / might cause https://stackoverflow.com/a/66801171 issues
+      BATCH_MODE="-Djansi.force=true -Djansi.passthrough=true -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn"
+      echo -e "\e[92m  > Running in batch mode\e[39m"
+      ;;
+    -c|--coverage)
+      COVERAGE="-Dskip.code.coverage=false"
+      echo -e "\e[92m  > Enabled code coverage instrumentation\e[39m"
+      ;;
+    -C|--components)
+      shift
+      IFS=',' read -r -a COMPONENTS <<< "$1"
+      COMPONENTS_TO_BUILD+=(${COMPONENTS[*]})
+      echo -e "\e[92m  > Build components $( IFS=$','; echo "${COMPONENTS[*]}" )\e[39m"
+      ;;
+    -d|--dirty)
+      NO_CLEAN=true
+      echo -e "\e[92m  > Skip mvn clean\e[39m"
+      ;;
+    -g|--gpgkey)
+      shift
+      GPG_KEYNAME="$1"
+      echo -e "\e[92m  > GPG Key set to $GPG_KEYNAME\e[39m"
+      ;;
+    -h|--help)
+      show_help
+      exit 0
+      ;;
+    -p|--parallel)
+      PARALLELIZED="-T1C"
+      echo -e "\e[92m  > Parallel execution of 1 thread per core\e[39m"
+      ;;
+    -r|--coverage-report)
+      COV_REPORT=true
+      echo -e "\e[92m  > Create coverage report\e[39m"
+      ;;
+    -s|--repo-settings)
+      MVN_SETTINGS="-s .mvn/ci-settings.xml"
+      echo -e "\e[92m  > Executing maven with settings from .mvn/settings.xml \e[39m"
+      ;;
+    -t|--test)
+      ENABLED_TEST=""
+      echo -e "\e[92m  > With test execution\e[39m"
+      ;;
+    -x|--debug)
+      DEBUG="$MVN_DEBUG"
+      echo -e "\e[92m  > Running in debug mode\e[39m"
+      ;;
+    -y|--silent-confirm)
+      SILENT=true
+      echo -e "\e[92m  > Silent confirmation \e[93m(accept all confirmations silently)\e[39m"
+      ;;
+    -z|--dryrun)
+      DRYRUN=true
+      echo -e "\e[92m  > Dryrun - No git push will be executed\e[39m"
+      ;;
+    --)
+      shift
+      break
+    ;;
+  esac
+  shift
+done
 
-if [[ "$*" == *silent* ]]
+if [[ ${#COMPONENTS_TO_BUILD[@]} = 0 ]]
 then
-  SILENT=true
-  echo -e "\e[92m  > Silent execution \e[93m(accept all confirmations silently)\e[39m"
-else
-  SILENT=false
-  echo "  * No silent execution (pass 'silent' as argument to enable)"
+  echo -e "\e[92m  > Build all components\e[39m"
+  COMPONENTS_TO_BUILD=${ALL_COMPONENTS[*]}
 fi
 
-if [[ "$*" == *no-clean* ]]
-then
-  NO_CLEAN=true
-  echo -e "\e[92m  > Skip mvn clean\e[39m"
-else
-  NO_CLEAN=false
-  echo "  * Executing mvn clean before execution (pass 'no-clean' as argument to skip)"
-fi
+## VALIDATE
 
-if [[ "$*" == *gpgkey=* ]]
-then
-  GPG_KEYNAME=$(echo "$*" | sed -r -E -n 's|.*gpgkey=([^ ]+).*|\1|p')
-  echo -e "\e[92m  > GPG Key set to $GPG_KEYNAME\e[39m"
-elif [[ -n "$GPG_KEY" ]]
-then
-  GPG_KEYNAME=$GPG_KEY
-  echo -e "\e[92m  > GPG Key set to $GPG_KEYNAME\e[39m"
-elif [[ $(basename $0) != "build.sh" ]]
+if [[ "$(basename $0)" != "build.sh" ]] && [[ -z "$GPG_KEYNAME" ]]
 then
   echo -e "\e[91m  !ERR! Cannot sign artifacts without passing a gpg key for signing. Please pass gpgkey=<your key> as a parameter or GPG_KEY as secret.\e[39m"
   exit 1
 fi
 
-if [[ "$*" == *coverage* ]]
-then
-  COVERAGE="-Dskip.code.coverage=false"
-  echo -e "\e[92m  > Creating Code Coverage report\e[39m"
-else
-  COVERAGE=""
-  echo "  * No code coverage (pass 'coverage' as argument to enable)"
-fi
-
 DEPLOY_SIGN="-Poss -Dgpg.keyname=$GPG_KEYNAME -Dgpg.executable=gpg"
 if [[ "$SILENT" = true ]] && [[ -z "$GPG_PASSPHRASE" ]]
 then
@@ -149,7 +202,7 @@ function doRunCommand() {
 # $1: yes/no question
 function doAskQuestion() {
 	local question="${1}"
-  
+
 	local answer
 	while true
 	do
@@ -200,6 +253,6 @@ function pauseUntilKeyPressed() {
   if [[ "$SILENT" = false ]]
   then
     echo ""
-    read -p "Press any key to resume with cleanup after reviewing the deployments ..."  
+    read -p "Press any key to resume with cleanup after reviewing the deployments ..."
   fi
 }
diff --git a/pom.xml b/pom.xml
index 029605ecaf..e0f14f7dbf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.devonfw.cobigen</groupId>
   <artifactId>master-parent</artifactId>
@@ -14,9 +14,10 @@
     <github.project>devonfw/cobigen</github.project>
     <flatten.mode>ossrh</flatten.mode>
     <slf4j.version>1.7.30</slf4j.version>
+    <zeroturnaround.version>1.12</zeroturnaround.version>
     <skip.deployment>true</skip.deployment>
-    <java.version>1.8</java.version>
-    <tycho.version>1.6.0</tycho.version>
+    <java.version>11</java.version>
+    <tycho.version>2.7.5</tycho.version>
     <jaxb.version>3.0.1</jaxb.version>
     <jacoco.version>0.8.8</jacoco.version>
     <license.skipAggregateDownloadLicenses>${skip.deployment}</license.skipAggregateDownloadLicenses>
@@ -129,7 +130,12 @@
       <dependency>
         <groupId>com.google.guava</groupId>
         <artifactId>guava</artifactId>
-        <version>30.1.1-jre</version>
+        <version>31.1-jre</version>
+      </dependency>
+      <dependency>
+        <groupId>org.zeroturnaround</groupId>
+        <artifactId>zt-exec</artifactId>
+        <version>${zeroturnaround.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.commons</groupId>
@@ -139,13 +145,23 @@
       <dependency>
         <groupId>com.fasterxml.jackson.core</groupId>
         <artifactId>jackson-databind</artifactId>
-        <version>2.12.7.1</version>
+        <version>2.13.3</version>
       </dependency>
       <dependency>
         <groupId>com.google.code.gson</groupId>
         <artifactId>gson</artifactId>
         <version>2.8.9</version>
       </dependency>
+      <dependency>
+        <groupId>com.squareup.okhttp3</groupId>
+        <artifactId>okhttp</artifactId>
+        <version>4.10.0</version>
+      </dependency>
+      <dependency>
+        <groupId>com.squareup.okio</groupId>
+        <artifactId>okio</artifactId>
+        <version>3.2.0</version>
+      </dependency>
       <dependency>
         <groupId>jaxen</groupId>
         <artifactId>jaxen</artifactId>
@@ -187,6 +203,11 @@
         <artifactId>core-externalprocess-api</artifactId>
         <version>${revision}</version>
       </dependency>
+      <dependency>
+        <groupId>com.devonfw.cobigen</groupId>
+        <artifactId>core-artifact-retriever</artifactId>
+        <version>${revision}</version>
+      </dependency>
       <dependency>
         <groupId>com.devonfw.cobigen</groupId>
         <artifactId>core-test</artifactId>
@@ -197,6 +218,11 @@
         <artifactId>javaplugin</artifactId>
         <version>${revision}</version>
       </dependency>
+      <dependency>
+        <groupId>com.devonfw.cobigen</groupId>
+        <artifactId>openapiplugin</artifactId>
+        <version>${revision}</version>
+      </dependency>
       <dependency>
         <groupId>com.devonfw.cobigen</groupId>
         <artifactId>tempeng-freemarker</artifactId>
@@ -233,7 +259,7 @@
             <configuration>
               <property>master.basedir</property>
               <project>
-                <groupId>${project.groupId}</groupId>
+                <groupId>com.devonfw.cobigen</groupId>
                 <artifactId>master-parent</artifactId>
               </project>
             </configuration>
@@ -593,22 +619,6 @@
               </execution>
             </executions>
           </plugin>
-          <!-- plugins from profile -->
-          <!-- sets ${qualifiedVersion} for upload to update site -->
-          <plugin>
-            <groupId>org.eclipse.tycho</groupId>
-            <artifactId>tycho-packaging-plugin</artifactId>
-            <version>${tycho.version}</version>
-            <executions>
-              <execution>
-                <id>build-qualifier</id>
-                <phase>validate</phase>
-                <goals>
-                  <goal>build-qualifier</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
         </plugins>
       </build>
     </profile>
diff --git a/sonar-report/pom.xml b/sonar-report/pom.xml
index b68081935b..9795e236dd 100644
--- a/sonar-report/pom.xml
+++ b/sonar-report/pom.xml
@@ -14,10 +14,6 @@
   <artifactId>sonar-report</artifactId>
   <name>Aggregated Sonar Report</name>
 
-  <properties>
-    <java.version>11</java.version>
-  </properties>
-
   <!-- Unfortunately, there is different solution to that then specifying all leaves modules of interest -->
   <dependencies>
     <dependency>