http://git-wip-us.apache.org/repos/asf/incubator-beam-site/blob/61ba656f/content/beam/capability/2016/03/17/capability-matrix.html
----------------------------------------------------------------------
diff --git a/content/beam/capability/2016/03/17/capability-matrix.html 
b/content/beam/capability/2016/03/17/capability-matrix.html
index d274fc7..d9ec070 100644
--- a/content/beam/capability/2016/03/17/capability-matrix.html
+++ b/content/beam/capability/2016/03/17/capability-matrix.html
@@ -48,78 +48,71 @@
     <div id="navbar" class="navbar-collapse collapse">
       <ul class="nav navbar-nav">
         <li class="dropdown">
-                 <a href="#" class="dropdown-toggle" data-toggle="dropdown" 
role="button" aria-haspopup="true" aria-expanded="false">Use <span 
class="caret"></span></a>
+                 <a href="#" class="dropdown-toggle" data-toggle="dropdown" 
role="button" aria-haspopup="true" aria-expanded="false">Get Started <span 
class="caret"></span></a>
                  <ul class="dropdown-menu">
-                         <li><a href="/use">User Hub</a></li>
-                         <li role="separator" class="divider"></li>
-                         <li class="dropdown-header">General</li>
-                         <li><a href="/use/beam-overview/">Beam 
Overview</a></li>
-                         <li><a href="/use/quickstart/">Quickstart</a></li>
-                         <li><a href="/use/releases">Release 
Information</a></li>
+                         <li><a href="/get-started/beam-overview/">Beam 
Overview</a></li>
+              <li><a href="/get-started/quickstart/">Quickstart</a></li>
                          <li role="separator" class="divider"></li>
                          <li class="dropdown-header">Example Walkthroughs</li>
-                         <li><a 
href="/use/wordcount-example/">WordCount</a></li>
-                         <li><a href="/use/walkthroughs/">Mobile 
Gaming</a></li>
-                         <li role="separator" class="divider"></li>
-                         <li class="dropdown-header">Support</li>
-                         <li><a href="/use/mailing-lists/">Mailing 
Lists</a></li>
-              <li><a href="/use/issue-tracking/">Issue Tracking</a></li>
-                         <li><a 
href="http://stackoverflow.com/questions/tagged/apache-beam";>Beam on 
StackOverflow</a></li>
-              <li><a href="http://apachebeam.slack.com";>Beam Slack 
Channel</a></li>
+                         <li><a 
href="/get-started/wordcount-example/">WordCount</a></li>
+                         <li><a 
href="/get-started/mobile-gaming-example/">Mobile Gaming</a></li>
+              <li role="separator" class="divider"></li>
+              <li class="dropdown-header">Resources</li>
+              <li><a href="/get-started/downloads">Downloads</a></li>
+              <li><a href="/get-started/releases">Release Notes</a></li>
+              <li><a href="/get-started/support">Support</a></li>
                  </ul>
            </li>
         <li class="dropdown">
-                 <a href="#" class="dropdown-toggle" data-toggle="dropdown" 
role="button" aria-haspopup="true" aria-expanded="false">Learn <span 
class="caret"></span></a>
+                 <a href="#" class="dropdown-toggle" data-toggle="dropdown" 
role="button" aria-haspopup="true" aria-expanded="false">Documentation <span 
class="caret"></span></a>
                  <ul class="dropdown-menu">
-                         <li><a href="/learn">Learner Hub</a></li>
+                         <li><a href="/documentation">Using the 
Documentation</a></li>
                          <li role="separator" class="divider"></li>
                          <li class="dropdown-header">Beam Concepts</li>
-                         <li><a href="/learn/programming-guide/">Programming 
Guide</a></li>
-                         <li><a 
href="/learn/presentation-materials/">Presentation Materials</a></li>
-                         <li><a href="/learn/resources/">Additional 
Resources</a></li>
+                         <li><a 
href="/documentation/programming-guide/">Programming Guide</a></li>
+                         <li><a href="/documentation/resources/">Additional 
Resources</a></li>
                          <li role="separator" class="divider"></li>
+              <li class="dropdown-header">Pipeline Fundamentals</li>
+              <li><a 
href="/documentation/pipelines/design-your-pipeline/">Design Your 
Pipeline</a></li>
+              <li><a 
href="/documentation/pipelines/create-your-pipeline/">Create Your 
Pipeline</a></li>
+              <li><a href="/documentation/pipelines/test-your-pipeline/">Test 
Your Pipeline</a></li>
+              <li role="separator" class="divider"></li>
                          <li class="dropdown-header">SDKs</li>
-                         <li><a href="/learn/sdks/java/">Java SDK</a></li>
-                         <li><a href="/learn/sdks/javadoc/">Java SDK API 
Reference</a></li>
+                         <li><a href="/documentation/sdks/java/">Java 
SDK</a></li>
+                         <li><a href="/documentation/sdks/javadoc/">Java SDK 
API Reference</a></li>
                          <li role="separator" class="divider"></li>
                          <li class="dropdown-header">Runners</li>
-                         <li><a 
href="/learn/runners/capability-matrix/">Capability Matrix</a></li>
-                         <li><a href="/learn/runners/direct/">Direct 
Runner</a></li>
-                         <li><a href="/learn/runners/flink/">Apache Flink 
Runner</a></li>
-                         <li><a href="/learn/runners/spark/">Apache Spark 
Runner</a></li>
-                         <li><a href="/learn/runners/dataflow/">Cloud Dataflow 
Runner</a></li>
+                         <li><a 
href="/documentation/runners/capability-matrix/">Capability Matrix</a></li>
+                         <li><a href="/documentation/runners/direct/">Direct 
Runner</a></li>
+                         <li><a href="/documentation/runners/flink/">Apache 
Flink Runner</a></li>
+                         <li><a href="/documentation/runners/spark/">Apache 
Spark Runner</a></li>
+                         <li><a href="/documentation/runners/dataflow/">Cloud 
Dataflow Runner</a></li>
                  </ul>
            </li>
         <li class="dropdown">
                  <a href="#" class="dropdown-toggle" data-toggle="dropdown" 
role="button" aria-haspopup="true" aria-expanded="false">Contribute <span 
class="caret"></span></a>
                  <ul class="dropdown-menu">
-                         <li><a href="/contribute">Contributor Hub</a></li>
-                         <li role="separator" class="divider"></li>
-                         <li class="dropdown-header">Basics</li>
-                         <li><a 
href="/contribute/contribution-guide/">Contribution Guide</a></li>
-                         <li><a href="/contribute/work-in-progress/">Work In 
Progress</a></li>
-                         <li><a href="/use/mailing-lists/">Mailing 
Lists</a></li>
-              <li><a href="/contribute/source-repository/">Source 
Repository</a></li>
-              <li><a href="/use/issue-tracking/">Issue Tracking</a></li>
-              <li role="separator" class="divider"></li>
-                         <li class="dropdown-header">Technical References</li>
-                         <li><a href="/contribute/testing/">Testing</a></li>
-              <li><a href="/contribute/design-principles/">Design 
Principles</a></li>
-                         <li><a href="https://goo.gl/nk5OM0";>Technical 
Vision</a></li>
+                         <li><a href="/contribute">Get Started 
Contributing</a></li>
         <li role="separator" class="divider"></li>
-                         <li class="dropdown-header">Committer Resources</li>
+        <li class="dropdown-header">Guides</li>
+                         <li><a 
href="/contribute/contribution-guide/">Contribution Guide</a></li>
+        <li><a href="/contribute/testing/">Testing Guide</a></li>
         <li><a href="/contribute/release-guide/">Release Guide</a></li>
+        <li role="separator" class="divider"></li>
+        <li class="dropdown-header">Technical References</li>
+        <li><a href="/contribute/design-principles/">Design Principles</a></li>
+                         <li><a href="/contribute/work-in-progress/">Ongoing 
Projects</a></li>
+        <li><a href="/contribute/source-repository/">Source 
Repository</a></li>      
+        <li role="separator" class="divider"></li>
+                         <li class="dropdown-header">Promotion</li>
+        <li><a href="/contribute/presentation-materials/">Presentation 
Materials</a></li>
+        <li><a href="/contribute/logos/">Logos and Design</a></li>
+        <li role="separator" class="divider"></li>
+        <li><a href="/contribute/team/">Team</a></li>
                  </ul>
            </li>
+
         <li><a href="/blog">Blog</a></li>
-        <li class="dropdown">
-          <a href="#" class="dropdown-toggle" data-toggle="dropdown" 
role="button" aria-haspopup="true" aria-expanded="false">Project<span 
class="caret"></span></a>
-          <ul class="dropdown-menu">
-            <li><a href="/project/logos/">Logos and design</a></li>
-            <li><a href="/project/public-meetings/">Public Meetings</a></li>
-                       <li><a href="/project/team/">Team</a></li>
-          </ul>
-        </li>
       </ul>
       <ul class="nav navbar-nav navbar-right">
         <li class="dropdown">

http://git-wip-us.apache.org/repos/asf/incubator-beam-site/blob/61ba656f/content/beam/capability/2016/04/03/presentation-materials.html
----------------------------------------------------------------------
diff --git a/content/beam/capability/2016/04/03/presentation-materials.html 
b/content/beam/capability/2016/04/03/presentation-materials.html
index 8f99554..550f4d7 100644
--- a/content/beam/capability/2016/04/03/presentation-materials.html
+++ b/content/beam/capability/2016/04/03/presentation-materials.html
@@ -48,78 +48,71 @@
     <div id="navbar" class="navbar-collapse collapse">
       <ul class="nav navbar-nav">
         <li class="dropdown">
-                 <a href="#" class="dropdown-toggle" data-toggle="dropdown" 
role="button" aria-haspopup="true" aria-expanded="false">Use <span 
class="caret"></span></a>
+                 <a href="#" class="dropdown-toggle" data-toggle="dropdown" 
role="button" aria-haspopup="true" aria-expanded="false">Get Started <span 
class="caret"></span></a>
                  <ul class="dropdown-menu">
-                         <li><a href="/use">User Hub</a></li>
-                         <li role="separator" class="divider"></li>
-                         <li class="dropdown-header">General</li>
-                         <li><a href="/use/beam-overview/">Beam 
Overview</a></li>
-                         <li><a href="/use/quickstart/">Quickstart</a></li>
-                         <li><a href="/use/releases">Release 
Information</a></li>
+                         <li><a href="/get-started/beam-overview/">Beam 
Overview</a></li>
+              <li><a href="/get-started/quickstart/">Quickstart</a></li>
                          <li role="separator" class="divider"></li>
                          <li class="dropdown-header">Example Walkthroughs</li>
-                         <li><a 
href="/use/wordcount-example/">WordCount</a></li>
-                         <li><a href="/use/walkthroughs/">Mobile 
Gaming</a></li>
-                         <li role="separator" class="divider"></li>
-                         <li class="dropdown-header">Support</li>
-                         <li><a href="/use/mailing-lists/">Mailing 
Lists</a></li>
-              <li><a href="/use/issue-tracking/">Issue Tracking</a></li>
-                         <li><a 
href="http://stackoverflow.com/questions/tagged/apache-beam";>Beam on 
StackOverflow</a></li>
-              <li><a href="http://apachebeam.slack.com";>Beam Slack 
Channel</a></li>
+                         <li><a 
href="/get-started/wordcount-example/">WordCount</a></li>
+                         <li><a 
href="/get-started/mobile-gaming-example/">Mobile Gaming</a></li>
+              <li role="separator" class="divider"></li>
+              <li class="dropdown-header">Resources</li>
+              <li><a href="/get-started/downloads">Downloads</a></li>
+              <li><a href="/get-started/releases">Release Notes</a></li>
+              <li><a href="/get-started/support">Support</a></li>
                  </ul>
            </li>
         <li class="dropdown">
-                 <a href="#" class="dropdown-toggle" data-toggle="dropdown" 
role="button" aria-haspopup="true" aria-expanded="false">Learn <span 
class="caret"></span></a>
+                 <a href="#" class="dropdown-toggle" data-toggle="dropdown" 
role="button" aria-haspopup="true" aria-expanded="false">Documentation <span 
class="caret"></span></a>
                  <ul class="dropdown-menu">
