diff --git a/cpl-workspace.json b/cpl-workspace.json
index f049627f..df257d8b 100644
--- a/cpl-workspace.json
+++ b/cpl-workspace.json
@@ -1,10 +1,10 @@
 {
   "WorkspaceSettings": {
-    "DefaultProject": "cpl_cli",
+    "DefaultProject": "cpl-cli",
     "Projects": {
-      "cpl_core": "src/cpl_core/cpl_core.json",
-      "cpl_cli": "src/cpl_cli/cpl_cli.json",
-      "cpl_query": "src/cpl_query/cpl_query.json",
+      "cpl-core": "src/cpl_core/cpl-core.json",
+      "cpl-cli": "src/cpl_cli/cpl-cli.json",
+      "cpl-query": "src/cpl_query/cpl-query.json",
       "set-version": "tools/set_version/set-version.json"
     },
     "Scripts": {
@@ -19,34 +19,35 @@
       "do": "cpl docs-open",
 
       "pre-build-all": "cpl sv $ARGS",
-      "build-all": "cpl build-cli; cpl build-core; cpl build-query;",
+      "build-all": "cpl build-cli; cpl build-core; cpl build-query; cpl build-set-version",
       "ba": "cpl build-all $ARGS",
-      "build-cli": "echo 'Build cpl_cli'; cd ./src/cpl_cli; cpl build; cd ../../;",
-      "build-core": "echo 'Build cpl_core'; cd ./src/cpl_core; cpl build; cd ../../;",
-      "build-query": "echo 'Build cpl_query'; cd ./src/cpl_query; cpl build; cd ../../;",
+      "build-cli": "echo 'Build cpl-cli'; cd ./src/cpl_cli; cpl build; cd ../../;",
+      "build-core": "echo 'Build cpl-core'; cd ./src/cpl_core; cpl build; cd ../../;",
+      "build-query": "echo 'Build cpl-query'; cd ./src/cpl_query; cpl build; cd ../../;",
+      "build-set-version": "echo 'Build set-version'; cd ./tools/set_version; cpl build; cd ../../;",
 
       "pre-publish-all": "cpl sv $ARGS",
       "publish-all": "cpl publish-cli; cpl publish-core; cpl publish-query;",
       "pa": "cpl build-all $ARGS",
-      "publish-cli": "echo 'Publish cpl_cli'; cd ./src/cpl_cli; cpl publish; cd ../../;",
-      "publish-core": "echo 'Publish cpl_core'; cd ./src/cpl_core; cpl publish; cd ../../;",
+      "publish-cli": "echo 'Publish cpl-cli'; cd ./src/cpl_cli; cpl publish; cd ../../;",
+      "publish-core": "echo 'Publish cpl-core'; cd ./src/cpl_core; cpl publish; cd ../../;",
       "publish-query": "echo 'Publish cpl_query'; cd ./src/cpl_query; cpl publish; cd ../../;",
 
-      "upload-prod-cli": "echo 'PROD Upload cpl_cli'; cpl upl-prod-cli;",
+      "upload-prod-cli": "echo 'PROD Upload cpl-cli'; cpl upl-prod-cli;",
       "upl-prod-cli": "twine upload -r pip.sh-edraft.de dist/cpl-cli/publish/setup/*",
-      "upload-prod-core": "echo 'PROD Upload cpl_core'; cpl upl-prod-core;",
+      "upload-prod-core": "echo 'PROD Upload cpl-core'; cpl upl-prod-core;",
       "upl-prod-core": "twine upload -r pip.sh-edraft.de dist/cpl-core/publish/setup/*",
       "upload-prod-query": "echo 'PROD Upload cpl_query'; cpl upl-prod-query;",
       "upl-prod-query": "twine upload -r pip.sh-edraft.de dist/cpl-query/publish/setup/*",
-      "upload-exp-cli": "echo 'EXP Upload cpl_cli'; cpl upl-exp-cli;",
+      "upload-exp-cli": "echo 'EXP Upload cpl-cli'; cpl upl-exp-cli;",
       "upl-exp-cli": "twine upload -r pip-exp.sh-edraft.de dist/cpl-cli/publish/setup/*",
-      "upload-exp-core": "echo 'EXP Upload cpl_core'; cpl upl-exp-core;",
+      "upload-exp-core": "echo 'EXP Upload cpl-core'; cpl upl-exp-core;",
       "upl-exp-core": "twine upload -r pip-exp.sh-edraft.de dist/cpl-core/publish/setup/*",
       "upload-exp-query": "echo 'EXP Upload cpl_query'; cpl upl-exp-query;",
       "upl-exp-query": "twine upload -r pip-exp.sh-edraft.de dist/cpl-query/publish/setup/*",
-      "upload-dev-cli": "echo 'DEV Upload cpl_cli'; cpl upl-dev-cli;",
+      "upload-dev-cli": "echo 'DEV Upload cpl-cli'; cpl upl-dev-cli;",
       "upl-dev-cli": "twine upload -r pip-dev.sh-edraft.de dist/cpl-cli/publish/setup/*",
-      "upload-dev-core": "echo 'DEV Upload cpl_core'; cpl upl-dev-core;",
+      "upload-dev-core": "echo 'DEV Upload cpl-core'; cpl upl-dev-core;",
       "upl-dev-core": "twine upload -r pip-dev.sh-edraft.de dist/cpl-core/publish/setup/*",
       "upload-dev-query": "echo 'DEV Upload cpl_query'; cpl upl-dev-query;",
       "upl-dev-query": "twine upload -r pip-dev.sh-edraft.de dist/cpl-query/publish/setup/*",
diff --git a/src/cpl_cli/__init__.py b/src/cpl_cli/__init__.py
index 45fe463b..7cb6d3f8 100644
--- a/src/cpl_cli/__init__.py
+++ b/src/cpl_cli/__init__.py
@@ -15,7 +15,7 @@ __title__ = 'cpl_cli'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.15.dev5'
+__version__ = '2022.6.15.dev6'
 
 from collections import namedtuple
 
@@ -27,4 +27,4 @@ from .main import main
 from .startup import Startup
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='15.dev5')
+version_info = VersionInfo(major='2022', minor='6', micro='15.dev6')
diff --git a/src/cpl_cli/_templates/__init__.py b/src/cpl_cli/_templates/__init__.py
index 11fa49b0..53dda839 100644
--- a/src/cpl_cli/_templates/__init__.py
+++ b/src/cpl_cli/_templates/__init__.py
@@ -15,11 +15,11 @@ __title__ = 'cpl_cli._templates'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.15.dev5'
+__version__ = '2022.6.15.dev6'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='15.dev5')
+version_info = VersionInfo(major='2022', minor='6', micro='15.dev6')
diff --git a/src/cpl_cli/_templates/build/__init__.py b/src/cpl_cli/_templates/build/__init__.py
index 2c3a98d5..07ddd701 100644
--- a/src/cpl_cli/_templates/build/__init__.py
+++ b/src/cpl_cli/_templates/build/__init__.py
@@ -15,11 +15,11 @@ __title__ = 'cpl_cli._templates.build'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.15.dev5'
+__version__ = '2022.6.15.dev6'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='15.dev5')
+version_info = VersionInfo(major='2022', minor='6', micro='15.dev6')
diff --git a/src/cpl_cli/_templates/generate/__init__.py b/src/cpl_cli/_templates/generate/__init__.py
index 08dd2e4e..ea97f740 100644
--- a/src/cpl_cli/_templates/generate/__init__.py
+++ b/src/cpl_cli/_templates/generate/__init__.py
@@ -15,11 +15,11 @@ __title__ = 'cpl_cli._templates.generate'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.15.dev5'
+__version__ = '2022.6.15.dev6'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='15.dev5')
+version_info = VersionInfo(major='2022', minor='6', micro='15.dev6')
diff --git a/src/cpl_cli/_templates/new/__init__.py b/src/cpl_cli/_templates/new/__init__.py
index 157f6367..0c850ce0 100644
--- a/src/cpl_cli/_templates/new/__init__.py
+++ b/src/cpl_cli/_templates/new/__init__.py
@@ -15,11 +15,11 @@ __title__ = 'cpl_cli._templates.new'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.15.dev5'
+__version__ = '2022.6.15.dev6'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='15.dev5')
+version_info = VersionInfo(major='2022', minor='6', micro='15.dev6')
diff --git a/src/cpl_cli/_templates/new/console/__init__.py b/src/cpl_cli/_templates/new/console/__init__.py
index 2bcf5e60..ec149713 100644
--- a/src/cpl_cli/_templates/new/console/__init__.py
+++ b/src/cpl_cli/_templates/new/console/__init__.py
@@ -15,11 +15,11 @@ __title__ = 'cpl_cli._templates.new.console'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.15.dev5'
+__version__ = '2022.6.15.dev6'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='15.dev5')
+version_info = VersionInfo(major='2022', minor='6', micro='15.dev6')
diff --git a/src/cpl_cli/_templates/new/console/source/__init__.py b/src/cpl_cli/_templates/new/console/source/__init__.py
index 08977d40..bbbd3059 100644
--- a/src/cpl_cli/_templates/new/console/source/__init__.py
+++ b/src/cpl_cli/_templates/new/console/source/__init__.py
@@ -15,11 +15,11 @@ __title__ = 'cpl_cli._templates.new.console.source'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.15.dev5'
+__version__ = '2022.6.15.dev6'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='15.dev5')
+version_info = VersionInfo(major='2022', minor='6', micro='15.dev6')
diff --git a/src/cpl_cli/_templates/new/console/source/name/__init__.py b/src/cpl_cli/_templates/new/console/source/name/__init__.py
index 2325a91c..f5406781 100644
--- a/src/cpl_cli/_templates/new/console/source/name/__init__.py
+++ b/src/cpl_cli/_templates/new/console/source/name/__init__.py
@@ -15,11 +15,11 @@ __title__ = 'cpl_cli._templates.new.console.source.name'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.15.dev5'
+__version__ = '2022.6.15.dev6'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='15.dev5')
+version_info = VersionInfo(major='2022', minor='6', micro='15.dev6')
diff --git a/src/cpl_cli/_templates/new/console/source/tests/__init__.py b/src/cpl_cli/_templates/new/console/source/tests/__init__.py
index 965cb756..f6d82449 100644
--- a/src/cpl_cli/_templates/new/console/source/tests/__init__.py
+++ b/src/cpl_cli/_templates/new/console/source/tests/__init__.py
@@ -15,11 +15,11 @@ __title__ = 'cpl_cli._templates.new.console.source.tests'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.15.dev5'
+__version__ = '2022.6.15.dev6'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='15.dev5')
+version_info = VersionInfo(major='2022', minor='6', micro='15.dev6')
diff --git a/src/cpl_cli/_templates/new/library/__init__.py b/src/cpl_cli/_templates/new/library/__init__.py
index b395a0ef..28d0efb2 100644
--- a/src/cpl_cli/_templates/new/library/__init__.py
+++ b/src/cpl_cli/_templates/new/library/__init__.py
@@ -15,11 +15,11 @@ __title__ = 'cpl_cli._templates.new.library'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.15.dev5'
+__version__ = '2022.6.15.dev6'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='15.dev5')
+version_info = VersionInfo(major='2022', minor='6', micro='15.dev6')
diff --git a/src/cpl_cli/_templates/new/library/source/__init__.py b/src/cpl_cli/_templates/new/library/source/__init__.py
index 7d140743..6a4455cb 100644
--- a/src/cpl_cli/_templates/new/library/source/__init__.py
+++ b/src/cpl_cli/_templates/new/library/source/__init__.py
@@ -15,11 +15,11 @@ __title__ = 'cpl_cli._templates.new.library.source'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.15.dev5'
+__version__ = '2022.6.15.dev6'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='15.dev5')
+version_info = VersionInfo(major='2022', minor='6', micro='15.dev6')
diff --git a/src/cpl_cli/_templates/new/library/source/name/__init__.py b/src/cpl_cli/_templates/new/library/source/name/__init__.py
index 1ee00f59..c22556ae 100644
--- a/src/cpl_cli/_templates/new/library/source/name/__init__.py
+++ b/src/cpl_cli/_templates/new/library/source/name/__init__.py
@@ -15,11 +15,11 @@ __title__ = 'cpl_cli._templates.new.library.source.name'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.15.dev5'
+__version__ = '2022.6.15.dev6'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='15.dev5')
+version_info = VersionInfo(major='2022', minor='6', micro='15.dev6')
diff --git a/src/cpl_cli/_templates/new/library/source/tests/__init__.py b/src/cpl_cli/_templates/new/library/source/tests/__init__.py
index 65d310c5..d8a59598 100644
--- a/src/cpl_cli/_templates/new/library/source/tests/__init__.py
+++ b/src/cpl_cli/_templates/new/library/source/tests/__init__.py
@@ -15,11 +15,11 @@ __title__ = 'cpl_cli._templates.new.library.source.tests'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.15.dev5'
+__version__ = '2022.6.15.dev6'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='15.dev5')
+version_info = VersionInfo(major='2022', minor='6', micro='15.dev6')
diff --git a/src/cpl_cli/_templates/publish/__init__.py b/src/cpl_cli/_templates/publish/__init__.py
index efd96230..efb9b5b5 100644
--- a/src/cpl_cli/_templates/publish/__init__.py
+++ b/src/cpl_cli/_templates/publish/__init__.py
@@ -15,11 +15,11 @@ __title__ = 'cpl_cli._templates.publish'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.15.dev5'
+__version__ = '2022.6.15.dev6'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='15.dev5')
+version_info = VersionInfo(major='2022', minor='6', micro='15.dev6')
diff --git a/src/cpl_cli/appsettings.json b/src/cpl_cli/appsettings.json
index f4dbfbf1..eb80fe1d 100644
--- a/src/cpl_cli/appsettings.json
+++ b/src/cpl_cli/appsettings.json
@@ -1,5 +1,5 @@
 {
   "CLI": {
-    "PipPath": "https://pip.sh-edraft.de"
+    "PipPath": "https://pip-dev.sh-edraft.de"
   }
 }
