diff --git a/griddle-react/.babelrc b/griddle-react/.babelrc
deleted file mode 100644
index facd180928..0000000000
--- a/griddle-react/.babelrc
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "presets": ["es2015", "react"]
-}
\ No newline at end of file
diff --git a/griddle-react/.gitignore b/griddle-react/.gitignore
deleted file mode 100644
index 0a7b2a3260..0000000000
--- a/griddle-react/.gitignore
+++ /dev/null
@@ -1,40 +0,0 @@
-*.iml
-.idea
-/target
-/typings
-
-output/
-
-# Logs
-logs
-*.log
-npm-debug.log*
-
-# Runtime data
-pids
-*.pid
-*.seed
-
-# Directory for instrumented libs generated by jscoverage/JSCover
-lib-cov
-
-# Coverage directory used by tools like istanbul
-coverage
-
-# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
-.grunt
-
-# node-waf configuration
-.lock-wscript
-
-# Compiled binary addons (http://nodejs.org/api/addons.html)
-build/Release
-
-# Dependency directory
-node_modules
-
-# Optional npm cache directory
-.npm
-
-# Optional REPL history
-.node_repl_history
diff --git a/griddle-react/.travis.yml b/griddle-react/.travis.yml
deleted file mode 100644
index c5c95c6331..0000000000
--- a/griddle-react/.travis.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-language: node_js
-node_js:
-  - "5.8"
-  - "5.7"
-  - "4.4"
\ No newline at end of file
diff --git a/griddle-react/LICENSE b/griddle-react/LICENSE
deleted file mode 100644
index 0794d0b4a6..0000000000
--- a/griddle-react/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2016 David Hara
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/griddle-react/README.md b/griddle-react/README.md
deleted file mode 100644
index 25169cfd6d..0000000000
--- a/griddle-react/README.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# griddle-react-typings
-[![Build Status](https://travis-ci.org/hodavidhara/griddle-react-typings.svg?branch=master)](https://travis-ci.org/hodavidhara/griddle-react-typings)
-
-Typescript 2.1 definition for https://griddlegriddle.github.io/Griddle/
-
-## Testing
-run:
-```
-npm install
-npm test
-npm start
-```
-
-then open your browser to http://localhost:8080/webpack-dev-server/test/
diff --git a/griddle-react/test/test.tsx b/griddle-react/griddle-react-tests.tsx
similarity index 74%
rename from griddle-react/test/test.tsx
rename to griddle-react/griddle-react-tests.tsx
index 9888658f8d..5f241feeb5 100644
--- a/griddle-react/test/test.tsx
+++ b/griddle-react/griddle-react-tests.tsx
@@ -1,6 +1,15 @@
+/*
+Licensed under the MIT License (MIT)
+
+Copyright (c) 2016 David Hara
+*/
+
 import * as React from 'react';
 import { render } from 'react-dom';
 import Griddle, { CustomColumnComponentProps } from 'griddle-react';
+import CustomColumnComponentGrid from './test/CustomColumnComponent';
+import CustomHeaderComponentGrid from './test/CustomHeaderComponent';
+import CustomFilterComponentGrid from './test/CustomFilterComponent';
 
 interface MyCustomResult {
   name: string,
@@ -50,6 +59,12 @@ const TypedGriddle = Griddle as TypedGriddle;
 
 render(
   <div>
+    <h1>Custom Column Component Grid</h1>
+    <CustomColumnComponentGrid />
+    <h1>Custom Header Component Grid</h1>
+    <CustomHeaderComponentGrid />
+    <h1>Custom Filter Component Grid</h1>
+    <CustomFilterComponentGrid />
     <TypedGriddle
       results={results}
       columnMetadata={columnMeta}
@@ -60,4 +75,4 @@ render(
     />
   </div>,
   document.getElementById('root')
-);
\ No newline at end of file
+);
diff --git a/griddle-react/griddle-react.d.ts b/griddle-react/index.d.ts
similarity index 75%
rename from griddle-react/griddle-react.d.ts
rename to griddle-react/index.d.ts
index 90a09c1e36..e5d3e560bb 100644
--- a/griddle-react/griddle-react.d.ts
+++ b/griddle-react/index.d.ts
@@ -1,3 +1,33 @@
+// Type definitions for griddle-react 0.7
+// Project: https://github.com/griddlegriddle/griddle
+// Definitions by: David Hara <https://github.com/hodavidhara>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
+
+/*
+The MIT License (MIT)
+
+Copyright (c) 2016 David Hara
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
+
 import * as React from 'react';
 
 type ReactClass<T> = React.ComponentClass<T> | React.StatelessComponent<T>
@@ -137,4 +167,4 @@ export interface GriddleProps<T> {
 declare class Griddle<T> extends React.Component<GriddleProps<T>, any> {
 }
 
-export default Griddle;
\ No newline at end of file
+export default Griddle;
diff --git a/griddle-react/package.json b/griddle-react/package.json
deleted file mode 100644
index 167b423124..0000000000
--- a/griddle-react/package.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "name": "griddle-react-typings",
-  "version": "0.7.1",
-  "description": "",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/hodavidhara/griddle-react-typings.git"
-  },
-  "main": "griddle-react.d.ts",
-  "scripts": {
-    "test": "tsc",
-    "start": "webpack-dev-server"
-  },
-  "author": "",
-  "license": "MIT",
-  "peerDependencies": {
-    "@types/react": "^0.14.3 || ^15.0.1",
-    "@types/react-dom": "^0.14.3 || ^15.0.1",
-    "react": "^0.14.3 || ^15.0.1",
-    "react-dom": "^0.14.3 || ^15.0.1"
-  },
-  "dependencies": {
-    "@types/lodash": "^4.12.0",
-    "griddle-react": "^0.7.1",
-    "lodash": "^4.12.0"
-  },
-  "devDependencies": {
-    "@types/react": "^0.14.3 || ^15.0.1",
-    "@types/react-dom": "^0.14.3 || ^15.0.1",
-    "babel-core": "^6.7.4",
-    "babel-loader": "^6.2.4",
-    "babel-preset-es2015": "^6.6.0",
-    "babel-preset-react": "^6.5.0",
-    "react": "^0.14.3 || ^15.0.1",
-    "react-dom": "^0.14.3 || ^15.0.1",
-    "ts-loader": "^0.8.1",
-    "typescript": "^2.1.0",
-    "typings": "^0.7.9",
-    "webpack": "^1.12.14",
-    "webpack-dev-server": "^1.14.1"
-  }
-}
diff --git a/griddle-react/test/CustomColumnComponent.tsx b/griddle-react/test/CustomColumnComponent.tsx
index 3f9b9cd22b..83adc8f05a 100644
--- a/griddle-react/test/CustomColumnComponent.tsx
+++ b/griddle-react/test/CustomColumnComponent.tsx
@@ -1,3 +1,9 @@
+/*
+Licensed under the MIT License (MIT)
+
+Copyright (c) 2016 David Hara
+*/
+
 import * as React from 'react';
 import Griddle, { CustomColumnComponentProps } from 'griddle-react';
 
diff --git a/griddle-react/test/CustomFilterComponent.tsx b/griddle-react/test/CustomFilterComponent.tsx
index 349b132947..cb06f11703 100644
--- a/griddle-react/test/CustomFilterComponent.tsx
+++ b/griddle-react/test/CustomFilterComponent.tsx
@@ -1,3 +1,9 @@
+/*
+Licensed under the MIT License (MIT)
+
+Copyright (c) 2016 David Hara
+*/
+
 import * as _ from 'lodash';
 import * as React from 'react';
 import Griddle, { CustomFilterComponentProps } from 'griddle-react';
diff --git a/griddle-react/test/CustomHeaderComponent.tsx b/griddle-react/test/CustomHeaderComponent.tsx
index 0d59405c5a..359cfc74a8 100644
--- a/griddle-react/test/CustomHeaderComponent.tsx
+++ b/griddle-react/test/CustomHeaderComponent.tsx
@@ -1,3 +1,9 @@
+/*
+Licensed under the MIT License (MIT)
+
+Copyright (c) 2016 David Hara
+*/
+
 import * as React from 'react';
 import Griddle, { ColumnMetaData, CustomHeaderComponentProps } from 'griddle-react';
 
diff --git a/griddle-react/test/index.html b/griddle-react/test/index.html
deleted file mode 100644
index 2ce79ad3c7..0000000000
--- a/griddle-react/test/index.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-</head>
-<body>
-<div id="root"></div>
-<script src="/bundle.js"></script>
-</body>
-</html>
\ No newline at end of file
diff --git a/griddle-react/test/index.tsx b/griddle-react/test/index.tsx
deleted file mode 100644
index 8883029708..0000000000
--- a/griddle-react/test/index.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import * as React from 'react';
-import { render } from 'react-dom';
-import CustomColumnComponentGrid from './CustomColumnComponent';
-import CustomHeaderComponentGrid from './CustomHeaderComponent';
-import CustomFilterComponentGrid from './CustomFilterComponent';
-
-render(
-  <div>
-    <h1>Custom Column Component Grid</h1>
-    <CustomColumnComponentGrid />
-    <h1>Custom Header Component Grid</h1>
-    <CustomHeaderComponentGrid />
-    <h1>Custom Filter Component Grid</h1>
-    <CustomFilterComponentGrid />
-  </div>,
-  document.getElementById('root')
-);
\ No newline at end of file
diff --git a/griddle-react/tsconfig.json b/griddle-react/tsconfig.json
index 7f01a8e329..2482b52409 100644
--- a/griddle-react/tsconfig.json
+++ b/griddle-react/tsconfig.json
@@ -1,14 +1,27 @@
 {
   "compilerOptions": {
-    "module": "es2015",
-    "outDir": "./target",
+    "module": "commonjs",
+    "lib": [
+      "es6",
+      "dom"
+    ],
     "jsx": "preserve",
-    "target": "es6"
+    "noImplicitAny": false,
+    "noImplicitThis": true,
+    "strictNullChecks": false,
+    "baseUrl": "../",
+    "typeRoots": [
+      "../"
+    ],
+    "types": [],
+    "noEmit": true,
+    "forceConsistentCasingInFileNames": true
   },
-  "exclude": [
-    "node_modules",
-    "griddle-react.d.ts",
-    "typings/main",
-    "typings/main.d.ts"
+  "files": [
+    "index.d.ts",
+    "griddle-react-tests.tsx",
+    "test/CustomColumnComponent.tsx",
+    "test/CustomFilterComponent.tsx",
+    "test/CustomHeaderComponent.tsx"
   ]
-}
\ No newline at end of file
+}
diff --git a/griddle-react/tslint.json b/griddle-react/tslint.json
new file mode 100644
index 0000000000..f9e30021f4
--- /dev/null
+++ b/griddle-react/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "../tslint.json"
+}
diff --git a/griddle-react/typings.json b/griddle-react/typings.json
deleted file mode 100644
index b7346e0ead..0000000000
--- a/griddle-react/typings.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "name": "griddle-react",
-  "main": "griddle-react.d.ts"
-}
diff --git a/griddle-react/webpack.config.js b/griddle-react/webpack.config.js
deleted file mode 100644
index 03320a27b5..0000000000
--- a/griddle-react/webpack.config.js
+++ /dev/null
@@ -1,20 +0,0 @@
-module.exports = {
-  entry: ['./test/index.tsx'],
-  resolve: {
-    extensions: ["", ".webpack.js", ".web.js", ".js", ".ts", ".tsx"]
-  },
-  output: {
-    path: './output/',
-    filename: 'bundle.js'
-  },
-  module: {
-    loaders: [
-      {
-        test: /.tsx?$/,
-        loaders: ['babel-loader', 'ts-loader'],
-        exclude: /node_modules/
-      }
-    ]
-  },
-  devtool: "#source-map"
-};
\ No newline at end of file