-                         <li><a href="/learn">Learner Hub</a></li>
+                         <li><a href="/documentation">Using the 
Documentation</a></li>
                          <li role="separator" class="divider"></li>
                          <li class="dropdown-header">Beam Concepts</li>
-                         <li><a href="/learn/programming-guide/">Programming 
Guide</a></li>
-                         <li><a 
href="/learn/presentation-materials/">Presentation Materials</a></li>
-                         <li><a href="/learn/resources/">Additional 
Resources</a></li>
+                         <li><a 
href="/documentation/programming-guide/">Programming Guide</a></li>
+                         <li><a href="/documentation/resources/">Additional 
Resources</a></li>
                          <li role="separator" class="divider"></li>
+              <li class="dropdown-header">Pipeline Fundamentals</li>
+              <li><a 
href="/documentation/pipelines/design-your-pipeline/">Design Your 
Pipeline</a></li>
+              <li><a 
href="/documentation/pipelines/create-your-pipeline/">Create Your 
Pipeline</a></li>
+              <li><a href="/documentation/pipelines/test-your-pipeline/">Test 
Your Pipeline</a></li>
+              <li role="separator" class="divider"></li>
                          <li class="dropdown-header">SDKs</li>
-                         <li><a href="/learn/sdks/java/">Java SDK</a></li>
-                         <li><a href="/learn/sdks/javadoc/">Java SDK API 
Reference</a></li>
+                         <li><a href="/documentation/sdks/java/">Java 
SDK</a></li>
+                         <li><a href="/documentation/sdks/javadoc/">Java SDK 
API Reference</a></li>
                          <li role="separator" class="divider"></li>
                          <li class="dropdown-header">Runners</li>
-                         <li><a 
href="/learn/runners/capability-matrix/">Capability Matrix</a></li>
-                         <li><a href="/learn/runners/direct/">Direct 
Runner</a></li>
-                         <li><a href="/learn/runners/flink/">Apache Flink 
Runner</a></li>
-                         <li><a href="/learn/runners/spark/">Apache Spark 
Runner</a></li>
-                         <li><a href="/learn/runners/dataflow/">Cloud Dataflow 
Runner</a></li>
+                         <li><a 
href="/documentation/runners/capability-matrix/">Capability Matrix</a></li>
+                         <li><a href="/documentation/runners/direct/">Direct 
Runner</a></li>
+                         <li><a href="/documentation/runners/flink/">Apache 
Flink Runner</a></li>
+                         <li><a href="/documentation/runners/spark/">Apache 
Spark Runner</a></li>
+                         <li><a href="/documentation/runners/dataflow/">Cloud 
Dataflow Runner</a></li>
                  </ul>
            </li>
         <li class="dropdown">
                  <a href="#" class="dropdown-toggle" data-toggle="dropdown" 
role="button" aria-haspopup="true" aria-expanded="false">Contribute <span 
class="caret"></span></a>
                  <ul class="dropdown-menu">
-                         <li><a href="/contribute">Contributor Hub</a></li>
-                         <li role="separator" class="divider"></li>
-                         <li class="dropdown-header">Basics</li>
-                         <li><a 
href="/contribute/contribution-guide/">Contribution Guide</a></li>
-                         <li><a href="/contribute/work-in-progress/">Work In 
Progress</a></li>
-                         <li><a href="/use/mailing-lists/">Mailing 
Lists</a></li>
-              <li><a href="/contribute/source-repository/">Source 
Repository</a></li>
-              <li><a href="/use/issue-tracking/">Issue Tracking</a></li>
-              <li role="separator" class="divider"></li>
-                         <li class="dropdown-header">Technical References</li>
-                         <li><a href="/contribute/testing/">Testing</a></li>
-              <li><a href="/contribute/design-principles/">Design 
Principles</a></li>
-                         <li><a href="https://goo.gl/nk5OM0";>Technical 
Vision</a></li>
+                         <li><a href="/contribute">Get Started 
Contributing</a></li>
         <li role="separator" class="divider"></li>
-                         <li class="dropdown-header">Committer Resources</li>
+        <li class="dropdown-header">Guides</li>
+                         <li><a 
href="/contribute/contribution-guide/">Contribution Guide</a></li>
+        <li><a href="/contribute/testing/">Testing Guide</a></li>
         <li><a href="/contribute/release-guide/">Release Guide</a></li>
+        <li role="separator" class="divider"></li>
+        <li class="dropdown-header">Technical References</li>
+        <li><a href="/contribute/design-principles/">Design Principles</a></li>
+                         <li><a href="/contribute/work-in-progress/">Ongoing 
Projects</a></li>
+        <li><a href="/contribute/source-repository/">Source 
Repository</a></li>      
+        <li role="separator" class="divider"></li>
+                         <li class="dropdown-header">Promotion</li>
+        <li><a href="/contribute/presentation-materials/">Presentation 
Materials</a></li>
+        <li><a href="/contribute/logos/">Logos and Design</a></li>
+        <li role="separator" class="divider"></li>
+        <li><a href="/contribute/team/">Team</a></li>
                  </ul>
            </li>
+
         <li><a href="/blog">Blog</a></li>
-        <li class="dropdown">
-          <a href="#" class="dropdown-toggle" data-toggle="dropdown" 
role="button" aria-haspopup="true" aria-expanded="false">Project<span 
class="caret"></span></a>
-          <ul class="dropdown-menu">
-            <li><a href="/project/logos/">Logos and design</a></li>
-            <li><a href="/project/public-meetings/">Public Meetings</a></li>
-                       <li><a href="/project/team/">Team</a></li>
-          </ul>
-        </li>
       </ul>
       <ul class="nav navbar-nav navbar-right">
         <li class="dropdown">

http://git-wip-us.apache.org/repos/asf/incubator-beam-site/blob/61ba656f/content/beam/python/sdk/2016/02/25/python-sdk-now-public.html
----------------------------------------------------------------------
diff --git a/content/beam/python/sdk/2016/02/25/python-sdk-now-public.html 
b/content/beam/python/sdk/2016/02/25/python-sdk-now-public.html
index b6db077..b88cbd8 100644
--- a/content/beam/python/sdk/2016/02/25/python-sdk-now-public.html
+++ b/content/beam/python/sdk/2016/02/25/python-sdk-now-public.html
@@ -48,78 +48,71 @@
     <div id="navbar" class="navbar-collapse collapse">
       <ul class="nav navbar-nav">
         <li class="dropdown">
-                 <a href="#" class="dropdown-toggle" data-toggle="dropdown" 
role="button" aria-haspopup="true" aria-expanded="false">Use <span 
class="caret"></span></a>
+                 <a href="#" class="dropdown-toggle" data-toggle="dropdown" 
role="button" aria-haspopup="true" aria-expanded="false">Get Started <span 
class="caret"></span></a>
                  <ul class="dropdown-menu">
-                         <li><a href="/use">User Hub</a></li>
-                         <li role="separator" class="divider"></li>
-                         <li class="dropdown-header">General</li>
-                         <li><a href="/use/beam-overview/">Beam 
Overview</a></li>
-                         <li><a href="/use/quickstart/">Quickstart</a></li>
-                         <li><a href="/use/releases">Release 
Information</a></li>
+                         <li><a href="/get-started/beam-overview/">Beam 
Overview</a></li>
+              <li><a href="/get-started/quickstart/">Quickstart</a></li>
                          <li role="separator" class="divider"></li>
                          <li class="dropdown-header">Example Walkthroughs</li>
-                         <li><a 
href="/use/wordcount-example/">WordCount</a></li>
-                         <li><a href="/use/walkthroughs/">Mobile 
Gaming</a></li>
-                         <li role="separator" class="divider"></li>
-                         <li class="dropdown-header">Support</li>
-                         <li><a href="/use/mailing-lists/">Mailing 
Lists</a></li>
-              <li><a href="/use/issue-tracking/">Issue Tracking</a></li>
-                         <li><a 
href="http://stackoverflow.com/questions/tagged/apache-beam";>Beam on 
StackOverflow</a></li>
-              <li><a href="http://apachebeam.slack.com";>Beam Slack 
Channel</a></li>
+                         <li><a 
href="/get-started/wordcount-example/">WordCount</a></li>
+                         <li><a 
href="/get-started/mobile-gaming-example/">Mobile Gaming</a></li>
+              <li role="separator" class="divider"></li>
+              <li class="dropdown-header">Resources</li>
+              <li><a href="/get-started/downloads">Downloads</a></li>
+              <li><a href="/get-started/releases">Release Notes</a></li>
+              <li><a href="/get-started/support">Support</a></li>
                  </ul>
            </li>
         <li class="dropdown">
-                 <a href="#" class="dropdown-toggle" data-toggle="dropdown" 
role="button" aria-haspopup="true" aria-expanded="false">Learn <span 
class="caret"></span></a>
+                 <a href="#" class="dropdown-toggle" data-toggle="dropdown" 
role="button" aria-haspopup="true" aria-expanded="false">Documentation <span 
class="caret"></span></a>
                  <ul class="dropdown-menu">
-                         <li><a href="/learn">Learner Hub</a></li>
+                         <li><a href="/documentation">Using the 
Documentation</a></li>
                          <li role="separator" class="divider"></li>
                          <li class="dropdown-header">Beam Concepts</li>
-                         <li><a href="/learn/programming-guide/">Programming 
Guide</a></li>
-                         <li><a 
href="/learn/presentation-materials/">Presentation Materials</a></li>
-                         <li><a href="/learn/resources/">Additional 
Resources</a></li>
+                         <li><a 
href="/documentation/programming-guide/">Programming Guide</a></li>
+                         <li><a href="/documentation/resources/">Additional 
Resources</a></li>
                          <li role="separator" class="divider"></li>
+              <li class="dropdown-header">Pipeline Fundamentals</li>
+              <li><a 
href="/documentation/pipelines/design-your-pipeline/">Design Your 
Pipeline</a></li>
+              <li><a 
href="/documentation/pipelines/create-your-pipeline/">Create Your 
Pipeline</a></li>
+              <li><a href="/documentation/pipelines/test-your-pipeline/">Test 
Your Pipeline</a></li>
+              <li role="separator" class="divider"></li>
                          <li class="dropdown-header">SDKs</li>
-                         <li><a href="/learn/sdks/java/">Java SDK</a></li>
-                         <li><a href="/learn/sdks/javadoc/">Java SDK API 
Reference</a></li>
+                         <li><a href="/documentation/sdks/java/">Java 
SDK</a></li>
+                         <li><a href="/documentation/sdks/javadoc/">Java SDK 
API Reference</a></li>
                          <li role="separator" class="divider"></li>
                          <li class="dropdown-header">Runners</li>
-                         <li><a 
href="/learn/runners/capability-matrix/">Capability Matrix</a></li>
-                         <li><a href="/learn/runners/direct/">Direct 
Runner</a></li>
-                         <li><a href="/learn/runners/flink/">Apache Flink 
Runner</a></li>
-                         <li><a href="/learn/runners/spark/">Apache Spark 
Runner</a></li>
-                         <li><a href="/learn/runners/dataflow/">Cloud Dataflow 
Runner</a></li>
+                         <li><a 
href="/documentation/runners/capability-matrix/">Capability Matrix</a></li>
+                         <li><a href="/documentation/runners/direct/">Direct 
Runner</a></li>
+                         <li><a href="/documentation/runners/flink/">Apache 
Flink Runner</a></li>
+                         <li><a href="/documentation/runners/spark/">Apache 
Spark Runner</a></li>
+                         <li><a href="/documentation/runners/dataflow/">Cloud 
Dataflow Runner</a></li>
                  </ul>
            </li>
         <li class="dropdown">
                  <a href="#" class="dropdown-toggle" data-toggle="dropdown" 
role="button" aria-haspopup="true" aria-expanded="false">Contribute <span 
class="caret"></span></a>
                  <ul class="dropdown-menu">
