diff --git a/packages/docusaurus-plugin-content-docs/src/index.js b/packages/docusaurus-plugin-content-docs/src/index.js
index 9f5adbc21b..a0a04e0cd3 100644
--- a/packages/docusaurus-plugin-content-docs/src/index.js
+++ b/packages/docusaurus-plugin-content-docs/src/index.js
@@ -234,13 +234,17 @@ class DocusaurusPluginContentDocs {
       }),
     );
 
+    const docsBaseRoute = normalizeUrl([
+      this.context.siteConfig.baseUrl,
+      routeBasePath,
+    ]);
     const docsMetadataPath = await createData(
-      `docsMetadata.json`,
+      `${docuHash(docsBaseRoute)}.json`,
       JSON.stringify(content, null, 2),
     );
 
     addRoute({
-      path: normalizeUrl([this.context.siteConfig.baseUrl, routeBasePath]),
+      path: docsBaseRoute,
       component: docLayoutComponent,
       routes,
       modules: {
diff --git a/packages/docusaurus/lib/default-theme/Doc/index.js b/packages/docusaurus/lib/default-theme/Doc/index.js
index 8df92233fe..f50d9da10c 100644
--- a/packages/docusaurus/lib/default-theme/Doc/index.js
+++ b/packages/docusaurus/lib/default-theme/Doc/index.js
@@ -26,12 +26,14 @@ function Doc(props) {
         <title>{siteConfig.title}</title>
         {favicon && <link rel="shortcut icon" href={baseUrl + favicon} />}
       </Head>
-      <div className="row">
-        <div className="col col--3">
-          <Sidebar docsMetadata={docsMetadata} location={location} />
-        </div>
-        <div className="col col--9" style={{padding: '0 3rem'}}>
-          {renderRoutes(route.routes, {docsMetadata})}
+      <div className="container container--fluid">
+        <div className="row">
+          <div className="col col--3">
+            <Sidebar docsMetadata={docsMetadata} location={location} />
+          </div>
+          <div className="col col--9">
+            {renderRoutes(route.routes, {docsMetadata})}
+          </div>
         </div>
       </div>
     </Layout>
diff --git a/packages/docusaurus/lib/default-theme/DocBody/index.js b/packages/docusaurus/lib/default-theme/DocBody/index.js
index 4439f22a69..786b712a59 100644
--- a/packages/docusaurus/lib/default-theme/DocBody/index.js
+++ b/packages/docusaurus/lib/default-theme/DocBody/index.js
@@ -45,6 +45,12 @@ function DocBody(props) {
       <div className="container margin-vert--lg">
         <div className="row">
           <div className="col col--8">
+            {/* TODO: remove this in the future */}
+            <div className="alert alert--warning" role="alert">
+              Docusaurus 2 is still <strong>work in progress</strong>. Do not
+              use it in production yet!
+            </div>
+            <br />
             <header>
               <h1 className="margin-bottom--lg">{metadata.title}</h1>
             </header>
diff --git a/website/docs/introduction.md b/website/docs/introduction.md
new file mode 100644
index 0000000000..604d9ec5ac
--- /dev/null
+++ b/website/docs/introduction.md
@@ -0,0 +1,15 @@
+---
+id: introduction
+title: Introduction
+---
+
+
+![Introducing Slash](/img/slash-introducing.svg)
+
+Docusaurus is a **painless static site generator** powered by React.
+
+
+## Installation
+
+TODO
+
diff --git a/website/docusaurus.config.js b/website/docusaurus.config.js
index 5d71dfc694..ac63f09151 100644
--- a/website/docusaurus.config.js
+++ b/website/docusaurus.config.js
@@ -13,7 +13,8 @@ module.exports = {
   baseUrl: '/',
   url: 'https://docusaurus-2.netlify.com',
   headerLinks: [
-    {url: 'docs/installation', label: 'Docs'},
+    {url: 'docs-legacy/installation', label: 'Docs V1'},
+    {url: 'docs/introduction', label: 'Docs'},
     {url: 'blog', label: 'Blog'},
     {url: 'feedback/', label: 'Feedback'},
   ],
@@ -29,7 +30,7 @@ module.exports = {
       '@docusaurus/preset-classic',
       {
         docs: {
-          path: '../docs',
+          path: 'docs',
           sidebarPath: require.resolve('./sidebars.json'),
         },
         blog: {
@@ -38,4 +39,14 @@ module.exports = {
       },
     ],
   ],
+  plugins: [
+    {
+      name: '@docusaurus/plugin-content-docs',
+      options: {
+        path: '../docs',
+        routeBasePath: 'docs-legacy',
+        sidebarPath: require.resolve('./sidebars-legacy.json'),
+      },
+    },
+  ],
 };
diff --git a/website/sidebars-legacy.json b/website/sidebars-legacy.json
new file mode 100644
index 0000000000..632546c139
--- /dev/null
+++ b/website/sidebars-legacy.json
@@ -0,0 +1,25 @@
+{
+  "docs-legacy": {
+    "Getting Started": [
+      "installation",
+      "site-preparation",
+      "site-creation",
+      "publishing",
+      "docker"
+    ],
+    "Guides": [
+      "adding-blog",
+      "custom-pages",
+      "search",
+      "navigation",
+      "translation",
+      "versioning"
+    ],
+    "API": [
+      "commands",
+      "doc-markdown",
+      "api-pages",
+      "site-config"
+    ]
+  }
+}
diff --git a/website/sidebars.json b/website/sidebars.json
index da7246cf9a..8ba4ef3427 100644
--- a/website/sidebars.json
+++ b/website/sidebars.json
@@ -1,20 +1,7 @@
 {
   "docs": {
-    "Getting Started": [
-      "installation",
-      "site-preparation",
-      "site-creation",
-      "publishing",
-      "docker"
-    ],
-    "Guides": [
-      "adding-blog",
-      "custom-pages",
-      "search",
-      "navigation",
-      "translation",
-      "versioning"
-    ],
-    "API": ["commands", "doc-markdown", "api-pages", "site-config"]
+    "Quick Start": [
+      "introduction"
+    ]
   }
 }