diff --git a/website/layouts/docs.erb b/website/layouts/docs.erb
index 67e1aefc1..7ebf352d6 100644
--- a/website/layouts/docs.erb
+++ b/website/layouts/docs.erb
@@ -1,15 +1,15 @@
 <% wrap_layout :inner do %>
   <% content_for :sidebar do %>
-    <h4><a href="/docs/cli-index.html">Terraform CLI</a></h4>
+    <h4><a href="/docs/cli/index.html">Terraform CLI</a></h4>
 
     <ul class="nav docs-sidenav">
 
       <li>
-        <a href="/docs/cli-index.html">Overview</a>
+        <a href="/docs/cli/index.html">Overview</a>
       </li>
 
       <li>
-        <a href="/docs/commands/index.html">Basic CLI Features</a>
+        <a href="/docs/cli/commands/index.html">Basic CLI Features</a>
       </li>
 
       <li>
@@ -20,11 +20,11 @@
           </li>
 
           <li>
-            <a href="/docs/commands/init.html"><code>init</code></a>
+            <a href="/docs/cli/commands/init.html"><code>init</code></a>
           </li>
 
           <li>
-            <a href="/docs/commands/get.html"><code>get</code></a>
+            <a href="/docs/cli/commands/get.html"><code>get</code></a>
           </li>
         </ul>
       </li>
@@ -37,15 +37,15 @@
           </li>
 
           <li>
-            <a href="/docs/commands/plan.html"><code>plan</code></a>
+            <a href="/docs/cli/commands/plan.html"><code>plan</code></a>
           </li>
 
           <li>
-            <a href="/docs/commands/apply.html"><code>apply</code></a>
+            <a href="/docs/cli/commands/apply.html"><code>apply</code></a>
           </li>
 
           <li>
-            <a href="/docs/commands/destroy.html"><code>destroy</code></a>
+            <a href="/docs/cli/commands/destroy.html"><code>destroy</code></a>
           </li>
         </ul>
       </li>
@@ -58,11 +58,11 @@
           </li>
 
           <li>
-            <a href="/docs/commands/login.html"><code>login</code></a>
+            <a href="/docs/cli/commands/login.html"><code>login</code></a>
           </li>
 
           <li>
-            <a href="/docs/commands/logout.html"><code>logout</code></a>
+            <a href="/docs/cli/commands/logout.html"><code>logout</code></a>
           </li>
         </ul>
       </li>
@@ -75,23 +75,23 @@
           </li>
 
           <li>
-            <a href="/docs/commands/console.html"><code>console</code></a>
+            <a href="/docs/cli/commands/console.html"><code>console</code></a>
           </li>
 
           <li>
-            <a href="/docs/commands/fmt.html"><code>fmt</code></a>
+            <a href="/docs/cli/commands/fmt.html"><code>fmt</code></a>
           </li>
 
           <li>
-            <a href="/docs/commands/validate.html"><code>validate</code></a>
+            <a href="/docs/cli/commands/validate.html"><code>validate</code></a>
           </li>
 
           <li>
-            <a href="/docs/commands/0.13upgrade.html"><code>0.13upgrade</code></a>
+            <a href="/docs/cli/commands/0.13upgrade.html"><code>0.13upgrade</code></a>
           </li>
 
           <li>
-            <a href="/docs/commands/0.12upgrade.html"><code>0.12upgrade</code></a>
+            <a href="/docs/cli/commands/0.12upgrade.html"><code>0.12upgrade</code></a>
           </li>
         </ul>
       </li>
@@ -104,23 +104,23 @@
           </li>
 
           <li>
-            <a href="/docs/commands/graph.html"><code>graph</code></a>
+            <a href="/docs/cli/commands/graph.html"><code>graph</code></a>
           </li>
 
           <li>
-            <a href="/docs/commands/output.html"><code>output</code></a>
+            <a href="/docs/cli/commands/output.html"><code>output</code></a>
           </li>
 
           <li>
-            <a href="/docs/commands/show.html"><code>show</code></a>
+            <a href="/docs/cli/commands/show.html"><code>show</code></a>
           </li>
 
           <li>
-            <a href="/docs/commands/state/list.html"><code>state list</code></a>
+            <a href="/docs/cli/commands/state/list.html"><code>state list</code></a>
           </li>
 
           <li>
-            <a href="/docs/commands/state/show.html"><code>state show</code></a>
+            <a href="/docs/cli/commands/state/show.html"><code>state show</code></a>
           </li>
         </ul>
       </li>
@@ -129,19 +129,19 @@
         <a href="#">Importing Infrastructure</a>
         <ul class="nav">
           <li>
-            <a href="/docs/import/index.html">Overview</a>
+            <a href="/docs/cli/import/index.html">Overview</a>
           </li>
 
           <li>
