diff --git a/.gitignore b/.gitignore
index a70a722..8d2ff7e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@
 
 # Log file
 *.log
+.idea
 #*.iml
 
 # Package Files #
@@ -34,15 +35,9 @@ src/generated
 .project
 .classpath
 .factorypath
-.idea/
-.settings/
+.settings
 .vscode
 *.code-workspace
 *.xpr
 # Testing stuff
 xrechnung
-
-# Mac stuff
-.DS_Store
-andre*-simple.xml
-somePrefix*.xml
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1fb40e2..f0365aa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,15 +3,13 @@ image: maven:latest
 variables:
   BUILD_PROPS: "-Dbuild.revision=$CI_COMMIT_SHA -Dbuild.branch=$CI_COMMIT_REF_NAME -Dbuild.number=$CI_PIPELINE_IID -Dfile.encoding=UTF-8  -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false"
   MAVEN_OPTS: "-Dmaven.repo.local=$CI_PROJECT_DIR/.m2/repository -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN -Dorg.slf4j.simpleLogger.showDateTime=true -Djava.awt.headless=true"
-  MAVEN_CLI_OPTS: " --batch-mode  --update-snapshots --errors --fail-at-end --show-version -s .mvn/settings.xml"
-  MAVEN_CLI_OPTS_CENTRAL: " --batch-mode --show-version -s .mvn/settings-maven-central.xml"
+  MAVEN_CLI_OPTS: " --batch-mode  --errors --fail-at-end --show-version -s .mvn/settings.xml"
 
 before_script:
   - export CI_JOB_TIMESTAMP="-Dbuild.timestamp=$(date --utc --iso-8601=seconds)"
 
 cache:
-# Change the cache key if major dependencies change  
-  key: constant151
+  key: "$CI_JOB_NAME"
   paths:
     - .m2/repository
 
@@ -37,18 +35,9 @@ cache:
   rules:
     - if: $CI_PIPELINE_SOURCE == "schedule"
 
-# Note: image "maven:3-eclipse-temurin-8-alpine" does not work!
-java-8:
-  extends: .java
-  image: $CI_REGISTRY_IMAGE/maven:3-jdk-8
-
-java-8-openj9:
-  extends: .java_extended
-  image: $CI_REGISTRY_IMAGE/maven:3-jdk-8-openj9
-
 java-11:
   extends: .java
-  image: $CI_REGISTRY_IMAGE/maven:3-eclipse-temurin-11-alpine
+  image: $CI_REGISTRY_IMAGE/maven:3-jdk-11
   needs: [ ]
   script:
     - mvn $MAVEN_CLI_OPTS $BUILD_PROPS $CI_JOB_TIMESTAMP install
