diff --git a/.gitignore b/.gitignore
index 5dd71aa..f5d6e64 100644
--- a/.gitignore
+++ b/.gitignore
@@ -266,3 +266,4 @@ tags
 # Custom rules (everything added below won't be overriden by 'Generate .gitignore File' if you use 'Update' option)
 main.py
 hsman/.flaskenv
+hsman/docker.env
diff --git a/hsapi/LICENSE b/hsapi-client/LICENSE
similarity index 100%
rename from hsapi/LICENSE
rename to hsapi-client/LICENSE
diff --git a/hsapi/README.md b/hsapi-client/README.md
similarity index 100%
rename from hsapi/README.md
rename to hsapi-client/README.md
diff --git a/hsapi/headscale.openapi.json b/hsapi-client/headscale.openapi.json
similarity index 100%
rename from hsapi/headscale.openapi.json
rename to hsapi-client/headscale.openapi.json
diff --git a/hsapi/hsapi/__init__.py b/hsapi-client/hsapi_client/__init__.py
similarity index 100%
rename from hsapi/hsapi/__init__.py
rename to hsapi-client/hsapi_client/__init__.py
diff --git a/hsapi/hsapi/apikeys.py b/hsapi-client/hsapi_client/apikeys.py
similarity index 100%
rename from hsapi/hsapi/apikeys.py
rename to hsapi-client/hsapi_client/apikeys.py
diff --git a/hsapi/hsapi/config.py b/hsapi-client/hsapi_client/config.py
similarity index 100%
rename from hsapi/hsapi/config.py
rename to hsapi-client/hsapi_client/config.py
diff --git a/hsapi/hsapi/model.py b/hsapi-client/hsapi_client/model.py
similarity index 100%
rename from hsapi/hsapi/model.py
rename to hsapi-client/hsapi_client/model.py
diff --git a/hsapi/hsapi/nodes.py b/hsapi-client/hsapi_client/nodes.py
similarity index 100%
rename from hsapi/hsapi/nodes.py
rename to hsapi-client/hsapi_client/nodes.py
diff --git a/hsapi/hsapi/preauthkeys.py b/hsapi-client/hsapi_client/preauthkeys.py
similarity index 100%
rename from hsapi/hsapi/preauthkeys.py
rename to hsapi-client/hsapi_client/preauthkeys.py
diff --git a/hsapi/hsapi/routes.py b/hsapi-client/hsapi_client/routes.py
similarity index 100%
rename from hsapi/hsapi/routes.py
rename to hsapi-client/hsapi_client/routes.py
diff --git a/hsapi/hsapi/schemas.py b/hsapi-client/hsapi_client/schemas.py
similarity index 100%
rename from hsapi/hsapi/schemas.py
rename to hsapi-client/hsapi_client/schemas.py
diff --git a/hsapi/hsapi/users.py b/hsapi-client/hsapi_client/users.py
similarity index 100%
rename from hsapi/hsapi/users.py
rename to hsapi-client/hsapi_client/users.py
diff --git a/hsapi/poetry.lock b/hsapi-client/poetry.lock
similarity index 100%
rename from hsapi/poetry.lock
rename to hsapi-client/poetry.lock
diff --git a/hsapi/pyproject.toml b/hsapi-client/pyproject.toml
similarity index 95%
rename from hsapi/pyproject.toml
rename to hsapi-client/pyproject.toml
index 1c235fa..9b361f5 100644
--- a/hsapi/pyproject.toml
+++ b/hsapi-client/pyproject.toml
@@ -1,5 +1,5 @@
 [tool.poetry]
-name = "hsapi"
+name = "hsapi-client"
 version = "0.9.0"
 description = "Headscale API client"
 authors = ["Andrea Mistrali <andrea@mistrali.pw>"]