added ASF related information
diff --git a/.gitignore b/.gitignore
index 0a50e32..2ea2e7a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+.idea
+*.iml
 *.bak
 *~
-_site/
+_site
diff --git a/.idea/sbt.xml b/.idea/sbt.xml
deleted file mode 100644
index 877c407..0000000
--- a/.idea/sbt.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ScalaSbtSettings">
-    <option name="customLauncherEnabled" value="true" />
-    <option name="customLauncherPath" value="$USER_HOME$/sbt/bin/sbt-launch.jar" />
-    <option name="vmParameters" value="-XX:MaxPermSize=384M -Dhttps.proxyHost=child-prc.intel.com -Dhttps.proxyPort=913 -Dhttp.proxyHost=child-prc.intel.com -Dhttp.proxyPort=913 -Dsbt.ivy.home=/home/xzhong10/.ivy2/ -Duser.home=/home/xzhong10/" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
deleted file mode 100644
index e96534f..0000000
--- a/.idea/uiDesigner.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Palette2">
-    <group name="Swing">
-      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
-      </item>
-      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
-        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
-        <initial-values>
-          <property name="text" value="Button" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="RadioButton" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="CheckBox" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="Label" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
-          <preferred-size width="-1" height="20" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
-      </item>
-    </group>
-  </component>
-</project>
\ No newline at end of file
diff --git a/_config.yml b/_config.yml
index 4c64ec9..f629d6a 100644
--- a/_config.yml
+++ b/_config.yml
@@ -15,6 +15,3 @@
 GEARPUMP_VERSION: 0.8.0
 SCALA_BINARY_VERSION: "2.11"
 SCALA_VERSION: "2.11.8"
-GEARPUMP_ISSUE_TRACKER_URL: https://github.com/gearpump/gearpump/issues
-GEARPUMP_GITHUB_URL: https://github.com/gearpump/gearpump
-GEARPUMP_EXAMPLES_URL: https://github.com/gearpump/gearpump-examples
diff --git a/_layouts/global.html b/_layouts/global.html
index 2f1605b..b49b7cc 100644
--- a/_layouts/global.html
+++ b/_layouts/global.html
@@ -7,7 +7,7 @@
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
   <meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1"/>
-  <title>{{ page.title }} - GEARPUMP {{site.GEARPUMP_VERSION}} Documentation</title>
+  <title>Apache Gearpump (Incubating): {{ page.title }}</title>
   {% if page.description %}
     <meta name="description" content="{{page.description | replace: 'GEARPUMP_VERSION', site.GEARPUMP_VERSION}}">
   {% endif %}
@@ -36,7 +36,7 @@
 </head>
 <body>
   <!--[if lt IE 7]>
-    <p class="chromeframe">You are using an outdated browser. <a href="http://browsehappy.com/">Upgrade your browser today</a> or <a href="http://www.google.com/chromeframe/?redirect=true">install Google Chrome Frame</a> to better experience this site.</p>
+    <p class="chromeframe">You are using an outdated browser. <a href="http://browsehappy.com/">Upgrade your browser today</a> or <a href="http://www.google.com/chromeframe/?redirect=true">install Google Chrome Frame</a> to better experience this site.</p>l
   <![endif]-->
 
   <div class="navbar navbar-inverse navbar-fixed-top" id="topbar">
@@ -48,38 +48,49 @@
           <span class="icon-bar"></span>
           <span class="icon-bar"></span>
         </button>
-        <a class="navbar-brand" href="/">Gearpump</a>
+        <a class="navbar-brand" href="/">Apache Gearpump (incubating)</a>
       </div>
       <div id="navbar" class="collapse navbar-collapse">
         <ul class="nav navbar-nav">
-          <li><a href="index.html">Overview</a></li>
-
+          <li><a href="overview.html">Overview</a></li>
           <li class="dropdown">
-            <a href="#" class="dropdown-toggle" data-toggle="dropdown">Documentation<b class="caret"></b></a>
+            <a href="#" class="dropdown-toggle" data-toggle="dropdown">Docs<b class="caret"></b></a>
             <ul class="dropdown-menu">
               <li><a href="releases/latest/index.html">Latest Release ({{site.GEARPUMP_VERSION}})</a></li>
               <li><a href="usecases.html">Use Cases</a></li>
-              <!--
-              <li><a href="roadmap.html">Roadmap</a></li>
-              -->
               <li class="divider"></li>
               <li><a href="publications.html">Publications</a></li>
             </ul>
           </li>
-
+          <li><a href="downloads.html">Downloads</a></li>
+          <li><a href="faq.html">FAQ</a></li>
           <li class="dropdown">
             <a href="#" class="dropdown-toggle" data-toggle="dropdown">Community<b class="caret"></b></a>
             <ul class="dropdown-menu">
