diff --git a/src/cpl_cli/cpl_cli.json b/src/cpl_cli/cpl_cli.json
index e3e6df73..b37f9d13 100644
--- a/src/cpl_cli/cpl_cli.json
+++ b/src/cpl_cli/cpl_cli.json
@@ -16,7 +16,7 @@
     "LicenseName": "MIT",
     "LicenseDescription": "MIT, see LICENSE for more details.",
     "Dependencies": [
-      "sh_cpl==2021.4.dev1"
+      "sh_cpl==2021.4.post1"
     ],
     "PythonVersion": ">=3.8",
     "PythonPath": {},
diff --git a/src/cpl_cli/source_creator/console_builder.py b/src/cpl_cli/source_creator/console_builder.py
index 6662e80a..8ccb405e 100644
--- a/src/cpl_cli/source_creator/console_builder.py
+++ b/src/cpl_cli/source_creator/console_builder.py
@@ -3,18 +3,17 @@ import os
 from cpl.console.foreground_color_enum import ForegroundColorEnum
 from cpl.console.console import Console
 from cpl.utils.string import String
-from cpl_cli.configuration.workspace_settings import WorkspaceSettings
 from cpl_cli.configuration.workspace_settings_name_enum import WorkspaceSettingsNameEnum
 from cpl_cli.source_creator.template_builder import TemplateBuilder
 from cpl_cli.templates.new.console.appsettings_json import AppsettingsTemplate
 from cpl_cli.templates.new.console.license import LicenseTemplate
 from cpl_cli.templates.new.console.readme_py import ReadmeTemplate
-from cpl_cli.templates.new.console.src.name.application import ApplicationTemplate
-from cpl_cli.templates.new.console.src.name.init import MainInitTemplate
-from cpl_cli.templates.new.console.src.name.main import MainWithApplicationHostAndStartupTemplate, \
+from cpl_cli.templates.new.console.source.name.application import ApplicationTemplate
+from cpl_cli.templates.new.console.source.name.init import MainInitTemplate
+from cpl_cli.templates.new.console.source.name.main import MainWithApplicationHostAndStartupTemplate, \
     MainWithoutApplicationBaseTemplate, MainWithApplicationBaseTemplate, MainWithDependencyInjection
-from cpl_cli.templates.new.console.src.name.startup import StartupTemplate
-from cpl_cli.templates.new.console.src.tests.init import TestsInitTemplate
+from cpl_cli.templates.new.console.source.name.startup import StartupTemplate
+from cpl_cli.templates.new.console.source.tests.init import TestsInitTemplate
 from cpl_cli.templates.template_file_abc import TemplateFileABC
 
 
diff --git a/src/cpl_cli/source_creator/library_builder.py b/src/cpl_cli/source_creator/library_builder.py
index cbee2bcd..0d06e361 100644
--- a/src/cpl_cli/source_creator/library_builder.py
+++ b/src/cpl_cli/source_creator/library_builder.py
@@ -8,12 +8,12 @@ from cpl_cli.source_creator.template_builder import TemplateBuilder
 from cpl_cli.templates.new.library.appsettings_json import AppsettingsTemplate
 from cpl_cli.templates.new.library.license import LicenseTemplate
 from cpl_cli.templates.new.library.readme_py import ReadmeTemplate
-from cpl_cli.templates.new.library.src.name.application import ApplicationTemplate
-from cpl_cli.templates.new.library.src.name.init import NameInitTemplate
-from cpl_cli.templates.new.library.src.name.main import MainWithApplicationHostAndStartupTemplate, \
+from cpl_cli.templates.new.library.source.name.application import ApplicationTemplate
+from cpl_cli.templates.new.library.source.name.init import NameInitTemplate
+from cpl_cli.templates.new.library.source.name.main import MainWithApplicationHostAndStartupTemplate, \
     MainWithoutApplicationBaseTemplate, MainWithApplicationBaseTemplate, MainWithDependencyInjection
-from cpl_cli.templates.new.library.src.name.startup import StartupTemplate
-from cpl_cli.templates.new.library.src.tests.init import TestsInitTemplate
+from cpl_cli.templates.new.library.source.name.startup import StartupTemplate
+from cpl_cli.templates.new.library.source.tests.init import TestsInitTemplate
 from cpl_cli.templates.template_file_abc import TemplateFileABC
 
 
