diff --git a/90_references.Rmd b/90_references.Rmd
index 3215aee3..810e6ad9 100644
--- a/90_references.Rmd
+++ b/90_references.Rmd
@@ -1,6 +1,6 @@
 `r if (knitr:::is_html_output()) '# References'`
 
-### Resources
+### Resources {#resources}
 
 We practice what we preach! This site is created with Git and R markdown, using the [`bookdown`](https://github.com/rstudio/bookdown/) package. Go ahead and [peek behind the scenes](https://github.com/jennybc/happy-git-with-r).
 
diff --git a/_bookdown.yml b/_bookdown.yml
index 1bb34f62..d4d6d0d3 100644
--- a/_bookdown.yml
+++ b/_bookdown.yml
@@ -34,10 +34,11 @@ rmd_files: [
   "usage-rmd-and-github.Rmd",
   "usage-r-script-and-github.Rmd",
 
-  "33_git-commands.Rmd",
-  ## TODO: commit, diff
-  "35_git-branches.Rmd",
-  "36_git-remotes.Rmd",
+  "git-intro.Rmd",
+   ## TODO: commit, diff
+  "git-commands.Rmd",
+  "git-branches.Rmd",
+  "git-remotes.Rmd",
 
   "40_workflow-pull.Rmd",
   "49_workflow-explore-extend-pull-request.Rmd",
diff --git a/35_git-branches.Rmd b/git-branches.Rmd
similarity index 99%
rename from 35_git-branches.Rmd
rename to git-branches.Rmd
index 71e46b9e..690d0042 100644
--- a/35_git-branches.Rmd
+++ b/git-branches.Rmd
@@ -1,4 +1,4 @@
-# Branches {#branches}
+# Branches {#git-branches}
 
 Branching means that you take a detour from the main stream of development and
 do work without changing the main stream. It allows one or many people to work
diff --git a/33_git-commands.Rmd b/git-commands.Rmd
similarity index 81%
rename from 33_git-commands.Rmd
rename to git-commands.Rmd
index c1aef540..ba761233 100644
--- a/33_git-commands.Rmd
+++ b/git-commands.Rmd
@@ -1,8 +1,6 @@
-# (PART) Git basics and workflows {-} 
+# Git commands {#git-commands}
 
-# Git commands {#usage-git-cmds}
-
-Here's a start on the various Git commands that have been largely going on under the hood. We've tried to pick workflows that have RStudio doing this for us. But all of this can be done from the command line.
+A collection of some of the Git commands that have been largely going on under the hood. We've emphasized early workflows that are possible in RStudio. But all of this and much more can be done from the command line. This list is here mostly so we can consult it during live workshops if needed.
 
 *Unless you use the [GitHub API](https://developer.github.com/v3/), most of the GitHub bits really have to be done from the browser.*
 
diff --git a/git-intro.Rmd b/git-intro.Rmd
new file mode 100644
index 00000000..30376481
--- /dev/null
+++ b/git-intro.Rmd
@@ -0,0 +1,13 @@
+# (PART) Basic Git concepts {-} 
+
+# Some Git basics {#git-intro .unnumbered}
+
+We've told you shockingly little about Git so far! To a large extent, this is by design. There are lots of [general Git resources](#resources) out there that do a great job explaining the core concepts and terminology. Happy Git is designed to fill what we see as some gaps:
+
+  * A "batteries included" guide for early success with basic workflows.
+  * Advice on how to use Git/GitHub in data science, which differs from pure software development in several aspects.
+  * Special considerations relevant to people who use R and RStudio.
+  
+In live workshops, we also intoduce the most important basic ideas in the context of guided activities.
+
+This part collects anything we've written about core Git concepts, is a work in progress, and should be used to complement [external Git resources](#resources).
diff --git a/36_git-remotes.Rmd b/git-remotes.Rmd
similarity index 99%
rename from 36_git-remotes.Rmd
rename to git-remotes.Rmd
index 887b3a80..9bff8d81 100644
--- a/36_git-remotes.Rmd
+++ b/git-remotes.Rmd
@@ -1,4 +1,4 @@
-# Remotes {#remotes}
+# Remotes {#git-remotes}
 
 Remote repositories are versions of your project that are hosted on the
 Internet or another network. A single project can have 1, 2 or even hundreds of