\ No newline at end of file
diff --git a/src/cpl_cli/command/__init__.py b/src/cpl_cli/command/__init__.py
index fcb4e9eb..78c14eb3 100644
--- a/src/cpl_cli/command/__init__.py
+++ b/src/cpl_cli/command/__init__.py
@@ -15,7 +15,7 @@ __title__ = 'cpl_cli.command'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.15.dev5'
+__version__ = '2022.6.15.dev6'
 
 from collections import namedtuple
 
@@ -28,4 +28,4 @@ from .publish_service import PublishService
 from .version_service import VersionService
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='15.dev5')
+version_info = VersionInfo(major='2022', minor='6', micro='15.dev6')
diff --git a/src/cpl_cli/configuration/__init__.py b/src/cpl_cli/configuration/__init__.py
index 498bcecf..cac49753 100644
--- a/src/cpl_cli/configuration/__init__.py
+++ b/src/cpl_cli/configuration/__init__.py
@@ -15,7 +15,7 @@ __title__ = 'cpl_cli.configuration'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.15.dev5'
+__version__ = '2022.6.15.dev6'
 
 from collections import namedtuple
 
@@ -30,4 +30,4 @@ from .workspace_settings import WorkspaceSettings
 from .workspace_settings_name_enum import WorkspaceSettingsNameEnum
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='15.dev5')
+version_info = VersionInfo(major='2022', minor='6', micro='15.dev6')
diff --git a/src/cpl_cli/cpl_cli.json b/src/cpl_cli/cpl-cli.json
similarity index 94%
rename from src/cpl_cli/cpl_cli.json
rename to src/cpl_cli/cpl-cli.json
index c4bb37d9..7b6c8ca9 100644
--- a/src/cpl_cli/cpl_cli.json
+++ b/src/cpl_cli/cpl-cli.json
@@ -4,7 +4,7 @@
     "Version": {
       "Major": "2022",
       "Minor": "6",
-      "Micro": "15.dev5"
+      "Micro": "15.dev6"
     },
     "Author": "Sven Heidemann",
     "AuthorEmail": "sven.heidemann@sh-edraft.de",
