diff --git a/LICENSE b/LICENSE
index eb293c886f..d8fa8d9d6d 100644
--- a/LICENSE
+++ b/LICENSE
@@ -16,7 +16,11 @@ are:
     snippit. It is copyrighted 2007 by Steven Levithan and released under an
     MIT license.
 
-  - WAF build system. Copyrighted Thomas Nagy. Released under an MIT license.
+  - WAF build system, located at tools/waf. Copyrighted Thomas Nagy.
+    Released under an MIT license.
+
+  - The SCONS build system, located at tools/scons. Copyrighted by the SCONS
+    Foundation.  Released under an MIT license.
 
 Additionally deps/http_parser is based on Zed Shaw's Mongrel.  Mongrel is
 copyrighted by Zed Shaw and distributed under GPL2 or a permissive open
diff --git a/TODO b/TODO
index f1056974a1..9742c27097 100644
--- a/TODO
+++ b/TODO
@@ -1,7 +1,5 @@
 Major features planned: (somewhat ordered)
 
-- require/include HTTP URLs
-
 - C++ API for external modules/plugins
   (Some sort of module build system?)
 
@@ -12,8 +10,6 @@ Major features planned: (somewhat ordered)
 
 - Signal handlers
 
-- popen() (perhaps with bidirectional stream?)
-
 - Internally replace getaddrinfo() with udns
   http://www.corpit.ru/mjt/udns.html
   JS resolver interface
diff --git a/configure b/configure
index 11d4ce01e7..a106344647 100755
--- a/configure
+++ b/configure
@@ -24,6 +24,8 @@ cd $WORKINGDIR
 WORKINGDIR=`pwd`
 cd $CUR_DIR
 
+WAF="${WORKINGDIR}/tools/waf"
+
 # Checks for WAF. Honours $WAF if set. Stores path to 'waf' in $WAF.
 # Requires that $PYTHON is set.
 #
