diff --git a/scripts/fetch_from_web.py b/scripts/install/fetch_from_web.py
similarity index 100%
rename from scripts/fetch_from_web.py
rename to scripts/install/fetch_from_web.py
diff --git a/scripts/install/install_curl.sh b/scripts/install/install_curl.sh
index b2e47481..5f32e384 100755
--- a/scripts/install/install_curl.sh
+++ b/scripts/install/install_curl.sh
@@ -22,7 +22,7 @@ then
 fi
 
 rm -f -- ${QPACKAGE_ROOT}/bin/curl
-${QPACKAGE_ROOT}/scripts/fetch_from_web.py ${CURL_URL} CURL.tar.bz2
+${QPACKAGE_ROOT}/scripts/install/fetch_from_web.py ${CURL_URL} CURL.tar.bz2
 tar -jxf CURL.tar.bz2 && rm CURL.tar.bz2 ||exit 1
 cd ${CURL} || exit 1 
 mv curl.ermine ${QPACKAGE_ROOT}/bin/curl
diff --git a/scripts/install/install_docopt.sh b/scripts/install/install_docopt.sh
index 6f799c47..7e55ea45 100755
--- a/scripts/install/install_docopt.sh
+++ b/scripts/install/install_docopt.sh
@@ -16,6 +16,6 @@ fi
 cd ${QPACKAGE_ROOT}
 
 rm -f -- scripts/${DOCOPT}{,c}
-${QPACKAGE_ROOT}/scripts/fetch_from_web.py ${DOCOPT_URL} ${DOCOPT}
+${QPACKAGE_ROOT}/scripts/install/fetch_from_web.py ${DOCOPT_URL} ${DOCOPT}
 
-mv ${DOCOPT} scripts/${DOCOPT}
\ No newline at end of file
+mv ${DOCOPT} scripts/${DOCOPT}
diff --git a/scripts/install/install_emsl.sh b/scripts/install/install_emsl.sh
index b01afb6e..b0bbc820 100755
--- a/scripts/install/install_emsl.sh
+++ b/scripts/install/install_emsl.sh
@@ -15,7 +15,7 @@ fi
 
 cd ${QPACKAGE_ROOT}
 
-${QPACKAGE_ROOT}/scripts/fetch_from_web.py ${URL} ${QPACKAGE_ROOT}/${BASE}.tar.gz
+${QPACKAGE_ROOT}/scripts/install/fetch_from_web.py ${URL} ${QPACKAGE_ROOT}/${BASE}.tar.gz
 tar -zxf ${BASE}.tar.gz && rm ${BASE}.tar.gz ||exit 1
 rm -rf EMSL_Basis
 mv ${BASE}-master EMSL_Basis
diff --git a/scripts/install/install_ezfio.sh b/scripts/install/install_ezfio.sh
index c0033ca8..7e9a39e2 100755
--- a/scripts/install/install_ezfio.sh
+++ b/scripts/install/install_ezfio.sh
@@ -16,7 +16,7 @@ fi
 cd ${QPACKAGE_ROOT}
 
 rm -rf -- EZFIO
-${QPACKAGE_ROOT}/scripts/fetch_from_web.py ${URL} ${QPACKAGE_ROOT}/${BASE}.tar.gz
+${QPACKAGE_ROOT}/scripts/install/fetch_from_web.py ${URL} ${QPACKAGE_ROOT}/${BASE}.tar.gz
 tar -zxf ${BASE}.tar.gz && rm ${BASE}.tar.gz ||exit 1
 mv EZFIO-master EZFIO
 
diff --git a/scripts/install/install_irpf90.sh b/scripts/install/install_irpf90.sh
index d93340d2..d7043882 100755
--- a/scripts/install/install_irpf90.sh
+++ b/scripts/install/install_irpf90.sh
@@ -17,7 +17,7 @@ fi
 cd ${QPACKAGE_ROOT}
 
 
-${QPACKAGE_ROOT}/scripts/fetch_from_web.py ${URL} ${QPACKAGE_ROOT}/${BASE}.tar.gz
+${QPACKAGE_ROOT}/scripts/install/fetch_from_web.py ${URL} ${QPACKAGE_ROOT}/${BASE}.tar.gz
 tar -zxf ${BASE}.tar.gz && rm ${BASE}.tar.gz ||exit 1
 mv ${BASE}-master irpf90
 make -C irpf90 | tee install_irpf90.log
diff --git a/scripts/install/install_m4.sh b/scripts/install/install_m4.sh
index 8bf514fd..6495b82e 100755
--- a/scripts/install/install_m4.sh
+++ b/scripts/install/install_m4.sh
@@ -20,7 +20,7 @@ rm -f l${QPACKAGE_ROOT}/bin/m4
 if [[ -z ${M4} ]] 
 then 
     rm -f -- bin/m4
-    ${QPACKAGE_ROOT}/scripts/fetch_from_web.py ${M4_URL} M4.tar.gz 
+    ${QPACKAGE_ROOT}/scripts/install/fetch_from_web.py ${M4_URL} M4.tar.gz 
     tar -zxf M4.tar.gz && rm M4.tar.gz ||exit 1
     cd m4* || exit 1 
     ./configure && make || exit 1 
diff --git a/scripts/install/install_ninja.sh b/scripts/install/install_ninja.sh
new file mode 100755
index 00000000..438d6098
--- /dev/null
+++ b/scripts/install/install_ninja.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+#
+# Installs the ninja build system
+# Thu May 28 13:21:16 CEST 2015
+
+BASE="ninja"
+URL="https://github.com/martine/ninja/archive/master.tar.gz"
+if [[ -z ${QPACKAGE_ROOT} ]]
+then
+  echo "The QPACKAGE_ROOT environment variable is not set."
+  echo "Please reload the quantum_package.rc file."
+  exit -1
+fi
+cd ${QPACKAGE_ROOT}
+${QPACKAGE_ROOT}/scripts/install/fetch_from_web.py ${URL} ${QPACKAGE_ROOT}/${BASE}.tar.gz
+tar -zxf ${BASE}.tar.gz && rm ${BASE}.tar.gz ||exit 1
+rm -rf ${BASE}
+mv ${BASE}-master ${BASE}
+cd ${BASE}
+./configure.py --bootstrap
+
diff --git a/scripts/install/install_ocaml.sh b/scripts/install/install_ocaml.sh
index 1cefba6c..fe02e9df 100755
--- a/scripts/install/install_ocaml.sh
+++ b/scripts/install/install_ocaml.sh
@@ -45,7 +45,7 @@ then
     done
   fi
 fi
-${QPACKAGE_ROOT}/scripts/fetch_from_web.py \
+${QPACKAGE_ROOT}/scripts/install/fetch_from_web.py \
    "https://raw.github.com/ocaml/opam/master/shell/opam_installer.sh" opam_installer.sh
 chmod +x opam_installer.sh
 echo N | ./opam_installer.sh ${QPACKAGE_ROOT}/bin