diff --git a/src/cpl_cli/templates/new/console/src/__init__.py b/src/cpl_cli/templates/new/console/source/__init__.py
similarity index 91%
rename from src/cpl_cli/templates/new/console/src/__init__.py
rename to src/cpl_cli/templates/new/console/source/__init__.py
index 1ddf7033..c844cefa 100644
--- a/src/cpl_cli/templates/new/console/src/__init__.py
+++ b/src/cpl_cli/templates/new/console/source/__init__.py
@@ -11,7 +11,7 @@ sh-edraft Common Python library Command Line Interface
 
 """
 
-__title__ = 'cpl_cli.templates.new.console'
+__title__ = 'cpl_cli.templates.new.console.source'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
diff --git a/src/cpl_cli/templates/new/console/src/tests/__init__.py b/src/cpl_cli/templates/new/console/source/name/__init__.py
similarity index 90%
rename from src/cpl_cli/templates/new/console/src/tests/__init__.py
rename to src/cpl_cli/templates/new/console/source/name/__init__.py
index 751570a7..7dfac621 100644
--- a/src/cpl_cli/templates/new/console/src/tests/__init__.py
+++ b/src/cpl_cli/templates/new/console/source/name/__init__.py
@@ -11,7 +11,7 @@ sh-edraft Common Python library Command Line Interface
 
 """
 
-__title__ = 'cpl_cli.templates.new.console.tests'
+__title__ = 'cpl_cli.templates.new.console.source.name'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
diff --git a/src/cpl_cli/templates/new/console/src/name/application.py b/src/cpl_cli/templates/new/console/source/name/application.py
similarity index 100%
rename from src/cpl_cli/templates/new/console/src/name/application.py
rename to src/cpl_cli/templates/new/console/source/name/application.py
diff --git a/src/cpl_cli/templates/new/console/src/name/init.py b/src/cpl_cli/templates/new/console/source/name/init.py
similarity index 100%
rename from src/cpl_cli/templates/new/console/src/name/init.py
rename to src/cpl_cli/templates/new/console/source/name/init.py
diff --git a/src/cpl_cli/templates/new/console/src/name/main.py b/src/cpl_cli/templates/new/console/source/name/main.py
similarity index 100%
rename from src/cpl_cli/templates/new/console/src/name/main.py
rename to src/cpl_cli/templates/new/console/source/name/main.py
diff --git a/src/cpl_cli/templates/new/console/src/name/startup.py b/src/cpl_cli/templates/new/console/source/name/startup.py
similarity index 100%
rename from src/cpl_cli/templates/new/console/src/name/startup.py
rename to src/cpl_cli/templates/new/console/source/name/startup.py
diff --git a/src/cpl_cli/templates/new/console/source/tests/__init__.py b/src/cpl_cli/templates/new/console/source/tests/__init__.py
new file mode 100644
index 00000000..e9ec5a2f
--- /dev/null
+++ b/src/cpl_cli/templates/new/console/source/tests/__init__.py
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+
+"""
+sh_cpl-cli sh-edraft Common Python library CLI
+~~~~~~~~~~~~~~~~~~~
+
+sh-edraft Common Python library Command Line Interface
+
+:copyright: (c) 2020 - 2021 sh-edraft.de
+:license: MIT, see LICENSE for more details.
+
+"""
+
+__title__ = 'cpl_cli.templates.new.console.source.tests'
+__author__ = 'Sven Heidemann'
+__license__ = 'MIT'
+__copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
+__version__ = '2021.4'
+
+from collections import namedtuple
+
+# imports:
+
+VersionInfo = namedtuple('VersionInfo', 'major minor micro')
+version_info = VersionInfo(major='2021', minor='4', micro='None')
diff --git a/src/cpl_cli/templates/new/console/src/tests/init.py b/src/cpl_cli/templates/new/console/source/tests/init.py
similarity index 100%
rename from src/cpl_cli/templates/new/console/src/tests/init.py
rename to src/cpl_cli/templates/new/console/source/tests/init.py
diff --git a/src/cpl_cli/templates/new/console/src/name/__init__.py b/src/cpl_cli/templates/new/library/source/__init__.py
similarity index 91%
rename from src/cpl_cli/templates/new/console/src/name/__init__.py
rename to src/cpl_cli/templates/new/library/source/__init__.py
index a5d7713c..ba73726c 100644
--- a/src/cpl_cli/templates/new/console/src/name/__init__.py
+++ b/src/cpl_cli/templates/new/library/source/__init__.py
@@ -11,7 +11,7 @@ sh-edraft Common Python library Command Line Interface
 
 """
 
-__title__ = 'cpl_cli.templates.new.console.name'
+__title__ = 'cpl_cli.templates.new.library.source'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
diff --git a/src/cpl_cli/templates/new/library/src/__init__.py b/src/cpl_cli/templates/new/library/source/name/__init__.py
similarity index 90%
rename from src/cpl_cli/templates/new/library/src/__init__.py
rename to src/cpl_cli/templates/new/library/source/name/__init__.py
index b4c7abd9..813c312a 100644
--- a/src/cpl_cli/templates/new/library/src/__init__.py
+++ b/src/cpl_cli/templates/new/library/source/name/__init__.py
@@ -11,7 +11,7 @@ sh-edraft Common Python library Command Line Interface
 
 """
 
