diff --git a/lib/cmd/argbash/README.md b/cmd/argbash/README.md
similarity index 100%
rename from lib/cmd/argbash/README.md
rename to cmd/argbash/README.md
diff --git a/lib/cmd/argbash/argbash-refresh.sh b/cmd/argbash/argbash-refresh.sh
similarity index 100%
rename from lib/cmd/argbash/argbash-refresh.sh
rename to cmd/argbash/argbash-refresh.sh
diff --git a/lib/cmd/argbash/build.sh b/cmd/argbash/build.sh
similarity index 100%
rename from lib/cmd/argbash/build.sh
rename to cmd/argbash/build.sh
diff --git a/lib/cmd/argbash/clean.sh b/cmd/argbash/clean.sh
similarity index 100%
rename from lib/cmd/argbash/clean.sh
rename to cmd/argbash/clean.sh
diff --git a/lib/cmd/argbash/dep-graph.sh b/cmd/argbash/dep-graph.sh
similarity index 100%
rename from lib/cmd/argbash/dep-graph.sh
rename to cmd/argbash/dep-graph.sh
diff --git a/lib/cmd/argbash/new.sh b/cmd/argbash/new.sh
similarity index 100%
rename from lib/cmd/argbash/new.sh
rename to cmd/argbash/new.sh
diff --git a/lib/cmd/argbash/opt-global.m4 b/cmd/argbash/opt-global.m4
similarity index 100%
rename from lib/cmd/argbash/opt-global.m4
rename to cmd/argbash/opt-global.m4
diff --git a/lib/cmd/argbash/opt-main.sh b/cmd/argbash/opt-main.sh
similarity index 100%
rename from lib/cmd/argbash/opt-main.sh
rename to cmd/argbash/opt-main.sh
diff --git a/lib/cmd/argbash/push.sh b/cmd/argbash/push.sh
similarity index 100%
rename from lib/cmd/argbash/push.sh
rename to cmd/argbash/push.sh
diff --git a/lib/cmd/argbash/update.sh b/cmd/argbash/update.sh
similarity index 100%
rename from lib/cmd/argbash/update.sh
rename to cmd/argbash/update.sh
diff --git a/lib/cmd/build.sh b/cmd/build.sh
similarity index 100%
rename from lib/cmd/build.sh
rename to cmd/build.sh
diff --git a/lib/cmd/clean.sh b/cmd/clean.sh
similarity index 100%
rename from lib/cmd/clean.sh
rename to cmd/clean.sh
diff --git a/lib/cmd/dep-graph.sh b/cmd/dep-graph.sh
similarity index 100%
rename from lib/cmd/dep-graph.sh
rename to cmd/dep-graph.sh
diff --git a/lib/cmd/new.sh b/cmd/new.sh
similarity index 100%
rename from lib/cmd/new.sh
rename to cmd/new.sh
diff --git a/lib/cmd/push.sh b/cmd/push.sh
similarity index 100%
rename from lib/cmd/push.sh
rename to cmd/push.sh
diff --git a/lib/cmd/update.sh b/cmd/update.sh
similarity index 100%
rename from lib/cmd/update.sh
rename to cmd/update.sh
diff --git a/lib/engine/docker.sh b/engine/docker.sh
similarity index 100%
rename from lib/engine/docker.sh
rename to engine/docker.sh
diff --git a/lib/bob-core/Dockerfile.template b/engine/docker/bob-core/Dockerfile.template
similarity index 100%
rename from lib/bob-core/Dockerfile.template
rename to engine/docker/bob-core/Dockerfile.template
diff --git a/lib/bob-core/bashrc.sh b/engine/docker/bob-core/bashrc.sh
similarity index 100%
rename from lib/bob-core/bashrc.sh
rename to engine/docker/bob-core/bashrc.sh
diff --git a/lib/bob-core/build-root.sh b/engine/docker/bob-core/build-root.sh
similarity index 100%
rename from lib/bob-core/build-root.sh
rename to engine/docker/bob-core/build-root.sh
diff --git a/lib/bob-core/etc/portage/make.conf b/engine/docker/bob-core/etc/portage/make.conf
similarity index 100%
rename from lib/bob-core/etc/portage/make.conf
rename to engine/docker/bob-core/etc/portage/make.conf
diff --git a/lib/bob-core/etc/portage/postsync.d/eix b/engine/docker/bob-core/etc/portage/postsync.d/eix
similarity index 100%
rename from lib/bob-core/etc/portage/postsync.d/eix
rename to engine/docker/bob-core/etc/portage/postsync.d/eix
diff --git a/lib/bob-core/etc/portage/repos.conf/gentoo.conf b/engine/docker/bob-core/etc/portage/repos.conf/gentoo.conf
similarity index 100%
rename from lib/bob-core/etc/portage/repos.conf/gentoo.conf
rename to engine/docker/bob-core/etc/portage/repos.conf/gentoo.conf
diff --git a/lib/bob-core/etc/profile.d/portage-defaults.sh b/engine/docker/bob-core/etc/profile.d/portage-defaults.sh
similarity index 100%
rename from lib/bob-core/etc/profile.d/portage-defaults.sh
rename to engine/docker/bob-core/etc/profile.d/portage-defaults.sh
diff --git a/lib/bob-core/portage-git-sync.sh b/engine/docker/bob-core/portage-git-sync.sh
similarity index 100%
rename from lib/bob-core/portage-git-sync.sh
rename to engine/docker/bob-core/portage-git-sync.sh
diff --git a/lib/bob-portage/Dockerfile.template b/engine/docker/bob-portage/Dockerfile.template
similarity index 100%
rename from lib/bob-portage/Dockerfile.template
rename to engine/docker/bob-portage/Dockerfile.template
diff --git a/lib/engine/dummy.sh b/engine/dummy.sh
similarity index 100%
rename from lib/engine/dummy.sh
rename to engine/dummy.sh
diff --git a/lib/template/docker/builder/Dockerfile.template b/template/docker/builder/Dockerfile.template
similarity index 100%
rename from lib/template/docker/builder/Dockerfile.template
rename to template/docker/builder/Dockerfile.template
diff --git a/lib/template/docker/builder/build.conf b/template/docker/builder/build.conf
similarity index 100%
rename from lib/template/docker/builder/build.conf
rename to template/docker/builder/build.conf
diff --git a/lib/template/docker/builder/build_ext.sh b/template/docker/builder/build_ext.sh
similarity index 100%
rename from lib/template/docker/builder/build_ext.sh
rename to template/docker/builder/build_ext.sh
diff --git a/lib/template/docker/builder/build_stage3.sh b/template/docker/builder/build_stage3.sh
similarity index 100%
rename from lib/template/docker/builder/build_stage3.sh
rename to template/docker/builder/build_stage3.sh
diff --git a/lib/template/docker/image/Dockerfile.template b/template/docker/image/Dockerfile.template
similarity index 100%
rename from lib/template/docker/image/Dockerfile.template
rename to template/docker/image/Dockerfile.template
diff --git a/lib/template/docker/image/README.md b/template/docker/image/README.md
similarity index 100%
rename from lib/template/docker/image/README.md
rename to template/docker/image/README.md
diff --git a/lib/template/docker/image/build-test.sh b/template/docker/image/build-test.sh
similarity index 100%
rename from lib/template/docker/image/build-test.sh
rename to template/docker/image/build-test.sh
diff --git a/lib/template/docker/image/build.conf b/template/docker/image/build.conf
similarity index 100%
rename from lib/template/docker/image/build.conf
rename to template/docker/image/build.conf
diff --git a/lib/template/docker/image/build.sh b/template/docker/image/build.sh
similarity index 100%
rename from lib/template/docker/image/build.sh
rename to template/docker/image/build.sh
diff --git a/lib/template/docker/image/docker-healthcheck.sh b/template/docker/image/docker-healthcheck.sh
similarity index 100%
rename from lib/template/docker/image/docker-healthcheck.sh
rename to template/docker/image/docker-healthcheck.sh
diff --git a/lib/template/docker/namespace/.gitignore b/template/docker/namespace/.gitignore
similarity index 100%
rename from lib/template/docker/namespace/.gitignore
rename to template/docker/namespace/.gitignore
diff --git a/lib/template/docker/namespace/README.md b/template/docker/namespace/README.md
similarity index 100%
rename from lib/template/docker/namespace/README.md
rename to template/docker/namespace/README.md
diff --git a/lib/template/docker/namespace/kubler.conf.multi b/template/docker/namespace/kubler.conf.multi
similarity index 100%
rename from lib/template/docker/namespace/kubler.conf.multi
rename to template/docker/namespace/kubler.conf.multi
diff --git a/lib/template/docker/namespace/kubler.conf.single b/template/docker/namespace/kubler.conf.single
similarity index 100%
rename from lib/template/docker/namespace/kubler.conf.single
rename to template/docker/namespace/kubler.conf.single