diff --git a/.idea/misc.xml b/.idea/misc.xml
index 74c32a17..d56657ad 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectPlainTextFileTypeManager">
-    <file url="file://$PROJECT_DIR$/publish_templates/all_template.txt" />
-  </component>
   <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.9" project-jdk-type="Python SDK" />
 </project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 7899a43d..01dddac8 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -22,12 +22,31 @@
     <select />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="7e2256bc-a6b8-4880-83a6-8b0e3372d0a4" name="Default Changelist" comment="Changed copyright date">
+    <list default="true" id="7e2256bc-a6b8-4880-83a6-8b0e3372d0a4" name="Default Changelist" comment="Changed configuration to upper case">
+      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/cpl.json" beforeDir="false" afterPath="$PROJECT_DIR$/cpl.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/cpl_cli/configuration/build_settings_name.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/cpl_cli/configuration/build_settings_name.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/cpl_cli/configuration/project_settings_name.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/cpl_cli/configuration/project_settings_name.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/cpl_cli/configuration/version_settings_name.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/cpl_cli/configuration/version_settings_name.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/cpl/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/cpl/__init__.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/cpl/application/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/cpl/application/__init__.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/cpl/configuration/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/cpl/configuration/__init__.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/cpl/console/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/cpl/console/__init__.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/cpl/database/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/cpl/database/__init__.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/cpl/database/connection/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/cpl/database/connection/__init__.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/cpl/database/context/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/cpl/database/context/__init__.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/cpl/dependency_injection/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/cpl/dependency_injection/__init__.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/cpl/environment/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/cpl/environment/__init__.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/cpl/logging/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/cpl/logging/__init__.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/cpl/mailing/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/cpl/mailing/__init__.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/cpl/time/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/cpl/time/__init__.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/cpl/utils/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/cpl/utils/__init__.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/cpl_cli/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/cpl_cli/init.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/cpl_cli/command/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/cpl_cli/command/__init__.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/cpl_cli/configuration/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/cpl_cli/configuration/__init__.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/cpl_cli/publish/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/cpl_cli/publish/__init__.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/cpl_cli/publish/publisher.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/cpl_cli/publish/publisher.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/cpl_cli/templates/publish/setup.txt" beforeDir="false" afterPath="$PROJECT_DIR$/src/cpl_cli/templates/publish/setup.txt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/tests/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/tests/__init__.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/tests/db/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/tests/db/__init__.py" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -78,7 +97,7 @@
     <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
     <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
     <property name="last_opened_file_path" value="$PROJECT_DIR$/../sh_python_line_counter" />
-    <property name="settings.editor.selected.configurable" value="editing.templates" />
+    <property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable" />
   </component>
   <component name="ReaderModeSettings">
     <option name="enabled" value="false" />
@@ -92,11 +111,11 @@
       <recent name="$PROJECT_DIR$/src/cpl/application" />
     </key>
     <key name="MoveFile.RECENT_KEYS">
+      <recent name="$PROJECT_DIR$" />
       <recent name="$PROJECT_DIR$/src/cpl_cli/configuration" />
       <recent name="$PROJECT_DIR$/src/cpl_cli" />
       <recent name="$PROJECT_DIR$/src/cpl" />
       <recent name="$PROJECT_DIR$/src/cpl/database/connection" />
-      <recent name="$PROJECT_DIR$/src/cpl/database/context" />
     </key>
   </component>
   <component name="RunManager" selected="Python.cli build">
@@ -352,7 +371,7 @@
       <option name="INPUT_FILE" value="" />
       <method v="2" />
     </configuration>
-    <configuration name="main cli" type="PythonConfigurationType" factoryName="Python" temporary="true">
+    <configuration name="main cli" type="PythonConfigurationType" factoryName="Python">
       <module name="sh_common_py_lib" />
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
@@ -451,7 +470,6 @@
     </list>
     <recent_temporary>
       <list>
-        <item itemvalue="Python.main cli" />
         <item itemvalue="Python tests.Unittests" />
         <item itemvalue="Python tests.Unittests" />
       </list>
@@ -466,13 +484,6 @@
       <option name="presentableId" value="Default" />
       <updated>1605881914521</updated>
     </task>
-    <task id="LOCAL-00057" summary="Improved help command">
-      <created>1608139067953</created>
-      <option name="number" value="00057" />
-      <option name="presentableId" value="LOCAL-00057" />
-      <option name="project" value="LOCAL" />
-      <updated>1608139067953</updated>
-    </task>
     <task id="LOCAL-00058" summary="Changed deps">
       <created>1608139239527</created>
       <option name="number" value="00058" />
@@ -809,7 +820,14 @@
       <option name="project" value="LOCAL" />
       <updated>1615232454844</updated>
     </task>
-    <option name="localTasksCounter" value="106" />
+    <task id="LOCAL-00106" summary="Changed configuration to upper case">
+      <created>1615232966232</created>
+      <option name="number" value="00106" />
+      <option name="presentableId" value="LOCAL-00106" />
+      <option name="project" value="LOCAL" />
+      <updated>1615232966232</updated>
+    </task>
+    <option name="localTasksCounter" value="107" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
@@ -825,7 +843,6 @@
     <option name="oldMeFiltersMigrated" value="true" />
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="Removed unused packages" />
     <MESSAGE value="Removed publish package" />
     <MESSAGE value="Refactored code" />
     <MESSAGE value="Improved configuration" />