@@ -16,7 +16,7 @@
     "LicenseName": "MIT",
     "LicenseDescription": "MIT, see LICENSE for more details.",
     "Dependencies": [
-      "cpl-core>=2022.6.15.dev5"
+      "cpl-core>=2022.6.15.dev6"
     ],
     "PythonVersion": ">=3.10",
     "PythonPath": {},
diff --git a/src/cpl_cli/live_server/__init__.py b/src/cpl_cli/live_server/__init__.py
index 251148fe..86125170 100644
--- a/src/cpl_cli/live_server/__init__.py
+++ b/src/cpl_cli/live_server/__init__.py
@@ -15,11 +15,11 @@ __title__ = 'cpl_cli.live_server'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.15.dev5'
+__version__ = '2022.6.15.dev6'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='15.dev5')
+version_info = VersionInfo(major='2022', minor='6', micro='15.dev6')
diff --git a/src/cpl_cli/publish/__init__.py b/src/cpl_cli/publish/__init__.py
index e7deb73e..fa93a9b9 100644
--- a/src/cpl_cli/publish/__init__.py
+++ b/src/cpl_cli/publish/__init__.py
@@ -15,7 +15,7 @@ __title__ = 'cpl_cli.publish'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.15.dev5'
+__version__ = '2022.6.15.dev6'
 
 from collections import namedtuple
 
