diff --git a/src/docs/book/contributor.book b/src/docs/book/contributor.book
index 776417aa6d..d5b2ae90ae 100644
--- a/src/docs/book/contributor.book
+++ b/src/docs/book/contributor.book
@@ -1,36 +1,36 @@
 {
   "name": "phabcontrib",
   "title": "Phabricator Contributor Documentation",
   "short": "Phabricator Contributor Docs",
   "preface": "Information for Phabricator contributors.",
   "root": "../../../",
   "uri.source":
     "https://secure.phabricator.com/diffusion/P/browse/master/%f$%l",
   "rules": {
     "(\\.diviner$)": "DivinerArticleAtomizer"
   },
   "exclude": [
     "(^externals/)",
-    "(^webroot/rsrc/externals/)",
-    "(^scripts/)",
-    "(^support/)",
     "(^resources/)",
-    "(^src/docs/user/)",
+    "(^scripts/)",
+    "(^src/docs/flavor/)",
     "(^src/docs/tech/)",
-    "(^src/docs/flavor/)"
+    "(^src/docs/user/)",
+    "(^support/)",
+    "(^webroot/rsrc/externals/)"
   ],
   "groups": {
     "contrib": {
       "name": "Contributor Overview"
     },
     "detail": {
       "name": "Contributing in Detail"
     },
-    "standards": {
-      "name": "Coding Standards"
-    },
     "developer": {
       "name": "Developer Guides"
+    },
+    "standards": {
+      "name": "Coding Standards"
     }
   }
 }