-              <li><a href="https://groups.google.com/forum/#!forum/gearpump-user">Mailing List</a></li>
+              <li class="dropdown-header">Community</li>
+              <li><a href="community.html#mailing-lists">Mailing Lists</a></li>
+              <li><a href="community.html#issue-tracker">Issue Tracker</a></li>
+              <li><a href="community.html#source-code-repositories">Source Code Repositories</a></li>
+              <li><a href="community.html#who-we-are">Who We Are</a></li>
+              <li><a href="https://twitter.com/ApacheGearpump" target="_blank">Follow us on Twitter</a></li>
+              <li class="divider"></li>
+              <li class="dropdown-header">Contribute</li>
               <li><a href="how-to-contribute.html">How to Contribute</a></li>
               <li><a href="coding-style.html">Coding Style</a></li>
-              <li class="divider"></li>
-              <li><a href="faq.html">FAQ</a></li>
-              <li><a href="about.html">About</a></li>
             </ul>
           </li>
+        </ul>
 
-          <li><a href="download.html">Download</a></li>
+        <ul class="nav navbar-nav">
+          <li class="dropdown">
+            <a href="#" class="dropdown-toggle" data-toggle="dropdown">ASF<b class="caret"></b></a>
+            <ul class="dropdown-menu">
+              <li><a href="license.html">License</a></li>
+              <li><a href="//apache.org/foundation/how-it-works.html" target="_blank">How Apache Works</a></li>
+              <li><a href="//apache.org/foundation" target="_blank">Foundation</a></li>
+              <li><a href="//www.apache.org/foundation/sponsorship.html" target="_blank">Sponsoring Apache</a></li>
+            </ul>
+          </li>
         </ul>
 
 <a class="ribbon hidden-xs" href="//github.com/gearpump/gearpump"><img src="img/forkme_right_red_aa0000.png" alt="Fork me on GitHub"/></a>
@@ -88,7 +99,7 @@
     </div>
   </div>
 
-  <div class="container" id="content">
+  <div class="container" id="content" style="margin-bottom: 50px">
    {% if page.displayTitle %}
     <h1 class="title">{{ page.displayTitle }}</h1>
    {% else %}
@@ -96,9 +107,18 @@
    {% endif %}
 
    {{ content }}
-
   </div> <!-- /container -->
 
+  <footer class="navbar navbar-default navbar-fixed-bottom">
+    <div class="container text-center" style="padding: 14px 0 10px 0; line-height: 150%">
+      <p class="text-muted">
+        Copyright © 2016 <a href="//apache.org" target="_blank">The Apache Software Foundation</a>.
+        All Rights Reserved.<br/>
+        Apache and the Apache feather logo are trademarks of The Apache Software Foundation.
+      </p>
+    </div>
+  </footer>
+
   <script src="js/vendor/jquery-2.1.4.min.js"></script>
   <script src="js/vendor/bootstrap-3.3.5.min.js"></script>
   <script src="js/vendor/anchor-1.1.1.min.js"></script>
