diff --git a/src/demo/demo.tsx b/src/demo/demo.tsx
index 76230a46..59975151 100644
--- a/src/demo/demo.tsx
+++ b/src/demo/demo.tsx
@@ -1,4 +1,4 @@
-import React from 'react'
+import * as React from 'react'
 
 import * as V from 'src/react-virtualized-table';
 
diff --git a/src/demo/index.tsx b/src/demo/index.tsx
index 85a62cdd..dba66371 100644
--- a/src/demo/index.tsx
+++ b/src/demo/index.tsx
@@ -1,4 +1,4 @@
-import React from 'react'
+import * as React from 'react'
 import ReactDOM from "react-dom";
 
 import Demo from 'src/demo/demo'
diff --git a/src/demo/jumbotron/index.tsx b/src/demo/jumbotron/index.tsx
index 2ad4e5c0..dd6fdd12 100644
--- a/src/demo/jumbotron/index.tsx
+++ b/src/demo/jumbotron/index.tsx
@@ -1,4 +1,4 @@
-import React from 'react'
+import * as React from 'react'
 
 import Icon from 'src/icon'
 
diff --git a/src/demo/mainTable/index.tsx b/src/demo/mainTable/index.tsx
index 1ea05d97..63e859b9 100644
--- a/src/demo/mainTable/index.tsx
+++ b/src/demo/mainTable/index.tsx
@@ -1,4 +1,4 @@
-import React from 'react'
+import * as React from 'react'
 
 import * as V from 'src/react-virtualized-table';
 
diff --git a/src/demo/navbar/index.tsx b/src/demo/navbar/index.tsx
index 09ba367c..8b10bc76 100644
--- a/src/demo/navbar/index.tsx
+++ b/src/demo/navbar/index.tsx
@@ -1,4 +1,4 @@
-import React from 'react'
+import * as React from 'react'
 
 import Icon from 'src/icon'
 
diff --git a/src/demo/sidebar/index.tsx b/src/demo/sidebar/index.tsx
index 1dfc1498..be37a66d 100644
--- a/src/demo/sidebar/index.tsx
+++ b/src/demo/sidebar/index.tsx
@@ -1,4 +1,4 @@
-import React from 'react'
+import * as React from 'react'
 
 import Table from 'src/demo/mainTable'
 
diff --git a/src/demo/smallerTables/index.tsx b/src/demo/smallerTables/index.tsx
index 7179af64..a01ea1f5 100644
--- a/src/demo/smallerTables/index.tsx
+++ b/src/demo/smallerTables/index.tsx
@@ -1,4 +1,4 @@
-import React from 'react'
+import * as React from 'react'
 
 import * as V from 'src/react-virtualized-table';
 
diff --git a/src/filtered/head.tsx b/src/filtered/head.tsx
index 7d3b10a1..4882a92b 100644
--- a/src/filtered/head.tsx
+++ b/src/filtered/head.tsx
@@ -1,4 +1,4 @@
-import React from 'react'
+import * as React from 'react'
 
 import M from './model'
 
diff --git a/src/filtered/index.tsx b/src/filtered/index.tsx
index 8281c412..aab019f7 100644
--- a/src/filtered/index.tsx
+++ b/src/filtered/index.tsx
@@ -1,4 +1,4 @@
-import React from 'react'
+import * as React from 'react'
 
 import * as Helpers from '../helpers'
 const {merge, deepCopy} = Helpers
@@ -6,14 +6,12 @@ const {merge, deepCopy} = Helpers
 import {
 	VTable,
 	VTableProps
-} from "src"
+} from "../index"
 
 import {
 	Column
 } from '../model'
 
-import SearchField from '../searchfield'
-
 import Checkbox from '../checkbox'
 
 import Head from './head'
@@ -24,7 +22,7 @@ import M, {
 	filtered
 } from './model'
 
-import CP, {
+import {
 	Item,
 	Given,
 	initCounter,
diff --git a/src/head.tsx b/src/head.tsx
index 4ae30487..a4f0d2f0 100644
--- a/src/head.tsx
+++ b/src/head.tsx
@@ -1,4 +1,4 @@
-import React from 'react'
+import * as React from 'react'
 
 import Sticky from './stickyWrapper'
 
diff --git a/src/icon/index.tsx b/src/icon/index.tsx
index d33770a3..26cbee23 100644
--- a/src/icon/index.tsx
+++ b/src/icon/index.tsx
@@ -1,4 +1,4 @@
-import React from 'react'
+import * as React from 'react'
 
 export type Props = {
 	type?:string,
diff --git a/src/index.tsx b/src/index.tsx
index 90dd3c40..f5d8b056 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -1,4 +1,4 @@
-import React from 'react'
+import * as React from 'react'
 
 import {
 	merge, deepCopy
diff --git a/src/model.ts b/src/model.ts
index c8153069..29da19ea 100644
--- a/src/model.ts
+++ b/src/model.ts
@@ -6,7 +6,7 @@ import I from './icon/model'
 
 import C from './checkbox/model'
 
-import { VTable } from 'src'
+import { VTable } from './index'
 
 const listRowHeight = 50
 const codepickerHeight = 250
diff --git a/src/row.tsx b/src/row.tsx
index 953f9e79..3b728e9c 100644
--- a/src/row.tsx
+++ b/src/row.tsx
@@ -1,4 +1,4 @@
-import React from 'react'
+import * as React from 'react'
 
 import CP, {
 	Item,
diff --git a/src/searchfield/index.tsx b/src/searchfield/index.tsx
index a05c6a33..e3827bd1 100644
--- a/src/searchfield/index.tsx
+++ b/src/searchfield/index.tsx
@@ -1,4 +1,4 @@
-import React from 'react'
+import * as React from 'react'
 
 export type Props = {
 	onChange:Function,
diff --git a/src/stickyWrapper/index.tsx b/src/stickyWrapper/index.tsx
index 72688e04..cdc88e07 100644
--- a/src/stickyWrapper/index.tsx
+++ b/src/stickyWrapper/index.tsx
@@ -1,4 +1,4 @@
-import React from 'react'
+import * as React from 'react'
 
 import SM, {
 	S as Sticky