diff --git a/.gitignore b/.gitignore
index bf6c14bd88..cc152e1c4f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,7 +5,6 @@ dist
 lib
 es
 coverage
-types
 
 website/translated_docs
 website/build/
diff --git a/package.json b/package.json
index af8b30bf27..2ff08712af 100644
--- a/package.json
+++ b/package.json
@@ -26,16 +26,15 @@
   "main": "lib/redux.js",
   "unpkg": "dist/redux.js",
   "module": "es/redux.js",
-  "types": "types/index.d.ts",
+  "types": "lib/redux.d.ts",
   "files": [
     "dist",
     "lib",
     "es",
-    "src",
-    "types"
+    "src"
   ],
   "scripts": {
-    "clean": "rimraf lib dist es coverage types",
+    "clean": "rimraf lib dist es coverage",
     "format": "prettier --write \"{src,test}/**/*.{js,ts}\" index.d.ts \"**/*.md\"",
     "format:check": "prettier --list-different \"{src,test}/**/*.{js,ts}\" index.d.ts \"**/*.md\"",
     "lint": "eslint --ext js,ts src test",
@@ -43,9 +42,8 @@
     "test": "jest",
     "test:watch": "npm test -- --watch",
     "test:cov": "npm test -- --coverage",
-    "build": "npm run build-types && rollup -c",
+    "build": "rollup -c",
     "prepare": "npm run clean && npm run check-types && npm run format:check && npm run lint && npm test",
-    "build-types": "tsc --emitDeclarationOnly",
     "check-types": "tsc --noEmit",
     "examples:lint": "eslint --ext js,ts examples",
     "examples:test": "cross-env CI=true babel-node examples/testAll.js"
diff --git a/rollup.config.js b/rollup.config.js
index cea2874f86..60aad7da58 100644
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -9,7 +9,7 @@ import pkg from './package.json'
 export default [
   // CommonJS
   {
-    input: 'src/index.ts',
+    input: 'src/redux.ts',
     output: { file: 'lib/redux.js', format: 'cjs', indent: false },
     external: [
       ...Object.keys(pkg.dependencies || {}),
@@ -26,7 +26,7 @@ export default [
 
   // ES
   {
-    input: 'src/index.ts',
+    input: 'src/redux.ts',
     output: { file: 'es/redux.js', format: 'es', indent: false },
     external: [
       ...Object.keys(pkg.dependencies || {}),
@@ -43,7 +43,7 @@ export default [
 
   // ES for Browsers
   {
-    input: 'src/index.ts',
+    input: 'src/redux.ts',
     output: { file: 'es/redux.mjs', format: 'es', indent: false },
     plugins: [
       nodeResolve({
@@ -69,7 +69,7 @@ export default [
 
   // UMD Development
   {
-    input: 'src/index.ts',
+    input: 'src/redux.ts',
     output: {
       file: 'dist/redux.js',
       format: 'umd',
@@ -92,7 +92,7 @@ export default [
 
   // UMD Production
   {
-    input: 'src/index.ts',
+    input: 'src/redux.ts',
     output: {
       file: 'dist/redux.min.js',
       format: 'umd',
diff --git a/src/index.ts b/src/redux.ts
similarity index 100%
rename from src/index.ts
rename to src/redux.ts
diff --git a/test/typescript.spec.ts b/test/typescript.spec.ts
index e2f25f193e..6d55a3c85c 100644
--- a/test/typescript.spec.ts
+++ b/test/typescript.spec.ts
@@ -1,7 +1,7 @@
 import { checkDirectory } from 'typings-tester'
 
 describe('TypeScript definitions', function() {
-  it('should compile against index.d.ts', () => {
+  it('should compile against redux.d.ts', () => {
     checkDirectory(__dirname + '/typescript')
   })
 })
diff --git a/test/typescript/tsconfig.json b/test/typescript/tsconfig.json
index eb36059da2..235e25d10d 100644
--- a/test/typescript/tsconfig.json
+++ b/test/typescript/tsconfig.json
@@ -4,7 +4,7 @@
     "strict": true,
     "baseUrl": "../..",
     "paths": {
-      "redux": ["types/index.d.ts"]
+      "redux": ["lib/redux.d.ts"]
     }
   }
 }
diff --git a/tsconfig.json b/tsconfig.json
index 1ef2e9f083..cb947efa06 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -12,7 +12,7 @@
     "jsx": "react" /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */,
     "declaration": true /* Generates corresponding '.d.ts' file. */,
     // "declarationMap": true /* Generates a sourcemap for each corresponding '.d.ts' file. */,
-    "declarationDir": "./types" /* Output directory for generated declaration files. */,
+    // "declarationDir": "./types" /* Output directory for generated declaration files. */,
     // "emitDeclarationOnly": true /* Only emit ‘.d.ts’ declaration files. */,
     "sourceMap": true /* Generates corresponding '.map' file. */,
     // "outFile": "./",                       /* Concatenate and emit output to single file. */