diff --git a/bahub/.dockerignore b/.dockerignore
similarity index 100%
rename from bahub/.dockerignore
rename to .dockerignore
diff --git a/bahub/.gitignore b/.gitignore
similarity index 100%
rename from bahub/.gitignore
rename to .gitignore
diff --git a/bahub/.rkd/docker/.jobber b/.rkd/docker/.jobber
similarity index 100%
rename from bahub/.rkd/docker/.jobber
rename to .rkd/docker/.jobber
diff --git a/bahub/.rkd/docker/Dockerfile b/.rkd/docker/Dockerfile
similarity index 100%
rename from bahub/.rkd/docker/Dockerfile
rename to .rkd/docker/Dockerfile
diff --git a/bahub/.rkd/docker/entrypoint.sh b/.rkd/docker/entrypoint.sh
similarity index 100%
rename from bahub/.rkd/docker/entrypoint.sh
rename to .rkd/docker/entrypoint.sh
diff --git a/bahub/.rkd/makefile.py b/.rkd/makefile.py
similarity index 100%
rename from bahub/.rkd/makefile.py
rename to .rkd/makefile.py
diff --git a/bahub/Pipfile b/Pipfile
similarity index 100%
rename from bahub/Pipfile
rename to Pipfile
diff --git a/bahub/Pipfile.lock b/Pipfile.lock
similarity index 100%
rename from bahub/Pipfile.lock
rename to Pipfile.lock
diff --git a/bahub/README.md b/README.md
similarity index 100%
rename from bahub/README.md
rename to README.md
diff --git a/bahub/bahub.conf.yaml b/bahub.conf.yaml
similarity index 100%
rename from bahub/bahub.conf.yaml
rename to bahub.conf.yaml
diff --git a/bahub/bahub/__init__.py b/bahub/__init__.py
similarity index 100%
rename from bahub/bahub/__init__.py
rename to bahub/__init__.py
diff --git a/bahub/bahub/__main__.py b/bahub/__main__.py
similarity index 100%
rename from bahub/bahub/__main__.py
rename to bahub/__main__.py
diff --git a/bahub/bahub/adapters/__init__.py b/bahub/adapters/__init__.py
similarity index 100%
rename from bahub/bahub/adapters/__init__.py
rename to bahub/adapters/__init__.py
diff --git a/bahub/bahub/adapters/base.py b/bahub/adapters/base.py
similarity index 100%
rename from bahub/bahub/adapters/base.py
rename to bahub/adapters/base.py
diff --git a/bahub/bahub/adapters/filesystem.py b/bahub/adapters/filesystem.py
similarity index 100%
rename from bahub/bahub/adapters/filesystem.py
rename to bahub/adapters/filesystem.py
diff --git a/bahub/bahub/adapters/mysql.py b/bahub/adapters/mysql.py
similarity index 100%
rename from bahub/bahub/adapters/mysql.py
rename to bahub/adapters/mysql.py
diff --git a/bahub/bahub/adapters/postgres_dump.py.disabled b/bahub/adapters/postgres_dump.py.disabled
similarity index 100%
rename from bahub/bahub/adapters/postgres_dump.py.disabled
rename to bahub/adapters/postgres_dump.py.disabled
diff --git a/bahub/bahub/api.py b/bahub/api.py
similarity index 100%
rename from bahub/bahub/api.py
rename to bahub/api.py
diff --git a/bahub/bahub/bin.py b/bahub/bin.py
similarity index 100%
rename from bahub/bahub/bin.py
rename to bahub/bin.py
diff --git a/bahub/bahub/configurationfactory.py b/bahub/configurationfactory.py
similarity index 100%
rename from bahub/bahub/configurationfactory.py
rename to bahub/configurationfactory.py
diff --git a/bahub/bahub/env.py b/bahub/env.py
similarity index 100%
rename from bahub/bahub/env.py
rename to bahub/env.py
diff --git a/bahub/bahub/errorhandler.py b/bahub/errorhandler.py
similarity index 100%
rename from bahub/bahub/errorhandler.py
rename to bahub/errorhandler.py
diff --git a/bahub/bahub/exception.py b/bahub/exception.py
similarity index 100%
rename from bahub/bahub/exception.py
rename to bahub/exception.py
diff --git a/bahub/bahub/fs.py b/bahub/fs.py
similarity index 100%
rename from bahub/bahub/fs.py
rename to bahub/fs.py
diff --git a/bahub/bahub/importing.py b/bahub/importing.py
similarity index 100%
rename from bahub/bahub/importing.py
rename to bahub/importing.py
diff --git a/bahub/bahub/inputoutput.py b/bahub/inputoutput.py
similarity index 100%
rename from bahub/bahub/inputoutput.py
rename to bahub/inputoutput.py
diff --git a/bahub/bahub/internal/__init__.py b/bahub/internal/__init__.py
similarity index 100%
rename from bahub/bahub/internal/__init__.py
rename to bahub/internal/__init__.py
diff --git a/bahub/bahub/internal/makefile.py b/bahub/internal/makefile.py
similarity index 100%
rename from bahub/bahub/internal/makefile.py
rename to bahub/internal/makefile.py
diff --git a/bahub/bahub/internal/schema/__init__.py b/bahub/internal/schema/__init__.py
similarity index 100%
rename from bahub/bahub/internal/schema/__init__.py
rename to bahub/internal/schema/__init__.py
diff --git a/bahub/bahub/internal/schema/org.riotkit.bahub.json b/bahub/internal/schema/org.riotkit.bahub.json
similarity index 100%
rename from bahub/bahub/internal/schema/org.riotkit.bahub.json
rename to bahub/internal/schema/org.riotkit.bahub.json
diff --git a/bahub/bahub/model.py b/bahub/model.py
similarity index 100%
rename from bahub/bahub/model.py
rename to bahub/model.py
diff --git a/bahub/bahub/notifier.py b/bahub/notifier.py
similarity index 100%
rename from bahub/bahub/notifier.py
rename to bahub/notifier.py
diff --git a/bahub/bahub/response.py b/bahub/response.py
similarity index 100%
rename from bahub/bahub/response.py
rename to bahub/response.py
diff --git a/bahub/bahub/schema.py b/bahub/schema.py
similarity index 100%
rename from bahub/bahub/schema.py
rename to bahub/schema.py
diff --git a/bahub/bahub/security.py b/bahub/security.py
similarity index 100%
rename from bahub/bahub/security.py
rename to bahub/security.py
diff --git a/bahub/bahub/settings.py b/bahub/settings.py
similarity index 100%
rename from bahub/bahub/settings.py
rename to bahub/settings.py
diff --git a/bahub/bahub/tasks/__init__.py b/bahub/tasks/__init__.py
similarity index 100%
rename from bahub/bahub/tasks/__init__.py
rename to bahub/tasks/__init__.py
diff --git a/bahub/bahub/tasks/base.py b/bahub/tasks/base.py
similarity index 100%
rename from bahub/bahub/tasks/base.py
rename to bahub/tasks/base.py
diff --git a/bahub/bahub/tasks/docs.py b/bahub/tasks/docs.py
similarity index 100%
rename from bahub/bahub/tasks/docs.py
rename to bahub/tasks/docs.py
diff --git a/bahub/bahub/tasks/prepare.py b/bahub/tasks/prepare.py
similarity index 100%
rename from bahub/bahub/tasks/prepare.py
rename to bahub/tasks/prepare.py
diff --git a/bahub/bahub/tasks/restore.py b/bahub/tasks/restore.py
similarity index 100%
rename from bahub/bahub/tasks/restore.py
rename to bahub/tasks/restore.py
diff --git a/bahub/bahub/transports/__init__.py b/bahub/transports/__init__.py
similarity index 100%
rename from bahub/bahub/transports/__init__.py
rename to bahub/transports/__init__.py
diff --git a/bahub/bahub/transports/all.py b/bahub/transports/all.py
similarity index 100%
rename from bahub/bahub/transports/all.py
rename to bahub/transports/all.py
diff --git a/bahub/bahub/transports/base.py b/bahub/transports/base.py
similarity index 100%
rename from bahub/bahub/transports/base.py
rename to bahub/transports/base.py
diff --git a/bahub/bahub/transports/docker.py b/bahub/transports/docker.py
similarity index 100%
rename from bahub/bahub/transports/docker.py
rename to bahub/transports/docker.py
diff --git a/bahub/bahub/transports/kubernetes.py b/bahub/transports/kubernetes.py
similarity index 100%
rename from bahub/bahub/transports/kubernetes.py
rename to bahub/transports/kubernetes.py
diff --git a/bahub/bahub/transports/kubernetespodexec.py b/bahub/transports/kubernetespodexec.py
similarity index 100%
rename from bahub/bahub/transports/kubernetespodexec.py
rename to bahub/transports/kubernetespodexec.py
diff --git a/bahub/bahub/transports/sh.py b/bahub/transports/sh.py
similarity index 100%
rename from bahub/bahub/transports/sh.py
rename to bahub/transports/sh.py
diff --git a/bahub/bahub/transports/sidedocker.py b/bahub/transports/sidedocker.py
similarity index 100%
rename from bahub/bahub/transports/sidedocker.py
rename to bahub/transports/sidedocker.py
diff --git a/bahub/bahub/versions.py b/bahub/versions.py
similarity index 100%
rename from bahub/bahub/versions.py
rename to bahub/versions.py
diff --git a/bahub/docs/backup-controller.svg b/docs/backup-controller.svg
similarity index 100%
rename from bahub/docs/backup-controller.svg
rename to docs/backup-controller.svg
diff --git a/bahub/requirements-dev.txt b/requirements-dev.txt
similarity index 100%
rename from bahub/requirements-dev.txt
rename to requirements-dev.txt
diff --git a/bahub/requirements.txt b/requirements.txt
similarity index 100%
rename from bahub/requirements.txt
rename to requirements.txt
diff --git a/bahub/setup.cfg b/setup.cfg
similarity index 100%
rename from bahub/setup.cfg
rename to setup.cfg
diff --git a/bahub/setup.py b/setup.py
similarity index 100%
rename from bahub/setup.py
rename to setup.py
diff --git a/bahub/test/env/config_factory_test/bahub.test.conf.yaml b/test/env/config_factory_test/bahub.test.conf.yaml
similarity index 100%
rename from bahub/test/env/config_factory_test/bahub.test.conf.yaml
rename to test/env/config_factory_test/bahub.test.conf.yaml
diff --git a/bahub/test/test_configurationfactory.py b/test/test_configurationfactory.py
similarity index 100%
rename from bahub/test/test_configurationfactory.py
rename to test/test_configurationfactory.py
diff --git a/bahub/test/test_encryption.py b/test/test_encryption.py
similarity index 100%
rename from bahub/test/test_encryption.py
rename to test/test_encryption.py
diff --git a/bahub/test/test_importing.py b/test/test_importing.py
similarity index 100%
rename from bahub/test/test_importing.py
rename to test/test_importing.py
diff --git a/bahub/test/test_inputoutput.py b/test/test_inputoutput.py
similarity index 100%
rename from bahub/test/test_inputoutput.py
rename to test/test_inputoutput.py
diff --git a/bahub/test/test_schema.py b/test/test_schema.py
similarity index 100%
rename from bahub/test/test_schema.py
rename to test/test_schema.py
diff --git a/bahub/test/test_security.py b/test/test_security.py
similarity index 100%
rename from bahub/test/test_security.py
rename to test/test_security.py
diff --git a/bahub/test/test_transports_docker.py b/test/test_transports_docker.py
similarity index 100%
rename from bahub/test/test_transports_docker.py
rename to test/test_transports_docker.py
diff --git a/bahub/test/test_transports_sh.py b/test/test_transports_sh.py
similarity index 100%
rename from bahub/test/test_transports_sh.py
rename to test/test_transports_sh.py
diff --git a/bahub/test/test_transports_temporarydocker.py b/test/test_transports_temporarydocker.py
similarity index 100%
rename from bahub/test/test_transports_temporarydocker.py
rename to test/test_transports_temporarydocker.py