diff --git a/Makefile b/Makefile
index 125b41ce..23f38493 100644
--- a/Makefile
+++ b/Makefile
@@ -8,13 +8,13 @@ install:
 
 install-dev:
 	# install core
-	pip install -e core;poetry install -C core --only dev --no-root
+	pip install -e core && poetry install -C core --only dev --no-root
 	# install services
 	@for f in $(shell ls ${SERVICES_DIR}); do pip install -e ${SERVICES_DIR}/$${f};poetry install -C ${SERVICES_DIR}/$${f} --only dev --no-root; done
 
 test:
 	# test core
-	cd core; pytest; cd ..;
+	cd core && pytest && cd ..
 	# test services
 	@for f in $(shell ls ${SERVICES_DIR}); do  set -e; cd ${SERVICES_DIR}/$${f}; sh -c 'pytest || ([ $$? = 5 ] && exit 0 || exit $$?)'; cd ../..; done
 
diff --git a/core/src/core/__init__.py b/core/src/stackit/core/__init__.py
similarity index 100%
rename from core/src/core/__init__.py
rename to core/src/stackit/core/__init__.py
diff --git a/core/src/core/auth_methods/key_auth.py b/core/src/stackit/core/auth_methods/key_auth.py
similarity index 100%
rename from core/src/core/auth_methods/key_auth.py
rename to core/src/stackit/core/auth_methods/key_auth.py
diff --git a/core/src/core/auth_methods/token_auth.py b/core/src/stackit/core/auth_methods/token_auth.py
similarity index 100%
rename from core/src/core/auth_methods/token_auth.py
rename to core/src/stackit/core/auth_methods/token_auth.py
diff --git a/core/src/core/authorization.py b/core/src/stackit/core/authorization.py
similarity index 100%
rename from core/src/core/authorization.py
rename to core/src/stackit/core/authorization.py
diff --git a/core/src/core/configuration.py b/core/src/stackit/core/configuration.py
similarity index 100%
rename from core/src/core/configuration.py
rename to core/src/stackit/core/configuration.py