@@ -850,7 +867,8 @@
     <MESSAGE value="Added publish logic" />
     <MESSAGE value="Bugfixes in build process" />
     <MESSAGE value="Changed copyright date" />
-    <option name="LAST_COMMIT_MESSAGE" value="Changed copyright date" />
+    <MESSAGE value="Changed configuration to upper case" />
+    <option name="LAST_COMMIT_MESSAGE" value="Changed configuration to upper case" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
diff --git a/cpl.json b/cpl.json
index 332b2d94..2b12f42d 100644
--- a/cpl.json
+++ b/cpl.json
@@ -21,20 +21,17 @@
       "SQLAlchemy",
       "termcolor",
       "pyfiglet",
-      "tabulate",
-      "smtplib"
+      "tabulate"
     ],
     "PythonVersion": ">=3.8"
   },
   "BuildSettings": {
-    "SourcePath": "src/cpl",
+    "SourcePath": "src",
     "OutputPath": "dist",
     "Main": "cpl_cli.main",
     "EntryPoint": "cpl",
     "IncludePackageData": "False",
-    "Included": [
-      "src/cpl_cli"
-    ],
+    "Included": [],
     "Excluded": [
       "*/__pycache__",
       "*/logs"
diff --git a/src/cpl_cli/__init__.py b/src/cpl_cli/__init__.py
deleted file mode 100644
index b42288f3..00000000
--- a/src/cpl_cli/__init__.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-sh_cpl sh-edraft Common Python library
-~~~~~~~~~~~~~~~~~~~
-
-sh-edraft Common Python library
-
-:copyright: (c) 2020 - 2021 sh-edraft.de
-:license: MIT, see LICENSE for more details.
-
-"""
-
-__title__ = 'sh_cpl.cpl_cli'
-__author__ = 'Sven Heidemann'
-__license__ = 'MIT'
-__copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.4.1'
-
-from collections import namedtuple
-
-# imports:
-
-VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major=2021, minor=4, micro=1)
diff --git a/src/cpl_cli/publish/publisher.py b/src/cpl_cli/publish/publisher.py
index f2f523c5..d1b305c6 100644
--- a/src/cpl_cli/publish/publisher.py
+++ b/src/cpl_cli/publish/publisher.py
@@ -228,8 +228,7 @@ class Publisher(PublisherABC):
             setup_string = stringTemplate(template_string).substitute(
                 Name=self._project_settings.name,
                 Version=self._project_settings.version.to_str(),
-                Packages=setuptools.find_packages(where=self._build_settings.source_path,
-                                                  exclude=self._build_settings.excluded),
+                Packages=setuptools.find_packages(where=self._build_settings.source_path, exclude=self._build_settings.excluded),
                 URL=self._project_settings.url,
                 LicenseName=self._project_settings.license_name,
                 Author=self._project_settings.author,
diff --git a/src/cpl_cli/templates/publish/setup.txt b/src/cpl_cli/templates/publish/setup.txt
index a332470e..dab0356c 100644
--- a/src/cpl_cli/templates/publish/setup.txt
+++ b/src/cpl_cli/templates/publish/setup.txt
@@ -14,7 +14,6 @@ setuptools.setup(
     author_email='$AuthorMail',
     include_package_data=$InstallPackageData,
     description='$Description',
-    package_dir = {'': 'cpl'},
     python_requires='$PyRequires',
     install_requires=$Dependencies,
     entry_points=$EntryPoints
diff --git a/src/tests/__init__.py b/src/tests/__init__.py
index c91a0362..71ee2167 100644
--- a/src/tests/__init__.py
+++ b/src/tests/__init__.py
@@ -1,20 +1,20 @@
 # -*- coding: utf-8 -*-
 
 """
-sh_cpl Common Python Library
+sh_cpl sh-edraft Common Python library
 ~~~~~~~~~~~~~~~~~~~
 
-Common Python Library
+sh-edraft Common Python library
 
-:copyright: (c) 2020 sh-edraft.de
+:copyright: (c) 2020 - 2021 sh-edraft.de
 :license: MIT, see LICENSE for more details.
 
 """
 
-__title__ = 'src.tests'
+__title__ = 'sh_cpl.tests'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
-__copyright__ = 'Copyright (c) 2020 sh-edraft.de'
+__copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
 __version__ = '2021.4.1'
 
 from collections import namedtuple
diff --git a/src/tests/db/__init__.py b/src/tests/db/__init__.py
index 862072c8..746ca0b0 100644
--- a/src/tests/db/__init__.py
+++ b/src/tests/db/__init__.py
@@ -1,20 +1,20 @@
 # -*- coding: utf-8 -*-
 
 """
-sh_cpl Common Python Library
+sh_cpl sh-edraft Common Python library
 ~~~~~~~~~~~~~~~~~~~
 
-Common Python Library
+sh-edraft Common Python library
 
-:copyright: (c) 2020 sh-edraft.de
+:copyright: (c) 2020 - 2021 sh-edraft.de
 :license: MIT, see LICENSE for more details.
 
 """
 
-__title__ = 'src.tests.db'
+__title__ = 'tests.db'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
-__copyright__ = 'Copyright (c) 2020 sh-edraft.de'
+__copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
 __version__ = '2021.4.1'
 
 from collections import namedtuple