diff --git a/_common/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
similarity index 100%
rename from _common/.devcontainer/devcontainer.json
rename to .devcontainer/devcontainer.json
diff --git a/_common/.flake8 b/.flake8
similarity index 100%
rename from _common/.flake8
rename to .flake8
diff --git a/_common/.isort.cfg b/.isort.cfg
similarity index 100%
rename from _common/.isort.cfg
rename to .isort.cfg
diff --git a/_common/.vscode/launch.json b/.vscode/launch.json
similarity index 100%
rename from _common/.vscode/launch.json
rename to .vscode/launch.json
diff --git a/_common/.vscode/settings.json b/.vscode/settings.json
similarity index 55%
rename from _common/.vscode/settings.json
rename to .vscode/settings.json
index 59ec155..be3b874 100644
--- a/_common/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,20 +1,30 @@
 {
     "python.languageServer": "Pylance",
     "[python]": {
+        "diffEditor.ignoreTrimWhitespace": false,
         "editor.formatOnSave": true,
+        "editor.wordBasedSuggestions": "off",
         "editor.defaultFormatter": "ms-python.black-formatter",
         "editor.codeActionsOnSave": {
-            "source.organizeImports": "explicit"
+            "source.organizeImports": "explicit",
+            "source.fixAll": "explicit",
         },
     },
     "git.closeDiffOnOperation": true,
+    "python.analysis.autoImportCompletions": true,
+    "python.analysis.importFormat": "relative",
+    "python.analysis.fixAll": [
+        "source.convertImportFormat",
+        "source.unusedImports",
+    ],
     "python.analysis.typeCheckingMode": "basic",
     "python.analysis.diagnosticMode": "workspace",
     "python.testing.unittestEnabled": false,
     "python.testing.pytestEnabled": true,
     "python.testing.pytestArgs": [
-        "--import-mode=importlib"
+        "--import-mode=importlib",
     ],
     "black-formatter.importStrategy": "fromEnvironment",
     "flake8.importStrategy": "fromEnvironment",
+    "isort.importStrategy": "fromEnvironment",
 }
\ No newline at end of file
diff --git a/README.md b/README.md
deleted file mode 120000
index 9eb06cd..0000000
--- a/README.md
+++ /dev/null
@@ -1 +0,0 @@
-kiwi-scp/README.md
\ No newline at end of file
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..649c74d
--- /dev/null
+++ b/README.md
@@ -0,0 +1,5 @@
+# kiwi-scp
+
+> `kiwi` - simple, consistent, powerful
+
+The simple tool for managing container servers
\ No newline at end of file
diff --git a/kiwi-core/poetry.lock b/core/poetry.lock
similarity index 100%
rename from kiwi-core/poetry.lock
rename to core/poetry.lock
diff --git a/kiwi-core/pyproject.toml b/core/pyproject.toml
similarity index 100%
rename from kiwi-core/pyproject.toml
rename to core/pyproject.toml
diff --git a/kiwi-core/kiwi_scp_core/lib.py b/core/src/kiwi_scp_core/lib.py
similarity index 100%
rename from kiwi-core/kiwi_scp_core/lib.py
rename to core/src/kiwi_scp_core/lib.py
diff --git a/kiwi-core/.devcontainer b/kiwi-core/.devcontainer
deleted file mode 120000
index 2744295..0000000
--- a/kiwi-core/.devcontainer
+++ /dev/null
@@ -1 +0,0 @@
-../_common/.devcontainer
\ No newline at end of file
diff --git a/kiwi-core/.flake8 b/kiwi-core/.flake8
deleted file mode 120000
index a0c467f..0000000
--- a/kiwi-core/.flake8
+++ /dev/null
@@ -1 +0,0 @@
-../_common/.flake8
\ No newline at end of file
diff --git a/kiwi-core/.isort.cfg b/kiwi-core/.isort.cfg
deleted file mode 120000
index edfae6e..0000000
--- a/kiwi-core/.isort.cfg
+++ /dev/null
@@ -1 +0,0 @@
-../_common/.isort.cfg
\ No newline at end of file
diff --git a/kiwi-core/.vscode b/kiwi-core/.vscode
deleted file mode 120000
index a442d7b..0000000
--- a/kiwi-core/.vscode
+++ /dev/null
@@ -1 +0,0 @@
-../_common/.vscode
\ No newline at end of file
diff --git a/kiwi-scp/.devcontainer b/kiwi-scp/.devcontainer
deleted file mode 120000
index 2744295..0000000
--- a/kiwi-scp/.devcontainer
+++ /dev/null
@@ -1 +0,0 @@
-../_common/.devcontainer
\ No newline at end of file
diff --git a/kiwi-scp/.flake8 b/kiwi-scp/.flake8
deleted file mode 120000
index a0c467f..0000000
--- a/kiwi-scp/.flake8
+++ /dev/null
@@ -1 +0,0 @@
-../_common/.flake8
\ No newline at end of file
diff --git a/kiwi-scp/.isort.cfg b/kiwi-scp/.isort.cfg
deleted file mode 120000
index edfae6e..0000000
--- a/kiwi-scp/.isort.cfg
+++ /dev/null
@@ -1 +0,0 @@
-../_common/.isort.cfg
\ No newline at end of file
diff --git a/kiwi-scp/.vscode b/kiwi-scp/.vscode
deleted file mode 120000
index a442d7b..0000000
--- a/kiwi-scp/.vscode
+++ /dev/null
@@ -1 +0,0 @@
-../_common/.vscode
\ No newline at end of file
diff --git a/kiwi-scp/README.md b/kiwi-scp/README.md
deleted file mode 100644
index 649c74d..0000000
--- a/kiwi-scp/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# kiwi-scp
-
-> `kiwi` - simple, consistent, powerful
-
-The simple tool for managing container servers
\ No newline at end of file
diff --git a/kiwi-scp/poetry.lock b/poetry.lock
similarity index 75%
rename from kiwi-scp/poetry.lock
rename to poetry.lock
index 8068870..1b1eec1 100644
--- a/kiwi-scp/poetry.lock
+++ b/poetry.lock
@@ -11,9 +11,9 @@ develop = true
 
 [package.source]
 type = "directory"
-url = "../kiwi-core"
+url = "core"
 
 [metadata]
 lock-version = "2.0"
 python-versions = "^3.9"
-content-hash = "daa3a0a80c900e2c198fd5d5c312db186c787f85c78e314648658ea38b26bdf1"
+content-hash = "bdf1cd785d9c108e14728e88e69313a3b4c776b05cf300b3737bc586b3f4d728"
diff --git a/kiwi-scp/pyproject.toml b/pyproject.toml
similarity index 88%
rename from kiwi-scp/pyproject.toml
rename to pyproject.toml
index 9d24b8e..3c34eb1 100644
--- a/kiwi-scp/pyproject.toml
+++ b/pyproject.toml
@@ -7,7 +7,7 @@ authors = ["Jörn-Michael <40151420+ldericher@users.noreply.github.com>"]
 readme = "README.md"
 
 [tool.poetry.dependencies]
-kiwi-scp-core = {path="../kiwi-core", develop=true}
+kiwi-scp-core = {path="core", develop=true}
 python = "^3.9"
 
 [tool.poetry.scripts]
diff --git a/kiwi-scp/kiwi_scp/main.py b/src/kiwi_scp/main.py
similarity index 100%
rename from kiwi-scp/kiwi_scp/main.py
rename to src/kiwi_scp/main.py