diff --git a/.codesandbox/ci.json b/.codesandbox/ci.json
index 5b1f405df8d9..b1c5c541ead1 100644
--- a/.codesandbox/ci.json
+++ b/.codesandbox/ci.json
@@ -4,13 +4,13 @@
     "packages/x-license",
     "packages/grid/data-grid",
     "packages/grid/x-grid",
-    "packages/grid/x-grid-data-generator"
+    "packages/x-grid-data-generator"
   ],
   "publishDirectory": {
     "@material-ui/x-license": "packages/x-license",
     "@material-ui/data-grid": "packages/grid/data-grid",
     "@material-ui/x-grid": "packages/grid/x-grid",
-    "@material-ui/x-grid-data-generator": "packages/grid/x-grid-data-generator"
+    "@material-ui/x-grid-data-generator": "packages/x-grid-data-generator"
   },
   "sandboxes": [
     "new",
diff --git a/.eslintignore b/.eslintignore
index f95a42614c1d..d1d5ed0fd7e2 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -3,9 +3,7 @@
 /docs/export
 /lerna.json
 /packages/demo-app/public/static-data
-/packages/grid/lib/lodash
-/packages/grid/x-grid-modules/lib/autosizer
-/packages/grid/x-grid-modules/lib/lodash
+lib
 CHANGELOG.md
 dist
 node_modules
diff --git a/babel.config.js b/babel.config.js
index e6a9950a2fc1..948ac80af7fc 100644
--- a/babel.config.js
+++ b/babel.config.js
@@ -19,8 +19,7 @@ if (process.env.BABEL_ENV === 'es') {
 
 const defaultAlias = {
   '@material-ui/data-grid': './packages/grid/data-grid/src',
-  '@material-ui/x-grid-data-generator': './packages/grid/x-grid-data-generator/src',
-  '@material-ui/x-grid-modules': './packages/grid/x-grid-modules/src',
+  '@material-ui/x-grid-data-generator': './packages/x-grid-data-generator/src',
   '@material-ui/x-grid': './packages/grid/x-grid/src',
   '@material-ui/x-license': './packages/x-license/src',
 };
diff --git a/docs/babel.config.js b/docs/babel.config.js
index 5aab2abbc2d6..9edf7b1d1932 100644
--- a/docs/babel.config.js
+++ b/docs/babel.config.js
@@ -12,8 +12,7 @@ function resolvePath(sourcePath, currentFile, opts) {
 
 const alias = {
   '@material-ui/data-grid': '../packages/grid/data-grid/src',
-  '@material-ui/x-grid-data-generator': '../packages/grid/x-grid-data-generator/src',
-  '@material-ui/x-grid-modules': '../packages/grid/x-grid-modules/src',
+  '@material-ui/x-grid-data-generator': '../packages/x-grid-data-generator/src',
   '@material-ui/x-grid': '../packages/grid/x-grid/src',
   '@material-ui/x-license': '../packages/x-license/src',
   // Help in the event npm and git are significantly desynchronized.
diff --git a/package.json b/package.json
index 6e978a2e4ef9..17fef6809157 100644
--- a/package.json
+++ b/package.json
@@ -27,9 +27,10 @@
     "eslint:ci": "eslint . --report-unused-disable-directives --ext .js,.ts,.tsx",
     "jsonlint": "node scripts/jsonlint.js",
     "typescript": "lerna run typescript --parallel",
-    "build:codesandbox": "yarn lerna:build",
-    "lerna:build": "cd packages/x-license && yarn build && cd ../grid/x-grid-modules && yarn build && cd ../data-grid && yarn build && cd ../x-grid && yarn build && cd ../x-grid-data-generator && yarn build",
-    "lerna:publish": "lerna publish"
+    "build:codesandbox": "yarn build",
+    "build": "cd packages/x-license && yarn build && cd ../grid && yarn build && cd ../x-grid-data-generator && yarn build",
+    "publish": "yarn build && lerna publish",
+    "fake-publish": "lerna publish --no-git-tag-version --no-push --registry=\"http://localhost:4873/\""
   },
   "devDependencies": {
     "@babel/core": "^7.10.2",
diff --git a/packages/grid/x-grid-modules/src/GridComponent.tsx b/packages/grid/_modules_/grid/GridComponent.tsx
similarity index 100%
rename from packages/grid/x-grid-modules/src/GridComponent.tsx
rename to packages/grid/_modules_/grid/GridComponent.tsx
diff --git a/packages/grid/x-grid-modules/src/GridComponentProps.ts b/packages/grid/_modules_/grid/GridComponentProps.ts
similarity index 100%
rename from packages/grid/x-grid-modules/src/GridComponentProps.ts
rename to packages/grid/_modules_/grid/GridComponentProps.ts
diff --git a/packages/grid/x-grid-modules/src/components/api-context.ts b/packages/grid/_modules_/grid/components/api-context.ts
similarity index 100%
rename from packages/grid/x-grid-modules/src/components/api-context.ts
rename to packages/grid/_modules_/grid/components/api-context.ts
diff --git a/packages/grid/_modules_/grid/components/autosizer.tsx b/packages/grid/_modules_/grid/components/autosizer.tsx
new file mode 100644
index 000000000000..7391028e3598
--- /dev/null
+++ b/packages/grid/_modules_/grid/components/autosizer.tsx
@@ -0,0 +1,3 @@
+import AutoSizer from '../lib/autosizer';
+
+export const AutoSizerWrapper = AutoSizer;
diff --git a/packages/grid/x-grid-modules/src/components/cell.tsx b/packages/grid/_modules_/grid/components/cell.tsx
similarity index 100%
rename from packages/grid/x-grid-modules/src/components/cell.tsx
rename to packages/grid/_modules_/grid/components/cell.tsx
diff --git a/packages/grid/x-grid-modules/src/components/checkbox-renderer.tsx b/packages/grid/_modules_/grid/components/checkbox-renderer.tsx
similarity index 100%
rename from packages/grid/x-grid-modules/src/components/checkbox-renderer.tsx
rename to packages/grid/_modules_/grid/components/checkbox-renderer.tsx
diff --git a/packages/grid/x-grid-modules/src/components/column-header-item.tsx b/packages/grid/_modules_/grid/components/column-header-item.tsx
similarity index 100%
rename from packages/grid/x-grid-modules/src/components/column-header-item.tsx
rename to packages/grid/_modules_/grid/components/column-header-item.tsx
diff --git a/packages/grid/x-grid-modules/src/components/column-header-separator.tsx b/packages/grid/_modules_/grid/components/column-header-separator.tsx
similarity index 100%
rename from packages/grid/x-grid-modules/src/components/column-header-separator.tsx
rename to packages/grid/_modules_/grid/components/column-header-separator.tsx
diff --git a/packages/grid/x-grid-modules/src/components/column-header-sort-icon.tsx b/packages/grid/_modules_/grid/components/column-header-sort-icon.tsx
similarity index 100%
rename from packages/grid/x-grid-modules/src/components/column-header-sort-icon.tsx
rename to packages/grid/_modules_/grid/components/column-header-sort-icon.tsx
diff --git a/packages/grid/x-grid-modules/src/components/column-header-title.tsx b/packages/grid/_modules_/grid/components/column-header-title.tsx
similarity index 100%
rename from packages/grid/x-grid-modules/src/components/column-header-title.tsx
rename to packages/grid/_modules_/grid/components/column-header-title.tsx
diff --git a/packages/grid/x-grid-modules/src/components/column-headers.tsx b/packages/grid/_modules_/grid/components/column-headers.tsx
similarity index 100%
rename from packages/grid/x-grid-modules/src/components/column-headers.tsx
rename to packages/grid/_modules_/grid/components/column-headers.tsx
diff --git a/packages/grid/x-grid-modules/src/components/default-footer.tsx b/packages/grid/_modules_/grid/components/default-footer.tsx
similarity index 100%
rename from packages/grid/x-grid-modules/src/components/default-footer.tsx
rename to packages/grid/_modules_/grid/components/default-footer.tsx
diff --git a/packages/grid/x-grid-modules/src/components/error-boundary.tsx b/packages/grid/_modules_/grid/components/error-boundary.tsx
similarity index 100%
rename from packages/grid/x-grid-modules/src/components/error-boundary.tsx
rename to packages/grid/_modules_/grid/components/error-boundary.tsx
diff --git a/packages/grid/x-grid-modules/src/components/error-message.tsx b/packages/grid/_modules_/grid/components/error-message.tsx
similarity index 100%
rename from packages/grid/x-grid-modules/src/components/error-message.tsx
rename to packages/grid/_modules_/grid/components/error-message.tsx
diff --git a/packages/grid/x-grid-modules/src/components/icons/index.tsx b/packages/grid/_modules_/grid/components/icons/index.tsx
similarity index 100%
rename from packages/grid/x-grid-modules/src/components/icons/index.tsx
rename to packages/grid/_modules_/grid/components/icons/index.tsx
diff --git a/packages/grid/x-grid-modules/src/components/index.ts b/packages/grid/_modules_/grid/components/index.ts
similarity index 100%
rename from packages/grid/x-grid-modules/src/components/index.ts
rename to packages/grid/_modules_/grid/components/index.ts
diff --git a/packages/grid/x-grid-modules/src/components/loading-overlay.tsx b/packages/grid/_modules_/grid/components/loading-overlay.tsx
similarity index 100%
rename from packages/grid/x-grid-modules/src/components/loading-overlay.tsx
rename to packages/grid/_modules_/grid/components/loading-overlay.tsx
diff --git a/packages/grid/x-grid-modules/src/components/no-row-message.tsx b/packages/grid/_modules_/grid/components/no-row-message.tsx
similarity index 100%
rename from packages/grid/x-grid-modules/src/components/no-row-message.tsx
rename to packages/grid/_modules_/grid/components/no-row-message.tsx
diff --git a/packages/grid/x-grid-modules/src/components/options-context.ts b/packages/grid/_modules_/grid/components/options-context.ts
similarity index 100%
rename from packages/grid/x-grid-modules/src/components/options-context.ts
rename to packages/grid/_modules_/grid/components/options-context.ts
diff --git a/packages/grid/x-grid-modules/src/components/pagination.tsx b/packages/grid/_modules_/grid/components/pagination.tsx
similarity index 100%
rename from packages/grid/x-grid-modules/src/components/pagination.tsx
rename to packages/grid/_modules_/grid/components/pagination.tsx
diff --git a/packages/grid/x-grid-modules/src/components/render-context.ts b/packages/grid/_modules_/grid/components/render-context.ts
similarity index 100%
rename from packages/grid/x-grid-modules/src/components/render-context.ts
rename to packages/grid/_modules_/grid/components/render-context.ts
diff --git a/packages/grid/x-grid-modules/src/components/rendering-zone.tsx b/packages/grid/_modules_/grid/components/rendering-zone.tsx
similarity index 100%
rename from packages/grid/x-grid-modules/src/components/rendering-zone.tsx
rename to packages/grid/_modules_/grid/components/rendering-zone.tsx
diff --git a/packages/grid/x-grid-modules/src/components/row-cells.tsx b/packages/grid/_modules_/grid/components/row-cells.tsx
similarity index 100%
rename from packages/grid/x-grid-modules/src/components/row-cells.tsx
rename to packages/grid/_modules_/grid/components/row-cells.tsx
diff --git a/packages/grid/x-grid-modules/src/components/row-count.tsx b/packages/grid/_modules_/grid/components/row-count.tsx
similarity index 100%
rename from packages/grid/x-grid-modules/src/components/row-count.tsx
rename to packages/grid/_modules_/grid/components/row-count.tsx
diff --git a/packages/grid/x-grid-modules/src/components/row.tsx b/packages/grid/_modules_/grid/components/row.tsx
similarity index 100%
rename from packages/grid/x-grid-modules/src/components/row.tsx
rename to packages/grid/_modules_/grid/components/row.tsx
diff --git a/packages/grid/x-grid-modules/src/components/selected-row-count.tsx b/packages/grid/_modules_/grid/components/selected-row-count.tsx
similarity index 100%
rename from packages/grid/x-grid-modules/src/components/selected-row-count.tsx
rename to packages/grid/_modules_/grid/components/selected-row-count.tsx
diff --git a/packages/grid/x-grid-modules/src/components/sticky-container.tsx b/packages/grid/_modules_/grid/components/sticky-container.tsx
similarity index 100%
rename from packages/grid/x-grid-modules/src/components/sticky-container.tsx
rename to packages/grid/_modules_/grid/components/sticky-container.tsx
diff --git a/packages/grid/x-grid-modules/src/components/styled-wrappers/GridColumnsContainer.tsx b/packages/grid/_modules_/grid/components/styled-wrappers/GridColumnsContainer.tsx
similarity index 100%
rename from packages/grid/x-grid-modules/src/components/styled-wrappers/GridColumnsContainer.tsx
rename to packages/grid/_modules_/grid/components/styled-wrappers/GridColumnsContainer.tsx
diff --git a/packages/grid/x-grid-modules/src/components/styled-wrappers/GridDataContainer.tsx b/packages/grid/_modules_/grid/components/styled-wrappers/GridDataContainer.tsx
similarity index 100%
rename from packages/grid/x-grid-modules/src/components/styled-wrappers/GridDataContainer.tsx
rename to packages/grid/_modules_/grid/components/styled-wrappers/GridDataContainer.tsx
diff --git a/packages/grid/x-grid-modules/src/components/styled-wrappers/GridFooter.tsx b/packages/grid/_modules_/grid/components/styled-wrappers/GridFooter.tsx
similarity index 100%
rename from packages/grid/x-grid-modules/src/components/styled-wrappers/GridFooter.tsx
rename to packages/grid/_modules_/grid/components/styled-wrappers/GridFooter.tsx
diff --git a/packages/grid/x-grid-modules/src/components/styled-wrappers/GridOverlay.tsx b/packages/grid/_modules_/grid/components/styled-wrappers/GridOverlay.tsx
similarity index 100%
rename from packages/grid/x-grid-modules/src/components/styled-wrappers/GridOverlay.tsx
rename to packages/grid/_modules_/grid/components/styled-wrappers/GridOverlay.tsx
diff --git a/packages/grid/x-grid-modules/src/components/styled-wrappers/GridRoot.tsx b/packages/grid/_modules_/grid/components/styled-wrappers/GridRoot.tsx
similarity index 100%
rename from packages/grid/x-grid-modules/src/components/styled-wrappers/GridRoot.tsx
rename to packages/grid/_modules_/grid/components/styled-wrappers/GridRoot.tsx
diff --git a/packages/grid/x-grid-modules/src/components/styled-wrappers/GridRootStyles.ts b/packages/grid/_modules_/grid/components/styled-wrappers/GridRootStyles.ts
similarity index 100%
rename from packages/grid/x-grid-modules/src/components/styled-wrappers/GridRootStyles.ts
rename to packages/grid/_modules_/grid/components/styled-wrappers/GridRootStyles.ts
diff --git a/packages/grid/x-grid-modules/src/components/styled-wrappers/GridWindow.tsx b/packages/grid/_modules_/grid/components/styled-wrappers/GridWindow.tsx
similarity index 100%
rename from packages/grid/x-grid-modules/src/components/styled-wrappers/GridWindow.tsx
rename to packages/grid/_modules_/grid/components/styled-wrappers/GridWindow.tsx
diff --git a/packages/grid/x-grid-modules/src/components/styled-wrappers/index.ts b/packages/grid/_modules_/grid/components/styled-wrappers/index.ts
similarity index 100%
rename from packages/grid/x-grid-modules/src/components/styled-wrappers/index.ts
rename to packages/grid/_modules_/grid/components/styled-wrappers/index.ts
diff --git a/packages/grid/x-grid-modules/src/components/viewport.tsx b/packages/grid/_modules_/grid/components/viewport.tsx
similarity index 100%
rename from packages/grid/x-grid-modules/src/components/viewport.tsx
rename to packages/grid/_modules_/grid/components/viewport.tsx
diff --git a/packages/grid/x-grid-modules/src/components/watermark.tsx b/packages/grid/_modules_/grid/components/watermark.tsx
similarity index 100%
rename from packages/grid/x-grid-modules/src/components/watermark.tsx
rename to packages/grid/_modules_/grid/components/watermark.tsx
diff --git a/packages/grid/x-grid-modules/src/constants/cssClassesConstants.ts b/packages/grid/_modules_/grid/constants/cssClassesConstants.ts
similarity index 100%
rename from packages/grid/x-grid-modules/src/constants/cssClassesConstants.ts
rename to packages/grid/_modules_/grid/constants/cssClassesConstants.ts
diff --git a/packages/grid/x-grid-modules/src/constants/eventsConstants.ts b/packages/grid/_modules_/grid/constants/eventsConstants.ts
similarity index 100%
rename from packages/grid/x-grid-modules/src/constants/eventsConstants.ts
rename to packages/grid/_modules_/grid/constants/eventsConstants.ts
diff --git a/packages/grid/x-grid-modules/src/constants/index.ts b/packages/grid/_modules_/grid/constants/index.ts
similarity index 100%
rename from packages/grid/x-grid-modules/src/constants/index.ts
rename to packages/grid/_modules_/grid/constants/index.ts
diff --git a/packages/grid/x-grid-modules/src/hooks/features/index.ts b/packages/grid/_modules_/grid/hooks/features/index.ts
similarity index 100%
rename from packages/grid/x-grid-modules/src/hooks/features/index.ts
rename to packages/grid/_modules_/grid/hooks/features/index.ts
diff --git a/packages/grid/x-grid-modules/src/hooks/features/useApiRef.ts b/packages/grid/_modules_/grid/hooks/features/useApiRef.ts
similarity index 100%
rename from packages/grid/x-grid-modules/src/hooks/features/useApiRef.ts
rename to packages/grid/_modules_/grid/hooks/features/useApiRef.ts
diff --git a/packages/grid/x-grid-modules/src/hooks/features/useColumnResize.tsx b/packages/grid/_modules_/grid/hooks/features/useColumnResize.tsx
similarity index 100%
rename from packages/grid/x-grid-modules/src/hooks/features/useColumnResize.tsx
rename to packages/grid/_modules_/grid/hooks/features/useColumnResize.tsx
diff --git a/packages/grid/x-grid-modules/src/hooks/features/useComponents.tsx b/packages/grid/_modules_/grid/hooks/features/useComponents.tsx
similarity index 100%
rename from packages/grid/x-grid-modules/src/hooks/features/useComponents.tsx
rename to packages/grid/_modules_/grid/hooks/features/useComponents.tsx
diff --git a/packages/grid/x-grid-modules/src/hooks/features/usePagination.ts b/packages/grid/_modules_/grid/hooks/features/usePagination.ts
similarity index 100%
rename from packages/grid/x-grid-modules/src/hooks/features/usePagination.ts
rename to packages/grid/_modules_/grid/hooks/features/usePagination.ts
diff --git a/packages/grid/x-grid-modules/src/hooks/features/useSelection.ts b/packages/grid/_modules_/grid/hooks/features/useSelection.ts
similarity index 100%
rename from packages/grid/x-grid-modules/src/hooks/features/useSelection.ts
rename to packages/grid/_modules_/grid/hooks/features/useSelection.ts
diff --git a/packages/grid/x-grid-modules/src/hooks/features/useSorting.ts b/packages/grid/_modules_/grid/hooks/features/useSorting.ts
similarity index 100%
rename from packages/grid/x-grid-modules/src/hooks/features/useSorting.ts
rename to packages/grid/_modules_/grid/hooks/features/useSorting.ts
diff --git a/packages/grid/x-grid-modules/src/hooks/index.ts b/packages/grid/_modules_/grid/hooks/index.ts
similarity index 100%
rename from packages/grid/x-grid-modules/src/hooks/index.ts
rename to packages/grid/_modules_/grid/hooks/index.ts
diff --git a/packages/grid/x-grid-modules/src/hooks/root/index.ts b/packages/grid/_modules_/grid/hooks/root/index.ts
similarity index 100%
rename from packages/grid/x-grid-modules/src/hooks/root/index.ts
rename to packages/grid/_modules_/grid/hooks/root/index.ts
diff --git a/packages/grid/x-grid-modules/src/hooks/root/useApi.ts b/packages/grid/_modules_/grid/hooks/root/useApi.ts
similarity index 100%
rename from packages/grid/x-grid-modules/src/hooks/root/useApi.ts
rename to packages/grid/_modules_/grid/hooks/root/useApi.ts
diff --git a/packages/grid/x-grid-modules/src/hooks/root/useApiEventHandler.ts b/packages/grid/_modules_/grid/hooks/root/useApiEventHandler.ts
similarity index 100%
rename from packages/grid/x-grid-modules/src/hooks/root/useApiEventHandler.ts
rename to packages/grid/_modules_/grid/hooks/root/useApiEventHandler.ts
diff --git a/packages/grid/x-grid-modules/src/hooks/root/useApiMethod.ts b/packages/grid/_modules_/grid/hooks/root/useApiMethod.ts
similarity index 100%
rename from packages/grid/x-grid-modules/src/hooks/root/useApiMethod.ts
rename to packages/grid/_modules_/grid/hooks/root/useApiMethod.ts
diff --git a/packages/grid/x-grid-modules/src/hooks/root/useColumns.ts b/packages/grid/_modules_/grid/hooks/root/useColumns.ts
similarity index 100%
rename from packages/grid/x-grid-modules/src/hooks/root/useColumns.ts
rename to packages/grid/_modules_/grid/hooks/root/useColumns.ts
diff --git a/packages/grid/x-grid-modules/src/hooks/root/useContainerProps.ts b/packages/grid/_modules_/grid/hooks/root/useContainerProps.ts
similarity index 100%
rename from packages/grid/x-grid-modules/src/hooks/root/useContainerProps.ts
rename to packages/grid/_modules_/grid/hooks/root/useContainerProps.ts
diff --git a/packages/grid/x-grid-modules/src/hooks/root/useEvents.ts b/packages/grid/_modules_/grid/hooks/root/useEvents.ts
similarity index 100%
rename from packages/grid/x-grid-modules/src/hooks/root/useEvents.ts
rename to packages/grid/_modules_/grid/hooks/root/useEvents.ts
diff --git a/packages/grid/x-grid-modules/src/hooks/root/useKeyboard.ts b/packages/grid/_modules_/grid/hooks/root/useKeyboard.ts
similarity index 100%
rename from packages/grid/x-grid-modules/src/hooks/root/useKeyboard.ts
rename to packages/grid/_modules_/grid/hooks/root/useKeyboard.ts
diff --git a/packages/grid/x-grid-modules/src/hooks/root/useNativeEventListener.ts b/packages/grid/_modules_/grid/hooks/root/useNativeEventListener.ts
similarity index 100%
rename from packages/grid/x-grid-modules/src/hooks/root/useNativeEventListener.ts
rename to packages/grid/_modules_/grid/hooks/root/useNativeEventListener.ts
diff --git a/packages/grid/x-grid-modules/src/hooks/root/useRows.ts b/packages/grid/_modules_/grid/hooks/root/useRows.ts
similarity index 100%
rename from packages/grid/x-grid-modules/src/hooks/root/useRows.ts
rename to packages/grid/_modules_/grid/hooks/root/useRows.ts
diff --git a/packages/grid/x-grid-modules/src/hooks/utils/index.ts b/packages/grid/_modules_/grid/hooks/utils/index.ts
similarity index 100%
rename from packages/grid/x-grid-modules/src/hooks/utils/index.ts
rename to packages/grid/_modules_/grid/hooks/utils/index.ts
diff --git a/packages/grid/x-grid-modules/src/hooks/utils/useIcons.ts b/packages/grid/_modules_/grid/hooks/utils/useIcons.ts
similarity index 100%
rename from packages/grid/x-grid-modules/src/hooks/utils/useIcons.ts
rename to packages/grid/_modules_/grid/hooks/utils/useIcons.ts
diff --git a/packages/grid/x-grid-modules/src/hooks/utils/useLogger.ts b/packages/grid/_modules_/grid/hooks/utils/useLogger.ts
similarity index 100%
rename from packages/grid/x-grid-modules/src/hooks/utils/useLogger.ts
rename to packages/grid/_modules_/grid/hooks/utils/useLogger.ts
diff --git a/packages/grid/x-grid-modules/src/hooks/utils/useOptionsProp.ts b/packages/grid/_modules_/grid/hooks/utils/useOptionsProp.ts
similarity index 100%
rename from packages/grid/x-grid-modules/src/hooks/utils/useOptionsProp.ts
rename to packages/grid/_modules_/grid/hooks/utils/useOptionsProp.ts
diff --git a/packages/grid/x-grid-modules/src/hooks/utils/useRafUpdate.ts b/packages/grid/_modules_/grid/hooks/utils/useRafUpdate.ts
similarity index 100%
rename from packages/grid/x-grid-modules/src/hooks/utils/useRafUpdate.ts
rename to packages/grid/_modules_/grid/hooks/utils/useRafUpdate.ts
diff --git a/packages/grid/x-grid-modules/src/hooks/utils/useScrollFn.ts b/packages/grid/_modules_/grid/hooks/utils/useScrollFn.ts
similarity index 100%
rename from packages/grid/x-grid-modules/src/hooks/utils/useScrollFn.ts
rename to packages/grid/_modules_/grid/hooks/utils/useScrollFn.ts
diff --git a/packages/grid/x-grid-modules/src/hooks/utils/useStateRef.ts b/packages/grid/_modules_/grid/hooks/utils/useStateRef.ts
similarity index 100%
rename from packages/grid/x-grid-modules/src/hooks/utils/useStateRef.ts
rename to packages/grid/_modules_/grid/hooks/utils/useStateRef.ts
diff --git a/packages/grid/x-grid-modules/src/hooks/virtualization/index.ts b/packages/grid/_modules_/grid/hooks/virtualization/index.ts
similarity index 100%
rename from packages/grid/x-grid-modules/src/hooks/virtualization/index.ts
rename to packages/grid/_modules_/grid/hooks/virtualization/index.ts
diff --git a/packages/grid/x-grid-modules/src/hooks/virtualization/useVirtualColumns.ts b/packages/grid/_modules_/grid/hooks/virtualization/useVirtualColumns.ts
similarity index 100%
rename from packages/grid/x-grid-modules/src/hooks/virtualization/useVirtualColumns.ts
rename to packages/grid/_modules_/grid/hooks/virtualization/useVirtualColumns.ts
diff --git a/packages/grid/x-grid-modules/src/hooks/virtualization/useVirtualRows.ts b/packages/grid/_modules_/grid/hooks/virtualization/useVirtualRows.ts
similarity index 100%
rename from packages/grid/x-grid-modules/src/hooks/virtualization/useVirtualRows.ts
rename to packages/grid/_modules_/grid/hooks/virtualization/useVirtualRows.ts
diff --git a/packages/grid/x-grid-modules/src/index.ts b/packages/grid/_modules_/grid/index.ts
similarity index 100%
rename from packages/grid/x-grid-modules/src/index.ts
rename to packages/grid/_modules_/grid/index.ts
diff --git a/packages/grid/x-grid-modules/lib/autosizer/index.js b/packages/grid/_modules_/grid/lib/autosizer/index.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/autosizer/index.js
rename to packages/grid/_modules_/grid/lib/autosizer/index.js
diff --git a/packages/grid/x-grid-modules/lib/autosizer/types.d.ts b/packages/grid/_modules_/grid/lib/autosizer/types.d.ts
similarity index 100%
rename from packages/grid/x-grid-modules/lib/autosizer/types.d.ts
rename to packages/grid/_modules_/grid/lib/autosizer/types.d.ts
diff --git a/packages/grid/x-grid-modules/lib/lodash/_DataView.js b/packages/grid/_modules_/grid/lib/lodash/_DataView.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/_DataView.js
rename to packages/grid/_modules_/grid/lib/lodash/_DataView.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/_Hash.js b/packages/grid/_modules_/grid/lib/lodash/_Hash.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/_Hash.js
rename to packages/grid/_modules_/grid/lib/lodash/_Hash.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/_ListCache.js b/packages/grid/_modules_/grid/lib/lodash/_ListCache.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/_ListCache.js
rename to packages/grid/_modules_/grid/lib/lodash/_ListCache.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/_Map.js b/packages/grid/_modules_/grid/lib/lodash/_Map.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/_Map.js
rename to packages/grid/_modules_/grid/lib/lodash/_Map.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/_MapCache.js b/packages/grid/_modules_/grid/lib/lodash/_MapCache.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/_MapCache.js
rename to packages/grid/_modules_/grid/lib/lodash/_MapCache.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/_Promise.js b/packages/grid/_modules_/grid/lib/lodash/_Promise.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/_Promise.js
rename to packages/grid/_modules_/grid/lib/lodash/_Promise.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/_Set.js b/packages/grid/_modules_/grid/lib/lodash/_Set.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/_Set.js
rename to packages/grid/_modules_/grid/lib/lodash/_Set.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/_SetCache.js b/packages/grid/_modules_/grid/lib/lodash/_SetCache.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/_SetCache.js
rename to packages/grid/_modules_/grid/lib/lodash/_SetCache.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/_Stack.js b/packages/grid/_modules_/grid/lib/lodash/_Stack.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/_Stack.js
rename to packages/grid/_modules_/grid/lib/lodash/_Stack.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/_Symbol.js b/packages/grid/_modules_/grid/lib/lodash/_Symbol.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/_Symbol.js
rename to packages/grid/_modules_/grid/lib/lodash/_Symbol.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/_Uint8Array.js b/packages/grid/_modules_/grid/lib/lodash/_Uint8Array.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/_Uint8Array.js
rename to packages/grid/_modules_/grid/lib/lodash/_Uint8Array.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/_WeakMap.js b/packages/grid/_modules_/grid/lib/lodash/_WeakMap.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/_WeakMap.js
rename to packages/grid/_modules_/grid/lib/lodash/_WeakMap.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/_arrayFilter.js b/packages/grid/_modules_/grid/lib/lodash/_arrayFilter.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/_arrayFilter.js
rename to packages/grid/_modules_/grid/lib/lodash/_arrayFilter.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/_arrayLikeKeys.js b/packages/grid/_modules_/grid/lib/lodash/_arrayLikeKeys.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/_arrayLikeKeys.js
rename to packages/grid/_modules_/grid/lib/lodash/_arrayLikeKeys.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/_arrayPush.js b/packages/grid/_modules_/grid/lib/lodash/_arrayPush.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/_arrayPush.js
rename to packages/grid/_modules_/grid/lib/lodash/_arrayPush.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/_arraySome.js b/packages/grid/_modules_/grid/lib/lodash/_arraySome.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/_arraySome.js
rename to packages/grid/_modules_/grid/lib/lodash/_arraySome.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/_assocIndexOf.js b/packages/grid/_modules_/grid/lib/lodash/_assocIndexOf.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/_assocIndexOf.js
rename to packages/grid/_modules_/grid/lib/lodash/_assocIndexOf.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/_baseGetAllKeys.js b/packages/grid/_modules_/grid/lib/lodash/_baseGetAllKeys.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/_baseGetAllKeys.js
rename to packages/grid/_modules_/grid/lib/lodash/_baseGetAllKeys.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/_baseGetTag.js b/packages/grid/_modules_/grid/lib/lodash/_baseGetTag.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/_baseGetTag.js
rename to packages/grid/_modules_/grid/lib/lodash/_baseGetTag.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/_baseIsArguments.js b/packages/grid/_modules_/grid/lib/lodash/_baseIsArguments.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/_baseIsArguments.js
rename to packages/grid/_modules_/grid/lib/lodash/_baseIsArguments.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/_baseIsEqual.js b/packages/grid/_modules_/grid/lib/lodash/_baseIsEqual.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/_baseIsEqual.js
rename to packages/grid/_modules_/grid/lib/lodash/_baseIsEqual.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/_baseIsEqualDeep.js b/packages/grid/_modules_/grid/lib/lodash/_baseIsEqualDeep.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/_baseIsEqualDeep.js
rename to packages/grid/_modules_/grid/lib/lodash/_baseIsEqualDeep.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/_baseIsNative.js b/packages/grid/_modules_/grid/lib/lodash/_baseIsNative.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/_baseIsNative.js
rename to packages/grid/_modules_/grid/lib/lodash/_baseIsNative.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/_baseIsTypedArray.js b/packages/grid/_modules_/grid/lib/lodash/_baseIsTypedArray.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/_baseIsTypedArray.js
rename to packages/grid/_modules_/grid/lib/lodash/_baseIsTypedArray.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/_baseKeys.js b/packages/grid/_modules_/grid/lib/lodash/_baseKeys.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/_baseKeys.js
rename to packages/grid/_modules_/grid/lib/lodash/_baseKeys.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/_baseTimes.js b/packages/grid/_modules_/grid/lib/lodash/_baseTimes.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/_baseTimes.js
rename to packages/grid/_modules_/grid/lib/lodash/_baseTimes.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/_baseUnary.js b/packages/grid/_modules_/grid/lib/lodash/_baseUnary.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/_baseUnary.js
rename to packages/grid/_modules_/grid/lib/lodash/_baseUnary.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/_cacheHas.js b/packages/grid/_modules_/grid/lib/lodash/_cacheHas.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/_cacheHas.js
rename to packages/grid/_modules_/grid/lib/lodash/_cacheHas.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/_coreJsData.js b/packages/grid/_modules_/grid/lib/lodash/_coreJsData.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/_coreJsData.js
rename to packages/grid/_modules_/grid/lib/lodash/_coreJsData.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/_equalArrays.js b/packages/grid/_modules_/grid/lib/lodash/_equalArrays.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/_equalArrays.js
rename to packages/grid/_modules_/grid/lib/lodash/_equalArrays.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/_equalByTag.js b/packages/grid/_modules_/grid/lib/lodash/_equalByTag.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/_equalByTag.js
rename to packages/grid/_modules_/grid/lib/lodash/_equalByTag.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/_equalObjects.js b/packages/grid/_modules_/grid/lib/lodash/_equalObjects.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/_equalObjects.js
rename to packages/grid/_modules_/grid/lib/lodash/_equalObjects.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/_freeGlobal.js b/packages/grid/_modules_/grid/lib/lodash/_freeGlobal.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/_freeGlobal.js
rename to packages/grid/_modules_/grid/lib/lodash/_freeGlobal.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/_getAllKeys.js b/packages/grid/_modules_/grid/lib/lodash/_getAllKeys.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/_getAllKeys.js
rename to packages/grid/_modules_/grid/lib/lodash/_getAllKeys.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/_getMapData.js b/packages/grid/_modules_/grid/lib/lodash/_getMapData.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/_getMapData.js
rename to packages/grid/_modules_/grid/lib/lodash/_getMapData.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/_getNative.js b/packages/grid/_modules_/grid/lib/lodash/_getNative.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/_getNative.js
rename to packages/grid/_modules_/grid/lib/lodash/_getNative.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/_getRawTag.js b/packages/grid/_modules_/grid/lib/lodash/_getRawTag.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/_getRawTag.js
rename to packages/grid/_modules_/grid/lib/lodash/_getRawTag.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/_getSymbols.js b/packages/grid/_modules_/grid/lib/lodash/_getSymbols.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/_getSymbols.js
rename to packages/grid/_modules_/grid/lib/lodash/_getSymbols.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/_getTag.js b/packages/grid/_modules_/grid/lib/lodash/_getTag.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/_getTag.js
rename to packages/grid/_modules_/grid/lib/lodash/_getTag.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/_getValue.js b/packages/grid/_modules_/grid/lib/lodash/_getValue.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/_getValue.js
rename to packages/grid/_modules_/grid/lib/lodash/_getValue.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/_hashClear.js b/packages/grid/_modules_/grid/lib/lodash/_hashClear.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/_hashClear.js
rename to packages/grid/_modules_/grid/lib/lodash/_hashClear.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/_hashDelete.js b/packages/grid/_modules_/grid/lib/lodash/_hashDelete.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/_hashDelete.js
rename to packages/grid/_modules_/grid/lib/lodash/_hashDelete.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/_hashGet.js b/packages/grid/_modules_/grid/lib/lodash/_hashGet.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/_hashGet.js
rename to packages/grid/_modules_/grid/lib/lodash/_hashGet.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/_hashHas.js b/packages/grid/_modules_/grid/lib/lodash/_hashHas.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/_hashHas.js
rename to packages/grid/_modules_/grid/lib/lodash/_hashHas.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/_hashSet.js b/packages/grid/_modules_/grid/lib/lodash/_hashSet.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/_hashSet.js
rename to packages/grid/_modules_/grid/lib/lodash/_hashSet.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/_isIndex.js b/packages/grid/_modules_/grid/lib/lodash/_isIndex.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/_isIndex.js
rename to packages/grid/_modules_/grid/lib/lodash/_isIndex.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/_isKeyable.js b/packages/grid/_modules_/grid/lib/lodash/_isKeyable.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/_isKeyable.js
rename to packages/grid/_modules_/grid/lib/lodash/_isKeyable.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/_isMasked.js b/packages/grid/_modules_/grid/lib/lodash/_isMasked.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/_isMasked.js
rename to packages/grid/_modules_/grid/lib/lodash/_isMasked.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/_isPrototype.js b/packages/grid/_modules_/grid/lib/lodash/_isPrototype.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/_isPrototype.js
rename to packages/grid/_modules_/grid/lib/lodash/_isPrototype.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/_listCacheClear.js b/packages/grid/_modules_/grid/lib/lodash/_listCacheClear.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/_listCacheClear.js
rename to packages/grid/_modules_/grid/lib/lodash/_listCacheClear.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/_listCacheDelete.js b/packages/grid/_modules_/grid/lib/lodash/_listCacheDelete.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/_listCacheDelete.js
rename to packages/grid/_modules_/grid/lib/lodash/_listCacheDelete.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/_listCacheGet.js b/packages/grid/_modules_/grid/lib/lodash/_listCacheGet.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/_listCacheGet.js
rename to packages/grid/_modules_/grid/lib/lodash/_listCacheGet.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/_listCacheHas.js b/packages/grid/_modules_/grid/lib/lodash/_listCacheHas.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/_listCacheHas.js
rename to packages/grid/_modules_/grid/lib/lodash/_listCacheHas.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/_listCacheSet.js b/packages/grid/_modules_/grid/lib/lodash/_listCacheSet.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/_listCacheSet.js
rename to packages/grid/_modules_/grid/lib/lodash/_listCacheSet.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/_mapCacheClear.js b/packages/grid/_modules_/grid/lib/lodash/_mapCacheClear.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/_mapCacheClear.js
rename to packages/grid/_modules_/grid/lib/lodash/_mapCacheClear.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/_mapCacheDelete.js b/packages/grid/_modules_/grid/lib/lodash/_mapCacheDelete.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/_mapCacheDelete.js
rename to packages/grid/_modules_/grid/lib/lodash/_mapCacheDelete.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/_mapCacheGet.js b/packages/grid/_modules_/grid/lib/lodash/_mapCacheGet.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/_mapCacheGet.js
rename to packages/grid/_modules_/grid/lib/lodash/_mapCacheGet.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/_mapCacheHas.js b/packages/grid/_modules_/grid/lib/lodash/_mapCacheHas.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/_mapCacheHas.js
rename to packages/grid/_modules_/grid/lib/lodash/_mapCacheHas.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/_mapCacheSet.js b/packages/grid/_modules_/grid/lib/lodash/_mapCacheSet.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/_mapCacheSet.js
rename to packages/grid/_modules_/grid/lib/lodash/_mapCacheSet.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/_mapToArray.js b/packages/grid/_modules_/grid/lib/lodash/_mapToArray.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/_mapToArray.js
rename to packages/grid/_modules_/grid/lib/lodash/_mapToArray.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/_nativeCreate.js b/packages/grid/_modules_/grid/lib/lodash/_nativeCreate.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/_nativeCreate.js
rename to packages/grid/_modules_/grid/lib/lodash/_nativeCreate.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/_nativeKeys.js b/packages/grid/_modules_/grid/lib/lodash/_nativeKeys.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/_nativeKeys.js
rename to packages/grid/_modules_/grid/lib/lodash/_nativeKeys.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/_nodeUtil.js b/packages/grid/_modules_/grid/lib/lodash/_nodeUtil.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/_nodeUtil.js
rename to packages/grid/_modules_/grid/lib/lodash/_nodeUtil.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/_objectToString.js b/packages/grid/_modules_/grid/lib/lodash/_objectToString.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/_objectToString.js
rename to packages/grid/_modules_/grid/lib/lodash/_objectToString.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/_overArg.js b/packages/grid/_modules_/grid/lib/lodash/_overArg.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/_overArg.js
rename to packages/grid/_modules_/grid/lib/lodash/_overArg.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/_root.js b/packages/grid/_modules_/grid/lib/lodash/_root.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/_root.js
rename to packages/grid/_modules_/grid/lib/lodash/_root.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/_setCacheAdd.js b/packages/grid/_modules_/grid/lib/lodash/_setCacheAdd.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/_setCacheAdd.js
rename to packages/grid/_modules_/grid/lib/lodash/_setCacheAdd.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/_setCacheHas.js b/packages/grid/_modules_/grid/lib/lodash/_setCacheHas.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/_setCacheHas.js
rename to packages/grid/_modules_/grid/lib/lodash/_setCacheHas.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/_setToArray.js b/packages/grid/_modules_/grid/lib/lodash/_setToArray.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/_setToArray.js
rename to packages/grid/_modules_/grid/lib/lodash/_setToArray.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/_stackClear.js b/packages/grid/_modules_/grid/lib/lodash/_stackClear.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/_stackClear.js
rename to packages/grid/_modules_/grid/lib/lodash/_stackClear.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/_stackDelete.js b/packages/grid/_modules_/grid/lib/lodash/_stackDelete.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/_stackDelete.js
rename to packages/grid/_modules_/grid/lib/lodash/_stackDelete.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/_stackGet.js b/packages/grid/_modules_/grid/lib/lodash/_stackGet.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/_stackGet.js
rename to packages/grid/_modules_/grid/lib/lodash/_stackGet.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/_stackHas.js b/packages/grid/_modules_/grid/lib/lodash/_stackHas.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/_stackHas.js
rename to packages/grid/_modules_/grid/lib/lodash/_stackHas.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/_stackSet.js b/packages/grid/_modules_/grid/lib/lodash/_stackSet.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/_stackSet.js
rename to packages/grid/_modules_/grid/lib/lodash/_stackSet.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/_toSource.js b/packages/grid/_modules_/grid/lib/lodash/_toSource.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/_toSource.js
rename to packages/grid/_modules_/grid/lib/lodash/_toSource.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/date.default.js b/packages/grid/_modules_/grid/lib/lodash/date.default.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/date.default.js
rename to packages/grid/_modules_/grid/lib/lodash/date.default.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/date.js b/packages/grid/_modules_/grid/lib/lodash/date.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/date.js
rename to packages/grid/_modules_/grid/lib/lodash/date.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/debounce.js b/packages/grid/_modules_/grid/lib/lodash/debounce.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/debounce.js
rename to packages/grid/_modules_/grid/lib/lodash/debounce.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/eq.js b/packages/grid/_modules_/grid/lib/lodash/eq.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/eq.js
rename to packages/grid/_modules_/grid/lib/lodash/eq.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/function.default.js b/packages/grid/_modules_/grid/lib/lodash/function.default.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/function.default.js
rename to packages/grid/_modules_/grid/lib/lodash/function.default.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/function.js b/packages/grid/_modules_/grid/lib/lodash/function.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/function.js
rename to packages/grid/_modules_/grid/lib/lodash/function.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/isArguments.js b/packages/grid/_modules_/grid/lib/lodash/isArguments.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/isArguments.js
rename to packages/grid/_modules_/grid/lib/lodash/isArguments.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/isArray.js b/packages/grid/_modules_/grid/lib/lodash/isArray.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/isArray.js
rename to packages/grid/_modules_/grid/lib/lodash/isArray.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/isArrayLike.js b/packages/grid/_modules_/grid/lib/lodash/isArrayLike.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/isArrayLike.js
rename to packages/grid/_modules_/grid/lib/lodash/isArrayLike.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/isBuffer.js b/packages/grid/_modules_/grid/lib/lodash/isBuffer.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/isBuffer.js
rename to packages/grid/_modules_/grid/lib/lodash/isBuffer.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/isEqual.js b/packages/grid/_modules_/grid/lib/lodash/isEqual.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/isEqual.js
rename to packages/grid/_modules_/grid/lib/lodash/isEqual.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/isFunction.js b/packages/grid/_modules_/grid/lib/lodash/isFunction.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/isFunction.js
rename to packages/grid/_modules_/grid/lib/lodash/isFunction.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/isLength.js b/packages/grid/_modules_/grid/lib/lodash/isLength.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/isLength.js
rename to packages/grid/_modules_/grid/lib/lodash/isLength.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/isObject.js b/packages/grid/_modules_/grid/lib/lodash/isObject.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/isObject.js
rename to packages/grid/_modules_/grid/lib/lodash/isObject.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/isObjectLike.js b/packages/grid/_modules_/grid/lib/lodash/isObjectLike.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/isObjectLike.js
rename to packages/grid/_modules_/grid/lib/lodash/isObjectLike.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/isSymbol.js b/packages/grid/_modules_/grid/lib/lodash/isSymbol.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/isSymbol.js
rename to packages/grid/_modules_/grid/lib/lodash/isSymbol.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/isTypedArray.js b/packages/grid/_modules_/grid/lib/lodash/isTypedArray.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/isTypedArray.js
rename to packages/grid/_modules_/grid/lib/lodash/isTypedArray.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/keys.js b/packages/grid/_modules_/grid/lib/lodash/keys.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/keys.js
rename to packages/grid/_modules_/grid/lib/lodash/keys.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/lang.default.js b/packages/grid/_modules_/grid/lib/lodash/lang.default.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/lang.default.js
rename to packages/grid/_modules_/grid/lib/lodash/lang.default.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/lang.js b/packages/grid/_modules_/grid/lib/lodash/lang.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/lang.js
rename to packages/grid/_modules_/grid/lib/lodash/lang.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/now.js b/packages/grid/_modules_/grid/lib/lodash/now.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/now.js
rename to packages/grid/_modules_/grid/lib/lodash/now.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/object.default.js b/packages/grid/_modules_/grid/lib/lodash/object.default.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/object.default.js
rename to packages/grid/_modules_/grid/lib/lodash/object.default.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/object.js b/packages/grid/_modules_/grid/lib/lodash/object.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/object.js
rename to packages/grid/_modules_/grid/lib/lodash/object.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/readme.md b/packages/grid/_modules_/grid/lib/lodash/readme.md
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/readme.md
rename to packages/grid/_modules_/grid/lib/lodash/readme.md
diff --git a/packages/grid/x-grid-modules/lib/lodash/stubArray.js b/packages/grid/_modules_/grid/lib/lodash/stubArray.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/stubArray.js
rename to packages/grid/_modules_/grid/lib/lodash/stubArray.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/stubFalse.js b/packages/grid/_modules_/grid/lib/lodash/stubFalse.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/stubFalse.js
rename to packages/grid/_modules_/grid/lib/lodash/stubFalse.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/toNumber.js b/packages/grid/_modules_/grid/lib/lodash/toNumber.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/toNumber.js
rename to packages/grid/_modules_/grid/lib/lodash/toNumber.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/util.default.js b/packages/grid/_modules_/grid/lib/lodash/util.default.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/util.default.js
rename to packages/grid/_modules_/grid/lib/lodash/util.default.js
diff --git a/packages/grid/x-grid-modules/lib/lodash/util.js b/packages/grid/_modules_/grid/lib/lodash/util.js
similarity index 100%
rename from packages/grid/x-grid-modules/lib/lodash/util.js
rename to packages/grid/_modules_/grid/lib/lodash/util.js
diff --git a/packages/grid/x-grid-modules/src/models/api/apiRef.ts b/packages/grid/_modules_/grid/models/api/apiRef.ts
similarity index 100%
rename from packages/grid/x-grid-modules/src/models/api/apiRef.ts
rename to packages/grid/_modules_/grid/models/api/apiRef.ts
diff --git a/packages/grid/x-grid-modules/src/models/api/columnApi.ts b/packages/grid/_modules_/grid/models/api/columnApi.ts
similarity index 100%
rename from packages/grid/x-grid-modules/src/models/api/columnApi.ts
rename to packages/grid/_modules_/grid/models/api/columnApi.ts
diff --git a/packages/grid/x-grid-modules/src/models/api/coreApi.ts b/packages/grid/_modules_/grid/models/api/coreApi.ts
similarity index 100%
rename from packages/grid/x-grid-modules/src/models/api/coreApi.ts
rename to packages/grid/_modules_/grid/models/api/coreApi.ts
diff --git a/packages/grid/x-grid-modules/src/models/api/eventsApi.ts b/packages/grid/_modules_/grid/models/api/eventsApi.ts
similarity index 100%
rename from packages/grid/x-grid-modules/src/models/api/eventsApi.ts
rename to packages/grid/_modules_/grid/models/api/eventsApi.ts
diff --git a/packages/grid/x-grid-modules/src/models/api/gridApi.ts b/packages/grid/_modules_/grid/models/api/gridApi.ts
similarity index 100%
rename from packages/grid/x-grid-modules/src/models/api/gridApi.ts
rename to packages/grid/_modules_/grid/models/api/gridApi.ts
diff --git a/packages/grid/x-grid-modules/src/models/api/index.ts b/packages/grid/_modules_/grid/models/api/index.ts
similarity index 100%
rename from packages/grid/x-grid-modules/src/models/api/index.ts
rename to packages/grid/_modules_/grid/models/api/index.ts
diff --git a/packages/grid/x-grid-modules/src/models/api/paginationApi.ts b/packages/grid/_modules_/grid/models/api/paginationApi.ts
similarity index 100%
rename from packages/grid/x-grid-modules/src/models/api/paginationApi.ts
rename to packages/grid/_modules_/grid/models/api/paginationApi.ts
diff --git a/packages/grid/x-grid-modules/src/models/api/rowApi.ts b/packages/grid/_modules_/grid/models/api/rowApi.ts
similarity index 100%
rename from packages/grid/x-grid-modules/src/models/api/rowApi.ts
rename to packages/grid/_modules_/grid/models/api/rowApi.ts
diff --git a/packages/grid/x-grid-modules/src/models/api/selectionApi.ts b/packages/grid/_modules_/grid/models/api/selectionApi.ts
similarity index 100%
rename from packages/grid/x-grid-modules/src/models/api/selectionApi.ts
rename to packages/grid/_modules_/grid/models/api/selectionApi.ts
diff --git a/packages/grid/x-grid-modules/src/models/api/sortApi.ts b/packages/grid/_modules_/grid/models/api/sortApi.ts
similarity index 100%
rename from packages/grid/x-grid-modules/src/models/api/sortApi.ts
rename to packages/grid/_modules_/grid/models/api/sortApi.ts
diff --git a/packages/grid/x-grid-modules/src/models/api/virtualizationApi.ts b/packages/grid/_modules_/grid/models/api/virtualizationApi.ts
similarity index 100%
rename from packages/grid/x-grid-modules/src/models/api/virtualizationApi.ts
rename to packages/grid/_modules_/grid/models/api/virtualizationApi.ts
diff --git a/packages/grid/x-grid-modules/src/models/cellClass.ts b/packages/grid/_modules_/grid/models/cellClass.ts
similarity index 100%
rename from packages/grid/x-grid-modules/src/models/cellClass.ts
rename to packages/grid/_modules_/grid/models/cellClass.ts
diff --git a/packages/grid/x-grid-modules/src/models/colDef/checkboxSelection.tsx b/packages/grid/_modules_/grid/models/colDef/checkboxSelection.tsx
similarity index 100%
rename from packages/grid/x-grid-modules/src/models/colDef/checkboxSelection.tsx
rename to packages/grid/_modules_/grid/models/colDef/checkboxSelection.tsx
diff --git a/packages/grid/x-grid-modules/src/models/colDef/colDef.ts b/packages/grid/_modules_/grid/models/colDef/colDef.ts
similarity index 100%
rename from packages/grid/x-grid-modules/src/models/colDef/colDef.ts
rename to packages/grid/_modules_/grid/models/colDef/colDef.ts
diff --git a/packages/grid/x-grid-modules/src/models/colDef/colType.ts b/packages/grid/_modules_/grid/models/colDef/colType.ts
similarity index 100%
rename from packages/grid/x-grid-modules/src/models/colDef/colType.ts
rename to packages/grid/_modules_/grid/models/colDef/colType.ts
diff --git a/packages/grid/x-grid-modules/src/models/colDef/colTypeDef.ts b/packages/grid/_modules_/grid/models/colDef/colTypeDef.ts
similarity index 100%
rename from packages/grid/x-grid-modules/src/models/colDef/colTypeDef.ts
rename to packages/grid/_modules_/grid/models/colDef/colTypeDef.ts
diff --git a/packages/grid/x-grid-modules/src/models/colDef/dateColDef.ts b/packages/grid/_modules_/grid/models/colDef/dateColDef.ts
similarity index 100%
rename from packages/grid/x-grid-modules/src/models/colDef/dateColDef.ts
rename to packages/grid/_modules_/grid/models/colDef/dateColDef.ts
diff --git a/packages/grid/x-grid-modules/src/models/colDef/defaultColumnTypes.ts b/packages/grid/_modules_/grid/models/colDef/defaultColumnTypes.ts
similarity index 100%
rename from packages/grid/x-grid-modules/src/models/colDef/defaultColumnTypes.ts
rename to packages/grid/_modules_/grid/models/colDef/defaultColumnTypes.ts
diff --git a/packages/grid/x-grid-modules/src/models/colDef/getColDef.ts b/packages/grid/_modules_/grid/models/colDef/getColDef.ts
similarity index 100%
rename from packages/grid/x-grid-modules/src/models/colDef/getColDef.ts
rename to packages/grid/_modules_/grid/models/colDef/getColDef.ts
diff --git a/packages/grid/x-grid-modules/src/models/colDef/index.ts b/packages/grid/_modules_/grid/models/colDef/index.ts
similarity index 100%
rename from packages/grid/x-grid-modules/src/models/colDef/index.ts
rename to packages/grid/_modules_/grid/models/colDef/index.ts
diff --git a/packages/grid/x-grid-modules/src/models/colDef/numericColDef.ts b/packages/grid/_modules_/grid/models/colDef/numericColDef.ts
similarity index 100%
rename from packages/grid/x-grid-modules/src/models/colDef/numericColDef.ts
rename to packages/grid/_modules_/grid/models/colDef/numericColDef.ts
diff --git a/packages/grid/x-grid-modules/src/models/colDef/stringColDef.ts b/packages/grid/_modules_/grid/models/colDef/stringColDef.ts
similarity index 100%
rename from packages/grid/x-grid-modules/src/models/colDef/stringColDef.ts
rename to packages/grid/_modules_/grid/models/colDef/stringColDef.ts
diff --git a/packages/grid/x-grid-modules/src/models/containerProps.ts b/packages/grid/_modules_/grid/models/containerProps.ts
similarity index 100%
rename from packages/grid/x-grid-modules/src/models/containerProps.ts
rename to packages/grid/_modules_/grid/models/containerProps.ts
diff --git a/packages/grid/x-grid-modules/src/models/elementSize.ts b/packages/grid/_modules_/grid/models/elementSize.ts
similarity index 100%
rename from packages/grid/x-grid-modules/src/models/elementSize.ts
rename to packages/grid/_modules_/grid/models/elementSize.ts
diff --git a/packages/grid/x-grid-modules/src/models/featureMode.ts b/packages/grid/_modules_/grid/models/featureMode.ts
similarity index 100%
rename from packages/grid/x-grid-modules/src/models/featureMode.ts
rename to packages/grid/_modules_/grid/models/featureMode.ts
diff --git a/packages/grid/x-grid-modules/src/models/gridComponentOverridesProp.tsx b/packages/grid/_modules_/grid/models/gridComponentOverridesProp.tsx
similarity index 100%
rename from packages/grid/x-grid-modules/src/models/gridComponentOverridesProp.tsx
rename to packages/grid/_modules_/grid/models/gridComponentOverridesProp.tsx
diff --git a/packages/grid/x-grid-modules/src/models/gridOptions.tsx b/packages/grid/_modules_/grid/models/gridOptions.tsx
similarity index 100%
rename from packages/grid/x-grid-modules/src/models/gridOptions.tsx
rename to packages/grid/_modules_/grid/models/gridOptions.tsx
diff --git a/packages/grid/x-grid-modules/src/models/index.ts b/packages/grid/_modules_/grid/models/index.ts
similarity index 100%
rename from packages/grid/x-grid-modules/src/models/index.ts
rename to packages/grid/_modules_/grid/models/index.ts
diff --git a/packages/grid/x-grid-modules/src/models/params/cellParams.ts b/packages/grid/_modules_/grid/models/params/cellParams.ts
similarity index 100%
rename from packages/grid/x-grid-modules/src/models/params/cellParams.ts
rename to packages/grid/_modules_/grid/models/params/cellParams.ts
diff --git a/packages/grid/x-grid-modules/src/models/params/colParams.ts b/packages/grid/_modules_/grid/models/params/colParams.ts
similarity index 100%
rename from packages/grid/x-grid-modules/src/models/params/colParams.ts
rename to packages/grid/_modules_/grid/models/params/colParams.ts
diff --git a/packages/grid/x-grid-modules/src/models/params/componentParams.ts b/packages/grid/_modules_/grid/models/params/componentParams.ts
similarity index 100%
rename from packages/grid/x-grid-modules/src/models/params/componentParams.ts
rename to packages/grid/_modules_/grid/models/params/componentParams.ts
diff --git a/packages/grid/x-grid-modules/src/models/params/index.ts b/packages/grid/_modules_/grid/models/params/index.ts
similarity index 100%
rename from packages/grid/x-grid-modules/src/models/params/index.ts
rename to packages/grid/_modules_/grid/models/params/index.ts
diff --git a/packages/grid/x-grid-modules/src/models/params/pageChangeParams.ts b/packages/grid/_modules_/grid/models/params/pageChangeParams.ts
similarity index 100%
rename from packages/grid/x-grid-modules/src/models/params/pageChangeParams.ts
rename to packages/grid/_modules_/grid/models/params/pageChangeParams.ts
diff --git a/packages/grid/x-grid-modules/src/models/params/rowParams.ts b/packages/grid/_modules_/grid/models/params/rowParams.ts
similarity index 100%
rename from packages/grid/x-grid-modules/src/models/params/rowParams.ts
rename to packages/grid/_modules_/grid/models/params/rowParams.ts
diff --git a/packages/grid/x-grid-modules/src/models/params/rowSelectedParams.ts b/packages/grid/_modules_/grid/models/params/rowSelectedParams.ts
similarity index 100%
rename from packages/grid/x-grid-modules/src/models/params/rowSelectedParams.ts
rename to packages/grid/_modules_/grid/models/params/rowSelectedParams.ts
diff --git a/packages/grid/x-grid-modules/src/models/params/selectionChangeParams.ts b/packages/grid/_modules_/grid/models/params/selectionChangeParams.ts
similarity index 100%
rename from packages/grid/x-grid-modules/src/models/params/selectionChangeParams.ts
rename to packages/grid/_modules_/grid/models/params/selectionChangeParams.ts
diff --git a/packages/grid/x-grid-modules/src/models/params/sortModelParams.ts b/packages/grid/_modules_/grid/models/params/sortModelParams.ts
similarity index 100%
rename from packages/grid/x-grid-modules/src/models/params/sortModelParams.ts
rename to packages/grid/_modules_/grid/models/params/sortModelParams.ts
diff --git a/packages/grid/x-grid-modules/src/models/renderContextProps.ts b/packages/grid/_modules_/grid/models/renderContextProps.ts
similarity index 100%
rename from packages/grid/x-grid-modules/src/models/renderContextProps.ts
rename to packages/grid/_modules_/grid/models/renderContextProps.ts
diff --git a/packages/grid/x-grid-modules/src/models/rootContainerRef.ts b/packages/grid/_modules_/grid/models/rootContainerRef.ts
similarity index 100%
rename from packages/grid/x-grid-modules/src/models/rootContainerRef.ts
rename to packages/grid/_modules_/grid/models/rootContainerRef.ts
diff --git a/packages/grid/x-grid-modules/src/models/rows.ts b/packages/grid/_modules_/grid/models/rows.ts
similarity index 100%
rename from packages/grid/x-grid-modules/src/models/rows.ts
rename to packages/grid/_modules_/grid/models/rows.ts
diff --git a/packages/grid/x-grid-modules/src/models/sortModel.ts b/packages/grid/_modules_/grid/models/sortModel.ts
similarity index 100%
rename from packages/grid/x-grid-modules/src/models/sortModel.ts
rename to packages/grid/_modules_/grid/models/sortModel.ts
diff --git a/packages/grid/x-grid-modules/src/utils/__tests__/classnames.tests.ts b/packages/grid/_modules_/grid/utils/__tests__/classnames.tests.ts
similarity index 100%
rename from packages/grid/x-grid-modules/src/utils/__tests__/classnames.tests.ts
rename to packages/grid/_modules_/grid/utils/__tests__/classnames.tests.ts
diff --git a/packages/grid/x-grid-modules/src/utils/classnames.ts b/packages/grid/_modules_/grid/utils/classnames.ts
similarity index 100%
rename from packages/grid/x-grid-modules/src/utils/classnames.ts
rename to packages/grid/_modules_/grid/utils/classnames.ts
diff --git a/packages/grid/x-grid-modules/src/utils/domUtils.ts b/packages/grid/_modules_/grid/utils/domUtils.ts
similarity index 100%
rename from packages/grid/x-grid-modules/src/utils/domUtils.ts
rename to packages/grid/_modules_/grid/utils/domUtils.ts
diff --git a/packages/grid/x-grid-modules/src/utils/index.ts b/packages/grid/_modules_/grid/utils/index.ts
similarity index 100%
rename from packages/grid/x-grid-modules/src/utils/index.ts
rename to packages/grid/_modules_/grid/utils/index.ts
diff --git a/packages/grid/x-grid-modules/src/utils/keyboardUtils.ts b/packages/grid/_modules_/grid/utils/keyboardUtils.ts
similarity index 100%
rename from packages/grid/x-grid-modules/src/utils/keyboardUtils.ts
rename to packages/grid/_modules_/grid/utils/keyboardUtils.ts
diff --git a/packages/grid/x-grid-modules/src/utils/mergeOptions.ts b/packages/grid/_modules_/grid/utils/mergeOptions.ts
similarity index 100%
rename from packages/grid/x-grid-modules/src/utils/mergeOptions.ts
rename to packages/grid/_modules_/grid/utils/mergeOptions.ts
diff --git a/packages/grid/x-grid-modules/src/utils/paramsUtils.ts b/packages/grid/_modules_/grid/utils/paramsUtils.ts
similarity index 100%
rename from packages/grid/x-grid-modules/src/utils/paramsUtils.ts
rename to packages/grid/_modules_/grid/utils/paramsUtils.ts
diff --git a/packages/grid/x-grid-modules/src/utils/sortingUtils.ts b/packages/grid/_modules_/grid/utils/sortingUtils.ts
similarity index 100%
rename from packages/grid/x-grid-modules/src/utils/sortingUtils.ts
rename to packages/grid/_modules_/grid/utils/sortingUtils.ts
diff --git a/packages/grid/x-grid-modules/src/utils/utils.ts b/packages/grid/_modules_/grid/utils/utils.ts
similarity index 89%
rename from packages/grid/x-grid-modules/src/utils/utils.ts
rename to packages/grid/_modules_/grid/utils/utils.ts
index 642812e02570..eafdb228a3d8 100644
--- a/packages/grid/x-grid-modules/src/utils/utils.ts
+++ b/packages/grid/_modules_/grid/utils/utils.ts
@@ -1,5 +1,5 @@
-import _debounce from '../../lib/lodash/debounce';
-import isEqual from '../../lib/lodash/isEqual';
+import _debounce from '../lib/lodash/debounce';
+import isEqual from '../lib/lodash/isEqual';
 
 export { isEqual };
 
diff --git a/packages/grid/_modules_/index.ts b/packages/grid/_modules_/index.ts
new file mode 100644
index 000000000000..d24d1bdc0f95
--- /dev/null
+++ b/packages/grid/_modules_/index.ts
@@ -0,0 +1 @@
+export * from './grid';
diff --git a/packages/grid/data-grid/package.json b/packages/grid/data-grid/package.json
index 23fec632679b..827cef201e23 100644
--- a/packages/grid/data-grid/package.json
+++ b/packages/grid/data-grid/package.json
@@ -5,7 +5,7 @@
   "author": "Material-UI Team",
   "main": "dist/index-cjs.js",
   "module": "dist/index-esm.js",
-  "types": "dist/data-grid.all.d.ts",
+  "types": "dist/data-grid.d.ts",
   "files": [
     "dist/*"
   ],
@@ -26,11 +26,8 @@
   ],
   "scripts": {
     "precommit": "npm run lint",
-    "build": "rollup -c ",
-    "start": "rollup -cw",
     "lint": "eslint 'src/**/*.{ts,tsx}' --quiet --fix -c ../../../.eslintrc.js && npm run lint:css",
     "lint:css": "stylelint 'src/**/*.{ts,tsx}' ../../../.stylelintrc.js",
-    "test": "../../../node_modules/.bin/jest --config jest.config.js",
     "typescript": "tsc -p tsconfig.json"
   },
   "dependencies": {
@@ -38,7 +35,6 @@
     "tslib": "^2.0.0"
   },
   "devDependencies": {
-    "@material-ui/x-grid-modules": "^4.0.0-alpha.2",
     "@rollup/plugin-node-resolve": "^8.0.1",
     "rollup": "^2.6.1",
     "rollup-plugin-cleaner": "^1.0.0",
diff --git a/packages/grid/data-grid/src/DataGrid.tsx b/packages/grid/data-grid/src/DataGrid.tsx
index ea5831855db8..2884104acb2c 100644
--- a/packages/grid/data-grid/src/DataGrid.tsx
+++ b/packages/grid/data-grid/src/DataGrid.tsx
@@ -1,7 +1,9 @@
 import * as React from 'react';
 import * as PropTypes from 'prop-types';
-import { chainPropTypes } from '@material-ui/utils';
-import { GridComponent, GridComponentProps, classnames } from '@material-ui/x-grid-modules';
+import { GridComponent, GridComponentProps, classnames } from '../../_modules_/grid';
+
+// TODO: Refactor to import when moving to material-ui v5
+const chainPropTypes = require('@material-ui/utils').chainPropTypes;
 
 const FORCED_PROPS: Partial<GridComponentProps> = {
   disableColumnResize: true,
diff --git a/packages/grid/data-grid/src/index.ts b/packages/grid/data-grid/src/index.ts
index 4142c7a7af07..e617d7e7cf84 100644
--- a/packages/grid/data-grid/src/index.ts
+++ b/packages/grid/data-grid/src/index.ts
@@ -1,2 +1,2 @@
-export * from '@material-ui/x-grid-modules';
+export * from '../../_modules_';
 export * from './DataGrid';
diff --git a/packages/grid/data-grid/tsconfig.build.json b/packages/grid/data-grid/tsconfig.build.json
deleted file mode 100644
index 0c5e11f71710..000000000000
--- a/packages/grid/data-grid/tsconfig.build.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "extends": "../../../tsconfig.json",
-  "compilerOptions": {
-    "baseUrl": "./",
-    "declaration": true,
-    "declarationDir": "./dist",
-    "module": "es6",
-    "noImplicitAny": false,
-    "strict": true,
-    "outDir": "./dist",
-    "target": "es6",
-    "sourceMap": true,
-    "build": true
-  },
-  "include": ["src"],
-  "exclude": ["__tests__", "**/*.test.ts", "node_modules", "lib"],
-  "references": [
-    {
-      "path": "../x-grid-modules"
-    }
-  ]
-}
diff --git a/packages/grid/data-grid/jest.config.js b/packages/grid/jest.config.js
similarity index 91%
rename from packages/grid/data-grid/jest.config.js
rename to packages/grid/jest.config.js
index 5c8de23ae3cb..36d18b12edb5 100644
--- a/packages/grid/data-grid/jest.config.js
+++ b/packages/grid/jest.config.js
@@ -1,6 +1,6 @@
 module.exports = {
   preset: 'ts-jest',
-  rootDir: './',
+  rootDir: './_modules_',
   testEnvironment: 'node',
   transform: {
     '^.+\\.(t|j)sx?$': 'ts-jest',
diff --git a/packages/grid/package.json b/packages/grid/package.json
new file mode 100644
index 000000000000..f66b2a14de12
--- /dev/null
+++ b/packages/grid/package.json
@@ -0,0 +1,13 @@
+{
+  "private": true,
+  "scripts": {
+    "build:data-grid": "rollup --config rollup.data-grid.config.js",
+    "build:x": "rollup --config rollup.x-grid.config.js",
+    "build": "yarn build:data-grid && yarn build:x",
+    "start": "rollup -cw",
+    "start:x": "rollup -w --config rollup.x-grid.config.js",
+    "test:modules": "../../node_modules/.bin/jest --config jest.config.js",
+    "lint": "../../../node_modules/.bin/tsc --noEmit && eslint 'src/**/*.{ts,tsx}' --quiet --fix -c ../../../.eslintrc.js && npm run lint:css",
+    "lint:css": "stylelint 'src/**/*.{ts,tsx}' ../../../.stylelintrc.js"
+  }
+}
diff --git a/packages/grid/data-grid/rollup.config.js b/packages/grid/rollup.data-grid.config.js
similarity index 58%
rename from packages/grid/data-grid/rollup.config.js
rename to packages/grid/rollup.data-grid.config.js
index 08e6b9483852..5c713af2620b 100644
--- a/packages/grid/data-grid/rollup.config.js
+++ b/packages/grid/rollup.data-grid.config.js
@@ -1,25 +1,24 @@
-import resolve from '@rollup/plugin-node-resolve';
 import typescript from 'rollup-plugin-typescript2';
 import cleaner from 'rollup-plugin-cleaner';
 import sourceMaps from 'rollup-plugin-sourcemaps';
 import { terser } from 'rollup-plugin-terser';
 import dts from 'rollup-plugin-dts';
 import command from 'rollup-plugin-command';
-import pkg from './package.json';
+import pkg from './data-grid/package.json';
 
 // dev build if watching, prod build if not
 const production = !process.env.ROLLUP_WATCH;
 export default [
   {
-    input: 'src/index.ts',
+    input: './data-grid/src/index.ts',
     output: [
       {
-        file: 'dist/index-esm.js',
+        file: './data-grid/dist/index-esm.js',
         format: 'esm',
         sourcemap: !production,
       },
       {
-        file: 'dist/index-cjs.js',
+        file: './data-grid/dist/index-cjs.js',
         format: 'cjs',
         sourcemap: !production,
       },
@@ -27,12 +26,9 @@ export default [
 
     external: [...Object.keys(pkg.peerDependencies || {})],
     plugins: [
-      resolve({
-        resolveOnly: [/^@material-ui\/x-.*$/], // we bundle x-license and x-grid-modules
-      }),
       production &&
         cleaner({
-          targets: ['./dist/'],
+          targets: ['./data-grid/dist/'],
         }),
       typescript({ tsconfig: 'tsconfig.build.json' }),
       !production && sourceMaps(),
@@ -40,18 +36,23 @@ export default [
     ],
   },
   {
-    input: './dist/index.d.ts',
-    output: [{ file: 'dist/data-grid.d.ts', format: 'es' }],
+    input: './data-grid/dist/data-grid/src/index.d.ts',
+    output: [{ file: './data-grid/dist/data-grid.d.ts', format: 'es' }],
     plugins: [
       dts(),
-      command(
-        `cat ../x-grid-modules/dist/x-grid-modules.d.ts ./dist/data-grid.d.ts > ./dist/data-grid.all.d.ts`,
-        {
-          exitOnFail: true,
-          wait: true,
-        },
-      ),
       !production && sourceMaps(),
+      production &&
+        command(
+          [
+            `rm -rf ./data-grid/dist/data-grid/`,
+            `rm -rf ./data-grid/dist/_modules_ `,
+            `rm -rf ./data-grid/dist/x-grid`,
+          ],
+          {
+            exitOnFail: true,
+            wait: true,
+          },
+        ),
     ],
   },
 ];
diff --git a/packages/grid/x-grid/rollup.config.js b/packages/grid/rollup.x-grid.config.js
similarity index 58%
rename from packages/grid/x-grid/rollup.config.js
rename to packages/grid/rollup.x-grid.config.js
index a8cdf15b7dac..677efe12dc5d 100644
--- a/packages/grid/x-grid/rollup.config.js
+++ b/packages/grid/rollup.x-grid.config.js
@@ -1,27 +1,26 @@
-import typescript from 'rollup-plugin-typescript2';
 import { generateReleaseInfo } from '@material-ui/x-license';
+import replace from '@rollup/plugin-replace';
+import typescript from 'rollup-plugin-typescript2';
 import cleaner from 'rollup-plugin-cleaner';
 import sourceMaps from 'rollup-plugin-sourcemaps';
 import { terser } from 'rollup-plugin-terser';
-import replace from '@rollup/plugin-replace';
-import resolve from '@rollup/plugin-node-resolve';
 import dts from 'rollup-plugin-dts';
 import command from 'rollup-plugin-command';
-import pkg from './package.json';
+import pkg from './x-grid/package.json';
 
 // dev build if watching, prod build if not
 const production = !process.env.ROLLUP_WATCH;
 export default [
   {
-    input: 'src/index.ts',
+    input: './x-grid/src/index.ts',
     output: [
       {
-        file: 'dist/index-esm.js',
+        file: './x-grid/dist/index-esm.js',
         format: 'esm',
         sourcemap: !production,
       },
       {
-        file: 'dist/index-cjs.js',
+        file: './x-grid/dist/index-cjs.js',
         format: 'cjs',
         sourcemap: !production,
       },
@@ -32,28 +31,33 @@ export default [
       replace({
         __RELEASE_INFO__: generateReleaseInfo(),
       }),
-      resolve({
-        resolveOnly: [/^@material-ui\/x-.*$/], // we bundle x-license and x-grid-modules
-      }),
       production &&
         cleaner({
-          targets: ['./dist/'],
+          targets: ['./x-grid/dist/'],
         }),
-      typescript(),
+      typescript({ tsconfig: 'tsconfig.build.json' }),
       !production && sourceMaps(),
       production && terser(),
     ],
   },
   {
-    input: './dist/index.d.ts',
-    output: [{ file: 'dist/x-grid.d.ts', format: 'es' }],
+    input: './x-grid/dist/x-grid/src/index.d.ts',
+    output: [{ file: './x-grid/dist/x-grid.d.ts', format: 'es' }],
     plugins: [
       dts(),
-      command(
-        `cat ../../x-license/dist/x-license.d.ts ../x-grid-modules/dist/x-grid-modules.d.ts ./dist/x-grid.d.ts > ./dist/x-grid.all.d.ts`,
-        { exitOnFail: true, wait: true },
-        !production && sourceMaps(),
-      ),
+      !production && sourceMaps(),
+      production &&
+        command(
+          [
+            `rm -rf ./x-grid/dist/x-grid`,
+            `rm -rf ./x-grid/dist/_modules_`,
+            `rm -rf ./x-grid/dist/data-grid`,
+          ],
+          {
+            exitOnFail: true,
+            wait: true,
+          },
+        ),
     ],
   },
 ];
diff --git a/packages/grid/tsconfig.build.json b/packages/grid/tsconfig.build.json
new file mode 100644
index 000000000000..be4402789eee
--- /dev/null
+++ b/packages/grid/tsconfig.build.json
@@ -0,0 +1,27 @@
+{
+  "compilerOptions": {
+    "baseUrl": "./",
+    "declaration": true,
+    "declarationDir": "./dist",
+    "module": "es6",
+    "noImplicitAny": false,
+    "strict": true,
+    "outDir": "./dist",
+    "target": "es6",
+    "sourceMap": true,
+    "lib": ["dom", "dom.iterable", "esnext", "ES6"],
+    "allowJs": true,
+    "skipLibCheck": true,
+    "esModuleInterop": true,
+    "allowSyntheticDefaultImports": true,
+    "forceConsistentCasingInFileNames": true,
+    "moduleResolution": "node",
+    "resolveJsonModule": true,
+    "isolatedModules": true,
+    "jsx": "react",
+    "types": ["jest", "node"],
+    "rootDir": "./"
+  },
+  "include": ["./data-grid/src", "./x-grid/src", "./_modules_/**/*"],
+  "exclude": ["__tests__", "**/*.test.ts", "node_modules"]
+}
diff --git a/packages/grid/x-grid-modules/jest.config.js b/packages/grid/x-grid-modules/jest.config.js
deleted file mode 100644
index 5c8de23ae3cb..000000000000
--- a/packages/grid/x-grid-modules/jest.config.js
+++ /dev/null
@@ -1,10 +0,0 @@
-module.exports = {
-  preset: 'ts-jest',
-  rootDir: './',
-  testEnvironment: 'node',
-  transform: {
-    '^.+\\.(t|j)sx?$': 'ts-jest',
-    '.+\\.(css|styl|less|sass|scss|png|jpg|ttf|woff|woff2)$': 'jest-transform-stub',
-  },
-  testPathIgnorePatterns: ['/node_modules/', '/dist/', '/lib/'],
-};
diff --git a/packages/grid/x-grid-modules/package.json b/packages/grid/x-grid-modules/package.json
deleted file mode 100644
index 2b5d2c12e495..000000000000
--- a/packages/grid/x-grid-modules/package.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "name": "@material-ui/x-grid-modules",
-  "version": "4.0.0-alpha.2",
-  "description": "Material-UI shared grid modules",
-  "author": "Material-UI Team",
-  "main": "dist/index-cjs.js",
-  "module": "dist/index-esm.js",
-  "types": "dist/x-grid-modules.d.ts",
-  "files": [
-    "dist/*"
-  ],
-  "private": true,
-  "devDependencies": {
-    "@types/node": "^14.0.13",
-    "rollup": "^2.6.1",
-    "rollup-plugin-cleaner": "^1.0.0",
-    "rollup-plugin-dts": "^1.4.7",
-    "rollup-plugin-sourcemaps": "^0.6.2",
-    "rollup-plugin-terser": "^5.3.0",
-    "rollup-plugin-typescript2": "^0.27.1",
-    "tslib": "^2.0.0",
-    "typedoc": "^0.19.2",
-    "typedoc-plugin-markdown": "^2.3.1"
-  },
-  "peerDependencies": {
-    "@material-ui/core": "^4.9.12",
-    "react": "^16.8.0"
-  },
-  "scripts": {
-    "precommit": "npm run lint",
-    "build": "rollup -c ",
-    "start": "rollup -cw",
-    "lint": "eslint 'src/**/*.{ts,tsx}' --quiet --fix -c ../../../.eslintrc.js && npm run lint:css",
-    "lint:css": "stylelint 'src/**/*.{ts,tsx}' ../../../.stylelintrc.js",
-    "test": "../../../node_modules/.bin/jest --config jest.config.js",
-    "doc": "typedoc"
-  },
-  "setupFiles": [
-    "<rootDir>/src/setupTests.js"
-  ],
-  "gitHead": "4604f069db2ab4d1cf992eb57bb07d261ffe6cf2"
-}
diff --git a/packages/grid/x-grid-modules/rollup.config.js b/packages/grid/x-grid-modules/rollup.config.js
deleted file mode 100644
index 7a33100f7b84..000000000000
--- a/packages/grid/x-grid-modules/rollup.config.js
+++ /dev/null
@@ -1,42 +0,0 @@
-import typescript from 'rollup-plugin-typescript2';
-import cleaner from 'rollup-plugin-cleaner';
-import sourceMaps from 'rollup-plugin-sourcemaps';
-import { terser } from 'rollup-plugin-terser';
-import dts from 'rollup-plugin-dts';
-import pkg from './package.json';
-
-// dev build if watching, prod build if not
-const production = !process.env.ROLLUP_WATCH;
-export default [
-  {
-    input: 'src/index.ts',
-    output: [
-      {
-        file: 'dist/index-esm.js',
-        format: 'esm',
-        sourcemap: !production,
-      },
-      {
-        file: 'dist/index-cjs.js',
-        format: 'cjs',
-        sourcemap: !production,
-      },
-    ],
-
-    external: [...Object.keys(pkg.peerDependencies || {})],
-    plugins: [
-      production &&
-        cleaner({
-          targets: ['./dist/'],
-        }),
-      typescript(),
-      !production && sourceMaps(),
-      production && terser(),
-    ],
-  },
-  {
-    input: './dist/src/index.d.ts',
-    output: [{ file: 'dist/x-grid-modules.d.ts', format: 'es' }],
-    plugins: [dts(), !production && sourceMaps()],
-  },
-];
diff --git a/packages/grid/x-grid-modules/src/components/autosizer.tsx b/packages/grid/x-grid-modules/src/components/autosizer.tsx
deleted file mode 100644
index de71aee55867..000000000000
--- a/packages/grid/x-grid-modules/src/components/autosizer.tsx
+++ /dev/null
@@ -1,3 +0,0 @@
-import AutoSizer from '../../lib/autosizer';
-
-export const AutoSizerWrapper = AutoSizer;
diff --git a/packages/grid/x-grid-modules/tsconfig.json b/packages/grid/x-grid-modules/tsconfig.json
deleted file mode 100644
index 58143bf75153..000000000000
--- a/packages/grid/x-grid-modules/tsconfig.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "extends": "../../../tsconfig.json",
-  "compilerOptions": {
-    "declaration": true,
-    "declarationDir": "./dist",
-    "module": "es6",
-    "noImplicitAny": false,
-    "strict": true,
-    "outDir": "./dist",
-    "target": "es6",
-    "sourceMap": true,
-    "composite": true,
-    "paths": {}
-  },
-  "include": ["src", "lib"],
-  "exclude": ["__tests__", "**/*.test.ts", "**/*.tests.ts", "node_modules"]
-}
diff --git a/packages/grid/x-grid-modules/typedoc.json b/packages/grid/x-grid-modules/typedoc.json
deleted file mode 100644
index c34f8339ca79..000000000000
--- a/packages/grid/x-grid-modules/typedoc.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "inputFiles": ["./src"],
-  "mode": "modules",
-  "out": "../documentation/generated/"
-}
diff --git a/packages/grid/x-grid/jest.config.js b/packages/grid/x-grid/jest.config.js
deleted file mode 100644
index 5c8de23ae3cb..000000000000
--- a/packages/grid/x-grid/jest.config.js
+++ /dev/null
@@ -1,10 +0,0 @@
-module.exports = {
-  preset: 'ts-jest',
-  rootDir: './',
-  testEnvironment: 'node',
-  transform: {
-    '^.+\\.(t|j)sx?$': 'ts-jest',
-    '.+\\.(css|styl|less|sass|scss|png|jpg|ttf|woff|woff2)$': 'jest-transform-stub',
-  },
-  testPathIgnorePatterns: ['/node_modules/', '/dist/', '/lib/'],
-};
diff --git a/packages/grid/x-grid/package.json b/packages/grid/x-grid/package.json
index 0b566d04bcb9..9bb08744e84e 100644
--- a/packages/grid/x-grid/package.json
+++ b/packages/grid/x-grid/package.json
@@ -5,7 +5,7 @@
   "author": "Material-UI Team",
   "main": "dist/index-cjs.js",
   "module": "dist/index-esm.js",
-  "types": "dist/x-grid.all.d.ts",
+  "types": "dist/x-grid.d.ts",
   "files": [
     "dist/*"
   ],
@@ -25,12 +25,11 @@
     "data-grid"
   ],
   "dependencies": {
+    "@material-ui/x-license": "^4.0.0-alpha.2",
     "prop-types": "^15.7.2",
     "tslib": "^2.0.0"
   },
   "devDependencies": {
-    "@material-ui/x-grid-modules": "^4.0.0-alpha.2",
-    "@material-ui/x-license": "^4.0.0-alpha.2",
     "@rollup/plugin-node-resolve": "^8.0.1",
     "@rollup/plugin-replace": "^2.3.3",
     "rollup": "^2.6.1",
@@ -47,12 +46,8 @@
   },
   "scripts": {
     "precommit": "npm run lint",
-    "build": "rollup -c ",
-    "prepublishOnly": "npm run build",
-    "start": "rollup -cw",
     "lint": "../../../node_modules/.bin/tsc --noEmit && eslint 'src/**/*.{ts,tsx}' --quiet --fix -c ../../../.eslintrc.js && npm run lint:css",
-    "lint:css": "stylelint 'src/**/*.{ts,tsx}' ../../../.stylelintrc.js",
-    "test": "../../../node_modules/.bin/jest --config jest.config.js"
+    "lint:css": "stylelint 'src/**/*.{ts,tsx}' ../../../.stylelintrc.js"
   },
   "setupFiles": [
     "<rootDir>/src/setupTests.js"
diff --git a/packages/grid/x-grid/src/XGrid.tsx b/packages/grid/x-grid/src/XGrid.tsx
index c46cebe7e3a9..e30d1346a486 100644
--- a/packages/grid/x-grid/src/XGrid.tsx
+++ b/packages/grid/x-grid/src/XGrid.tsx
@@ -1,12 +1,14 @@
 import * as React from 'react';
 import { LicenseInfo, useLicenseVerifier } from '@material-ui/x-license';
-import { ponyfillGlobal } from '@material-ui/utils';
-import { GridComponent, GridComponentProps, classnames } from '@material-ui/x-grid-modules';
+import { GridComponent, GridComponentProps, classnames } from '../../_modules_/grid';
 
 // This is the package release date. Each package version should update this const
 // automatically when a new version is published on npm.
 let RELEASE_INFO = '__RELEASE_INFO__';
 
+// TODO: Refactor to import when moving to material-ui v5
+const ponyfillGlobal = require('@material-ui/utils').ponyfillGlobal;
+
 // eslint-disable-next-line no-useless-concat
 if (process.env.NODE_ENV !== 'production' && RELEASE_INFO === '__RELEASE' + '_INFO__') {
   // eslint-disable-next-line no-underscore-dangle
diff --git a/packages/grid/x-grid/src/index.ts b/packages/grid/x-grid/src/index.ts
index b6427e602450..df4eae2a4070 100644
--- a/packages/grid/x-grid/src/index.ts
+++ b/packages/grid/x-grid/src/index.ts
@@ -1,3 +1,3 @@
-export * from '@material-ui/x-grid-modules';
-export * from '@material-ui/x-license';
+export { LicenseInfo } from '@material-ui/x-license';
+export * from '../../_modules_';
 export * from './XGrid';
diff --git a/packages/grid/x-grid/tsconfig.json b/packages/grid/x-grid/tsconfig.json
index 0c5e11f71710..56f3193b1fdd 100644
--- a/packages/grid/x-grid/tsconfig.json
+++ b/packages/grid/x-grid/tsconfig.json
@@ -1,22 +1,8 @@
 {
   "extends": "../../../tsconfig.json",
   "compilerOptions": {
-    "baseUrl": "./",
-    "declaration": true,
-    "declarationDir": "./dist",
-    "module": "es6",
-    "noImplicitAny": false,
-    "strict": true,
-    "outDir": "./dist",
-    "target": "es6",
-    "sourceMap": true,
-    "build": true
+    "noEmit": true,
+    "types": ["mocha", "node"]
   },
-  "include": ["src"],
-  "exclude": ["__tests__", "**/*.test.ts", "node_modules", "lib"],
-  "references": [
-    {
-      "path": "../x-grid-modules"
-    }
-  ]
+  "include": ["src"]
 }
diff --git a/packages/storybook/.storybook/main.js b/packages/storybook/.storybook/main.js
index 25188bebcda9..2b84d39f04e1 100644
--- a/packages/storybook/.storybook/main.js
+++ b/packages/storybook/.storybook/main.js
@@ -83,8 +83,7 @@ module.exports = {
       extensions: ['.js', '.ts', '.tsx'],
       alias: {
         '@material-ui/data-grid': path.resolve(__dirname, '../../../packages/grid/data-grid/src'),
-        '@material-ui/x-grid-data-generator': path.resolve(__dirname, '../../../packages/grid/x-grid-data-generator/src'),
-        '@material-ui/x-grid-modules': path.resolve(__dirname, '../../../packages/grid/x-grid-modules/src'),
+        '@material-ui/x-grid-data-generator': path.resolve(__dirname, '../../../packages/x-grid-data-generator/src'),
         '@material-ui/x-grid': path.resolve(__dirname, '../../../packages/grid/x-grid/src'),
         '@material-ui/x-license': path.resolve(__dirname, '../../../packages/x-license/src'),
       },
diff --git a/packages/grid/x-grid-data-generator/LICENSE b/packages/x-grid-data-generator/LICENSE
similarity index 100%
rename from packages/grid/x-grid-data-generator/LICENSE
rename to packages/x-grid-data-generator/LICENSE
diff --git a/packages/grid/x-grid-data-generator/README.md b/packages/x-grid-data-generator/README.md
similarity index 100%
rename from packages/grid/x-grid-data-generator/README.md
rename to packages/x-grid-data-generator/README.md
diff --git a/packages/grid/x-grid-data-generator/bin/data-gen-script.js b/packages/x-grid-data-generator/bin/data-gen-script.js
similarity index 100%
rename from packages/grid/x-grid-data-generator/bin/data-gen-script.js
rename to packages/x-grid-data-generator/bin/data-gen-script.js
diff --git a/packages/grid/x-grid-data-generator/package.json b/packages/x-grid-data-generator/package.json
similarity index 100%
rename from packages/grid/x-grid-data-generator/package.json
rename to packages/x-grid-data-generator/package.json
diff --git a/packages/grid/x-grid-data-generator/rollup.config.js b/packages/x-grid-data-generator/rollup.config.js
similarity index 100%
rename from packages/grid/x-grid-data-generator/rollup.config.js
rename to packages/x-grid-data-generator/rollup.config.js
diff --git a/packages/grid/x-grid-data-generator/some.json b/packages/x-grid-data-generator/some.json
similarity index 100%
rename from packages/grid/x-grid-data-generator/some.json
rename to packages/x-grid-data-generator/some.json
diff --git a/packages/grid/x-grid-data-generator/src/commodities.columns.tsx b/packages/x-grid-data-generator/src/commodities.columns.tsx
similarity index 100%
rename from packages/grid/x-grid-data-generator/src/commodities.columns.tsx
rename to packages/x-grid-data-generator/src/commodities.columns.tsx
diff --git a/packages/grid/x-grid-data-generator/src/datagen-cli.ts b/packages/x-grid-data-generator/src/datagen-cli.ts
similarity index 100%
rename from packages/grid/x-grid-data-generator/src/datagen-cli.ts
rename to packages/x-grid-data-generator/src/datagen-cli.ts
diff --git a/packages/grid/x-grid-data-generator/src/employees.columns.tsx b/packages/x-grid-data-generator/src/employees.columns.tsx
similarity index 100%
rename from packages/grid/x-grid-data-generator/src/employees.columns.tsx
rename to packages/x-grid-data-generator/src/employees.columns.tsx
diff --git a/packages/grid/x-grid-data-generator/src/index.ts b/packages/x-grid-data-generator/src/index.ts
similarity index 100%
rename from packages/grid/x-grid-data-generator/src/index.ts
rename to packages/x-grid-data-generator/src/index.ts
diff --git a/packages/grid/x-grid-data-generator/src/renderer/index.ts b/packages/x-grid-data-generator/src/renderer/index.ts
similarity index 100%
rename from packages/grid/x-grid-data-generator/src/renderer/index.ts
rename to packages/x-grid-data-generator/src/renderer/index.ts
diff --git a/packages/grid/x-grid-data-generator/src/renderer/renderAvatar.tsx b/packages/x-grid-data-generator/src/renderer/renderAvatar.tsx
similarity index 100%
rename from packages/grid/x-grid-data-generator/src/renderer/renderAvatar.tsx
rename to packages/x-grid-data-generator/src/renderer/renderAvatar.tsx
diff --git a/packages/grid/x-grid-data-generator/src/renderer/renderCountry.tsx b/packages/x-grid-data-generator/src/renderer/renderCountry.tsx
similarity index 100%
rename from packages/grid/x-grid-data-generator/src/renderer/renderCountry.tsx
rename to packages/x-grid-data-generator/src/renderer/renderCountry.tsx
diff --git a/packages/grid/x-grid-data-generator/src/renderer/renderDone.tsx b/packages/x-grid-data-generator/src/renderer/renderDone.tsx
similarity index 100%
rename from packages/grid/x-grid-data-generator/src/renderer/renderDone.tsx
rename to packages/x-grid-data-generator/src/renderer/renderDone.tsx
diff --git a/packages/grid/x-grid-data-generator/src/renderer/renderEmail.tsx b/packages/x-grid-data-generator/src/renderer/renderEmail.tsx
similarity index 100%
rename from packages/grid/x-grid-data-generator/src/renderer/renderEmail.tsx
rename to packages/x-grid-data-generator/src/renderer/renderEmail.tsx
diff --git a/packages/grid/x-grid-data-generator/src/renderer/renderIncoterm.tsx b/packages/x-grid-data-generator/src/renderer/renderIncoterm.tsx
similarity index 100%
rename from packages/grid/x-grid-data-generator/src/renderer/renderIncoterm.tsx
rename to packages/x-grid-data-generator/src/renderer/renderIncoterm.tsx
diff --git a/packages/grid/x-grid-data-generator/src/renderer/renderLink.tsx b/packages/x-grid-data-generator/src/renderer/renderLink.tsx
similarity index 100%
rename from packages/grid/x-grid-data-generator/src/renderer/renderLink.tsx
rename to packages/x-grid-data-generator/src/renderer/renderLink.tsx
diff --git a/packages/grid/x-grid-data-generator/src/renderer/renderPnl.tsx b/packages/x-grid-data-generator/src/renderer/renderPnl.tsx
similarity index 100%
rename from packages/grid/x-grid-data-generator/src/renderer/renderPnl.tsx
rename to packages/x-grid-data-generator/src/renderer/renderPnl.tsx
diff --git a/packages/grid/x-grid-data-generator/src/renderer/renderProgress.tsx b/packages/x-grid-data-generator/src/renderer/renderProgress.tsx
similarity index 100%
rename from packages/grid/x-grid-data-generator/src/renderer/renderProgress.tsx
rename to packages/x-grid-data-generator/src/renderer/renderProgress.tsx
diff --git a/packages/grid/x-grid-data-generator/src/renderer/renderRating.tsx b/packages/x-grid-data-generator/src/renderer/renderRating.tsx
similarity index 100%
rename from packages/grid/x-grid-data-generator/src/renderer/renderRating.tsx
rename to packages/x-grid-data-generator/src/renderer/renderRating.tsx
diff --git a/packages/grid/x-grid-data-generator/src/renderer/renderStatus.tsx b/packages/x-grid-data-generator/src/renderer/renderStatus.tsx
similarity index 100%
rename from packages/grid/x-grid-data-generator/src/renderer/renderStatus.tsx
rename to packages/x-grid-data-generator/src/renderer/renderStatus.tsx
diff --git a/packages/grid/x-grid-data-generator/src/renderer/renderTotalPrice.tsx b/packages/x-grid-data-generator/src/renderer/renderTotalPrice.tsx
similarity index 100%
rename from packages/grid/x-grid-data-generator/src/renderer/renderTotalPrice.tsx
rename to packages/x-grid-data-generator/src/renderer/renderTotalPrice.tsx
diff --git a/packages/grid/x-grid-data-generator/src/services/generatableColDef.ts b/packages/x-grid-data-generator/src/services/generatableColDef.ts
similarity index 100%
rename from packages/grid/x-grid-data-generator/src/services/generatableColDef.ts
rename to packages/x-grid-data-generator/src/services/generatableColDef.ts
diff --git a/packages/grid/x-grid-data-generator/src/services/index.ts b/packages/x-grid-data-generator/src/services/index.ts
similarity index 100%
rename from packages/grid/x-grid-data-generator/src/services/index.ts
rename to packages/x-grid-data-generator/src/services/index.ts
diff --git a/packages/grid/x-grid-data-generator/src/services/random-generator.ts b/packages/x-grid-data-generator/src/services/random-generator.ts
similarity index 100%
rename from packages/grid/x-grid-data-generator/src/services/random-generator.ts
rename to packages/x-grid-data-generator/src/services/random-generator.ts
diff --git a/packages/grid/x-grid-data-generator/src/services/real-data-service.ts b/packages/x-grid-data-generator/src/services/real-data-service.ts
similarity index 100%
rename from packages/grid/x-grid-data-generator/src/services/real-data-service.ts
rename to packages/x-grid-data-generator/src/services/real-data-service.ts
diff --git a/packages/grid/x-grid-data-generator/src/services/static-data.ts b/packages/x-grid-data-generator/src/services/static-data.ts
similarity index 100%
rename from packages/grid/x-grid-data-generator/src/services/static-data.ts
rename to packages/x-grid-data-generator/src/services/static-data.ts
diff --git a/packages/grid/x-grid-data-generator/src/style/real-data-stories.css b/packages/x-grid-data-generator/src/style/real-data-stories.css
similarity index 100%
rename from packages/grid/x-grid-data-generator/src/style/real-data-stories.css
rename to packages/x-grid-data-generator/src/style/real-data-stories.css
diff --git a/packages/grid/x-grid-data-generator/src/useDemoData.ts b/packages/x-grid-data-generator/src/useDemoData.ts
similarity index 100%
rename from packages/grid/x-grid-data-generator/src/useDemoData.ts
rename to packages/x-grid-data-generator/src/useDemoData.ts
diff --git a/packages/grid/x-grid-data-generator/tsconfig.json b/packages/x-grid-data-generator/tsconfig.json
similarity index 88%
rename from packages/grid/x-grid-data-generator/tsconfig.json
rename to packages/x-grid-data-generator/tsconfig.json
index 0a4ae6011f2c..ca8b148a726a 100644
--- a/packages/grid/x-grid-data-generator/tsconfig.json
+++ b/packages/x-grid-data-generator/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.json",
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
     "baseUrl": "./",
     "declaration": true,
diff --git a/tsconfig.json b/tsconfig.json
index 2343c187d22b..edd18c494f9f 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -20,10 +20,8 @@
     "paths": {
       "@material-ui/data-grid": ["./packages/grid/data-grid/src"],
       "@material-ui/data-grid/*": ["./packages/grid/data-grid/src/*"],
-      "@material-ui/x-grid-data-generator": ["./packages/grid/x-grid-data-generator/src/"],
-      "@material-ui/x-grid-data-generator/*": ["./packages/grid/x-grid-data-generator/src/*"],
-      "@material-ui/x-grid-modules": ["./packages/grid/x-grid-modules/src"],
-      "@material-ui/x-grid-modules/*": ["./packages/grid/x-grid-modules/src/*"],
+      "@material-ui/x-grid-data-generator": ["./packages/x-grid-data-generator/src/"],
+      "@material-ui/x-grid-data-generator/*": ["./packages/x-grid-data-generator/src/*"],
       "@material-ui/x-grid": ["./packages/grid/x-grid/src"],
       "@material-ui/x-grid/*": ["./packages/grid/x-grid/src/*"],
       "@material-ui/x-license": ["./packages/x-license/src"],
diff --git a/webpackBaseConfig.js b/webpackBaseConfig.js
index 3e2944b61b3f..fadf52602006 100644
--- a/webpackBaseConfig.js
+++ b/webpackBaseConfig.js
@@ -10,9 +10,8 @@ module.exports = {
       '@material-ui/data-grid': path.resolve(__dirname, './packages/grid/data-grid/src'),
       '@material-ui/x-grid-data-generator': path.resolve(
         __dirname,
-        './packages/grid/x-grid-data-generator/src',
+        './packages/x-grid-data-generator/src',
       ),
-      '@material-ui/x-grid-modules': path.resolve(__dirname, './packages/grid/x-grid-modules/src'),
       '@material-ui/x-grid': path.resolve(__dirname, './packages/grid/x-grid/src'),
       '@material-ui/x-license': path.resolve(__dirname, './packages/x-license/src'),
       docs: path.resolve(__dirname, './docs/node_modules/@material-ui/monorepo/docs'),
diff --git a/yarn.lock b/yarn.lock
index c057d134dd6e..5d35ae705aa2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1608,22 +1608,6 @@
   resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.2.5.tgz#8eed982e2ee6f7f4e44c253e12962980791efd46"
   integrity sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA==
 
-"@eslint/eslintrc@^0.1.3":
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.1.3.tgz#7d1a2b2358552cc04834c0979bd4275362e37085"
-  integrity sha512-4YVwPkANLeNtRjMekzux1ci8hIaH5eGKktGqR0d3LWsKNn5B2X/1Z6Trxy7jQXl9EBGE6Yj02O+t09FMeRllaA==
-  dependencies:
-    ajv "^6.12.4"
-    debug "^4.1.1"
-    espree "^7.3.0"
-    globals "^12.1.0"
-    ignore "^4.0.6"
-    import-fresh "^3.2.1"
-    js-yaml "^3.13.1"
-    lodash "^4.17.19"
-    minimatch "^3.0.4"
-    strip-json-comments "^3.1.1"
-
 "@evocateur/libnpmaccess@^3.1.2":
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/@evocateur/libnpmaccess/-/libnpmaccess-3.1.2.tgz#ecf7f6ce6b004e9f942b098d92200be4a4b1c845"
@@ -3223,10 +3207,10 @@
     "@sinonjs/commons" "^1"
     "@sinonjs/samsam" "^5.0.2"
 
-"@sinonjs/samsam@^5.0.2", "@sinonjs/samsam@^5.1.0":
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/@sinonjs/samsam/-/samsam-5.1.0.tgz#3afe719232b541bb6cf3411a4c399a188de21ec0"
-  integrity sha512-42nyaQOVunX5Pm6GRJobmzbS7iLI+fhERITnETXzzwDZh+TtDr/Au3yAvXVjFmZ4wEUaE4Y3NFZfKv0bV0cbtg==
+"@sinonjs/samsam@^5.0.2", "@sinonjs/samsam@^5.0.3":
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/@sinonjs/samsam/-/samsam-5.0.3.tgz#86f21bdb3d52480faf0892a480c9906aa5a52938"
+  integrity sha512-QucHkc2uMJ0pFGjJUDP3F9dq5dx8QIaqISl9QgwLOh6P9yv877uONPGXh/OH/0zmM3tW1JjuJltAZV2l7zU+uQ==
   dependencies:
     "@sinonjs/commons" "^1.6.0"
     lodash.get "^4.4.2"
@@ -4732,9 +4716,9 @@
     "@types/enzyme" "*"
 
 "@types/enzyme@*", "@types/enzyme@^3.10.5":
-  version "3.10.6"
-  resolved "https://registry.yarnpkg.com/@types/enzyme/-/enzyme-3.10.6.tgz#a34a6b09ff732be29c194dc8d786555f4717fd85"
-  integrity sha512-Jxyn2U+UfhmrE7EaeZYfV1sPA5OEDuZmg9Lxj8TxOnfCn71flf0Cn1136LWdCVYj7yapLFmUWqKCcgplWNZCJg==
+  version "3.10.5"
+  resolved "https://registry.yarnpkg.com/@types/enzyme/-/enzyme-3.10.5.tgz#fe7eeba3550369eed20e7fb565bfb74eec44f1f0"
+  integrity sha512-R+phe509UuUYy9Tk0YlSbipRpfVtIzb/9BHn5pTEtjJTF5LXvUjrIQcZvNyANNEyFrd2YGs196PniNT1fgvOQA==
   dependencies:
     "@types/cheerio" "*"
     "@types/react" "*"
@@ -5136,7 +5120,7 @@
   resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-1.0.1.tgz#0a851d3bd96498fa25c33ab7278ed3bd65f06c3e"
   integrity sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw==
 
-"@types/styled-components@5.1.3", "@types/styled-components@^5.0.1":
+"@types/styled-components@5.1.3":
   version "5.1.3"
   resolved "https://registry.yarnpkg.com/@types/styled-components/-/styled-components-5.1.3.tgz#6fab3d9c8f7d9a15cbb89d379d850c985002f363"
   integrity sha512-HGpirof3WOhiX17lb61Q/tpgqn48jxO8EfZkdJ8ueYqwLbK2AHQe/G08DasdA2IdKnmwOIP1s9X2bopxKXgjRw==
@@ -5146,6 +5130,16 @@
     "@types/react-native" "*"
     csstype "^3.0.2"
 
+"@types/styled-components@^5.0.1":
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/@types/styled-components/-/styled-components-5.1.1.tgz#17c3b3a299aa38254189e04a72a8ee009a22e42d"
+  integrity sha512-fIjKvDU1LJExBZWEQilHqzfpOK4KUwBsj5zC79lxa94ekz8oDQSBNcayMACBImxIuevF+NbBGL9O/2CQ67Zhig==
+  dependencies:
+    "@types/hoist-non-react-statics" "*"
+    "@types/react" "*"
+    "@types/react-native" "*"
+    csstype "^2.2.0"
+
 "@types/tapable@*", "@types/tapable@^1.0.5":
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.6.tgz#a9ca4b70a18b270ccb2bc0aaafefd1d486b7ea74"
@@ -5227,17 +5221,6 @@
     semver "^7.3.2"
     tsutils "^3.17.1"
 
-"@typescript-eslint/experimental-utils@3.10.1":
-  version "3.10.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-3.10.1.tgz#e179ffc81a80ebcae2ea04e0332f8b251345a686"
-  integrity sha512-DewqIgscDzmAfd5nOGe4zm6Bl7PKtMG2Ad0KG8CUZAHlXfAKTF9Ol5PXhiMh39yRL2ChRH1cuuUGOcVyyrhQIw==
-  dependencies:
-    "@types/json-schema" "^7.0.3"
-    "@typescript-eslint/types" "3.10.1"
-    "@typescript-eslint/typescript-estree" "3.10.1"
-    eslint-scope "^5.0.0"
-    eslint-utils "^2.0.0"
-
 "@typescript-eslint/experimental-utils@3.6.1":
   version "3.6.1"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-3.6.1.tgz#b5a2738ebbceb3fa90c5b07d50bb1225403c4a54"
@@ -5249,40 +5232,48 @@
     eslint-scope "^5.0.0"
     eslint-utils "^2.0.0"
 
-"@typescript-eslint/parser@^3.6.0", "@typescript-eslint/parser@^3.6.1":
-  version "3.10.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-3.10.1.tgz#1883858e83e8b442627e1ac6f408925211155467"
-  integrity sha512-Ug1RcWcrJP02hmtaXVS3axPPTTPnZjupqhgj+NnZ6BCkwSImWk/283347+x9wN+lqOdK9Eo3vsyiyDHgsmiEJw==
+"@typescript-eslint/experimental-utils@3.8.0":
+  version "3.8.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-3.8.0.tgz#ac1f7c88322dcfb7635ece6f0441516dd951099a"
+  integrity sha512-o8T1blo1lAJE0QDsW7nSyvZHbiDzQDjINJKyB44Z3sSL39qBy5L10ScI/XwDtaiunoyKGLiY9bzRk4YjsUZl8w==
+  dependencies:
+    "@types/json-schema" "^7.0.3"
+    "@typescript-eslint/types" "3.8.0"
+    "@typescript-eslint/typescript-estree" "3.8.0"
+    eslint-scope "^5.0.0"
+    eslint-utils "^2.0.0"
+
+"@typescript-eslint/parser@^3.6.0":
+  version "3.8.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-3.8.0.tgz#8e1dcd404299bf79492409c81c415fa95a7c622b"
+  integrity sha512-u5vjOBaCsnMVQOvkKCXAmmOhyyMmFFf5dbkM3TIbg3MZ2pyv5peE4gj81UAbTHwTOXEwf7eCQTUMKrDl/+qGnA==
   dependencies:
     "@types/eslint-visitor-keys" "^1.0.0"
-    "@typescript-eslint/experimental-utils" "3.10.1"
-    "@typescript-eslint/types" "3.10.1"
-    "@typescript-eslint/typescript-estree" "3.10.1"
+    "@typescript-eslint/experimental-utils" "3.8.0"
+    "@typescript-eslint/types" "3.8.0"
+    "@typescript-eslint/typescript-estree" "3.8.0"
     eslint-visitor-keys "^1.1.0"
 
-"@typescript-eslint/types@3.10.1":
-  version "3.10.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-3.10.1.tgz#1d7463fa7c32d8a23ab508a803ca2fe26e758727"
-  integrity sha512-+3+FCUJIahE9q0lDi1WleYzjCwJs5hIsbugIgnbB+dSCYUxl8L6PwmsyOPFZde2hc1DlTo/xnkOgiTLSyAbHiQ==
+"@typescript-eslint/parser@^3.6.1":
+  version "3.6.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-3.6.1.tgz#216e8adf4ee9c629f77c985476a2ea07fb80e1dc"
+  integrity sha512-SLihQU8RMe77YJ/jGTqOt0lMq7k3hlPVfp7v/cxMnXA9T0bQYoMDfTsNgHXpwSJM1Iq2aAJ8WqekxUwGv5F67Q==
+  dependencies:
+    "@types/eslint-visitor-keys" "^1.0.0"
+    "@typescript-eslint/experimental-utils" "3.6.1"
+    "@typescript-eslint/types" "3.6.1"
+    "@typescript-eslint/typescript-estree" "3.6.1"
+    eslint-visitor-keys "^1.1.0"
 
 "@typescript-eslint/types@3.6.1":
   version "3.6.1"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-3.6.1.tgz#87600fe79a1874235d3cc1cf5c7e1a12eea69eee"
   integrity sha512-NPxd5yXG63gx57WDTW1rp0cF3XlNuuFFB5G+Kc48zZ+51ZnQn9yjDEsjTPQ+aWM+V+Z0I4kuTFKjKvgcT1F7xQ==
 
-"@typescript-eslint/typescript-estree@3.10.1":
-  version "3.10.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-3.10.1.tgz#fd0061cc38add4fad45136d654408569f365b853"
-  integrity sha512-QbcXOuq6WYvnB3XPsZpIwztBoquEYLXh2MtwVU+kO8jgYCiv4G5xrSP/1wg4tkvrEE+esZVquIPX/dxPlePk1w==
-  dependencies:
-    "@typescript-eslint/types" "3.10.1"
-    "@typescript-eslint/visitor-keys" "3.10.1"
-    debug "^4.1.1"
-    glob "^7.1.6"
-    is-glob "^4.0.1"
-    lodash "^4.17.15"
-    semver "^7.3.2"
-    tsutils "^3.17.1"
+"@typescript-eslint/types@3.8.0":
+  version "3.8.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-3.8.0.tgz#58581dd863f86e0cd23353d94362bb90b4bea796"
+  integrity sha512-8kROmEQkv6ss9kdQ44vCN1dTrgu4Qxrd2kXr10kz2NP5T8/7JnEfYNxCpPkArbLIhhkGLZV3aVMplH1RXQRF7Q==
 
 "@typescript-eslint/typescript-estree@3.6.1":
   version "3.6.1"
@@ -5298,12 +5289,19 @@
     semver "^7.3.2"
     tsutils "^3.17.1"
 
-"@typescript-eslint/visitor-keys@3.10.1":
-  version "3.10.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-3.10.1.tgz#cd4274773e3eb63b2e870ac602274487ecd1e931"
-  integrity sha512-9JgC82AaQeglebjZMgYR5wgmfUdUc+EitGUUMW8u2nDckaeimzW+VsoLV6FoimPv2id3VQzfjwBxEMVz08ameQ==
+"@typescript-eslint/typescript-estree@3.8.0":
+  version "3.8.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-3.8.0.tgz#0606d19f629f813dbdd5a34c7a1e895d6191cac6"
+  integrity sha512-MTv9nPDhlKfclwnplRNDL44mP2SY96YmPGxmMbMy6x12I+pERcxpIUht7DXZaj4mOKKtet53wYYXU0ABaiXrLw==
   dependencies:
-    eslint-visitor-keys "^1.1.0"
+    "@typescript-eslint/types" "3.8.0"
+    "@typescript-eslint/visitor-keys" "3.8.0"
+    debug "^4.1.1"
+    glob "^7.1.6"
+    is-glob "^4.0.1"
+    lodash "^4.17.15"
+    semver "^7.3.2"
+    tsutils "^3.17.1"
 
 "@typescript-eslint/visitor-keys@3.6.1":
   version "3.6.1"
@@ -5312,6 +5310,13 @@
   dependencies:
     eslint-visitor-keys "^1.1.0"
 
+"@typescript-eslint/visitor-keys@3.8.0":
+  version "3.8.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-3.8.0.tgz#ad35110249fb3fc30a36bfcbfeea93e710cfaab1"
+  integrity sha512-gfqQWyVPpT9NpLREXNR820AYwgz+Kr1GuF3nf1wxpHD6hdxI62tq03ToomFnDxY0m3pUB39IF7sil7D5TQexLA==
+  dependencies:
+    eslint-visitor-keys "^1.1.0"
+
 "@webassemblyjs/ast@1.9.0":
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.9.0.tgz#bd850604b4042459a5a41cd7d338cbed695ed964"
@@ -5570,16 +5575,11 @@ acorn@^6.0.1, acorn@^6.4.1:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.1.tgz#531e58ba3f51b9dacb9a6646ca4debf5b14ca474"
   integrity sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==
 
-acorn@^7.1.0, acorn@^7.1.1:
+acorn@^7.1.0, acorn@^7.1.1, acorn@^7.3.1:
   version "7.3.1"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.3.1.tgz#85010754db53c3fbaf3b9ea3e083aa5c5d147ffd"
   integrity sha512-tLc0wSnatxAQHVHUapaHdz72pi9KUyHjq5KyHjGg9Y8Ifdc79pTh2XvI6I1/chZbnM7QtNKzh66ooDogPZSleA==
 
-acorn@^7.4.0:
-  version "7.4.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.0.tgz#e1ad486e6c54501634c6c397c5c121daa383607c"
-  integrity sha512-+G7P8jJmCHr+S+cLfQxygbWhXy+8YTVGzAkpEbcLo2mLoL7tij/VG41QSHACSf5QgYRhMZYHuNc6drJaO0Da+w==
-
 address@1.1.2, address@^1.0.1, address@^1.0.3:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/address/-/address-1.1.2.tgz#bf1116c9c758c51b7a933d296b72c221ed9428b6"
@@ -5663,7 +5663,7 @@ airbnb-js-shims@^2.2.1:
     string.prototype.padstart "^3.0.0"
     symbol.prototype.description "^1.0.0"
 
-airbnb-prop-types@^2.16.0:
+airbnb-prop-types@^2.15.0:
   version "2.16.0"
   resolved "https://registry.yarnpkg.com/airbnb-prop-types/-/airbnb-prop-types-2.16.0.tgz#b96274cefa1abb14f623f804173ee97c13971dc2"
   integrity sha512-7WHOFolP/6cS96PhKNrslCLMYAI8yB1Pp6u6XmxozQOiZbsI5ycglZr5cHhBFfuRcQQjzCMith5ZPZdYiJCxUg==
@@ -5683,12 +5683,27 @@ ajv-errors@^1.0.0:
   resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz#f35986aceb91afadec4102fbd85014950cefa64d"
   integrity sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==
 
-ajv-keywords@^3.1.0, ajv-keywords@^3.4.1, ajv-keywords@^3.5.2:
+ajv-keywords@^3.1.0, ajv-keywords@^3.4.1:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.0.tgz#5c894537098785926d71e696114a53ce768ed773"
+  integrity sha512-eyoaac3btgU8eJlvh01En8OCKzRqlLe2G5jDsCr3RiE2uLGMEEB1aaGwVVpwR8M95956tGH6R+9edC++OvzaVw==
+
+ajv-keywords@^3.5.2:
   version "3.5.2"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
   integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==
 
-ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.0, ajv@^6.12.4, ajv@^6.5.5:
+ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.0, ajv@^6.5.5:
+  version "6.12.3"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.3.tgz#18c5af38a111ddeb4f2697bd78d68abc1cabd706"
+  integrity sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==
+  dependencies:
+    fast-deep-equal "^3.1.1"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.4.1"
+    uri-js "^4.2.2"
+
+ajv@^6.12.4:
   version "6.12.4"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.4.tgz#0614facc4522127fa713445c6bfd3ebd376e2234"
   integrity sha512-eienB2c9qVQs2KWexhkrdMLVDoIQCz5KSeLxwg9Lzk4DOfBtIK9PQwwufcsn1jjGuf9WZmqPMbGxOzfcuphJCQ==
@@ -7436,9 +7451,9 @@ chalk@^4.0.0, chalk@^4.1.0:
     supports-color "^7.1.0"
 
 chance@^1.1.6:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/chance/-/chance-1.1.7.tgz#e99dde5ac16681af787b5ba94c8277c090d6cfe8"
-  integrity sha512-bua/2cZEfzS6qPm0vi3JEvGNbriDLcMj9lKxCQOjUcCJRcyjA7umP0zZm6bKWWlBN04vA0L99QGH/CZQawr0eg==
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/chance/-/chance-1.1.6.tgz#967a0a129e0f342f7c65cd5d20f5ae870a26b8af"
+  integrity sha512-DXLzaGjasDWbvlFAJyQBIwlzdQZuPdz4of9TTTxmHTjja88ZU/vBwUwxxjalSt43zWTPrhiJT0z0N4bZqfZS9w==
 
 char-regex@^1.0.2:
   version "1.0.2"
@@ -7516,7 +7531,22 @@ chokidar@2.1.8, chokidar@^2.1.8:
   optionalDependencies:
     fsevents "^1.2.7"
 
-chokidar@3.4.2, chokidar@^3.3.0, chokidar@^3.4.1, chokidar@^3.4.2:
+chokidar@3.3.1:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.3.1.tgz#c84e5b3d18d9a4d77558fef466b1bf16bbeb3450"
+  integrity sha512-4QYCEWOcK3OJrxwvyyAOxFuhpvOVCYkr33LPfFNBjAD/w3sEzWsp2BUOkI4l9bHvWioAd0rc6NlHUOEaWkTeqg==
+  dependencies:
+    anymatch "~3.1.1"
+    braces "~3.0.2"
+    glob-parent "~5.1.0"
+    is-binary-path "~2.1.0"
+    is-glob "~4.0.1"
+    normalize-path "~3.0.0"
+    readdirp "~3.3.0"
+  optionalDependencies:
+    fsevents "~2.1.2"
+
+chokidar@^3.3.0, chokidar@^3.4.1, chokidar@^3.4.2:
   version "3.4.2"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.4.2.tgz#38dc8e658dec3809741eb3ef7bb0a47fe424232d"
   integrity sha512-IZHaDeBeI+sZJRX7lGcXsdzgvZqKv6sECqsbErJA4mHWfpRrD8B97kSFN4cQz6nGBGiuFia1MKR4d6c1o8Cv7A==
@@ -8654,7 +8684,7 @@ cssstyle@^2.0.0, cssstyle@^2.2.0:
   dependencies:
     cssom "~0.3.6"
 
-csstype@^2.5.2, csstype@^2.5.7, csstype@^2.6.7:
+csstype@^2.2.0, csstype@^2.5.2, csstype@^2.5.7, csstype@^2.6.5, csstype@^2.6.7:
   version "2.6.11"
   resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.11.tgz#452f4d024149ecf260a852b025e36562a253ffc5"
   integrity sha512-l8YyEC9NBkSm783PFTvh0FmJy7s5pFKrDp49ZL7zBGX3fWkO+N4EEyan1qqp8cwPLDcD0OSdyY6hAMoxp34JFw==
@@ -8838,6 +8868,13 @@ debug@3.1.0, debug@=3.1.0, debug@~3.1.0:
   dependencies:
     ms "2.0.0"
 
+debug@3.2.6, debug@^3.0.0, debug@^3.1.0, debug@^3.1.1, debug@^3.2.5:
+  version "3.2.6"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
+  integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
+  dependencies:
+    ms "^2.1.1"
+
 debug@4, debug@4.2.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.2.0.tgz#7f150f93920e94c58f5574c2fd01a3110effe7f1"
@@ -8845,20 +8882,13 @@ debug@4, debug@4.2.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1:
   dependencies:
     ms "2.1.2"
 
-debug@4.1.1, debug@~4.1.0:
+debug@~4.1.0:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
   integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
   dependencies:
     ms "^2.1.1"
 
-debug@^3.0.0, debug@^3.1.0, debug@^3.1.1, debug@^3.2.5:
-  version "3.2.6"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
-  integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
-  dependencies:
-    ms "^2.1.1"
-
 debuglog@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
@@ -9639,39 +9669,39 @@ envinfo@^7.3.1:
   integrity sha512-hQBkDf2iO4Nv0CNHpCuSBeaSrveU6nThVxFGTrq/eDlV716UQk09zChaJae4mZRsos1x4YLY2TaH3LHUae3ZmQ==
 
 enzyme-adapter-react-16@^1.15.2:
-  version "1.15.4"
-  resolved "https://registry.yarnpkg.com/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.15.4.tgz#328a782365a363ecb424f99283c4833dd92c0f21"
-  integrity sha512-wPzxs+JaGDK2TPYzl5a9YWGce6i2SQ3Cg51ScLeyj2WotUZ8Obcq1ke/U1Y2VGpYlb9rrX2yCjzSMgtKCeAt5w==
+  version "1.15.2"
+  resolved "https://registry.yarnpkg.com/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.15.2.tgz#b16db2f0ea424d58a808f9df86ab6212895a4501"
+  integrity sha512-SkvDrb8xU3lSxID8Qic9rB8pvevDbLybxPK6D/vW7PrT0s2Cl/zJYuXvsd1EBTz0q4o3iqG3FJhpYz3nUNpM2Q==
   dependencies:
-    enzyme-adapter-utils "^1.13.1"
-    enzyme-shallow-equal "^1.0.4"
+    enzyme-adapter-utils "^1.13.0"
+    enzyme-shallow-equal "^1.0.1"
     has "^1.0.3"
     object.assign "^4.1.0"
     object.values "^1.1.1"
     prop-types "^15.7.2"
-    react-is "^16.13.1"
+    react-is "^16.12.0"
     react-test-renderer "^16.0.0-0"
     semver "^5.7.0"
 
-enzyme-adapter-utils@^1.13.1:
-  version "1.13.1"
-  resolved "https://registry.yarnpkg.com/enzyme-adapter-utils/-/enzyme-adapter-utils-1.13.1.tgz#59c1b734b0927543e3d8dc477299ec957feb312d"
-  integrity sha512-5A9MXXgmh/Tkvee3bL/9RCAAgleHqFnsurTYCbymecO4ohvtNO5zqIhHxV370t7nJAwaCfkgtffarKpC0GPt0g==
+enzyme-adapter-utils@^1.13.0:
+  version "1.13.0"
+  resolved "https://registry.yarnpkg.com/enzyme-adapter-utils/-/enzyme-adapter-utils-1.13.0.tgz#01c885dde2114b4690bf741f8dc94cee3060eb78"
+  integrity sha512-YuEtfQp76Lj5TG1NvtP2eGJnFKogk/zT70fyYHXK2j3v6CtuHqc8YmgH/vaiBfL8K1SgVVbQXtTcgQZFwzTVyQ==
   dependencies:
-    airbnb-prop-types "^2.16.0"
+    airbnb-prop-types "^2.15.0"
     function.prototype.name "^1.1.2"
     object.assign "^4.1.0"
     object.fromentries "^2.0.2"
     prop-types "^15.7.2"
     semver "^5.7.1"
 
-enzyme-shallow-equal@^1.0.1, enzyme-shallow-equal@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/enzyme-shallow-equal/-/enzyme-shallow-equal-1.0.4.tgz#b9256cb25a5f430f9bfe073a84808c1d74fced2e"
-  integrity sha512-MttIwB8kKxypwHvRynuC3ahyNc+cFbR8mjVIltnmzQ0uKGqmsfO4bfBuLxb0beLNPhjblUEYvEbsg+VSygvF1Q==
+enzyme-shallow-equal@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/enzyme-shallow-equal/-/enzyme-shallow-equal-1.0.1.tgz#7afe03db3801c9b76de8440694096412a8d9d49e"
+  integrity sha512-hGA3i1so8OrYOZSM9whlkNmVHOicJpsjgTzC+wn2JMJXhq1oO4kA4bJ5MsfzSIcC71aLDKzJ6gZpIxrqt3QTAQ==
   dependencies:
     has "^1.0.3"
-    object-is "^1.1.2"
+    object-is "^1.0.2"
 
 enzyme@^3.11.0:
   version "3.11.0"
@@ -9827,21 +9857,16 @@ escape-html@^1.0.3, escape-html@~1.0.3:
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
   integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
 
+escape-string-regexp@1.0.5, escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
+
 escape-string-regexp@2.0.0, escape-string-regexp@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344"
   integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==
 
-escape-string-regexp@4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
-  integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
-
-escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
-  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
-
 escodegen@^1.11.1, escodegen@^1.12.0, escodegen@^1.14.1:
   version "1.14.3"
   resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.3.tgz#4e7b81fba61581dc97582ed78cab7f0e8d63f503"
@@ -9977,9 +10002,9 @@ eslint-plugin-react-hooks@^4.0.8:
   integrity sha512-6SSb5AiMCPd8FDJrzah+Z4F44P2CdOaK026cXFV+o/xSRzfOiV1FNFeLl2z6xm3yqWOQEZ5OfVgiec90qV2xrQ==
 
 eslint-plugin-react@^7.20.3:
-  version "7.20.6"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.20.6.tgz#4d7845311a93c463493ccfa0a19c9c5d0fd69f60"
-  integrity sha512-kidMTE5HAEBSLu23CUDvj8dc3LdBU0ri1scwHBZjI41oDv4tjsWZKU7MQccFzH1QYPYhsnTF2ovh7JlcIcmxgg==
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.20.5.tgz#29480f3071f64a04b2c3d99d9b460ce0f76fb857"
+  integrity sha512-ajbJfHuFnpVNJjhyrfq+pH1C0gLc2y94OiCbAXT5O0J0YCKaFEHDV8+3+mDOr+w8WguRX+vSs1bM2BDG0VLvCw==
   dependencies:
     array-includes "^3.1.1"
     array.prototype.flatmap "^1.2.3"
@@ -10022,12 +10047,11 @@ eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0:
   integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==
 
 eslint@^7.4.0:
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.9.0.tgz#522aeccc5c3a19017cf0cb46ebfd660a79acf337"
-  integrity sha512-V6QyhX21+uXp4T+3nrNfI3hQNBDa/P8ga7LoQOenwrlEFXrEnUEE+ok1dMtaS3b6rmLXhT1TkTIsG75HMLbknA==
+  version "7.5.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.5.0.tgz#9ecbfad62216d223b82ac9ffea7ef3444671d135"
+  integrity sha512-vlUP10xse9sWt9SGRtcr1LAC67BENcQMFeV+w5EvLEoFe3xJ8cF1Skd0msziRx/VMC+72B4DxreCE+OR12OA6Q==
   dependencies:
     "@babel/code-frame" "^7.0.0"
-    "@eslint/eslintrc" "^0.1.3"
     ajv "^6.10.0"
     chalk "^4.0.0"
     cross-spawn "^7.0.2"
@@ -10037,7 +10061,7 @@ eslint@^7.4.0:
     eslint-scope "^5.1.0"
     eslint-utils "^2.1.0"
     eslint-visitor-keys "^1.3.0"
-    espree "^7.3.0"
+    espree "^7.2.0"
     esquery "^1.2.0"
     esutils "^2.0.2"
     file-entry-cache "^5.0.1"
@@ -10069,12 +10093,12 @@ esm@^3.2.25:
   resolved "https://registry.yarnpkg.com/esm/-/esm-3.2.25.tgz#342c18c29d56157688ba5ce31f8431fbb795cc10"
   integrity sha512-U1suiZ2oDVWv4zPO56S0NcR5QriEahGtdN2OR6FiOG4WJvcjBVFB0qI4+eKoWFH483PKGuLuu6V8Z4T5g63UVA==
 
-espree@^7.3.0:
-  version "7.3.0"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-7.3.0.tgz#dc30437cf67947cf576121ebd780f15eeac72348"
-  integrity sha512-dksIWsvKCixn1yrEXO8UosNSxaDoSYpq9reEjZSbHLpT5hpaCAKTLBwq0RHtLrIr+c0ByiYzWT8KTMRzoRCNlw==
+espree@^7.2.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-7.2.0.tgz#1c263d5b513dbad0ac30c4991b93ac354e948d69"
+  integrity sha512-H+cQ3+3JYRMEIOl87e7QdHX70ocly5iW4+dttuR8iYSPr/hXKFb+7dBsZ7+u1adC4VrnPlTkv0+OwuPnDop19g==
   dependencies:
-    acorn "^7.4.0"
+    acorn "^7.3.1"
     acorn-jsx "^5.2.0"
     eslint-visitor-keys "^1.3.0"
 
@@ -10693,14 +10717,6 @@ find-up@4.1.0, find-up@^4.0.0, find-up@^4.1.0:
     locate-path "^5.0.0"
     path-exists "^4.0.0"
 
-find-up@5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc"
-  integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==
-  dependencies:
-    locate-path "^6.0.0"
-    path-exists "^4.0.0"
-
 find-up@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
@@ -10939,7 +10955,7 @@ fs-extra@^0.30.0:
     path-is-absolute "^1.0.0"
     rimraf "^2.2.8"
 
-fs-extra@^9.0.0, fs-extra@^9.0.1:
+fs-extra@^9.0.0:
   version "9.0.1"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.0.1.tgz#910da0062437ba4c39fedd863f1675ccfefcb9fc"
   integrity sha512-h2iAoN838FqAFJY2/qVpzFXy+EBxfVE220PalAqQLDVsFOHLJrZvut5puAbCdNv6WJk+B8ihI+k0c7JK5erwqQ==
@@ -11675,11 +11691,6 @@ hex-color-regex@^1.1.0:
   resolved "https://registry.yarnpkg.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz#4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e"
   integrity sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==
 
-highlight.js@^10.2.0:
-  version "10.2.0"
-  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.2.0.tgz#367151bcf813adebc54822f1cb51d2e1e599619f"
-  integrity sha512-OryzPiqqNCfO/wtFo619W+nPYALM6u7iCQkum4bqRmmlcTikOkmlL06i009QelynBPAlNByTQU6cBB2cOBQtCw==
-
 highlight.js@~9.13.0:
   version "9.13.1"
   resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.13.1.tgz#054586d53a6863311168488a0f58d6c505ce641e"
@@ -13823,7 +13834,15 @@ js-tokens@^3.0.2:
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
   integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls=
 
-js-yaml@3.14.0, js-yaml@^3.13.1:
+js-yaml@3.13.1:
+  version "3.13.1"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
+  integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
+  dependencies:
+    argparse "^1.0.7"
+    esprima "^4.0.0"
+
+js-yaml@^3.13.1:
   version "3.14.0"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.0.tgz#a7a34170f26a21bb162424d8adacb4113a69e482"
   integrity sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==
@@ -14081,12 +14100,12 @@ jss-rtl@^0.3.0:
     rtl-css-js "^1.13.1"
 
 jss@^10.0.3, jss@^10.3.0:
-  version "10.4.0"
-  resolved "https://registry.yarnpkg.com/jss/-/jss-10.4.0.tgz#473a6fbe42e85441020a07e9519dac1e8a2e79ca"
-  integrity sha512-l7EwdwhsDishXzqTc3lbsbyZ83tlUl5L/Hb16pHCvZliA9lRDdNBZmHzeJHP0sxqD0t1mrMmMR8XroR12JBYzw==
+  version "10.3.0"
+  resolved "https://registry.yarnpkg.com/jss/-/jss-10.3.0.tgz#2cf7be265f72b59c1764d816fdabff1c5dd18326"
+  integrity sha512-B5sTRW9B6uHaUVzSo9YiMEOEp3UX8lWevU0Fsv+xtRnsShmgCfIYX44bTH8bPJe6LQKqEXku3ulKuHLbxBS97Q==
   dependencies:
     "@babel/runtime" "^7.3.1"
-    csstype "^3.0.2"
+    csstype "^2.6.5"
     is-in-browser "^1.1.3"
     tiny-warning "^1.0.2"
 
@@ -14479,13 +14498,6 @@ locate-path@^5.0.0:
   dependencies:
     p-locate "^4.1.0"
 
-locate-path@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286"
-  integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==
-  dependencies:
-    p-locate "^5.0.0"
-
 lodash._reinterpolate@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
@@ -14591,12 +14603,12 @@ lodash@^4.0.1, lodash@^4.15.0, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52"
   integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==
 
-log-symbols@4.0.0, log-symbols@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.0.0.tgz#69b3cc46d20f448eccdb75ea1fa733d9e821c920"
-  integrity sha512-FN8JBzLx6CzeMrB0tg6pqlGU1wCrXW+ZXGH481kfsBqer0hToTIiHdjH4Mq8xJUbvATujKCvaREGWpGUionraA==
+log-symbols@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-3.0.0.tgz#f3a08516a5dea893336a7dee14d18a1cfdab77c4"
+  integrity sha512-dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ==
   dependencies:
-    chalk "^4.0.0"
+    chalk "^2.4.2"
 
 log-symbols@^2.1.0:
   version "2.2.0"
@@ -14605,6 +14617,13 @@ log-symbols@^2.1.0:
   dependencies:
     chalk "^2.0.1"
 
+log-symbols@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.0.0.tgz#69b3cc46d20f448eccdb75ea1fa733d9e821c920"
+  integrity sha512-FN8JBzLx6CzeMrB0tg6pqlGU1wCrXW+ZXGH481kfsBqer0hToTIiHdjH4Mq8xJUbvATujKCvaREGWpGUionraA==
+  dependencies:
+    chalk "^4.0.0"
+
 log4js@^6.2.1:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/log4js/-/log4js-6.3.0.tgz#10dfafbb434351a3e30277a00b9879446f715bcb"
@@ -14706,11 +14725,6 @@ lru-cache@^6.0.0:
   dependencies:
     yallist "^4.0.0"
 
-lunr@^2.3.9:
-  version "2.3.9"
-  resolved "https://registry.yarnpkg.com/lunr/-/lunr-2.3.9.tgz#18b123142832337dd6e964df1a5a7707b25d35e1"
-  integrity sha512-zTU3DaZaF3Rt9rhN3uBMGQD3dD2/vFQqnvZCDv4dl5iOzq2IZQqTxu90r4E5J+nP70J3ilqVCrbho2eWaeW8Ow==
-
 lz-string@^1.4.4:
   version "1.4.4"
   resolved "https://registry.yarnpkg.com/lz-string/-/lz-string-1.4.4.tgz#c0d8eaf36059f705796e1e344811cf4c498d3a26"
@@ -14846,7 +14860,7 @@ marked@^0.3.12:
   resolved "https://registry.yarnpkg.com/marked/-/marked-0.3.19.tgz#5d47f709c4c9fc3c216b6d46127280f40b39d790"
   integrity sha512-ea2eGWOqNxPcXv8dyERdSr/6FmzvWwzjMxpfGB/sbMccXoct+xY+YukPD+QTUZwyvK7BZwcr4m21WBOW41pAkg==
 
-marked@^1.0.0, marked@^1.1.1:
+marked@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/marked/-/marked-1.1.1.tgz#e5d61b69842210d5df57b05856e0c91572703e6a"
   integrity sha512-mJzT8D2yPxoPh7h0UXkB+dBj4FykPJ2OIfxAWeIHrvoHDkFxukV/29QxoFQoPM6RLEwhIFdJpmKBlqVM3s2ZIw==
@@ -15193,7 +15207,7 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
   integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=
 
-minimatch@3.0.4, minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.4:
+minimatch@3.0.4, minimatch@^3.0.2, minimatch@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
   integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
@@ -15347,27 +15361,27 @@ mkdirp@0.x, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@~0.5.1:
     minimist "^1.2.5"
 
 mocha@^8.0.1:
-  version "8.1.3"
-  resolved "https://registry.yarnpkg.com/mocha/-/mocha-8.1.3.tgz#5e93f873e35dfdd69617ea75f9c68c2ca61c2ac5"
-  integrity sha512-ZbaYib4hT4PpF4bdSO2DohooKXIn4lDeiYqB+vTmCdr6l2woW0b6H3pf5x4sM5nwQMru9RvjjHYWVGltR50ZBw==
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/mocha/-/mocha-8.0.1.tgz#fe01f0530362df271aa8f99510447bc38b88d8ed"
+  integrity sha512-vefaXfdYI8+Yo8nPZQQi0QO2o+5q9UIMX1jZ1XMmK3+4+CQjc7+B0hPdUeglXiTlr8IHMVRo63IhO9Mzt6fxOg==
   dependencies:
     ansi-colors "4.1.1"
     browser-stdout "1.3.1"
-    chokidar "3.4.2"
-    debug "4.1.1"
+    chokidar "3.3.1"
+    debug "3.2.6"
     diff "4.0.2"
-    escape-string-regexp "4.0.0"
-    find-up "5.0.0"
+    escape-string-regexp "1.0.5"
+    find-up "4.1.0"
     glob "7.1.6"
     growl "1.10.5"
     he "1.2.0"
-    js-yaml "3.14.0"
-    log-symbols "4.0.0"
+    js-yaml "3.13.1"
+    log-symbols "3.0.0"
     minimatch "3.0.4"
     ms "2.1.2"
     object.assign "4.1.0"
     promise.allsettled "1.0.2"
-    serialize-javascript "4.0.0"
+    serialize-javascript "3.0.0"
     strip-json-comments "3.0.1"
     supports-color "7.1.0"
     which "2.0.2"
@@ -15375,7 +15389,7 @@ mocha@^8.0.1:
     workerpool "6.0.0"
     yargs "13.3.2"
     yargs-parser "13.1.2"
-    yargs-unparser "1.6.1"
+    yargs-unparser "1.6.0"
 
 modify-values@^1.0.0:
   version "1.0.1"
@@ -15592,7 +15606,7 @@ nice-try@^1.0.4:
   resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
   integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
 
-nise@^4.0.4:
+nise@^4.0.1:
   version "4.0.4"
   resolved "https://registry.yarnpkg.com/nise/-/nise-4.0.4.tgz#d73dea3e5731e6561992b8f570be9e363c4512dd"
   integrity sha512-bTTRUNlemx6deJa+ZyoCUTRvH3liK5+N6VQZ4NIw90AgDXY6iPnsqplNFf6STcj+ePk0H/xqxnP75Lr0J0Fq3A==
@@ -16299,13 +16313,6 @@ p-locate@^4.1.0:
   dependencies:
     p-limit "^2.2.0"
 
-p-locate@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834"
-  integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==
-  dependencies:
-    p-limit "^3.0.2"
-
 p-map-series@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-map-series/-/p-map-series-1.0.0.tgz#bf98fe575705658a9e1351befb85ae4c1f07bdca"
@@ -16697,7 +16704,7 @@ performance-now@^2.1.0:
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
   integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
 
-picomatch@^2.0.4, picomatch@^2.0.5, picomatch@^2.2.1, picomatch@^2.2.2:
+picomatch@^2.0.4, picomatch@^2.0.5, picomatch@^2.0.7, picomatch@^2.2.1, picomatch@^2.2.2:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad"
   integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==
@@ -17402,7 +17409,7 @@ process@0.11.10, process@^0.11.10:
   resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
   integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI=
 
-progress@^2.0.0, progress@^2.0.1, progress@^2.0.3:
+progress@^2.0.0, progress@^2.0.1:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
   integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
@@ -18290,6 +18297,13 @@ readdirp@^2.2.1:
     micromatch "^3.1.10"
     readable-stream "^2.0.2"
 
+readdirp@~3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.3.0.tgz#984458d13a1e42e2e9f5841b129e162f369aff17"
+  integrity sha512-zz0pAkSPOXXm1viEwygWIPSPkcBYjW1xU5j/JBh5t9bGCJwa6f9+BJa6VaB2g+b55yVrmXzqkyLf4xaWYM0IkQ==
+  dependencies:
+    picomatch "^2.0.7"
+
 readdirp@~3.4.0:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.4.0.tgz#9fdccdf9e9155805449221ac645e8303ab5b9ada"
@@ -19056,10 +19070,17 @@ rx@^4.1.0:
   resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782"
   integrity sha1-pfE/957zt0D+MKqAP7CfmIBdR4I=
 
-rxjs@^6.4.0, rxjs@^6.5.3, rxjs@^6.5.5, rxjs@^6.6.0:
-  version "6.6.3"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.3.tgz#8ca84635c4daa900c0d3967a6ee7ac60271ee552"
-  integrity sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==
+rxjs@^6.4.0, rxjs@^6.5.5, rxjs@^6.6.0:
+  version "6.6.0"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.0.tgz#af2901eedf02e3a83ffa7f886240ff9018bbec84"
+  integrity sha512-3HMA8z/Oz61DUHe+SdOiQyzIf4tOx5oQHmMir7IZEu6TMqCLHT4LRcmNaUS0NwOz8VLvmmBduMsoaUvMaIiqzg==
+  dependencies:
+    tslib "^1.9.0"
+
+rxjs@^6.5.3:
+  version "6.6.2"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.2.tgz#8096a7ac03f2cc4fe5860ef6e572810d9e01c0d2"
+  integrity sha512-BHdBMVoWC2sL26w//BCu3YzKT4s2jip/WhwsGEDmeKYBhKDZeYezVUnHatYB7L85v5xs0BAQmg6BEYJEKxBabg==
   dependencies:
     tslib "^1.9.0"
 
@@ -19230,12 +19251,10 @@ send@0.17.1:
     range-parser "~1.2.1"
     statuses "~1.5.0"
 
-serialize-javascript@4.0.0, serialize-javascript@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-4.0.0.tgz#b525e1238489a5ecfc42afacc3fe99e666f4b1aa"
-  integrity sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==
-  dependencies:
-    randombytes "^2.1.0"
+serialize-javascript@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-3.0.0.tgz#492e489a2d77b7b804ad391a5f5d97870952548e"
+  integrity sha512-skZcHYw2vEX4bw90nAr2iTTsz6x2SrHEnfxgKYmZlvJYBEZrvbKtobJWlQ20zczKb3bsHHXXTYt48zBA7ni9cw==
 
 serialize-javascript@^2.1.2:
   version "2.1.2"
@@ -19249,6 +19268,13 @@ serialize-javascript@^3.1.0:
   dependencies:
     randombytes "^2.1.0"
 
+serialize-javascript@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-4.0.0.tgz#b525e1238489a5ecfc42afacc3fe99e666f4b1aa"
+  integrity sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==
+  dependencies:
+    randombytes "^2.1.0"
+
 serve-favicon@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/serve-favicon/-/serve-favicon-2.5.0.tgz#935d240cdfe0f5805307fdfe967d88942a2cbcf0"
@@ -19377,7 +19403,7 @@ shell-quote@1.7.2:
   resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.7.2.tgz#67a7d02c76c9da24f99d20808fcaded0e0e04be2"
   integrity sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg==
 
-shelljs@^0.8.3, shelljs@^0.8.4:
+shelljs@^0.8.3:
   version "0.8.4"
   resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.8.4.tgz#de7684feeb767f8716b326078a8a00875890e3c2"
   integrity sha512-7gk3UZ9kOfPLIAbslLzyWeGiEqx9e3rxwZM0KE6EL8GlGwjym9Mrlx5/p33bWTu9YG6vcS4MBxYZDHYr5lr8BQ==
@@ -19432,16 +19458,16 @@ simplebar@^4.2.3:
     resize-observer-polyfill "^1.5.1"
 
 sinon@^9.0.2:
-  version "9.0.3"
-  resolved "https://registry.yarnpkg.com/sinon/-/sinon-9.0.3.tgz#bffc3ec28c936332cd2a41833547b9eed201ecff"
-  integrity sha512-IKo9MIM111+smz9JGwLmw5U1075n1YXeAq8YeSFlndCLhAL5KGn6bLgu7b/4AYHTV/LcEMcRm2wU2YiL55/6Pg==
+  version "9.0.2"
+  resolved "https://registry.yarnpkg.com/sinon/-/sinon-9.0.2.tgz#b9017e24633f4b1c98dfb6e784a5f0509f5fd85d"
+  integrity sha512-0uF8Q/QHkizNUmbK3LRFqx5cpTttEVXudywY9Uwzy8bTfZUhljZ7ARzSxnRHWYWtVTeh4Cw+tTb3iU21FQVO9A==
   dependencies:
     "@sinonjs/commons" "^1.7.2"
     "@sinonjs/fake-timers" "^6.0.1"
     "@sinonjs/formatio" "^5.0.1"
-    "@sinonjs/samsam" "^5.1.0"
+    "@sinonjs/samsam" "^5.0.3"
     diff "^4.0.2"
-    nise "^4.0.4"
+    nise "^4.0.1"
     supports-color "^7.1.0"
 
 sisteransi@^1.0.4:
@@ -19832,11 +19858,16 @@ sshpk@^1.7.0:
     safer-buffer "^2.0.2"
     tweetnacl "~0.14.0"
 
-ssim.js@^3.1.0, ssim.js@^3.1.1:
+ssim.js@^3.1.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/ssim.js/-/ssim.js-3.3.0.tgz#49d9f6d741467054118f2a61c0e106e2defe03dc"
   integrity sha512-Gu85i4R+lN1U1NtOP59CHSpZXHhF8jGqRH8RzxRc5v/YlU+ralZIs4pJyaWgqf3Kzbzx73qcjwmmY2kbq/jBOw==
 
+ssim.js@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/ssim.js/-/ssim.js-3.1.1.tgz#6b0ad54a8eeae3490adde84076f62a2dc48febfe"
+  integrity sha512-/AcvEnpIxwh1+t4HNRE9lg+Ka8MIsUPXsXeQjzd5IQjs1DcphrlPHKciWdZRnHAQoQIbLFzXJ+5KruYeH7oXjw==
+
 ssri@^6.0.0, ssri@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz#2a3c41b28dd45b62b63676ecb74001265ae9edd8"
@@ -20203,7 +20234,7 @@ strip-json-comments@3.0.1:
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.0.1.tgz#85713975a91fb87bf1b305cca77395e40d2a64a7"
   integrity sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw==
 
-strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
+strip-json-comments@^3.1.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
   integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
@@ -20954,9 +20985,9 @@ ts-jest@^25.2.0:
     yargs-parser "18.x"
 
 ts-loader@^8.0.2:
-  version "8.0.4"
-  resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-8.0.4.tgz#02b9c91fbcfdb3114d8b1e98a3829265270eee7a"
-  integrity sha512-5u8KF1SW8eCUb/Ff7At81e3wznPmT/27fvaGRO9CziVy+6NlPVRvrzSox4OwU0/e6OflOUB32Err4VquysCSAQ==
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-8.0.2.tgz#ee73ca9350f745799396fff8578ba29b1e95616b"
+  integrity sha512-oYT7wOTUawYXQ8XIDsRhziyW0KUEV38jISYlE+9adP6tDtG+O5GkRe4QKQXrHVH4mJJ88DysvEtvGP65wMLlhg==
   dependencies:
     chalk "^2.3.0"
     enhanced-resolve "^4.0.0"
@@ -21097,36 +21128,6 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
-typedoc-default-themes@^0.11.4:
-  version "0.11.4"
-  resolved "https://registry.yarnpkg.com/typedoc-default-themes/-/typedoc-default-themes-0.11.4.tgz#1bc55b7c8d1132844616ff6f570e1e2cd0eb7343"
-  integrity sha512-Y4Lf+qIb9NTydrexlazAM46SSLrmrQRqWiD52593g53SsmUFioAsMWt8m834J6qsp+7wHRjxCXSZeiiW5cMUdw==
-
-typedoc-plugin-markdown@^2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/typedoc-plugin-markdown/-/typedoc-plugin-markdown-2.3.1.tgz#c4c6c3228f625b24875e87cc1622b9a259b914ce"
-  integrity sha512-7rlmg1tLjddYy11uznHCAlyoOpxdWnFXqGEZ7j2mJ4KJg2avwWgEpw6SFZVofgPCGn36zklpFS51lHxYSRTLVQ==
-  dependencies:
-    fs-extra "^9.0.0"
-    handlebars "^4.7.6"
-
-typedoc@^0.19.2:
-  version "0.19.2"
-  resolved "https://registry.yarnpkg.com/typedoc/-/typedoc-0.19.2.tgz#842a63a581f4920f76b0346bb80eb2a49afc2c28"
-  integrity sha512-oDEg1BLEzi1qvgdQXc658EYgJ5qJLVSeZ0hQ57Eq4JXy6Vj2VX4RVo18qYxRWz75ifAaYuYNBUCnbhjd37TfOg==
-  dependencies:
-    fs-extra "^9.0.1"
-    handlebars "^4.7.6"
-    highlight.js "^10.2.0"
-    lodash "^4.17.20"
-    lunr "^2.3.9"
-    marked "^1.1.1"
-    minimatch "^3.0.0"
-    progress "^2.0.3"
-    semver "^7.3.2"
-    shelljs "^0.8.4"
-    typedoc-default-themes "^0.11.4"
-
 typescript-to-proptypes@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/typescript-to-proptypes/-/typescript-to-proptypes-2.1.0.tgz#32c74abccbfdcd6d2c4841f7e53fe8c1893c2e9a"
@@ -21946,9 +21947,9 @@ webpack@4.44.0:
     webpack-sources "^1.4.1"
 
 webpack@^4.41.0, webpack@^4.41.5, webpack@^4.43.0:
-  version "4.44.2"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.44.2.tgz#6bfe2b0af055c8b2d1e90ed2cd9363f841266b72"
-  integrity sha512-6KJVGlCxYdISyurpQ0IPTklv+DULv05rs2hseIXer6D7KrUicRDLFb4IUM1S6LUAKypPM/nSiVSuv8jHu1m3/Q==
+  version "4.44.1"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.44.1.tgz#17e69fff9f321b8f117d1fda714edfc0b939cc21"
+  integrity sha512-4UOGAohv/VGUNQJstzEywwNxqX417FnjZgZJpJQegddzPmTvph37eBIRbRTfdySXzVtJXLJfbMN3mMYhM6GdmQ==
   dependencies:
     "@webassemblyjs/ast" "1.9.0"
     "@webassemblyjs/helper-module-context" "1.9.0"
@@ -22273,18 +22274,16 @@ yargs-parser@^15.0.1:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
-yargs-unparser@1.6.1:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/yargs-unparser/-/yargs-unparser-1.6.1.tgz#bd4b0ee05b4c94d058929c32cb09e3fce71d3c5f"
-  integrity sha512-qZV14lK9MWsGCmcr7u5oXGH0dbGqZAIxTDrWXZDo5zUr6b6iUmelNKO6x6R1dQT24AH3LgRxJpr8meWy2unolA==
+yargs-unparser@1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/yargs-unparser/-/yargs-unparser-1.6.0.tgz#ef25c2c769ff6bd09e4b0f9d7c605fb27846ea9f"
+  integrity sha512-W9tKgmSn0DpSatfri0nx52Joq5hVXgeLiqR/5G0sZNDoLZFOr/xjBUDcShCOGNsBnEMNo1KAMBkTej1Hm62HTw==
   dependencies:
-    camelcase "^5.3.1"
-    decamelize "^1.2.0"
     flat "^4.1.0"
-    is-plain-obj "^1.1.0"
-    yargs "^14.2.3"
+    lodash "^4.17.15"
+    yargs "^13.3.0"
 
-yargs@13.3.2, yargs@^13.3.2:
+yargs@13.3.2, yargs@^13.3.0, yargs@^13.3.2:
   version "13.3.2"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd"
   integrity sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==
@@ -22300,7 +22299,7 @@ yargs@13.3.2, yargs@^13.3.2:
     y18n "^4.0.0"
     yargs-parser "^13.1.2"
 
-yargs@^14.2.2, yargs@^14.2.3:
+yargs@^14.2.2:
   version "14.2.3"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-14.2.3.tgz#1a1c3edced1afb2a2fea33604bc6d1d8d688a414"
   integrity sha512-ZbotRWhF+lkjijC/VhmOT9wSgyBQ7+zr13+YLkhfsSiTriYsMzkTUFP18pFhWwBeMa5gUc1MzbhrO6/VB7c9Xg==