diff --git a/launch/launch-node.py b/launch/launch-node.py
index 5474f5004c..eaf1645555 100755
--- a/launch/launch-node.py
+++ b/launch/launch-node.py
@@ -129,12 +129,12 @@ def bootstrap_server(server, key, name, volume_device, keep,
             ssh_client.ssh('ping6 -c5 -Q 0x10 review.openstack.org '
                            '|| ping6 -c5 -Q 0x10 wiki.openstack.org')
 
-    ssh_client.scp(os.path.join(SCRIPT_DIR, '..', 'make_swap.sh'),
+    ssh_client.scp(os.path.join(SCRIPT_DIR, 'make_swap.sh'),
                    'make_swap.sh')
     ssh_client.ssh('bash -x make_swap.sh')
 
     if volume_device:
-        ssh_client.scp(os.path.join(SCRIPT_DIR, '..', 'mount_volume.sh'),
+        ssh_client.scp(os.path.join(SCRIPT_DIR, 'mount_volume.sh'),
                        'mount_volume.sh')
         ssh_client.ssh('bash -x mount_volume.sh %s %s %s' %
                        (volume_device, mount_path, fs_label))
diff --git a/make_swap.sh b/launch/make_swap.sh
similarity index 100%
rename from make_swap.sh
rename to launch/make_swap.sh
diff --git a/mount_volume.sh b/launch/mount_volume.sh
similarity index 100%
rename from mount_volume.sh
rename to launch/mount_volume.sh