@@ -63,25 +52,41 @@ java-11:
         - target/surefire-reports/*.xml
         - target/failsafe-reports/*.xml
 
+java8:
+  extends: .java
+  image: $CI_REGISTRY_IMAGE/maven:3-jdk-8
+
 java-11-openj9:
   extends: .java_extended
   image: $CI_REGISTRY_IMAGE/maven:3-jdk-11-openj9
 
+java-8-openj9:
+  extends: .java_extended
+  image: $CI_REGISTRY_IMAGE/maven:3-jdk-8-openj9
+
+java-15:
+  extends: .java_extended
+  image: $CI_REGISTRY_IMAGE/maven:3-openjdk-15
+
+java-16:
+  extends: .java_extended
+  image: $CI_REGISTRY_IMAGE/maven:3-openjdk-16
+
 java-17:
   extends: .java
-  image: $CI_REGISTRY_IMAGE/maven:3-eclipse-temurin-17-alpine
+  image: $CI_REGISTRY_IMAGE/maven:3-openjdk-17
 
-java-21:
-  extends: .java
-  image: $CI_REGISTRY_IMAGE/maven:3-eclipse-temurin-21-alpine
-
-java-24:
+java-18:
   extends: .java_extended
-  image: $CI_REGISTRY_IMAGE/maven:3-eclipse-temurin-24-alpine
+  image: $CI_REGISTRY_IMAGE/maven:3-openjdk-18
+
+java-19:
+  extends: .java_extended
+  image: $CI_REGISTRY_IMAGE/maven:3-eclipse-temurin-19-alpine
 
 deploy:
   stage: deploy
-  image: $CI_REGISTRY_IMAGE/maven:3-eclipse-temurin-11-alpine
+  image: $CI_REGISTRY_IMAGE/maven:3-jdk-11
   needs:
     - job: java-11
   script:
@@ -94,11 +99,6 @@ deploy:
     - mvn $MAVEN_CLI_OPTS  deploy:deploy-file -Dfile=target/validationtool-${PROJECT_VERSION}-sources.jar -DgroupId=kosit -DartifactId=validator -Dclassifier="sources" -Dversion=${PROJECT_VERSION} -Dpackaging=jar -DrepositoryId="gitlab-maven" -Durl=https://projekte.kosit.org/api/v4/projects/7/packages/maven
   when: manual
 
-deploy-snapshot:
-  extends: java-8
-  script:
-    - mvn $MAVEN_CLI_OPTS_CENTRAL -P release-snapshot deploy
-
 create-build-image:
   stage: deploy
   image: docker:latest
@@ -116,7 +116,7 @@ create-build-image:
 
 owasp-check:
   extends: .java
-  image: $CI_REGISTRY_IMAGE/maven:3-eclipse-temurin-11-alpine
+  image: $CI_REGISTRY_IMAGE/maven:3-jdk-11
   needs: [ ]
   script:
     - mvn $MAVEN_CLI_OPTS $BUILD_PROPS $CI_JOB_TIMESTAMP validate -Powasp-check
@@ -126,3 +126,5 @@ owasp-check:
       changes:
         - pom.xml
         - owasp-suppressions.xml
+
+
diff --git a/.idea/checkstyle-idea.xml b/.idea/checkstyle-idea.xml
new file mode 100644
index 0000000..ef7efd6
--- /dev/null
+++ b/.idea/checkstyle-idea.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CheckStyle-IDEA">
+    <option name="configuration">
+      <map>
+        <entry key="checkstyle-version" value="8.16" />
+        <entry key="copy-libs" value="true" />
+        <entry key="location-0" value="BUNDLED:(bundled):Sun Checks" />
+        <entry key="location-1" value="BUNDLED:(bundled):Google Checks" />
+        <entry key="scan-before-checkin" value="false" />
+        <entry key="scanscope" value="JavaOnly" />
+        <entry key="suppress-errors" value="false" />
+      </map>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
new file mode 100644
index 0000000..c09264f
--- /dev/null
+++ b/.idea/compiler.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <annotationProcessing>
+      <profile default="true" name="Default" enabled="true" />
+      <profile name="Maven default annotation processors profile" enabled="true">
+        <sourceOutputDir name="target/generated-sources/annotations" />
+        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
+        <outputRelativeToContentRoot value="true" />
+        <module name="validator" />
+        <module name="validationtool" />
+      </profile>
+    </annotationProcessing>
+    <bytecodeTargetLevel>
+      <module name="validator" target="1.8" />
+    </bytecodeTargetLevel>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/copyright/KoSIT_Validator.xml b/.idea/copyright/KoSIT_Validator.xml
new file mode 100644
index 0000000..16895e8
--- /dev/null
+++ b/.idea/copyright/KoSIT_Validator.xml
@@ -0,0 +1,6 @@
+<component name="CopyrightManager">
+  <copyright>
+    <option name="notice" value="Copyright 2017-2022  Koordinierungsstelle für IT-Standards (KoSIT)&#10;&#10;Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);&#10;you may not use this file except in compliance with the License.&#10;You may obtain a copy of the License at&#10;&#10;    http://www.apache.org/licenses/LICENSE-2.0&#10;&#10;Unless required by applicable law or agreed to in writing, software&#10;distributed under the License is distributed on an &quot;AS IS&quot; BASIS,&#10;WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.&#10;See the License for the specific language governing permissions and&#10;limitations under the License." />
+    <option name="myName" value="KoSIT Validator" />
+  </copyright>
+</component>
\ No newline at end of file
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
new file mode 100644
index 0000000..bc6a0ba
--- /dev/null
+++ b/.idea/copyright/profiles_settings.xml
@@ -0,0 +1,7 @@
+<component name="CopyrightManager">
+  <settings default="KoSIT Validator">
+    <module2copyright>
+      <element module="All" copyright="KoSIT Validator" />
+    </module2copyright>
+  </settings>
+</component>
\ No newline at end of file
diff --git a/.idea/eclipseCodeFormatter.xml b/.idea/eclipseCodeFormatter.xml
new file mode 100644
index 0000000..a63598c
--- /dev/null
+++ b/.idea/eclipseCodeFormatter.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="EclipseCodeFormatterProjectSettings">
+    <option name="projectSpecificProfile">
+      <ProjectSpecificProfile>
+        <option name="disabledFileTypes" value="xml" />
+        <option name="formatSeletedTextInAllFileTypes" value="false" />
+        <option name="formatter" value="ECLIPSE" />
+        <option name="importOrderConfigFilePath" value="$PROJECT_DIR$/.settings/org.eclipse.jdt.ui.prefs" />
+        <option name="importOrderFromFile" value="true" />
+        <option name="pathToConfigFileJava" value="$PROJECT_DIR$/formatter.xml" />
+        <option name="selectedJavaProfile" value="init" />
+        <option name="useForLiveTemplates" value="true" />
+      </ProjectSpecificProfile>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
new file mode 100644
index 0000000..893896a
--- /dev/null
+++ b/.idea/encodings.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding">
+    <file url="file://$PROJECT_DIR$" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/src/main/model" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/target/generated-sources/xjc" charset="UTF-8" />
+    <file url="PROJECT" charset="UTF-8" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..4d7210a
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="JavaScriptSettings">
+    <option name="languageLevel" value="ES6" />
+  </component>
+  <component name="JavadocGenerationManager">
+    <option name="OUTPUT_DIRECTORY" value="$PROJECT_DIR$/target" />
+  </component>
+  <component name="MarkdownProjectSettings">
+    <PreviewSettings splitEditorLayout="SPLIT" splitEditorPreview="PREVIEW" useGrayscaleRendering="false" zoomFactor="1.0" maxImageWidth="0" showGitHubPageIfSynced="false" allowBrowsingInPreview="false" synchronizePreviewPosition="true" highlightPreviewType="LINE" highlightFadeOut="5" highlightOnTyping="true" synchronizeSourcePosition="true">
+      <PanelProvider>
+        <provider providerId="com.vladsch.idea.multimarkdown.editor.swing.html.panel" providerName="Default - Swing" />
+      </PanelProvider>
+    </PreviewSettings>
+    <ParserSettings>
+      <PegdownExtensions>
+        <option name="ABBREVIATIONS" value="false" />
+        <option name="ANCHORLINKS" value="true" />
+        <option name="ATXHEADERSPACE" value="true" />
+        <option name="AUTOLINKS" value="true" />
+        <option name="DEFINITIONS" value="false" />
+        <option name="FENCED_CODE_BLOCKS" value="true" />
+        <option name="FOOTNOTES" value="false" />
+        <option name="HARDWRAPS" value="false" />
+        <option name="INSERTED" value="false" />
+        <option name="QUOTES" value="false" />
+        <option name="RELAXEDHRULES" value="true" />
+        <option name="SMARTS" value="false" />
+        <option name="STRIKETHROUGH" value="true" />
+        <option name="SUBSCRIPT" value="false" />
+        <option name="SUPERSCRIPT" value="false" />
+        <option name="SUPPRESS_HTML_BLOCKS" value="false" />
+        <option name="SUPPRESS_INLINE_HTML" value="false" />
+        <option name="TABLES" value="true" />
+        <option name="TASKLISTITEMS" value="true" />
+        <option name="TOC" value="false" />
+        <option name="WIKILINKS" value="true" />
+      </PegdownExtensions>
+      <ParserOptions>
+        <option name="COMMONMARK_LISTS" value="false" />
+        <option name="DUMMY" value="false" />
+        <option name="EMOJI_SHORTCUTS" value="true" />
+        <option name="FLEXMARK_FRONT_MATTER" value="false" />
+        <option name="GFM_TABLE_RENDERING" value="true" />
+        <option name="GITBOOK_URL_ENCODING" value="false" />
+        <option name="GITHUB_EMOJI_URL" value="false" />
+        <option name="GITHUB_LISTS" value="true" />
+        <option name="GITHUB_WIKI_LINKS" value="true" />
+        <option name="JEKYLL_FRONT_MATTER" value="false" />
+        <option name="SIM_TOC_BLANK_LINE_SPACER" value="true" />
+      </ParserOptions>
+    </ParserSettings>
+    <HtmlSettings headerTopEnabled="false" headerBottomEnabled="false" bodyTopEnabled="false" bodyBottomEnabled="false" embedUrlContent="false" addPageHeader="true">
+      <GeneratorProvider>
+        <provider providerId="com.vladsch.idea.multimarkdown.editor.swing.html.generator" providerName="Default Swing HTML Generator" />
+      </GeneratorProvider>
+      <headerTop />
+      <headerBottom />
+      <bodyTop />
+      <bodyBottom />
+    </HtmlSettings>
+    <CssSettings previewScheme="UI_SCHEME" cssUri="" isCssUriEnabled="false" isCssTextEnabled="false" isDynamicPageWidth="true">
+      <StylesheetProvider>
+        <provider providerId="com.vladsch.idea.multimarkdown.editor.swing.html.css" providerName="Default Swing Stylesheet" />
+      </StylesheetProvider>
+      <ScriptProviders />
+      <cssText />
+    </CssSettings>
+    <HtmlExportSettings updateOnSave="false" parentDir="$ProjectFileDir$" targetDir="$ProjectFileDir$" cssDir="" scriptDir="" plainHtml="false" imageDir="" copyLinkedImages="false" imageUniquifyType="0" targetExt="" useTargetExt="false" noCssNoScripts="false" linkToExportedHtml="true" exportOnSettingsChange="true" regenerateOnProjectOpen="false" />
+    <LinkMapSettings>
+      <textMaps />
+    </LinkMapSettings>
+  </component>
+  <component name="MavenProjectsManager">
+    <option name="originalFiles">
+      <list>
+        <option value="$PROJECT_DIR$/pom.xml" />
+      </list>
+    </option>
+  </component>
+  <component name="NodePackageJsonFileManager">
+    <packageJsonPaths />
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" project-jdk-name="oracle-1.8" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+  <component name="jetbrains.communicator.idea.IdProvider" IDEtalkID="4B2DA906C3A7DF4F7B6EA28093E19A3F" />
+</project>
\ No newline at end of file
diff --git a/.idea/saveactions_settings.xml b/.idea/saveactions_settings.xml
new file mode 100644
index 0000000..3b2acd8
--- /dev/null
+++ b/.idea/saveactions_settings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="SaveActionSettings">
+    <option name="actions">
+      <set>
+        <option value="activate" />
+        <option value="activateOnShortcut" />
+        <option value="activateOnBatch" />
+        <option value="organizeImports" />
+        <option value="reformatChangedCode" />
+        <option value="rearrange" />
+        <option value="fieldCanBeFinal" />
+        <option value="localCanBeFinal" />
+        <option value="methodMayBeStatic" />
+        <option value="unqualifiedFieldAccess" />
+        <option value="missingOverrideAnnotation" />
+        <option value="useBlocks" />
+      </set>
+    </option>
+    <option name="configurationPath" value="" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..94a25f7
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.mvn/createBuildImages.sh b/.mvn/createBuildImages.sh
index e29998b..1cd5ec7 100644
--- a/.mvn/createBuildImages.sh
+++ b/.mvn/createBuildImages.sh
@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-TAGS=("3-jdk-8" "3-jdk-8-openj9" "3-eclipse-temurin-11-alpine" "3-jdk-11-openj9" "3-eclipse-temurin-17-alpine" "3-eclipse-temurin-21-alpine" "3-eclipse-temurin-24-alpine")
+TAGS=("3-openjdk-16" "3-jdk-11" "3-jdk-11-openj9" "3-jdk-8" "3-jdk-8-openj9" "3-openjdk-15" "3-openjdk-17" "3-openjdk-18" "3-eclipse-temurin-19-alpine")
 
 docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" "$CI_REGISTRY"
 for i in "${TAGS[@]}"
diff --git a/.mvn/settings-maven-central.xml b/.mvn/settings-maven-central.xml
deleted file mode 100644
index 30b15c3..0000000
--- a/.mvn/settings-maven-central.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0" 
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
-  <servers>
-    <server>
-      <id>central</id>
-      <username>${MVN_CENTRAL_USER}</username>
-      <password>${MAVEN_CENTRAL_TOKEN}</password>
-    </server>
-  </servers>
-</settings>
diff --git a/.mvn/settings.xml b/.mvn/settings.xml
index 0b53a90..d1b2b61 100644
--- a/.mvn/settings.xml
+++ b/.mvn/settings.xml
@@ -1,6 +1,36 @@
-<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0" 
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
+<!--
+  ~ Copyright 2017-2022  Koordinierungsstelle für IT-Standards (KoSIT)
+  ~
+  ~ 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.
+  -->
+
+<settings xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/SETTINGS/1.1.0"
+        xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.1.0 http://maven.apache.org/xsd/settings-1.1.0.xsd">
+<!--
+  ~ Copyright 2017-2021  Koordinierungsstelle für IT-Standards (KoSIT)
+  ~
+  ~ 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.
+  -->
     <servers>
         <server>
             <id>gitlab-maven</id>
diff --git a/.settings/org.eclipse.jdt.ui.prefs b/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 0000000..16bf637
--- /dev/null
+++ b/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,127 @@
+cleanup.add_default_serial_version_id=false
+cleanup.add_generated_serial_version_id=true
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=true
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
+cleanup.convert_to_enhanced_for_loop=true
+cleanup.correct_indentation=false
+cleanup.format_source_code=true
+cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=true
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=true
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=true
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=true
+cleanup.remove_unnecessary_nls_tags=true
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=true
+cleanup.use_this_for_non_static_field_access=true
+cleanup.use_this_for_non_static_field_access_only_if_necessary=false
+cleanup.use_this_for_non_static_method_access=true
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
+cleanup_profile=_initCleanUpProfile
+cleanup_settings_version=2
+eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+formatter_profile=_initFormatterProfile
+formatter_settings_version=12
+org.eclipse.jdt.ui.ignorelowercasenames=true
+org.eclipse.jdt.ui.importorder=java;javax;org;com;lombok;de;
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.ondemandthreshold=99
+org.eclipse.jdt.ui.staticondemandthreshold=99
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="false" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * The ${bare_field_name} of this {@link ${enclosing_type}}.\r\n * \r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="false" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * Sets the ${bare_field_name} of this {@link ${enclosing_type}}.\r\n *\r\n * @param ${param} the new ${bare_field_name} to set\r\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * Creates a new instance of {@link ${enclosing_type}}.\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment"/><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * ${todo} Describe this class\r\n *\r\n * @author ${user}\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="false" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${todo} Describe this method\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * ${todo} Describe why this method is overridden.\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_methods=false
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=true
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=true
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
+sp_cleanup.convert_to_enhanced_for_loop=true
+sp_cleanup.correct_indentation=false
+sp_cleanup.format_source_code=true
+sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.insert_inferred_type_arguments=false
+sp_cleanup.make_local_variable_final=true
+sp_cleanup.make_parameters_final=true
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=true
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.organize_imports=true
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=false
+sp_cleanup.remove_trailing_whitespaces=true
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=true
+sp_cleanup.remove_unnecessary_nls_tags=false
+sp_cleanup.remove_unused_imports=true
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
+sp_cleanup.use_blocks=true
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=false
+sp_cleanup.use_parentheses_in_expressions=true
+sp_cleanup.use_this_for_non_static_field_access=true
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=false
+sp_cleanup.use_this_for_non_static_method_access=true
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_type_arguments=false
diff --git a/.settings/settings.xml b/.settings/settings.xml
new file mode 100644
index 0000000..d1b2b61
--- /dev/null
+++ b/.settings/settings.xml
@@ -0,0 +1,47 @@
+<!--
+  ~ Copyright 2017-2022  Koordinierungsstelle für IT-Standards (KoSIT)
+  ~
+  ~ 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.
+  -->
+
+<settings xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/SETTINGS/1.1.0"
+        xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.1.0 http://maven.apache.org/xsd/settings-1.1.0.xsd">
+<!--
+  ~ Copyright 2017-2021  Koordinierungsstelle für IT-Standards (KoSIT)
+  ~
+  ~ 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.
+  -->
+    <servers>
+        <server>
+            <id>gitlab-maven</id>
+            <configuration>
+                <httpHeaders>
+                    <property>
+                        <name>Job-Token</name>
+                        <value>${env.CI_JOB_TOKEN}</value>
+                    </property>
+                </httpHeaders>
+            </configuration>
+        </server>
+    </servers>
+</settings>
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f3f2e86..fd7b759 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,50 +2,16 @@
 
 All notable changes to this project will be documented in this file.
 
-The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/)
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## 1.5.2 - 2025-09-01
-
-### Fixed
-
-- (BUILD) [#148](https://projekte.kosit.org/kosit/validator/-/issues/148): Regression that due to renaming from `validationtool` to `validator` the distribution zip did not contain all jars anymore
-
-# 1.5.1 - 2025-09-01
-
-### Fixed
-
-- (CORE) [#130](https://projekte.kosit.org/kosit/validator/-/issues/130) Check result to stdout causes an exception. This also fixes [GitHub #131](https://github.com/itplr-kosit/validator/issues/131)
-- (CORE) [#131](https://projekte.kosit.org/kosit/validator/-/issues/131) `UnsupportedOperationException` because of read-only list. This also fixes [GitHub #136](https://github.com/itplr-kosit/validator/issues/136)
-- (CLI) [#104](https://projekte.kosit.org/kosit/validator/-/issues/104) made the usage of the `-r` parameter optional, if only one unnamed scenario is used
-- (CLI) [#145](https://projekte.kosit.org/kosit/validator/-/issues/145) If the CLI is invoked without any parameter, the usage is shown twice
-- (DOC) [#129](https://projekte.kosit.org/kosit/validator/-/issues/129) API documentation is outdated. This also fixes [GitHub #130](https://github.com/itplr-kosit/validator/issues/130)
-- (BUILD) [#62](https://projekte.kosit.org/kosit/validator/-/issues/62) Surefire Test Error running `de.kosit.validationtool.impl.xml.RemoteResolvingStrategyTest` fails without `http.proxy` setting
-- (BUILD) [#110](https://projekte.kosit.org/kosit/validator/-/issues/110) reactivated the GitLab CI environment
-
-### Added
-
-- (BUILD) [#140](https://projekte.kosit.org/kosit/validator/-/issues/140) prepare pom.xml to be able to release to Maven Central
-- (BUILD) [#144](https://projekte.kosit.org/kosit/validator/-/issues/144) created a Maven profile to release on Maven Central
-
-### Changed
-
-- (CORE) [#109](https://projekte.kosit.org/kosit/validator/-/issues/109) dependencies were updated to the latest Java 1.8 compatible versions
-  - Bump [Saxon HE](https://www.saxonica.com/documentation11/documentation.xml) to 12.8
-  - Bump [jaxb-ri](https://github.com/eclipse-ee4j/jaxb-ri) to 2.3.9
-  - Bump [SLF4J](https://www.slf4j.org/) to 2.0.17
-- (CORE) [#136](https://projekte.kosit.org/kosit/validator/-/issues/136) removed IDE project folders from git
-- (BUILD) [#135](https://projekte.kosit.org/kosit/validator/-/issues/135) protected specific git branches
-- (BUILD) [#137](https://projekte.kosit.org/kosit/validator/-/issues/137) GitLab CI should only run on Java LTS versions as well as the latest Java version
-- (BUILD) [#147](https://projekte.kosit.org/kosit/validator/-/issues/147) Change Maven coordinates from `de.kosit:validationtool` to `org.kosit:validator`
-
-## 1.5.0
+# 1.5.0 (to be released)
 
 ### Fixed
 
 - (CLI) [#93](https://projekte.kosit.org/kosit/validator/-/issues/93) Remove usage information, when validation failed
 - (CLI) [#95](https://projekte.kosit.org/kosit/validator/-/issues/95) NPE when using empty repository definition (-r "")
-- (CORE) [GitHub #101](https://github.com/itplr-kosit/validator/issues/101) Role is null in FailedAssert
+- (CORE) [#101](https://github.com/itplr-kosit/validator/issues/101) Role is null in FailedAssert
 
 ### Added
 
@@ -53,13 +19,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - (API) Possibility to use preconfigured Saxon `Processor` instance for validation
 
 ### Changed
-
-- (CORE) [GitHub #100](https://github.com/itplr-kosit/validator/issues/100) Make createReport optional
+- (CORE) [#100](https://github.com/itplr-kosit/validator/issues/100) Make createReport optional
 - (DAEMON) UI rewrite based on [Docusaurs](https://docusaurus.io)
-- (API)  [ResolvingConfigurationStrategy.java#getProcessor()](de/kosit/validationtool/api/ResolvingConfigurationStrategy) is removed.
+- (
+  API)  [ResolvingConfigurationStrategy.java#getProcessor()](de/kosit/validationtool/api/ResolvingConfigurationStrategy)
+  is removed.
 - (CORE) Bump [Saxon HE](https://www.saxonica.com/documentation11/documentation.xml) to 11.4
 - (CORE) Bump [jaxb-ri](https://github.com/eclipse-ee4j/jaxb-ri) to 2.3.7
 - (CORE) Various other dependency updates. See pom.xml
+
 - (CORE) CLI parsing based on pico-cli, commons-cli is removed
 
 ## 1.4.2
@@ -70,14 +38,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - [#80](https://github.com/itplr-kosit/validator/issues/80) using classloader to initialize jaxb context (to support
   usage in OSGi
   environments)
-- [#75] (<https://github.com/itplr-kosit/validator/issues/75>) Improve logging on invalid documents
+- [#75] (https://github.com/itplr-kosit/validator/issues/75) Improve logging on invalid documents
 
 ## 1.4.1
 
 ### Fixed
 
 - Allow more than 3 customLevel elements in scenarios (see xrechnung
-  configuration [issue 49](https://github.com/itplr-kosit/validator-configuration-xrechnung/issues/49))
+  configuration [ issue 49](https://github.com/itplr-kosit/validator-configuration-xrechnung/issues/49))
 - Remove saxon signature from java8 uber-jar (see [67](https://github.com/itplr-kosit/validator/issues/67))
 
 ## 1.4.0
@@ -167,13 +135,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
-- *Result#getAcceptRecommendation()* does not *only* work when *acceptMatch* is configured in the scenario
-  - schema correctness is a precondition, if the checked instance is not valid, this evaluates to *REJECTED*
-  - if *acceptMatch* is configured, the result is based on the boolean result of the xpath expression evaluated against
+- *Result#getAcceptRecommendation()* does not _only_ work when _acceptMatch_ is configured in the scenario
+  - schema correctness is a precondition, if the checked instance is not valid, this evaluates to _REJECTED_
+  - if _acceptMatch_ is configured, the result is based on the boolean result of the xpath expression evaluated against
     the generated report
-  - if *no* *acceptMatch* is configured, the result is based on evaluation of schema and schematron correctness
-  - *UNDEFINED* is only returned, when processing is stopped somehow
-- *Result#isAcceptable()* can now evaluate to true, when no *acceptMatch* is configured (see above)
+  - if *no* _acceptMatch_ is configured, the result is based on evaluation of schema and schematron correctness
+  - _UNDEFINED_ is only returned, when processing is stopped somehow
+- *Result#isAcceptable()* can now evaluate to true, when no _acceptMatch_ is configured (see above)
 
 ## 1.1.3
 
@@ -204,10 +172,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
-- Enhanced API-Usage e.g. return *Result* object with processing information
+- Enhanced API-Usage e.g. return _Result_ object with processing information
 - Support loading scenarios and content from a JAR-File
 - Simple Daemon-Mode exposing validation functionality via http
-- cli option to serialize the 'report input' xml document to *cwd* (current working directory)
+- cli option to serialize the 'report input' xml document to _cwd_ (current working directory)
 - Documentation in `docs` folder
 
 ### Changed
diff --git a/NOTICE b/NOTICE
index 948af93..172c225 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
-KoSIT XML Validator
-Copyright 2017-2025 Koordinierungsstelle für IT-Standards (KoSIT)
+KoSIT Validator
+Copyright 2017-2022 Koordinierungsstelle für IT-Standards (KoSIT)
 
 This product includes software developed by
-Koordinierungsstelle für IT-Standards (<https://www.xoev.de/>).
+Koordinierungsstelle für IT-Standards (https://www.xoev.de/).
diff --git a/README.md b/README.md
index cf6d9f7..0fd508e 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,4 @@
 # KoSIT Validator
-
 - [Introduction](#introduction)
 - [Validation Configurations](#validation-configurations)
     * [Third Party Validation Configurations](#third-party-validation-configurations)
@@ -10,18 +9,17 @@
 - [Packages](#packages)
 
 ## Introduction
+The validator is an XML validation engine to validate and process  XML files in various formats. It basically does the following in order:
 
-The validator is an XML validation engine to validate and process XML files in various formats. It basically does the following in order:
-
-1. identify actual XML format 
-1. validate the XML file (using schema  and schematron rules)
-1. generate a custom report / extract custom data from the XML file
+1. identify actual xml format 
+1. validate the xml file (using schema  and schematron rules)
+1. generate a custom report / extract custom data from the xml file
 1. compute an acceptance status (according the supplied schema and rules)
 
-The validator depends on self defined [scenarios](docs/configurations.md) in order to fully configure the whole process.
-It always creates a [validation report in XML](docs/configurations.md#validators-report). The actual content of the report can also be controlled by the scenario.
+The validator depends on self defined [scenarios](docs/configurations.md) which are used to fully configure the process.
+It always creates a [validation report in XML](docs/configurations.md#validators-report). The actual content of this is controlled by the scenario.
 
-See [architecture](docs/architecture.md) for information about the whole validation process.
+See [architecture](docs/architecture.md) for information about the actual validation process.
 
 
 ## Validation configurations
@@ -32,7 +30,7 @@ All configurations are self-contained modules which are deployed and developed o
 
 ### Third party validation configurations
 
-Here are two public third party validation configurations available which might serve as examples:
+Currently, there are two public third party validation configurations available.
 
 * Validation Configuration for [XRechnung](http://www.xoev.de/de/xrechnung):
   * Source code is available on [GitHub](https://github.com/itplr-kosit/validator-configuration-xrechnung)
@@ -45,31 +43,28 @@ Here are two public third party validation configurations available which might
 
 The validator can be used in three different ways:
 
-* as standalone application running from the CLI
+* as standalone application running from the cli
 * as library embedded within a custom application
 * as a daemon providing a http interface
 
-### Standalone Command Line Interface (CLI)
-
-**Important hint**: since v1.5.1 the filename has been changed from `validationtool-*` to `validator-*`
+### Standalone Command-Line Interface
 
 The general way using the CLI is:
 
 ```shell
-java -jar  validator-<version>-standalone.jar  -s <scenario-config-file> -r <repository-path>
-[OPTIONS] [FILE] [FILE] [FILE] ...
+java -jar  validationtool-<version>-standalone.jar  -s <scenario-config-file> [OPTIONS] [FILE] [FILE] [FILE] ...
 ```
 
 The help option displays further CLI options to customize the process:
 
 ```shell
-java -jar  validator-<version>-standalone.jar --help
+java -jar  validationtool-<version>-standalone.jar --help
 ```
 
 A concrete example with a specific validator configuration can be found on 
 [GitHub](https://github.com/itplr-kosit/validator-configuration-xrechnung)
 
-The [CLI documentation](./docs/cli.md) shows further configuration options.
+The  [CLI documentation](./docs/cli.md) shows further configuration options.
 
 ### Application User Interface (API / embedded usage)
 
@@ -97,7 +92,7 @@ will thus not be resolved transitively.
 You can also start the validator as a HTTP-Server. Just start it in _Daemon-Mode_ with the `-D` option.
 
 ```shell
-java -jar  validator-<version>-standalone.jar  -s <scenario-config-file> -D
+java -jar  validationtool-<version>-standalone.jar  -s <scenario-config-file> -D
 ```
 
 
@@ -107,7 +102,7 @@ The [daemon documentation](./docs/daemon.md) shows more usage details and furthe
 
 The validator distribution contains the following artifacts:
 
-1. **validator-`<version>`.jar**: Java library for embedded use within an application
-1. **validator-`<version`>-standalone.jar**: Uber-JAR for standalone usage containing all dependencies in one jar file. This file comes with JAXB *embedded* and can be used with Java 8 and Java >= 11)
-1. **validator-`<version`>-java8-standalone.jar**: Uber-JAR for standalone usage with Java JDK 8 containing all dependencies in one jar file. This file file *does not* contain JAXB and depends on the bundled version of the JDK.
+1. **validationtool-`<version>`.jar**: Java library for embedded use within an application
+1. **validationtool-`<version`>-standalone.jar**: Uber-JAR for standalone usage containing all dependencies in one jar file. This file comes with JAXB *embedded* and can be used with Java 8 and Java >= 11)
+1. **validationtool-`<version`>-java8-standalone.jar**: Uber-JAR for standalone usage with Java JDK 8 containing all dependencies in one jar file. This file file *does not* contain JAXB and depends on the bundled version of the JDK.
 1. **libs/***: directory containing all (incl. optional) dependencies of the validator
diff --git a/docs/api.md b/docs/api.md
index caa93fe..b26d428 100644
--- a/docs/api.md
+++ b/docs/api.md
@@ -12,8 +12,8 @@ Then you can declare the dependency as follows:
 
 ```xml
 <dependency>
-   <groupId>org.kosit</groupId>
-   <artifactId>validator</artifactId>
+   <groupId>de.kosit</groupId>
+   <artifactId>validationtool</artifactId>
    <version>${validator.version}</version>
 </dependency>
 ```
@@ -22,12 +22,10 @@ Then you can declare the dependency as follows:
 
 ```js
 dependencies {
-    compile group: 'org.kosit', name: 'validator', version: '1.5.1'
+    compile group: 'de.kosit', name: 'validationtool', version: '1.1.0'
 }
 ```
 
-Hint: prior to v1.5.1 the group ID was `de.kosit` and the artifact ID was `validationtool`.
-
 ## Usage
 
 Prerequisite for use is a valid [scenario definition](configurations.md) and the a folder with all necessary artifacts for validation (repository) either on the filesystem or on the classpath.
@@ -35,39 +33,34 @@ Prerequisite for use is a valid [scenario definition](configurations.md) and the
 The following example demonstrates loading scenario.xml and whole configuration from classpath and validating one XML document:
 
 ```java
-package de.kosit.validationtool.docs;
+package org.kosit.validator.example;
 
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
-import org.w3c.dom.Document;
-
 import de.kosit.validationtool.api.Check;
 import de.kosit.validationtool.api.Configuration;
 import de.kosit.validationtool.api.Input;
 import de.kosit.validationtool.api.InputFactory;
 import de.kosit.validationtool.api.Result;
 import de.kosit.validationtool.impl.DefaultCheck;
-import de.kosit.validationtool.impl.xml.ProcessorProvider;
+import org.w3c.dom.Document;
 
-/**
- * Example code that is used in the docs/api.md file
- */
 public class StandardExample {
 
-    public void run(final Path testDocument) throws URISyntaxException {
+    public void run(Path testDocument) throws URISyntaxException {
         // Load scenarios.xml from classpath
-        final URL scenarios = this.getClass().getClassLoader().getResource("examples/simple/scenarios-with-relative-paths.xml");
+        URL scenarios = this.getClass().getClassLoader().getResource("scenarios.xml");
         // Load the rest of the specific Validator configuration from classpath
-        final Configuration config = Configuration.load(scenarios.toURI()).build(ProcessorProvider.getProcessor());
+        Configuration config = Configuration.load(scenarios.toURI()).build();
         // Use the default validation procedure
-        final Check validator = new DefaultCheck(config);
+        Check validator = new DefaultCheck(config);
         // Validate a single document
-        final Input document = InputFactory.read(testDocument);
+        Input document = InputFactory.read(testDocument);
         // Get Result including information about the whole validation
-        final Result report = validator.checkInput(document);
+        Result report = validator.checkInput(document);
         System.out.println("Is processing succesful=" + report.isProcessingSuccessful());
         // Get report document if processing was successful
         Document result = null;
@@ -77,16 +70,13 @@ public class StandardExample {
         // continue processing results...
     }
 
-    public static void main(final String[] args) throws Exception {
-        // Use e.g. "src/test/resources/examples/simple/input/foo.xml"
-        if (args.length == 0) {
-            throw new IllegalStateException("Provide a test document filename on the commandline");
-        }
+    public static void main(String[] args) throws Exception {
         // Path of document for validation
-        final Path testDoc = Paths.get(args[0]);
-        final StandardExample example = new StandardExample();
+        Path testDoc = Paths.get(args[0]);
+        StandardExample example = new StandardExample();
         // run example validation
         example.run(testDoc);
+
     }
 }
 ```
@@ -144,36 +134,26 @@ Instead of pre-configured [scenario files](configurations.md) it is possible to
 A simple configuration looks like this:
 
 ```java
-package de.kosit.validationtool.docs;
-
-import static de.kosit.validationtool.config.ConfigurationBuilder.fallback;
-import static de.kosit.validationtool.config.ConfigurationBuilder.report;
-import static de.kosit.validationtool.config.ConfigurationBuilder.scenario;
-import static de.kosit.validationtool.config.ConfigurationBuilder.schema;
-import static de.kosit.validationtool.config.ConfigurationBuilder.schematron;
-
-import java.net.URI;
-import java.nio.file.Paths;
-
-import de.kosit.validationtool.api.Check;
+import static de.kosit.validationtool.config.ConfigurationBuilder.*;
 import de.kosit.validationtool.api.Configuration;
-import de.kosit.validationtool.impl.DefaultCheck;
-import de.kosit.validationtool.impl.xml.ProcessorProvider;
+import java.net.URI;
+import java.nio.file.Path;
 
-/**
- * Example code that is used in the docs/api.md file
- */
 public class MyValidator {
 
-    public static void main(final String[] args) {
-        final Configuration config = Configuration.create().name("myconfiguration")
-                .with(scenario("firstScenario").match("//myNode").validate(schema("Sample Schema").schemaLocation(URI.create("simple.xsd")))
-                        .validate(schematron("my rules").source("myRules.xsl")).with(report("my report").source("report.xsl")))
-                .with(fallback().name("default-report").source("fallback.xsl")).useRepository(Paths.get("/opt/myrepository"))
-                .build(ProcessorProvider.getProcessor());
-        final Check validator = new DefaultCheck(config);
-        // .. run your checks
-    }
+ public static void main(String[] args) {
+    Configuration config = Configuration.create().name("myconfiguration")
+                          .with(scenario("firstScenario")
+                                          .match("//myNode")
+                                          .validate(schema("Sample Schema").schemaLocation(URI.create("simple.xsd")))
+                                          .validate(schematron("my rules").source("myRules.xsl"))
+                                          .with(report("my report").source("report.xsl")))
+                          .with(fallback().name("default-report").source("fallback.xsl"))
+                          .useRepository(Paths.get("/opt/myrepository"))
+                          .build();
+    Check validator = new DefaultCheck(config);
+    // .. run your checks
+ }
 }
 ```
 
@@ -208,17 +188,19 @@ which further opens the second to load resources also from remote locations via
 
 You can configure usage of one of these implementations using the `ResolvingMode` via
 
-```java
-final Configuration config = Configuration.load(URI.create("myscenarios.xml")).setResolvingMode(ResolvingMode.STRICT_LOCAL)
-        .build(ProcessorProvider.getProcessor());
-```
+````java
+Conifuguration config = Configuration.load(URI.create("myscenarios.xml"))
+                            .resolvingMode(ResolvingMode.STRICT_LOCAL)
+                            .build();
+````
 
 If you decide to implement your own strategy, you can configure this via:
 
-```java
-final Configuration config = Configuration.load(URI.create("myscenarios.xml"))
-        .setResolvingStrategy(new MyCustomResolvingConfigurationStrategy()).build(ProcessorProvider.getProcessor());
-```
+````java
+Conifuguration config = Configuration.load(URI.create("myscenarios.xml"))
+                            .resolvingStrategy(new MyCustomResolvingConfigurationStrategy())
+                            .build();
+````
 
 ---
 
diff --git a/docs/cli.md b/docs/cli.md
index 492bedc..071f6da 100644
--- a/docs/cli.md
+++ b/docs/cli.md
@@ -1,29 +1,27 @@
-# Validator Command Line Interface (CLI)
+# Validator CLI
 
-The `validator` comes with a command line interface (CLI) which allows validating any number of input XML files.
-
-**Important hint**: since v1.5.1 the filename has been changed from `validationtool-*` to `validator-*`
+The validator comes with a commandline interface (CLI) which allows validating any number of input xml files.
 
 The general way using the CLI is:
 
 ```shell
-java -jar  validator-<version>-standalone.jar  -s <scenario-config-file> [OPTIONS] [FILE] [FILE] [FILE] ...
+java -jar  validationtool-<version>-standalone.jar  -s <scenario-config-file> [OPTIONS] [FILE] [FILE] [FILE] ...
 ```
 
-The validator can also read the XML file from the standard input
+The validator can also read the xml file from the standard input
 
-```shell
+```shell script
 # via redirection
-java -jar validator-<version>-standalone.jar  -s <scenario-config-file> [OPTIONS] < my-input.xml
+java -jar validationtool-<version>-standalone.jar  -s <scenario-config-file> [OPTIONS] < my-input.xml
 
 # read from pipe
-cat my-input.xml |  validator-<version>-standalone.jar  -s <scenario-config-file> [OPTIONS]
+cat my-input.xml |  validationtool-<version>-standalone.jar  -s <scenario-config-file> [OPTIONS]
 ```
 
-The help option displays further CLI options:
+The help option displays further CLI options to customize the process:
 
 ```shell
-java -jar  validator-<version>-standalone.jar --help
+java -jar  validationtool-<version>-standalone.jar --help
 ```
 
 You can also use multiple scenario configurations and multiple repositories with resources for these. The validator either supports
@@ -31,17 +29,17 @@ supplying the parameters in order or using named configuration. Valid usages are
 
 ```shell
 # multiple scenarios, implicit repository
-java -jar  validator-<version>-standalone.jar -s <scenario-config-file1> -s <scenario-config-file2> [OPTIONS] [FILE]
+java -jar  validationtool-<version>-standalone.jar -s <scenario-config-file1> -s <scenario-config-file2> [OPTIONS] [FILE]
 
 # multiple scenarios, single defined repository
-java -jar  validator-<version>-standalone.jar -s <scenario-config-file1> -s <scenario-config-file2> -r <path-to-repo> [OPTIONS] [FILE]
+java -jar  validationtool-<version>-standalone.jar -s <scenario-config-file1> -s <scenario-config-file2> -r <path-to-repo> [OPTIONS] [FILE]
 
 # multiple scenarios, multiple repositories ordered
-java -jar  validator-<version>-standalone.jar -s <scenario-config-file1> -r <path-to-repo1> -s <scenario-config-file2> -r <path-to-repo2> [OPTIONS] [FILE]
-java -jar  validator-<version>-standalone.jar -s <scenario-config-file1> -s <scenario-config-file2> -r <path-to-repo1>  -r <path-to-repo2> [OPTIONS] [FILE]
+java -jar  validationtool-<version>-standalone.jar -s <scenario-config-file1> -r <path-to-repo1> -s <scenario-config-file2> -r <path-to-repo2> [OPTIONS] [FILE]
+java -jar  validationtool-<version>-standalone.jar -s <scenario-config-file1> -s <scenario-config-file2> -r <path-to-repo1>  -r <path-to-repo2> [OPTIONS] [FILE]
 
 # multiple scenarios, multiple repositories (named)
-java -jar  validator-<version>-standalone.jar -s "NAME1=<scenario-config-file1>" -s "NAME2=<scenario-config-file2>" -r "NAME1=<path-to-repo1>"  -r "NAME2=<path-to-repo2>" [OPTIONS] [FILE]
+java -jar  validationtool-<version>-standalone.jar -s "NAME1=<scenario-config-file1>" -s "NAME2=<scenario-config-file2>" -r "NAME1=<path-to-repo1>"  -r "NAME2=<path-to-repo2>" [OPTIONS] [FILE]
 ```
 
 ## Special features
@@ -59,7 +57,7 @@ generated reports. This is mainly useful for scenario developers. Ask KoSIT for
 
 | code | description |
 |-|-|
-| 0  | All validated xml files are acceptable according to the scenario configurations or application usage was requested |
+| 0  | All validated xml files are acceptable according to the scenario configurations |
 | positive integer | Number of rejected (e.g. not acceptable) xml files according to the scenario configurations| 
 | -1 | Parsing error. The commandline arguments specified are incorrect  |
-| -2 | Configuration error. There is an error loading the configuration and/or validation targets |
+| -2 |  Configuration error. There is an error loading the configuration and/or validation targets |
diff --git a/docs/daemon.md b/docs/daemon.md
index a0f8f66..04f3b92 100644
--- a/docs/daemon.md
+++ b/docs/daemon.md
@@ -8,10 +8,8 @@ and should work with OpenJDK based distributions. Keep this in mind, if you want
 To use the validator daemon as is, start the _Daemon-Mode_ with the `-D` option and supply a suitable
  [validator configuration](configurations.md).
 
-**Important hint**: since v1.5.1 the filename has been changed from `validationtool-*` to `validator-*`
-
 ```shell
-java -jar  validator-<version>-standalone.jar  -s <scenario-config-file> -D
+java -jar  validationtool-<version>-standalone.jar  -s <scenario-config-file> -D
 ```
 
 Per default the HTTP-Server listens on _localhost_ at Port 8080.
@@ -19,7 +17,7 @@ Per default the HTTP-Server listens on _localhost_ at Port 8080.
 You can configure the daemon with `-H` for IP Adress and `-P` for port number:
 
 ```shell
-java -jar  validator-<version>-standalone.jar  -s <scenario-config-file> -D -H 192.168.1.x -P 8081
+java -jar  validationtool-<version>-standalone.jar  -s <scenario-config-file> -D -H 192.168.1.x -P 8081
 ```
 
 ## Customized usage
@@ -137,5 +135,5 @@ The daemon provides a simple GUI when issuing `GET` requests providing the follo
  The GUI can be disabled using the API (see above) or via CLI:
  
  ```shell script
-java -jar  validator-<version>-standalone.jar  -s <scenario-config-file> -D --disable-gui
+java -jar  validationtool-<version>-standalone.jar  -s <scenario-config-file> -D --disable-gui
 ```
diff --git a/pom.xml b/pom.xml
index e6fbcff..cd1efac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,13 +1,29 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<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">
+<!--
+  ~ Copyright 2017-2022  Koordinierungsstelle für IT-Standards (KoSIT)
+  ~
+  ~ 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.
+  -->
+
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" 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>
 
-    <name>KoSIT XML Validator</name>
+    <name>KoSIT XML Prüftool Implementierung</name>
 
-    <groupId>org.kosit</groupId>
-    <artifactId>validator</artifactId>
-    <version>1.5.3-SNAPSHOT</version>
+    <groupId>de.kosit</groupId>
+    <version>1.5.0</version>
 
+    <artifactId>validationtool</artifactId>
     <description>KoSIT XML Validator against XSD and Schematron based on defined scenarios.</description>
     <developers>
         <!-- In alphabetical order by last name -->
@@ -21,7 +37,7 @@
             <id>renzo.kottmann</id>
             <name>Renzo Kottmann</name>
             <organization>KoSIT</organization>
-            <organizationUrl>http://www.xeinkauf.de</organizationUrl>
+            <organizationUrl>http://www.xoev.de</organizationUrl>
             <roles>
                 <role>Product Owner</role>
             </roles>
@@ -38,37 +54,24 @@
     </developers>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <version.assertj>3.27.3</version.assertj>
-        <version.commons-io>2.20.0</version.commons-io>
-        <version.commons-lang>3.18.0</version.commons-lang>
-        <version.jacoco>0.8.13</version.jacoco>
-        <version.jaxb>2.3.9</version.jaxb>
-        <version.lombok>1.18.38</version.lombok>
-        <version.mockito>4.11.0</version.mockito>
-        <version.owasp-dependency-check>10.0.4</version.owasp-dependency-check>
-        <version.rest-assured>5.5.5</version.rest-assured>
-        <version.saxon-he>12.8</version.saxon-he>
-        <version.slf4j>2.0.17</version.slf4j>
+        <version.assertj>3.23.1</version.assertj>
+        <version.commons-io>2.11.0</version.commons-io>
+        <version.commons-lang>3.12.0</version.commons-lang>
+        <version.jacoco>0.8.8</version.jacoco>
+        <version.jaxb>2.3.7</version.jaxb>
+        <version.lombok>1.18.24</version.lombok>
+        <version.mockito>4.9.0</version.mockito>
+        <version.owasp-dependency-check>7.2.0</version.owasp-dependency-check>
+        <version.rest-assured>5.2.0</version.rest-assured>
+        <version.saxon-he>11.4</version.saxon-he>
+        <version.slf4j>1.7.36</version.slf4j>
     </properties>
-
     <repositories>
         <repository>
             <id>project.local</id>
             <name>project</name>
             <url>file:${project.basedir}/libs</url>
         </repository>
-
-        <repository>
-            <name>Central Portal Snapshots</name>
-            <id>central-portal-snapshots</id>
-            <url>https://central.sonatype.com/repository/maven-snapshots/</url>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
     </repositories>
 
     <dependencies>
@@ -92,13 +95,13 @@
         <dependency>
             <groupId>info.picocli</groupId>
             <artifactId>picocli</artifactId>
-            <version>4.7.7</version>
+            <version>4.7.0</version>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.fusesource.jansi</groupId>
             <artifactId>jansi</artifactId>
-            <version>2.4.2</version>
+            <version>2.4.0</version>
             <optional>true</optional>
         </dependency>
         <dependency>
@@ -128,7 +131,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.13.2</version>
+            <version>4.13.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -139,7 +142,7 @@
         <dependency>
             <groupId>io.rest-assured</groupId>
             <artifactId>rest-assured</artifactId>
-            <version>${version.rest-assured}</version>
+            <version>5.3.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -169,41 +172,11 @@
             </resource>
         </resources>
 
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.sonatype.central</groupId>
-                    <artifactId>central-publishing-maven-plugin</artifactId>
-                    <version>0.8.0</version>
-                    <extensions>true</extensions>
-                    <configuration>
-                        <publishingServerId>central</publishingServerId>
-                        <autoPublish>true</autoPublish>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-gpg-plugin</artifactId>
-                    <version>3.2.8</version>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-
         <plugins>
-            <!-- for PR 152 -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-resources-plugin</artifactId>
-                <version>3.3.1</version>
-                <configuration>
-                    <propertiesEncoding>ISO-8859-1</propertiesEncoding>
-                </configuration>
-            </plugin>
-
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
-                <version>3.6.1</version>
+                <version>3.3.0</version>
                 <executions>
                     <execution>
                         <id>reserve-network-port</id>
@@ -223,7 +196,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
-                <version>3.6.1</version>
+                <version>3.1.0</version>
                 <executions>
                     <execution>
                         <id>enforce-versions</id>
@@ -243,7 +216,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.14.0</version>
+                <version>3.10.1</version>
                 <configuration>
                     <source>1.8</source>
                     <target>1.8</target>
@@ -254,7 +227,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.6.0</version>
+                <version>3.4.1</version>
                 <executions>
                     <execution>
                         <id>jdk11+</id>
@@ -327,7 +300,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
-                <version>3.7.1</version>
+                <version>3.4.2</version>
                 <executions>
                     <execution>
                         <id>full_dist</id>
@@ -352,7 +325,7 @@
             <plugin>
                 <groupId>org.jvnet.jaxb2.maven2</groupId>
                 <artifactId>maven-jaxb2-plugin</artifactId>
-                <version>0.15.3</version>
+                <version>0.15.1</version>
                 <executions>
                     <execution>
                         <goals>
@@ -372,7 +345,7 @@
                         <plugin>
                             <groupId>org.jvnet.jaxb2_commons</groupId>
                             <artifactId>jaxb2-basics</artifactId>
-                            <version>0.13.1</version>
+                            <version>0.11.1</version>
                         </plugin>
                     </plugins>
                 </configuration>
@@ -427,11 +400,11 @@
                             <goal>dump</goal>
 
                         </goals>
-                        <configuration>
-                            <address>localhost</address>
-                            <port>${jacoco.tcp.port}</port>
-                            <append>true</append>
-                        </configuration>
+                            <configuration>
+                                <address>localhost</address>
+                                <port>${jacoco.tcp.port}</port>
+                                <append>true</append>
+                            </configuration>
                     </execution>
                     <execution>
                         <id>generateJacocoReport</id>
@@ -445,23 +418,17 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.5.3</version>
+                <version>3.0.0-M7</version>
                 <configuration>
                     <!--suppress MavenModelInspection -->
                     <argLine>-Dfile.encoding=UTF-8 ${jacocoSurefire}</argLine>
-                    <systemProperties>
-                        <property>
-                            <name>java.net.useSystemProxies</name>
-                            <value>true</value>
-                        </property>
-                    </systemProperties>
                 </configuration>
             </plugin>
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
-                <version>3.3.1</version>
+                <version>3.2.1</version>
                 <executions>
                     <execution>
                         <id>attach-sources</id>
@@ -475,7 +442,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-release-plugin</artifactId>
-                <version>3.1.1</version>
+                <version>2.5.3</version>
                 <configuration>
                     <tagNameFormat>v@{project.version}</tagNameFormat>
                 </configuration>
@@ -484,17 +451,17 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>exec-maven-plugin</artifactId>
-                <version>3.5.0</version>
+                <version>3.1.0</version>
                 <executions>
-                    <execution>
+                <execution>
                         <id>run</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
+                    <phase>pre-integration-test</phase>
+                    <goals>
                             <goal>exec</goal>
-                        </goals>
+                    </goals>
                     </execution>
                 </executions>
-                <configuration>
+                    <configuration>
                     <executable>java</executable>
                     <longClasspath>false</longClasspath>
                     <async>true</async>
@@ -542,7 +509,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>
-                <version>3.5.3</version>
+                <version>3.0.0-M7</version>
                 <executions>
                     <execution>
                         <id>test-it</id>
@@ -551,8 +518,8 @@
                             <goal>verify</goal>
                         </goals>
                         <configuration>
-                            <!--suppress MavenModelInspection -->
-                            <argLine>-Dfile.encoding=UTF-8 -Ddaemon.port=${validator.server.port}</argLine>
+                        <!--suppress MavenModelInspection -->
+                        <argLine>-Dfile.encoding=UTF-8 -Ddaemon.port=${validator.server.port}</argLine>
                         </configuration>
 
                     </execution>
@@ -561,7 +528,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.11.2</version>
+                <version>3.4.1</version>
                 <configuration>
                     <source>8</source>
                     <doclint>none</doclint>
@@ -610,8 +577,8 @@
             <build>
                 <plugins>
                     <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-gpg-plugin</artifactId>
+                        <version>1.6</version>
                         <executions>
                             <execution>
                                 <id>sign-artifacts</id>
@@ -622,10 +589,6 @@
                             </execution>
                         </executions>
                     </plugin>
-                    <plugin>
-                        <groupId>org.sonatype.central</groupId>
-                        <artifactId>central-publishing-maven-plugin</artifactId>
-                    </plugin>
                 </plugins>
             </build>
         </profile>
@@ -660,15 +623,13 @@
         </profile>
         <profile>
             <id>format</id>
-            <activation>
-                <activeByDefault>false</activeByDefault>
-            </activation>
+            <activation><activeByDefault>false</activeByDefault></activation>
             <build>
                 <plugins>
                     <plugin>
                         <groupId>net.revelc.code.formatter</groupId>
                         <artifactId>formatter-maven-plugin</artifactId>
-                        <version>2.13.0</version>
+                        <version>2.12.2</version>
                         <executions>
                             <execution>
                                 <id>maven-formatting</id>
@@ -685,17 +646,6 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-            <id>release-snapshot</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.sonatype.central</groupId>
-                        <artifactId>central-publishing-maven-plugin</artifactId>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
     </profiles>
 
     <reporting>
@@ -705,14 +655,12 @@
     </reporting>
 
     <scm>
-        <connection>scm:git:https://github.com/itplr-kosit/validator.git</connection>
+        <connection>https://github.com/itplr-kosit/validationtool.git</connection>
         <developerConnection>scm:git:https://projekte.kosit.org/kosit/validator.git</developerConnection>
-        <tag>release/1.5.x</tag>
+        <tag>v1.1.0</tag>
         <url>https://github.com/itplr-kosit/validator</url>
     </scm>
-
     <url>https://github.com/itplr-kosit/validator</url>
-
     <licenses>
         <license>
             <name>Apache License, Version 2.0</name>
@@ -720,4 +668,12 @@
             <distribution>repo</distribution>
         </license>
     </licenses>
+    <distributionManagement>
+        <repository>
+            <id>sonatype-nexus-staging</id>
+            <name>Nexus Release Repository</name>
+            <url>https://oss.sonatype.org/service/local/staging/deploy/maven2</url>
+        </repository>
+    </distributionManagement>
+
 </project>
diff --git a/src/assembly/assembly-dist.xml b/src/assembly/assembly-dist.xml
index 597eec6..a4fd78f 100644
--- a/src/assembly/assembly-dist.xml
+++ b/src/assembly/assembly-dist.xml
@@ -1,5 +1,22 @@
+<!--
+  ~ Copyright 2017-2022  Koordinierungsstelle für IT-Standards (KoSIT)
+  ~
+  ~ 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.
+  -->
+
 <assembly xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns="http://maven.apache.org/ASSEMBLY/2.0.0" xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
+          xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
+          xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
     <id>full</id>
     <formats>
         <format>zip</format>
@@ -18,7 +35,7 @@
             <directory>${project.build.directory}</directory>
             <outputDirectory/>
             <includes>
-                <include>validator-*.jar</include>
+                <include>validationtool-*.jar</include>
             </includes>
         </fileSet>
 
diff --git a/src/main/java/de/kosit/validationtool/cmd/CommandLineApplication.java b/src/main/java/de/kosit/validationtool/cmd/CommandLineApplication.java
index 09e3757..b2a4fcd 100644
--- a/src/main/java/de/kosit/validationtool/cmd/CommandLineApplication.java
+++ b/src/main/java/de/kosit/validationtool/cmd/CommandLineApplication.java
@@ -25,6 +25,7 @@ import org.fusesource.jansi.AnsiRenderer.Code;
 
 import de.kosit.validationtool.cmd.report.Line;
 import de.kosit.validationtool.impl.Printer;
+
 import picocli.CommandLine;
 import picocli.CommandLine.ParseResult;
 
@@ -78,11 +79,11 @@ public class CommandLineApplication {
         final CommandLine commandLine = new CommandLine(new CommandLineOptions());
         try {
             commandLine.setExecutionExceptionHandler(CommandLineApplication::logExecutionException);
-            final int cmdlineRetVal = commandLine.execute(args);
-            if (commandLine.isUsageHelpRequested() || cmdlineRetVal == CommandLine.ExitCode.USAGE) {
+            commandLine.execute(args);
+            if (commandLine.isUsageHelpRequested()) {
                 resultStatus = ReturnValue.HELP_REQUEST;
             } else {
-                resultStatus = ObjectUtils.getIfNull(commandLine.getExecutionResult(), ReturnValue.PARSING_ERROR);
+                resultStatus = ObjectUtils.defaultIfNull(commandLine.getExecutionResult(), ReturnValue.PARSING_ERROR);
                 if (resultStatus.isError()) {
                     commandLine.usage(System.out);
                 }
diff --git a/src/main/java/de/kosit/validationtool/cmd/CommandLineOptions.java b/src/main/java/de/kosit/validationtool/cmd/CommandLineOptions.java
index 99cab94..69e26d9 100644
--- a/src/main/java/de/kosit/validationtool/cmd/CommandLineOptions.java
+++ b/src/main/java/de/kosit/validationtool/cmd/CommandLineOptions.java
@@ -20,10 +20,12 @@ import java.nio.file.Path;
 import java.util.List;
 import java.util.concurrent.Callable;
 
-import de.kosit.validationtool.cmd.CommandLineApplication.Level;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
+
+import de.kosit.validationtool.cmd.CommandLineApplication.Level;
+
 import picocli.CommandLine.ArgGroup;
 import picocli.CommandLine.Command;
 import picocli.CommandLine.Help.Visibility;
@@ -36,12 +38,10 @@ import picocli.CommandLine.Parameters;
  * @author Andreas Penski
  */
 @Command(description = "Structural and semantic validation of xml files", name = "KoSIT Validator", mixinStandardHelpOptions = false,
-         separator = " ", synopsisHeading = CommandLineOptions.SYNOSIS_HEADING)
+         separator = " ")
 @Getter
 public class CommandLineOptions implements Callable<ReturnValue> {
 
-    static final String SYNOSIS_HEADING = "Usage: ";
-
     /**
      * @author Andreas Penski
      */
@@ -175,9 +175,9 @@ public class CommandLineOptions implements Callable<ReturnValue> {
 
     private static void configureLogging(final CommandLineOptions cmd) {
         if (cmd.isDebugLog()) {
-            System.setProperty(org.slf4j.simple.SimpleLogger.DEFAULT_LOG_LEVEL_KEY, "DEBUG");
+            System.setProperty(org.slf4j.impl.SimpleLogger.DEFAULT_LOG_LEVEL_KEY, "DEBUG");
         } else {
-            System.setProperty(org.slf4j.simple.SimpleLogger.DEFAULT_LOG_LEVEL_KEY, cmd.getLogLevel().name());
+            System.setProperty(org.slf4j.impl.SimpleLogger.DEFAULT_LOG_LEVEL_KEY, cmd.getLogLevel().name());
         }
     }
 
diff --git a/src/main/java/de/kosit/validationtool/cmd/Validator.java b/src/main/java/de/kosit/validationtool/cmd/Validator.java
index a54e3b5..b5d37fc 100644
--- a/src/main/java/de/kosit/validationtool/cmd/Validator.java
+++ b/src/main/java/de/kosit/validationtool/cmd/Validator.java
@@ -16,7 +16,7 @@
 
 package de.kosit.validationtool.cmd;
 
-import static org.apache.commons.lang3.ObjectUtils.getIfNull;
+import static org.apache.commons.lang3.ObjectUtils.defaultIfNull;
 import static org.apache.commons.lang3.StringUtils.EMPTY;
 import static org.apache.commons.lang3.StringUtils.isNotEmpty;
 
@@ -37,11 +37,14 @@ import java.util.stream.Stream;
 
 import org.fusesource.jansi.AnsiRenderer.Code;
 
+import lombok.extern.slf4j.Slf4j;
+
 import de.kosit.validationtool.api.Configuration;
 import de.kosit.validationtool.api.Input;
 import de.kosit.validationtool.api.InputFactory;
 import de.kosit.validationtool.api.Result;
 import de.kosit.validationtool.cmd.CommandLineOptions.CliOptions;
+import de.kosit.validationtool.cmd.CommandLineOptions.Definition;
 import de.kosit.validationtool.cmd.CommandLineOptions.RepositoryDefinition;
 import de.kosit.validationtool.cmd.CommandLineOptions.ScenarioDefinition;
 import de.kosit.validationtool.cmd.assertions.Assertions;
@@ -52,7 +55,7 @@ import de.kosit.validationtool.impl.EngineInformation;
 import de.kosit.validationtool.impl.Printer;
 import de.kosit.validationtool.impl.ScenarioRepository;
 import de.kosit.validationtool.impl.xml.ProcessorProvider;
-import lombok.extern.slf4j.Slf4j;
+
 import net.sf.saxon.s9api.Processor;
 
 /**
@@ -129,7 +132,7 @@ public class Validator {
         final Processor processor = ProcessorProvider.getProcessor();
         final List<Configuration> config = getConfiguration(cmd);
         final InternalCheck check = new InternalCheck(processor, config.toArray(new Configuration[0]));
-        final CommandLineOptions.CliOptions cliOptions = getIfNull(cmd.getCliOptions(), new CliOptions());
+        final CommandLineOptions.CliOptions cliOptions = defaultIfNull(cmd.getCliOptions(), new CliOptions());
         final Path outputDirectory = determineOutputDirectory(cliOptions);
         if (cliOptions.isExtractHtml()) {
             check.getCheckSteps().add(new ExtractHtmlContentAction(processor, outputDirectory));
@@ -177,19 +180,17 @@ public class Validator {
      * @return a list of configurations of the scenarios and repositories passed in cmd
      */
     private static List<Configuration> getConfiguration(final CommandLineOptions cmd) {
-        final List<ScenarioDefinition> scenarios = getIfNull(cmd.getScenarios(), Collections.emptyList());
-        // Map from scenario name to scenario path
+        final List<ScenarioDefinition> scenarios = defaultIfNull(cmd.getScenarios(), Collections.emptyList());
         final Map<String, Path> mappedScenarios = scenarios.stream()
                 .collect(Collectors.toMap(ScenarioDefinition::getName, ScenarioDefinition::getPath));
-        final List<RepositoryDefinition> repos = getIfNull(cmd.getRepositories(), Collections.emptyList());
-        final Map<String, Path> mappedRepos = repos.stream()
-                .collect(Collectors.toMap(RepositoryDefinition::getName, RepositoryDefinition::getPath));
+        final List<RepositoryDefinition> repos = defaultIfNull(cmd.getRepositories(), Collections.emptyList());
+        final Map<String, Path> mappedRepos = repos.stream().collect(Collectors.toMap(Definition::getName, Definition::getPath));
         checkUnused(mappedScenarios, mappedRepos);
 
         return mappedScenarios.entrySet().stream().map(e -> {
             assertFileExistance(e.getValue(), "scenario");
             final URI scenarioLocation = e.getValue().toUri();
-            final URI repositoryLocation = findRepository(scenarioLocation, e.getKey(), mappedRepos);
+            final URI repositoryLocation = findRepository(e.getKey(), mappedRepos);
 
             reportLoading(scenarioLocation, repositoryLocation);
             final Configuration configuration = Configuration.load(scenarioLocation, repositoryLocation)
@@ -207,14 +208,9 @@ public class Validator {
         unused.forEach(e -> Printer.writeErr("Warning: repository definition \"{0}\" is not used", e.getKey()));
     }
 
-    private static URI findRepository(final URI scenarioLocation, final String key, final Map<String, Path> repositories) {
+    private static URI findRepository(final String key, final Map<String, Path> repositories) {
         final Path path = repositories.getOrDefault(key, repositories.get(ScenarioRepository.DEFAULT_ID));
         if (path == null) {
-            // If it is an unnamed scenario, use the CWD instead
-            if (key.startsWith(ScenarioRepository.DEFAULT)) {
-                // Assume directory of scenario location instead
-                return Paths.get(scenarioLocation).getParent().toUri();
-            }
             throw new IllegalArgumentException(String.format("No repository location for scenario definition '%s' specified", key));
         }
         return determineRepository(path);
diff --git a/src/main/java/de/kosit/validationtool/config/XPathBuilder.java b/src/main/java/de/kosit/validationtool/config/XPathBuilder.java
index 713f951..90b5351 100644
--- a/src/main/java/de/kosit/validationtool/config/XPathBuilder.java
+++ b/src/main/java/de/kosit/validationtool/config/XPathBuilder.java
@@ -114,7 +114,7 @@ class XPathBuilder implements Builder<XPathExecutable> {
         final Iterable<String> iterable = () -> iterator;
         StreamSupport.stream(iterable.spliterator(), false).filter(e -> !ArrayUtils.contains(IGNORED_PREFIXES, e))
                 .filter(StringUtils::isNotBlank).forEach(e -> ns.put(e, this.executable.getUnderlyingExpression().getInternalExpression()
-                        .getRetainedStaticContext().getURIForPrefix(e, false).toString()));
+                        .getRetainedStaticContext().getURIForPrefix(e, false)));
         getNamespaces().putAll(ns);
 
     }
diff --git a/src/main/java/de/kosit/validationtool/impl/Printer.java b/src/main/java/de/kosit/validationtool/impl/Printer.java
index cdfbbb4..c165d97 100644
--- a/src/main/java/de/kosit/validationtool/impl/Printer.java
+++ b/src/main/java/de/kosit/validationtool/impl/Printer.java
@@ -38,11 +38,7 @@ public class Printer {
      * @param params the params.
      */
     public static void writeOut(final String message, final Object... params) {
-        try {
-            System.out.println(new MessageFormat(message, Locale.ENGLISH).format(params));
-        } catch (final RuntimeException ex) {
-            System.err.println("[Format error!] <" + message + "> with params <" + params + ">");
-        }
+        System.out.println(new MessageFormat(message, Locale.ENGLISH).format(params));
     }
 
     /**
@@ -52,11 +48,7 @@ public class Printer {
      * @param params the params.
      */
     public static void writeErr(final String message, final Object... params) {
-        try {
-            System.err.println(new MessageFormat(message, Locale.ENGLISH).format(params));
-        } catch (final RuntimeException ex) {
-            System.err.println("[Format error!] <" + message + "> with params <" + params + ">");
-        }
+        System.err.println(new MessageFormat(message, Locale.ENGLISH).format(params));
     }
 
     /**
diff --git a/src/main/java/de/kosit/validationtool/impl/Scenario.java b/src/main/java/de/kosit/validationtool/impl/Scenario.java
index d92768a..23deb7d 100644
--- a/src/main/java/de/kosit/validationtool/impl/Scenario.java
+++ b/src/main/java/de/kosit/validationtool/impl/Scenario.java
@@ -16,20 +16,22 @@
 
 package de.kosit.validationtool.impl;
 
-import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 
 import javax.xml.transform.URIResolver;
 import javax.xml.validation.Schema;
 
-import de.kosit.validationtool.api.ResolvingConfigurationStrategy;
-import de.kosit.validationtool.model.scenarios.ResourceType;
-import de.kosit.validationtool.model.scenarios.ScenarioType;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.Setter;
+
+import de.kosit.validationtool.api.ResolvingConfigurationStrategy;
+import de.kosit.validationtool.model.scenarios.ResourceType;
+import de.kosit.validationtool.model.scenarios.ScenarioType;
+
 import net.sf.saxon.lib.UnparsedTextURIResolver;
 import net.sf.saxon.s9api.XPathExecutable;
 import net.sf.saxon.s9api.XPathSelector;
@@ -78,11 +80,7 @@ public class Scenario {
     private Transformation reportTransformation;
 
     public List<Transformation> getSchematronValidations() {
-        // Must return a mutable list
-        if (this.schematronValidations == null) {
-            this.schematronValidations = new ArrayList<>();
-        }
-        return this.schematronValidations;
+        return this.schematronValidations == null ? Collections.emptyList() : this.schematronValidations;
     }
 
     public String getName() {
@@ -97,9 +95,9 @@ public class Scenario {
     }
 
     /**
-     * Returns a new XPath selector for evaluating the {@link de.kosit.validationtool.api.AcceptRecommendation}.
+     * Liefert einen neuen XPath-Selector zur Evaluierung der {@link de.kosit.validationtool.api.AcceptRecommendation}.
      *
-     * @return new selector
+     * @return neuer Selector
      */
     public Optional<XPathSelector> getAcceptSelector() {
         final XPathSelector selector = this.acceptExecutable != null ? this.acceptExecutable.load() : null;
diff --git a/src/test/java/de/kosit/validationtool/cmd/CommandlineApplicationTest.java b/src/test/java/de/kosit/validationtool/cmd/CommandlineApplicationTest.java
index f8ce55d..4231b9f 100644
--- a/src/test/java/de/kosit/validationtool/cmd/CommandlineApplicationTest.java
+++ b/src/test/java/de/kosit/validationtool/cmd/CommandlineApplicationTest.java
@@ -32,9 +32,10 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
-import de.kosit.validationtool.impl.Helper.Simple;
 import lombok.extern.slf4j.Slf4j;
 
+import de.kosit.validationtool.impl.Helper.Simple;
+
 /**
  * Testet die Parameter des Kommandozeilen-Tools.
  * 
@@ -73,7 +74,7 @@ public class CommandlineApplicationTest {
 
     @Test
     public void testHelp() {
-        final String[] args = { "-?" };
+        final String[] args = new String[] { "-?" };
         CommandLineApplication.mainProgram(args);
         assertThat(CommandLine.getErrorOutput()).isEmpty();
         checkForHelp(CommandLine.getOutputLines());
@@ -81,20 +82,12 @@ public class CommandlineApplicationTest {
 
     private static void checkForHelp(final List<String> outputLines) {
         assertThat(outputLines.size()).isPositive();
-        assertThat(outputLines.stream().filter(l -> l.startsWith(CommandLineOptions.SYNOSIS_HEADING))).hasSize(1);
-    }
-
-    @Test
-    public void testNoArguments() {
-        final String[] args = {};
-        CommandLineApplication.mainProgram(args);
-        assertThat(CommandLine.getErrorOutput()).isNotEmpty();
-        checkForHelp(CommandLine.getErrorLines());
+        assertThat(outputLines.stream().filter(l -> l.startsWith("Usage: KoSIT Validator"))).hasSize(1);
     }
 
     @Test
     public void testRequiredScenarioFile() {
-        final String[] args = { "arguments", "egal welche", "argumente drin sind" };
+        final String[] args = new String[] { "arguments", "egal welche", "argumente drin sind" };
         CommandLineApplication.mainProgram(args);
         assertThat(CommandLine.getErrorOutput()).isNotEmpty();
         assertThat(CommandLine.getErrorOutput()).contains("Missing required option: '--scenarios");
@@ -102,7 +95,7 @@ public class CommandlineApplicationTest {
 
     @Test
     public void testNotExistingScenarioFile() {
-        final String[] args = { "-s", Paths.get(Simple.NOT_EXISTING).toString(), Paths.get(Simple.NOT_EXISTING).toString() };
+        final String[] args = new String[] { "-s", Paths.get(Simple.NOT_EXISTING).toString(), Paths.get(Simple.NOT_EXISTING).toString() };
         CommandLineApplication.mainProgram(args);
         assertThat(CommandLine.getErrorOutput()).isNotEmpty();
         assertThat(CommandLine.getErrorOutput()).contains("Not a valid path for scenario definition specified");
@@ -110,7 +103,7 @@ public class CommandlineApplicationTest {
 
     @Test
     public void testIncorrectRepository() {
-        final String[] args = { "-s", Paths.get(Simple.SCENARIOS).toString(), "-r", Paths.get(Simple.NOT_EXISTING).toString(),
+        final String[] args = new String[] { "-s", Paths.get(Simple.SCENARIOS).toString(), "-r", Paths.get(Simple.NOT_EXISTING).toString(),
                 Paths.get(Simple.SIMPLE_VALID).toString() };
         CommandLineApplication.mainProgram(args);
         assertThat(CommandLine.getErrorOutput()).isNotEmpty();
@@ -119,8 +112,8 @@ public class CommandlineApplicationTest {
 
     @Test
     public void testNotExistingTestTarget() {
-        final String[] args = { "-s", Paths.get(Simple.SCENARIOS).toString(), "-r", Paths.get(Simple.REPOSITORY_URI).toString(),
-                Paths.get(Simple.NOT_EXISTING).toString() };
+        final String[] args = new String[] { "-s", Paths.get(Simple.SCENARIOS).toString(), "-r",
+                Paths.get(Simple.REPOSITORY_URI).toString(), Paths.get(Simple.NOT_EXISTING).toString() };
         CommandLineApplication.mainProgram(args);
         assertThat(CommandLine.getErrorOutput()).isNotEmpty();
         assertThat(CommandLine.getErrorOutput()).contains("No test targets found");
@@ -128,24 +121,17 @@ public class CommandlineApplicationTest {
 
     @Test
     public void testValidMinimalConfiguration() {
-        final String[] args = { "-s", Paths.get(Simple.SCENARIOS).toString(), "-r", Paths.get(Simple.REPOSITORY_URI).toString(),
-                Paths.get(Simple.SIMPLE_VALID).toString() };
-        CommandLineApplication.mainProgram(args);
-        assertThat(CommandLine.getErrorOutput()).contains(RESULT_OUTPUT);
-    }
-
-    @Test
-    public void testValidMinimalConfigurationWithoutRepositoryPath() {
-        final String[] args = { "-s", Paths.get(Simple.SCENARIOS_WITH_RELATIVE_PATHS).toString(),
-                Paths.get(Simple.SIMPLE_VALID).toString() };
+        final String[] args = new String[] { "-s", Paths.get(Simple.SCENARIOS).toString(), "-r",
+                Paths.get(Simple.REPOSITORY_URI).toString(), Paths.get(Simple.SIMPLE_VALID).toString() };
         CommandLineApplication.mainProgram(args);
         assertThat(CommandLine.getErrorOutput()).contains(RESULT_OUTPUT);
     }
 
     @Test
     public void testValidNamingConfiguration() {
-        final String[] args = { "-s", Paths.get(Simple.SCENARIOS).toString(), "-r", Paths.get(Simple.REPOSITORY_URI).toString(),
-                Paths.get(Simple.SIMPLE_VALID).toString(), "--report-prefix", "somePrefix", "--report-postfix", "somePostfix" };
+        final String[] args = new String[] { "-s", Paths.get(Simple.SCENARIOS).toString(), "-r",
+                Paths.get(Simple.REPOSITORY_URI).toString(), Paths.get(Simple.SIMPLE_VALID).toString(), "--report-prefix", "somePrefix",
+                "--report-postfix", "somePostfix" };
         CommandLineApplication.mainProgram(args);
         assertThat(CommandLine.getErrorOutput()).contains(RESULT_OUTPUT);
         assertThat(CommandLine.getErrorOutput()).contains("somePrefix-simple-somePostfix");
@@ -153,7 +139,7 @@ public class CommandlineApplicationTest {
 
     @Test
     public void testValidMultipleInput() {
-        final String[] args = { "-s", Paths.get(Simple.SCENARIOS).toString(), "-o", this.output.toString(), "-r",
+        final String[] args = new String[] { "-s", Paths.get(Simple.SCENARIOS).toString(), "-o", this.output.toString(), "-r",
                 Paths.get(Simple.REPOSITORY_URI).toString(), Paths.get(Simple.SIMPLE_VALID).toString(), Paths.get(Simple.FOO).toString() };
         CommandLineApplication.mainProgram(args);
         assertThat(CommandLine.getErrorOutput()).contains("Processing 2 object(s) completed");
@@ -161,7 +147,7 @@ public class CommandlineApplicationTest {
 
     @Test
     public void testValidDirectoryInput() {
-        final String[] args = { "-s", Paths.get(Simple.SCENARIOS).toString(), "-o", this.output.toString(), "-r",
+        final String[] args = new String[] { "-s", Paths.get(Simple.SCENARIOS).toString(), "-o", this.output.toString(), "-r",
                 Paths.get(Simple.REPOSITORY_URI).toString(), Paths.get(Simple.EXAMPLES).toString() };
         CommandLineApplication.mainProgram(args);
         assertThat(CommandLine.getErrorOutput()).contains("Processing 8 object(s) completed");
@@ -170,7 +156,7 @@ public class CommandlineApplicationTest {
     @Test
     public void testValidOutputConfiguration() throws IOException {
 
-        final String[] args = { "-s", Paths.get(Simple.SCENARIOS).toString(), "-o", this.output.toString(), "-r",
+        final String[] args = new String[] { "-s", Paths.get(Simple.SCENARIOS).toString(), "-o", this.output.toString(), "-r",
                 Paths.get(Simple.REPOSITORY_URI).toString(), Paths.get(Simple.SIMPLE_VALID).toString() };
         CommandLineApplication.mainProgram(args);
         assertThat(CommandLine.getErrorOutput()).contains(RESULT_OUTPUT);
@@ -181,7 +167,8 @@ public class CommandlineApplicationTest {
     @Test
     public void testNoInput() {
         // assertThat(output).doesNotExist();
-        final String[] args = { "-s", Paths.get(Simple.SCENARIOS).toString(), "-r", Paths.get(Simple.REPOSITORY_URI).toString(), };
+        final String[] args = new String[] { "-s", Paths.get(Simple.SCENARIOS).toString(), "-r",
+                Paths.get(Simple.REPOSITORY_URI).toString(), };
         CommandLineApplication.mainProgram(args);
         checkForHelp(CommandLine.getOutputLines());
     }
@@ -189,8 +176,8 @@ public class CommandlineApplicationTest {
     @Test
     public void testPrint() {
 
-        final String[] args = { "-s", Paths.get(Simple.SCENARIOS).toString(), "-p", "-r", Paths.get(Simple.REPOSITORY_URI).toString(), "-o",
-                this.output.toString(), Paths.get(Simple.SIMPLE_VALID).toString() };
+        final String[] args = new String[] { "-s", Paths.get(Simple.SCENARIOS).toString(), "-p", "-r",
+                Paths.get(Simple.REPOSITORY_URI).toString(), "-o", this.output.toString(), Paths.get(Simple.SIMPLE_VALID).toString() };
         CommandLineApplication.mainProgram(args);
         assertThat(CommandLine.getErrorOutput()).contains(RESULT_OUTPUT);
         assertThat(CommandLine.getOutputLines()).haveAtLeastOne(new Condition<>(
@@ -199,8 +186,9 @@ public class CommandlineApplicationTest {
 
     @Test
     public void testHtmlExtraktion() throws IOException {
-        final String[] args = { "-s", Paths.get(Simple.SCENARIOS).toString(), "-h", "-o", this.output.toAbsolutePath().toString(), "-r",
-                Paths.get(Simple.REPOSITORY_URI).toString(), Paths.get(Simple.SIMPLE_VALID).toString() };
+        final String[] args = new String[] { "-s", Paths.get(Simple.SCENARIOS).toString(), "-h", "-o",
+                this.output.toAbsolutePath().toString(), "-r", Paths.get(Simple.REPOSITORY_URI).toString(),
+                Paths.get(Simple.SIMPLE_VALID).toString() };
         CommandLineApplication.mainProgram(args);
         assertThat(CommandLine.getErrorOutput()).contains(RESULT_OUTPUT);
         assertThat(Files.list(this.output).filter(f -> f.toString().endsWith(".html")).count()).isPositive();
@@ -208,9 +196,9 @@ public class CommandlineApplicationTest {
 
     @Test
     public void testAssertionsExtraktion() {
-        final String[] args = { "-d", "-s", Paths.get(Simple.SCENARIOS).toString(), "-r", Paths.get(Simple.REPOSITORY_URI).toString(), "-o",
-                this.output.toString(), "-c", Paths.get(ASSERTIONS).toString(), Paths.get(Simple.REPOSITORY_URI).toString(),
-                Paths.get(Simple.SIMPLE_VALID).toString() };
+        final String[] args = new String[] { "-d", "-s", Paths.get(Simple.SCENARIOS).toString(), "-r",
+                Paths.get(Simple.REPOSITORY_URI).toString(), "-o", this.output.toString(), "-c", Paths.get(ASSERTIONS).toString(),
+                Paths.get(Simple.REPOSITORY_URI).toString(), Paths.get(Simple.SIMPLE_VALID).toString() };
         CommandLineApplication.mainProgram(args);
         assertThat(CommandLine.getErrorOutput()).contains(RESULT_OUTPUT);
         assertThat(CommandLine.getErrorOutput()).contains("Can not find assertions for ");
@@ -218,16 +206,16 @@ public class CommandlineApplicationTest {
 
     @Test
     public void testDebugFlag() {
-        final String[] args = { "-s", Paths.get(Simple.SCENARIOS).toString(), "-r", "unknown", "-o", this.output.toString(), "-d",
-                Paths.get(ASSERTIONS).toString() };
+        final String[] args = new String[] { "-s", Paths.get(Simple.SCENARIOS).toString(), "-r", "unknown", "-o", this.output.toString(),
+                "-d", Paths.get(ASSERTIONS).toString() };
         CommandLineApplication.mainProgram(args);
         assertThat(CommandLine.getErrorOutput()).contains("at de.kosit.validationtool");
     }
 
     @Test
     public void testPrintMemoryStats() {
-        final String[] args = { "-m", "-s", Paths.get(Simple.SCENARIOS).toString(), "-r", Paths.get(Simple.REPOSITORY_URI).toString(),
-                Paths.get(Simple.SIMPLE_VALID).toString() };
+        final String[] args = new String[] { "-m", "-s", Paths.get(Simple.SCENARIOS).toString(), "-r",
+                Paths.get(Simple.REPOSITORY_URI).toString(), Paths.get(Simple.SIMPLE_VALID).toString() };
         CommandLineApplication.mainProgram(args);
         assertThat(CommandLine.getErrorOutput()).contains(RESULT_OUTPUT);
         assertThat(CommandLine.getErrorOutput()).contains("total");
@@ -235,38 +223,32 @@ public class CommandlineApplicationTest {
 
     @Test
     public void testReadFromPipe() throws IOException {
-        final String[] args = { "-s", Paths.get(Simple.SCENARIOS).toString(), "-r", Paths.get(Simple.REPOSITORY_URI).toString() };
+        final String[] args = new String[] { "-s", Paths.get(Simple.SCENARIOS).toString(), "-r",
+                Paths.get(Simple.REPOSITORY_URI).toString() };
         CommandLine.setStandardInput(Files.newInputStream(Paths.get(Simple.SIMPLE_VALID)));
         CommandLineApplication.mainProgram(args);
         assertThat(CommandLine.getErrorOutput()).contains(RESULT_OUTPUT);
     }
 
-    @Test
-    public void testAndre() throws IOException {
-        final String[] args = { "-s", Paths.get(Simple.SCENARIOS).toString(), "-r", Paths.get(Simple.REPOSITORY_URI).toString(),
-                Paths.get(Simple.SIMPLE_VALID).toString(), "--report-prefix", "andre1" };
-        CommandLineApplication.mainProgram(args);
-        assertThat(CommandLine.getErrorOutput()).contains(RESULT_OUTPUT);
-    }
-
     @Test
     public void testUnexpectedDaemonFlag() {
-        final String[] args = { "-D", "-s", Paths.get(Simple.SCENARIOS).toString(), "-r", Paths.get(Simple.REPOSITORY_URI).toString(),
-                Paths.get(Simple.SIMPLE_VALID).toString() };
+        final String[] args = new String[] { "-D", "-s", Paths.get(Simple.SCENARIOS).toString(), "-r",
+                Paths.get(Simple.REPOSITORY_URI).toString(), Paths.get(Simple.SIMPLE_VALID).toString() };
         CommandLineApplication.mainProgram(args);
         assertThat(CommandLine.getErrorOutput()).contains("Will ignore cli mode options");
     }
 
     @Test
     public void testParsingError() {
-        final String[] args = { "-s", "-r", Paths.get(Simple.REPOSITORY_URI).toString(), Paths.get(Simple.SIMPLE_VALID).toString() };
+        final String[] args = new String[] { "-s", "-r", Paths.get(Simple.REPOSITORY_URI).toString(),
+                Paths.get(Simple.SIMPLE_VALID).toString() };
         CommandLineApplication.mainProgram(args);
         assertThat(CommandLine.getErrorOutput()).contains("Expected parameter for option");
     }
 
     @Test
     public void loadMultipleScenarios() {
-        final String[] args = { "-s", "s1=" + Paths.get(Simple.SCENARIOS).toString(), "-s",
+        final String[] args = new String[] { "-s", "s1=" + Paths.get(Simple.SCENARIOS).toString(), "-s",
                 "s2=" + Paths.get(Simple.OTHER_SCENARIOS).toString(), "-r", "s1=" + Paths.get(Simple.REPOSITORY_URI).toString(), "-r",
                 "s2=" + Paths.get(Simple.REPOSITORY_URI).toString(), Paths.get(Simple.SIMPLE_VALID).toString() };
         CommandLineApplication.mainProgram(args);
@@ -275,7 +257,7 @@ public class CommandlineApplicationTest {
 
     @Test
     public void loadMultipleScenariosSingleRepository() {
-        final String[] args = { "-s", "s1=" + Paths.get(Simple.SCENARIOS).toString(), "-s",
+        final String[] args = new String[] { "-s", "s1=" + Paths.get(Simple.SCENARIOS).toString(), "-s",
                 "s2=" + Paths.get(Simple.OTHER_SCENARIOS).toString(), "-r", Paths.get(Simple.REPOSITORY_URI).toString(),
                 Paths.get(Simple.SIMPLE_VALID).toString() };
         CommandLineApplication.mainProgram(args);
@@ -284,7 +266,7 @@ public class CommandlineApplicationTest {
 
     @Test
     public void loadMultipleScenariosMissingRepository() {
-        final String[] args = { "-s", "s1=" + Paths.get(Simple.SCENARIOS).toString(), "-s",
+        final String[] args = new String[] { "-s", "s1=" + Paths.get(Simple.SCENARIOS).toString(), "-s",
                 "s2=" + Paths.get(Simple.OTHER_SCENARIOS).toString(), "-r", "s1=" + Paths.get(Simple.REPOSITORY_URI).toString(), "-r",
                 "typo=" + Paths.get(Simple.REPOSITORY_URI).toString(), Paths.get(Simple.SIMPLE_VALID).toString() };
         CommandLineApplication.mainProgram(args);
@@ -293,16 +275,16 @@ public class CommandlineApplicationTest {
 
     @Test
     public void loadMultipleOrderedScenarios() {
-        final String[] args = { "-s", Paths.get(Simple.SCENARIOS).toString(), "-s", Paths.get(Simple.OTHER_SCENARIOS).toString(), "-r",
-                Paths.get(Simple.REPOSITORY_URI).toString(), "-r", Paths.get(Simple.REPOSITORY_URI).toString(),
-                Paths.get(Simple.SIMPLE_VALID).toString() };
+        final String[] args = new String[] { "-s", Paths.get(Simple.SCENARIOS).toString(), "-s",
+                Paths.get(Simple.OTHER_SCENARIOS).toString(), "-r", Paths.get(Simple.REPOSITORY_URI).toString(), "-r",
+                Paths.get(Simple.REPOSITORY_URI).toString(), Paths.get(Simple.SIMPLE_VALID).toString() };
         CommandLineApplication.mainProgram(args);
         assertThat(CommandLine.getOutput()).contains("Processing of 1 objects completed");
     }
 
     @Test
     public void checkUnusedRepository() {
-        final String[] args = { "-s", "s1=" + Paths.get(Simple.SCENARIOS).toString(), "-r",
+        final String[] args = new String[] { "-s", "s1=" + Paths.get(Simple.SCENARIOS).toString(), "-r",
                 "s1=" + Paths.get(Simple.REPOSITORY_URI).toString(), "-r", "unused=" + Paths.get(Simple.REPOSITORY_URI).toString(),
                 Paths.get(Simple.SIMPLE_VALID).toString() };
         CommandLineApplication.mainProgram(args);
@@ -312,7 +294,7 @@ public class CommandlineApplicationTest {
 
     @Test
     public void checkDuplicationScenarioDefinition() {
-        final String[] args = { "-s", "s1=" + Paths.get(Simple.SCENARIOS).toString(), "-r",
+        final String[] args = new String[] { "-s", "s1=" + Paths.get(Simple.SCENARIOS).toString(), "-r",
                 "s1=" + Paths.get(Simple.REPOSITORY_URI).toString(), "-r", "unused=" + Paths.get(Simple.REPOSITORY_URI).toString(),
                 Paths.get(Simple.SIMPLE_VALID).toString() };
         CommandLineApplication.mainProgram(args);
diff --git a/src/test/java/de/kosit/validationtool/config/ScenarioBuilderTest.java b/src/test/java/de/kosit/validationtool/config/ScenarioBuilderTest.java
index f9f5590..42f2f58 100644
--- a/src/test/java/de/kosit/validationtool/config/ScenarioBuilderTest.java
+++ b/src/test/java/de/kosit/validationtool/config/ScenarioBuilderTest.java
@@ -34,6 +34,7 @@ import de.kosit.validationtool.impl.Scenario;
 import de.kosit.validationtool.impl.model.Result;
 import de.kosit.validationtool.model.scenarios.NamespaceType;
 import de.kosit.validationtool.model.scenarios.ScenarioType;
+
 import net.sf.saxon.s9api.XPathExecutable;
 
 /**
@@ -139,25 +140,6 @@ public class ScenarioBuilderTest {
         assertThat(configuration.getNamespace()).isEmpty();
     }
 
-    @Test
-    public void testConfigureWithSchematron() {
-        final ContentRepository repository = Simple.createContentRepository();
-        final XPathExecutable match = repository.createXPath("//*", null);
-        final XPathExecutable accept = repository.createXPath("//*", null);
-        final ScenarioBuilder builder = createScenario();
-        builder.getNamespaces().clear();
-
-        builder.match(match);
-        builder.acceptWith(accept);
-        final Result<Scenario, String> result = builder.build(repository);
-        assertThat(result.isValid()).isTrue();
-        final ScenarioType configuration = result.getObject().getConfiguration();
-        assertThat(configuration.getMatch()).isNotEmpty();
-        assertThat(configuration.getAcceptMatch()).isNotEmpty();
-        assertThat(configuration.getNamespace()).isEmpty();
-        assertThat(configuration.getValidateWithSchematron()).isNotEmpty();
-    }
-
     @Test
     public void testBasicAttributes() {
         final ContentRepository repository = Simple.createContentRepository();
diff --git a/src/test/java/de/kosit/validationtool/config/TestConfigurationFactory.java b/src/test/java/de/kosit/validationtool/config/TestConfigurationFactory.java
index 0daacf7..79ec407 100644
--- a/src/test/java/de/kosit/validationtool/config/TestConfigurationFactory.java
+++ b/src/test/java/de/kosit/validationtool/config/TestConfigurationFactory.java
@@ -20,7 +20,6 @@ import static de.kosit.validationtool.config.ConfigurationBuilder.fallback;
 import static de.kosit.validationtool.config.ConfigurationBuilder.report;
 import static de.kosit.validationtool.config.ConfigurationBuilder.scenario;
 import static de.kosit.validationtool.config.ConfigurationBuilder.schema;
-import static de.kosit.validationtool.config.ConfigurationBuilder.schematron;
 
 import java.net.URI;
 import java.util.Date;
@@ -47,7 +46,6 @@ public class TestConfigurationFactory {
 
     public static ScenarioBuilder createScenario() {
         return scenario("simple").validate(schema("Sample Schema").schemaLocation(URI.create("simple.xsd")))
-                .validate(schematron("Sample Schematron").source(Simple.SCHEMATRON))
                 .with(report("Report für eRechnung").source("report.xsl")).acceptWith("count(//test:rejected) = 0")
                 .declareNamespace("cri", "http://www.xoev.de/de/validator/framework/1/createreportinput")
                 .declareNamespace("rpt", "http://validator.kosit.de/test-report")
diff --git a/src/test/java/de/kosit/validationtool/docs/MiscDocExampleCodes.java b/src/test/java/de/kosit/validationtool/docs/MiscDocExampleCodes.java
deleted file mode 100644
index ae8aa29..0000000
--- a/src/test/java/de/kosit/validationtool/docs/MiscDocExampleCodes.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package de.kosit.validationtool.docs;
-
-import java.net.URI;
-
-import javax.xml.transform.URIResolver;
-import javax.xml.validation.Schema;
-import javax.xml.validation.SchemaFactory;
-import javax.xml.validation.Validator;
-
-import de.kosit.validationtool.api.Configuration;
-import de.kosit.validationtool.api.ResolvingConfigurationStrategy;
-import de.kosit.validationtool.impl.ResolvingMode;
-import de.kosit.validationtool.impl.xml.ProcessorProvider;
-import net.sf.saxon.lib.UnparsedTextURIResolver;
-
-public class MiscDocExampleCodes {
-
-    void m1() {
-        final Configuration config = Configuration.load(URI.create("myscenarios.xml")).setResolvingMode(ResolvingMode.STRICT_LOCAL)
-                .build(ProcessorProvider.getProcessor());
-    }
-
-    private static final class MyCustomResolvingConfigurationStrategy implements ResolvingConfigurationStrategy {
-
-        public SchemaFactory createSchemaFactory() {
-            // TODO
-            return null;
-        }
-
-        public URIResolver createResolver(final URI scenarioRepository) {
-            // TODO
-            return null;
-        }
-
-        public UnparsedTextURIResolver createUnparsedTextURIResolver(final URI scenarioRepository) {
-            // TODO
-            return null;
-        }
-
-        public Validator createValidator(final Schema schema) {
-            // TODO
-            return null;
-        }
-    }
-
-    void m2() {
-        final Configuration config = Configuration.load(URI.create("myscenarios.xml"))
-                .setResolvingStrategy(new MyCustomResolvingConfigurationStrategy()).build(ProcessorProvider.getProcessor());
-    }
-
-}
diff --git a/src/test/java/de/kosit/validationtool/docs/MyValidator.java b/src/test/java/de/kosit/validationtool/docs/MyValidator.java
deleted file mode 100644
index 7d4acd9..0000000
--- a/src/test/java/de/kosit/validationtool/docs/MyValidator.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package de.kosit.validationtool.docs;
-
-import static de.kosit.validationtool.config.ConfigurationBuilder.fallback;
-import static de.kosit.validationtool.config.ConfigurationBuilder.report;
-import static de.kosit.validationtool.config.ConfigurationBuilder.scenario;
-import static de.kosit.validationtool.config.ConfigurationBuilder.schema;
-import static de.kosit.validationtool.config.ConfigurationBuilder.schematron;
-
-import java.net.URI;
-import java.nio.file.Paths;
-
-import de.kosit.validationtool.api.Check;
-import de.kosit.validationtool.api.Configuration;
-import de.kosit.validationtool.impl.DefaultCheck;
-import de.kosit.validationtool.impl.xml.ProcessorProvider;
-
-/**
- * Example code that is used in the docs/api.md file
- */
-public class MyValidator {
-
-    public static void main(final String[] args) {
-        final Configuration config = Configuration.create().name("myconfiguration")
-                .with(scenario("firstScenario").match("//myNode").validate(schema("Sample Schema").schemaLocation(URI.create("simple.xsd")))
-                        .validate(schematron("my rules").source("myRules.xsl")).with(report("my report").source("report.xsl")))
-                .with(fallback().name("default-report").source("fallback.xsl")).useRepository(Paths.get("/opt/myrepository"))
-                .build(ProcessorProvider.getProcessor());
-        final Check validator = new DefaultCheck(config);
-        // .. run your checks
-    }
-}
\ No newline at end of file
diff --git a/src/test/java/de/kosit/validationtool/docs/StandardExample.java b/src/test/java/de/kosit/validationtool/docs/StandardExample.java
deleted file mode 100644
index 71025fe..0000000
--- a/src/test/java/de/kosit/validationtool/docs/StandardExample.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package de.kosit.validationtool.docs;
-
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-
-import org.w3c.dom.Document;
-
-import de.kosit.validationtool.api.Check;
-import de.kosit.validationtool.api.Configuration;
-import de.kosit.validationtool.api.Input;
-import de.kosit.validationtool.api.InputFactory;
-import de.kosit.validationtool.api.Result;
-import de.kosit.validationtool.impl.DefaultCheck;
-import de.kosit.validationtool.impl.xml.ProcessorProvider;
-
-/**
- * Example code that is used in the docs/api.md file
- */
-public class StandardExample {
-
-    public void run(final Path testDocument) throws URISyntaxException {
-        // Load scenarios.xml from classpath
-        final URL scenarios = this.getClass().getClassLoader().getResource("examples/simple/scenarios-with-relative-paths.xml");
-        // Load the rest of the specific Validator configuration from classpath
-        final Configuration config = Configuration.load(scenarios.toURI()).build(ProcessorProvider.getProcessor());
-        // Use the default validation procedure
-        final Check validator = new DefaultCheck(config);
-        // Validate a single document
-        final Input document = InputFactory.read(testDocument);
-        // Get Result including information about the whole validation
-        final Result report = validator.checkInput(document);
-        System.out.println("Is processing succesful=" + report.isProcessingSuccessful());
-        // Get report document if processing was successful
-        Document result = null;
-        if (report.isProcessingSuccessful()) {
-            result = report.getReportDocument();
-        }
-        // continue processing results...
-    }
-
-    public static void main(final String[] args) throws Exception {
-        // Use e.g. "src/test/resources/examples/simple/input/foo.xml"
-        if (args.length == 0) {
-            throw new IllegalStateException("Provide a test document filename on the commandline");
-        }
-        // Path of document for validation
-        final Path testDoc = Paths.get(args[0]);
-        final StandardExample example = new StandardExample();
-        // run example validation
-        example.run(testDoc);
-    }
-}
\ No newline at end of file
diff --git a/src/test/java/de/kosit/validationtool/impl/Helper.java b/src/test/java/de/kosit/validationtool/impl/Helper.java
index f60c8a1..334791c 100644
--- a/src/test/java/de/kosit/validationtool/impl/Helper.java
+++ b/src/test/java/de/kosit/validationtool/impl/Helper.java
@@ -32,6 +32,7 @@ import de.kosit.validationtool.impl.model.Result;
 import de.kosit.validationtool.impl.tasks.DocumentParseAction;
 import de.kosit.validationtool.impl.xml.ProcessorProvider;
 import de.kosit.validationtool.model.reportInput.XMLSyntaxError;
+
 import net.sf.saxon.s9api.Processor;
 import net.sf.saxon.s9api.SaxonApiException;
 import net.sf.saxon.s9api.Serializer;
@@ -51,18 +52,16 @@ public class Helper {
 
         public static final URI EXAMPLES = ROOT.resolve("input/");
 
-        public static final URI SIMPLE_VALID = ROOT.resolve("input/simple.xml");
+        public static final URI SIMPLE_VALID = Simple.ROOT.resolve("input/simple.xml");
 
-        public static final URI FOO = ROOT.resolve("input/foo.xml");
+        public static final URI FOO = Simple.ROOT.resolve("input/foo.xml");
 
         public static final URI FOO_SCHEMATRON_INVALID = EXAMPLES.resolve("foo-schematron-invalid.xml");
 
-        public static final URI REJECTED = ROOT.resolve("input/withManualReject.xml");
+        public static final URI REJECTED = Simple.ROOT.resolve("input/withManualReject.xml");
 
         public static final URI SCENARIOS = ROOT.resolve("scenarios.xml");
 
-        public static final URI SCENARIOS_WITH_RELATIVE_PATHS = ROOT.resolve("scenarios-with-relative-paths.xml");
-
         public static final URI OTHER_SCENARIOS = ROOT.resolve("otherScenarios.xml");
 
         public static final URI ERROR_SCENARIOS = ROOT.resolve("scenarios-with-errors.xml");
@@ -85,8 +84,6 @@ public class Helper {
 
         public static final URI SCHEMA = REPOSITORY_URI.resolve("simple.xsd");
 
-        public static final URI SCHEMATRON = REPOSITORY_URI.resolve("simple-schematron-error.xsl");
-
         public static final ContentRepository createContentRepository() {
             final ResolvingConfigurationStrategy strategy = ResolvingMode.STRICT_RELATIVE.getStrategy();
             return new ContentRepository(Helper.getTestProcessor(), strategy, Simple.REPOSITORY_URI);
diff --git a/src/test/java/de/kosit/validationtool/impl/tasks/CreateReportActionTest.java b/src/test/java/de/kosit/validationtool/impl/tasks/CreateReportActionTest.java
index 9bf99bc..17f6dfd 100644
--- a/src/test/java/de/kosit/validationtool/impl/tasks/CreateReportActionTest.java
+++ b/src/test/java/de/kosit/validationtool/impl/tasks/CreateReportActionTest.java
@@ -77,7 +77,7 @@ public class CreateReportActionTest {
         this.action.check(bag);
         assertThat(bag.getReport()).isNotNull();
         final String reportString = serialize(bag.getReport());
-        assertThat(reportString).contains("SXXP0003");
+        assertThat(reportString).contains("SAXParseException");
     }
 
     @Test
diff --git a/src/test/resources/examples/resolving/withRemote.xsd b/src/test/resources/examples/resolving/withRemote.xsd
index 1d458d8..1811f74 100644
--- a/src/test/resources/examples/resolving/withRemote.xsd
+++ b/src/test/resources/examples/resolving/withRemote.xsd
@@ -18,8 +18,9 @@
 <schema xmlns:context="http://www.springframework.org/schema/context" xmlns="http://www.w3.org/2001/XMLSchema"
         targetNamespace="http://www.example.org/main"
         elementFormDefault="qualified">
+
     <import namespace="http://www.springframework.org/schema/context"
-            schemaLocation="https://www.springframework.org/schema/context/spring-context.xsd" />
+            schemaLocation="http://www.springframework.org/schema/context/spring-context.xsd" />
 
     <complexType name="MainType">
         <sequence>
diff --git a/src/test/resources/examples/simple/scenarios-with-relative-paths.xml b/src/test/resources/examples/simple/scenarios-with-relative-paths.xml
deleted file mode 100644
index ff2334b..0000000
--- a/src/test/resources/examples/simple/scenarios-with-relative-paths.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright 2017-2022  Koordinierungsstelle für IT-Standards (KoSIT)
-  ~
-  ~ 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.
-  -->
-
-<scenarios xmlns="http://www.xoev.de/de/validator/framework/1/scenarios" frameworkVersion="1.1.2">
-    <name>HTML-TestSuite</name>
-    <author>QA</author>
-    <date>2025-08-19</date>
-    <description>
-        <p>Szenario für Tests</p>
-    </description>
-
-    <scenario>
-        <name>Simple</name>
-        <description>
-            <p>Nur Schemaprüfung.</p>
-        </description>
-        <namespace prefix="cri">http://www.xoev.de/de/validator/framework/1/createreportinput
-        </namespace>
-        <namespace prefix="test">
-            http://validator.kosit.de/test-sample</namespace>
-        <namespace prefix="rpt">http://validator.kosit.de/test-report</namespace>
-        <match>/test:simple</match>
-
-        <validateWithXmlSchema>
-            <resource>
-                <name>Sample Schema</name>
-                <location>repository/simple.xsd</location>
-            </resource>
-        </validateWithXmlSchema>
-        <validateWithSchematron>
-            <resource>
-                <name>Sample Schematron</name>
-                <location>repository/simple.xsl</location>
-            </resource>
-        </validateWithSchematron>
-        <createReport>
-            <resource>
-                <name>Report für eRechnung</name>
-                <location>repository/report.xsl</location>
-            </resource>
-        </createReport>
-        <acceptMatch>count(//test:rejected) = 0</acceptMatch>
-    </scenario>
-
-    <scenario>
-        <name>NoAcceptMatch</name>
-        <description>
-            <p>Nur Schemaprüfung. Keine AcceptMatch deklaration</p>
-            <p>Testen, ob auch alte Konfiguration funktionioeren</p>
-        </description>
-        <namespace prefix="test">http://validator.kosit.de/test-sample</namespace>
-        <match>/test:foo</match>
-        <validateWithXmlSchema>
-            <resource>
-                <name>Sample Schema</name>
-                <location>repository/simple.xsd</location>
-            </resource>
-        </validateWithXmlSchema>
-        <validateWithSchematron>
-            <resource>
-                <name>Sample Schematron</name>
-                <location>repository/simple.xsl</location>
-            </resource>
-        </validateWithSchematron>
-        <createReport>
-            <resource>
-                <name>Report für eRechnung</name>
-                <location>repository/report.xsl</location>
-            </resource>
-        </createReport>
-    </scenario>
-
-
-    <noScenarioReport>
-        <resource>
-            <name>default</name>
-            <location>repository/report.xsl</location>
-        </resource>
-    </noScenarioReport>
-
-</scenarios>