-            <a href="/docs/commands/import.html"><code>import</code></a>
+            <a href="/docs/cli/commands/import.html"><code>import</code></a>
           </li>
 
           <li>
-            <a href="/docs/import/usage.html">Usage Tips</a>
+            <a href="/docs/cli/import/usage.html">Usage Tips</a>
           </li>
 
           <li>
-            <a href="/docs/import/importability.html">Resource Importability</a>
+            <a href="/docs/cli/import/importability.html">Resource Importability</a>
           </li>
 
 
@@ -156,7 +156,11 @@
           </li>
 
           <li>
-            <a href="/docs/internals/resource-addressing.html">Resource Addressing</a>
+            <a href="/docs/cli/state/resource-addressing.html">Resource Addressing</a>
+          </li>
+
+          <li>
+            <a href="/docs/cli/commands/state/index.html"><code>state</code></a>
           </li>
 
           <li>
@@ -167,15 +171,15 @@
               </li>
 
               <li>
-                <a href="/docs/commands/state/list.html"><code>state list</code></a>
+                <a href="/docs/cli/commands/state/list.html"><code>state list</code></a>
               </li>
 
               <li>
-                <a href="/docs/commands/state/show.html"><code>state show</code></a>
+                <a href="/docs/cli/commands/state/show.html"><code>state show</code></a>
               </li>
 
               <li>
-                <a href="/docs/commands/refresh.html"><code>refresh</code></a>
+                <a href="/docs/cli/commands/refresh.html"><code>refresh</code></a>
               </li>
             </ul>
           </li>
@@ -188,11 +192,11 @@
               </li>
 
               <li>
-                <a href="/docs/commands/taint.html"><code>taint</code></a>
+                <a href="/docs/cli/commands/taint.html"><code>taint</code></a>
               </li>
 
               <li>
-                <a href="/docs/commands/untaint.html"><code>untaint</code></a>
+                <a href="/docs/cli/commands/untaint.html"><code>untaint</code></a>
               </li>
             </ul>
           </li>
@@ -205,15 +209,15 @@
               </li>
 
               <li>
-                <a href="/docs/commands/state/mv.html"><code>state mv</code></a>
+                <a href="/docs/cli/commands/state/mv.html"><code>state mv</code></a>
               </li>
 
               <li>
-                <a href="/docs/commands/state/rm.html"><code>state rm</code></a>
+                <a href="/docs/cli/commands/state/rm.html"><code>state rm</code></a>
               </li>
 
               <li>
-                <a href="/docs/commands/state/replace-provider.html"><code>state replace-provider</code></a>
+                <a href="/docs/cli/commands/state/replace-provider.html"><code>state replace-provider</code></a>
               </li>
             </ul>
           </li>
@@ -226,15 +230,15 @@
               </li>
 
               <li>
-                <a href="/docs/commands/state/pull.html"><code>state pull</code></a>
+                <a href="/docs/cli/commands/state/pull.html"><code>state pull</code></a>
               </li>
 
               <li>
-                <a href="/docs/commands/state/push.html"><code>state push</code></a>
+                <a href="/docs/cli/commands/state/push.html"><code>state push</code></a>
               </li>
 
               <li>
-                <a href="/docs/commands/force-unlock.html"><code>force-unlock</code></a>
+                <a href="/docs/cli/commands/force-unlock.html"><code>force-unlock</code></a>
               </li>
             </ul>
           </li>
@@ -253,27 +257,27 @@
             <a href="#"><code>workspace</code></a>
             <ul class="nav nav-auto-expand">
               <li>
-                <a href="/docs/commands/workspace/index.html">Overview</a>
+                <a href="/docs/cli/commands/workspace/index.html">Overview</a>
               </li>
 
               <li>
-                <a href="/docs/commands/workspace/list.html"><code>workspace list</code></a>
+                <a href="/docs/cli/commands/workspace/list.html"><code>workspace list</code></a>
               </li>
 
               <li>
-                <a href="/docs/commands/workspace/select.html"><code>workspace select</code></a>
+                <a href="/docs/cli/commands/workspace/select.html"><code>workspace select</code></a>
               </li>
 
               <li>
-                <a href="/docs/commands/workspace/new.html"><code>workspace new</code></a>
+                <a href="/docs/cli/commands/workspace/new.html"><code>workspace new</code></a>
               </li>
 
               <li>
-                <a href="/docs/commands/workspace/delete.html"><code>workspace delete</code></a>
+                <a href="/docs/cli/commands/workspace/delete.html"><code>workspace delete</code></a>
               </li>
 
               <li>
