diff --git a/package.json b/package.json
index 5c6303f..642fa60 100644
--- a/package.json
+++ b/package.json
@@ -62,10 +62,8 @@
   },
   "dependencies": {
     "@ag-community/grid-core": "^21.0.0",
-    "@ag-community/client-side-row-model": "^21.0.0",
-    "@ag-community/infinite-row-model": "^21.0.0",
-    "@ag-community/csv-export": "^21.0.0",
-    "ag-grid-enterprise": "^21.0.0",
+    "@ag-community/grid-all-modules": "^21.0.0",
+    "@ag-enterprise/grid-all-modules": "^21.0.0",
     "ag-grid-react": "^21.2.2",
     "bootstrap": "4.3.1",
     "d3": "4.9.1",
diff --git a/src-examples/App.jsx b/src-examples/App.jsx
index e33efdf..0c014e8 100644
--- a/src-examples/App.jsx
+++ b/src-examples/App.jsx
@@ -2,11 +2,6 @@ import React, {Component} from "react";
 import {Redirect, Route, Switch} from "react-router-dom";
 
 import NavItem from "./NavItem";
-
-import '@ag-community/client-side-row-model'
-import '@ag-community/infinite-row-model'
-import '@ag-community/csv-export'
-
 import RichGridDeclarativeExample from "./richGridDeclarativeExample/RichGridDeclarativeExample";
 import SimpleReduxDynamicExample from "./simpleReduxDynamicComponentExample/SimpleReduxExample";
 import SimpleReduxHookExample from "./simpleReduxHooksExample/SimpleReduxHookExample";
diff --git a/src-examples/richGridDeclarativeExample/RichGridDeclarativeExample.jsx b/src-examples/richGridDeclarativeExample/RichGridDeclarativeExample.jsx
index 3b2ae20..2f8963a 100644
--- a/src-examples/richGridDeclarativeExample/RichGridDeclarativeExample.jsx
+++ b/src-examples/richGridDeclarativeExample/RichGridDeclarativeExample.jsx
@@ -13,10 +13,11 @@ import SortableHeaderComponent from './SortableHeaderComponent.jsx';
 
 import "./RichGridDeclarativeExample.css";
 
-import '@ag-community/client-side-row-model'
+// for community features
+// import {AllModules} from "@ag-community/grid-all-modules";
 
-// take this line out if you do not want to use ag-Grid-Enterprise
-// import "ag-grid-enterprise";
+// for enterprise features
+import {AllModules} from "@ag-enterprise/grid-all-modules";
 
 export default class RichGridDeclarativeExample extends Component {
     constructor(props) {
@@ -196,6 +197,9 @@ export default class RichGridDeclarativeExample extends Component {
                             // binding to array properties
                             rowData={this.state.rowData}
 
+                            // register all modules (row model, csv/excel, row grouping etc)
+                            modules={AllModules}
+
                             // no binding, just providing hard coded strings for the properties
                             // boolean properties will default to true if provided (ie suppressRowClickSelection => suppressRowClickSelection="true")
                             suppressRowClickSelection
diff --git a/src-large-data/largeGrid.jsx b/src-large-data/largeGrid.jsx
index e9749a6..19af264 100644
--- a/src-large-data/largeGrid.jsx
+++ b/src-large-data/largeGrid.jsx
@@ -2,10 +2,11 @@ import React, {Component} from 'react';
 import SimpleCellRenderer from './simpleCellRenderer.jsx';
 import {AgGridReact} from 'ag-grid-react';
 
-import '@ag-community/client-side-row-model'
+// for community features
+import {AllModules} from "@ag-community/grid-all-modules";
 
-// put this line in to use ag-Grid enterprise
-// import 'ag-grid-enterprise';
+// for enterprise features
+// import {AllModules} from "@ag-enterprise/grid-all-modules";
 
 export default class MyApp extends Component {
 
@@ -63,7 +64,7 @@ export default class MyApp extends Component {
     render() {
         return (
             <div style={{height: '100%'}} className="ag-theme-fresh">
-                <AgGridReact columnDefs={this.state.columnDefs} rowData={this.state.rowData}/>
+                <AgGridReact columnDefs={this.state.columnDefs} rowData={this.state.rowData} modules={AllModules}/>
             </div>
         );
     }
diff --git a/src-trader-dashboard/index.js b/src-trader-dashboard/index.js
index 2e9af41..6903025 100644
--- a/src-trader-dashboard/index.js
+++ b/src-trader-dashboard/index.js
@@ -5,10 +5,6 @@ import {render} from "react-dom";
 
 import {Provider} from "react-redux";
 
-import '@ag-community/client-side-row-model'
-import "@ag-community/grid-core/dist/styles/ag-grid.css";
-import "@ag-community/grid-core/dist/styles/ag-theme-fresh.css";
-
 import StoreService from './services/StoreService';
 import TraderDashboard from "./components/TraderDashboard.jsx";