@@ -24,4 +24,4 @@ from .publisher_abc import PublisherABC
 from .publisher_service import PublisherService
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='15.dev5')
+version_info = VersionInfo(major='2022', minor='6', micro='15.dev6')
diff --git a/src/cpl_cli/source_creator/__init__.py b/src/cpl_cli/source_creator/__init__.py
index 314f06e2..575be513 100644
--- a/src/cpl_cli/source_creator/__init__.py
+++ b/src/cpl_cli/source_creator/__init__.py
@@ -15,11 +15,11 @@ __title__ = 'cpl_cli.source_creator'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.15.dev5'
+__version__ = '2022.6.15.dev6'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='15.dev5')
+version_info = VersionInfo(major='2022', minor='6', micro='15.dev6')
diff --git a/src/cpl_cli/validators/__init__.py b/src/cpl_cli/validators/__init__.py
index 4c47f878..740afb11 100644
--- a/src/cpl_cli/validators/__init__.py
+++ b/src/cpl_cli/validators/__init__.py
@@ -15,11 +15,11 @@ __title__ = 'cpl_cli.validators'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.15.dev5'
+__version__ = '2022.6.15.dev6'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='15.dev5')
+version_info = VersionInfo(major='2022', minor='6', micro='15.dev6')
diff --git a/src/cpl_core/__init__.py b/src/cpl_core/__init__.py
index d426da8b..5c67e393 100644
--- a/src/cpl_core/__init__.py
+++ b/src/cpl_core/__init__.py
@@ -15,11 +15,11 @@ __title__ = 'cpl_core'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.15.dev5'
+__version__ = '2022.6.15.dev6'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='15.dev5')
+version_info = VersionInfo(major='2022', minor='6', micro='15.dev6')
diff --git a/src/cpl_core/application/__init__.py b/src/cpl_core/application/__init__.py
index de30dbde..86327ae6 100644
--- a/src/cpl_core/application/__init__.py
+++ b/src/cpl_core/application/__init__.py
@@ -15,7 +15,7 @@ __title__ = 'cpl_core.application'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.15.dev5'
+__version__ = '2022.6.15.dev6'
 
 from collections import namedtuple
 