-                <a href="/docs/commands/workspace/show.html"><code>workspace show</code></a>
+                <a href="/docs/cli/commands/workspace/show.html"><code>workspace show</code></a>
               </li>
             </ul>
           </li>
@@ -288,23 +292,27 @@
           </li>
 
           <li>
-            <a href="/docs/commands/providers.html"><code>providers</code></a>
+            <a href="/docs/cli/plugins/signing.html">Plugin Signing</a>
           </li>
 
           <li>
-            <a href="/docs/commands/version.html"><code>version</code></a>
+            <a href="/docs/cli/commands/providers.html"><code>providers</code></a>
           </li>
 
           <li>
-            <a href="/docs/commands/providers/lock.html"><code>providers lock</code></a>
+            <a href="/docs/cli/commands/version.html"><code>version</code></a>
           </li>
 
           <li>
-            <a href="/docs/commands/providers/mirror.html"><code>providers mirror</code></a>
+            <a href="/docs/cli/commands/providers/lock.html"><code>providers lock</code></a>
           </li>
 
           <li>
-            <a href="/docs/commands/providers/schema.html"><code>providers schema</code></a>
+            <a href="/docs/cli/commands/providers/mirror.html"><code>providers mirror</code></a>
+          </li>
+
+          <li>
+            <a href="/docs/cli/commands/providers/schema.html"><code>providers schema</code></a>
           </li>
         </ul>
       </li>
@@ -317,11 +325,11 @@
           </li>
 
           <li>
-            <a href="/docs/commands/cli-config.html">CLI Config File</a>
+            <a href="/docs/cli/config/config-file.html">CLI Config File</a>
           </li>
 
           <li>
-            <a href="/docs/commands/environment-variables.html">Environment Variables</a>
+            <a href="/docs/cli/config/environment-variables.html">Environment Variables</a>
           </li>
         </ul>
       </li>
@@ -350,159 +358,159 @@
         <ul class="nav">
 
           <li>
-            <a href="/docs/commands/apply.html"><code>apply</code></a>
+            <a href="/docs/cli/commands/apply.html"><code>apply</code></a>
           </li>
 
           <li>
-            <a href="/docs/commands/console.html"><code>console</code></a>
+            <a href="/docs/cli/commands/console.html"><code>console</code></a>
           </li>
 
           <li>
-            <a href="/docs/commands/destroy.html"><code>destroy</code></a>
+            <a href="/docs/cli/commands/destroy.html"><code>destroy</code></a>
           </li>
 
           <li>
-            <a href="/docs/commands/env.html"><code>env</code></a>
+            <a href="/docs/cli/commands/env.html"><code>env</code></a>
           </li>
 
           <li>
-            <a href="/docs/commands/fmt.html"><code>fmt</code></a>
+            <a href="/docs/cli/commands/fmt.html"><code>fmt</code></a>
           </li>
 
           <li>
-            <a href="/docs/commands/force-unlock.html"><code>force-unlock</code></a>
+            <a href="/docs/cli/commands/force-unlock.html"><code>force-unlock</code></a>
           </li>
 
           <li>
-            <a href="/docs/commands/get.html"><code>get</code></a>
+            <a href="/docs/cli/commands/get.html"><code>get</code></a>
           </li>
 
           <li>
-            <a href="/docs/commands/graph.html"><code>graph</code></a>
+            <a href="/docs/cli/commands/graph.html"><code>graph</code></a>
           </li>
 
           <li>
-            <a href="/docs/commands/import.html"><code>import</code></a>
+            <a href="/docs/cli/commands/import.html"><code>import</code></a>
           </li>
 
           <li>
-            <a href="/docs/commands/init.html"><code>init</code></a>
+            <a href="/docs/cli/commands/init.html"><code>init</code></a>
           </li>
 
           <li>
-            <a href="/docs/commands/login.html"><code>login</code></a>
+            <a href="/docs/cli/commands/login.html"><code>login</code></a>
           </li>
 
           <li>
-            <a href="/docs/commands/logout.html"><code>logout</code></a>
+            <a href="/docs/cli/commands/logout.html"><code>logout</code></a>
           </li>
 
           <li>
-            <a href="/docs/commands/output.html"><code>output</code></a>
+            <a href="/docs/cli/commands/output.html"><code>output</code></a>
           </li>
 
           <li>
-            <a href="/docs/commands/plan.html"><code>plan</code></a>
+            <a href="/docs/cli/commands/plan.html"><code>plan</code></a>
           </li>
 
           <li>
-            <a href="/docs/commands/providers.html"><code>providers</code></a>
+            <a href="/docs/cli/commands/providers.html"><code>providers</code></a>
           </li>
 
           <li>
-            <a href="/docs/commands/providers/lock.html"><code>providers lock</code></a>
+            <a href="/docs/cli/commands/providers/lock.html"><code>providers lock</code></a>
           </li>
 
           <li>
