diff --git a/.ci/lib.sh b/.ci/lib.sh
deleted file mode 100644
index f9bfcbc5c..000000000
--- a/.ci/lib.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Copyright (c) 2018 Intel Corporation
-#
-# SPDX-License-Identifier: Apache-2.0
-
-export tests_repo="${tests_repo:-github.com/kata-containers/tests}"
-export tests_repo_dir="$GOPATH/src/$tests_repo"
-
-clone_tests_repo()
-{
-	# KATA_CI_NO_NETWORK is (has to be) ignored if there is
-	# no existing clone.
-	if [ -d "$tests_repo_dir" -a -n "$KATA_CI_NO_NETWORK" ]
-	then
-		return
-	fi
-
-	go get -d -u "$tests_repo" || true
-}
-
-run_static_checks()
-{
-	bash "$tests_repo_dir/.ci/static-checks.sh" "github.com/kata-containers/osbuilder"
-}
diff --git a/.ci/run.sh b/.ci/run.sh
deleted file mode 100755
index 7439a9d75..000000000
--- a/.ci/run.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-#
-# Copyright (c) 2018 Intel Corporation
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-
-set -e
-
-export GOPATH="${GOPATH:-/tmp/go}"
-
-script_dir="$(dirname $(readlink -f $0))"
-
-sudo -E PATH="$PATH" bash "${script_dir}/../tests/test_images.sh"
-
-# run again to build rust agent
-sudo -E RUST_AGENT="yes" PATH="$PATH" bash "${script_dir}/../tests/test_images.sh"
diff --git a/.ci/setup.sh b/.ci/setup.sh
deleted file mode 100755
index 355fa72a2..000000000
--- a/.ci/setup.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-#
-# Copyright (c) 2018 Intel Corporation
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-set -e
-
-cidir=$(dirname "$0")
-source "${cidir}/lib.sh"
-
-clone_tests_repo
-
-pushd "${tests_repo_dir}"
-.ci/setup.sh
-popd
-
-bash "${cidir}/static-checks.sh"
-# yq needed to correctly parse runtime/versions.yaml
-make -C ${tests_repo_dir} install-yq
-
diff --git a/.ci/static-checks.sh b/.ci/static-checks.sh
deleted file mode 100755
index cfadeaf8a..000000000
--- a/.ci/static-checks.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-#
-# Copyright (c) 2018 Intel Corporation
-#
-# SPDX-License-Identifier: Apache-2.0
-
-set -e
-
-cidir=$(dirname "$0")
-source "${cidir}/lib.sh"
-
-run_static_checks
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index d3cff5931..000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# Copyright (c) 2018 Intel Corporation
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-sudo: required
-dist: bionic
-
-os:
-  - linux
-  - linux-ppc64le
-
-matrix:
-  allow_failures:
-    - os: linux-ppc64le
-
-language: bash
-
-services:
-  - docker
-
-before_script:
-  - ".ci/setup.sh"
-
-script:
-  - "travis_wait 50 .ci/run.sh"
diff --git a/.gitignore b/tools/osbuilder/.gitignore
similarity index 100%
rename from .gitignore
rename to tools/osbuilder/.gitignore
diff --git a/CODE_OF_CONDUCT.md b/tools/osbuilder/CODE_OF_CONDUCT.md
similarity index 100%
rename from CODE_OF_CONDUCT.md
rename to tools/osbuilder/CODE_OF_CONDUCT.md
diff --git a/CONTRIBUTING.md b/tools/osbuilder/CONTRIBUTING.md
similarity index 100%
rename from CONTRIBUTING.md
rename to tools/osbuilder/CONTRIBUTING.md
diff --git a/LICENSE b/tools/osbuilder/LICENSE
similarity index 100%
rename from LICENSE
rename to tools/osbuilder/LICENSE
diff --git a/Makefile b/tools/osbuilder/Makefile
similarity index 100%
rename from Makefile
rename to tools/osbuilder/Makefile
diff --git a/README.md b/tools/osbuilder/README.md
similarity index 100%
rename from README.md
rename to tools/osbuilder/README.md
diff --git a/VERSION b/tools/osbuilder/VERSION
similarity index 100%
rename from VERSION
rename to tools/osbuilder/VERSION
diff --git a/dracut/Dockerfile.in b/tools/osbuilder/dracut/Dockerfile.in
similarity index 100%
rename from dracut/Dockerfile.in
rename to tools/osbuilder/dracut/Dockerfile.in
diff --git a/dracut/dracut.conf.d/05-base.conf b/tools/osbuilder/dracut/dracut.conf.d/05-base.conf
similarity index 100%
rename from dracut/dracut.conf.d/05-base.conf
rename to tools/osbuilder/dracut/dracut.conf.d/05-base.conf
diff --git a/dracut/dracut.conf.d/10-drivers.conf b/tools/osbuilder/dracut/dracut.conf.d/10-drivers.conf
similarity index 100%
rename from dracut/dracut.conf.d/10-drivers.conf
rename to tools/osbuilder/dracut/dracut.conf.d/10-drivers.conf
diff --git a/image-builder/Dockerfile b/tools/osbuilder/image-builder/Dockerfile
similarity index 100%
rename from image-builder/Dockerfile
rename to tools/osbuilder/image-builder/Dockerfile
diff --git a/image-builder/README.md b/tools/osbuilder/image-builder/README.md
similarity index 100%
rename from image-builder/README.md
rename to tools/osbuilder/image-builder/README.md
diff --git a/image-builder/image_builder.sh b/tools/osbuilder/image-builder/image_builder.sh
similarity index 100%
rename from image-builder/image_builder.sh
rename to tools/osbuilder/image-builder/image_builder.sh
diff --git a/image-builder/nsdax.gpl.c b/tools/osbuilder/image-builder/nsdax.gpl.c
similarity index 100%
rename from image-builder/nsdax.gpl.c
rename to tools/osbuilder/image-builder/nsdax.gpl.c
diff --git a/initrd-builder/README.md b/tools/osbuilder/initrd-builder/README.md
similarity index 100%
rename from initrd-builder/README.md
rename to tools/osbuilder/initrd-builder/README.md
diff --git a/initrd-builder/initrd_builder.sh b/tools/osbuilder/initrd-builder/initrd_builder.sh
similarity index 100%
rename from initrd-builder/initrd_builder.sh
rename to tools/osbuilder/initrd-builder/initrd_builder.sh
diff --git a/rootfs-builder/.gitignore b/tools/osbuilder/rootfs-builder/.gitignore
similarity index 100%
rename from rootfs-builder/.gitignore
rename to tools/osbuilder/rootfs-builder/.gitignore
diff --git a/rootfs-builder/README.md b/tools/osbuilder/rootfs-builder/README.md
similarity index 100%
rename from rootfs-builder/README.md
rename to tools/osbuilder/rootfs-builder/README.md
diff --git a/rootfs-builder/alpine/Dockerfile.in b/tools/osbuilder/rootfs-builder/alpine/Dockerfile.in
similarity index 100%
rename from rootfs-builder/alpine/Dockerfile.in
rename to tools/osbuilder/rootfs-builder/alpine/Dockerfile.in
diff --git a/rootfs-builder/alpine/config.sh b/tools/osbuilder/rootfs-builder/alpine/config.sh
similarity index 100%
rename from rootfs-builder/alpine/config.sh
rename to tools/osbuilder/rootfs-builder/alpine/config.sh
diff --git a/rootfs-builder/alpine/rootfs_lib.sh b/tools/osbuilder/rootfs-builder/alpine/rootfs_lib.sh
similarity index 100%
rename from rootfs-builder/alpine/rootfs_lib.sh
rename to tools/osbuilder/rootfs-builder/alpine/rootfs_lib.sh
diff --git a/rootfs-builder/centos/Dockerfile.in b/tools/osbuilder/rootfs-builder/centos/Dockerfile.in
similarity index 100%
rename from rootfs-builder/centos/Dockerfile.in
rename to tools/osbuilder/rootfs-builder/centos/Dockerfile.in
diff --git a/rootfs-builder/centos/config.sh b/tools/osbuilder/rootfs-builder/centos/config.sh
similarity index 100%
rename from rootfs-builder/centos/config.sh
rename to tools/osbuilder/rootfs-builder/centos/config.sh
diff --git a/rootfs-builder/centos/config_aarch64.sh b/tools/osbuilder/rootfs-builder/centos/config_aarch64.sh
similarity index 100%
rename from rootfs-builder/centos/config_aarch64.sh
rename to tools/osbuilder/rootfs-builder/centos/config_aarch64.sh
diff --git a/rootfs-builder/centos/config_ppc64le.sh b/tools/osbuilder/rootfs-builder/centos/config_ppc64le.sh
similarity index 100%
rename from rootfs-builder/centos/config_ppc64le.sh
rename to tools/osbuilder/rootfs-builder/centos/config_ppc64le.sh
diff --git a/rootfs-builder/clearlinux/Dockerfile.in b/tools/osbuilder/rootfs-builder/clearlinux/Dockerfile.in
similarity index 100%
rename from rootfs-builder/clearlinux/Dockerfile.in
rename to tools/osbuilder/rootfs-builder/clearlinux/Dockerfile.in
diff --git a/rootfs-builder/clearlinux/config.sh b/tools/osbuilder/rootfs-builder/clearlinux/config.sh
similarity index 100%
rename from rootfs-builder/clearlinux/config.sh
rename to tools/osbuilder/rootfs-builder/clearlinux/config.sh
diff --git a/rootfs-builder/debian/Dockerfile-aarch64.in b/tools/osbuilder/rootfs-builder/debian/Dockerfile-aarch64.in
similarity index 100%
rename from rootfs-builder/debian/Dockerfile-aarch64.in
rename to tools/osbuilder/rootfs-builder/debian/Dockerfile-aarch64.in
diff --git a/rootfs-builder/debian/Dockerfile.in b/tools/osbuilder/rootfs-builder/debian/Dockerfile.in
similarity index 100%
rename from rootfs-builder/debian/Dockerfile.in
rename to tools/osbuilder/rootfs-builder/debian/Dockerfile.in
diff --git a/rootfs-builder/debian/config.sh b/tools/osbuilder/rootfs-builder/debian/config.sh
similarity index 100%
rename from rootfs-builder/debian/config.sh
rename to tools/osbuilder/rootfs-builder/debian/config.sh
diff --git a/rootfs-builder/debian/rootfs_lib.sh b/tools/osbuilder/rootfs-builder/debian/rootfs_lib.sh
similarity index 100%
rename from rootfs-builder/debian/rootfs_lib.sh
rename to tools/osbuilder/rootfs-builder/debian/rootfs_lib.sh
diff --git a/rootfs-builder/euleros/Dockerfile.in b/tools/osbuilder/rootfs-builder/euleros/Dockerfile.in
similarity index 100%
rename from rootfs-builder/euleros/Dockerfile.in
rename to tools/osbuilder/rootfs-builder/euleros/Dockerfile.in
diff --git a/rootfs-builder/euleros/RPM-GPG-KEY-EulerOS b/tools/osbuilder/rootfs-builder/euleros/RPM-GPG-KEY-EulerOS
similarity index 100%
rename from rootfs-builder/euleros/RPM-GPG-KEY-EulerOS
rename to tools/osbuilder/rootfs-builder/euleros/RPM-GPG-KEY-EulerOS
diff --git a/rootfs-builder/euleros/config.sh b/tools/osbuilder/rootfs-builder/euleros/config.sh
similarity index 100%
rename from rootfs-builder/euleros/config.sh
rename to tools/osbuilder/rootfs-builder/euleros/config.sh
diff --git a/rootfs-builder/fedora/Dockerfile.in b/tools/osbuilder/rootfs-builder/fedora/Dockerfile.in
similarity index 100%
rename from rootfs-builder/fedora/Dockerfile.in
rename to tools/osbuilder/rootfs-builder/fedora/Dockerfile.in
diff --git a/rootfs-builder/fedora/config.sh b/tools/osbuilder/rootfs-builder/fedora/config.sh
similarity index 100%
rename from rootfs-builder/fedora/config.sh
rename to tools/osbuilder/rootfs-builder/fedora/config.sh
diff --git a/rootfs-builder/fedora/config_aarch64.sh b/tools/osbuilder/rootfs-builder/fedora/config_aarch64.sh
similarity index 100%
rename from rootfs-builder/fedora/config_aarch64.sh
rename to tools/osbuilder/rootfs-builder/fedora/config_aarch64.sh
diff --git a/rootfs-builder/rootfs.sh b/tools/osbuilder/rootfs-builder/rootfs.sh
similarity index 100%
rename from rootfs-builder/rootfs.sh
rename to tools/osbuilder/rootfs-builder/rootfs.sh
diff --git a/rootfs-builder/suse/Dockerfile.in b/tools/osbuilder/rootfs-builder/suse/Dockerfile.in
similarity index 100%
rename from rootfs-builder/suse/Dockerfile.in
rename to tools/osbuilder/rootfs-builder/suse/Dockerfile.in
diff --git a/rootfs-builder/suse/config.sh b/tools/osbuilder/rootfs-builder/suse/config.sh
similarity index 100%
rename from rootfs-builder/suse/config.sh
rename to tools/osbuilder/rootfs-builder/suse/config.sh
diff --git a/rootfs-builder/suse/config.xml b/tools/osbuilder/rootfs-builder/suse/config.xml
similarity index 100%
rename from rootfs-builder/suse/config.xml
rename to tools/osbuilder/rootfs-builder/suse/config.xml
diff --git a/rootfs-builder/suse/install-packages.sh b/tools/osbuilder/rootfs-builder/suse/install-packages.sh
similarity index 100%
rename from rootfs-builder/suse/install-packages.sh
rename to tools/osbuilder/rootfs-builder/suse/install-packages.sh
diff --git a/rootfs-builder/suse/rootfs_lib.sh b/tools/osbuilder/rootfs-builder/suse/rootfs_lib.sh
similarity index 100%
rename from rootfs-builder/suse/rootfs_lib.sh
rename to tools/osbuilder/rootfs-builder/suse/rootfs_lib.sh
diff --git a/rootfs-builder/template/Dockerfile.template b/tools/osbuilder/rootfs-builder/template/Dockerfile.template
similarity index 100%
rename from rootfs-builder/template/Dockerfile.template
rename to tools/osbuilder/rootfs-builder/template/Dockerfile.template
diff --git a/rootfs-builder/template/Makefile b/tools/osbuilder/rootfs-builder/template/Makefile
similarity index 100%
rename from rootfs-builder/template/Makefile
rename to tools/osbuilder/rootfs-builder/template/Makefile
diff --git a/rootfs-builder/template/config_template.sh b/tools/osbuilder/rootfs-builder/template/config_template.sh
similarity index 100%
rename from rootfs-builder/template/config_template.sh
rename to tools/osbuilder/rootfs-builder/template/config_template.sh
diff --git a/rootfs-builder/template/rootfs_lib_template.sh b/tools/osbuilder/rootfs-builder/template/rootfs_lib_template.sh
similarity index 100%
rename from rootfs-builder/template/rootfs_lib_template.sh
rename to tools/osbuilder/rootfs-builder/template/rootfs_lib_template.sh
diff --git a/rootfs-builder/ubuntu/Dockerfile-aarch64.in b/tools/osbuilder/rootfs-builder/ubuntu/Dockerfile-aarch64.in
similarity index 100%
rename from rootfs-builder/ubuntu/Dockerfile-aarch64.in
rename to tools/osbuilder/rootfs-builder/ubuntu/Dockerfile-aarch64.in
diff --git a/rootfs-builder/ubuntu/Dockerfile.in b/tools/osbuilder/rootfs-builder/ubuntu/Dockerfile.in
similarity index 100%
rename from rootfs-builder/ubuntu/Dockerfile.in
rename to tools/osbuilder/rootfs-builder/ubuntu/Dockerfile.in
diff --git a/rootfs-builder/ubuntu/config.sh b/tools/osbuilder/rootfs-builder/ubuntu/config.sh
similarity index 100%
rename from rootfs-builder/ubuntu/config.sh
rename to tools/osbuilder/rootfs-builder/ubuntu/config.sh
diff --git a/rootfs-builder/ubuntu/rootfs_lib.sh b/tools/osbuilder/rootfs-builder/ubuntu/rootfs_lib.sh
similarity index 100%
rename from rootfs-builder/ubuntu/rootfs_lib.sh
rename to tools/osbuilder/rootfs-builder/ubuntu/rootfs_lib.sh
diff --git a/scripts/install-yq.sh b/tools/osbuilder/scripts/install-yq.sh
similarity index 100%
rename from scripts/install-yq.sh
rename to tools/osbuilder/scripts/install-yq.sh
diff --git a/scripts/lib.sh b/tools/osbuilder/scripts/lib.sh
similarity index 100%
rename from scripts/lib.sh
rename to tools/osbuilder/scripts/lib.sh
diff --git a/tests/README.md b/tools/osbuilder/tests/README.md
similarity index 100%
rename from tests/README.md
rename to tools/osbuilder/tests/README.md
diff --git a/tests/test_config.sh b/tools/osbuilder/tests/test_config.sh
similarity index 100%
rename from tests/test_config.sh
rename to tools/osbuilder/tests/test_config.sh
diff --git a/tests/test_images.sh b/tools/osbuilder/tests/test_images.sh
similarity index 100%
rename from tests/test_images.sh
rename to tools/osbuilder/tests/test_images.sh