diff --git a/kopano_base/Dockerfile b/base/Dockerfile
similarity index 100%
rename from kopano_base/Dockerfile
rename to base/Dockerfile
diff --git a/kopano_base/README.md b/base/README.md
similarity index 100%
rename from kopano_base/README.md
rename to base/README.md
diff --git a/kopano_base/kcconf.py b/base/kcconf.py
similarity index 100%
rename from kopano_base/kcconf.py
rename to base/kcconf.py
diff --git a/kopano_dagent/Dockerfile b/dagent/Dockerfile
similarity index 100%
rename from kopano_dagent/Dockerfile
rename to dagent/Dockerfile
diff --git a/kopano_dagent/configure.py b/dagent/configure.py
similarity index 100%
rename from kopano_dagent/configure.py
rename to dagent/configure.py
diff --git a/kopano_dagent/start.sh b/dagent/start.sh
similarity index 100%
rename from kopano_dagent/start.sh
rename to dagent/start.sh
diff --git a/kopano_gateway/Dockerfile b/gateway/Dockerfile
similarity index 100%
rename from kopano_gateway/Dockerfile
rename to gateway/Dockerfile
diff --git a/kopano_gateway/configure.py b/gateway/configure.py
similarity index 100%
rename from kopano_gateway/configure.py
rename to gateway/configure.py
diff --git a/kopano_gateway/start.sh b/gateway/start.sh
similarity index 100%
rename from kopano_gateway/start.sh
rename to gateway/start.sh
diff --git a/kopano_ical/Dockerfile b/ical/Dockerfile
similarity index 100%
rename from kopano_ical/Dockerfile
rename to ical/Dockerfile
diff --git a/kopano_ical/configure.py b/ical/configure.py
similarity index 100%
rename from kopano_ical/configure.py
rename to ical/configure.py
diff --git a/kopano_ical/start.sh b/ical/start.sh
similarity index 100%
rename from kopano_ical/start.sh
rename to ical/start.sh
diff --git a/kopano_monitor/Dockerfile b/monitor/Dockerfile
similarity index 100%
rename from kopano_monitor/Dockerfile
rename to monitor/Dockerfile
diff --git a/kopano_monitor/configure.py b/monitor/configure.py
similarity index 100%
rename from kopano_monitor/configure.py
rename to monitor/configure.py
diff --git a/kopano_monitor/start.sh b/monitor/start.sh
similarity index 100%
rename from kopano_monitor/start.sh
rename to monitor/start.sh
diff --git a/kopano_search/Dockerfile b/search/Dockerfile
similarity index 100%
rename from kopano_search/Dockerfile
rename to search/Dockerfile
diff --git a/kopano_search/configure.py b/search/configure.py
similarity index 100%
rename from kopano_search/configure.py
rename to search/configure.py
diff --git a/kopano_search/start.sh b/search/start.sh
similarity index 100%
rename from kopano_search/start.sh
rename to search/start.sh
diff --git a/kopano_server/Dockerfile b/server/Dockerfile
similarity index 100%
rename from kopano_server/Dockerfile
rename to server/Dockerfile
diff --git a/kopano_server/README.md b/server/README.md
similarity index 100%
rename from kopano_server/README.md
rename to server/README.md
diff --git a/kopano_server/configure.py b/server/configure.py
similarity index 100%
rename from kopano_server/configure.py
rename to server/configure.py
diff --git a/kopano_server/start.sh b/server/start.sh
similarity index 100%
rename from kopano_server/start.sh
rename to server/start.sh
diff --git a/kopano_spooler/Dockerfile b/spooler/Dockerfile
similarity index 100%
rename from kopano_spooler/Dockerfile
rename to spooler/Dockerfile
diff --git a/kopano_spooler/configure.py b/spooler/configure.py
similarity index 100%
rename from kopano_spooler/configure.py
rename to spooler/configure.py
diff --git a/kopano_spooler/start.sh b/spooler/start.sh
similarity index 100%
rename from kopano_spooler/start.sh
rename to spooler/start.sh
diff --git a/kopano_ssl/Dockerfile b/ssl/Dockerfile
similarity index 100%
rename from kopano_ssl/Dockerfile
rename to ssl/Dockerfile
diff --git a/kopano_ssl/gencerts.sh b/ssl/gencerts.sh
similarity index 100%
rename from kopano_ssl/gencerts.sh
rename to ssl/gencerts.sh
diff --git a/kopano_ssl/start.sh b/ssl/start.sh
similarity index 100%
rename from kopano_ssl/start.sh
rename to ssl/start.sh
diff --git a/kopano_webapp/Dockerfile b/webapp/Dockerfile
similarity index 100%
rename from kopano_webapp/Dockerfile
rename to webapp/Dockerfile
diff --git a/kopano_webapp/apache2-kopano.conf b/webapp/apache2-kopano.conf
similarity index 100%
rename from kopano_webapp/apache2-kopano.conf
rename to webapp/apache2-kopano.conf
diff --git a/kopano_webapp/start.sh b/webapp/start.sh
similarity index 100%
rename from kopano_webapp/start.sh
rename to webapp/start.sh
diff --git a/kopano_webapp/z-push-GPG.key b/webapp/z-push-GPG.key
similarity index 100%
rename from kopano_webapp/z-push-GPG.key
rename to webapp/z-push-GPG.key