diff --git a/js2c.py b/tools/js2c.py
similarity index 100%
rename from js2c.py
rename to tools/js2c.py
diff --git a/jsmin.py b/tools/jsmin.py
similarity index 100%
rename from jsmin.py
rename to tools/jsmin.py
diff --git a/deps/v8/scons-LICENSE b/tools/scons/scons-LICENSE
similarity index 100%
rename from deps/v8/scons-LICENSE
rename to tools/scons/scons-LICENSE
diff --git a/deps/v8/scons-README b/tools/scons/scons-README
similarity index 100%
rename from deps/v8/scons-README
rename to tools/scons/scons-README
diff --git a/deps/v8/scons-local-1.2.0/SCons/Action.py b/tools/scons/scons-local-1.2.0/SCons/Action.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Action.py
rename to tools/scons/scons-local-1.2.0/SCons/Action.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Builder.py b/tools/scons/scons-local-1.2.0/SCons/Builder.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Builder.py
rename to tools/scons/scons-local-1.2.0/SCons/Builder.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/CacheDir.py b/tools/scons/scons-local-1.2.0/SCons/CacheDir.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/CacheDir.py
rename to tools/scons/scons-local-1.2.0/SCons/CacheDir.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Conftest.py b/tools/scons/scons-local-1.2.0/SCons/Conftest.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Conftest.py
rename to tools/scons/scons-local-1.2.0/SCons/Conftest.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Debug.py b/tools/scons/scons-local-1.2.0/SCons/Debug.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Debug.py
rename to tools/scons/scons-local-1.2.0/SCons/Debug.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Defaults.py b/tools/scons/scons-local-1.2.0/SCons/Defaults.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Defaults.py
rename to tools/scons/scons-local-1.2.0/SCons/Defaults.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Environment.py b/tools/scons/scons-local-1.2.0/SCons/Environment.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Environment.py
rename to tools/scons/scons-local-1.2.0/SCons/Environment.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Errors.py b/tools/scons/scons-local-1.2.0/SCons/Errors.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Errors.py
rename to tools/scons/scons-local-1.2.0/SCons/Errors.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Executor.py b/tools/scons/scons-local-1.2.0/SCons/Executor.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Executor.py
rename to tools/scons/scons-local-1.2.0/SCons/Executor.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Job.py b/tools/scons/scons-local-1.2.0/SCons/Job.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Job.py
rename to tools/scons/scons-local-1.2.0/SCons/Job.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Memoize.py b/tools/scons/scons-local-1.2.0/SCons/Memoize.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Memoize.py
rename to tools/scons/scons-local-1.2.0/SCons/Memoize.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Node/Alias.py b/tools/scons/scons-local-1.2.0/SCons/Node/Alias.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Node/Alias.py
rename to tools/scons/scons-local-1.2.0/SCons/Node/Alias.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Node/FS.py b/tools/scons/scons-local-1.2.0/SCons/Node/FS.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Node/FS.py
rename to tools/scons/scons-local-1.2.0/SCons/Node/FS.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Node/Python.py b/tools/scons/scons-local-1.2.0/SCons/Node/Python.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Node/Python.py
rename to tools/scons/scons-local-1.2.0/SCons/Node/Python.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Node/__init__.py b/tools/scons/scons-local-1.2.0/SCons/Node/__init__.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Node/__init__.py
rename to tools/scons/scons-local-1.2.0/SCons/Node/__init__.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Options/BoolOption.py b/tools/scons/scons-local-1.2.0/SCons/Options/BoolOption.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Options/BoolOption.py
rename to tools/scons/scons-local-1.2.0/SCons/Options/BoolOption.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Options/EnumOption.py b/tools/scons/scons-local-1.2.0/SCons/Options/EnumOption.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Options/EnumOption.py
rename to tools/scons/scons-local-1.2.0/SCons/Options/EnumOption.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Options/ListOption.py b/tools/scons/scons-local-1.2.0/SCons/Options/ListOption.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Options/ListOption.py
rename to tools/scons/scons-local-1.2.0/SCons/Options/ListOption.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Options/PackageOption.py b/tools/scons/scons-local-1.2.0/SCons/Options/PackageOption.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Options/PackageOption.py
rename to tools/scons/scons-local-1.2.0/SCons/Options/PackageOption.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Options/PathOption.py b/tools/scons/scons-local-1.2.0/SCons/Options/PathOption.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Options/PathOption.py
rename to tools/scons/scons-local-1.2.0/SCons/Options/PathOption.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Options/__init__.py b/tools/scons/scons-local-1.2.0/SCons/Options/__init__.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Options/__init__.py
rename to tools/scons/scons-local-1.2.0/SCons/Options/__init__.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/PathList.py b/tools/scons/scons-local-1.2.0/SCons/PathList.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/PathList.py
rename to tools/scons/scons-local-1.2.0/SCons/PathList.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Platform/__init__.py b/tools/scons/scons-local-1.2.0/SCons/Platform/__init__.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Platform/__init__.py
rename to tools/scons/scons-local-1.2.0/SCons/Platform/__init__.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Platform/aix.py b/tools/scons/scons-local-1.2.0/SCons/Platform/aix.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Platform/aix.py
rename to tools/scons/scons-local-1.2.0/SCons/Platform/aix.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Platform/cygwin.py b/tools/scons/scons-local-1.2.0/SCons/Platform/cygwin.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Platform/cygwin.py
rename to tools/scons/scons-local-1.2.0/SCons/Platform/cygwin.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Platform/darwin.py b/tools/scons/scons-local-1.2.0/SCons/Platform/darwin.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Platform/darwin.py
rename to tools/scons/scons-local-1.2.0/SCons/Platform/darwin.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Platform/hpux.py b/tools/scons/scons-local-1.2.0/SCons/Platform/hpux.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Platform/hpux.py
rename to tools/scons/scons-local-1.2.0/SCons/Platform/hpux.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Platform/irix.py b/tools/scons/scons-local-1.2.0/SCons/Platform/irix.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Platform/irix.py
rename to tools/scons/scons-local-1.2.0/SCons/Platform/irix.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Platform/os2.py b/tools/scons/scons-local-1.2.0/SCons/Platform/os2.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Platform/os2.py
rename to tools/scons/scons-local-1.2.0/SCons/Platform/os2.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Platform/posix.py b/tools/scons/scons-local-1.2.0/SCons/Platform/posix.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Platform/posix.py
rename to tools/scons/scons-local-1.2.0/SCons/Platform/posix.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Platform/sunos.py b/tools/scons/scons-local-1.2.0/SCons/Platform/sunos.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Platform/sunos.py
rename to tools/scons/scons-local-1.2.0/SCons/Platform/sunos.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Platform/win32.py b/tools/scons/scons-local-1.2.0/SCons/Platform/win32.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Platform/win32.py
rename to tools/scons/scons-local-1.2.0/SCons/Platform/win32.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/SConf.py b/tools/scons/scons-local-1.2.0/SCons/SConf.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/SConf.py
rename to tools/scons/scons-local-1.2.0/SCons/SConf.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/SConsign.py b/tools/scons/scons-local-1.2.0/SCons/SConsign.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/SConsign.py
rename to tools/scons/scons-local-1.2.0/SCons/SConsign.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Scanner/C.py b/tools/scons/scons-local-1.2.0/SCons/Scanner/C.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Scanner/C.py
rename to tools/scons/scons-local-1.2.0/SCons/Scanner/C.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Scanner/D.py b/tools/scons/scons-local-1.2.0/SCons/Scanner/D.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Scanner/D.py
rename to tools/scons/scons-local-1.2.0/SCons/Scanner/D.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Scanner/Dir.py b/tools/scons/scons-local-1.2.0/SCons/Scanner/Dir.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Scanner/Dir.py
rename to tools/scons/scons-local-1.2.0/SCons/Scanner/Dir.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Scanner/Fortran.py b/tools/scons/scons-local-1.2.0/SCons/Scanner/Fortran.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Scanner/Fortran.py
rename to tools/scons/scons-local-1.2.0/SCons/Scanner/Fortran.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Scanner/IDL.py b/tools/scons/scons-local-1.2.0/SCons/Scanner/IDL.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Scanner/IDL.py
rename to tools/scons/scons-local-1.2.0/SCons/Scanner/IDL.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Scanner/LaTeX.py b/tools/scons/scons-local-1.2.0/SCons/Scanner/LaTeX.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Scanner/LaTeX.py
rename to tools/scons/scons-local-1.2.0/SCons/Scanner/LaTeX.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Scanner/Prog.py b/tools/scons/scons-local-1.2.0/SCons/Scanner/Prog.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Scanner/Prog.py
rename to tools/scons/scons-local-1.2.0/SCons/Scanner/Prog.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Scanner/RC.py b/tools/scons/scons-local-1.2.0/SCons/Scanner/RC.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Scanner/RC.py
rename to tools/scons/scons-local-1.2.0/SCons/Scanner/RC.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Scanner/__init__.py b/tools/scons/scons-local-1.2.0/SCons/Scanner/__init__.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Scanner/__init__.py
rename to tools/scons/scons-local-1.2.0/SCons/Scanner/__init__.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Script/Interactive.py b/tools/scons/scons-local-1.2.0/SCons/Script/Interactive.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Script/Interactive.py
rename to tools/scons/scons-local-1.2.0/SCons/Script/Interactive.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Script/Main.py b/tools/scons/scons-local-1.2.0/SCons/Script/Main.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Script/Main.py
rename to tools/scons/scons-local-1.2.0/SCons/Script/Main.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Script/SConsOptions.py b/tools/scons/scons-local-1.2.0/SCons/Script/SConsOptions.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Script/SConsOptions.py
rename to tools/scons/scons-local-1.2.0/SCons/Script/SConsOptions.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Script/SConscript.py b/tools/scons/scons-local-1.2.0/SCons/Script/SConscript.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Script/SConscript.py
rename to tools/scons/scons-local-1.2.0/SCons/Script/SConscript.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Script/__init__.py b/tools/scons/scons-local-1.2.0/SCons/Script/__init__.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Script/__init__.py
rename to tools/scons/scons-local-1.2.0/SCons/Script/__init__.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Sig.py b/tools/scons/scons-local-1.2.0/SCons/Sig.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Sig.py
rename to tools/scons/scons-local-1.2.0/SCons/Sig.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Subst.py b/tools/scons/scons-local-1.2.0/SCons/Subst.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Subst.py
rename to tools/scons/scons-local-1.2.0/SCons/Subst.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Taskmaster.py b/tools/scons/scons-local-1.2.0/SCons/Taskmaster.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Taskmaster.py
rename to tools/scons/scons-local-1.2.0/SCons/Taskmaster.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/386asm.py b/tools/scons/scons-local-1.2.0/SCons/Tool/386asm.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/386asm.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/386asm.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/BitKeeper.py b/tools/scons/scons-local-1.2.0/SCons/Tool/BitKeeper.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/BitKeeper.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/BitKeeper.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/CVS.py b/tools/scons/scons-local-1.2.0/SCons/Tool/CVS.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/CVS.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/CVS.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/FortranCommon.py b/tools/scons/scons-local-1.2.0/SCons/Tool/FortranCommon.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/FortranCommon.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/FortranCommon.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/JavaCommon.py b/tools/scons/scons-local-1.2.0/SCons/Tool/JavaCommon.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/JavaCommon.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/JavaCommon.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/Perforce.py b/tools/scons/scons-local-1.2.0/SCons/Tool/Perforce.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/Perforce.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/Perforce.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/PharLapCommon.py b/tools/scons/scons-local-1.2.0/SCons/Tool/PharLapCommon.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/PharLapCommon.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/PharLapCommon.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/RCS.py b/tools/scons/scons-local-1.2.0/SCons/Tool/RCS.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/RCS.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/RCS.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/SCCS.py b/tools/scons/scons-local-1.2.0/SCons/Tool/SCCS.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/SCCS.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/SCCS.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/Subversion.py b/tools/scons/scons-local-1.2.0/SCons/Tool/Subversion.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/Subversion.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/Subversion.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/__init__.py b/tools/scons/scons-local-1.2.0/SCons/Tool/__init__.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/__init__.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/__init__.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/aixc++.py b/tools/scons/scons-local-1.2.0/SCons/Tool/aixc++.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/aixc++.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/aixc++.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/aixcc.py b/tools/scons/scons-local-1.2.0/SCons/Tool/aixcc.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/aixcc.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/aixcc.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/aixf77.py b/tools/scons/scons-local-1.2.0/SCons/Tool/aixf77.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/aixf77.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/aixf77.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/aixlink.py b/tools/scons/scons-local-1.2.0/SCons/Tool/aixlink.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/aixlink.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/aixlink.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/applelink.py b/tools/scons/scons-local-1.2.0/SCons/Tool/applelink.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/applelink.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/applelink.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/ar.py b/tools/scons/scons-local-1.2.0/SCons/Tool/ar.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/ar.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/ar.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/as.py b/tools/scons/scons-local-1.2.0/SCons/Tool/as.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/as.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/as.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/bcc32.py b/tools/scons/scons-local-1.2.0/SCons/Tool/bcc32.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/bcc32.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/bcc32.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/c++.py b/tools/scons/scons-local-1.2.0/SCons/Tool/c++.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/c++.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/c++.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/cc.py b/tools/scons/scons-local-1.2.0/SCons/Tool/cc.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/cc.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/cc.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/cvf.py b/tools/scons/scons-local-1.2.0/SCons/Tool/cvf.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/cvf.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/cvf.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/default.py b/tools/scons/scons-local-1.2.0/SCons/Tool/default.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/default.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/default.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/dmd.py b/tools/scons/scons-local-1.2.0/SCons/Tool/dmd.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/dmd.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/dmd.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/dvi.py b/tools/scons/scons-local-1.2.0/SCons/Tool/dvi.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/dvi.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/dvi.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/dvipdf.py b/tools/scons/scons-local-1.2.0/SCons/Tool/dvipdf.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/dvipdf.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/dvipdf.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/dvips.py b/tools/scons/scons-local-1.2.0/SCons/Tool/dvips.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/dvips.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/dvips.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/f77.py b/tools/scons/scons-local-1.2.0/SCons/Tool/f77.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/f77.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/f77.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/f90.py b/tools/scons/scons-local-1.2.0/SCons/Tool/f90.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/f90.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/f90.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/f95.py b/tools/scons/scons-local-1.2.0/SCons/Tool/f95.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/f95.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/f95.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/filesystem.py b/tools/scons/scons-local-1.2.0/SCons/Tool/filesystem.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/filesystem.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/filesystem.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/fortran.py b/tools/scons/scons-local-1.2.0/SCons/Tool/fortran.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/fortran.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/fortran.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/g++.py b/tools/scons/scons-local-1.2.0/SCons/Tool/g++.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/g++.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/g++.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/g77.py b/tools/scons/scons-local-1.2.0/SCons/Tool/g77.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/g77.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/g77.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/gas.py b/tools/scons/scons-local-1.2.0/SCons/Tool/gas.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/gas.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/gas.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/gcc.py b/tools/scons/scons-local-1.2.0/SCons/Tool/gcc.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/gcc.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/gcc.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/gfortran.py b/tools/scons/scons-local-1.2.0/SCons/Tool/gfortran.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/gfortran.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/gfortran.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/gnulink.py b/tools/scons/scons-local-1.2.0/SCons/Tool/gnulink.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/gnulink.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/gnulink.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/gs.py b/tools/scons/scons-local-1.2.0/SCons/Tool/gs.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/gs.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/gs.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/hpc++.py b/tools/scons/scons-local-1.2.0/SCons/Tool/hpc++.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/hpc++.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/hpc++.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/hpcc.py b/tools/scons/scons-local-1.2.0/SCons/Tool/hpcc.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/hpcc.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/hpcc.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/hplink.py b/tools/scons/scons-local-1.2.0/SCons/Tool/hplink.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/hplink.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/hplink.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/icc.py b/tools/scons/scons-local-1.2.0/SCons/Tool/icc.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/icc.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/icc.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/icl.py b/tools/scons/scons-local-1.2.0/SCons/Tool/icl.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/icl.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/icl.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/ifl.py b/tools/scons/scons-local-1.2.0/SCons/Tool/ifl.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/ifl.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/ifl.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/ifort.py b/tools/scons/scons-local-1.2.0/SCons/Tool/ifort.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/ifort.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/ifort.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/ilink.py b/tools/scons/scons-local-1.2.0/SCons/Tool/ilink.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/ilink.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/ilink.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/ilink32.py b/tools/scons/scons-local-1.2.0/SCons/Tool/ilink32.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/ilink32.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/ilink32.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/install.py b/tools/scons/scons-local-1.2.0/SCons/Tool/install.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/install.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/install.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/intelc.py b/tools/scons/scons-local-1.2.0/SCons/Tool/intelc.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/intelc.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/intelc.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/jar.py b/tools/scons/scons-local-1.2.0/SCons/Tool/jar.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/jar.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/jar.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/javac.py b/tools/scons/scons-local-1.2.0/SCons/Tool/javac.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/javac.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/javac.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/javah.py b/tools/scons/scons-local-1.2.0/SCons/Tool/javah.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/javah.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/javah.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/latex.py b/tools/scons/scons-local-1.2.0/SCons/Tool/latex.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/latex.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/latex.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/lex.py b/tools/scons/scons-local-1.2.0/SCons/Tool/lex.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/lex.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/lex.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/link.py b/tools/scons/scons-local-1.2.0/SCons/Tool/link.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/link.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/link.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/linkloc.py b/tools/scons/scons-local-1.2.0/SCons/Tool/linkloc.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/linkloc.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/linkloc.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/m4.py b/tools/scons/scons-local-1.2.0/SCons/Tool/m4.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/m4.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/m4.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/masm.py b/tools/scons/scons-local-1.2.0/SCons/Tool/masm.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/masm.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/masm.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/midl.py b/tools/scons/scons-local-1.2.0/SCons/Tool/midl.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/midl.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/midl.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/mingw.py b/tools/scons/scons-local-1.2.0/SCons/Tool/mingw.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/mingw.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/mingw.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/mslib.py b/tools/scons/scons-local-1.2.0/SCons/Tool/mslib.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/mslib.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/mslib.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/mslink.py b/tools/scons/scons-local-1.2.0/SCons/Tool/mslink.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/mslink.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/mslink.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/msvc.py b/tools/scons/scons-local-1.2.0/SCons/Tool/msvc.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/msvc.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/msvc.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/msvs.py b/tools/scons/scons-local-1.2.0/SCons/Tool/msvs.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/msvs.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/msvs.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/mwcc.py b/tools/scons/scons-local-1.2.0/SCons/Tool/mwcc.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/mwcc.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/mwcc.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/mwld.py b/tools/scons/scons-local-1.2.0/SCons/Tool/mwld.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/mwld.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/mwld.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/nasm.py b/tools/scons/scons-local-1.2.0/SCons/Tool/nasm.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/nasm.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/nasm.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/packaging/__init__.py b/tools/scons/scons-local-1.2.0/SCons/Tool/packaging/__init__.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/packaging/__init__.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/packaging/__init__.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/packaging/ipk.py b/tools/scons/scons-local-1.2.0/SCons/Tool/packaging/ipk.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/packaging/ipk.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/packaging/ipk.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/packaging/msi.py b/tools/scons/scons-local-1.2.0/SCons/Tool/packaging/msi.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/packaging/msi.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/packaging/msi.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/packaging/rpm.py b/tools/scons/scons-local-1.2.0/SCons/Tool/packaging/rpm.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/packaging/rpm.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/packaging/rpm.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/packaging/src_tarbz2.py b/tools/scons/scons-local-1.2.0/SCons/Tool/packaging/src_tarbz2.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/packaging/src_tarbz2.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/packaging/src_tarbz2.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/packaging/src_targz.py b/tools/scons/scons-local-1.2.0/SCons/Tool/packaging/src_targz.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/packaging/src_targz.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/packaging/src_targz.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/packaging/src_zip.py b/tools/scons/scons-local-1.2.0/SCons/Tool/packaging/src_zip.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/packaging/src_zip.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/packaging/src_zip.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/packaging/tarbz2.py b/tools/scons/scons-local-1.2.0/SCons/Tool/packaging/tarbz2.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/packaging/tarbz2.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/packaging/tarbz2.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/packaging/targz.py b/tools/scons/scons-local-1.2.0/SCons/Tool/packaging/targz.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/packaging/targz.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/packaging/targz.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/packaging/zip.py b/tools/scons/scons-local-1.2.0/SCons/Tool/packaging/zip.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/packaging/zip.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/packaging/zip.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/pdf.py b/tools/scons/scons-local-1.2.0/SCons/Tool/pdf.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/pdf.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/pdf.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/pdflatex.py b/tools/scons/scons-local-1.2.0/SCons/Tool/pdflatex.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/pdflatex.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/pdflatex.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/pdftex.py b/tools/scons/scons-local-1.2.0/SCons/Tool/pdftex.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/pdftex.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/pdftex.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/qt.py b/tools/scons/scons-local-1.2.0/SCons/Tool/qt.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/qt.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/qt.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/rmic.py b/tools/scons/scons-local-1.2.0/SCons/Tool/rmic.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/rmic.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/rmic.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/rpcgen.py b/tools/scons/scons-local-1.2.0/SCons/Tool/rpcgen.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/rpcgen.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/rpcgen.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/rpm.py b/tools/scons/scons-local-1.2.0/SCons/Tool/rpm.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/rpm.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/rpm.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/sgiar.py b/tools/scons/scons-local-1.2.0/SCons/Tool/sgiar.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/sgiar.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/sgiar.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/sgic++.py b/tools/scons/scons-local-1.2.0/SCons/Tool/sgic++.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/sgic++.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/sgic++.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/sgicc.py b/tools/scons/scons-local-1.2.0/SCons/Tool/sgicc.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/sgicc.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/sgicc.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/sgilink.py b/tools/scons/scons-local-1.2.0/SCons/Tool/sgilink.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/sgilink.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/sgilink.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/sunar.py b/tools/scons/scons-local-1.2.0/SCons/Tool/sunar.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/sunar.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/sunar.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/sunc++.py b/tools/scons/scons-local-1.2.0/SCons/Tool/sunc++.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/sunc++.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/sunc++.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/suncc.py b/tools/scons/scons-local-1.2.0/SCons/Tool/suncc.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/suncc.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/suncc.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/sunf77.py b/tools/scons/scons-local-1.2.0/SCons/Tool/sunf77.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/sunf77.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/sunf77.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/sunf90.py b/tools/scons/scons-local-1.2.0/SCons/Tool/sunf90.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/sunf90.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/sunf90.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/sunf95.py b/tools/scons/scons-local-1.2.0/SCons/Tool/sunf95.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/sunf95.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/sunf95.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/sunlink.py b/tools/scons/scons-local-1.2.0/SCons/Tool/sunlink.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/sunlink.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/sunlink.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/swig.py b/tools/scons/scons-local-1.2.0/SCons/Tool/swig.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/swig.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/swig.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/tar.py b/tools/scons/scons-local-1.2.0/SCons/Tool/tar.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/tar.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/tar.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/tex.py b/tools/scons/scons-local-1.2.0/SCons/Tool/tex.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/tex.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/tex.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/tlib.py b/tools/scons/scons-local-1.2.0/SCons/Tool/tlib.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/tlib.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/tlib.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/wix.py b/tools/scons/scons-local-1.2.0/SCons/Tool/wix.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/wix.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/wix.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/yacc.py b/tools/scons/scons-local-1.2.0/SCons/Tool/yacc.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/yacc.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/yacc.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Tool/zip.py b/tools/scons/scons-local-1.2.0/SCons/Tool/zip.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Tool/zip.py
rename to tools/scons/scons-local-1.2.0/SCons/Tool/zip.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Util.py b/tools/scons/scons-local-1.2.0/SCons/Util.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Util.py
rename to tools/scons/scons-local-1.2.0/SCons/Util.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Variables/BoolVariable.py b/tools/scons/scons-local-1.2.0/SCons/Variables/BoolVariable.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Variables/BoolVariable.py
rename to tools/scons/scons-local-1.2.0/SCons/Variables/BoolVariable.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Variables/EnumVariable.py b/tools/scons/scons-local-1.2.0/SCons/Variables/EnumVariable.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Variables/EnumVariable.py
rename to tools/scons/scons-local-1.2.0/SCons/Variables/EnumVariable.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Variables/ListVariable.py b/tools/scons/scons-local-1.2.0/SCons/Variables/ListVariable.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Variables/ListVariable.py
rename to tools/scons/scons-local-1.2.0/SCons/Variables/ListVariable.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Variables/PackageVariable.py b/tools/scons/scons-local-1.2.0/SCons/Variables/PackageVariable.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Variables/PackageVariable.py
rename to tools/scons/scons-local-1.2.0/SCons/Variables/PackageVariable.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Variables/PathVariable.py b/tools/scons/scons-local-1.2.0/SCons/Variables/PathVariable.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Variables/PathVariable.py
rename to tools/scons/scons-local-1.2.0/SCons/Variables/PathVariable.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Variables/__init__.py b/tools/scons/scons-local-1.2.0/SCons/Variables/__init__.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Variables/__init__.py
rename to tools/scons/scons-local-1.2.0/SCons/Variables/__init__.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/Warnings.py b/tools/scons/scons-local-1.2.0/SCons/Warnings.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/Warnings.py
rename to tools/scons/scons-local-1.2.0/SCons/Warnings.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/__init__.py b/tools/scons/scons-local-1.2.0/SCons/__init__.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/__init__.py
rename to tools/scons/scons-local-1.2.0/SCons/__init__.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/compat/__init__.py b/tools/scons/scons-local-1.2.0/SCons/compat/__init__.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/compat/__init__.py
rename to tools/scons/scons-local-1.2.0/SCons/compat/__init__.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/compat/_scons_UserString.py b/tools/scons/scons-local-1.2.0/SCons/compat/_scons_UserString.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/compat/_scons_UserString.py
rename to tools/scons/scons-local-1.2.0/SCons/compat/_scons_UserString.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/compat/_scons_hashlib.py b/tools/scons/scons-local-1.2.0/SCons/compat/_scons_hashlib.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/compat/_scons_hashlib.py
rename to tools/scons/scons-local-1.2.0/SCons/compat/_scons_hashlib.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/compat/_scons_itertools.py b/tools/scons/scons-local-1.2.0/SCons/compat/_scons_itertools.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/compat/_scons_itertools.py
rename to tools/scons/scons-local-1.2.0/SCons/compat/_scons_itertools.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/compat/_scons_optparse.py b/tools/scons/scons-local-1.2.0/SCons/compat/_scons_optparse.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/compat/_scons_optparse.py
rename to tools/scons/scons-local-1.2.0/SCons/compat/_scons_optparse.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/compat/_scons_sets.py b/tools/scons/scons-local-1.2.0/SCons/compat/_scons_sets.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/compat/_scons_sets.py
rename to tools/scons/scons-local-1.2.0/SCons/compat/_scons_sets.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/compat/_scons_sets15.py b/tools/scons/scons-local-1.2.0/SCons/compat/_scons_sets15.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/compat/_scons_sets15.py
rename to tools/scons/scons-local-1.2.0/SCons/compat/_scons_sets15.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/compat/_scons_shlex.py b/tools/scons/scons-local-1.2.0/SCons/compat/_scons_shlex.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/compat/_scons_shlex.py
rename to tools/scons/scons-local-1.2.0/SCons/compat/_scons_shlex.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/compat/_scons_subprocess.py b/tools/scons/scons-local-1.2.0/SCons/compat/_scons_subprocess.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/compat/_scons_subprocess.py
rename to tools/scons/scons-local-1.2.0/SCons/compat/_scons_subprocess.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/compat/_scons_textwrap.py b/tools/scons/scons-local-1.2.0/SCons/compat/_scons_textwrap.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/compat/_scons_textwrap.py
rename to tools/scons/scons-local-1.2.0/SCons/compat/_scons_textwrap.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/compat/builtins.py b/tools/scons/scons-local-1.2.0/SCons/compat/builtins.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/compat/builtins.py
rename to tools/scons/scons-local-1.2.0/SCons/compat/builtins.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/cpp.py b/tools/scons/scons-local-1.2.0/SCons/cpp.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/cpp.py
rename to tools/scons/scons-local-1.2.0/SCons/cpp.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/dblite.py b/tools/scons/scons-local-1.2.0/SCons/dblite.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/dblite.py
rename to tools/scons/scons-local-1.2.0/SCons/dblite.py
diff --git a/deps/v8/scons-local-1.2.0/SCons/exitfuncs.py b/tools/scons/scons-local-1.2.0/SCons/exitfuncs.py
similarity index 100%
rename from deps/v8/scons-local-1.2.0/SCons/exitfuncs.py
rename to tools/scons/scons-local-1.2.0/SCons/exitfuncs.py
diff --git a/deps/v8/scons-time.py b/tools/scons/scons-time.py
similarity index 100%
rename from deps/v8/scons-time.py
rename to tools/scons/scons-time.py
diff --git a/deps/v8/scons.py b/tools/scons/scons.py
similarity index 100%
rename from deps/v8/scons.py
rename to tools/scons/scons.py
diff --git a/deps/v8/sconsign.py b/tools/scons/sconsign.py
similarity index 100%
rename from deps/v8/sconsign.py
rename to tools/scons/sconsign.py
diff --git a/waf b/tools/waf
similarity index 100%
rename from waf
rename to tools/waf
diff --git a/wscript b/wscript
index ce85c400b5..a7cc110c45 100644
--- a/wscript
+++ b/wscript
@@ -5,7 +5,6 @@ import os
 from os.path import join, dirname, abspath
 from logging import fatal
 
