29 files changed, 1903 insertions, 3516 deletions

diff --git a/core/Cargo.toml b/core/Cargo.toml
index e08e6bc74..1ac633410 100644
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -22,6 +22,9 @@ log = "0.4.8"
 serde_json = "1.0.41"
 url = "2.1"
 
+rusty_v8 = "0.0.23"
+# rusty_v8 = { path = "../../rusty_v8" }
+
 [[example]]
 name = "deno_core_http_bench"
 path = "examples/http_bench.rs"
diff --git a/core/build.rs b/core/build.rs
deleted file mode 100644
index 9500c7654..000000000
--- a/core/build.rs
+++ /dev/null
@@ -1,148 +0,0 @@
-// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
-// Run "cargo build -vv" if you want to see gn output.
-
-fn main() {
-  let build = gn::Build::setup();
-
-  println!("cargo:rustc-link-search=native={}/obj", build.gn_out_dir);
-
-  build.run("default");
-}
-
-mod gn {
-  use std::env;
-  use std::path::{self, Path, PathBuf};
-  use std::process::Command;
-
-  pub struct Build {
-    gn_mode: String,
-    root: PathBuf,
-    pub gn_out_dir: String,
-    pub gn_out_path: PathBuf,
-    pub check_only: bool,
-  }
-
-  impl Build {
-    pub fn setup() -> Build {
-      let gn_mode = if cfg!(target_os = "windows") {
-        // On Windows, we need to link with a release build of libdeno, because
-        // rust always uses the release CRT.
-        // TODO(piscisaureus): make linking with debug libdeno possible.
-        String::from("release")
-      } else {
-        // Cargo sets PROFILE to either "debug" or "release", which conveniently
-        // matches the build modes we support.
-        env::var("PROFILE").unwrap()
-      };
-
-      // cd into workspace root.
-      assert!(env::set_current_dir("..").is_ok());
-
-      let root = env::current_dir().unwrap();
-      // If not using host default target the output folder will change
-      // target/release will become target/$TARGET/release
-      // Gn should also be using this output directory as well
-      // most things will work with gn using the default
-      // output directory but some tests depend on artifacts
-      // being in a specific directory relative to the main build output
-      let gn_out_path = root.join(format!("target/{}", gn_mode.clone()));
-      let gn_out_dir = normalize_path(&gn_out_path);
-
-      // Tell Cargo when to re-run this file. We do this first, so these directives
-      // can take effect even if something goes wrong later in the build process.
-      println!("cargo:rerun-if-env-changed=DENO_BUILD_PATH");
-
-      // This helps Rust source files locate the snapshot, source map etc.
-      println!("cargo:rustc-env=GN_OUT_DIR={}", gn_out_dir);
-
-      // Detect if we're being invoked by the rust language server (RLS).
-      // Unfortunately we can't detect whether we're being run by `cargo check`.
-      let check_only = env::var_os("CARGO")
-        .map(PathBuf::from)
-        .as_ref()
-        .and_then(|p| p.file_stem())
-        .and_then(|f| f.to_str())
-        .map(|s| s.starts_with("rls"))
-        .unwrap_or(false);
-
-      if check_only {
-        // Enable the 'check_only' feature, which enables some workarounds in the
-        // rust source code to compile successfully without a bundle and snapshot
-        println!("cargo:rustc-cfg=feature=\"check-only\"");
-      }
-
-      Build {
-        gn_out_dir,
-        gn_out_path,
-        check_only,
-        gn_mode,
-        root,
-      }
-    }
-
-    pub fn run(&self, gn_target: &str) {
-      if !self.gn_out_path.join("build.ninja").exists() {
-        let mut cmd = Command::new("python");
-        cmd.env("DENO_BUILD_PATH", &self.gn_out_dir);
-        cmd.env("DENO_BUILD_MODE", &self.gn_mode);
-        cmd.env("DEPOT_TOOLS_WIN_TOOLCHAIN", "0");
-        cmd.arg("./tools/setup.py");
-        if env::var_os("DENO_NO_BINARY_DOWNLOAD").is_some() {
-          cmd.arg("--no-binary-download");
-        }
-        let status = cmd.status().expect("setup.py failed");
-        assert!(status.success());
-      }
-
-      let mut ninja = Command::new("third_party/depot_tools/ninja");
-      let ninja = if !cfg!(target_os = "windows") {
-        &mut ninja
-      } else {
-        // Windows needs special configuration. This is similar to the function of
-        // python_env() in //tools/util.py.
-        let python_path: Vec<String> = vec![
-          "third_party/python_packages",
-          "third_party/python_packages/win32",
-          "third_party/python_packages/win32/lib",
-          "third_party/python_packages/Pythonwin",
-        ]
-        .into_iter()
-        .map(|p| self.root.join(p).into_os_string().into_string().unwrap())
-        .collect();
-        let orig_path = String::from(";")
-          + &env::var_os("PATH").unwrap().into_string().unwrap();
-        let path = self
-          .root
-          .join("third_party/python_packages/pywin32_system32")
-          .into_os_string()
-          .into_string()
-          .unwrap();
-        ninja
-          .env("PYTHONPATH", python_path.join(";"))
-          .env("PATH", path + &orig_path)
-          .env("DEPOT_TOOLS_WIN_TOOLCHAIN", "0")
-      };
-
-      let status = ninja
-        .arg(gn_target)
-        .arg("-C")
-        .arg(&self.gn_out_dir)
-        .status()
-        .expect("ninja failed");
-      assert!(status.success());
-    }
-  }
-
-  // Utility function to make a path absolute, normalizing it to use forward
-  // slashes only. The returned value is an owned String, otherwise panics.
-  fn normalize_path<T: AsRef<Path>>(path: T) -> String {
-    path
-      .as_ref()
-      .to_str()
-      .unwrap()
-      .to_owned()
-      .chars()
-      .map(|c| if path::is_separator(c) { '/' } else { c })
-      .collect()
-  }
-}
diff --git a/core/flags.rs b/core/flags.rs
index 380adbfa2..7c1f5c449 100644
--- a/core/flags.rs
+++ b/core/flags.rs
@@ -1,44 +1,7 @@
 // Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
-//! This module wraps libdeno::deno_set_v8_flags
-use crate::libdeno::deno_set_v8_flags;
-use libc::c_char;
-use libc::c_int;
-use std::ffi::CStr;
-use std::ffi::CString;
-use std::vec::Vec;
-
+use rusty_v8 as v8;
 /// Pass the command line arguments to v8.
 /// Returns a vector of command line arguments that V8 did not understand.
 pub fn v8_set_flags(args: Vec<String>) -> Vec<String> {
-  // deno_set_v8_flags(int* argc, char** argv) mutates argc and argv to remove
-  // flags that v8 understands.
-
-  // Make a new array, that can be modified by V8::SetFlagsFromCommandLine(),
-  // containing mutable raw pointers to the individual command line args.
-  let mut raw_argv = args
-    .iter()
-    .map(|arg| CString::new(arg.as_str()).unwrap().into_bytes_with_nul())
-    .collect::<Vec<_>>();
-  let mut c_argv = raw_argv
-    .iter_mut()
-    .map(|arg| arg.as_mut_ptr() as *mut c_char)
-    .collect::<Vec<_>>();
-
-  // Store the length of the c_argv array in a local variable. We'll pass
-  // a pointer to this local variable to deno_set_v8_flags(), which then
-  // updates its value.
-  let mut c_argv_len = c_argv.len() as c_int;
-  // Let v8 parse the arguments it recognizes and remove them from c_argv.
-  unsafe { deno_set_v8_flags(&mut c_argv_len, c_argv.as_mut_ptr()) };
-  // If c_argv_len was updated we have to change the length of c_argv to match.
-  c_argv.truncate(c_argv_len as usize);
-  // Copy the modified arguments list into a proper rust vec and return it.
-  c_argv
-    .iter()
-    .map(|ptr| unsafe {
-      let cstr = CStr::from_ptr(*ptr as *const c_char);
-      let slice = cstr.to_str().unwrap();
-      slice.to_string()
-    })
-    .collect()
+  v8::V8::set_flags_from_command_line(args)
 }
diff --git a/core/isolate.rs b/core/isolate.rs
index 9c4595eb0..f15f0856c 100644
--- a/core/isolate.rs
+++ b/core/isolate.rs
@@ -12,10 +12,8 @@ use crate::libdeno;
 use crate::libdeno::deno_buf;
 use crate::libdeno::deno_dyn_import_id;
 use crate::libdeno::deno_mod;
-use crate::libdeno::deno_pinned_buf;
 use crate::libdeno::PinnedBuf;
 use crate::libdeno::Snapshot1;
-use crate::libdeno::Snapshot2;
 use crate::ops::*;
 use crate::shared_queue::SharedQueue;
 use crate::shared_queue::RECOMMENDED_SIZE;
@@ -29,15 +27,11 @@ use futures::stream::StreamFuture;
 use futures::stream::TryStream;
 use futures::stream::TryStreamExt;
 use futures::task::AtomicWaker;
-use libc::c_char;
 use libc::c_void;
-use libc::strdup;
 use std::ffi::CStr;
-use std::ffi::CString;
 use std::fmt;
 use std::future::Future;
 use std::pin::Pin;
-use std::ptr::null;
 use std::sync::{Arc, Mutex, Once};
 use std::task::Context;
 use std::task::Poll;
