diff --git a/docs/_includes/nav-about.html b/docs/_includes/nav/about.html
similarity index 100%
rename from docs/_includes/nav-about.html
rename to docs/_includes/nav/about.html
diff --git a/docs/_includes/nav-components.html b/docs/_includes/nav/components.html
similarity index 100%
rename from docs/_includes/nav-components.html
rename to docs/_includes/nav/components.html
diff --git a/docs/_includes/nav-css.html b/docs/_includes/nav/css.html
similarity index 100%
rename from docs/_includes/nav-css.html
rename to docs/_includes/nav/css.html
diff --git a/docs/_includes/nav-customize.html b/docs/_includes/nav/customize.html
similarity index 100%
rename from docs/_includes/nav-customize.html
rename to docs/_includes/nav/customize.html
diff --git a/docs/_includes/nav-getting-started.html b/docs/_includes/nav/getting-started.html
similarity index 100%
rename from docs/_includes/nav-getting-started.html
rename to docs/_includes/nav/getting-started.html
diff --git a/docs/_includes/nav-javascript.html b/docs/_includes/nav/javascript.html
similarity index 100%
rename from docs/_includes/nav-javascript.html
rename to docs/_includes/nav/javascript.html
diff --git a/docs/_includes/nav-main.html b/docs/_includes/nav/main.html
similarity index 100%
rename from docs/_includes/nav-main.html
rename to docs/_includes/nav/main.html
diff --git a/docs/_includes/nav-migration.html b/docs/_includes/nav/migration.html
similarity index 100%
rename from docs/_includes/nav-migration.html
rename to docs/_includes/nav/migration.html
diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html
index 70746f6cfd..ec05d83cea 100644
--- a/docs/_layouts/default.html
+++ b/docs/_layouts/default.html
@@ -8,7 +8,7 @@
     <a class="sr-only sr-only-focusable" href="#content">Skip to main content</a>
 
     <!-- Docs master nav -->
-    {% include nav-main.html %}
+    {% include nav/main.html %}
 
     <!-- Docs page layout -->
     <div class="bs-docs-header" id="content">
@@ -29,19 +29,19 @@
           <div class="bs-docs-sidebar hidden-print" role="complementary">
             <ul class="nav bs-docs-sidenav">
               {% if page.slug == "getting-started" %}
-                {% include nav-getting-started.html %}
+                {% include nav/getting-started.html %}
               {% elsif page.slug == "css" %}
-                {% include nav-css.html %}
+                {% include nav/css.html %}
               {% elsif page.slug == "components" %}
-                {% include nav-components.html %}
+                {% include nav/components.html %}
               {% elsif page.slug == "js" %}
-                {% include nav-javascript.html %}
+                {% include nav/javascript.html %}
               {% elsif page.slug == "customize" %}
-                {% include nav-customize.html %}
+                {% include nav/customize.html %}
               {% elsif page.slug == "about" %}
-                {% include nav-about.html %}
+                {% include nav/about.html %}
               {% elsif page.slug == "migration" %}
-                {% include nav-migration.html %}
+                {% include nav/migration.html %}
               {% endif %}
             </ul>
             <a class="back-to-top" href="#top">
diff --git a/docs/_layouts/home.html b/docs/_layouts/home.html
index 99b863f9b0..9b1eee6ed3 100644
--- a/docs/_layouts/home.html
+++ b/docs/_layouts/home.html
@@ -8,7 +8,7 @@
     <a class="sr-only sr-only-focusable" href="#content">Skip to main content</a>
 
     <!-- Docs master nav -->
-    {% include nav-main.html %}
+    {% include nav/main.html %}
 
     <!-- Page content of course! -->
     {{ content }}