-            <a href="/docs/commands/providers/mirror.html"><code>providers mirror</code></a>
+            <a href="/docs/cli/commands/providers/mirror.html"><code>providers mirror</code></a>
           </li>
 
           <li>
-            <a href="/docs/commands/providers/schema.html"><code>providers schema</code></a>
+            <a href="/docs/cli/commands/providers/schema.html"><code>providers schema</code></a>
           </li>
 
           <li>
-            <a href="/docs/commands/push.html"><code>push</code></a>
+            <a href="/docs/cli/commands/push.html"><code>push</code></a>
           </li>
 
           <li>
-            <a href="/docs/commands/refresh.html"><code>refresh</code></a>
+            <a href="/docs/cli/commands/refresh.html"><code>refresh</code></a>
           </li>
 
           <li>
-            <a href="/docs/commands/show.html"><code>show</code></a>
+            <a href="/docs/cli/commands/show.html"><code>show</code></a>
           </li>
 
           <li>
-            <a href="/docs/commands/state/list.html"><code>state list</code></a>
+            <a href="/docs/cli/commands/state/list.html"><code>state list</code></a>
           </li>
 
           <li>
-            <a href="/docs/commands/state/mv.html"><code>state mv</code></a>
+            <a href="/docs/cli/commands/state/mv.html"><code>state mv</code></a>
           </li>
 
           <li>
-            <a href="/docs/commands/state/pull.html"><code>state pull</code></a>
+            <a href="/docs/cli/commands/state/pull.html"><code>state pull</code></a>
           </li>
 
           <li>
-            <a href="/docs/commands/state/push.html"><code>state push</code></a>
+            <a href="/docs/cli/commands/state/push.html"><code>state push</code></a>
           </li>
 
           <li>
-            <a href="/docs/commands/state/replace-provider.html"><code>state replace-provider</code></a>
+            <a href="/docs/cli/commands/state/replace-provider.html"><code>state replace-provider</code></a>
           </li>
 
           <li>
-            <a href="/docs/commands/state/rm.html"><code>state rm</code></a>
+            <a href="/docs/cli/commands/state/rm.html"><code>state rm</code></a>
           </li>
 
           <li>
-            <a href="/docs/commands/state/show.html"><code>state show</code></a>
+            <a href="/docs/cli/commands/state/show.html"><code>state show</code></a>
           </li>
 
           <li>
-            <a href="/docs/commands/taint.html"><code>taint</code></a>
+            <a href="/docs/cli/commands/taint.html"><code>taint</code></a>
           </li>
 
           <li>
-            <a href="/docs/commands/untaint.html"><code>untaint</code></a>
+            <a href="/docs/cli/commands/untaint.html"><code>untaint</code></a>
           </li>
 
           <li>
-            <a href="/docs/commands/validate.html"><code>validate</code></a>
+            <a href="/docs/cli/commands/validate.html"><code>validate</code></a>
           </li>
 
           <li>
-            <a href="/docs/commands/version.html"><code>version</code></a>
+            <a href="/docs/cli/commands/version.html"><code>version</code></a>
           </li>
 
           <li>
-            <a href="/docs/commands/workspace/list.html"><code>workspace list</code></a>
+            <a href="/docs/cli/commands/workspace/list.html"><code>workspace list</code></a>
           </li>
 
           <li>
-            <a href="/docs/commands/workspace/select.html"><code>workspace select</code></a>
+            <a href="/docs/cli/commands/workspace/select.html"><code>workspace select</code></a>
           </li>
 
           <li>
-            <a href="/docs/commands/workspace/new.html"><code>workspace new</code></a>
+            <a href="/docs/cli/commands/workspace/new.html"><code>workspace new</code></a>
           </li>
 
           <li>
-            <a href="/docs/commands/workspace/delete.html"><code>workspace delete</code></a>
+            <a href="/docs/cli/commands/workspace/delete.html"><code>workspace delete</code></a>
           </li>
 
           <li>
-            <a href="/docs/commands/workspace/show.html"><code>workspace show</code></a>
+            <a href="/docs/cli/commands/workspace/show.html"><code>workspace show</code></a>
           </li>
 
           <li>
-            <a href="/docs/commands/0.12upgrade.html"><code>0.12upgrade</code></a>
+            <a href="/docs/cli/commands/0.12upgrade.html"><code>0.12upgrade</code></a>
           </li>
 
           <li>
-            <a href="/docs/commands/0.13upgrade.html"><code>0.13upgrade</code></a>
+            <a href="/docs/cli/commands/0.13upgrade.html"><code>0.13upgrade</code></a>
           </li>
         </ul>
       </li>