diff --git a/docs/html/_redirects.yaml b/docs/html/_redirects.yaml
index bacb4ba1e16cd..5188b900aa84e 100644
--- a/docs/html/_redirects.yaml
+++ b/docs/html/_redirects.yaml
@@ -1,3 +1,5 @@
+# For information about this file's format, see
+# https://developers.google.com/internal/publishing/redirects
 redirects:
 - from: /about/versions/index.html
   to: /about/index.html
@@ -22,11 +24,11 @@ redirects:
 - from: /tools/debugging/debugging-projects-cmdline.html
   to: /studio/tools/debugging/index.html
 - from: /sdk/compatibility-library.html
-  to: /go/libraries/support-library/index.html
+  to: /topic/libraries/support-library/index.html
 - from: /tools/extras/support-library.html
-  to: /go/libraries/support-library/index.html
+  to: /topic/libraries/support-library/index.html
 - from: /training/basics/fragments/support-lib.html
-  to: /go/libraries/support-library/setup.html
+  to: /topic/libraries/support-library/setup.html
 - from: /sdk/eclipse-adt.html
   to: /studio/tools/sdk/eclipse-adt.html
 - from: /sdk/RELEASENOTES.html
@@ -70,7 +72,7 @@ redirects:
 - from: /tools/publishing/app-signing-eclipse.html
   to: /studio/tools/help/adt.html
 - from: /tools/help/uiautomator/...
-  to: /go/libraries/testing-support-library/
+  to: /topic/libraries/testing-support-library/
 - from: /tools/testing/testing_ui.html
   to: /training/testing/ui-testing/index.html
 - from: /tools/testing/activity_test.html
@@ -846,16 +848,16 @@ redirects:
 - from: /downloads/
   to: https://commondatastorage.googleapis.com/androiddevelopers/
 
-# Redirects for the new go/libraries/ area
+# Redirects for the new [dac]/topic/libraries/ area
 
 - from: /tools/support-library
-  to: /go/libraries/support-library
+  to: /topic/libraries/support-library
 
 - from: /tools/data-binding/...
-  to: /go/libraries/data-binding
+  to: /topic/libraries/data-binding
 
 - from: /tools/testing-support-library
-  to: /go/libraries/testing-support-library
+  to: /topic/libraries/testing-support-library
 
 # GCM redirects
 - from: /reference/com/google/...
diff --git a/docs/html/go/libraries/_book.yaml b/docs/html/go/libraries/_book.yaml
deleted file mode 100644
index 209dae5980b58..0000000000000
--- a/docs/html/go/libraries/_book.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-toc:
-- title: Support Library
-  path: /tools/support-library/index.html
-  section:
-  - title: Features
-    path: /tools/support-library/features.html
-  - title: Setup
-    path: /tools/support-library/setup.html
-
-- title: Data Binding Library
-  path: /tools/data-binding/guide.html
-
-- title: Testing Support Library
-  path: /tools/testing-support-library/index.html
-  section:
-  - title: API Reference
-    path: /reference/android/support/test/package-summary.html
diff --git a/docs/html/guide/_book.yaml b/docs/html/guide/_book.yaml
index 4163f0f494b67..07c05cb7b001e 100644
--- a/docs/html/guide/_book.yaml
+++ b/docs/html/guide/_book.yaml
@@ -365,11 +365,8 @@ toc:
   - title: App Install Location
     path: /guide/topics/data/install-location.html
 
-
 - title: Libraries
-  path: /go/libraries/index.html
-  section:
-  - include: /go/libraries/_book.yaml
+  path: /topic/libraries/index.html
 
 - title: Administration
   path: /guide/topics/admin/index.html
diff --git a/docs/html/jd_extras_en.js b/docs/html/jd_extras_en.js
index e3fbb253bc392..18e1f993fcae5 100644
--- a/docs/html/jd_extras_en.js
+++ b/docs/html/jd_extras_en.js
@@ -3,7 +3,7 @@
 
    'Extras' defined in this file are metadata represendations of
    resources that are outside the autogenerated local resource lists,
-   or representations that override the default representations. 
+   or representations that override the default representations.
    (Overriding the default is not recommended)
 
    'Collections' are a predefined set of resources that pages can
@@ -4535,12 +4535,12 @@ METADATA['en'].collections = {
       "https://support.google.com/googleplay/answer/2651410"
     ]
   },
