42 files changed, 5 insertions, 12 deletions

diff --git a/cli/fmt_errors.rs b/cli/fmt_errors.rs
index b3c855db9..3e871e6f3 100644
--- a/cli/fmt_errors.rs
+++ b/cli/fmt_errors.rs
@@ -40,7 +40,7 @@ fn italic_bold(s: &str, internal: bool) -> String {
   }
 }
 
-// Keep in sync with `cli/rt/40_error_stack.js`.
+// Keep in sync with `runtime/js/40_error_stack.js`.
 pub fn format_location(frame: &JsStackFrame) -> String {
   let internal = frame
     .file_name
@@ -75,7 +75,7 @@ pub fn format_location(frame: &JsStackFrame) -> String {
   result
 }
 
-// Keep in sync with `cli/rt/40_error_stack.js`.
+// Keep in sync with `runtime/js/40_error_stack.js`.
 fn format_frame(frame: &JsStackFrame) -> String {
   let internal = frame
     .file_name
diff --git a/cli/tsc/README.md b/cli/tsc/README.md
index e68013885..e8287f3c0 100644
--- a/cli/tsc/README.md
+++ b/cli/tsc/README.md
@@ -1,11 +1,4 @@
 # tsc
 
-This directory contains the code for the typescript compiler snapshot
-
-There is currently A LOT of overlap between this code and the runtime snapshot
-code in cli/rt.
-
-This is intentionally ugly because there should be no overlap.
-
-This directory ultimately should contain just typescript.js and a smallish
-CompilerHost.
+This directory contains the typescript compiler and a small compiler host for
+the runtime snapshot.
diff --git a/runtime/build.rs b/runtime/build.rs
index 78f17f61f..ca4a77c31 100644
--- a/runtime/build.rs
+++ b/runtime/build.rs
@@ -62,7 +62,7 @@ fn main() {
   // Main snapshot
   let runtime_snapshot_path = o.join("CLI_SNAPSHOT.bin");
 
-  let js_files = get_js_files("rt");
+  let js_files = get_js_files("js");
   create_runtime_snapshot(&runtime_snapshot_path, js_files);
 }
 
diff --git a/runtime/rt/00_bootstrap_namespace.js b/runtime/js/00_bootstrap_namespace.js
index 514cbe3f0..514cbe3f0 100644
--- a/runtime/rt/00_bootstrap_namespace.js
+++ b/runtime/js/00_bootstrap_namespace.js
diff --git a/runtime/rt/01_build.js b/runtime/js/01_build.js
index 7c1dc817e..7c1dc817e 100644
--- a/runtime/rt/01_build.js
+++ b/runtime/js/01_build.js
diff --git a/runtime/rt/01_colors.js b/runtime/js/01_colors.js
index 39e4a7a18..39e4a7a18 100644
--- a/runtime/rt/01_colors.js
+++ b/runtime/js/01_colors.js
diff --git a/runtime/rt/01_errors.js b/runtime/js/01_errors.js
index d5933069b..d5933069b 100644
--- a/runtime/rt/01_errors.js
+++ b/runtime/js/01_errors.js
diff --git a/runtime/rt/01_internals.js b/runtime/js/01_internals.js
index eee9eeaf7..eee9eeaf7 100644
--- a/runtime/rt/01_internals.js
+++ b/runtime/js/01_internals.js
diff --git a/runtime/rt/01_version.js b/runtime/js/01_version.js
index 325e1156f..325e1156f 100644
--- a/runtime/rt/01_version.js
+++ b/runtime/js/01_version.js
diff --git a/runtime/rt/01_web_util.js b/runtime/js/01_web_util.js
index a9573a71d..a9573a71d 100644
--- a/runtime/rt/01_web_util.js
+++ b/runtime/js/01_web_util.js
diff --git a/runtime/rt/02_console.js b/runtime/js/02_console.js
index 971837bd6..971837bd6 100644
--- a/runtime/rt/02_console.js
+++ b/runtime/js/02_console.js
diff --git a/runtime/rt/06_util.js b/runtime/js/06_util.js
index f4804c519..f4804c519 100644
--- a/runtime/rt/06_util.js
+++ b/runtime/js/06_util.js
diff --git a/runtime/rt/10_dispatch_minimal.js b/runtime/js/10_dispatch_minimal.js
index dceb23e5f..dceb23e5f 100644
--- a/runtime/rt/10_dispatch_minimal.js
+++ b/runtime/js/10_dispatch_minimal.js
diff --git a/runtime/rt/11_timers.js b/runtime/js/11_timers.js
index 5a59844a3..5a59844a3 100644
--- a/runtime/rt/11_timers.js
+++ b/runtime/js/11_timers.js
diff --git a/runtime/rt/11_workers.js b/runtime/js/11_workers.js
index 62210dfae..62210dfae 100644
--- a/runtime/rt/11_workers.js
+++ b/runtime/js/11_workers.js
diff --git a/runtime/rt/12_io.js b/runtime/js/12_io.js
index 006d51cdd..006d51cdd 100644
--- a/runtime/rt/12_io.js
+++ b/runtime/js/12_io.js
diff --git a/runtime/rt/13_buffer.js b/runtime/js/13_buffer.js
index e06e2138b..e06e2138b 100644
--- a/runtime/rt/13_buffer.js
+++ b/runtime/js/13_buffer.js
diff --git a/runtime/rt/27_websocket.js b/runtime/js/27_websocket.js
index 60428c24d..60428c24d 100644
--- a/runtime/rt/27_websocket.js
+++ b/runtime/js/27_websocket.js
diff --git a/runtime/rt/30_files.js b/runtime/js/30_files.js
index 679b184fd..679b184fd 100644
--- a/runtime/rt/30_files.js
+++ b/runtime/js/30_files.js
diff --git a/runtime/rt/30_fs.js b/runtime/js/30_fs.js
index 33fab01e4..33fab01e4 100644
--- a/runtime/rt/30_fs.js
+++ b/runtime/js/30_fs.js
diff --git a/runtime/rt/30_metrics.js b/runtime/js/30_metrics.js
index d44a629cb..d44a629cb 100644
--- a/runtime/rt/30_metrics.js
+++ b/runtime/js/30_metrics.js
diff --git a/runtime/rt/30_net.js b/runtime/js/30_net.js
index 7009f6f8d..7009f6f8d 100644
--- a/runtime/rt/30_net.js
+++ b/runtime/js/30_net.js
diff --git a/runtime/rt/30_os.js b/runtime/js/30_os.js
index ebc4e8916..ebc4e8916 100644
--- a/runtime/rt/30_os.js
+++ b/runtime/js/30_os.js
diff --git a/runtime/rt/40_compiler_api.js b/runtime/js/40_compiler_api.js
index ea963b67b..ea963b67b 100644
--- a/runtime/rt/40_compiler_api.js
+++ b/runtime/js/40_compiler_api.js
diff --git a/runtime/rt/40_diagnostics.js b/runtime/js/40_diagnostics.js
index 2b7457853..2b7457853 100644
--- a/runtime/rt/40_diagnostics.js
+++ b/runtime/js/40_diagnostics.js
diff --git a/runtime/rt/40_error_stack.js b/runtime/js/40_error_stack.js
index da2ee51f3..da2ee51f3 100644
--- a/runtime/rt/40_error_stack.js
+++ b/runtime/js/40_error_stack.js
diff --git a/runtime/rt/40_fs_events.js b/runtime/js/40_fs_events.js
index a179e8c1b..a179e8c1b 100644
--- a/runtime/rt/40_fs_events.js
+++ b/runtime/js/40_fs_events.js
diff --git a/runtime/rt/40_net_unstable.js b/runtime/js/40_net_unstable.js
index fcc899a30..fcc899a30 100644
--- a/runtime/rt/40_net_unstable.js
+++ b/runtime/js/40_net_unstable.js
diff --git a/runtime/rt/40_performance.js b/runtime/js/40_performance.js
index 0a63dc704..0a63dc704 100644
--- a/runtime/rt/40_performance.js
+++ b/runtime/js/40_performance.js
diff --git a/runtime/rt/40_permissions.js b/runtime/js/40_permissions.js
index 50d471b6a..50d471b6a 100644
--- a/runtime/rt/40_permissions.js
+++ b/runtime/js/40_permissions.js
diff --git a/runtime/rt/40_plugins.js b/runtime/js/40_plugins.js
index f5aefd400..f5aefd400 100644
--- a/runtime/rt/40_plugins.js
+++ b/runtime/js/40_plugins.js
diff --git a/runtime/rt/40_process.js b/runtime/js/40_process.js
index b46a1aead..b46a1aead 100644
--- a/runtime/rt/40_process.js
+++ b/runtime/js/40_process.js
diff --git a/runtime/rt/40_read_file.js b/runtime/js/40_read_file.js
index 9a36f335b..9a36f335b 100644
--- a/runtime/rt/40_read_file.js
+++ b/runtime/js/40_read_file.js
diff --git a/runtime/rt/40_signals.js b/runtime/js/40_signals.js
index 091afd66a..091afd66a 100644
--- a/runtime/rt/40_signals.js
+++ b/runtime/js/40_signals.js
diff --git a/runtime/rt/40_testing.js b/runtime/js/40_testing.js
index 082d17fe0..082d17fe0 100644
--- a/runtime/rt/40_testing.js
+++ b/runtime/js/40_testing.js
diff --git a/runtime/rt/40_tls.js b/runtime/js/40_tls.js
index d66e0bd01..d66e0bd01 100644
--- a/runtime/rt/40_tls.js
+++ b/runtime/js/40_tls.js
diff --git a/runtime/rt/40_tty.js b/runtime/js/40_tty.js
index 598d33237..598d33237 100644
--- a/runtime/rt/40_tty.js
+++ b/runtime/js/40_tty.js
diff --git a/runtime/rt/40_write_file.js b/runtime/js/40_write_file.js
index 7a9cb1f40..7a9cb1f40 100644
--- a/runtime/rt/40_write_file.js
+++ b/runtime/js/40_write_file.js
diff --git a/runtime/rt/41_prompt.js b/runtime/js/41_prompt.js
index ec294668b..ec294668b 100644
--- a/runtime/rt/41_prompt.js
+++ b/runtime/js/41_prompt.js
diff --git a/runtime/rt/90_deno_ns.js b/runtime/js/90_deno_ns.js
index 9188788ec..9188788ec 100644
--- a/runtime/rt/90_deno_ns.js
+++ b/runtime/js/90_deno_ns.js
diff --git a/runtime/rt/99_main.js b/runtime/js/99_main.js
index f38d51936..f38d51936 100644
--- a/runtime/rt/99_main.js
+++ b/runtime/js/99_main.js
diff --git a/runtime/rt/README.md b/runtime/js/README.md
index b17fa22e5..b17fa22e5 100644
--- a/runtime/rt/README.md
+++ b/runtime/js/README.md