@@ -28,4 +28,4 @@ from .startup_abc import StartupABC
 from .startup_extension_abc import StartupExtensionABC
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='15.dev5')
+version_info = VersionInfo(major='2022', minor='6', micro='15.dev6')
diff --git a/src/cpl_core/configuration/__init__.py b/src/cpl_core/configuration/__init__.py
index 4dd2588f..03f0e052 100644
--- a/src/cpl_core/configuration/__init__.py
+++ b/src/cpl_core/configuration/__init__.py
@@ -15,7 +15,7 @@ __title__ = 'cpl_core.configuration'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.15.dev5'
+__version__ = '2022.6.15.dev6'
 
 from collections import namedtuple
 
@@ -34,4 +34,4 @@ from .validator_abc import ValidatorABC
 from .variable_argument import VariableArgument
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='15.dev5')
+version_info = VersionInfo(major='2022', minor='6', micro='15.dev6')
diff --git a/src/cpl_core/console/__init__.py b/src/cpl_core/console/__init__.py
index f5a54096..9b692bdf 100644
--- a/src/cpl_core/console/__init__.py
+++ b/src/cpl_core/console/__init__.py
@@ -15,7 +15,7 @@ __title__ = 'cpl_core.console'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.15.dev5'
+__version__ = '2022.6.15.dev6'
 
 from collections import namedtuple
 
@@ -27,4 +27,4 @@ from .foreground_color_enum import ForegroundColorEnum
 from .spinner_thread import SpinnerThread
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='15.dev5')
+version_info = VersionInfo(major='2022', minor='6', micro='15.dev6')
diff --git a/src/cpl_core/cpl_core.json b/src/cpl_core/cpl-core.json
similarity index 98%
rename from src/cpl_core/cpl_core.json
rename to src/cpl_core/cpl-core.json
index 52ef6a45..07f1ad74 100644
--- a/src/cpl_core/cpl_core.json
+++ b/src/cpl_core/cpl-core.json
@@ -4,7 +4,7 @@
     "Version": {
       "Major": "2022",
       "Minor": "6",
-      "Micro": "15.dev5"
+      "Micro": "15.dev6"
     },
     "Author": "Sven Heidemann",
     "AuthorEmail": "sven.heidemann@sh-edraft.de",
