diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 56cd891..4c5ffe6 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -45,7 +45,7 @@
 	"postCreateCommand": "sudo /usr/local/py-utils/bin/poetry self add poetry-plugin-up",
 
 	// Use 'postStartCommand' to run commands after the container is started.
-	"postStartCommand": "poetry install"
+	"postStartCommand": "poetry install && poetry run poetry install --directory=./kiwi"
 	
 	// Use 'forwardPorts' to make a list of ports inside the container available locally.
 	// "forwardPorts": [],
diff --git a/core/poetry.lock b/core/poetry.lock
deleted file mode 100644
index aed336c..0000000
--- a/core/poetry.lock
+++ /dev/null
@@ -1,7 +0,0 @@
-# This file is automatically @generated by Poetry 1.8.2 and should not be changed by hand.
-package = []
-
-[metadata]
-lock-version = "2.0"
-python-versions = "^3.9"
-content-hash = "c595a0588c25d58f3e3834ad7169126836d262b925fe6ca9b5d540dcf301d254"
diff --git a/README.md b/kiwi/README.md
similarity index 100%
rename from README.md
rename to kiwi/README.md
diff --git a/kiwi/poetry.lock b/kiwi/poetry.lock
new file mode 100644
index 0000000..d9bf9a1
--- /dev/null
+++ b/kiwi/poetry.lock
@@ -0,0 +1,19 @@
+# This file is automatically @generated by Poetry 1.8.2 and should not be changed by hand.
+
+[[package]]
+name = "kiwi-scp-core"
+version = "0.1.0"
+description = ""
+optional = false
+python-versions = "^3.9"
+files = []
+develop = true
+
+[package.source]
+type = "directory"
+url = ".."
+
+[metadata]
+lock-version = "2.0"
+python-versions = "^3.9"
+content-hash = "a3d34500c99938adcdd197120ef1d14e13272335d82463becce1e9b26fdb1fa3"
diff --git a/core/pyproject.toml b/kiwi/pyproject.toml
similarity index 53%
rename from core/pyproject.toml
rename to kiwi/pyproject.toml
index 032c1be..8c2d88d 100644
--- a/core/pyproject.toml
+++ b/kiwi/pyproject.toml
@@ -1,14 +1,19 @@
 [tool.poetry]
-name = "kiwi-scp-core"
-version = "0.1.0"
-description = ""
+name = "kiwi-scp"
+version = "0.3.0"
+description = "kiwi is the simple tool for managing container servers."
 license = "MIT"
 authors = ["Jörn-Michael Miehe <40151420+ldericher@users.noreply.github.com>"]
 maintainers = []
+readme = "README.md"
 
 [tool.poetry.dependencies]
+kiwi-scp-core = {path="..", develop=true}
 python = "^3.9"
 
+[tool.poetry.scripts]
+kiwi = "kiwi_scp.main:main"
+
 [build-system]
 build-backend = "poetry.core.masonry.api"
 requires = ["poetry-core"]
diff --git a/src/kiwi_scp/main.py b/kiwi/src/kiwi_scp/main.py
similarity index 100%
rename from src/kiwi_scp/main.py
rename to kiwi/src/kiwi_scp/main.py
diff --git a/poetry.lock b/poetry.lock
index 9fa338c..7a499b6 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -101,19 +101,6 @@ files = [
 [package.extras]
 colors = ["colorama (>=0.4.6)"]
 
-[[package]]
-name = "kiwi-scp-core"
-version = "0.1.0"
-description = ""
-optional = false
-python-versions = "^3.9"
-files = []
-develop = true
-
-[package.source]
-type = "directory"
-url = "core"
-
 [[package]]
 name = "mccabe"
 version = "0.7.0"
@@ -221,4 +208,4 @@ files = [
 [metadata]
 lock-version = "2.0"
 python-versions = "^3.9"
-content-hash = "ff1c6b410532cfb62184d0527821f3a2f5c5ac90e9eab8d9b6023e053921951e"
+content-hash = "4a9120abe8e3e31f72c4a2554d20acded5c1da5a81d3169bbd6ec50b45dd16cb"
diff --git a/pyproject.toml b/pyproject.toml
index b852075..d870c03 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,19 +1,14 @@
 [tool.poetry]
-name = "kiwi-scp"
-version = "0.3.0"
-description = "kiwi is the simple tool for managing container servers."
+name = "kiwi-scp-core"
+version = "0.1.0"
+description = ""
 license = "MIT"
 authors = ["Jörn-Michael Miehe <40151420+ldericher@users.noreply.github.com>"]
 maintainers = []
-readme = "README.md"
 
 [tool.poetry.dependencies]
-kiwi-scp-core = {path="core", develop=true}
 python = "^3.9"
 
-[tool.poetry.scripts]
-kiwi = "kiwi_scp.main:main"
-
 [tool.poetry.group.dev.dependencies]
 black = "^24.4.2"
 flake8 = "^7.0.0"
diff --git a/core/src/kiwi_scp_core/lib.py b/src/kiwi_scp_core/lib.py
similarity index 100%
rename from core/src/kiwi_scp_core/lib.py
rename to src/kiwi_scp_core/lib.py