From 15bc33df50ff690e8457726c731f0b86bd6c4f35 Mon Sep 17 00:00:00 2001
From: Endilie Yacop Sucipto <endiliey@gmail.com>
Date: Wed, 10 Apr 2019 14:20:15 +0700
Subject: [PATCH] chore(v2): rename/ restructure folder (#1351)

* chore(v2): restructure folder

* typo

* fix test
---
 packages/docusaurus/lib/{core => client}/App.js |  0
 .../lib/{core => client}/clientEntry.js         |  0
 .../lib/{docusaurus => client/exports}/Head.js  |  0
 .../lib/{docusaurus => client/exports}/Link.js  |  2 +-
 .../{docusaurus => client/exports}/context.js   |  0
 .../docusaurus/lib/{core => client}/preload.js  |  0
 .../lib/{core => client}/serverEntry.js         |  0
 .../templates/index.html.template.ejs           |  0
 .../templates/metadata.template.ejs             |  0
 .../templates/ssr.html.template.js              |  0
 packages/docusaurus/lib/commands/build.js       |  2 +-
 packages/docusaurus/lib/commands/deploy.js      | 13 +++++--------
 packages/docusaurus/lib/commands/eject.js       |  2 +-
 packages/docusaurus/lib/commands/start.js       | 17 +++++++----------
 packages/docusaurus/lib/constants.js            |  1 +
 .../{theme => default-theme}/BlogPage/index.js  |  0
 .../{theme => default-theme}/BlogPost/index.js  |  0
 .../lib/{theme => default-theme}/Doc/index.js   |  0
 .../Doc/styles.module.css                       |  0
 .../{theme => default-theme}/DocBody/index.js   |  0
 .../DocBody/styles.module.css                   |  0
 .../DocsPaginator/index.js                      |  0
 .../{theme => default-theme}/Footer/index.js    |  0
 .../{theme => default-theme}/Layout/index.js    |  0
 .../{theme => default-theme}/Layout/styles.css  |  0
 .../{theme => default-theme}/Loading/index.js   |  0
 .../Loading/styles.module.css                   |  0
 .../{theme => default-theme}/Markdown/index.js  |  0
 .../{theme => default-theme}/Navbar/index.js    |  0
 .../Navbar/styles.module.css                    |  0
 .../lib/{theme => default-theme}/NotFound.js    |  0
 .../lib/{theme => default-theme}/Pages/index.js |  0
 .../lib/{theme => default-theme}/Post/index.js  |  0
 .../{theme => default-theme}/Search/index.js    |  0
 .../{theme => default-theme}/Search/styles.css  |  0
 .../{theme => default-theme}/Sidebar/index.js   |  0
 .../Sidebar/styles.module.css                   |  0
 .../docusaurus/lib/{ => server}/load/config.js  |  8 ++------
 .../docusaurus/lib/{ => server}/load/env.js     |  6 ++----
 .../docusaurus/lib/{ => server}/load/index.js   |  8 ++++----
 .../docusaurus/lib/{ => server}/load/plugins.js |  0
 .../docusaurus/lib/{ => server}/load/routes.js  |  0
 .../docusaurus/lib/{ => server}/load/theme.js   |  2 +-
 packages/docusaurus/lib/webpack/base.js         |  3 +--
 packages/docusaurus/lib/webpack/client.js       |  2 +-
 packages/docusaurus/lib/webpack/server.js       |  2 +-
 packages/docusaurus/test/load/config.test.js    |  2 +-
 packages/docusaurus/test/load/env.test.js       |  2 +-
 packages/docusaurus/test/loadSetup.js           |  2 +-
 49 files changed, 31 insertions(+), 43 deletions(-)
 rename packages/docusaurus/lib/{core => client}/App.js (100%)
 rename packages/docusaurus/lib/{core => client}/clientEntry.js (100%)
 rename packages/docusaurus/lib/{docusaurus => client/exports}/Head.js (100%)
 rename packages/docusaurus/lib/{docusaurus => client/exports}/Link.js (96%)
 rename packages/docusaurus/lib/{docusaurus => client/exports}/context.js (100%)
 rename packages/docusaurus/lib/{core => client}/preload.js (100%)
 rename packages/docusaurus/lib/{core => client}/serverEntry.js (100%)
 rename packages/docusaurus/lib/{core => client}/templates/index.html.template.ejs (100%)
 rename packages/docusaurus/lib/{core => client}/templates/metadata.template.ejs (100%)
 rename packages/docusaurus/lib/{core => client}/templates/ssr.html.template.js (100%)
 rename packages/docusaurus/lib/{theme => default-theme}/BlogPage/index.js (100%)
 rename packages/docusaurus/lib/{theme => default-theme}/BlogPost/index.js (100%)
 rename packages/docusaurus/lib/{theme => default-theme}/Doc/index.js (100%)
 rename packages/docusaurus/lib/{theme => default-theme}/Doc/styles.module.css (100%)
 rename packages/docusaurus/lib/{theme => default-theme}/DocBody/index.js (100%)
 rename packages/docusaurus/lib/{theme => default-theme}/DocBody/styles.module.css (100%)
 rename packages/docusaurus/lib/{theme => default-theme}/DocsPaginator/index.js (100%)
 rename packages/docusaurus/lib/{theme => default-theme}/Footer/index.js (100%)
 rename packages/docusaurus/lib/{theme => default-theme}/Layout/index.js (100%)
 rename packages/docusaurus/lib/{theme => default-theme}/Layout/styles.css (100%)
 rename packages/docusaurus/lib/{theme => default-theme}/Loading/index.js (100%)
 rename packages/docusaurus/lib/{theme => default-theme}/Loading/styles.module.css (100%)
 rename packages/docusaurus/lib/{theme => default-theme}/Markdown/index.js (100%)
 rename packages/docusaurus/lib/{theme => default-theme}/Navbar/index.js (100%)
 rename packages/docusaurus/lib/{theme => default-theme}/Navbar/styles.module.css (100%)
 rename packages/docusaurus/lib/{theme => default-theme}/NotFound.js (100%)
 rename packages/docusaurus/lib/{theme => default-theme}/Pages/index.js (100%)
 rename packages/docusaurus/lib/{theme => default-theme}/Post/index.js (100%)
 rename packages/docusaurus/lib/{theme => default-theme}/Search/index.js (100%)
 rename packages/docusaurus/lib/{theme => default-theme}/Search/styles.css (100%)
 rename packages/docusaurus/lib/{theme => default-theme}/Sidebar/index.js (100%)
 rename packages/docusaurus/lib/{theme => default-theme}/Sidebar/styles.module.css (100%)
 rename packages/docusaurus/lib/{ => server}/load/config.js (95%)
 rename packages/docusaurus/lib/{ => server}/load/env.js (92%)
 rename packages/docusaurus/lib/{ => server}/load/index.js (93%)
 rename packages/docusaurus/lib/{ => server}/load/plugins.js (100%)
 rename packages/docusaurus/lib/{ => server}/load/routes.js (100%)
 rename packages/docusaurus/lib/{ => server}/load/theme.js (93%)

diff --git a/packages/docusaurus/lib/core/App.js b/packages/docusaurus/lib/client/App.js
similarity index 100%
rename from packages/docusaurus/lib/core/App.js
rename to packages/docusaurus/lib/client/App.js
diff --git a/packages/docusaurus/lib/core/clientEntry.js b/packages/docusaurus/lib/client/clientEntry.js
similarity index 100%
rename from packages/docusaurus/lib/core/clientEntry.js
rename to packages/docusaurus/lib/client/clientEntry.js
diff --git a/packages/docusaurus/lib/docusaurus/Head.js b/packages/docusaurus/lib/client/exports/Head.js
similarity index 100%
rename from packages/docusaurus/lib/docusaurus/Head.js
rename to packages/docusaurus/lib/client/exports/Head.js
diff --git a/packages/docusaurus/lib/docusaurus/Link.js b/packages/docusaurus/lib/client/exports/Link.js
similarity index 96%
rename from packages/docusaurus/lib/docusaurus/Link.js
rename to packages/docusaurus/lib/client/exports/Link.js
index ed02937d8e..a23c6c7c9c 100644
--- a/packages/docusaurus/lib/docusaurus/Link.js
+++ b/packages/docusaurus/lib/client/exports/Link.js
@@ -11,7 +11,7 @@ import {NavLink} from 'react-router-dom';
 
 import DocusaurusContext from '@docusaurus/context';
 
-import preload from '../core/preload';
+import preload from '../preload';
 
 const externalRegex = /^(https?:|\/\/)/;
 
diff --git a/packages/docusaurus/lib/docusaurus/context.js b/packages/docusaurus/lib/client/exports/context.js
similarity index 100%
rename from packages/docusaurus/lib/docusaurus/context.js
rename to packages/docusaurus/lib/client/exports/context.js
diff --git a/packages/docusaurus/lib/core/preload.js b/packages/docusaurus/lib/client/preload.js
similarity index 100%
rename from packages/docusaurus/lib/core/preload.js
rename to packages/docusaurus/lib/client/preload.js
diff --git a/packages/docusaurus/lib/core/serverEntry.js b/packages/docusaurus/lib/client/serverEntry.js
similarity index 100%
rename from packages/docusaurus/lib/core/serverEntry.js
rename to packages/docusaurus/lib/client/serverEntry.js
diff --git a/packages/docusaurus/lib/core/templates/index.html.template.ejs b/packages/docusaurus/lib/client/templates/index.html.template.ejs
similarity index 100%
rename from packages/docusaurus/lib/core/templates/index.html.template.ejs
rename to packages/docusaurus/lib/client/templates/index.html.template.ejs
diff --git a/packages/docusaurus/lib/core/templates/metadata.template.ejs b/packages/docusaurus/lib/client/templates/metadata.template.ejs
similarity index 100%
rename from packages/docusaurus/lib/core/templates/metadata.template.ejs
rename to packages/docusaurus/lib/client/templates/metadata.template.ejs
diff --git a/packages/docusaurus/lib/core/templates/ssr.html.template.js b/packages/docusaurus/lib/client/templates/ssr.html.template.js
similarity index 100%
rename from packages/docusaurus/lib/core/templates/ssr.html.template.js
rename to packages/docusaurus/lib/client/templates/ssr.html.template.js
diff --git a/packages/docusaurus/lib/commands/build.js b/packages/docusaurus/lib/commands/build.js
index 6035f5b08e..e34fcb3c2b 100644
--- a/packages/docusaurus/lib/commands/build.js
+++ b/packages/docusaurus/lib/commands/build.js
@@ -13,7 +13,7 @@ const path = require('path');
 const chalk = require('chalk');
 const fs = require('fs-extra');
 const globby = require('globby');
-const load = require('../load');
+const load = require('../server/load');
 const createServerConfig = require('../webpack/server');
 const createClientConfig = require('../webpack/client');
 const {applyConfigureWebpack} = require('../webpack/utils');
diff --git a/packages/docusaurus/lib/commands/deploy.js b/packages/docusaurus/lib/commands/deploy.js
index f96277e6d0..d858a80b34 100644
--- a/packages/docusaurus/lib/commands/deploy.js
+++ b/packages/docusaurus/lib/commands/deploy.js
@@ -9,7 +9,8 @@ const path = require('path');
 const shell = require('shelljs');
 const fs = require('fs-extra');
 const build = require('./build');
-const loadConfig = require('../load/config');
+const loadConfig = require('../server/load/config');
+const {CONFIG_FILE_NAME} = require('../constants');
 
 module.exports = async function deploy(siteDir) {
   console.log('Deploy command invoked ...');
@@ -27,16 +28,14 @@ module.exports = async function deploy(siteDir) {
     process.env.CURRENT_BRANCH ||
     shell.exec('git rev-parse --abbrev-ref HEAD').stdout.trim();
 
-  const siteConfig = loadConfig.loadConfig(siteDir);
+  const siteConfig = loadConfig(siteDir);
   const organizationName =
     process.env.ORGANIZATION_NAME ||
     process.env.CIRCLE_PROJECT_USERNAME ||
     siteConfig.organizationName;
   if (!organizationName) {
     throw new Error(
-      `Missing project organization name. Did you forget to define 'organizationName' in ${
-        loadConfig.configFileName
-      }? You may also export it via the organizationName environment variable.`,
+      `Missing project organization name. Did you forget to define 'organizationName' in ${CONFIG_FILE_NAME}? You may also export it via the organizationName environment variable.`,
     );
   }
   const projectName =
@@ -45,9 +44,7 @@ module.exports = async function deploy(siteDir) {
     siteConfig.projectName;
   if (!projectName) {
     throw new Error(
-      `Missing project name. Did you forget to define 'projectName' in ${
-        loadConfig.configFileName
-      }? You may also export it via the projectName environment variable.`,
+      `Missing project name. Did you forget to define 'projectName' in ${CONFIG_FILE_NAME}? You may also export it via the projectName environment variable.`,
     );
   }
 
diff --git a/packages/docusaurus/lib/commands/eject.js b/packages/docusaurus/lib/commands/eject.js
index 9c8581d949..fb082260db 100644
--- a/packages/docusaurus/lib/commands/eject.js
+++ b/packages/docusaurus/lib/commands/eject.js
@@ -10,7 +10,7 @@ const chalk = require('chalk');
 const path = require('path');
 
 module.exports = async function eject(siteDir) {
-  const defaultTheme = path.resolve(__dirname, '..', 'theme');
+  const defaultTheme = path.resolve(__dirname, '..', 'default-theme');
   const customTheme = path.resolve(siteDir, 'theme');
   await fs.copy(defaultTheme, customTheme);
 
diff --git a/packages/docusaurus/lib/commands/start.js b/packages/docusaurus/lib/commands/start.js
index 12b5c573d9..b74f28eb68 100644
--- a/packages/docusaurus/lib/commands/start.js
+++ b/packages/docusaurus/lib/commands/start.js
@@ -19,8 +19,8 @@ const HotModuleReplacementPlugin = require('webpack/lib/HotModuleReplacementPlug
 const WebpackDevServer = require('webpack-dev-server');
 const merge = require('webpack-merge');
 const {normalizeUrl} = require('@docusaurus/utils');
-const load = require('../load');
-const loadConfig = require('../load/config');
+const load = require('../server/load');
+const {CONFIG_FILE_NAME} = require('../constants');
 const createClientConfig = require('../webpack/client');
 const {applyConfigureWebpack} = require('../webpack/utils');
 
@@ -64,13 +64,10 @@ module.exports = async function start(siteDir, cliOptions = {}) {
         ),
       ),
     ).map(normalizeToSiteDir);
-    const fsWatcher = chokidar.watch(
-      [...pluginPaths, loadConfig.configFileName],
-      {
-        cwd: siteDir,
-        ignoreInitial: true,
-      },
-    );
+    const fsWatcher = chokidar.watch([...pluginPaths, CONFIG_FILE_NAME], {
+      cwd: siteDir,
+      ignoreInitial: true,
+    });
     ['add', 'change', 'unlink', 'addDir', 'unlinkDir'].forEach(event =>
       fsWatcher.on(event, reload),
     );
@@ -93,7 +90,7 @@ module.exports = async function start(siteDir, cliOptions = {}) {
         hash: true,
         template: path.resolve(
           __dirname,
-          '../core/templates/index.html.template.ejs',
+          '../client/templates/index.html.template.ejs',
         ),
         filename: 'index.html',
         title: siteConfig.title,
diff --git a/packages/docusaurus/lib/constants.js b/packages/docusaurus/lib/constants.js
index 9cebdb87da..fa0a7d576f 100644
--- a/packages/docusaurus/lib/constants.js
+++ b/packages/docusaurus/lib/constants.js
@@ -7,4 +7,5 @@
 
 module.exports = {
   GENERATED_FILES_DIR_NAME: '.docusaurus',
+  CONFIG_FILE_NAME: 'docusaurus.config.js',
 };
diff --git a/packages/docusaurus/lib/theme/BlogPage/index.js b/packages/docusaurus/lib/default-theme/BlogPage/index.js
similarity index 100%
rename from packages/docusaurus/lib/theme/BlogPage/index.js
rename to packages/docusaurus/lib/default-theme/BlogPage/index.js
diff --git a/packages/docusaurus/lib/theme/BlogPost/index.js b/packages/docusaurus/lib/default-theme/BlogPost/index.js
similarity index 100%
rename from packages/docusaurus/lib/theme/BlogPost/index.js
rename to packages/docusaurus/lib/default-theme/BlogPost/index.js
diff --git a/packages/docusaurus/lib/theme/Doc/index.js b/packages/docusaurus/lib/default-theme/Doc/index.js
similarity index 100%
rename from packages/docusaurus/lib/theme/Doc/index.js
rename to packages/docusaurus/lib/default-theme/Doc/index.js
diff --git a/packages/docusaurus/lib/theme/Doc/styles.module.css b/packages/docusaurus/lib/default-theme/Doc/styles.module.css
similarity index 100%
rename from packages/docusaurus/lib/theme/Doc/styles.module.css
rename to packages/docusaurus/lib/default-theme/Doc/styles.module.css
diff --git a/packages/docusaurus/lib/theme/DocBody/index.js b/packages/docusaurus/lib/default-theme/DocBody/index.js
similarity index 100%
rename from packages/docusaurus/lib/theme/DocBody/index.js
rename to packages/docusaurus/lib/default-theme/DocBody/index.js
diff --git a/packages/docusaurus/lib/theme/DocBody/styles.module.css b/packages/docusaurus/lib/default-theme/DocBody/styles.module.css
similarity index 100%
rename from packages/docusaurus/lib/theme/DocBody/styles.module.css
rename to packages/docusaurus/lib/default-theme/DocBody/styles.module.css
diff --git a/packages/docusaurus/lib/theme/DocsPaginator/index.js b/packages/docusaurus/lib/default-theme/DocsPaginator/index.js
similarity index 100%
rename from packages/docusaurus/lib/theme/DocsPaginator/index.js
rename to packages/docusaurus/lib/default-theme/DocsPaginator/index.js
diff --git a/packages/docusaurus/lib/theme/Footer/index.js b/packages/docusaurus/lib/default-theme/Footer/index.js
similarity index 100%
rename from packages/docusaurus/lib/theme/Footer/index.js
rename to packages/docusaurus/lib/default-theme/Footer/index.js
diff --git a/packages/docusaurus/lib/theme/Layout/index.js b/packages/docusaurus/lib/default-theme/Layout/index.js
similarity index 100%
rename from packages/docusaurus/lib/theme/Layout/index.js
rename to packages/docusaurus/lib/default-theme/Layout/index.js
diff --git a/packages/docusaurus/lib/theme/Layout/styles.css b/packages/docusaurus/lib/default-theme/Layout/styles.css
similarity index 100%
rename from packages/docusaurus/lib/theme/Layout/styles.css
rename to packages/docusaurus/lib/default-theme/Layout/styles.css
diff --git a/packages/docusaurus/lib/theme/Loading/index.js b/packages/docusaurus/lib/default-theme/Loading/index.js
similarity index 100%
rename from packages/docusaurus/lib/theme/Loading/index.js
rename to packages/docusaurus/lib/default-theme/Loading/index.js
diff --git a/packages/docusaurus/lib/theme/Loading/styles.module.css b/packages/docusaurus/lib/default-theme/Loading/styles.module.css
similarity index 100%
rename from packages/docusaurus/lib/theme/Loading/styles.module.css
rename to packages/docusaurus/lib/default-theme/Loading/styles.module.css
diff --git a/packages/docusaurus/lib/theme/Markdown/index.js b/packages/docusaurus/lib/default-theme/Markdown/index.js
similarity index 100%
rename from packages/docusaurus/lib/theme/Markdown/index.js
rename to packages/docusaurus/lib/default-theme/Markdown/index.js
diff --git a/packages/docusaurus/lib/theme/Navbar/index.js b/packages/docusaurus/lib/default-theme/Navbar/index.js
similarity index 100%
rename from packages/docusaurus/lib/theme/Navbar/index.js
rename to packages/docusaurus/lib/default-theme/Navbar/index.js
diff --git a/packages/docusaurus/lib/theme/Navbar/styles.module.css b/packages/docusaurus/lib/default-theme/Navbar/styles.module.css
similarity index 100%
rename from packages/docusaurus/lib/theme/Navbar/styles.module.css
rename to packages/docusaurus/lib/default-theme/Navbar/styles.module.css
diff --git a/packages/docusaurus/lib/theme/NotFound.js b/packages/docusaurus/lib/default-theme/NotFound.js
similarity index 100%
rename from packages/docusaurus/lib/theme/NotFound.js
rename to packages/docusaurus/lib/default-theme/NotFound.js
diff --git a/packages/docusaurus/lib/theme/Pages/index.js b/packages/docusaurus/lib/default-theme/Pages/index.js
similarity index 100%
rename from packages/docusaurus/lib/theme/Pages/index.js
rename to packages/docusaurus/lib/default-theme/Pages/index.js
diff --git a/packages/docusaurus/lib/theme/Post/index.js b/packages/docusaurus/lib/default-theme/Post/index.js
similarity index 100%
rename from packages/docusaurus/lib/theme/Post/index.js
rename to packages/docusaurus/lib/default-theme/Post/index.js
diff --git a/packages/docusaurus/lib/theme/Search/index.js b/packages/docusaurus/lib/default-theme/Search/index.js
similarity index 100%
rename from packages/docusaurus/lib/theme/Search/index.js
rename to packages/docusaurus/lib/default-theme/Search/index.js
diff --git a/packages/docusaurus/lib/theme/Search/styles.css b/packages/docusaurus/lib/default-theme/Search/styles.css
similarity index 100%
rename from packages/docusaurus/lib/theme/Search/styles.css
rename to packages/docusaurus/lib/default-theme/Search/styles.css
diff --git a/packages/docusaurus/lib/theme/Sidebar/index.js b/packages/docusaurus/lib/default-theme/Sidebar/index.js
similarity index 100%
rename from packages/docusaurus/lib/theme/Sidebar/index.js
rename to packages/docusaurus/lib/default-theme/Sidebar/index.js
diff --git a/packages/docusaurus/lib/theme/Sidebar/styles.module.css b/packages/docusaurus/lib/default-theme/Sidebar/styles.module.css
similarity index 100%
rename from packages/docusaurus/lib/theme/Sidebar/styles.module.css
rename to packages/docusaurus/lib/default-theme/Sidebar/styles.module.css
diff --git a/packages/docusaurus/lib/load/config.js b/packages/docusaurus/lib/server/load/config.js
similarity index 95%
rename from packages/docusaurus/lib/load/config.js
rename to packages/docusaurus/lib/server/load/config.js
index f0f41dcda8..dea8b23872 100644
--- a/packages/docusaurus/lib/load/config.js
+++ b/packages/docusaurus/lib/server/load/config.js
@@ -8,8 +8,7 @@
 const fs = require('fs-extra');
 const _ = require('lodash');
 const path = require('path');
-
-const CONFIG_FILE_NAME = 'docusaurus.config.js';
+const {CONFIG_FILE_NAME} = require('../../constants');
 
 const REQUIRED_FIELDS = [
   'baseUrl',
@@ -115,7 +114,4 @@ function loadConfig(siteDir, deleteCache = true) {
   return config;
 }
 
-module.exports = {
-  configFileName: CONFIG_FILE_NAME,
-  loadConfig,
-};
+module.exports = loadConfig;
diff --git a/packages/docusaurus/lib/load/env.js b/packages/docusaurus/lib/server/load/env.js
similarity index 92%
rename from packages/docusaurus/lib/load/env.js
rename to packages/docusaurus/lib/server/load/env.js
index 9bebe3f3c5..a1022df01e 100644
--- a/packages/docusaurus/lib/load/env.js
+++ b/packages/docusaurus/lib/server/load/env.js
@@ -8,7 +8,7 @@
 const fs = require('fs-extra');
 const path = require('path');
 const {idx} = require('@docusaurus/utils');
-const loadConfig = require('./config');
+const {CONFIG_FILE_NAME} = require('../../constants');
 
 module.exports = function loadEnv({siteDir, siteConfig}) {
   // Translation.
@@ -38,9 +38,7 @@ module.exports = function loadEnv({siteDir, siteConfig}) {
 
     if (!defaultLanguage) {
       throw new Error(
-        `Please set a default language in ${
-          loadConfig.configFileName
-        } which is enabled in languages.js`,
+        `Please set a default language in ${CONFIG_FILE_NAME} which is enabled in languages.js`,
       );
     }
 
diff --git a/packages/docusaurus/lib/load/index.js b/packages/docusaurus/lib/server/load/index.js
similarity index 93%
rename from packages/docusaurus/lib/load/index.js
rename to packages/docusaurus/lib/server/load/index.js
index bedc07bfeb..4ef79fdd77 100644
--- a/packages/docusaurus/lib/load/index.js
+++ b/packages/docusaurus/lib/server/load/index.js
@@ -16,7 +16,7 @@ const loadEnv = require('./env');
 const loadTheme = require('./theme');
 const loadRoutes = require('./routes');
 const loadPlugins = require('./plugins');
-const constants = require('../constants');
+const constants = require('../../constants');
 
 module.exports = async function load(siteDir, cliOptions = {}) {
   const generatedFilesDir = path.resolve(
@@ -25,10 +25,10 @@ module.exports = async function load(siteDir, cliOptions = {}) {
   );
 
   // Site Config
-  const siteConfig = loadConfig.loadConfig(siteDir);
+  const siteConfig = loadConfig(siteDir);
   await generate(
     generatedFilesDir,
-    loadConfig.configFileName,
+    constants.CONFIG_FILE_NAME,
     `export default ${JSON.stringify(siteConfig, null, 2)};`,
   );
 
@@ -67,7 +67,7 @@ module.exports = async function load(siteDir, cliOptions = {}) {
   // Generate contents metadata.
   const metadataTemplateFile = path.resolve(
     __dirname,
-    '../core/templates/metadata.template.ejs',
+    '../../client/templates/metadata.template.ejs',
   );
   const metadataTemplate = fs.readFileSync(metadataTemplateFile).toString();
   const pluginMetadataImports = _.compact(pluginsLoadedContent).map(
diff --git a/packages/docusaurus/lib/load/plugins.js b/packages/docusaurus/lib/server/load/plugins.js
similarity index 100%
rename from packages/docusaurus/lib/load/plugins.js
rename to packages/docusaurus/lib/server/load/plugins.js
diff --git a/packages/docusaurus/lib/load/routes.js b/packages/docusaurus/lib/server/load/routes.js
similarity index 100%
rename from packages/docusaurus/lib/load/routes.js
rename to packages/docusaurus/lib/server/load/routes.js
diff --git a/packages/docusaurus/lib/load/theme.js b/packages/docusaurus/lib/server/load/theme.js
similarity index 93%
rename from packages/docusaurus/lib/load/theme.js
rename to packages/docusaurus/lib/server/load/theme.js
index 819cd9737a..aeaf027f9a 100644
--- a/packages/docusaurus/lib/load/theme.js
+++ b/packages/docusaurus/lib/server/load/theme.js
@@ -12,7 +12,7 @@ module.exports = function loadConfig(siteDir) {
   const customThemePath = path.resolve(siteDir, 'theme');
   const themePath = fs.existsSync(customThemePath)
     ? customThemePath
-    : path.resolve(__dirname, '../theme');
+    : path.resolve(__dirname, '../../default-theme');
 
   const themeComponents = [
     'Doc',
diff --git a/packages/docusaurus/lib/webpack/base.js b/packages/docusaurus/lib/webpack/base.js
index cb7eaea717..e2220cb9dd 100644
--- a/packages/docusaurus/lib/webpack/base.js
+++ b/packages/docusaurus/lib/webpack/base.js
@@ -43,8 +43,7 @@ module.exports = function createBaseConfig(props, isServer) {
         '@site': siteDir,
         '@build': outDir,
         '@generated': generatedFilesDir,
-        '@core': path.resolve(__dirname, '../core'),
-        '@docusaurus': path.resolve(__dirname, '../docusaurus'),
+        '@docusaurus': path.resolve(__dirname, '../client/exports'),
       },
       modules: [
         'node_modules',
diff --git a/packages/docusaurus/lib/webpack/client.js b/packages/docusaurus/lib/webpack/client.js
index a774b11f60..bdc08149af 100644
--- a/packages/docusaurus/lib/webpack/client.js
+++ b/packages/docusaurus/lib/webpack/client.js
@@ -18,7 +18,7 @@ module.exports = function createClientConfig(props) {
 
   const clientConfig = merge(config, {
     entry: {
-      main: path.resolve(__dirname, '../core/clientEntry.js'),
+      main: path.resolve(__dirname, '../client/clientEntry.js'),
     },
     plugins: [
       // Generate manifests file
diff --git a/packages/docusaurus/lib/webpack/server.js b/packages/docusaurus/lib/webpack/server.js
index 3f1d9797ed..63a9200e90 100644
--- a/packages/docusaurus/lib/webpack/server.js
+++ b/packages/docusaurus/lib/webpack/server.js
@@ -19,7 +19,7 @@ module.exports = function createServerConfig(props) {
 
   const serverConfig = merge(config, {
     entry: {
-      main: path.resolve(__dirname, '../core/serverEntry.js'),
+      main: path.resolve(__dirname, '../client/serverEntry.js'),
     },
     output: {
       filename: 'server.bundle.js',
diff --git a/packages/docusaurus/test/load/config.test.js b/packages/docusaurus/test/load/config.test.js
index af15c2d75b..18dc3960bb 100644
--- a/packages/docusaurus/test/load/config.test.js
+++ b/packages/docusaurus/test/load/config.test.js
@@ -6,7 +6,7 @@
  */
 
 import path from 'path';
-import {loadConfig} from '@lib/load/config';
+import loadConfig from '@lib/server/load/config';
 import loadSetup from '../loadSetup';
 
 describe('loadConfig', () => {
diff --git a/packages/docusaurus/test/load/env.test.js b/packages/docusaurus/test/load/env.test.js
index 656ddc94bc..f88689ebbc 100644
--- a/packages/docusaurus/test/load/env.test.js
+++ b/packages/docusaurus/test/load/env.test.js
@@ -6,7 +6,7 @@
  */
 
 import path from 'path';
-import loadEnv from '@lib/load/env';
+import loadEnv from '@lib/server/load/env';
 import loadSetup from '../loadSetup';
 
 describe('loadEnv', () => {
diff --git a/packages/docusaurus/test/loadSetup.js b/packages/docusaurus/test/loadSetup.js
index e35274cf9a..74c60f68ad 100644
--- a/packages/docusaurus/test/loadSetup.js
+++ b/packages/docusaurus/test/loadSetup.js
@@ -7,7 +7,7 @@
 
 import '@babel/polyfill';
 import path from 'path';
-import load from '@lib/load';
+import load from '@lib/server/load';
 
 // Helper methods to setup dummy/fake projects
 const loadSetup = async name => {