diff --git a/docs/internals/configuration.md b/docs/advanced/configuration.md
similarity index 100%
rename from docs/internals/configuration.md
rename to docs/advanced/configuration.md
diff --git a/docs/internals/keymaps.md b/docs/advanced/keymaps.md
similarity index 100%
rename from docs/internals/keymaps.md
rename to docs/advanced/keymaps.md
diff --git a/docs/internals/serialization.md b/docs/advanced/serialization.md
similarity index 100%
rename from docs/internals/serialization.md
rename to docs/advanced/serialization.md
diff --git a/docs/internals/view-system.md b/docs/advanced/view-system.md
similarity index 100%
rename from docs/internals/view-system.md
rename to docs/advanced/view-system.md
diff --git a/docs/creating-a-package.md b/docs/creating-a-package.md
index 92fb8a371..183a5d28a 100644
--- a/docs/creating-a-package.md
+++ b/docs/creating-a-package.md
@@ -381,7 +381,7 @@ Additional libraries can be found by browsing Atom's *node_modules* folder.
 [apm]: https://github.com/atom/apm
 [git-tag]: http://git-scm.com/book/en/Git-Basics-Tagging
 [wrap-guide]: https://github.com/atom/wrap-guide/
-[keymaps]: internals/keymaps.md
+[keymaps]: advanced/keymaps.md
 [theme-variables]: theme-variables.md
 [tm-tokens]: http://manual.macromates.com/en/language_grammars.html
 [spacepen]: https://github.com/nathansobo/space-pen
diff --git a/docs/index.md b/docs/index.md
index a27dc1d9d..001836228 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -7,7 +7,7 @@
 
 ### Advanced Topics
 
-* [Configuration](internals/configuration.md)
-* [Keymaps](internals/keymaps.md)
-* [Serialization](internals/serialization.md)
-* [View System](internals/view-system.md)
+* [Configuration](advanced/configuration.md)
+* [Keymaps](advanced/keymaps.md)
+* [Serialization](advanced/serialization.md)
+* [View System](advanced/view-system.md)
diff --git a/vendor/apm b/vendor/apm
index 50d23f5f4..3f8701bfe 160000
--- a/vendor/apm
+++ b/vendor/apm
@@ -1 +1 @@
-Subproject commit 50d23f5f419230cf1833e7bb8ee7bf0d7289ab1d
+Subproject commit 3f8701bfe624de844641863391c04def9cca5c86