diff --git a/packages/redux-devtools-app/demo/index.tsx b/packages/redux-devtools-app/demo/index.tsx
index e69de29b..6a350581 100644
--- a/packages/redux-devtools-app/demo/index.tsx
+++ b/packages/redux-devtools-app/demo/index.tsx
@@ -0,0 +1,22 @@
+import React from 'react';
+import { render } from 'react-dom';
+import App from '../src';
+
+render(<App />, document.getElementById('root'));
+
+if (module.hot) {
+  // https://github.com/webpack/webpack/issues/418#issuecomment-53398056
+  module.hot.accept((err) => {
+    if (err) console.error(err.message); // eslint-disable-line no-console
+  });
+
+  /*
+    module.hot.accept('./app', () => {
+      const NextApp = require('./app').default;
+      render(
+        <NextApp />,
+        document.getElementById('root')
+      );
+    });
+   */
+}
diff --git a/packages/redux-devtools-app/package.json b/packages/redux-devtools-app/package.json
index 3475469e..04699c35 100644
--- a/packages/redux-devtools-app/package.json
+++ b/packages/redux-devtools-app/package.json
@@ -1,8 +1,8 @@
 {
-  "name": "redux-devtools-core",
+  "name": "@redux-devtools/app",
   "version": "1.0.0-4",
-  "description": "Reusable functions of Redux DevTools",
-  "homepage": "https://github.com/reduxjs/redux-devtools/tree/master/packages/redux-devtools-core",
+  "description": "Redux DevTools app",
+  "homepage": "https://github.com/reduxjs/redux-devtools/tree/master/packages/redux-devtools-app",
   "bugs": {
     "url": "https://github.com/reduxjs/redux-devtools/issues"
   },
@@ -43,18 +43,14 @@
     "@redux-devtools/inspector-monitor-test-tab": "^0.6.2",
     "@redux-devtools/inspector-monitor-trace-tab": "^0.1.3",
     "@redux-devtools/log-monitor": "^2.1.0",
-    "@redux-devtools/serialize": "^0.2.0",
     "@redux-devtools/slider-monitor": "^2.0.0-5",
     "d3-state-visualizer": "^1.3.4",
     "devui": "^1.0.0-6",
-    "get-params": "^0.1.2",
-    "immutable": "^4.0.0-rc.12",
     "javascript-stringify": "^2.0.1",
     "jsan": "^3.1.13",
     "jsondiffpatch": "^0.4.1",
     "localforage": "^1.9.0",
     "lodash": "^4.17.19",
-    "nanoid": "^3.1.12",
     "prop-types": "^15.7.2",
     "react-icons": "^3.10.0",
     "react-is": "^16.13.1",
diff --git a/packages/redux-devtools-cli/README.md b/packages/redux-devtools-cli/README.md
index e23f0d40..f25be59c 100644
--- a/packages/redux-devtools-cli/README.md
+++ b/packages/redux-devtools-cli/README.md
@@ -9,13 +9,13 @@ Bridge for remote debugging via [Redux DevTools extension](https://github.com/za
 with npm:
 
 ```
-npm install -g redux-devtools-cli
+npm install -g @redux-devtools/cli
 ```
 
 or with yarn:
 
 ```
-yarn global add redux-devtools-cli
+yarn global add @redux-devtools/cli
 ```
 
 and start as:
@@ -24,20 +24,20 @@ and start as:
 redux-devtools --hostname=localhost --port=8000
 ```
 
-> Note the package is called `redux-devtools-cli` not `redux-devtools` (the latter is a React component).
+> Note the package is called `@redux-devtools/cli` not `redux-devtools` (the latter is a React component).
 
 #### Or add in your project
 
 with npm:
 
 ```
-npm install --save-dev redux-devtools-cli
+npm install --save-dev @redux-devtools/cli
 ```
 
 or with yarn:
 
 ```
-yarn add --dev redux-devtools-cli
+yarn add --dev @redux-devtools/cli
 ```
 
 and add to `package.json`:
@@ -53,7 +53,7 @@ So, you can start redux-devtools server by running `npm run redux-devtools`.
 ##### Import in your `server.js` script you use for starting a development server:
 
 ```js
-var reduxDevTools = require('redux-devtools-cli');
+var reduxDevTools = require('@redux-devtools/cli');
 reduxDevTools({ hostname: 'localhost', port: 8000 });
 ```
 
diff --git a/packages/redux-devtools-cli/app/package.json b/packages/redux-devtools-cli/app/package.json
index 7b98eaba..b67c0b81 100644
--- a/packages/redux-devtools-cli/app/package.json
+++ b/packages/redux-devtools-cli/app/package.json
@@ -1,6 +1,6 @@
 {
   "private": true,
-  "name": "redux-devtools-cli",
+  "name": "@redux-devtools/cli",
   "version": "0.0.1",
   "main": "electron.js",
   "description": "Remote Redux DevTools",
diff --git a/packages/redux-devtools-cli/package.json b/packages/redux-devtools-cli/package.json
index 8a09a685..e3ab9db3 100644
--- a/packages/redux-devtools-cli/package.json
+++ b/packages/redux-devtools-cli/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "redux-devtools-cli",
+  "name": "@redux-devtools/cli",
   "version": "1.0.0-4",
   "description": "CLI for remote debugging with Redux DevTools.",
   "homepage": "https://github.com/reduxjs/redux-devtools/tree/master/packages/redux-devtools-cli",
diff --git a/packages/redux-devtools-cli/src/bin/injectServer.ts b/packages/redux-devtools-cli/src/bin/injectServer.ts
index c5d04acf..033655e7 100644
--- a/packages/redux-devtools-cli/src/bin/injectServer.ts
+++ b/packages/redux-devtools-cli/src/bin/injectServer.ts
@@ -3,7 +3,7 @@ import path from 'path';
 import semver from 'semver';
 import { Options } from '../options';
 
-const name = 'redux-devtools-cli';
+const name = '@redux-devtools/cli';
 const startFlag = '/* ' + name + ' start */';
 const endFlag = '/* ' + name + ' end */';
 const serverFlags: { [moduleName: string]: { [version: string]: string } } = {