Rename crates: 'deno' to 'deno_core' and 'deno_cli' to 'deno' (#3600)

45 files changed, 114 insertions, 105 deletions

diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index 23f751fe4..2f96f0b4b 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -1,7 +1,7 @@
 # Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
 
 [package]
-name = "deno_cli"
+name = "deno"
 version = "0.28.1"
 license = "MIT"
 authors = ["the Deno authors"]
@@ -11,7 +11,7 @@ repository = "https://github.com/denoland/deno"
 default-run = "deno"
 
 [lib]
-name = "deno_cli"
+name = "deno"
 path = "lib.rs"
 
 [[bin]]
@@ -22,7 +22,7 @@ path = "main.rs"
 deno_typescript = { path = "../deno_typescript", version = "0.28.1" }
 
 [dependencies]
-deno = { path = "../core", version = "0.28.1" }
+deno_core = { path = "../core", version = "0.28.1" }
 deno_typescript = { path = "../deno_typescript", version = "0.28.1" }
 
 ansi_term = "0.12.1"
diff --git a/cli/compilers/json.rs b/cli/compilers/json.rs
index 699355ff5..765b79cd6 100644
--- a/cli/compilers/json.rs
+++ b/cli/compilers/json.rs
@@ -3,7 +3,7 @@ use crate::compilers::CompiledModule;
 use crate::compilers::CompiledModuleFuture;
 use crate::file_fetcher::SourceFile;
 use crate::futures::future::FutureExt;
-use deno::ErrBox;
+use deno_core::ErrBox;
 use regex::Regex;
 use std::pin::Pin;
 use std::str;
diff --git a/cli/compilers/mod.rs b/cli/compilers/mod.rs
index a422b22b7..c4e2b2e6b 100644
--- a/cli/compilers/mod.rs
+++ b/cli/compilers/mod.rs
@@ -1,5 +1,5 @@
 // Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
-use deno::ErrBox;
+use deno_core::ErrBox;
 use futures::Future;
 
 mod js;
diff --git a/cli/compilers/ts.rs b/cli/compilers/ts.rs
index d3a08da3c..5a9117d59 100644
--- a/cli/compilers/ts.rs
+++ b/cli/compilers/ts.rs
@@ -12,9 +12,9 @@ use crate::startup_data;
 use crate::state::*;
 use crate::version;
 use crate::worker::Worker;
-use deno::Buf;
-use deno::ErrBox;
-use deno::ModuleSpecifier;
+use deno_core::Buf;
+use deno_core::ErrBox;
+use deno_core::ModuleSpecifier;
 use futures::future::FutureExt;
 use futures::Future;
 use regex::Regex;
@@ -604,7 +604,7 @@ mod tests {
   use super::*;
   use crate::fs as deno_fs;
   use crate::tokio_util;
-  use deno::ModuleSpecifier;
+  use deno_core::ModuleSpecifier;
   use std::path::PathBuf;
   use tempfile::TempDir;
 
@@ -652,7 +652,7 @@ mod tests {
       .parent()
       .unwrap()
       .join("tests/002_hello.ts");
-    use deno::ModuleSpecifier;
+    use deno_core::ModuleSpecifier;
     let module_name = ModuleSpecifier::resolve_url_or_path(p.to_str().unwrap())
       .unwrap()
       .to_string();
diff --git a/cli/deno_error.rs b/cli/deno_error.rs
index 5db82abb2..80ee218ee 100644
--- a/cli/deno_error.rs
+++ b/cli/deno_error.rs
@@ -3,9 +3,9 @@ use crate::diagnostics::Diagnostic;
 use crate::fmt_errors::JSError;
 use crate::import_map::ImportMapError;
 pub use crate::msg::ErrorKind;
-use deno::AnyError;
-use deno::ErrBox;
-use deno::ModuleResolutionError;
+use deno_core::AnyError;
+use deno_core::ErrBox;
+use deno_core::ModuleResolutionError;
 use dlopen::Error as DlopenError;
 use http::uri;
 use hyper;
@@ -355,9 +355,9 @@ mod tests {
   use crate::diagnostics::Diagnostic;
   use crate::diagnostics::DiagnosticCategory;
   use crate::diagnostics::DiagnosticItem;
-  use deno::ErrBox;
-  use deno::StackFrame;
-  use deno::V8Exception;
+  use deno_core::ErrBox;
+  use deno_core::StackFrame;
+  use deno_core::V8Exception;
 
   fn js_error() -> JSError {
     JSError::new(V8Exception {
diff --git a/cli/file_fetcher.rs b/cli/file_fetcher.rs
index bb1c2f651..8fe27b2c3 100644
--- a/cli/file_fetcher.rs
+++ b/cli/file_fetcher.rs
@@ -8,8 +8,8 @@ use crate::http_util;
 use crate::http_util::FetchOnceResult;
 use crate::msg;
 use crate::progress::Progress;
-use deno::ErrBox;
-use deno::ModuleSpecifier;
+use deno_core::ErrBox;
+use deno_core::ModuleSpecifier;
 use futures::future::Either;
 use futures::future::FutureExt;
 use serde_json;
diff --git a/cli/fmt_errors.rs b/cli/fmt_errors.rs
index 6a59019ca..83e417fe2 100644
--- a/cli/fmt_errors.rs
+++ b/cli/fmt_errors.rs
@@ -3,9 +3,9 @@
 use crate::colors;
 use crate::source_maps::apply_source_map;
 use crate::source_maps::SourceMapGetter;
-use deno::ErrBox;
-use deno::StackFrame;
-use deno::V8Exception;
+use deno_core::ErrBox;
+use deno_core::StackFrame;
+use deno_core::V8Exception;
 use std::error::Error;
 use std::fmt;
 
diff --git a/cli/fs.rs b/cli/fs.rs
index bad0c6b79..cdbc88d80 100644
--- a/cli/fs.rs
+++ b/cli/fs.rs
@@ -5,7 +5,7 @@ use std::io::ErrorKind;
 use std::io::Write;
 use std::path::{Path, PathBuf};
 
-use deno::ErrBox;
+use deno_core::ErrBox;
 use rand;
 use rand::Rng;
 use url::Url;
diff --git a/cli/global_state.rs b/cli/global_state.rs
index 0f7416e98..d42a50a76 100644
--- a/cli/global_state.rs
+++ b/cli/global_state.rs
@@ -13,8 +13,8 @@ use crate::metrics::Metrics;
 use crate::msg;
 use crate::permissions::DenoPermissions;
 use crate::progress::Progress;
-use deno::ErrBox;
-use deno::ModuleSpecifier;
+use deno_core::ErrBox;
+use deno_core::ModuleSpecifier;
 use std;
 use std::env;
 use std::future::Future;
diff --git a/cli/http_util.rs b/cli/http_util.rs
index bbd0a1f1e..8176e88ae 100644
--- a/cli/http_util.rs
+++ b/cli/http_util.rs
@@ -3,7 +3,7 @@ use crate::deno_error;
 use crate::deno_error::DenoError;
 use crate::version;
 use bytes::Bytes;
-use deno::ErrBox;
+use deno_core::ErrBox;
 use futures::future::FutureExt;
 use reqwest;
 use reqwest::header::HeaderMap;
diff --git a/cli/import_map.rs b/cli/import_map.rs
index 26f1dd86a..1a9207288 100644
--- a/cli/import_map.rs
+++ b/cli/import_map.rs
@@ -1,5 +1,5 @@
-use deno::ErrBox;
-use deno::ModuleSpecifier;
+use deno_core::ErrBox;
+use deno_core::ModuleSpecifier;
 use indexmap::IndexMap;
 use serde_json::Map;
 use serde_json::Value;
diff --git a/cli/js.rs b/cli/js.rs
index b76e49391..09fe3f8fa 100644
--- a/cli/js.rs
+++ b/cli/js.rs
@@ -28,9 +28,11 @@ pub fn get_asset(name: &str) -> Option<&'static str> {
 
 #[test]
 fn cli_snapshot() {
-  let mut isolate =
-    deno::Isolate::new(deno::StartupData::Snapshot(CLI_SNAPSHOT), false);
-  deno::js_check(isolate.execute(
+  let mut isolate = deno_core::Isolate::new(
+    deno_core::StartupData::Snapshot(CLI_SNAPSHOT),
+    false,
+  );
+  deno_core::js_check(isolate.execute(
     "<anon>",
     r#"
       if (!window) {
@@ -43,9 +45,11 @@ fn cli_snapshot() {
 
 #[test]
 fn compiler_snapshot() {
-  let mut isolate =
-    deno::Isolate::new(deno::StartupData::Snapshot(COMPILER_SNAPSHOT), false);
-  deno::js_check(isolate.execute(
+  let mut isolate = deno_core::Isolate::new(
+    deno_core::StartupData::Snapshot(COMPILER_SNAPSHOT),
+    false,
+  );
+  deno_core::js_check(isolate.execute(
     "<anon>",
     r#"
       if (!compilerMain) {
diff --git a/cli/lib.rs b/cli/lib.rs
index 768d2fba1..a1c608c44 100644
--- a/cli/lib.rs
+++ b/cli/lib.rs
@@ -7,7 +7,7 @@ extern crate futures;
 #[macro_use]
 extern crate serde_json;
 extern crate clap;
-extern crate deno;
+extern crate deno_core;
 extern crate indexmap;
 #[cfg(unix)]
 extern crate nix;
@@ -58,9 +58,9 @@ use crate::ops::io::get_stdio;
 use crate::progress::Progress;
 use crate::state::ThreadSafeState;
 use crate::worker::Worker;
-use deno::v8_set_flags;
-use deno::ErrBox;
-use deno::ModuleSpecifier;
+use deno_core::v8_set_flags;
+use deno_core::ErrBox;
+use deno_core::ModuleSpecifier;
 use flags::DenoFlags;
 use flags::DenoSubcommand;
 use log::Level;
diff --git a/cli/main.rs b/cli/main.rs
index b24c61a9b..40f953e7a 100644
--- a/cli/main.rs
+++ b/cli/main.rs
@@ -1,5 +1,5 @@
-extern crate deno_cli;
+extern crate deno;
 
 fn main() {
-  deno_cli::main();
+  deno::main();
 }
diff --git a/cli/ops/compiler.rs b/cli/ops/compiler.rs
index 90df45b80..bc85e5ca8 100644
--- a/cli/ops/compiler.rs
+++ b/cli/ops/compiler.rs
@@ -4,8 +4,8 @@ use crate::futures::future::try_join_all;
 use crate::msg;
 use crate::ops::json_op;
 use crate::state::ThreadSafeState;
-use deno::Loader;
-use deno::*;
+use deno_core::Loader;
+use deno_core::*;
 
 pub fn init(i: &mut Isolate, s: &ThreadSafeState) {
   i.register_op("cache", s.core_op(json_op(s.stateful_op(op_cache))));
diff --git a/cli/ops/dispatch_json.rs b/cli/ops/dispatch_json.rs
index 1636aa44c..7f53a3d80 100644
--- a/cli/ops/dispatch_json.rs
+++ b/cli/ops/dispatch_json.rs
@@ -1,5 +1,5 @@
 // Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
-use deno::*;
+use deno_core::*;
 use futures::future::FutureExt;
 use futures::task::SpawnExt;
 pub use serde_derive::Deserialize;
diff --git a/cli/ops/dispatch_minimal.rs b/cli/ops/dispatch_minimal.rs
index 54bf52679..2d5618d65 100644
--- a/cli/ops/dispatch_minimal.rs
+++ b/cli/ops/dispatch_minimal.rs
@@ -7,11 +7,11 @@
 use crate::deno_error::GetErrorKind;
 use crate::msg::ErrorKind;
 use byteorder::{LittleEndian, WriteBytesExt};
-use deno::Buf;
-use deno::CoreOp;
-use deno::ErrBox;
-use deno::Op;
-use deno::PinnedBuf;
+use deno_core::Buf;
+use deno_core::CoreOp;
+use deno_core::ErrBox;
+use deno_core::Op;
+use deno_core::PinnedBuf;
 use futures::future::FutureExt;
 use std::future::Future;
 use std::pin::Pin;
diff --git a/cli/ops/errors.rs b/cli/ops/errors.rs
index 2c40aa66c..19a92c8e7 100644
--- a/cli/ops/errors.rs
+++ b/cli/ops/errors.rs
@@ -5,7 +5,7 @@ use crate::ops::json_op;
 use crate::source_maps::get_orig_position;
 use crate::source_maps::CachedMaps;
 use crate::state::ThreadSafeState;
-use deno::*;
+use deno_core::*;
 use std::collections::HashMap;
 
 pub fn init(i: &mut Isolate, s: &ThreadSafeState) {
diff --git a/cli/ops/fetch.rs b/cli/ops/fetch.rs
index c1bc11973..6779f14e2 100644
--- a/cli/ops/fetch.rs
+++ b/cli/ops/fetch.rs
@@ -4,7 +4,7 @@ use super::io::StreamResource;
 use crate::http_util::{get_client, HttpBody};
 use crate::ops::json_op;
 use crate::state::ThreadSafeState;
-use deno::*;
+use deno_core::*;
 use futures::future::FutureExt;
 use http::header::HeaderName;
 use http::header::HeaderValue;
diff --git a/cli/ops/files.rs b/cli/ops/files.rs
index d4ba04ac1..5a8694019 100644
--- a/cli/ops/files.rs
+++ b/cli/ops/files.rs
@@ -7,7 +7,7 @@ use crate::deno_error::ErrorKind;
 use crate::fs as deno_fs;
 use crate::ops::json_op;
 use crate::state::ThreadSafeState;
-use deno::*;
+use deno_core::*;
 use futures::future::FutureExt;
 use std;
 use std::convert::From;
diff --git a/cli/ops/fs.rs b/cli/ops/fs.rs
index dc9ed1b10..f592c1142 100644
--- a/cli/ops/fs.rs
+++ b/cli/ops/fs.rs
@@ -6,7 +6,7 @@ use crate::deno_error::ErrorKind;
 use crate::fs as deno_fs;
 use crate::ops::json_op;
 use crate::state::ThreadSafeState;
-use deno::*;
+use deno_core::*;
 use remove_dir_all::remove_dir_all;
 use std::convert::From;
 use std::fs;
diff --git a/cli/ops/io.rs b/cli/ops/io.rs
index 8f69fd444..2a1455aca 100644
--- a/cli/ops/io.rs
+++ b/cli/ops/io.rs
@@ -4,9 +4,9 @@ use crate::deno_error::bad_resource;
 use crate::http_util::HttpBody;
 use crate::ops::minimal_op;
 use crate::state::ThreadSafeState;
-use deno::ErrBox;
-use deno::Resource;
-use deno::*;
+use deno_core::ErrBox;
+use deno_core::Resource;
+use deno_core::*;
 use futures::future::FutureExt;
 use futures::ready;
 use std::future::Future;
diff --git a/cli/ops/net.rs b/cli/ops/net.rs
index bf1e56dc9..06905f0d2 100644
--- a/cli/ops/net.rs
+++ b/cli/ops/net.rs
@@ -5,8 +5,8 @@ use crate::deno_error::bad_resource;
 use crate::ops::json_op;
 use crate::resolve_addr::resolve_addr;
 use crate::state::ThreadSafeState;
-use deno::Resource;
-use deno::*;
+use deno_core::Resource;
+use deno_core::*;
 use futures::future::FutureExt;
 use std;
 use std::convert::From;
diff --git a/cli/ops/os.rs b/cli/ops/os.rs
index b5062f109..e01071230 100644
--- a/cli/ops/os.rs
+++ b/cli/ops/os.rs
@@ -6,7 +6,7 @@ use crate::ops::json_op;
 use crate::state::ThreadSafeState;
 use crate::version;
 use atty;
-use deno::*;
+use deno_core::*;
 use std::collections::HashMap;
 use std::env;
 use std::io::{Error, ErrorKind};
diff --git a/cli/ops/permissions.rs b/cli/ops/permissions.rs
index 6ecd7cb10..2e282b181 100644
--- a/cli/ops/permissions.rs
+++ b/cli/ops/permissions.rs
@@ -3,7 +3,7 @@ use super::dispatch_json::{Deserialize, JsonOp, Value};
 use crate::deno_error::type_error;
 use crate::ops::json_op;
 use crate::state::ThreadSafeState;
-use deno::*;
+use deno_core::*;
 
 pub fn init(i: &mut Isolate, s: &ThreadSafeState) {
   i.register_op(
diff --git a/cli/ops/plugins.rs b/cli/ops/plugins.rs
index eb52b0717..747ea859d 100644
--- a/cli/ops/plugins.rs
+++ b/cli/ops/plugins.rs
@@ -2,13 +2,17 @@ use super::dispatch_json::{Deserialize, JsonOp, Value};
 use crate::fs as deno_fs;
 use crate::ops::json_op;
 use crate::state::ThreadSafeState;
-use deno::*;
+use deno_core::*;
 use dlopen::symbor::Library;
 use std::collections::HashMap;
 use std::ffi::OsStr;
 use std::sync::Arc;
 
-pub fn init(i: &mut Isolate, s: &ThreadSafeState, r: Arc<deno::OpRegistry>) {
+pub fn init(
+  i: &mut Isolate,
+  s: &ThreadSafeState,
+  r: Arc<deno_core::OpRegistry>,
+) {
   let r_ = r;
   i.register_op(
     "open_plugin",
@@ -52,7 +56,7 @@ struct OpenPluginArgs {
 }
 
 pub fn op_open_plugin(
-  registry: &Arc<deno::OpRegistry>,
+  registry: &Arc<deno_core::OpRegistry>,
   state: &ThreadSafeState,
   args: Value,
   _zero_copy: Option<PinnedBuf>,
diff --git a/cli/ops/process.rs b/cli/ops/process.rs
index 80ce4b1ac..8f724fd75 100644
--- a/cli/ops/process.rs
+++ b/cli/ops/process.rs
@@ -5,7 +5,7 @@ use crate::deno_error::bad_resource;
 use crate::ops::json_op;
 use crate::signal::kill;
 use crate::state::ThreadSafeState;
-use deno::*;
+use deno_core::*;
 use futures;
 use futures::future::FutureExt;
 use futures::future::TryFutureExt;
diff --git a/cli/ops/random.rs b/cli/ops/random.rs
index 95dbccf80..334616211 100644
--- a/cli/ops/random.rs
+++ b/cli/ops/random.rs
@@ -2,7 +2,7 @@
 use super::dispatch_json::{JsonOp, Value};
 use crate::ops::json_op;
 use crate::state::ThreadSafeState;
-use deno::*;
+use deno_core::*;
 use rand::thread_rng;
 use rand::Rng;
 
diff --git a/cli/ops/repl.rs b/cli/ops/repl.rs
index fd06a5481..54c8f8574 100644
--- a/cli/ops/repl.rs
+++ b/cli/ops/repl.rs
@@ -5,8 +5,8 @@ use crate::ops::json_op;
 use crate::repl;
 use crate::repl::Repl;
 use crate::state::ThreadSafeState;
-use deno::Resource;
-use deno::*;
+use deno_core::Resource;
+use deno_core::*;
 use std::sync::Arc;
 use std::sync::Mutex;
 
diff --git a/cli/ops/resources.rs b/cli/ops/resources.rs
index cd7b98aea..861df32b9 100644
--- a/cli/ops/resources.rs
+++ b/cli/ops/resources.rs
@@ -2,7 +2,7 @@
 use super::dispatch_json::{JsonOp, Value};
 use crate::ops::json_op;
 use crate::state::ThreadSafeState;
-use deno::*;
+use deno_core::*;
 
 pub fn init(i: &mut Isolate, s: &ThreadSafeState) {
   i.register_op("resources", s.core_op(json_op(s.stateful_op(op_resources))));
diff --git a/cli/ops/timers.rs b/cli/ops/timers.rs
index 982ea9cac..8bec10f70 100644
--- a/cli/ops/timers.rs
+++ b/cli/ops/timers.rs
@@ -2,7 +2,7 @@
 use super::dispatch_json::{Deserialize, JsonOp, Value};
 use crate::ops::json_op;
 use crate::state::ThreadSafeState;
-use deno::*;
+use deno_core::*;
 use futures::future::FutureExt;
 use std;
 use std::time::Duration;
diff --git a/cli/ops/tls.rs b/cli/ops/tls.rs
index a2975dcb0..4bbab3f4e 100644
--- a/cli/ops/tls.rs
+++ b/cli/ops/tls.rs
@@ -7,8 +7,8 @@ use crate::deno_error::ErrorKind;
 use crate::ops::json_op;
 use crate::resolve_addr::resolve_addr;
 use crate::state::ThreadSafeState;
-use deno::Resource;
-use deno::*;
+use deno_core::Resource;
+use deno_core::*;
 use futures::future::FutureExt;
 use std;
 use std::convert::From;
diff --git a/cli/ops/workers.rs b/cli/ops/workers.rs
index 00043ce77..6ebaa141f 100644
--- a/cli/ops/workers.rs
+++ b/cli/ops/workers.rs
@@ -8,7 +8,7 @@ use crate::ops::json_op;
 use crate::startup_data;
 use crate::state::ThreadSafeState;
 use crate::worker::Worker;
-use deno::*;
+use deno_core::*;
 use futures;
 use futures::future::FutureExt;
 use futures::future::TryFutureExt;
diff --git a/cli/permissions.rs b/cli/permissions.rs
index 3c6990e8c..735a90f74 100644
--- a/cli/permissions.rs
+++ b/cli/permissions.rs
@@ -4,7 +4,7 @@ use crate::flags::DenoFlags;
 use ansi_term::Style;
 #[cfg(not(test))]
 use atty;
-use deno::ErrBox;
+use deno_core::ErrBox;
 use log;
 use std::collections::HashSet;
 use std::fmt;
diff --git a/cli/repl.rs b/cli/repl.rs
index 7b6994fd8..ab8a29aed 100644
--- a/cli/repl.rs
+++ b/cli/repl.rs
@@ -1,6 +1,6 @@
 // Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
 use crate::deno_dir::DenoDir;
-use deno::ErrBox;
+use deno_core::ErrBox;
 use rustyline;
 use std::fs;
 use std::path::PathBuf;
diff --git a/cli/resolve_addr.rs b/cli/resolve_addr.rs
index b7ad9fada..5bda9a3e0 100644
--- a/cli/resolve_addr.rs
+++ b/cli/resolve_addr.rs
@@ -1,5 +1,5 @@
 // Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
-use deno::ErrBox;
+use deno_core::ErrBox;
 use std::future::Future;
 use std::net::SocketAddr;
 use std::net::ToSocketAddrs;
diff --git a/cli/shell.rs b/cli/shell.rs
index aaf29b4e0..197110bde 100644
--- a/cli/shell.rs
+++ b/cli/shell.rs
@@ -10,7 +10,7 @@ use std::fmt;
 use std::io::prelude::*;
 
 use atty;
-use deno::ErrBox;
+use deno_core::ErrBox;
 use termcolor::Color::{Cyan, Green, Red, Yellow};
 use termcolor::{self, Color, ColorSpec, StandardStream, WriteColor};
 
diff --git a/cli/signal.rs b/cli/signal.rs
index 22aa90be3..57f2d0d3d 100644
--- a/cli/signal.rs
+++ b/cli/signal.rs
@@ -1,4 +1,4 @@
-use deno::ErrBox;
+use deno_core::ErrBox;
 
 #[cfg(unix)]
 pub fn kill(pid: i32, signo: i32) -> Result<(), ErrBox> {
diff --git a/cli/source_maps.rs b/cli/source_maps.rs
index 72a351795..d3cda390d 100644
--- a/cli/source_maps.rs
+++ b/cli/source_maps.rs
@@ -1,7 +1,7 @@
 // Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
-//! This mod provides functions to remap a deno::V8Exception based on a source map
-use deno::StackFrame;
-use deno::V8Exception;
+//! This mod provides functions to remap a deno_core::V8Exception based on a source map
+use deno_core::StackFrame;
+use deno_core::V8Exception;
 use serde_json;
 use source_map_mappings::parse_mappings;
 use source_map_mappings::Bias;
diff --git a/cli/startup_data.rs b/cli/startup_data.rs
index 8de8e0200..a90a2377d 100644
--- a/cli/startup_data.rs
+++ b/cli/startup_data.rs
@@ -1,10 +1,10 @@
 // Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
 #[cfg(feature = "no-snapshot-init")]
-use deno::Script;
+use deno_core::Script;
 
 use crate::js::CLI_SNAPSHOT;
 use crate::js::COMPILER_SNAPSHOT;
-use deno::StartupData;
+use deno_core::StartupData;
 
 #[cfg(feature = "no-snapshot-init")]
 pub fn deno_isolate_init() -> StartupData<'static> {
diff --git a/cli/state.rs b/cli/state.rs
index 6cfa51a55..a4974958b 100644
--- a/cli/state.rs
+++ b/cli/state.rs
@@ -9,14 +9,14 @@ use crate::ops::MinimalOp;
 use crate::permissions::DenoPermissions;
 use crate::worker::Worker;
 use crate::worker::WorkerChannels;
-use deno::Buf;
-use deno::CoreOp;
-use deno::ErrBox;
-use deno::Loader;
-use deno::ModuleSpecifier;
-use deno::Op;
-use deno::PinnedBuf;
-use deno::ResourceTable;
+use deno_core::Buf;
+use deno_core::CoreOp;
+use deno_core::ErrBox;
+use deno_core::Loader;
+use deno_core::ModuleSpecifier;
+use deno_core::Op;
+use deno_core::PinnedBuf;
+use deno_core::ResourceTable;
 use futures::channel::mpsc;
 use futures::future::FutureExt;
 use futures::future::TryFutureExt;
@@ -43,7 +43,7 @@ pub struct ThreadSafeState(Arc<State>);
 #[cfg_attr(feature = "cargo-clippy", allow(stutter))]
 pub struct State {
   pub global_state: ThreadSafeGlobalState,
-  pub modules: Arc<Mutex<deno::Modules>>,
+  pub modules: Arc<Mutex<deno_core::Modules>>,
   pub permissions: Arc<Mutex<DenoPermissions>>,
   pub main_module: Option<ModuleSpecifier>,
   pub worker_channels: Mutex<WorkerChannels>,
@@ -179,13 +179,13 @@ impl Loader for ThreadSafeState {
     &self,
     module_specifier: &ModuleSpecifier,
     maybe_referrer: Option<ModuleSpecifier>,
-  ) -> Pin<Box<deno::SourceCodeInfoFuture>> {
+  ) -> Pin<Box<deno_core::SourceCodeInfoFuture>> {
     self.metrics.resolve_count.fetch_add(1, Ordering::SeqCst);
     let module_url_specified = module_specifier.to_string();
     let fut = self
       .global_state
       .fetch_compiled_module(module_specifier, maybe_referrer)
-      .map_ok(|compiled_module| deno::SourceCodeInfo {
+      .map_ok(|compiled_module| deno_core::SourceCodeInfo {
         // Real module name, might be different from initial specifier
         // due to redirections.
         code: compiled_module.code,
@@ -231,7 +231,7 @@ impl ThreadSafeState {
       None => None,
     };
 
-    let modules = Arc::new(Mutex::new(deno::Modules::new()));
+    let modules = Arc::new(Mutex::new(deno_core::Modules::new()));
     let permissions = if let Some(perm) = shared_permissions {
       perm
     } else {
diff --git a/cli/tests/integration_tests.rs b/cli/tests/integration_tests.rs
index fcf339c92..ee524e990 100644
--- a/cli/tests/integration_tests.rs
+++ b/cli/tests/integration_tests.rs
@@ -680,8 +680,8 @@ itest!(top_level_for_await_ts {
 });
 
 mod util {
-  use deno_cli::colors::strip_ansi_codes;
-  pub use deno_cli::test_util::*;
+  use deno::colors::strip_ansi_codes;
+  pub use deno::test_util::*;
   use os_pipe::pipe;
   use std::io::Read;
   use std::io::Write;
diff --git a/cli/tests/std_tests.rs b/cli/tests/std_tests.rs
index d1ed599bc..7b7928f70 100644
--- a/cli/tests/std_tests.rs
+++ b/cli/tests/std_tests.rs
@@ -6,7 +6,7 @@
 mod tests {
   extern crate lazy_static;
   extern crate tempfile;
-  use deno_cli::test_util::*;
+  use deno::test_util::*;
   use std::process::Command;
   use tempfile::TempDir;
 
diff --git a/cli/version.rs b/cli/version.rs
index 148337e71..b1ac42d39 100644
--- a/cli/version.rs
+++ b/cli/version.rs
@@ -3,5 +3,5 @@ pub const DENO: &str = env!("CARGO_PKG_VERSION");
 pub const TYPESCRIPT: &str = crate::js::TS_VERSION;
 
 pub fn v8() -> &'static str {
-  deno::v8_version()
+  deno_core::v8_version()
 }
diff --git a/cli/worker.rs b/cli/worker.rs
index 31f90c1da..c2e480c1f 100644
--- a/cli/worker.rs
+++ b/cli/worker.rs
@@ -2,12 +2,12 @@
 use crate::fmt_errors::JSError;
 use crate::ops;
 use crate::state::ThreadSafeState;
-use deno;
-use deno::Buf;
-use deno::ErrBox;
-use deno::ModuleSpecifier;
-use deno::RecursiveLoad;
-use deno::StartupData;
+use deno_core;
+use deno_core::Buf;
+use deno_core::ErrBox;
+use deno_core::ModuleSpecifier;
+use deno_core::RecursiveLoad;
+use deno_core::StartupData;
 use futures::channel::mpsc;
 use futures::future::FutureExt;
 use futures::future::TryFutureExt;
@@ -30,12 +30,12 @@ pub struct WorkerChannels {
   pub receiver: mpsc::Receiver<Buf>,
 }
 
-/// Wraps deno::Isolate to provide source maps, ops for the CLI, and
+/// Wraps deno_core::Isolate to provide source maps, ops for the CLI, and
 /// high-level module loading.
 #[derive(Clone)]
 pub struct Worker {
   pub name: String,
-  isolate: Arc<Mutex<deno::Isolate>>,
+  isolate: Arc<Mutex<deno_core::Isolate>>,
   pub state: ThreadSafeState,
   external_channels: Arc<Mutex<WorkerChannels>>,
 }
@@ -47,7 +47,8 @@ impl Worker {
     state: ThreadSafeState,
     external_channels: WorkerChannels,
   ) -> Self {
-    let isolate = Arc::new(Mutex::new(deno::Isolate::new(startup_data, false)));
+    let isolate =
+      Arc::new(Mutex::new(deno_core::Isolate::new(startup_data, false)));
     {
       let mut i = isolate.lock().unwrap();
       let op_registry = i.op_registry.clone();