diff --git a/tools/deployment/aiab/dev_single_node/README.txt b/tools/deployment/aiab/README.rst
similarity index 100%
rename from tools/deployment/aiab/dev_single_node/README.txt
rename to tools/deployment/aiab/README.rst
diff --git a/tools/deployment/aiab/dev_single_node/airship-in-a-bottle.sh b/tools/deployment/aiab/airship-in-a-bottle.sh
similarity index 99%
rename from tools/deployment/aiab/dev_single_node/airship-in-a-bottle.sh
rename to tools/deployment/aiab/airship-in-a-bottle.sh
index a3182a2b6..681a21c91 100755
--- a/tools/deployment/aiab/dev_single_node/airship-in-a-bottle.sh
+++ b/tools/deployment/aiab/airship-in-a-bottle.sh
@@ -160,4 +160,4 @@ fi
 echo ""
 echo "Starting Airship deployment..."
 sleep 1
-../common/deploy-airship.sh demo
+common/deploy-airship.sh demo
diff --git a/tools/deployment/aiab/common/deploy-airship.sh b/tools/deployment/aiab/common/deploy-airship.sh
index 87e454406..c8e3ca045 100755
--- a/tools/deployment/aiab/common/deploy-airship.sh
+++ b/tools/deployment/aiab/common/deploy-airship.sh
@@ -306,7 +306,7 @@ function execute_create_heat_stack() {
   echo " "
   set -x
   # Switch to directory where the script is located
-  pushd ${WORKSPACE}/treasuremap/tools/deployment/aiab/dev_single_node/
+  pushd ${WORKSPACE}/treasuremap/tools/deployment/aiab/
   bash test_create_heat_stack.sh
   popd
 }
@@ -333,7 +333,7 @@ function print_dashboards() {
   echo "  Password: password"
   echo " "
   echo "OpenStack CLI commands could be launched via \`./run_openstack_cli.sh\` script, e.g.:"
-  echo "  # cd ${WORKSPACE}/treasuremap/tools/deployment/aiab/dev_single_node"
+  echo "  # cd ${WORKSPACE}/treasuremap/tools/deployment/aiab"
   echo "  # ./run_openstack_cli.sh stack list"
   echo "  ..."
   echo "  "
diff --git a/tools/deployment/aiab/dev_single_node/test_create_heat_stack.sh b/tools/deployment/aiab/common/test_create_heat_stack.sh
similarity index 95%
rename from tools/deployment/aiab/dev_single_node/test_create_heat_stack.sh
rename to tools/deployment/aiab/common/test_create_heat_stack.sh
index 26512bb6c..4104c7520 100755
--- a/tools/deployment/aiab/dev_single_node/test_create_heat_stack.sh
+++ b/tools/deployment/aiab/common/test_create_heat_stack.sh
@@ -23,10 +23,8 @@ export OSH_EXT_SUBNET="172.24.8.0/24"
 # Install curl if it's not already installed
 apt -y install --no-install-recommends curl
 
-cp /root/deploy/treasuremap/tools/openstack /root/deploy/treasuremap/tools/deployment/aiab/dev_single_node
-
-# Change to the dev_single_node directory
-cd /root/deploy/treasuremap/tools/deployment/aiab/dev_single_node
+cp /root/deploy/treasuremap/tools/openstack /root/deploy/treasuremap/tools/deployment/aiab
+cd /root/deploy/treasuremap/tools/deployment/aiab
 
 printf "\nCreating KeyPair\n"
 ./openstack keypair create heat-vm-key > id_rsa