-                         <li><a href="/contribute">Contributor Hub</a></li>
-                         <li role="separator" class="divider"></li>
-                         <li class="dropdown-header">Basics</li>
-                         <li><a 
href="/contribute/contribution-guide/">Contribution Guide</a></li>
-                         <li><a href="/contribute/work-in-progress/">Work In 
Progress</a></li>
-                         <li><a href="/use/mailing-lists/">Mailing 
Lists</a></li>
-              <li><a href="/contribute/source-repository/">Source 
Repository</a></li>
-              <li><a href="/use/issue-tracking/">Issue Tracking</a></li>
-              <li role="separator" class="divider"></li>
-                         <li class="dropdown-header">Technical References</li>
-                         <li><a href="/contribute/testing/">Testing</a></li>
-              <li><a href="/contribute/design-principles/">Design 
Principles</a></li>
-                         <li><a href="https://goo.gl/nk5OM0";>Technical 
Vision</a></li>
+                         <li><a href="/contribute">Get Started 
Contributing</a></li>
         <li role="separator" class="divider"></li>
-                         <li class="dropdown-header">Committer Resources</li>
+        <li class="dropdown-header">Guides</li>
+                         <li><a 
href="/contribute/contribution-guide/">Contribution Guide</a></li>
+        <li><a href="/contribute/testing/">Testing Guide</a></li>
         <li><a href="/contribute/release-guide/">Release Guide</a></li>
+        <li role="separator" class="divider"></li>
+        <li class="dropdown-header">Technical References</li>
+        <li><a href="/contribute/design-principles/">Design Principles</a></li>
+                         <li><a href="/contribute/work-in-progress/">Ongoing 
Projects</a></li>
+        <li><a href="/contribute/source-repository/">Source 
Repository</a></li>      
+        <li role="separator" class="divider"></li>
+                         <li class="dropdown-header">Promotion</li>
+        <li><a href="/contribute/presentation-materials/">Presentation 
Materials</a></li>
+        <li><a href="/contribute/logos/">Logos and Design</a></li>
+        <li role="separator" class="divider"></li>
+        <li><a href="/contribute/team/">Team</a></li>
                  </ul>
            </li>
+
         <li><a href="/blog">Blog</a></li>
-        <li class="dropdown">
-          <a href="#" class="dropdown-toggle" data-toggle="dropdown" 
role="button" aria-haspopup="true" aria-expanded="false">Project<span 
class="caret"></span></a>
-          <ul class="dropdown-menu">
-            <li><a href="/project/logos/">Logos and design</a></li>
-            <li><a href="/project/public-meetings/">Public Meetings</a></li>
-                       <li><a href="/project/team/">Team</a></li>
-          </ul>
-        </li>
       </ul>
       <ul class="nav navbar-nav navbar-right">
         <li class="dropdown">

http://git-wip-us.apache.org/repos/asf/incubator-beam-site/blob/61ba656f/content/beam/release/2016/06/15/first-release.html
----------------------------------------------------------------------
diff --git a/content/beam/release/2016/06/15/first-release.html 
b/content/beam/release/2016/06/15/first-release.html
index 14dabb1..0b7b62f 100644
--- a/content/beam/release/2016/06/15/first-release.html
+++ b/content/beam/release/2016/06/15/first-release.html
@@ -48,78 +48,71 @@
     <div id="navbar" class="navbar-collapse collapse">
       <ul class="nav navbar-nav">
         <li class="dropdown">
-                 <a href="#" class="dropdown-toggle" data-toggle="dropdown" 
role="button" aria-haspopup="true" aria-expanded="false">Use <span 
class="caret"></span></a>
+                 <a href="#" class="dropdown-toggle" data-toggle="dropdown" 
role="button" aria-haspopup="true" aria-expanded="false">Get Started <span 
class="caret"></span></a>
                  <ul class="dropdown-menu">
-                         <li><a href="/use">User Hub</a></li>
-                         <li role="separator" class="divider"></li>
-                         <li class="dropdown-header">General</li>
-                         <li><a href="/use/beam-overview/">Beam 
Overview</a></li>
-                         <li><a href="/use/quickstart/">Quickstart</a></li>
-                         <li><a href="/use/releases">Release 
Information</a></li>
+                         <li><a href="/get-started/beam-overview/">Beam 
Overview</a></li>
+              <li><a href="/get-started/quickstart/">Quickstart</a></li>
                          <li role="separator" class="divider"></li>
                          <li class="dropdown-header">Example Walkthroughs</li>
-                         <li><a 
href="/use/wordcount-example/">WordCount</a></li>
-                         <li><a href="/use/walkthroughs/">Mobile 
Gaming</a></li>
-                         <li role="separator" class="divider"></li>
-                         <li class="dropdown-header">Support</li>
-                         <li><a href="/use/mailing-lists/">Mailing 
Lists</a></li>
-              <li><a href="/use/issue-tracking/">Issue Tracking</a></li>
-                         <li><a 
href="http://stackoverflow.com/questions/tagged/apache-beam";>Beam on 
StackOverflow</a></li>
-              <li><a href="http://apachebeam.slack.com";>Beam Slack 
Channel</a></li>
+                         <li><a 
href="/get-started/wordcount-example/">WordCount</a></li>
+                         <li><a 
href="/get-started/mobile-gaming-example/">Mobile Gaming</a></li>
+              <li role="separator" class="divider"></li>
+              <li class="dropdown-header">Resources</li>
+              <li><a href="/get-started/downloads">Downloads</a></li>
+              <li><a href="/get-started/releases">Release Notes</a></li>
+              <li><a href="/get-started/support">Support</a></li>
                  </ul>
            </li>
         <li class="dropdown">
-                 <a href="#" class="dropdown-toggle" data-toggle="dropdown" 
role="button" aria-haspopup="true" aria-expanded="false">Learn <span 
class="caret"></span></a>
+                 <a href="#" class="dropdown-toggle" data-toggle="dropdown" 
role="button" aria-haspopup="true" aria-expanded="false">Documentation <span 
class="caret"></span></a>
                  <ul class="dropdown-menu">
-                         <li><a href="/learn">Learner Hub</a></li>
+                         <li><a href="/documentation">Using the 
Documentation</a></li>
                          <li role="separator" class="divider"></li>
                          <li class="dropdown-header">Beam Concepts</li>
-                         <li><a href="/learn/programming-guide/">Programming 
Guide</a></li>
-                         <li><a 
href="/learn/presentation-materials/">Presentation Materials</a></li>
-                         <li><a href="/learn/resources/">Additional 
Resources</a></li>
+                         <li><a 
href="/documentation/programming-guide/">Programming Guide</a></li>
+                         <li><a href="/documentation/resources/">Additional 
Resources</a></li>
                          <li role="separator" class="divider"></li>
+              <li class="dropdown-header">Pipeline Fundamentals</li>
+              <li><a 
href="/documentation/pipelines/design-your-pipeline/">Design Your 
Pipeline</a></li>
+              <li><a 
href="/documentation/pipelines/create-your-pipeline/">Create Your 
Pipeline</a></li>
+              <li><a href="/documentation/pipelines/test-your-pipeline/">Test 
Your Pipeline</a></li>
+              <li role="separator" class="divider"></li>
                          <li class="dropdown-header">SDKs</li>
-                         <li><a href="/learn/sdks/java/">Java SDK</a></li>
-                         <li><a href="/learn/sdks/javadoc/">Java SDK API 
Reference</a></li>
+                         <li><a href="/documentation/sdks/java/">Java 
SDK</a></li>
+                         <li><a href="/documentation/sdks/javadoc/">Java SDK 
API Reference</a></li>
                          <li role="separator" class="divider"></li>
                          <li class="dropdown-header">Runners</li>
-                         <li><a 
href="/learn/runners/capability-matrix/">Capability Matrix</a></li>
-                         <li><a href="/learn/runners/direct/">Direct 
Runner</a></li>
-                         <li><a href="/learn/runners/flink/">Apache Flink 
Runner</a></li>
-                         <li><a href="/learn/runners/spark/">Apache Spark 
Runner</a></li>
-                         <li><a href="/learn/runners/dataflow/">Cloud Dataflow 
Runner</a></li>
+                         <li><a 
href="/documentation/runners/capability-matrix/">Capability Matrix</a></li>
+                         <li><a href="/documentation/runners/direct/">Direct 
Runner</a></li>
+                         <li><a href="/documentation/runners/flink/">Apache 
Flink Runner</a></li>
+                         <li><a href="/documentation/runners/spark/">Apache 
Spark Runner</a></li>
+                         <li><a href="/documentation/runners/dataflow/">Cloud 
Dataflow Runner</a></li>
                  </ul>
            </li>
         <li class="dropdown">
                  <a href="#" class="dropdown-toggle" data-toggle="dropdown" 
role="button" aria-haspopup="true" aria-expanded="false">Contribute <span 
class="caret"></span></a>
                  <ul class="dropdown-menu">
-                         <li><a href="/contribute">Contributor Hub</a></li>
-                         <li role="separator" class="divider"></li>
-                         <li class="dropdown-header">Basics</li>
-                         <li><a 
href="/contribute/contribution-guide/">Contribution Guide</a></li>
-                         <li><a href="/contribute/work-in-progress/">Work In 
Progress</a></li>
-                         <li><a href="/use/mailing-lists/">Mailing 
Lists</a></li>
-              <li><a href="/contribute/source-repository/">Source 
Repository</a></li>
-              <li><a href="/use/issue-tracking/">Issue Tracking</a></li>
-              <li role="separator" class="divider"></li>
-                         <li class="dropdown-header">Technical References</li>
-                         <li><a href="/contribute/testing/">Testing</a></li>
-              <li><a href="/contribute/design-principles/">Design 
Principles</a></li>
-                         <li><a href="https://goo.gl/nk5OM0";>Technical 
Vision</a></li>
+                         <li><a href="/contribute">Get Started 
Contributing</a></li>
         <li role="separator" class="divider"></li>
-                         <li class="dropdown-header">Committer Resources</li>
+        <li class="dropdown-header">Guides</li>
+                         <li><a 
href="/contribute/contribution-guide/">Contribution Guide</a></li>
+        <li><a href="/contribute/testing/">Testing Guide</a></li>
         <li><a href="/contribute/release-guide/">Release Guide</a></li>
+        <li role="separator" class="divider"></li>
+        <li class="dropdown-header">Technical References</li>
+        <li><a href="/contribute/design-principles/">Design Principles</a></li>
+                         <li><a href="/contribute/work-in-progress/">Ongoing 
Projects</a></li>
+        <li><a href="/contribute/source-repository/">Source 
Repository</a></li>      
+        <li role="separator" class="divider"></li>
+                         <li class="dropdown-header">Promotion</li>
+        <li><a href="/contribute/presentation-materials/">Presentation 
Materials</a></li>
+        <li><a href="/contribute/logos/">Logos and Design</a></li>
+        <li role="separator" class="divider"></li>
+        <li><a href="/contribute/team/">Team</a></li>
                  </ul>
            </li>
+
         <li><a href="/blog">Blog</a></li>
-        <li class="dropdown">
-          <a href="#" class="dropdown-toggle" data-toggle="dropdown" 
role="button" aria-haspopup="true" aria-expanded="false">Project<span 
class="caret"></span></a>
-          <ul class="dropdown-menu">
-            <li><a href="/project/logos/">Logos and design</a></li>
-            <li><a href="/project/public-meetings/">Public Meetings</a></li>
-                       <li><a href="/project/team/">Team</a></li>
-          </ul>
-        </li>
       </ul>
       <ul class="nav navbar-nav navbar-right">
         <li class="dropdown">

http://git-wip-us.apache.org/repos/asf/incubator-beam-site/blob/61ba656f/content/beam/update/2016/10/11/strata-hadoop-world-and-beam.html
----------------------------------------------------------------------
diff --git a/content/beam/update/2016/10/11/strata-hadoop-world-and-beam.html 
b/content/beam/update/2016/10/11/strata-hadoop-world-and-beam.html
index 9302317..280b3f5 100644
--- a/content/beam/update/2016/10/11/strata-hadoop-world-and-beam.html
+++ b/content/beam/update/2016/10/11/strata-hadoop-world-and-beam.html
@@ -48,78 +48,71 @@
     <div id="navbar" class="navbar-collapse collapse">
       <ul class="nav navbar-nav">
         <li class="dropdown">
-                 <a href="#" class="dropdown-toggle" data-toggle="dropdown" 
role="button" aria-haspopup="true" aria-expanded="false">Use <span 
class="caret"></span></a>
+                 <a href="#" class="dropdown-toggle" data-toggle="dropdown" 
role="button" aria-haspopup="true" aria-expanded="false">Get Started <span 
class="caret"></span></a>
                  <ul class="dropdown-menu">