diff --git a/src/cpl_core/database/__init__.py b/src/cpl_core/database/__init__.py
index cd5872a5..df923673 100644
--- a/src/cpl_core/database/__init__.py
+++ b/src/cpl_core/database/__init__.py
@@ -15,7 +15,7 @@ __title__ = 'cpl_core.database'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.15.dev5'
+__version__ = '2022.6.15.dev6'
 
 from collections import namedtuple
 
@@ -25,4 +25,4 @@ from .database_settings import DatabaseSettings
 from .table_abc import TableABC
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='15.dev5')
+version_info = VersionInfo(major='2022', minor='6', micro='15.dev6')
diff --git a/src/cpl_core/database/connection/__init__.py b/src/cpl_core/database/connection/__init__.py
index 73867271..5f69fdb3 100644
--- a/src/cpl_core/database/connection/__init__.py
+++ b/src/cpl_core/database/connection/__init__.py
@@ -15,7 +15,7 @@ __title__ = 'cpl_core.database.connection'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.15.dev5'
+__version__ = '2022.6.15.dev6'
 
 from collections import namedtuple
 
@@ -24,4 +24,4 @@ from .database_connection import DatabaseConnection
 from .database_connection_abc import DatabaseConnectionABC
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='15.dev5')
+version_info = VersionInfo(major='2022', minor='6', micro='15.dev6')
diff --git a/src/cpl_core/database/context/__init__.py b/src/cpl_core/database/context/__init__.py
index 6bee9461..181a2c39 100644
--- a/src/cpl_core/database/context/__init__.py
+++ b/src/cpl_core/database/context/__init__.py
@@ -15,7 +15,7 @@ __title__ = 'cpl_core.database.context'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.15.dev5'
+__version__ = '2022.6.15.dev6'
 
 from collections import namedtuple
 
@@ -24,4 +24,4 @@ from .database_context import DatabaseContext
 from .database_context_abc import DatabaseContextABC
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='15.dev5')
+version_info = VersionInfo(major='2022', minor='6', micro='15.dev6')
diff --git a/src/cpl_core/dependency_injection/__init__.py b/src/cpl_core/dependency_injection/__init__.py
index 6c924298..2dbe809e 100644
--- a/src/cpl_core/dependency_injection/__init__.py
+++ b/src/cpl_core/dependency_injection/__init__.py
@@ -15,7 +15,7 @@ __title__ = 'cpl_core.dependency_injection'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.15.dev5'
+__version__ = '2022.6.15.dev6'
 
 from collections import namedtuple
 
@@ -30,4 +30,4 @@ from .service_provider import ServiceProvider
 from .service_provider_abc import ServiceProviderABC
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='15.dev5')
+version_info = VersionInfo(major='2022', minor='6', micro='15.dev6')
diff --git a/src/cpl_core/environment/__init__.py b/src/cpl_core/environment/__init__.py
index 1c742efc..f01a86df 100644
--- a/src/cpl_core/environment/__init__.py
+++ b/src/cpl_core/environment/__init__.py
@@ -15,7 +15,7 @@ __title__ = 'cpl_core.environment'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.15.dev5'
+__version__ = '2022.6.15.dev6'
 
 from collections import namedtuple
 
@@ -25,4 +25,4 @@ from .environment_name_enum import EnvironmentNameEnum
 from .application_environment import ApplicationEnvironment
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='15.dev5')
+version_info = VersionInfo(major='2022', minor='6', micro='15.dev6')
diff --git a/src/cpl_core/logging/__init__.py b/src/cpl_core/logging/__init__.py
index 2d9d2a34..a65b9347 100644
--- a/src/cpl_core/logging/__init__.py
+++ b/src/cpl_core/logging/__init__.py
@@ -15,7 +15,7 @@ __title__ = 'cpl_core.logging'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.15.dev5'
+__version__ = '2022.6.15.dev6'
 
 from collections import namedtuple
 