@@ -153,8 +147,8 @@ impl From<Script<'_>> for OwnedScript {
 /// in the form of the StartupScript struct.
 pub enum StartupData<'a> {
   Script(Script<'a>),
-  Snapshot(&'a [u8]),
-  LibdenoSnapshot(Snapshot1<'a>),
+  Snapshot(&'static [u8]),
+  LibdenoSnapshot(Snapshot1),
   None,
 }
 
@@ -170,8 +164,8 @@ type IsolateErrorHandleFn = dyn FnMut(ErrBox) -> Result<(), ErrBox>;
 /// by implementing dispatcher function that takes control buffer and optional zero copy buffer
 /// as arguments. An async Op corresponds exactly to a Promise in JavaScript.
 pub struct Isolate {
-  libdeno_isolate: *const libdeno::isolate,
-  shared_libdeno_isolate: Arc<Mutex<Option<*const libdeno::isolate>>>,
+  libdeno_isolate: *mut libdeno::isolate,
+  shared_libdeno_isolate: Arc<Mutex<Option<*mut libdeno::isolate>>>,
   dyn_import: Option<Arc<DynImportFn>>,
   js_error_create: Arc<JSErrorCreateFn>,
   needs_init: bool,
@@ -212,7 +206,7 @@ impl Isolate {
 
     let mut libdeno_config = libdeno::deno_config {
       will_snapshot: will_snapshot.into(),
-      load_snapshot: Snapshot2::empty(),
+      load_snapshot: None,
       shared: shared.as_deno_buf(),
       recv_cb: Self::pre_dispatch,
       dyn_import_cb: Self::dyn_import,
@@ -226,10 +220,10 @@ impl Isolate {
         startup_script = Some(d.into());
       }
       StartupData::Snapshot(d) => {
-        libdeno_config.load_snapshot = d.into();
+        libdeno_config.load_snapshot = Some(d.into());
       }
       StartupData::LibdenoSnapshot(d) => {
-        libdeno_config.load_snapshot = d;
+        libdeno_config.load_snapshot = Some(d.into());
       }
       StartupData::None => {}
     };
@@ -310,16 +304,14 @@ impl Isolate {
     }
   }
 
-  extern "C" fn dyn_import(
+  fn dyn_import(
     user_data: *mut c_void,
-    specifier: *const c_char,
-    referrer: *const c_char,
+    specifier: &str,
+    referrer: &str,
     id: deno_dyn_import_id,
   ) {
     assert_ne!(user_data, std::ptr::null_mut());
     let isolate = unsafe { Isolate::from_raw_ptr(user_data) };
-    let specifier = unsafe { CStr::from_ptr(specifier).to_str().unwrap() };
-    let referrer = unsafe { CStr::from_ptr(referrer).to_str().unwrap() };
     debug!("dyn_import specifier {} referrer {} ", specifier, referrer);
 
     if let Some(ref f) = isolate.dyn_import {
@@ -334,19 +326,18 @@ impl Isolate {
     }
   }
 
-  extern "C" fn pre_dispatch(
+  fn pre_dispatch(
     user_data: *mut c_void,
     op_id: OpId,
     control_buf: deno_buf,
-    zero_copy_buf: deno_pinned_buf,
+    zero_copy_buf: Option<PinnedBuf>,
   ) {
     let isolate = unsafe { Isolate::from_raw_ptr(user_data) };
 
-    let maybe_op = isolate.op_registry.call(
-      op_id,
-      control_buf.as_ref(),
-      PinnedBuf::new(zero_copy_buf),
-    );
+    let maybe_op =
+      isolate
+        .op_registry
+        .call(op_id, control_buf.as_ref(), zero_copy_buf);
 
     let op = match maybe_op {
       Some(op) => op,
@@ -397,42 +388,36 @@ impl Isolate {
     js_source: &str,
   ) -> Result<(), ErrBox> {
     self.shared_init();
-    let filename = CString::new(js_filename).unwrap();
-    let source = CString::new(js_source).unwrap();
     unsafe {
       libdeno::deno_execute(
         self.libdeno_isolate,
-        self.as_raw_ptr(),
-        filename.as_ptr(),
-        source.as_ptr(),
+        self as *mut _ as *mut c_void,
+        js_filename,
+        js_source,
       )
     };
     self.check_last_exception()
   }
 
   fn check_last_exception(&mut self) -> Result<(), ErrBox> {
-    let ptr = unsafe { libdeno::deno_last_exception(self.libdeno_isolate) };
-    if ptr.is_null() {
-      Ok(())
-    } else {
-      let js_error_create = &*self.js_error_create;
-      let cstr = unsafe { CStr::from_ptr(ptr) };
-      if self.error_handler.is_some() {
-        // We duplicate the string and assert ownership.
-        // This is due to we want the user to safely clone the error.
-        let cstring = unsafe { CString::from_raw(strdup(ptr)) };
-        // We need to clear last exception to avoid double handling.
-        unsafe { libdeno::deno_clear_last_exception(self.libdeno_isolate) };
-        let json_string = cstring.into_string().unwrap();
-        let v8_exception = V8Exception::from_json(&json_string).unwrap();
-        let js_error = js_error_create(v8_exception);
-        let handler = self.error_handler.as_mut().unwrap();
-        handler(js_error)
-      } else {
-        let json_str = cstr.to_str().unwrap();
-        let v8_exception = V8Exception::from_json(json_str).unwrap();
-        let js_error = js_error_create(v8_exception);
-        Err(js_error)
+    let maybe_err =
+      unsafe { libdeno::deno_last_exception(self.libdeno_isolate) };
+    match maybe_err {
+      None => Ok(()),
+      Some(json_str) => {
+        let js_error_create = &*self.js_error_create;
+        if self.error_handler.is_some() {
+          // We need to clear last exception to avoid double handling.
+          unsafe { libdeno::deno_clear_last_exception(self.libdeno_isolate) };
+          let v8_exception = V8Exception::from_json(&json_str).unwrap();
+          let js_error = js_error_create(v8_exception);
+          let handler = self.error_handler.as_mut().unwrap();
+          handler(js_error)
+        } else {
+          let v8_exception = V8Exception::from_json(&json_str).unwrap();
+          let js_error = js_error_create(v8_exception);
+          Err(js_error)
+        }
       }
     }
   }
@@ -444,9 +429,8 @@ impl Isolate {
   }
 
   fn throw_exception(&mut self, exception_text: &str) {
-    let text = CString::new(exception_text).unwrap();
     unsafe {
-      libdeno::deno_throw_exception(self.libdeno_isolate, text.as_ptr())
+      libdeno::deno_throw_exception(self.libdeno_isolate, exception_text)
     }
   }
 
@@ -471,14 +455,8 @@ impl Isolate {
     name: &str,
     source: &str,
   ) -> Result<deno_mod, ErrBox> {
-    let name_ = CString::new(name.to_string()).unwrap();
-    let name_ptr = name_.as_ptr() as *const libc::c_char;
-
-    let source_ = CString::new(source.to_string()).unwrap();
-    let source_ptr = source_.as_ptr() as *const libc::c_char;
-
     let id = unsafe {
-      libdeno::deno_mod_new(self.libdeno_isolate, main, name_ptr, source_ptr)
+      libdeno::deno_mod_new(self.libdeno_isolate, main, name, source)
     };
 
     self.check_last_exception().map(|_| id)
@@ -489,12 +467,10 @@ impl Isolate {
       unsafe { libdeno::deno_mod_imports_len(self.libdeno_isolate, id) };
     let mut out = Vec::new();
     for i in 0..len {
-      let specifier_ptr =
-        unsafe { libdeno::deno_mod_imports_get(self.libdeno_isolate, id, i) };
-      let specifier_c: &CStr = unsafe { CStr::from_ptr(specifier_ptr) };
-      let specifier: &str = specifier_c.to_str().unwrap();
-
-      out.push(specifier.to_string());
+      let specifier =
+        unsafe { libdeno::deno_mod_imports_get(self.libdeno_isolate, id, i) }
+          .unwrap();
+      out.push(specifier);
     }
     out
   }
@@ -505,15 +481,11 @@ impl Isolate {
   /// ErrBox can be downcast to a type that exposes additional information about
   /// the V8 exception. By default this type is CoreJSError, however it may be a
   /// different type if Isolate::set_js_error_create() has been used.
-  pub fn snapshot(&mut self) -> Result<Snapshot1<'static>, ErrBox> {
-    let snapshot = unsafe { libdeno::deno_snapshot_new(self.libdeno_isolate) };
+  pub fn snapshot(&mut self) -> Result<Snapshot1, ErrBox> {
+    let snapshot = libdeno::deno_snapshot_new(self.libdeno_isolate);
     match self.check_last_exception() {
       Ok(..) => Ok(snapshot),
-      Err(err) => {
-        assert_eq!(snapshot.data_ptr, null());
-        assert_eq!(snapshot.data_len, 0);
-        Err(err)
-      }
+      Err(err) => Err(err),
     }
   }
 
@@ -526,11 +498,7 @@ impl Isolate {
     let (mod_id, maybe_err_str) = match result {
       Ok(mod_id) => (mod_id, None),
       Err(None) => (0, None),
-      Err(Some(err_str)) => (0, Some(CString::new(err_str).unwrap())),
-    };
-    let err_str_ptr = match maybe_err_str {
-      Some(ref err_str) => err_str.as_ptr(),
-      None => std::ptr::null(),
+      Err(Some(err_str)) => (0, Some(err_str)),
     };
     unsafe {
       libdeno::deno_dyn_import_done(
@@ -538,7 +506,7 @@ impl Isolate {
         self.as_raw_ptr(),
         id,
         mod_id,
-        err_str_ptr,
+        maybe_err_str,
       )
     };
     self.check_last_exception()
@@ -662,11 +630,11 @@ impl Isolate {
 }
 
 struct LockerScope {
-  libdeno_isolate: *const libdeno::isolate,
+  libdeno_isolate: *mut libdeno::isolate,
 }
 
 impl LockerScope {
-  fn new(libdeno_isolate: *const libdeno::isolate) -> LockerScope {
+  fn new(libdeno_isolate: *mut libdeno::isolate) -> LockerScope {
     unsafe { libdeno::deno_lock(libdeno_isolate) }
     LockerScope { libdeno_isolate }
   }
@@ -752,7 +720,7 @@ impl Future for Isolate {
 /// IsolateHandle is a thread safe handle on an Isolate. It exposed thread safe V8 functions.
 #[derive(Clone)]
 pub struct IsolateHandle {
-  shared_libdeno_isolate: Arc<Mutex<Option<*const libdeno::isolate>>>,
+  shared_libdeno_isolate: Arc<Mutex<Option<*mut libdeno::isolate>>>,
 }
 
 unsafe impl Send for IsolateHandle {}
diff --git a/core/js_errors.rs b/core/js_errors.rs
index f8707b0ae..0b77945a6 100644
--- a/core/js_errors.rs
+++ b/core/js_errors.rs
@@ -123,7 +123,8 @@ impl V8Exception {
   /// Creates a new V8Exception by parsing the raw exception JSON string from V8.
   pub fn from_json(json_str: &str) -> Option<Self> {
     let v = serde_json::from_str::<serde_json::Value>(json_str);
-    if v.is_err() {
+    if let Err(err) = v {
+      eprintln!("V8Exception::from_json got problem {}", err);
       return None;
     }
     let v = v.unwrap();
diff --git a/core/lib.rs b/core/lib.rs
index 5d37fe0ae..b6e94c7d5 100644
--- a/core/lib.rs
+++ b/core/lib.rs
@@ -5,6 +5,9 @@ extern crate futures;
 extern crate libc;
 #[macro_use]
 extern crate downcast_rs;
+extern crate rusty_v8;
+#[macro_use]
+extern crate lazy_static;
 
 mod any_error;
 mod flags;
@@ -18,6 +21,8 @@ mod plugins;
 mod resources;
 mod shared_queue;
 
+use rusty_v8 as v8;
+
 pub use crate::any_error::*;
 pub use crate::flags::v8_set_flags;
 pub use crate::isolate::*;
@@ -32,10 +37,7 @@ pub use crate::plugins::*;
 pub use crate::resources::*;
 
 pub fn v8_version() -> &'static str {
-  use std::ffi::CStr;
-  let version = unsafe { libdeno::deno_v8_version() };
-  let c_str = unsafe { CStr::from_ptr(version) };
-  c_str.to_str().unwrap()
+  v8::V8::get_version()
 }
 
 #[test]
diff --git a/core/libdeno.rs b/core/libdeno.rs
index 8e09b7d24..8aa564806 100644
--- a/core/libdeno.rs
+++ b/core/libdeno.rs
@@ -1,10 +1,20 @@
 // Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
+#![allow(unused)]
+#![allow(mutable_transmutes)]
+#![allow(clippy::transmute_ptr_to_ptr)]
+
+use rusty_v8 as v8;
+use v8::InIsolate;
 
 use libc::c_char;
 use libc::c_int;
 use libc::c_void;
 use libc::size_t;
+use std::collections::HashMap;
 use std::convert::From;
+use std::convert::TryFrom;
+use std::convert::TryInto;
+use std::ffi::CString;
 use std::marker::PhantomData;
 use std::ops::{Deref, DerefMut};
 use std::option::Option;
@@ -14,11 +24,685 @@ use std::slice;
 
 pub type OpId = u32;
 
-// TODO(F001): change this definition to `extern { pub type isolate; }`
-// After RFC 1861 is stablized. See https://github.com/rust-lang/rust/issues/43467.
+#[allow(non_camel_case_types)]
+pub type isolate = DenoIsolate;
+
+struct ModuleInfo {
+  main: bool,
+  name: String,
+  handle: v8::Global<v8::Module>,
+  import_specifiers: Vec<String>,
+}
+
 #[repr(C)]
-pub struct isolate {
-  _unused: [u8; 0],
+struct UserDataScope {
+  deno_: *mut DenoIsolate,
+  prev_data_: *mut c_void,
+  data_: *mut c_void,
+}
+
+impl UserDataScope {
+  pub fn new(deno_ptr: *mut DenoIsolate, data: *mut c_void) -> Self {
+    let mut deno = unsafe { &mut (*deno_ptr) };
+    assert!(deno.user_data_.is_null() || deno.user_data_ == data);
+    let s = Self {
+      deno_: deno_ptr,
+      data_: data,
+      prev_data_: deno.user_data_,
+    };
+    deno.user_data_ = data;
+    s
+  }
+}
+
+impl Drop for UserDataScope {
+  fn drop(&mut self) {
+    let mut deno = unsafe { &mut (*self.deno_) };
+    assert!(deno.user_data_ == self.data_);
+    deno.user_data_ = self.prev_data_;
+  }
+}
+
+pub struct DenoIsolate {
+  isolate_: Option<v8::OwnedIsolate>,
+  last_exception_: Option<String>,
+  last_exception_handle_: v8::Global<v8::Value>,
+  context_: v8::Global<v8::Context>,
+  mods_: HashMap<deno_mod, ModuleInfo>,
+  mods_by_name_: HashMap<String, deno_mod>,
+  locker_: Option<v8::Locker>,
+  shared_: deno_buf,
+  shared_ab_: v8::Global<v8::SharedArrayBuffer>,
+  resolve_cb_: Option<deno_resolve_cb>,
+  recv_: v8::Global<v8::Function>,
+  user_data_: *mut c_void,
+  current_args_: *const v8::FunctionCallbackInfo,
+  recv_cb_: deno_recv_cb,
+  snapshot_creator_: Option<v8::SnapshotCreator>,
+  has_snapshotted_: bool,
+  snapshot_: Option<SnapshotConfig>,
+  next_dyn_import_id_: deno_dyn_import_id,
+  dyn_import_cb_: deno_dyn_import_cb,
+  dyn_import_map_: HashMap<deno_dyn_import_id, v8::Global<v8::PromiseResolver>>,
+  pending_promise_map_: HashMap<i32, v8::Global<v8::Value>>,
+  /*
+  void* global_import_buf_ptr_;
+  v8::Persistent<v8::ArrayBuffer> global_import_buf_;
+  */
+}
+
+impl Drop for DenoIsolate {
+  fn drop(&mut self) {
+    // TODO Too much boiler plate.
+    // <Boilerplate>
+    let mut isolate = self.isolate_.take().unwrap();
+    {
+      let mut locker = v8::Locker::new(&isolate);
+      let mut hs = v8::HandleScope::new(&mut locker);
+      let scope = hs.enter();
+      // </Boilerplate>
+      self.context_.reset(scope);
+      self.shared_ab_.reset(scope);
+      self.last_exception_handle_.reset(scope);
+      self.recv_.reset(scope);
+      for (key, module) in self.mods_.iter_mut() {
+        module.handle.reset(scope);
+      }
+      for (key, handle) in self.dyn_import_map_.iter_mut() {
+        handle.reset(scope);
+      }
+      for (key, handle) in self.pending_promise_map_.iter_mut() {
+        handle.reset(scope);
+      }
+    }
+    if let Some(locker_) = self.locker_.take() {
+      drop(locker_);
+    }
+    if let Some(creator) = self.snapshot_creator_.take() {
+      // TODO(ry) V8 has a strange assert which prevents a SnapshotCreator from
+      // being deallocated if it hasn't created a snapshot yet.
+      // https://github.com/v8/v8/blob/73212783fbd534fac76cc4b66aac899c13f71fc8/src/api.cc#L603
+      // If that assert is removed, this if guard could be removed.
+      // WARNING: There may be false positive LSAN errors here.
+      std::mem::forget(isolate);
+      if self.has_snapshotted_ {
+        drop(creator);
+      }
+    } else {
+      drop(isolate);
+    }
+  }
+}
+
+impl DenoIsolate {
+  pub fn new(config: deno_config) -> Self {
+    Self {
+      isolate_: None,
+      last_exception_: None,
+      last_exception_handle_: v8::Global::<v8::Value>::new(),
+      context_: v8::Global::<v8::Context>::new(),
+      mods_: HashMap::new(),
+      mods_by_name_: HashMap::new(),
+      pending_promise_map_: HashMap::new(),
+      locker_: None,
+      shared_: config.shared,
+      shared_ab_: v8::Global::<v8::SharedArrayBuffer>::new(),
+      resolve_cb_: None,
+      recv_: v8::Global::<v8::Function>::new(),
+      user_data_: std::ptr::null_mut(),
+      current_args_: std::ptr::null(),
+      recv_cb_: config.recv_cb,
+      snapshot_creator_: None,
+      snapshot_: config.load_snapshot,
+      has_snapshotted_: false,
+      next_dyn_import_id_: 0,
+      dyn_import_cb_: config.dyn_import_cb,
+      dyn_import_map_: HashMap::new(),
+    }
+  }
+
+  pub fn add_isolate(&mut self, mut isolate: v8::OwnedIsolate) {
+    isolate.set_capture_stack_trace_for_uncaught_exceptions(true, 10);
+    isolate.set_promise_reject_callback(promise_reject_callback);
+    isolate.add_message_listener(message_callback);
+    isolate.set_host_initialize_import_meta_object_callback(
+      host_initialize_import_meta_object_callback,
+    );
+    isolate.set_host_import_module_dynamically_callback(
+      host_import_module_dynamically_callback,
+    );
+    let self_ptr: *mut Self = self;
+    unsafe { isolate.set_data(0, self_ptr as *mut c_void) };
+    self.isolate_ = Some(isolate);
+  }
+
+  pub fn register_module(
+    &mut self,
+    main: bool,
+    name: &str,
+    source: &str,
+  ) -> deno_mod {
+    let isolate = self.isolate_.as_ref().unwrap();
+    let mut locker = v8::Locker::new(&isolate);
+
+    let mut hs = v8::HandleScope::new(&mut locker);
+    let scope = hs.enter();
+    let mut context = v8::Context::new(scope);
+    context.enter();
+
+    let name_str = v8::String::new(scope, name).unwrap();
+    let source_str = v8::String::new(scope, source).unwrap();
+
+    let origin = module_origin(scope, name_str);
+    let source = v8::script_compiler::Source::new(source_str, &origin);
+
+    let mut try_catch = v8::TryCatch::new(scope);
+    let tc = try_catch.enter();
+
+    let mut maybe_module =
+      v8::script_compiler::compile_module(&isolate, source);
+
+    if tc.has_caught() {
+      assert!(maybe_module.is_none());
+      self.handle_exception(scope, context, tc.exception().unwrap());
+      context.exit();
+      return 0;
+    }
+    let module = maybe_module.unwrap();
+    let id = module.get_identity_hash();
+
+    let mut import_specifiers: Vec<String> = vec![];
+    for i in 0..module.get_module_requests_length() {
+      let specifier = module.get_module_request(i);
+      import_specifiers.push(specifier.to_rust_string_lossy(scope));
+    }
+
+    let mut handle = v8::Global::<v8::Module>::new();
+    handle.set(scope, module);
+    self.mods_.insert(
+      id,
+      ModuleInfo {
+        main,
+        name: name.to_string(),
+        import_specifiers,
+        handle,
+      },
+    );
+    self.mods_by_name_.insert(name.to_string(), id);
+    context.exit();
+    id
+  }
+
+  fn get_module_info(&self, id: deno_mod) -> Option<&ModuleInfo> {
+    if id == 0 {
+      return None;
+    }
+    self.mods_.get(&id)
+  }
+
+  fn execute<'a>(
+    &mut self,
+    s: &mut impl v8::ToLocal<'a>,
+    mut context: v8::Local<'a, v8::Context>,
+    js_filename: &str,
+    js_source: &str,
+  ) -> bool {
+    let mut hs = v8::HandleScope::new(s);
+    let s = hs.enter();
+    let source = v8::String::new(s, js_source).unwrap();
+    let name = v8::String::new(s, js_filename).unwrap();
+    let mut try_catch = v8::TryCatch::new(s);
+    let tc = try_catch.enter();
+    let origin = script_origin(s, name);
+    let mut script =
+      v8::Script::compile(s, context, source, Some(&origin)).unwrap();
+    let result = script.run(s, context);
+    if result.is_none() {
+      assert!(tc.has_caught());
+      let exception = tc.exception().unwrap();
+      self.handle_exception(s, context, exception);
+      false
+    } else {
+      true
+    }
+  }
+
+  fn handle_exception<'a>(
+    &mut self,
+    s: &mut impl v8::ToLocal<'a>,
+    mut context: v8::Local<'a, v8::Context>,
+    exception: v8::Local<'a, v8::Value>,
+  ) {
+    let isolate = context.get_isolate();
+    // TerminateExecution was called
+    if isolate.is_execution_terminating() {
+      // cancel exception termination so that the exception can be created
+      isolate.cancel_terminate_execution();
+
+      // maybe make a new exception object
+      let exception = if (exception.is_null_or_undefined()) {
+        let exception_str = v8::String::new(s, "execution terminated").unwrap();
+        isolate.enter();
+        let e = v8::error(s, exception_str);
+        isolate.exit();
+        e
+      } else {
+        exception
+      };
+
+      // handle the exception as if it is a regular exception
+      self.handle_exception(s, context, exception);
+
+      // re-enable exception termination
+      context.get_isolate().terminate_execution();
+      return;
+    }
+
+    let json_str = self.encode_exception_as_json(s, context, exception);
+    self.last_exception_ = Some(json_str);
+    self.last_exception_handle_.set(s, exception);
+  }
+
+  fn encode_exception_as_json<'a>(
+    &mut self,
+    s: &mut impl v8::ToLocal<'a>,
+    mut context: v8::Local<'a, v8::Context>,
+    exception: v8::Local<'a, v8::Value>,
+  ) -> String {
+    let message = v8::create_message(s, exception);
+    self.encode_message_as_json(s, context, message)
+  }
+
+  fn encode_message_as_json<'a>(
+    &mut self,
+    s: &mut impl v8::ToLocal<'a>,
+    mut context: v8::Local<v8::Context>,
+    message: v8::Local<v8::Message>,
+  ) -> String {
+    let json_obj = self.encode_message_as_object(s, context, message);
+    let json_string = v8::json::stringify(context, json_obj.into()).unwrap();
+    json_string.to_rust_string_lossy(s)
+  }
+
+  fn encode_message_as_object<'a>(
+    &mut self,
+    s: &mut impl v8::ToLocal<'a>,
+    mut context: v8::Local<v8::Context>,
+    message: v8::Local<v8::Message>,
+  ) -> v8::Local<'a, v8::Object> {
+    let json_obj = v8::Object::new(s);
+
+    let exception_str = message.get(s);
+    json_obj.set(
+      context,
+      v8::String::new(s, "message").unwrap().into(),
+      exception_str.into(),
+    );
+
+    let script_resource_name = message
+      .get_script_resource_name(s)
+      .expect("Missing ScriptResourceName");
+    json_obj.set(
+      context,
+      v8::String::new(s, "scriptResourceName").unwrap().into(),
+      script_resource_name,
+    );
+
+    let source_line = message
+      .get_source_line(s, context)
+      .expect("Missing SourceLine");
+    json_obj.set(
+      context,
+      v8::String::new(s, "sourceLine").unwrap().into(),
+      source_line.into(),
+    );
+
+    let line_number = message
+      .get_line_number(context)
+      .expect("Missing LineNumber");
+    json_obj.set(
+      context,
+      v8::String::new(s, "lineNumber").unwrap().into(),
+      v8::Integer::new(s, line_number as i32).into(),
+    );
+
+    json_obj.set(
+      context,
+      v8::String::new(s, "startPosition").unwrap().into(),
+      v8::Integer::new(s, message.get_start_position() as i32).into(),
+    );
+
+    json_obj.set(
+      context,
+      v8::String::new(s, "endPosition").unwrap().into(),
+      v8::Integer::new(s, message.get_end_position() as i32).into(),
+    );
+
+    json_obj.set(
+      context,
+      v8::String::new(s, "errorLevel").unwrap().into(),
+      v8::Integer::new(s, message.error_level() as i32).into(),
+    );
+
+    json_obj.set(
+      context,
+      v8::String::new(s, "startColumn").unwrap().into(),
+      v8::Integer::new(s, message.get_start_column() as i32).into(),
+    );
+
+    json_obj.set(
+      context,
+      v8::String::new(s, "endColumn").unwrap().into(),
+      v8::Integer::new(s, message.get_end_column() as i32).into(),
+    );
+
+    let is_shared_cross_origin =
+      v8::Boolean::new(s, message.is_shared_cross_origin());
+
+    json_obj.set(
+      context,
+      v8::String::new(s, "isSharedCrossOrigin").unwrap().into(),
+      is_shared_cross_origin.into(),
+    );
+
+    let is_opaque = v8::Boolean::new(s, message.is_opaque());
+
+    json_obj.set(
+      context,
+      v8::String::new(s, "isOpaque").unwrap().into(),
+      is_opaque.into(),
+    );
+
+    let frames = if let Some(stack_trace) = message.get_stack_trace(s) {
+      let count = stack_trace.get_frame_count() as i32;
+      let frames = v8::Array::new(s, count);
+
+      for i in 0..count {
+        let frame = stack_trace
+          .get_frame(s, i as usize)
+          .expect("No frame found");
+        let frame_obj = v8::Object::new(s);
+        frames.set(context, v8::Integer::new(s, i).into(), frame_obj.into());
+        frame_obj.set(
+          context,
+          v8::String::new(s, "line").unwrap().into(),
+          v8::Integer::new(s, frame.get_line_number() as i32).into(),
+        );
+        frame_obj.set(
+          context,
+          v8::String::new(s, "column").unwrap().into(),
+          v8::Integer::new(s, frame.get_column() as i32).into(),
+        );
+
+        if let Some(function_name) = frame.get_function_name(s) {
+          frame_obj.set(
+            context,
+            v8::String::new(s, "functionName").unwrap().into(),
+            function_name.into(),
+          );
+        }
+
+        let script_name = match frame.get_script_name_or_source_url(s) {
+          Some(name) => name,
+          None => v8::String::new(s, "<unknown>").unwrap(),
+        };
+        frame_obj.set(
+          context,
+          v8::String::new(s, "scriptName").unwrap().into(),
+          script_name.into(),
+        );
+
+        frame_obj.set(
+          context,
+          v8::String::new(s, "isEval").unwrap().into(),
+          v8::Boolean::new(s, frame.is_eval()).into(),
+        );
+
+        frame_obj.set(
+          context,
+          v8::String::new(s, "isConstructor").unwrap().into(),
+          v8::Boolean::new(s, frame.is_constructor()).into(),
+        );
+
+        frame_obj.set(
+          context,
+          v8::String::new(s, "isWasm").unwrap().into(),
+          v8::Boolean::new(s, frame.is_wasm()).into(),
+        );
+      }
+
+      frames
+    } else {
+      // No stack trace. We only have one stack frame of info..
+      let frames = v8::Array::new(s, 1);
+      let frame_obj = v8::Object::new(s);
+      frames.set(context, v8::Integer::new(s, 0).into(), frame_obj.into());
+
+      frame_obj.set(
+        context,
+        v8::String::new(s, "scriptResourceName").unwrap().into(),
+        script_resource_name,
+      );
+      frame_obj.set(
+        context,
+        v8::String::new(s, "line").unwrap().into(),
+        v8::Integer::new(s, line_number as i32).into(),
+      );
+      frame_obj.set(
+        context,
+        v8::String::new(s, "column").unwrap().into(),
+        v8::Integer::new(s, message.get_start_column() as i32).into(),
+      );
+
+      frames
+    };
+
+    json_obj.set(
+      context,
+      v8::String::new(s, "frames").unwrap().into(),
+      frames.into(),
+    );
+
+    json_obj
+  }
+}
+
+fn script_origin<'a>(
+  s: &mut impl v8::ToLocal<'a>,
+  resource_name: v8::Local<'a, v8::String>,
+) -> v8::ScriptOrigin<'a> {
+  let resource_line_offset = v8::Integer::new(s, 0);
+  let resource_column_offset = v8::Integer::new(s, 0);
+  let resource_is_shared_cross_origin = v8::Boolean::new(s, false);
+  let script_id = v8::Integer::new(s, 123);
+  let source_map_url = v8::String::new(s, "source_map_url").unwrap();
+  let resource_is_opaque = v8::Boolean::new(s, true);
+  let is_wasm = v8::Boolean::new(s, false);
+  let is_module = v8::Boolean::new(s, false);
+  v8::ScriptOrigin::new(
+    resource_name.into(),
+    resource_line_offset,
+    resource_column_offset,
+    resource_is_shared_cross_origin,
+    script_id,
+    source_map_url.into(),
+    resource_is_opaque,
+    is_wasm,
+    is_module,
+  )
+}
+
+fn module_origin<'a>(
+  s: &mut impl v8::ToLocal<'a>,
+  resource_name: v8::Local<'a, v8::String>,
+) -> v8::ScriptOrigin<'a> {
+  let resource_line_offset = v8::Integer::new(s, 0);
+  let resource_column_offset = v8::Integer::new(s, 0);
+  let resource_is_shared_cross_origin = v8::Boolean::new(s, false);
+  let script_id = v8::Integer::new(s, 123);
+  let source_map_url = v8::String::new(s, "source_map_url").unwrap();
+  let resource_is_opaque = v8::Boolean::new(s, true);
+  let is_wasm = v8::Boolean::new(s, false);
+  let is_module = v8::Boolean::new(s, true);
+  v8::ScriptOrigin::new(
+    resource_name.into(),
+    resource_line_offset,
+    resource_column_offset,
+    resource_is_shared_cross_origin,
+    script_id,
+    source_map_url.into(),
+    resource_is_opaque,
+    is_wasm,
+    is_module,
+  )
+}
+
+extern "C" fn host_import_module_dynamically_callback(
+  context: v8::Local<v8::Context>,
+  referrer: v8::Local<v8::ScriptOrModule>,
+  specifier: v8::Local<v8::String>,
+) -> *mut v8::Promise {
+  let mut cbs = v8::CallbackScope::new(context);
+  let mut hs = v8::EscapableHandleScope::new(cbs.enter());
+  let scope = hs.enter();
+  let mut isolate = scope.isolate();
+  let deno_isolate: &mut DenoIsolate =
+    unsafe { &mut *(isolate.get_data(0) as *mut DenoIsolate) };
+
+  // NOTE(bartlomieju): will crash for non-UTF-8 specifier
+  let specifier_str = specifier
+    .to_string(scope)
+    .unwrap()
+    .to_rust_string_lossy(scope);
+  let referrer_name = referrer.get_resource_name();
+  let referrer_name_str = referrer_name
+    .to_string(scope)
+    .unwrap()
+    .to_rust_string_lossy(scope);
+
+  // TODO(ry) I'm not sure what HostDefinedOptions is for or if we're ever going
+  // to use it. For now we check that it is not used. This check may need to be
+  // changed in the future.
+  let host_defined_options = referrer.get_host_defined_options();
+  assert_eq!(host_defined_options.length(), 0);
+
+  let mut resolver = v8::PromiseResolver::new(scope, context).unwrap();
+  let promise = resolver.get_promise(scope);
+
+  let mut resolver_handle = v8::Global::new();
+  resolver_handle.set(scope, resolver);
+
+  let import_id = deno_isolate.next_dyn_import_id_;
+  deno_isolate.next_dyn_import_id_ += 1;
+  deno_isolate
+    .dyn_import_map_
+    .insert(import_id, resolver_handle);
+
+  let cb = deno_isolate.dyn_import_cb_;
+  cb(
+    deno_isolate.user_data_,
+    &specifier_str,
+    &referrer_name_str,
+    import_id,
+  );
+
+  &mut *scope.escape(promise)
+}
+
+extern "C" fn host_initialize_import_meta_object_callback(
+  context: v8::Local<v8::Context>,
+  module: v8::Local<v8::Module>,
+  meta: v8::Local<v8::Object>,
+) {
+  let mut cbs = v8::CallbackScope::new(context);
+  let mut hs = v8::HandleScope::new(cbs.enter());
+  let scope = hs.enter();
+  let mut isolate = scope.isolate();
+  let deno_isolate: &mut DenoIsolate =
+    unsafe { &mut *(isolate.get_data(0) as *mut DenoIsolate) };
+
+  let id = module.get_identity_hash();
+  assert_ne!(id, 0);
+
+  let info = deno_isolate.get_module_info(id).expect("Module not found");
+
+  meta.create_data_property(
+    context,
+    v8::String::new(scope, "url").unwrap().into(),
+    v8::String::new(scope, &info.name).unwrap().into(),
+  );
+  meta.create_data_property(
+    context,
+    v8::String::new(scope, "main").unwrap().into(),
+    v8::Boolean::new(scope, info.main).into(),
+  );
+}
+
+extern "C" fn message_callback(
+  message: v8::Local<v8::Message>,
+  exception: v8::Local<v8::Value>,
+) {
+  let mut message: v8::Local<v8::Message> =
+    unsafe { std::mem::transmute(message) };
+  let isolate = message.get_isolate();
+  let deno_isolate: &mut DenoIsolate =
+    unsafe { &mut *(isolate.get_data(0) as *mut DenoIsolate) };
+  let mut locker = v8::Locker::new(isolate);
+  let mut hs = v8::HandleScope::new(&mut locker);
+  let scope = hs.enter();
+  assert!(!deno_isolate.context_.is_empty());
+  let mut context = deno_isolate.context_.get(scope).unwrap();
+
+  // TerminateExecution was called
+  if isolate.is_execution_terminating() {
+    let u = v8::new_undefined(scope);
+    deno_isolate.handle_exception(scope, context, u.into());
+    return;
+  }
+
+  let json_str = deno_isolate.encode_message_as_json(scope, context, message);
+  deno_isolate.last_exception_ = Some(json_str);
+}
+
+extern "C" fn promise_reject_callback(msg: v8::PromiseRejectMessage) {
+  #[allow(mutable_transmutes)]
+  let mut msg: v8::PromiseRejectMessage = unsafe { std::mem::transmute(msg) };
+  let mut isolate = msg.isolate();
+  let deno_isolate: &mut DenoIsolate =
+    unsafe { &mut *(isolate.get_data(0) as *mut DenoIsolate) };
+  let mut locker = v8::Locker::new(isolate);
+  assert!(!deno_isolate.context_.is_empty());
+  let mut hs = v8::HandleScope::new(&mut locker);
+  let scope = hs.enter();
+  let mut context = deno_isolate.context_.get(scope).unwrap();
+  context.enter();
+
+  let promise = msg.get_promise();
+  let promise_id = promise.get_identity_hash();
+
+  match msg.get_event() {
+    v8::PromiseRejectEvent::PromiseRejectWithNoHandler => {
+      let error = msg.get_value();
+      let mut error_global = v8::Global::<v8::Value>::new();
+      error_global.set(scope, error);
+      deno_isolate
+        .pending_promise_map_
+        .insert(promise_id, error_global);
+    }
+    v8::PromiseRejectEvent::PromiseHandlerAddedAfterReject => {
+      if let Some(mut handle) =
+        deno_isolate.pending_promise_map_.remove(&promise_id)
+      {
+        handle.reset(scope);
+      }
+    }
+    v8::PromiseRejectEvent::PromiseRejectAfterResolved => {}
+    v8::PromiseRejectEvent::PromiseResolveAfterResolved => {
+      // Should not warn. See #1272
+    }
+  };
+
+  context.exit();
 }
 
 /// This type represents a borrowed slice.
@@ -61,6 +745,16 @@ impl<'a> From<&'a [u8]> for deno_buf {
   }
 }
 
+impl<'a> From<&'a mut [u8]> for deno_buf {
+  #[inline]
+  fn from(x: &'a mut [u8]) -> Self {
+    Self {
+      data_ptr: x.as_ref().as_ptr(),
+      data_len: x.len(),
+    }
+  }
+}
+
 impl Deref for deno_buf {
   type Target = [u8];
   #[inline]
@@ -81,38 +775,24 @@ impl AsRef<[u8]> for deno_buf {
 /// but the existence of a PinnedBuf inhibits this until it is dropped. It
 /// behaves much like an Arc<[u8]>, although a PinnedBuf currently can't be
 /// cloned.
-#[repr(C)]
 pub struct PinnedBuf {
   data_ptr: NonNull<u8>,
   data_len: usize,
-  pin: NonNull<c_void>,
-}
-
-#[repr(C)]
-pub struct PinnedBufRaw {
-  data_ptr: *mut u8,
-  data_len: usize,
-  pin: *mut c_void,
+  backing_store: v8::SharedRef<v8::BackingStore>,
 }
 
 unsafe impl Send for PinnedBuf {}
-unsafe impl Send for PinnedBufRaw {}
 
 impl PinnedBuf {
-  pub fn new(raw: PinnedBufRaw) -> Option<Self> {
-    NonNull::new(raw.data_ptr).map(|data_ptr| PinnedBuf {
-      data_ptr,
-      data_len: raw.data_len,
-      pin: NonNull::new(raw.pin).unwrap(),
-    })
-  }
-}
-
-impl Drop for PinnedBuf {
-  fn drop(&mut self) {
-    unsafe {
-      let raw = &mut *(self as *mut PinnedBuf as *mut PinnedBufRaw);
-      deno_pinned_buf_delete(raw);
+  pub fn new(view: v8::Local<v8::ArrayBufferView>) -> Self {
+    let mut backing_store = view.buffer().unwrap().get_backing_store();
+    let backing_store_ptr = backing_store.data() as *mut _ as *mut u8;
+    let view_ptr = unsafe { backing_store_ptr.add(view.byte_offset()) };
+    let view_len = view.byte_length();
+    Self {
+      data_ptr: NonNull::new(view_ptr).unwrap(),
+      data_len: view_len,
+      backing_store,
     }
   }
 }
@@ -142,8 +822,6 @@ impl AsMut<[u8]> for PinnedBuf {
   }
 }
 
-pub use PinnedBufRaw as deno_pinned_buf;
-
 #[repr(C)]
 pub struct deno_snapshot<'a> {
   pub data_ptr: *const u8,
@@ -159,50 +837,27 @@ unsafe impl Send for deno_snapshot<'_> {}
 // reconsidered. The entire snapshotting interface is still under construction.
 
 /// The type returned from deno_snapshot_new. Needs to be dropped.
-pub type Snapshot1<'a> = deno_snapshot<'a>;
+pub type Snapshot1 = v8::OwnedStartupData;
 
 /// The type created from slice. Used for loading.
-pub type Snapshot2<'a> = deno_snapshot<'a>;
-
-/// Converts Rust &Buf to libdeno `deno_buf`.
-impl<'a> From<&'a [u8]> for Snapshot2<'a> {
-  #[inline]
-  fn from(x: &'a [u8]) -> Self {
-    Self {
-      data_ptr: x.as_ref().as_ptr(),
-      data_len: x.len(),
-      _marker: PhantomData,
-    }
-  }
-}
-
-impl Snapshot2<'_> {
-  #[inline]
-  pub fn empty() -> Self {
-    Self {
-      data_ptr: null(),
-      data_len: 0,
-      _marker: PhantomData,
-    }
-  }
-}
+pub type Snapshot2<'a> = v8::StartupData<'a>;
 
 #[allow(non_camel_case_types)]
-type deno_recv_cb = unsafe extern "C" fn(
+type deno_recv_cb = unsafe fn(
   user_data: *mut c_void,
   op_id: OpId,
   control_buf: deno_buf,
-  zero_copy_buf: deno_pinned_buf,
+  zero_copy_buf: Option<PinnedBuf>,
 );
 
 /// Called when dynamic import is called in JS: import('foo')
 /// Embedder must call deno_dyn_import_done() with the specified id and
 /// the module.
 #[allow(non_camel_case_types)]
-type deno_dyn_import_cb = unsafe extern "C" fn(
+type deno_dyn_import_cb = fn(
   user_data: *mut c_void,
-  specifier: *const c_char,
-  referrer: *const c_char,
+  specifier: &str,
+  referrer: &str,
   id: deno_dyn_import_id,
 );
 
@@ -219,113 +874,1146 @@ type deno_resolve_cb = unsafe extern "C" fn(
   referrer: deno_mod,
 ) -> deno_mod;
 
+pub enum SnapshotConfig {
+  Borrowed(v8::StartupData<'static>),
+  Owned(v8::OwnedStartupData),
+}
+
+impl From<&'static [u8]> for SnapshotConfig {
+  fn from(sd: &'static [u8]) -> Self {
+    Self::Borrowed(v8::StartupData::new(sd))
+  }
+}
+
+impl From<v8::OwnedStartupData> for SnapshotConfig {
+  fn from(sd: v8::OwnedStartupData) -> Self {
+    Self::Owned(sd)
+  }
+}
+
+impl Deref for SnapshotConfig {
+  type Target = v8::StartupData<'static>;
+  fn deref(&self) -> &Self::Target {
+    match self {
+      Self::Borrowed(sd) => sd,
+      Self::Owned(sd) => &*sd,
+    }
+  }
+}
+
 #[repr(C)]
-pub struct deno_config<'a> {
+pub struct deno_config {
   pub will_snapshot: c_int,
-  pub load_snapshot: Snapshot2<'a>,
+  pub load_snapshot: Option<SnapshotConfig>,
   pub shared: deno_buf,
   pub recv_cb: deno_recv_cb,
   pub dyn_import_cb: deno_dyn_import_cb,
 }
 
-#[cfg(not(windows))]
-#[link(name = "deno")]
-extern "C" {}
-
-#[cfg(any(target_os = "macos", target_os = "freebsd"))]
-#[link(name = "c++")]
-extern "C" {}
-
-#[cfg(windows)]
-#[link(name = "libdeno")]
-extern "C" {}
-
-#[cfg(windows)]
-#[link(name = "shlwapi")]
-extern "C" {}
-
-#[cfg(windows)]
-#[link(name = "winmm")]
-extern "C" {}
-
-#[cfg(windows)]
-#[link(name = "ws2_32")]
-extern "C" {}
-
-#[cfg(windows)]
-#[link(name = "dbghelp")]
-extern "C" {}
-
-extern "C" {
-  pub fn deno_init();
-  pub fn deno_v8_version() -> *const c_char;
-  pub fn deno_set_v8_flags(argc: *mut c_int, argv: *mut *mut c_char);
-  pub fn deno_new(config: deno_config) -> *const isolate;
-  pub fn deno_delete(i: *const isolate);
-  pub fn deno_last_exception(i: *const isolate) -> *const c_char;
-  pub fn deno_clear_last_exception(i: *const isolate);
-  pub fn deno_check_promise_errors(i: *const isolate);
-  pub fn deno_lock(i: *const isolate);
-  pub fn deno_unlock(i: *const isolate);
-  pub fn deno_throw_exception(i: *const isolate, text: *const c_char);
-  pub fn deno_respond(
-    i: *const isolate,
-    user_data: *const c_void,
-    op_id: OpId,
-    buf: deno_buf,
+pub unsafe fn deno_init() {
+  let platform = v8::platform::new_default_platform();
+  v8::V8::initialize_platform(platform);
+  v8::V8::initialize();
+  // TODO(ry) This makes WASM compile synchronously. Eventually we should
+  // remove this to make it work asynchronously too. But that requires getting
+  // PumpMessageLoop and RunMicrotasks setup correctly.
+  // See https://github.com/denoland/deno/issues/2544
+  let argv = vec![
+    "".to_string(),
+    "--no-wasm-async-compilation".to_string(),
+    "--harmony-top-level-await".to_string(),
+  ];
+  v8::V8::set_flags_from_command_line(argv);
+}
+
+lazy_static! {
+  static ref EXTERNAL_REFERENCES: v8::ExternalReferences =
+    v8::ExternalReferences::new(&[
+      v8::ExternalReference { function: print },
+      v8::ExternalReference { function: recv },
+      v8::ExternalReference { function: send },
+      v8::ExternalReference {
+        function: eval_context
+      },
+      v8::ExternalReference {
+        function: error_to_json
+      },
+      v8::ExternalReference {
+        getter: shared_getter
+      },
+      v8::ExternalReference {
+        message: message_callback
+      },
+      v8::ExternalReference {
+        function: queue_microtask
+      },
+    ]);
+}
+
+pub unsafe fn deno_new_snapshotter(config: deno_config) -> *mut isolate {
+  assert_ne!(config.will_snapshot, 0);
+  // TODO(ry) Support loading snapshots before snapshotting.
+  assert!(config.load_snapshot.is_none());
+  let mut creator = v8::SnapshotCreator::new(Some(&EXTERNAL_REFERENCES));
+
+  let mut d = Box::new(DenoIsolate::new(config));
+  let isolate = creator.get_owned_isolate();
+
+  let mut locker = v8::Locker::new(&isolate);
+  {
+    let mut hs = v8::HandleScope::new(&mut locker);
+    let scope = hs.enter();
+    let mut context = v8::Context::new(scope);
+    // context.enter();
+    d.context_.set(scope, context);
+    creator.set_default_context(context);
+    initialize_context(scope, context);
+    // context.exit();
+  }
+  d.add_isolate(isolate);
+
+  d.snapshot_creator_ = Some(creator);
+
+  Box::into_raw(d)
+}
+
+extern "C" fn print(info: &v8::FunctionCallbackInfo) {
+  let info: &mut v8::FunctionCallbackInfo =
+    unsafe { std::mem::transmute(info) };
+
+  let arg_len = info.length();
+  assert!(arg_len >= 0 && arg_len <= 2);
+
+  let obj = info.get_argument(0);
+  let is_err_arg = info.get_argument(1);
+
+  let mut hs = v8::HandleScope::new(info);
+  let scope = hs.enter();
+
+  let mut is_err = false;
+  if arg_len == 2 {
+    let int_val = is_err_arg
+      .integer_value(scope)
+      .expect("Unable to convert to integer");
+    is_err = int_val != 0;
+  };
+  let mut isolate = scope.isolate();
+  let mut try_catch = v8::TryCatch::new(scope);
+  let tc = try_catch.enter();
+  let str_ = match obj.to_string(scope) {
+    Some(s) => s,
+    None => v8::String::new(scope, "").unwrap(),
+  };
+  if is_err {
+    eprint!("{}", str_.to_rust_string_lossy(scope));
+  } else {
+    print!("{}", str_.to_rust_string_lossy(scope));
+  }
+}
+
+extern "C" fn recv(info: &v8::FunctionCallbackInfo) {
+  #[allow(mutable_transmutes)]
+  #[allow(clippy::transmute_ptr_to_ptr)]
+  let info: &mut v8::FunctionCallbackInfo =
+    unsafe { std::mem::transmute(info) };
+  assert_eq!(info.length(), 1);
+  let mut isolate = info.get_isolate();
+  let deno_isolate: &mut DenoIsolate =
+    unsafe { &mut *(isolate.get_data(0) as *mut DenoIsolate) };
+  let mut locker = v8::Locker::new(&isolate);
+  let mut hs = v8::HandleScope::new(&mut locker);
+  let scope = hs.enter();
+
+  if !deno_isolate.recv_.is_empty() {
+    let msg = v8::String::new(scope, "Deno.core.recv already called.").unwrap();
+    isolate.throw_exception(msg.into());
+    return;
+  }
+
+  let recv_fn =
+    v8::Local::<v8::Function>::try_from(info.get_argument(0)).unwrap();
+  deno_isolate.recv_.set(scope, recv_fn);
+}
+
+extern "C" fn send(info: &v8::FunctionCallbackInfo) {
+  #[allow(mutable_transmutes)]
+  #[allow(clippy::transmute_ptr_to_ptr)]
+  let info: &mut v8::FunctionCallbackInfo =
+    unsafe { std::mem::transmute(info) };
+
+  let mut hs = v8::HandleScope::new(info);
+  let scope = hs.enter();
+  let mut isolate = scope.isolate();
+  let deno_isolate: &mut DenoIsolate =
+    unsafe { &mut *(isolate.get_data(0) as *mut DenoIsolate) };
+  assert!(!deno_isolate.context_.is_empty());
+
+  let op_id = v8::Local::<v8::Uint32>::try_from(info.get_argument(0))
+    .unwrap()
+    .value() as u32;
+
+  let control =
+    v8::Local::<v8::ArrayBufferView>::try_from(info.get_argument(1))
+      .map(|view| {
+        let mut backing_store = view.buffer().unwrap().get_backing_store();
+        let backing_store_ptr = backing_store.data() as *mut _ as *mut u8;
+        let view_ptr = unsafe { backing_store_ptr.add(view.byte_offset()) };
+        let view_len = view.byte_length();
+        unsafe { deno_buf::from_raw_parts(view_ptr, view_len) }
+      })
+      .unwrap_or_else(|_| deno_buf::empty());
+
+  let zero_copy: Option<PinnedBuf> =
+    v8::Local::<v8::ArrayBufferView>::try_from(info.get_argument(2))
+      .map(PinnedBuf::new)
+      .ok();
+
+  // TODO: what's the point of this again?
+  // DCHECK_NULL(d->current_args_);
+  // d->current_args_ = &args;
+  assert!(deno_isolate.current_args_.is_null());
+  deno_isolate.current_args_ = info;
+
+  unsafe {
+    (deno_isolate.recv_cb_)(deno_isolate.user_data_, op_id, control, zero_copy);
+  }
+
+  if deno_isolate.current_args_.is_null() {
+    // This indicates that deno_repond() was called already.
+  } else {
+    // Asynchronous.
+    deno_isolate.current_args_ = null();
+  }
+}
+
+extern "C" fn eval_context(info: &v8::FunctionCallbackInfo) {
+  let rv = &mut info.get_return_value();
+
+  #[allow(mutable_transmutes)]
+  #[allow(clippy::transmute_ptr_to_ptr)]
+  let info: &mut v8::FunctionCallbackInfo =
+    unsafe { std::mem::transmute(info) };
+  let arg0 = info.get_argument(0);
+
+  let mut hs = v8::HandleScope::new(info);
+  let scope = hs.enter();
+  let mut isolate = scope.isolate();
+  let deno_isolate: &mut DenoIsolate =
+    unsafe { &mut *(isolate.get_data(0) as *mut DenoIsolate) };
+  assert!(!deno_isolate.context_.is_empty());
+  let mut context = deno_isolate.context_.get(scope).unwrap();
+
+  let source = match v8::Local::<v8::String>::try_from(arg0) {
+    Ok(s) => s,
+    Err(_) => {
+      let msg = v8::String::new(scope, "Invalid argument").unwrap();
+      let exception = v8::type_error(scope, msg);
+      scope.isolate().throw_exception(exception);
+      return;
+    }
+  };
+
+  let output = v8::Array::new(scope, 2);
+  /**
+   * output[0] = result
+   * output[1] = ErrorInfo | null
+   *   ErrorInfo = {
+   *     thrown: Error | any,
+   *     isNativeError: boolean,
+   *     isCompileError: boolean,
+   *   }
+   */
+  let mut try_catch = v8::TryCatch::new(scope);
+  let tc = try_catch.enter();
+  let name = v8::String::new(scope, "<unknown>").unwrap();
+  let origin = script_origin(scope, name);
+  let maybe_script = v8::Script::compile(scope, context, source, Some(&origin));
+
+  if maybe_script.is_none() {
+    assert!(tc.has_caught());
+    let exception = tc.exception().unwrap();
+
+    output.set(
+      context,
+      v8::Integer::new(scope, 0).into(),
+      v8::new_null(scope).into(),
+    );
+
+    let errinfo_obj = v8::Object::new(scope);
+    errinfo_obj.set(
+      context,
+      v8::String::new(scope, "isCompileError").unwrap().into(),
+      v8::Boolean::new(scope, true).into(),
+    );
+
+    errinfo_obj.set(
+      context,
+      v8::String::new(scope, "isNativeError").unwrap().into(),
+      v8::Boolean::new(scope, exception.is_native_error()).into(),
+    );
+
+    errinfo_obj.set(
+      context,
+      v8::String::new(scope, "thrown").unwrap().into(),
+      exception,
+    );
+
+    output.set(
+      context,
+      v8::Integer::new(scope, 1).into(),
+      errinfo_obj.into(),
+    );
+
+    rv.set(output.into());
+    return;
+  }
+
+  let result = maybe_script.unwrap().run(scope, context);
+
+  if result.is_none() {
+    assert!(tc.has_caught());
+    let exception = tc.exception().unwrap();
+
+    output.set(
+      context,
+      v8::Integer::new(scope, 0).into(),
+      v8::new_null(scope).into(),
+    );
+
+    let errinfo_obj = v8::Object::new(scope);
+    errinfo_obj.set(
+      context,
+      v8::String::new(scope, "isCompileError").unwrap().into(),
+      v8::Boolean::new(scope, false).into(),
+    );
+
+    let is_native_error = if exception.is_native_error() {
+      v8::Boolean::new(scope, true)
+    } else {
+      v8::Boolean::new(scope, false)
+    };
+
+    errinfo_obj.set(
+      context,
+      v8::String::new(scope, "isNativeError").unwrap().into(),
+      is_native_error.into(),
+    );
+
+    errinfo_obj.set(
+      context,
+      v8::String::new(scope, "thrown").unwrap().into(),
+      exception,
+    );
+
+    output.set(
+      context,
+      v8::Integer::new(scope, 1).into(),
+      errinfo_obj.into(),
+    );
+
+    rv.set(output.into());
+    return;
+  }
+
+  output.set(context, v8::Integer::new(scope, 0).into(), result.unwrap());
+  output.set(
+    context,
+    v8::Integer::new(scope, 1).into(),
+    v8::new_null(scope).into(),
   );
-  pub fn deno_pinned_buf_delete(buf: &mut deno_pinned_buf);
-  pub fn deno_execute(
-    i: *const isolate,
-    user_data: *const c_void,
-    js_filename: *const c_char,
-    js_source: *const c_char,
+  rv.set(output.into());
+}
+
+extern "C" fn error_to_json(info: &v8::FunctionCallbackInfo) {
+  #[allow(mutable_transmutes)]
+  #[allow(clippy::transmute_ptr_to_ptr)]
+  let info: &mut v8::FunctionCallbackInfo =
+    unsafe { std::mem::transmute(info) };
+  assert_eq!(info.length(), 1);
+  // <Boilerplate>
+  let mut isolate = info.get_isolate();
+  let deno_isolate: &mut DenoIsolate =
+    unsafe { &mut *(isolate.get_data(0) as *mut DenoIsolate) };
+  let mut locker = v8::Locker::new(&isolate);
+  assert!(!deno_isolate.context_.is_empty());
+  let mut hs = v8::HandleScope::new(&mut locker);
+  let scope = hs.enter();
+  let mut context = deno_isolate.context_.get(scope).unwrap();
+  // </Boilerplate>
+  let exception = info.get_argument(0);
+  let json_string =
+    deno_isolate.encode_exception_as_json(scope, context, exception);
+  let s = v8::String::new(scope, &json_string).unwrap();
+  let mut rv = info.get_return_value();
+  rv.set(s.into());
+}
+
+extern "C" fn queue_microtask(info: &v8::FunctionCallbackInfo) {
+  #[allow(mutable_transmutes)]
+  #[allow(clippy::transmute_ptr_to_ptr)]
+  let info: &mut v8::FunctionCallbackInfo =
+    unsafe { std::mem::transmute(info) };
+  assert_eq!(info.length(), 1);
+  let arg0 = info.get_argument(0);
+  let mut isolate = info.get_isolate();
+  let deno_isolate: &mut DenoIsolate =
+    unsafe { &mut *(isolate.get_data(0) as *mut DenoIsolate) };
+  let mut locker = v8::Locker::new(&isolate);
+  let mut hs = v8::HandleScope::new(&mut locker);
+  let scope = hs.enter();
+
+  match v8::Local::<v8::Function>::try_from(arg0) {
+    Ok(f) => isolate.enqueue_microtask(f),
+    Err(_) => {
+      let msg = v8::String::new(scope, "Invalid argument").unwrap();
+      let exception = v8::type_error(scope, msg);
+      isolate.throw_exception(exception);
+    }
+  };
+}
+
+extern "C" fn shared_getter(
+  name: v8::Local<v8::Name>,
+  info: &v8::PropertyCallbackInfo,
+) {
+  let shared_ab = {
+    #[allow(mutable_transmutes)]
+    #[allow(clippy::transmute_ptr_to_ptr)]
+    let info: &mut v8::PropertyCallbackInfo =
+      unsafe { std::mem::transmute(info) };
+
+    let mut hs = v8::EscapableHandleScope::new(info);
+    let scope = hs.enter();
+    let mut isolate = scope.isolate();
+    let deno_isolate: &mut DenoIsolate =
+      unsafe { &mut *(isolate.get_data(0) as *mut DenoIsolate) };
+
+    if deno_isolate.shared_.data_ptr.is_null() {
+      return;
+    }
+
+    // Lazily initialize the persistent external ArrayBuffer.
+    if deno_isolate.shared_ab_.is_empty() {
+      #[allow(mutable_transmutes)]
+      #[allow(clippy::transmute_ptr_to_ptr)]
+      let data_ptr: *mut u8 =
+        unsafe { std::mem::transmute(deno_isolate.shared_.data_ptr) };
+      let ab = unsafe {
+        v8::SharedArrayBuffer::new_DEPRECATED(
+          scope,
+          data_ptr as *mut c_void,
+          deno_isolate.shared_.data_len,
+        )
+      };
+      deno_isolate.shared_ab_.set(scope, ab);
+    }
+
+    let shared_ab = deno_isolate.shared_ab_.get(scope).unwrap();
+    scope.escape(shared_ab)
+  };
+
+  let rv = &mut info.get_return_value();
+  rv.set(shared_ab.into());
+}
+
+fn initialize_context<'a>(
+  scope: &mut impl v8::ToLocal<'a>,
+  mut context: v8::Local<v8::Context>,
+) {
+  context.enter();
+
+  let global = context.global(scope);
+
+  let deno_val = v8::Object::new(scope);
+
+  global.set(
+    context,
+    v8::String::new(scope, "Deno").unwrap().into(),
+    deno_val.into(),
   );
-  pub fn deno_terminate_execution(i: *const isolate);
-  #[allow(dead_code)]
-  pub fn deno_run_microtasks(i: *const isolate, user_data: *const c_void);
 
-  // Modules
+  let mut core_val = v8::Object::new(scope);
 
-  pub fn deno_mod_new(
-    i: *const isolate,
-    main: bool,
-    name: *const c_char,
-    source: *const c_char,
-  ) -> deno_mod;
-
-  pub fn deno_mod_imports_len(i: *const isolate, id: deno_mod) -> size_t;
-
-  pub fn deno_mod_imports_get(
-    i: *const isolate,
-    id: deno_mod,
-    index: size_t,
-  ) -> *const c_char;
-
-  pub fn deno_mod_instantiate(
-    i: *const isolate,
-    user_data: *const c_void,
-    id: deno_mod,
-    resolve_cb: deno_resolve_cb,
+  deno_val.set(
+    context,
+    v8::String::new(scope, "core").unwrap().into(),
+    core_val.into(),
+  );
+
+  let mut print_tmpl = v8::FunctionTemplate::new(scope, print);
+  let mut print_val = print_tmpl.get_function(scope, context).unwrap();
+  core_val.set(
+    context,
+    v8::String::new(scope, "print").unwrap().into(),
+    print_val.into(),
+  );
+
+  let mut recv_tmpl = v8::FunctionTemplate::new(scope, recv);
+  let mut recv_val = recv_tmpl.get_function(scope, context).unwrap();
+  core_val.set(
+    context,
+    v8::String::new(scope, "recv").unwrap().into(),
+    recv_val.into(),
   );
 
-  pub fn deno_mod_evaluate(
-    i: *const isolate,
-    user_data: *const c_void,
-    id: deno_mod,
+  let mut send_tmpl = v8::FunctionTemplate::new(scope, send);
+  let mut send_val = send_tmpl.get_function(scope, context).unwrap();
+  core_val.set(
+    context,
+    v8::String::new(scope, "send").unwrap().into(),
+    send_val.into(),
   );
 
-  /// Call exactly once for every deno_dyn_import_cb.
-  pub fn deno_dyn_import_done(
-    i: *const isolate,
-    user_data: *const c_void,
-    id: deno_dyn_import_id,
-    mod_id: deno_mod,
-    error_str: *const c_char,
+  let mut eval_context_tmpl = v8::FunctionTemplate::new(scope, eval_context);
+  let mut eval_context_val =
+    eval_context_tmpl.get_function(scope, context).unwrap();
+  core_val.set(
+    context,
+    v8::String::new(scope, "evalContext").unwrap().into(),
+    eval_context_val.into(),
+  );
+
+  let mut error_to_json_tmpl = v8::FunctionTemplate::new(scope, error_to_json);
+  let mut error_to_json_val =
+    error_to_json_tmpl.get_function(scope, context).unwrap();
+  core_val.set(
+    context,
+    v8::String::new(scope, "errorToJSON").unwrap().into(),
+    error_to_json_val.into(),
+  );
+
+  core_val.set_accessor(
+    context,
+    v8::String::new(scope, "shared").unwrap().into(),
+    shared_getter,
+  );
+
+  // Direct bindings on `window`.
+  let mut queue_microtask_tmpl =
+    v8::FunctionTemplate::new(scope, queue_microtask);
+  let mut queue_microtask_val =
+    queue_microtask_tmpl.get_function(scope, context).unwrap();
+  global.set(
+    context,
+    v8::String::new(scope, "queueMicrotask").unwrap().into(),
+    queue_microtask_val.into(),
+  );
+
+  context.exit();
+}
+
+pub unsafe fn deno_new(config: deno_config) -> *mut isolate {
+  if config.will_snapshot != 0 {
+    return deno_new_snapshotter(config);
+  }
+
+  let load_snapshot_is_null = config.load_snapshot.is_none();
+
+  let mut d = Box::new(DenoIsolate::new(config));
+  let mut params = v8::Isolate::create_params();
+  params.set_array_buffer_allocator(v8::new_default_allocator());
+  params.set_external_references(&EXTERNAL_REFERENCES);
+  if let Some(ref mut snapshot) = d.snapshot_ {
+    params.set_snapshot_blob(snapshot);
+  }
+
+  let isolate = v8::Isolate::new(params);
+  d.add_isolate(isolate);
+
+  let mut locker = v8::Locker::new(d.isolate_.as_ref().unwrap());
+  {
+    let mut hs = v8::HandleScope::new(&mut locker);
+    let scope = hs.enter();
+    let mut context = v8::Context::new(scope);
+
+    if load_snapshot_is_null {
+      // If no snapshot is provided, we initialize the context with empty
+      // main source code and source maps.
+      initialize_context(scope, context);
+    }
+    d.context_.set(scope, context);
+  }
+  Box::into_raw(d)
+}
+
+pub unsafe fn deno_delete(i: *mut DenoIsolate) {
+  let deno_isolate = unsafe { Box::from_raw(i as *mut DenoIsolate) };
+  drop(deno_isolate);
+}
+
+pub unsafe fn deno_last_exception(i: *mut DenoIsolate) -> Option<String> {
+  (*i).last_exception_.clone()
+}
+
+pub unsafe fn deno_clear_last_exception(i: *mut DenoIsolate) {
+  let i_mut: &mut DenoIsolate = unsafe { &mut *i };
+  i_mut.last_exception_ = None;
+}
+
+pub unsafe fn deno_check_promise_errors(i: *mut DenoIsolate) {
+  /*
+  if (d->pending_promise_map_.size() > 0) {
+    auto* isolate = d->isolate_;
+    v8::Locker locker(isolate);
+    v8::Isolate::Scope isolate_scope(isolate);
+    v8::HandleScope handle_scope(isolate);
+    auto context = d->context_.Get(d->isolate_);
+    v8::Context::Scope context_scope(context);
+
+    auto it = d->pending_promise_map_.begin();
+    while (it != d->pending_promise_map_.end()) {
+      auto error = it->second.Get(isolate);
+      deno::HandleException(context, error);
+      it = d->pending_promise_map_.erase(it);
+    }
+  }
+  */
+  let i_mut: &mut DenoIsolate = unsafe { &mut *i };
+  let isolate = i_mut.isolate_.as_ref().unwrap();
+
+  if i_mut.pending_promise_map_.is_empty() {
+    return;
+  }
+
+  let mut locker = v8::Locker::new(isolate);
+  assert!(!i_mut.context_.is_empty());
+  let mut hs = v8::HandleScope::new(&mut locker);
+  let scope = hs.enter();
+  let mut context = i_mut.context_.get(scope).unwrap();
+  context.enter();
+
+  let pending_promises: Vec<(i32, v8::Global<v8::Value>)> =
+    i_mut.pending_promise_map_.drain().collect();
+  for (promise_id, mut handle) in pending_promises {
+    let error = handle.get(scope).expect("Empty error handle");
+    i_mut.handle_exception(scope, context, error);
+    handle.reset(scope);
+  }
+
+  context.exit();
+}
+
+pub unsafe fn deno_lock(i: *mut DenoIsolate) {
+  let i_mut: &mut DenoIsolate = unsafe { &mut *i };
+  assert!(i_mut.locker_.is_none());
+  let mut locker = v8::Locker::new(i_mut.isolate_.as_ref().unwrap());
+  i_mut.locker_ = Some(locker);
+}
+
+pub unsafe fn deno_unlock(i: *mut DenoIsolate) {
+  let i_mut: &mut DenoIsolate = unsafe { &mut *i };
+  i_mut.locker_.take().unwrap();
+}
+
+pub unsafe fn deno_throw_exception(i: *mut DenoIsolate, text: &str) {
+  let i_mut: &mut DenoIsolate = unsafe { &mut *i };
+  let isolate = i_mut.isolate_.as_ref().unwrap();
+  let mut locker = v8::Locker::new(isolate);
+  let mut hs = v8::HandleScope::new(&mut locker);
+  let scope = hs.enter();
+  let msg = v8::String::new(scope, text).unwrap();
+  isolate.throw_exception(msg.into());
+}
+
+pub unsafe fn deno_import_buf<'sc>(
+  scope: &mut impl v8::ToLocal<'sc>,
+  buf: deno_buf,
+) -> v8::Local<'sc, v8::Uint8Array> {
+  /*
+  if (buf.data_ptr == nullptr) {
+    return v8::Local<v8::Uint8Array>();
+  }
+  */
+
+  if buf.data_ptr.is_null() {
+    let mut ab = v8::ArrayBuffer::new(scope, 0);
+    return v8::Uint8Array::new(ab, 0, 0).expect("Failed to create UintArray8");
+  }
+
+  /*
+  // To avoid excessively allocating new ArrayBuffers, we try to reuse a single
+  // global ArrayBuffer. The caveat is that users must extract data from it
+  // before the next tick. We only do this for ArrayBuffers less than 1024
+  // bytes.
+  v8::Local<v8::ArrayBuffer> ab;
+  void* data;
+  if (buf.data_len > GLOBAL_IMPORT_BUF_SIZE) {
+    // Simple case. We allocate a new ArrayBuffer for this.
+    ab = v8::ArrayBuffer::New(d->isolate_, buf.data_len);
+    data = ab->GetBackingStore()->Data();
+  } else {
+    // Fast case. We reuse the global ArrayBuffer.
+    if (d->global_import_buf_.IsEmpty()) {
+      // Lazily initialize it.
+      DCHECK_NULL(d->global_import_buf_ptr_);
+      ab = v8::ArrayBuffer::New(d->isolate_, GLOBAL_IMPORT_BUF_SIZE);
+      d->global_import_buf_.Reset(d->isolate_, ab);
+      d->global_import_buf_ptr_ = ab->GetBackingStore()->Data();
+    } else {
+      DCHECK(d->global_import_buf_ptr_);
+      ab = d->global_import_buf_.Get(d->isolate_);
+    }
+    data = d->global_import_buf_ptr_;
+  }
+  memcpy(data, buf.data_ptr, buf.data_len);
+  auto view = v8::Uint8Array::New(ab, 0, buf.data_len);
+  return view;
+  */
+
+  // TODO(bartlomieju): for now skipping part with `global_import_buf_`
+  // and always creating new buffer
+  let mut ab = v8::ArrayBuffer::new(scope, buf.data_len);
+  let mut backing_store = ab.get_backing_store();
+  let data = backing_store.data();
+  let data: *mut u8 = unsafe { data as *mut libc::c_void as *mut u8 };
+  std::ptr::copy_nonoverlapping(buf.data_ptr, data, buf.data_len);
+  v8::Uint8Array::new(ab, 0, buf.data_len).expect("Failed to create UintArray8")
+}
+
+pub unsafe fn deno_respond(
+  i: *mut isolate,
+  user_data: *const c_void,
+  op_id: OpId,
+  buf: deno_buf,
+) {
+  /*
+  auto* d = deno::unwrap(d_);
+  if (d->current_args_ != nullptr) {
+    // Synchronous response.
+    // Note op_id is not passed back in the case of synchronous response.
+    if (buf.data_ptr != nullptr && buf.data_len > 0) {
+      auto ab = deno::ImportBuf(d, buf);
+      d->current_args_->GetReturnValue().Set(ab);
+    }
+    d->current_args_ = nullptr;
+    return;
+  }
+  */
+  let deno_isolate: &mut DenoIsolate = unsafe { &mut *i };
+
+  if !deno_isolate.current_args_.is_null() {
+    // Synchronous response.
+    // Note op_id is not passed back in the case of synchronous response.
+    if !buf.data_ptr.is_null() && buf.data_len > 0 {
+      let isolate = deno_isolate.isolate_.as_ref().unwrap();
+      let mut locker = v8::Locker::new(isolate);
+      assert!(!deno_isolate.context_.is_empty());
+      let mut hs = v8::HandleScope::new(&mut locker);
+      let scope = hs.enter();
+      let ab = deno_import_buf(scope, buf);
+      let info: &v8::FunctionCallbackInfo =
+        unsafe { &*deno_isolate.current_args_ };
+      let rv = &mut info.get_return_value();
+      rv.set(ab.into())
+    }
+    deno_isolate.current_args_ = std::ptr::null();
+    return;
+  }
+
+  /*
+  // Asynchronous response.
+  deno::UserDataScope user_data_scope(d, user_data);
+  v8::Isolate::Scope isolate_scope(d->isolate_);
+  v8::HandleScope handle_scope(d->isolate_);
+
+  auto context = d->context_.Get(d->isolate_);
+  v8::Context::Scope context_scope(context);
+
+  v8::TryCatch try_catch(d->isolate_);
+
+  auto recv_ = d->recv_.Get(d->isolate_);
+  if (recv_.IsEmpty()) {
+    d->last_exception_ = "Deno.core.recv has not been called.";
+    return;
+  }
+
+  v8::Local<v8::Value> args[2];
+  int argc = 0;
+
+  if (buf.data_ptr != nullptr) {
+    args[0] = v8::Integer::New(d->isolate_, op_id);
+    args[1] = deno::ImportBuf(d, buf);
+    argc = 2;
+  }
+
+  auto v = recv_->Call(context, context->Global(), argc, args);
+
+  if (try_catch.HasCaught()) {
+    CHECK(v.IsEmpty());
+    deno::HandleException(context, try_catch.Exception());
+  }
+  */
+
+  let user_data: *mut c_void = unsafe { std::mem::transmute(user_data) };
+  let user_scope = UserDataScope::new(deno_isolate, user_data);
+  let isolate = deno_isolate.isolate_.as_ref().unwrap();
+  // println!("deno_execute -> Isolate ptr {:?}", isolate);
+  let mut locker = v8::Locker::new(isolate);
+  assert!(!deno_isolate.context_.is_empty());
+  let mut hs = v8::HandleScope::new(&mut locker);
+  let scope = hs.enter();
+  let mut context = deno_isolate.context_.get(scope).unwrap();
+  context.enter();
+
+  let mut try_catch = v8::TryCatch::new(scope);
+  let tc = try_catch.enter();
+
+  let recv_ = deno_isolate.recv_.get(scope);
+
+  if recv_.is_none() {
+    let msg = "Deno.core.recv has not been called.".to_string();
+    deno_isolate.last_exception_ = Some(msg);
+    return;
+  }
+
+  let mut argc = 0;
+  let mut args: Vec<v8::Local<v8::Value>> = vec![];
+
+  if !buf.data_ptr.is_null() {
+    argc = 2;
+    let op_id = v8::Integer::new(scope, op_id as i32);
+    args.push(op_id.into());
+    let buf = deno_import_buf(scope, buf);
+    args.push(buf.into());
+  }
+
+  let global = context.global(scope);
+  let maybe_value =
+    recv_
+      .unwrap()
+      .call(scope, context, global.into(), argc, args);
+
+  if tc.has_caught() {
+    assert!(maybe_value.is_none());
+    deno_isolate.handle_exception(scope, context, tc.exception().unwrap());
+  }
+  context.exit();
+}
+
+pub unsafe fn deno_execute(
+  i: *mut DenoIsolate,
+  user_data: *mut c_void,
+  js_filename: &str,
+  js_source: &str,
+) {
+  let i_mut: &mut DenoIsolate = unsafe { &mut *i };
+  let _user_data_scope = UserDataScope::new(i, user_data);
+  let isolate = i_mut.isolate_.as_ref().unwrap();
+  // println!("deno_execute -> Isolate ptr {:?}", isolate);
+  let mut locker = v8::Locker::new(isolate);
+  assert!(!i_mut.context_.is_empty());
+  let mut hs = v8::HandleScope::new(&mut locker);
+  let scope = hs.enter();
+  let mut context = i_mut.context_.get(scope).unwrap();
+  context.enter();
+
+  i_mut.execute(scope, context, js_filename, js_source);
+
+  context.exit();
+  /*
+  auto* d = deno::unwrap(d_);
+  deno::UserDataScope user_data_scope(d, user_data);
+  auto* isolate = d->isolate_;
+  v8::Locker locker(isolate);
+  v8::Isolate::Scope isolate_scope(isolate);
+  v8::HandleScope handle_scope(isolate);
+  auto context = d->context_.Get(d->isolate_);
+  CHECK(!context.IsEmpty());
+  execute(context, js_filename, js_source);
+  */
+}
+
+pub unsafe fn deno_terminate_execution(i: *mut DenoIsolate) {
+  /*
+  deno::DenoIsolate* d = reinterpret_cast<deno::DenoIsolate*>(d_);
+  d->isolate_->TerminateExecution();
+  */
+  let i_mut: &mut DenoIsolate = unsafe { &mut *i };
+  let isolate = i_mut.isolate_.as_ref().unwrap();
+  isolate.terminate_execution();
+}
+
+#[allow(dead_code)]
+pub unsafe fn deno_run_microtasks(i: *mut isolate, user_data: *mut c_void) {
+  /*
+  deno::DenoIsolate* d = reinterpret_cast<deno::DenoIsolate*>(d_);
+  deno::UserDataScope user_data_scope(d, user_data);
+  v8::Locker locker(d->isolate_);
+  v8::Isolate::Scope isolate_scope(d->isolate_);
+  d->isolate_->RunMicrotasks();
+  */
+  let deno_isolate: &mut DenoIsolate = unsafe { &mut *i };
+  let user_scope = UserDataScope::new(deno_isolate, user_data);
+  let isolate = deno_isolate.isolate_.as_mut().unwrap();
+  let mut locker = v8::Locker::new(isolate);
+  isolate.enter();
+  isolate.run_microtasks();
+  isolate.exit();
+}
+
+// Modules
+
+pub unsafe fn deno_mod_new(
+  i: *mut DenoIsolate,
+  main: bool,
+  name: &str,
+  source: &str,
+) -> deno_mod {
+  let i_mut: &mut DenoIsolate = unsafe { &mut *i };
+  i_mut.register_module(main, name, source)
+}
+
+pub unsafe fn deno_mod_imports_len(i: *mut DenoIsolate, id: deno_mod) -> usize {
+  let info = (*i).get_module_info(id).unwrap();
+  info.import_specifiers.len()
+}
+
+pub unsafe fn deno_mod_imports_get(
+  i: *mut DenoIsolate,
+  id: deno_mod,
+  index: size_t,
+) -> Option<String> {
+  match (*i).get_module_info(id) {
+    Some(info) => match info.import_specifiers.get(index) {
+      Some(specifier) => Some(specifier.to_string()),
+      None => None,
+    },
+    None => None,
+  }
+}
+
+fn resolve_callback(
+  context: v8::Local<v8::Context>,
+  specifier: v8::Local<v8::String>,
+  referrer: v8::Local<v8::Module>,
+) -> *mut v8::Module {
+  let mut cbs = v8::CallbackScope::new(context);
+  let cb_scope = cbs.enter();
+  let isolate = cb_scope.isolate();
+  let deno_isolate: &mut DenoIsolate =
+    unsafe { &mut *(isolate.get_data(0) as *mut DenoIsolate) };
+
+  let mut locker = v8::Locker::new(isolate);
+  let mut hs = v8::EscapableHandleScope::new(&mut locker);
+  let scope = hs.enter();
+
+  let referrer_id = referrer.get_identity_hash();
+  let referrer_info = deno_isolate
+    .get_module_info(referrer_id)
+    .expect("ModuleInfo not found");
+  let len_ = referrer.get_module_requests_length();
+
+  let specifier_str = specifier.to_rust_string_lossy(scope);
+
+  for i in 0..len_ {
+    let req = referrer.get_module_request(i);
+    let req_str = req.to_rust_string_lossy(scope);
+
+    if req_str == specifier_str {
+      let resolve_cb = deno_isolate.resolve_cb_.unwrap();
+      let c_str = CString::new(req_str.to_string()).unwrap();
+      let c_req_str: *const c_char = c_str.as_ptr() as *const c_char;
+      let id =
+        unsafe { resolve_cb(deno_isolate.user_data_, c_req_str, referrer_id) };
+      let maybe_info = deno_isolate.get_module_info(id);
+
+      if maybe_info.is_none() {
+        let msg = format!(
+          "Cannot resolve module \"{}\" from \"{}\"",
+          req_str, referrer_info.name
+        );
+        let msg = v8::String::new(scope, &msg).unwrap();
+        isolate.throw_exception(msg.into());
+        break;
+      }
+
+      let child_mod =
+        maybe_info.unwrap().handle.get(scope).expect("Empty handle");
+      return &mut *scope.escape(child_mod);
+    }
+  }
+
+  std::ptr::null_mut()
+}
+
+pub unsafe fn deno_mod_instantiate(
+  i: *mut DenoIsolate,
+  user_data: *mut c_void,
+  id: deno_mod,
+  resolve_cb: deno_resolve_cb,
+) {
+  let i_mut: &mut DenoIsolate = unsafe { &mut *i };
+  let user_scope = UserDataScope::new(i_mut, user_data);
+  let isolate = i_mut.isolate_.as_ref().unwrap();
+  let mut locker = v8::Locker::new(isolate);
+  let mut hs = v8::HandleScope::new(&mut locker);
+  let scope = hs.enter();
+  assert!(!i_mut.context_.is_empty());
+  let mut context = i_mut.context_.get(scope).unwrap();
+  context.enter();
+  let mut try_catch = v8::TryCatch::new(scope);
+  let tc = try_catch.enter();
+
+  assert!(i_mut.resolve_cb_.is_none());
+  i_mut.resolve_cb_ = Some(resolve_cb);
+
+  let maybe_info = i_mut.get_module_info(id);
+
+  if maybe_info.is_none() {
+    return;
+  }
+
+  let module_handle = &maybe_info.unwrap().handle;
+  let mut module = module_handle.get(scope).unwrap();
+
+  if module.get_status() == v8::ModuleStatus::Errored {
+    return;
+  }
+
+  let maybe_ok = module.instantiate_module(context, resolve_callback);
+  assert!(maybe_ok.is_some() || tc.has_caught());
+  i_mut.resolve_cb_.take();
+
+  if tc.has_caught() {
+    i_mut.handle_exception(scope, context, tc.exception().unwrap());
+  }
+
+  context.exit();
+}
+
+pub unsafe fn deno_mod_evaluate(
+  i: *mut DenoIsolate,
+  user_data: *const c_void,
+  id: deno_mod,
+) {
+  let deno_isolate: &mut DenoIsolate = unsafe { &mut *i };
+  let user_data: *mut c_void = unsafe { std::mem::transmute(user_data) };
+  let user_scope = UserDataScope::new(deno_isolate, user_data);
+  let isolate = deno_isolate.isolate_.as_ref().unwrap();
+  let mut locker = v8::Locker::new(isolate);
+  let mut hs = v8::HandleScope::new(&mut locker);
+  let scope = hs.enter();
+  assert!(!deno_isolate.context_.is_empty());
+  let mut context = deno_isolate.context_.get(scope).unwrap();
+  context.enter();
+
+  let info = deno_isolate
+    .get_module_info(id)
+    .expect("ModuleInfo not found");
+  let mut module = info.handle.get(scope).expect("Empty module handle");
+  let mut status = module.get_status();
+
+  if status == v8::ModuleStatus::Instantiated {
+    let ok = module.evaluate(scope, context).is_some();
+    // Update status after evaluating.
+    status = module.get_status();
+    if ok {
+      assert!(
+        status == v8::ModuleStatus::Evaluated
+          || status == v8::ModuleStatus::Errored
+      );
+    } else {
+      assert!(status == v8::ModuleStatus::Errored);
+    }
+  }
+
+  match status {
+    v8::ModuleStatus::Evaluated => {
+      deno_isolate.last_exception_handle_.reset(scope);
+      deno_isolate.last_exception_.take();
+    }
+    v8::ModuleStatus::Errored => {
+      deno_isolate.handle_exception(scope, context, module.get_exception());
+    }
+    other => panic!("Unexpected module status {:?}", other),
+  };
+
+  context.exit();
+}
+
+/// Call exactly once for every deno_dyn_import_cb.
+pub unsafe fn deno_dyn_import_done(
+  i: *mut DenoIsolate,
+  user_data: *const c_void,
+  id: deno_dyn_import_id,
+  mod_id: deno_mod,
+  error_str: Option<String>,
+) {
+  let deno_isolate: &mut DenoIsolate = unsafe { &mut *i };
+  assert!(
+    (mod_id == 0 && error_str.is_some())
+      || (mod_id != 0 && error_str.is_none())
+      || (mod_id == 0 && !deno_isolate.last_exception_handle_.is_empty())
   );
 
-  pub fn deno_snapshot_new(i: *const isolate) -> Snapshot1<'static>;
+  let user_data: *mut c_void = unsafe { std::mem::transmute(user_data) };
+  let user_scope = UserDataScope::new(deno_isolate, user_data);
+
+  let isolate = deno_isolate.isolate_.as_ref().unwrap();
+  let mut locker = v8::Locker::new(isolate);
+  let mut hs = v8::HandleScope::new(&mut locker);
+  let scope = hs.enter();
+  assert!(!deno_isolate.context_.is_empty());
+  let mut context = deno_isolate.context_.get(scope).unwrap();
+  context.enter();
+
+  // TODO(ry) error on bad import_id.
+  let mut resolver_handle = deno_isolate.dyn_import_map_.remove(&id).unwrap();
+  /// Resolve.
+  let mut resolver = resolver_handle.get(scope).unwrap();
+  resolver_handle.reset(scope);
+
+  let maybe_info = deno_isolate.get_module_info(mod_id);
+
+  if let Some(info) = maybe_info {
+    // Resolution success
+    let mut module = info.handle.get(scope).unwrap();
+    assert_eq!(module.get_status(), v8::ModuleStatus::Evaluated);
+    let module_namespace = module.get_module_namespace();
+    resolver.resolve(context, module_namespace).unwrap();
+  } else {
+    // Resolution error.
+    if let Some(error_str) = error_str {
+      let msg = v8::String::new(scope, &error_str).unwrap();
+      let isolate = context.get_isolate();
+      isolate.enter();
+      let e = v8::type_error(scope, msg);
+      isolate.exit();
+      resolver.reject(context, e).unwrap();
+    } else {
+      let e = deno_isolate.last_exception_handle_.get(scope).unwrap();
+      deno_isolate.last_exception_handle_.reset(scope);
+      deno_isolate.last_exception_.take();
+      resolver.reject(context, e).unwrap();
+    }
+  }
+
+  isolate.run_microtasks();
+
+  context.exit();
+}
+
+pub fn deno_snapshot_new(i: *mut DenoIsolate) -> v8::OwnedStartupData {
+  let deno_isolate: &mut DenoIsolate = unsafe { &mut *i };
+  assert!(deno_isolate.snapshot_creator_.is_some());
+
+  let isolate = deno_isolate.isolate_.as_ref().unwrap();
+  let mut locker = v8::Locker::new(isolate);
+  let mut hs = v8::HandleScope::new(&mut locker);
+  let scope = hs.enter();
+
+  // d.clear_modules();
+  deno_isolate.context_.reset(scope);
+
+  let snapshot_creator = deno_isolate.snapshot_creator_.as_mut().unwrap();
+  let startup_data = snapshot_creator
+    .create_blob(v8::FunctionCodeHandling::Keep)
+    .unwrap();
+  deno_isolate.has_snapshotted_ = true;
+  startup_data
+}
 
-  #[allow(dead_code)]
-  pub fn deno_snapshot_delete(s: &mut deno_snapshot);
+#[allow(dead_code)]
+pub unsafe fn deno_snapshot_delete(s: &mut deno_snapshot) {
+  todo!()
 }
diff --git a/core/libdeno/.gn b/core/libdeno/.gn
deleted file mode 100644
index 7916c47a7..000000000
--- a/core/libdeno/.gn
+++ /dev/null
@@ -1,60 +0,0 @@
-# This file is used by the GN meta build system to find the root of the source
-# tree and to set startup options. For documentation on the values set in this
-# file, run "gn help dotfile" at the command line.
-
-# The location of the build configuration file.
-buildconfig = "//build/config/BUILDCONFIG.gn"
-
-# These are the targets to check headers for by default. The files in targets
-# matching these patterns (see "gn help label_pattern" for format) will have
-# their includes checked for proper dependencies when you run either
-# "gn check" or "gn gen --check".
-check_targets = []
-
-default_args = {
-  # Various global chrome args that are unrelated to deno.
-  proprietary_codecs = false
-  safe_browsing_mode = 0
-  toolkit_views = false
-  use_aura = false
-  use_dbus = false
-  use_gio = false
-  use_glib = false
-  use_ozone = false
-  use_udev = false
-
-  # To disable "use_atk" and other features that we don't need.
-  is_desktop_linux = false
-
-  # TODO(ry) We may want to turn on CFI at some point. Disabling for simplicity
-  # for now. See http://clang.llvm.org/docs/ControlFlowIntegrity.html
-  is_cfi = false
-
-  # TODO(ry) Remove this so debug builds can link faster. Currently removing
-  # this breaks cargo build in debug mode in OSX.
-  is_component_build = false
-
-  # Enable Jumbo build for a faster build.
-  # https://chromium.googlesource.com/chromium/src/+/master/docs/jumbo.md
-  use_jumbo_build = true
-
-  symbol_level = 1
-  treat_warnings_as_errors = true
-
-  # https://cs.chromium.org/chromium/src/docs/ccache_mac.md
-  clang_use_chrome_plugins = false
-
-  v8_enable_gdbjit = false
-  v8_enable_i18n_support = false
-  v8_enable_shared_ro_heap = false  # See #2624
-  v8_imminent_deprecation_warnings = false
-  v8_monolithic = false
-  v8_untrusted_code_mitigations = false
-  v8_use_external_startup_data = false
-  v8_use_snapshot = true
-  v8_postmortem_support = true  # for https://github.com/nodejs/llnode/
-
-  # We don't want to require downloading the binary executable
-  # tools/clang/dsymutil.
-  enable_dsyms = false
-}
diff --git a/core/libdeno/BUILD.gn b/core/libdeno/BUILD.gn
deleted file mode 100644
index 06e217c73..000000000
--- a/core/libdeno/BUILD.gn
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
-import("//v8/gni/v8.gni")
-
-group("default") {
-  testonly = true
-  deps = [
-    ":libdeno_static_lib",
-    ":libdeno_test",
-    ":v8",
-  ]
-}
-
-config("deno_config") {
-  include_dirs = [ "//v8" ]  # This allows us to v8/src/base/ libraries.
-  configs = [ "//v8:external_config" ]
-  cflags = []
-
-  if (is_debug) {
-    defines = [ "DEBUG" ]
-  }
-
-  if (is_clang) {
-    cflags += [
-      "-fcolor-diagnostics",
-      "-fansi-escape-codes",
-    ]
-  }
-
-  if (is_debug && is_clang && !is_win) {
-    cflags += [ "-glldb" ]
-  }
-
-  if (is_win) {
-    # The `/Zl` ("omit default library name") flag makes the compiler produce
-    # object files that can link with both the static and dynamic CRT.
-    cflags += [ "/Zl" ]
-  }
-}
-
-v8_source_set("v8") {
-  deps = [
-    "//v8:v8",
-    "//v8:v8_libbase",
-    "//v8:v8_libplatform",
-    "//v8:v8_libsampler",
-  ]
-  configs = [ ":deno_config" ]
-}
-
-# Only functionality needed for libdeno_test and snapshot_creator
-# In particular no assets, no rust, no msg handlers.
-# Because snapshots are slow, it's important that snapshot_creator's
-# dependencies are minimal.
-v8_source_set("libdeno") {
-  sources = [
-    "api.cc",
-    "binding.cc",
-    "buffer.h",
-    "deno.h",
-    "exceptions.cc",
-    "exceptions.h",
-    "internal.h",
-    "modules.cc",
-  ]
-  deps = [
-    ":v8",
-  ]
-  configs = [ ":deno_config" ]
-}
-
-# The cargo-driven build links with libdeno to pull in all non-rust code.
-v8_static_library("libdeno_static_lib") {
-  output_name = "libdeno"
-  deps = [
-    ":libdeno",
-    "//build/config:shared_library_deps",
-  ]
-  configs = [ ":deno_config" ]
-}
-
-v8_executable("libdeno_test") {
-  testonly = true
-  sources = [
-    "libdeno_test.cc",
-    "modules_test.cc",
-    "test.cc",
-  ]
-  deps = [
-    ":libdeno",
-    "//testing/gtest:gtest",
-  ]
-  data = [
-    "libdeno_test.js",
-  ]
-  js_path = rebase_path(data[0])
-  defines = [ "JS_PATH=\"$js_path\"" ]
-  configs = [ ":deno_config" ]
-}
diff --git a/core/libdeno/api.cc b/core/libdeno/api.cc
deleted file mode 100644
index 149709819..000000000
--- a/core/libdeno/api.cc
+++ /dev/null
@@ -1,254 +0,0 @@
-// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <iostream>
-#include <string>
-
-#include "v8/include/libplatform/libplatform.h"
-#include "v8/include/v8.h"
-#include "v8/src/base/logging.h"
-
-#include "deno.h"
-#include "exceptions.h"
-#include "internal.h"
-
-extern "C" {
-
-Deno* deno_new_snapshotter(deno_config config) {
-  CHECK(config.will_snapshot);
-  // TODO(ry) Support loading snapshots before snapshotting.
-  CHECK_NULL(config.load_snapshot.data_ptr);
-  auto* creator = new v8::SnapshotCreator(deno::external_references);
-  auto* isolate = creator->GetIsolate();
-  auto* d = new deno::DenoIsolate(config);
-  d->snapshot_creator_ = creator;
-  d->AddIsolate(isolate);
-  {
-    v8::Locker locker(isolate);
-    v8::Isolate::Scope isolate_scope(isolate);
-    v8::HandleScope handle_scope(isolate);
-    auto context = v8::Context::New(isolate);
-    d->context_.Reset(isolate, context);
-
-    creator->SetDefaultContext(context,
-                               v8::SerializeInternalFieldsCallback(
-                                   deno::SerializeInternalFields, nullptr));
-    deno::InitializeContext(isolate, context);
-  }
-  return reinterpret_cast<Deno*>(d);
-}
-
-Deno* deno_new(deno_config config) {
-  if (config.will_snapshot) {
-    return deno_new_snapshotter(config);
-  }
-  deno::DenoIsolate* d = new deno::DenoIsolate(config);
-  v8::Isolate::CreateParams params;
-  params.array_buffer_allocator = &deno::ArrayBufferAllocator::global();
-  params.external_references = deno::external_references;
-
-  if (config.load_snapshot.data_ptr) {
-    params.snapshot_blob = &d->snapshot_;
-  }
-
-  v8::Isolate* isolate = v8::Isolate::New(params);
-  d->AddIsolate(isolate);
-
-  v8::Locker locker(isolate);
-  v8::Isolate::Scope isolate_scope(isolate);
-  {
-    v8::HandleScope handle_scope(isolate);
-    auto context =
-        v8::Context::New(isolate, nullptr, v8::MaybeLocal<v8::ObjectTemplate>(),
-                         v8::MaybeLocal<v8::Value>(),
-                         v8::DeserializeInternalFieldsCallback(
-                             deno::DeserializeInternalFields, nullptr));
-    if (!config.load_snapshot.data_ptr) {
-      // If no snapshot is provided, we initialize the context with empty
-      // main source code and source maps.
-      deno::InitializeContext(isolate, context);
-    }
-    d->context_.Reset(isolate, context);
-  }
-
-  return reinterpret_cast<Deno*>(d);
-}
-
-void deno_lock(Deno* d_) {
-  auto* d = deno::unwrap(d_);
-  CHECK_NULL(d->locker_);
-  d->locker_ = new v8::Locker(d->isolate_);
-}
-
-void deno_unlock(Deno* d_) {
-  auto* d = deno::unwrap(d_);
-  CHECK_NOT_NULL(d->locker_);
-  delete d->locker_;
-  d->locker_ = nullptr;
-}
-
-deno_snapshot deno_snapshot_new(Deno* d_) {
-  auto* d = deno::unwrap(d_);
-  CHECK_NOT_NULL(d->snapshot_creator_);
-  d->ClearModules();
-  d->context_.Reset();
-
-  auto blob = d->snapshot_creator_->CreateBlob(
-      v8::SnapshotCreator::FunctionCodeHandling::kKeep);
-  d->has_snapshotted_ = true;
-  return {reinterpret_cast<uint8_t*>(const_cast<char*>(blob.data)),
-          blob.raw_size};
-}
-
-void deno_snapshot_delete(deno_snapshot snapshot) {
-  delete[] snapshot.data_ptr;
-}
-
-static std::unique_ptr<v8::Platform> platform;
-
-void deno_init() {
-  if (platform.get() == nullptr) {
-    platform = v8::platform::NewDefaultPlatform();
-    v8::V8::InitializePlatform(platform.get());
-    v8::V8::Initialize();
-    // TODO(ry) This makes WASM compile synchronously. Eventually we should
-    // remove this to make it work asynchronously too. But that requires getting
-    // PumpMessageLoop and RunMicrotasks setup correctly.
-    // See https://github.com/denoland/deno/issues/2544
-    const char* argv[3] = {"", "--no-wasm-async-compilation",
-                           "--harmony-top-level-await"};
-    int argc = 3;
-    v8::V8::SetFlagsFromCommandLine(&argc, const_cast<char**>(argv), false);
-  }
-}
-
-const char* deno_v8_version() { return v8::V8::GetVersion(); }
-
-void deno_set_v8_flags(int* argc, char** argv) {
-  v8::V8::SetFlagsFromCommandLine(argc, argv, true);
-}
-
-const char* deno_last_exception(Deno* d_) {
-  auto* d = deno::unwrap(d_);
-  if (d->last_exception_.length() > 0) {
-    return d->last_exception_.c_str();
-  } else {
-    return nullptr;
-  }
-}
-
-void deno_clear_last_exception(Deno* d_) {
-  auto* d = deno::unwrap(d_);
-  d->last_exception_.clear();
-  d->last_exception_handle_.Reset();
-}
-
-void deno_execute(Deno* d_, void* user_data, const char* js_filename,
-                  const char* js_source) {
-  auto* d = deno::unwrap(d_);
-  deno::UserDataScope user_data_scope(d, user_data);
-  auto* isolate = d->isolate_;
-  v8::Locker locker(isolate);
-  v8::Isolate::Scope isolate_scope(isolate);
-  v8::HandleScope handle_scope(isolate);
-  auto context = d->context_.Get(d->isolate_);
-  CHECK(!context.IsEmpty());
-  deno::Execute(context, js_filename, js_source);
-}
-
-void deno_pinned_buf_delete(deno_pinned_buf* buf) {
-  // The PinnedBuf destructor implicitly releases the ArrayBuffer reference.
-  auto _ = deno::PinnedBuf(buf);
-}
-
-void deno_throw_exception(Deno* d_, const char* text) {
-  auto* d = deno::unwrap(d_);
-  auto* isolate = d->isolate_;
-  isolate->ThrowException(deno::v8_str(text));
-}
-
-void deno_respond(Deno* d_, void* user_data, deno_op_id op_id, deno_buf buf) {
-  auto* d = deno::unwrap(d_);
-  if (d->current_args_ != nullptr) {
-    // Synchronous response.
-    // Note op_id is not passed back in the case of synchronous response.
-    if (buf.data_ptr != nullptr && buf.data_len > 0) {
-      auto ab = deno::ImportBuf(d, buf);
-      d->current_args_->GetReturnValue().Set(ab);
-    }
-    d->current_args_ = nullptr;
-    return;
-  }
-
-  // Asynchronous response.
-  deno::UserDataScope user_data_scope(d, user_data);
-  v8::Isolate::Scope isolate_scope(d->isolate_);
-  v8::HandleScope handle_scope(d->isolate_);
-
-  auto context = d->context_.Get(d->isolate_);
-  v8::Context::Scope context_scope(context);
-
-  v8::TryCatch try_catch(d->isolate_);
-
-  auto recv_ = d->recv_.Get(d->isolate_);
-  if (recv_.IsEmpty()) {
-    d->last_exception_ = "Deno.core.recv has not been called.";
-    return;
-  }
-
-  v8::Local<v8::Value> args[2];
-  int argc = 0;
-
-  if (buf.data_ptr != nullptr) {
-    args[0] = v8::Integer::New(d->isolate_, op_id);
-    args[1] = deno::ImportBuf(d, buf);
-    argc = 2;
-  }
-
-  auto v = recv_->Call(context, context->Global(), argc, args);
-
-  if (try_catch.HasCaught()) {
-    CHECK(v.IsEmpty());
-    deno::HandleException(context, try_catch.Exception());
-  }
-}
-
-void deno_check_promise_errors(Deno* d_) {
-  auto* d = deno::unwrap(d_);
-  if (d->pending_promise_map_.size() > 0) {
-    auto* isolate = d->isolate_;
-    v8::Locker locker(isolate);
-    v8::Isolate::Scope isolate_scope(isolate);
-    v8::HandleScope handle_scope(isolate);
-    auto context = d->context_.Get(d->isolate_);
-    v8::Context::Scope context_scope(context);
-
-    auto it = d->pending_promise_map_.begin();
-    while (it != d->pending_promise_map_.end()) {
-      auto error = it->second.Get(isolate);
-      deno::HandleException(context, error);
-      it = d->pending_promise_map_.erase(it);
-    }
-  }
-}
-
-void deno_delete(Deno* d_) {
-  deno::DenoIsolate* d = reinterpret_cast<deno::DenoIsolate*>(d_);
-  delete d;
-}
-
-void deno_terminate_execution(Deno* d_) {
-  deno::DenoIsolate* d = reinterpret_cast<deno::DenoIsolate*>(d_);
-  d->isolate_->TerminateExecution();
-}
-
-void deno_run_microtasks(Deno* d_, void* user_data) {
-  deno::DenoIsolate* d = reinterpret_cast<deno::DenoIsolate*>(d_);
-
-  deno::UserDataScope user_data_scope(d, user_data);
-  v8::Locker locker(d->isolate_);
-  v8::Isolate::Scope isolate_scope(d->isolate_);
-  d->isolate_->RunMicrotasks();
-}
-}
diff --git a/core/libdeno/binding.cc b/core/libdeno/binding.cc
deleted file mode 100644
index 4785db3d0..000000000
--- a/core/libdeno/binding.cc
+++ /dev/null
@@ -1,597 +0,0 @@
-// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <algorithm>
-#include <iostream>
-#include <string>
-
-#ifdef _WIN32
-#ifndef WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN
-#endif
-#include <io.h>
-#include <windows.h>
-#endif  // _WIN32
-
-#include "v8/include/v8.h"
-#include "v8/src/base/logging.h"
-
-#include "deno.h"
-#include "exceptions.h"
-#include "internal.h"
-
-#define GLOBAL_IMPORT_BUF_SIZE 1024
-
-namespace deno {
-
-std::vector<InternalFieldData*> deserialized_data;
-
-void DeserializeInternalFields(v8::Local<v8::Object> holder, int index,
-                               v8::StartupData payload, void* data) {
-  DCHECK_NULL(data);
-  if (payload.raw_size == 0) {
-    holder->SetAlignedPointerInInternalField(index, nullptr);
-    return;
-  }
-  InternalFieldData* embedder_field = new InternalFieldData{0};
-  memcpy(embedder_field, payload.data, payload.raw_size);
-  holder->SetAlignedPointerInInternalField(index, embedder_field);
-  deserialized_data.push_back(embedder_field);
-}
-
-v8::StartupData SerializeInternalFields(v8::Local<v8::Object> holder, int index,
-                                        void* data) {
-  DCHECK_NULL(data);
-  InternalFieldData* embedder_field = static_cast<InternalFieldData*>(
-      holder->GetAlignedPointerFromInternalField(index));
-  if (embedder_field == nullptr) return {nullptr, 0};
-  int size = sizeof(*embedder_field);
-  char* payload = new char[size];
-  // We simply use memcpy to serialize the content.
-  memcpy(payload, embedder_field, size);
-  return {payload, size};
-}
-
-// Extracts a C string from a v8::V8 Utf8Value.
-const char* ToCString(const v8::String::Utf8Value& value) {
-  return *value ? *value : "<string conversion failed>";
-}
-
-void PromiseRejectCallback(v8::PromiseRejectMessage promise_reject_message) {
-  auto* isolate = v8::Isolate::GetCurrent();
-  DenoIsolate* d = static_cast<DenoIsolate*>(isolate->GetData(0));
-  DCHECK_EQ(d->isolate_, isolate);
-  v8::HandleScope handle_scope(d->isolate_);
-  auto error = promise_reject_message.GetValue();
-  auto context = d->context_.Get(d->isolate_);
-  auto promise = promise_reject_message.GetPromise();
-
-  v8::Context::Scope context_scope(context);
-
-  int promise_id = promise->GetIdentityHash();
-  switch (promise_reject_message.GetEvent()) {
-    case v8::kPromiseRejectWithNoHandler:
-      // Insert the error into the pending_promise_map_ using the promise's id
-      // as the key.
-      d->pending_promise_map_.emplace(std::piecewise_construct,
-                                      std::make_tuple(promise_id),
-                                      std::make_tuple(d->isolate_, error));
-      break;
-
-    case v8::kPromiseHandlerAddedAfterReject:
-      d->pending_promise_map_.erase(promise_id);
-      break;
-
-    case v8::kPromiseRejectAfterResolved:
-      break;
-
-    case v8::kPromiseResolveAfterResolved:
-      // Should not warn. See #1272
-      break;
-
-    default:
-      CHECK(false && "unreachable");
-  }
-}
-
-void Print(const v8::FunctionCallbackInfo<v8::Value>& args) {
-  auto* isolate = args.GetIsolate();
-  int argsLen = args.Length();
-  if (argsLen < 1 || argsLen > 2) {
-    ThrowInvalidArgument(isolate);
-  }
-  v8::HandleScope handle_scope(isolate);
-  bool is_err = args.Length() >= 2 ? args[1]->BooleanValue(isolate) : false;
-  FILE* file = is_err ? stderr : stdout;
-
-#ifdef _WIN32
-  int fd = _fileno(file);
-  if (fd < 0) return;
-
-  HANDLE h = reinterpret_cast<HANDLE>(_get_osfhandle(fd));
-  if (h == INVALID_HANDLE_VALUE) return;
-
-  DWORD mode;
-  if (GetConsoleMode(h, &mode)) {
-    // Print to Windows console. Since the Windows API generally doesn't support
-    // UTF-8 encoded text, we have to use `WriteConsoleW()` which uses UTF-16.
-    v8::String::Value str(isolate, args[0]);
-    auto str_len = static_cast<size_t>(str.length());
-    auto str_wchars = reinterpret_cast<WCHAR*>(*str);
-
-    // WriteConsoleW has some limit to how many characters can be written at
-    // once, which is unspecified but low enough to be encountered in practice.
-    // Therefore we break up the write into chunks of 8kb if necessary.
-    size_t chunk_start = 0;
-    while (chunk_start < str_len) {
-      size_t chunk_end = std::min(chunk_start + 8192, str_len);
-
-      // Do not break in the middle of a surrogate pair. Note that `chunk_end`
-      // points to the start of the next chunk, so we check whether it contains
-      // the second half of a surrogate pair (a.k.a. "low surrogate").
-      if (chunk_end < str_len && str_wchars[chunk_end] >= 0xdc00 &&
-          str_wchars[chunk_end] <= 0xdfff) {
-        --chunk_end;
-      }
-
-      // Write to the console.
-      DWORD chunk_len = static_cast<DWORD>(chunk_end - chunk_start);
-      DWORD _;
-      WriteConsoleW(h, &str_wchars[chunk_start], chunk_len, &_, nullptr);
-
-      chunk_start = chunk_end;
-    }
-    return;
-  }
-#endif  // _WIN32
-
-  v8::String::Utf8Value str(isolate, args[0]);
-  fwrite(*str, sizeof(**str), str.length(), file);
-  fflush(file);
-}
-
-void ErrorToJSON(const v8::FunctionCallbackInfo<v8::Value>& args) {
-  CHECK_EQ(args.Length(), 1);
-  auto* isolate = args.GetIsolate();
-  DenoIsolate* d = DenoIsolate::FromIsolate(isolate);
-  auto context = d->context_.Get(d->isolate_);
-  v8::HandleScope handle_scope(isolate);
-  auto json_string = EncodeExceptionAsJSON(context, args[0]);
-  args.GetReturnValue().Set(v8_str(json_string.c_str()));
-}
-
-v8::Local<v8::Uint8Array> ImportBuf(DenoIsolate* d, deno_buf buf) {
-  if (buf.data_ptr == nullptr) {
-    return v8::Local<v8::Uint8Array>();
-  }
-
-  // To avoid excessively allocating new ArrayBuffers, we try to reuse a single
-  // global ArrayBuffer. The caveat is that users must extract data from it
-  // before the next tick. We only do this for ArrayBuffers less than 1024
-  // bytes.
-  v8::Local<v8::ArrayBuffer> ab;
-  void* data;
-  if (buf.data_len > GLOBAL_IMPORT_BUF_SIZE) {
-    // Simple case. We allocate a new ArrayBuffer for this.
-    ab = v8::ArrayBuffer::New(d->isolate_, buf.data_len);
-    data = ab->GetBackingStore()->Data();
-  } else {
-    // Fast case. We reuse the global ArrayBuffer.
-    if (d->global_import_buf_.IsEmpty()) {
-      // Lazily initialize it.
-      DCHECK_NULL(d->global_import_buf_ptr_);
-      ab = v8::ArrayBuffer::New(d->isolate_, GLOBAL_IMPORT_BUF_SIZE);
-      d->global_import_buf_.Reset(d->isolate_, ab);
-      d->global_import_buf_ptr_ = ab->GetBackingStore()->Data();
-    } else {
-      DCHECK(d->global_import_buf_ptr_);
-      ab = d->global_import_buf_.Get(d->isolate_);
-    }
-    data = d->global_import_buf_ptr_;
-  }
-  memcpy(data, buf.data_ptr, buf.data_len);
-  auto view = v8::Uint8Array::New(ab, 0, buf.data_len);
-  return view;
-}
-
-// Sets the recv_ callback.
-void Recv(const v8::FunctionCallbackInfo<v8::Value>& args) {
-  v8::Isolate* isolate = args.GetIsolate();
-  DenoIsolate* d = DenoIsolate::FromIsolate(isolate);
-  DCHECK_EQ(d->isolate_, isolate);
-
-  v8::HandleScope handle_scope(isolate);
-
-  if (!d->recv_.IsEmpty()) {
-    isolate->ThrowException(v8_str("Deno.core.recv already called."));
-    return;
-  }
-
-  v8::Local<v8::Value> v = args[0];
-  CHECK(v->IsFunction());
-  v8::Local<v8::Function> func = v8::Local<v8::Function>::Cast(v);
-
-  d->recv_.Reset(isolate, func);
-}
-
-void Send(const v8::FunctionCallbackInfo<v8::Value>& args) {
-  v8::Isolate* isolate = args.GetIsolate();
-  DenoIsolate* d = DenoIsolate::FromIsolate(isolate);
-  DCHECK_EQ(d->isolate_, isolate);
-
-  v8::HandleScope handle_scope(isolate);
-
-  deno_buf control = {nullptr, 0};
-
-  int32_t op_id = 0;
-  if (args[0]->IsInt32()) {
-    auto context = d->context_.Get(isolate);
-    op_id = args[0]->Int32Value(context).FromJust();
-  }
-
-  if (args[1]->IsArrayBufferView()) {
-    auto view = v8::Local<v8::ArrayBufferView>::Cast(args[1]);
-    auto data =
-        reinterpret_cast<uint8_t*>(view->Buffer()->GetBackingStore()->Data());
-    control = {data + view->ByteOffset(), view->ByteLength()};
-  }
-
-  PinnedBuf zero_copy =
-      args[2]->IsArrayBufferView()
-          ? PinnedBuf(v8::Local<v8::ArrayBufferView>::Cast(args[2]))
-          : PinnedBuf();
-
-  DCHECK_NULL(d->current_args_);
-  d->current_args_ = &args;
-
-  d->recv_cb_(d->user_data_, op_id, control, zero_copy.IntoRaw());
-
-  if (d->current_args_ == nullptr) {
-    // This indicates that deno_repond() was called already.
-  } else {
-    // Asynchronous.
-    d->current_args_ = nullptr;
-  }
-}
-
-v8::ScriptOrigin ModuleOrigin(v8::Isolate* isolate,
-                              v8::Local<v8::Value> resource_name) {
-  return v8::ScriptOrigin(resource_name, v8::Local<v8::Integer>(),
-                          v8::Local<v8::Integer>(), v8::Local<v8::Boolean>(),
-                          v8::Local<v8::Integer>(), v8::Local<v8::Value>(),
-                          v8::Local<v8::Boolean>(), v8::Local<v8::Boolean>(),
-                          v8::True(isolate));
-}
-
-deno_mod DenoIsolate::RegisterModule(bool main, const char* name,
-                                     const char* source) {
-  v8::Isolate::Scope isolate_scope(isolate_);
-  v8::Locker locker(isolate_);
-  v8::HandleScope handle_scope(isolate_);
-  auto context = context_.Get(isolate_);
-  v8::Context::Scope context_scope(context);
-
-  v8::Local<v8::String> name_str = v8_str(name);
-  v8::Local<v8::String> source_str = v8_str(source);
-
-  auto origin = ModuleOrigin(isolate_, name_str);
-  v8::ScriptCompiler::Source source_(source_str, origin);
-
-  v8::TryCatch try_catch(isolate_);
-
-  auto maybe_module = v8::ScriptCompiler::CompileModule(isolate_, &source_);
-
-  if (try_catch.HasCaught()) {
-    CHECK(maybe_module.IsEmpty());
-    HandleException(context, try_catch.Exception());
-    return 0;
-  }
-
-  auto module = maybe_module.ToLocalChecked();
-
-  int id = module->GetIdentityHash();
-
-  std::vector<std::string> import_specifiers;
-
-  for (int i = 0; i < module->GetModuleRequestsLength(); ++i) {
-    v8::Local<v8::String> specifier = module->GetModuleRequest(i);
-    v8::String::Utf8Value specifier_utf8(isolate_, specifier);
-    import_specifiers.push_back(*specifier_utf8);
-  }
-
-  mods_.emplace(
-      std::piecewise_construct, std::make_tuple(id),
-      std::make_tuple(isolate_, module, main, name, import_specifiers));
-  mods_by_name_[name] = id;
-
-  return id;
-}
-
-void Shared(v8::Local<v8::Name> property,
-            const v8::PropertyCallbackInfo<v8::Value>& info) {
-  v8::Isolate* isolate = info.GetIsolate();
-  DenoIsolate* d = DenoIsolate::FromIsolate(isolate);
-  DCHECK_EQ(d->isolate_, isolate);
-  v8::Locker locker(d->isolate_);
-  v8::EscapableHandleScope handle_scope(isolate);
-  if (d->shared_.data_ptr == nullptr) {
-    return;
-  }
-  v8::Local<v8::SharedArrayBuffer> ab;
-  if (d->shared_ab_.IsEmpty()) {
-    // Lazily initialize the persistent external ArrayBuffer.
-    ab = v8::SharedArrayBuffer::New(isolate, d->shared_.data_ptr,
-                                    d->shared_.data_len,
-                                    v8::ArrayBufferCreationMode::kExternalized);
-    d->shared_ab_.Reset(isolate, ab);
-  }
-  auto shared_ab = d->shared_ab_.Get(isolate);
-  info.GetReturnValue().Set(shared_ab);
-}
-
-void DenoIsolate::ClearModules() {
-  for (auto it = mods_.begin(); it != mods_.end(); it++) {
-    it->second.handle.Reset();
-  }
-  mods_.clear();
-  mods_by_name_.clear();
-}
-
-bool Execute(v8::Local<v8::Context> context, const char* js_filename,
-             const char* js_source) {
-  auto* isolate = context->GetIsolate();
-  v8::Isolate::Scope isolate_scope(isolate);
-  v8::HandleScope handle_scope(isolate);
-  v8::Context::Scope context_scope(context);
-
-  auto source = v8_str(js_source);
-  auto name = v8_str(js_filename);
-
-  v8::TryCatch try_catch(isolate);
-
-  v8::ScriptOrigin origin(name);
-
-  auto script = v8::Script::Compile(context, source, &origin);
-
-  if (script.IsEmpty()) {
-    DCHECK(try_catch.HasCaught());
-    HandleException(context, try_catch.Exception());
-    return false;
-  }
-
-  auto result = script.ToLocalChecked()->Run(context);
-
-  if (result.IsEmpty()) {
-    DCHECK(try_catch.HasCaught());
-    HandleException(context, try_catch.Exception());
-    return false;
-  }
-
-  return true;
-}
-
-static inline v8::Local<v8::Boolean> v8_bool(bool v) {
-  return v8::Boolean::New(v8::Isolate::GetCurrent(), v);
-}
-
-void EvalContext(const v8::FunctionCallbackInfo<v8::Value>& args) {
-  v8::Isolate* isolate = args.GetIsolate();
-  DenoIsolate* d = DenoIsolate::FromIsolate(isolate);
-  v8::EscapableHandleScope handleScope(isolate);
-  auto context = d->context_.Get(isolate);
-  v8::Context::Scope context_scope(context);
-
-  if (!(args[0]->IsString())) {
-    ThrowInvalidArgument(isolate);
-    return;
-  }
-
-  auto source = args[0].As<v8::String>();
-
-  auto output = v8::Array::New(isolate, 2);
-  /**
-   * output[0] = result
-   * output[1] = ErrorInfo | null
-   *   ErrorInfo = {
-   *     thrown: Error | any,
-   *     isNativeError: boolean,
-   *     isCompileError: boolean,
-   *   }
-   */
-
-  v8::TryCatch try_catch(isolate);
-
-  auto name = v8_str("<unknown>");
-  v8::ScriptOrigin origin(name);
-  auto script = v8::Script::Compile(context, source, &origin);
-
-  if (script.IsEmpty()) {
-    CHECK(try_catch.HasCaught());
-    auto exception = try_catch.Exception();
-
-    CHECK(output->Set(context, 0, v8::Null(isolate)).FromJust());
-
-    auto errinfo_obj = v8::Object::New(isolate);
-    CHECK(errinfo_obj->Set(context, v8_str("isCompileError"), v8_bool(true))
-              .FromJust());
-    CHECK(errinfo_obj
-              ->Set(context, v8_str("isNativeError"),
-                    v8_bool(exception->IsNativeError()))
-              .FromJust());
-    CHECK(errinfo_obj->Set(context, v8_str("thrown"), exception).FromJust());
-
-    CHECK(output->Set(context, 1, errinfo_obj).FromJust());
-
-    args.GetReturnValue().Set(output);
-    return;
-  }
-
-  auto result = script.ToLocalChecked()->Run(context);
-
-  if (result.IsEmpty()) {
-    CHECK(try_catch.HasCaught());
-    auto exception = try_catch.Exception();
-
-    CHECK(output->Set(context, 0, v8::Null(isolate)).FromJust());
-
-    auto errinfo_obj = v8::Object::New(isolate);
-    CHECK(errinfo_obj->Set(context, v8_str("isCompileError"), v8_bool(false))
-              .FromJust());
-    CHECK(errinfo_obj
-              ->Set(context, v8_str("isNativeError"),
-                    v8_bool(exception->IsNativeError()))
-              .FromJust());
-    CHECK(errinfo_obj->Set(context, v8_str("thrown"), exception).FromJust());
-
-    CHECK(output->Set(context, 1, errinfo_obj).FromJust());
-
-    args.GetReturnValue().Set(output);
-    return;
-  }
-
-  CHECK(output->Set(context, 0, result.ToLocalChecked()).FromJust());
-  CHECK(output->Set(context, 1, v8::Null(isolate)).FromJust());
-  args.GetReturnValue().Set(output);
-}
-
-void QueueMicrotask(const v8::FunctionCallbackInfo<v8::Value>& args) {
-  v8::Isolate* isolate = args.GetIsolate();
-
-  if (!(args[0]->IsFunction())) {
-    ThrowInvalidArgument(isolate);
-    return;
-  }
-  isolate->EnqueueMicrotask(args[0].As<v8::Function>());
-}
-
-void InitializeContext(v8::Isolate* isolate, v8::Local<v8::Context> context) {
-  v8::HandleScope handle_scope(isolate);
-  v8::Context::Scope context_scope(context);
-
-  auto global = context->Global();
-
-  auto deno_val = v8::Object::New(isolate);
-  CHECK(global->Set(context, deno::v8_str("Deno"), deno_val).FromJust());
-
-  auto core_val = v8::Object::New(isolate);
-  CHECK(deno_val->Set(context, deno::v8_str("core"), core_val).FromJust());
-
-  auto print_tmpl = v8::FunctionTemplate::New(isolate, Print);
-  auto print_val = print_tmpl->GetFunction(context).ToLocalChecked();
-  CHECK(core_val->Set(context, deno::v8_str("print"), print_val).FromJust());
-
-  auto recv_tmpl = v8::FunctionTemplate::New(isolate, Recv);
-  auto recv_val = recv_tmpl->GetFunction(context).ToLocalChecked();
-  CHECK(core_val->Set(context, deno::v8_str("recv"), recv_val).FromJust());
-
-  auto send_tmpl = v8::FunctionTemplate::New(isolate, Send);
-  auto send_val = send_tmpl->GetFunction(context).ToLocalChecked();
-  CHECK(core_val->Set(context, deno::v8_str("send"), send_val).FromJust());
-
-  auto eval_context_tmpl = v8::FunctionTemplate::New(isolate, EvalContext);
-  auto eval_context_val =
-      eval_context_tmpl->GetFunction(context).ToLocalChecked();
-  CHECK(core_val->Set(context, deno::v8_str("evalContext"), eval_context_val)
-            .FromJust());
-
-  auto error_to_json_tmpl = v8::FunctionTemplate::New(isolate, ErrorToJSON);
-  auto error_to_json_val =
-      error_to_json_tmpl->GetFunction(context).ToLocalChecked();
-  CHECK(core_val->Set(context, deno::v8_str("errorToJSON"), error_to_json_val)
-            .FromJust());
-
-  CHECK(core_val->SetAccessor(context, deno::v8_str("shared"), Shared)
-            .FromJust());
-
-  // Direct bindings on `window`.
-  auto queue_microtask_tmpl =
-      v8::FunctionTemplate::New(isolate, QueueMicrotask);
-  auto queue_microtask_val =
-      queue_microtask_tmpl->GetFunction(context).ToLocalChecked();
-  CHECK(
-      global->Set(context, deno::v8_str("queueMicrotask"), queue_microtask_val)
-          .FromJust());
-}
-
-void MessageCallback(v8::Local<v8::Message> message,
-                     v8::Local<v8::Value> data) {
-  auto* isolate = message->GetIsolate();
-  DenoIsolate* d = static_cast<DenoIsolate*>(isolate->GetData(0));
-
-  v8::HandleScope handle_scope(isolate);
-  auto context = d->context_.Get(isolate);
-  HandleExceptionMessage(context, message);
-}
-
-void HostInitializeImportMetaObjectCallback(v8::Local<v8::Context> context,
-                                            v8::Local<v8::Module> module,
-                                            v8::Local<v8::Object> meta) {
-  auto* isolate = context->GetIsolate();
-  DenoIsolate* d = DenoIsolate::FromIsolate(isolate);
-  v8::Isolate::Scope isolate_scope(isolate);
-
-  CHECK(!module.IsEmpty());
-
-  deno_mod id = module->GetIdentityHash();
-  CHECK_NE(id, 0);
-
-  auto* info = d->GetModuleInfo(id);
-
-  const char* url = info->name.c_str();
-  const bool main = info->main;
-
-  meta->CreateDataProperty(context, v8_str("url"), v8_str(url)).ToChecked();
-  meta->CreateDataProperty(context, v8_str("main"), v8_bool(main)).ToChecked();
-}
-
-v8::MaybeLocal<v8::Promise> HostImportModuleDynamicallyCallback(
-    v8::Local<v8::Context> context, v8::Local<v8::ScriptOrModule> referrer,
-    v8::Local<v8::String> specifier) {
-  auto* isolate = context->GetIsolate();
-  DenoIsolate* d = DenoIsolate::FromIsolate(isolate);
-  v8::Isolate::Scope isolate_scope(isolate);
-  v8::Context::Scope context_scope(context);
-  v8::EscapableHandleScope handle_scope(isolate);
-
-  v8::String::Utf8Value specifier_str(isolate, specifier);
-
-  auto referrer_name = referrer->GetResourceName();
-  v8::String::Utf8Value referrer_name_str(isolate, referrer_name);
-
-  // TODO(ry) I'm not sure what HostDefinedOptions is for or if we're ever going
-  // to use it. For now we check that it is not used. This check may need to be
-  // changed in the future.
-  auto host_defined_options = referrer->GetHostDefinedOptions();
-  CHECK_EQ(host_defined_options->Length(), 0);
-
-  v8::Local<v8::Promise::Resolver> resolver =
-      v8::Promise::Resolver::New(context).ToLocalChecked();
-
-  deno_dyn_import_id import_id = d->next_dyn_import_id_++;
-
-  d->dyn_import_map_.emplace(std::piecewise_construct,
-                             std::make_tuple(import_id),
-                             std::make_tuple(d->isolate_, resolver));
-
-  d->dyn_import_cb_(d->user_data_, *specifier_str, *referrer_name_str,
-                    import_id);
-
-  auto promise = resolver->GetPromise();
-  return handle_scope.Escape(promise);
-}
-
-void DenoIsolate::AddIsolate(v8::Isolate* isolate) {
-  isolate_ = isolate;
-  isolate_->SetCaptureStackTraceForUncaughtExceptions(
-      true, 10, v8::StackTrace::kDetailed);
-  isolate_->SetPromiseRejectCallback(deno::PromiseRejectCallback);
-  isolate_->SetData(0, this);
-  isolate_->AddMessageListener(MessageCallback);
-  isolate->SetHostInitializeImportMetaObjectCallback(
-      HostInitializeImportMetaObjectCallback);
-  isolate->SetHostImportModuleDynamicallyCallback(
-      HostImportModuleDynamicallyCallback);
-}
-
-}  // namespace deno
diff --git a/core/libdeno/buffer.h b/core/libdeno/buffer.h
deleted file mode 100644
index 4f641f270..000000000
--- a/core/libdeno/buffer.h
+++ /dev/null
@@ -1,140 +0,0 @@
-// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
-#ifndef BUFFER_H_
-#define BUFFER_H_
-
-// Cpplint bans the use of <mutex> because it duplicates functionality in
-// chromium //base. However Deno doensn't use that, so suppress that lint.
-#include <memory>
-#include <mutex>  // NOLINT
-#include <string>
-#include <unordered_map>
-#include <utility>
-
-#include "v8/include/v8.h"
-#include "v8/src/base/logging.h"
-
-namespace deno {
-
-class ArrayBufferAllocator : public v8::ArrayBuffer::Allocator {
- public:
-  static ArrayBufferAllocator& global() {
-    static ArrayBufferAllocator global_instance;
-    return global_instance;
-  }
-
-  void* Allocate(size_t length) override { return new uint8_t[length](); }
-
-  void* AllocateUninitialized(size_t length) override {
-    return new uint8_t[length];
-  }
-
-  void Free(void* data, size_t length) override { Unref(data); }
-
- private:
-  friend class PinnedBuf;
-
-  void Ref(void* data) {
-    std::lock_guard<std::mutex> lock(ref_count_map_mutex_);
-    // Note:
-    //  - `unordered_map::insert(make_pair(key, value))` returns the existing
-    //    item if the key, already exists in the map, otherwise it creates an
-    //    new entry with `value`.
-    //  - Buffers not in the map have an implicit reference count of one.
-    auto entry = ref_count_map_.insert(std::make_pair(data, 1)).first;
-    ++entry->second;
-  }
-
-  void Unref(void* data) {
-    {
-      std::lock_guard<std::mutex> lock(ref_count_map_mutex_);
-      auto entry = ref_count_map_.find(data);
-      if (entry == ref_count_map_.end()) {
-        // Buffers not in the map have an implicit ref count of one. After
-        // dereferencing there are no references left, so we delete the buffer.
-      } else if (--entry->second == 0) {
-        // The reference count went to zero, so erase the map entry and free the
-        // buffer.
-        ref_count_map_.erase(entry);
-      } else {
-        // After decreasing the reference count the buffer still has references
-        // left, so we leave the pin in place.
-        return;
-      }
-      delete[] reinterpret_cast<uint8_t*>(data);
-    }
-  }
-
- private:
-  ArrayBufferAllocator() {}
-
-  ~ArrayBufferAllocator() {
-    // TODO(pisciaureus): Enable this check. It currently fails sometimes
-    // because the compiler worker isolate never actually exits, so when the
-    // process exits this isolate still holds on to some buffers.
-    // CHECK(ref_count_map_.empty());
-  }
-
-  std::unordered_map<void*, size_t> ref_count_map_;
-  std::mutex ref_count_map_mutex_;
-};
-
-class PinnedBuf {
-  struct Unref {
-    // This callback gets called from the Pin destructor.
-    void operator()(void* ptr) { ArrayBufferAllocator::global().Unref(ptr); }
-  };
-  // The Pin is a unique (non-copyable) smart pointer which automatically
-  // unrefs the referenced ArrayBuffer in its destructor.
-  using Pin = std::unique_ptr<void, Unref>;
-
-  uint8_t* data_ptr_;
-  size_t data_len_;
-  Pin pin_;
-
- public:
-  // PinnedBuf::Raw is a POD struct with the same memory layout as the PinBuf
-  // itself. It is used to move a PinnedBuf between C and Rust.
-  struct Raw {
-    uint8_t* data_ptr;
-    size_t data_len;
-    void* pin;
-  };
-
-  PinnedBuf() : data_ptr_(nullptr), data_len_(0), pin_() {}
-
-  explicit PinnedBuf(v8::Local<v8::ArrayBufferView> view) {
-    auto buf = view->Buffer()->GetBackingStore()->Data();
-    ArrayBufferAllocator::global().Ref(buf);
-
-    data_ptr_ = reinterpret_cast<uint8_t*>(buf) + view->ByteOffset();
-    data_len_ = view->ByteLength();
-    pin_ = Pin(buf);
-  }
-
-  // This constructor recreates a PinnedBuf that has previously been converted
-  // to a PinnedBuf::Raw using the IntoRaw() method. This is a move operation;
-  // the Raw struct is emptied in the process.
-  explicit PinnedBuf(Raw* raw)
-      : data_ptr_(raw->data_ptr), data_len_(raw->data_len), pin_(raw->pin) {
-    raw->data_ptr = nullptr;
-    raw->data_len = 0;
-    raw->pin = nullptr;
-  }
-
-  // The IntoRaw() method converts the PinnedBuf to a PinnedBuf::Raw so it's
-  // ownership can be moved to Rust. The source PinnedBuf is emptied in the
-  // process, but the pinned ArrayBuffer is not dereferenced. In order to not
-  // leak it, the raw struct must eventually be turned back into a PinnedBuf
-  // using the constructor above.
-  Raw IntoRaw() {
-    Raw raw{
-        .data_ptr = data_ptr_, .data_len = data_len_, .pin = pin_.release()};
-    data_ptr_ = nullptr;
-    data_len_ = 0;
-    return raw;
-  }
-};
-
-}  // namespace deno
-
-#endif  // BUFFER_H_
diff --git a/core/libdeno/build b/core/libdeno/build
deleted file mode 160000
-Subproject 6af664c48ed657b89e99a9a8692dc15d7f7a6d9
diff --git a/core/libdeno/build_overrides b/core/libdeno/build_overrides
deleted file mode 120000
index f1aca1a07..000000000
--- a/core/libdeno/build_overrides
+++ /dev/null
@@ -1 +0,0 @@
-v8/build_overrides
\ No newline at end of file
diff --git a/core/libdeno/buildtools b/core/libdeno/buildtools
deleted file mode 120000
index c5b1c451c..000000000
--- a/core/libdeno/buildtools
+++ /dev/null
@@ -1 +0,0 @@
-v8/buildtools
\ No newline at end of file
diff --git a/core/libdeno/deno.h b/core/libdeno/deno.h
deleted file mode 100644
index 1beabf5b4..000000000
--- a/core/libdeno/deno.h
+++ /dev/null
@@ -1,165 +0,0 @@
-// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
-#ifndef DENO_H_
-#define DENO_H_
-
-#include <stddef.h>
-#include <stdint.h>
-
-#include "buffer.h"
-
-// Neither Rust nor Go support calling directly into C++ functions, therefore
-// the public interface to libdeno is done in C.
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef deno::PinnedBuf::Raw deno_pinned_buf;
-
-// Data that gets transmitted.
-typedef struct {
-  uint8_t* data_ptr;
-  size_t data_len;
-} deno_buf;
-
-typedef struct {
-  uint8_t* data_ptr;
-  size_t data_len;
-} deno_snapshot;
-
-typedef struct deno_s Deno;
-
-typedef uint32_t deno_op_id;
-
-// A callback to receive a message from a Deno.core.send() javascript call.
-// control_buf is valid for only for the lifetime of this callback.
-// data_buf is valid until deno_respond() is called.
-//
-// op_id corresponds to the first argument of Deno.core.send().
-// op_id is an extra user-defined integer valued which is not interpreted by
-// libdeno.
-//
-// control_buf corresponds to the second argument of Deno.core.send().
-//
-// zero_copy_buf corresponds to the third argument of Deno.core.send().
-// The user must call deno_pinned_buf_delete on each zero_copy_buf received.
-typedef void (*deno_recv_cb)(void* user_data, deno_op_id op_id,
-                             deno_buf control_buf,
-                             deno_pinned_buf zero_copy_buf);
-
-typedef int deno_dyn_import_id;
-// Called when dynamic import is called in JS: import('foo')
-// Embedder must call deno_dyn_import_done() with the specified id and
-// the module.
-typedef void (*deno_dyn_import_cb)(void* user_data, const char* specifier,
-                                   const char* referrer, deno_dyn_import_id id);
-
-void deno_init();
-const char* deno_v8_version();
-void deno_set_v8_flags(int* argc, char** argv);
-
-typedef struct {
-  int will_snapshot;            // Default 0. If calling deno_snapshot_new 1.
-  deno_snapshot load_snapshot;  // A startup snapshot to use.
-  deno_buf shared;              // Shared buffer to be mapped to libdeno.shared
-  deno_recv_cb recv_cb;         // Maps to Deno.core.send() calls.
-  deno_dyn_import_cb dyn_import_cb;
-} deno_config;
-
-// Create a new deno isolate.
-// Warning: If config.will_snapshot is set, deno_snapshot_new() must be called
-// or an error will result.
-Deno* deno_new(deno_config config);
-void deno_delete(Deno* d);
-
-// Generate a snapshot. The resulting buf can be used in as the load_snapshot
-// member in deno_confg.
-// When calling this function, the caller must have created the isolate "d" with
-// "will_snapshot" set to 1.
-// The caller must free the returned data with deno_snapshot_delete().
-deno_snapshot deno_snapshot_new(Deno* d);
-
-// Only for use with data returned from deno_snapshot_new.
-void deno_snapshot_delete(deno_snapshot);
-
-void deno_lock(Deno* d);
-void deno_unlock(Deno* d);
-
-// Compile and execute a traditional JavaScript script that does not use
-// module import statements.
-// If it succeeded deno_last_exception() will return NULL.
-void deno_execute(Deno* d, void* user_data, const char* js_filename,
-                  const char* js_source);
-
-// deno_respond sends one message back for every deno_recv_cb made.
-//
-// If this is called during deno_recv_cb, the issuing Deno.core.send() in
-// javascript will synchronously return the specified buf as an ArrayBuffer (or
-// null if buf is empty).
-//
-// If this is called after deno_recv_cb has returned, the deno_respond
-// will call into the JS callback specified by Deno.core.recv().
-//
-// (Ideally, but not currently: After calling deno_respond(), the caller no
-// longer owns `buf` and must not use it; deno_respond() is responsible for
-// releasing its memory.)
-//
-// op_id is an extra user-defined integer valued which is not currently
-// interpreted by libdeno. But it should probably correspond to the op_id in
-// deno_recv_cb.
-//
-// If a JS exception was encountered, deno_last_exception() will be non-NULL.
-void deno_respond(Deno* d, void* user_data, deno_op_id op_id, deno_buf buf);
-
-void deno_throw_exception(Deno* d, const char* text);
-
-// consumes zero_copy
-void deno_pinned_buf_delete(deno_pinned_buf* buf);
-
-void deno_check_promise_errors(Deno* d);
-
-// Returns a cstring pointer to the exception.
-// Rust side must NOT assert ownership.
-const char* deno_last_exception(Deno* d);
-
-// Clears last exception.
-// Rust side must NOT hold pointer to exception string when called.
-void deno_clear_last_exception(Deno* d_);
-
-void deno_terminate_execution(Deno* d);
-
-void deno_run_microtasks(Deno* d, void* user_data);
-// Module API
-
-typedef int deno_mod;
-
-// Returns zero on error - check deno_last_exception().
-deno_mod deno_mod_new(Deno* d, bool main, const char* name, const char* source);
-
-size_t deno_mod_imports_len(Deno* d, deno_mod id);
-
-// Returned pointer is valid for the lifetime of the Deno isolate "d".
-const char* deno_mod_imports_get(Deno* d, deno_mod id, size_t index);
-
-typedef deno_mod (*deno_resolve_cb)(void* user_data, const char* specifier,
-                                    deno_mod referrer);
-
-// If it succeeded deno_last_exception() will return NULL.
-void deno_mod_instantiate(Deno* d, void* user_data, deno_mod id,
-                          deno_resolve_cb cb);
-
-// If it succeeded deno_last_exception() will return NULL.
-void deno_mod_evaluate(Deno* d, void* user_data, deno_mod id);
-
-// Call exactly once for every deno_dyn_import_cb.
-// Note this call will execute JS.
-// Either mod_id is zero and error_str is not null OR mod_id is valid and
-// error_str is null.
-// TODO(ry) The errors arising from dynamic import are not exactly the same as
-// those arising from ops in Deno.
-void deno_dyn_import_done(Deno* d, void* user_data, deno_dyn_import_id id,
-                          deno_mod mod_id, const char* error_str);
-
-#ifdef __cplusplus
-}  // extern "C"
-#endif
-#endif  // DENO_H_
diff --git a/core/libdeno/exceptions.cc b/core/libdeno/exceptions.cc
deleted file mode 100644
index 7f622da80..000000000
--- a/core/libdeno/exceptions.cc
+++ /dev/null
@@ -1,236 +0,0 @@
-// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
-#include "exceptions.h"
-#include <string>
-#include "internal.h"
-
-namespace deno {
-
-v8::Local<v8::Object> EncodeMessageAsObject(v8::Local<v8::Context> context,
-                                            v8::Local<v8::Message> message) {
-  auto* isolate = context->GetIsolate();
-  v8::EscapableHandleScope handle_scope(isolate);
-  v8::Context::Scope context_scope(context);
-
-  auto stack_trace = message->GetStackTrace();
-
-  // Encode the exception into a JS object, which we will then turn into JSON.
-  auto json_obj = v8::Object::New(isolate);
-  auto exception_str = message->Get();
-  CHECK(json_obj->Set(context, v8_str("message"), exception_str).FromJust());
-
-  auto maybe_source_line = message->GetSourceLine(context);
-  if (!maybe_source_line.IsEmpty()) {
-    CHECK(json_obj
-              ->Set(context, v8_str("sourceLine"),
-                    maybe_source_line.ToLocalChecked())
-              .FromJust());
-  }
-
-  CHECK(json_obj
-            ->Set(context, v8_str("scriptResourceName"),
-                  message->GetScriptResourceName())
-            .FromJust());
-
-  auto maybe_line_number = message->GetLineNumber(context);
-  if (maybe_line_number.IsJust()) {
-    CHECK(json_obj
-              ->Set(context, v8_str("lineNumber"),
-                    v8::Integer::New(isolate, maybe_line_number.FromJust()))
-              .FromJust());
-  }
-
-  CHECK(json_obj
-            ->Set(context, v8_str("startPosition"),
-                  v8::Integer::New(isolate, message->GetStartPosition()))
-            .FromJust());
-
-  CHECK(json_obj
-            ->Set(context, v8_str("endPosition"),
-                  v8::Integer::New(isolate, message->GetEndPosition()))
-            .FromJust());
-
-  CHECK(json_obj
-            ->Set(context, v8_str("errorLevel"),
-                  v8::Integer::New(isolate, message->ErrorLevel()))
-            .FromJust());
-
-  auto maybe_start_column = message->GetStartColumn(context);
-  if (maybe_start_column.IsJust()) {
-    auto start_column =
-        v8::Integer::New(isolate, maybe_start_column.FromJust());
-    CHECK(
-        json_obj->Set(context, v8_str("startColumn"), start_column).FromJust());
-  }
-
-  auto maybe_end_column = message->GetEndColumn(context);
-  if (maybe_end_column.IsJust()) {
-    auto end_column = v8::Integer::New(isolate, maybe_end_column.FromJust());
-    CHECK(json_obj->Set(context, v8_str("endColumn"), end_column).FromJust());
-  }
-
-  CHECK(json_obj
-            ->Set(context, v8_str("isSharedCrossOrigin"),
-                  v8::Boolean::New(isolate, message->IsSharedCrossOrigin()))
-            .FromJust());
-
-  CHECK(json_obj
-            ->Set(context, v8_str("isOpaque"),
-                  v8::Boolean::New(isolate, message->IsOpaque()))
-            .FromJust());
-
-  v8::Local<v8::Array> frames;
-  if (!stack_trace.IsEmpty()) {
-    uint32_t count = static_cast<uint32_t>(stack_trace->GetFrameCount());
-    frames = v8::Array::New(isolate, count);
-
-    for (uint32_t i = 0; i < count; ++i) {
-      auto frame = stack_trace->GetFrame(isolate, i);
-      auto frame_obj = v8::Object::New(isolate);
-      CHECK(frames->Set(context, i, frame_obj).FromJust());
-      auto line = v8::Integer::New(isolate, frame->GetLineNumber());
-      auto column = v8::Integer::New(isolate, frame->GetColumn());
-      CHECK(frame_obj->Set(context, v8_str("line"), line).FromJust());
-      CHECK(frame_obj->Set(context, v8_str("column"), column).FromJust());
-
-      auto function_name = frame->GetFunctionName();
-      if (!function_name.IsEmpty()) {
-        CHECK(frame_obj->Set(context, v8_str("functionName"), function_name)
-                  .FromJust());
-      }
-      // scriptName can be empty in special conditions e.g. eval
-      auto scriptName = frame->GetScriptNameOrSourceURL();
-      if (scriptName.IsEmpty()) {
-        scriptName = v8_str("<unknown>");
-      }
-      CHECK(
-          frame_obj->Set(context, v8_str("scriptName"), scriptName).FromJust());
-      CHECK(frame_obj
-                ->Set(context, v8_str("isEval"),
-                      v8::Boolean::New(isolate, frame->IsEval()))
-                .FromJust());
-      CHECK(frame_obj
-                ->Set(context, v8_str("isConstructor"),
-                      v8::Boolean::New(isolate, frame->IsConstructor()))
-                .FromJust());
-      CHECK(frame_obj
-                ->Set(context, v8_str("isWasm"),
-                      v8::Boolean::New(isolate, frame->IsWasm()))
-                .FromJust());
-    }
-  } else {
-    // No stack trace. We only have one stack frame of info..
-    frames = v8::Array::New(isolate, 1);
-
-    auto frame_obj = v8::Object::New(isolate);
-    CHECK(frames->Set(context, 0, frame_obj).FromJust());
-
-    auto line =
-        v8::Integer::New(isolate, message->GetLineNumber(context).FromJust());
-    auto column =
-        v8::Integer::New(isolate, message->GetStartColumn(context).FromJust());
-
-    CHECK(frame_obj->Set(context, v8_str("line"), line).FromJust());
-    CHECK(frame_obj->Set(context, v8_str("column"), column).FromJust());
-    CHECK(frame_obj
-              ->Set(context, v8_str("scriptName"),
-                    message->GetScriptResourceName())
-              .FromJust());
-  }
-
-  CHECK(json_obj->Set(context, v8_str("frames"), frames).FromJust());
-  json_obj = handle_scope.Escape(json_obj);
-  return json_obj;
-}
-
-std::string EncodeMessageAsJSON(v8::Local<v8::Context> context,
-                                v8::Local<v8::Message> message) {
-  auto* isolate = context->GetIsolate();
-  v8::HandleScope handle_scope(isolate);
-  v8::Context::Scope context_scope(context);
-  auto json_obj = EncodeMessageAsObject(context, message);
-  auto json_string = v8::JSON::Stringify(context, json_obj).ToLocalChecked();
-  v8::String::Utf8Value json_string_(isolate, json_string);
-  return std::string(ToCString(json_string_));
-}
-
-v8::Local<v8::Object> EncodeExceptionAsObject(v8::Local<v8::Context> context,
-                                              v8::Local<v8::Value> exception) {
-  auto* isolate = context->GetIsolate();
-  v8::EscapableHandleScope handle_scope(isolate);
-  v8::Context::Scope context_scope(context);
-
-  auto message = v8::Exception::CreateMessage(isolate, exception);
-  auto json_obj = EncodeMessageAsObject(context, message);
-  json_obj = handle_scope.Escape(json_obj);
-  return json_obj;
-}
-
-std::string EncodeExceptionAsJSON(v8::Local<v8::Context> context,
-                                  v8::Local<v8::Value> exception) {
-  auto* isolate = context->GetIsolate();
-  v8::HandleScope handle_scope(isolate);
-  v8::Context::Scope context_scope(context);
-
-  auto message = v8::Exception::CreateMessage(isolate, exception);
-  return EncodeMessageAsJSON(context, message);
-}
-
-void HandleException(v8::Local<v8::Context> context,
-                     v8::Local<v8::Value> exception) {
-  v8::Isolate* isolate = context->GetIsolate();
-
-  // TerminateExecution was called
-  if (isolate->IsExecutionTerminating()) {
-    // cancel exception termination so that the exception can be created
-    isolate->CancelTerminateExecution();
-
-    // maybe make a new exception object
-    if (exception->IsNullOrUndefined()) {
-      exception = v8::Exception::Error(v8_str("execution terminated"));
-    }
-
-    // handle the exception as if it is a regular exception
-    HandleException(context, exception);
-
-    // re-enable exception termination
-    isolate->TerminateExecution();
-    return;
-  }
-
-  DenoIsolate* d = DenoIsolate::FromIsolate(isolate);
-  std::string json_str = EncodeExceptionAsJSON(context, exception);
-  CHECK_NOT_NULL(d);
-  d->last_exception_ = json_str;
-  d->last_exception_handle_.Reset(isolate, exception);
-}
-
-void HandleExceptionMessage(v8::Local<v8::Context> context,
-                            v8::Local<v8::Message> message) {
-  v8::Isolate* isolate = context->GetIsolate();
-
-  // TerminateExecution was called
-  if (isolate->IsExecutionTerminating()) {
-    HandleException(context, v8::Undefined(isolate));
-    return;
-  }
-
-  DenoIsolate* d = DenoIsolate::FromIsolate(isolate);
-  std::string json_str = EncodeMessageAsJSON(context, message);
-  CHECK_NOT_NULL(d);
-  d->last_exception_ = json_str;
-}
-
-void ClearException(v8::Local<v8::Context> context) {
-  v8::Isolate* isolate = context->GetIsolate();
-  DenoIsolate* d = DenoIsolate::FromIsolate(isolate);
-  CHECK_NOT_NULL(d);
-
-  d->last_exception_.clear();
-  d->last_exception_handle_.Reset();
-}
-
-void ThrowInvalidArgument(v8::Isolate* isolate) {
-  isolate->ThrowException(v8::Exception::TypeError(v8_str("Invalid Argument")));
-}
-
-}  // namespace deno
diff --git a/core/libdeno/exceptions.h b/core/libdeno/exceptions.h
deleted file mode 100644
index 155dc8aad..000000000
--- a/core/libdeno/exceptions.h
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
-#ifndef EXCEPTIONS_H_
-#define EXCEPTIONS_H_
-
-#include <string>
-#include "v8/include/v8.h"
-
-namespace deno {
-
-v8::Local<v8::Object> EncodeExceptionAsObject(v8::Local<v8::Context> context,
-                                              v8::Local<v8::Value> exception);
-
-std::string EncodeExceptionAsJSON(v8::Local<v8::Context> context,
-                                  v8::Local<v8::Value> exception);
-
-void HandleException(v8::Local<v8::Context> context,
-                     v8::Local<v8::Value> exception);
-
-void HandleExceptionMessage(v8::Local<v8::Context> context,
-                            v8::Local<v8::Message> message);
-
-void ClearException(v8::Local<v8::Context> context);
-
-void ThrowInvalidArgument(v8::Isolate* isolate);
-}  // namespace deno
-
-#endif  // EXCEPTIONS_H_
diff --git a/core/libdeno/internal.h b/core/libdeno/internal.h
deleted file mode 100644
index 9669473a1..000000000
--- a/core/libdeno/internal.h
+++ /dev/null
@@ -1,206 +0,0 @@
-// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
-#ifndef INTERNAL_H_
-#define INTERNAL_H_
-
-#include <map>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include "buffer.h"
-#include "deno.h"
-#include "v8/include/v8.h"
-#include "v8/src/base/logging.h"
-
-namespace deno {
-
-struct ModuleInfo {
-  bool main;
-  std::string name;
-  v8::Persistent<v8::Module> handle;
-  std::vector<std::string> import_specifiers;
-
-  ModuleInfo(v8::Isolate* isolate, v8::Local<v8::Module> module, bool main_,
-             const char* name_, std::vector<std::string> import_specifiers_)
-      : main(main_), name(name_), import_specifiers(import_specifiers_) {
-    handle.Reset(isolate, module);
-  }
-};
-
-// deno_s = Wrapped Isolate.
-class DenoIsolate {
- public:
-  explicit DenoIsolate(deno_config config)
-      : isolate_(nullptr),
-        locker_(nullptr),
-        shared_(config.shared),
-        current_args_(nullptr),
-        snapshot_creator_(nullptr),
-        global_import_buf_ptr_(nullptr),
-        recv_cb_(config.recv_cb),
-        user_data_(nullptr),
-        resolve_cb_(nullptr),
-        next_dyn_import_id_(0),
-        dyn_import_cb_(config.dyn_import_cb),
-        has_snapshotted_(false) {
-    if (config.load_snapshot.data_ptr) {
-      snapshot_.data =
-          reinterpret_cast<const char*>(config.load_snapshot.data_ptr);
-      snapshot_.raw_size = static_cast<int>(config.load_snapshot.data_len);
-    }
-  }
-
-  ~DenoIsolate() {
-    last_exception_handle_.Reset();
-    shared_ab_.Reset();
-    if (locker_) {
-      delete locker_;
-    }
-    if (snapshot_creator_) {
-      // TODO(ry) V8 has a strange assert which prevents a SnapshotCreator from
-      // being deallocated if it hasn't created a snapshot yet.
-      // https://github.com/v8/v8/blob/73212783fbd534fac76cc4b66aac899c13f71fc8/src/api.cc#L603
-      // If that assert is removed, this if guard could be removed.
-      // WARNING: There may be false positive LSAN errors here.
-      if (has_snapshotted_) {
-        delete snapshot_creator_;
-      }
-    } else {
-      isolate_->Dispose();
-    }
-  }
-
-  static inline DenoIsolate* FromIsolate(v8::Isolate* isolate) {
-    return static_cast<DenoIsolate*>(isolate->GetData(0));
-  }
-
-  void AddIsolate(v8::Isolate* isolate);
-
-  deno_mod RegisterModule(bool main, const char* name, const char* source);
-  void ClearModules();
-
-  ModuleInfo* GetModuleInfo(deno_mod id) {
-    if (id == 0) {
-      return nullptr;
-    }
-    auto it = mods_.find(id);
-    if (it != mods_.end()) {
-      return &it->second;
-    } else {
-      return nullptr;
-    }
-  }
-
-  v8::Isolate* isolate_;
-  v8::Locker* locker_;
-  deno_buf shared_;
-  const v8::FunctionCallbackInfo<v8::Value>* current_args_;
-  v8::SnapshotCreator* snapshot_creator_;
-  void* global_import_buf_ptr_;
-  deno_recv_cb recv_cb_;
-  void* user_data_;
-
-  std::map<deno_mod, ModuleInfo> mods_;
-  std::map<std::string, deno_mod> mods_by_name_;
-  deno_resolve_cb resolve_cb_;
-
-  deno_dyn_import_id next_dyn_import_id_;
-  deno_dyn_import_cb dyn_import_cb_;
-  std::map<deno_dyn_import_id, v8::Persistent<v8::Promise::Resolver>>
-      dyn_import_map_;
-
-  v8::Persistent<v8::Context> context_;
-  std::map<int, v8::Persistent<v8::Value>> pending_promise_map_;
-  std::string last_exception_;
-  v8::Persistent<v8::Value> last_exception_handle_;
-  v8::Persistent<v8::Function> recv_;
-  v8::StartupData snapshot_;
-  v8::Persistent<v8::ArrayBuffer> global_import_buf_;
-  v8::Persistent<v8::SharedArrayBuffer> shared_ab_;
-  bool has_snapshotted_;
-};
-
-class UserDataScope {
-  DenoIsolate* deno_;
-  void* prev_data_;
-  void* data_;  // Not necessary; only for sanity checking.
-
- public:
-  UserDataScope(DenoIsolate* deno, void* data) : deno_(deno), data_(data) {
-    CHECK(deno->user_data_ == nullptr || deno->user_data_ == data_);
-    prev_data_ = deno->user_data_;
-    deno->user_data_ = data;
-  }
-
-  ~UserDataScope() {
-    CHECK(deno_->user_data_ == data_);
-    deno_->user_data_ = prev_data_;
-  }
-};
-
-struct InternalFieldData {
-  uint32_t data;
-};
-
-static inline v8::Local<v8::String> v8_str(const char* x) {
-  return v8::String::NewFromUtf8(v8::Isolate::GetCurrent(), x,
-                                 v8::NewStringType::kNormal)
-      .ToLocalChecked();
-}
-
-static inline DenoIsolate* unwrap(Deno* d_) {
-  return reinterpret_cast<deno::DenoIsolate*>(d_);
-}
-
-const char* ToCString(const v8::String::Utf8Value& value);
-
-void Print(const v8::FunctionCallbackInfo<v8::Value>& args);
-void Recv(const v8::FunctionCallbackInfo<v8::Value>& args);
-void Send(const v8::FunctionCallbackInfo<v8::Value>& args);
-void EvalContext(const v8::FunctionCallbackInfo<v8::Value>& args);
-void ErrorToJSON(const v8::FunctionCallbackInfo<v8::Value>& args);
-void Shared(v8::Local<v8::Name> property,
-            const v8::PropertyCallbackInfo<v8::Value>& info);
-void MessageCallback(v8::Local<v8::Message> message, v8::Local<v8::Value> data);
-void QueueMicrotask(const v8::FunctionCallbackInfo<v8::Value>& args);
-static intptr_t external_references[] = {
-    reinterpret_cast<intptr_t>(Print),
-    reinterpret_cast<intptr_t>(Recv),
-    reinterpret_cast<intptr_t>(Send),
-    reinterpret_cast<intptr_t>(EvalContext),
-    reinterpret_cast<intptr_t>(ErrorToJSON),
-    reinterpret_cast<intptr_t>(Shared),
-    reinterpret_cast<intptr_t>(MessageCallback),
-    reinterpret_cast<intptr_t>(QueueMicrotask),
-    0};
-
-static const deno_buf empty_buf = {nullptr, 0};
-static const deno_snapshot empty_snapshot = {nullptr, 0};
-
-Deno* NewFromSnapshot(void* user_data, deno_recv_cb cb);
-
-void InitializeContext(v8::Isolate* isolate, v8::Local<v8::Context> context);
-
-void DeserializeInternalFields(v8::Local<v8::Object> holder, int index,
-                               v8::StartupData payload, void* data);
-
-v8::StartupData SerializeInternalFields(v8::Local<v8::Object> holder, int index,
-                                        void* data);
-
-v8::Local<v8::Uint8Array> ImportBuf(DenoIsolate* d, deno_buf buf);
-
-bool Execute(v8::Local<v8::Context> context, const char* js_filename,
-             const char* js_source);
-bool ExecuteMod(v8::Local<v8::Context> context, const char* js_filename,
-                const char* js_source, bool resolve_only);
-
-}  // namespace deno
-
-extern "C" {
-// This is just to workaround the linker.
-struct deno_s {
-  deno::DenoIsolate isolate;
-};
-}
-
-#endif  // INTERNAL_H_
diff --git a/core/libdeno/libdeno_test.cc b/core/libdeno/libdeno_test.cc
deleted file mode 100644
index 1b21eb7b1..000000000
--- a/core/libdeno/libdeno_test.cc
+++ /dev/null
@@ -1,322 +0,0 @@
-// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
-#include "test.h"
-
-TEST(LibDenoTest, InitializesCorrectly) {
-  EXPECT_NE(snapshot.data_ptr, nullptr);
-  Deno* d = deno_new(deno_config{0, snapshot, empty, nullptr, nullptr});
-  deno_execute(d, nullptr, "a.js", "1 + 2");
-  EXPECT_EQ(nullptr, deno_last_exception(d));
-  deno_delete(d);
-}
-
-TEST(LibDenoTest, Snapshotter) {
-  Deno* d1 = deno_new(deno_config{1, empty_snapshot, empty, nullptr, nullptr});
-  deno_execute(d1, nullptr, "a.js", "a = 1 + 2");
-  EXPECT_EQ(nullptr, deno_last_exception(d1));
-  deno_snapshot test_snapshot = deno_snapshot_new(d1);
-  deno_delete(d1);
-
-  Deno* d2 = deno_new(deno_config{0, test_snapshot, empty, nullptr, nullptr});
-  deno_execute(d2, nullptr, "b.js", "if (a != 3) throw Error('x');");
-  EXPECT_EQ(nullptr, deno_last_exception(d2));
-  deno_delete(d2);
-
-  deno_snapshot_delete(test_snapshot);
-}
-
-TEST(LibDenoTest, CanCallFunction) {
-  Deno* d = deno_new(deno_config{0, snapshot, empty, nullptr, nullptr});
-  deno_lock(d);
-  deno_execute(d, nullptr, "a.js",
-               "if (CanCallFunction() != 'foo') throw Error();");
-  EXPECT_EQ(nullptr, deno_last_exception(d));
-  deno_unlock(d);
-  deno_delete(d);
-}
-
-TEST(LibDenoTest, ErrorsCorrectly) {
-  Deno* d = deno_new(deno_config{0, snapshot, empty, nullptr, nullptr});
-  deno_execute(d, nullptr, "a.js", "throw Error()");
-  EXPECT_NE(nullptr, deno_last_exception(d));
-  deno_delete(d);
-}
-
-void assert_null(deno_pinned_buf b) {
-  EXPECT_EQ(b.data_ptr, nullptr);
-  EXPECT_EQ(b.data_len, 0u);
-  EXPECT_EQ(b.pin, nullptr);
-}
-
-TEST(LibDenoTest, RecvReturnEmpty) {
-  static int count = 0;
-  auto recv_cb = [](auto _, deno_op_id op_id, auto buf, auto zero_copy_buf) {
-    EXPECT_EQ(op_id, 42u);
-    assert_null(zero_copy_buf);
-    count++;
-    EXPECT_EQ(static_cast<size_t>(3), buf.data_len);
-    EXPECT_EQ(buf.data_ptr[0], 'a');
-    EXPECT_EQ(buf.data_ptr[1], 'b');
-    EXPECT_EQ(buf.data_ptr[2], 'c');
-  };
-  Deno* d = deno_new(deno_config{0, snapshot, empty, recv_cb, nullptr});
-  deno_execute(d, nullptr, "a.js", "RecvReturnEmpty()");
-  EXPECT_EQ(nullptr, deno_last_exception(d));
-  EXPECT_EQ(count, 2);
-  deno_delete(d);
-}
-
-TEST(LibDenoTest, BasicRecv) {
-  static int count = 0;
-  auto recv_cb = [](auto user_data, deno_op_id op_id, auto buf,
-                    auto zero_copy_buf) {
-    EXPECT_EQ(op_id, 42u);
-    // auto d = reinterpret_cast<Deno*>(user_data);
-    assert_null(zero_copy_buf);
-    count++;
-    EXPECT_EQ(static_cast<size_t>(3), buf.data_len);
-    EXPECT_EQ(buf.data_ptr[0], 1);
-    EXPECT_EQ(buf.data_ptr[1], 2);
-    EXPECT_EQ(buf.data_ptr[2], 3);
-  };
-  Deno* d = deno_new(deno_config{0, snapshot, empty, recv_cb, nullptr});
-  deno_execute(d, d, "a.js", "BasicRecv()");
-  EXPECT_EQ(nullptr, deno_last_exception(d));
-  EXPECT_EQ(count, 1);
-  deno_check_promise_errors(d);
-  EXPECT_EQ(deno_last_exception(d), nullptr);
-  {
-    deno_lock(d);
-    uint8_t response[] = {'b', 'a', 'r'};
-    deno_respond(d, nullptr, 43, {response, sizeof response});
-    deno_unlock(d);
-  }
-  EXPECT_EQ(count, 2);
-  EXPECT_EQ(nullptr, deno_last_exception(d));
-  deno_check_promise_errors(d);
-  EXPECT_EQ(deno_last_exception(d), nullptr);
-  deno_delete(d);
-}
-
-TEST(LibDenoTest, RecvReturnBar) {
-  static int count = 0;
-  auto recv_cb = [](auto user_data, deno_op_id op_id, auto buf,
-                    auto zero_copy_buf) {
-    EXPECT_EQ(op_id, 42u);
-    auto d = reinterpret_cast<Deno*>(user_data);
-    assert_null(zero_copy_buf);
-    count++;
-    EXPECT_EQ(static_cast<size_t>(3), buf.data_len);
-    EXPECT_EQ(buf.data_ptr[0], 'a');
-    EXPECT_EQ(buf.data_ptr[1], 'b');
-    EXPECT_EQ(buf.data_ptr[2], 'c');
-    uint8_t response[] = {'b', 'a', 'r'};
-    deno_respond(d, user_data, op_id, {response, sizeof response});
-  };
-  Deno* d = deno_new(deno_config{0, snapshot, empty, recv_cb, nullptr});
-  deno_execute(d, d, "a.js", "RecvReturnBar()");
-  EXPECT_EQ(nullptr, deno_last_exception(d));
-  EXPECT_EQ(count, 1);
-  deno_delete(d);
-}
-
-TEST(LibDenoTest, DoubleRecvFails) {
-  Deno* d = deno_new(deno_config{0, snapshot, empty, nullptr, nullptr});
-  deno_execute(d, nullptr, "a.js", "DoubleRecvFails()");
-  EXPECT_NE(nullptr, deno_last_exception(d));
-  deno_delete(d);
-}
-
-TEST(LibDenoTest, TypedArraySnapshots) {
-  Deno* d = deno_new(deno_config{0, snapshot, empty, nullptr, nullptr});
-  deno_execute(d, nullptr, "a.js", "TypedArraySnapshots()");
-  EXPECT_EQ(nullptr, deno_last_exception(d));
-  deno_delete(d);
-}
-
-TEST(LibDenoTest, SnapshotBug) {
-  Deno* d = deno_new(deno_config{0, snapshot, empty, nullptr, nullptr});
-  deno_execute(d, nullptr, "a.js", "SnapshotBug()");
-  EXPECT_EQ(nullptr, deno_last_exception(d));
-  deno_delete(d);
-}
-
-TEST(LibDenoTest, GlobalErrorHandling) {
-  Deno* d = deno_new(deno_config{0, snapshot, empty, nullptr, nullptr});
-  deno_execute(d, nullptr, "a.js", "GlobalErrorHandling()");
-  std::string expected =
-      "{\"message\":\"Uncaught ReferenceError: notdefined is not defined\","
-      "\"sourceLine\":\" "
-      "notdefined()\",\"scriptResourceName\":\"helloworld.js\","
-      "\"lineNumber\":3,\"startPosition\":3,\"endPosition\":4,\"errorLevel\":8,"
-      "\"startColumn\":1,\"endColumn\":2,\"isSharedCrossOrigin\":false,"
-      "\"isOpaque\":false,\"frames\":[{\"line\":3,\"column\":2,"
-      "\"functionName\":\"eval\",\"scriptName\":\"helloworld.js\",\"isEval\":"
-      "true,"
-      "\"isConstructor\":false,\"isWasm\":false},";
-  std::string actual(deno_last_exception(d), 0, expected.length());
-  EXPECT_STREQ(expected.c_str(), actual.c_str());
-  deno_delete(d);
-}
-
-TEST(LibDenoTest, ZeroCopyBuf) {
-  static int count = 0;
-  static deno_pinned_buf zero_copy_buf2;
-  auto recv_cb = [](auto user_data, deno_op_id op_id, deno_buf buf,
-                    deno_pinned_buf zero_copy_buf) {
-    EXPECT_EQ(op_id, 42u);
-    count++;
-    EXPECT_NE(zero_copy_buf.pin, nullptr);
-    zero_copy_buf.data_ptr[0] = 4;
-    zero_copy_buf.data_ptr[1] = 2;
-    zero_copy_buf2 = zero_copy_buf;
-    EXPECT_EQ(2u, buf.data_len);
-    EXPECT_EQ(2u, zero_copy_buf.data_len);
-    EXPECT_EQ(buf.data_ptr[0], 1);
-    EXPECT_EQ(buf.data_ptr[1], 2);
-    // Note zero_copy_buf won't actually be freed here because in
-    // libdeno_test.js zeroCopyBuf is a rooted global. We just want to exercise
-    // the API here.
-    deno_pinned_buf_delete(&zero_copy_buf);
-  };
-  Deno* d = deno_new(deno_config{0, snapshot, empty, recv_cb, nullptr});
-  deno_execute(d, d, "a.js", "ZeroCopyBuf()");
-  EXPECT_EQ(nullptr, deno_last_exception(d));
-  EXPECT_EQ(count, 1);
-  // zero_copy_buf was subsequently changed in JS, let's check that our copy
-  // reflects that.
-  EXPECT_EQ(zero_copy_buf2.data_ptr[0], 9);
-  EXPECT_EQ(zero_copy_buf2.data_ptr[1], 8);
-  deno_delete(d);
-}
-
-TEST(LibDenoTest, CheckPromiseErrors) {
-  static int count = 0;
-  auto recv_cb = [](auto _, deno_op_id op_id, auto buf, auto zero_copy_buf) {
-    count++;
-  };
-  Deno* d = deno_new(deno_config{0, snapshot, empty, recv_cb, nullptr});
-  EXPECT_EQ(deno_last_exception(d), nullptr);
-  deno_execute(d, nullptr, "a.js", "CheckPromiseErrors()");
-  EXPECT_EQ(nullptr, deno_last_exception(d));
-  EXPECT_EQ(count, 1);
-  // We caught the exception. So still no errors after calling
-  // deno_check_promise_errors().
-  deno_check_promise_errors(d);
-  EXPECT_EQ(deno_last_exception(d), nullptr);
-  deno_delete(d);
-}
-
-TEST(LibDenoTest, LastException) {
-  Deno* d = deno_new(deno_config{0, empty_snapshot, empty, nullptr, nullptr});
-  EXPECT_EQ(deno_last_exception(d), nullptr);
-  deno_execute(d, nullptr, "a.js", "\n\nthrow Error('boo');\n\n");
-  EXPECT_STREQ(deno_last_exception(d),
-               "{\"message\":\"Uncaught Error: boo\",\"sourceLine\":\"throw "
-               "Error('boo');\",\"scriptResourceName\":\"a.js\",\"lineNumber\":"
-               "3,\"startPosition\":8,\"endPosition\":9,\"errorLevel\":8,"
-               "\"startColumn\":6,\"endColumn\":7,\"isSharedCrossOrigin\":"
-               "false,\"isOpaque\":false,\"frames\":[{\"line\":3,\"column\":7,"
-               "\"scriptName\":\"a.js\",\"isEval\":false,"
-               "\"isConstructor\":false,\"isWasm\":false}]}");
-  deno_delete(d);
-}
-
-TEST(LibDenoTest, EncodeErrorBug) {
-  Deno* d = deno_new(deno_config{0, empty_snapshot, empty, nullptr, nullptr});
-  EXPECT_EQ(deno_last_exception(d), nullptr);
-  deno_execute(d, nullptr, "a.js", "eval('a')");
-  EXPECT_STREQ(
-      deno_last_exception(d),
-      "{\"message\":\"Uncaught ReferenceError: a is not "
-      "defined\",\"sourceLine\":\"a\",\"lineNumber\":1,\"startPosition\":0,"
-      "\"endPosition\":1,\"errorLevel\":8,\"startColumn\":0,\"endColumn\":1,"
-      "\"isSharedCrossOrigin\":false,\"isOpaque\":false,\"frames\":[{\"line\":"
-      "1,\"column\":1,\"functionName\":\"eval\",\"scriptName\":\"<unknown>\","
-      "\"isEval\":true,\"isConstructor\":false,\"isWasm\":false},{\"line\":1,"
-      "\"column\":1,\"scriptName\":\"a.js\",\"isEval\":"
-      "false,\"isConstructor\":false,\"isWasm\":false}]}");
-  deno_delete(d);
-}
-
-TEST(LibDenoTest, Shared) {
-  uint8_t s[] = {0, 1, 2};
-  deno_buf shared = {s, sizeof s};
-  Deno* d = deno_new(deno_config{0, snapshot, shared, nullptr, nullptr});
-  deno_execute(d, nullptr, "a.js", "Shared()");
-  EXPECT_EQ(nullptr, deno_last_exception(d));
-  EXPECT_EQ(s[0], 42);
-  EXPECT_EQ(s[1], 43);
-  EXPECT_EQ(s[2], 44);
-  deno_delete(d);
-}
-
-TEST(LibDenoTest, Utf8Bug) {
-  Deno* d = deno_new(deno_config{0, empty_snapshot, empty, nullptr, nullptr});
-  // The following is a valid UTF-8 javascript which just defines a string
-  // literal. We had a bug where libdeno would choke on this.
-  deno_execute(d, nullptr, "a.js", "x = \"\xEF\xBF\xBD\"");
-  EXPECT_EQ(nullptr, deno_last_exception(d));
-  deno_delete(d);
-}
-
-TEST(LibDenoTest, LibDenoEvalContext) {
-  Deno* d = deno_new(deno_config{0, snapshot, empty, nullptr, nullptr});
-  deno_execute(d, nullptr, "a.js", "LibDenoEvalContext();");
-  EXPECT_EQ(nullptr, deno_last_exception(d));
-  deno_delete(d);
-}
-
-TEST(LibDenoTest, LibDenoEvalContextError) {
-  Deno* d = deno_new(deno_config{0, snapshot, empty, nullptr, nullptr});
-  deno_execute(d, nullptr, "a.js", "LibDenoEvalContextError();");
-  EXPECT_EQ(nullptr, deno_last_exception(d));
-  deno_delete(d);
-}
-
-TEST(LibDenoTest, LibDenoEvalContextInvalidArgument) {
-  Deno* d = deno_new(deno_config{0, snapshot, empty, nullptr, nullptr});
-  deno_execute(d, nullptr, "a.js", "LibDenoEvalContextInvalidArgument();");
-  EXPECT_EQ(nullptr, deno_last_exception(d));
-  deno_delete(d);
-}
-
-TEST(LibDenoTest, LibDenoPrintInvalidArgument) {
-  Deno* d = deno_new(deno_config{0, snapshot, empty, nullptr, nullptr});
-  deno_execute(d, nullptr, "a.js", "LibDenoPrintInvalidArgument();");
-  EXPECT_EQ(nullptr, deno_last_exception(d));
-  deno_delete(d);
-}
-
-TEST(LibDenoTest, SharedAtomics) {
-  int32_t s[] = {0, 1, 2};
-  deno_buf shared = {reinterpret_cast<uint8_t*>(s), sizeof s};
-  Deno* d = deno_new(deno_config{0, empty_snapshot, shared, nullptr, nullptr});
-  deno_execute(d, nullptr, "a.js",
-               "Atomics.add(new Int32Array(Deno.core.shared), 0, 1)");
-  EXPECT_EQ(nullptr, deno_last_exception(d));
-  EXPECT_EQ(s[0], 1);
-  EXPECT_EQ(s[1], 1);
-  EXPECT_EQ(s[2], 2);
-  deno_delete(d);
-}
-
-TEST(LibDenoTest, WasmInstantiate) {
-  static int count = 0;
-  auto recv_cb = [](auto _, deno_op_id op_id, auto buf, auto zero_copy_buf) {
-    EXPECT_EQ(op_id, 42u);
-    EXPECT_EQ(buf.data_len, 1u);
-    EXPECT_EQ(buf.data_ptr[0], 42);
-    count++;
-  };
-  Deno* d = deno_new(deno_config{0, snapshot, empty, recv_cb, nullptr});
-  EXPECT_EQ(deno_last_exception(d), nullptr);
-  deno_execute(d, nullptr, "a.js", "WasmInstantiate()");
-
-  EXPECT_EQ(nullptr, deno_last_exception(d));
-  deno_check_promise_errors(d);
-  EXPECT_EQ(nullptr, deno_last_exception(d));
-
-  EXPECT_EQ(count, 3);
-
-  deno_delete(d);
-}
diff --git a/core/libdeno/libdeno_test.js b/core/libdeno/libdeno_test.js
deleted file mode 100644
index 5477a87a0..000000000
--- a/core/libdeno/libdeno_test.js
+++ /dev/null
@@ -1,271 +0,0 @@
-// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
-
-// A simple runtime that doesn't involve typescript or protobufs to test
-// libdeno. Invoked by libdeno_test.cc
-
-// eslint-disable-next-line @typescript-eslint/no-this-alias
-const global = this;
-
-function assert(cond) {
-  if (!cond) throw Error("libdeno_test.js assert failed");
-}
-
-global.CanCallFunction = () => {
-  Deno.core.print("Hello world from foo");
-  return "foo";
-};
-
-// This object is created to test snapshotting.
-// See DeserializeInternalFieldsCallback and SerializeInternalFieldsCallback.
-const snapshotted = new Uint8Array([1, 3, 3, 7]);
-
-global.TypedArraySnapshots = () => {
-  assert(snapshotted[0] === 1);
-  assert(snapshotted[1] === 3);
-  assert(snapshotted[2] === 3);
-  assert(snapshotted[3] === 7);
-};
-
-global.RecvReturnEmpty = () => {
-  const m1 = new Uint8Array("abc".split("").map(c => c.charCodeAt(0)));
-  const m2 = m1.slice();
-  const r1 = Deno.core.send(42, m1);
-  assert(r1 == null);
-  const r2 = Deno.core.send(42, m2);
-  assert(r2 == null);
-};
-
-global.BasicRecv = () => {
-  const m = new Uint8Array([1, 2, 3]);
-  Deno.core.recv((opId, buf) => {
-    assert(opId === 43);
-    assert(buf instanceof Uint8Array);
-    assert(buf.byteLength === 3);
-    const s = String.fromCharCode(...buf);
-    assert(s === "bar");
-    const r = Deno.core.send(42, m);
-    assert(!r); // async
-  });
-  const r = Deno.core.send(42, m);
-  assert(!r); // async
-};
-
-global.RecvReturnBar = () => {
-  const m = new Uint8Array("abc".split("").map(c => c.charCodeAt(0)));
-  const r = Deno.core.send(42, m);
-  assert(r instanceof Uint8Array);
-  assert(r.byteLength === 3);
-  const rstr = String.fromCharCode(...r);
-  assert(rstr === "bar");
-};
-
-global.DoubleRecvFails = () => {
-  // Deno.core.recv is an internal function and should only be called once from the
-  // runtime.
-  Deno.core.recv((_channel, _msg) => assert(false));
-  Deno.core.recv((_channel, _msg) => assert(false));
-};
-
-global.SendRecvSlice = () => {
-  const abLen = 1024;
-  let buf = new Uint8Array(abLen);
-  for (let i = 0; i < 5; i++) {
-    // Set first and last byte, for verification by the native side.
-    buf[0] = 100 + i;
-    buf[buf.length - 1] = 100 - i;
-    // On the native side, the slice is shortened by 19 bytes.
-    buf = Deno.core.send(42, buf);
-    assert(buf.byteOffset === i * 11);
-    assert(buf.byteLength === abLen - i * 30 - 19);
-    assert(buf.buffer.byteLength == abLen);
-    // Look for values written by the backend.
-    assert(buf[0] === 200 + i);
-    assert(buf[buf.length - 1] === 200 - i);
-    // On the JS side, the start of the slice is moved up by 11 bytes.
-    buf = buf.subarray(11);
-    assert(buf.byteOffset === (i + 1) * 11);
-    assert(buf.byteLength === abLen - (i + 1) * 30);
-  }
-};
-
-global.JSSendArrayBufferViewTypes = () => {
-  // Test that ArrayBufferView slices are transferred correctly.
-  // Send Uint8Array.
-  const ab1 = new ArrayBuffer(4321);
-  const u8 = new Uint8Array(ab1, 2468, 1000);
-  u8[0] = 1;
-  Deno.core.send(42, u8);
-  // Send Uint32Array.
-  const ab2 = new ArrayBuffer(4321);
-  const u32 = new Uint32Array(ab2, 2468, 1000 / Uint32Array.BYTES_PER_ELEMENT);
-  u32[0] = 0x02020202;
-  Deno.core.send(42, u32);
-  // Send DataView.
-  const ab3 = new ArrayBuffer(4321);
-  const dv = new DataView(ab3, 2468, 1000);
-  dv.setUint8(0, 3);
-  Deno.core.send(42, dv);
-};
-
-// The following join has caused SnapshotBug to segfault when using kKeep.
-[].join("");
-
-global.SnapshotBug = () => {
-  assert("1,2,3" === String([1, 2, 3]));
-};
-
-global.GlobalErrorHandling = () => {
-  eval("\n\n notdefined()\n//# sourceURL=helloworld.js");
-};
-
-// Allocate this buf at the top level to avoid GC.
-const zeroCopyBuf = new Uint8Array([3, 4]);
-
-global.ZeroCopyBuf = () => {
-  const a = new Uint8Array([1, 2]);
-  const b = zeroCopyBuf;
-  // The second parameter of send should modified by the
-  // privileged side.
-  const r = Deno.core.send(42, a, b);
-  assert(r == null);
-  // b is different.
-  assert(b[0] === 4);
-  assert(b[1] === 2);
-  // Now we modify it again.
-  b[0] = 9;
-  b[1] = 8;
-};
-
-global.CheckPromiseErrors = () => {
-  async function fn() {
-    throw new Error("message");
-  }
-
-  (async () => {
-    try {
-      await fn();
-    } catch (e) {
-      Deno.core.send(42, new Uint8Array([42]));
-    }
-  })();
-};
-
-global.Shared = () => {
-  const ab = Deno.core.shared;
-  assert(ab instanceof SharedArrayBuffer);
-  assert(Deno.core.shared != undefined);
-  assert(ab.byteLength === 3);
-  const ui8 = new Uint8Array(ab);
-  assert(ui8[0] === 0);
-  assert(ui8[1] === 1);
-  assert(ui8[2] === 2);
-  ui8[0] = 42;
-  ui8[1] = 43;
-  ui8[2] = 44;
-};
-
-global.LibDenoEvalContext = () => {
-  const [result, errInfo] = Deno.core.evalContext("let a = 1; a");
-  assert(result === 1);
-  assert(!errInfo);
-  const [result2, errInfo2] = Deno.core.evalContext("a = a + 1; a");
-  assert(result2 === 2);
-  assert(!errInfo2);
-};
-
-global.LibDenoEvalContextError = () => {
-  const [result, errInfo] = Deno.core.evalContext("not_a_variable");
-  assert(!result);
-  assert(!!errInfo);
-  assert(errInfo.isNativeError); // is a native error (ReferenceError)
-  assert(!errInfo.isCompileError); // is NOT a compilation error
-  assert(errInfo.thrown.message === "not_a_variable is not defined");
-
-  const [result2, errInfo2] = Deno.core.evalContext("throw 1");
-  assert(!result2);
-  assert(!!errInfo2);
-  assert(!errInfo2.isNativeError); // is NOT a native error
-  assert(!errInfo2.isCompileError); // is NOT a compilation error
-  assert(errInfo2.thrown === 1);
-
-  const [result3, errInfo3] = Deno.core.evalContext(
-    "class AError extends Error {}; throw new AError('e')"
-  );
-  assert(!result3);
-  assert(!!errInfo3);
-  assert(errInfo3.isNativeError); // extend from native error, still native error
-  assert(!errInfo3.isCompileError); // is NOT a compilation error
-  assert(errInfo3.thrown.message === "e");
-
-  const [result4, errInfo4] = Deno.core.evalContext("{");
-  assert(!result4);
-  assert(!!errInfo4);
-  assert(errInfo4.isNativeError); // is a native error (SyntaxError)
-  assert(errInfo4.isCompileError); // is a compilation error! (braces not closed)
-  assert(errInfo4.thrown.message === "Unexpected end of input");
-
-  const [result5, errInfo5] = Deno.core.evalContext("eval('{')");
-  assert(!result5);
-  assert(!!errInfo5);
-  assert(errInfo5.isNativeError); // is a native error (SyntaxError)
-  assert(!errInfo5.isCompileError); // is NOT a compilation error! (just eval)
-  assert(errInfo5.thrown.message === "Unexpected end of input");
-};
-
-global.LibDenoEvalContextInvalidArgument = () => {
-  try {
-    Deno.core.evalContext();
-  } catch (e) {
-    assert(e instanceof TypeError);
-    assert(e.message === "Invalid Argument");
-  }
-};
-
-global.LibDenoPrintInvalidArgument = () => {
-  try {
-    Deno.core.print();
-  } catch (e) {
-    assert(e instanceof TypeError);
-    assert(e.message === "Invalid Argument");
-  }
-  try {
-    Deno.core.print(2, 3, 4);
-  } catch (e) {
-    assert(e instanceof TypeError);
-    assert(e.message === "Invalid Argument");
-  }
-};
-
-global.WasmInstantiate = () => {
-  // The following blob can be created by taking the following s-expr and pass
-  // it through wat2wasm.
-  //    (module
-  //      (func $add (param $a i32) (param $b i32) (result i32)
-  //        local.get $a
-  //        local.get $b
-  //        i32.add)
-  //      (export "add" (func $add))
-  //    )
-  // prettier-ignore
-  const bytes = new Uint8Array([
-    0x00, 0x61, 0x73, 0x6d, 0x01, 0x00, 0x00, 0x00, 0x01, 0x07, 0x01, 0x60,
-    0x02, 0x7f, 0x7f, 0x01, 0x7f, 0x03, 0x02, 0x01, 0x00, 0x07, 0x07, 0x01,
-    0x03, 0x61, 0x64, 0x64, 0x00, 0x00, 0x0a, 0x09, 0x01, 0x07, 0x00, 0x20,
-    0x00, 0x20, 0x01, 0x6a, 0x0b
-  ]);
-
-  (async () => {
-    Deno.core.send(42, new Uint8Array([42]));
-
-    const wasm = await WebAssembly.instantiate(bytes);
-
-    Deno.core.send(42, new Uint8Array([42]));
-
-    const result = wasm.instance.exports.add(1, 3);
-    if (result != 4) {
-      throw Error("bad");
-    }
-    // To signal success, we send back a fixed buffer.
-    Deno.core.send(42, new Uint8Array([42]));
-  })();
-};
diff --git a/core/libdeno/modules.cc b/core/libdeno/modules.cc
deleted file mode 100644
index 9ccdbcadb..000000000
--- a/core/libdeno/modules.cc
+++ /dev/null
@@ -1,223 +0,0 @@
-// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
-#include "exceptions.h"
-#include "internal.h"
-
-using deno::ClearException;
-using deno::DenoIsolate;
-using deno::HandleException;
-using v8::Boolean;
-using v8::Context;
-using v8::EscapableHandleScope;
-using v8::HandleScope;
-using v8::Integer;
-using v8::Isolate;
-using v8::Local;
-using v8::Locker;
-using v8::Module;
-using v8::Object;
-using v8::ScriptCompiler;
-using v8::ScriptOrigin;
-using v8::String;
-using v8::Value;
-
-v8::MaybeLocal<v8::Module> ResolveCallback(Local<Context> context,
-                                           Local<String> specifier,
-                                           Local<Module> referrer) {
-  auto* isolate = context->GetIsolate();
-  v8::Isolate::Scope isolate_scope(isolate);
-  v8::Locker locker(isolate);
-
-  DenoIsolate* d = DenoIsolate::FromIsolate(isolate);
-
-  v8::EscapableHandleScope handle_scope(isolate);
-
-  deno_mod referrer_id = referrer->GetIdentityHash();
-  auto* referrer_info = d->GetModuleInfo(referrer_id);
-  CHECK_NOT_NULL(referrer_info);
-
-  for (int i = 0; i < referrer->GetModuleRequestsLength(); i++) {
-    Local<String> req = referrer->GetModuleRequest(i);
-
-    if (req->Equals(context, specifier).ToChecked()) {
-      v8::String::Utf8Value req_utf8(isolate, req);
-      std::string req_str(*req_utf8);
-
-      deno_mod id = d->resolve_cb_(d->user_data_, req_str.c_str(), referrer_id);
-
-      // Note: id might be zero, in which case GetModuleInfo will return
-      // nullptr.
-      auto* info = d->GetModuleInfo(id);
-      if (info == nullptr) {
-        char buf[64 * 1024];
-        snprintf(buf, sizeof(buf), "Cannot resolve module \"%s\" from \"%s\"",
-                 req_str.c_str(), referrer_info->name.c_str());
-        isolate->ThrowException(deno::v8_str(buf));
-        break;
-      } else {
-        Local<Module> child_mod = info->handle.Get(isolate);
-        return handle_scope.Escape(child_mod);
-      }
-    }
-  }
-
-  return v8::MaybeLocal<v8::Module>();  // Error
-}
-
-extern "C" {
-
-deno_mod deno_mod_new(Deno* d_, bool main, const char* name_cstr,
-                      const char* source_cstr) {
-  auto* d = deno::unwrap(d_);
-  return d->RegisterModule(main, name_cstr, source_cstr);
-}
-
-const char* deno_mod_name(Deno* d_, deno_mod id) {
-  auto* d = deno::unwrap(d_);
-  auto* info = d->GetModuleInfo(id);
-  return info->name.c_str();
-}
-
-size_t deno_mod_imports_len(Deno* d_, deno_mod id) {
-  auto* d = deno::unwrap(d_);
-  auto* info = d->GetModuleInfo(id);
-  return info->import_specifiers.size();
-}
-
-const char* deno_mod_imports_get(Deno* d_, deno_mod id, size_t index) {
-  auto* d = deno::unwrap(d_);
-  auto* info = d->GetModuleInfo(id);
-  if (info == nullptr || index >= info->import_specifiers.size()) {
-    return nullptr;
-  } else {
-    return info->import_specifiers[index].c_str();
-  }
-}
-
-void deno_mod_instantiate(Deno* d_, void* user_data, deno_mod id,
-                          deno_resolve_cb cb) {
-  auto* d = deno::unwrap(d_);
-  deno::UserDataScope user_data_scope(d, user_data);
-
-  auto* isolate = d->isolate_;
-  v8::Isolate::Scope isolate_scope(isolate);
-  v8::Locker locker(isolate);
-  v8::HandleScope handle_scope(isolate);
-  auto context = d->context_.Get(d->isolate_);
-  v8::Context::Scope context_scope(context);
-
-  v8::TryCatch try_catch(isolate);
-  {
-    CHECK_NULL(d->resolve_cb_);
-    d->resolve_cb_ = cb;
-    {
-      auto* info = d->GetModuleInfo(id);
-      if (info == nullptr) {
-        return;
-      }
-      Local<Module> module = info->handle.Get(isolate);
-      if (module->GetStatus() == Module::kErrored) {
-        return;
-      }
-      auto maybe_ok = module->InstantiateModule(context, ResolveCallback);
-      CHECK(maybe_ok.IsJust() || try_catch.HasCaught());
-    }
-    d->resolve_cb_ = nullptr;
-  }
-
-  if (try_catch.HasCaught()) {
-    HandleException(context, try_catch.Exception());
-  }
-}
-
-void deno_mod_evaluate(Deno* d_, void* user_data, deno_mod id) {
-  auto* d = deno::unwrap(d_);
-  deno::UserDataScope user_data_scope(d, user_data);
-
-  auto* isolate = d->isolate_;
-  v8::Isolate::Scope isolate_scope(isolate);
-  v8::Locker locker(isolate);
-  v8::HandleScope handle_scope(isolate);
-  auto context = d->context_.Get(d->isolate_);
-  v8::Context::Scope context_scope(context);
-
-  auto* info = d->GetModuleInfo(id);
-  auto module = info->handle.Get(isolate);
-  auto status = module->GetStatus();
-
-  if (status == Module::kInstantiated) {
-    bool ok = !module->Evaluate(context).IsEmpty();
-    status = module->GetStatus();  // Update status after evaluating.
-    if (ok) {
-      // Note status can still be kErrored even if we get ok.
-      CHECK(status == Module::kEvaluated || status == Module::kErrored);
-    } else {
-      CHECK_EQ(status, Module::kErrored);
-    }
-  }
-
-  switch (status) {
-    case Module::kEvaluated:
-      ClearException(context);
-      break;
-    case Module::kErrored:
-      HandleException(context, module->GetException());
-      break;
-    default:
-      FATAL("Unexpected module status: %d", static_cast<int>(status));
-  }
-}
-
-void deno_dyn_import_done(Deno* d_, void* user_data,
-                          deno_dyn_import_id import_id, deno_mod mod_id,
-                          const char* error_str) {
-  auto* d = deno::unwrap(d_);
-  CHECK((mod_id == 0 && error_str != nullptr) ||
-        (mod_id != 0 && error_str == nullptr) ||
-        (mod_id == 0 && !d->last_exception_handle_.IsEmpty()));
-  deno::UserDataScope user_data_scope(d, user_data);
-
-  auto* isolate = d->isolate_;
-  v8::Isolate::Scope isolate_scope(isolate);
-  v8::Locker locker(isolate);
-  v8::HandleScope handle_scope(isolate);
-  auto context = d->context_.Get(d->isolate_);
-  v8::Context::Scope context_scope(context);
-
-  auto it = d->dyn_import_map_.find(import_id);
-  if (it == d->dyn_import_map_.end()) {
-    CHECK(false);  // TODO(ry) error on bad import_id.
-    return;
-  }
-
-  /// Resolve.
-  auto persistent_promise = &it->second;
-  auto promise = persistent_promise->Get(isolate);
-
-  auto* info = d->GetModuleInfo(mod_id);
-
-  // Do the following callback into JS?? Is user_data_scope needed?
-  persistent_promise->Reset();
-  d->dyn_import_map_.erase(it);
-
-  if (info == nullptr) {
-    // Resolution error.
-    if (error_str != nullptr) {
-      auto msg = deno::v8_str(error_str);
-      auto exception = v8::Exception::TypeError(msg);
-      promise->Reject(context, exception).ToChecked();
-    } else {
-      auto e = d->last_exception_handle_.Get(isolate);
-      ClearException(context);
-      promise->Reject(context, e).ToChecked();
-    }
-  } else {
-    // Resolution success
-    Local<Module> module = info->handle.Get(isolate);
-    CHECK_EQ(module->GetStatus(), v8::Module::kEvaluated);
-    Local<Value> module_namespace = module->GetModuleNamespace();
-    promise->Resolve(context, module_namespace).ToChecked();
-  }
-  d->isolate_->RunMicrotasks();
-}
-
-}  // extern "C"
diff --git a/core/libdeno/modules_test.cc b/core/libdeno/modules_test.cc
deleted file mode 100644
index ee6a93112..000000000
--- a/core/libdeno/modules_test.cc
+++ /dev/null
@@ -1,426 +0,0 @@
-// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
-#include "test.h"
-
-static int exec_count = 0;
-void recv_cb(void* user_data, deno_op_id op_id, deno_buf buf,
-             deno_pinned_buf zero_copy_buf) {
-  // We use this to check that scripts have executed.
-  EXPECT_EQ(1u, buf.data_len);
-  EXPECT_EQ(42u, op_id);
-  EXPECT_EQ(buf.data_ptr[0], 4);
-  EXPECT_EQ(zero_copy_buf.data_ptr, nullptr);
-  EXPECT_EQ(zero_copy_buf.data_len, 0u);
-  EXPECT_EQ(zero_copy_buf.pin, nullptr);
-  exec_count++;
-}
-
-TEST(ModulesTest, Resolution) {
-  exec_count = 0;  // Reset
-  Deno* d = deno_new(deno_config{0, empty_snapshot, empty, recv_cb, nullptr});
-  EXPECT_EQ(0, exec_count);
-
-  static deno_mod a = deno_mod_new(d, true, "a.js",
-                                   "import { b } from 'b.js'\n"
-                                   "if (b() != 'b') throw Error();\n"
-                                   "Deno.core.send(42, new Uint8Array([4]));");
-  EXPECT_NE(a, 0);
-  EXPECT_EQ(nullptr, deno_last_exception(d));
-
-  const char* b_src = "export function b() { return 'b' }";
-  static deno_mod b = deno_mod_new(d, false, "b.js", b_src);
-  EXPECT_NE(b, 0);
-  EXPECT_EQ(nullptr, deno_last_exception(d));
-
-  EXPECT_EQ(0, exec_count);
-
-  EXPECT_EQ(1u, deno_mod_imports_len(d, a));
-  EXPECT_EQ(0u, deno_mod_imports_len(d, b));
-
-  EXPECT_STREQ("b.js", deno_mod_imports_get(d, a, 0));
-  EXPECT_EQ(nullptr, deno_mod_imports_get(d, a, 1));
-  EXPECT_EQ(nullptr, deno_mod_imports_get(d, b, 0));
-
-  static int resolve_count = 0;
-  auto resolve_cb = [](void* user_data, const char* specifier,
-                       deno_mod referrer) {
-    EXPECT_EQ(referrer, a);
-    EXPECT_STREQ(specifier, "b.js");
-    resolve_count++;
-    return b;
-  };
-
-  deno_mod_instantiate(d, d, b, resolve_cb);
-  EXPECT_EQ(nullptr, deno_last_exception(d));
-  EXPECT_EQ(0, resolve_count);
-  EXPECT_EQ(0, exec_count);
-
-  deno_mod_instantiate(d, d, a, resolve_cb);
-  EXPECT_EQ(nullptr, deno_last_exception(d));
-  EXPECT_EQ(1, resolve_count);
-  EXPECT_EQ(0, exec_count);
-
-  deno_mod_evaluate(d, d, a);
-  EXPECT_EQ(nullptr, deno_last_exception(d));
-  EXPECT_EQ(1, resolve_count);
-  EXPECT_EQ(1, exec_count);
-
-  deno_delete(d);
-}
-
-TEST(ModulesTest, ResolutionError) {
-  exec_count = 0;  // Reset
-  Deno* d = deno_new(deno_config{0, empty_snapshot, empty, recv_cb, nullptr});
-  EXPECT_EQ(0, exec_count);
-
-  static deno_mod a = deno_mod_new(d, true, "a.js",
-                                   "import 'bad'\n"
-                                   "Deno.core.send(42, new Uint8Array([4]));");
-  EXPECT_NE(a, 0);
-  EXPECT_EQ(nullptr, deno_last_exception(d));
-
-  EXPECT_EQ(0, exec_count);
-
-  EXPECT_EQ(1u, deno_mod_imports_len(d, a));
-  EXPECT_STREQ("bad", deno_mod_imports_get(d, a, 0));
-
-  static int resolve_count = 0;
-  auto resolve_cb = [](void* user_data, const char* specifier,
-                       deno_mod referrer) {
-    EXPECT_EQ(referrer, a);
-    EXPECT_STREQ(specifier, "bad");
-    resolve_count++;
-    return 0;
-  };
-
-  deno_mod_instantiate(d, d, a, resolve_cb);
-  EXPECT_NE(nullptr, deno_last_exception(d));
-  EXPECT_EQ(1, resolve_count);
-  EXPECT_EQ(0, exec_count);
-
-  deno_delete(d);
-}
-
-TEST(ModulesTest, ImportMetaUrl) {
-  exec_count = 0;  // Reset
-  Deno* d = deno_new(deno_config{0, empty_snapshot, empty, recv_cb, nullptr});
-  EXPECT_EQ(0, exec_count);
-
-  static deno_mod a =
-      deno_mod_new(d, true, "a.js",
-                   "if ('a.js' != import.meta.url) throw 'hmm'\n"
-                   "Deno.core.send(42, new Uint8Array([4]));");
-  EXPECT_NE(a, 0);
-  EXPECT_EQ(nullptr, deno_last_exception(d));
-
-  deno_mod_instantiate(d, d, a, nullptr);
-  EXPECT_EQ(nullptr, deno_last_exception(d));
-  EXPECT_EQ(0, exec_count);
-
-  deno_mod_evaluate(d, d, a);
-  EXPECT_EQ(nullptr, deno_last_exception(d));
-  EXPECT_EQ(1, exec_count);
-}
-
-TEST(ModulesTest, ImportMetaMain) {
-  Deno* d = deno_new(deno_config{0, empty_snapshot, empty, recv_cb, nullptr});
-
-  const char* throw_not_main_src = "if (!import.meta.main) throw 'err'";
-  static deno_mod throw_not_main =
-      deno_mod_new(d, true, "a.js", throw_not_main_src);
-  EXPECT_NE(throw_not_main, 0);
-  EXPECT_EQ(nullptr, deno_last_exception(d));
-
-  deno_mod_instantiate(d, d, throw_not_main, nullptr);
-  EXPECT_EQ(nullptr, deno_last_exception(d));
-
-  deno_mod_evaluate(d, d, throw_not_main);
-  EXPECT_EQ(nullptr, deno_last_exception(d));
-
-  const char* throw_main_src = "if (import.meta.main) throw 'err'";
-  static deno_mod throw_main = deno_mod_new(d, false, "b.js", throw_main_src);
-  EXPECT_NE(throw_main, 0);
-  EXPECT_EQ(nullptr, deno_last_exception(d));
-
-  deno_mod_instantiate(d, d, throw_main, nullptr);
-  EXPECT_EQ(nullptr, deno_last_exception(d));
-
-  deno_mod_evaluate(d, d, throw_main);
-  EXPECT_EQ(nullptr, deno_last_exception(d));
-
-  deno_delete(d);
-}
-
-TEST(ModulesTest, DynamicImportSuccess) {
-  exec_count = 0;
-  static int dyn_import_count = 0;
-  static deno_mod b = 0;
-  auto dyn_import_cb = [](auto user_data, const char* specifier,
-                          const char* referrer, deno_dyn_import_id import_id) {
-    auto d = reinterpret_cast<Deno*>(user_data);
-    dyn_import_count++;
-    EXPECT_STREQ(specifier, "foo");
-    EXPECT_STREQ(referrer, "a.js");
-    deno_dyn_import_done(d, d, import_id, b, nullptr);
-  };
-  const char* src =
-      "(async () => { \n"
-      "  let mod = await import('foo'); \n"
-      "  assert(mod.b() === 'b'); \n"
-      // Send a message to signify that we're done.
-      "  Deno.core.send(42, new Uint8Array([4])); \n"
-      "})(); \n";
-  Deno* d = deno_new(deno_config{0, snapshot, empty, recv_cb, dyn_import_cb});
-  static deno_mod a = deno_mod_new(d, true, "a.js", src);
-  EXPECT_NE(a, 0);
-  EXPECT_EQ(nullptr, deno_last_exception(d));
-  deno_mod_instantiate(d, d, a, nullptr);
-  EXPECT_EQ(nullptr, deno_last_exception(d));
-  const char* b_src = "export function b() { return 'b' }";
-  b = deno_mod_new(d, false, "b.js", b_src);
-  EXPECT_NE(b, 0);
-  EXPECT_EQ(nullptr, deno_last_exception(d));
-  deno_mod_instantiate(d, d, b, nullptr);
-  EXPECT_EQ(nullptr, deno_last_exception(d));
-  deno_mod_evaluate(d, d, b);
-  EXPECT_EQ(nullptr, deno_last_exception(d));
-  deno_mod_evaluate(d, d, a);
-  EXPECT_EQ(nullptr, deno_last_exception(d));
-  deno_check_promise_errors(d);
-  EXPECT_EQ(deno_last_exception(d), nullptr);
-  deno_delete(d);
-  EXPECT_EQ(1, exec_count);
-  EXPECT_EQ(1, dyn_import_count);
-}
-
-TEST(ModulesTest, DynamicImportError) {
-  exec_count = 0;
-  static int dyn_import_count = 0;
-  auto dyn_import_cb = [](auto user_data, const char* specifier,
-                          const char* referrer, deno_dyn_import_id import_id) {
-    auto d = reinterpret_cast<Deno*>(user_data);
-    dyn_import_count++;
-    EXPECT_STREQ(specifier, "foo");
-    EXPECT_STREQ(referrer, "a.js");
-    // We indicate there was an error resolving by returning mod_id 0.
-    deno_dyn_import_done(d, d, import_id, 0, "foo not found");
-  };
-  const char* src =
-      "(async () => { \n"
-      "  let mod = await import('foo'); \n"
-      // The following should be unreachable.
-      "  Deno.core.send(42, new Uint8Array([4])); \n"
-      "})(); \n";
-  Deno* d = deno_new(deno_config{0, snapshot, empty, recv_cb, dyn_import_cb});
-  static deno_mod a = deno_mod_new(d, true, "a.js", src);
-  EXPECT_NE(a, 0);
-  EXPECT_EQ(nullptr, deno_last_exception(d));
-  deno_mod_instantiate(d, d, a, nullptr);
-  EXPECT_EQ(nullptr, deno_last_exception(d));
-  // No error when evaluating, because it's an async error.
-  deno_mod_evaluate(d, d, a);
-  EXPECT_EQ(nullptr, deno_last_exception(d));
-  // Now we should get an error.
-  deno_check_promise_errors(d);
-  EXPECT_NE(deno_last_exception(d), nullptr);
-  std::string e(deno_last_exception(d));
-  EXPECT_NE(e.find("Uncaught TypeError: foo not found"), std::string::npos);
-  deno_delete(d);
-  EXPECT_EQ(0, exec_count);
-  EXPECT_EQ(1, dyn_import_count);
-}
-
-TEST(ModulesTest, DynamicImportAsync) {
-  exec_count = 0;
-  static int dyn_import_count = 0;
-  static deno_mod b = 0;
-  static std::vector<deno_dyn_import_id> import_ids = {};
-  auto dyn_import_cb = [](auto user_data, const char* specifier,
-                          const char* referrer, deno_dyn_import_id import_id) {
-    // auto d = reinterpret_cast<Deno*>(user_data);
-    dyn_import_count++;
-    EXPECT_STREQ(specifier, "foo");
-    EXPECT_STREQ(referrer, "a.js");
-    // We don't call deno_dyn_import_done until later.
-    import_ids.push_back(import_id);
-  };
-  const char* src =
-      "(async () => { \n"
-      "  let mod = await import('foo'); \n"
-      "  assert(mod.b() === 'b'); \n"
-      // AGAIN!
-      "  mod = await import('foo'); \n"
-      "  assert(mod.b() === 'b'); \n"
-      // Send a message to signify that we're done.
-      "  Deno.core.send(42, new Uint8Array([4])); \n"
-      "})(); \n";
-  Deno* d = deno_new(deno_config{0, snapshot, empty, recv_cb, dyn_import_cb});
-  static deno_mod a = deno_mod_new(d, true, "a.js", src);
-  EXPECT_NE(a, 0);
-  EXPECT_EQ(nullptr, deno_last_exception(d));
-  deno_mod_instantiate(d, d, a, nullptr);
-  EXPECT_EQ(nullptr, deno_last_exception(d));
-
-  // Evaluate. We check that there are no errors, and Deno.core.send has not
-  // been called.
-  deno_mod_evaluate(d, d, a);
-  EXPECT_EQ(nullptr, deno_last_exception(d));
-  deno_check_promise_errors(d);
-  EXPECT_EQ(deno_last_exception(d), nullptr);
-  EXPECT_EQ(0, exec_count);
-  EXPECT_EQ(1, dyn_import_count);
-
-  // Instantiate b.js
-  const char* b_src = "export function b() { return 'b' }";
-  b = deno_mod_new(d, false, "b.js", b_src);
-  EXPECT_NE(b, 0);
-  EXPECT_EQ(nullptr, deno_last_exception(d));
-  deno_mod_instantiate(d, d, b, nullptr);
-  EXPECT_EQ(nullptr, deno_last_exception(d));
-  deno_mod_evaluate(d, d, b);
-  EXPECT_EQ(nullptr, deno_last_exception(d));
-
-  // Now we resolve the import.
-  EXPECT_EQ(1u, import_ids.size());
-  auto import_id = import_ids.back();
-  import_ids.pop_back();
-
-  deno_dyn_import_done(d, d, import_id, b, nullptr);
-
-  EXPECT_EQ(nullptr, deno_last_exception(d));
-  deno_check_promise_errors(d);
-  EXPECT_EQ(deno_last_exception(d), nullptr);
-
-  EXPECT_EQ(1u, import_ids.size());
-  EXPECT_EQ(2, dyn_import_count);
-  EXPECT_EQ(0, exec_count);
-
-  import_id = import_ids.back();
-  import_ids.pop_back();
-  deno_dyn_import_done(d, d, import_id, b, nullptr);
-
-  EXPECT_EQ(nullptr, deno_last_exception(d));
-  deno_check_promise_errors(d);
-  EXPECT_EQ(deno_last_exception(d), nullptr);
-
-  // We still have to resolve the second one
-  EXPECT_EQ(2, dyn_import_count);
-  EXPECT_EQ(1, exec_count);
-
-  deno_delete(d);
-}
-
-TEST(ModulesTest, DynamicImportThrows) {
-  exec_count = 0;
-  static int dyn_import_count = 0;
-  static deno_mod b = 0;
-  static std::vector<deno_dyn_import_id> import_ids = {};
-  auto dyn_import_cb = [](auto user_data, const char* specifier,
-                          const char* referrer, deno_dyn_import_id import_id) {
-    dyn_import_count++;
-    EXPECT_STREQ(specifier, "b.js");
-    EXPECT_STREQ(referrer, "a.js");
-    // We don't call deno_dyn_import_done until later.
-    import_ids.push_back(import_id);
-  };
-  Deno* d = deno_new(deno_config{0, snapshot, empty, recv_cb, dyn_import_cb});
-
-  // Instantiate and evaluate the root module. This should succeed.
-  const char* a_src =
-      "(async () => { \n"
-      "  let mod = await import('b.js'); \n"
-      // unreachable
-      "  Deno.core.send(42, new Uint8Array([4])); \n"
-      "})(); \n";
-  static deno_mod a = deno_mod_new(d, true, "a.js", a_src);
-  EXPECT_NE(a, 0);
-  EXPECT_EQ(nullptr, deno_last_exception(d));
-  deno_mod_instantiate(d, d, a, nullptr);
-  EXPECT_EQ(nullptr, deno_last_exception(d));
-  deno_mod_evaluate(d, d, a);
-  EXPECT_EQ(nullptr, deno_last_exception(d));
-  deno_check_promise_errors(d);
-  EXPECT_EQ(deno_last_exception(d), nullptr);
-
-  // Instantiate b.js, which should succeed.
-  const char* b_src = "throw new Error('foo')";
-  b = deno_mod_new(d, false, "b.js", b_src);
-  EXPECT_NE(b, 0);
-  EXPECT_EQ(nullptr, deno_last_exception(d));
-  deno_mod_instantiate(d, d, b, nullptr);
-  EXPECT_EQ(nullptr, deno_last_exception(d));
-
-  // Evaluate b.js. It throws in the global scope, so deno_last_exception()
-  // should be non-null afterwards.
-  deno_mod_evaluate(d, d, b);
-  EXPECT_NE(deno_last_exception(d), nullptr);
-
-  // Resolve the dynamic import of b.js. Since deno_mod_evaluate() failed,
-  // we indicate failure to deno_dyn_import_done() by setting mod_id to 0.
-  // The last error should be picked up and cleared by deno_dyn_import_done().
-  EXPECT_EQ(1u, import_ids.size());
-  auto import_id = import_ids.back();
-  import_ids.pop_back();
-  deno_dyn_import_done(d, d, import_id, 0, nullptr);
-  EXPECT_EQ(deno_last_exception(d), nullptr);
-
-  // Since the dynamically imported module threw an error,
-  // it should show up as an unhandled promise rejection.
-  deno_check_promise_errors(d);
-  EXPECT_NE(deno_last_exception(d), nullptr);
-  std::string e(deno_last_exception(d));
-  EXPECT_NE(e.find("Uncaught Error: foo"), std::string::npos);
-
-  EXPECT_EQ(1, dyn_import_count);
-  EXPECT_EQ(0, exec_count);
-
-  deno_delete(d);
-}
-
-TEST(ModulesTest, DynamicImportSyntaxError) {
-  exec_count = 0;
-  static int dyn_import_count = 0;
-  auto dyn_import_cb = [](auto user_data, const char* specifier,
-                          const char* referrer, deno_dyn_import_id import_id) {
-    auto d = reinterpret_cast<Deno*>(user_data);
-    dyn_import_count++;
-    EXPECT_STREQ(specifier, "b.js");
-    EXPECT_STREQ(referrer, "a.js");
-
-    // Compile b.js, which should fail because of the syntax error.
-    deno_mod b = deno_mod_new(d, false, "b.js", "syntax error");
-    EXPECT_EQ(b, 0);
-    EXPECT_NE(nullptr, deno_last_exception(d));
-
-    // `deno_dyn_import_done` should consume the last exception, and use it
-    // to reject the dynamic import promise.
-    deno_dyn_import_done(d, d, import_id, 0, nullptr);
-    EXPECT_EQ(nullptr, deno_last_exception(d));
-  };
-  Deno* d = deno_new(deno_config{0, snapshot, empty, recv_cb, dyn_import_cb});
-
-  // Instantiate and evaluate the root module. This should succeed.
-  const char* src =
-      "(async () => { \n"
-      "  let mod = await import('b.js'); \n"
-      // unreachable
-      "  Deno.core.send(42, new Uint8Array([4])); \n"
-      "})(); \n";
-  static deno_mod a = deno_mod_new(d, true, "a.js", src);
-  EXPECT_NE(a, 0);
-  EXPECT_EQ(nullptr, deno_last_exception(d));
-  deno_mod_instantiate(d, d, a, nullptr);
-  EXPECT_EQ(nullptr, deno_last_exception(d));
-  deno_mod_evaluate(d, d, a);
-  EXPECT_EQ(nullptr, deno_last_exception(d));
-
-  // The failed dynamic import should cause an unhandled promise rejection.
-  deno_check_promise_errors(d);
-  EXPECT_NE(deno_last_exception(d), nullptr);
-  EXPECT_NE(std::string(deno_last_exception(d)).find("Syntax"),
-            std::string::npos);
-
-  EXPECT_EQ(1, dyn_import_count);
-  EXPECT_EQ(0, exec_count);
-
-  deno_delete(d);
-}
diff --git a/core/libdeno/test.cc b/core/libdeno/test.cc
deleted file mode 100644
index 994d43d21..000000000
--- a/core/libdeno/test.cc
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
-#include "test.h"
-#include <fstream>
-#include <string>
-#include "internal.h"
-
-deno_snapshot snapshot = {nullptr, 0};
-
-bool ReadFileToString(const char* fn, std::string* contents) {
-  std::ifstream file(fn, std::ios::binary);
-  if (file.fail()) {
-    return false;
-  }
-  contents->assign(std::istreambuf_iterator<char>{file}, {});
-  return !file.fail();
-}
-
-int main(int argc, char** argv) {
-  // All of the JS code in libdeno_test.js is tested after being snapshotted.
-  // We create that snapshot now at runtime, rather than at compile time to
-  // simplify the build process. So we load and execute the libdeno_test.js
-  // file, without running any of the tests and store the result in the global
-  // "snapshot" variable, which will be used later in the tests.
-  std::string js_fn = JS_PATH;
-  std::string js_source;
-  CHECK(ReadFileToString(js_fn.c_str(), &js_source));
-
-  deno_init();
-  deno_config config = {1, deno::empty_snapshot, deno::empty_buf, nullptr,
-                        nullptr};
-  Deno* d = deno_new(config);
-
-  deno_execute(d, nullptr, js_fn.c_str(), js_source.c_str());
-  if (deno_last_exception(d) != nullptr) {
-    std::cerr << "Snapshot Exception " << std::endl;
-    std::cerr << deno_last_exception(d) << std::endl;
-    deno_delete(d);
-    return 1;
-  }
-
-  snapshot = deno_snapshot_new(d);
-
-  testing::InitGoogleTest(&argc, argv);
-  deno_init();
-  deno_set_v8_flags(&argc, argv);
-  return RUN_ALL_TESTS();
-}
diff --git a/core/libdeno/test.h b/core/libdeno/test.h
deleted file mode 100644
index 4d7b73ab3..000000000
--- a/core/libdeno/test.h
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
-#ifndef TEST_H_
-#define TEST_H_
-
-#include "deno.h"
-#include "testing/gtest/include/gtest/gtest.h"
-
-extern deno_snapshot snapshot;  // Loaded in libdeno/test.cc
-const deno_buf empty = {nullptr, 0};
-const deno_snapshot empty_snapshot = {nullptr, 0};
-
-#endif  // TEST_H_
diff --git a/core/libdeno/testing b/core/libdeno/testing
deleted file mode 120000
index ed34f4824..000000000
--- a/core/libdeno/testing
+++ /dev/null
@@ -1 +0,0 @@
-v8/testing
\ No newline at end of file
diff --git a/core/libdeno/third_party b/core/libdeno/third_party
deleted file mode 120000
index 48370cbe7..000000000
--- a/core/libdeno/third_party
+++ /dev/null
@@ -1 +0,0 @@
-v8/third_party
\ No newline at end of file
diff --git a/core/libdeno/tools b/core/libdeno/tools
deleted file mode 120000
index 7b6c53ae9..000000000
--- a/core/libdeno/tools
+++ /dev/null
@@ -1 +0,0 @@
-v8/tools
\ No newline at end of file
diff --git a/core/libdeno/v8 b/core/libdeno/v8
deleted file mode 120000
index efdcb44da..000000000
--- a/core/libdeno/v8
+++ /dev/null
@@ -1 +0,0 @@
-../../third_party/v8
\ No newline at end of file