-                         <li><a href="/use">User Hub</a></li>
-                         <li role="separator" class="divider"></li>
-                         <li class="dropdown-header">General</li>
-                         <li><a href="/use/beam-overview/">Beam 
Overview</a></li>
-                         <li><a href="/use/quickstart/">Quickstart</a></li>
-                         <li><a href="/use/releases">Release 
Information</a></li>
+                         <li><a href="/get-started/beam-overview/">Beam 
Overview</a></li>
+              <li><a href="/get-started/quickstart/">Quickstart</a></li>
                          <li role="separator" class="divider"></li>
                          <li class="dropdown-header">Example Walkthroughs</li>
-                         <li><a 
href="/use/wordcount-example/">WordCount</a></li>
-                         <li><a href="/use/walkthroughs/">Mobile 
Gaming</a></li>
-                         <li role="separator" class="divider"></li>
-                         <li class="dropdown-header">Support</li>
-                         <li><a href="/use/mailing-lists/">Mailing 
Lists</a></li>
-              <li><a href="/use/issue-tracking/">Issue Tracking</a></li>
-                         <li><a 
href="http://stackoverflow.com/questions/tagged/apache-beam";>Beam on 
StackOverflow</a></li>
-              <li><a href="http://apachebeam.slack.com";>Beam Slack 
Channel</a></li>
+                         <li><a 
href="/get-started/wordcount-example/">WordCount</a></li>
+                         <li><a 
href="/get-started/mobile-gaming-example/">Mobile Gaming</a></li>
+              <li role="separator" class="divider"></li>
+              <li class="dropdown-header">Resources</li>
+              <li><a href="/get-started/downloads">Downloads</a></li>
+              <li><a href="/get-started/releases">Release Notes</a></li>
+              <li><a href="/get-started/support">Support</a></li>
                  </ul>
            </li>
         <li class="dropdown">
-                 <a href="#" class="dropdown-toggle" data-toggle="dropdown" 
role="button" aria-haspopup="true" aria-expanded="false">Learn <span 
class="caret"></span></a>
+                 <a href="#" class="dropdown-toggle" data-toggle="dropdown" 
role="button" aria-haspopup="true" aria-expanded="false">Documentation <span 
class="caret"></span></a>
                  <ul class="dropdown-menu">
-                         <li><a href="/learn">Learner Hub</a></li>
+                         <li><a href="/documentation">Using the 
Documentation</a></li>
                          <li role="separator" class="divider"></li>
                          <li class="dropdown-header">Beam Concepts</li>
-                         <li><a href="/learn/programming-guide/">Programming 
Guide</a></li>
-                         <li><a 
href="/learn/presentation-materials/">Presentation Materials</a></li>
-                         <li><a href="/learn/resources/">Additional 
Resources</a></li>
+                         <li><a 
href="/documentation/programming-guide/">Programming Guide</a></li>
+                         <li><a href="/documentation/resources/">Additional 
Resources</a></li>
                          <li role="separator" class="divider"></li>
+              <li class="dropdown-header">Pipeline Fundamentals</li>
+              <li><a 
href="/documentation/pipelines/design-your-pipeline/">Design Your 
Pipeline</a></li>
+              <li><a 
href="/documentation/pipelines/create-your-pipeline/">Create Your 
Pipeline</a></li>
+              <li><a href="/documentation/pipelines/test-your-pipeline/">Test 
Your Pipeline</a></li>
+              <li role="separator" class="divider"></li>
                          <li class="dropdown-header">SDKs</li>
-                         <li><a href="/learn/sdks/java/">Java SDK</a></li>
-                         <li><a href="/learn/sdks/javadoc/">Java SDK API 
Reference</a></li>
+                         <li><a href="/documentation/sdks/java/">Java 
SDK</a></li>
+                         <li><a href="/documentation/sdks/javadoc/">Java SDK 
API Reference</a></li>
                          <li role="separator" class="divider"></li>
                          <li class="dropdown-header">Runners</li>
-                         <li><a 
href="/learn/runners/capability-matrix/">Capability Matrix</a></li>
-                         <li><a href="/learn/runners/direct/">Direct 
Runner</a></li>
-                         <li><a href="/learn/runners/flink/">Apache Flink 
Runner</a></li>
-                         <li><a href="/learn/runners/spark/">Apache Spark 
Runner</a></li>
-                         <li><a href="/learn/runners/dataflow/">Cloud Dataflow 
Runner</a></li>
+                         <li><a 
href="/documentation/runners/capability-matrix/">Capability Matrix</a></li>
+                         <li><a href="/documentation/runners/direct/">Direct 
Runner</a></li>
+                         <li><a href="/documentation/runners/flink/">Apache 
Flink Runner</a></li>
+                         <li><a href="/documentation/runners/spark/">Apache 
Spark Runner</a></li>
+                         <li><a href="/documentation/runners/dataflow/">Cloud 
Dataflow Runner</a></li>
                  </ul>
            </li>
         <li class="dropdown">
                  <a href="#" class="dropdown-toggle" data-toggle="dropdown" 
role="button" aria-haspopup="true" aria-expanded="false">Contribute <span 
class="caret"></span></a>
                  <ul class="dropdown-menu">
-                         <li><a href="/contribute">Contributor Hub</a></li>
-                         <li role="separator" class="divider"></li>
-                         <li class="dropdown-header">Basics</li>
-                         <li><a 
href="/contribute/contribution-guide/">Contribution Guide</a></li>
-                         <li><a href="/contribute/work-in-progress/">Work In 
Progress</a></li>
-                         <li><a href="/use/mailing-lists/">Mailing 
Lists</a></li>
-              <li><a href="/contribute/source-repository/">Source 
Repository</a></li>
-              <li><a href="/use/issue-tracking/">Issue Tracking</a></li>
-              <li role="separator" class="divider"></li>
-                         <li class="dropdown-header">Technical References</li>
-                         <li><a href="/contribute/testing/">Testing</a></li>
-              <li><a href="/contribute/design-principles/">Design 
Principles</a></li>
-                         <li><a href="https://goo.gl/nk5OM0";>Technical 
Vision</a></li>
+                         <li><a href="/contribute">Get Started 
Contributing</a></li>
         <li role="separator" class="divider"></li>
-                         <li class="dropdown-header">Committer Resources</li>
+        <li class="dropdown-header">Guides</li>
+                         <li><a 
href="/contribute/contribution-guide/">Contribution Guide</a></li>
+        <li><a href="/contribute/testing/">Testing Guide</a></li>
         <li><a href="/contribute/release-guide/">Release Guide</a></li>
+        <li role="separator" class="divider"></li>
+        <li class="dropdown-header">Technical References</li>
+        <li><a href="/contribute/design-principles/">Design Principles</a></li>
+                         <li><a href="/contribute/work-in-progress/">Ongoing 
Projects</a></li>
+        <li><a href="/contribute/source-repository/">Source 
Repository</a></li>      
+        <li role="separator" class="divider"></li>
+                         <li class="dropdown-header">Promotion</li>
+        <li><a href="/contribute/presentation-materials/">Presentation 
Materials</a></li>
+        <li><a href="/contribute/logos/">Logos and Design</a></li>
+        <li role="separator" class="divider"></li>
+        <li><a href="/contribute/team/">Team</a></li>
                  </ul>
            </li>
+
         <li><a href="/blog">Blog</a></li>
-        <li class="dropdown">
-          <a href="#" class="dropdown-toggle" data-toggle="dropdown" 
role="button" aria-haspopup="true" aria-expanded="false">Project<span 
class="caret"></span></a>
-          <ul class="dropdown-menu">
-            <li><a href="/project/logos/">Logos and design</a></li>
-            <li><a href="/project/public-meetings/">Public Meetings</a></li>
-                       <li><a href="/project/team/">Team</a></li>
-          </ul>
-        </li>
       </ul>
       <ul class="nav navbar-nav navbar-right">
         <li class="dropdown">

http://git-wip-us.apache.org/repos/asf/incubator-beam-site/blob/61ba656f/content/beam/update/website/2016/02/22/beam-has-a-logo.html
----------------------------------------------------------------------
diff --git a/content/beam/update/website/2016/02/22/beam-has-a-logo.html 
b/content/beam/update/website/2016/02/22/beam-has-a-logo.html
index b90f856..cf8ea37 100644
--- a/content/beam/update/website/2016/02/22/beam-has-a-logo.html
+++ b/content/beam/update/website/2016/02/22/beam-has-a-logo.html
@@ -48,78 +48,71 @@
     <div id="navbar" class="navbar-collapse collapse">
       <ul class="nav navbar-nav">
         <li class="dropdown">
-                 <a href="#" class="dropdown-toggle" data-toggle="dropdown" 
role="button" aria-haspopup="true" aria-expanded="false">Use <span 
class="caret"></span></a>
+                 <a href="#" class="dropdown-toggle" data-toggle="dropdown" 
role="button" aria-haspopup="true" aria-expanded="false">Get Started <span 
class="caret"></span></a>
                  <ul class="dropdown-menu">
-                         <li><a href="/use">User Hub</a></li>
-                         <li role="separator" class="divider"></li>
-                         <li class="dropdown-header">General</li>
-                         <li><a href="/use/beam-overview/">Beam 
Overview</a></li>
-                         <li><a href="/use/quickstart/">Quickstart</a></li>
-                         <li><a href="/use/releases">Release 
Information</a></li>
+                         <li><a href="/get-started/beam-overview/">Beam 
Overview</a></li>
+              <li><a href="/get-started/quickstart/">Quickstart</a></li>
                          <li role="separator" class="divider"></li>
                          <li class="dropdown-header">Example Walkthroughs</li>
-                         <li><a 
href="/use/wordcount-example/">WordCount</a></li>
-                         <li><a href="/use/walkthroughs/">Mobile 
Gaming</a></li>
-                         <li role="separator" class="divider"></li>
-                         <li class="dropdown-header">Support</li>
-                         <li><a href="/use/mailing-lists/">Mailing 
Lists</a></li>
-              <li><a href="/use/issue-tracking/">Issue Tracking</a></li>
-                         <li><a 
href="http://stackoverflow.com/questions/tagged/apache-beam";>Beam on 
StackOverflow</a></li>
-              <li><a href="http://apachebeam.slack.com";>Beam Slack 
Channel</a></li>
+                         <li><a 
href="/get-started/wordcount-example/">WordCount</a></li>
+                         <li><a 
href="/get-started/mobile-gaming-example/">Mobile Gaming</a></li>
+              <li role="separator" class="divider"></li>
+              <li class="dropdown-header">Resources</li>
+              <li><a href="/get-started/downloads">Downloads</a></li>
+              <li><a href="/get-started/releases">Release Notes</a></li>
+              <li><a href="/get-started/support">Support</a></li>
                  </ul>
            </li>
         <li class="dropdown">
-                 <a href="#" class="dropdown-toggle" data-toggle="dropdown" 
role="button" aria-haspopup="true" aria-expanded="false">Learn <span 
class="caret"></span></a>
+                 <a href="#" class="dropdown-toggle" data-toggle="dropdown" 
role="button" aria-haspopup="true" aria-expanded="false">Documentation <span 
class="caret"></span></a>
                  <ul class="dropdown-menu">
-                         <li><a href="/learn">Learner Hub</a></li>
+                         <li><a href="/documentation">Using the 
Documentation</a></li>
                          <li role="separator" class="divider"></li>
                          <li class="dropdown-header">Beam Concepts</li>
-                         <li><a href="/learn/programming-guide/">Programming 
Guide</a></li>
-                         <li><a 
href="/learn/presentation-materials/">Presentation Materials</a></li>
-                         <li><a href="/learn/resources/">Additional 
Resources</a></li>
+                         <li><a 
href="/documentation/programming-guide/">Programming Guide</a></li>
+                         <li><a href="/documentation/resources/">Additional 
Resources</a></li>
                          <li role="separator" class="divider"></li>
+              <li class="dropdown-header">Pipeline Fundamentals</li>
+              <li><a 
href="/documentation/pipelines/design-your-pipeline/">Design Your 
Pipeline</a></li>
+              <li><a 
href="/documentation/pipelines/create-your-pipeline/">Create Your 
Pipeline</a></li>
+              <li><a href="/documentation/pipelines/test-your-pipeline/">Test 
Your Pipeline</a></li>
+              <li role="separator" class="divider"></li>
                          <li class="dropdown-header">SDKs</li>
