diff --git a/bootstrap.bash b/bootstrap.bash
index 62c429c54..e48f48035 100755
--- a/bootstrap.bash
+++ b/bootstrap.bash
@@ -8,7 +8,7 @@ if [[ "$ORIG_SRCDIR" != "." ]]; then
     echo "error: To use BUILDDIR, run from the source directory"
     exit 1
   fi
-  export BUILDDIR=$("${ORIG_SRCDIR}/build/soong/reverse_path.py" "$ORIG_SRCDIR")
+  export BUILDDIR=$("${ORIG_SRCDIR}/build/soong/scripts/reverse_path.py" "$ORIG_SRCDIR")
   cd $ORIG_SRCDIR
 fi
 if [[ -z "$BUILDDIR" ]]; then
@@ -45,7 +45,7 @@ if [[ $# -eq 0 ]]; then
       exit 1
     fi
 
-    export SRCDIR_FROM_BUILDDIR=$(build/soong/reverse_path.py "$BUILDDIR")
+    export SRCDIR_FROM_BUILDDIR=$(build/soong/scripts/reverse_path.py "$BUILDDIR")
 
     sed -e "s|@@BuildDir@@|${BUILDDIR}|" \
         -e "s|@@SrcDirFromBuildDir@@|${SRCDIR_FROM_BUILDDIR}|" \
diff --git a/cc/builder.go b/cc/builder.go
index f67f9bd31..ca8bc750f 100644
--- a/cc/builder.go
+++ b/cc/builder.go
@@ -101,7 +101,7 @@ var (
 		},
 		"objcopyCmd", "prefix")
 
-	copyGccLibPath = pctx.SourcePathVariable("copyGccLibPath", "build/soong/copygcclib.sh")
+	copyGccLibPath = pctx.SourcePathVariable("copyGccLibPath", "build/soong/scripts/copygcclib.sh")
 
 	copyGccLib = pctx.StaticRule("copyGccLib",
 		blueprint.RuleParams{
diff --git a/copygcclib.sh b/scripts/copygcclib.sh
similarity index 100%
rename from copygcclib.sh
rename to scripts/copygcclib.sh
diff --git a/reverse_path.py b/scripts/reverse_path.py
similarity index 100%
rename from reverse_path.py
rename to scripts/reverse_path.py
diff --git a/reverse_path_test.py b/scripts/reverse_path_test.py
old mode 100644
new mode 100755
similarity index 97%
rename from reverse_path_test.py
rename to scripts/reverse_path_test.py
index c5bb8e698..557769352
--- a/reverse_path_test.py
+++ b/scripts/reverse_path_test.py
@@ -1,3 +1,5 @@
+#!/usr/bin/env python
+
 from __future__ import print_function
 
 import os