5 files changed, 14 insertions, 13 deletions
diff --git a/tools/benchmark.py b/tools/benchmark.py
index cf2bc4ff7..772e35d40 100755
--- a/tools/benchmark.py
+++ b/tools/benchmark.py
@@ -60,17 +60,17 @@ def get_binary_sizes(build_dir):
         "deno":
         os.path.join(build_dir, "deno" + executable_suffix),
         "main.js":
-        os.path.join(build_dir, "gen/bundle/main.js"),
+        os.path.join(build_dir, "gen/cli/bundle/main.js"),
         "main.js.map":
-        os.path.join(build_dir, "gen/bundle/main.js.map"),
+        os.path.join(build_dir, "gen/cli/bundle/main.js.map"),
         "compiler.js":
-        os.path.join(build_dir, "gen/bundle/compiler.js"),
+        os.path.join(build_dir, "gen/cli/bundle/compiler.js"),
         "compiler.js.map":
-        os.path.join(build_dir, "gen/bundle/compiler.js.map"),
+        os.path.join(build_dir, "gen/cli/bundle/compiler.js.map"),
         "snapshot_deno.bin":
-        os.path.join(build_dir, "gen/snapshot_deno.bin"),
+        os.path.join(build_dir, "gen/cli/snapshot_deno.bin"),
         "snapshot_compiler.bin":
-        os.path.join(build_dir, "gen/snapshot_compiler.bin")
+        os.path.join(build_dir, "gen/cli/snapshot_compiler.bin")
     }
     sizes = {}
     for name, path in path_dict.items():
diff --git a/tools/format.py b/tools/format.py
index bc6a3b532..b0d3bc5e4 100755
--- a/tools/format.py
+++ b/tools/format.py
@@ -21,10 +21,10 @@ def qrun(cmd, env=None):
 
 print "clang_format"
 qrun([clang_format_path, "-i", "-style", "Google"] +
-     find_exts(["libdeno"], [".cc", ".h"]))
+     find_exts(["core"], [".cc", ".h"]))
 
 print "gn format"
-for fn in ["BUILD.gn", ".gn"] + find_exts(["build_extra", "libdeno"],
+for fn in ["BUILD.gn", ".gn"] + find_exts(["build_extra", "core"],
                                           [".gn", ".gni"]):
     qrun(["third_party/depot_tools/gn", "format", fn], env=google_env())
 
@@ -43,6 +43,7 @@ qrun(["node", prettier, "--write", "--loglevel=error"] + ["rollup.config.js"] +
 
 print "rustfmt"
 qrun([
-    "third_party/rustfmt/" + platform() +
-    "/rustfmt", "--config-path", rustfmt_config, "build.rs"
+    "third_party/rustfmt/" + platform() + "/rustfmt",
+    "--config-path",
+    rustfmt_config,
 ] + find_exts(["cli", "core"], [".rs"]))
diff --git a/tools/lint.py b/tools/lint.py
index 4ce7900d1..6f6ba8dfe 100755
--- a/tools/lint.py
+++ b/tools/lint.py
@@ -16,7 +16,7 @@ eslint = os.path.join(third_party_path, "node_modules", "eslint", "bin",
 os.chdir(root_path)
 run([
     "python", cpplint, "--filter=-build/include_subdir",
-    "--repository=libdeno", "--extensions=cc,h", "--recursive", "libdeno"
+    "--repository=core/libdeno", "--extensions=cc,h", "--recursive", "core"
 ])
 
 run([
diff --git a/tools/ts_library_builder/build_library.ts b/tools/ts_library_builder/build_library.ts
index c2d0ef109..b0d438531 100644
--- a/tools/ts_library_builder/build_library.ts
+++ b/tools/ts_library_builder/build_library.ts
@@ -80,7 +80,7 @@ const libPreamble = `// Copyright 2018-2019 the Deno authors. All rights reserve
 `;
 
 // The path to the msg_generated file relative to the build path
-const MSG_GENERATED_PATH = "/gen/msg_generated.ts";
+const MSG_GENERATED_PATH = "/gen/cli/msg_generated.ts";
 
 // An array of enums we want to expose pub
 const MSG_GENERATED_ENUMS = ["ErrorKind"];
diff --git a/tools/ts_library_builder/main.ts b/tools/ts_library_builder/main.ts
index ed692d03a..54a659d01 100644
--- a/tools/ts_library_builder/main.ts
+++ b/tools/ts_library_builder/main.ts
@@ -5,7 +5,7 @@ import { main as buildRuntimeLib } from "./build_library";
 // this is very simplistic argument parsing, just enough to integrate into
 // the build scripts, versus being very robust
 let basePath = process.cwd();
-let buildPath = path.join(basePath, "out", "debug");
+let buildPath = path.join(basePath, "target", "debug");
 let outFile = path.join(buildPath, "gen", "lib", "lib.d.ts");
 let inline: string[] = [];
 let debug = false;