diff --git a/src/index.js b/src/index.js
index c7002fb..c3dd63d 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,10 +1,12 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
 import { hashHistory } from 'react-router';
-import Routes from './routes';
+import Routes from './routes/routes';
 
 
 import './index.css';
+import './fonts/font.css';
+
 
 ReactDOM.render(
   <Routes history={hashHistory} />,
diff --git a/src/about/index.css b/src/lib/components/AboutPage/index.css
similarity index 100%
rename from src/about/index.css
rename to src/lib/components/AboutPage/index.css
diff --git a/src/about/index.js b/src/lib/components/AboutPage/index.js
similarity index 89%
rename from src/about/index.js
rename to src/lib/components/AboutPage/index.js
index 9d45b90..b595bad 100644
--- a/src/about/index.js
+++ b/src/lib/components/AboutPage/index.js
@@ -2,15 +2,12 @@
  * Created by terencelimzw on 26/12/16.
  */
 
-import React, {Component } from 'react';
-import Card from '../lib/card'
+import React, {PureComponent } from 'react';
+import Card from '../Card';
 
 import './index.css';
 
-export default class About extends Component {
-  // static propTypes = {}
-  // static defaultProps = {}
-  // state = {}
+export default class About extends PureComponent {
 
   render() {
     // const { className, ...props } = this.props;
diff --git a/src/lib/card/index.css b/src/lib/components/Card/index.css
similarity index 100%
rename from src/lib/card/index.css
rename to src/lib/components/Card/index.css
diff --git a/src/lib/card/index.js b/src/lib/components/Card/index.js
similarity index 94%
rename from src/lib/card/index.js
rename to src/lib/components/Card/index.js
index 8665e66..397e8c0 100644
--- a/src/lib/card/index.js
+++ b/src/lib/components/Card/index.js
@@ -6,7 +6,6 @@
  */
 import React, {PropTypes} from "react";
 
-import "../../fonts/font.css"
 import "./index.css";
 
 const Card = ({children,title,width}) => (
diff --git a/src/lib/chart/index.css b/src/lib/components/ChartSVG/index.css
similarity index 100%
rename from src/lib/chart/index.css
rename to src/lib/components/ChartSVG/index.css
diff --git a/src/lib/chart/index.js b/src/lib/components/ChartSVG/index.js
similarity index 100%
rename from src/lib/chart/index.js
rename to src/lib/components/ChartSVG/index.js
diff --git a/src/lib/heatmap/index.css b/src/lib/components/Heatmap/index.css
similarity index 100%
rename from src/lib/heatmap/index.css
rename to src/lib/components/Heatmap/index.css
diff --git a/src/lib/heatmap/index.js b/src/lib/components/Heatmap/index.js
similarity index 98%
rename from src/lib/heatmap/index.js
rename to src/lib/components/Heatmap/index.js
index de3fbed..c6686c6 100644
--- a/src/lib/heatmap/index.js
+++ b/src/lib/components/Heatmap/index.js
@@ -10,7 +10,7 @@ const HeatMap = ({gridSize,stroke,strokeOpacity,colorRange,data,onMouseOver,onMo
   var domain = [0,(raw_data?d3.max(raw_data.map(d=>d3.max(d))):0)]
   var colorScale = d3.scaleLinear().range(colorRange).domain(domain)
   return (
-      <g className={"heatmap"}>
+      <g className={"Heatmap"}>
         {data.map((d, i) => {
             return (
               d.avail.map((a, b) => (
diff --git a/src/lib/axes/index.css b/src/lib/components/HeatmapAxes/index.css
similarity index 100%
rename from src/lib/axes/index.css
rename to src/lib/components/HeatmapAxes/index.css
diff --git a/src/lib/axes/index.js b/src/lib/components/HeatmapAxes/index.js
similarity index 100%
rename from src/lib/axes/index.js
rename to src/lib/components/HeatmapAxes/index.js
diff --git a/src/lib/nav/index.css b/src/lib/components/Navbar/index.css
similarity index 100%
rename from src/lib/nav/index.css
rename to src/lib/components/Navbar/index.css
diff --git a/src/lib/nav/index.js b/src/lib/components/Navbar/index.js
similarity index 96%
rename from src/lib/nav/index.js
rename to src/lib/components/Navbar/index.js
index cf1e4e2..9690257 100644
--- a/src/lib/nav/index.js
+++ b/src/lib/components/Navbar/index.js
@@ -5,7 +5,6 @@ import React, {PropTypes} from "react";
 import {Link} from "react-router";
 
 import "./index.css";
-import "../../fonts/font.css"
 
 const Navbar = ({title,links}) => {
 
diff --git a/src/notfound/index.css b/src/lib/components/NotFoundPage/index.css
similarity index 100%
rename from src/notfound/index.css
rename to src/lib/components/NotFoundPage/index.css
diff --git a/src/notfound/index.js b/src/lib/components/NotFoundPage/index.js
similarity index 94%
rename from src/notfound/index.js
rename to src/lib/components/NotFoundPage/index.js
index d21ec57..ce9027a 100644
--- a/src/notfound/index.js
+++ b/src/lib/components/NotFoundPage/index.js
@@ -3,7 +3,7 @@
  */
 
 import React, {Component } from 'react';
-import Card from '../lib/card'
+import Card from '../Card'
 
 import './index.css';
 
diff --git a/src/lib/select/index.css b/src/lib/components/Select/index.css
similarity index 100%
rename from src/lib/select/index.css
rename to src/lib/components/Select/index.css
diff --git a/src/lib/select/index.js b/src/lib/components/Select/index.js
similarity index 99%
rename from src/lib/select/index.js
rename to src/lib/components/Select/index.js
index b11b822..37470fb 100644
--- a/src/lib/select/index.js
+++ b/src/lib/components/Select/index.js
@@ -4,6 +4,7 @@
 import React, {PropTypes} from "react";
 
 import "./index.css";
+
 const Select = ({options,text,onChange,value}) => {
   return (
     <div className="select-container">
diff --git a/src/lib/tooltip/index.css b/src/lib/components/Tooltip/index.css
similarity index 100%
rename from src/lib/tooltip/index.css
rename to src/lib/components/Tooltip/index.css
diff --git a/src/lib/tooltip/index.js b/src/lib/components/Tooltip/index.js
similarity index 78%
rename from src/lib/tooltip/index.js
rename to src/lib/components/Tooltip/index.js
index 6ed2d42..3055ffb 100644
--- a/src/lib/tooltip/index.js
+++ b/src/lib/components/Tooltip/index.js
@@ -1,12 +1,6 @@
-/**
- * Created by terencelimzw on 24/12/16.
- */
-/**
- * Created by terencelimzw on 24/12/16.
- */
 import React, {PropTypes} from "react";
 
-import "./index.css";
+import "./index.css"
 
 const Tooltip = ({show,x,y,message}) => {
   const classes = show ? "tooltip show" : "tooltip";
diff --git a/src/main/index.css b/src/lib/containers/AppShell/index.css
similarity index 100%
rename from src/main/index.css
rename to src/lib/containers/AppShell/index.css
diff --git a/src/main/index.js b/src/lib/containers/AppShell/index.js
similarity index 73%
rename from src/main/index.js
rename to src/lib/containers/AppShell/index.js
index aff20c1..54afc1a 100644
--- a/src/main/index.js
+++ b/src/lib/containers/AppShell/index.js
@@ -1,16 +1,9 @@
-/**
- * Created by terencelimzw on 26/12/16.
- */
-
-import React, {Component } from 'react';
-import Navbar from '../lib/nav';
+import React, {Component} from 'react';
+import Navbar from '../../components/Navbar';
 import ReactCSSTransitionGroup from 'react-addons-css-transition-group';
 import './index.css';
 
-export default class About extends Component {
-  // static propTypes = {}
-  // static defaultProps = {}
-  // state = {}
+export default class AppShell extends Component {
 
   render() {
     // const { className, ...props } = this.props;
diff --git a/src/app/index.css b/src/lib/containers/Module/index.css
similarity index 100%
rename from src/app/index.css
rename to src/lib/containers/Module/index.css
diff --git a/src/app/index.js b/src/lib/containers/Module/index.js
similarity index 86%
rename from src/app/index.js
rename to src/lib/containers/Module/index.js
index 6ed9fca..f4cd531 100644
--- a/src/app/index.js
+++ b/src/lib/containers/Module/index.js
@@ -1,17 +1,16 @@
 import React, { Component } from 'react';
-import Card from '../lib/card';
-import HeatMap from '../lib/heatmap'
-import Axis from '../lib/axes'
-import ChartSVG from '../lib/chart'
-import Tooltip from '../lib/tooltip'
-import Select from '../lib/select'
+import Card from '../../components/Card';
+import HeatMap from '../../components/Heatmap';
+import Axis from '../../components/HeatmapAxes';
+import ChartSVG from '../../components/ChartSVG';
+import Tooltip from '../../components/Tooltip';
+import Select from '../../components/Select';
 import {json} from 'd3-request'
 import * as d3 from 'd3'
 
 import './index.css';
-import '../fonts/font.css'
 
-class App extends Component {
+class Module extends Component {
   constructor(props) {
     super(props);
     this.state = {hover:false,x:0,y:0,value:0};
@@ -35,10 +34,10 @@ class App extends Component {
         update_timestamp: update_timestamp
       });
     };
-    json("http://222.164.236.19:9003/latest.json",
-      (error,data)=>{
-        if (error) {
-          console.log(error);
+    // json("http://222.164.236.19:9003/latest.json",
+    //   (error,data)=>{
+    //     if (error) {
+    //       console.log(error);
           json("https://raw.githubusercontent.com/terencelimzhengwei/active-sg-badminton/master/data/latest.json",
             (error,data)=>{
               if (error) {
@@ -47,11 +46,11 @@ class App extends Component {
               setData(data);
             }
           )
-        } else {
-          setData(data);
-        }
-      }
-      );
+      //   } else {
+      //     setData(data);
+      //   }
+      // }
+      // );
   }
 
   render() {
@@ -125,4 +124,4 @@ class App extends Component {
   }
 }
 
-export default App;
+export default Module;
diff --git a/src/logo.svg b/src/logo.svg
deleted file mode 100644
index 6b60c10..0000000
--- a/src/logo.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 841.9 595.3">
-    <g fill="#61DAFB">
-        <path d="M666.3 296.5c0-32.5-40.7-63.3-103.1-82.4 14.4-63.6 8-114.2-20.2-130.4-6.5-3.8-14.1-5.6-22.4-5.6v22.3c4.6 0 8.3.9 11.4 2.6 13.6 7.8 19.5 37.5 14.9 75.7-1.1 9.4-2.9 19.3-5.1 29.4-19.6-4.8-41-8.5-63.5-10.9-13.5-18.5-27.5-35.3-41.6-50 32.6-30.3 63.2-46.9 84-46.9V78c-27.5 0-63.5 19.6-99.9 53.6-36.4-33.8-72.4-53.2-99.9-53.2v22.3c20.7 0 51.4 16.5 84 46.6-14 14.7-28 31.4-41.3 49.9-22.6 2.4-44 6.1-63.6 11-2.3-10-4-19.7-5.2-29-4.7-38.2 1.1-67.9 14.6-75.8 3-1.8 6.9-2.6 11.5-2.6V78.5c-8.4 0-16 1.8-22.6 5.6-28.1 16.2-34.4 66.7-19.9 130.1-62.2 19.2-102.7 49.9-102.7 82.3 0 32.5 40.7 63.3 103.1 82.4-14.4 63.6-8 114.2 20.2 130.4 6.5 3.8 14.1 5.6 22.5 5.6 27.5 0 63.5-19.6 99.9-53.6 36.4 33.8 72.4 53.2 99.9 53.2 8.4 0 16-1.8 22.6-5.6 28.1-16.2 34.4-66.7 19.9-130.1 62-19.1 102.5-49.9 102.5-82.3zm-130.2-66.7c-3.7 12.9-8.3 26.2-13.5 39.5-4.1-8-8.4-16-13.1-24-4.6-8-9.5-15.8-14.4-23.4 14.2 2.1 27.9 4.7 41 7.9zm-45.8 106.5c-7.8 13.5-15.8 26.3-24.1 38.2-14.9 1.3-30 2-45.2 2-15.1 0-30.2-.7-45-1.9-8.3-11.9-16.4-24.6-24.2-38-7.6-13.1-14.5-26.4-20.8-39.8 6.2-13.4 13.2-26.8 20.7-39.9 7.8-13.5 15.8-26.3 24.1-38.2 14.9-1.3 30-2 45.2-2 15.1 0 30.2.7 45 1.9 8.3 11.9 16.4 24.6 24.2 38 7.6 13.1 14.5 26.4 20.8 39.8-6.3 13.4-13.2 26.8-20.7 39.9zm32.3-13c5.4 13.4 10 26.8 13.8 39.8-13.1 3.2-26.9 5.9-41.2 8 4.9-7.7 9.8-15.6 14.4-23.7 4.6-8 8.9-16.1 13-24.1zM421.2 430c-9.3-9.6-18.6-20.3-27.8-32 9 .4 18.2.7 27.5.7 9.4 0 18.7-.2 27.8-.7-9 11.7-18.3 22.4-27.5 32zm-74.4-58.9c-14.2-2.1-27.9-4.7-41-7.9 3.7-12.9 8.3-26.2 13.5-39.5 4.1 8 8.4 16 13.1 24 4.7 8 9.5 15.8 14.4 23.4zM420.7 163c9.3 9.6 18.6 20.3 27.8 32-9-.4-18.2-.7-27.5-.7-9.4 0-18.7.2-27.8.7 9-11.7 18.3-22.4 27.5-32zm-74 58.9c-4.9 7.7-9.8 15.6-14.4 23.7-4.6 8-8.9 16-13 24-5.4-13.4-10-26.8-13.8-39.8 13.1-3.1 26.9-5.8 41.2-7.9zm-90.5 125.2c-35.4-15.1-58.3-34.9-58.3-50.6 0-15.7 22.9-35.6 58.3-50.6 8.6-3.7 18-7 27.7-10.1 5.7 19.6 13.2 40 22.5 60.9-9.2 20.8-16.6 41.1-22.2 60.6-9.9-3.1-19.3-6.5-28-10.2zM310 490c-13.6-7.8-19.5-37.5-14.9-75.7 1.1-9.4 2.9-19.3 5.1-29.4 19.6 4.8 41 8.5 63.5 10.9 13.5 18.5 27.5 35.3 41.6 50-32.6 30.3-63.2 46.9-84 46.9-4.5-.1-8.3-1-11.3-2.7zm237.2-76.2c4.7 38.2-1.1 67.9-14.6 75.8-3 1.8-6.9 2.6-11.5 2.6-20.7 0-51.4-16.5-84-46.6 14-14.7 28-31.4 41.3-49.9 22.6-2.4 44-6.1 63.6-11 2.3 10.1 4.1 19.8 5.2 29.1zm38.5-66.7c-8.6 3.7-18 7-27.7 10.1-5.7-19.6-13.2-40-22.5-60.9 9.2-20.8 16.6-41.1 22.2-60.6 9.9 3.1 19.3 6.5 28.1 10.2 35.4 15.1 58.3 34.9 58.3 50.6-.1 15.7-23 35.6-58.4 50.6zM320.8 78.4z"/>
-        <circle cx="420.9" cy="296.5" r="45.7"/>
-        <path d="M520.5 78.1z"/>
-    </g>
-</svg>
diff --git a/src/routes.js b/src/routes/routes.js
similarity index 66%
rename from src/routes.js
rename to src/routes/routes.js
index d406445..03a6744 100644
--- a/src/routes.js
+++ b/src/routes/routes.js
@@ -5,10 +5,10 @@
 import React from 'react';
 import { Router, Route } from 'react-router';
 
-import App from './app';
-import About from './about';
-import Main from './main';
-import NotFound from './notfound';
+import App from '../lib/containers/Module'
+import About from '../lib/components/AboutPage';
+import Main from '../lib/containers/AppShell';
+import NotFound from '../lib/components/NotFoundPage';
 
 const Routes = (props) => (
   <Router {...props}>