diff --git a/types/react-virtualized/dist/commonjs/ArrowKeyStepper.d.ts b/types/react-virtualized/dist/commonjs/ArrowKeyStepper.d.ts
new file mode 100644
index 0000000000..fd16c58feb
--- /dev/null
+++ b/types/react-virtualized/dist/commonjs/ArrowKeyStepper.d.ts
@@ -0,0 +1 @@
+export * from '../es/ArrowKeyStepper';
\ No newline at end of file
diff --git a/types/react-virtualized/dist/commonjs/AutoSizer.d.ts b/types/react-virtualized/dist/commonjs/AutoSizer.d.ts
new file mode 100644
index 0000000000..c0551a98a4
--- /dev/null
+++ b/types/react-virtualized/dist/commonjs/AutoSizer.d.ts
@@ -0,0 +1 @@
+export * from '../es/AutoSizer';
\ No newline at end of file
diff --git a/types/react-virtualized/dist/commonjs/CellMeasurer.d.ts b/types/react-virtualized/dist/commonjs/CellMeasurer.d.ts
new file mode 100644
index 0000000000..907eafee51
--- /dev/null
+++ b/types/react-virtualized/dist/commonjs/CellMeasurer.d.ts
@@ -0,0 +1 @@
+export * from '../es/CellMeasurer';
\ No newline at end of file
diff --git a/types/react-virtualized/dist/commonjs/Collection.d.ts b/types/react-virtualized/dist/commonjs/Collection.d.ts
new file mode 100644
index 0000000000..2764686c76
--- /dev/null
+++ b/types/react-virtualized/dist/commonjs/Collection.d.ts
@@ -0,0 +1 @@
+export * from '../es/Collection';
\ No newline at end of file
diff --git a/types/react-virtualized/dist/commonjs/ColumnSizer.d.ts b/types/react-virtualized/dist/commonjs/ColumnSizer.d.ts
new file mode 100644
index 0000000000..80c9cf5d2e
--- /dev/null
+++ b/types/react-virtualized/dist/commonjs/ColumnSizer.d.ts
@@ -0,0 +1 @@
+export * from '../es/ColumnSizer';
\ No newline at end of file
diff --git a/types/react-virtualized/dist/commonjs/Grid.d.ts b/types/react-virtualized/dist/commonjs/Grid.d.ts
new file mode 100644
index 0000000000..168a11ac52
--- /dev/null
+++ b/types/react-virtualized/dist/commonjs/Grid.d.ts
@@ -0,0 +1 @@
+export * from '../es/Grid';
\ No newline at end of file
diff --git a/types/react-virtualized/dist/commonjs/InfiniteLoader.d.ts b/types/react-virtualized/dist/commonjs/InfiniteLoader.d.ts
new file mode 100644
index 0000000000..29449c85ff
--- /dev/null
+++ b/types/react-virtualized/dist/commonjs/InfiniteLoader.d.ts
@@ -0,0 +1 @@
+export * from '../es/InfiniteLoader';
\ No newline at end of file
diff --git a/types/react-virtualized/dist/commonjs/List.d.ts b/types/react-virtualized/dist/commonjs/List.d.ts
new file mode 100644
index 0000000000..6fdfde2dc0
--- /dev/null
+++ b/types/react-virtualized/dist/commonjs/List.d.ts
@@ -0,0 +1 @@
+export * from '../es/List';
\ No newline at end of file
diff --git a/types/react-virtualized/dist/commonjs/Masonry.d.ts b/types/react-virtualized/dist/commonjs/Masonry.d.ts
new file mode 100644
index 0000000000..e5189fb5f9
--- /dev/null
+++ b/types/react-virtualized/dist/commonjs/Masonry.d.ts
@@ -0,0 +1 @@
+export * from '../es/Masonry';
\ No newline at end of file
diff --git a/types/react-virtualized/dist/commonjs/MultiGrid.d.ts b/types/react-virtualized/dist/commonjs/MultiGrid.d.ts
new file mode 100644
index 0000000000..09f385eca4
--- /dev/null
+++ b/types/react-virtualized/dist/commonjs/MultiGrid.d.ts
@@ -0,0 +1 @@
+export * from '../es/MultiGrid';
\ No newline at end of file
diff --git a/types/react-virtualized/dist/commonjs/ScrollSync.d.ts b/types/react-virtualized/dist/commonjs/ScrollSync.d.ts
new file mode 100644
index 0000000000..ffb4423c0a
--- /dev/null
+++ b/types/react-virtualized/dist/commonjs/ScrollSync.d.ts
@@ -0,0 +1 @@
+export * from '../es/ScrollSync';
\ No newline at end of file
diff --git a/types/react-virtualized/dist/commonjs/Table.d.ts b/types/react-virtualized/dist/commonjs/Table.d.ts
new file mode 100644
index 0000000000..db2670ceda
--- /dev/null
+++ b/types/react-virtualized/dist/commonjs/Table.d.ts
@@ -0,0 +1 @@
+export * from '../es/Table';
\ No newline at end of file
diff --git a/types/react-virtualized/dist/commonjs/WindowScroller.d.ts b/types/react-virtualized/dist/commonjs/WindowScroller.d.ts
new file mode 100644
index 0000000000..0380f0a4fb
--- /dev/null
+++ b/types/react-virtualized/dist/commonjs/WindowScroller.d.ts
@@ -0,0 +1 @@
+export * from '../es/WindowScroller';
\ No newline at end of file
diff --git a/types/react-virtualized/ArrowKeyStepper.d.ts b/types/react-virtualized/dist/es/ArrowKeyStepper.d.ts
similarity index 100%
rename from types/react-virtualized/ArrowKeyStepper.d.ts
rename to types/react-virtualized/dist/es/ArrowKeyStepper.d.ts
diff --git a/types/react-virtualized/AutoSizer.d.ts b/types/react-virtualized/dist/es/AutoSizer.d.ts
similarity index 100%
rename from types/react-virtualized/AutoSizer.d.ts
rename to types/react-virtualized/dist/es/AutoSizer.d.ts
diff --git a/types/react-virtualized/CellMeasurer.d.ts b/types/react-virtualized/dist/es/CellMeasurer.d.ts
similarity index 100%
rename from types/react-virtualized/CellMeasurer.d.ts
rename to types/react-virtualized/dist/es/CellMeasurer.d.ts
diff --git a/types/react-virtualized/Collection.d.ts b/types/react-virtualized/dist/es/Collection.d.ts
similarity index 99%
rename from types/react-virtualized/Collection.d.ts
rename to types/react-virtualized/dist/es/Collection.d.ts
index 52a69de286..404d329222 100644
--- a/types/react-virtualized/Collection.d.ts
+++ b/types/react-virtualized/dist/es/Collection.d.ts
@@ -1,11 +1,10 @@
-/** @flow */
 import { PureComponent, Validator, Requireable } from 'react'
 import {
     Index,
     ScrollPosition,
     SizeInfo,
     SizeAndPositionInfo
-} from './genericTypes';
+} from '../../index';
 
 export type CollectionCellSizeAndPosition = { height: number, width: number, x: number, y: number };
 export type CollectionCellSizeAndPositionGetter = (params: Index) => CollectionCellSizeAndPosition;
