diff --git a/src/index.css b/src/index.css
deleted file mode 100644
index ea6ff7d8..00000000
--- a/src/index.css
+++ /dev/null
@@ -1,28 +0,0 @@
-@import url("https://fonts.googleapis.com/css?family=Lato:400,900");
-
-@import url("https://cdn.jsdelivr.net/prism/1.4.1/themes/prism.css");
-@import url("https://cdn.jsdelivr.net/bootstrap/3.3.6/css/bootstrap.min.css");
-@import url("https://cdn.jsdelivr.net/animatecss/3.5.1/animate.min.css");
-@import url("https://cdn.jsdelivr.net/toastr/2.1.2/toastr.min.css");
-
-body {
-  margin: 0;
-  padding: 0;
-  font-family: sans-serif;
-}
-
-html, body, #root, .full-height {
-  height: 100%;
-}
-
-@keyframes fa-spin {
-  0% {
-    -webkit-transform: rotate(0deg);
-    transform: rotate(0deg);
-  }
-  100% {
-    -webkit-transform: rotate(359deg);
-    transform: rotate(359deg);
-  }
-}
-
diff --git a/src/index.js b/src/index.js
index 1325199f..ab915a81 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,21 +1,29 @@
-import React from "react";
-
-import ReactDOM from "react-dom";
-
-const Root = (
-  window.ReactGoogleMapsAsync ?
-  require(`./app/AsyncApp`).default :
-  /*
-   * If you're not using async,
-   *
-   * Add script src="https://maps.googleapis.com/maps/api/js" to your HTML to provide google.maps reference
-   */
-  require(`./app/App`).default
-);
-
-import "./index.css";
-
-ReactDOM.render(
-  <Root />,
-  document.getElementById(`root`)
-);
+export { default as withScriptjs } from "./withScriptjs"
+
+export { default as withGoogleMap } from "./withGoogleMap"
+
+export { default as GoogleMap } from "./components/GoogleMap"
+
+export { default as Circle } from "./components/Circle"
+
+export { default as Marker } from "./components/Marker"
+
+export { default as Polyline } from "./components/Polyline"
+
+export { default as Polygon } from "./components/Polygon"
+
+export { default as Rectangle } from "./components/Rectangle"
+
+export { default as InfoWindow } from "./components/InfoWindow"
+
+export { default as OverlayView } from "./components/OverlayView"
+
+export { default as DirectionsRenderer } from "./components/DirectionsRenderer"
+
+export { default as FusionTablesLayer } from "./components/FusionTablesLayer"
+
+export { default as KmlLayer } from "./components/KmlLayer"
+
+export { default as TrafficLayer } from "./components/TrafficLayer"
+
+export { default as StreetViewPanorama } from "./components/StreetViewPanorama"
diff --git a/src/lib/index.js b/src/lib/index.js
deleted file mode 100644
index 583b2518..00000000
--- a/src/lib/index.js
+++ /dev/null
@@ -1,55 +0,0 @@
-export {
-  default as withGoogleMap,
-} from "./withGoogleMap";
-
-export {
-  default as GoogleMap,
-} from "./GoogleMap";
-
-export {
-  default as Marker,
-} from "./Marker";
-
-export {
-  default as Rectangle,
-} from "./Rectangle";
-
-export {
-  default as Polyline,
-} from "./Polyline";
-
-export {
-  default as Polygon,
-} from "./Polygon";
-
-export {
-  default as Circle,
-} from "./Circle";
-
-export {
-  default as KmlLayer,
-} from "./KmlLayer";
-
-export {
-  default as FusionTablesLayer,
-} from "./FusionTablesLayer";
-
-export {
-  default as TrafficLayer,
-} from "./TrafficLayer";
-
-export {
-  default as DirectionsRenderer,
-} from "./DirectionsRenderer";
-
-export {
-  default as InfoWindow,
-} from "./InfoWindow";
-
-export {
-  default as OverlayView,
-} from "./OverlayView";
-
-export {
-  default as StreetViewPanorama,
-} from "./StreetViewPanorama";
diff --git a/src/lib/index.spec.js b/src/lib/index.spec.js
deleted file mode 100644
index dcdcb1c3..00000000
--- a/src/lib/index.spec.js
+++ /dev/null
@@ -1,71 +0,0 @@
-import {
-  withGoogleMap,
-  GoogleMap,
-  Circle,
-  DirectionsRenderer,
-  InfoWindow,
-  KmlLayer,
-  FusionTablesLayer,
-  Marker,
-  OverlayView,
-  Polygon,
-  Polyline,
-  Rectangle,
-  StreetViewPanorama,
-} from "./index";
-
-describe(`index`, () => {
-
-  it(`should export withGoogleMap`, () => {
-    expect(withGoogleMap).toBeDefined();
-  });
-
-  it(`should export GoogleMap`, () => {
-    expect(GoogleMap).toBeDefined();
-  });
-
-  it(`should export Circle`, () => {
-    expect(Circle).toBeDefined();
-  });
-
-  it(`should export DirectionsRenderer`, () => {
-    expect(DirectionsRenderer).toBeDefined();
-  });
-
-  it(`should export InfoWindow`, () => {
-    expect(InfoWindow).toBeDefined();
-  });
-  
-  it(`should export KmlLayer`, () => {
-    expect(KmlLayer).toBeDefined();
-  });
-
-  it(`should export FusionTablesLayer`, () => {
-    expect(FusionTablesLayer).toBeDefined();
-  });
-
-  it(`should export Marker`, () => {
-    expect(Marker).toBeDefined();
-  });
-
-  it(`should export OverlayView`, () => {
-    expect(OverlayView).toBeDefined();
-  });
-
-  it(`should export Polygon`, () => {
-    expect(Polygon).toBeDefined();
-  });
-
-  it(`should export Polyline`, () => {
-    expect(Polyline).toBeDefined();
-  });
-
-  it(`should export Rectangle`, () => {
-    expect(Rectangle).toBeDefined();
-  });
-
-  it(`should export StreetViewPanorama`, () => {
-    expect(StreetViewPanorama).toBeDefined();
-  });
-
-});