-
 import js2c
 
 VERSION='0.0.5'
@@ -13,6 +12,7 @@ APPNAME='node'
 
 srcdir = '.'
 blddir = 'build'
+cwd = os.getcwd()
 
 def set_options(opt):
   # the gcc module provides a --debug-level option
@@ -83,14 +83,15 @@ def build(bld):
   deps_tgt = join(bld.srcnode.abspath(bld.env_of_name("default")),"deps")
   v8dir_src = join(deps_src,"v8")
   v8dir_tgt = join(deps_tgt, "v8")
+  scons = os.path.join(cwd, 'tools/scons/scons.py')
 
   v8rule = 'cp -rf %s %s && ' \
            'cd %s && ' \
-           'python scons.py -Q mode=%s library=static snapshot=on'
+           'python %s -Q mode=%s library=static snapshot=on'
 
   v8 = bld.new_task_gen(
     target = join("deps/v8", bld.env["staticlib_PATTERN"] % "v8"),
-    rule=v8rule % ( v8dir_src , deps_tgt , v8dir_tgt, "release"),
+    rule=v8rule % ( v8dir_src , deps_tgt , v8dir_tgt, scons, "release"),
     before="cxx",
     install_path = None
   )
@@ -108,7 +109,7 @@ def build(bld):
     bld.env_of_name('debug')["STATICLIB_V8"] = "v8_g"
     bld.env_of_name('debug')["LIBPATH_V8"] = v8dir_tgt
     bld.env_of_name('debug')["LINKFLAGS_V8"] = "-pthread"
-    v8_debug.rule = v8rule % ( v8dir_src , deps_tgt , v8dir_tgt, "debug")
+    v8_debug.rule = v8rule % ( v8dir_src , deps_tgt , v8dir_tgt, scons, "debug")
     v8_debug.target = join("deps/v8", bld.env["staticlib_PATTERN"] % "v8_g")
 
   ### oi