diff --git a/about.md b/about.md
deleted file mode 100644
index a4f3ebf..0000000
--- a/about.md
+++ /dev/null
@@ -1,34 +0,0 @@
----
-layout: global
-title: About
----
-### Who are we?
-
-We are a group of streaming guys from Intel.
-
-### User List
-
-We have a user mail list at: [User Mail List](https://groups.google.com/forum/#!forum/gearpump-user)
-
-### Submit an issue
-
-Please submit new issue to [https://github.com/gearpump/gearpump/issues](https://github.com/gearpump/gearpump/issues)
-
-### Make code contribution
-
-Contributions are warmly welcome! To contribute to Gearpump source code, please make a PR against [https://github.com/gearpump/gearpump/pulls](https://github.com/gearpump/gearpump/pulls)
-
-To contribute to the contents in this site, make a PR to [https://github.com/gearpump/gearpump.github.io](https://github.com/gearpump/gearpump.github.io)
-
-### More Technical Support
-
-For business cooperation and support, please contact <xiang.zhong@intel.com> <kam.d.kasravi@intel.com> <weihua.jiang@intel.com>
-
-### License
-
-The source tree under [http://github.com/gearpump/gearpump](http://github.com/gearpump/gearpump) is
-Licensed under the Apache License, Version 2.0: http://www.apache.org/licenses/LICENSE-2.0
-
-### Acknowledgement
-
-The netty transport code work is based on [Apache Storm](http://storm.apache.org/). Thanks Apache Storm contributors.
diff --git a/community.md b/community.md
new file mode 100644
index 0000000..0e556b0
--- /dev/null
+++ b/community.md
@@ -0,0 +1,80 @@
+---
+layout: global
+title: Community
+---
+
+There are many ways to get help from the Apache Gearpump community. The mailing lists are the primary place where all Gearpump committers are present. These are the mailing lists that have been established for this project. For each list, there is a subscribe, unsubscribe and an archives link. Report bugs and submit feature requests can either be discussed on dev mailing list or on JIRA. Those interested in contributing to Gearpump should check out the [contribution guide](how-to-contribute.html) section.
+
+
+## Mailing Lists
+
+{: .table .table-striped }
+| Name | Subscribe | Unsubscribe | Post | Archives |
+| ---- | --------- | ----------- | ---- | -------- |
+| User support and questions mailing list<br>**user**@gearpump.incubator.apache.org | [Subscribe](mailto:user-subscribe@gearpump.incubator.apache.org?subject=Subscribe) | [Unsubscribe](mailto:user-unsubscribe@gearpump.incubator.apache.org?subject=Unsubscribe) | [Compose](mailto:user@gearpump.incubator.apache.org) | [View Online](http://mail-archives.apache.org/mod_mbox/incubator-gearpump-user/) | 
+| Development related discussions<br>**dev**@gearpump.incubator.apache.org | [Subscribe](mailto:dev-subscribe@gearpump.incubator.apache.org?subject=Subscribe) | [Unsubscribe](mailto:dev-unsubscribe@gearpump.incubator.apache.org?subject=Unsubscribe) | [Compose](mailto:dev@gearpump.incubator.apache.org) | [View Online](http://mail-archives.apache.org/mod_mbox/incubator-gearpump-dev/) |
+| All commits to the repository<br>**commits**@gearpump.incubator.apache.org | [Subscribe](mailto:commits-subscribe@gearpump.incubator.apache.org?subject=Subscribe) | [Unsubscribe](mailto:commits-unsubscribe@gearpump.incubator.apache.org?subject=Unsubscribe) | N/A | [View Online](http://mail-archives.apache.org/mod_mbox/incubator-gearpump-commits/) |
+
+## Issue Tracker
+
+We use [JIRA](https://issues.apache.org/jira/browse/GEARPUMP) to track all code related issues. All issue activity is also mirrored to the issues mailing list.
+
+## Source Code Repositories
+
+Main source repositories:
+
+* **ASF writable**: https://git-wip-us.apache.org/repos/asf/incubator-gearpump.git
+* **ASF read-only**: git://git.apache.org/repos/asf/incubator-gearpump.git
+* **GitHub mirror**: https://github.com/apache/incubator-gearpump.git
+
+Website repositories:
+
+* **ASF writable**: https://git-wip-us.apache.org/repos/asf/incubator-gearpump-site.git
+* **ASF read-only**: git://git.apache.org/repos/asf/incubator-gearpump-site.git
+* **GitHub mirror**: https://github.com/apache/incubator-gearpump-site.git
+
+## Who We Are
+
+A successful project requires many people to play many roles. Some members write code or documentation, while others are valuable as testers, submitting patches and suggestions. 
+
+The team is comprised of Members and Contributors. Members have direct access to the source of a project and actively evolve the code-base. Contributors improve the project through submission of patches and suggestions to the Members. The number of Contributors to the project is unbounded. Get involved today. All contributions to the project are greatly appreciated. 
+
+### Gearpump Committers
+
+The following people with commit privileges that have directly contributed to the project in one way or another.
+
+{: .table .table-striped }
+| Name | Roles | Apache ID |
+| ---- | ----- | --------- | 
+| Xiang Zhong | Committer | seanzhong |
+| Tianlun Zhang | Committer | mauzhang |
+| Qian Xu | Committer | qxu |
+| Huafeng Wang | Committer | huafengw | 
+| Kam Kasravi | Committer | kamkasravi | 
+| Weihua Jiang | Committer | whjiang | 
+| Tomasz Targonski | Committer | tomasztargonski |
+| Karol Brejna | Committer | karolbrejna | 
+| Gang Wang | Committer | garyw | 
+| Mark Chmarny | Committer | mchmarny | 
+| Xinglang Wang | Committer | xinglang | 
+| Lan Wang | Committer | lanwang | 
+| Jianzhong Chen | Committer | centiteo | 
+| Xuefu Zhang | Committer | xuefu | 
+| Rui Li | Committer | lirui | 
+
+You can reach individual directly at `<apache-id>@apache.org`. 
+
+### Mentors
+
+The following people are very kind to mentor the incubating project.
+
+{: .table .table-striped }
+| Name | Roles | Apache ID |
+| ---- | ---- | --------- | 
+| Andrew Purtell | PPMC, Mentor | apurtell | 
+| Jarek Jarcec Cecho | PPMC, Mentor | jarcec |
+| Todd Lipcon | PPMC, Mentor | todd |
+| Xuefu Zhang | Apache Member, Mentor | xuefu |
+| Reynold Xin | PPMC, Mentor | rxin |
+
+You can reach individual directly at `<apache-id>@apache.org`. 
diff --git a/css/main.css b/css/main.css
index af70fb3..623a572 100644
--- a/css/main.css
+++ b/css/main.css
@@ -28,18 +28,18 @@
 }
 
 h1 {
-  font-size: 28px;
-  margin-top: 12px;
+  font-size: 24px;
+  margin-top: 20px;
 }
 
 h2 {
-  font-size: 24px;
-  margin-top: 12px;
+  font-size: 20px;
+  margin-top: 18px;
 }
 
 h3 {
-  font-size: 21px;
-  margin-top: 10px;
+  font-size: 16px;
+  margin-top: 16px;
 }
 
 .container {
@@ -63,8 +63,9 @@
  * Made the navigation bar buttons not grey out when clicked.
  * Essentially making nav bar buttons not react to clicks, only hover events.
  */
+.navbar .nav li.dropdown:hover,
 .navbar .nav li.dropdown.open > .dropdown-toggle {
-  background-color: transparent;
+  background-color: #052c46;
 }
 
 /**
@@ -102,9 +103,9 @@
 
 pre, pre > *,
 code, code > * {
-  font-family: "roboto mono",monaco,consolas,menlo,"Lucida Console",monospace !important;
+  font-family: "roboto mono",monaco,consolas,menlo,"Lucida Console",monospace;
   font-size: 12px;
-  font-weight: normal !important;
+  font-weight: 400 !important;
   line-height: 165%;
 }
 
@@ -121,3 +122,7 @@
   right: 0;
   border: 0;
 }
+
+table {
+  padding: 10px 10px 10px 10px;
+}
diff --git a/download.md b/download.md
deleted file mode 100644
index 974a3d2..0000000
--- a/download.md
+++ /dev/null
@@ -1,13 +0,0 @@
----
-layout: global
-title: Downloads
----
-
-### [{{ site.GEARPUMP_VERSION }} Source Tree ](https://github.com/gearpump/gearpump/tree/{{ site.GEARPUMP_VERSION }})
-
-### [{{ site.GEARPUMP_VERSION }} Release Notes](https://github.com/gearpump/gearpump/releases)
-
-### Build For Scala 2.11
-[![Scala 2.11 Build](img/download.jpg)](https://github.com/gearpump/gearpump/releases/download/{{ site.GEARPUMP_VERSION }}/gearpump-2.11-{{ site.GEARPUMP_VERSION }}.zip)
-
-*Note that as we have upgraded the Akka library to 2.4.x, which has dropped the Scala 2.10 support, we do NOT provide Gearpump build for Scala 2.10 since Gearpump 0.8.0.* 
diff --git a/downloads.md b/downloads.md
new file mode 100644
index 0000000..a0dc765
--- /dev/null
+++ b/downloads.md
@@ -0,0 +1,133 @@
+---
+layout: global
+---
+
+## Downloads
+
+### Latest Stable Release (v{{ site.GEARPUMP_VERSION }}) 
+
+[Release Notes](https://github.com/gearpump/gearpump/releases)
+
+* [Binary (for Scala 2.11)](https://github.com/gearpump/gearpump/releases/download/{{ site.GEARPUMP_VERSION }}/gearpump-2.11-{{ site.GEARPUMP_VERSION }}.zip)
+* [Source code (.zip)](https://github.com/gearpump/gearpump/archive/{{ site.GEARPUMP_VERSION }}.zip)
+* [Source code (.tar.gz)](https://github.com/gearpump/gearpump/archive/{{ site.GEARPUMP_VERSION }}.tar.gz)
+
+*Note that as we have upgraded the Akka library to 2.4.x, which has dropped the Scala 2.10 support, we do NOT provide Gearpump build for Scala 2.10 since Gearpump 0.8.0.* 
+
+## Maven Dependencies
+
+To program against this version, you need to add below artifact dependencies to your application's Maven setting:
+
+{% highlight xml %}
+<dependencies>
+  <dependency>
+    <groupId>com.github.intel-hadoop</groupId>
+    <artifactId>gearpump-core_2.11</artifactId>
+    <version>{{ site.GEARPUMP_VERSION }}</version>
+  </dependency>
+  <dependency>
+    <groupId>com.github.intel-hadoop</groupId>
+    <artifactId>gearpump-streaming_2.11</artifactId>
+    <version>{{ site.GEARPUMP_VERSION }}</version>
+  </dependency>
+</dependencies>
+{% endhighlight %}
+
+To ensure above dependencies resolved, you will need to add the following repositories as well.
+
+{% if site.GEARPUMP_VERSION contains "SNAPSHOT" %}
+{% highlight xml %}
+<repositories>
+  <repository>
+    <id>sonatype-nexus-releases</id>
+    <name>Sonatype Nexus Snapshots</name>
+    <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+  </repository>
+  <repository>
+    <id>releases-oss.sonatype.org</id>
+    <name>Sonatype Releases Repository</name>
+    <url>http://oss.sonatype.org/content/repositories/releases/</url>
+  </repository>
+  <repository>
+    <id>akka-data-replication</id>
+    <name>Patrik at Bintray</name>
+    <url>http://dl.bintray.com/patriknw/maven</url>
+  </repository>
+  <repository>
+    <id>cloudera</id>
+    <name>Cloudera repo</name>
+    <url>https://repository.cloudera.com/artifactory/cloudera-repos</url>
+  </repository>
+  <repository>
+    <id>vincent</id>
+    <name>vincent</name>
+    <url>http://dl.bintray.com/fvunicorn/maven</url>
+  </repository>
+  <repository>
+    <id>non</id>
+    <name>non</name>
+    <url>http://dl.bintray.com/non/maven</url>
+  </repository>
+  <repository>
+    <id>maven-repo</id>
+    <name>maven-repo</name>
+    <url>http://repo.maven.apache.org/maven2</url>
+  </repository>
+  <repository>
+    <id>maven1-repo</id>
+    <name>maven1-repo</name>
+    <url>http://repo1.maven.org/maven2</url>
+  </repository>
+  <repository>
+    <id>maven2-repo</id>
+    <name>maven2-repo</name>
+    <url>http://mvnrepository.com/artifact</url>
+  </repository>
+</repositories>
+{% endhighlight %}
+{% else %}
+{% highlight xml %}
+<repositories>
+  <repository>
+    <id>releases-oss.sonatype.org</id>
+    <name>Sonatype Releases Repository</name>
+    <url>http://oss.sonatype.org/content/repositories/releases/</url>
+  </repository>
+  <repository>
+    <id>akka-data-replication</id>
+    <name>Patrik at Bintray</name>
+    <url>http://dl.bintray.com/patriknw/maven</url>
+  </repository>
+  <repository>
+    <id>cloudera</id>
+    <name>Cloudera repo</name>
+    <url>https://repository.cloudera.com/artifactory/cloudera-repos</url>
+  </repository>
+  <repository>
+    <id>vincent</id>
+    <name>vincent</name>
+    <url>http://dl.bintray.com/fvunicorn/maven</url>
+  </repository>
+  <repository>
+    <id>non</id>
+    <name>non</name>
+    <url>http://dl.bintray.com/non/maven</url>
+  </repository>
+  <repository>
+    <id>maven-repo</id>
+    <name>maven-repo</name>
+    <url>http://repo.maven.apache.org/maven2</url>
+  </repository>
+  <repository>
+    <id>maven1-repo</id>
+    <name>maven1-repo</name>
+    <url>http://repo1.maven.org/maven2</url>
+  </repository>
+  <repository>
+    <id>maven2-repo</id>
+    <name>maven2-repo</name>
+    <url>http://mvnrepository.com/artifact</url>
+  </repository>
+</repositories>
+{% endhighlight %}
+{% endif %}
diff --git a/faq.md b/faq.md
index 6a7e09a..e9e4d9d 100644
--- a/faq.md
+++ b/faq.md
@@ -1,34 +1,59 @@
 ---
 layout: global
 displayTitle: Frequently Asked Questions
-title: faq
-description: Gearpump Frequently Asked Questions
+title: FAQ
 ---
 
-##### What's Relation between Gearpump and YARN?
-Gearpump can run on top of YARN as a YARN application. Gearpump's ApplicationMaster provides the application management , deployment and scheduling of DAG's after arbitrating and receiving container resources from YARN
+The following questions are frequently asked with regard to the Gearpump project in general. If you have further questions, make sure to consult the documentation or feel free to ask the community.
 
-##### Relation with Storm and Spark Streaming
-Storm and spark streaming are proven platforms, there are many production deployments. Compared with them, Gearpump is not than proven and there is no production deployment yet. However, there is no single platform that can cover every use case; Gearpump has its own +1 points in some special fields. As an instance, for IOT use cases, Gearpump may be considered convenient because the topology can be deployed to edge device with feature of location transparency. For another example, when users want to upgrade the application online without service interruption, Gearpump may be suitable as it can dynamically modify the computation DAG on the fly. For other special use cases that are suitable for Gearpump, please check section [What is a good use case for Gearpump](usecases.html)
+{: .table .table-condensed .table-hover }
+|**[General](#general)**|
+| &nbsp; [Why we name it Gearpump?](#why-we-name-it-gearpump)|
+| &nbsp; [What's relationship between Gearpump and YARN?](#whats-relationship-between-gearpump-and-yarn)|
+| &nbsp; [Relation with Storm and Spark Streaming](#relation-with-storm-and-spark-streaming)|
+|**[Technical Internals](#technical-internals)**|
+| &nbsp; [Why not using Akka persistence to store the checkpoint file?](#why-not-using-akka-persistence-to-store-the-checkpoint-file)|
+| &nbsp; [Have you considered the Akka Stream API for the high level DSL?](#have-you-considered-the-akka-stream-api-for-the-high-level-dsl)|
+| &nbsp; [Why wrapping the Task, instead of using the Actor interface directly?](#why-wrapping-the-task-instead-of-using-the-actor-interface-directly)|
+| &nbsp; [Why does my task has an extremely high message latency (e.g. 10 seconds)?](#why-does-my-task-has-an-extremely-high-message-latency-eg-10-seconds-)|
+|**[Errors](#errors)**|
+| &nbsp; [Why I cannot open the Dashboard, even if the Services process has been launched successfully?](#why-i-cannot-open-the-dashboard-even-if-the-services-process-has-been-launched-successfully)|
 
-##### Why we name it Gearpump?
+## General 
+
+### Why we name it Gearpump?
 
 The name Gearpump is a reference the engineering term "Gear Pump", which is a super simple pump that consists of only two gears, but is very powerful at streaming water from left to right.
 
-##### Why not using akka persistence to store the checkpoint file?
+### What's relationship between Gearpump and YARN?
+Gearpump can run on top of YARN as a YARN application. Gearpump's Application Master provides the application management, deployment and scheduling of DAG's after arbitrating and receiving container resources from YARN.
 
-1. We only checkpoint file to disk when necessary.(not record level)
-2. We have custom checkpoint file format
+### Relation with Storm and Spark Streaming
+Storm and Spark Streaming are proven platforms. There are many production deployments. Compared with them, Gearpump is not than proven and there is no production deployment yet. However, there is no single platform that can cover every use case. Gearpump has its own +1 points in some unique use cases. For instance, for the IOT use cases, Gearpump may be considered convenient because the topology can be deployed to edge device with feature of location transparency. For another example, when users want to upgrade the application online without service interruption, Gearpump may be suitable as it can dynamically modify the computation DAG on the fly. To explore more good use cases that are suitable for Gearpump, please check the section [What is a good use case for Gearpump](usecases.html).
 
-##### Have you considered the akka stream API for the high level DSL?
+### Why not using Akka persistence to store the checkpoint file?
 
-We are looking into a hands of candidate for what a good DSL should be. Akka stream API is one of the candidates.
+1. We only checkpoint file to disk when necessary, not at record level.
+2. We have custom checkpoint file format.
 
-##### Why wrapping the Task, instead of using the Actor interface directly?
+### Have you considered the Akka Stream API for the high level DSL?
 
-1. It is more easy to conduct Unit test
+We are looking into a hands of candidate for what a good DSL should be. Akka Stream API is one of the candidates.
+
+### Why wrapping the Task, instead of using the Actor interface directly?
+
+1. It is more easy to conduct Unit test.
 2. We have custom logic and messages to ensure the data consistency, like flow control, like message loss detection.
-3. As the Gearpump interface evolves rapidly. for now, we want to conservative in exposing more powerful functions so that we doesn't tie our hands for future refactory, it let us feel safe.
+3. As the Gearpump interface evolves rapidly. For now, we want to conservative in exposing more powerful functions so that we doesn't tie our hands for future refactoring, it provides a great flexibility.
 
-##### What is the open source plan for this project?
-The ultimate goal is to make it an Apache project.
+### Why does my task has an extremely high message latency (e.g. 10 seconds) ?
+
+Please check whether you are doing blocking jobs (e.g. sleep, IO) in your task. By default, all tasks in an executor share a thread pool. The blocking tasks could use up all the threads while other tasks don't get a chance to run. In that case, you can set `gearpump.task-dispatcher` to `"gearpump.single-thread-dispatcher"` in `gear.conf` such that a unique thread is dedicated to each task.
+
+Generally, we recommend use the default `share-thread-pool-dispatcher` which has better performance and only turn to the `single-thread-dispatcher` when you have to.
+
+## Errors
+
+### Why I cannot open the Dashboard, even if the Services process has been launched successfully?
+
+By default, our Services process binds to a local **IPv6 port**. It's possible that another process on your system has already taken up the same **IPv4 port**. You may check by `lsof -i -P | grep -i "Listen"` if your system is Unix/Linux.
diff --git a/how-to-contribute.md b/how-to-contribute.md
index 4c15aaf..9afa23b 100644
--- a/how-to-contribute.md
+++ b/how-to-contribute.md
@@ -3,46 +3,44 @@
 title: How to contribute
 ---
 
-
-## Contributions Welcome!
 Gearpump is developed by an open and friendly community. Everybody is cordially welcome to join the community and contribute to Gearpump. There are several ways to interact with the community and to contribute to Gearpump including asking questions, filing bug reports, implementing new use cases, proposing new features, joining discussions on the mailing lists, contributing code or documentation, improving the website, or testing release candidates.
 
-### Ask questions!
+## Ask questions!
 
-The Gearpump community is eager to help and to answer your questions. We have a [user mailing list](https://groups.google.com/forum/#!forum/gearpump-user).
+The Gearpump community is eager to help and to answer your questions. Please subscribe the [user mailing list](mailto:user-subscribe@gearpump.incubator.apache.org?subject=Subscribe).
 
-### File a bug report
+## File a bug report
 
-Please let us know if you experienced a problem with Gearpump and file a bug report. Open [Gearpump’s Issue Tracker](https://github.com/gearpump/gearpump/issues) and click on the green *New Issue* button at the top right. Please give detailed information about the problem you encountered and, if possible, add a description that helps to reproduce the problem. Thank you very much.
+Please let us know if you experienced a problem with Gearpump and file a bug report. Open the [Issue Tracker](https://issues.apache.org/jira/browse/GEARPUMP) and click on the *New Issue* link. Please give detailed information about the problem you encountered and, if possible, add a description that helps to reproduce the problem. Thank you very much.
 
-### Propose an improvement or a new feature
+## Propose an improvement or a new feature
 
-Our community is constantly looking for feedback to improve Gearpump. If you have an idea how to improve Gearpump or have a new feature in mind that would be beneficial for Gearpump users, please open an issue in [Gearpump’s Issue Tracker](https://github.com/gearpump/gearpump/issues). The improvement or new feature should be described in appropriate detail and include the scope and its requirements if possible. Detailed information is important for a few reasons:
+Our community is constantly looking for feedback to improve Gearpump. If you have an idea how to improve Gearpump or have a new feature in mind that would be beneficial for Gearpump users, please open an issue in the [Issue Tracker](https://issues.apache.org/jira/browse/GEARPUMP). The improvement or new feature should be described in appropriate detail and include the scope and its requirements if possible. Detailed information is important for a few reasons:
 
 * It ensures your requirements are met when the improvement or feature is implemented.
 * It helps to estimate the effort and to design a solution that addresses your needs.
 * It allow for constructive discussions that might arise around this issue.
 * Detailed information is also required, if you plan to contribute the improvement or feature you proposed yourself. Please read the Contribute code guide in this case as well.
 
-### Test a release candidate
+## Test a release candidate
 
 Gearpump is continuously improved by its active community. Every few weeks, we release a new version of Gearpump with bug fixes, improvements, and new features. Release testing is a big effort if done by a small group of people but can be easily scaled out to more people. The Gearpump community encourages everybody to participate in the testing of a release candidate. By testing a release candidate, you can ensure that the next Gearpump release is working properly for your setup and help to improve the quality of releases.
 
-### Contribute code
+## Contribute code
 
 Gearpump is maintained, improved, and extended by code contributions of volunteers. The Gearpump community encourages anybody to contribute source code.
 
-### Looking for an issue to work on?
-We maintain a list of all known bugs, proposed improvements and suggested features in [Gearpump’s Issue Tracker](https://github.com/gearpump/gearpump/issues). Please have a look at the list, if you are looking for an issue to work on. Feel free to ask questions about issues that you would be interested in working on.
+## Looking for an issue to work on?
+We maintain a list of all known bugs, proposed improvements and suggested features in the [Issue Tracker](https://issues.apache.org/jira/browse/GEARPUMP). Please have a look at the list, if you are looking for an issue to work on. Feel free to ask questions about issues that you would be interested in working on.
 
-### Contribute documentation
+## Contribute documentation
 
 Good documentation is crucial for any kind of software. This is especially true for sophisticated software systems such as distributed data processing engines like Gearpump. The Gearpump community aims to provide concise, precise, and complete documentation and welcomes any contribution to improve Gearpump’s documentation.
 
 Please report missing, incorrect, or out-dated documentation as an issue.
 Gearpump’s documentation is written in Markdown and located in the `docs` folder in Gearpump’s source code repository.
 
-### Improve the website
+## Improve the website
 
 The Gearpump website presents Gearpump and its community. It serves several purposes including:
 
@@ -52,14 +50,13 @@
 
 We welcome any contribution to improve our website.
 
-Please open an issue at [Gearpump Website Issue Tracker](https://github.com/gearpump/gearpump.github.io/issues) if you think our website could be improved.
+Please open an issue at the [Issue Tracker](https://issues.apache.org/jira/browse/GEARPUMP) if you think our website could be improved.
 
 
-### More ways to contribute…
+## More ways to contribute
 
 There are many more ways to contribute to the Gearpump community. For example you can
 
-* give a talk about Gearpump and tell others how you use it.
-* organize a local Meetup or user group.
-* talk to people about Gearpump.
-* …
+* Give a talk about Gearpump and tell others how you use it.
+* Organize a local Meetup or user group.
+* Talk to people about Gearpump.
diff --git a/license.md b/license.md
new file mode 100644
index 0000000..5ce945b
--- /dev/null
+++ b/license.md
@@ -0,0 +1,214 @@
+---
+layout: global
+title: License
+displayTitle: Project License
+---
+
+The project is licensed under Apache License 2.0.
+
+```
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+```
+
+Here is the [full license statement](http://gearpump.io/LICENSE) for all its dependencies.
diff --git a/overview.md b/overview.md
index f47b4fe..c011a80 100644
--- a/overview.md
+++ b/overview.md
@@ -1,43 +1,26 @@
 ---
 layout: global
-displayTitle: Gearpump Overview
+displayTitle: Apache Gearpump
 title: Overview 
-description: Gearpump GEARPUMP_VERSION documentation homepage
+description: Apache Gearpump GEARPUMP_VERSION documentation homepage
 ---
-[![Release](https://img.shields.io/badge/Latest%20Release-v{{ site.GEARPUMP_VERSION }}-blue.svg)](http://www.gearpump.io/download.html)   [![Demo site](https://img.shields.io/badge/Demo%20Site-online-green.svg)](http://demo.gearpump.io)
+[![Release](https://img.shields.io/badge/Latest%20Release-v{{ site.GEARPUMP_VERSION }}-blue.svg)](http://www.gearpump.io/downloads.html) [![Demo site](https://img.shields.io/badge/Demo%20Site-click%20to%20visit-green.svg)](http://demo.gearpump.io)
 
-Gearpump is a real-time big data streaming engine.
-It is inspired by recent advances in the [Akka](http://akka.io/) framework and a desire to improve on existing streaming frameworks.
-Gearpump is event/message based and featured as low latency handling, high performance, exactly once semantics,
-dynamic topology update, [Apache Storm](https://storm.apache.org/) compatibility, etc.
+**Apache Gearpump** is a real-time big data streaming engine. The name Gearpump is a reference to the engineering term "gear pump" which is a super simple pump that consists of only two gears, but is very powerful at streaming water. Different to other streaming engines, Gearpump's engine is event/message based. Per initial benchmarks we are able to process 18 million messages per second (message length is 100 bytes) with a 8ms latency on a 4-node cluster. 
 
-![logo](img/logo2.png)
+![Logo](img/logo2.png)
 
-The	name	Gearpump	is	a	reference to	the	engineering term "gear	pump,"	which	is	a	super simple
-pump	that	consists of	only	two	gears,	but	is	very	powerful at	streaming water.
+## The Highlights
 
-![UI](/img/dashboard.gif)
+* Extremely high throughput and low latency stream processing
+* Configurable message delivery guarantee (at least once, exactly once)
+* Application hot re-deployment
+* Comprehensive Dashboard for application monitoring
+* Native Storm Application compatibility
+* Native Samoa Application compatibility
+* Friendly and extensible APIs
 
-### Gearpump Technical Highlights
-Gearpump is a modern big data real-time streaming engine which has many unique features:
+## Getting Started
 
-* Extremely high performance
-* Low latency
-* Configurable message delivery guarantee (at least once, exactly once).
-* Highly extensible
-* Dynamic DAG
-* Storm compatibility
-* Samoa compatibility
-* widely IoT connectivity
-* Both high level and low level API
-
-
-### Gearpump Performance
-Per initial benchmarks we are able to process 18 million messages/second (100 bytes per message) with a 8ms latency on a 4-node cluster.
-
-![bashboard](img/dashboard.png)
-
-### Gearpump and Akka
-Gearpump is a 100% Akka based platform. We model big data streaming within the Akka actor hierarchy.
-![arctor hierarchy](img/actor_hierarchy.png)
-Gearpump
+* Download [the latest stable release](downloads.html) and run Gearpump on your machine
+* Checkout [the documentation](releases/latest/index.html) to find a setup guide for all deployment options
\ No newline at end of file