diff --git a/types/react-virtualized/ColumnSizer.d.ts b/types/react-virtualized/dist/es/ColumnSizer.d.ts
similarity index 100%
rename from types/react-virtualized/ColumnSizer.d.ts
rename to types/react-virtualized/dist/es/ColumnSizer.d.ts
diff --git a/types/react-virtualized/Grid.d.ts b/types/react-virtualized/dist/es/Grid.d.ts
similarity index 99%
rename from types/react-virtualized/Grid.d.ts
rename to types/react-virtualized/dist/es/Grid.d.ts
index ea7130857c..b68cf45956 100644
--- a/types/react-virtualized/Grid.d.ts
+++ b/types/react-virtualized/dist/es/Grid.d.ts
@@ -1,9 +1,8 @@
-/** @flow */
 import { Validator, Requireable, PureComponent } from 'react'
 import { List } from './List';
 import { Table } from './Table';
 import { CellMeasurerCache } from './CellMeasurer';
-import { Index, Map, Alignment } from './genericTypes';
+import { Index, Map, Alignment } from '../../index';
 
 export type GridCellProps = {
     columnIndex: number;
diff --git a/types/react-virtualized/InfiniteLoader.d.ts b/types/react-virtualized/dist/es/InfiniteLoader.d.ts
similarity index 98%
rename from types/react-virtualized/InfiniteLoader.d.ts
rename to types/react-virtualized/dist/es/InfiniteLoader.d.ts
index 4493921e72..e16359adca 100644
--- a/types/react-virtualized/InfiniteLoader.d.ts
+++ b/types/react-virtualized/dist/es/InfiniteLoader.d.ts
@@ -1,5 +1,5 @@
 import { PureComponent, Validator, Requireable } from 'react'
-import { Index, IndexRange } from './genericTypes';
+import { Index, IndexRange } from '../../index';
 
 export type InfiniteLoaderChildProps = {
     onRowsRendered: (params: { startIndex: number, stopIndex: number }) => void,
diff --git a/types/react-virtualized/List.d.ts b/types/react-virtualized/dist/es/List.d.ts
similarity index 98%
rename from types/react-virtualized/List.d.ts
rename to types/react-virtualized/dist/es/List.d.ts
index d4d5196a34..2a4f30dbfe 100644
--- a/types/react-virtualized/List.d.ts
+++ b/types/react-virtualized/dist/es/List.d.ts
@@ -1,7 +1,6 @@
-/** @flow */
 import { PureComponent, Validator, Requireable } from 'react'
 import { Grid, GridCellProps } from './Grid'
-import { Index, IndexRange, Alignment } from './genericTypes'
+import { Index, IndexRange, Alignment } from '../../index'
 import { CellMeasurerCache } from './CellMeasurer'
 
 export type ListRowProps = GridCellProps & { index: number, style: React.CSSProperties };
diff --git a/types/react-virtualized/Masonry.d.ts b/types/react-virtualized/dist/es/Masonry.d.ts
similarity index 99%
rename from types/react-virtualized/Masonry.d.ts
rename to types/react-virtualized/dist/es/Masonry.d.ts
index c4187bf611..51c59a90fc 100644
--- a/types/react-virtualized/Masonry.d.ts
+++ b/types/react-virtualized/dist/es/Masonry.d.ts
@@ -1,5 +1,4 @@
 import { PureComponent, Validator, Requireable } from 'react'
-import { } from './genericTypes';
 import { CellMeasurerCache, KeyMapper } from './CellMeasurer';
 import { GridCellRenderer } from './Grid';
 /**
diff --git a/types/react-virtualized/MultiGrid.d.ts b/types/react-virtualized/dist/es/MultiGrid.d.ts
similarity index 100%
rename from types/react-virtualized/MultiGrid.d.ts
rename to types/react-virtualized/dist/es/MultiGrid.d.ts
diff --git a/types/react-virtualized/ScrollSync.d.ts b/types/react-virtualized/dist/es/ScrollSync.d.ts
similarity index 100%
rename from types/react-virtualized/ScrollSync.d.ts
rename to types/react-virtualized/dist/es/ScrollSync.d.ts
diff --git a/types/react-virtualized/Table.d.ts b/types/react-virtualized/dist/es/Table.d.ts
similarity index 99%
rename from types/react-virtualized/Table.d.ts
rename to types/react-virtualized/dist/es/Table.d.ts
index af5cf9b0b5..6607211dcf 100644
--- a/types/react-virtualized/Table.d.ts
+++ b/types/react-virtualized/dist/es/Table.d.ts
@@ -1,6 +1,6 @@
 import { Validator, Requireable, PureComponent, Component } from 'react';
 import { CellMeasurerCache } from './CellMeasurer';
-import { Index, Alignment, ScrollEventData, IndexRange, OverscanIndexRange } from './genericTypes';
+import { Index, Alignment, ScrollEventData, IndexRange, OverscanIndexRange } from '../../index';
 import { Grid } from './Grid';
 
 export type TableCellDataGetterParams = {
diff --git a/types/react-virtualized/WindowScroller.d.ts b/types/react-virtualized/dist/es/WindowScroller.d.ts
similarity index 99%
rename from types/react-virtualized/WindowScroller.d.ts
rename to types/react-virtualized/dist/es/WindowScroller.d.ts
index 093debdd78..7e0a09379e 100644
--- a/types/react-virtualized/WindowScroller.d.ts
+++ b/types/react-virtualized/dist/es/WindowScroller.d.ts
@@ -1,4 +1,3 @@
-/** @flow */
 import { Validator, Requireable, PureComponent } from 'react'
 
 export type WindowScrollerChildProps = {
diff --git a/types/react-virtualized/genericTypes.d.ts b/types/react-virtualized/genericTypes.d.ts
deleted file mode 100644
index 7f4b6ff4b4..0000000000
--- a/types/react-virtualized/genericTypes.d.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-export type Index = {
-    index: number
-};
-
-export type PositionInfo = {
-    x: number,
-    y: number
-};
-
-export type ScrollPosition = {
-    scrollLeft: number,
-    scrollTop: number
-};
-
-export type SizeInfo = {
-    height: number,
-    width: number
-};
-
-export type SizeAndPositionInfo = SizeInfo & PositionInfo;
-
-export type Map<T> = { [key: string]: T };
-
-export type Alignment = 'auto' | 'end' | 'start' | 'center';
-
-export type IndexRange = {
-    startIndex: number,
-    stopIndex: number
-}
-
-export type OverscanIndexRange = {
-    overscanStartIndex: number,
-    overscanStopIndex: number,
-}
-
-export type ScrollEventData = {
-    clientHeight: number,
-    scrollHeight: number,
-    scrollTop: number
-}
\ No newline at end of file
diff --git a/types/react-virtualized/index.d.ts b/types/react-virtualized/index.d.ts
index 3280d8410d..d6860176ed 100644
--- a/types/react-virtualized/index.d.ts
+++ b/types/react-virtualized/index.d.ts
@@ -8,19 +8,19 @@ export {
     ArrowKeyStepper,
     ArrowKeyStepperProps,
     ChildProps as ArrowKeyStepperChildProps
-} from './ArrowKeyStepper'
+} from './dist/es/ArrowKeyStepper'
 export {
     AutoSizer,
     AutoSizerProps,
     Dimensions
-} from './AutoSizer'
+} from './dist/es/AutoSizer'
 export {
     CellMeasurer,
     CellMeasurerCache,
     CellMeasurerCacheParams,
     CellMeasurerProps,
     KeyMapper
-} from './CellMeasurer'
+} from './dist/es/CellMeasurer'
 export {
     Collection,
     CollectionCellGroupRenderer,
@@ -30,12 +30,12 @@ export {
     CollectionCellSizeAndPosition,
     CollectionCellSizeAndPositionGetter,
     CollectionProps
-} from './Collection'
+} from './dist/es/Collection'
 export {
     ColumnSizer,
     ColumnSizerProps,
     SizedColumnProps
-} from './ColumnSizer'
+} from './dist/es/ColumnSizer'
 export {
     defaultCellRangeRenderer,
     Grid,
@@ -56,18 +56,18 @@ export {
     SectionRenderedParams,
     SizeAndPositionData,
     VisibleCellRange
-} from './Grid'
+} from './dist/es/Grid'
 export {
     InfiniteLoader,
     InfiniteLoaderChildProps,
     InfiniteLoaderProps
-} from './InfiniteLoader'
+} from './dist/es/InfiniteLoader'
 export {
     List,
     ListProps,
     ListRowProps,
     ListRowRenderer
-} from './List'
+} from './dist/es/List'
 export {
     createCellPositioner as createMasonryCellPositioner,
     Masonry,
@@ -79,19 +79,19 @@ export {
     OnScrollCallback,
     Position,
     Positioner
-} from './Masonry'
+} from './dist/es/Masonry'
 export {
     MultiGrid,
     MultiGridProps,
     MultiGridState
-} from './MultiGrid'
+} from './dist/es/MultiGrid'
 export {
     ScrollSync,
     OnScrollParams,
     ScrollSyncChildProps,
     ScrollSyncProps,
     ScrollSyncState
-} from './ScrollSync'
+} from './dist/es/ScrollSync'
 export {
     defaultTableCellDataGetter,
     defaultTableCellRenderer,
@@ -117,22 +117,51 @@ export {
     TableProps,
     TableRowProps,
     TableRowRenderer
-} from './Table'
+} from './dist/es/Table'
 export {
     WindowScroller,
     WindowScrollerChildProps,
     WindowScrollerProps,
     WindowScrollerState
-} from './WindowScroller'
+} from './dist/es/WindowScroller'
 
-export {
-    Alignment,
-    Index,
-    IndexRange,
-    Map,
-    PositionInfo,
-    ScrollEventData,
-    ScrollPosition,
-    SizeAndPositionInfo,
-    SizeInfo
-} from './genericTypes'
\ No newline at end of file
+export type Index = {
+    index: number
+};
+
+export type PositionInfo = {
+    x: number,
+    y: number
+};
+
+export type ScrollPosition = {
+    scrollLeft: number,
+    scrollTop: number
+};
+
+export type SizeInfo = {
+    height: number,
+    width: number
+};
+
+export type SizeAndPositionInfo = SizeInfo & PositionInfo;
+
+export type Map<T> = { [key: string]: T };
+
+export type Alignment = 'auto' | 'end' | 'start' | 'center';
+
+export type IndexRange = {
+    startIndex: number,
+    stopIndex: number
+}
+
+export type OverscanIndexRange = {
+    overscanStartIndex: number,
+    overscanStopIndex: number,
+}
+
+export type ScrollEventData = {
+    clientHeight: number,
+    scrollHeight: number,
+    scrollTop: number
+}
\ No newline at end of file