-__title__ = 'cpl_cli.templates.new.library'
+__title__ = 'cpl_cli.templates.new.library.source.name'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
diff --git a/src/cpl_cli/templates/new/library/src/name/application.py b/src/cpl_cli/templates/new/library/source/name/application.py
similarity index 100%
rename from src/cpl_cli/templates/new/library/src/name/application.py
rename to src/cpl_cli/templates/new/library/source/name/application.py
diff --git a/src/cpl_cli/templates/new/library/src/name/init.py b/src/cpl_cli/templates/new/library/source/name/init.py
similarity index 100%
rename from src/cpl_cli/templates/new/library/src/name/init.py
rename to src/cpl_cli/templates/new/library/source/name/init.py
diff --git a/src/cpl_cli/templates/new/library/src/name/main.py b/src/cpl_cli/templates/new/library/source/name/main.py
similarity index 100%
rename from src/cpl_cli/templates/new/library/src/name/main.py
rename to src/cpl_cli/templates/new/library/source/name/main.py
diff --git a/src/cpl_cli/templates/new/library/src/name/startup.py b/src/cpl_cli/templates/new/library/source/name/startup.py
similarity index 100%
rename from src/cpl_cli/templates/new/library/src/name/startup.py
rename to src/cpl_cli/templates/new/library/source/name/startup.py
diff --git a/src/cpl_cli/templates/new/library/source/tests/__init__.py b/src/cpl_cli/templates/new/library/source/tests/__init__.py
new file mode 100644
index 00000000..b787bf81
--- /dev/null
+++ b/src/cpl_cli/templates/new/library/source/tests/__init__.py
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+
+"""
+sh_cpl-cli sh-edraft Common Python library CLI
+~~~~~~~~~~~~~~~~~~~
+
+sh-edraft Common Python library Command Line Interface
+
+:copyright: (c) 2020 - 2021 sh-edraft.de
+:license: MIT, see LICENSE for more details.
+
+"""
+
+__title__ = 'cpl_cli.templates.new.library.source.tests'
+__author__ = 'Sven Heidemann'
+__license__ = 'MIT'
+__copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
+__version__ = '2021.4'
+
+from collections import namedtuple
+
+# imports:
+
+VersionInfo = namedtuple('VersionInfo', 'major minor micro')
+version_info = VersionInfo(major='2021', minor='4', micro='None')
diff --git a/src/cpl_cli/templates/new/library/src/tests/init.py b/src/cpl_cli/templates/new/library/source/tests/init.py
similarity index 100%
rename from src/cpl_cli/templates/new/library/src/tests/init.py
rename to src/cpl_cli/templates/new/library/source/tests/init.py
diff --git a/src/cpl_cli/templates/new/library/src/name/__init__.py b/src/cpl_cli/templates/new/library/src/name/__init__.py
deleted file mode 100644
index b2a503fe..00000000
--- a/src/cpl_cli/templates/new/library/src/name/__init__.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-sh_cpl-cli sh-edraft Common Python library CLI
-~~~~~~~~~~~~~~~~~~~
-
-sh-edraft Common Python library Command Line Interface
-
-:copyright: (c) 2020 - 2021 sh-edraft.de
-:license: MIT, see LICENSE for more details.
-
-"""
-
-__title__ = 'cpl_cli.templates.new.library.name'
-__author__ = 'Sven Heidemann'
-__license__ = 'MIT'
-__copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.4'
-
-from collections import namedtuple
-
-# imports:
-
-VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='4', micro='None')
diff --git a/src/cpl_cli/templates/new/library/src/tests/__init__.py b/src/cpl_cli/templates/new/library/src/tests/__init__.py
deleted file mode 100644
index 9d7fd86b..00000000
--- a/src/cpl_cli/templates/new/library/src/tests/__init__.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-sh_cpl-cli sh-edraft Common Python library CLI
-~~~~~~~~~~~~~~~~~~~
-
-sh-edraft Common Python library Command Line Interface
-
-:copyright: (c) 2020 - 2021 sh-edraft.de
-:license: MIT, see LICENSE for more details.
-
-"""
-
-__title__ = 'cpl_cli.templates.new.library.tests'
-__author__ = 'Sven Heidemann'
-__license__ = 'MIT'
-__copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.4'
-
-from collections import namedtuple
-
-# imports:
-
-VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='4', micro='None')