@@ -27,4 +27,4 @@ from .logging_settings import LoggingSettings
 from .logging_settings_name_enum import LoggingSettingsNameEnum
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='15.dev5')
+version_info = VersionInfo(major='2022', minor='6', micro='15.dev6')
diff --git a/src/cpl_core/mailing/__init__.py b/src/cpl_core/mailing/__init__.py
index aa8e5585..42691554 100644
--- a/src/cpl_core/mailing/__init__.py
+++ b/src/cpl_core/mailing/__init__.py
@@ -15,7 +15,7 @@ __title__ = 'cpl_core.mailing'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.15.dev5'
+__version__ = '2022.6.15.dev6'
 
 from collections import namedtuple
 
@@ -27,4 +27,4 @@ from .email_client_settings import EMailClientSettings
 from .email_client_settings_name_enum import EMailClientSettingsNameEnum
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='15.dev5')
+version_info = VersionInfo(major='2022', minor='6', micro='15.dev6')
diff --git a/src/cpl_core/pipes/__init__.py b/src/cpl_core/pipes/__init__.py
index fee19c49..b229f9bf 100644
--- a/src/cpl_core/pipes/__init__.py
+++ b/src/cpl_core/pipes/__init__.py
@@ -15,7 +15,7 @@ __title__ = 'cpl_core.pipes'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.15.dev5'
+__version__ = '2022.6.15.dev6'
 
 from collections import namedtuple
 
@@ -29,4 +29,4 @@ from .to_camel_case_pipe import ToCamelCasePipe
 from .to_snake_case_pipe import ToSnakeCasePipe
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='15.dev5')
+version_info = VersionInfo(major='2022', minor='6', micro='15.dev6')
diff --git a/src/cpl_core/time/__init__.py b/src/cpl_core/time/__init__.py
index 73d6d0e6..3545cfe2 100644
--- a/src/cpl_core/time/__init__.py
+++ b/src/cpl_core/time/__init__.py
@@ -15,7 +15,7 @@ __title__ = 'cpl_core.time'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.15.dev5'
+__version__ = '2022.6.15.dev6'
 
 from collections import namedtuple
 
@@ -24,4 +24,4 @@ from .time_format_settings import TimeFormatSettings
 from .time_format_settings_names_enum import TimeFormatSettingsNamesEnum
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='15.dev5')
+version_info = VersionInfo(major='2022', minor='6', micro='15.dev6')
diff --git a/src/cpl_core/utils/__init__.py b/src/cpl_core/utils/__init__.py
index 6b9b81f0..db1d6243 100644
--- a/src/cpl_core/utils/__init__.py
+++ b/src/cpl_core/utils/__init__.py
@@ -15,7 +15,7 @@ __title__ = 'cpl_core.utils'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.15.dev5'
+__version__ = '2022.6.15.dev6'
 
 from collections import namedtuple
 
@@ -25,4 +25,4 @@ from .string import String
 from .pip import Pip
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='15.dev5')
+version_info = VersionInfo(major='2022', minor='6', micro='15.dev6')
diff --git a/src/cpl_query/__init__.py b/src/cpl_query/__init__.py
index 7c6d8f33..720b9b90 100644
--- a/src/cpl_query/__init__.py
+++ b/src/cpl_query/__init__.py
@@ -15,11 +15,11 @@ __title__ = 'cpl_query'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.15.dev5'
+__version__ = '2022.6.15.dev6'
 
 from collections import namedtuple
 
 # imports: 
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='15.dev5')
+version_info = VersionInfo(major='2022', minor='6', micro='15.dev6')
diff --git a/src/cpl_query/_query/__init__.py b/src/cpl_query/_query/__init__.py
index a2b481ce..1dc36a5c 100644
--- a/src/cpl_query/_query/__init__.py
+++ b/src/cpl_query/_query/__init__.py
@@ -15,11 +15,11 @@ __title__ = 'cpl_query._query'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.15.dev5'
+__version__ = '2022.6.15.dev6'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='15.dev5')
+version_info = VersionInfo(major='2022', minor='6', micro='15.dev6')
diff --git a/src/cpl_query/cpl_query.json b/src/cpl_query/cpl-query.json
similarity index 94%
rename from src/cpl_query/cpl_query.json
rename to src/cpl_query/cpl-query.json
index 74a4b97f..c6c29fec 100644
--- a/src/cpl_query/cpl_query.json
+++ b/src/cpl_query/cpl-query.json
@@ -4,7 +4,7 @@
     "Version": {
       "Major": "2022",
       "Minor": "6",
-      "Micro": "15.dev5"
+      "Micro": "15.dev6"
     },
     "Author": "Sven Heidemann",
     "AuthorEmail": "sven.heidemann@sh-edraft.de",
