diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8a550e62..bdb01f2f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -22,9 +22,9 @@
     <select />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="7e2256bc-a6b8-4880-83a6-8b0e3372d0a4" name="Default Changelist" comment="Improved gitignore">
-      <change afterPath="$PROJECT_DIR$/src/cpl_cli/__init__.py" afterDir="false" />
+    <list default="true" id="7e2256bc-a6b8-4880-83a6-8b0e3372d0a4" name="Default Changelist" comment="Bugfixes">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/cpl_cli/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/cpl_cli/__init__.py" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -462,13 +462,6 @@
       <option name="presentableId" value="Default" />
       <updated>1605881914521</updated>
     </task>
-    <task id="LOCAL-00061" summary="Removed publisher.py">
-      <created>1608139612476</created>
-      <option name="number" value="00061" />
-      <option name="presentableId" value="LOCAL-00061" />
-      <option name="project" value="LOCAL" />
-      <updated>1608139612476</updated>
-    </task>
     <task id="LOCAL-00062" summary="Added first steps of database command">
       <created>1608383809354</created>
       <option name="number" value="00062" />
@@ -805,7 +798,14 @@
       <option name="project" value="LOCAL" />
       <updated>1615237379969</updated>
     </task>
-    <option name="localTasksCounter" value="110" />
+    <task id="LOCAL-00110" summary="Bugfixes">
+      <created>1615238077056</created>
+      <option name="number" value="00110" />
+      <option name="presentableId" value="LOCAL-00110" />
+      <option name="project" value="LOCAL" />
+      <updated>1615238077056</updated>
+    </task>
+    <option name="localTasksCounter" value="111" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
@@ -843,10 +843,10 @@
     <MESSAGE value="Bugfixes in build process" />
     <MESSAGE value="Changed copyright date" />
     <MESSAGE value="Changed configuration to upper case" />
-    <MESSAGE value="Bugfixes" />
     <MESSAGE value="Added modules imports" />
     <MESSAGE value="Improved gitignore" />
-    <option name="LAST_COMMIT_MESSAGE" value="Improved gitignore" />
+    <MESSAGE value="Bugfixes" />
+    <option name="LAST_COMMIT_MESSAGE" value="Bugfixes" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
diff --git a/src/cpl_cli/__init__.py b/src/cpl_cli/__init__.py
index b42288f3..e2a78d1f 100644
--- a/src/cpl_cli/__init__.py
+++ b/src/cpl_cli/__init__.py
@@ -20,6 +20,13 @@ __version__ = '2021.4.1'
 from collections import namedtuple
 
 # imports:
+from .cli import CLI
+from .command_abc import CommandABC
+from .command_handler import CommandHandler
+from .command_model import CommandModel
+from .error import Error
+from .main import main
+from .startup import Startup
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
 version_info = VersionInfo(major=2021, minor=4, micro=1)