-                         <li><a href="/learn/sdks/java/">Java SDK</a></li>
-                         <li><a href="/learn/sdks/javadoc/">Java SDK API 
Reference</a></li>
+                         <li><a href="/documentation/sdks/java/">Java 
SDK</a></li>
+                         <li><a href="/documentation/sdks/javadoc/">Java SDK 
API Reference</a></li>
                          <li role="separator" class="divider"></li>
                          <li class="dropdown-header">Runners</li>
-                         <li><a 
href="/learn/runners/capability-matrix/">Capability Matrix</a></li>
-                         <li><a href="/learn/runners/direct/">Direct 
Runner</a></li>
-                         <li><a href="/learn/runners/flink/">Apache Flink 
Runner</a></li>
-                         <li><a href="/learn/runners/spark/">Apache Spark 
Runner</a></li>
-                         <li><a href="/learn/runners/dataflow/">Cloud Dataflow 
Runner</a></li>
+                         <li><a 
href="/documentation/runners/capability-matrix/">Capability Matrix</a></li>
+                         <li><a href="/documentation/runners/direct/">Direct 
Runner</a></li>
+                         <li><a href="/documentation/runners/flink/">Apache 
Flink Runner</a></li>
+                         <li><a href="/documentation/runners/spark/">Apache 
Spark Runner</a></li>
+                         <li><a href="/documentation/runners/dataflow/">Cloud 
Dataflow Runner</a></li>
                  </ul>
            </li>
         <li class="dropdown">
                  <a href="#" class="dropdown-toggle" data-toggle="dropdown" 
role="button" aria-haspopup="true" aria-expanded="false">Contribute <span 
class="caret"></span></a>
                  <ul class="dropdown-menu">
-                         <li><a href="/contribute">Contributor Hub</a></li>
-                         <li role="separator" class="divider"></li>
-                         <li class="dropdown-header">Basics</li>
-                         <li><a 
href="/contribute/contribution-guide/">Contribution Guide</a></li>
-                         <li><a href="/contribute/work-in-progress/">Work In 
Progress</a></li>
-                         <li><a href="/use/mailing-lists/">Mailing 
Lists</a></li>
-              <li><a href="/contribute/source-repository/">Source 
Repository</a></li>
-              <li><a href="/use/issue-tracking/">Issue Tracking</a></li>
-              <li role="separator" class="divider"></li>
-                         <li class="dropdown-header">Technical References</li>
-                         <li><a href="/contribute/testing/">Testing</a></li>
-              <li><a href="/contribute/design-principles/">Design 
Principles</a></li>
-                         <li><a href="https://goo.gl/nk5OM0";>Technical 
Vision</a></li>
+                         <li><a href="/contribute">Get Started 
Contributing</a></li>
         <li role="separator" class="divider"></li>
-                         <li class="dropdown-header">Committer Resources</li>
+        <li class="dropdown-header">Guides</li>
+                         <li><a 
href="/contribute/contribution-guide/">Contribution Guide</a></li>
+        <li><a href="/contribute/testing/">Testing Guide</a></li>
         <li><a href="/contribute/release-guide/">Release Guide</a></li>
+        <li role="separator" class="divider"></li>
+        <li class="dropdown-header">Technical References</li>
+        <li><a href="/contribute/design-principles/">Design Principles</a></li>
+                         <li><a href="/contribute/work-in-progress/">Ongoing 
Projects</a></li>
+        <li><a href="/contribute/source-repository/">Source 
Repository</a></li>      
+        <li role="separator" class="divider"></li>
+                         <li class="dropdown-header">Promotion</li>
+        <li><a href="/contribute/presentation-materials/">Presentation 
Materials</a></li>
+        <li><a href="/contribute/logos/">Logos and Design</a></li>
+        <li role="separator" class="divider"></li>
+        <li><a href="/contribute/team/">Team</a></li>
                  </ul>
            </li>
+
         <li><a href="/blog">Blog</a></li>
-        <li class="dropdown">
-          <a href="#" class="dropdown-toggle" data-toggle="dropdown" 
role="button" aria-haspopup="true" aria-expanded="false">Project<span 
class="caret"></span></a>
-          <ul class="dropdown-menu">
-            <li><a href="/project/logos/">Logos and design</a></li>
-            <li><a href="/project/public-meetings/">Public Meetings</a></li>
-                       <li><a href="/project/team/">Team</a></li>
-          </ul>
-        </li>
       </ul>
       <ul class="nav navbar-nav navbar-right">
         <li class="dropdown">

http://git-wip-us.apache.org/repos/asf/incubator-beam-site/blob/61ba656f/content/blog/2016/05/18/splitAtFraction-method.html
----------------------------------------------------------------------
diff --git a/content/blog/2016/05/18/splitAtFraction-method.html 
b/content/blog/2016/05/18/splitAtFraction-method.html
index 6bf3cd3..0dbd7cc 100644
--- a/content/blog/2016/05/18/splitAtFraction-method.html
+++ b/content/blog/2016/05/18/splitAtFraction-method.html
@@ -48,78 +48,71 @@
     <div id="navbar" class="navbar-collapse collapse">
       <ul class="nav navbar-nav">
         <li class="dropdown">
-                 <a href="#" class="dropdown-toggle" data-toggle="dropdown" 
role="button" aria-haspopup="true" aria-expanded="false">Use <span 
class="caret"></span></a>
+                 <a href="#" class="dropdown-toggle" data-toggle="dropdown" 
role="button" aria-haspopup="true" aria-expanded="false">Get Started <span 
class="caret"></span></a>
                  <ul class="dropdown-menu">
-                         <li><a href="/use">User Hub</a></li>
-                         <li role="separator" class="divider"></li>
-                         <li class="dropdown-header">General</li>
-                         <li><a href="/use/beam-overview/">Beam 
Overview</a></li>
-                         <li><a href="/use/quickstart/">Quickstart</a></li>
-                         <li><a href="/use/releases">Release 
Information</a></li>
+                         <li><a href="/get-started/beam-overview/">Beam 
Overview</a></li>
+              <li><a href="/get-started/quickstart/">Quickstart</a></li>
                          <li role="separator" class="divider"></li>
                          <li class="dropdown-header">Example Walkthroughs</li>
-                         <li><a 
href="/use/wordcount-example/">WordCount</a></li>
-                         <li><a href="/use/walkthroughs/">Mobile 
Gaming</a></li>
-                         <li role="separator" class="divider"></li>
-                         <li class="dropdown-header">Support</li>
-                         <li><a href="/use/mailing-lists/">Mailing 
Lists</a></li>
-              <li><a href="/use/issue-tracking/">Issue Tracking</a></li>
-                         <li><a 
href="http://stackoverflow.com/questions/tagged/apache-beam";>Beam on 
StackOverflow</a></li>
-              <li><a href="http://apachebeam.slack.com";>Beam Slack 
Channel</a></li>
+                         <li><a 
href="/get-started/wordcount-example/">WordCount</a></li>
+                         <li><a 
href="/get-started/mobile-gaming-example/">Mobile Gaming</a></li>
+              <li role="separator" class="divider"></li>
+              <li class="dropdown-header">Resources</li>
+              <li><a href="/get-started/downloads">Downloads</a></li>
+              <li><a href="/get-started/releases">Release Notes</a></li>
+              <li><a href="/get-started/support">Support</a></li>
                  </ul>
            </li>
         <li class="dropdown">
-                 <a href="#" class="dropdown-toggle" data-toggle="dropdown" 
role="button" aria-haspopup="true" aria-expanded="false">Learn <span 
class="caret"></span></a>
+                 <a href="#" class="dropdown-toggle" data-toggle="dropdown" 
role="button" aria-haspopup="true" aria-expanded="false">Documentation <span 
class="caret"></span></a>
                  <ul class="dropdown-menu">
-                         <li><a href="/learn">Learner Hub</a></li>
+                         <li><a href="/documentation">Using the 
Documentation</a></li>
                          <li role="separator" class="divider"></li>
                          <li class="dropdown-header">Beam Concepts</li>
-                         <li><a href="/learn/programming-guide/">Programming 
Guide</a></li>
-                         <li><a 
href="/learn/presentation-materials/">Presentation Materials</a></li>
-                         <li><a href="/learn/resources/">Additional 
Resources</a></li>
+                         <li><a 
href="/documentation/programming-guide/">Programming Guide</a></li>
+                         <li><a href="/documentation/resources/">Additional 
Resources</a></li>
                          <li role="separator" class="divider"></li>
+              <li class="dropdown-header">Pipeline Fundamentals</li>
+              <li><a 
href="/documentation/pipelines/design-your-pipeline/">Design Your 
Pipeline</a></li>
+              <li><a 
href="/documentation/pipelines/create-your-pipeline/">Create Your 
Pipeline</a></li>
+              <li><a href="/documentation/pipelines/test-your-pipeline/">Test 
Your Pipeline</a></li>
+              <li role="separator" class="divider"></li>
                          <li class="dropdown-header">SDKs</li>
-                         <li><a href="/learn/sdks/java/">Java SDK</a></li>
-                         <li><a href="/learn/sdks/javadoc/">Java SDK API 
Reference</a></li>
+                         <li><a href="/documentation/sdks/java/">Java 
SDK</a></li>
+                         <li><a href="/documentation/sdks/javadoc/">Java SDK 
API Reference</a></li>
                          <li role="separator" class="divider"></li>
                          <li class="dropdown-header">Runners</li>
-                         <li><a 
href="/learn/runners/capability-matrix/">Capability Matrix</a></li>
-                         <li><a href="/learn/runners/direct/">Direct 
Runner</a></li>
-                         <li><a href="/learn/runners/flink/">Apache Flink 
Runner</a></li>
-                         <li><a href="/learn/runners/spark/">Apache Spark 
Runner</a></li>
-                         <li><a href="/learn/runners/dataflow/">Cloud Dataflow 
Runner</a></li>
+                         <li><a 
href="/documentation/runners/capability-matrix/">Capability Matrix</a></li>
+                         <li><a href="/documentation/runners/direct/">Direct 
Runner</a></li>
+                         <li><a href="/documentation/runners/flink/">Apache 
Flink Runner</a></li>
+                         <li><a href="/documentation/runners/spark/">Apache 
Spark Runner</a></li>
+                         <li><a href="/documentation/runners/dataflow/">Cloud 
Dataflow Runner</a></li>
                  </ul>
            </li>
         <li class="dropdown">
                  <a href="#" class="dropdown-toggle" data-toggle="dropdown" 
role="button" aria-haspopup="true" aria-expanded="false">Contribute <span 
class="caret"></span></a>
                  <ul class="dropdown-menu">
-                         <li><a href="/contribute">Contributor Hub</a></li>
-                         <li role="separator" class="divider"></li>
-                         <li class="dropdown-header">Basics</li>
-                         <li><a 
href="/contribute/contribution-guide/">Contribution Guide</a></li>
-                         <li><a href="/contribute/work-in-progress/">Work In 
Progress</a></li>
-                         <li><a href="/use/mailing-lists/">Mailing 
Lists</a></li>
-              <li><a href="/contribute/source-repository/">Source 
Repository</a></li>
-              <li><a href="/use/issue-tracking/">Issue Tracking</a></li>
-              <li role="separator" class="divider"></li>
-                         <li class="dropdown-header">Technical References</li>
-                         <li><a href="/contribute/testing/">Testing</a></li>
-              <li><a href="/contribute/design-principles/">Design 
Principles</a></li>
-                         <li><a href="https://goo.gl/nk5OM0";>Technical 
Vision</a></li>
+                         <li><a href="/contribute">Get Started 
Contributing</a></li>
         <li role="separator" class="divider"></li>
-                         <li class="dropdown-header">Committer Resources</li>
+        <li class="dropdown-header">Guides</li>
+                         <li><a 
href="/contribute/contribution-guide/">Contribution Guide</a></li>
+        <li><a href="/contribute/testing/">Testing Guide</a></li>
         <li><a href="/contribute/release-guide/">Release Guide</a></li>
