diff --git a/scripts/createImage b/baseimage/createImage
similarity index 100%
rename from scripts/createImage
rename to baseimage/createImage
diff --git a/scripts/digitalocean.sh b/baseimage/digitalocean.sh
similarity index 100%
rename from scripts/digitalocean.sh
rename to baseimage/digitalocean.sh
diff --git a/scripts/initializeBaseUbuntuImage.sh b/baseimage/initializeBaseUbuntuImage.sh
similarity index 100%
rename from scripts/initializeBaseUbuntuImage.sh
rename to baseimage/initializeBaseUbuntuImage.sh
diff --git a/installer.sh b/installer.sh
index 38a85c482..89432c6cb 100755
--- a/installer.sh
+++ b/installer.sh
@@ -139,7 +139,7 @@ cat > /root/provision.json <<EOF
 EOF
 
 echo "[INFO] Running Ubuntu initializing script ..."
-/bin/bash "${installer_tmp_dir}/scripts/initializeBaseUbuntuImage.sh" "${revision}" selfhosting
+/bin/bash "${installer_tmp_dir}/baseimage/initializeBaseUbuntuImage.sh" "${revision}" selfhosting
 echo ""
 
 echo "[INFO] Reloading systemd daemon ..."
diff --git a/scripts/createBoxTarball b/scripts/createReleaseTarball
similarity index 100%
rename from scripts/createBoxTarball
rename to scripts/createReleaseTarball