-  "go/libraries": {
+  "topic/libraries": {
     "title": "",
     "resources": [
-      "go/libraries/support-library/index.html",
-      "go/libraries/testing-support-library/index.html",
-      "go/libraries/data-binding/index.html"
+      "topic/libraries/support-library/index.html",
+      "topic/libraries/testing-support-library/index.html",
+      "topic/libraries/data-binding/index.html"
     ]
   },
   "autolanding": {
diff --git a/docs/html/topic/libraries/_book.yaml b/docs/html/topic/libraries/_book.yaml
new file mode 100644
index 0000000000000..37006739d784e
--- /dev/null
+++ b/docs/html/topic/libraries/_book.yaml
@@ -0,0 +1,17 @@
+toc:
+- title: Support Library
+  path: /topic/libraries/support-library/index.html
+  section:
+  - title: Features
+    path: /topic/libraries/support-library/features.html
+  - title: Setup
+    path: /topic/libraries/support-library/setup.html
+
+- title: Data Binding Library
+  path: /topic/libraries/data-binding/guide.html
+
+- title: Testing Support Library
+  path: /topic/libraries/testing-support-library/index.html
+  section:
+  - title: API Reference
+    path: /reference/android/support/test/package-summary.html
diff --git a/docs/html/go/libraries/data-binding/index.jd b/docs/html/topic/libraries/data-binding/index.jd
similarity index 100%
rename from docs/html/go/libraries/data-binding/index.jd
rename to docs/html/topic/libraries/data-binding/index.jd
diff --git a/docs/html/go/libraries/index.jd b/docs/html/topic/libraries/index.jd
similarity index 87%
rename from docs/html/go/libraries/index.jd
rename to docs/html/topic/libraries/index.jd
index 2831d15e2eab6..90520a724807e 100644
--- a/docs/html/go/libraries/index.jd
+++ b/docs/html/topic/libraries/index.jd
@@ -7,7 +7,7 @@ included with the Android Framework.</p>
 
 <div class="dynamic-grid">
   <div class="resource-widget resource-flow-layout landing col-12"
-    data-query="collection:go/libraries"
+    data-query="collection:topic/libraries"
     data-cardSizes="6x6"
     data-maxResults="6">
   </div>
diff --git a/docs/html/go/libraries/support-library/features.jd b/docs/html/topic/libraries/support-library/features.jd
similarity index 99%
rename from docs/html/go/libraries/support-library/features.jd
rename to docs/html/topic/libraries/support-library/features.jd
index 089357a5465ef..d9616d951c5ca 100755
--- a/docs/html/go/libraries/support-library/features.jd
+++ b/docs/html/topic/libraries/support-library/features.jd
@@ -34,11 +34,11 @@ page.title=Support Library Features
 
     <h2>See also</h2>
     <ol>
-      <li><a href="{@docRoot}go/libraries/support-library/index.html#revisions">
+      <li><a href="{@docRoot}topic/libraries/support-library/index.html#revisions">
         Support Library Revisions</a></li>
-      <li><a href="{@docRoot}go/libraries/support-library/setup.html">
+      <li><a href="{@docRoot}topic/libraries/support-library/setup.html">
         Support Library Setup</a></li>
-      <li><a href="{@docRoot}go/libraries/testing-support-library/index.html">
+      <li><a href="{@docRoot}topic/libraries/testing-support-library/index.html">
         Testing Support Library</a></li>
     </ol>
 
diff --git a/docs/html/go/libraries/support-library/index.jd b/docs/html/topic/libraries/support-library/index.jd
similarity index 100%
rename from docs/html/go/libraries/support-library/index.jd
rename to docs/html/topic/libraries/support-library/index.jd
diff --git a/docs/html/go/libraries/support-library/setup.jd b/docs/html/topic/libraries/support-library/setup.jd
similarity index 100%
rename from docs/html/go/libraries/support-library/setup.jd
rename to docs/html/topic/libraries/support-library/setup.jd
diff --git a/docs/html/go/libraries/testing-support-library/index.jd b/docs/html/topic/libraries/testing-support-library/index.jd
similarity index 100%
rename from docs/html/go/libraries/testing-support-library/index.jd
rename to docs/html/topic/libraries/testing-support-library/index.jd