+        <li role="separator" class="divider"></li>
+        <li class="dropdown-header">Technical References</li>
+        <li><a href="/contribute/design-principles/">Design Principles</a></li>
+                         <li><a href="/contribute/work-in-progress/">Ongoing 
Projects</a></li>
+        <li><a href="/contribute/source-repository/">Source 
Repository</a></li>      
+        <li role="separator" class="divider"></li>
+                         <li class="dropdown-header">Promotion</li>
+        <li><a href="/contribute/presentation-materials/">Presentation 
Materials</a></li>
+        <li><a href="/contribute/logos/">Logos and Design</a></li>
+        <li role="separator" class="divider"></li>
+        <li><a href="/contribute/team/">Team</a></li>
                  </ul>
            </li>
+
         <li><a href="/blog">Blog</a></li>
-        <li class="dropdown">
-          <a href="#" class="dropdown-toggle" data-toggle="dropdown" 
role="button" aria-haspopup="true" aria-expanded="false">Project<span 
class="caret"></span></a>
-          <ul class="dropdown-menu">
-            <li><a href="/project/logos/">Logos and design</a></li>
-            <li><a href="/project/public-meetings/">Public Meetings</a></li>
-                       <li><a href="/project/team/">Team</a></li>
-          </ul>
-        </li>
       </ul>
       <ul class="nav navbar-nav navbar-right">
         <li class="dropdown">

http://git-wip-us.apache.org/repos/asf/incubator-beam-site/blob/61ba656f/content/blog/2016/05/27/where-is-my-pcollection-dot-map.html
----------------------------------------------------------------------
diff --git a/content/blog/2016/05/27/where-is-my-pcollection-dot-map.html 
b/content/blog/2016/05/27/where-is-my-pcollection-dot-map.html
index 913876f..6d5d1dd 100644
--- a/content/blog/2016/05/27/where-is-my-pcollection-dot-map.html
+++ b/content/blog/2016/05/27/where-is-my-pcollection-dot-map.html
@@ -48,78 +48,71 @@
     <div id="navbar" class="navbar-collapse collapse">
       <ul class="nav navbar-nav">
         <li class="dropdown">
-                 <a href="#" class="dropdown-toggle" data-toggle="dropdown" 
role="button" aria-haspopup="true" aria-expanded="false">Use <span 
class="caret"></span></a>
+                 <a href="#" class="dropdown-toggle" data-toggle="dropdown" 
role="button" aria-haspopup="true" aria-expanded="false">Get Started <span 
class="caret"></span></a>
                  <ul class="dropdown-menu">
-                         <li><a href="/use">User Hub</a></li>
-                         <li role="separator" class="divider"></li>
-                         <li class="dropdown-header">General</li>
-                         <li><a href="/use/beam-overview/">Beam 
Overview</a></li>
-                         <li><a href="/use/quickstart/">Quickstart</a></li>
-                         <li><a href="/use/releases">Release 
Information</a></li>
+                         <li><a href="/get-started/beam-overview/">Beam 
Overview</a></li>
+              <li><a href="/get-started/quickstart/">Quickstart</a></li>
                          <li role="separator" class="divider"></li>
                          <li class="dropdown-header">Example Walkthroughs</li>
-                         <li><a 
href="/use/wordcount-example/">WordCount</a></li>
-                         <li><a href="/use/walkthroughs/">Mobile 
Gaming</a></li>
-                         <li role="separator" class="divider"></li>
-                         <li class="dropdown-header">Support</li>
-                         <li><a href="/use/mailing-lists/">Mailing 
Lists</a></li>
-              <li><a href="/use/issue-tracking/">Issue Tracking</a></li>
-                         <li><a 
href="http://stackoverflow.com/questions/tagged/apache-beam";>Beam on 
StackOverflow</a></li>
-              <li><a href="http://apachebeam.slack.com";>Beam Slack 
Channel</a></li>
+                         <li><a 
href="/get-started/wordcount-example/">WordCount</a></li>
+                         <li><a 
href="/get-started/mobile-gaming-example/">Mobile Gaming</a></li>
+              <li role="separator" class="divider"></li>
+              <li class="dropdown-header">Resources</li>
+              <li><a href="/get-started/downloads">Downloads</a></li>
+              <li><a href="/get-started/releases">Release Notes</a></li>
+              <li><a href="/get-started/support">Support</a></li>
                  </ul>
            </li>
         <li class="dropdown">
-                 <a href="#" class="dropdown-toggle" data-toggle="dropdown" 
role="button" aria-haspopup="true" aria-expanded="false">Learn <span 
class="caret"></span></a>
+                 <a href="#" class="dropdown-toggle" data-toggle="dropdown" 
role="button" aria-haspopup="true" aria-expanded="false">Documentation <span 
class="caret"></span></a>
                  <ul class="dropdown-menu">
-                         <li><a href="/learn">Learner Hub</a></li>
+                         <li><a href="/documentation">Using the 
Documentation</a></li>
                          <li role="separator" class="divider"></li>
                          <li class="dropdown-header">Beam Concepts</li>
-                         <li><a href="/learn/programming-guide/">Programming 
Guide</a></li>
-                         <li><a 
href="/learn/presentation-materials/">Presentation Materials</a></li>
-                         <li><a href="/learn/resources/">Additional 
Resources</a></li>
+                         <li><a 
href="/documentation/programming-guide/">Programming Guide</a></li>
+                         <li><a href="/documentation/resources/">Additional 
Resources</a></li>
                          <li role="separator" class="divider"></li>
+              <li class="dropdown-header">Pipeline Fundamentals</li>
+              <li><a 
href="/documentation/pipelines/design-your-pipeline/">Design Your 
Pipeline</a></li>
+              <li><a 
href="/documentation/pipelines/create-your-pipeline/">Create Your 
Pipeline</a></li>
+              <li><a href="/documentation/pipelines/test-your-pipeline/">Test 
Your Pipeline</a></li>
+              <li role="separator" class="divider"></li>
                          <li class="dropdown-header">SDKs</li>
-                         <li><a href="/learn/sdks/java/">Java SDK</a></li>
-                         <li><a href="/learn/sdks/javadoc/">Java SDK API 
Reference</a></li>
+                         <li><a href="/documentation/sdks/java/">Java 
SDK</a></li>
+                         <li><a href="/documentation/sdks/javadoc/">Java SDK 
API Reference</a></li>
                          <li role="separator" class="divider"></li>
                          <li class="dropdown-header">Runners</li>
-                         <li><a 
href="/learn/runners/capability-matrix/">Capability Matrix</a></li>
-                         <li><a href="/learn/runners/direct/">Direct 
Runner</a></li>
-                         <li><a href="/learn/runners/flink/">Apache Flink 
Runner</a></li>
-                         <li><a href="/learn/runners/spark/">Apache Spark 
Runner</a></li>
-                         <li><a href="/learn/runners/dataflow/">Cloud Dataflow 
Runner</a></li>
+                         <li><a 
href="/documentation/runners/capability-matrix/">Capability Matrix</a></li>
+                         <li><a href="/documentation/runners/direct/">Direct 
Runner</a></li>
+                         <li><a href="/documentation/runners/flink/">Apache 
Flink Runner</a></li>
+                         <li><a href="/documentation/runners/spark/">Apache 
Spark Runner</a></li>
+                         <li><a href="/documentation/runners/dataflow/">Cloud 
Dataflow Runner</a></li>
                  </ul>
            </li>
         <li class="dropdown">
                  <a href="#" class="dropdown-toggle" data-toggle="dropdown" 
role="button" aria-haspopup="true" aria-expanded="false">Contribute <span 
class="caret"></span></a>
                  <ul class="dropdown-menu">
-                         <li><a href="/contribute">Contributor Hub</a></li>
-                         <li role="separator" class="divider"></li>
-                         <li class="dropdown-header">Basics</li>
-                         <li><a 
href="/contribute/contribution-guide/">Contribution Guide</a></li>
-                         <li><a href="/contribute/work-in-progress/">Work In 
Progress</a></li>
-                         <li><a href="/use/mailing-lists/">Mailing 
Lists</a></li>
-              <li><a href="/contribute/source-repository/">Source 
Repository</a></li>
-              <li><a href="/use/issue-tracking/">Issue Tracking</a></li>
-              <li role="separator" class="divider"></li>
-                         <li class="dropdown-header">Technical References</li>
-                         <li><a href="/contribute/testing/">Testing</a></li>
-              <li><a href="/contribute/design-principles/">Design 
Principles</a></li>
-                         <li><a href="https://goo.gl/nk5OM0";>Technical 
Vision</a></li>
+                         <li><a href="/contribute">Get Started 
Contributing</a></li>
         <li role="separator" class="divider"></li>
-                         <li class="dropdown-header">Committer Resources</li>
+        <li class="dropdown-header">Guides</li>
+                         <li><a 
href="/contribute/contribution-guide/">Contribution Guide</a></li>
+        <li><a href="/contribute/testing/">Testing Guide</a></li>
         <li><a href="/contribute/release-guide/">Release Guide</a></li>
+        <li role="separator" class="divider"></li>
+        <li class="dropdown-header">Technical References</li>
+        <li><a href="/contribute/design-principles/">Design Principles</a></li>
+                         <li><a href="/contribute/work-in-progress/">Ongoing 
Projects</a></li>
+        <li><a href="/contribute/source-repository/">Source 
Repository</a></li>      
+        <li role="separator" class="divider"></li>
+                         <li class="dropdown-header">Promotion</li>
+        <li><a href="/contribute/presentation-materials/">Presentation 
Materials</a></li>
+        <li><a href="/contribute/logos/">Logos and Design</a></li>
+        <li role="separator" class="divider"></li>
+        <li><a href="/contribute/team/">Team</a></li>
                  </ul>
            </li>
+
         <li><a href="/blog">Blog</a></li>
-        <li class="dropdown">
-          <a href="#" class="dropdown-toggle" data-toggle="dropdown" 
role="button" aria-haspopup="true" aria-expanded="false">Project<span 
class="caret"></span></a>
-          <ul class="dropdown-menu">
-            <li><a href="/project/logos/">Logos and design</a></li>
-            <li><a href="/project/public-meetings/">Public Meetings</a></li>
-                       <li><a href="/project/team/">Team</a></li>
-          </ul>
-        </li>
       </ul>
       <ul class="nav navbar-nav navbar-right">
         <li class="dropdown">

http://git-wip-us.apache.org/repos/asf/incubator-beam-site/blob/61ba656f/content/blog/2016/06/13/flink-batch-runner-milestone.html
----------------------------------------------------------------------
diff --git a/content/blog/2016/06/13/flink-batch-runner-milestone.html 
b/content/blog/2016/06/13/flink-batch-runner-milestone.html
index a149977..76f5a42 100644
--- a/content/blog/2016/06/13/flink-batch-runner-milestone.html
+++ b/content/blog/2016/06/13/flink-batch-runner-milestone.html
@@ -48,78 +48,71 @@
     <div id="navbar" class="navbar-collapse collapse">
       <ul class="nav navbar-nav">
         <li class="dropdown">
-                 <a href="#" class="dropdown-toggle" data-toggle="dropdown" 
role="button" aria-haspopup="true" aria-expanded="false">Use <span 
class="caret"></span></a>
+                 <a href="#" class="dropdown-toggle" data-toggle="dropdown" 
role="button" aria-haspopup="true" aria-expanded="false">Get Started <span 
class="caret"></span></a>
                  <ul class="dropdown-menu">
-                         <li><a href="/use">User Hub</a></li>
-                         <li role="separator" class="divider"></li>
-                         <li class="dropdown-header">General</li>
-                         <li><a href="/use/beam-overview/">Beam 
Overview</a></li>
-                         <li><a href="/use/quickstart/">Quickstart</a></li>
-                         <li><a href="/use/releases">Release 
Information</a></li>
+                         <li><a href="/get-started/beam-overview/">Beam 
Overview</a></li>
+              <li><a href="/get-started/quickstart/">Quickstart</a></li>
                          <li role="separator" class="divider"></li>
                          <li class="dropdown-header">Example Walkthroughs</li>
