diff --git a/content/community/coding-guidelines.md b/content/community/coding-guidelines.md
index 4d7b4cb..0e04ee7 100644
--- a/content/community/coding-guidelines.md
+++ b/content/community/coding-guidelines.md
@@ -12,8 +12,8 @@
 ```
  $JIRI_ROOT
    .jiri_root        # Jiri utils and metadata
+     bin             # Contributor tool binaries
      scripts/jiri    # Jiri command-line tool
-   devtools          # Contributor tool binaries
    environment       # Platform-dependent configuration
    manifest          # Multi-repo configuration data
    release           # Source code
@@ -31,10 +31,9 @@
    website           # Source for this site
 ```
 
-Each repository has a `README.md` file summarizing its purpose. The `devtools`
-directory isn't a repository, but rather a top-level directory where contributor
-tools are placed during installation. The `manifest` repository contains the
-configuration that describes this repository arrangement.
+Each repository has a `README.md` file summarizing its purpose.  The `manifest`
+repository contains the configuration that describes this repository
+arrangement.
 
 Things move around, so its best to examine your local installation for the
 latest arrangement.
@@ -83,9 +82,8 @@
 
 # VDL
 
-The `devtools/bin/vdl` tool uses VDL files to generate files
-containing [RPC] stub code for various languages - Go, Java, JavaScript,
-etc.
+The `vdl` tool uses VDL files to generate files containing [RPC] stub code for
+various languages - Go, Java, JavaScript, etc.
 
 [VDL] is not Go, but is modeled after Go, so VDL code should follow
 Go's style guidelines.
diff --git a/content/community/contributing.md b/content/community/contributing.md
index 8c273bc..0523240 100644
--- a/content/community/contributing.md
+++ b/content/community/contributing.md
@@ -16,11 +16,11 @@
 fetch all Vanadium repositories.
 
 The instructions below assume you've set the `JIRI_ROOT` environment variable
-and have added `$JIRI_ROOT/devtools/bin` to your `PATH`:
+and have added `$JIRI_ROOT/.jiri_root/scripts` to your `PATH`:
 
     # Edit to taste.
     export JIRI_ROOT=${HOME}/v23_root
-    export PATH=$PATH:$JIRI_ROOT/devtools/bin
+    export PATH=$PATH:$JIRI_ROOT/.jiri_root/scripts
 
 Recommended: Add the lines above to your `~/.bashrc` or similar.
 
diff --git a/content/testing.md b/content/testing.md
index 2a5bd5d..6abd13a 100644
--- a/content/testing.md
+++ b/content/testing.md
@@ -18,7 +18,7 @@
 <!-- @checkInstall -->
 ```
 [ -z "${JIRI_ROOT:?'Must define JIRI_ROOT'}" ]
-[ -x "$JIRI_ROOT/devtools/bin/jiri" ] || echo 'No jiri!'
+[ -x "$JIRI_ROOT/.jiri_root/scripts/jiri" ] || echo 'No jiri!'
 [ -x "$JIRI_ROOT/release/go/bin/principal" ] || echo 'No bin!'
 ```
 
diff --git a/content/tools/jiri.md b/content/tools/jiri.md
index 95225c2..978beac 100644
--- a/content/tools/jiri.md
+++ b/content/tools/jiri.md
@@ -10,7 +10,7 @@
 `jiri` is available here: https://github.com/vanadium/go.jiri
 
 The "fetch repositories" step of [Vanadium installation](/installation/)
-installs the `jiri` tool in `$JIRI_ROOT/devtools/bin`.
+installs the `jiri` tool in `$JIRI_ROOT/.jiri_root/scripts`.
 
 Run `jiri help` to learn more about the tool. (Note, this command assumes your
-`PATH` contains `$JIRI_ROOT/devtools/bin`.)
+`PATH` contains `$JIRI_ROOT/.jiri_root/scripts`.)
diff --git a/content/tutorials/setup.md b/content/tutorials/setup.md
index 7cd729a..d692885 100644
--- a/content/tutorials/setup.md
+++ b/content/tutorials/setup.md
@@ -43,7 +43,7 @@
 # accumulation, $GOPATH is intentionally omitted from the right hand side (any
 # existing value is ignored).
 if [ -z "$V23_GOPATH" ]; then
-  export V23_GOPATH=`${JIRI_ROOT}/devtools/bin/jiri go env GOPATH`
+  export V23_GOPATH=`${JIRI_ROOT}/.jiri_root/scripts/jiri go env GOPATH`
 fi
 export GOPATH=$V_TUT:${V23_GOPATH}
 
diff --git a/content/tutorials/syncbase/user-guide.md b/content/tutorials/syncbase/user-guide.md
index 61935bd..129bcde 100644
--- a/content/tutorials/syncbase/user-guide.md
+++ b/content/tutorials/syncbase/user-guide.md
@@ -45,11 +45,11 @@
    Vanadium repositories, which include Syncbase as well as the Todos demo app.
 
    The instructions below assume you've set the `JIRI_ROOT` environment variable
-   and have added `$JIRI_ROOT/devtools/bin` to your `PATH`:
+   and have added `$JIRI_ROOT/.jiri_root/scripts` to your `PATH`:
 
         # Edit to taste.
         export JIRI_ROOT=${HOME}/vanadium
-        export PATH=$PATH:$JIRI_ROOT/devtools/bin
+        export PATH=$PATH:$JIRI_ROOT/.jiri_root/scripts
 
    Recommended: Add the lines above to your `~/.bashrc` or similar.