diff --git a/bin/dib-lint b/bin/dib-lint index f75c1ccd6..b54f5921c 100755 --- a/bin/dib-lint +++ b/bin/dib-lint @@ -21,6 +21,8 @@ set -eu set -o pipefail +ELEMENTS_DIR=diskimage_builder/elements + parse_exclusions() { # Per-file exclusions # Example: # dib-lint: disable=sete setpipefail @@ -63,7 +65,7 @@ echo "Running dib-lint in $(pwd)" rc=0 TMPDIR=$(mktemp -d /tmp/tmp.XXXXXXXXXX) trap "rm -rf $TMPDIR" EXIT -for i in $(find elements -type f \ +for i in $(find $ELEMENTS_DIR -type f \ -not -name \*~ \ -not -name \#\*\# \ -not -name \*.orig \ @@ -180,7 +182,7 @@ done echo "Checking indents..." -for i in $(find elements -type f -and -name '*.rst' -or -type f -executable); do +for i in $(find $ELEMENTS_DIR -type f -and -name '*.rst' -or -type f -executable); do # Check for tab indentation if ! excluded tabindent; then if grep -q $'^ *\t' ${i}; then @@ -196,14 +198,14 @@ for i in $(find elements -type f -and -name '*.rst' -or -type f -executable); do done if ! excluded mddocs; then - md_docs=$(find elements -name '*.md') + md_docs=$(find $ELEMENTS_DIR -name '*.md') if [ -n "$md_docs" ]; then error ".md docs found: $md_docs" fi fi echo "Checking YAML parsing..." -for i in $(find elements -type f -name '*.yaml'); do +for i in $(find $ELEMENTS_DIR -type f -name '*.yaml'); do echo "Parsing $i" py_check=" import yaml @@ -218,7 +220,7 @@ except yaml.parser.ParserError: fi done echo "Checking pkg-map files..." -for i in $(find elements -type f \ +for i in $(find $ELEMENTS_DIR -type f \ -name 'pkg-map' -a \! -executable); do echo "Parsing $i" py_check=" diff --git a/bin/disk-image-create b/bin/disk-image-create index 7afd5fcc5..086c04242 100755 --- a/bin/disk-image-create +++ b/bin/disk-image-create @@ -26,69 +26,14 @@ export DIB_ENV=$(export | grep ' DIB_.*=') SCRIPTNAME=$(basename $0) -# this is a bit tricky to handle the case of being installed with "pip -# -e" (i.e. setuptools develop mode) and a regular install -# -# When installed normally, the scripts are installed into /usr/bin/ -# and the other bits specified in "data_files" into -# /usr/share/diskimage-builder/[elements|lib|scripts] (if you're in a -# virtualenv, modulo all this with the right prefix-paths) -# -# When installed with -e, the scripts will still be installed into -# /usr/bin, but the data_files will *not* be installed. Because the -# "diskimage_builder" python module will be linked to the source repo -# (that's the idea of develop mode) what we can do is assume the -# following: -# -# - if the python module directory has a "bin" directory, then it must -# be the source repo and hence we have been installed via develop -# mode. Thus setup ourselves to use the scripts from the source -# repo. -# -# - otherwise, try to find libraires and elements have been installed -# into the system paths via a "normal" pip install -# -# - lastly, we might be running completely uninstalled. -# XXX : this might cause problems at some point; we might need to "cd" -# so python can find things, or use pip -e. -# -# This means if you want to develop your elements, then "pip -e" is -# the way to go ... your disk-image-create runs will be referencing -# the scripts from the editable source repo. But note that changes to -# anything in bin/ will *not* be applied; those files have been -# statically copied in during install. You'll need to iterate with -# another run of "pip install -e" if you're actually working on those -# bin/* scripts. +export _LIB=$(python -c ' +import diskimage_builder.paths +diskimage_builder.paths.get_path("lib")') -export SCRIPT_HOME=$(dirname $(readlink -f $0)) +_BASE_ELEMENT_DIR=$(python -c ' +import diskimage_builder.paths +diskimage_builder.paths.get_path("elements")') -_DIB_PYTHON_INSTALL=$(python -c ' - -import inspect -import os -import sys - -# this can fail if we are being run with pwd outside the source -# directory *and* have not been installed -try: - import diskimage_builder -except ImportError: - sys.exit(0) - -print(os.path.dirname(inspect.getfile(diskimage_builder)))') - -if [ -n "$_DIB_PYTHON_INSTALL" -a -d $_DIB_PYTHON_INSTALL/../bin ]; then - # we have been installed with "pip -e" - export SCRIPT_HOME=$_DIB_PYTHON_INSTALL/../bin - export _PREFIX=$SCRIPT_HOME/.. -elif [ -d $SCRIPT_HOME/../share/diskimage-builder ]; then - # we have been installed in /usr - export _PREFIX=$SCRIPT_HOME/../share/diskimage-builder -else - # we have not been installed in any way - export _PREFIX=$SCRIPT_HOME/.. -fi -export _LIB=$_PREFIX/lib source $_LIB/die IS_RAMDISK=0 diff --git a/elements/apt-conf/README.rst b/diskimage_builder/elements/apt-conf/README.rst similarity index 100% rename from elements/apt-conf/README.rst rename to diskimage_builder/elements/apt-conf/README.rst diff --git a/elements/apt-conf/extra-data.d/99-override-default-apt-conf b/diskimage_builder/elements/apt-conf/extra-data.d/99-override-default-apt-conf similarity index 100% rename from elements/apt-conf/extra-data.d/99-override-default-apt-conf rename to diskimage_builder/elements/apt-conf/extra-data.d/99-override-default-apt-conf diff --git a/elements/apt-preferences/README.rst b/diskimage_builder/elements/apt-preferences/README.rst similarity index 100% rename from elements/apt-preferences/README.rst rename to diskimage_builder/elements/apt-preferences/README.rst diff --git a/elements/apt-preferences/extra-data.d/99-set-apt-package-pins b/diskimage_builder/elements/apt-preferences/extra-data.d/99-set-apt-package-pins similarity index 100% rename from elements/apt-preferences/extra-data.d/99-set-apt-package-pins rename to diskimage_builder/elements/apt-preferences/extra-data.d/99-set-apt-package-pins diff --git a/elements/apt-sources/README.rst b/diskimage_builder/elements/apt-sources/README.rst similarity index 100% rename from elements/apt-sources/README.rst rename to diskimage_builder/elements/apt-sources/README.rst diff --git a/elements/apt-sources/extra-data.d/99-override-default-apt-sources b/diskimage_builder/elements/apt-sources/extra-data.d/99-override-default-apt-sources similarity index 100% rename from elements/apt-sources/extra-data.d/99-override-default-apt-sources rename to diskimage_builder/elements/apt-sources/extra-data.d/99-override-default-apt-sources diff --git a/elements/apt-sources/test-elements/test-sources/element-deps b/diskimage_builder/elements/apt-sources/test-elements/test-sources/element-deps similarity index 100% rename from elements/apt-sources/test-elements/test-sources/element-deps rename to diskimage_builder/elements/apt-sources/test-elements/test-sources/element-deps diff --git a/elements/apt-sources/test-elements/test-sources/environment.d/00-set-apt-sources b/diskimage_builder/elements/apt-sources/test-elements/test-sources/environment.d/00-set-apt-sources similarity index 100% rename from elements/apt-sources/test-elements/test-sources/environment.d/00-set-apt-sources rename to diskimage_builder/elements/apt-sources/test-elements/test-sources/environment.d/00-set-apt-sources diff --git a/elements/apt-sources/test-elements/test-sources/extra-data.d/00-write-apt-sources b/diskimage_builder/elements/apt-sources/test-elements/test-sources/extra-data.d/00-write-apt-sources similarity index 100% rename from elements/apt-sources/test-elements/test-sources/extra-data.d/00-write-apt-sources rename to diskimage_builder/elements/apt-sources/test-elements/test-sources/extra-data.d/00-write-apt-sources diff --git a/elements/apt-sources/test-elements/test-sources/pre-install.d/00-test-apt-sources b/diskimage_builder/elements/apt-sources/test-elements/test-sources/pre-install.d/00-test-apt-sources similarity index 100% rename from elements/apt-sources/test-elements/test-sources/pre-install.d/00-test-apt-sources rename to diskimage_builder/elements/apt-sources/test-elements/test-sources/pre-install.d/00-test-apt-sources diff --git a/elements/architecture-emulation-binaries/README.rst b/diskimage_builder/elements/architecture-emulation-binaries/README.rst similarity index 100% rename from elements/architecture-emulation-binaries/README.rst rename to diskimage_builder/elements/architecture-emulation-binaries/README.rst diff --git a/elements/architecture-emulation-binaries/cleanup.d/01-cleanbinary b/diskimage_builder/elements/architecture-emulation-binaries/cleanup.d/01-cleanbinary similarity index 100% rename from elements/architecture-emulation-binaries/cleanup.d/01-cleanbinary rename to diskimage_builder/elements/architecture-emulation-binaries/cleanup.d/01-cleanbinary diff --git a/elements/architecture-emulation-binaries/extra-data.d/01-copy-binary b/diskimage_builder/elements/architecture-emulation-binaries/extra-data.d/01-copy-binary similarity index 100% rename from elements/architecture-emulation-binaries/extra-data.d/01-copy-binary rename to diskimage_builder/elements/architecture-emulation-binaries/extra-data.d/01-copy-binary diff --git a/elements/baremetal/README.rst b/diskimage_builder/elements/baremetal/README.rst similarity index 100% rename from elements/baremetal/README.rst rename to diskimage_builder/elements/baremetal/README.rst diff --git a/elements/baremetal/cleanup.d/99-extract-kernel-and-ramdisk b/diskimage_builder/elements/baremetal/cleanup.d/99-extract-kernel-and-ramdisk similarity index 100% rename from elements/baremetal/cleanup.d/99-extract-kernel-and-ramdisk rename to diskimage_builder/elements/baremetal/cleanup.d/99-extract-kernel-and-ramdisk diff --git a/elements/base/README.rst b/diskimage_builder/elements/base/README.rst similarity index 100% rename from elements/base/README.rst rename to diskimage_builder/elements/base/README.rst diff --git a/elements/base/cleanup.d/01-ccache b/diskimage_builder/elements/base/cleanup.d/01-ccache similarity index 100% rename from elements/base/cleanup.d/01-ccache rename to diskimage_builder/elements/base/cleanup.d/01-ccache diff --git a/elements/base/cleanup.d/99-tidy-logs b/diskimage_builder/elements/base/cleanup.d/99-tidy-logs similarity index 100% rename from elements/base/cleanup.d/99-tidy-logs rename to diskimage_builder/elements/base/cleanup.d/99-tidy-logs diff --git a/elements/base/element-deps b/diskimage_builder/elements/base/element-deps similarity index 100% rename from elements/base/element-deps rename to diskimage_builder/elements/base/element-deps diff --git a/elements/base/environment.d/10-ccache.bash b/diskimage_builder/elements/base/environment.d/10-ccache.bash similarity index 100% rename from elements/base/environment.d/10-ccache.bash rename to diskimage_builder/elements/base/environment.d/10-ccache.bash diff --git a/elements/base/extra-data.d/50-store-build-settings b/diskimage_builder/elements/base/extra-data.d/50-store-build-settings similarity index 100% rename from elements/base/extra-data.d/50-store-build-settings rename to diskimage_builder/elements/base/extra-data.d/50-store-build-settings diff --git a/elements/base/install.d/00-baseline-environment b/diskimage_builder/elements/base/install.d/00-baseline-environment similarity index 100% rename from elements/base/install.d/00-baseline-environment rename to diskimage_builder/elements/base/install.d/00-baseline-environment diff --git a/elements/base/install.d/00-up-to-date b/diskimage_builder/elements/base/install.d/00-up-to-date similarity index 100% rename from elements/base/install.d/00-up-to-date rename to diskimage_builder/elements/base/install.d/00-up-to-date diff --git a/elements/base/install.d/10-cloud-init b/diskimage_builder/elements/base/install.d/10-cloud-init similarity index 100% rename from elements/base/install.d/10-cloud-init rename to diskimage_builder/elements/base/install.d/10-cloud-init diff --git a/elements/base/install.d/50-store-build-settings b/diskimage_builder/elements/base/install.d/50-store-build-settings similarity index 100% rename from elements/base/install.d/50-store-build-settings rename to diskimage_builder/elements/base/install.d/50-store-build-settings diff --git a/elements/base/install.d/80-disable-rfc3041 b/diskimage_builder/elements/base/install.d/80-disable-rfc3041 similarity index 100% rename from elements/base/install.d/80-disable-rfc3041 rename to diskimage_builder/elements/base/install.d/80-disable-rfc3041 diff --git a/elements/base/package-installs.yaml b/diskimage_builder/elements/base/package-installs.yaml similarity index 100% rename from elements/base/package-installs.yaml rename to diskimage_builder/elements/base/package-installs.yaml diff --git a/elements/base/pkg-map b/diskimage_builder/elements/base/pkg-map similarity index 100% rename from elements/base/pkg-map rename to diskimage_builder/elements/base/pkg-map diff --git a/elements/base/pre-install.d/03-baseline-tools b/diskimage_builder/elements/base/pre-install.d/03-baseline-tools similarity index 100% rename from elements/base/pre-install.d/03-baseline-tools rename to diskimage_builder/elements/base/pre-install.d/03-baseline-tools diff --git a/elements/base/root.d/01-ccache b/diskimage_builder/elements/base/root.d/01-ccache similarity index 100% rename from elements/base/root.d/01-ccache rename to diskimage_builder/elements/base/root.d/01-ccache diff --git a/elements/bootloader/README.rst b/diskimage_builder/elements/bootloader/README.rst similarity index 100% rename from elements/bootloader/README.rst rename to diskimage_builder/elements/bootloader/README.rst diff --git a/elements/bootloader/cleanup.d/51-bootloader b/diskimage_builder/elements/bootloader/cleanup.d/51-bootloader similarity index 100% rename from elements/bootloader/cleanup.d/51-bootloader rename to diskimage_builder/elements/bootloader/cleanup.d/51-bootloader diff --git a/elements/bootloader/finalise.d/50-bootloader b/diskimage_builder/elements/bootloader/finalise.d/50-bootloader similarity index 100% rename from elements/bootloader/finalise.d/50-bootloader rename to diskimage_builder/elements/bootloader/finalise.d/50-bootloader diff --git a/elements/bootloader/pkg-map b/diskimage_builder/elements/bootloader/pkg-map similarity index 100% rename from elements/bootloader/pkg-map rename to diskimage_builder/elements/bootloader/pkg-map diff --git a/elements/cache-url/README.rst b/diskimage_builder/elements/cache-url/README.rst similarity index 100% rename from elements/cache-url/README.rst rename to diskimage_builder/elements/cache-url/README.rst diff --git a/elements/cache-url/__init__.py b/diskimage_builder/elements/cache-url/__init__.py similarity index 100% rename from elements/cache-url/__init__.py rename to diskimage_builder/elements/cache-url/__init__.py diff --git a/elements/cache-url/bin/cache-url b/diskimage_builder/elements/cache-url/bin/cache-url similarity index 100% rename from elements/cache-url/bin/cache-url rename to diskimage_builder/elements/cache-url/bin/cache-url diff --git a/elements/cache-url/tests/__init__.py b/diskimage_builder/elements/cache-url/tests/__init__.py similarity index 100% rename from elements/cache-url/tests/__init__.py rename to diskimage_builder/elements/cache-url/tests/__init__.py diff --git a/elements/cache-url/tests/test_cache_url.py b/diskimage_builder/elements/cache-url/tests/test_cache_url.py similarity index 100% rename from elements/cache-url/tests/test_cache_url.py rename to diskimage_builder/elements/cache-url/tests/test_cache_url.py diff --git a/elements/centos-minimal/README.rst b/diskimage_builder/elements/centos-minimal/README.rst similarity index 100% rename from elements/centos-minimal/README.rst rename to diskimage_builder/elements/centos-minimal/README.rst diff --git a/elements/centos-minimal/element-deps b/diskimage_builder/elements/centos-minimal/element-deps similarity index 100% rename from elements/centos-minimal/element-deps rename to diskimage_builder/elements/centos-minimal/element-deps diff --git a/elements/centos-minimal/element-provides b/diskimage_builder/elements/centos-minimal/element-provides similarity index 100% rename from elements/centos-minimal/element-provides rename to diskimage_builder/elements/centos-minimal/element-provides diff --git a/elements/centos-minimal/environment.d/10-centos-distro-name.bash b/diskimage_builder/elements/centos-minimal/environment.d/10-centos-distro-name.bash similarity index 100% rename from elements/centos-minimal/environment.d/10-centos-distro-name.bash rename to diskimage_builder/elements/centos-minimal/environment.d/10-centos-distro-name.bash diff --git a/elements/centos-minimal/test-elements/build-succeeds/README.rst b/diskimage_builder/elements/centos-minimal/test-elements/build-succeeds/README.rst similarity index 100% rename from elements/centos-minimal/test-elements/build-succeeds/README.rst rename to diskimage_builder/elements/centos-minimal/test-elements/build-succeeds/README.rst diff --git a/elements/centos-minimal/yum.repos.d/yum.repo b/diskimage_builder/elements/centos-minimal/yum.repos.d/yum.repo similarity index 100% rename from elements/centos-minimal/yum.repos.d/yum.repo rename to diskimage_builder/elements/centos-minimal/yum.repos.d/yum.repo diff --git a/elements/centos/README.rst b/diskimage_builder/elements/centos/README.rst similarity index 100% rename from elements/centos/README.rst rename to diskimage_builder/elements/centos/README.rst diff --git a/elements/centos/element-deps b/diskimage_builder/elements/centos/element-deps similarity index 100% rename from elements/centos/element-deps rename to diskimage_builder/elements/centos/element-deps diff --git a/elements/centos/element-provides b/diskimage_builder/elements/centos/element-provides similarity index 100% rename from elements/centos/element-provides rename to diskimage_builder/elements/centos/element-provides diff --git a/elements/centos/environment.d/00-bootloader.bash b/diskimage_builder/elements/centos/environment.d/00-bootloader.bash similarity index 100% rename from elements/centos/environment.d/00-bootloader.bash rename to diskimage_builder/elements/centos/environment.d/00-bootloader.bash diff --git a/elements/centos/environment.d/10-centos6-distro-name.bash b/diskimage_builder/elements/centos/environment.d/10-centos6-distro-name.bash similarity index 100% rename from elements/centos/environment.d/10-centos6-distro-name.bash rename to diskimage_builder/elements/centos/environment.d/10-centos6-distro-name.bash diff --git a/elements/centos/package-installs.yaml b/diskimage_builder/elements/centos/package-installs.yaml similarity index 100% rename from elements/centos/package-installs.yaml rename to diskimage_builder/elements/centos/package-installs.yaml diff --git a/elements/centos/pre-install.d/02-yum-repos b/diskimage_builder/elements/centos/pre-install.d/02-yum-repos similarity index 100% rename from elements/centos/pre-install.d/02-yum-repos rename to diskimage_builder/elements/centos/pre-install.d/02-yum-repos diff --git a/elements/centos/root.d/10-centos6-cloud-image b/diskimage_builder/elements/centos/root.d/10-centos6-cloud-image similarity index 100% rename from elements/centos/root.d/10-centos6-cloud-image rename to diskimage_builder/elements/centos/root.d/10-centos6-cloud-image diff --git a/elements/centos/test-elements/build-succeeds/element-deps b/diskimage_builder/elements/centos/test-elements/build-succeeds/element-deps similarity index 100% rename from elements/centos/test-elements/build-succeeds/element-deps rename to diskimage_builder/elements/centos/test-elements/build-succeeds/element-deps diff --git a/elements/centos7/README.rst b/diskimage_builder/elements/centos7/README.rst similarity index 100% rename from elements/centos7/README.rst rename to diskimage_builder/elements/centos7/README.rst diff --git a/elements/centos7/element-deps b/diskimage_builder/elements/centos7/element-deps similarity index 100% rename from elements/centos7/element-deps rename to diskimage_builder/elements/centos7/element-deps diff --git a/elements/centos7/element-provides b/diskimage_builder/elements/centos7/element-provides similarity index 100% rename from elements/centos7/element-provides rename to diskimage_builder/elements/centos7/element-provides diff --git a/elements/centos7/environment.d/10-centos7-distro-name.bash b/diskimage_builder/elements/centos7/environment.d/10-centos7-distro-name.bash similarity index 100% rename from elements/centos7/environment.d/10-centos7-distro-name.bash rename to diskimage_builder/elements/centos7/environment.d/10-centos7-distro-name.bash diff --git a/elements/centos7/pre-install.d/01-set-centos-mirror b/diskimage_builder/elements/centos7/pre-install.d/01-set-centos-mirror similarity index 100% rename from elements/centos7/pre-install.d/01-set-centos-mirror rename to diskimage_builder/elements/centos7/pre-install.d/01-set-centos-mirror diff --git a/elements/centos7/root.d/10-centos7-cloud-image b/diskimage_builder/elements/centos7/root.d/10-centos7-cloud-image similarity index 100% rename from elements/centos7/root.d/10-centos7-cloud-image rename to diskimage_builder/elements/centos7/root.d/10-centos7-cloud-image diff --git a/elements/centos7/test-elements/build-succeeds/README.rst b/diskimage_builder/elements/centos7/test-elements/build-succeeds/README.rst similarity index 100% rename from elements/centos7/test-elements/build-succeeds/README.rst rename to diskimage_builder/elements/centos7/test-elements/build-succeeds/README.rst diff --git a/elements/centos7/test-elements/build-succeeds/element-deps b/diskimage_builder/elements/centos7/test-elements/build-succeeds/element-deps similarity index 100% rename from elements/centos7/test-elements/build-succeeds/element-deps rename to diskimage_builder/elements/centos7/test-elements/build-succeeds/element-deps diff --git a/elements/cleanup-kernel-initrd/README.rst b/diskimage_builder/elements/cleanup-kernel-initrd/README.rst similarity index 100% rename from elements/cleanup-kernel-initrd/README.rst rename to diskimage_builder/elements/cleanup-kernel-initrd/README.rst diff --git a/elements/cleanup-kernel-initrd/cleanup.d/99-cleanup-kernel-initrd b/diskimage_builder/elements/cleanup-kernel-initrd/cleanup.d/99-cleanup-kernel-initrd similarity index 100% rename from elements/cleanup-kernel-initrd/cleanup.d/99-cleanup-kernel-initrd rename to diskimage_builder/elements/cleanup-kernel-initrd/cleanup.d/99-cleanup-kernel-initrd diff --git a/elements/cloud-init-datasources/README.rst b/diskimage_builder/elements/cloud-init-datasources/README.rst similarity index 100% rename from elements/cloud-init-datasources/README.rst rename to diskimage_builder/elements/cloud-init-datasources/README.rst diff --git a/elements/cloud-init-datasources/install.d/05-set-cloud-init-sources b/diskimage_builder/elements/cloud-init-datasources/install.d/05-set-cloud-init-sources similarity index 100% rename from elements/cloud-init-datasources/install.d/05-set-cloud-init-sources rename to diskimage_builder/elements/cloud-init-datasources/install.d/05-set-cloud-init-sources diff --git a/elements/cloud-init-disable-resizefs/README.rst b/diskimage_builder/elements/cloud-init-disable-resizefs/README.rst similarity index 100% rename from elements/cloud-init-disable-resizefs/README.rst rename to diskimage_builder/elements/cloud-init-disable-resizefs/README.rst diff --git a/elements/cloud-init-disable-resizefs/post-install.d/50-cloud-init-disable-resizefs b/diskimage_builder/elements/cloud-init-disable-resizefs/post-install.d/50-cloud-init-disable-resizefs similarity index 100% rename from elements/cloud-init-disable-resizefs/post-install.d/50-cloud-init-disable-resizefs rename to diskimage_builder/elements/cloud-init-disable-resizefs/post-install.d/50-cloud-init-disable-resizefs diff --git a/elements/cloud-init-nocloud/README.rst b/diskimage_builder/elements/cloud-init-nocloud/README.rst similarity index 100% rename from elements/cloud-init-nocloud/README.rst rename to diskimage_builder/elements/cloud-init-nocloud/README.rst diff --git a/elements/cloud-init-nocloud/element-deps b/diskimage_builder/elements/cloud-init-nocloud/element-deps similarity index 100% rename from elements/cloud-init-nocloud/element-deps rename to diskimage_builder/elements/cloud-init-nocloud/element-deps diff --git a/elements/cloud-init-nocloud/environment.d/10-cloud-init-nocloud.bash b/diskimage_builder/elements/cloud-init-nocloud/environment.d/10-cloud-init-nocloud.bash similarity index 100% rename from elements/cloud-init-nocloud/environment.d/10-cloud-init-nocloud.bash rename to diskimage_builder/elements/cloud-init-nocloud/environment.d/10-cloud-init-nocloud.bash diff --git a/elements/cloud-init-nocloud/install.d/05-inject-local-source-data b/diskimage_builder/elements/cloud-init-nocloud/install.d/05-inject-local-source-data similarity index 100% rename from elements/cloud-init-nocloud/install.d/05-inject-local-source-data rename to diskimage_builder/elements/cloud-init-nocloud/install.d/05-inject-local-source-data diff --git a/elements/cloud-init/README.rst b/diskimage_builder/elements/cloud-init/README.rst similarity index 100% rename from elements/cloud-init/README.rst rename to diskimage_builder/elements/cloud-init/README.rst diff --git a/elements/cloud-init/element-deps b/diskimage_builder/elements/cloud-init/element-deps similarity index 100% rename from elements/cloud-init/element-deps rename to diskimage_builder/elements/cloud-init/element-deps diff --git a/elements/cloud-init/package-installs.yaml b/diskimage_builder/elements/cloud-init/package-installs.yaml similarity index 100% rename from elements/cloud-init/package-installs.yaml rename to diskimage_builder/elements/cloud-init/package-installs.yaml diff --git a/elements/cloud-init/pkg-map b/diskimage_builder/elements/cloud-init/pkg-map similarity index 100% rename from elements/cloud-init/pkg-map rename to diskimage_builder/elements/cloud-init/pkg-map diff --git a/elements/cloud-init/post-install.d/20-enable-cloud-init b/diskimage_builder/elements/cloud-init/post-install.d/20-enable-cloud-init similarity index 100% rename from elements/cloud-init/post-install.d/20-enable-cloud-init rename to diskimage_builder/elements/cloud-init/post-install.d/20-enable-cloud-init diff --git a/elements/debian-minimal/README.rst b/diskimage_builder/elements/debian-minimal/README.rst similarity index 100% rename from elements/debian-minimal/README.rst rename to diskimage_builder/elements/debian-minimal/README.rst diff --git a/elements/debian-minimal/element-deps b/diskimage_builder/elements/debian-minimal/element-deps similarity index 100% rename from elements/debian-minimal/element-deps rename to diskimage_builder/elements/debian-minimal/element-deps diff --git a/elements/debian-minimal/element-provides b/diskimage_builder/elements/debian-minimal/element-provides similarity index 100% rename from elements/debian-minimal/element-provides rename to diskimage_builder/elements/debian-minimal/element-provides diff --git a/elements/debian-minimal/environment.d/10-debian-minimal.bash b/diskimage_builder/elements/debian-minimal/environment.d/10-debian-minimal.bash similarity index 100% rename from elements/debian-minimal/environment.d/10-debian-minimal.bash rename to diskimage_builder/elements/debian-minimal/environment.d/10-debian-minimal.bash diff --git a/elements/debian-minimal/package-installs.yaml b/diskimage_builder/elements/debian-minimal/package-installs.yaml similarity index 100% rename from elements/debian-minimal/package-installs.yaml rename to diskimage_builder/elements/debian-minimal/package-installs.yaml diff --git a/elements/debian-minimal/pkg-map b/diskimage_builder/elements/debian-minimal/pkg-map similarity index 100% rename from elements/debian-minimal/pkg-map rename to diskimage_builder/elements/debian-minimal/pkg-map diff --git a/elements/debian-minimal/pre-install.d/02-debian-apt-update b/diskimage_builder/elements/debian-minimal/pre-install.d/02-debian-apt-update similarity index 100% rename from elements/debian-minimal/pre-install.d/02-debian-apt-update rename to diskimage_builder/elements/debian-minimal/pre-install.d/02-debian-apt-update diff --git a/elements/debian-minimal/test-elements/stable-build-succeeds/README.rst b/diskimage_builder/elements/debian-minimal/test-elements/stable-build-succeeds/README.rst similarity index 100% rename from elements/debian-minimal/test-elements/stable-build-succeeds/README.rst rename to diskimage_builder/elements/debian-minimal/test-elements/stable-build-succeeds/README.rst diff --git a/elements/debian-minimal/test-elements/stable-build-succeeds/environment.d/10-set-distro.bash b/diskimage_builder/elements/debian-minimal/test-elements/stable-build-succeeds/environment.d/10-set-distro.bash similarity index 100% rename from elements/debian-minimal/test-elements/stable-build-succeeds/environment.d/10-set-distro.bash rename to diskimage_builder/elements/debian-minimal/test-elements/stable-build-succeeds/environment.d/10-set-distro.bash diff --git a/elements/debian-minimal/test-elements/testing-build-succeeds/README.rst b/diskimage_builder/elements/debian-minimal/test-elements/testing-build-succeeds/README.rst similarity index 100% rename from elements/debian-minimal/test-elements/testing-build-succeeds/README.rst rename to diskimage_builder/elements/debian-minimal/test-elements/testing-build-succeeds/README.rst diff --git a/elements/debian-minimal/test-elements/testing-build-succeeds/environment.d/10-set-distro.bash b/diskimage_builder/elements/debian-minimal/test-elements/testing-build-succeeds/environment.d/10-set-distro.bash similarity index 100% rename from elements/debian-minimal/test-elements/testing-build-succeeds/environment.d/10-set-distro.bash rename to diskimage_builder/elements/debian-minimal/test-elements/testing-build-succeeds/environment.d/10-set-distro.bash diff --git a/elements/debian-systemd/README.rst b/diskimage_builder/elements/debian-systemd/README.rst similarity index 100% rename from elements/debian-systemd/README.rst rename to diskimage_builder/elements/debian-systemd/README.rst diff --git a/elements/debian-systemd/element-deps b/diskimage_builder/elements/debian-systemd/element-deps similarity index 100% rename from elements/debian-systemd/element-deps rename to diskimage_builder/elements/debian-systemd/element-deps diff --git a/elements/debian-systemd/root.d/05-debian-systemd b/diskimage_builder/elements/debian-systemd/root.d/05-debian-systemd similarity index 100% rename from elements/debian-systemd/root.d/05-debian-systemd rename to diskimage_builder/elements/debian-systemd/root.d/05-debian-systemd diff --git a/elements/debian-upstart/README.rst b/diskimage_builder/elements/debian-upstart/README.rst similarity index 100% rename from elements/debian-upstart/README.rst rename to diskimage_builder/elements/debian-upstart/README.rst diff --git a/elements/debian-upstart/element-deps b/diskimage_builder/elements/debian-upstart/element-deps similarity index 100% rename from elements/debian-upstart/element-deps rename to diskimage_builder/elements/debian-upstart/element-deps diff --git a/elements/debian-upstart/root.d/05-debian-upstart b/diskimage_builder/elements/debian-upstart/root.d/05-debian-upstart similarity index 100% rename from elements/debian-upstart/root.d/05-debian-upstart rename to diskimage_builder/elements/debian-upstart/root.d/05-debian-upstart diff --git a/elements/debian-upstart/root.d/20-debian-fix-upstart-jobs b/diskimage_builder/elements/debian-upstart/root.d/20-debian-fix-upstart-jobs similarity index 100% rename from elements/debian-upstart/root.d/20-debian-fix-upstart-jobs rename to diskimage_builder/elements/debian-upstart/root.d/20-debian-fix-upstart-jobs diff --git a/elements/debian/README.rst b/diskimage_builder/elements/debian/README.rst similarity index 100% rename from elements/debian/README.rst rename to diskimage_builder/elements/debian/README.rst diff --git a/elements/debian/element-deps b/diskimage_builder/elements/debian/element-deps similarity index 100% rename from elements/debian/element-deps rename to diskimage_builder/elements/debian/element-deps diff --git a/elements/debian/element-provides b/diskimage_builder/elements/debian/element-provides similarity index 100% rename from elements/debian/element-provides rename to diskimage_builder/elements/debian/element-provides diff --git a/elements/debian/install.d/10-cloud-opinions b/diskimage_builder/elements/debian/install.d/10-cloud-opinions similarity index 100% rename from elements/debian/install.d/10-cloud-opinions rename to diskimage_builder/elements/debian/install.d/10-cloud-opinions diff --git a/elements/debian/package-installs.yaml b/diskimage_builder/elements/debian/package-installs.yaml similarity index 100% rename from elements/debian/package-installs.yaml rename to diskimage_builder/elements/debian/package-installs.yaml diff --git a/elements/debian/test-elements/build-succeeds/README.rst b/diskimage_builder/elements/debian/test-elements/build-succeeds/README.rst similarity index 100% rename from elements/debian/test-elements/build-succeeds/README.rst rename to diskimage_builder/elements/debian/test-elements/build-succeeds/README.rst diff --git a/elements/debian/test-elements/build-succeeds/element-deps b/diskimage_builder/elements/debian/test-elements/build-succeeds/element-deps similarity index 100% rename from elements/debian/test-elements/build-succeeds/element-deps rename to diskimage_builder/elements/debian/test-elements/build-succeeds/element-deps diff --git a/elements/debian/test-elements/build-succeeds/environment.d/09-debian-stable b/diskimage_builder/elements/debian/test-elements/build-succeeds/environment.d/09-debian-stable similarity index 100% rename from elements/debian/test-elements/build-succeeds/environment.d/09-debian-stable rename to diskimage_builder/elements/debian/test-elements/build-succeeds/environment.d/09-debian-stable diff --git a/elements/debootstrap/README.rst b/diskimage_builder/elements/debootstrap/README.rst similarity index 100% rename from elements/debootstrap/README.rst rename to diskimage_builder/elements/debootstrap/README.rst diff --git a/elements/debootstrap/element-deps b/diskimage_builder/elements/debootstrap/element-deps similarity index 100% rename from elements/debootstrap/element-deps rename to diskimage_builder/elements/debootstrap/element-deps diff --git a/elements/debootstrap/environment.d/10-debootstrap-default-locale b/diskimage_builder/elements/debootstrap/environment.d/10-debootstrap-default-locale similarity index 100% rename from elements/debootstrap/environment.d/10-debootstrap-default-locale rename to diskimage_builder/elements/debootstrap/environment.d/10-debootstrap-default-locale diff --git a/elements/debootstrap/install.d/10-debian-networking b/diskimage_builder/elements/debootstrap/install.d/10-debian-networking similarity index 100% rename from elements/debootstrap/install.d/10-debian-networking rename to diskimage_builder/elements/debootstrap/install.d/10-debian-networking diff --git a/elements/debootstrap/install.d/12-debian-locale-gen b/diskimage_builder/elements/debootstrap/install.d/12-debian-locale-gen similarity index 100% rename from elements/debootstrap/install.d/12-debian-locale-gen rename to diskimage_builder/elements/debootstrap/install.d/12-debian-locale-gen diff --git a/elements/debootstrap/install.d/15-cleanup-debootstrap b/diskimage_builder/elements/debootstrap/install.d/15-cleanup-debootstrap similarity index 100% rename from elements/debootstrap/install.d/15-cleanup-debootstrap rename to diskimage_builder/elements/debootstrap/install.d/15-cleanup-debootstrap diff --git a/elements/debootstrap/package-installs.yaml b/diskimage_builder/elements/debootstrap/package-installs.yaml similarity index 100% rename from elements/debootstrap/package-installs.yaml rename to diskimage_builder/elements/debootstrap/package-installs.yaml diff --git a/elements/debootstrap/pkg-map b/diskimage_builder/elements/debootstrap/pkg-map similarity index 100% rename from elements/debootstrap/pkg-map rename to diskimage_builder/elements/debootstrap/pkg-map diff --git a/elements/debootstrap/root.d/08-debootstrap b/diskimage_builder/elements/debootstrap/root.d/08-debootstrap similarity index 100% rename from elements/debootstrap/root.d/08-debootstrap rename to diskimage_builder/elements/debootstrap/root.d/08-debootstrap diff --git a/elements/deploy-baremetal/README.rst b/diskimage_builder/elements/deploy-baremetal/README.rst similarity index 100% rename from elements/deploy-baremetal/README.rst rename to diskimage_builder/elements/deploy-baremetal/README.rst diff --git a/elements/deploy-baremetal/binary-deps.d/deploy b/diskimage_builder/elements/deploy-baremetal/binary-deps.d/deploy similarity index 100% rename from elements/deploy-baremetal/binary-deps.d/deploy rename to diskimage_builder/elements/deploy-baremetal/binary-deps.d/deploy diff --git a/elements/deploy-baremetal/element-deps b/diskimage_builder/elements/deploy-baremetal/element-deps similarity index 100% rename from elements/deploy-baremetal/element-deps rename to diskimage_builder/elements/deploy-baremetal/element-deps diff --git a/elements/deploy-baremetal/init.d/80-deploy b/diskimage_builder/elements/deploy-baremetal/init.d/80-deploy similarity index 100% rename from elements/deploy-baremetal/init.d/80-deploy rename to diskimage_builder/elements/deploy-baremetal/init.d/80-deploy diff --git a/elements/deploy-baremetal/package-installs.yaml b/diskimage_builder/elements/deploy-baremetal/package-installs.yaml similarity index 100% rename from elements/deploy-baremetal/package-installs.yaml rename to diskimage_builder/elements/deploy-baremetal/package-installs.yaml diff --git a/elements/deploy-kexec/README.rst b/diskimage_builder/elements/deploy-kexec/README.rst similarity index 100% rename from elements/deploy-kexec/README.rst rename to diskimage_builder/elements/deploy-kexec/README.rst diff --git a/elements/deploy-kexec/binary-deps.d/deploy-kexec b/diskimage_builder/elements/deploy-kexec/binary-deps.d/deploy-kexec similarity index 100% rename from elements/deploy-kexec/binary-deps.d/deploy-kexec rename to diskimage_builder/elements/deploy-kexec/binary-deps.d/deploy-kexec diff --git a/elements/deploy-kexec/element-deps b/diskimage_builder/elements/deploy-kexec/element-deps similarity index 100% rename from elements/deploy-kexec/element-deps rename to diskimage_builder/elements/deploy-kexec/element-deps diff --git a/elements/deploy-kexec/init.d/81-deploy-kexec b/diskimage_builder/elements/deploy-kexec/init.d/81-deploy-kexec similarity index 100% rename from elements/deploy-kexec/init.d/81-deploy-kexec rename to diskimage_builder/elements/deploy-kexec/init.d/81-deploy-kexec diff --git a/elements/deploy-kexec/package-installs.yaml b/diskimage_builder/elements/deploy-kexec/package-installs.yaml similarity index 100% rename from elements/deploy-kexec/package-installs.yaml rename to diskimage_builder/elements/deploy-kexec/package-installs.yaml diff --git a/elements/deploy-targetcli/README.rst b/diskimage_builder/elements/deploy-targetcli/README.rst similarity index 100% rename from elements/deploy-targetcli/README.rst rename to diskimage_builder/elements/deploy-targetcli/README.rst diff --git a/elements/deploy-targetcli/binary-deps.d/deploy-targetcli b/diskimage_builder/elements/deploy-targetcli/binary-deps.d/deploy-targetcli similarity index 100% rename from elements/deploy-targetcli/binary-deps.d/deploy-targetcli rename to diskimage_builder/elements/deploy-targetcli/binary-deps.d/deploy-targetcli diff --git a/elements/deploy-targetcli/dracut-drivers.d/targetcli-drivers b/diskimage_builder/elements/deploy-targetcli/dracut-drivers.d/targetcli-drivers similarity index 100% rename from elements/deploy-targetcli/dracut-drivers.d/targetcli-drivers rename to diskimage_builder/elements/deploy-targetcli/dracut-drivers.d/targetcli-drivers diff --git a/elements/deploy-targetcli/element-deps b/diskimage_builder/elements/deploy-targetcli/element-deps similarity index 100% rename from elements/deploy-targetcli/element-deps rename to diskimage_builder/elements/deploy-targetcli/element-deps diff --git a/elements/deploy-targetcli/extra-data.d/50-add-targetcli-module b/diskimage_builder/elements/deploy-targetcli/extra-data.d/50-add-targetcli-module similarity index 100% rename from elements/deploy-targetcli/extra-data.d/50-add-targetcli-module rename to diskimage_builder/elements/deploy-targetcli/extra-data.d/50-add-targetcli-module diff --git a/elements/deploy-targetcli/extra-data.d/module/iscsi-func b/diskimage_builder/elements/deploy-targetcli/extra-data.d/module/iscsi-func similarity index 100% rename from elements/deploy-targetcli/extra-data.d/module/iscsi-func rename to diskimage_builder/elements/deploy-targetcli/extra-data.d/module/iscsi-func diff --git a/elements/deploy-targetcli/extra-data.d/module/module-setup.sh b/diskimage_builder/elements/deploy-targetcli/extra-data.d/module/module-setup.sh similarity index 100% rename from elements/deploy-targetcli/extra-data.d/module/module-setup.sh rename to diskimage_builder/elements/deploy-targetcli/extra-data.d/module/module-setup.sh diff --git a/elements/deploy-targetcli/extra-data.d/module/targetcli-wrapper b/diskimage_builder/elements/deploy-targetcli/extra-data.d/module/targetcli-wrapper similarity index 100% rename from elements/deploy-targetcli/extra-data.d/module/targetcli-wrapper rename to diskimage_builder/elements/deploy-targetcli/extra-data.d/module/targetcli-wrapper diff --git a/elements/deploy-targetcli/package-installs.yaml b/diskimage_builder/elements/deploy-targetcli/package-installs.yaml similarity index 100% rename from elements/deploy-targetcli/package-installs.yaml rename to diskimage_builder/elements/deploy-targetcli/package-installs.yaml diff --git a/elements/deploy-tgtadm/README.rst b/diskimage_builder/elements/deploy-tgtadm/README.rst similarity index 100% rename from elements/deploy-tgtadm/README.rst rename to diskimage_builder/elements/deploy-tgtadm/README.rst diff --git a/elements/deploy-tgtadm/binary-deps.d/deploy-tgtadm b/diskimage_builder/elements/deploy-tgtadm/binary-deps.d/deploy-tgtadm similarity index 100% rename from elements/deploy-tgtadm/binary-deps.d/deploy-tgtadm rename to diskimage_builder/elements/deploy-tgtadm/binary-deps.d/deploy-tgtadm diff --git a/elements/deploy-tgtadm/extra-data.d/50-inject-tgtadm-iscsi-func b/diskimage_builder/elements/deploy-tgtadm/extra-data.d/50-inject-tgtadm-iscsi-func similarity index 100% rename from elements/deploy-tgtadm/extra-data.d/50-inject-tgtadm-iscsi-func rename to diskimage_builder/elements/deploy-tgtadm/extra-data.d/50-inject-tgtadm-iscsi-func diff --git a/elements/deploy-tgtadm/extra-data.d/scripts/iscsi-func b/diskimage_builder/elements/deploy-tgtadm/extra-data.d/scripts/iscsi-func similarity index 100% rename from elements/deploy-tgtadm/extra-data.d/scripts/iscsi-func rename to diskimage_builder/elements/deploy-tgtadm/extra-data.d/scripts/iscsi-func diff --git a/elements/deploy-tgtadm/package-installs.yaml b/diskimage_builder/elements/deploy-tgtadm/package-installs.yaml similarity index 100% rename from elements/deploy-tgtadm/package-installs.yaml rename to diskimage_builder/elements/deploy-tgtadm/package-installs.yaml diff --git a/elements/devuser/README.rst b/diskimage_builder/elements/devuser/README.rst similarity index 100% rename from elements/devuser/README.rst rename to diskimage_builder/elements/devuser/README.rst diff --git a/elements/devuser/environment.d/50-devuser b/diskimage_builder/elements/devuser/environment.d/50-devuser similarity index 100% rename from elements/devuser/environment.d/50-devuser rename to diskimage_builder/elements/devuser/environment.d/50-devuser diff --git a/elements/devuser/extra-data.d/50-devuser b/diskimage_builder/elements/devuser/extra-data.d/50-devuser similarity index 100% rename from elements/devuser/extra-data.d/50-devuser rename to diskimage_builder/elements/devuser/extra-data.d/50-devuser diff --git a/elements/devuser/install.d/50-devuser b/diskimage_builder/elements/devuser/install.d/50-devuser similarity index 100% rename from elements/devuser/install.d/50-devuser rename to diskimage_builder/elements/devuser/install.d/50-devuser diff --git a/elements/dhcp-all-interfaces/README.rst b/diskimage_builder/elements/dhcp-all-interfaces/README.rst similarity index 100% rename from elements/dhcp-all-interfaces/README.rst rename to diskimage_builder/elements/dhcp-all-interfaces/README.rst diff --git a/elements/dhcp-all-interfaces/element-deps b/diskimage_builder/elements/dhcp-all-interfaces/element-deps similarity index 100% rename from elements/dhcp-all-interfaces/element-deps rename to diskimage_builder/elements/dhcp-all-interfaces/element-deps diff --git a/elements/dhcp-all-interfaces/install.d/50-dhcp-all-interfaces b/diskimage_builder/elements/dhcp-all-interfaces/install.d/50-dhcp-all-interfaces similarity index 100% rename from elements/dhcp-all-interfaces/install.d/50-dhcp-all-interfaces rename to diskimage_builder/elements/dhcp-all-interfaces/install.d/50-dhcp-all-interfaces diff --git a/elements/dhcp-all-interfaces/install.d/60-remove-cloud-image-interfaces b/diskimage_builder/elements/dhcp-all-interfaces/install.d/60-remove-cloud-image-interfaces similarity index 100% rename from elements/dhcp-all-interfaces/install.d/60-remove-cloud-image-interfaces rename to diskimage_builder/elements/dhcp-all-interfaces/install.d/60-remove-cloud-image-interfaces diff --git a/elements/dhcp-all-interfaces/install.d/dhcp-all-interfaces-udev.rules b/diskimage_builder/elements/dhcp-all-interfaces/install.d/dhcp-all-interfaces-udev.rules similarity index 100% rename from elements/dhcp-all-interfaces/install.d/dhcp-all-interfaces-udev.rules rename to diskimage_builder/elements/dhcp-all-interfaces/install.d/dhcp-all-interfaces-udev.rules diff --git a/elements/dhcp-all-interfaces/install.d/dhcp-all-interfaces.conf b/diskimage_builder/elements/dhcp-all-interfaces/install.d/dhcp-all-interfaces.conf similarity index 100% rename from elements/dhcp-all-interfaces/install.d/dhcp-all-interfaces.conf rename to diskimage_builder/elements/dhcp-all-interfaces/install.d/dhcp-all-interfaces.conf diff --git a/elements/dhcp-all-interfaces/install.d/dhcp-all-interfaces.init b/diskimage_builder/elements/dhcp-all-interfaces/install.d/dhcp-all-interfaces.init similarity index 100% rename from elements/dhcp-all-interfaces/install.d/dhcp-all-interfaces.init rename to diskimage_builder/elements/dhcp-all-interfaces/install.d/dhcp-all-interfaces.init diff --git a/elements/dhcp-all-interfaces/install.d/dhcp-all-interfaces.sh b/diskimage_builder/elements/dhcp-all-interfaces/install.d/dhcp-all-interfaces.sh similarity index 100% rename from elements/dhcp-all-interfaces/install.d/dhcp-all-interfaces.sh rename to diskimage_builder/elements/dhcp-all-interfaces/install.d/dhcp-all-interfaces.sh diff --git a/elements/dhcp-all-interfaces/install.d/dhcp-interface@.service b/diskimage_builder/elements/dhcp-all-interfaces/install.d/dhcp-interface@.service similarity index 100% rename from elements/dhcp-all-interfaces/install.d/dhcp-interface@.service rename to diskimage_builder/elements/dhcp-all-interfaces/install.d/dhcp-interface@.service diff --git a/elements/dhcp-all-interfaces/package-installs.yaml b/diskimage_builder/elements/dhcp-all-interfaces/package-installs.yaml similarity index 100% rename from elements/dhcp-all-interfaces/package-installs.yaml rename to diskimage_builder/elements/dhcp-all-interfaces/package-installs.yaml diff --git a/elements/dhcp-all-interfaces/pkg-map b/diskimage_builder/elements/dhcp-all-interfaces/pkg-map similarity index 100% rename from elements/dhcp-all-interfaces/pkg-map rename to diskimage_builder/elements/dhcp-all-interfaces/pkg-map diff --git a/elements/dib-init-system/README.rst b/diskimage_builder/elements/dib-init-system/README.rst similarity index 100% rename from elements/dib-init-system/README.rst rename to diskimage_builder/elements/dib-init-system/README.rst diff --git a/elements/dib-init-system/dib-init-system b/diskimage_builder/elements/dib-init-system/dib-init-system similarity index 100% rename from elements/dib-init-system/dib-init-system rename to diskimage_builder/elements/dib-init-system/dib-init-system diff --git a/elements/dib-init-system/environment.d/10-dib-init-system.bash b/diskimage_builder/elements/dib-init-system/environment.d/10-dib-init-system.bash similarity index 100% rename from elements/dib-init-system/environment.d/10-dib-init-system.bash rename to diskimage_builder/elements/dib-init-system/environment.d/10-dib-init-system.bash diff --git a/elements/dib-init-system/install.d/20-install-init-scripts b/diskimage_builder/elements/dib-init-system/install.d/20-install-init-scripts similarity index 100% rename from elements/dib-init-system/install.d/20-install-init-scripts rename to diskimage_builder/elements/dib-init-system/install.d/20-install-init-scripts diff --git a/elements/dib-init-system/post-install.d/10-enable-init-scripts b/diskimage_builder/elements/dib-init-system/post-install.d/10-enable-init-scripts similarity index 100% rename from elements/dib-init-system/post-install.d/10-enable-init-scripts rename to diskimage_builder/elements/dib-init-system/post-install.d/10-enable-init-scripts diff --git a/elements/dib-init-system/pre-install.d/04-dib-init-system b/diskimage_builder/elements/dib-init-system/pre-install.d/04-dib-init-system similarity index 100% rename from elements/dib-init-system/pre-install.d/04-dib-init-system rename to diskimage_builder/elements/dib-init-system/pre-install.d/04-dib-init-system diff --git a/elements/dib-python/README.rst b/diskimage_builder/elements/dib-python/README.rst similarity index 100% rename from elements/dib-python/README.rst rename to diskimage_builder/elements/dib-python/README.rst diff --git a/elements/dib-python/pre-install.d/01-dib-python b/diskimage_builder/elements/dib-python/pre-install.d/01-dib-python similarity index 100% rename from elements/dib-python/pre-install.d/01-dib-python rename to diskimage_builder/elements/dib-python/pre-install.d/01-dib-python diff --git a/elements/dib-run-parts/root.d/90-base-dib-run-parts b/diskimage_builder/elements/dib-run-parts/root.d/90-base-dib-run-parts similarity index 100% rename from elements/dib-run-parts/root.d/90-base-dib-run-parts rename to diskimage_builder/elements/dib-run-parts/root.d/90-base-dib-run-parts diff --git a/elements/disable-selinux/post-install.d/15-disable-selinux b/diskimage_builder/elements/disable-selinux/post-install.d/15-disable-selinux similarity index 100% rename from elements/disable-selinux/post-install.d/15-disable-selinux rename to diskimage_builder/elements/disable-selinux/post-install.d/15-disable-selinux diff --git a/elements/dkms/README.rst b/diskimage_builder/elements/dkms/README.rst similarity index 100% rename from elements/dkms/README.rst rename to diskimage_builder/elements/dkms/README.rst diff --git a/elements/dkms/element-deps b/diskimage_builder/elements/dkms/element-deps similarity index 100% rename from elements/dkms/element-deps rename to diskimage_builder/elements/dkms/element-deps diff --git a/elements/dkms/package-installs.yaml b/diskimage_builder/elements/dkms/package-installs.yaml similarity index 100% rename from elements/dkms/package-installs.yaml rename to diskimage_builder/elements/dkms/package-installs.yaml diff --git a/elements/dkms/post-install.d/97-dkms b/diskimage_builder/elements/dkms/post-install.d/97-dkms similarity index 100% rename from elements/dkms/post-install.d/97-dkms rename to diskimage_builder/elements/dkms/post-install.d/97-dkms diff --git a/elements/docker/README.rst b/diskimage_builder/elements/docker/README.rst similarity index 100% rename from elements/docker/README.rst rename to diskimage_builder/elements/docker/README.rst diff --git a/elements/docker/element-deps b/diskimage_builder/elements/docker/element-deps similarity index 100% rename from elements/docker/element-deps rename to diskimage_builder/elements/docker/element-deps diff --git a/elements/docker/element-provides b/diskimage_builder/elements/docker/element-provides similarity index 100% rename from elements/docker/element-provides rename to diskimage_builder/elements/docker/element-provides diff --git a/elements/docker/extra-data.d/01-docker-minimal b/diskimage_builder/elements/docker/extra-data.d/01-docker-minimal similarity index 100% rename from elements/docker/extra-data.d/01-docker-minimal rename to diskimage_builder/elements/docker/extra-data.d/01-docker-minimal diff --git a/elements/docker/root.d/08-docker b/diskimage_builder/elements/docker/root.d/08-docker similarity index 100% rename from elements/docker/root.d/08-docker rename to diskimage_builder/elements/docker/root.d/08-docker diff --git a/elements/dpkg/README.rst b/diskimage_builder/elements/dpkg/README.rst similarity index 100% rename from elements/dpkg/README.rst rename to diskimage_builder/elements/dpkg/README.rst diff --git a/elements/dpkg/bin/install-packages b/diskimage_builder/elements/dpkg/bin/install-packages similarity index 100% rename from elements/dpkg/bin/install-packages rename to diskimage_builder/elements/dpkg/bin/install-packages diff --git a/elements/dpkg/cleanup.d/40-unblock-daemons b/diskimage_builder/elements/dpkg/cleanup.d/40-unblock-daemons similarity index 100% rename from elements/dpkg/cleanup.d/40-unblock-daemons rename to diskimage_builder/elements/dpkg/cleanup.d/40-unblock-daemons diff --git a/elements/dpkg/cleanup.d/50-remove-img-build-proxy b/diskimage_builder/elements/dpkg/cleanup.d/50-remove-img-build-proxy similarity index 100% rename from elements/dpkg/cleanup.d/50-remove-img-build-proxy rename to diskimage_builder/elements/dpkg/cleanup.d/50-remove-img-build-proxy diff --git a/elements/dpkg/cleanup.d/60-untrim-dpkg b/diskimage_builder/elements/dpkg/cleanup.d/60-untrim-dpkg similarity index 100% rename from elements/dpkg/cleanup.d/60-untrim-dpkg rename to diskimage_builder/elements/dpkg/cleanup.d/60-untrim-dpkg diff --git a/elements/dpkg/element-deps b/diskimage_builder/elements/dpkg/element-deps similarity index 100% rename from elements/dpkg/element-deps rename to diskimage_builder/elements/dpkg/element-deps diff --git a/elements/dpkg/extra-data.d/01-copy-apt-keys b/diskimage_builder/elements/dpkg/extra-data.d/01-copy-apt-keys similarity index 100% rename from elements/dpkg/extra-data.d/01-copy-apt-keys rename to diskimage_builder/elements/dpkg/extra-data.d/01-copy-apt-keys diff --git a/elements/dpkg/finalise.d/99-clean-up-cache b/diskimage_builder/elements/dpkg/finalise.d/99-clean-up-cache similarity index 100% rename from elements/dpkg/finalise.d/99-clean-up-cache rename to diskimage_builder/elements/dpkg/finalise.d/99-clean-up-cache diff --git a/elements/dpkg/finalise.d/99-write-dpkg-manifest b/diskimage_builder/elements/dpkg/finalise.d/99-write-dpkg-manifest similarity index 100% rename from elements/dpkg/finalise.d/99-write-dpkg-manifest rename to diskimage_builder/elements/dpkg/finalise.d/99-write-dpkg-manifest diff --git a/elements/dpkg/pre-install.d/00-disable-apt-recommends b/diskimage_builder/elements/dpkg/pre-install.d/00-disable-apt-recommends similarity index 100% rename from elements/dpkg/pre-install.d/00-disable-apt-recommends rename to diskimage_builder/elements/dpkg/pre-install.d/00-disable-apt-recommends diff --git a/elements/dpkg/pre-install.d/02-add-apt-keys b/diskimage_builder/elements/dpkg/pre-install.d/02-add-apt-keys similarity index 100% rename from elements/dpkg/pre-install.d/02-add-apt-keys rename to diskimage_builder/elements/dpkg/pre-install.d/02-add-apt-keys diff --git a/elements/dpkg/pre-install.d/99-apt-get-update b/diskimage_builder/elements/dpkg/pre-install.d/99-apt-get-update similarity index 100% rename from elements/dpkg/pre-install.d/99-apt-get-update rename to diskimage_builder/elements/dpkg/pre-install.d/99-apt-get-update diff --git a/elements/dpkg/root.d/50-build-with-http-cache b/diskimage_builder/elements/dpkg/root.d/50-build-with-http-cache similarity index 100% rename from elements/dpkg/root.d/50-build-with-http-cache rename to diskimage_builder/elements/dpkg/root.d/50-build-with-http-cache diff --git a/elements/dpkg/root.d/60-block-apt-translations b/diskimage_builder/elements/dpkg/root.d/60-block-apt-translations similarity index 100% rename from elements/dpkg/root.d/60-block-apt-translations rename to diskimage_builder/elements/dpkg/root.d/60-block-apt-translations diff --git a/elements/dpkg/root.d/99-block-daemons b/diskimage_builder/elements/dpkg/root.d/99-block-daemons similarity index 100% rename from elements/dpkg/root.d/99-block-daemons rename to diskimage_builder/elements/dpkg/root.d/99-block-daemons diff --git a/elements/dpkg/root.d/99-shared_apt_cache b/diskimage_builder/elements/dpkg/root.d/99-shared_apt_cache similarity index 100% rename from elements/dpkg/root.d/99-shared_apt_cache rename to diskimage_builder/elements/dpkg/root.d/99-shared_apt_cache diff --git a/elements/dpkg/root.d/99-trim-dpkg b/diskimage_builder/elements/dpkg/root.d/99-trim-dpkg similarity index 100% rename from elements/dpkg/root.d/99-trim-dpkg rename to diskimage_builder/elements/dpkg/root.d/99-trim-dpkg diff --git a/elements/dracut-network/README.rst b/diskimage_builder/elements/dracut-network/README.rst similarity index 100% rename from elements/dracut-network/README.rst rename to diskimage_builder/elements/dracut-network/README.rst diff --git a/elements/dracut-network/dracut-029-netgen.patch b/diskimage_builder/elements/dracut-network/dracut-029-netgen.patch similarity index 100% rename from elements/dracut-network/dracut-029-netgen.patch rename to diskimage_builder/elements/dracut-network/dracut-029-netgen.patch diff --git a/elements/dracut-network/dracut-write-ifcfg.patch b/diskimage_builder/elements/dracut-network/dracut-write-ifcfg.patch similarity index 100% rename from elements/dracut-network/dracut-write-ifcfg.patch rename to diskimage_builder/elements/dracut-network/dracut-write-ifcfg.patch diff --git a/elements/dracut-network/element-deps b/diskimage_builder/elements/dracut-network/element-deps similarity index 100% rename from elements/dracut-network/element-deps rename to diskimage_builder/elements/dracut-network/element-deps diff --git a/elements/dracut-network/finalise.d/98-regenerate-initramfs b/diskimage_builder/elements/dracut-network/finalise.d/98-regenerate-initramfs similarity index 100% rename from elements/dracut-network/finalise.d/98-regenerate-initramfs rename to diskimage_builder/elements/dracut-network/finalise.d/98-regenerate-initramfs diff --git a/elements/dracut-network/install.d/11-patch-dracut b/diskimage_builder/elements/dracut-network/install.d/11-patch-dracut similarity index 100% rename from elements/dracut-network/install.d/11-patch-dracut rename to diskimage_builder/elements/dracut-network/install.d/11-patch-dracut diff --git a/elements/dracut-network/package-installs.yaml b/diskimage_builder/elements/dracut-network/package-installs.yaml similarity index 100% rename from elements/dracut-network/package-installs.yaml rename to diskimage_builder/elements/dracut-network/package-installs.yaml diff --git a/elements/dracut-ramdisk/README.rst b/diskimage_builder/elements/dracut-ramdisk/README.rst similarity index 100% rename from elements/dracut-ramdisk/README.rst rename to diskimage_builder/elements/dracut-ramdisk/README.rst diff --git a/elements/dracut-ramdisk/binary-deps.d/dracut-ramdisk b/diskimage_builder/elements/dracut-ramdisk/binary-deps.d/dracut-ramdisk similarity index 100% rename from elements/dracut-ramdisk/binary-deps.d/dracut-ramdisk rename to diskimage_builder/elements/dracut-ramdisk/binary-deps.d/dracut-ramdisk diff --git a/elements/dracut-ramdisk/dracut-drivers.d/base-drivers b/diskimage_builder/elements/dracut-ramdisk/dracut-drivers.d/base-drivers similarity index 100% rename from elements/dracut-ramdisk/dracut-drivers.d/base-drivers rename to diskimage_builder/elements/dracut-ramdisk/dracut-drivers.d/base-drivers diff --git a/elements/dracut-ramdisk/element-deps b/diskimage_builder/elements/dracut-ramdisk/element-deps similarity index 100% rename from elements/dracut-ramdisk/element-deps rename to diskimage_builder/elements/dracut-ramdisk/element-deps diff --git a/elements/dracut-ramdisk/environment.d/10-dracut-version.bash b/diskimage_builder/elements/dracut-ramdisk/environment.d/10-dracut-version.bash similarity index 100% rename from elements/dracut-ramdisk/environment.d/10-dracut-version.bash rename to diskimage_builder/elements/dracut-ramdisk/environment.d/10-dracut-version.bash diff --git a/elements/dracut-ramdisk/extra-data.d/scripts/module/deploy-cmdline.sh b/diskimage_builder/elements/dracut-ramdisk/extra-data.d/scripts/module/deploy-cmdline.sh similarity index 100% rename from elements/dracut-ramdisk/extra-data.d/scripts/module/deploy-cmdline.sh rename to diskimage_builder/elements/dracut-ramdisk/extra-data.d/scripts/module/deploy-cmdline.sh diff --git a/elements/dracut-ramdisk/extra-data.d/scripts/module/module-setup.sh b/diskimage_builder/elements/dracut-ramdisk/extra-data.d/scripts/module/module-setup.sh similarity index 100% rename from elements/dracut-ramdisk/extra-data.d/scripts/module/module-setup.sh rename to diskimage_builder/elements/dracut-ramdisk/extra-data.d/scripts/module/module-setup.sh diff --git a/elements/dracut-ramdisk/init.d/00-override-troubleshoot b/diskimage_builder/elements/dracut-ramdisk/init.d/00-override-troubleshoot similarity index 100% rename from elements/dracut-ramdisk/init.d/00-override-troubleshoot rename to diskimage_builder/elements/dracut-ramdisk/init.d/00-override-troubleshoot diff --git a/elements/dracut-ramdisk/install.d/20-install-dracut-deps b/diskimage_builder/elements/dracut-ramdisk/install.d/20-install-dracut-deps similarity index 100% rename from elements/dracut-ramdisk/install.d/20-install-dracut-deps rename to diskimage_builder/elements/dracut-ramdisk/install.d/20-install-dracut-deps diff --git a/elements/dracut-ramdisk/pkg-map b/diskimage_builder/elements/dracut-ramdisk/pkg-map similarity index 100% rename from elements/dracut-ramdisk/pkg-map rename to diskimage_builder/elements/dracut-ramdisk/pkg-map diff --git a/elements/dracut-ramdisk/post-install.d/01-ensure-drivers b/diskimage_builder/elements/dracut-ramdisk/post-install.d/01-ensure-drivers similarity index 100% rename from elements/dracut-ramdisk/post-install.d/01-ensure-drivers rename to diskimage_builder/elements/dracut-ramdisk/post-install.d/01-ensure-drivers diff --git a/elements/dracut-ramdisk/post-install.d/99-build-dracut-ramdisk b/diskimage_builder/elements/dracut-ramdisk/post-install.d/99-build-dracut-ramdisk similarity index 100% rename from elements/dracut-ramdisk/post-install.d/99-build-dracut-ramdisk rename to diskimage_builder/elements/dracut-ramdisk/post-install.d/99-build-dracut-ramdisk diff --git a/elements/dracut-ramdisk/source-repository-dracut b/diskimage_builder/elements/dracut-ramdisk/source-repository-dracut similarity index 100% rename from elements/dracut-ramdisk/source-repository-dracut rename to diskimage_builder/elements/dracut-ramdisk/source-repository-dracut diff --git a/elements/dynamic-login/README.rst b/diskimage_builder/elements/dynamic-login/README.rst similarity index 100% rename from elements/dynamic-login/README.rst rename to diskimage_builder/elements/dynamic-login/README.rst diff --git a/elements/dynamic-login/element-deps b/diskimage_builder/elements/dynamic-login/element-deps similarity index 100% rename from elements/dynamic-login/element-deps rename to diskimage_builder/elements/dynamic-login/element-deps diff --git a/elements/dynamic-login/init-scripts/systemd/dynamic-login.service b/diskimage_builder/elements/dynamic-login/init-scripts/systemd/dynamic-login.service similarity index 100% rename from elements/dynamic-login/init-scripts/systemd/dynamic-login.service rename to diskimage_builder/elements/dynamic-login/init-scripts/systemd/dynamic-login.service diff --git a/elements/dynamic-login/init-scripts/sysv/dynamic-login.init b/diskimage_builder/elements/dynamic-login/init-scripts/sysv/dynamic-login.init similarity index 100% rename from elements/dynamic-login/init-scripts/sysv/dynamic-login.init rename to diskimage_builder/elements/dynamic-login/init-scripts/sysv/dynamic-login.init diff --git a/elements/dynamic-login/init-scripts/upstart/dynamic-login.conf b/diskimage_builder/elements/dynamic-login/init-scripts/upstart/dynamic-login.conf similarity index 100% rename from elements/dynamic-login/init-scripts/upstart/dynamic-login.conf rename to diskimage_builder/elements/dynamic-login/init-scripts/upstart/dynamic-login.conf diff --git a/elements/dynamic-login/install.d/70-enable-dynamic-login-services b/diskimage_builder/elements/dynamic-login/install.d/70-enable-dynamic-login-services similarity index 100% rename from elements/dynamic-login/install.d/70-enable-dynamic-login-services rename to diskimage_builder/elements/dynamic-login/install.d/70-enable-dynamic-login-services diff --git a/elements/dynamic-login/package-installs.yaml b/diskimage_builder/elements/dynamic-login/package-installs.yaml similarity index 100% rename from elements/dynamic-login/package-installs.yaml rename to diskimage_builder/elements/dynamic-login/package-installs.yaml diff --git a/elements/dynamic-login/static/usr/local/bin/dynamic-login b/diskimage_builder/elements/dynamic-login/static/usr/local/bin/dynamic-login similarity index 100% rename from elements/dynamic-login/static/usr/local/bin/dynamic-login rename to diskimage_builder/elements/dynamic-login/static/usr/local/bin/dynamic-login diff --git a/elements/element-manifest/README.rst b/diskimage_builder/elements/element-manifest/README.rst similarity index 100% rename from elements/element-manifest/README.rst rename to diskimage_builder/elements/element-manifest/README.rst diff --git a/elements/element-manifest/element-deps b/diskimage_builder/elements/element-manifest/element-deps similarity index 100% rename from elements/element-manifest/element-deps rename to diskimage_builder/elements/element-manifest/element-deps diff --git a/elements/element-manifest/extra-data.d/75-inject-element-manifest b/diskimage_builder/elements/element-manifest/extra-data.d/75-inject-element-manifest similarity index 100% rename from elements/element-manifest/extra-data.d/75-inject-element-manifest rename to diskimage_builder/elements/element-manifest/extra-data.d/75-inject-element-manifest diff --git a/elements/enable-serial-console/README.rst b/diskimage_builder/elements/enable-serial-console/README.rst similarity index 100% rename from elements/enable-serial-console/README.rst rename to diskimage_builder/elements/enable-serial-console/README.rst diff --git a/elements/enable-serial-console/cleanup.d/99-fix-grub b/diskimage_builder/elements/enable-serial-console/cleanup.d/99-fix-grub similarity index 100% rename from elements/enable-serial-console/cleanup.d/99-fix-grub rename to diskimage_builder/elements/enable-serial-console/cleanup.d/99-fix-grub diff --git a/elements/enable-serial-console/install.d/20-stty b/diskimage_builder/elements/enable-serial-console/install.d/20-stty similarity index 100% rename from elements/enable-serial-console/install.d/20-stty rename to diskimage_builder/elements/enable-serial-console/install.d/20-stty diff --git a/elements/enable-serial-console/install.d/serial-console-udev.rules b/diskimage_builder/elements/enable-serial-console/install.d/serial-console-udev.rules similarity index 100% rename from elements/enable-serial-console/install.d/serial-console-udev.rules rename to diskimage_builder/elements/enable-serial-console/install.d/serial-console-udev.rules diff --git a/elements/enable-serial-console/install.d/ttySx.conf b/diskimage_builder/elements/enable-serial-console/install.d/ttySx.conf similarity index 100% rename from elements/enable-serial-console/install.d/ttySx.conf rename to diskimage_builder/elements/enable-serial-console/install.d/ttySx.conf diff --git a/elements/epel/README.rst b/diskimage_builder/elements/epel/README.rst similarity index 100% rename from elements/epel/README.rst rename to diskimage_builder/elements/epel/README.rst diff --git a/elements/epel/element-deps b/diskimage_builder/elements/epel/element-deps similarity index 100% rename from elements/epel/element-deps rename to diskimage_builder/elements/epel/element-deps diff --git a/elements/epel/package-installs.yaml b/diskimage_builder/elements/epel/package-installs.yaml similarity index 100% rename from elements/epel/package-installs.yaml rename to diskimage_builder/elements/epel/package-installs.yaml diff --git a/elements/epel/pre-install.d/05-rpm-epel-release b/diskimage_builder/elements/epel/pre-install.d/05-rpm-epel-release similarity index 100% rename from elements/epel/pre-install.d/05-rpm-epel-release rename to diskimage_builder/elements/epel/pre-install.d/05-rpm-epel-release diff --git a/elements/fedora-minimal/README.rst b/diskimage_builder/elements/fedora-minimal/README.rst similarity index 100% rename from elements/fedora-minimal/README.rst rename to diskimage_builder/elements/fedora-minimal/README.rst diff --git a/elements/fedora-minimal/element-deps b/diskimage_builder/elements/fedora-minimal/element-deps similarity index 100% rename from elements/fedora-minimal/element-deps rename to diskimage_builder/elements/fedora-minimal/element-deps diff --git a/elements/fedora-minimal/element-provides b/diskimage_builder/elements/fedora-minimal/element-provides similarity index 100% rename from elements/fedora-minimal/element-provides rename to diskimage_builder/elements/fedora-minimal/element-provides diff --git a/elements/fedora-minimal/environment.d/10-fedora-distro-name.bash b/diskimage_builder/elements/fedora-minimal/environment.d/10-fedora-distro-name.bash similarity index 100% rename from elements/fedora-minimal/environment.d/10-fedora-distro-name.bash rename to diskimage_builder/elements/fedora-minimal/environment.d/10-fedora-distro-name.bash diff --git a/elements/fedora-minimal/environment.d/11-yum-dnf.bash b/diskimage_builder/elements/fedora-minimal/environment.d/11-yum-dnf.bash similarity index 100% rename from elements/fedora-minimal/environment.d/11-yum-dnf.bash rename to diskimage_builder/elements/fedora-minimal/environment.d/11-yum-dnf.bash diff --git a/elements/fedora-minimal/test-elements/build-succeeds/README.rst b/diskimage_builder/elements/fedora-minimal/test-elements/build-succeeds/README.rst similarity index 100% rename from elements/fedora-minimal/test-elements/build-succeeds/README.rst rename to diskimage_builder/elements/fedora-minimal/test-elements/build-succeeds/README.rst diff --git a/elements/fedora-minimal/test-elements/build-succeeds/environment.d/10-fedora-pin-mirror.bash b/diskimage_builder/elements/fedora-minimal/test-elements/build-succeeds/environment.d/10-fedora-pin-mirror.bash similarity index 100% rename from elements/fedora-minimal/test-elements/build-succeeds/environment.d/10-fedora-pin-mirror.bash rename to diskimage_builder/elements/fedora-minimal/test-elements/build-succeeds/environment.d/10-fedora-pin-mirror.bash diff --git a/elements/fedora-minimal/yum.repos.d/yum.repo b/diskimage_builder/elements/fedora-minimal/yum.repos.d/yum.repo similarity index 100% rename from elements/fedora-minimal/yum.repos.d/yum.repo rename to diskimage_builder/elements/fedora-minimal/yum.repos.d/yum.repo diff --git a/elements/fedora/README.rst b/diskimage_builder/elements/fedora/README.rst similarity index 100% rename from elements/fedora/README.rst rename to diskimage_builder/elements/fedora/README.rst diff --git a/elements/fedora/element-deps b/diskimage_builder/elements/fedora/element-deps similarity index 100% rename from elements/fedora/element-deps rename to diskimage_builder/elements/fedora/element-deps diff --git a/elements/fedora/element-provides b/diskimage_builder/elements/fedora/element-provides similarity index 100% rename from elements/fedora/element-provides rename to diskimage_builder/elements/fedora/element-provides diff --git a/elements/fedora/environment.d/10-fedora-distro-name.bash b/diskimage_builder/elements/fedora/environment.d/10-fedora-distro-name.bash similarity index 100% rename from elements/fedora/environment.d/10-fedora-distro-name.bash rename to diskimage_builder/elements/fedora/environment.d/10-fedora-distro-name.bash diff --git a/elements/fedora/environment.d/11-yum-dnf.bash b/diskimage_builder/elements/fedora/environment.d/11-yum-dnf.bash similarity index 100% rename from elements/fedora/environment.d/11-yum-dnf.bash rename to diskimage_builder/elements/fedora/environment.d/11-yum-dnf.bash diff --git a/elements/fedora/package-installs.yaml b/diskimage_builder/elements/fedora/package-installs.yaml similarity index 100% rename from elements/fedora/package-installs.yaml rename to diskimage_builder/elements/fedora/package-installs.yaml diff --git a/elements/fedora/pre-install.d/01-set-fedora-mirror b/diskimage_builder/elements/fedora/pre-install.d/01-set-fedora-mirror similarity index 100% rename from elements/fedora/pre-install.d/01-set-fedora-mirror rename to diskimage_builder/elements/fedora/pre-install.d/01-set-fedora-mirror diff --git a/elements/fedora/root.d/10-fedora-cloud-image b/diskimage_builder/elements/fedora/root.d/10-fedora-cloud-image similarity index 100% rename from elements/fedora/root.d/10-fedora-cloud-image rename to diskimage_builder/elements/fedora/root.d/10-fedora-cloud-image diff --git a/elements/fedora/test-elements/build-succeeds/element-deps b/diskimage_builder/elements/fedora/test-elements/build-succeeds/element-deps similarity index 100% rename from elements/fedora/test-elements/build-succeeds/element-deps rename to diskimage_builder/elements/fedora/test-elements/build-succeeds/element-deps diff --git a/elements/fedora/test-elements/build-succeeds/environment.d/10-fedora-pin-mirror.bash b/diskimage_builder/elements/fedora/test-elements/build-succeeds/environment.d/10-fedora-pin-mirror.bash similarity index 100% rename from elements/fedora/test-elements/build-succeeds/environment.d/10-fedora-pin-mirror.bash rename to diskimage_builder/elements/fedora/test-elements/build-succeeds/environment.d/10-fedora-pin-mirror.bash diff --git a/elements/gentoo/README.rst b/diskimage_builder/elements/gentoo/README.rst similarity index 100% rename from elements/gentoo/README.rst rename to diskimage_builder/elements/gentoo/README.rst diff --git a/elements/gentoo/bin/install-packages b/diskimage_builder/elements/gentoo/bin/install-packages similarity index 100% rename from elements/gentoo/bin/install-packages rename to diskimage_builder/elements/gentoo/bin/install-packages diff --git a/elements/gentoo/element-deps b/diskimage_builder/elements/gentoo/element-deps similarity index 100% rename from elements/gentoo/element-deps rename to diskimage_builder/elements/gentoo/element-deps diff --git a/elements/gentoo/element-provides b/diskimage_builder/elements/gentoo/element-provides similarity index 100% rename from elements/gentoo/element-provides rename to diskimage_builder/elements/gentoo/element-provides diff --git a/elements/gentoo/environment.d/00-gentoo-envars.bash b/diskimage_builder/elements/gentoo/environment.d/00-gentoo-envars.bash similarity index 100% rename from elements/gentoo/environment.d/00-gentoo-envars.bash rename to diskimage_builder/elements/gentoo/environment.d/00-gentoo-envars.bash diff --git a/elements/gentoo/extra-data.d/gentoo-releng.gpg b/diskimage_builder/elements/gentoo/extra-data.d/gentoo-releng.gpg similarity index 100% rename from elements/gentoo/extra-data.d/gentoo-releng.gpg rename to diskimage_builder/elements/gentoo/extra-data.d/gentoo-releng.gpg diff --git a/elements/gentoo/package-installs.yaml b/diskimage_builder/elements/gentoo/package-installs.yaml similarity index 100% rename from elements/gentoo/package-installs.yaml rename to diskimage_builder/elements/gentoo/package-installs.yaml diff --git a/elements/gentoo/post-install.d/99-cleanup b/diskimage_builder/elements/gentoo/post-install.d/99-cleanup similarity index 100% rename from elements/gentoo/post-install.d/99-cleanup rename to diskimage_builder/elements/gentoo/post-install.d/99-cleanup diff --git a/elements/gentoo/pre-install.d/02-gentoo-migrate-pax b/diskimage_builder/elements/gentoo/pre-install.d/02-gentoo-migrate-pax similarity index 100% rename from elements/gentoo/pre-install.d/02-gentoo-migrate-pax rename to diskimage_builder/elements/gentoo/pre-install.d/02-gentoo-migrate-pax diff --git a/elements/gentoo/root.d/10-gentoo-image b/diskimage_builder/elements/gentoo/root.d/10-gentoo-image similarity index 100% rename from elements/gentoo/root.d/10-gentoo-image rename to diskimage_builder/elements/gentoo/root.d/10-gentoo-image diff --git a/elements/gentoo/test-elements/build-succeeds/README.rst b/diskimage_builder/elements/gentoo/test-elements/build-succeeds/README.rst similarity index 100% rename from elements/gentoo/test-elements/build-succeeds/README.rst rename to diskimage_builder/elements/gentoo/test-elements/build-succeeds/README.rst diff --git a/elements/gentoo/test-elements/build-succeeds/element-deps b/diskimage_builder/elements/gentoo/test-elements/build-succeeds/element-deps similarity index 100% rename from elements/gentoo/test-elements/build-succeeds/element-deps rename to diskimage_builder/elements/gentoo/test-elements/build-succeeds/element-deps diff --git a/elements/growroot/README.rst b/diskimage_builder/elements/growroot/README.rst similarity index 100% rename from elements/growroot/README.rst rename to diskimage_builder/elements/growroot/README.rst diff --git a/elements/growroot/element-deps b/diskimage_builder/elements/growroot/element-deps similarity index 100% rename from elements/growroot/element-deps rename to diskimage_builder/elements/growroot/element-deps diff --git a/elements/growroot/init-scripts/openrc/growroot b/diskimage_builder/elements/growroot/init-scripts/openrc/growroot similarity index 100% rename from elements/growroot/init-scripts/openrc/growroot rename to diskimage_builder/elements/growroot/init-scripts/openrc/growroot diff --git a/elements/growroot/init-scripts/systemd/growroot.service b/diskimage_builder/elements/growroot/init-scripts/systemd/growroot.service similarity index 100% rename from elements/growroot/init-scripts/systemd/growroot.service rename to diskimage_builder/elements/growroot/init-scripts/systemd/growroot.service diff --git a/elements/growroot/init-scripts/upstart/growroot.conf b/diskimage_builder/elements/growroot/init-scripts/upstart/growroot.conf similarity index 100% rename from elements/growroot/init-scripts/upstart/growroot.conf rename to diskimage_builder/elements/growroot/init-scripts/upstart/growroot.conf diff --git a/elements/growroot/package-installs.yaml b/diskimage_builder/elements/growroot/package-installs.yaml similarity index 100% rename from elements/growroot/package-installs.yaml rename to diskimage_builder/elements/growroot/package-installs.yaml diff --git a/elements/growroot/pkg-map b/diskimage_builder/elements/growroot/pkg-map similarity index 100% rename from elements/growroot/pkg-map rename to diskimage_builder/elements/growroot/pkg-map diff --git a/elements/growroot/post-install.d/80-growroot b/diskimage_builder/elements/growroot/post-install.d/80-growroot similarity index 100% rename from elements/growroot/post-install.d/80-growroot rename to diskimage_builder/elements/growroot/post-install.d/80-growroot diff --git a/elements/growroot/static/usr/local/sbin/growroot b/diskimage_builder/elements/growroot/static/usr/local/sbin/growroot similarity index 100% rename from elements/growroot/static/usr/local/sbin/growroot rename to diskimage_builder/elements/growroot/static/usr/local/sbin/growroot diff --git a/elements/grub2/README.rst b/diskimage_builder/elements/grub2/README.rst similarity index 100% rename from elements/grub2/README.rst rename to diskimage_builder/elements/grub2/README.rst diff --git a/elements/grub2/install.d/02-grub-install-spec b/diskimage_builder/elements/grub2/install.d/02-grub-install-spec similarity index 100% rename from elements/grub2/install.d/02-grub-install-spec rename to diskimage_builder/elements/grub2/install.d/02-grub-install-spec diff --git a/elements/grub2/package-installs.yaml b/diskimage_builder/elements/grub2/package-installs.yaml similarity index 100% rename from elements/grub2/package-installs.yaml rename to diskimage_builder/elements/grub2/package-installs.yaml diff --git a/elements/grub2/pkg-map b/diskimage_builder/elements/grub2/pkg-map similarity index 100% rename from elements/grub2/pkg-map rename to diskimage_builder/elements/grub2/pkg-map diff --git a/elements/grub2/post-install.d/01-delete-grubenv b/diskimage_builder/elements/grub2/post-install.d/01-delete-grubenv similarity index 100% rename from elements/grub2/post-install.d/01-delete-grubenv rename to diskimage_builder/elements/grub2/post-install.d/01-delete-grubenv diff --git a/elements/hpdsa/README.rst b/diskimage_builder/elements/hpdsa/README.rst similarity index 100% rename from elements/hpdsa/README.rst rename to diskimage_builder/elements/hpdsa/README.rst diff --git a/elements/hpdsa/package-installs.yaml b/diskimage_builder/elements/hpdsa/package-installs.yaml similarity index 100% rename from elements/hpdsa/package-installs.yaml rename to diskimage_builder/elements/hpdsa/package-installs.yaml diff --git a/elements/hpdsa/post-install.d/95-hpdsa b/diskimage_builder/elements/hpdsa/post-install.d/95-hpdsa similarity index 100% rename from elements/hpdsa/post-install.d/95-hpdsa rename to diskimage_builder/elements/hpdsa/post-install.d/95-hpdsa diff --git a/elements/hpdsa/post-install.d/98-hpdsa-post-dkms b/diskimage_builder/elements/hpdsa/post-install.d/98-hpdsa-post-dkms similarity index 100% rename from elements/hpdsa/post-install.d/98-hpdsa-post-dkms rename to diskimage_builder/elements/hpdsa/post-install.d/98-hpdsa-post-dkms diff --git a/elements/hpdsa/pre-install.d/06-hpdsa b/diskimage_builder/elements/hpdsa/pre-install.d/06-hpdsa similarity index 100% rename from elements/hpdsa/pre-install.d/06-hpdsa rename to diskimage_builder/elements/hpdsa/pre-install.d/06-hpdsa diff --git a/elements/hpdsa/root.d/10-hpdsa-check-distro b/diskimage_builder/elements/hpdsa/root.d/10-hpdsa-check-distro similarity index 100% rename from elements/hpdsa/root.d/10-hpdsa-check-distro rename to diskimage_builder/elements/hpdsa/root.d/10-hpdsa-check-distro diff --git a/elements/hwburnin/README.rst b/diskimage_builder/elements/hwburnin/README.rst similarity index 100% rename from elements/hwburnin/README.rst rename to diskimage_builder/elements/hwburnin/README.rst diff --git a/elements/hwburnin/binary-deps.d/hwburnin b/diskimage_builder/elements/hwburnin/binary-deps.d/hwburnin similarity index 100% rename from elements/hwburnin/binary-deps.d/hwburnin rename to diskimage_builder/elements/hwburnin/binary-deps.d/hwburnin diff --git a/elements/hwburnin/init.d/70-hwburnin b/diskimage_builder/elements/hwburnin/init.d/70-hwburnin similarity index 100% rename from elements/hwburnin/init.d/70-hwburnin rename to diskimage_builder/elements/hwburnin/init.d/70-hwburnin diff --git a/elements/hwdiscovery/README.rst b/diskimage_builder/elements/hwdiscovery/README.rst similarity index 100% rename from elements/hwdiscovery/README.rst rename to diskimage_builder/elements/hwdiscovery/README.rst diff --git a/elements/hwdiscovery/binary-deps.d/hwdiscovery b/diskimage_builder/elements/hwdiscovery/binary-deps.d/hwdiscovery similarity index 100% rename from elements/hwdiscovery/binary-deps.d/hwdiscovery rename to diskimage_builder/elements/hwdiscovery/binary-deps.d/hwdiscovery diff --git a/elements/hwdiscovery/element-deps b/diskimage_builder/elements/hwdiscovery/element-deps similarity index 100% rename from elements/hwdiscovery/element-deps rename to diskimage_builder/elements/hwdiscovery/element-deps diff --git a/elements/hwdiscovery/init.d/60-hwdiscovery b/diskimage_builder/elements/hwdiscovery/init.d/60-hwdiscovery similarity index 100% rename from elements/hwdiscovery/init.d/60-hwdiscovery rename to diskimage_builder/elements/hwdiscovery/init.d/60-hwdiscovery diff --git a/elements/hwdiscovery/package-installs.yaml b/diskimage_builder/elements/hwdiscovery/package-installs.yaml similarity index 100% rename from elements/hwdiscovery/package-installs.yaml rename to diskimage_builder/elements/hwdiscovery/package-installs.yaml diff --git a/elements/ilo/README.rst b/diskimage_builder/elements/ilo/README.rst similarity index 100% rename from elements/ilo/README.rst rename to diskimage_builder/elements/ilo/README.rst diff --git a/elements/ilo/extra-data.d/50-ilo-firmware b/diskimage_builder/elements/ilo/extra-data.d/50-ilo-firmware similarity index 100% rename from elements/ilo/extra-data.d/50-ilo-firmware rename to diskimage_builder/elements/ilo/extra-data.d/50-ilo-firmware diff --git a/elements/ilo/init.d/50-ilo-firmware b/diskimage_builder/elements/ilo/init.d/50-ilo-firmware similarity index 100% rename from elements/ilo/init.d/50-ilo-firmware rename to diskimage_builder/elements/ilo/init.d/50-ilo-firmware diff --git a/elements/ilo/ramdisk-install.d/50-ilo-firmware b/diskimage_builder/elements/ilo/ramdisk-install.d/50-ilo-firmware similarity index 100% rename from elements/ilo/ramdisk-install.d/50-ilo-firmware rename to diskimage_builder/elements/ilo/ramdisk-install.d/50-ilo-firmware diff --git a/elements/install-bin/README.rst b/diskimage_builder/elements/install-bin/README.rst similarity index 100% rename from elements/install-bin/README.rst rename to diskimage_builder/elements/install-bin/README.rst diff --git a/elements/install-bin/pre-install.d/01-install-bin b/diskimage_builder/elements/install-bin/pre-install.d/01-install-bin similarity index 100% rename from elements/install-bin/pre-install.d/01-install-bin rename to diskimage_builder/elements/install-bin/pre-install.d/01-install-bin diff --git a/elements/install-static/README.rst b/diskimage_builder/elements/install-static/README.rst similarity index 100% rename from elements/install-static/README.rst rename to diskimage_builder/elements/install-static/README.rst diff --git a/elements/install-static/element-deps b/diskimage_builder/elements/install-static/element-deps similarity index 100% rename from elements/install-static/element-deps rename to diskimage_builder/elements/install-static/element-deps diff --git a/elements/install-static/install.d/10-install-static-files b/diskimage_builder/elements/install-static/install.d/10-install-static-files similarity index 100% rename from elements/install-static/install.d/10-install-static-files rename to diskimage_builder/elements/install-static/install.d/10-install-static-files diff --git a/elements/install-static/package-installs.yaml b/diskimage_builder/elements/install-static/package-installs.yaml similarity index 100% rename from elements/install-static/package-installs.yaml rename to diskimage_builder/elements/install-static/package-installs.yaml diff --git a/elements/install-types/README.rst b/diskimage_builder/elements/install-types/README.rst similarity index 100% rename from elements/install-types/README.rst rename to diskimage_builder/elements/install-types/README.rst diff --git a/elements/install-types/extra-data.d/99-enable-install-types b/diskimage_builder/elements/install-types/extra-data.d/99-enable-install-types similarity index 100% rename from elements/install-types/extra-data.d/99-enable-install-types rename to diskimage_builder/elements/install-types/extra-data.d/99-enable-install-types diff --git a/elements/ironic-agent/README.rst b/diskimage_builder/elements/ironic-agent/README.rst similarity index 100% rename from elements/ironic-agent/README.rst rename to diskimage_builder/elements/ironic-agent/README.rst diff --git a/elements/ironic-agent/cleanup.d/99-ramdisk-create b/diskimage_builder/elements/ironic-agent/cleanup.d/99-ramdisk-create similarity index 100% rename from elements/ironic-agent/cleanup.d/99-ramdisk-create rename to diskimage_builder/elements/ironic-agent/cleanup.d/99-ramdisk-create diff --git a/elements/ironic-agent/element-deps b/diskimage_builder/elements/ironic-agent/element-deps similarity index 100% rename from elements/ironic-agent/element-deps rename to diskimage_builder/elements/ironic-agent/element-deps diff --git a/elements/ironic-agent/element-provides b/diskimage_builder/elements/ironic-agent/element-provides similarity index 100% rename from elements/ironic-agent/element-provides rename to diskimage_builder/elements/ironic-agent/element-provides diff --git a/elements/ironic-agent/environment.d/01-ironic-agent.sh b/diskimage_builder/elements/ironic-agent/environment.d/01-ironic-agent.sh similarity index 100% rename from elements/ironic-agent/environment.d/01-ironic-agent.sh rename to diskimage_builder/elements/ironic-agent/environment.d/01-ironic-agent.sh diff --git a/elements/ironic-agent/extra-data.d/15-ssl-ca-copy b/diskimage_builder/elements/ironic-agent/extra-data.d/15-ssl-ca-copy similarity index 100% rename from elements/ironic-agent/extra-data.d/15-ssl-ca-copy rename to diskimage_builder/elements/ironic-agent/extra-data.d/15-ssl-ca-copy diff --git a/elements/ironic-agent/finalise.d/99-remove-extra-packages b/diskimage_builder/elements/ironic-agent/finalise.d/99-remove-extra-packages similarity index 100% rename from elements/ironic-agent/finalise.d/99-remove-extra-packages rename to diskimage_builder/elements/ironic-agent/finalise.d/99-remove-extra-packages diff --git a/elements/ironic-agent/install.d/ironic-agent-package-install/package-installs-ironic-agent b/diskimage_builder/elements/ironic-agent/install.d/ironic-agent-package-install/package-installs-ironic-agent similarity index 100% rename from elements/ironic-agent/install.d/ironic-agent-package-install/package-installs-ironic-agent rename to diskimage_builder/elements/ironic-agent/install.d/ironic-agent-package-install/package-installs-ironic-agent diff --git a/elements/ironic-agent/install.d/ironic-agent-source-install/60-ironic-agent-install b/diskimage_builder/elements/ironic-agent/install.d/ironic-agent-source-install/60-ironic-agent-install similarity index 100% rename from elements/ironic-agent/install.d/ironic-agent-source-install/60-ironic-agent-install rename to diskimage_builder/elements/ironic-agent/install.d/ironic-agent-source-install/60-ironic-agent-install diff --git a/elements/ironic-agent/install.d/ironic-agent-source-install/ironic-python-agent.conf b/diskimage_builder/elements/ironic-agent/install.d/ironic-agent-source-install/ironic-python-agent.conf similarity index 100% rename from elements/ironic-agent/install.d/ironic-agent-source-install/ironic-python-agent.conf rename to diskimage_builder/elements/ironic-agent/install.d/ironic-agent-source-install/ironic-python-agent.conf diff --git a/elements/ironic-agent/install.d/ironic-agent-source-install/ironic-python-agent.init b/diskimage_builder/elements/ironic-agent/install.d/ironic-agent-source-install/ironic-python-agent.init similarity index 100% rename from elements/ironic-agent/install.d/ironic-agent-source-install/ironic-python-agent.init rename to diskimage_builder/elements/ironic-agent/install.d/ironic-agent-source-install/ironic-python-agent.init diff --git a/elements/ironic-agent/install.d/ironic-agent-source-install/ironic-python-agent.service b/diskimage_builder/elements/ironic-agent/install.d/ironic-agent-source-install/ironic-python-agent.service similarity index 100% rename from elements/ironic-agent/install.d/ironic-agent-source-install/ironic-python-agent.service rename to diskimage_builder/elements/ironic-agent/install.d/ironic-agent-source-install/ironic-python-agent.service diff --git a/elements/ironic-agent/package-installs.yaml b/diskimage_builder/elements/ironic-agent/package-installs.yaml similarity index 100% rename from elements/ironic-agent/package-installs.yaml rename to diskimage_builder/elements/ironic-agent/package-installs.yaml diff --git a/elements/ironic-agent/pkg-map b/diskimage_builder/elements/ironic-agent/pkg-map similarity index 100% rename from elements/ironic-agent/pkg-map rename to diskimage_builder/elements/ironic-agent/pkg-map diff --git a/elements/ironic-agent/post-install.d/80-ironic-agent b/diskimage_builder/elements/ironic-agent/post-install.d/80-ironic-agent similarity index 100% rename from elements/ironic-agent/post-install.d/80-ironic-agent rename to diskimage_builder/elements/ironic-agent/post-install.d/80-ironic-agent diff --git a/elements/ironic-agent/source-repository-ironic-agent b/diskimage_builder/elements/ironic-agent/source-repository-ironic-agent similarity index 100% rename from elements/ironic-agent/source-repository-ironic-agent rename to diskimage_builder/elements/ironic-agent/source-repository-ironic-agent diff --git a/elements/ironic-agent/svc-map b/diskimage_builder/elements/ironic-agent/svc-map similarity index 100% rename from elements/ironic-agent/svc-map rename to diskimage_builder/elements/ironic-agent/svc-map diff --git a/elements/ironic-agent/test-elements/build-succeeds-fedora/element-deps b/diskimage_builder/elements/ironic-agent/test-elements/build-succeeds-fedora/element-deps similarity index 100% rename from elements/ironic-agent/test-elements/build-succeeds-fedora/element-deps rename to diskimage_builder/elements/ironic-agent/test-elements/build-succeeds-fedora/element-deps diff --git a/elements/ironic-agent/test-elements/build-succeeds-fedora/element-type b/diskimage_builder/elements/ironic-agent/test-elements/build-succeeds-fedora/element-type similarity index 100% rename from elements/ironic-agent/test-elements/build-succeeds-fedora/element-type rename to diskimage_builder/elements/ironic-agent/test-elements/build-succeeds-fedora/element-type diff --git a/elements/ironic-agent/test-elements/build-succeeds-fedora/environment.d/10-fedora-pin-mirror.bash b/diskimage_builder/elements/ironic-agent/test-elements/build-succeeds-fedora/environment.d/10-fedora-pin-mirror.bash similarity index 100% rename from elements/ironic-agent/test-elements/build-succeeds-fedora/environment.d/10-fedora-pin-mirror.bash rename to diskimage_builder/elements/ironic-agent/test-elements/build-succeeds-fedora/environment.d/10-fedora-pin-mirror.bash diff --git a/elements/iso/README.rst b/diskimage_builder/elements/iso/README.rst similarity index 100% rename from elements/iso/README.rst rename to diskimage_builder/elements/iso/README.rst diff --git a/elements/iso/cleanup.d/100-build-iso b/diskimage_builder/elements/iso/cleanup.d/100-build-iso similarity index 100% rename from elements/iso/cleanup.d/100-build-iso rename to diskimage_builder/elements/iso/cleanup.d/100-build-iso diff --git a/elements/iso/element-deps b/diskimage_builder/elements/iso/element-deps similarity index 100% rename from elements/iso/element-deps rename to diskimage_builder/elements/iso/element-deps diff --git a/elements/iso/package-installs.yaml b/diskimage_builder/elements/iso/package-installs.yaml similarity index 100% rename from elements/iso/package-installs.yaml rename to diskimage_builder/elements/iso/package-installs.yaml diff --git a/elements/iso/pkg-map b/diskimage_builder/elements/iso/pkg-map similarity index 100% rename from elements/iso/pkg-map rename to diskimage_builder/elements/iso/pkg-map diff --git a/elements/iso/post-install.d/01-copy-bootloaders b/diskimage_builder/elements/iso/post-install.d/01-copy-bootloaders similarity index 100% rename from elements/iso/post-install.d/01-copy-bootloaders rename to diskimage_builder/elements/iso/post-install.d/01-copy-bootloaders diff --git a/elements/local-config/README.rst b/diskimage_builder/elements/local-config/README.rst similarity index 100% rename from elements/local-config/README.rst rename to diskimage_builder/elements/local-config/README.rst diff --git a/elements/local-config/element-deps b/diskimage_builder/elements/local-config/element-deps similarity index 100% rename from elements/local-config/element-deps rename to diskimage_builder/elements/local-config/element-deps diff --git a/elements/local-config/environment.d/62-ssh-key b/diskimage_builder/elements/local-config/environment.d/62-ssh-key similarity index 100% rename from elements/local-config/environment.d/62-ssh-key rename to diskimage_builder/elements/local-config/environment.d/62-ssh-key diff --git a/elements/local-config/extra-data.d/62-ssh-key b/diskimage_builder/elements/local-config/extra-data.d/62-ssh-key similarity index 100% rename from elements/local-config/extra-data.d/62-ssh-key rename to diskimage_builder/elements/local-config/extra-data.d/62-ssh-key diff --git a/elements/local-config/install.d/62-ssh-key b/diskimage_builder/elements/local-config/install.d/62-ssh-key similarity index 100% rename from elements/local-config/install.d/62-ssh-key rename to diskimage_builder/elements/local-config/install.d/62-ssh-key diff --git a/elements/local-config/package-installs.yaml b/diskimage_builder/elements/local-config/package-installs.yaml similarity index 100% rename from elements/local-config/package-installs.yaml rename to diskimage_builder/elements/local-config/package-installs.yaml diff --git a/elements/local-config/pre-install.d/02-proxy-settings b/diskimage_builder/elements/local-config/pre-install.d/02-proxy-settings similarity index 100% rename from elements/local-config/pre-install.d/02-proxy-settings rename to diskimage_builder/elements/local-config/pre-install.d/02-proxy-settings diff --git a/elements/manifests/README.rst b/diskimage_builder/elements/manifests/README.rst similarity index 100% rename from elements/manifests/README.rst rename to diskimage_builder/elements/manifests/README.rst diff --git a/elements/manifests/cleanup.d/01-copy-manifests-dir b/diskimage_builder/elements/manifests/cleanup.d/01-copy-manifests-dir similarity index 100% rename from elements/manifests/cleanup.d/01-copy-manifests-dir rename to diskimage_builder/elements/manifests/cleanup.d/01-copy-manifests-dir diff --git a/elements/manifests/environment.d/14-manifests b/diskimage_builder/elements/manifests/environment.d/14-manifests similarity index 100% rename from elements/manifests/environment.d/14-manifests rename to diskimage_builder/elements/manifests/environment.d/14-manifests diff --git a/elements/manifests/extra-data.d/20-manifest-dir b/diskimage_builder/elements/manifests/extra-data.d/20-manifest-dir similarity index 100% rename from elements/manifests/extra-data.d/20-manifest-dir rename to diskimage_builder/elements/manifests/extra-data.d/20-manifest-dir diff --git a/elements/mellanox/README.rst b/diskimage_builder/elements/mellanox/README.rst similarity index 100% rename from elements/mellanox/README.rst rename to diskimage_builder/elements/mellanox/README.rst diff --git a/elements/mellanox/init.d/01-mellanox b/diskimage_builder/elements/mellanox/init.d/01-mellanox similarity index 100% rename from elements/mellanox/init.d/01-mellanox rename to diskimage_builder/elements/mellanox/init.d/01-mellanox diff --git a/elements/mellanox/install.d/65-mellanox b/diskimage_builder/elements/mellanox/install.d/65-mellanox similarity index 100% rename from elements/mellanox/install.d/65-mellanox rename to diskimage_builder/elements/mellanox/install.d/65-mellanox diff --git a/elements/mellanox/install.d/mellanox-rules.udev b/diskimage_builder/elements/mellanox/install.d/mellanox-rules.udev similarity index 100% rename from elements/mellanox/install.d/mellanox-rules.udev rename to diskimage_builder/elements/mellanox/install.d/mellanox-rules.udev diff --git a/elements/mellanox/udev.d/81-mellanox-drivers.rules b/diskimage_builder/elements/mellanox/udev.d/81-mellanox-drivers.rules similarity index 100% rename from elements/mellanox/udev.d/81-mellanox-drivers.rules rename to diskimage_builder/elements/mellanox/udev.d/81-mellanox-drivers.rules diff --git a/elements/modprobe-blacklist/README.rst b/diskimage_builder/elements/modprobe-blacklist/README.rst similarity index 100% rename from elements/modprobe-blacklist/README.rst rename to diskimage_builder/elements/modprobe-blacklist/README.rst diff --git a/elements/modprobe-blacklist/install.d/80-modprobe-blacklist b/diskimage_builder/elements/modprobe-blacklist/install.d/80-modprobe-blacklist similarity index 100% rename from elements/modprobe-blacklist/install.d/80-modprobe-blacklist rename to diskimage_builder/elements/modprobe-blacklist/install.d/80-modprobe-blacklist diff --git a/elements/no-final-image/README.rst b/diskimage_builder/elements/no-final-image/README.rst similarity index 100% rename from elements/no-final-image/README.rst rename to diskimage_builder/elements/no-final-image/README.rst diff --git a/elements/oat-client/README.rst b/diskimage_builder/elements/oat-client/README.rst similarity index 100% rename from elements/oat-client/README.rst rename to diskimage_builder/elements/oat-client/README.rst diff --git a/elements/oat-client/element-deps b/diskimage_builder/elements/oat-client/element-deps similarity index 100% rename from elements/oat-client/element-deps rename to diskimage_builder/elements/oat-client/element-deps diff --git a/elements/oat-client/package-installs.yaml b/diskimage_builder/elements/oat-client/package-installs.yaml similarity index 100% rename from elements/oat-client/package-installs.yaml rename to diskimage_builder/elements/oat-client/package-installs.yaml diff --git a/elements/oat-client/yum.repos.d/fedora-oat.repo b/diskimage_builder/elements/oat-client/yum.repos.d/fedora-oat.repo similarity index 100% rename from elements/oat-client/yum.repos.d/fedora-oat.repo rename to diskimage_builder/elements/oat-client/yum.repos.d/fedora-oat.repo diff --git a/elements/opensuse/README.rst b/diskimage_builder/elements/opensuse/README.rst similarity index 100% rename from elements/opensuse/README.rst rename to diskimage_builder/elements/opensuse/README.rst diff --git a/elements/opensuse/element-deps b/diskimage_builder/elements/opensuse/element-deps similarity index 100% rename from elements/opensuse/element-deps rename to diskimage_builder/elements/opensuse/element-deps diff --git a/elements/opensuse/element-provides b/diskimage_builder/elements/opensuse/element-provides similarity index 100% rename from elements/opensuse/element-provides rename to diskimage_builder/elements/opensuse/element-provides diff --git a/elements/opensuse/environment.d/10-opensuse-distro-name.bash b/diskimage_builder/elements/opensuse/environment.d/10-opensuse-distro-name.bash similarity index 100% rename from elements/opensuse/environment.d/10-opensuse-distro-name.bash rename to diskimage_builder/elements/opensuse/environment.d/10-opensuse-distro-name.bash diff --git a/elements/opensuse/extra-data.d/01-inject-defaults b/diskimage_builder/elements/opensuse/extra-data.d/01-inject-defaults similarity index 100% rename from elements/opensuse/extra-data.d/01-inject-defaults rename to diskimage_builder/elements/opensuse/extra-data.d/01-inject-defaults diff --git a/elements/opensuse/package-installs.yaml b/diskimage_builder/elements/opensuse/package-installs.yaml similarity index 100% rename from elements/opensuse/package-installs.yaml rename to diskimage_builder/elements/opensuse/package-installs.yaml diff --git a/elements/opensuse/pre-install.d/00-opensuse-setup b/diskimage_builder/elements/opensuse/pre-install.d/00-opensuse-setup similarity index 100% rename from elements/opensuse/pre-install.d/00-opensuse-setup rename to diskimage_builder/elements/opensuse/pre-install.d/00-opensuse-setup diff --git a/elements/opensuse/root.d/10-opensuse-cloud-image b/diskimage_builder/elements/opensuse/root.d/10-opensuse-cloud-image similarity index 100% rename from elements/opensuse/root.d/10-opensuse-cloud-image rename to diskimage_builder/elements/opensuse/root.d/10-opensuse-cloud-image diff --git a/elements/package-installs/README.rst b/diskimage_builder/elements/package-installs/README.rst similarity index 100% rename from elements/package-installs/README.rst rename to diskimage_builder/elements/package-installs/README.rst diff --git a/elements/package-installs/bin/package-installs b/diskimage_builder/elements/package-installs/bin/package-installs similarity index 100% rename from elements/package-installs/bin/package-installs rename to diskimage_builder/elements/package-installs/bin/package-installs diff --git a/elements/package-installs/bin/package-installs-squash b/diskimage_builder/elements/package-installs/bin/package-installs-squash similarity index 100% rename from elements/package-installs/bin/package-installs-squash rename to diskimage_builder/elements/package-installs/bin/package-installs-squash diff --git a/elements/package-installs/bin/package-installs-v2 b/diskimage_builder/elements/package-installs/bin/package-installs-v2 similarity index 100% rename from elements/package-installs/bin/package-installs-v2 rename to diskimage_builder/elements/package-installs/bin/package-installs-v2 diff --git a/elements/package-installs/bin/package-uninstalls b/diskimage_builder/elements/package-installs/bin/package-uninstalls similarity index 100% rename from elements/package-installs/bin/package-uninstalls rename to diskimage_builder/elements/package-installs/bin/package-uninstalls diff --git a/elements/package-installs/element-deps b/diskimage_builder/elements/package-installs/element-deps similarity index 100% rename from elements/package-installs/element-deps rename to diskimage_builder/elements/package-installs/element-deps diff --git a/elements/package-installs/extra-data.d/99-squash-package-install b/diskimage_builder/elements/package-installs/extra-data.d/99-squash-package-install similarity index 100% rename from elements/package-installs/extra-data.d/99-squash-package-install rename to diskimage_builder/elements/package-installs/extra-data.d/99-squash-package-install diff --git a/elements/package-installs/install.d/01-package-installs b/diskimage_builder/elements/package-installs/install.d/01-package-installs similarity index 100% rename from elements/package-installs/install.d/01-package-installs rename to diskimage_builder/elements/package-installs/install.d/01-package-installs diff --git a/elements/package-installs/install.d/99-package-uninstalls b/diskimage_builder/elements/package-installs/install.d/99-package-uninstalls similarity index 100% rename from elements/package-installs/install.d/99-package-uninstalls rename to diskimage_builder/elements/package-installs/install.d/99-package-uninstalls diff --git a/elements/package-installs/post-install.d/00-package-installs b/diskimage_builder/elements/package-installs/post-install.d/00-package-installs similarity index 100% rename from elements/package-installs/post-install.d/00-package-installs rename to diskimage_builder/elements/package-installs/post-install.d/00-package-installs diff --git a/elements/package-installs/post-install.d/95-package-uninstalls b/diskimage_builder/elements/package-installs/post-install.d/95-package-uninstalls similarity index 100% rename from elements/package-installs/post-install.d/95-package-uninstalls rename to diskimage_builder/elements/package-installs/post-install.d/95-package-uninstalls diff --git a/elements/package-installs/pre-install.d/02-package-installs b/diskimage_builder/elements/package-installs/pre-install.d/02-package-installs similarity index 100% rename from elements/package-installs/pre-install.d/02-package-installs rename to diskimage_builder/elements/package-installs/pre-install.d/02-package-installs diff --git a/elements/package-installs/pre-install.d/99-package-uninstalls b/diskimage_builder/elements/package-installs/pre-install.d/99-package-uninstalls similarity index 100% rename from elements/package-installs/pre-install.d/99-package-uninstalls rename to diskimage_builder/elements/package-installs/pre-install.d/99-package-uninstalls diff --git a/elements/partitioning-sfdisk/README.rst b/diskimage_builder/elements/partitioning-sfdisk/README.rst similarity index 100% rename from elements/partitioning-sfdisk/README.rst rename to diskimage_builder/elements/partitioning-sfdisk/README.rst diff --git a/elements/partitioning-sfdisk/block-device.d/10-partitioning-sfdisk b/diskimage_builder/elements/partitioning-sfdisk/block-device.d/10-partitioning-sfdisk similarity index 100% rename from elements/partitioning-sfdisk/block-device.d/10-partitioning-sfdisk rename to diskimage_builder/elements/partitioning-sfdisk/block-device.d/10-partitioning-sfdisk diff --git a/elements/partitioning-sfdisk/environment.d/10-partitioning-sfdisk b/diskimage_builder/elements/partitioning-sfdisk/environment.d/10-partitioning-sfdisk similarity index 100% rename from elements/partitioning-sfdisk/environment.d/10-partitioning-sfdisk rename to diskimage_builder/elements/partitioning-sfdisk/environment.d/10-partitioning-sfdisk diff --git a/elements/partitioning-sfdisk/finalise.d/50-partitioning-remove-bogus-udev-links b/diskimage_builder/elements/partitioning-sfdisk/finalise.d/50-partitioning-remove-bogus-udev-links similarity index 100% rename from elements/partitioning-sfdisk/finalise.d/50-partitioning-remove-bogus-udev-links rename to diskimage_builder/elements/partitioning-sfdisk/finalise.d/50-partitioning-remove-bogus-udev-links diff --git a/elements/pip-and-virtualenv/README.rst b/diskimage_builder/elements/pip-and-virtualenv/README.rst similarity index 100% rename from elements/pip-and-virtualenv/README.rst rename to diskimage_builder/elements/pip-and-virtualenv/README.rst diff --git a/elements/pip-and-virtualenv/element-deps b/diskimage_builder/elements/pip-and-virtualenv/element-deps similarity index 100% rename from elements/pip-and-virtualenv/element-deps rename to diskimage_builder/elements/pip-and-virtualenv/element-deps diff --git a/elements/pip-and-virtualenv/install.d/pip-and-virtualenv-source-install/01-install-pip b/diskimage_builder/elements/pip-and-virtualenv/install.d/pip-and-virtualenv-source-install/01-install-pip similarity index 100% rename from elements/pip-and-virtualenv/install.d/pip-and-virtualenv-source-install/01-install-pip rename to diskimage_builder/elements/pip-and-virtualenv/install.d/pip-and-virtualenv-source-install/01-install-pip diff --git a/elements/pip-and-virtualenv/package-installs.yaml b/diskimage_builder/elements/pip-and-virtualenv/package-installs.yaml similarity index 100% rename from elements/pip-and-virtualenv/package-installs.yaml rename to diskimage_builder/elements/pip-and-virtualenv/package-installs.yaml diff --git a/elements/pip-and-virtualenv/pkg-map b/diskimage_builder/elements/pip-and-virtualenv/pkg-map similarity index 100% rename from elements/pip-and-virtualenv/pkg-map rename to diskimage_builder/elements/pip-and-virtualenv/pkg-map diff --git a/elements/pip-and-virtualenv/source-repository-pip-and-virtualenv b/diskimage_builder/elements/pip-and-virtualenv/source-repository-pip-and-virtualenv similarity index 100% rename from elements/pip-and-virtualenv/source-repository-pip-and-virtualenv rename to diskimage_builder/elements/pip-and-virtualenv/source-repository-pip-and-virtualenv diff --git a/elements/pip-cache/README.rst b/diskimage_builder/elements/pip-cache/README.rst similarity index 100% rename from elements/pip-cache/README.rst rename to diskimage_builder/elements/pip-cache/README.rst diff --git a/elements/pip-cache/environment.d/10-pip-cache b/diskimage_builder/elements/pip-cache/environment.d/10-pip-cache similarity index 100% rename from elements/pip-cache/environment.d/10-pip-cache rename to diskimage_builder/elements/pip-cache/environment.d/10-pip-cache diff --git a/elements/pip-cache/root.d/01-pip-cache b/diskimage_builder/elements/pip-cache/root.d/01-pip-cache similarity index 100% rename from elements/pip-cache/root.d/01-pip-cache rename to diskimage_builder/elements/pip-cache/root.d/01-pip-cache diff --git a/elements/pkg-map/README.rst b/diskimage_builder/elements/pkg-map/README.rst similarity index 100% rename from elements/pkg-map/README.rst rename to diskimage_builder/elements/pkg-map/README.rst diff --git a/elements/pkg-map/bin/pkg-map b/diskimage_builder/elements/pkg-map/bin/pkg-map similarity index 100% rename from elements/pkg-map/bin/pkg-map rename to diskimage_builder/elements/pkg-map/bin/pkg-map diff --git a/elements/pkg-map/element-deps b/diskimage_builder/elements/pkg-map/element-deps similarity index 100% rename from elements/pkg-map/element-deps rename to diskimage_builder/elements/pkg-map/element-deps diff --git a/elements/pkg-map/extra-data.d/10-create-pkg-map-dir b/diskimage_builder/elements/pkg-map/extra-data.d/10-create-pkg-map-dir similarity index 100% rename from elements/pkg-map/extra-data.d/10-create-pkg-map-dir rename to diskimage_builder/elements/pkg-map/extra-data.d/10-create-pkg-map-dir diff --git a/elements/posix/README.rst b/diskimage_builder/elements/posix/README.rst similarity index 100% rename from elements/posix/README.rst rename to diskimage_builder/elements/posix/README.rst diff --git a/elements/posix/element-deps b/diskimage_builder/elements/posix/element-deps similarity index 100% rename from elements/posix/element-deps rename to diskimage_builder/elements/posix/element-deps diff --git a/elements/posix/package-installs.yaml b/diskimage_builder/elements/posix/package-installs.yaml similarity index 100% rename from elements/posix/package-installs.yaml rename to diskimage_builder/elements/posix/package-installs.yaml diff --git a/elements/posix/pkg-map b/diskimage_builder/elements/posix/pkg-map similarity index 100% rename from elements/posix/pkg-map rename to diskimage_builder/elements/posix/pkg-map diff --git a/elements/proliant-tools/README.rst b/diskimage_builder/elements/proliant-tools/README.rst similarity index 100% rename from elements/proliant-tools/README.rst rename to diskimage_builder/elements/proliant-tools/README.rst diff --git a/elements/proliant-tools/element-deps b/diskimage_builder/elements/proliant-tools/element-deps similarity index 100% rename from elements/proliant-tools/element-deps rename to diskimage_builder/elements/proliant-tools/element-deps diff --git a/elements/proliant-tools/install.d/65-proliant-tools-install b/diskimage_builder/elements/proliant-tools/install.d/65-proliant-tools-install similarity index 100% rename from elements/proliant-tools/install.d/65-proliant-tools-install rename to diskimage_builder/elements/proliant-tools/install.d/65-proliant-tools-install diff --git a/elements/proliant-tools/package-installs.yaml b/diskimage_builder/elements/proliant-tools/package-installs.yaml similarity index 100% rename from elements/proliant-tools/package-installs.yaml rename to diskimage_builder/elements/proliant-tools/package-installs.yaml diff --git a/elements/proliant-tools/pkg-map b/diskimage_builder/elements/proliant-tools/pkg-map similarity index 100% rename from elements/proliant-tools/pkg-map rename to diskimage_builder/elements/proliant-tools/pkg-map diff --git a/elements/pypi/README.rst b/diskimage_builder/elements/pypi/README.rst similarity index 100% rename from elements/pypi/README.rst rename to diskimage_builder/elements/pypi/README.rst diff --git a/elements/pypi/extra-data.d/00-mount-pypi-mirror b/diskimage_builder/elements/pypi/extra-data.d/00-mount-pypi-mirror similarity index 100% rename from elements/pypi/extra-data.d/00-mount-pypi-mirror rename to diskimage_builder/elements/pypi/extra-data.d/00-mount-pypi-mirror diff --git a/elements/pypi/post-install.d/00-unconfigure-pypi-mirror b/diskimage_builder/elements/pypi/post-install.d/00-unconfigure-pypi-mirror similarity index 100% rename from elements/pypi/post-install.d/00-unconfigure-pypi-mirror rename to diskimage_builder/elements/pypi/post-install.d/00-unconfigure-pypi-mirror diff --git a/elements/pypi/pre-install.d/00-configure-pypi-mirror b/diskimage_builder/elements/pypi/pre-install.d/00-configure-pypi-mirror similarity index 100% rename from elements/pypi/pre-install.d/00-configure-pypi-mirror rename to diskimage_builder/elements/pypi/pre-install.d/00-configure-pypi-mirror diff --git a/elements/ramdisk-base/README.rst b/diskimage_builder/elements/ramdisk-base/README.rst similarity index 100% rename from elements/ramdisk-base/README.rst rename to diskimage_builder/elements/ramdisk-base/README.rst diff --git a/elements/ramdisk-base/cleanup.d/99-extract-ramdisk-files b/diskimage_builder/elements/ramdisk-base/cleanup.d/99-extract-ramdisk-files similarity index 100% rename from elements/ramdisk-base/cleanup.d/99-extract-ramdisk-files rename to diskimage_builder/elements/ramdisk-base/cleanup.d/99-extract-ramdisk-files diff --git a/elements/ramdisk-base/extra-data.d/01-inject-ramdisk-build-files b/diskimage_builder/elements/ramdisk-base/extra-data.d/01-inject-ramdisk-build-files similarity index 100% rename from elements/ramdisk-base/extra-data.d/01-inject-ramdisk-build-files rename to diskimage_builder/elements/ramdisk-base/extra-data.d/01-inject-ramdisk-build-files diff --git a/elements/ramdisk-base/extra-data.d/scripts/d/init-func b/diskimage_builder/elements/ramdisk-base/extra-data.d/scripts/d/init-func similarity index 100% rename from elements/ramdisk-base/extra-data.d/scripts/d/init-func rename to diskimage_builder/elements/ramdisk-base/extra-data.d/scripts/d/init-func diff --git a/elements/ramdisk-base/extra-data.d/scripts/init b/diskimage_builder/elements/ramdisk-base/extra-data.d/scripts/init similarity index 100% rename from elements/ramdisk-base/extra-data.d/scripts/init rename to diskimage_builder/elements/ramdisk-base/extra-data.d/scripts/init diff --git a/elements/ramdisk-base/extra-data.d/scripts/init-end b/diskimage_builder/elements/ramdisk-base/extra-data.d/scripts/init-end similarity index 100% rename from elements/ramdisk-base/extra-data.d/scripts/init-end rename to diskimage_builder/elements/ramdisk-base/extra-data.d/scripts/init-end diff --git a/elements/ramdisk-base/init.d/20-init-variables b/diskimage_builder/elements/ramdisk-base/init.d/20-init-variables similarity index 100% rename from elements/ramdisk-base/init.d/20-init-variables rename to diskimage_builder/elements/ramdisk-base/init.d/20-init-variables diff --git a/elements/ramdisk-base/init.d/40-check-network-ready b/diskimage_builder/elements/ramdisk-base/init.d/40-check-network-ready similarity index 100% rename from elements/ramdisk-base/init.d/40-check-network-ready rename to diskimage_builder/elements/ramdisk-base/init.d/40-check-network-ready diff --git a/elements/ramdisk-base/post-install.d/01-ensure-binaries b/diskimage_builder/elements/ramdisk-base/post-install.d/01-ensure-binaries similarity index 100% rename from elements/ramdisk-base/post-install.d/01-ensure-binaries rename to diskimage_builder/elements/ramdisk-base/post-install.d/01-ensure-binaries diff --git a/elements/ramdisk-base/udev.d/60-persistent-storage.rules b/diskimage_builder/elements/ramdisk-base/udev.d/60-persistent-storage.rules similarity index 100% rename from elements/ramdisk-base/udev.d/60-persistent-storage.rules rename to diskimage_builder/elements/ramdisk-base/udev.d/60-persistent-storage.rules diff --git a/elements/ramdisk/README.rst b/diskimage_builder/elements/ramdisk/README.rst similarity index 100% rename from elements/ramdisk/README.rst rename to diskimage_builder/elements/ramdisk/README.rst diff --git a/elements/ramdisk/binary-deps.d/ramdisk b/diskimage_builder/elements/ramdisk/binary-deps.d/ramdisk similarity index 100% rename from elements/ramdisk/binary-deps.d/ramdisk rename to diskimage_builder/elements/ramdisk/binary-deps.d/ramdisk diff --git a/elements/ramdisk/element-deps b/diskimage_builder/elements/ramdisk/element-deps similarity index 100% rename from elements/ramdisk/element-deps rename to diskimage_builder/elements/ramdisk/element-deps diff --git a/elements/ramdisk/init.d/10-start-base-system b/diskimage_builder/elements/ramdisk/init.d/10-start-base-system similarity index 100% rename from elements/ramdisk/init.d/10-start-base-system rename to diskimage_builder/elements/ramdisk/init.d/10-start-base-system diff --git a/elements/ramdisk/init.d/30-start-network b/diskimage_builder/elements/ramdisk/init.d/30-start-network similarity index 100% rename from elements/ramdisk/init.d/30-start-network rename to diskimage_builder/elements/ramdisk/init.d/30-start-network diff --git a/elements/ramdisk/install.d/20-install-dhcp-client b/diskimage_builder/elements/ramdisk/install.d/20-install-dhcp-client similarity index 100% rename from elements/ramdisk/install.d/20-install-dhcp-client rename to diskimage_builder/elements/ramdisk/install.d/20-install-dhcp-client diff --git a/elements/ramdisk/install.d/52-ramdisk-install-busybox b/diskimage_builder/elements/ramdisk/install.d/52-ramdisk-install-busybox similarity index 100% rename from elements/ramdisk/install.d/52-ramdisk-install-busybox rename to diskimage_builder/elements/ramdisk/install.d/52-ramdisk-install-busybox diff --git a/elements/ramdisk/pkg-map b/diskimage_builder/elements/ramdisk/pkg-map similarity index 100% rename from elements/ramdisk/pkg-map rename to diskimage_builder/elements/ramdisk/pkg-map diff --git a/elements/ramdisk/post-install.d/99-build-ramdisk b/diskimage_builder/elements/ramdisk/post-install.d/99-build-ramdisk similarity index 100% rename from elements/ramdisk/post-install.d/99-build-ramdisk rename to diskimage_builder/elements/ramdisk/post-install.d/99-build-ramdisk diff --git a/elements/rax-nova-agent/README.rst b/diskimage_builder/elements/rax-nova-agent/README.rst similarity index 100% rename from elements/rax-nova-agent/README.rst rename to diskimage_builder/elements/rax-nova-agent/README.rst diff --git a/elements/rax-nova-agent/element-deps b/diskimage_builder/elements/rax-nova-agent/element-deps similarity index 100% rename from elements/rax-nova-agent/element-deps rename to diskimage_builder/elements/rax-nova-agent/element-deps diff --git a/elements/rax-nova-agent/install.d/05-xen-tools b/diskimage_builder/elements/rax-nova-agent/install.d/05-xen-tools similarity index 100% rename from elements/rax-nova-agent/install.d/05-xen-tools rename to diskimage_builder/elements/rax-nova-agent/install.d/05-xen-tools diff --git a/elements/rax-nova-agent/install.d/10-nova-agent b/diskimage_builder/elements/rax-nova-agent/install.d/10-nova-agent similarity index 100% rename from elements/rax-nova-agent/install.d/10-nova-agent rename to diskimage_builder/elements/rax-nova-agent/install.d/10-nova-agent diff --git a/elements/rax-nova-agent/package-installs.yaml b/diskimage_builder/elements/rax-nova-agent/package-installs.yaml similarity index 100% rename from elements/rax-nova-agent/package-installs.yaml rename to diskimage_builder/elements/rax-nova-agent/package-installs.yaml diff --git a/elements/rax-nova-agent/source-repository-nova-agent b/diskimage_builder/elements/rax-nova-agent/source-repository-nova-agent similarity index 100% rename from elements/rax-nova-agent/source-repository-nova-agent rename to diskimage_builder/elements/rax-nova-agent/source-repository-nova-agent diff --git a/elements/rax-nova-agent/source-repository-xen-tools b/diskimage_builder/elements/rax-nova-agent/source-repository-xen-tools similarity index 100% rename from elements/rax-nova-agent/source-repository-xen-tools rename to diskimage_builder/elements/rax-nova-agent/source-repository-xen-tools diff --git a/elements/redhat-common/README.rst b/diskimage_builder/elements/redhat-common/README.rst similarity index 100% rename from elements/redhat-common/README.rst rename to diskimage_builder/elements/redhat-common/README.rst diff --git a/elements/redhat-common/bin/extract-image b/diskimage_builder/elements/redhat-common/bin/extract-image similarity index 100% rename from elements/redhat-common/bin/extract-image rename to diskimage_builder/elements/redhat-common/bin/extract-image diff --git a/elements/redhat-common/bin/map-packages b/diskimage_builder/elements/redhat-common/bin/map-packages similarity index 100% rename from elements/redhat-common/bin/map-packages rename to diskimage_builder/elements/redhat-common/bin/map-packages diff --git a/elements/redhat-common/element-deps b/diskimage_builder/elements/redhat-common/element-deps similarity index 100% rename from elements/redhat-common/element-deps rename to diskimage_builder/elements/redhat-common/element-deps diff --git a/elements/redhat-common/environment.d/50-redhat-common b/diskimage_builder/elements/redhat-common/environment.d/50-redhat-common similarity index 100% rename from elements/redhat-common/environment.d/50-redhat-common rename to diskimage_builder/elements/redhat-common/environment.d/50-redhat-common diff --git a/elements/redhat-common/finalise.d/01-clean-old-kernels b/diskimage_builder/elements/redhat-common/finalise.d/01-clean-old-kernels similarity index 100% rename from elements/redhat-common/finalise.d/01-clean-old-kernels rename to diskimage_builder/elements/redhat-common/finalise.d/01-clean-old-kernels diff --git a/elements/redhat-common/finalise.d/99-cleanup-tmp-grub b/diskimage_builder/elements/redhat-common/finalise.d/99-cleanup-tmp-grub similarity index 100% rename from elements/redhat-common/finalise.d/99-cleanup-tmp-grub rename to diskimage_builder/elements/redhat-common/finalise.d/99-cleanup-tmp-grub diff --git a/elements/redhat-common/package-installs.yaml b/diskimage_builder/elements/redhat-common/package-installs.yaml similarity index 100% rename from elements/redhat-common/package-installs.yaml rename to diskimage_builder/elements/redhat-common/package-installs.yaml diff --git a/elements/redhat-common/pre-install.d/15-remove-grub b/diskimage_builder/elements/redhat-common/pre-install.d/15-remove-grub similarity index 100% rename from elements/redhat-common/pre-install.d/15-remove-grub rename to diskimage_builder/elements/redhat-common/pre-install.d/15-remove-grub diff --git a/elements/rhel-common/README.rst b/diskimage_builder/elements/rhel-common/README.rst similarity index 100% rename from elements/rhel-common/README.rst rename to diskimage_builder/elements/rhel-common/README.rst diff --git a/elements/rhel-common/finalise.d/60-unregister b/diskimage_builder/elements/rhel-common/finalise.d/60-unregister similarity index 100% rename from elements/rhel-common/finalise.d/60-unregister rename to diskimage_builder/elements/rhel-common/finalise.d/60-unregister diff --git a/elements/rhel-common/install.d/10-openstack-selinux-rhel b/diskimage_builder/elements/rhel-common/install.d/10-openstack-selinux-rhel similarity index 100% rename from elements/rhel-common/install.d/10-openstack-selinux-rhel rename to diskimage_builder/elements/rhel-common/install.d/10-openstack-selinux-rhel diff --git a/elements/rhel-common/os-refresh-config/pre-configure.d/06-rhel-registration b/diskimage_builder/elements/rhel-common/os-refresh-config/pre-configure.d/06-rhel-registration similarity index 100% rename from elements/rhel-common/os-refresh-config/pre-configure.d/06-rhel-registration rename to diskimage_builder/elements/rhel-common/os-refresh-config/pre-configure.d/06-rhel-registration diff --git a/elements/rhel-common/pre-install.d/00-rhel-registration b/diskimage_builder/elements/rhel-common/pre-install.d/00-rhel-registration similarity index 100% rename from elements/rhel-common/pre-install.d/00-rhel-registration rename to diskimage_builder/elements/rhel-common/pre-install.d/00-rhel-registration diff --git a/elements/rhel-common/pre-install.d/00-rhsm b/diskimage_builder/elements/rhel-common/pre-install.d/00-rhsm similarity index 100% rename from elements/rhel-common/pre-install.d/00-rhsm rename to diskimage_builder/elements/rhel-common/pre-install.d/00-rhsm diff --git a/elements/rhel-common/pre-install.d/10-rhel-blacklist b/diskimage_builder/elements/rhel-common/pre-install.d/10-rhel-blacklist similarity index 100% rename from elements/rhel-common/pre-install.d/10-rhel-blacklist rename to diskimage_builder/elements/rhel-common/pre-install.d/10-rhel-blacklist diff --git a/elements/rhel/README.rst b/diskimage_builder/elements/rhel/README.rst similarity index 100% rename from elements/rhel/README.rst rename to diskimage_builder/elements/rhel/README.rst diff --git a/elements/rhel/bin/map-packages b/diskimage_builder/elements/rhel/bin/map-packages similarity index 100% rename from elements/rhel/bin/map-packages rename to diskimage_builder/elements/rhel/bin/map-packages diff --git a/elements/rhel/element-deps b/diskimage_builder/elements/rhel/element-deps similarity index 100% rename from elements/rhel/element-deps rename to diskimage_builder/elements/rhel/element-deps diff --git a/elements/rhel/element-provides b/diskimage_builder/elements/rhel/element-provides similarity index 100% rename from elements/rhel/element-provides rename to diskimage_builder/elements/rhel/element-provides diff --git a/elements/rhel/environment.d/10-rhel-distro-name.bash b/diskimage_builder/elements/rhel/environment.d/10-rhel-distro-name.bash similarity index 100% rename from elements/rhel/environment.d/10-rhel-distro-name.bash rename to diskimage_builder/elements/rhel/environment.d/10-rhel-distro-name.bash diff --git a/elements/rhel/finalise.d/60-rhsm-unregister b/diskimage_builder/elements/rhel/finalise.d/60-rhsm-unregister similarity index 100% rename from elements/rhel/finalise.d/60-rhsm-unregister rename to diskimage_builder/elements/rhel/finalise.d/60-rhsm-unregister diff --git a/elements/rhel/root.d/10-rhel-cloud-image b/diskimage_builder/elements/rhel/root.d/10-rhel-cloud-image similarity index 100% rename from elements/rhel/root.d/10-rhel-cloud-image rename to diskimage_builder/elements/rhel/root.d/10-rhel-cloud-image diff --git a/elements/rhel7/README.rst b/diskimage_builder/elements/rhel7/README.rst similarity index 100% rename from elements/rhel7/README.rst rename to diskimage_builder/elements/rhel7/README.rst diff --git a/elements/rhel7/element-deps b/diskimage_builder/elements/rhel7/element-deps similarity index 100% rename from elements/rhel7/element-deps rename to diskimage_builder/elements/rhel7/element-deps diff --git a/elements/rhel7/element-provides b/diskimage_builder/elements/rhel7/element-provides similarity index 100% rename from elements/rhel7/element-provides rename to diskimage_builder/elements/rhel7/element-provides diff --git a/elements/rhel7/environment.d/10-rhel7-distro-name.bash b/diskimage_builder/elements/rhel7/environment.d/10-rhel7-distro-name.bash similarity index 100% rename from elements/rhel7/environment.d/10-rhel7-distro-name.bash rename to diskimage_builder/elements/rhel7/environment.d/10-rhel7-distro-name.bash diff --git a/elements/rhel7/root.d/10-rhel7-cloud-image b/diskimage_builder/elements/rhel7/root.d/10-rhel7-cloud-image similarity index 100% rename from elements/rhel7/root.d/10-rhel7-cloud-image rename to diskimage_builder/elements/rhel7/root.d/10-rhel7-cloud-image diff --git a/elements/rpm-distro/finalise.d/90-selinux-fixfiles-restore b/diskimage_builder/elements/rpm-distro/finalise.d/90-selinux-fixfiles-restore similarity index 100% rename from elements/rpm-distro/finalise.d/90-selinux-fixfiles-restore rename to diskimage_builder/elements/rpm-distro/finalise.d/90-selinux-fixfiles-restore diff --git a/elements/rpm-distro/post-install.d/05-fstab-rootfs-label b/diskimage_builder/elements/rpm-distro/post-install.d/05-fstab-rootfs-label similarity index 100% rename from elements/rpm-distro/post-install.d/05-fstab-rootfs-label rename to diskimage_builder/elements/rpm-distro/post-install.d/05-fstab-rootfs-label diff --git a/elements/rpm-distro/post-install.d/06-network-config-nonzeroconf b/diskimage_builder/elements/rpm-distro/post-install.d/06-network-config-nonzeroconf similarity index 100% rename from elements/rpm-distro/post-install.d/06-network-config-nonzeroconf rename to diskimage_builder/elements/rpm-distro/post-install.d/06-network-config-nonzeroconf diff --git a/elements/rpm-distro/pre-install.d/00-fix-requiretty b/diskimage_builder/elements/rpm-distro/pre-install.d/00-fix-requiretty similarity index 100% rename from elements/rpm-distro/pre-install.d/00-fix-requiretty rename to diskimage_builder/elements/rpm-distro/pre-install.d/00-fix-requiretty diff --git a/elements/rpm-distro/pre-install.d/00-usr-local-bin-secure-path b/diskimage_builder/elements/rpm-distro/pre-install.d/00-usr-local-bin-secure-path similarity index 100% rename from elements/rpm-distro/pre-install.d/00-usr-local-bin-secure-path rename to diskimage_builder/elements/rpm-distro/pre-install.d/00-usr-local-bin-secure-path diff --git a/elements/rpm-distro/pre-install.d/01-override-yum-arch b/diskimage_builder/elements/rpm-distro/pre-install.d/01-override-yum-arch similarity index 100% rename from elements/rpm-distro/pre-install.d/01-override-yum-arch rename to diskimage_builder/elements/rpm-distro/pre-install.d/01-override-yum-arch diff --git a/elements/runtime-ssh-host-keys/README.rst b/diskimage_builder/elements/runtime-ssh-host-keys/README.rst similarity index 100% rename from elements/runtime-ssh-host-keys/README.rst rename to diskimage_builder/elements/runtime-ssh-host-keys/README.rst diff --git a/elements/runtime-ssh-host-keys/cleanup.d/90-remove-ssh-host-keys b/diskimage_builder/elements/runtime-ssh-host-keys/cleanup.d/90-remove-ssh-host-keys similarity index 100% rename from elements/runtime-ssh-host-keys/cleanup.d/90-remove-ssh-host-keys rename to diskimage_builder/elements/runtime-ssh-host-keys/cleanup.d/90-remove-ssh-host-keys diff --git a/elements/runtime-ssh-host-keys/element-deps b/diskimage_builder/elements/runtime-ssh-host-keys/element-deps similarity index 100% rename from elements/runtime-ssh-host-keys/element-deps rename to diskimage_builder/elements/runtime-ssh-host-keys/element-deps diff --git a/elements/runtime-ssh-host-keys/init-scripts/systemd/ssh-keygen.service b/diskimage_builder/elements/runtime-ssh-host-keys/init-scripts/systemd/ssh-keygen.service similarity index 100% rename from elements/runtime-ssh-host-keys/init-scripts/systemd/ssh-keygen.service rename to diskimage_builder/elements/runtime-ssh-host-keys/init-scripts/systemd/ssh-keygen.service diff --git a/elements/runtime-ssh-host-keys/init-scripts/upstart/ssh-keygen.conf b/diskimage_builder/elements/runtime-ssh-host-keys/init-scripts/upstart/ssh-keygen.conf similarity index 100% rename from elements/runtime-ssh-host-keys/init-scripts/upstart/ssh-keygen.conf rename to diskimage_builder/elements/runtime-ssh-host-keys/init-scripts/upstart/ssh-keygen.conf diff --git a/elements/runtime-ssh-host-keys/package-installs.yaml b/diskimage_builder/elements/runtime-ssh-host-keys/package-installs.yaml similarity index 100% rename from elements/runtime-ssh-host-keys/package-installs.yaml rename to diskimage_builder/elements/runtime-ssh-host-keys/package-installs.yaml diff --git a/elements/runtime-ssh-host-keys/pkg-map b/diskimage_builder/elements/runtime-ssh-host-keys/pkg-map similarity index 100% rename from elements/runtime-ssh-host-keys/pkg-map rename to diskimage_builder/elements/runtime-ssh-host-keys/pkg-map diff --git a/elements/runtime-ssh-host-keys/post-install.d/80-ssh-keygen b/diskimage_builder/elements/runtime-ssh-host-keys/post-install.d/80-ssh-keygen similarity index 100% rename from elements/runtime-ssh-host-keys/post-install.d/80-ssh-keygen rename to diskimage_builder/elements/runtime-ssh-host-keys/post-install.d/80-ssh-keygen diff --git a/elements/select-boot-kernel-initrd/README.rst b/diskimage_builder/elements/select-boot-kernel-initrd/README.rst similarity index 100% rename from elements/select-boot-kernel-initrd/README.rst rename to diskimage_builder/elements/select-boot-kernel-initrd/README.rst diff --git a/elements/select-boot-kernel-initrd/bin/select-boot-kernel-initrd b/diskimage_builder/elements/select-boot-kernel-initrd/bin/select-boot-kernel-initrd similarity index 100% rename from elements/select-boot-kernel-initrd/bin/select-boot-kernel-initrd rename to diskimage_builder/elements/select-boot-kernel-initrd/bin/select-boot-kernel-initrd diff --git a/elements/select-boot-kernel-initrd/cleanup.d/99-remove-dib-img-functions b/diskimage_builder/elements/select-boot-kernel-initrd/cleanup.d/99-remove-dib-img-functions similarity index 100% rename from elements/select-boot-kernel-initrd/cleanup.d/99-remove-dib-img-functions rename to diskimage_builder/elements/select-boot-kernel-initrd/cleanup.d/99-remove-dib-img-functions diff --git a/elements/select-boot-kernel-initrd/extra-data.d/99-copy-dib-img-functions b/diskimage_builder/elements/select-boot-kernel-initrd/extra-data.d/99-copy-dib-img-functions similarity index 100% rename from elements/select-boot-kernel-initrd/extra-data.d/99-copy-dib-img-functions rename to diskimage_builder/elements/select-boot-kernel-initrd/extra-data.d/99-copy-dib-img-functions diff --git a/elements/selinux-permissive/README.rst b/diskimage_builder/elements/selinux-permissive/README.rst similarity index 100% rename from elements/selinux-permissive/README.rst rename to diskimage_builder/elements/selinux-permissive/README.rst diff --git a/elements/selinux-permissive/install.d/11-selinux-permissive b/diskimage_builder/elements/selinux-permissive/install.d/11-selinux-permissive similarity index 100% rename from elements/selinux-permissive/install.d/11-selinux-permissive rename to diskimage_builder/elements/selinux-permissive/install.d/11-selinux-permissive diff --git a/elements/simple-init/README.rst b/diskimage_builder/elements/simple-init/README.rst similarity index 100% rename from elements/simple-init/README.rst rename to diskimage_builder/elements/simple-init/README.rst diff --git a/elements/simple-init/element-deps b/diskimage_builder/elements/simple-init/element-deps similarity index 100% rename from elements/simple-init/element-deps rename to diskimage_builder/elements/simple-init/element-deps diff --git a/elements/simple-init/environment.d/50-disable-cloud-init b/diskimage_builder/elements/simple-init/environment.d/50-disable-cloud-init similarity index 100% rename from elements/simple-init/environment.d/50-disable-cloud-init rename to diskimage_builder/elements/simple-init/environment.d/50-disable-cloud-init diff --git a/elements/simple-init/install.d/50-simple-init b/diskimage_builder/elements/simple-init/install.d/50-simple-init similarity index 100% rename from elements/simple-init/install.d/50-simple-init rename to diskimage_builder/elements/simple-init/install.d/50-simple-init diff --git a/elements/simple-init/install.d/60-simple-init-remove-interfaces b/diskimage_builder/elements/simple-init/install.d/60-simple-init-remove-interfaces similarity index 100% rename from elements/simple-init/install.d/60-simple-init-remove-interfaces rename to diskimage_builder/elements/simple-init/install.d/60-simple-init-remove-interfaces diff --git a/elements/simple-init/install.d/simple-init-repo-install/40-glean b/diskimage_builder/elements/simple-init/install.d/simple-init-repo-install/40-glean similarity index 100% rename from elements/simple-init/install.d/simple-init-repo-install/40-glean rename to diskimage_builder/elements/simple-init/install.d/simple-init-repo-install/40-glean diff --git a/elements/simple-init/install.d/simple-init-source-install/40-glean b/diskimage_builder/elements/simple-init/install.d/simple-init-source-install/40-glean similarity index 100% rename from elements/simple-init/install.d/simple-init-source-install/40-glean rename to diskimage_builder/elements/simple-init/install.d/simple-init-source-install/40-glean diff --git a/elements/simple-init/package-installs.yaml b/diskimage_builder/elements/simple-init/package-installs.yaml similarity index 100% rename from elements/simple-init/package-installs.yaml rename to diskimage_builder/elements/simple-init/package-installs.yaml diff --git a/elements/simple-init/pkg-map b/diskimage_builder/elements/simple-init/pkg-map similarity index 100% rename from elements/simple-init/pkg-map rename to diskimage_builder/elements/simple-init/pkg-map diff --git a/elements/simple-init/source-repository-simple-init b/diskimage_builder/elements/simple-init/source-repository-simple-init similarity index 100% rename from elements/simple-init/source-repository-simple-init rename to diskimage_builder/elements/simple-init/source-repository-simple-init diff --git a/elements/source-repositories/README.rst b/diskimage_builder/elements/source-repositories/README.rst similarity index 100% rename from elements/source-repositories/README.rst rename to diskimage_builder/elements/source-repositories/README.rst diff --git a/elements/source-repositories/element-deps b/diskimage_builder/elements/source-repositories/element-deps similarity index 100% rename from elements/source-repositories/element-deps rename to diskimage_builder/elements/source-repositories/element-deps diff --git a/elements/source-repositories/extra-data.d/98-source-repositories b/diskimage_builder/elements/source-repositories/extra-data.d/98-source-repositories similarity index 100% rename from elements/source-repositories/extra-data.d/98-source-repositories rename to diskimage_builder/elements/source-repositories/extra-data.d/98-source-repositories diff --git a/elements/source-repositories/package-installs.yaml b/diskimage_builder/elements/source-repositories/package-installs.yaml similarity index 100% rename from elements/source-repositories/package-installs.yaml rename to diskimage_builder/elements/source-repositories/package-installs.yaml diff --git a/elements/source-repositories/pkg-map b/diskimage_builder/elements/source-repositories/pkg-map similarity index 100% rename from elements/source-repositories/pkg-map rename to diskimage_builder/elements/source-repositories/pkg-map diff --git a/elements/stable-interface-names/README.rst b/diskimage_builder/elements/stable-interface-names/README.rst similarity index 100% rename from elements/stable-interface-names/README.rst rename to diskimage_builder/elements/stable-interface-names/README.rst diff --git a/elements/stable-interface-names/element-deps b/diskimage_builder/elements/stable-interface-names/element-deps similarity index 100% rename from elements/stable-interface-names/element-deps rename to diskimage_builder/elements/stable-interface-names/element-deps diff --git a/elements/stable-interface-names/install.d/02-stable-interface-names b/diskimage_builder/elements/stable-interface-names/install.d/02-stable-interface-names similarity index 100% rename from elements/stable-interface-names/install.d/02-stable-interface-names rename to diskimage_builder/elements/stable-interface-names/install.d/02-stable-interface-names diff --git a/elements/stable-interface-names/package-installs.yaml b/diskimage_builder/elements/stable-interface-names/package-installs.yaml similarity index 100% rename from elements/stable-interface-names/package-installs.yaml rename to diskimage_builder/elements/stable-interface-names/package-installs.yaml diff --git a/elements/svc-map/README.rst b/diskimage_builder/elements/svc-map/README.rst similarity index 100% rename from elements/svc-map/README.rst rename to diskimage_builder/elements/svc-map/README.rst diff --git a/elements/svc-map/bin/svc-map b/diskimage_builder/elements/svc-map/bin/svc-map similarity index 100% rename from elements/svc-map/bin/svc-map rename to diskimage_builder/elements/svc-map/bin/svc-map diff --git a/elements/svc-map/extra-data.d/10-merge-svc-map-files b/diskimage_builder/elements/svc-map/extra-data.d/10-merge-svc-map-files similarity index 100% rename from elements/svc-map/extra-data.d/10-merge-svc-map-files rename to diskimage_builder/elements/svc-map/extra-data.d/10-merge-svc-map-files diff --git a/elements/svc-map/extra-data.d/11-copy-svc-map-file b/diskimage_builder/elements/svc-map/extra-data.d/11-copy-svc-map-file similarity index 100% rename from elements/svc-map/extra-data.d/11-copy-svc-map-file rename to diskimage_builder/elements/svc-map/extra-data.d/11-copy-svc-map-file diff --git a/elements/svc-map/package-installs.yaml b/diskimage_builder/elements/svc-map/package-installs.yaml similarity index 100% rename from elements/svc-map/package-installs.yaml rename to diskimage_builder/elements/svc-map/package-installs.yaml diff --git a/elements/svc-map/pkg-map b/diskimage_builder/elements/svc-map/pkg-map similarity index 100% rename from elements/svc-map/pkg-map rename to diskimage_builder/elements/svc-map/pkg-map diff --git a/elements/svc-map/tests/__init__.py b/diskimage_builder/elements/svc-map/tests/__init__.py similarity index 100% rename from elements/svc-map/tests/__init__.py rename to diskimage_builder/elements/svc-map/tests/__init__.py diff --git a/elements/svc-map/tests/test_data_merge.py b/diskimage_builder/elements/svc-map/tests/test_data_merge.py similarity index 100% rename from elements/svc-map/tests/test_data_merge.py rename to diskimage_builder/elements/svc-map/tests/test_data_merge.py diff --git a/elements/uboot/README.rst b/diskimage_builder/elements/uboot/README.rst similarity index 100% rename from elements/uboot/README.rst rename to diskimage_builder/elements/uboot/README.rst diff --git a/elements/uboot/cleanup.d/98-uboot b/diskimage_builder/elements/uboot/cleanup.d/98-uboot similarity index 100% rename from elements/uboot/cleanup.d/98-uboot rename to diskimage_builder/elements/uboot/cleanup.d/98-uboot diff --git a/elements/ubuntu-core/README.rst b/diskimage_builder/elements/ubuntu-core/README.rst similarity index 100% rename from elements/ubuntu-core/README.rst rename to diskimage_builder/elements/ubuntu-core/README.rst diff --git a/elements/ubuntu-core/element-deps b/diskimage_builder/elements/ubuntu-core/element-deps similarity index 100% rename from elements/ubuntu-core/element-deps rename to diskimage_builder/elements/ubuntu-core/element-deps diff --git a/elements/ubuntu-core/element-provides b/diskimage_builder/elements/ubuntu-core/element-provides similarity index 100% rename from elements/ubuntu-core/element-provides rename to diskimage_builder/elements/ubuntu-core/element-provides diff --git a/elements/ubuntu-core/environment.d/10-ubuntu-distro-name.bash b/diskimage_builder/elements/ubuntu-core/environment.d/10-ubuntu-distro-name.bash similarity index 100% rename from elements/ubuntu-core/environment.d/10-ubuntu-distro-name.bash rename to diskimage_builder/elements/ubuntu-core/environment.d/10-ubuntu-distro-name.bash diff --git a/elements/ubuntu-core/package-installs.yaml b/diskimage_builder/elements/ubuntu-core/package-installs.yaml similarity index 100% rename from elements/ubuntu-core/package-installs.yaml rename to diskimage_builder/elements/ubuntu-core/package-installs.yaml diff --git a/elements/ubuntu-core/root.d/10-cache-ubuntu-image b/diskimage_builder/elements/ubuntu-core/root.d/10-cache-ubuntu-image similarity index 100% rename from elements/ubuntu-core/root.d/10-cache-ubuntu-image rename to diskimage_builder/elements/ubuntu-core/root.d/10-cache-ubuntu-image diff --git a/elements/ubuntu-minimal/README.rst b/diskimage_builder/elements/ubuntu-minimal/README.rst similarity index 100% rename from elements/ubuntu-minimal/README.rst rename to diskimage_builder/elements/ubuntu-minimal/README.rst diff --git a/elements/ubuntu-minimal/element-deps b/diskimage_builder/elements/ubuntu-minimal/element-deps similarity index 100% rename from elements/ubuntu-minimal/element-deps rename to diskimage_builder/elements/ubuntu-minimal/element-deps diff --git a/elements/ubuntu-minimal/element-provides b/diskimage_builder/elements/ubuntu-minimal/element-provides similarity index 100% rename from elements/ubuntu-minimal/element-provides rename to diskimage_builder/elements/ubuntu-minimal/element-provides diff --git a/elements/ubuntu-minimal/environment.d/10-ubuntu-distro-name.bash b/diskimage_builder/elements/ubuntu-minimal/environment.d/10-ubuntu-distro-name.bash similarity index 100% rename from elements/ubuntu-minimal/environment.d/10-ubuntu-distro-name.bash rename to diskimage_builder/elements/ubuntu-minimal/environment.d/10-ubuntu-distro-name.bash diff --git a/elements/ubuntu-minimal/pre-install.d/01-ubuntu-apt-update b/diskimage_builder/elements/ubuntu-minimal/pre-install.d/01-ubuntu-apt-update similarity index 100% rename from elements/ubuntu-minimal/pre-install.d/01-ubuntu-apt-update rename to diskimage_builder/elements/ubuntu-minimal/pre-install.d/01-ubuntu-apt-update diff --git a/elements/ubuntu-minimal/test-elements/build-succeeds/README.rst b/diskimage_builder/elements/ubuntu-minimal/test-elements/build-succeeds/README.rst similarity index 100% rename from elements/ubuntu-minimal/test-elements/build-succeeds/README.rst rename to diskimage_builder/elements/ubuntu-minimal/test-elements/build-succeeds/README.rst diff --git a/elements/ubuntu-signed/element-deps b/diskimage_builder/elements/ubuntu-signed/element-deps similarity index 100% rename from elements/ubuntu-signed/element-deps rename to diskimage_builder/elements/ubuntu-signed/element-deps diff --git a/elements/ubuntu-signed/package-installs.yaml b/diskimage_builder/elements/ubuntu-signed/package-installs.yaml similarity index 100% rename from elements/ubuntu-signed/package-installs.yaml rename to diskimage_builder/elements/ubuntu-signed/package-installs.yaml diff --git a/elements/ubuntu-signed/post-install.d/90-get-signed-kernel b/diskimage_builder/elements/ubuntu-signed/post-install.d/90-get-signed-kernel similarity index 100% rename from elements/ubuntu-signed/post-install.d/90-get-signed-kernel rename to diskimage_builder/elements/ubuntu-signed/post-install.d/90-get-signed-kernel diff --git a/elements/ubuntu/README.rst b/diskimage_builder/elements/ubuntu/README.rst similarity index 100% rename from elements/ubuntu/README.rst rename to diskimage_builder/elements/ubuntu/README.rst diff --git a/elements/ubuntu/element-deps b/diskimage_builder/elements/ubuntu/element-deps similarity index 100% rename from elements/ubuntu/element-deps rename to diskimage_builder/elements/ubuntu/element-deps diff --git a/elements/ubuntu/element-provides b/diskimage_builder/elements/ubuntu/element-provides similarity index 100% rename from elements/ubuntu/element-provides rename to diskimage_builder/elements/ubuntu/element-provides diff --git a/elements/ubuntu/environment.d/10-ubuntu-distro-name.bash b/diskimage_builder/elements/ubuntu/environment.d/10-ubuntu-distro-name.bash similarity index 100% rename from elements/ubuntu/environment.d/10-ubuntu-distro-name.bash rename to diskimage_builder/elements/ubuntu/environment.d/10-ubuntu-distro-name.bash diff --git a/elements/ubuntu/environment.d/99-cloud-init-datasources.bash b/diskimage_builder/elements/ubuntu/environment.d/99-cloud-init-datasources.bash similarity index 100% rename from elements/ubuntu/environment.d/99-cloud-init-datasources.bash rename to diskimage_builder/elements/ubuntu/environment.d/99-cloud-init-datasources.bash diff --git a/elements/ubuntu/install.d/99-autoremove b/diskimage_builder/elements/ubuntu/install.d/99-autoremove similarity index 100% rename from elements/ubuntu/install.d/99-autoremove rename to diskimage_builder/elements/ubuntu/install.d/99-autoremove diff --git a/elements/ubuntu/package-installs.yaml b/diskimage_builder/elements/ubuntu/package-installs.yaml similarity index 100% rename from elements/ubuntu/package-installs.yaml rename to diskimage_builder/elements/ubuntu/package-installs.yaml diff --git a/elements/ubuntu/pre-install.d/00-remove-apt-xapian-index b/diskimage_builder/elements/ubuntu/pre-install.d/00-remove-apt-xapian-index similarity index 100% rename from elements/ubuntu/pre-install.d/00-remove-apt-xapian-index rename to diskimage_builder/elements/ubuntu/pre-install.d/00-remove-apt-xapian-index diff --git a/elements/ubuntu/pre-install.d/00-remove-grub b/diskimage_builder/elements/ubuntu/pre-install.d/00-remove-grub similarity index 100% rename from elements/ubuntu/pre-install.d/00-remove-grub rename to diskimage_builder/elements/ubuntu/pre-install.d/00-remove-grub diff --git a/elements/ubuntu/pre-install.d/01-set-ubuntu-mirror b/diskimage_builder/elements/ubuntu/pre-install.d/01-set-ubuntu-mirror similarity index 100% rename from elements/ubuntu/pre-install.d/01-set-ubuntu-mirror rename to diskimage_builder/elements/ubuntu/pre-install.d/01-set-ubuntu-mirror diff --git a/elements/ubuntu/root.d/10-cache-ubuntu-tarball b/diskimage_builder/elements/ubuntu/root.d/10-cache-ubuntu-tarball similarity index 100% rename from elements/ubuntu/root.d/10-cache-ubuntu-tarball rename to diskimage_builder/elements/ubuntu/root.d/10-cache-ubuntu-tarball diff --git a/elements/vm/README.rst b/diskimage_builder/elements/vm/README.rst similarity index 100% rename from elements/vm/README.rst rename to diskimage_builder/elements/vm/README.rst diff --git a/elements/vm/element-deps b/diskimage_builder/elements/vm/element-deps similarity index 100% rename from elements/vm/element-deps rename to diskimage_builder/elements/vm/element-deps diff --git a/elements/vm/finalise.d/50-remove-bogus-udev-links b/diskimage_builder/elements/vm/finalise.d/50-remove-bogus-udev-links similarity index 100% rename from elements/vm/finalise.d/50-remove-bogus-udev-links rename to diskimage_builder/elements/vm/finalise.d/50-remove-bogus-udev-links diff --git a/elements/yum-minimal/README.rst b/diskimage_builder/elements/yum-minimal/README.rst similarity index 100% rename from elements/yum-minimal/README.rst rename to diskimage_builder/elements/yum-minimal/README.rst diff --git a/elements/yum-minimal/element-deps b/diskimage_builder/elements/yum-minimal/element-deps similarity index 100% rename from elements/yum-minimal/element-deps rename to diskimage_builder/elements/yum-minimal/element-deps diff --git a/elements/yum-minimal/install.d/10-base-networking b/diskimage_builder/elements/yum-minimal/install.d/10-base-networking similarity index 100% rename from elements/yum-minimal/install.d/10-base-networking rename to diskimage_builder/elements/yum-minimal/install.d/10-base-networking diff --git a/elements/yum-minimal/install.d/15-base-fstab b/diskimage_builder/elements/yum-minimal/install.d/15-base-fstab similarity index 100% rename from elements/yum-minimal/install.d/15-base-fstab rename to diskimage_builder/elements/yum-minimal/install.d/15-base-fstab diff --git a/elements/yum-minimal/package-installs.yaml b/diskimage_builder/elements/yum-minimal/package-installs.yaml similarity index 100% rename from elements/yum-minimal/package-installs.yaml rename to diskimage_builder/elements/yum-minimal/package-installs.yaml diff --git a/elements/yum-minimal/pkg-map b/diskimage_builder/elements/yum-minimal/pkg-map similarity index 100% rename from elements/yum-minimal/pkg-map rename to diskimage_builder/elements/yum-minimal/pkg-map diff --git a/elements/yum-minimal/pre-install.d/03-yum-cleanup b/diskimage_builder/elements/yum-minimal/pre-install.d/03-yum-cleanup similarity index 100% rename from elements/yum-minimal/pre-install.d/03-yum-cleanup rename to diskimage_builder/elements/yum-minimal/pre-install.d/03-yum-cleanup diff --git a/elements/yum-minimal/root.d/08-yum-chroot b/diskimage_builder/elements/yum-minimal/root.d/08-yum-chroot similarity index 100% rename from elements/yum-minimal/root.d/08-yum-chroot rename to diskimage_builder/elements/yum-minimal/root.d/08-yum-chroot diff --git a/elements/yum/README.rst b/diskimage_builder/elements/yum/README.rst similarity index 100% rename from elements/yum/README.rst rename to diskimage_builder/elements/yum/README.rst diff --git a/elements/yum/bin/install-packages b/diskimage_builder/elements/yum/bin/install-packages similarity index 100% rename from elements/yum/bin/install-packages rename to diskimage_builder/elements/yum/bin/install-packages diff --git a/elements/yum/cleanup.d/99-remove-yum-repo-conf b/diskimage_builder/elements/yum/cleanup.d/99-remove-yum-repo-conf similarity index 100% rename from elements/yum/cleanup.d/99-remove-yum-repo-conf rename to diskimage_builder/elements/yum/cleanup.d/99-remove-yum-repo-conf diff --git a/elements/yum/element-deps b/diskimage_builder/elements/yum/element-deps similarity index 100% rename from elements/yum/element-deps rename to diskimage_builder/elements/yum/element-deps diff --git a/elements/yum/extra-data.d/99-yum-repo-conf b/diskimage_builder/elements/yum/extra-data.d/99-yum-repo-conf similarity index 100% rename from elements/yum/extra-data.d/99-yum-repo-conf rename to diskimage_builder/elements/yum/extra-data.d/99-yum-repo-conf diff --git a/elements/yum/post-install.d/99-reset-yum-conf b/diskimage_builder/elements/yum/post-install.d/99-reset-yum-conf similarity index 100% rename from elements/yum/post-install.d/99-reset-yum-conf rename to diskimage_builder/elements/yum/post-install.d/99-reset-yum-conf diff --git a/elements/yum/pre-install.d/00-dnf-update b/diskimage_builder/elements/yum/pre-install.d/00-dnf-update similarity index 100% rename from elements/yum/pre-install.d/00-dnf-update rename to diskimage_builder/elements/yum/pre-install.d/00-dnf-update diff --git a/elements/yum/pre-install.d/01-yum-keepcache b/diskimage_builder/elements/yum/pre-install.d/01-yum-keepcache similarity index 100% rename from elements/yum/pre-install.d/01-yum-keepcache rename to diskimage_builder/elements/yum/pre-install.d/01-yum-keepcache diff --git a/elements/yum/root.d/50-yum-cache b/diskimage_builder/elements/yum/root.d/50-yum-cache similarity index 100% rename from elements/yum/root.d/50-yum-cache rename to diskimage_builder/elements/yum/root.d/50-yum-cache diff --git a/elements/zypper/README.rst b/diskimage_builder/elements/zypper/README.rst similarity index 100% rename from elements/zypper/README.rst rename to diskimage_builder/elements/zypper/README.rst diff --git a/elements/zypper/bin/install-packages b/diskimage_builder/elements/zypper/bin/install-packages similarity index 100% rename from elements/zypper/bin/install-packages rename to diskimage_builder/elements/zypper/bin/install-packages diff --git a/elements/zypper/bin/map-packages b/diskimage_builder/elements/zypper/bin/map-packages similarity index 100% rename from elements/zypper/bin/map-packages rename to diskimage_builder/elements/zypper/bin/map-packages diff --git a/elements/zypper/bin/map-services b/diskimage_builder/elements/zypper/bin/map-services similarity index 100% rename from elements/zypper/bin/map-services rename to diskimage_builder/elements/zypper/bin/map-services diff --git a/elements/zypper/install.d/01-ccache-symlinks b/diskimage_builder/elements/zypper/install.d/01-ccache-symlinks similarity index 100% rename from elements/zypper/install.d/01-ccache-symlinks rename to diskimage_builder/elements/zypper/install.d/01-ccache-symlinks diff --git a/elements/zypper/install.d/01-login-defs b/diskimage_builder/elements/zypper/install.d/01-login-defs similarity index 100% rename from elements/zypper/install.d/01-login-defs rename to diskimage_builder/elements/zypper/install.d/01-login-defs diff --git a/elements/zypper/post-install.d/10-mkinitrd b/diskimage_builder/elements/zypper/post-install.d/10-mkinitrd similarity index 100% rename from elements/zypper/post-install.d/10-mkinitrd rename to diskimage_builder/elements/zypper/post-install.d/10-mkinitrd diff --git a/elements/zypper/post-install.d/99-zypper-no-keep-packages b/diskimage_builder/elements/zypper/post-install.d/99-zypper-no-keep-packages similarity index 100% rename from elements/zypper/post-install.d/99-zypper-no-keep-packages rename to diskimage_builder/elements/zypper/post-install.d/99-zypper-no-keep-packages diff --git a/elements/zypper/pre-install.d/01-zypper-keep-packages b/diskimage_builder/elements/zypper/pre-install.d/01-zypper-keep-packages similarity index 100% rename from elements/zypper/pre-install.d/01-zypper-keep-packages rename to diskimage_builder/elements/zypper/pre-install.d/01-zypper-keep-packages diff --git a/elements/zypper/root.d/50-zypper-cache b/diskimage_builder/elements/zypper/root.d/50-zypper-cache similarity index 100% rename from elements/zypper/root.d/50-zypper-cache rename to diskimage_builder/elements/zypper/root.d/50-zypper-cache diff --git a/lib/common-defaults b/diskimage_builder/lib/common-defaults similarity index 98% rename from lib/common-defaults rename to diskimage_builder/lib/common-defaults index e04718559..ebbff5f1f 100644 --- a/lib/common-defaults +++ b/diskimage_builder/lib/common-defaults @@ -39,7 +39,6 @@ export DIB_NO_TMPFS=${DIB_NO_TMPFS:-0} export DIB_MIN_TMPFS=${DIB_MIN_TMPFS:-2} # Set via the CLI normally. # IMAGE_ELEMENT= -_BASE_ELEMENT_DIR=$_PREFIX/elements ELEMENTS_PATH=${ELEMENTS_PATH:+"$ELEMENTS_PATH:$_BASE_ELEMENT_DIR"} export ELEMENTS_PATH=${ELEMENTS_PATH:-$_BASE_ELEMENT_DIR} export DIB_OFFLINE=${DIB_OFFLINE:-''} diff --git a/lib/common-functions b/diskimage_builder/lib/common-functions similarity index 100% rename from lib/common-functions rename to diskimage_builder/lib/common-functions diff --git a/lib/die b/diskimage_builder/lib/die similarity index 100% rename from lib/die rename to diskimage_builder/lib/die diff --git a/lib/img-defaults b/diskimage_builder/lib/img-defaults similarity index 100% rename from lib/img-defaults rename to diskimage_builder/lib/img-defaults diff --git a/lib/img-functions b/diskimage_builder/lib/img-functions similarity index 100% rename from lib/img-functions rename to diskimage_builder/lib/img-functions diff --git a/lib/ramdisk-defaults b/diskimage_builder/lib/ramdisk-defaults similarity index 100% rename from lib/ramdisk-defaults rename to diskimage_builder/lib/ramdisk-defaults diff --git a/lib/ramdisk-functions b/diskimage_builder/lib/ramdisk-functions similarity index 100% rename from lib/ramdisk-functions rename to diskimage_builder/lib/ramdisk-functions diff --git a/diskimage_builder/paths.py b/diskimage_builder/paths.py new file mode 100644 index 000000000..18f2028ea --- /dev/null +++ b/diskimage_builder/paths.py @@ -0,0 +1,31 @@ +# Copyright 2016 Ian Wienand (iwienand@redhat.com) +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + +"""Export paths""" + +import os +import pkg_resources +import sys + + +def get_path(var): + if var == "lib": + print(os.path.abspath( + pkg_resources.resource_filename(__name__, "lib"))) + elif var == "elements": + print(os.path.abspath( + pkg_resources.resource_filename(__name__, "elements"))) + else: + print("Unknown path request!") + sys.exit(1) diff --git a/diskimage_builder/tests/test_elements.py b/diskimage_builder/tests/test_elements.py deleted file mode 100644 index e8c685979..000000000 --- a/diskimage_builder/tests/test_elements.py +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 2012 Hewlett-Packard Development Company, L.P. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -import os -import sys - - -class StubPackage(object): - pass - - -# load all tests from /elements/*/tests/ dirs. -# conceptually load_tests should be in __init__, but see -# http://bugs.python.org/issue16662 instead. So, its here in test_elements.py -def load_tests(loader, tests, pattern): - """load tests for diskimage_builder elements.""" - if pattern is None: - # http://bugs.python.org/issue11218 - pattern = "test*.py" - this_dir = os.path.dirname(__file__) - elements_dir = os.path.join(this_dir, "..", "..", "elements") - # Make a fake elements top level package, as discovery doesn't let us - # override the python path. - package = StubPackage() - package.__path__ = [elements_dir] - sys.modules['elements'] = package - elements = os.listdir(elements_dir) - for element in elements: - element_dir = os.path.join(elements_dir, element) - tests_path = os.path.join(element_dir, "tests") - if (not os.path.isdir(tests_path) or - not os.path.isfile(os.path.join(tests_path, '__init__.py'))): - continue - # Create a 'package' for the element, so it can be imported. - package = StubPackage() - package.__path__ = [element_dir] - sys.modules['elements.%s' % element] = package - # Try importing the test module - package_tests = loader.discover(start_dir=tests_path, pattern=pattern) - tests.addTests(package_tests) - return tests diff --git a/doc/source/elements.rst b/doc/source/elements.rst index 16e1947a0..1564d3139 100644 --- a/doc/source/elements.rst +++ b/doc/source/elements.rst @@ -8,4 +8,4 @@ of the element directory describing what it is for. .. toctree:: :glob: - elements/*/* + diskimage_builder/elements/*/* diff --git a/setup.cfg b/setup.cfg index 57122888d..2fdb2b220 100644 --- a/setup.cfg +++ b/setup.cfg @@ -30,8 +30,6 @@ scripts = bin/disk-image-create bin/ramdisk-image-create data_files = - share/diskimage-builder/elements = elements/* - share/diskimage-builder/lib = lib/* share/diskimage-builder/scripts = scripts/* [extract_messages] diff --git a/tests/run_functests.sh b/tests/run_functests.sh index 2bbd8c57f..75093c54e 100755 --- a/tests/run_functests.sh +++ b/tests/run_functests.sh @@ -4,8 +4,11 @@ set -eu set -o pipefail BASE_DIR=$(cd $(dirname "$0")/.. && pwd) -export DIB_ELEMENTS=$BASE_DIR/elements export DIB_CMD=$BASE_DIR/bin/disk-image-create +export DIB_ELEMENTS=$(python -c ' +import diskimage_builder.paths +diskimage_builder.paths.get_path("elements")') + # # Default skip tests @@ -81,9 +84,9 @@ function run_disk_element_test() { if break="after-error" break_outside_target=1 \ break_cmd="cp -v \$TMP_MOUNT_PATH/tmp/dib-test-should-fail ${dest_dir} || true" \ DIB_SHOW_IMAGE_USAGE=1 \ - ELEMENTS_PATH=$DIB_ELEMENTS:$DIB_ELEMENTS/$element/test-elements \ - $DIB_CMD -x -t tar,qcow2 ${use_tmp_flag} -o $dest_dir/image -n $element $test_element 2>&1 \ - | log_with_prefix "${element}/${test_element}"; then + ELEMENTS_PATH=$DIB_ELEMENTS/$element/test-elements \ + $DIB_CMD -x -t tar,qcow2 ${use_tmp_flag} -o $dest_dir/image -n $element $test_element 2>&1 \ + | log_with_prefix "${element}/${test_element}"; then if ! [ -f "$dest_dir/image.qcow2" ]; then echo "Error: qcow2 build failed for element: $element, test-element: $test_element."