-                         <li><a 
href="/use/wordcount-example/">WordCount</a></li>
-                         <li><a href="/use/walkthroughs/">Mobile 
Gaming</a></li>
-                         <li role="separator" class="divider"></li>
-                         <li class="dropdown-header">Support</li>
-                         <li><a href="/use/mailing-lists/">Mailing 
Lists</a></li>
-              <li><a href="/use/issue-tracking/">Issue Tracking</a></li>
-                         <li><a 
href="http://stackoverflow.com/questions/tagged/apache-beam";>Beam on 
StackOverflow</a></li>
-              <li><a href="http://apachebeam.slack.com";>Beam Slack 
Channel</a></li>
+                         <li><a 
href="/get-started/wordcount-example/">WordCount</a></li>
+                         <li><a 
href="/get-started/mobile-gaming-example/">Mobile Gaming</a></li>
+              <li role="separator" class="divider"></li>
+              <li class="dropdown-header">Resources</li>
+              <li><a href="/get-started/downloads">Downloads</a></li>
+              <li><a href="/get-started/releases">Release Notes</a></li>
+              <li><a href="/get-started/support">Support</a></li>
                  </ul>
            </li>
         <li class="dropdown">
-                 <a href="#" class="dropdown-toggle" data-toggle="dropdown" 
role="button" aria-haspopup="true" aria-expanded="false">Learn <span 
class="caret"></span></a>
+                 <a href="#" class="dropdown-toggle" data-toggle="dropdown" 
role="button" aria-haspopup="true" aria-expanded="false">Documentation <span 
class="caret"></span></a>
                  <ul class="dropdown-menu">
-                         <li><a href="/learn">Learner Hub</a></li>
+                         <li><a href="/documentation">Using the 
Documentation</a></li>
                          <li role="separator" class="divider"></li>
                          <li class="dropdown-header">Beam Concepts</li>
-                         <li><a href="/learn/programming-guide/">Programming 
Guide</a></li>
-                         <li><a 
href="/learn/presentation-materials/">Presentation Materials</a></li>
-                         <li><a href="/learn/resources/">Additional 
Resources</a></li>
+                         <li><a 
href="/documentation/programming-guide/">Programming Guide</a></li>
+                         <li><a href="/documentation/resources/">Additional 
Resources</a></li>
                          <li role="separator" class="divider"></li>
+              <li class="dropdown-header">Pipeline Fundamentals</li>
+              <li><a 
href="/documentation/pipelines/design-your-pipeline/">Design Your 
Pipeline</a></li>
+              <li><a 
href="/documentation/pipelines/create-your-pipeline/">Create Your 
Pipeline</a></li>
+              <li><a href="/documentation/pipelines/test-your-pipeline/">Test 
Your Pipeline</a></li>
+              <li role="separator" class="divider"></li>
                          <li class="dropdown-header">SDKs</li>
-                         <li><a href="/learn/sdks/java/">Java SDK</a></li>
-                         <li><a href="/learn/sdks/javadoc/">Java SDK API 
Reference</a></li>
+                         <li><a href="/documentation/sdks/java/">Java 
SDK</a></li>
+                         <li><a href="/documentation/sdks/javadoc/">Java SDK 
API Reference</a></li>
                          <li role="separator" class="divider"></li>
                          <li class="dropdown-header">Runners</li>
-                         <li><a 
href="/learn/runners/capability-matrix/">Capability Matrix</a></li>
-                         <li><a href="/learn/runners/direct/">Direct 
Runner</a></li>
-                         <li><a href="/learn/runners/flink/">Apache Flink 
Runner</a></li>
-                         <li><a href="/learn/runners/spark/">Apache Spark 
Runner</a></li>
-                         <li><a href="/learn/runners/dataflow/">Cloud Dataflow 
Runner</a></li>
+                         <li><a 
href="/documentation/runners/capability-matrix/">Capability Matrix</a></li>
+                         <li><a href="/documentation/runners/direct/">Direct 
Runner</a></li>
+                         <li><a href="/documentation/runners/flink/">Apache 
Flink Runner</a></li>
+                         <li><a href="/documentation/runners/spark/">Apache 
Spark Runner</a></li>
+                         <li><a href="/documentation/runners/dataflow/">Cloud 
Dataflow Runner</a></li>
                  </ul>
            </li>
         <li class="dropdown">
                  <a href="#" class="dropdown-toggle" data-toggle="dropdown" 
role="button" aria-haspopup="true" aria-expanded="false">Contribute <span 
class="caret"></span></a>
                  <ul class="dropdown-menu">
-                         <li><a href="/contribute">Contributor Hub</a></li>
-                         <li role="separator" class="divider"></li>
-                         <li class="dropdown-header">Basics</li>
-                         <li><a 
href="/contribute/contribution-guide/">Contribution Guide</a></li>
-                         <li><a href="/contribute/work-in-progress/">Work In 
Progress</a></li>
-                         <li><a href="/use/mailing-lists/">Mailing 
Lists</a></li>
-              <li><a href="/contribute/source-repository/">Source 
Repository</a></li>
-              <li><a href="/use/issue-tracking/">Issue Tracking</a></li>
-              <li role="separator" class="divider"></li>
-                         <li class="dropdown-header">Technical References</li>
-                         <li><a href="/contribute/testing/">Testing</a></li>
-              <li><a href="/contribute/design-principles/">Design 
Principles</a></li>
-                         <li><a href="https://goo.gl/nk5OM0";>Technical 
Vision</a></li>
+                         <li><a href="/contribute">Get Started 
Contributing</a></li>
         <li role="separator" class="divider"></li>
-                         <li class="dropdown-header">Committer Resources</li>
+        <li class="dropdown-header">Guides</li>
+                         <li><a 
href="/contribute/contribution-guide/">Contribution Guide</a></li>
+        <li><a href="/contribute/testing/">Testing Guide</a></li>
         <li><a href="/contribute/release-guide/">Release Guide</a></li>
+        <li role="separator" class="divider"></li>
+        <li class="dropdown-header">Technical References</li>
+        <li><a href="/contribute/design-principles/">Design Principles</a></li>
+                         <li><a href="/contribute/work-in-progress/">Ongoing 
Projects</a></li>
+        <li><a href="/contribute/source-repository/">Source 
Repository</a></li>      
+        <li role="separator" class="divider"></li>
+                         <li class="dropdown-header">Promotion</li>
+        <li><a href="/contribute/presentation-materials/">Presentation 
Materials</a></li>
+        <li><a href="/contribute/logos/">Logos and Design</a></li>
+        <li role="separator" class="divider"></li>
+        <li><a href="/contribute/team/">Team</a></li>
                  </ul>
            </li>
+
         <li><a href="/blog">Blog</a></li>
-        <li class="dropdown">
-          <a href="#" class="dropdown-toggle" data-toggle="dropdown" 
role="button" aria-haspopup="true" aria-expanded="false">Project<span 
class="caret"></span></a>
-          <ul class="dropdown-menu">
-            <li><a href="/project/logos/">Logos and design</a></li>
-            <li><a href="/project/public-meetings/">Public Meetings</a></li>
-                       <li><a href="/project/team/">Team</a></li>
-          </ul>
-        </li>
       </ul>
       <ul class="nav navbar-nav navbar-right">
         <li class="dropdown">

http://git-wip-us.apache.org/repos/asf/incubator-beam-site/blob/61ba656f/content/blog/2016/08/03/six-months.html
----------------------------------------------------------------------
diff --git a/content/blog/2016/08/03/six-months.html 
b/content/blog/2016/08/03/six-months.html
index 141c751..ca17065 100644
--- a/content/blog/2016/08/03/six-months.html
+++ b/content/blog/2016/08/03/six-months.html
@@ -48,78 +48,71 @@
     <div id="navbar" class="navbar-collapse collapse">
       <ul class="nav navbar-nav">
         <li class="dropdown">
-                 <a href="#" class="dropdown-toggle" data-toggle="dropdown" 
role="button" aria-haspopup="true" aria-expanded="false">Use <span 
class="caret"></span></a>
+                 <a href="#" class="dropdown-toggle" data-toggle="dropdown" 
role="button" aria-haspopup="true" aria-expanded="false">Get Started <span 
class="caret"></span></a>
                  <ul class="dropdown-menu">
-                         <li><a href="/use">User Hub</a></li>
-                         <li role="separator" class="divider"></li>
-                         <li class="dropdown-header">General</li>
-                         <li><a href="/use/beam-overview/">Beam 
Overview</a></li>
-                         <li><a href="/use/quickstart/">Quickstart</a></li>
-                         <li><a href="/use/releases">Release 
Information</a></li>
+                         <li><a href="/get-started/beam-overview/">Beam 
Overview</a></li>
+              <li><a href="/get-started/quickstart/">Quickstart</a></li>
                          <li role="separator" class="divider"></li>
                          <li class="dropdown-header">Example Walkthroughs</li>
-                         <li><a 
href="/use/wordcount-example/">WordCount</a></li>
-                         <li><a href="/use/walkthroughs/">Mobile 
Gaming</a></li>
-                         <li role="separator" class="divider"></li>
-                         <li class="dropdown-header">Support</li>
-                         <li><a href="/use/mailing-lists/">Mailing 
Lists</a></li>
-              <li><a href="/use/issue-tracking/">Issue Tracking</a></li>
-                         <li><a 
href="http://stackoverflow.com/questions/tagged/apache-beam";>Beam on 
StackOverflow</a></li>
-              <li><a href="http://apachebeam.slack.com";>Beam Slack 
Channel</a></li>
+                         <li><a 
href="/get-started/wordcount-example/">WordCount</a></li>
+                         <li><a 
href="/get-started/mobile-gaming-example/">Mobile Gaming</a></li>
+              <li role="separator" class="divider"></li>
+              <li class="dropdown-header">Resources</li>
+              <li><a href="/get-started/downloads">Downloads</a></li>
+              <li><a href="/get-started/releases">Release Notes</a></li>
+              <li><a href="/get-started/support">Support</a></li>
                  </ul>
            </li>
         <li class="dropdown">
-                 <a href="#" class="dropdown-toggle" data-toggle="dropdown" 
role="button" aria-haspopup="true" aria-expanded="false">Learn <span 
class="caret"></span></a>
+                 <a href="#" class="dropdown-toggle" data-toggle="dropdown" 
role="button" aria-haspopup="true" aria-expanded="false">Documentation <span 
class="caret"></span></a>
                  <ul class="dropdown-menu">
-                         <li><a href="/learn">Learner Hub</a></li>
+                         <li><a href="/documentation">Using the 
Documentation</a></li>
                          <li role="separator" class="divider"></li>
                          <li class="dropdown-header">Beam Concepts</li>
-                         <li><a href="/learn/programming-guide/">Programming 
Guide</a></li>
-                         <li><a 
href="/learn/presentation-materials/">Presentation Materials</a></li>
-                         <li><a href="/learn/resources/">Additional 
Resources</a></li>
+                         <li><a 
href="/documentation/programming-guide/">Programming Guide</a></li>
+                         <li><a href="/documentation/resources/">Additional 
Resources</a></li>
                          <li role="separator" class="divider"></li>
+              <li class="dropdown-header">Pipeline Fundamentals</li>
+              <li><a 
href="/documentation/pipelines/design-your-pipeline/">Design Your 
Pipeline</a></li>
+              <li><a 
href="/documentation/pipelines/create-your-pipeline/">Create Your 
Pipeline</a></li>
+              <li><a href="/documentation/pipelines/test-your-pipeline/">Test 
Your Pipeline</a></li>
+              <li role="separator" class="divider"></li>
                          <li class="dropdown-header">SDKs</li>
-                         <li><a href="/learn/sdks/java/">Java SDK</a></li>
-                         <li><a href="/learn/sdks/javadoc/">Java SDK API 
Reference</a></li>
+                         <li><a href="/documentation/sdks/java/">Java 
SDK</a></li>
+                         <li><a href="/documentation/sdks/javadoc/">Java SDK 
API Reference</a></li>
                          <li role="separator" class="divider"></li>
                          <li class="dropdown-header">Runners</li>
-                         <li><a 
href="/learn/runners/capability-matrix/">Capability Matrix</a></li>
-                         <li><a href="/learn/runners/direct/">Direct 
Runner</a></li>
-                         <li><a href="/learn/runners/flink/">Apache Flink 
Runner</a></li>
-                         <li><a href="/learn/runners/spark/">Apache Spark 
Runner</a></li>
-                         <li><a href="/learn/runners/dataflow/">Cloud Dataflow 
Runner</a></li>
+                         <li><a 
href="/documentation/runners/capability-matrix/">Capability Matrix</a></li>
+                         <li><a href="/documentation/runners/direct/">Direct 
Runner</a></li>
+                         <li><a href="/documentation/runners/flink/">Apache 
Flink Runner</a></li>
+                         <li><a href="/documentation/runners/spark/">Apache 
Spark Runner</a></li>
+                         <li><a href="/documentation/runners/dataflow/">Cloud 
Dataflow Runner</a></li>
                  </ul>
            </li>
         <li class="dropdown">
                  <a href="#" class="dropdown-toggle" data-toggle="dropdown" 