@@ -16,7 +16,7 @@
     "LicenseName": "MIT",
     "LicenseDescription": "MIT, see LICENSE for more details.",
     "Dependencies": [
-      "cpl-core>=2022.6.15.dev5"
+      "cpl-core>=2022.6.15.dev6"
     ],
     "PythonVersion": ">=3.10",
     "PythonPath": {},
diff --git a/src/cpl_query/extension/__init__.py b/src/cpl_query/extension/__init__.py
index 90840ef7..521196c9 100644
--- a/src/cpl_query/extension/__init__.py
+++ b/src/cpl_query/extension/__init__.py
@@ -15,7 +15,7 @@ __title__ = 'cpl_query.extension'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
-__version__ = '2022.6.15.dev5'
+__version__ = '2022.6.15.dev6'
 
 from collections import namedtuple
 
@@ -27,4 +27,4 @@ from .ordered_iterable_abc import OrderedIterableABC
 from .ordered_iterable import OrderedIterable
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='6', micro='15.dev5')
+version_info = VersionInfo(major='2022', minor='6', micro='15.dev6')
diff --git a/tools/set_version/__init__.py b/tools/set_version/__init__.py
index ad5eca30..d2f80d42 100644
--- a/tools/set_version/__init__.py
+++ b/tools/set_version/__init__.py
@@ -1 +1,25 @@
+# -*- coding: utf-8 -*-
+
+"""
+set-version CPL internal tool to set version from branch name
+~~~~~~~~~~~~~~~~~~~
+
+CPL internal tool to set version from branch name
+
+:copyright: (c) 2020 - 2022 sh-edraft.de
+:license: MIT, see LICENSE for more details.
+
+"""
+
+__title__ = 'set_version'
+__author__ = 'Sven Heidemann'
+__license__ = 'MIT'
+__copyright__ = 'Copyright (c) 2020 - 2022 sh-edraft.de'
+__version__ = '2022.6'
+
+from collections import namedtuple
+
 # imports: 
+
+VersionInfo = namedtuple('VersionInfo', 'major minor micro')
+version_info = VersionInfo(major='2022', minor='6', micro='None')
diff --git a/tools/set_version/appsettings.json b/tools/set_version/appsettings.json
deleted file mode 100644
index 629e6ebd..00000000
--- a/tools/set_version/appsettings.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "TimeFormatSettings": {
-    "DateFormat": "%Y-%m-%d",
-    "TimeFormat": "%H:%M:%S",
-    "DateTimeFormat": "%Y-%m-%d %H:%M:%S.%f",
-    "DateTimeLogFormat": "%Y-%m-%d_%H-%M-%S"
-  },
-
-  "LoggingSettings": {
-    "Path": "logs/",
-    "Filename": "log_$start_time.log",
-    "ConsoleLogLevel": "ERROR",
-    "FileLogLevel": "WARN"
-  }
-}
diff --git a/tools/set_version/set-version.json b/tools/set_version/set-version.json
index e1a7d005..06a62dbc 100644
--- a/tools/set_version/set-version.json
+++ b/tools/set_version/set-version.json
@@ -4,24 +4,22 @@
     "Version": {
       "Major": "2022",
       "Minor": "6",
-      "Micro": "15"
+      "Micro": ""
     },
-    "Author": "",
-    "AuthorEmail": "",
-    "Description": "",
-    "LongDescription": "",
-    "URL": "",
-    "CopyrightDate": "",
-    "CopyrightName": "",
-    "LicenseName": "",
-    "LicenseDescription": "",
+    "Author": "Sven Heidemann",
+    "AuthorEmail": "sven.heidemann@sh-edraft.de",
+    "Description": "CPL internal tool to set version from branch name",
+    "LongDescription": "CPL internal tool to set version from branch name",
+    "URL": "https://www.sh-edraft.de",
+    "CopyrightDate": "2020 - 2022",
+    "CopyrightName": "sh-edraft.de",
+    "LicenseName": "MIT",
+    "LicenseDescription": "MIT, see LICENSE for more details.",
     "Dependencies": [
-      "cpl-core>=2022.6.15.dev5"
+      "cpl-core>=2022.6.15.dev6"
     ],
     "PythonVersion": ">=3.10.4",
-    "PythonPath": {
-      "linux": ""
-    },
+    "PythonPath": {},
     "Classifiers": []
   },
   "BuildSettings": {