diff --git a/packages/react-core/package.json b/packages/react-core/package.json
index e90fb3487b4..770b1e6f7b7 100644
--- a/packages/react-core/package.json
+++ b/packages/react-core/package.json
@@ -5,6 +5,18 @@
   "main": "dist/js/index.js",
   "module": "dist/esm/index.js",
   "types": "dist/esm/index.d.ts",
+  "exports": {
+    ".": "./dist/esm/index.js",
+    "./next": "./dist/esm/next/index.js",
+    "./deprecated": "./dist/esm/deprecated/index.js",
+    "./package.json": "./package.json"
+  },
+  "typesVersions": {
+    "*": {
+      "next": ["dist/esm/next/index.d.ts"],
+      "deprecated": ["dist/esm/deprecated/index.d.ts"]
+    }
+  },
   "patternfly:src": "src/",
   "sideEffects": [
     "*.css",
diff --git a/packages/react-core/src/deprecated/components/index.ts b/packages/react-core/src/deprecated/components/index.ts
new file mode 100644
index 00000000000..b13bb4eb87d
--- /dev/null
+++ b/packages/react-core/src/deprecated/components/index.ts
@@ -0,0 +1 @@
+export * from './';
diff --git a/packages/react-core/src/deprecated/index.ts b/packages/react-core/src/deprecated/index.ts
new file mode 100644
index 00000000000..07635cbbc8e
--- /dev/null
+++ b/packages/react-core/src/deprecated/index.ts
@@ -0,0 +1 @@
+export * from './components';
diff --git a/packages/react-core/src/next/components/index.ts b/packages/react-core/src/next/components/index.ts
new file mode 100644
index 00000000000..b13bb4eb87d
--- /dev/null
+++ b/packages/react-core/src/next/components/index.ts
@@ -0,0 +1 @@
+export * from './';
diff --git a/packages/react-core/src/next/index.ts b/packages/react-core/src/next/index.ts
new file mode 100644
index 00000000000..07635cbbc8e
--- /dev/null
+++ b/packages/react-core/src/next/index.ts
@@ -0,0 +1 @@
+export * from './components';
diff --git a/packages/react-core/tsconfig.json b/packages/react-core/tsconfig.json
index f3062d0890f..0debb1580c3 100644
--- a/packages/react-core/tsconfig.json
+++ b/packages/react-core/tsconfig.json
@@ -4,7 +4,12 @@
     "jsx": "react",
     "rootDir": "./src",
     "outDir": "./dist/esm",
-    "tsBuildInfoFile": "dist/esm.tsbuildinfo"
+    "tsBuildInfoFile": "dist/esm.tsbuildinfo",
+    "baseUrl": ".",
+    "paths": {
+      "*/next": ["./src/next"],
+      "*/deprecated": ["./src/deprecated"],
+    }
   },
   "include": [
     "./src/*",
diff --git a/packages/react-docs/patternfly-docs/patternfly-docs.source.js b/packages/react-docs/patternfly-docs/patternfly-docs.source.js
index f535c2f068f..29e3bc703a5 100644
--- a/packages/react-docs/patternfly-docs/patternfly-docs.source.js
+++ b/packages/react-docs/patternfly-docs/patternfly-docs.source.js
@@ -38,7 +38,8 @@ module.exports = (baseSourceMD, sourceProps) => {
   sourceProps(path.join(reactLogViewerPath, '/**/*.tsx'), reactPropsIgnore);
 
   // React MD
-  sourceMD(path.join(reactCorePath, '/**/examples/*.md'), 'react');
+  sourceMD(path.join(reactCorePath, '/components/**/examples/*.md'), 'react');
+  sourceMD(path.join(reactCorePath, '/next/components/**/examples/*.md'), 'react-next');
   sourceMD(path.join(reactCorePath, '/**/demos/**/*.md'), 'react-demos');
 
   // React-table MD