diff --git a/src/index.js b/src/index.js
index 4d47f4ea0..e3b146f30 100644
--- a/src/index.js
+++ b/src/index.js
@@ -7,25 +7,17 @@ export { default as GenericChartComponent } from "./lib/GenericChartComponent";
 export { default as GenericComponent } from "./lib/GenericComponent";
 export { default as BackgroundText } from "./lib/BackgroundText";
 export { default as ZoomButtons } from "./lib/ZoomButtons";
+export { getAxisCanvas, getMouseCanvas } from "./lib/GenericComponent";
+export * from "./lib/scale";
+export * from "./lib/series";
+export * from "./lib/axes";
+export * from "./lib/coordinates";
+export * from "./lib/tooltip";
+export * from "./lib/helper";
+export * from "./lib/utils";
+export * from "./lib/indicator";
+export * from "./lib/interactive";
+export { default as algorithm } from "./lib/algorithm";
+export * from "./lib/annotation";
 
 export const version = "0.7.8";
-
-/*
-// chart types & Series
-import * as series from "./lib/series";
-import * as scale from "./lib/scale";
-
-import * as coordinates from "./lib/coordinates";
-import * as indicator from "./lib/indicator";
-import * as algorithm from "./lib/algorithm";
-
-import * as annotation from "./lib/annotation";
-
-import * as axes from "./lib/axes";
-import * as tooltip from "./lib/tooltip";
-import * as helper from "./lib/helper";
-
-import * as interactive from "./lib/interactive";
-import * as utils from "./lib/utils";
-
-*/