diff --git a/src/docs/book/flavor.book b/src/docs/book/flavor.book
index b13ed9956c..978244f19d 100644
--- a/src/docs/book/flavor.book
+++ b/src/docs/book/flavor.book
@@ -1,42 +1,42 @@
 {
   "name": "phabflavor",
   "title": "Phabricator Flavor Text",
   "short": "Flavor Text",
   "preface": "Recommendations, lore, and dark rituals.",
   "root": "../../../",
   "uri.source":
     "https://secure.phabricator.com/diffusion/P/browse/master/%f$%l",
   "rules": {
     "(\\.diviner$)": "DivinerArticleAtomizer"
   },
   "exclude": [
     "(^externals/)",
-    "(^webroot/rsrc/externals/)",
-    "(^scripts/)",
-    "(^support/)",
     "(^resources/)",
-    "(^src/docs/user/)",
+    "(^scripts/)",
+    "(^src/docs/contributor/)",
     "(^src/docs/tech/)",
-    "(^src/docs/contributor/)"
+    "(^src/docs/user/)",
+    "(^support/)",
+    "(^webroot/rsrc/externals/)"
   ],
   "groups": {
     "overview": {
       "name": "Overview"
     },
-    "review": {
-      "name": "Revision Control and Code Review"
-    },
-    "sundry": {
-      "name": "Sundries"
+    "javascript": {
+      "name": "Javascript"
     },
     "lore": {
       "name": "Phabricator Lore"
     },
     "php": {
       "name": "PHP"
     },
-    "javascript": {
-      "name": "Javascript"
+    "review": {
+      "name": "Revision Control and Code Review"
+    },
+    "sundry": {
+      "name": "Sundries"
     }
   }
 }
diff --git a/src/docs/book/phabricator.book b/src/docs/book/phabricator.book
index 0fc945f04e..ed74ddd012 100644
--- a/src/docs/book/phabricator.book
+++ b/src/docs/book/phabricator.book
@@ -1,269 +1,347 @@
 {
   "name": "phabdev",
   "title": "Phabricator Technical Documentation",
   "short": "Phabricator Tech Docs",
   "preface": "Technical documentation intended for Phabricator developers.",
   "root": "../../../",
   "uri.source":
     "https://secure.phabricator.com/diffusion/P/browse/master/%f$%l",
   "rules": {
-    "(\\.php$)": "DivinerPHPAtomizer",
-    "(\\.diviner$)": "DivinerArticleAtomizer"
+    "(\\.diviner$)": "DivinerArticleAtomizer",
+    "(\\.php$)": "DivinerPHPAtomizer"
   },
   "exclude": [
     "(^externals/)",
-    "(^webroot/rsrc/externals/)",
-    "(^scripts/)",
-    "(^support/)",
     "(^resources/)",
-    "(^src/docs/user/)",
+    "(^scripts/)",
+    "(^src/docs/contributor/)",
     "(^src/docs/flavor/)",
-    "(^src/docs/contributor/)"
+    "(^src/docs/user/)",
+    "(^support/)",
+    "(^webroot/rsrc/externals/)"
   ],
   "groups": {
+    "aphront": {
+      "name": "Aphront",
+      "include": "(^src/aphront/)"
+    },
+    "almanac": {
+      "name": "Almanac",
+      "include": "(^src/applications/almanac/)"
+    },
+    "aphlict": {
+      "name": "Aphlict",
+      "include": "(^src/applications/aphlict/)"
+    },
     "arcanist": {
       "name": "Arcanist Integration",
       "include": "(^src/applications/arcanist/)"
     },
     "audit": {
       "name": "Audit",
       "include": "(^src/applications/audit/)"
     },
     "auth": {
       "name": "Auth",
       "include": "(^src/applications/auth/)"
     },
     "baseapp": {
       "name": "Application Basics",
       "include": "(^src/applications/base/)"
     },
     "cache": {
       "name": "Cache",
       "include": "(^src/applications/cache/)"
     },
     "calendar": {
       "name": "Calendar",
       "include": "(^src/applications/calendar/)"
     },
+    "celerity": {
+      "name": "Celerity",
+      "include": "(^src/applications/celerity/)"
+    },
     "chatlog": {
       "name": "Chatlog",
       "include": "(^src/applications/chatlog/)"
     },
     "conduit": {
       "name": "Conduit",
       "include": "(^src/applications/conduit/)"
     },
     "config": {
       "name": "Config",
       "include": "(^src/applications/config/)"
     },
     "conpherence": {
       "name": "Conpherence",
       "include": "(^src/applications/conpherence/)"
     },
+    "console": {
+      "name": "Console",
+      "include": "(^src/applications/console/)"
+    },
     "countdown": {
       "name": "Countdown",
       "include": "(^src/applications/countdown/)"
     },
+    "customfield": {
+      "name": "Custom Fields",
+      "include": "(^src/infrastructure/customfield/)"
+    },
     "daemon": {
       "name": "Daemons",
-      "include": "(^src/applications/daemon/)"
+      "include": [
+        "(^src/applications/daemon/)",
+        "(^src/infrastructure/daemon/)"
+      ]
+    },
+    "dashboard": {
+      "name": "Dashboard",
+      "include": "(^src/applications/dashboard/)"
     },
     "differential": {
       "name": "Differential",
       "include": "(^src/applications/differential/)"
     },
     "diffusion": {
       "name": "Diffusion",
       "include": "(^src/applications/diffusion/)"
     },
-    "directory": {
-      "name": "Directory",
-      "include": "(^src/applications/directory/)"
-    },
     "diviner": {
       "name": "Diviner",
       "include": "(^src/applications/diviner/)"
     },
     "doorkeeper": {
       "name": "Doorkeeper",
       "include": "(^src/applications/doorkeeper/)"
     },
     "draft": {
       "name": "Draft",
       "include": "(^src/applications/draft/)"
     },
     "drydock": {
       "name": "Drydock",
       "include": "(^src/applications/drydock/)"
     },
+    "edges": {
+      "name": "Edges",
+      "include": "(^src/infrastructure/edges/)"
+    },
+    "events": {
+      "name": "Events",
+      "include": "(^src/infrastructure/events/)"
+    },
     "fact": {
       "name": "Fact",
       "include": "(^src/applications/fact/)"
     },
     "feed": {
       "name": "Feed",
       "include": "(^src/applications/feed/)"
     },
     "files": {
       "name": "Files",
       "include": "(^src/applications/files/)"
     },
     "flag": {
       "name": "Flags",
       "include": "(^src/applications/flag/)"
     },
+    "fund": {
+      "name": "Fund",
+      "include": "(^src/applications/fund/)"
+    },
     "harbormaster": {
       "name": "Harbormaster",
       "include": "(^src/applications/harbormaster/)"
     },
     "help": {
       "name": "Help",
       "include": "(^src/applications/help/)"
     },
     "herald": {
       "name": "Herald",
       "include": "(^src/applications/herald/)"
     },
+    "home": {
+      "name": "Home",
+      "include": "(^src/applications/home/)"
+    },
     "legalpad": {
       "name": "Legalpad",
       "include": "(^src/applications/legalpad/)"
     },
     "lipsum": {
       "name": "Lipsum",
       "include": "(^src/applications/lipsum/)"
     },
     "macro": {
       "name": "Macro",
       "include": "(^src/applications/macro/)"
     },
     "maniphest": {
       "name": "Maniphest",
       "include": "(^src/applications/maniphest/)"
     },
     "meta": {
-      "name": "Meta",
+      "name": "Applications",
       "include": "(^src/applications/meta/)"
     },
     "metamta": {
       "name": "MetaMTA",
       "include": "(^src/applications/metamta/)"
     },
+    "multimeter": {
+      "name": "Multimeter",
+      "include": "(^src/applications/multimeter/)"
+    },
     "notification": {
       "name": "Notifications",
       "include": "(^src/applications/notification/)"
     },
+    "nuance": {
+      "name": "Nuance",
+      "include": "(^src/applications/nuance/)"
+    },
     "oauthserver": {
       "name": "OAuth Server",
       "include": "(^src/applications/oauthserver/)"
     },
     "owners": {
       "name": "Owners",
       "include": "(^src/applications/owners/)"
     },
+    "passphrase": {
+      "name": "Passphrase",
+      "include": "(^src/applications/passphrase/)"
+    },
     "paste": {
       "name": "Paste",
       "include": "(^src/applications/paste/)"
     },
     "people": {
       "name": "People",
       "include": "(^src/applications/people/)"
     },
     "phame": {
       "name": "Phame",
       "include": "(^src/applications/phame/)"
     },
     "phid": {
       "name": "PHIDs",
       "include": "(^src/applications/phid/)"
     },
     "phlux": {
       "name": "Phlux",
       "include": "(^src/applications/phlux/)"
     },
     "pholio": {
       "name": "Pholio",
       "include": "(^src/applications/pholio/)"
     },
     "phortune": {
       "name": "Phortune",
       "include": "(^src/applications/phortune/)"
     },
     "phpast": {
       "name": "PHPAST",
       "include": "(^src/applications/phpast/)"
     },
+    "phragment": {
+      "name": "Phragment",
+      "include": "(^src/applications/phragment/)"
+    },
     "phrequent": {
       "name": "Phrequent",
       "include": "(^src/applications/phrequent/)"
     },
     "phriction": {
       "name": "Phriction",
       "include": "(^src/applications/phriction/)"
     },
+    "phui": {
+      "name": "PHUI",
+      "include": "(^src/view/phui/)"
+    },
     "policy": {
       "name": "Policy",
       "include": "(^src/applications/policy/)"
     },
     "ponder": {
       "name": "Ponder",
       "include": "(^src/applications/ponder/)"
     },
     "project": {
       "name": "Projects",
       "include": "(^src/applications/project/)"
     },
     "releeph": {
       "name": "Releeph",
       "include": "(^src/applications/releeph/)"
     },
     "remarkup": {
       "name": "Remarkup",
-      "include": "(^src/applications/remarkup/)"
+      "include": [
+        "(^src/applications/remarkup/)",
+        "(^src/infrastructure/markup/)"
+      ]
     },
     "repository": {
       "name": "Repositories",
       "include": "(^src/applications/repository/)"
     },
     "search": {
       "name": "Search",
       "include": "(^src/applications/search/)"
     },
     "settings": {
       "name": "Settings",
       "include": "(^src/applications/settings/)"
     },
     "slowvote": {
       "name": "Slowvote",
       "include": "(^src/applications/slowvote/)"
     },
+    "spaces": {
+      "name": "Spaces",
+      "include": "(^src/applications/spaces/)"
+    },
+    "storage": {
+      "name": "Storage",
+      "include": "(^src/infrastructure/storage/)"
+    },
     "subscriptions": {
       "name": "Subscriptions",
       "include": "(^src/applications/subscriptions/)"
     },
+    "support": {
+      "name": "Support",
+      "include": "(^src/applications/support/)"
+    },
     "system": {
       "name": "System",
       "include": "(^src/applications/system/)"
     },
     "tokens": {
       "name": "Tokens",
       "include": "(^src/applications/tokens/)"
     },
     "transactions": {
       "name": "Transactions",
       "include": "(^src/applications/transactions/)"
     },
     "typeahead": {
       "name": "Typeahead",
       "include": "(^src/applications/typeahead/)"
     },
     "uiexample": {
       "name": "UI Examples",
       "include": "(^src/applications/uiexample/)"
     },
     "xhprof": {
       "name": "XHProf",
       "include": "(^src/applications/xhprof/)"
     }
   }
 }
diff --git a/src/docs/book/user.book b/src/docs/book/user.book
index 18b6c6db6c..e6f44abe36 100644
--- a/src/docs/book/user.book
+++ b/src/docs/book/user.book
@@ -1,51 +1,33 @@
 {
   "name": "phabricator",
   "title": "Phabricator User Documentation",
   "short": "Phabricator User Docs",
   "preface": "Instructions for installing, configuring, and using Phabricator.",
   "root": "../../../",
   "uri.source":
     "https://secure.phabricator.com/diffusion/P/browse/master/%f$%l",
   "rules": {
     "(\\.diviner$)": "DivinerArticleAtomizer"
   },
   "exclude": [
     "(^externals/)",
-    "(^webroot/rsrc/externals/)",
-    "(^scripts/)",
-    "(^support/)",
     "(^resources/)",
-    "(^src/docs/tech/)",
+    "(^scripts/)",
+    "(^src/docs/contributor/)",
     "(^src/docs/flavor/)",
-    "(^src/docs/contributor/)"
+    "(^src/docs/tech/)",
+    "(^support/)",
+    "(^webroot/rsrc/externals/)"
   ],
   "groups": {
     "intro": {
       "name": "Introduction"
     },
     "config": {
       "name": "Configuration"
     },
     "userguide": {
       "name": "Application User Guides"
-    },
-    "differential": {
-      "name": "Differential (Code Review)"
-    },
-    "diffusion": {
-      "name": "Diffusion (Repository Browser)"
-    },
-    "maniphest": {
-      "name": "Maniphest (Task Tracking)"
-    },
-    "slowvote": {
-      "name": "Slowvote (Polls)"
-    },
-    "herald": {
-      "name": "Herald (Notifications)"
-    },
-    "phriction": {
-      "name": "Phriction (Wiki)"
     }
   }
 }