diff --git a/README.md b/README.md
index 79cf26ef..08321939 100644
--- a/README.md
+++ b/README.md
@@ -4,6 +4,18 @@ This package deploys Postfix and Dovecot servers, including OpenDKIM for DKIM si
 
 Postfix uses Dovecot for authentication as described in <https://www.postfix.org/SASL_README.html#server_dovecot>
 
+## Getting started 
+
+prepare:
+
+    pip install -e chatmail-infra
+
+
+then run with pyinfra command line tool: 
+
+    CHATMAIL_DOMAIN=c1.testrun.org pyinfra --ssh-user root c1.testrun.org deploy.py
+
+
 ## Structure (wip)
 
 ```
@@ -12,7 +24,7 @@ Postfix uses Dovecot for authentication as described in <https://www.postfix.org
 deploy.py 
 
 # chatmail pyinfra deploy package 
-pyinfra-src
+chatmail-pyinfra 
     pyproject.toml
     chatmail/__init__ ...
 
@@ -20,7 +32,7 @@ pyinfra-src
     tests/test_online_test.py
 
 # doveauth tool used by dovecot's auth mechanism on the host system 
-doveauth-src 
+doveauth
     README.md
     pyproject.toml
     doveauth.py
@@ -28,7 +40,9 @@ doveauth-src
     test_doveauth.py
 ```
 
-## Ports
+## Dovecot/Postfix configuration
+
+### Ports
 
 Postfix listens on ports 25 (smtp) and 587 (submission) and 465 (submissions).
 Dovecot listens on ports 143(imap) and 993 (imaps).
@@ -36,9 +50,3 @@ Dovecot listens on ports 143(imap) and 993 (imaps).
 ## DNS
 
 For DKIM you must add a DNS entry as in /etc/opendkim/selector.txt (where selector is the opendkim_selector configured in the chatmail inventory).
-
-## Run with pyinfra
-
-```
-CHATMAIL_DOMAIN=c1.testrun.org pyinfra --ssh-user root c1.testrun.org deploy.py
-```
diff --git a/pyproject.toml b/chatmail-pyinfra/pyproject.toml
similarity index 100%
rename from pyproject.toml
rename to chatmail-pyinfra/pyproject.toml
diff --git a/src/chatmail/__init__.py b/chatmail-pyinfra/src/chatmail/__init__.py
similarity index 100%
rename from src/chatmail/__init__.py
rename to chatmail-pyinfra/src/chatmail/__init__.py
diff --git a/src/chatmail/acmetool/__init__.py b/chatmail-pyinfra/src/chatmail/acmetool/__init__.py
similarity index 100%
rename from src/chatmail/acmetool/__init__.py
rename to chatmail-pyinfra/src/chatmail/acmetool/__init__.py
diff --git a/src/chatmail/acmetool/acmetool-redirector.service b/chatmail-pyinfra/src/chatmail/acmetool/acmetool-redirector.service
similarity index 100%
rename from src/chatmail/acmetool/acmetool-redirector.service
rename to chatmail-pyinfra/src/chatmail/acmetool/acmetool-redirector.service
diff --git a/src/chatmail/acmetool/acmetool.cron b/chatmail-pyinfra/src/chatmail/acmetool/acmetool.cron
similarity index 100%
rename from src/chatmail/acmetool/acmetool.cron
rename to chatmail-pyinfra/src/chatmail/acmetool/acmetool.cron
diff --git a/src/chatmail/acmetool/acmetool.hook b/chatmail-pyinfra/src/chatmail/acmetool/acmetool.hook
similarity index 100%
rename from src/chatmail/acmetool/acmetool.hook
rename to chatmail-pyinfra/src/chatmail/acmetool/acmetool.hook
diff --git a/src/chatmail/acmetool/response-file.yaml.j2 b/chatmail-pyinfra/src/chatmail/acmetool/response-file.yaml.j2
similarity index 100%
rename from src/chatmail/acmetool/response-file.yaml.j2
rename to chatmail-pyinfra/src/chatmail/acmetool/response-file.yaml.j2
diff --git a/src/chatmail/dovecot/doveauth.lua b/chatmail-pyinfra/src/chatmail/dovecot/doveauth.lua
similarity index 100%
rename from src/chatmail/dovecot/doveauth.lua
rename to chatmail-pyinfra/src/chatmail/dovecot/doveauth.lua
diff --git a/src/chatmail/dovecot/doveauth.py b/chatmail-pyinfra/src/chatmail/dovecot/doveauth.py
similarity index 100%
rename from src/chatmail/dovecot/doveauth.py
rename to chatmail-pyinfra/src/chatmail/dovecot/doveauth.py
diff --git a/src/chatmail/dovecot/dovecot.conf.j2 b/chatmail-pyinfra/src/chatmail/dovecot/dovecot.conf.j2
similarity index 100%
rename from src/chatmail/dovecot/dovecot.conf.j2
rename to chatmail-pyinfra/src/chatmail/dovecot/dovecot.conf.j2
diff --git a/src/chatmail/dovecot/test_doveauth.lua b/chatmail-pyinfra/src/chatmail/dovecot/test_doveauth.lua
similarity index 100%
rename from src/chatmail/dovecot/test_doveauth.lua
rename to chatmail-pyinfra/src/chatmail/dovecot/test_doveauth.lua
diff --git a/src/chatmail/dovecot/test_doveauth.py b/chatmail-pyinfra/src/chatmail/dovecot/test_doveauth.py
similarity index 100%
rename from src/chatmail/dovecot/test_doveauth.py
rename to chatmail-pyinfra/src/chatmail/dovecot/test_doveauth.py
diff --git a/src/chatmail/opendkim/opendkim.conf b/chatmail-pyinfra/src/chatmail/opendkim/opendkim.conf
similarity index 100%
rename from src/chatmail/opendkim/opendkim.conf
rename to chatmail-pyinfra/src/chatmail/opendkim/opendkim.conf
diff --git a/src/chatmail/postfix/main.cf.j2 b/chatmail-pyinfra/src/chatmail/postfix/main.cf.j2
similarity index 100%
rename from src/chatmail/postfix/main.cf.j2
rename to chatmail-pyinfra/src/chatmail/postfix/main.cf.j2
diff --git a/src/chatmail/postfix/master.cf b/chatmail-pyinfra/src/chatmail/postfix/master.cf
similarity index 100%
rename from src/chatmail/postfix/master.cf
rename to chatmail-pyinfra/src/chatmail/postfix/master.cf
diff --git a/tests/test_online_login.py b/chatmail-pyinfra/tests/test_online_login.py
similarity index 100%
rename from tests/test_online_login.py
rename to chatmail-pyinfra/tests/test_online_login.py
diff --git a/scripts/init.sh b/scripts/init.sh
index ba741b97..c8ec47fc 100755
--- a/scripts/init.sh
+++ b/scripts/init.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 python3 -m venv venv
 venv/bin/pip install pyinfra
-venv/bin/pip install -e .
+venv/bin/pip install -e chatmail-pyinfra