role="button" aria-haspopup="true" aria-expanded="false">Contribute <span 
class="caret"></span></a>
                  <ul class="dropdown-menu">
-                         <li><a href="/contribute">Contributor Hub</a></li>
-                         <li role="separator" class="divider"></li>
-                         <li class="dropdown-header">Basics</li>
-                         <li><a 
href="/contribute/contribution-guide/">Contribution Guide</a></li>
-                         <li><a href="/contribute/work-in-progress/">Work In 
Progress</a></li>
-                         <li><a href="/use/mailing-lists/">Mailing 
Lists</a></li>
-              <li><a href="/contribute/source-repository/">Source 
Repository</a></li>
-              <li><a href="/use/issue-tracking/">Issue Tracking</a></li>
-              <li role="separator" class="divider"></li>
-                         <li class="dropdown-header">Technical References</li>
-                         <li><a href="/contribute/testing/">Testing</a></li>
-              <li><a href="/contribute/design-principles/">Design 
Principles</a></li>
-                         <li><a href="https://goo.gl/nk5OM0";>Technical 
Vision</a></li>
+                         <li><a href="/contribute">Get Started 
Contributing</a></li>
         <li role="separator" class="divider"></li>
-                         <li class="dropdown-header">Committer Resources</li>
+        <li class="dropdown-header">Guides</li>
+                         <li><a 
href="/contribute/contribution-guide/">Contribution Guide</a></li>
+        <li><a href="/contribute/testing/">Testing Guide</a></li>
         <li><a href="/contribute/release-guide/">Release Guide</a></li>
+        <li role="separator" class="divider"></li>
+        <li class="dropdown-header">Technical References</li>
+        <li><a href="/contribute/design-principles/">Design Principles</a></li>
+                         <li><a href="/contribute/work-in-progress/">Ongoing 
Projects</a></li>
+        <li><a href="/contribute/source-repository/">Source 
Repository</a></li>      
+        <li role="separator" class="divider"></li>
+                         <li class="dropdown-header">Promotion</li>
+        <li><a href="/contribute/presentation-materials/">Presentation 
Materials</a></li>
+        <li><a href="/contribute/logos/">Logos and Design</a></li>
+        <li role="separator" class="divider"></li>
+        <li><a href="/contribute/team/">Team</a></li>
                  </ul>
            </li>
+
         <li><a href="/blog">Blog</a></li>
-        <li class="dropdown">
-          <a href="#" class="dropdown-toggle" data-toggle="dropdown" 
role="button" aria-haspopup="true" aria-expanded="false">Project<span 
class="caret"></span></a>
-          <ul class="dropdown-menu">
-            <li><a href="/project/logos/">Logos and design</a></li>
-            <li><a href="/project/public-meetings/">Public Meetings</a></li>
-                       <li><a href="/project/team/">Team</a></li>
-          </ul>
-        </li>
       </ul>
       <ul class="nav navbar-nav navbar-right">
         <li class="dropdown">

http://git-wip-us.apache.org/repos/asf/incubator-beam-site/blob/61ba656f/content/blog/2016/10/20/test-stream.html
----------------------------------------------------------------------
diff --git a/content/blog/2016/10/20/test-stream.html 
b/content/blog/2016/10/20/test-stream.html
index a5195bc..ddd114e 100644
--- a/content/blog/2016/10/20/test-stream.html
+++ b/content/blog/2016/10/20/test-stream.html
@@ -48,78 +48,71 @@
     <div id="navbar" class="navbar-collapse collapse">
       <ul class="nav navbar-nav">
         <li class="dropdown">
-                 <a href="#" class="dropdown-toggle" data-toggle="dropdown" 
role="button" aria-haspopup="true" aria-expanded="false">Use <span 
class="caret"></span></a>
+                 <a href="#" class="dropdown-toggle" data-toggle="dropdown" 
role="button" aria-haspopup="true" aria-expanded="false">Get Started <span 
class="caret"></span></a>
                  <ul class="dropdown-menu">
-                         <li><a href="/use">User Hub</a></li>
-                         <li role="separator" class="divider"></li>
-                         <li class="dropdown-header">General</li>
-                         <li><a href="/use/beam-overview/">Beam 
Overview</a></li>
-                         <li><a href="/use/quickstart/">Quickstart</a></li>
-                         <li><a href="/use/releases">Release 
Information</a></li>
+                         <li><a href="/get-started/beam-overview/">Beam 
Overview</a></li>
+              <li><a href="/get-started/quickstart/">Quickstart</a></li>
                          <li role="separator" class="divider"></li>
                          <li class="dropdown-header">Example Walkthroughs</li>
-                         <li><a 
href="/use/wordcount-example/">WordCount</a></li>
-                         <li><a href="/use/walkthroughs/">Mobile 
Gaming</a></li>
-                         <li role="separator" class="divider"></li>
-                         <li class="dropdown-header">Support</li>
-                         <li><a href="/use/mailing-lists/">Mailing 
Lists</a></li>
-              <li><a href="/use/issue-tracking/">Issue Tracking</a></li>
-                         <li><a 
href="http://stackoverflow.com/questions/tagged/apache-beam";>Beam on 
StackOverflow</a></li>
-              <li><a href="http://apachebeam.slack.com";>Beam Slack 
Channel</a></li>
+                         <li><a 
href="/get-started/wordcount-example/">WordCount</a></li>
+                         <li><a 
href="/get-started/mobile-gaming-example/">Mobile Gaming</a></li>
+              <li role="separator" class="divider"></li>
+              <li class="dropdown-header">Resources</li>
+              <li><a href="/get-started/downloads">Downloads</a></li>
+              <li><a href="/get-started/releases">Release Notes</a></li>
+              <li><a href="/get-started/support">Support</a></li>
                  </ul>
            </li>
         <li class="dropdown">
-                 <a href="#" class="dropdown-toggle" data-toggle="dropdown" 
role="button" aria-haspopup="true" aria-expanded="false">Learn <span 
class="caret"></span></a>
+                 <a href="#" class="dropdown-toggle" data-toggle="dropdown" 
role="button" aria-haspopup="true" aria-expanded="false">Documentation <span 
class="caret"></span></a>
                  <ul class="dropdown-menu">
-                         <li><a href="/learn">Learner Hub</a></li>
+                         <li><a href="/documentation">Using the 
Documentation</a></li>
                          <li role="separator" class="divider"></li>
                          <li class="dropdown-header">Beam Concepts</li>
-                         <li><a href="/learn/programming-guide/">Programming 
Guide</a></li>
-                         <li><a 
href="/learn/presentation-materials/">Presentation Materials</a></li>
-                         <li><a href="/learn/resources/">Additional 
Resources</a></li>
+                         <li><a 
href="/documentation/programming-guide/">Programming Guide</a></li>
+                         <li><a href="/documentation/resources/">Additional 
Resources</a></li>
                          <li role="separator" class="divider"></li>
+              <li class="dropdown-header">Pipeline Fundamentals</li>
+              <li><a 
href="/documentation/pipelines/design-your-pipeline/">Design Your 
Pipeline</a></li>
+              <li><a 
href="/documentation/pipelines/create-your-pipeline/">Create Your 
Pipeline</a></li>
+              <li><a href="/documentation/pipelines/test-your-pipeline/">Test 
Your Pipeline</a></li>
+              <li role="separator" class="divider"></li>
                          <li class="dropdown-header">SDKs</li>
-                         <li><a href="/learn/sdks/java/">Java SDK</a></li>
-                         <li><a href="/learn/sdks/javadoc/">Java SDK API 
Reference</a></li>
+                         <li><a href="/documentation/sdks/java/">Java 
SDK</a></li>
+                         <li><a href="/documentation/sdks/javadoc/">Java SDK 
API Reference</a></li>
                          <li role="separator" class="divider"></li>
                          <li class="dropdown-header">Runners</li>
-                         <li><a 
href="/learn/runners/capability-matrix/">Capability Matrix</a></li>
-                         <li><a href="/learn/runners/direct/">Direct 
Runner</a></li>
-                         <li><a href="/learn/runners/flink/">Apache Flink 
Runner</a></li>
-                         <li><a href="/learn/runners/spark/">Apache Spark 
Runner</a></li>
-                         <li><a href="/learn/runners/dataflow/">Cloud Dataflow 
Runner</a></li>
+                         <li><a 
href="/documentation/runners/capability-matrix/">Capability Matrix</a></li>
+                         <li><a href="/documentation/runners/direct/">Direct 
Runner</a></li>
+                         <li><a href="/documentation/runners/flink/">Apache 
Flink Runner</a></li>
+                         <li><a href="/documentation/runners/spark/">Apache 
Spark Runner</a></li>
+                         <li><a href="/documentation/runners/dataflow/">Cloud 
Dataflow Runner</a></li>
                  </ul>
            </li>
         <li class="dropdown">
                  <a href="#" class="dropdown-toggle" data-toggle="dropdown" 
role="button" aria-haspopup="true" aria-expanded="false">Contribute <span 
class="caret"></span></a>
                  <ul class="dropdown-menu">
-                         <li><a href="/contribute">Contributor Hub</a></li>
-                         <li role="separator" class="divider"></li>
-                         <li class="dropdown-header">Basics</li>
-                         <li><a 
href="/contribute/contribution-guide/">Contribution Guide</a></li>
-                         <li><a href="/contribute/work-in-progress/">Work In 
Progress</a></li>
-                         <li><a href="/use/mailing-lists/">Mailing 
Lists</a></li>
-              <li><a href="/contribute/source-repository/">Source 
Repository</a></li>
-              <li><a href="/use/issue-tracking/">Issue Tracking</a></li>
-              <li role="separator" class="divider"></li>
-                         <li class="dropdown-header">Technical References</li>
-                         <li><a href="/contribute/testing/">Testing</a></li>
-              <li><a href="/contribute/design-principles/">Design 
Principles</a></li>
-                         <li><a href="https://goo.gl/nk5OM0";>Technical 
Vision</a></li>
+                         <li><a href="/contribute">Get Started 
Contributing</a></li>
         <li role="separator" class="divider"></li>
-                         <li class="dropdown-header">Committer Resources</li>
+        <li class="dropdown-header">Guides</li>
+                         <li><a 
href="/contribute/contribution-guide/">Contribution Guide</a></li>
+        <li><a href="/contribute/testing/">Testing Guide</a></li>
         <li><a href="/contribute/release-guide/">Release Guide</a></li>
+        <li role="separator" class="divider"></li>
+        <li class="dropdown-header">Technical References</li>
+        <li><a href="/contribute/design-principles/">Design Principles</a></li>
+                         <li><a href="/contribute/work-in-progress/">Ongoing 
Projects</a></li>
+        <li><a href="/contribute/source-repository/">Source 
Repository</a></li>      
+        <li role="separator" class="divider"></li>
+                         <li class="dropdown-header">Promotion</li>
+        <li><a href="/contribute/presentation-materials/">Presentation 
Materials</a></li>
+        <li><a href="/contribute/logos/">Logos and Design</a></li>
+        <li role="separator" class="divider"></li>
+        <li><a href="/contribute/team/">Team</a></li>
                  </ul>
            </li>
+
         <li><a href="/blog">Blog</a></li>
-        <li class="dropdown">
-          <a href="#" class="dropdown-toggle" data-toggle="dropdown" 
role="button" aria-haspopup="true" aria-expanded="false">Project<span 
class="caret"></span></a>
-          <ul class="dropdown-menu">
-            <li><a href="/project/logos/">Logos and design</a></li>
-            <li><a href="/project/public-meetings/">Public Meetings</a></li>
-                       <li><a href="/project/team/">Team</a></li>
-          </ul>
-        </li>
       </ul>
       <ul class="nav navbar-nav navbar-right">
         <li class="dropdown">


Reply via email to