diff --git a/.gclient b/.gclient
index 5943d3d57d..bbbba0b972 100644
--- a/.gclient
+++ b/.gclient
@@ -19,7 +19,7 @@ solutions = [{
     }
 }, {
     'url': 'https://github.com/ry/protobuf_chromium.git',
-    'name': 'third_party/protobuf',
+    'name': 'protobuf',
 }, {
     'url':
     'https://chromium.googlesource.com/chromium/src/tools/protoc_wrapper@9af82fef8cb9ca3ccc13e2ed958f58f2c21f449b',
@@ -29,15 +29,15 @@ solutions = [{
     'url':
     'https://chromium.googlesource.com/chromium/src/third_party/zlib@39b4a6260702da4c089eca57136abf40a39667e9',
     'name':
-    'third_party/zlib'
+    'zlib'
 }, {
     'url':
     'https://github.com/cpplint/cpplint.git@a33992f68f36fcaa6d0f531a25012a4c474d3542',
     'name':
-    'third_party/cpplint'
+    'cpplint'
 }, {
     'url':
     'https://github.com/rust-lang/libc.git@8a85d662b90c14d458bc4ae9521a05564e20d7ae',
     'name':
-    'third_party/rust_crates/libc'
+    'rust_crates/libc'
 }]
diff --git a/.gitignore b/.gitignore
index 12cf21c768..c8cf15063a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,16 @@
+# build
 /out/
+
+# npm deps
 node_modules
-/v8/
-/tools/protoc_wrapper/
+
+# git deps
+/third_party/v8/
+/third_party/tools/protoc_wrapper/
 /third_party/cpplint/
 /third_party/protobuf/
 /third_party/zlib/
 /third_party/rust_crates/libc/
-/.gclient_entries
+
+# gclient files
+/third_party/.gclient_entries
diff --git a/.travis.yml b/.travis.yml
index b16e094c46..c1aa20a069 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,7 +29,7 @@ install:
  - export PATH=$HOME/.cargo/bin:$PATH
  - rustc --version
  - (cd js; yarn)
- - gclient sync -j2 --no-history
+ - (cd third_party; gclient sync -j2 --no-history)
  # ccache needs the custom LLVM to be in PATH and other variables.
  - export PATH=`pwd`/third_party/llvm-build/Release+Asserts/bin:$PATH
  - export CCACHE_CPP2=yes
diff --git a/BUILD.gn b/BUILD.gn
index 6f21f05dde..ebdf7b25d2 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1,11 +1,11 @@
 import("//third_party/protobuf/proto_library.gni")
-import("//v8/gni/v8.gni")
-import("//v8/snapshot_toolchain.gni")
+import("//third_party/v8/gni/v8.gni")
+import("//third_party/v8/snapshot_toolchain.gni")
 import("deno.gni")
 
 config("deno_config") {
-  include_dirs = [ "v8" ]  # This allows us to v8/src/base/ libraries.
-  configs = [ "v8:external_config" ]
+  include_dirs = [ "third_party/v8" ]  # This allows us to v8/src/base/ libraries.
+  configs = [ "third_party/v8:external_config" ]
 }
 
 rust_executable("deno") {
@@ -73,7 +73,7 @@ v8_source_set("deno_nosnapshot") {
     "src/include/deno.h",
   ]
   deps = [
-    "v8:v8_monolith",
+    "third_party/v8:v8_monolith",
   ]
   configs = [ ":deno_config" ]
 }
diff --git a/README.md b/README.md
index 8112b845ad..7372a0d94d 100644
--- a/README.md
+++ b/README.md
@@ -74,8 +74,8 @@ You need [rust](https://www.rust-lang.org/en-US/install.html) installed.
 You need [ccache](https://developer.mozilla.org/en-US/docs/Mozilla/Developer_guide/Build_Instructions/ccache) installed.
 
 Fetch packages and v8:
-``` bash
-gclient sync --no-history
+```bash
+(cd third_party; gclient sync --no-history)
 ```
 
 Install the javascript deps.
diff --git a/build b/build
index 3a238b5086..57ae3a6c85 120000
--- a/build
+++ b/build
@@ -1 +1 @@
-v8/build
\ No newline at end of file
+third_party/v8/build
\ No newline at end of file
diff --git a/build_overrides b/build_overrides
index f1aca1a07d..3e199c0e10 120000
--- a/build_overrides
+++ b/build_overrides
@@ -1 +1 @@
-v8/build_overrides
\ No newline at end of file
+third_party/v8/build_overrides
\ No newline at end of file
diff --git a/buildtools b/buildtools
index c5b1c451c8..25713c88ac 120000
--- a/buildtools
+++ b/buildtools
@@ -1 +1 @@
-v8/buildtools
\ No newline at end of file
+third_party/v8/buildtools
\ No newline at end of file
diff --git a/deno.gni b/deno.gni
index 8d8f0ac169..d5fbe8e2c8 100644
--- a/deno.gni
+++ b/deno.gni
@@ -26,7 +26,7 @@ template("create_snapshot") {
                            ])
     visibility = [ ":*" ]  # Only targets in this file can depend on this.
     deps += [ ":snapshot_creator" ]
-    script = "v8/tools/run.py"
+    script = "third_party/v8/tools/run.py"
     data = []
     exe = rebase_path(get_label_info(":snapshot_creator", "root_out_dir") +
                       "/snapshot_creator")
@@ -66,7 +66,7 @@ template("rust_crate") {
     ]
     outputs = []
     depfile = "$target_gen_dir/$target_name.d"
-    script = "v8/tools/run.py"
+    script = "third_party/v8/tools/run.py"
 
     args = [
       "rustc",
diff --git a/src/deno.cc b/src/deno.cc
index 90d14f6316..a2ef366baf 100644
--- a/src/deno.cc
+++ b/src/deno.cc
@@ -24,9 +24,9 @@ IN THE SOFTWARE.
 #include <string.h>
 #include <string>
 
-#include "v8/include/libplatform/libplatform.h"
-#include "v8/include/v8.h"
-#include "v8/src/base/logging.h"
+#include "third_party/v8/include/libplatform/libplatform.h"
+#include "third_party/v8/include/v8.h"
+#include "third_party/v8/src/base/logging.h"
 
 #include "./deno_internal.h"
 #include "include/deno.h"
diff --git a/src/deno_internal.h b/src/deno_internal.h
index e0a4c34a44..742ac3e3a3 100644
--- a/src/deno_internal.h
+++ b/src/deno_internal.h
@@ -5,7 +5,7 @@
 
 #include <string>
 #include "include/deno.h"
-#include "v8/include/v8.h"
+#include "third_party/v8/include/v8.h"
 
 extern "C" {
 // deno_s = Wrapped Isolate.
diff --git a/src/file_util.cc b/src/file_util.cc
index 1c97f400e0..52e0bc2049 100644
--- a/src/file_util.cc
+++ b/src/file_util.cc
@@ -44,7 +44,7 @@ class StartupDataCppWriter {
  private:
   void WritePrefix() {
     file_ << "// Autogenerated snapshot file. Do not edit.\n\n";
-    file_ << "#include \"v8/include/v8.h\"\n\n";
+    file_ << "#include \"third_party/v8/include/v8.h\"\n\n";
     file_ << "namespace deno { \n\n";
   }
 
diff --git a/src/from_snapshot.cc b/src/from_snapshot.cc
index 97d5885a9c..6195a8aae4 100644
--- a/src/from_snapshot.cc
+++ b/src/from_snapshot.cc
@@ -5,8 +5,8 @@
 #include <string.h>
 #include <string>
 
-#include "v8/include/v8.h"
-#include "v8/src/base/logging.h"
+#include "third_party/v8/include/v8.h"
+#include "third_party/v8/src/base/logging.h"
 
 #include "./deno_internal.h"
 #include "include/deno.h"
diff --git a/src/mock_main.cc b/src/mock_main.cc
index 2a10b88203..21b91ef5df 100644
--- a/src/mock_main.cc
+++ b/src/mock_main.cc
@@ -12,7 +12,7 @@
 
 #include "./msg.pb.h"
 #include "include/deno.h"
-#include "v8/src/base/logging.h"
+#include "third_party/v8/src/base/logging.h"
 
 static char** global_argv;
 static int global_argc;
diff --git a/src/snapshot_creator.cc b/src/snapshot_creator.cc
index b822abd6e9..1b6adf67b1 100644
--- a/src/snapshot_creator.cc
+++ b/src/snapshot_creator.cc
@@ -4,8 +4,8 @@
 #include "deno_internal.h"
 #include "file_util.h"
 #include "include/deno.h"
-#include "v8/include/v8.h"
-#include "v8/src/base/logging.h"
+#include "third_party/v8/include/v8.h"
+#include "third_party/v8/src/base/logging.h"
 
 namespace deno {
 
diff --git a/testing b/testing
index ed34f4824a..ee58868150 120000
--- a/testing
+++ b/testing
@@ -1 +1 @@
-v8/testing
\ No newline at end of file
+third_party/v8/testing
\ No newline at end of file
diff --git a/third_party/.gclient b/third_party/.gclient
new file mode 120000
index 0000000000..76444bf271
--- /dev/null
+++ b/third_party/.gclient
@@ -0,0 +1 @@
+../.gclient
\ No newline at end of file
diff --git a/third_party/googletest b/third_party/googletest
index 80cee42e34..c9ff314a12 120000
--- a/third_party/googletest
+++ b/third_party/googletest
@@ -1 +1 @@
-../v8/third_party/googletest
\ No newline at end of file
+v8/third_party/googletest
\ No newline at end of file
diff --git a/third_party/jinja2 b/third_party/jinja2
index 268588bb99..2f1c1924c3 120000
--- a/third_party/jinja2
+++ b/third_party/jinja2
@@ -1 +1 @@
-../v8/third_party/jinja2
\ No newline at end of file
+v8/third_party/jinja2
\ No newline at end of file
diff --git a/third_party/llvm-build b/third_party/llvm-build
index d023bbec2b..0b5b02b342 120000
--- a/third_party/llvm-build
+++ b/third_party/llvm-build
@@ -1 +1 @@
-../v8/third_party/llvm-build
\ No newline at end of file
+v8/third_party/llvm-build
\ No newline at end of file
diff --git a/third_party/markupsafe b/third_party/markupsafe
index 8e9e53c9e9..c233a58a33 120000
--- a/third_party/markupsafe
+++ b/third_party/markupsafe
@@ -1 +1 @@
-../v8/third_party/markupsafe
\ No newline at end of file
+v8/third_party/markupsafe
\ No newline at end of file
diff --git a/tools/clang b/tools/clang
index 7f66b6537c..e3fc678576 120000
--- a/tools/clang
+++ b/tools/clang
@@ -1 +1 @@
-../v8/tools/clang
\ No newline at end of file
+../third_party/v8/tools/clang
\ No newline at end of file
diff --git a/tools/protoc_wrapper b/tools/protoc_wrapper
new file mode 120000
index 0000000000..008a7795e5
--- /dev/null
+++ b/tools/protoc_wrapper
@@ -0,0 +1 @@
+../third_party/tools/protoc_wrapper
\ No newline at end of file